diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 61786ae676ef..9bd2f4688b49 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -513,12 +513,6 @@
githubId = 38869148;
name = "Alex Eyre";
};
- algorith = {
- email = "dries_van_daele@telenet.be";
- github = "DriesVanDaele";
- githubId = 1141488;
- name = "Dries Van Daele";
- };
alibabzo = {
email = "alistair.bill@gmail.com";
github = "alibabzo";
@@ -6536,6 +6530,12 @@
githubId = 787421;
name = "Kevin Quick";
};
+ kradalby = {
+ name = "Kristoffer Dalby";
+ email = "kristoffer@dalby.cc";
+ github = "kradalby";
+ githubId = 98431;
+ };
kraem = {
email = "me@kraem.xyz";
github = "kraem";
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
index 2d2eec1763cf..8c4bc7355190 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@@ -192,6 +192,15 @@
services.rstudio-server.
+
+
+ headscale,
+ an Open Source implementation of the
+ Tailscale
+ Control Server. Available as
+ services.headscale
+
+
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index 448f302afe67..cfff3afd81c1 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -58,6 +58,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [rstudio-server](https://www.rstudio.com/products/rstudio/#rstudio-server), a browser-based version of the RStudio IDE for the R programming language. Available as [services.rstudio-server](options.html#opt-services.rstudio-server.enable).
+- [headscale](https://github.com/juanfont/headscale), an Open Source implementation of the [Tailscale](https://tailscale.io) Control Server. Available as [services.headscale](options.html#opt-services.headscale.enable)
+
## Backward Incompatibilities {#sec-release-22.05-incompatibilities}
diff --git a/nixos/lib/systemd-lib.nix b/nixos/lib/systemd-lib.nix
index db4c35511871..ab166d7327ce 100644
--- a/nixos/lib/systemd-lib.nix
+++ b/nixos/lib/systemd-lib.nix
@@ -11,6 +11,9 @@ in rec {
mkPathSafeName = lib.replaceChars ["@" ":" "\\" "[" "]"] ["-" "-" "-" "" ""];
+ # a type for options that take a unit name
+ unitNameType = types.strMatching "[a-zA-Z0-9@%:_.\\-]+[.](service|socket|device|mount|automount|swap|target|path|timer|scope|slice)";
+
makeUnit = name: unit:
if unit.enable then
pkgs.runCommand "unit-${mkPathSafeName name}"
diff --git a/nixos/lib/systemd-unit-options.nix b/nixos/lib/systemd-unit-options.nix
index 832a33d64290..520f2e982a26 100644
--- a/nixos/lib/systemd-unit-options.nix
+++ b/nixos/lib/systemd-unit-options.nix
@@ -45,7 +45,7 @@ in rec {
requiredBy = mkOption {
default = [];
- type = types.listOf types.str;
+ type = types.listOf unitNameType;
description = ''
Units that require (i.e. depend on and need to go down with)
this unit. The discussion under wantedBy
@@ -56,7 +56,7 @@ in rec {
wantedBy = mkOption {
default = [];
- type = types.listOf types.str;
+ type = types.listOf unitNameType;
description = ''
Units that want (i.e. depend on) this unit. The standard way
to make a unit start by default at boot is to set this option
@@ -73,7 +73,7 @@ in rec {
aliases = mkOption {
default = [];
- type = types.listOf types.str;
+ type = types.listOf unitNameType;
description = "Aliases of that unit.";
};
@@ -110,7 +110,7 @@ in rec {
requires = mkOption {
default = [];
- type = types.listOf types.str;
+ type = types.listOf unitNameType;
description = ''
Start the specified units when this unit is started, and stop
this unit when the specified units are stopped or fail.
@@ -119,7 +119,7 @@ in rec {
wants = mkOption {
default = [];
- type = types.listOf types.str;
+ type = types.listOf unitNameType;
description = ''
Start the specified units when this unit is started.
'';
@@ -127,7 +127,7 @@ in rec {
after = mkOption {
default = [];
- type = types.listOf types.str;
+ type = types.listOf unitNameType;
description = ''
If the specified units are started at the same time as
this unit, delay this unit until they have started.
@@ -136,7 +136,7 @@ in rec {
before = mkOption {
default = [];
- type = types.listOf types.str;
+ type = types.listOf unitNameType;
description = ''
If the specified units are started at the same time as
this unit, delay them until this unit has started.
@@ -145,7 +145,7 @@ in rec {
bindsTo = mkOption {
default = [];
- type = types.listOf types.str;
+ type = types.listOf unitNameType;
description = ''
Like ‘requires’, but in addition, if the specified units
unexpectedly disappear, this unit will be stopped as well.
@@ -154,7 +154,7 @@ in rec {
partOf = mkOption {
default = [];
- type = types.listOf types.str;
+ type = types.listOf unitNameType;
description = ''
If the specified units are stopped or restarted, then this
unit is stopped or restarted as well.
@@ -163,7 +163,7 @@ in rec {
conflicts = mkOption {
default = [];
- type = types.listOf types.str;
+ type = types.listOf unitNameType;
description = ''
If the specified units are started, then this unit is stopped
and vice versa.
@@ -172,7 +172,7 @@ in rec {
requisite = mkOption {
default = [];
- type = types.listOf types.str;
+ type = types.listOf unitNameType;
description = ''
Similar to requires. However if the units listed are not started,
they will not be started and the transaction will fail.
@@ -203,7 +203,7 @@ in rec {
onFailure = mkOption {
default = [];
- type = types.listOf types.str;
+ type = types.listOf unitNameType;
description = ''
A list of one or more units that are activated when
this unit enters the "failed" state.
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 643c787aa88d..7593a5037db1 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -764,6 +764,7 @@
./services/networking/gvpe.nix
./services/networking/hans.nix
./services/networking/haproxy.nix
+ ./services/networking/headscale.nix
./services/networking/hostapd.nix
./services/networking/htpdate.nix
./services/networking/hylafax/default.nix
diff --git a/nixos/modules/services/networking/headscale.nix b/nixos/modules/services/networking/headscale.nix
new file mode 100644
index 000000000000..091d2a938cd4
--- /dev/null
+++ b/nixos/modules/services/networking/headscale.nix
@@ -0,0 +1,490 @@
+{ config, lib, pkgs, ... }:
+with lib;
+let
+ cfg = config.services.headscale;
+
+ dataDir = "/var/lib/headscale";
+ runDir = "/run/headscale";
+
+ settingsFormat = pkgs.formats.yaml { };
+ configFile = settingsFormat.generate "headscale.yaml" cfg.settings;
+in
+{
+ options = {
+ services.headscale = {
+ enable = mkEnableOption "headscale, Open Source coordination server for Tailscale";
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.headscale;
+ defaultText = literalExpression "pkgs.headscale";
+ description = ''
+ Which headscale package to use for the running server.
+ '';
+ };
+
+ user = mkOption {
+ default = "headscale";
+ type = types.str;
+ description = ''
+ User account under which headscale runs.
+
+ If left as the default value this user will automatically be created
+ on system activation, otherwise you are responsible for
+ ensuring the user exists before the headscale service starts.
+
+ '';
+ };
+
+ group = mkOption {
+ default = "headscale";
+ type = types.str;
+ description = ''
+ Group under which headscale runs.
+
+ If left as the default value this group will automatically be created
+ on system activation, otherwise you are responsible for
+ ensuring the user exists before the headscale service starts.
+
+ '';
+ };
+
+ serverUrl = mkOption {
+ type = types.str;
+ default = "http://127.0.0.1:8080";
+ description = ''
+ The url clients will connect to.
+ '';
+ example = "https://myheadscale.example.com:443";
+ };
+
+ address = mkOption {
+ type = types.str;
+ default = "127.0.0.1";
+ description = ''
+ Listening address of headscale.
+ '';
+ example = "0.0.0.0";
+ };
+
+ port = mkOption {
+ type = types.port;
+ default = 8080;
+ description = ''
+ Listening port of headscale.
+ '';
+ example = 443;
+ };
+
+ privateKeyFile = mkOption {
+ type = types.path;
+ default = "${dataDir}/private.key";
+ description = ''
+ Path to private key file, generated automatically if it does not exist.
+ '';
+ };
+
+ derp = {
+ urls = mkOption {
+ type = types.listOf types.str;
+ default = [ "https://controlplane.tailscale.com/derpmap/default" ];
+ description = ''
+ List of urls containing DERP maps.
+ See How Tailscale works for more information on DERP maps.
+ '';
+ };
+
+ paths = mkOption {
+ type = types.listOf types.path;
+ default = [ ];
+ description = ''
+ List of file paths containing DERP maps.
+ See How Tailscale works for more information on DERP maps.
+ '';
+ };
+
+
+ autoUpdate = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether to automatically update DERP maps on a set frequency.
+ '';
+ example = false;
+ };
+
+ updateFrequency = mkOption {
+ type = types.str;
+ default = "24h";
+ description = ''
+ Frequency to update DERP maps.
+ '';
+ example = "5m";
+ };
+
+ };
+
+ ephemeralNodeInactivityTimeout = mkOption {
+ type = types.str;
+ default = "30m";
+ description = ''
+ Time before an inactive ephemeral node is deleted.
+ '';
+ example = "5m";
+ };
+
+ database = {
+ type = mkOption {
+ type = types.enum [ "sqlite3" "postgres" ];
+ example = "postgres";
+ default = "sqlite3";
+ description = "Database engine to use.";
+ };
+
+ host = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "127.0.0.1";
+ description = "Database host address.";
+ };
+
+ port = mkOption {
+ type = types.nullOr types.port;
+ default = null;
+ example = 3306;
+ description = "Database host port.";
+ };
+
+ name = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "headscale";
+ description = "Database name.";
+ };
+
+ user = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "headscale";
+ description = "Database user.";
+ };
+
+ passwordFile = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ example = "/run/keys/headscale-dbpassword";
+ description = ''
+ A file containing the password corresponding to
+ .
+ '';
+ };
+
+ path = mkOption {
+ type = types.nullOr types.str;
+ default = "${dataDir}/db.sqlite";
+ description = "Path to the sqlite3 database file.";
+ };
+ };
+
+ logLevel = mkOption {
+ type = types.str;
+ default = "info";
+ description = ''
+ headscale log level.
+ '';
+ example = "debug";
+ };
+
+ dns = {
+ nameservers = mkOption {
+ type = types.listOf types.str;
+ default = [ "1.1.1.1" ];
+ description = ''
+ List of nameservers to pass to Tailscale clients.
+ '';
+ };
+
+ domains = mkOption {
+ type = types.listOf types.str;
+ default = [ ];
+ description = ''
+ Search domains to inject to Tailscale clients.
+ '';
+ example = [ "mydomain.internal" ];
+ };
+
+ magicDns = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether to use [MagicDNS](https://tailscale.com/kb/1081/magicdns/).
+ Only works if there is at least a nameserver defined.
+ '';
+ example = false;
+ };
+
+ baseDomain = mkOption {
+ type = types.str;
+ default = "";
+ description = ''
+ Defines the base domain to create the hostnames for MagicDNS.
+ must be a FQDNs, without the trailing dot.
+ The FQDN of the hosts will be
+ hostname.namespace.base_domain (e.g.
+ myhost.mynamespace.example.com).
+ '';
+ };
+ };
+
+ openIdConnect = {
+ issuer = mkOption {
+ type = types.str;
+ default = "";
+ description = ''
+ URL to OpenID issuer.
+ '';
+ example = "https://openid.example.com";
+ };
+
+ clientId = mkOption {
+ type = types.str;
+ default = "";
+ description = ''
+ OpenID Connect client ID.
+ '';
+ };
+
+ clientSecretFile = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ description = ''
+ Path to OpenID Connect client secret file.
+ '';
+ };
+
+ domainMap = mkOption {
+ type = types.attrsOf types.str;
+ default = { };
+ description = ''
+ Domain map is used to map incomming users (by their email) to
+ a namespace. The key can be a string, or regex.
+ '';
+ example = {
+ ".*" = "default-namespace";
+ };
+ };
+
+ };
+
+ tls = {
+ letsencrypt = {
+ hostname = mkOption {
+ type = types.nullOr types.str;
+ default = "";
+ description = ''
+ Domain name to request a TLS certificate for.
+ '';
+ };
+ challengeType = mkOption {
+ type = types.enum [ "TLS_ALPN-01" "HTTP-01" ];
+ default = "HTTP-01";
+ description = ''
+ Type of ACME challenge to use, currently supported types:
+ HTTP-01 or TLS_ALPN-01.
+ '';
+ };
+ httpListen = mkOption {
+ type = types.nullOr types.str;
+ default = ":http";
+ description = ''
+ When HTTP-01 challenge is chosen, letsencrypt must set up a
+ verification endpoint, and it will be listening on:
+ :http = port 80.
+ '';
+ };
+ };
+
+ certFile = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ description = ''
+ Path to already created certificate.
+ '';
+ };
+ keyFile = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ description = ''
+ Path to key for already created certificate.
+ '';
+ };
+ };
+
+ aclPolicyFile = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ description = ''
+ Path to a file containg ACL policies.
+ '';
+ };
+
+ settings = mkOption {
+ type = settingsFormat.type;
+ default = { };
+ description = ''
+ Overrides to config.yaml as a Nix attribute set.
+ This option is ideal for overriding settings not exposed as Nix options.
+ Check the example config
+ for possible options.
+ '';
+ };
+
+
+ };
+
+ };
+ config = mkIf cfg.enable {
+
+ services.headscale.settings = {
+ server_url = mkDefault cfg.serverUrl;
+ listen_addr = mkDefault "${cfg.address}:${toString cfg.port}";
+
+ private_key_path = mkDefault cfg.privateKeyFile;
+
+ derp = {
+ urls = mkDefault cfg.derp.urls;
+ paths = mkDefault cfg.derp.paths;
+ auto_update_enable = mkDefault cfg.derp.autoUpdate;
+ update_frequency = mkDefault cfg.derp.updateFrequency;
+ };
+
+ # Turn off update checks since the origin of our package
+ # is nixpkgs and not Github.
+ disable_check_updates = true;
+
+ ephemeral_node_inactivity_timeout = mkDefault cfg.ephemeralNodeInactivityTimeout;
+
+ db_type = mkDefault cfg.database.type;
+ db_path = mkDefault cfg.database.path;
+
+ log_level = mkDefault cfg.logLevel;
+
+ dns_config = {
+ nameservers = mkDefault cfg.dns.nameservers;
+ domains = mkDefault cfg.dns.domains;
+ magic_dns = mkDefault cfg.dns.magicDns;
+ base_domain = mkDefault cfg.dns.baseDomain;
+ };
+
+ unix_socket = "${runDir}/headscale.sock";
+
+ # OpenID Connect
+ oidc = {
+ issuer = mkDefault cfg.openIdConnect.issuer;
+ client_id = mkDefault cfg.openIdConnect.clientId;
+ domain_map = mkDefault cfg.openIdConnect.domainMap;
+ };
+
+ tls_letsencrypt_cache_dir = "${dataDir}/.cache";
+
+ } // optionalAttrs (cfg.database.host != null) {
+ db_host = mkDefault cfg.database.host;
+ } // optionalAttrs (cfg.database.port != null) {
+ db_port = mkDefault cfg.database.port;
+ } // optionalAttrs (cfg.database.name != null) {
+ db_name = mkDefault cfg.database.name;
+ } // optionalAttrs (cfg.database.user != null) {
+ db_user = mkDefault cfg.database.user;
+ } // optionalAttrs (cfg.tls.letsencrypt.hostname != null) {
+ tls_letsencrypt_hostname = mkDefault cfg.tls.letsencrypt.hostname;
+ } // optionalAttrs (cfg.tls.letsencrypt.challengeType != null) {
+ tls_letsencrypt_challenge_type = mkDefault cfg.tls.letsencrypt.challengeType;
+ } // optionalAttrs (cfg.tls.letsencrypt.httpListen != null) {
+ tls_letsencrypt_listen = mkDefault cfg.tls.letsencrypt.httpListen;
+ } // optionalAttrs (cfg.tls.certFile != null) {
+ tls_cert_path = mkDefault cfg.tls.certFile;
+ } // optionalAttrs (cfg.tls.keyFile != null) {
+ tls_key_path = mkDefault cfg.tls.keyFile;
+ } // optionalAttrs (cfg.aclPolicyFile != null) {
+ acl_policy_path = mkDefault cfg.aclPolicyFile;
+ };
+
+ # Setup the headscale configuration in a known path in /etc to
+ # allow both the Server and the Client use it to find the socket
+ # for communication.
+ environment.etc."headscale/config.yaml".source = configFile;
+
+ users.groups.headscale = mkIf (cfg.group == "headscale") { };
+
+ users.users.headscale = mkIf (cfg.user == "headscale") {
+ description = "headscale user";
+ home = dataDir;
+ group = cfg.group;
+ isSystemUser = true;
+ };
+
+ systemd.services.headscale = {
+ description = "headscale coordination server for Tailscale";
+ after = [ "network-online.target" ];
+ wantedBy = [ "multi-user.target" ];
+ restartTriggers = [ configFile ];
+
+ script = ''
+ ${optionalString (cfg.database.passwordFile != null) ''
+ export HEADSCALE_DB_PASS="$(head -n1 ${escapeShellArg cfg.database.passwordFile})"
+ ''}
+
+ export HEADSCALE_OIDC_CLIENT_SECRET="$(head -n1 ${escapeShellArg cfg.openIdConnect.clientSecretFile})"
+ exec ${cfg.package}/bin/headscale serve
+ '';
+
+ serviceConfig =
+ let
+ capabilityBoundingSet = [ "CAP_CHOWN" ] ++ optional (cfg.port < 1024) "CAP_NET_BIND_SERVICE";
+ in
+ {
+ Restart = "always";
+ Type = "simple";
+ User = cfg.user;
+ Group = cfg.group;
+
+ # Hardening options
+ RuntimeDirectory = "headscale";
+ # Allow headscale group access so users can be added and use the CLI.
+ RuntimeDirectoryMode = "0750";
+
+ StateDirectory = "headscale";
+ StateDirectoryMode = "0750";
+
+ ProtectSystem = "strict";
+ ProtectHome = true;
+ PrivateTmp = true;
+ PrivateDevices = true;
+ ProtectKernelTunables = true;
+ ProtectControlGroups = true;
+ RestrictSUIDSGID = true;
+ PrivateMounts = true;
+ ProtectKernelModules = true;
+ ProtectKernelLogs = true;
+ ProtectHostname = true;
+ ProtectClock = true;
+ ProtectProc = "invisible";
+ ProcSubset = "pid";
+ RestrictNamespaces = true;
+ RemoveIPC = true;
+ UMask = "0077";
+
+ CapabilityBoundingSet = capabilityBoundingSet;
+ AmbientCapabilities = capabilityBoundingSet;
+ NoNewPrivileges = true;
+ LockPersonality = true;
+ RestrictRealtime = true;
+ SystemCallFilter = [ "@system-service" "~@priviledged" "@chown" ];
+ SystemCallArchitectures = "native";
+ RestrictAddressFamilies = "AF_INET AF_INET6 AF_UNIX";
+ };
+ };
+ };
+
+ meta.maintainers = with maintainers; [ kradalby ];
+}
diff --git a/pkgs/applications/misc/edgetx/default.nix b/pkgs/applications/misc/edgetx/default.nix
new file mode 100644
index 000000000000..4dfb5b6422fe
--- /dev/null
+++ b/pkgs/applications/misc/edgetx/default.nix
@@ -0,0 +1,47 @@
+{ lib, mkDerivation, fetchFromGitHub
+, cmake, gcc-arm-embedded, python3Packages
+, qtbase, qtmultimedia, qttranslations, SDL, gtest
+, dfu-util
+}:
+
+mkDerivation rec {
+ pname = "edgetx";
+ version = "2.6.0";
+
+ src = fetchFromGitHub {
+ owner = "EdgeTX";
+ repo = pname;
+ rev = "v${version}";
+ fetchSubmodules = true;
+ sha256 = "sha256-TffHFgr3g7v4VnNSSlLITz4cYjHM6wE0aI85W1g4IFA=";
+ };
+
+ nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ];
+
+ buildInputs = [ qtbase qtmultimedia qttranslations SDL ];
+
+ postPatch = ''
+ sed -i companion/src/burnconfigdialog.cpp \
+ -e 's|/usr/.*bin/dfu-util|${dfu-util}/bin/dfu-util|'
+ '';
+
+ cmakeFlags = [
+ "-DGTEST_ROOT=${gtest.src}/googletest"
+ "-DQT_TRANSLATIONS_DIR=${qttranslations}/translations"
+ "-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util"
+ ];
+
+ meta = with lib; {
+ description = "EdgeTX Companion transmitter support software";
+ longDescription = ''
+ EdgeTX Companion is used for many different tasks like loading EdgeTX
+ firmware to the radio, backing up model settings, editing settings and
+ running radio simulators.
+ '';
+ homepage = "https://edgetx.org/";
+ license = licenses.gpl2Only;
+ platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
+ maintainers = with maintainers; [ elitak lopsided98 wucke13 ];
+ };
+
+}
diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix
index 3acb493c1c04..aa290632748e 100644
--- a/pkgs/applications/misc/etesync-dav/default.nix
+++ b/pkgs/applications/misc/etesync-dav/default.nix
@@ -1,20 +1,36 @@
-{ lib, stdenv, python3Packages, radicale3 }:
+{ lib
+, stdenv
+, python3
+, radicale3
+}:
-python3Packages.buildPythonApplication rec {
+let
+ python = python3.override {
+ packageOverrides = self: super: {
+ flask_wtf = super.flask_wtf.overridePythonAttrs (old: rec {
+ version = "0.15.1";
+ src = old.src.override {
+ inherit version;
+ sha256 = "ff177185f891302dc253437fe63081e7a46a4e99aca61dfe086fb23e54fff2dc";
+ };
+ });
+ };
+ };
+in python.pkgs.buildPythonApplication rec {
pname = "etesync-dav";
- version = "0.30.8";
+ version = "0.32.1";
- src = python3Packages.fetchPypi {
+ src = python.pkgs.fetchPypi {
inherit pname version;
- sha256 = "sha256-HBLQsq3B6TMdcnUt8ukbk3+S0Ed44+gePkpuGZ2AyC4=";
+ sha256 = "a4e2ee83932755d29ac39c1e74005ec289880fd2d4d2164f09fe2464a294d720";
};
- propagatedBuildInputs = with python3Packages; [
+ propagatedBuildInputs = with python.pkgs; [
etebase
etesync
flask
flask_wtf
- radicale3
+ (python.pkgs.toPythonModule (radicale3.override { python3 = python; }))
];
doCheck = false;
diff --git a/pkgs/applications/misc/pdfstudio/default.nix b/pkgs/applications/misc/pdfstudio/default.nix
index 18e8136eb7b4..c91f6f64cf74 100644
--- a/pkgs/applications/misc/pdfstudio/default.nix
+++ b/pkgs/applications/misc/pdfstudio/default.nix
@@ -4,6 +4,10 @@
, callPackage
}:
+let makeurl = { pname, year, version }: "https://download.qoppa.com/${pname}/v${year}/${
+ builtins.replaceStrings [ "pdfstudio" "viewer" "." ] [ "PDFStudio" "Viewer" "_" ] "${pname}_v${version}"
+ }_linux64.deb";
+in
{
pdfstudio = callPackage ./common.nix rec {
pname = program;
@@ -17,9 +21,7 @@
libgccjit #for libstdc++.so.6 and libgomp.so.1
];
src = fetchurl {
- url = "https://download.qoppa.com/${pname}/v${year}/PDFStudio_v${
- builtins.replaceStrings [ "." ] [ "_" ] version
- }_linux64.deb";
+ url = makeurl { inherit pname year version; };
sha256 = "1188ll2qz58rr2slavqxisbz4q3fdzidpasb1p33926z0ym3rk45";
};
};
@@ -33,9 +35,7 @@
PDF Studio Viewer is an easy to use, full-featured PDF editing software. This is the free edition. For the standard/pro edition, see the package pdfstudio.
'';
src = fetchurl {
- url = "https://download.qoppa.com/${pname}/v${year}/PDFStudioViewer_v${
- builtins.replaceStrings [ "." ] [ "_" ] version
- }_linux64.deb";
+ url = makeurl { inherit pname year version; };
sha256 = "128k3fm8m8zdykx4s30g5m2zl7cgmvs4qinf1w525zh84v56agz6";
};
};
diff --git a/pkgs/applications/networking/irc/quassel/0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch b/pkgs/applications/networking/irc/quassel/0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch
deleted file mode 100644
index 6c40dc8dd895..000000000000
--- a/pkgs/applications/networking/irc/quassel/0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From ac9387271b2420a71f7d172f44354fc35adac504 Mon Sep 17 00:00:00 2001
-From: Manuel Nickschas
-Date: Tue, 7 Jan 2020 18:34:54 +0100
-Subject: [PATCH] common: Disable enum type stream operators for Qt >= 5.14
-
-Starting from version 5.14, Qt provides stream operators for enum
-types, which collide with the ones we ship in types.h. Disable
-Quassel's stream operators when compiling against Qt 5.14 or later.
-
-(cherry-picked from 579e559a6322209df7cd51c34801fecff5fe734b)
----
- src/common/types.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/common/types.h b/src/common/types.h
-index 467d9fb2..c4b9f364 100644
---- a/src/common/types.h
-+++ b/src/common/types.h
-@@ -140,6 +140,7 @@ Q_DECLARE_METATYPE(QHostAddress)
- typedef QList MsgIdList;
- typedef QList BufferIdList;
-
-+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
- /**
- * Catch-all stream serialization operator for enum types.
- *
-@@ -169,6 +170,7 @@ QDataStream &operator>>(QDataStream &in, T &value) {
- value = static_cast(v);
- return in;
- }
-+#endif
-
- // Exceptions
-
---
-2.26.2
-
diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix
index 44e7fb853601..d218f114143f 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@@ -5,7 +5,7 @@
, static ? false # link statically
, lib, stdenv, fetchFromGitHub, cmake, makeWrapper, dconf
-, mkDerivation, qtbase, qtscript
+, mkDerivation, qtbase, boost, zlib, qtscript
, phonon, libdbusmenu, qca-qt5
, withKDE ? true # enable KDE integration
@@ -33,27 +33,21 @@ let
in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec {
pname = "quassel${tag}";
- version = "0.13.1";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "quassel";
repo = "quassel";
rev = version;
- sha256 = "0z8p7iv90yrrjbh31cyxhpr6hsynfmi23rlayn7p2f6ki5az7yc3";
+ sha256 = "sha256-eulhNcyCmy9ryietOhT2yVJeJH+MMZRbTUo2XuTy9qU=";
};
- patches = [
- # fixes build with Qt 5.14
- # source: https://github.com/quassel/quassel/pull/518/commits/8a46d983fc99204711cdff1e4c542e272fef45b9
- ./0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch
- ];
-
# Prevent ``undefined reference to `qt_version_tag''' in SSL check
NIX_CFLAGS_COMPILE = "-DQT_NO_VERSION_TAGGING=1";
nativeBuildInputs = [ cmake makeWrapper ];
- buildInputs = [ qtbase ]
- ++ lib.optionals buildCore [qtscript qca-qt5]
+ buildInputs = [ qtbase boost zlib ]
+ ++ lib.optionals buildCore [qtscript qca-qt5 ]
++ lib.optionals buildClient [libdbusmenu phonon]
++ lib.optionals (buildClient && withKDE) [
extra-cmake-modules kconfigwidgets kcoreaddons
diff --git a/pkgs/applications/science/physics/shtns/default.nix b/pkgs/applications/science/physics/shtns/default.nix
new file mode 100644
index 000000000000..a720213b3913
--- /dev/null
+++ b/pkgs/applications/science/physics/shtns/default.nix
@@ -0,0 +1,22 @@
+{ lib, stdenv, fetchgit, fftw }:
+
+stdenv.mkDerivation rec {
+ pname = "shtns";
+ version = "3.5.1";
+
+ src = fetchgit {
+ url = "https://bitbucket.org/nschaeff/shtns";
+ rev = "v${version}";
+ sha256 = "1ajrplhv7a2dvb3cn3n638281w0bzdcydvvwbg64awbjg622mdpd";
+ };
+
+ buildInputs = [ fftw ];
+
+ meta = with lib; {
+ description = "High performance library for Spherical Harmonic Transform";
+ homepage = "https://nschaeff.bitbucket.io/shtns/";
+ license = licenses.cecill21;
+ maintainers = [ maintainers.bzizou ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix
index be2c5bc3d6ec..11ef2979afe0 100644
--- a/pkgs/applications/window-managers/spectrwm/default.nix
+++ b/pkgs/applications/window-managers/spectrwm/default.nix
@@ -22,9 +22,9 @@ stdenv.mkDerivation {
xcbutilwm
];
- sourceRoot = let
+ prePatch = let
subdir = if stdenv.isDarwin then "osx" else "linux";
- in "source/${subdir}";
+ in "cd ${subdir}";
makeFlags = [ "PREFIX=${placeholder "out"}" ];
diff --git a/pkgs/development/php-packages/maxminddb/default.nix b/pkgs/development/php-packages/maxminddb/default.nix
index 852a86a7b178..141d3126836b 100644
--- a/pkgs/development/php-packages/maxminddb/default.nix
+++ b/pkgs/development/php-packages/maxminddb/default.nix
@@ -13,8 +13,11 @@ buildPecl {
sha256 = "sha256-Dw1+pYJmZ3U2+rgSOEkx4a6HB8FebSr7YZodOjSipjI=";
};
+ prePatch = ''
+ cd ext
+ '';
+
buildInputs = [ libmaxminddb ];
- sourceRoot = "source/ext";
meta = with lib; {
description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader";
diff --git a/pkgs/development/tools/confluent-cli/default.nix b/pkgs/development/tools/confluent-cli/default.nix
new file mode 100644
index 000000000000..9664a75703a2
--- /dev/null
+++ b/pkgs/development/tools/confluent-cli/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, autoPatchelfHook, fetchurl, lib }:
+
+stdenv.mkDerivation rec {
+ pname = "confluent-cli";
+ version = "2.4.0";
+
+ # To get the latest version:
+ # curl -L https://cnfl.io/cli | sh -s -- -l | grep -v latest | sort -V | tail -n1
+ src = fetchurl (if stdenv.hostPlatform.isDarwin then {
+ url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${version}/confluent_v${version}_darwin_amd64.tar.gz";
+ sha256 = "1xkf7p9cn37k8j57cgbzxhqgnmchf86jyiza91bf6ddvm6jsm2gd";
+ } else {
+ url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${version}/confluent_v${version}_linux_amd64.tar.gz";
+ sha256 = "1wvy7x56cc7imycf0d83mxcqzdvv56cc0zbp913xgghjn9dl2z7a";
+ });
+
+ nativeBuildInputs = [ autoPatchelfHook ];
+
+ dontStrip = stdenv.isDarwin;
+
+ installPhase = ''
+ mkdir -p $out/{bin,share/doc/confluent-cli}
+ cp confluent $out/bin/
+ cp LICENSE $out/share/doc/confluent-cli/
+ cp -r legal $out/share/doc/confluent-cli/
+ '';
+
+ meta = with lib; {
+ description = "Confluent CLI";
+ homepage = "https://docs.confluent.io/confluent-cli/current/overview.html";
+ license = licenses.unfree;
+ maintainers = with maintainers; [ rguevara84 ];
+
+ # TODO: There's support for i686 systems but I do not have any such system
+ # to build it locally on, it's also unfree so I cannot rely on ofborg to
+ # build it. Get the list of supported system by looking at the list of
+ # files in the S3 bucket:
+ #
+ # https://s3-us-west-2.amazonaws.com/confluent.cloud?prefix=confluent-cli/archives/1.25.0/&delimiter=/%27
+ platforms = [ "x86_64-linux" "x86_64-darwin" ];
+ };
+}
diff --git a/pkgs/misc/emulators/wxmupen64plus/default.nix b/pkgs/misc/emulators/wxmupen64plus/default.nix
deleted file mode 100644
index c09a83b92ea8..000000000000
--- a/pkgs/misc/emulators/wxmupen64plus/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib, stdenv, fetchurl, python2, wxGTK29, mupen64plus, SDL, libX11, libGLU, libGL
-, wafHook }:
-
-stdenv.mkDerivation rec {
- pname = "wxmupen64plus";
- version = "0.3";
-
- src = fetchurl {
- url = "https://bitbucket.org/auria/wxmupen64plus/get/${version}.tar.bz2";
- sha256 = "1mnxi4k011dd300k35li2p6x4wccwi6im21qz8dkznnz397ps67c";
- };
-
- nativeBuildInputs = [ wafHook ];
- buildInputs = [ python2 wxGTK29 SDL libX11 libGLU libGL ];
-
- preConfigure = ''
- tar xf ${mupen64plus.src}
- APIDIR=$(eval echo `pwd`/mupen64plus*/source/mupen64plus-core/src/api)
- export CXXFLAGS="-I${libX11.dev}/include/X11 -DLIBDIR=\\\"${mupen64plus}/lib/\\\""
- export LDFLAGS="-lwx_gtk2u_adv-2.9"
-
- wafConfigureFlagsArray+=("--mupenapi=$APIDIR" "--wxconfig=`type -P wx-config`")
- '';
-
- NIX_CFLAGS_COMPILE = "-fpermissive";
-
- meta = {
- description = "GUI for the Mupen64Plus 2.0 emulator";
- license = lib.licenses.gpl2Plus;
- homepage = "https://bitbucket.org/auria/wxmupen64plus/wiki/Home";
- };
-}
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index ce5ffb483b7d..ca6d81fa23bb 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -41,12 +41,12 @@ final: prev:
aerial-nvim = buildVimPluginFrom2Nix {
pname = "aerial.nvim";
- version = "2022-01-26";
+ version = "2022-01-29";
src = fetchFromGitHub {
owner = "stevearc";
repo = "aerial.nvim";
- rev = "95916d1b5f171eb44faf54bb414f48856ec96aa6";
- sha256 = "14a4h0h6g8rkglhn3f77s3bil63y1vz1qnd03026r8bhzcdbqn3j";
+ rev = "98a33857ac1baf1b1fc656a3ca5b0318cf03c3d5";
+ sha256 = "1zzl1zs4qrcjw3fskszqj62s59jggm7hbkchxkf92fqsgck323mx";
};
meta.homepage = "https://github.com/stevearc/aerial.nvim/";
};
@@ -233,12 +233,12 @@ final: prev:
auto-session = buildVimPluginFrom2Nix {
pname = "auto-session";
- version = "2022-01-15";
+ version = "2022-01-30";
src = fetchFromGitHub {
owner = "rmagatti";
repo = "auto-session";
- rev = "486e23f024a21c952758726497244e27aa3b9f0e";
- sha256 = "1sxg9gr329zlccm8xh8zv3n26s72mikqh4aik5l1hdx663afqc0d";
+ rev = "5860ae9369c86332ec45b38ab8308b9a4afb272c";
+ sha256 = "0klwbjgxqddw5apqzrx9fsqk25xy6nbaplx4fw68x6z0c63dbvsa";
};
meta.homepage = "https://github.com/rmagatti/auto-session/";
};
@@ -413,12 +413,12 @@ final: prev:
bufexplorer = buildVimPluginFrom2Nix {
pname = "bufexplorer";
- version = "2022-01-06";
+ version = "2022-01-28";
src = fetchFromGitHub {
owner = "jlanzarotta";
repo = "bufexplorer";
- rev = "4d46f80734a1f6854942f78fcbf2163b959b8ab0";
- sha256 = "1hzbxpz3yz3z7fxj7imd4l3aznrxcx1fnhf39gg2xqzk8j1yspwx";
+ rev = "b3a24722bea9029b4c37eb0547b87152d514c66f";
+ sha256 = "14114786fkqjzpl3aqsk2lmfnlhxzdkkanv6ls6q0cwvpqdng6wc";
};
meta.homepage = "https://github.com/jlanzarotta/bufexplorer/";
};
@@ -497,12 +497,12 @@ final: prev:
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
- version = "2022-01-27";
+ version = "2022-01-31";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
- rev = "723d926f75680badc6cb95ba69668324833be8a3";
- sha256 = "19wxzny2xha79ajjqwya5c20nlpmn584g97i0j9y83fvcx1bljs6";
+ rev = "53778b6820ef3e1b38d923c75183253caa4ffd90";
+ sha256 = "1zd0x10d5frmaxgr58crldf98j48lnj5jgzd05myjni2bmaniqyn";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@@ -917,12 +917,12 @@ final: prev:
coc-nvim = buildVimPluginFrom2Nix {
pname = "coc.nvim";
- version = "2022-01-25";
+ version = "2022-01-31";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
- rev = "873b5942be70bb00541b995d501ac7c96ae5b185";
- sha256 = "181drp1dyrprfv7ljprmyh1mn1nqdqw4c2lb4kna5qh9bfg6051i";
+ rev = "679b32cee056b49fbf81b9fd543ce13b2c5e03e7";
+ sha256 = "15kk2ggspq9sdwaym1r46x0pkr2hvv58mxkwxpjdkcyhmhcnp3z5";
};
meta.homepage = "https://github.com/neoclide/coc.nvim/";
};
@@ -990,12 +990,12 @@ final: prev:
comment-nvim = buildVimPluginFrom2Nix {
pname = "comment.nvim";
- version = "2022-01-26";
+ version = "2022-01-29";
src = fetchFromGitHub {
owner = "numtostr";
repo = "comment.nvim";
- rev = "7365bfe9fc6dc004cc97b8977aa8129999d81bf5";
- sha256 = "160pd7d2n66p3nxjp80sm6qhxlcmsg6nlv79ssyi9sxh1z27qm0l";
+ rev = "22e71071d9473996563464fde19b108e5504f892";
+ sha256 = "0arjg84z2lly1j7r0fwj4kdl23f6w51ckjzqll463fmr4jx387ir";
};
meta.homepage = "https://github.com/numtostr/comment.nvim/";
};
@@ -1182,24 +1182,24 @@ final: prev:
coq_nvim = buildVimPluginFrom2Nix {
pname = "coq_nvim";
- version = "2022-01-27";
+ version = "2022-01-31";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq_nvim";
- rev = "120fcb4231fb8f9852a7c366c183b300ffcf5aef";
- sha256 = "0b29qdgwglj84m4brpn3ic6pdky3xhjnw3mgb97slb7vqkpq450y";
+ rev = "c254d54bf073c1875817a227fcccd502b7774b08";
+ sha256 = "1rrfav3ffxyhl2fa9ygdn8y5y99nxbmcvxy4zskiaarjbv9n88jb";
};
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
};
Coqtail = buildVimPluginFrom2Nix {
pname = "Coqtail";
- version = "2022-01-25";
+ version = "2022-01-27";
src = fetchFromGitHub {
owner = "whonore";
repo = "Coqtail";
- rev = "9d386079d0fb5598598a3bbbe62cfba96e764ce2";
- sha256 = "0rg97cqp91cj6czhs6fjk5xw1ydxazvm3dqn01n7l2bngbx44b0j";
+ rev = "106f292c4f9e60044d86497096831c48039921de";
+ sha256 = "0kxj9l0pby79zpm050wmqv4hv4wsgm8npvsb5flpsba1ws850vq6";
};
meta.homepage = "https://github.com/whonore/Coqtail/";
};
@@ -1362,12 +1362,12 @@ final: prev:
defx-nvim = buildVimPluginFrom2Nix {
pname = "defx.nvim";
- version = "2022-01-03";
+ version = "2022-01-30";
src = fetchFromGitHub {
owner = "Shougo";
repo = "defx.nvim";
- rev = "10fa80481a9489be1ad38ceff84e357a5a4c416b";
- sha256 = "10nqgha8p25n79sgi5arw79pr59q6wldm6s8c876l6al3111971n";
+ rev = "c3417f30029c384c73aeccb1084f21c14b4bae45";
+ sha256 = "0dc0w8j4fhbh86vmibi9wx146r79sv2yvsqczp28hqinwss6j68b";
};
meta.homepage = "https://github.com/Shougo/defx.nvim/";
};
@@ -1978,12 +1978,12 @@ final: prev:
fidget-nvim = buildVimPluginFrom2Nix {
pname = "fidget.nvim";
- version = "2022-01-26";
+ version = "2022-01-31";
src = fetchFromGitHub {
owner = "j-hui";
repo = "fidget.nvim";
- rev = "66c5ba6ea5f9da9e6a9ef0da07ab594768d5bd39";
- sha256 = "0065rw25rw4r7bnh80z6bis543zynk961w28dqz7pp1x3i4h9lmg";
+ rev = "2e91adf6667f1cafa9d0be51594fa3366534923f";
+ sha256 = "0rp820akrmj83csgajdlabh4y5xh2aiv8kiz7lma32pb0rmcm2lf";
};
meta.homepage = "https://github.com/j-hui/fidget.nvim/";
};
@@ -2183,12 +2183,12 @@ final: prev:
fzf-vim = buildVimPluginFrom2Nix {
pname = "fzf.vim";
- version = "2022-01-24";
+ version = "2022-01-30";
src = fetchFromGitHub {
owner = "junegunn";
repo = "fzf.vim";
- rev = "91332acb1c48e7080539c5b5cd131816341c738c";
- sha256 = "0s8695m25v2j5hpp80g3hd28g7ja17yxih5cd71jqmqvl3zwmqrg";
+ rev = "70541d2ee0bfd8998ef0f252bb93b660cf94fe14";
+ sha256 = "0sd3qg58nc0b5ydk2j8ypx707i405n4axm7f7h8ndj33bx2rapl1";
};
meta.homepage = "https://github.com/junegunn/fzf.vim/";
};
@@ -2267,12 +2267,12 @@ final: prev:
git-blame-nvim = buildVimPluginFrom2Nix {
pname = "git-blame.nvim";
- version = "2022-01-26";
+ version = "2022-01-29";
src = fetchFromGitHub {
owner = "f-person";
repo = "git-blame.nvim";
- rev = "d1412ddfadc845f6a98789d7583b2bd428bae14f";
- sha256 = "0r4c2a0fv8y5r97yg37p2v7v1ab6hvwrq5knn2ya29b1am6zzhi3";
+ rev = "e605e848885b184aa6af451fce20f68126dc1180";
+ sha256 = "19nr21mzw9bfzb2snji6idckvbahybpbsqdjlfk0a1hymvp8q9vr";
};
meta.homepage = "https://github.com/f-person/git-blame.nvim/";
};
@@ -2315,24 +2315,24 @@ final: prev:
gitlinker-nvim = buildVimPluginFrom2Nix {
pname = "gitlinker.nvim";
- version = "2022-01-10";
+ version = "2022-01-29";
src = fetchFromGitHub {
owner = "ruifm";
repo = "gitlinker.nvim";
- rev = "e83ebb3465fb224df394477a0d68a61094d3f7b9";
- sha256 = "0442yi5j1fdzh2wmyn59z9mzyzsja0j0dkialj4gzlsglg6ndbai";
+ rev = "ff33d07bb64e104b387fff7d91650a35274f81ea";
+ sha256 = "1sxhcbww0f780lp0zda1iaiyp89c6cirs0ncihjxr106a47zpya4";
};
meta.homepage = "https://github.com/ruifm/gitlinker.nvim/";
};
gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns.nvim";
- version = "2022-01-26";
+ version = "2022-01-29";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
- rev = "4a2d30f5fb77750c7a42be9bb58a9cc2c6c7f31d";
- sha256 = "0w105nggv6k2b22hkhlh7j19fp6gra70i3skaq1gihhh0x0h5pav";
+ rev = "2fa3716bc4690da96d885becdf9988603f0756f0";
+ sha256 = "12mdyrzw1aqjdcsqq6jfgd0sldi0hvdz24d64jxymyfz8z3xksam";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@@ -2483,12 +2483,12 @@ final: prev:
gruvbox-nvim = buildVimPluginFrom2Nix {
pname = "gruvbox.nvim";
- version = "2022-01-10";
+ version = "2022-01-27";
src = fetchFromGitHub {
owner = "ellisonleao";
repo = "gruvbox.nvim";
- rev = "ba2a3592174c19d6f3231d06723606f6ca33fc23";
- sha256 = "0qcc0f4lky8if91faw6923sdpgvr67nsfgfb1mqmhriwvq02l46y";
+ rev = "d4d0c6e66c1f4d5bdc0cb216c882d88d223a4187";
+ sha256 = "0s12sxhpk59r8a12df0zbhbmj6djffqmh1pw2fhw392zrb1549m8";
};
meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/";
};
@@ -2591,12 +2591,12 @@ final: prev:
hoon-vim = buildVimPluginFrom2Nix {
pname = "hoon.vim";
- version = "2020-11-09";
+ version = "2022-01-29";
src = fetchFromGitHub {
owner = "urbit";
repo = "hoon.vim";
- rev = "91b1922f8627bb0a55341bb088f2526d0f43a6ac";
- sha256 = "0h87r7r74iljwvfc6mb1maa08cxwnk6k89gc6vnwqm1zx6qxw1js";
+ rev = "f287adb9ce5f99a2a8b806833ab1582ba162aab0";
+ sha256 = "0nlmcz79qcmrkfji5mdc66p1pxrz5i68m50013fr66zqcccnynjk";
};
meta.homepage = "https://github.com/urbit/hoon.vim/";
};
@@ -2831,12 +2831,12 @@ final: prev:
jedi-vim = buildVimPluginFrom2Nix {
pname = "jedi-vim";
- version = "2022-01-17";
+ version = "2022-01-30";
src = fetchFromGitHub {
owner = "davidhalter";
repo = "jedi-vim";
- rev = "08ad42efed82dbb7547fdebe2acc194f50e07854";
- sha256 = "16acd976d44whpkl5bypskpf15a6mjf72pijjbg6j0jjnd2mm9qw";
+ rev = "32d05f7742dfb0ef84bee99e059ac3b7cb9526eb";
+ sha256 = "19z9i07w3wgf939fiy6kh7mq5pvlay3w37sm0sv4bmrdi42p8b4z";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/davidhalter/jedi-vim/";
@@ -3036,12 +3036,12 @@ final: prev:
lean-nvim = buildVimPluginFrom2Nix {
pname = "lean.nvim";
- version = "2022-01-24";
+ version = "2022-01-31";
src = fetchFromGitHub {
owner = "Julian";
repo = "lean.nvim";
- rev = "4d613c6aea73be9b8882d5710b11f502ef8692db";
- sha256 = "16lcr9bbiq33agd9p1cwrrxmzsj3xmva1lva8ay4zrm1v2v45jn5";
+ rev = "08edf8f60d9d6fea83e9ef434ff04c30e579a2e0";
+ sha256 = "1xl80n1nxi0yq2hszr47apikhgf9skxldf4c9a6v78cj9wqk4dvz";
};
meta.homepage = "https://github.com/Julian/lean.nvim/";
};
@@ -3180,12 +3180,12 @@ final: prev:
lightspeed-nvim = buildVimPluginFrom2Nix {
pname = "lightspeed.nvim";
- version = "2022-01-21";
+ version = "2022-01-31";
src = fetchFromGitHub {
owner = "ggandor";
repo = "lightspeed.nvim";
- rev = "428051b2e5212cea914510eb9eb979ec06d5b2e1";
- sha256 = "01s3v3jfmgyrmwkifnyfh0wlm1d5fdvfvya0564y76bj4sh2lpzw";
+ rev = "ca8691dfd5127a4b9dfc79214b71ae31b125cdbe";
+ sha256 = "0w2f0jf1ljdj97bxy7pyyfhrav55j612cr6d2kqinx6bqd0cy3p4";
};
meta.homepage = "https://github.com/ggandor/lightspeed.nvim/";
};
@@ -3276,12 +3276,12 @@ final: prev:
litee-nvim = buildVimPluginFrom2Nix {
pname = "litee.nvim";
- version = "2022-01-19";
+ version = "2022-01-27";
src = fetchFromGitHub {
owner = "ldelossa";
repo = "litee.nvim";
- rev = "54b3bcfd70250b5a5dc1d51d0f3653a4e6892555";
- sha256 = "0z4y7iis1fkm76ibkfln70fasywwrlrf25r3si6ns0s3wq9q849v";
+ rev = "d29557a4024358cf028b706d91e3a95bd8180784";
+ sha256 = "0d16jms75nm2phx4hyvqlr3fbjadllgznd5dsy53cjf0gnybd6h2";
};
meta.homepage = "https://github.com/ldelossa/litee.nvim/";
};
@@ -3347,12 +3347,12 @@ final: prev:
lsp_signature-nvim = buildVimPluginFrom2Nix {
pname = "lsp_signature.nvim";
- version = "2022-01-23";
+ version = "2022-01-30";
src = fetchFromGitHub {
owner = "ray-x";
repo = "lsp_signature.nvim";
- rev = "64eb5cc8961e54b2888d363bb94d551203080b45";
- sha256 = "0v3dza9mp351715i87x75zxkm0d5i7v77a5zq8c8mlhz1v31z0vx";
+ rev = "30c7cf023782f50cfa8f65d0508163d6ebfd2442";
+ sha256 = "1qnzy258giqxkhmbvfv8fph5k3f2r313mj0rqsans2v8bq6ay6g0";
};
meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
};
@@ -3371,14 +3371,14 @@ final: prev:
lspsaga-nvim = buildVimPluginFrom2Nix {
pname = "lspsaga.nvim";
- version = "2021-04-25";
+ version = "2022-01-19";
src = fetchFromGitHub {
- owner = "glepnir";
+ owner = "tami5";
repo = "lspsaga.nvim";
- rev = "cb0e35d2e594ff7a9c408d2e382945d56336c040";
- sha256 = "0ywhdgh6aqs0xlm8a4d9jhkik254ywagang12r5nyqxawjsmjnib";
+ rev = "9968d7378a4bb3c13445bb6fd7937f3e757bfa0d";
+ sha256 = "04p138pkix3h02710r1812r0c1lkzga6pj35k0c7yic0p040ba35";
};
- meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
+ meta.homepage = "https://github.com/tami5/lspsaga.nvim/";
};
lua-dev-nvim = buildVimPluginFrom2Nix {
@@ -3407,24 +3407,24 @@ final: prev:
lualine-nvim = buildVimPluginFrom2Nix {
pname = "lualine.nvim";
- version = "2022-01-24";
+ version = "2022-01-31";
src = fetchFromGitHub {
owner = "nvim-lualine";
repo = "lualine.nvim";
- rev = "9208bae98fd5d1ab6145868a8c48bfee53c1a499";
- sha256 = "1dz4kg3l79d128jgqs6cs8ikvr108z46ijv36wq7pw3dam4ybnaw";
+ rev = "dc31077bc517ac15a828102a386108e320c226d3";
+ sha256 = "1f1inhvpfy7qk8azjg6psv53g92fx5br4mlyydgijqiap8g7h33g";
};
meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/";
};
luasnip = buildVimPluginFrom2Nix {
pname = "luasnip";
- version = "2022-01-24";
+ version = "2022-01-28";
src = fetchFromGitHub {
owner = "l3mon4d3";
repo = "luasnip";
- rev = "59576a5cf28556a393eedfe38467e998288fc905";
- sha256 = "1bwmzvsm9d6ilq616697rwk3j29i0q3nzwdyapjyxdyhp9rivgsj";
+ rev = "35322c97b041542f95c85e87a8215892ea4137d5";
+ sha256 = "0b6yxjsahy4ap6p9jvz2jvqg6akd8hkhd42pfz3krnwg85m7waiw";
};
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
};
@@ -3443,12 +3443,12 @@ final: prev:
lush-nvim = buildVimPluginFrom2Nix {
pname = "lush.nvim";
- version = "2021-11-06";
+ version = "2022-01-27";
src = fetchFromGitHub {
owner = "rktjmp";
repo = "lush.nvim";
- rev = "57e9f310b7ddde27664c3e1a5ec3517df235124b";
- sha256 = "0y38id1dj15snx79sazh0kvs2c3jb1h6kyzr90zhm0130m7x6nri";
+ rev = "776c9381cfd80ead5c9388d59f3bc5b486e3b97d";
+ sha256 = "1bda2q28aryp7pxcsnvmqzbcw0sl6sz2mnii4vd0v4iprfkf779y";
};
meta.homepage = "https://github.com/rktjmp/lush.nvim/";
};
@@ -3539,24 +3539,24 @@ final: prev:
mini-nvim = buildVimPluginFrom2Nix {
pname = "mini.nvim";
- version = "2022-01-23";
+ version = "2022-01-30";
src = fetchFromGitHub {
owner = "echasnovski";
repo = "mini.nvim";
- rev = "a89d87667eec94915121d8f5caf199f63f9ff81d";
- sha256 = "0l6k5djgvhkl7y86g7wmaxs0yq5nv0g6aa46kjjc81lvycj9qg3m";
+ rev = "87e480118aef3429dc8eaff8eadfa41ffeba5fbd";
+ sha256 = "1hzmj42bz5lyyi1imm1pj4vk0dxin27qky4wyn5jcqdw7iyfr95a";
};
meta.homepage = "https://github.com/echasnovski/mini.nvim/";
};
minimap-vim = buildVimPluginFrom2Nix {
pname = "minimap.vim";
- version = "2022-01-12";
+ version = "2022-01-31";
src = fetchFromGitHub {
owner = "wfxr";
repo = "minimap.vim";
- rev = "e5707899509be893a530d44b9bed8cff4cda65e1";
- sha256 = "0kx5xdakwv9g8fhhc40rz2c0as5pjx46ymdw09bc5h1nnhwkgp8x";
+ rev = "c8ea2a5550b95b007631bc83908c48a3368eb57c";
+ sha256 = "08amdbn4xcdl7d09w3iqgrlyfmqnxlwmnild9q5mpqh5z372y6i0";
};
meta.homepage = "https://github.com/wfxr/minimap.vim/";
};
@@ -3971,12 +3971,12 @@ final: prev:
neorg = buildVimPluginFrom2Nix {
pname = "neorg";
- version = "2022-01-26";
+ version = "2022-01-31";
src = fetchFromGitHub {
owner = "nvim-neorg";
repo = "neorg";
- rev = "c5f9957b00aa54cc66bcccb686e586859d44b484";
- sha256 = "1ml0zrrij6a1f42q35wv7ml36yngc9gszzq1nqqh7mdad5zszxk5";
+ rev = "1e4cd7d7d0bd641173a3ef38a5427257acecbb63";
+ sha256 = "06p86l8l7akl8j4c20pg7sw12g944nwwdh0k9hwg99dkcisrnjyp";
};
meta.homepage = "https://github.com/nvim-neorg/neorg/";
};
@@ -4043,12 +4043,12 @@ final: prev:
neovim-ayu = buildVimPluginFrom2Nix {
pname = "neovim-ayu";
- version = "2022-01-21";
+ version = "2022-01-30";
src = fetchFromGitHub {
owner = "Shatur";
repo = "neovim-ayu";
- rev = "0bca6a4382e7cc5e26da8dce49e7f69abfb0e998";
- sha256 = "0pfrmzcs4vkxg74hzrp8g4kwb33m1r503c0b1yq25z33scqwc6hp";
+ rev = "1fff44e04d137c143af8f555963c90533ef9ae89";
+ sha256 = "1zffm9zmai82v3fnclp2nds3yiab0893kssyg0a2xyqp70xrh2hr";
};
meta.homepage = "https://github.com/Shatur/neovim-ayu/";
};
@@ -4223,24 +4223,24 @@ final: prev:
nord-nvim = buildVimPluginFrom2Nix {
pname = "nord.nvim";
- version = "2022-01-25";
+ version = "2022-01-31";
src = fetchFromGitHub {
owner = "shaunsingh";
repo = "nord.nvim";
- rev = "5fdd8f273145f493c05eeff3d46c7538aea9f126";
- sha256 = "0fj7w8ckp8949ysxnkq9h136pkd9ddqj54rzdb2dnia59wl2i2s1";
+ rev = "498b99c87a5826bfe4409883831deab91ebe296f";
+ sha256 = "1bhbk87wrjyk8mvg9aqspag58sz9chhrxvkhblpy2qypgla0s9pk";
};
meta.homepage = "https://github.com/shaunsingh/nord.nvim/";
};
nordic-nvim = buildVimPluginFrom2Nix {
pname = "nordic.nvim";
- version = "2022-01-27";
+ version = "2022-01-29";
src = fetchFromGitHub {
owner = "andersevenrud";
repo = "nordic.nvim";
- rev = "a7cf7e887454b86a45243bfc3e8dbd4aa73007ba";
- sha256 = "0ri0m0l8kv78ddkf9rgh4dn2857swrnsp6lnx6svpipi38cwz3w1";
+ rev = "6d0ccdb4d7e54b7ff29a626378f3c258b237d7db";
+ sha256 = "1ijanw0jpwc18wfrh5mnb981a9zrwr4r67w3sq40lb68v8vzmgnp";
};
meta.homepage = "https://github.com/andersevenrud/nordic.nvim/";
};
@@ -4271,12 +4271,12 @@ final: prev:
nui-nvim = buildVimPluginFrom2Nix {
pname = "nui.nvim";
- version = "2022-01-23";
+ version = "2022-01-30";
src = fetchFromGitHub {
owner = "MunifTanjim";
repo = "nui.nvim";
- rev = "0d603c19171fb2e127bc128e9229d48340a6beeb";
- sha256 = "1d6j3syv86afj0cpfqy8jcwj8pxm53wa1xjl76f1j5h7y6ba1237";
+ rev = "6f803e88093573f73d4ee6c0dfe0575df3f97a9f";
+ sha256 = "05napd3gqhdpb2x07affs50bm8prb3rzz0w5a39iyr40y96bpjix";
};
meta.homepage = "https://github.com/MunifTanjim/nui.nvim/";
};
@@ -4287,8 +4287,8 @@ final: prev:
src = fetchFromGitHub {
owner = "jose-elias-alvarez";
repo = "null-ls.nvim";
- rev = "59067dae4bf2367eb06326e419c23353722ecbec";
- sha256 = "0337mwsvd1jjjyvfg6xnmmadjw199i35wc0aiycv22kfdn7y4ybw";
+ rev = "2ae4a5e2e2b35716c44c104ef1afa35ecb40c444";
+ sha256 = "1y1vn3cr1q3wkgjabjb14pb8gwc4xy2rvka2s0a2mfv6a4f5v4z7";
};
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
};
@@ -4343,24 +4343,24 @@ final: prev:
nvim-base16 = buildVimPluginFrom2Nix {
pname = "nvim-base16";
- version = "2022-01-16";
+ version = "2022-01-29";
src = fetchFromGitHub {
owner = "RRethy";
repo = "nvim-base16";
- rev = "3720bdf0d651bb579ab0f24f889246862fdf8b00";
- sha256 = "0x9agiyh5zjsa462bw3xqx2vnmax8qpidwd7w72zjig0hmhy34hs";
+ rev = "60ba8c6cac20af497f5444084993cd42f83576b4";
+ sha256 = "0ag2vh3j4wlwkdjwb9017nwmqqa78181rr0csjvh22x8x91mv5mi";
};
meta.homepage = "https://github.com/RRethy/nvim-base16/";
};
nvim-bqf = buildVimPluginFrom2Nix {
pname = "nvim-bqf";
- version = "2022-01-20";
+ version = "2022-01-31";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-bqf";
- rev = "88ad98547aee3ac7c026c9e3654532e62cc7f1b3";
- sha256 = "0mcwzp7g631cg40gn8zy5rblqdwwrdrzgp3byaws47cgsmldb3w1";
+ rev = "a289c8fcb9f56a9df638b396a7c037997ab59a9d";
+ sha256 = "1d8ri9xzbryz4zi5fsl9s31racp7qs2mgih10p25rwyv6ai8sn58";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
};
@@ -4391,12 +4391,12 @@ final: prev:
nvim-cmp = buildVimPluginFrom2Nix {
pname = "nvim-cmp";
- version = "2022-01-25";
+ version = "2022-01-31";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-cmp";
- rev = "d93104244c3834fbd8f3dd01da9729920e0b5fe7";
- sha256 = "1gn4m5ppqbhk3y5ad98kkgc72ms5xdgx6jdz3176dkd8ah6lnpf0";
+ rev = "d6838996da8dc9fe4697632d2abf34086ebab427";
+ sha256 = "1wzskfwz2hjjvyix8lfjzqjml66lypg8fg2fhqgn4rbr85p9lr7m";
};
meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
};
@@ -4595,24 +4595,24 @@ final: prev:
nvim-hs-vim = buildVimPluginFrom2Nix {
pname = "nvim-hs.vim";
- version = "2020-08-29";
+ version = "2022-01-30";
src = fetchFromGitHub {
owner = "neovimhaskell";
repo = "nvim-hs.vim";
- rev = "30baacd3c7a10625cb2d4dd64ae3bbfc4fe3f8c6";
- sha256 = "1w6cr6j77nwxszm1d0y4phvjsz9q4aw214xkscw6izakfmk06h1x";
+ rev = "d4a6b7278ae6a1fdc64e300c3ebc1e24719af342";
+ sha256 = "0a4sc2ff67xdqy5wj1j384vrsbnvhcd15mmwv7yygd7rccc2wsxs";
};
meta.homepage = "https://github.com/neovimhaskell/nvim-hs.vim/";
};
nvim-jdtls = buildVimPluginFrom2Nix {
pname = "nvim-jdtls";
- version = "2022-01-13";
+ version = "2022-01-27";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-jdtls";
- rev = "2cceff656f2bfac38da784f2cd4b202a64a2faf3";
- sha256 = "13sx0rwz53rf8yg4ndc4m9fgvxa2xs46y92yn8rbgrjgf4xv18xi";
+ rev = "e2a80d5f51c326d6623979d614dd7968ef752061";
+ sha256 = "1m8sc88g8sk41m4ml62zn7dn05q1ns8xr20c7bldqaz9rwqbhqny";
};
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
};
@@ -4667,24 +4667,24 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
- version = "2022-01-24";
+ version = "2022-01-28";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
- rev = "c51096481dc13193991571b7132740d762902355";
- sha256 = "02gpqp2r6f6zz3mfbxhsg2hvs00yldkz5wn3snk8nyqllm13i3dm";
+ rev = "e7df7ecae0b0d2f997ea65e951ddbe98ca3e154b";
+ sha256 = "03nqjv7zy87k4k8q8a6zknywdsvbb3xm7sxfgc5zhi8z4ymk17nr";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
nvim-lsputils = buildVimPluginFrom2Nix {
pname = "nvim-lsputils";
- version = "2021-09-28";
+ version = "2022-01-29";
src = fetchFromGitHub {
owner = "RishabhRD";
repo = "nvim-lsputils";
- rev = "aaaf8c12771e905e5abf68470d8bda3e80536a0d";
- sha256 = "1iag2ynp2yba5xaw4z0hnp9q6hfcrvjmkhl4js9hqhhsrm42c2vh";
+ rev = "ae1a4a62449863ad82c70713d5b6108f3a07917c";
+ sha256 = "0xl3crhgkzmas8zdcycgk11am3wx0az4jh7fh5n4lsjip8895p4s";
};
meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/";
};
@@ -4727,12 +4727,12 @@ final: prev:
nvim-notify = buildVimPluginFrom2Nix {
pname = "nvim-notify";
- version = "2021-12-30";
+ version = "2022-01-30";
src = fetchFromGitHub {
owner = "rcarriga";
repo = "nvim-notify";
- rev = "15f52efacd169ea26b0f4070451d3ea53f98cd5a";
- sha256 = "1ixdckbmz6c54mm3mhkvh59ahfg5wc3h0ybnrp64d0bzsi3jngjh";
+ rev = "477b00f89bf863905c601210188eecf9677fa081";
+ sha256 = "11hh1yjl2pm8hkx8pb45fvhaqncbsl57wypx95fbg07yh2mzca0g";
};
meta.homepage = "https://github.com/rcarriga/nvim-notify/";
};
@@ -4775,12 +4775,12 @@ final: prev:
nvim-spectre = buildVimPluginFrom2Nix {
pname = "nvim-spectre";
- version = "2022-01-06";
+ version = "2022-01-30";
src = fetchFromGitHub {
owner = "nvim-pack";
repo = "nvim-spectre";
- rev = "4a4cf2c981b077055ef7725959d13007e366ba23";
- sha256 = "1aa062r2p69kn2xr9d2mbbrs8qdlv0q86lah2q9h6jhzxfi5ccdp";
+ rev = "9842b5fe987fb2c5a4ec4d42f8dbcdd04a047d4d";
+ sha256 = "12ww1yqxsk6qm6cimgr0ljgc98n831dpm711q4xqg9c6wm0pyzg7";
};
meta.homepage = "https://github.com/nvim-pack/nvim-spectre/";
};
@@ -4799,24 +4799,24 @@ final: prev:
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree.lua";
- version = "2022-01-21";
+ version = "2022-01-31";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-tree.lua";
- rev = "2dfed89af7724f9e71d2fdbe3cde791a93e9b9e0";
- sha256 = "1842c6s3q8hd8cnnyniwjxkkl48zzdy7v2gx20fiacnf365vgzpc";
+ rev = "0bc8258529e620b3c9d38bf5e88158ea24c85350";
+ sha256 = "1js0xg1w372xzihhs10zsrbgrgg47nx2pi6lrv9n5x9iiqigj2s3";
};
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
- version = "2022-01-25";
+ version = "2022-01-31";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
- rev = "620cc936ad6b26c59bb2d888b3890bb8d06c50c7";
- sha256 = "0f2lg3dwcfvgjal1b87sgf6kvqs16h3a90w4994hp0ps9imipsp8";
+ rev = "05c963602b66f087cb15f39035d8b31d8225bb55";
+ sha256 = "1g9abw015mfpaazms48b12q1ksiszf0hj1hyc146hjqyp2bybf3w";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@@ -4895,12 +4895,12 @@ final: prev:
nvim-ts-rainbow = buildVimPluginFrom2Nix {
pname = "nvim-ts-rainbow";
- version = "2022-01-24";
+ version = "2022-01-30";
src = fetchFromGitHub {
owner = "p00f";
repo = "nvim-ts-rainbow";
- rev = "38eb126412723fa4c3bfd137c1a3a811faf67eb5";
- sha256 = "13igbd268z0533bsrz0r8s69lbryh0h4w33cpywmacghxy672jjl";
+ rev = "ac5032edc1d3e9216d081d130a14d4fcaf6cd3b3";
+ sha256 = "1cqh19pwhfr0sqcajp1fwrk6sm1n6apy859890d9k52n9ir21zj2";
};
meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
};
@@ -4943,12 +4943,12 @@ final: prev:
nvim_context_vt = buildVimPluginFrom2Nix {
pname = "nvim_context_vt";
- version = "2022-01-22";
+ version = "2022-01-28";
src = fetchFromGitHub {
owner = "haringsrob";
repo = "nvim_context_vt";
- rev = "47afb03249e36cd740bda79907c0f279f4e28544";
- sha256 = "18pbdp7ci5gb7i0als4rgcr151rbm8j3mc0pxc9h4x9cvxdl8x5f";
+ rev = "b3d7072ab3a6db02ad173204b4420c1bbc46c2df";
+ sha256 = "0rxm91qa41hs8w5sc7yibn2n7zhqxfkvnildx6bpig054r21pa91";
};
meta.homepage = "https://github.com/haringsrob/nvim_context_vt/";
};
@@ -4991,12 +4991,12 @@ final: prev:
octo-nvim = buildVimPluginFrom2Nix {
pname = "octo.nvim";
- version = "2022-01-23";
+ version = "2022-01-29";
src = fetchFromGitHub {
owner = "pwntester";
repo = "octo.nvim";
- rev = "33224362e20e1b3e87eb7ef2d669de6c60e727db";
- sha256 = "0z163sfxly71bypskxnph9rwqamgp3h01i24va9n41wbbfvr0pw3";
+ rev = "3f1c6b93df0d927999dc7a243b0dd684d09f9d3e";
+ sha256 = "1sf7vqy0p6ssp6n9v91icvp1pm0yd0qki19icgpiqjsxya0qivca";
};
meta.homepage = "https://github.com/pwntester/octo.nvim/";
};
@@ -5087,12 +5087,12 @@ final: prev:
orgmode = buildVimPluginFrom2Nix {
pname = "orgmode";
- version = "2022-01-19";
+ version = "2022-01-27";
src = fetchFromGitHub {
owner = "nvim-orgmode";
repo = "orgmode";
- rev = "27c4083e29702c8b4fa5e314926ae054eb4c0dc2";
- sha256 = "0vl95ywln1njxi7593gf2jp8y12fi6mwz3xmc8v6vd012vj4lbnk";
+ rev = "f339a7f87e4736c0a3e0db563b8c3cb45fc00a61";
+ sha256 = "1raicj3h524csqivw9x3l6znx5y7dwfn3cmh2hzddfy0n7n1mph0";
};
meta.homepage = "https://github.com/nvim-orgmode/orgmode/";
};
@@ -5207,12 +5207,12 @@ final: prev:
plantuml-syntax = buildVimPluginFrom2Nix {
pname = "plantuml-syntax";
- version = "2021-12-25";
+ version = "2022-01-29";
src = fetchFromGitHub {
owner = "aklt";
repo = "plantuml-syntax";
- rev = "dbe57599bc340d7726938b624438779fa0ec2929";
- sha256 = "095j1an00187ampxklwd6hhy05xzz7ssjwkgdsv06ydx7a1kn8xk";
+ rev = "32428a7b7bc1f1f4efe54490c212a7bda5dd073c";
+ sha256 = "06jxfr484wa563hs5qj2g4i37a6mfdvdjdn7a72dmbqzismvzd48";
};
meta.homepage = "https://github.com/aklt/plantuml-syntax/";
};
@@ -5231,12 +5231,12 @@ final: prev:
plenary-nvim = buildVimPluginFrom2Nix {
pname = "plenary.nvim";
- version = "2022-01-05";
+ version = "2022-01-31";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "plenary.nvim";
- rev = "563d9f6d083f0514548f2ac4ad1888326d0a1c66";
- sha256 = "1i4sj56fral52xa2wqzx331a6xza4ksi0n6092g6q93kxx202xwq";
+ rev = "e86dc9b11241ff69ece50c15a5cdd49d20d4c27c";
+ sha256 = "1yfiqkvk71i68hha2xdikfmch9qkn0di9gl14x4b9snvcf6l9plh";
};
meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
};
@@ -5364,12 +5364,12 @@ final: prev:
python-mode = buildVimPluginFrom2Nix {
pname = "python-mode";
- version = "2022-01-19";
+ version = "2022-01-28";
src = fetchFromGitHub {
owner = "python-mode";
repo = "python-mode";
- rev = "6d81349723fdb6a7ce03b27afa8ea88819f3c0d5";
- sha256 = "1cpmjg8867qmir79pd1zay63ihp2jzd8f1igxq2954q354bk08br";
+ rev = "85d2cd1a196ac1def79d4599b5be69395ed5b603";
+ sha256 = "0jk8pssliyar4qs42x9m1jgri446cr4yc7iv8l9wc9xn6r3qnm29";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/python-mode/python-mode/";
@@ -5401,12 +5401,12 @@ final: prev:
quick-scope = buildVimPluginFrom2Nix {
pname = "quick-scope";
- version = "2021-12-28";
+ version = "2022-01-29";
src = fetchFromGitHub {
owner = "unblevable";
repo = "quick-scope";
- rev = "4371a23bbb3b687e49c42a2a4379d17fc5c6a9a3";
- sha256 = "0f625gmrs8zk622b1a8hhdxwx3c7hnxxznr98aqbxik6924rmr8g";
+ rev = "5e2373e36d774e1cebd58b318346db32c52db21a";
+ sha256 = "1dqygvc1gr35niqqdqivz5vgqpca9yj68incq3z73rl9qya96pvx";
};
meta.homepage = "https://github.com/unblevable/quick-scope/";
};
@@ -5545,12 +5545,12 @@ final: prev:
registers-nvim = buildVimPluginFrom2Nix {
pname = "registers.nvim";
- version = "2022-01-03";
+ version = "2022-01-31";
src = fetchFromGitHub {
owner = "tversteeg";
repo = "registers.nvim";
- rev = "3a8b22157ad5b68380ee1b751bd87edbd6d46471";
- sha256 = "07adb9rrcy4vr0bhjn4h8r1si0xq31gdpwr4l9lypfr23b2pdm10";
+ rev = "941a36e99bccc48fa9569a03b02ec95fb9c5222c";
+ sha256 = "0w0n3210c3j2jpvx0jf718in5hkj7vczv9n1qnls2f46ljwl1f5a";
};
meta.homepage = "https://github.com/tversteeg/registers.nvim/";
};
@@ -5713,12 +5713,12 @@ final: prev:
SchemaStore-nvim = buildVimPluginFrom2Nix {
pname = "SchemaStore.nvim";
- version = "2022-01-26";
+ version = "2022-01-30";
src = fetchFromGitHub {
owner = "b0o";
repo = "SchemaStore.nvim";
- rev = "6c831123b78a352216adb640d34bebe355b7df15";
- sha256 = "016r63vkyb2dpc6nvnky7ypv351893pyr5d1b11wpv53s0hr5z4y";
+ rev = "fd5423e0c9c6c27812070be4a2ec4a75d9e7778c";
+ sha256 = "16v8y6f40qx0n7gic3czhchch76yfrf3wp5ff10ij99sdsby84yc";
};
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
};
@@ -6159,12 +6159,12 @@ final: prev:
surround-nvim = buildVimPluginFrom2Nix {
pname = "surround.nvim";
- version = "2022-01-23";
+ version = "2022-01-28";
src = fetchFromGitHub {
owner = "blackCauldron7";
repo = "surround.nvim";
- rev = "b0105011437ab148261b5c4ed6b84c735c54cd61";
- sha256 = "1bs0ba29pfxvvz8j5qpam6mxch4b40idlpq7l39rsanrxyxl81yf";
+ rev = "3d5ae1ecd8a29a513895d5bd34723623702a03b0";
+ sha256 = "0rvj4l5hrr63alcg9dkr618xh8bvh2w6cinaxwdp0zx6a0ml2iv5";
};
meta.homepage = "https://github.com/blackCauldron7/surround.nvim/";
};
@@ -6183,12 +6183,12 @@ final: prev:
swift-vim = buildVimPluginFrom2Nix {
pname = "swift.vim";
- version = "2021-09-10";
+ version = "2022-01-28";
src = fetchFromGitHub {
owner = "keith";
repo = "swift.vim";
- rev = "3278cf3b0522e6f08eaf11275fedce619beffe9a";
- sha256 = "0hhi49iwkgzxhdixj0jbc4mbgad1irb056ijf7l5022r4k4gs2n8";
+ rev = "478e11812f3ddb1778918bd243d8b27c9984ab26";
+ sha256 = "15kqlbp1spkbkrgaa9dwp7dbdppncq059cps1qljpqp49qmgay2l";
};
meta.homepage = "https://github.com/keith/swift.vim/";
};
@@ -6546,12 +6546,12 @@ final: prev:
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope.nvim";
- version = "2022-01-18";
+ version = "2022-01-31";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
- rev = "0011b1148d3975600f5a9f0be8058cdaac4e30d9";
- sha256 = "129cha5pwr1blnkyvkl59ildap0zdvk2khajmvd79fkcncgffvfi";
+ rev = "f262e7d56d37625613c5de0df5a933cccacf13c5";
+ sha256 = "0gi31w0rpd14zmnnc883hji7vf8hi1njdprhm9lk3n6pslipgfmv";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@@ -6606,12 +6606,12 @@ final: prev:
thesaurus_query-vim = buildVimPluginFrom2Nix {
pname = "thesaurus_query.vim";
- version = "2021-07-08";
+ version = "2022-01-30";
src = fetchFromGitHub {
owner = "ron89";
repo = "thesaurus_query.vim";
- rev = "65e67a2dc3290d1fbed59db2a3f58944a73e7251";
- sha256 = "1hak0ncsq43j0vblcgy9y4ylx2lazhij71sm3471cgini42klmgp";
+ rev = "23d8aa3f7d1a785e31e760e1b6b3b4c18abf8332";
+ sha256 = "0mh87m2jimblmdkfw5hr07li3zh2zmvgp23izc79k1i41v4yffsi";
};
meta.homepage = "https://github.com/ron89/thesaurus_query.vim/";
};
@@ -7555,12 +7555,12 @@ final: prev:
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
- version = "2022-01-26";
+ version = "2022-01-31";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
- rev = "5ce5ea352432acfe8e9a15ee86dfe623e28b96f6";
- sha256 = "1yh0iqcq6v5gj9bm2ni58bh69cy4y6ihlmp8x49lsr2jv9x4hck9";
+ rev = "4525903a95f3c3831d521a67eae6d8dcb0a58b58";
+ sha256 = "0c8r385zbadyqxwbpjh6r0ghys23mawv23arkpr1d2srj4dwaij4";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@@ -8455,12 +8455,12 @@ final: prev:
vim-gitgutter = buildVimPluginFrom2Nix {
pname = "vim-gitgutter";
- version = "2021-09-07";
+ version = "2022-01-29";
src = fetchFromGitHub {
owner = "airblade";
repo = "vim-gitgutter";
- rev = "256702dd1432894b3607d3de6cd660863b331818";
- sha256 = "0zpa7cs59a8sq0k3frlf9flpf30jcn239yrpmv40r7nqvxzglbpl";
+ rev = "a02369403b8331b295f66a494d5d2ecf0e656b2f";
+ sha256 = "0g1wdpap96n9by7gli9s5w1k2s2bm9s5vrgv4j4ak0rzlgyhl1i3";
};
meta.homepage = "https://github.com/airblade/vim-gitgutter/";
};
@@ -8503,12 +8503,12 @@ final: prev:
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
- version = "2022-01-20";
+ version = "2022-01-28";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
- rev = "8dfedede1c6e27e4339411b1071fee6a40663f11";
- sha256 = "0micmffcbw70bbxcx03isrf4b4s6plz3drfjbbls7dvalws0z5pa";
+ rev = "430bc227654abc3eb5e27a9052a857344ca08cdc";
+ sha256 = "0wh3g0lilzi4rjlszjf5gys11zpqvyv53hy5gyjd72k0kkbfbc2k";
};
meta.homepage = "https://github.com/fatih/vim-go/";
};
@@ -9273,12 +9273,12 @@ final: prev:
vim-manpager = buildVimPluginFrom2Nix {
pname = "vim-manpager";
- version = "2020-10-28";
+ version = "2022-01-28";
src = fetchFromGitHub {
owner = "lambdalisue";
repo = "vim-manpager";
- rev = "c23c02dd79b0a5cabe140d1f10f9aa2591cf55ed";
- sha256 = "0g61qbp4vl010isigp6j3jjb3vb2kxalcbb56xzfa6c9k5zap5j9";
+ rev = "194607a8d1bd122ad811ef601eb04a3df7786d59";
+ sha256 = "0qnm4k0frki3p9fpb6h4xnv1dxijk9aqcd7glq28c216gh395a5d";
};
meta.homepage = "https://github.com/lambdalisue/vim-manpager/";
};
@@ -9297,12 +9297,12 @@ final: prev:
vim-markdown = buildVimPluginFrom2Nix {
pname = "vim-markdown";
- version = "2022-01-24";
+ version = "2022-01-29";
src = fetchFromGitHub {
owner = "preservim";
repo = "vim-markdown";
- rev = "9156bba66350d4c0c32b4ac783550c3e132d6a88";
- sha256 = "0ghlswpc0qdxidc38y9xy22293nf0hjxqwvln71gzmxjlxj3rdgk";
+ rev = "50d42082819cfa91745b6eff6e28ad5cbc8b27fa";
+ sha256 = "1582y2cyqywbgf4pg8m5m2s0nd6wwgnm1nxy5kmrfcn1119hn639";
};
meta.homepage = "https://github.com/preservim/vim-markdown/";
};
@@ -9454,12 +9454,12 @@ final: prev:
vim-mundo = buildVimPluginFrom2Nix {
pname = "vim-mundo";
- version = "2021-11-09";
+ version = "2022-01-30";
src = fetchFromGitHub {
owner = "simnalamburt";
repo = "vim-mundo";
- rev = "e193f185bad3aa58446e771f8f2739abf11d3262";
- sha256 = "1q2j88rcg0slvm2bfdri4fy42h5a2md9bbqsspb3kzx5yrhgawhp";
+ rev = "595ee332719f397c2441d85f79608113957cc78f";
+ sha256 = "0kwiw877izpjqfj4gp4km8ivj6iy2c2jxyiqgxrvjqna62kic0ap";
};
meta.homepage = "https://github.com/simnalamburt/vim-mundo/";
};
@@ -10258,12 +10258,12 @@ final: prev:
vim-sandwich = buildVimPluginFrom2Nix {
pname = "vim-sandwich";
- version = "2022-01-18";
+ version = "2022-01-30";
src = fetchFromGitHub {
owner = "machakann";
repo = "vim-sandwich";
- rev = "6ab5f16a56f5b2361ba17a41d8644631d2b43647";
- sha256 = "1z36b9vdl8zr1r08jm43p2qys598lbxplbjdqmywkx5y78dm4hhr";
+ rev = "48acdaded60c6b75fce06a0d61183ee99950c0ec";
+ sha256 = "0rijq9xwm3n84vpjzyvcpy6r58y6ma2pxj61h86122wda5ymwxwg";
};
meta.homepage = "https://github.com/machakann/vim-sandwich/";
};
@@ -10654,12 +10654,12 @@ final: prev:
vim-surround = buildVimPluginFrom2Nix {
pname = "vim-surround";
- version = "2021-10-12";
+ version = "2022-01-30";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-surround";
- rev = "aeb933272e72617f7c4d35e1f003be16836b948d";
- sha256 = "1b0bd5m5lv1p4d299mrwjfs2gk0zqwyaqdaid9hs9yqlxnr8s5nf";
+ rev = "baf89ad26488f6a7665d51b986f5c7ad2d22b30b";
+ sha256 = "0kzp1g2zw2an0z7bb8h4xs8jf17z0mnn0zf6v1wkipvz6nvp7di8";
};
meta.homepage = "https://github.com/tpope/vim-surround/";
};
@@ -10931,12 +10931,12 @@ final: prev:
vim-tpipeline = buildVimPluginFrom2Nix {
pname = "vim-tpipeline";
- version = "2022-01-24";
+ version = "2022-01-30";
src = fetchFromGitHub {
owner = "vimpostor";
repo = "vim-tpipeline";
- rev = "72b956f668237a4cd9b020b2c173d013699b38b5";
- sha256 = "1f0kkxclpa9x3qc81yzagl1qili13ihbicb6d84pnpycy482k0sj";
+ rev = "400e17c7af65ab194f968a1edac4bcae08fb48f2";
+ sha256 = "0s22bkh77avklapn5lr7pm36zaxn656pf4dwxx6lc5xdj3p2qd7y";
};
meta.homepage = "https://github.com/vimpostor/vim-tpipeline/";
};
@@ -10991,12 +10991,12 @@ final: prev:
vim-ultest = buildVimPluginFrom2Nix {
pname = "vim-ultest";
- version = "2022-01-21";
+ version = "2022-01-30";
src = fetchFromGitHub {
owner = "rcarriga";
repo = "vim-ultest";
- rev = "00da9eacaf4396bdc11817f987c35e5d09486eb4";
- sha256 = "1r5zdwm20110mzwawxik563l4bw5zxhrpdsn0cgq04icp5gbbxrc";
+ rev = "616bbca2e5d0a97edadb441df56bc21598e59a1a";
+ sha256 = "1a3ms0b6kvv70l7fd4wxc7lgnqj97c5ad9a1mk2bqcd3xh3yq6ki";
};
meta.homepage = "https://github.com/rcarriga/vim-ultest/";
};
@@ -11123,12 +11123,12 @@ final: prev:
vim-wakatime = buildVimPluginFrom2Nix {
pname = "vim-wakatime";
- version = "2022-01-27";
+ version = "2022-01-31";
src = fetchFromGitHub {
owner = "wakatime";
repo = "vim-wakatime";
- rev = "6fd8b9401af0597cfe8f05550d0194d057fce9c7";
- sha256 = "1j3d0fl449a539azm1ldralmijnc8qgn6c703k4qg2kzdkvpaa48";
+ rev = "b6754ace510ffa931bceb47df417a9ef3a87cb6b";
+ sha256 = "13dfaf6y0yfnbnxl43fc0jwqv45gigki4iyhb4698fhmcy105jv6";
};
meta.homepage = "https://github.com/wakatime/vim-wakatime/";
};
@@ -11291,12 +11291,12 @@ final: prev:
vimade = buildVimPluginFrom2Nix {
pname = "vimade";
- version = "2022-01-12";
+ version = "2022-01-31";
src = fetchFromGitHub {
owner = "TaDaa";
repo = "vimade";
- rev = "fd3d3eb4bf6e5bdb643353f9d4bdae70faa16768";
- sha256 = "046w99vqk0lmxiwnsw57yvz6xgs64wmqwfm3iymxygqz828c8n3s";
+ rev = "b0ce0820240e72a330bd388caa48baf434f1a0e3";
+ sha256 = "1yknp4fjdwkc5sfw8f6rkhffa1k7lz3pa9q62v9ifj27a0gykwsd";
};
meta.homepage = "https://github.com/TaDaa/vimade/";
};
@@ -11424,12 +11424,12 @@ final: prev:
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
- version = "2022-01-25";
+ version = "2022-01-31";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
- rev = "5659e6ac5ffc3ae43bd401d78b3a62653a28b750";
- sha256 = "1nqq10isng6fdkxbn5bjy8c54i00h85m3m13sm0j94lzcia7qxqr";
+ rev = "54bcb0407f8ff24a1cface0e91759940b81ae04e";
+ sha256 = "1n2k6jq01znx5501fdwdzbxxlzhyng5zv9j5k2hiijqkv9rm1487";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
@@ -11726,12 +11726,12 @@ final: prev:
zig-vim = buildVimPluginFrom2Nix {
pname = "zig.vim";
- version = "2022-01-17";
+ version = "2022-01-28";
src = fetchFromGitHub {
owner = "ziglang";
repo = "zig.vim";
- rev = "29ceb12298015dfb59a6e06706c9005f76153238";
- sha256 = "1i5h6lk0ikwhda4h368m4nn0shb6xciaqhxpag109l9xijgm3yap";
+ rev = "0762d89c24f5a1da6bf26ca83f3719c379008ff9";
+ sha256 = "00vfyi79m85d8pv0cnhyj82nqlnwiqs5pkzbr9yn8mvy6r0hscf3";
};
meta.homepage = "https://github.com/ziglang/zig.vim/";
};
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 948a39f271ca..b376b7fe1aef 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -796,7 +796,7 @@ self: super: {
libiconv
];
- cargoSha256 = "sha256-4VXXQjGmGGQXgfzSOvFnQS+iQjidj0FjaNKZ3VzBqw0=";
+ cargoSha256 = "sha256-y4yQ8Zv9bpfOyQrBX/TAuVYHhDsXdj0rh8nHJonxgcU=";
};
in
''
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 587c93be4f7d..3ea491e5fbe6 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -203,7 +203,6 @@ github/copilot.vim
gleam-lang/gleam.vim
glepnir/dashboard-nvim
glepnir/galaxyline.nvim
-glepnir/lspsaga.nvim
glepnir/oceanic-material
glepnir/zephyr-nvim
glts/vim-textobj-comment
@@ -779,6 +778,7 @@ tamago324/compe-zsh
tamago324/lir.nvim
tami5/compe-conjure
tami5/lispdocs.nvim
+tami5/lspsaga.nvim
tami5/sqlite.lua
tbastos/vim-lua
tbodt/deoplete-tabnine
diff --git a/pkgs/os-specific/linux/numatop/default.nix b/pkgs/os-specific/linux/numatop/default.nix
index ba972bb6916a..0946d5050db4 100644
--- a/pkgs/os-specific/linux/numatop/default.nix
+++ b/pkgs/os-specific/linux/numatop/default.nix
@@ -1,17 +1,32 @@
-{ lib, stdenv, fetchurl, pkg-config, numactl, ncurses, check }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, numactl, ncurses, check }:
stdenv.mkDerivation rec {
pname = "numatop";
- version = "2.1";
- src = fetchurl {
- url = "https://github.com/intel/${pname}/releases/download/v${version}/${pname}-v${version}.tar.xz";
- sha256 = "1s7psq1xyswj0lpx10zg5lnppav2xy9safkfx3rssrs9c2fp5d76";
+ version = "2.2";
+ src = fetchFromGitHub {
+ owner = "intel";
+ repo = "numatop";
+ rev = "v${version}";
+ sha256 = "sha256-GJvTwqgx34ZW10eIJj/xiKe3ZkAfs7GlJImz8jrnjfI=";
};
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ numactl ncurses ];
checkInputs = [ check ];
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/intel/numatop/pull/54.patch";
+ sha256 = "sha256-TbMLv7TT9T8wE4uJ1a/AroyPPwrwL0eX5IBLsh9GTTM=";
+ name = "fix-string-operations.patch";
+ })
+ (fetchpatch {
+ url = "https://github.com/intel/numatop/pull/64.patch";
+ sha256 = "sha256-IevbSFJRTS5iQ5apHOVXzF67f3LJaW6j7DySFmVuyiM=";
+ name = "fix-format-strings-mvwprintw.patch";
+ })
+ ];
+
doCheck = true;
meta = with lib; {
@@ -20,8 +35,8 @@ stdenv.mkDerivation rec {
license = licenses.bsd3;
maintainers = with maintainers; [ dtzWill ];
platforms = [
- { kernel.name = "linux"; cpu.family = "x86"; }
- { kernel.name = "linux"; cpu.family = "power"; }
+ "i686-linux" "x86_64-linux"
+ "powerpc64-linux" "powerpc64le-linux"
];
};
}
diff --git a/pkgs/servers/radicale/3.x.nix b/pkgs/servers/radicale/3.x.nix
index 9922b98a827b..443e54433f1c 100644
--- a/pkgs/servers/radicale/3.x.nix
+++ b/pkgs/servers/radicale/3.x.nix
@@ -2,13 +2,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "radicale";
- version = "3.1.0";
+ version = "3.1.3";
src = fetchFromGitHub {
owner = "Kozea";
repo = "Radicale";
rev = "v${version}";
- hash = "sha256-LtPv+3FQMGC2YP2+1cSPZVUIzrUhteJTl58+JdvGcQg=";
+ hash = "sha256-a1oapCktJPvNO+MTsB9COtxSFB/ZIZvJiuqX+s+lncY=";
};
postPatch = ''
@@ -36,6 +36,6 @@ python3.pkgs.buildPythonApplication rec {
homepage = "https://radicale.org/v3.html";
description = "CalDAV and CardDAV server";
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ dotlambda ];
+ maintainers = with maintainers; [ dotlambda erictapen ];
};
}
diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix
index d9c34c3fef7d..7237ba880cef 100644
--- a/pkgs/tools/audio/abcmidi/default.nix
+++ b/pkgs/tools/audio/abcmidi/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "abcMIDI";
- version = "2022.01.13";
+ version = "2022.01.28";
src = fetchzip {
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
- hash = "sha256-jXXUdPAmU6JcnqWBnzc9tfjEyLSdYxZZJh4w4iSCD1w=";
+ hash = "sha256-+g5oKUfm6vRuRQfOx0QDueYMabgScL8Mfw5GJcXQztg=";
};
meta = with lib; {
diff --git a/pkgs/tools/security/spire/default.nix b/pkgs/tools/security/spire/default.nix
index c5d33645f114..a6b3cc2259a6 100644
--- a/pkgs/tools/security/spire/default.nix
+++ b/pkgs/tools/security/spire/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "spire";
- version = "1.1.2";
+ version = "1.2.0";
outputs = [ "out" "agent" "server" ];
@@ -10,10 +10,10 @@ buildGoModule rec {
owner = "spiffe";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-MX2kbdLj72S2WBceUW/3ps34Bcsf/VArK8RN4r13wQY=";
+ sha256 = "01ph9jzh18bnidrsbnnxm3gxh0cgfllnjvf7a5haqz51lm6a9pny";
};
- vendorSha256 = "sha256-ZRcXMNKhNY3W5fV9q/V7xsnODoG6KWHrzpWte9hx/Ms=";
+ vendorSha256 = "17d845lwlbk19lsc937c22b1l0ikimhlagknm2i7mn8s8xrs57q8";
subPackages = [ "cmd/spire-agent" "cmd/spire-server" ];
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 646ad56d5d89..ab07fd2c9267 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1098,6 +1098,7 @@ mapAliases ({
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
+ wxmupen64plus = throw "wxmupen64plus was removed because the upstream disappeared."; # 2022-01-31
morituri = whipper; # added 2018-09-13
xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; # added 2021-11-19
xp-pen-g430 = pentablet-driver; # added 2020-05-03
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c867261cab6b..ae9547e72ca4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15018,6 +15018,8 @@ with pkgs;
ccloud-cli = callPackage ../development/tools/ccloud-cli { };
+ confluent-cli = callPackage ../development/tools/confluent-cli { };
+
htmlunit-driver = callPackage ../development/tools/selenium/htmlunit-driver { };
hyenae = callPackage ../tools/networking/hyenae { };
@@ -27481,6 +27483,8 @@ with pkgs;
mozjpeg = callPackage ../applications/graphics/mozjpeg { };
+ edgetx = libsForQt5.callPackage ../applications/misc/edgetx { };
+
easytag = callPackage ../applications/audio/easytag { };
mp3gain = callPackage ../applications/audio/mp3gain { };
@@ -32304,6 +32308,8 @@ with pkgs;
sherpa = callPackage ../applications/science/physics/sherpa {};
+ shtns = callPackage ../applications/science/physics/shtns { };
+
xfitter = callPackage ../applications/science/physics/xfitter {};
xflr5 = libsForQt5.callPackage ../applications/science/physics/xflr5 { };
@@ -34120,8 +34126,6 @@ with pkgs;
wraith = callPackage ../applications/networking/irc/wraith { };
- wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { };
-
wxsqlite3 = callPackage ../development/libraries/wxsqlite3 {
wxGTK = wxGTK30;
inherit (darwin.apple_sdk.frameworks) Cocoa;
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6d83cdfa0ff7..0550d0a2deb0 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -729,11 +729,20 @@ let
Appcpanminus = buildPerlPackage {
pname = "App-cpanminus";
- version = "1.7044";
+ version = "1.7045";
src = fetchurl {
- url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz";
- sha256 = "9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3";
+ url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7045.tar.gz";
+ sha256 = "1779w07zxlgfk35s24ksr7k9azd5yl8sbb48y1aaph7y4gf4lkmc";
};
+ # Use TLS endpoints for downloads and metadata by default
+ preConfigure = ''
+ substituteInPlace bin/cpanm \
+ --replace http://www.cpan.org https://www.cpan.org \
+ --replace http://backpan.perl.org https://backpan.perl.org \
+ --replace http://fastapi.metacpan.org https://fastapi.metacpan.org \
+ --replace http://cpanmetadb.plackperl.org https://cpanmetadb.plackperl.org
+ '';
+ propagatedBuildInputs = [ IOSocketSSL ];
meta = {
homepage = "https://github.com/miyagawa/cpanminus";
description = "Get, unpack, build and install modules from CPAN";