Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-05-21 18:39:32 +00:00 committed by GitHub
commit 69a17a4dac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
47 changed files with 2204 additions and 1928 deletions

View file

@ -4375,16 +4375,6 @@
githubId = 41924494;
name = "Ivar";
};
ivegotasthma = {
email = "ivegotasthma@protonmail.com";
github = "ivegotasthma";
githubId = 2437675;
name = "John Doe";
keys = [{
longkeyid = "rsa4096/09AC52AEA87817A4";
fingerprint = "4008 2A5B 56A4 79B9 83CB 95FD 09AC 52AE A878 17A4";
}];
};
ixmatus = {
email = "parnell@digitalmentat.com";
github = "ixmatus";

View file

@ -299,9 +299,8 @@ in
# Ensure essential files exist.
if [[ ! -f ${cfg.dataDir}/configs/znc.conf ]]; then
echo "No znc.conf file found in ${cfg.dataDir}. Creating one now."
cp --no-clobber ${cfg.configFile} ${cfg.dataDir}/configs/znc.conf
cp --no-preserve=ownership --no-clobber ${cfg.configFile} ${cfg.dataDir}/configs/znc.conf
chmod u+rw ${cfg.dataDir}/configs/znc.conf
chown ${cfg.user} ${cfg.dataDir}/configs/znc.conf
fi
if [[ ! -f ${cfg.dataDir}/znc.pem ]]; then

View file

@ -54,6 +54,7 @@ in
frontendUrl = lib.mkOption {
type = lib.types.str;
apply = x: if lib.hasSuffix "/" x then x else x + "/";
example = "keycloak.example.com/auth";
description = ''
The public URL used as base for all frontend requests. Should
@ -84,113 +85,128 @@ in
'';
};
certificatePrivateKeyBundle = lib.mkOption {
sslCertificate = lib.mkOption {
type = lib.types.nullOr lib.types.path;
default = null;
example = "/run/keys/ssl_cert";
description = ''
The path to a PEM formatted bundle of the private key and
certificate to use for TLS connections.
The path to a PEM formatted certificate to use for TLS/SSL
connections.
This should be a string, not a Nix path, since Nix paths are
copied into the world-readable Nix store.
'';
};
databaseType = lib.mkOption {
type = lib.types.enum [ "mysql" "postgresql" ];
default = "postgresql";
example = "mysql";
description = ''
The type of database Keycloak should connect to.
'';
};
databaseHost = lib.mkOption {
type = lib.types.str;
default = "localhost";
description = ''
Hostname of the database to connect to.
'';
};
databasePort =
let
dbPorts = {
postgresql = 5432;
mysql = 3306;
};
in
lib.mkOption {
type = lib.types.port;
default = dbPorts.${cfg.databaseType};
description = ''
Port of the database to connect to.
'';
};
databaseUseSSL = lib.mkOption {
type = lib.types.bool;
default = cfg.databaseHost != "localhost";
description = ''
Whether the database connection should be secured by SSL /
TLS.
'';
};
databaseCaCert = lib.mkOption {
sslCertificateKey = lib.mkOption {
type = lib.types.nullOr lib.types.path;
default = null;
example = "/run/keys/ssl_key";
description = ''
The SSL / TLS CA certificate that verifies the identity of the
database server.
Required when PostgreSQL is used and SSL is turned on.
For MySQL, if left at <literal>null</literal>, the default
Java keystore is used, which should suffice if the server
certificate is issued by an official CA.
'';
};
databaseCreateLocally = lib.mkOption {
type = lib.types.bool;
default = true;
description = ''
Whether a database should be automatically created on the
local host. Set this to false if you plan on provisioning a
local database yourself. This has no effect if
services.keycloak.databaseHost is customized.
'';
};
databaseUsername = lib.mkOption {
type = lib.types.str;
default = "keycloak";
description = ''
Username to use when connecting to an external or manually
provisioned database; has no effect when a local database is
automatically provisioned.
To use this with a local database, set <xref
linkend="opt-services.keycloak.databaseCreateLocally" /> to
<literal>false</literal> and create the database and user
manually. The database should be called
<literal>keycloak</literal>.
'';
};
databasePasswordFile = lib.mkOption {
type = lib.types.path;
example = "/run/keys/db_password";
description = ''
File containing the database password.
The path to a PEM formatted private key to use for TLS/SSL
connections.
This should be a string, not a Nix path, since Nix paths are
copied into the world-readable Nix store.
'';
};
database = {
type = lib.mkOption {
type = lib.types.enum [ "mysql" "postgresql" ];
default = "postgresql";
example = "mysql";
description = ''
The type of database Keycloak should connect to.
'';
};
host = lib.mkOption {
type = lib.types.str;
default = "localhost";
description = ''
Hostname of the database to connect to.
'';
};
port =
let
dbPorts = {
postgresql = 5432;
mysql = 3306;
};
in
lib.mkOption {
type = lib.types.port;
default = dbPorts.${cfg.database.type};
description = ''
Port of the database to connect to.
'';
};
useSSL = lib.mkOption {
type = lib.types.bool;
default = cfg.database.host != "localhost";
description = ''
Whether the database connection should be secured by SSL /
TLS.
'';
};
caCert = lib.mkOption {
type = lib.types.nullOr lib.types.path;
default = null;
description = ''
The SSL / TLS CA certificate that verifies the identity of the
database server.
Required when PostgreSQL is used and SSL is turned on.
For MySQL, if left at <literal>null</literal>, the default
Java keystore is used, which should suffice if the server
certificate is issued by an official CA.
'';
};
createLocally = lib.mkOption {
type = lib.types.bool;
default = true;
description = ''
Whether a database should be automatically created on the
local host. Set this to false if you plan on provisioning a
local database yourself. This has no effect if
services.keycloak.database.host is customized.
'';
};
username = lib.mkOption {
type = lib.types.str;
default = "keycloak";
description = ''
Username to use when connecting to an external or manually
provisioned database; has no effect when a local database is
automatically provisioned.
To use this with a local database, set <xref
linkend="opt-services.keycloak.database.createLocally" /> to
<literal>false</literal> and create the database and user
manually. The database should be called
<literal>keycloak</literal>.
'';
};
passwordFile = lib.mkOption {
type = lib.types.path;
example = "/run/keys/db_password";
description = ''
File containing the database password.
This should be a string, not a Nix path, since Nix paths are
copied into the world-readable Nix store.
'';
};
};
package = lib.mkOption {
type = lib.types.package;
default = pkgs.keycloak;
@ -261,12 +277,12 @@ in
config =
let
# We only want to create a database if we're actually going to connect to it.
databaseActuallyCreateLocally = cfg.databaseCreateLocally && cfg.databaseHost == "localhost";
createLocalPostgreSQL = databaseActuallyCreateLocally && cfg.databaseType == "postgresql";
createLocalMySQL = databaseActuallyCreateLocally && cfg.databaseType == "mysql";
databaseActuallyCreateLocally = cfg.database.createLocally && cfg.database.host == "localhost";
createLocalPostgreSQL = databaseActuallyCreateLocally && cfg.database.type == "postgresql";
createLocalMySQL = databaseActuallyCreateLocally && cfg.database.type == "mysql";
mySqlCaKeystore = pkgs.runCommandNoCC "mysql-ca-keystore" {} ''
${pkgs.jre}/bin/keytool -importcert -trustcacerts -alias MySQLCACert -file ${cfg.databaseCaCert} -keystore $out -storepass notsosecretpassword -noprompt
${pkgs.jre}/bin/keytool -importcert -trustcacerts -alias MySQLCACert -file ${cfg.database.caCert} -keystore $out -storepass notsosecretpassword -noprompt
'';
keycloakConfig' = builtins.foldl' lib.recursiveUpdate {
@ -282,11 +298,11 @@ in
};
"subsystem=datasources"."data-source=KeycloakDS" = {
max-pool-size = "20";
user-name = if databaseActuallyCreateLocally then "keycloak" else cfg.databaseUsername;
user-name = if databaseActuallyCreateLocally then "keycloak" else cfg.database.username;
password = "@db-password@";
};
} [
(lib.optionalAttrs (cfg.databaseType == "postgresql") {
(lib.optionalAttrs (cfg.database.type == "postgresql") {
"subsystem=datasources" = {
"jdbc-driver=postgresql" = {
driver-module-name = "org.postgresql";
@ -294,16 +310,16 @@ in
driver-xa-datasource-class-name = "org.postgresql.xa.PGXADataSource";
};
"data-source=KeycloakDS" = {
connection-url = "jdbc:postgresql://${cfg.databaseHost}:${builtins.toString cfg.databasePort}/keycloak";
connection-url = "jdbc:postgresql://${cfg.database.host}:${builtins.toString cfg.database.port}/keycloak";
driver-name = "postgresql";
"connection-properties=ssl".value = lib.boolToString cfg.databaseUseSSL;
} // (lib.optionalAttrs (cfg.databaseCaCert != null) {
"connection-properties=sslrootcert".value = cfg.databaseCaCert;
"connection-properties=ssl".value = lib.boolToString cfg.database.useSSL;
} // (lib.optionalAttrs (cfg.database.caCert != null) {
"connection-properties=sslrootcert".value = cfg.database.caCert;
"connection-properties=sslmode".value = "verify-ca";
});
};
})
(lib.optionalAttrs (cfg.databaseType == "mysql") {
(lib.optionalAttrs (cfg.database.type == "mysql") {
"subsystem=datasources" = {
"jdbc-driver=mysql" = {
driver-module-name = "com.mysql";
@ -311,22 +327,22 @@ in
driver-class-name = "com.mysql.jdbc.Driver";
};
"data-source=KeycloakDS" = {
connection-url = "jdbc:mysql://${cfg.databaseHost}:${builtins.toString cfg.databasePort}/keycloak";
connection-url = "jdbc:mysql://${cfg.database.host}:${builtins.toString cfg.database.port}/keycloak";
driver-name = "mysql";
"connection-properties=useSSL".value = lib.boolToString cfg.databaseUseSSL;
"connection-properties=requireSSL".value = lib.boolToString cfg.databaseUseSSL;
"connection-properties=verifyServerCertificate".value = lib.boolToString cfg.databaseUseSSL;
"connection-properties=useSSL".value = lib.boolToString cfg.database.useSSL;
"connection-properties=requireSSL".value = lib.boolToString cfg.database.useSSL;
"connection-properties=verifyServerCertificate".value = lib.boolToString cfg.database.useSSL;
"connection-properties=characterEncoding".value = "UTF-8";
valid-connection-checker-class-name = "org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLValidConnectionChecker";
validate-on-match = true;
exception-sorter-class-name = "org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLExceptionSorter";
} // (lib.optionalAttrs (cfg.databaseCaCert != null) {
} // (lib.optionalAttrs (cfg.database.caCert != null) {
"connection-properties=trustCertificateKeyStoreUrl".value = "file:${mySqlCaKeystore}";
"connection-properties=trustCertificateKeyStorePassword".value = "notsosecretpassword";
});
};
})
(lib.optionalAttrs (cfg.certificatePrivateKeyBundle != null) {
(lib.optionalAttrs (cfg.sslCertificate != null && cfg.sslCertificateKey != null) {
"socket-binding-group=standard-sockets"."socket-binding=https".port = cfg.httpsPort;
"core-service=management"."security-realm=UndertowRealm"."server-identity=ssl" = {
keystore-path = "/run/keycloak/ssl/certificate_private_key_bundle.p12";
@ -537,7 +553,9 @@ in
jbossCliScript = pkgs.writeText "jboss-cli-script" (mkJbossScript keycloakConfig');
keycloakConfig = pkgs.runCommandNoCC "keycloak-config" {} ''
keycloakConfig = pkgs.runCommandNoCC "keycloak-config" {
nativeBuildInputs = [ cfg.package ];
} ''
export JBOSS_BASE_DIR="$(pwd -P)";
export JBOSS_MODULEPATH="${cfg.package}/modules";
export JBOSS_LOG_DIR="$JBOSS_BASE_DIR/log";
@ -547,11 +565,11 @@ in
mkdir -p {deployments,ssl}
"${cfg.package}/bin/standalone.sh"&
standalone.sh&
attempt=1
max_attempts=30
while ! ${cfg.package}/bin/jboss-cli.sh --connect ':read-attribute(name=server-state)'; do
while ! jboss-cli.sh --connect ':read-attribute(name=server-state)'; do
if [[ "$attempt" == "$max_attempts" ]]; then
echo "ERROR: Could not connect to Keycloak after $attempt attempts! Failing.." >&2
exit 1
@ -561,7 +579,7 @@ in
(( attempt++ ))
done
${cfg.package}/bin/jboss-cli.sh --connect --file=${jbossCliScript} --echo-command
jboss-cli.sh --connect --file=${jbossCliScript} --echo-command
cp configuration/standalone.xml $out
'';
@ -570,8 +588,8 @@ in
assertions = [
{
assertion = (cfg.databaseUseSSL && cfg.databaseType == "postgresql") -> (cfg.databaseCaCert != null);
message = "A CA certificate must be specified (in 'services.keycloak.databaseCaCert') when PostgreSQL is used with SSL";
assertion = (cfg.database.useSSL && cfg.database.type == "postgresql") -> (cfg.database.caCert != null);
message = "A CA certificate must be specified (in 'services.keycloak.database.caCert') when PostgreSQL is used with SSL";
}
];
@ -581,6 +599,7 @@ in
after = [ "postgresql.service" ];
before = [ "keycloak.service" ];
bindsTo = [ "postgresql.service" ];
path = [ config.services.postgresql.package ];
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
@ -588,13 +607,15 @@ in
Group = "postgres";
};
script = ''
set -eu
set -o errexit -o pipefail -o nounset -o errtrace
shopt -s inherit_errexit
PSQL=${config.services.postgresql.package}/bin/psql
create_role="$(mktemp)"
trap 'rm -f "$create_role"' ERR EXIT
db_password="$(<'${cfg.databasePasswordFile}')"
$PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='keycloak'" | grep -q 1 || $PSQL -tAc "CREATE ROLE keycloak WITH LOGIN PASSWORD '$db_password' CREATEDB"
$PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = 'keycloak'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "keycloak" OWNER "keycloak"'
echo "CREATE ROLE keycloak WITH LOGIN PASSWORD '$(<'${cfg.database.passwordFile}')' CREATEDB" > "$create_role"
psql -tAc "SELECT 1 FROM pg_roles WHERE rolname='keycloak'" | grep -q 1 || psql -tA --file="$create_role"
psql -tAc "SELECT 1 FROM pg_database WHERE datname = 'keycloak'" | grep -q 1 || psql -tAc 'CREATE DATABASE "keycloak" OWNER "keycloak"'
'';
};
@ -602,6 +623,7 @@ in
after = [ "mysql.service" ];
before = [ "keycloak.service" ];
bindsTo = [ "mysql.service" ];
path = [ config.services.mysql.package ];
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
@ -609,13 +631,14 @@ in
Group = config.services.mysql.group;
};
script = ''
set -eu
set -o errexit -o pipefail -o nounset -o errtrace
shopt -s inherit_errexit
db_password="$(<'${cfg.databasePasswordFile}')"
db_password="$(<'${cfg.database.passwordFile}')"
( echo "CREATE USER IF NOT EXISTS 'keycloak'@'localhost' IDENTIFIED BY '$db_password';"
echo "CREATE DATABASE keycloak CHARACTER SET utf8 COLLATE utf8_unicode_ci;"
echo "GRANT ALL PRIVILEGES ON keycloak.* TO 'keycloak'@'localhost';"
) | ${config.services.mysql.package}/bin/mysql -N
) | mysql -N
'';
};
@ -634,6 +657,8 @@ in
bindsTo = databaseServices;
wantedBy = [ "multi-user.target" ];
path = with pkgs; [
cfg.package
openssl
replace-secret
];
environment = {
@ -644,14 +669,21 @@ in
serviceConfig = {
ExecStartPre = let
startPreFullPrivileges = ''
set -eu
set -o errexit -o pipefail -o nounset -o errtrace
shopt -s inherit_errexit
install -T -m 0400 -o keycloak -g keycloak '${cfg.databasePasswordFile}' /run/keycloak/secrets/db_password
'' + lib.optionalString (cfg.certificatePrivateKeyBundle != null) ''
install -T -m 0400 -o keycloak -g keycloak '${cfg.certificatePrivateKeyBundle}' /run/keycloak/secrets/ssl_cert_pk_bundle
umask u=rwx,g=,o=
install -T -m 0400 -o keycloak -g keycloak '${cfg.database.passwordFile}' /run/keycloak/secrets/db_password
'' + lib.optionalString (cfg.sslCertificate != null && cfg.sslCertificateKey != null) ''
install -T -m 0400 -o keycloak -g keycloak '${cfg.sslCertificate}' /run/keycloak/secrets/ssl_cert
install -T -m 0400 -o keycloak -g keycloak '${cfg.sslCertificateKey}' /run/keycloak/secrets/ssl_key
'';
startPre = ''
set -eu
set -o errexit -o pipefail -o nounset -o errtrace
shopt -s inherit_errexit
umask u=rwx,g=,o=
install -m 0600 ${cfg.package}/standalone/configuration/*.properties /run/keycloak/configuration
install -T -m 0600 ${keycloakConfig} /run/keycloak/configuration/standalone.xml
@ -659,13 +691,16 @@ in
replace-secret '@db-password@' '/run/keycloak/secrets/db_password' /run/keycloak/configuration/standalone.xml
export JAVA_OPTS=-Djboss.server.config.user.dir=/run/keycloak/configuration
${cfg.package}/bin/add-user-keycloak.sh -u admin -p '${cfg.initialAdminPassword}'
'' + lib.optionalString (cfg.certificatePrivateKeyBundle != null) ''
add-user-keycloak.sh -u admin -p '${cfg.initialAdminPassword}'
'' + lib.optionalString (cfg.sslCertificate != null && cfg.sslCertificateKey != null) ''
pushd /run/keycloak/ssl/
cat /run/keycloak/secrets/ssl_cert_pk_bundle <(echo) /etc/ssl/certs/ca-certificates.crt > allcerts.pem
${pkgs.openssl}/bin/openssl pkcs12 -export -in /run/keycloak/secrets/ssl_cert_pk_bundle -chain \
-name "${cfg.frontendUrl}" -out certificate_private_key_bundle.p12 \
-CAfile allcerts.pem -passout pass:notsosecretpassword
cat /run/keycloak/secrets/ssl_cert <(echo) \
/run/keycloak/secrets/ssl_key <(echo) \
/etc/ssl/certs/ca-certificates.crt \
> allcerts.pem
openssl pkcs12 -export -in /run/keycloak/secrets/ssl_cert -inkey /run/keycloak/secrets/ssl_key -chain \
-name "${cfg.frontendUrl}" -out certificate_private_key_bundle.p12 \
-CAfile allcerts.pem -passout pass:notsosecretpassword
popd
'';
in [
@ -697,4 +732,5 @@ in
};
meta.doc = ./keycloak.xml;
meta.maintainers = [ lib.maintainers.talyz ];
}

View file

@ -41,31 +41,31 @@
<productname>PostgreSQL</productname> or
<productname>MySQL</productname>. Which one is used can be
configured in <xref
linkend="opt-services.keycloak.databaseType" />. The selected
linkend="opt-services.keycloak.database.type" />. The selected
database will automatically be enabled and a database and role
created unless <xref
linkend="opt-services.keycloak.databaseHost" /> is changed from
linkend="opt-services.keycloak.database.host" /> is changed from
its default of <literal>localhost</literal> or <xref
linkend="opt-services.keycloak.databaseCreateLocally" /> is set
linkend="opt-services.keycloak.database.createLocally" /> is set
to <literal>false</literal>.
</para>
<para>
External database access can also be configured by setting
<xref linkend="opt-services.keycloak.databaseHost" />, <xref
linkend="opt-services.keycloak.databaseUsername" />, <xref
linkend="opt-services.keycloak.databaseUseSSL" /> and <xref
linkend="opt-services.keycloak.databaseCaCert" /> as
<xref linkend="opt-services.keycloak.database.host" />, <xref
linkend="opt-services.keycloak.database.username" />, <xref
linkend="opt-services.keycloak.database.useSSL" /> and <xref
linkend="opt-services.keycloak.database.caCert" /> as
appropriate. Note that you need to manually create a database
called <literal>keycloak</literal> and allow the configured
database user full access to it.
</para>
<para>
<xref linkend="opt-services.keycloak.databasePasswordFile" />
<xref linkend="opt-services.keycloak.database.passwordFile" />
must be set to the path to a file containing the password used
to log in to the database. If <xref linkend="opt-services.keycloak.databaseHost" />
and <xref linkend="opt-services.keycloak.databaseCreateLocally" />
to log in to the database. If <xref linkend="opt-services.keycloak.database.host" />
and <xref linkend="opt-services.keycloak.database.createLocally" />
are kept at their defaults, the database role
<literal>keycloak</literal> with that password is provisioned
on the local database instance.
@ -115,17 +115,17 @@
</para>
<para>
For HTTPS support, a TLS certificate and private key is
required. They should be <link
HTTPS support requires a TLS/SSL certificate and a private key,
both <link
xlink:href="https://en.wikipedia.org/wiki/Privacy-Enhanced_Mail">PEM
formatted</link> and concatenated into a single file. The path
to this file should be configured in
<xref linkend="opt-services.keycloak.certificatePrivateKeyBundle" />.
formatted</link>. Their paths should be set through <xref
linkend="opt-services.keycloak.sslCertificate" /> and <xref
linkend="opt-services.keycloak.sslCertificateKey" />.
</para>
<warning>
<para>
The path should be provided as a string, not a Nix path,
The paths should be provided as a strings, not a Nix paths,
since Nix paths are copied into the world readable Nix store.
</para>
</warning>
@ -195,8 +195,9 @@ services.keycloak = {
<link linkend="opt-services.keycloak.initialAdminPassword">initialAdminPassword</link> = "e6Wcm0RrtegMEHl"; # change on first login
<link linkend="opt-services.keycloak.frontendUrl">frontendUrl</link> = "https://keycloak.example.com/auth";
<link linkend="opt-services.keycloak.forceBackendUrlToFrontendUrl">forceBackendUrlToFrontendUrl</link> = true;
<link linkend="opt-services.keycloak.certificatePrivateKeyBundle">certificatePrivateKeyBundle</link> = "/run/keys/ssl_cert";
<link linkend="opt-services.keycloak.databasePasswordFile">databasePasswordFile</link> = "/run/keys/db_password";
<link linkend="opt-services.keycloak.sslCertificate">sslCertificate</link> = "/run/keys/ssl_cert";
<link linkend="opt-services.keycloak.sslCertificateKey">sslCertificateKey</link> = "/run/keys/ssl_key";
<link linkend="opt-services.keycloak.database.passwordFile">database.passwordFile</link> = "/run/keys/db_password";
};
</programlisting>
</para>

View file

@ -448,10 +448,10 @@ in {
join pg_namespace s on s.oid = c.relnamespace \
where s.nspname not in ('pg_catalog', 'pg_toast', 'information_schema') \
and s.nspname not like 'pg_temp%';" | sed -n 3p` -eq 0 ]; then
SAFETY_ASSURED=1 rake db:schema:load
rake db:seed
SAFETY_ASSURED=1 rails db:schema:load
rails db:seed
else
rake db:migrate
rails db:migrate
fi
'';
path = [ cfg.package pkgs.postgresql ];

View file

@ -3,7 +3,8 @@
# client using their Keycloak login.
let
frontendUrl = "http://keycloak/auth";
certs = import ./common/acme/server/snakeoil-certs.nix;
frontendUrl = "https://${certs.domain}/auth";
initialAdminPassword = "h4IhoJFnt2iQIR9";
keycloakTest = import ./make-test-python.nix (
@ -17,12 +18,27 @@ let
nodes = {
keycloak = { ... }: {
virtualisation.memorySize = 1024;
security.pki.certificateFiles = [
certs.ca.cert
];
networking.extraHosts = ''
127.0.0.1 ${certs.domain}
'';
services.keycloak = {
enable = true;
inherit frontendUrl databaseType initialAdminPassword;
databaseUsername = "bogus";
databasePasswordFile = pkgs.writeText "dbPassword" "wzf6vOCbPp6cqTH";
inherit frontendUrl initialAdminPassword;
sslCertificate = certs.${certs.domain}.cert;
sslCertificateKey = certs.${certs.domain}.key;
database = {
type = databaseType;
username = "bogus";
passwordFile = pkgs.writeText "dbPassword" "wzf6vOCbPp6cqTH";
};
};
environment.systemPackages = with pkgs; [
xmlstarlet
libtidy

View file

@ -1,8 +1,49 @@
{ lib, mkDerivation, fetchFromGitHub, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm
, qtbase, qtx11extras, qttools
, taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp
, libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf
, qca2, pkg-config, sparsehash, config, makeWrapper, gst_plugins }:
{ lib
, mkDerivation
, fetchFromGitHub
, fetchpatch
, boost
, cmake
, chromaprint
, gettext
, gst_all_1
, liblastfm
, qtbase
, qtx11extras
, qttools
, taglib
, fftw
, glew
, qjson
, sqlite
, libgpod
, libplist
, usbmuxd
, libmtp
, libpulseaudio
, gvfs
, libcdio
, libechonest
, libspotify
, pcre
, projectm
, protobuf
, qca2
, pkg-config
, sparsehash
, config
, makeWrapper
, gst_plugins
, util-linux
, libunwind
, libselinux
, elfutils
, libsepol
, orc
, alsaLib
}:
let
withIpod = config.clementine.ipod or false;
@ -22,9 +63,26 @@ let
patches = [
./clementine-spotify-blob.patch
(fetchpatch {
# "short-term" fix for execution on wayland (1.4.0rc1-131-g2179027a6)
# for https://github.com/clementine-player/Clementine/issues/6587
url = "https://github.com/clementine-player/Clementine/commit/2179027a6d97530c857e43be873baacd696ff332.patch";
sha256 = "0344bfcyvjim5ph8w4km6zkg96rj5g9ybp9x14qgyw2gkdksimn6";
})
];
nativeBuildInputs = [ cmake pkg-config makeWrapper ];
nativeBuildInputs = [
cmake
pkg-config
makeWrapper
util-linux
libunwind
libselinux
elfutils
libsepol
orc
];
buildInputs = [
boost
@ -48,11 +106,13 @@ let
qttools
sqlite
taglib
alsaLib
]
++ lib.optionals (withIpod) [libgpod libplist usbmuxd]
++ lib.optionals (withMTP) [libmtp]
++ lib.optionals (withCD) [libcdio]
++ lib.optionals (withCloud) [sparsehash];
++ lib.optionals (withIpod) [ libgpod libplist usbmuxd ]
++ lib.optionals (withMTP) [ libmtp ]
++ lib.optionals (withCD) [ libcdio ]
++ lib.optionals (withCloud) [ sparsehash ];
postPatch = ''
sed -i src/CMakeLists.txt \
@ -132,4 +192,5 @@ let
};
};
in free
in
free

View file

@ -19,20 +19,20 @@
stdenv.mkDerivation rec {
pname = "pika-backup";
version = "0.3.0";
version = "0.3.1";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "pika-backup";
rev = "v${version}";
sha256 = "sha256-k9kl6cSohWx+MB/9jyVcTgpv02gsVwAk5KDSNqQrmzI=";
sha256 = "0cr3axfp15nzwmsqyz6j781qhr2gsn9p69m0jfzy89pl83d6vcz0";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
sha256 = "0r6nbffik5j82bi82cmc00b17xv9m7xn3w3sarzwfxz0h43lal8a";
sha256 = "1z0cbrkhxyzwf7vjjsvdppb7zhflpkw4m5cy90a2315nbll3hpbp";
};
patches = [

View file

@ -6,6 +6,6 @@
callPackage ./generic.nix {
inherit buildGoPackage nvidia_x11 nvidiaGpuSupport;
version = "1.0.5";
sha256 = "06l56fi4fhplvl8v0i88q18yh1hwwd12fngnrflb91janbyk6p4l";
version = "1.0.6";
sha256 = "1nzaw4014bndxv042dkxdj492b21r5v5f06vav2kr1azk4m9sf07";
}

View file

@ -0,0 +1,11 @@
{ callPackage
, buildGoPackage
, nvidia_x11
, nvidiaGpuSupport
}:
callPackage ./generic.nix {
inherit buildGoPackage nvidia_x11 nvidiaGpuSupport;
version = "1.1.0";
sha256 = "0sz6blyxyxi5iq170s9v4nndb1hpz603z5ps2cxkdkaafal39767";
}

View file

@ -20,13 +20,13 @@
mkDerivation rec {
pname = "nextcloud-client";
version = "3.2.0";
version = "3.2.1";
src = fetchFromGitHub {
owner = "nextcloud";
repo = "desktop";
rev = "v${version}";
sha256 = "1nklsa2lx9ayjp8rk1mycjysqqmnq47djig0wygzna5mycl3ji06";
sha256 = "sha256-I31w79GDZxSGlT6YPKSpq0aiyGnJiJBVdTyWI+DUoz4=";
};
patches = [

View file

@ -1,7 +1,6 @@
{ lib
, mkDerivation
, fetchFromGitHub
, fetchpatch
, cmake
, extra-cmake-modules
, kcoreaddons
@ -12,23 +11,15 @@
mkDerivation rec {
pname = "applet-window-buttons";
version = "0.8.1";
version = "0.9.0";
src = fetchFromGitHub {
owner = "psifidotos";
repo = "applet-window-buttons";
rev = version;
sha256 = "0r1h4kbdv6pxj15w4n1w50g8zsl0jrc4808dyfygzwf87mghziyz";
sha256 = "sha256-ikgUE8GaiTpNjwrz7SbNQ3+b8KiigDgMREQ7J2b+EEs=";
};
patches = [
(fetchpatch {
name = "fix-compilation-error-with-plasma-5.21.patch";
url = "https://github.com/psifidotos/applet-window-buttons/commit/dc5ed862fa3cb943f9c0d561c864ff461156a19e.patch";
sha256 = "17bdkkmy7k402viynj2bpw281qzsn0f1w8gf98gq65wkm4sf4j6k";
})
];
nativeBuildInputs = [
cmake
extra-cmake-modules

View file

@ -22,6 +22,6 @@ buildPythonPackage rec {
description = "Python library for integration with Braintree";
homepage = "https://github.com/braintree/braintree_python";
license = licenses.mit;
maintainers = [ maintainers.ivegotasthma ];
maintainers = with maintainers; [ ];
};
}

View file

@ -39,6 +39,6 @@ buildPythonPackage rec {
description = "Python client library for Core API";
homepage = "https://github.com/core-api/python-client";
license = licenses.bsd3;
maintainers = with maintainers; [ ivegotasthma ];
maintainers = with maintainers; [ ];
};
}

View file

@ -29,6 +29,6 @@ buildPythonPackage rec {
description = "Python client library for Core Schema";
homepage = "https://github.com/ivegotasthma/python-coreschema";
license = licenses.bsd3;
maintainers = with maintainers; [ ivegotasthma ];
maintainers = with maintainers; [ ];
};
}

View file

@ -42,6 +42,6 @@ buildPythonPackage rec {
description = "Django email backends and webhooks for Mailgun";
homepage = "https://github.com/anymail/django-anymail";
license = licenses.bsd3;
maintainers = with maintainers; [ ivegotasthma ];
maintainers = with maintainers; [ ];
};
}

View file

@ -30,6 +30,6 @@ buildPythonPackage rec {
description = "Django app for handling server Cross-Origin Resource Sharing (CORS) headers";
homepage = "https://github.com/OttoYiu/django-cors-headers";
license = licenses.mit;
maintainers = [ maintainers.ivegotasthma ];
maintainers = with maintainers; [ ];
};
}

View file

@ -24,6 +24,6 @@ buildPythonPackage rec {
description = "Django app that makes registration and authentication easy";
homepage = "https://github.com/Tivix/django-rest-auth";
license = licenses.mit;
maintainers = [ maintainers.ivegotasthma ];
maintainers = with maintainers; [ ];
};
}

View file

@ -1,30 +0,0 @@
{ lib
, fetchPypi
, django
, pyjwt
, djangorestframework
, buildPythonPackage
}:
buildPythonPackage rec {
pname = "djangorestframework-jwt";
version = "1.11.0";
src = fetchPypi {
inherit pname version;
sha256 = "19rng6v1sw14mbjp5cplnrgxjnhlj8faalfw02iihi9s5w1k7zjy";
};
propagatedBuildInputs = [ pyjwt django djangorestframework ];
# ./runtests.py fails because the project must be tested against a django
# installation, there are missing database tables for User, that don't exist.
doCheck = false;
meta = with lib; {
description = "JSON Web Token Authentication support for Django REST Framework";
homepage = "https://github.com/GetBlimp/django-rest-framework-jwt";
license = licenses.mit;
maintainers = [ maintainers.ivegotasthma ];
};
}

View file

@ -0,0 +1,45 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pyjwt
, djangorestframework
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "drf-jwt";
version = "1.19.0";
src = fetchFromGitHub {
owner = "Styria-Digital";
repo = "django-rest-framework-jwt";
rev = version;
sha256 = "012rmm25w5gvkzi4lyyhn47y1n6g68q9gasga2mkv9i6mn8n4kp7";
};
propagatedBuildInputs = [
pyjwt
djangorestframework
];
# requires setting up a django instance
doCheck = false;
pythonImportsCheck = [
"rest_framework_jwt"
"rest_framework_jwt.blacklist"
# require setting DJANGO_SETTINGS_MODULE
# "rest_framework_jwt.authentication"
# "rest_framework_jwt.blacklist.views"
# "rest_framework_jwt.settings"
# "rest_framework_jwt.utils"
# "rest_framework_jwt.views"
];
meta = with lib; {
description = "JSON Web Token based authentication for Django REST framework";
homepage = "https://github.com/Styria-Digital/django-rest-framework-jwt";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

View file

@ -52,7 +52,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Generation of Swagger/OpenAPI schemas for Django REST Framework";
homepage = "https://github.com/axnsan12/drf-yasg";
maintainers = with maintainers; [ ivegotasthma ];
maintainers = with maintainers; [ ];
license = licenses.bsd3;
};
}

View file

@ -19,11 +19,11 @@
buildPythonPackage rec {
pname = "internetarchive";
version = "2.0.2";
version = "2.0.3";
src = fetchPypi {
inherit pname version;
sha256 = "515e6646a2b917c15f2241670d21f14a014b9c67dc509aef4d4aca5a59cdda65";
sha256 = "2ce0ab89fea37e5b2311bc7d163955e84f73f6beeac3942e17e9d51ad7cc9ffa";
};
propagatedBuildInputs = [

View file

@ -26,6 +26,6 @@ buildPythonPackage rec {
description = "Simple immutable types for python";
homepage = "https://github.com/tomchristie/itypes";
license = licenses.bsd3;
maintainers = with maintainers; [ ivegotasthma ];
maintainers = with maintainers; [ ];
};
}

View file

@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchFromGitLab, fetchurl }:
let
version = "13.11.0";
version = "13.12.0";
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
docker_x86_64 = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz";
sha256 = "1vmj7vxz1a4js9kqz7mm6xgnkmb37c1jbx2lwsq2qkrybkxfcw8k";
sha256 = "0m0r295520jy45wn8jw3jzhiixl4c6yrfx7gvgbd4c1v4y8ivrci";
};
docker_arm = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
sha256 = "1c1pywz7ylaysplvq1m15v7rf1sgdkh9scbqklzcm55fjk128lif";
sha256 = "0syfggplp19bbmhhpyc17h0f1dii9hc6n04q483l0xdk7sv39fwx";
};
in
buildGoPackage rec {
@ -30,7 +30,7 @@ buildGoPackage rec {
owner = "gitlab-org";
repo = "gitlab-runner";
rev = "v${version}";
sha256 = "07jqsxac50xwmhlv0nbnn098290nkpsmrxw872yh67n1s9gqfd27";
sha256 = "0jh5ghjyzr7srl3xjsklv9yskq8k88kmylpiigjir0mkbn43fgzq";
};
patches = [ ./fix-shell-path.patch ];

View file

@ -4,16 +4,16 @@ with lib;
buildGoModule rec {
pname = "kind";
version = "0.10.0";
version = "0.11.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "kubernetes-sigs";
repo = "kind";
sha256 = "1pp2x4bfqsd15siahyv9xkdyswsipmp9n86iwavrd0xhliqxlsa7";
sha256 = "020s1fr92lv9yiy5kbnrfb8n0lpslriwyh5z31aym3x44qpc6jaj";
};
vendorSha256 = "0c0j4s8kfzk2b3hy0d2g5bp1zr60l6vnwnpynsg6ksv8spwnpl5m";
vendorSha256 = "08cjvhk587f3aar4drn0hq9q1zlsnl4p7by4j38jzb4r8ix5s98y";
doCheck = false;

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "kubie";
version = "0.13.4";
version = "0.14.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "sbstp";
repo = "kubie";
sha256 = "sha256-ZD63Xtnw7qzTrzFxzzZ37N177/PnRaMEzBbhz7h/zCY=";
sha256 = "0mhm2j3i2ql7dz5vx0mwab8h8zr05ar5lfzdacgnrc293g1c01aq";
};
cargoSha256 = "sha256-WSjIN7YVX61V5nEei2iZfasIcBLjXxlZP6ZUj9nDnpo=";
cargoSha256 = "1rfqk7dmcz5zfq9fm9kvxf5718m0v0yfjm5a8718d40zzzvam7sy";
nativeBuildInputs = [ installShellFiles ];

View file

@ -1,4 +1,4 @@
{ fetchFromGitHub, nixStable, callPackage, nixFlakes, nixosTests }:
{ fetchFromGitHub, nixStable, callPackage, nixUnstable, nixosTests }:
{
hydra-unstable = callPackage ./common.nix {
@ -9,7 +9,7 @@
rev = "886e6f85e45a1f757e9b77d2a9e4539fbde29468";
sha256 = "t7Qb57Xjc0Ou+VDGC1N5u9AmeODW6MVOwKSrYRJq5f0=";
};
nix = nixFlakes;
nix = nixUnstable;
tests = {
basic = nixosTests.hydra.hydra-unstable;

View file

@ -269,12 +269,12 @@ final: prev:
barbar-nvim = buildVimPluginFrom2Nix {
pname = "barbar-nvim";
version = "2021-05-13";
version = "2021-05-19";
src = fetchFromGitHub {
owner = "romgrk";
repo = "barbar.nvim";
rev = "fa07efc01700896f1b52d11a237e16aacebac443";
sha256 = "1x10ygg0mb11imx0q9nhz02w10csa3ca0djfldk9cbx5lb8f8f95";
rev = "af49846c1422c454f98d3450282e02bf83d5f3bf";
sha256 = "17hf26d2sqywkyq0j2ckfffsshjd132n3zqgr4n6qzdpnbdd668p";
};
meta.homepage = "https://github.com/romgrk/barbar.nvim/";
};
@ -401,12 +401,12 @@ final: prev:
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
version = "2021-05-17";
version = "2021-05-21";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "3e74c75ddb096e8128d573439a779527288ac685";
sha256 = "0mkmla4y6g53nil6296irpb4zxa807cxj2jdr0fr2d4hp0y4xjci";
rev = "a54a87e651ca985b0d10e293f824f3493778b64e";
sha256 = "1cn1knxldl0qqv8p125fqa1fpn3n7cfq7lw9nfj8giaxpr8bag7f";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@ -545,12 +545,12 @@ final: prev:
coc-nvim = buildVimPluginFrom2Nix {
pname = "coc-nvim";
version = "2021-05-17";
version = "2021-05-18";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
rev = "7cfbd335ceefc0103ff3cbd39b2b4abf353f70be";
sha256 = "088ig7pc5z78zpc1l7siffdyvql9zbampx3fcxwch7xpjidas4ba";
rev = "17494990ab110b70aec3d7c97707448c6d3e72c9";
sha256 = "0krl2fn9d3kaczh124z3b1x3qkyq7vw51yim9a9v3raj6x73zynl";
};
meta.homepage = "https://github.com/neoclide/coc.nvim/";
};
@ -1184,12 +1184,12 @@ final: prev:
deoplete-nvim = buildVimPluginFrom2Nix {
pname = "deoplete-nvim";
version = "2021-05-17";
version = "2021-05-19";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete.nvim";
rev = "55e81a95a65ed896670abdb3340888db9a57e300";
sha256 = "1666wqczwi2xg4ghzdq7jsfsdbb2zrnkdgbhq0xjb3k8rs8921d4";
rev = "27be5ec45cf52223b225b25517bc088cfcf3c959";
sha256 = "0ixzly9pbgkwxghwqvpfl4smpk7875d0vwhkwcrnm1z8bhq9rypx";
};
meta.homepage = "https://github.com/Shougo/deoplete.nvim/";
};
@ -1232,12 +1232,12 @@ final: prev:
diffview-nvim = buildVimPluginFrom2Nix {
pname = "diffview-nvim";
version = "2021-05-17";
version = "2021-05-21";
src = fetchFromGitHub {
owner = "sindrets";
repo = "diffview.nvim";
rev = "daa7929d1f40485b832461fa919bd734da680e24";
sha256 = "082mym32hwfyig199pdxw64fzfc8z56f0xfnia472vvb1saspsly";
rev = "991d633b162dd3dd03f50d1fde19366ab5943cb2";
sha256 = "1n24ahzzbf66r6pjklca7ivydaxr8q03w4ib32bh8vmbk6b4x85g";
};
meta.homepage = "https://github.com/sindrets/diffview.nvim/";
};
@ -1268,12 +1268,12 @@ final: prev:
dracula-vim = buildVimPluginFrom2Nix {
pname = "dracula-vim";
version = "2021-04-23";
version = "2021-05-19";
src = fetchFromGitHub {
owner = "dracula";
repo = "vim";
rev = "d21059cd5960f4d0a5627fda82d29371772b247f";
sha256 = "0cbsiw0qkynm0glq8kidkbfxwy6lhn7rc6dvxflrrm62cl7yvw91";
rev = "c0337ceef66f87640ad02fa4e190a370a6ea6a7b";
sha256 = "1007nq0av5lw1jix0dpw6ryvym7kyzq8088fa7baavdxbs0wyr0s";
};
meta.homepage = "https://github.com/dracula/vim/";
};
@ -1292,12 +1292,12 @@ final: prev:
edge = buildVimPluginFrom2Nix {
pname = "edge";
version = "2021-05-08";
version = "2021-05-19";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "edge";
rev = "8f4cc117b703168f6c5d03ef65b36b095bb3f981";
sha256 = "0rq256pwfrxpgy9w2wx4fk9jddmb0xrifhnjkdjf3cmir8xdl7mp";
rev = "48b0c85e093a4fb9eeb00092b85ba66555e924b1";
sha256 = "0p033nxhwwk0dirdkbpcqjyv4k8sbif1m1df3xkqgydd0fj9yyp5";
};
meta.homepage = "https://github.com/sainnhe/edge/";
};
@ -1535,12 +1535,12 @@ final: prev:
friendly-snippets = buildVimPluginFrom2Nix {
pname = "friendly-snippets";
version = "2021-05-14";
version = "2021-05-20";
src = fetchFromGitHub {
owner = "rafamadriz";
repo = "friendly-snippets";
rev = "47ef802dcb1ad384990b4842b4ba54e1af89316a";
sha256 = "1mi62dyqiw32yl568p8nph74rb4n1hiimdv11ghrjca3jqasb6rk";
rev = "5ace19a332efeb9a8a026c6647c30eff9cc4a42e";
sha256 = "0bav74ax1841ar6g3m40vpm40n63z6rac0kx65838ls0b3yks2b8";
};
meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
};
@ -1811,12 +1811,12 @@ final: prev:
gruvbox-community = buildVimPluginFrom2Nix {
pname = "gruvbox-community";
version = "2021-05-02";
version = "2021-05-17";
src = fetchFromGitHub {
owner = "gruvbox-community";
repo = "gruvbox";
rev = "173f4d70115916cfb5f605c5a99e7c738dbb5e12";
sha256 = "0y509alsjky51z6yzijfjh13lmj2na16wvwayzvf5nc19ls6adxk";
rev = "51ae4557e8941943d70da36320cc80a521e2d99e";
sha256 = "0dgvd4qpzg7fn7rwvpknzi2bxzzb2g8jl9jh9byj07yll413gzqh";
};
meta.homepage = "https://github.com/gruvbox-community/gruvbox/";
};
@ -1895,12 +1895,12 @@ final: prev:
hologram-nvim = buildVimPluginFrom2Nix {
pname = "hologram-nvim";
version = "2021-05-10";
version = "2021-05-20";
src = fetchFromGitHub {
owner = "edluffy";
repo = "hologram.nvim";
rev = "975e9fbd0c154deb9c4e212490fb31cfa4257c98";
sha256 = "0xfwwmzmwj9s67jwr7bpazhbwdqpva7yzy4xsdx1l8pmaszni977";
rev = "7466e360040f14a828fe07cfa7fb6089d50f618e";
sha256 = "1gjns7dkyzl8yj0vq3103r0f6wjk1fjryz7xa8gi67rchbrxrls4";
};
meta.homepage = "https://github.com/edluffy/hologram.nvim/";
};
@ -2196,12 +2196,12 @@ final: prev:
julia-vim = buildVimPluginFrom2Nix {
pname = "julia-vim";
version = "2021-05-10";
version = "2021-05-20";
src = fetchFromGitHub {
owner = "JuliaEditorSupport";
repo = "julia-vim";
rev = "ce59786999f4715b5c806a3a2162a1cfcf5e9cfd";
sha256 = "1c9qyx5zd7ynpm2inws7kkig1zvs6j6j2gg5kl63ngvlcsihd0qk";
rev = "2f35033a2141eea7a5a89ef8be438985781a9fcf";
sha256 = "1d7xl7i5xl4mnpx7bl9cnf23x48lc6ambhgb98phzdsb0kzjhv3n";
};
meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/";
};
@ -2292,12 +2292,12 @@ final: prev:
LeaderF = buildVimPluginFrom2Nix {
pname = "LeaderF";
version = "2021-05-17";
version = "2021-05-21";
src = fetchFromGitHub {
owner = "Yggdroot";
repo = "LeaderF";
rev = "db069b35c802df228a811b0d0a53cdc2c48e246b";
sha256 = "09hr453mwlrv1vkdxk62qd03s62c14jzrflc4276vpmmrz78p03m";
rev = "dd16432f976086603ead281db36ff9d9dcf366fc";
sha256 = "118kpi8ccpg89hp8sx932yy663jh04ml97474q8p01z5j1p4jw20";
};
meta.homepage = "https://github.com/Yggdroot/LeaderF/";
};
@ -2460,12 +2460,12 @@ final: prev:
lsp-status-nvim = buildVimPluginFrom2Nix {
pname = "lsp-status-nvim";
version = "2021-04-09";
version = "2021-05-20";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "lsp-status.nvim";
rev = "7c376c3924d4f807d6ce49450fdeaa18720349c9";
sha256 = "0lf71qxg9hs3r4nwsla085fk5jkqzppj2r57w9imz4wqzb201bd7";
rev = "54c395248539d65fddda46f7d92e3421856874c1";
sha256 = "1qfrfckdbqyav8l1g7lwpjrrwh559nm71ki74qd1xd18y1h63ny2";
};
meta.homepage = "https://github.com/nvim-lua/lsp-status.nvim/";
};
@ -2520,12 +2520,12 @@ final: prev:
lualine-nvim = buildVimPluginFrom2Nix {
pname = "lualine-nvim";
version = "2021-05-14";
version = "2021-05-20";
src = fetchFromGitHub {
owner = "hoob3rt";
repo = "lualine.nvim";
rev = "9d9ee2d60ed22a603bd92afabd38e10eb15b413b";
sha256 = "0b3mqn0w45wwdilxin1qsfxljm6rmzf984l9jgbgda4gk4a5df1p";
rev = "0411f1c830812f071ab8d6b6251662de21d5322a";
sha256 = "1p76xklayzfvi7bgj90sjcwfv2p708x59znkh6x7689ij0lcx1b5";
};
meta.homepage = "https://github.com/hoob3rt/lualine.nvim/";
};
@ -2932,8 +2932,8 @@ final: prev:
src = fetchFromGitHub {
owner = "TimUntersberger";
repo = "neogit";
rev = "4fb55d07e6a890d17ef6387ef4a08df112aff1cf";
sha256 = "1slr7rm94n29i36ny00qa8rnpzgxaswjmsmrkva09gnpsik2haqn";
rev = "4095c328558bfa5c28bbb7b53e921219c45a450f";
sha256 = "0cw7hfnrw4r25zcvr38sf6i8vjzhd4ndkj7mybyh6ykwjc646pmq";
};
meta.homepage = "https://github.com/TimUntersberger/neogit/";
};
@ -3144,12 +3144,12 @@ final: prev:
nnn-vim = buildVimPluginFrom2Nix {
pname = "nnn-vim";
version = "2021-05-17";
version = "2021-05-21";
src = fetchFromGitHub {
owner = "mcchrish";
repo = "nnn.vim";
rev = "c678c7e4e7ec5656c984708ad8823453ec425fa7";
sha256 = "0kcr51vq0z5c7fhs5pdbbba2qnfqk2hl2ksprdkjf6l8nln0g8nw";
rev = "cf62f64c8ec1e92fb8e46c23e3b89d8621551e4b";
sha256 = "0c49170891ar7439fyp1phki46pyw8iinszpyaj0gf0pwmqhsdhg";
};
meta.homepage = "https://github.com/mcchrish/nnn.vim/";
};
@ -3204,48 +3204,48 @@ final: prev:
nvim-autopairs = buildVimPluginFrom2Nix {
pname = "nvim-autopairs";
version = "2021-05-16";
version = "2021-05-21";
src = fetchFromGitHub {
owner = "windwp";
repo = "nvim-autopairs";
rev = "0da518e9ccaa78355a3d5b08b4ecd5324b918789";
sha256 = "13qdll3khcxgm32l9hqvnman3c8a1p8q34x0ry6p0yqlx2da05qx";
rev = "71d8397621d49adf28a38f362e9964a305196e92";
sha256 = "1wsfjlnn7p6pcgw03l3balvr8gp0s7qy7syvkvc9cys5ksimp9yd";
};
meta.homepage = "https://github.com/windwp/nvim-autopairs/";
};
nvim-base16 = buildVimPluginFrom2Nix {
pname = "nvim-base16";
version = "2021-05-15";
version = "2021-05-19";
src = fetchFromGitHub {
owner = "RRethy";
repo = "nvim-base16";
rev = "550e235da7edc910bc3c8018ce385a85d705bc67";
sha256 = "1qvls8hmj2pdl3kk366667hwmw01hh7fp4nynn0xvyfkbw1bcylg";
rev = "08db07ed66d819f86f1e324ee245ccdd24ed378b";
sha256 = "0vwwg9agx3j0phi6n4mjnvbwlzp4n1hb22pdhkjlyq6a89vlsjl4";
};
meta.homepage = "https://github.com/RRethy/nvim-base16/";
};
nvim-bqf = buildVimPluginFrom2Nix {
pname = "nvim-bqf";
version = "2021-05-16";
version = "2021-05-21";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-bqf";
rev = "582e913d23e7afaf8f54beafd7dd21b1aea65ddc";
sha256 = "0i18dzl6nwpk88qsdz7q155kscxgzma4p7nikszvqfy64dyxf3y7";
rev = "3754935f6c6b9eaae203fe9d4620e2d3e1a8f0ef";
sha256 = "16rf7i540mahmlb9mdk5g02ax1v5wkh3fyiy9if8zirf47ywcczd";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
};
nvim-bufferline-lua = buildVimPluginFrom2Nix {
pname = "nvim-bufferline-lua";
version = "2021-05-15";
version = "2021-05-18";
src = fetchFromGitHub {
owner = "akinsho";
repo = "nvim-bufferline.lua";
rev = "f395a14247ab5ca76254945c8ad8bb646a1c0f1c";
sha256 = "1415v2cc6g81b6hh5h6ikqbr7qyzipbmbs59jb2jqqbjr5rwffg5";
rev = "1ac26a59bd6a2e76cda57a1cbdab75380ed22dbd";
sha256 = "0f8kf513hd67vcq85lgcfvpvm1zba1xpdyhvndmd92c90sxjmw7k";
};
meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/";
};
@ -3276,12 +3276,12 @@ final: prev:
nvim-compe = buildVimPluginFrom2Nix {
pname = "nvim-compe";
version = "2021-05-06";
version = "2021-05-18";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-compe";
rev = "efe3a6614e74c5eafec89e5b256ea514c5e1ea15";
sha256 = "00n9bh8m89jrg4jqaz34c8sp7y1h5x3v06xjir465635g66vq20h";
rev = "5001cd7632b50b65f04d59af85a9dd199ea73b3a";
sha256 = "0zb6ckn02kd8i0pd6ds0zl369mrr3p9wf0abyba5pgyzl9k4vp42";
};
meta.homepage = "https://github.com/hrsh7th/nvim-compe/";
};
@ -3300,12 +3300,12 @@ final: prev:
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
version = "2021-05-10";
version = "2021-05-21";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
rev = "7c6d12132339d7ef4136dabdd316a20e9c7dd8cf";
sha256 = "1hjf67pn1brrfyl4lyqg4y7112r8p3ak85iimgb9pqgrifr3xpzm";
rev = "260d13945348966f695c46e4c711001066f47300";
sha256 = "02nkr4wz63r973myyvvfs5wmdichcxaj0iika0z4j7mh59nqzvha";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
};
@ -3348,12 +3348,12 @@ final: prev:
nvim-hlslens = buildVimPluginFrom2Nix {
pname = "nvim-hlslens";
version = "2021-05-17";
version = "2021-05-18";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-hlslens";
rev = "1f7904ed99fa94ad9009fa5ece431fb2416558ce";
sha256 = "1wdg6cbjzvfgxp5cn2pb10bkf34fxi5682x3kbk6hmlmrcipqlnv";
rev = "6ca5fc6cd9fab32039a73bba4f14d33d47e87953";
sha256 = "1fm979m1g24pk9lx34wvdm4awvr08plhxb13c55j5fq24wf00y8h";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/";
};
@ -3372,12 +3372,12 @@ final: prev:
nvim-jdtls = buildVimPluginFrom2Nix {
pname = "nvim-jdtls";
version = "2021-05-04";
version = "2021-05-21";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-jdtls";
rev = "6fa8c5a9459504c2a090c0028b27da951e35a354";
sha256 = "15zqxsjp3frdihl40r4141ml4kiydxqw4arjirzqzrsrblxavd5c";
rev = "36baba2afb7fcba25fa5c2d12421e3159e0154c1";
sha256 = "19j6ss1z07i0669gm4rhyybxv3a225yv1yknc4c4gjls5zyzx2wn";
};
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
};
@ -3396,12 +3396,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2021-05-16";
version = "2021-05-19";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "0699e6c16c37c08418339675d142af0e00ccbeaa";
sha256 = "0rdqxcrcybvdspl22xzyrvv4rqikhq2liqja0jkf2xavc42j7fxx";
rev = "d23816b7b00028375e53dba2aa30f2b56573cf54";
sha256 = "0m5fgjjks15vzqscgvl9m2di8clxizc8ky3lwlw9j8m4zy8jh8kw";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@ -3468,36 +3468,36 @@ final: prev:
nvim-toggleterm-lua = buildVimPluginFrom2Nix {
pname = "nvim-toggleterm-lua";
version = "2021-05-16";
version = "2021-05-19";
src = fetchFromGitHub {
owner = "akinsho";
repo = "nvim-toggleterm.lua";
rev = "46ffb283c490f96b31d699b766471f83da0bc0cf";
sha256 = "0pimi8hm213n17lkiyz7ib4d804grzv3pzv060nh3qagdvi5rvnx";
rev = "8c4da4a877a0eb49d40fed30c4a928f011d242de";
sha256 = "0604gdsbnwfdrqra1ch14h8x880j31jfrajydfnfqiqy9dxvsab8";
};
meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/";
};
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree-lua";
version = "2021-04-22";
version = "2021-05-21";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-tree.lua";
rev = "f39869514645b98ec30bc8826763c288b6cbdbef";
sha256 = "0z6arqc2i8745vc08hdbwsm1i4biywq65v1zdzrhs3ysx0agppq0";
rev = "d6ab59fd5acb7c71b1a10ace5a522a720460ad6e";
sha256 = "1vdg2kbmgshvz36j1x2ld92rmlqqdwbj4ji45kk90qvg2zjpq0cv";
};
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2021-05-17";
version = "2021-05-20";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "4dcc3fb4b38d4a29d175fda69a0bf35b2aa675c5";
sha256 = "08aigjgwlkxx8x4g6pr8mc04liax0mq0bw7b6781fsfsxgf17g6q";
rev = "9a3acbc48d61995d98cf073fef8b0b57b3cfb0b9";
sha256 = "1iggsissn8amhx9hp8fnya44rq5m7jnqm8mpgk4j7lgxq1zibgm4";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@ -3540,24 +3540,24 @@ final: prev:
nvim-ts-rainbow = buildVimPluginFrom2Nix {
pname = "nvim-ts-rainbow";
version = "2021-05-17";
version = "2021-05-20";
src = fetchFromGitHub {
owner = "p00f";
repo = "nvim-ts-rainbow";
rev = "5ef9c414cef1419b8576c62f1079b22315c72a04";
sha256 = "1lxg9prli5zvy5f9ld83y1fjbm7y4ifkyvq16naxjr3grhp0lg76";
rev = "0d9648af426bdfc60b1387683b43b1aca1f7c950";
sha256 = "02g0ryianwdsmfcfai73nc4l25jw5kz0zwbfhvwmcg2px6z5aif2";
};
meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
};
nvim-web-devicons = buildVimPluginFrom2Nix {
pname = "nvim-web-devicons";
version = "2021-04-16";
version = "2021-05-19";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-web-devicons";
rev = "1db27380053de0cd4aaabd236a67c52d33199f1a";
sha256 = "1qq9mk102jj5hqdkmrirccr3jkh2dgsfb3gy4wvpcp7mdcqapsqc";
rev = "da717e19678bd6ec33008cf92da05da1b8ceb87d";
sha256 = "0jvvjpbxdgch0wvgdmihkqng84rwifq74q858cvfahrx3y5y1cnw";
};
meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/";
};
@ -3684,12 +3684,12 @@ final: prev:
packer-nvim = buildVimPluginFrom2Nix {
pname = "packer-nvim";
version = "2021-05-15";
version = "2021-05-20";
src = fetchFromGitHub {
owner = "wbthomason";
repo = "packer.nvim";
rev = "af1a46466c5752b9d1953fb508d2544473f4821e";
sha256 = "01nkgvqq9v1bc729pd10ghih60d42iap6ivm7n39419rh2df9qsv";
rev = "b46aa481b9ab8ad9a152bda19b7f0cb3ffb0a85f";
sha256 = "0czmv9gwv7xhmcc5dqi47dpgshavbxgqfg58dhrd10xnif7ci12s";
};
meta.homepage = "https://github.com/wbthomason/packer.nvim/";
};
@ -3997,24 +3997,24 @@ final: prev:
Recover-vim = buildVimPluginFrom2Nix {
pname = "Recover-vim";
version = "2021-02-24";
version = "2021-05-18";
src = fetchFromGitHub {
owner = "chrisbra";
repo = "Recover.vim";
rev = "f019bb0bc15093da74ef0bd1a9356dedf13ba885";
sha256 = "1v23k4wfiazvkm9iaqw987cs69fwf230a7i15x3rv68azw63fl2b";
rev = "097b098e62d6499967e44091689c104165ad5e22";
sha256 = "12qizfs7d0xh10vzm7spcqsi53k3iqvbfp5nhb3qh3xdsavzyp0m";
};
meta.homepage = "https://github.com/chrisbra/Recover.vim/";
};
registers-nvim = buildVimPluginFrom2Nix {
pname = "registers-nvim";
version = "2021-04-13";
version = "2021-05-20";
src = fetchFromGitHub {
owner = "tversteeg";
repo = "registers.nvim";
rev = "b8ad2cd8a01dc3e4c2530820409d01b1bbd6fb95";
sha256 = "1jz41mskrrbb4w2hkxcpmnpgj93nbh2rb30mn566xkjn3zkh1r23";
rev = "250297a3bdab7572c858fa8ca1816651c8016557";
sha256 = "1zxww3abnsaw57npiqh33d3s199w2jpc797gv21ys1w9h2g98m6k";
};
meta.homepage = "https://github.com/tversteeg/registers.nvim/";
};
@ -4057,12 +4057,12 @@ final: prev:
rnvimr = buildVimPluginFrom2Nix {
pname = "rnvimr";
version = "2021-04-19";
version = "2021-05-19";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "rnvimr";
rev = "f97caeb0cf973c81e5b0be83e1f0f67bb5f28cd5";
sha256 = "1l296pzf1pz7ahq57bdgnmpsaqi0snp503dp4xlwgay9xax803mv";
rev = "dacb2ba386d982d4466aa469799376c38ddcfd2a";
sha256 = "1b8zb6k92iwmvdny5g16d5y5zl8fc235vlgvxrnipcfj4m3ch0yy";
};
meta.homepage = "https://github.com/kevinhwang91/rnvimr/";
};
@ -4309,12 +4309,12 @@ final: prev:
sonokai = buildVimPluginFrom2Nix {
pname = "sonokai";
version = "2021-05-08";
version = "2021-05-19";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "sonokai";
rev = "11c554bdb70977f508d3a3ccaf87734d7b2c2e17";
sha256 = "0xza499wjmf1v6zvc0j2s893rhvii4llk7z4rry991bc3fcbf0md";
rev = "2ab955b30545b7074aa28daae73bbc7050fc55f0";
sha256 = "0ya3xa9fq6dn2s77qg2snx68aigl9px3flaawpsa0nf8np3jl6kz";
};
meta.homepage = "https://github.com/sainnhe/sonokai/";
};
@ -4538,12 +4538,12 @@ final: prev:
syntastic = buildVimPluginFrom2Nix {
pname = "syntastic";
version = "2021-04-22";
version = "2021-05-19";
src = fetchFromGitHub {
owner = "vim-syntastic";
repo = "syntastic";
rev = "a739985ef9fbb9888bdeea2f442d0574a9db0565";
sha256 = "0ajpn3q36mvczmvs0g17n1lz0h69rvm25bjsalw83mjxwn46g1h4";
rev = "176f364f1b4acf894cdc248944f2d5506a37cc80";
sha256 = "01ylf4vjlisgls2f2gwlagg7x1yyhcr64kzdlzhcs3r8s3wdsf25";
};
meta.homepage = "https://github.com/vim-syntastic/syntastic/";
};
@ -4803,12 +4803,12 @@ final: prev:
todo-comments-nvim = buildVimPluginFrom2Nix {
pname = "todo-comments-nvim";
version = "2021-05-16";
version = "2021-05-18";
src = fetchFromGitHub {
owner = "folke";
repo = "todo-comments.nvim";
rev = "0f6a87bb04925775bb2fd68c063152512e033313";
sha256 = "1w2qgchd8r553i836pb4zjy2h23nryd5nfc905h5nxw0jaqb1f4i";
rev = "219bc7ef4439b6fa53bc9db1dd14b11221e83d7d";
sha256 = "0s2gspk994d6wg09c2042v37l8v2sd6lms9zi1nidf5fw61pz4y6";
};
meta.homepage = "https://github.com/folke/todo-comments.nvim/";
};
@ -4912,12 +4912,12 @@ final: prev:
ultisnips = buildVimPluginFrom2Nix {
pname = "ultisnips";
version = "2021-04-18";
version = "2021-05-18";
src = fetchFromGitHub {
owner = "SirVer";
repo = "ultisnips";
rev = "204b501cc8f4acd7f32ebdea262bd5772ca007a2";
sha256 = "0jdb3v8lplrl3sqrmx8j8p4pirnwc42fc01arw64rjigrh0fwm4k";
rev = "b3fd9022bdc3472dac114a8b2aa85b845189514b";
sha256 = "0yss85xy3i6gfgpwy3h42db5q5gpmv9m3s64ygfix5f24lflsi98";
};
meta.homepage = "https://github.com/SirVer/ultisnips/";
};
@ -5260,12 +5260,12 @@ final: prev:
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
version = "2021-05-09";
version = "2021-05-21";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
rev = "ab4962b83866e181b989cb550c527cbfa327942c";
sha256 = "14df2fk5psn27v3rhpxv1h7yhpkzl4rzld7i148lm02cj0qahnhq";
rev = "4a64fbfc4bdb2cf91b2b50ca3f41b852061d614e";
sha256 = "1w2hb1dcmc7z3snj6xhqi993g9njf3l6dwdzr9m4jg669n8064ss";
};
meta.homepage = "https://github.com/vim-airline/vim-airline/";
};
@ -5284,12 +5284,12 @@ final: prev:
vim-airline-themes = buildVimPluginFrom2Nix {
pname = "vim-airline-themes";
version = "2021-05-07";
version = "2021-05-18";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline-themes";
rev = "140238f65ef8168f2b046c52c6297cc596f8b347";
sha256 = "062c12db6dhi3dv83iff1b940idhipimk3hsjcp1i4c3mbxxr78p";
rev = "531bcc9e5a4cb1b1fb4dec8face230bf3d205ac7";
sha256 = "05yapm3g9rj7k69dhlm7hspakbczwwlbx1lcdydvkx639ka7j09d";
};
meta.homepage = "https://github.com/vim-airline/vim-airline-themes/";
};
@ -5536,12 +5536,12 @@ final: prev:
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
version = "2021-05-16";
version = "2021-05-21";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
rev = "f343ae73bbc678be228791d7891996db12fbee47";
sha256 = "020xbya3hk0mz658g5jwkbk2v1313v2aa5cj8sl40cgqzp0lgmm1";
rev = "1c970361e49e974f93ef606ffd504b8e0c52f9fd";
sha256 = "1nkqyk7q8lzgm8y4y62mm57s6hyvwfp7ia5p2vbfvls09z8qymk3";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@ -5752,12 +5752,12 @@ final: prev:
vim-css-color = buildVimPluginFrom2Nix {
pname = "vim-css-color";
version = "2021-05-15";
version = "2021-05-20";
src = fetchFromGitHub {
owner = "ap";
repo = "vim-css-color";
rev = "fce515d173d8d9bbf279e1fefea5eacd6be98be8";
sha256 = "0hb97jhhrqi6drzfzirg9wdyg9jprw8pzd9ahklx380w2pkvzz4n";
rev = "47bbd29fedc2c34747ba5ae3a1cdbd62fcf19267";
sha256 = "0d6qj36qdshw630g86yh5afbq7azaijypnj6ja4y6ryy8cx11q7c";
};
meta.homepage = "https://github.com/ap/vim-css-color/";
};
@ -5800,12 +5800,12 @@ final: prev:
vim-dadbod = buildVimPluginFrom2Nix {
pname = "vim-dadbod";
version = "2021-05-14";
version = "2021-05-19";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-dadbod";
rev = "fb0833459d3c329df2e861eb8cc62b60295b62af";
sha256 = "1wwk110kf8y8gcaqq1v0alhpzb90fjx849zkkr6zia45xgrzwmh2";
rev = "5198650e81e4f187ab77e1f65bea193d923bc4a1";
sha256 = "1pl6m3bqginqfsaa5kqvhang5g24lvh9wlsbbdvan9jyslqqdpq7";
};
meta.homepage = "https://github.com/tpope/vim-dadbod/";
};
@ -6292,12 +6292,12 @@ final: prev:
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
version = "2021-05-12";
version = "2021-05-18";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
rev = "0868c30cc08a4cf49b5f43e08412c671b19fa3f0";
sha256 = "06pqam0ap0pb87gr8dvwzvnx1i62g73l81jrnwl7mzzz26p3ircj";
rev = "c926aadfaf2cff0c684d305c8ff1a59378e7d7f5";
sha256 = "00w1vdjq7hlgdq25ylxp13zdjnlf7lcl9sa4qjar8883z15z2yif";
};
meta.homepage = "https://github.com/tpope/vim-fugitive/";
};
@ -6412,12 +6412,12 @@ final: prev:
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
version = "2021-05-17";
version = "2021-05-21";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
rev = "8c883d7f30c220d572177e8ff1d3945f618b492a";
sha256 = "1sjxrkbx4hba7nyysp3jpw3hlxz9vfkxj7bn0xzmgdr7s598mxxn";
rev = "92328dcface63223fc7b0a1a61377e4dcf942582";
sha256 = "1fqhif14whq8rpadx8wqmbba1rb2vwaxld2s5p87kf9kn9g12yiw";
};
meta.homepage = "https://github.com/fatih/vim-go/";
};
@ -6713,12 +6713,12 @@ final: prev:
vim-illuminate = buildVimPluginFrom2Nix {
pname = "vim-illuminate";
version = "2021-04-13";
version = "2021-05-18";
src = fetchFromGitHub {
owner = "RRethy";
repo = "vim-illuminate";
rev = "d20beb074f2de67104dda1f698cf83c920ffd78a";
sha256 = "0lll31xp6vjqrzphs6f3zkz15rwis6lavw2cibvi7hx2vfp4hds2";
rev = "20707bb5ac23536041d34f327649844e631d52bd";
sha256 = "1gm0rfhhzmb1hv4dzys4w0si9ppaanxn0v68rpjc9yn8ahws426b";
};
meta.homepage = "https://github.com/RRethy/vim-illuminate/";
};
@ -6833,12 +6833,12 @@ final: prev:
vim-javascript = buildVimPluginFrom2Nix {
pname = "vim-javascript";
version = "2021-04-02";
version = "2021-05-20";
src = fetchFromGitHub {
owner = "pangloss";
repo = "vim-javascript";
rev = "585ad542834fd3d9e47e0ef59abafd69c696c80d";
sha256 = "0y0lpx54yfmqbmvrhy95d0gp3qvrqn7ak7mdfsqlddp77gzs7qk2";
rev = "3dc959f098029fafcb9add91397cfb65184cf066";
sha256 = "0w4yw7d0rbbscvxxglw2kqbmnl4fi3p77053l1r45jyy6p442ybr";
};
meta.homepage = "https://github.com/pangloss/vim-javascript/";
};
@ -7146,12 +7146,12 @@ final: prev:
vim-maktaba = buildVimPluginFrom2Nix {
pname = "vim-maktaba";
version = "2021-04-28";
version = "2021-05-20";
src = fetchFromGitHub {
owner = "google";
repo = "vim-maktaba";
rev = "0451d1e9dd580f50b92253c546fc7d41dc95920c";
sha256 = "0xxn0bnhvamf7r1k3ha5qwy8169gzd23k4m56iai514bbbfy9lfx";
rev = "b7106d83d38116984859eaecabeb8e1d5e21ae55";
sha256 = "14xds4wfrm2ir7ljv195lxm9zkkxnwbmflzihpj6vai788za5ikc";
};
meta.homepage = "https://github.com/google/vim-maktaba/";
};
@ -7219,12 +7219,12 @@ final: prev:
vim-matchup = buildVimPluginFrom2Nix {
pname = "vim-matchup";
version = "2021-05-12";
version = "2021-05-20";
src = fetchFromGitHub {
owner = "andymass";
repo = "vim-matchup";
rev = "f30d2d2d3a60905a09b516f843c130232da10060";
sha256 = "0fj4hn481n5rg7z9hkybzpa6zv1dqc120i6112c8wasl89rg6xl5";
rev = "42e8ef032ae44c6336a7194408de5e9492aa2a07";
sha256 = "1h1bpylrriq35m4bn4w9ikxq413ack27h35jcmhp1mb1lg5b32y9";
};
meta.homepage = "https://github.com/andymass/vim-matchup/";
};
@ -7555,12 +7555,12 @@ final: prev:
vim-oscyank = buildVimPluginFrom2Nix {
pname = "vim-oscyank";
version = "2021-05-14";
version = "2021-05-21";
src = fetchFromGitHub {
owner = "ojroques";
repo = "vim-oscyank";
rev = "a2d1adf046d1ce09499fcd5d595a5376fa43bb05";
sha256 = "0a2sakpw32gdvw6nraz6m3ifnb06ir0dyryh07ck719pkn9kp000";
rev = "fc88da94f3cd85e0e44778484b678c4d144275fe";
sha256 = "0flc8lxmhv99bisxxip5f6p4196i5215f5fa86mmqs6anff5pfyr";
};
meta.homepage = "https://github.com/ojroques/vim-oscyank/";
};
@ -7903,12 +7903,12 @@ final: prev:
vim-quickrun = buildVimPluginFrom2Nix {
pname = "vim-quickrun";
version = "2021-05-16";
version = "2021-05-18";
src = fetchFromGitHub {
owner = "thinca";
repo = "vim-quickrun";
rev = "7685488adfbd2950a8ef4ecaedafef8a036f9275";
sha256 = "1jsdxm2cgd5aqir3g7jbyq17xsslc8a5xmpmlsyci5hprrhnnv2c";
rev = "759c9dd42d02c8634a044af998fd895682a0ce75";
sha256 = "0wdfya3kzk0xygk8ngg1kz1kdd3qzfxld3w0bq3pxsns41838a8c";
};
meta.homepage = "https://github.com/thinca/vim-quickrun/";
};
@ -8155,12 +8155,12 @@ final: prev:
vim-signify = buildVimPluginFrom2Nix {
pname = "vim-signify";
version = "2021-04-29";
version = "2021-05-19";
src = fetchFromGitHub {
owner = "mhinz";
repo = "vim-signify";
rev = "6df213375c9d63faebb55f55aada2efa52458d12";
sha256 = "0yv5v4f03hpn17dsazcr62bwf1y43j915wy9a33hv5wyicqszsyi";
rev = "22f05607d4d7406781af56cafc1121152988c6d2";
sha256 = "1rq5d3v5qvv0hnvk18q66zd8963flnjvxb4b65vh88md15qc3p3j";
};
meta.homepage = "https://github.com/mhinz/vim-signify/";
};
@ -8516,12 +8516,12 @@ final: prev:
vim-test = buildVimPluginFrom2Nix {
pname = "vim-test";
version = "2021-04-06";
version = "2021-05-18";
src = fetchFromGitHub {
owner = "vim-test";
repo = "vim-test";
rev = "206eb5492b4afa03c31cea529aa917b4a7085d10";
sha256 = "084yaqw0zw1bc4y4pk1vdb58vza7dn31phjr53dvwdj0kyl7j088";
rev = "0671670b1ee4bdc7552aba2972800bec66fffbe7";
sha256 = "067sgc4qmplb3b1ddjwqzgfn4fvb7zgic330sygnbm6nq3nr0n92";
};
meta.homepage = "https://github.com/vim-test/vim-test/";
};
@ -8898,6 +8898,18 @@ final: prev:
meta.homepage = "https://github.com/liuchengxu/vim-which-key/";
};
vim-wordmotion = buildVimPluginFrom2Nix {
pname = "vim-wordmotion";
version = "2021-04-25";
src = fetchFromGitHub {
owner = "chaoren";
repo = "vim-wordmotion";
rev = "f6a2064444f39ba52161b16ac1429ee87c1af76d";
sha256 = "0y69jkgh9pf4b0c4pxgqvf43gq8amz9qwhq1cg38zriy2m4kxi7h";
};
meta.homepage = "https://github.com/chaoren/vim-wordmotion/";
};
vim-wordy = buildVimPluginFrom2Nix {
pname = "vim-wordy";
version = "2020-10-24";
@ -9128,12 +9140,12 @@ final: prev:
vimspector = buildVimPluginFrom2Nix {
pname = "vimspector";
version = "2021-05-15";
version = "2021-05-20";
src = fetchFromGitHub {
owner = "puremourning";
repo = "vimspector";
rev = "aacd62f09feed377c35930790514b2739fa08e51";
sha256 = "0na5dvwc8hly32hjkicw8vgy0agx4zyvsrdrjn21sz0daw48cabi";
rev = "99c0c4f763314851b9dd550750cedc793859f7d7";
sha256 = "1im3d5m9jplyy8jaxd35x31rdp8fswh3av4js2abs5n1x0scg7ya";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/puremourning/vimspector/";
@ -9141,12 +9153,12 @@ final: prev:
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
version = "2021-05-14";
version = "2021-05-21";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
rev = "ffb07473638f5a155dde79bfdc6c0d92f30f463b";
sha256 = "06h6rni46rfjhb9cn79swqnk9l7kxwv4hv265hizjk452scqwb7b";
rev = "dfec6def2d992f64411c2b4914f541b1d31f3737";
sha256 = "0zg0fqnyph5pblramjsj7lpg0v7m09mphpi7qczqdak8mr61cwhm";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
@ -9237,12 +9249,12 @@ final: prev:
which-key-nvim = buildVimPluginFrom2Nix {
pname = "which-key-nvim";
version = "2021-05-17";
version = "2021-05-20";
src = fetchFromGitHub {
owner = "folke";
repo = "which-key.nvim";
rev = "ec1474bb0c373eb583962deff20860c2af54f932";
sha256 = "1fp6p7yaws8c737zi9i7fc3vvv8lxkkn5lygfzyrmk6drkhis67h";
rev = "20a85bd8bc54a11cf040aafa5d60f8a735eecfbd";
sha256 = "03c2xwi6ids3na904f3j8x3xca73kzg9wbv5wl79vzqpvz29waw4";
};
meta.homepage = "https://github.com/folke/which-key.nvim/";
};
@ -9358,12 +9370,12 @@ final: prev:
YouCompleteMe = buildVimPluginFrom2Nix {
pname = "YouCompleteMe";
version = "2021-05-04";
version = "2021-05-18";
src = fetchFromGitHub {
owner = "ycm-core";
repo = "YouCompleteMe";
rev = "7c4d05375a09a871f618f9688c7af517d4e69b76";
sha256 = "0ghjcphxrav9zzg199d761ai83fzpcndsvyfxskwism4y803s3lf";
rev = "ab73ca25467625ea71f1ee9103fca55cc10ba27a";
sha256 = "0znj2djajmb7jcsnbpqrigvnb9dbcx1d390cn198b2zfd27kbkby";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";

View file

@ -47,6 +47,7 @@ camspiers/lens.vim
carlitux/deoplete-ternjs
ccarpita/rtorrent-syntax-file
cespare/vim-toml
chaoren/vim-wordmotion
chikatoike/concealedyank.vim
chikatoike/sourcemap.vim
chkno/vim-haskell-module-name

View file

@ -1,5 +1,5 @@
{ lib, stdenv, nodejs-slim, mkYarnPackage, fetchFromGitHub, bundlerEnv
, yarn, callPackage, imagemagick, ffmpeg, file, ruby_2_7, writeShellScript
, yarn, callPackage, imagemagick, ffmpeg, file, ruby_3_0, writeShellScript
# Allow building a fork or custom version of Mastodon:
, pname ? "mastodon"
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
mastodon-gems = bundlerEnv {
name = "${pname}-gems-${version}";
inherit version;
ruby = ruby_2_7;
ruby = ruby_3_0;
gemdir = src;
gemset = dependenciesDir + "/gemset.nix";
# This fix (copied from https://github.com/NixOS/nixpkgs/pull/76765) replaces the gem

File diff suppressed because it is too large Load diff

View file

@ -1,9 +1,9 @@
{
"version": "3.3.0",
"version": "3.4.0",
"name": "@tootsuite/mastodon",
"license": "AGPL-3.0-or-later",
"engines": {
"node": ">=10.13"
"node": ">=12"
},
"scripts": {
"postversion": "git push --tags",
@ -23,7 +23,7 @@
},
"browserslist": [
"last 2 versions",
"IE >= 11",
"not IE 11",
"iOS >= 9",
"not dead"
],
@ -60,37 +60,35 @@
},
"private": true,
"dependencies": {
"@babel/core": "^7.12.7",
"@babel/plugin-proposal-class-properties": "^7.8.3",
"@babel/plugin-proposal-decorators": "^7.12.1",
"@babel/plugin-transform-react-inline-elements": "^7.12.1",
"@babel/plugin-transform-runtime": "^7.12.1",
"@babel/preset-env": "^7.12.7",
"@babel/preset-react": "^7.12.7",
"@babel/runtime": "^7.12.5",
"@clusterws/cws": "^3.0.0",
"@babel/core": "^7.14.0",
"@babel/plugin-proposal-decorators": "^7.13.15",
"@babel/plugin-transform-react-inline-elements": "^7.12.13",
"@babel/plugin-transform-runtime": "^7.13.15",
"@babel/preset-env": "^7.14.1",
"@babel/preset-react": "^7.13.13",
"@babel/runtime": "^7.14.0",
"@gamestdio/websocket": "^0.3.2",
"@github/webauthn-json": "^0.5.7",
"@rails/ujs": "^6.0.3",
"array-includes": "^3.1.1",
"@rails/ujs": "^6.1.3",
"array-includes": "^3.1.3",
"arrow-key-navigation": "^1.2.0",
"autoprefixer": "^9.8.6",
"axios": "^0.21.0",
"babel-loader": "^8.2.1",
"axios": "^0.21.1",
"babel-loader": "^8.2.2",
"babel-plugin-lodash": "^3.3.4",
"babel-plugin-preval": "^5.0.0",
"babel-plugin-react-intl": "^6.2.0",
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
"babel-runtime": "^6.26.0",
"blurhash": "^1.1.3",
"classnames": "^2.2.5",
"color-blend": "^3.0.0",
"classnames": "^2.3.1",
"color-blend": "^3.0.1",
"compression-webpack-plugin": "^6.1.1",
"cross-env": "^7.0.2",
"css-loader": "^5.0.1",
"cssnano": "^4.1.10",
"detect-passive-events": "^2.0.1",
"dotenv": "^8.2.0",
"cross-env": "^7.0.3",
"css-loader": "^5.2.4",
"cssnano": "^4.1.11",
"detect-passive-events": "^2.0.3",
"dotenv": "^9.0.1",
"emoji-mart": "Gargron/emoji-mart#build",
"es6-symbol": "^3.1.3",
"escape-html": "^1.0.3",
@ -98,29 +96,29 @@
"express": "^4.17.1",
"file-loader": "^6.2.0",
"font-awesome": "^4.7.0",
"glob": "^7.1.6",
"glob": "^7.1.7",
"history": "^4.10.1",
"http-link-header": "^1.0.3",
"immutable": "^3.8.2",
"imports-loader": "^1.2.0",
"intersection-observer": "^0.11.0",
"intersection-observer": "^0.12.0",
"intl": "^1.2.5",
"intl-messageformat": "^2.2.0",
"intl-relativeformat": "^6.4.3",
"is-nan": "^1.3.0",
"js-yaml": "^3.13.1",
"lodash": "^4.17.19",
"is-nan": "^1.3.2",
"js-yaml": "^4.1.0",
"lodash": "^4.17.21",
"mark-loader": "^0.1.6",
"marky": "^1.2.1",
"mini-css-extract-plugin": "^1.3.1",
"marky": "^1.2.2",
"mini-css-extract-plugin": "^1.6.0",
"mkdirp": "^1.0.4",
"npmlog": "^4.1.2",
"object-assign": "^4.1.1",
"object-fit-images": "^3.2.3",
"object.values": "^1.1.1",
"object.values": "^1.1.3",
"offline-plugin": "^5.0.7",
"path-complete-extname": "^1.0.0",
"pg": "^6.4.0",
"pg": "^8.5.0",
"postcss-loader": "^3.0.0",
"postcss-object-fit-images": "^1.1.2",
"promise.prototype.finally": "^3.1.2",
@ -135,18 +133,18 @@
"react-masonry-infinite": "^1.2.2",
"react-motion": "^0.5.2",
"react-notification": "^6.8.5",
"react-overlays": "^0.9.2",
"react-redux": "^7.2.2",
"react-overlays": "^0.9.3",
"react-redux": "^7.2.4",
"react-redux-loading-bar": "^4.0.8",
"react-router-dom": "^4.1.1",
"react-router-scroll-4": "^1.0.0-beta.1",
"react-select": "^3.1.0",
"react-select": "^4.3.0",
"react-sparklines": "^1.7.0",
"react-swipeable-views": "^0.13.9",
"react-textarea-autosize": "^8.3.0",
"react-toggle": "^4.1.1",
"redis": "^3.0.2",
"redux": "^4.0.5",
"react-textarea-autosize": "^8.3.2",
"react-toggle": "^4.1.2",
"redis": "^3.1.2",
"redux": "^4.1.0",
"redux-immutable": "^4.0.0",
"redux-thunk": "^2.2.0",
"regenerator-runtime": "^0.13.7",
@ -154,8 +152,8 @@
"requestidlecallback": "^0.3.0",
"reselect": "^4.0.0",
"rimraf": "^3.0.2",
"sass": "^1.29.0",
"sass-loader": "^10.1.0",
"sass": "^1.32.12",
"sass-loader": "^10.1.1",
"stacktrace-js": "^2.0.2",
"stringz": "^2.1.0",
"substring-trie": "^1.0.2",
@ -163,31 +161,37 @@
"tesseract.js": "^2.1.1",
"throng": "^4.0.0",
"tiny-queue": "^0.2.1",
"twitter-text": "3.1.0",
"uuid": "^8.3.1",
"webpack": "^4.44.2",
"webpack-assets-manifest": "^3.1.1",
"webpack-bundle-analyzer": "^4.1.0",
"webpack": "^4.46.0",
"webpack-assets-manifest": "^4.0.6",
"webpack-bundle-analyzer": "^4.4.1",
"webpack-cli": "^3.3.12",
"webpack-merge": "^5.4.0",
"wicg-inert": "^3.1.0",
"webpack-merge": "^5.7.3",
"wicg-inert": "^3.1.1",
"ws": "^7.4.5",
"kind-of": "^6.0.3"
},
"devDependencies": {
"@testing-library/jest-dom": "^5.11.6",
"@testing-library/react": "^11.2.2",
"@testing-library/jest-dom": "^5.12.0",
"@testing-library/react": "^11.2.6",
"babel-eslint": "^10.1.0",
"babel-jest": "^26.6.3",
"eslint": "^7.14.0",
"eslint": "^7.26.0",
"eslint-plugin-import": "~2.22.1",
"eslint-plugin-jsx-a11y": "~6.4.1",
"eslint-plugin-promise": "~4.2.1",
"eslint-plugin-react": "~7.21.5",
"eslint-plugin-promise": "~5.1.0",
"eslint-plugin-react": "~7.23.2",
"jest": "^26.6.3",
"raf": "^3.4.1",
"react-intl-translations-manager": "^5.0.3",
"react-test-renderer": "^16.14.0",
"sass-lint": "^1.13.1",
"webpack-dev-server": "^3.11.0",
"yargs": "^16.1.1"
"webpack-dev-server": "^3.11.2",
"yargs": "^17.0.1"
},
"optionalDependencies": {
"bufferutil": "^4.0.3",
"utf-8-validate": "^5.0.5"
}
}

View file

@ -1,31 +1,32 @@
diff --git a/package.json b/package.json
index 7b8f49dd8..24cdd3498 100644
index 5bc1f6bf3..8cc22a403 100644
--- a/package.json
+++ b/package.json
@@ -168,7 +168,8 @@
"webpack-bundle-analyzer": "^4.1.0",
"webpack-cli": "^3.3.12",
"webpack-merge": "^5.4.0",
- "wicg-inert": "^3.1.0"
+ "wicg-inert": "^3.1.0",
"webpack-merge": "^5.7.3",
"wicg-inert": "^3.1.1",
- "ws": "^7.4.5"
+ "ws": "^7.4.5",
+ "kind-of": "^6.0.3"
},
"devDependencies": {
"@testing-library/jest-dom": "^5.11.6",
@@ -187,8 +188,5 @@
"sass-lint": "^1.13.1",
"webpack-dev-server": "^3.11.0",
"yargs": "^16.1.1"
- },
"@testing-library/jest-dom": "^5.12.0",
@@ -188,9 +189,6 @@
"webpack-dev-server": "^3.11.2",
"yargs": "^17.0.1"
},
- "resolutions": {
- "kind-of": "^6.0.3"
}
}
- },
"optionalDependencies": {
"bufferutil": "^4.0.3",
"utf-8-validate": "^5.0.5"
diff --git a/yarn.lock b/yarn.lock
index 4aa8f6380..68d2fd8b5 100644
index 6c8bcf549..bda3adbe8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5689,6 +5689,11 @@ is-binary-path@~2.1.0:
@@ -5833,6 +5833,11 @@ is-binary-path@~2.1.0:
dependencies:
binary-extensions "^2.0.0"
@ -37,7 +38,7 @@ index 4aa8f6380..68d2fd8b5 100644
is-callable@^1.1.4, is-callable@^1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
@@ -6639,7 +6644,26 @@ killable@^1.0.1:
@@ -6769,7 +6774,26 @@ killable@^1.0.1:
resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==

View file

@ -2,8 +2,8 @@
{ fetchgit, applyPatches }: let
src = fetchgit {
url = "https://github.com/tootsuite/mastodon.git";
rev = "v3.3.0";
sha256 = "17wvggvy5mmyf3f1i5v1hgvh6wjdhg9hb3wiyfaydx0slsg03qba";
rev = "v3.4.0";
sha256 = "0wa1j4iin6nlb1p5lxzgldzgr0vhrmm835gj2zqadw37vpsxdis3";
};
in applyPatches {
inherit src;

View file

@ -1 +1 @@
"3.3.0"
"3.4.0"

View file

@ -3,7 +3,7 @@ diff -Naur --label a/package.json --label b/package.json a/package.json b/packag
+++ b/package.json
@@ -1,4 +1,5 @@
{
+ "version": "3.3.0",
+ "version": "3.4.0",
"name": "@tootsuite/mastodon",
"license": "AGPL-3.0-or-later",
"engines": {

File diff suppressed because it is too large Load diff

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, gnugrep, nixFlakes }:
{ lib, stdenv, fetchFromGitHub, gnugrep, nixUnstable }:
stdenv.mkDerivation rec {
pname = "nix-direnv";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
# Substitute instead of wrapping because the resulting file is
# getting sourced, not executed:
postPatch = ''
sed -i "1a NIX_BIN_PREFIX=${nixFlakes}/bin/" direnvrc
sed -i "1a NIX_BIN_PREFIX=${nixUnstable}/bin/" direnvrc
substituteInPlace direnvrc --replace "grep" "${gnugrep}/bin/grep"
'';

View file

@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
pname = "tremor";
version = "0.11.1";
version = "0.11.2";
src = fetchFromGitHub {
owner = "tremor-rs";
repo = "tremor-runtime";
rev = "v${version}";
sha256 = "0aw6m5gklpgv1frrviv1v1ky898dwbcc1crd65d3gldcmnhvg6ap";
sha256 = "sha256-FedRwFVc+m25+Elj1Vp/fInbK6DVsUpniw29/dtecWo=";
};
cargoSha256 = "1lks3xgnzcccv3hiqgxjpfm4v4g97an8yzfnb2kakw7jkfli6kvi";
cargoSha256 = "sha256-jxXoFOwoBSkn7pv10ctLpD7ko8bokc1ADkB7NQFRC7c=";
nativeBuildInputs = [ cmake pkg-config installShellFiles ];

View file

@ -1,7 +1,7 @@
{ lib
, buildPythonApplication
, fetchFromGitHub
, nixFlakes
, nixUnstable
, nix-prefetch
, nixpkgs-fmt
, nixpkgs-review
@ -19,7 +19,7 @@ buildPythonApplication rec {
};
makeWrapperArgs = [
"--prefix" "PATH" ":" (lib.makeBinPath [ nixFlakes nix-prefetch nixpkgs-fmt nixpkgs-review ])
"--prefix" "PATH" ":" (lib.makeBinPath [ nixUnstable nix-prefetch nixpkgs-fmt nixpkgs-review ])
];
checkPhase = ''

View file

@ -227,12 +227,4 @@ in rec {
];
});
nixExperimental = nixUnstable.overrideAttrs (prev: {
patches = (prev.patches or []) ++ [ ./enable-all-experimental.patch ];
});
nixFlakes = nixUnstable.overrideAttrs (prev: {
patches = (prev.patches or []) ++ [ ./enable-flakes.patch ];
});
}

View file

@ -1,14 +0,0 @@
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc
index d3b27d7be..e7d002e1d 100644
--- a/src/libstore/globals.cc
+++ b/src/libstore/globals.cc
@@ -172,8 +172,7 @@ MissingExperimentalFeature::MissingExperimentalFeature(std::string feature)
void Settings::requireExperimentalFeature(const std::string & name)
{
- if (!isExperimentalFeatureEnabled(name))
- throw MissingExperimentalFeature(name);
+ return;
}
bool Settings::isWSL1()

View file

@ -1,14 +0,0 @@
diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh
index 3e4ead76c..81d407236 100644
--- a/src/libstore/globals.hh
+++ b/src/libstore/globals.hh
@@ -923,7 +923,8 @@ public:
value.
)"};
- Setting<Strings> experimentalFeatures{this, {}, "experimental-features",
+ Setting<Strings> experimentalFeatures{
+ this, {"flakes", "nix-command"}, "experimental-features",
"Experimental Nix features to enable."};
bool isExperimentalFeatureEnabled(const std::string & name);

View file

@ -1,7 +1,7 @@
{ lib
, python3
, fetchFromGitHub
, nixFlakes
, nixUnstable
, git
}:
@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
};
makeWrapperArgs = [
"--prefix" "PATH" ":" (lib.makeBinPath [ nixFlakes git ])
"--prefix" "PATH" ":" (lib.makeBinPath [ nixUnstable git ])
];
doCheck = false;

View file

@ -492,6 +492,7 @@ mapAliases ({
nginxUnstable = nginxMainline; # added 2018-04-25
nilfs_utils = nilfs-utils; # added 2018-04-25
nix-review = nixpkgs-review; # added 2019-12-22
nixFlakes = nixUnstable; # added 2021-05-21
nmap_graphical = nmap-graphical; # added 2017-01-19
nologin = shadow; # added 2018-04-25
nxproxy = nx-libs; # added 2019-02-15

View file

@ -7092,6 +7092,11 @@ in
inherit (linuxPackages) nvidia_x11;
nvidiaGpuSupport = config.cudaSupport or false;
};
nomad_1_1 = callPackage ../applications/networking/cluster/nomad/1.1.nix {
buildGoPackage = buildGo116Package;
inherit (linuxPackages) nvidia_x11;
nvidiaGpuSupport = config.cudaSupport or false;
};
nomad-driver-podman = callPackage ../applications/networking/cluster/nomad-driver-podman { };
@ -19086,11 +19091,7 @@ in
mailman-web = with python3.pkgs; toPythonApplication mailman-web;
mastodon = callPackage ../servers/mastodon {
# With nodejs v14 the streaming endpoint breaks. Need migrate to uWebSockets.js or similar.
# https://github.com/tootsuite/mastodon/issues/15184
nodejs-slim = nodejs-slim-12_x;
};
mastodon = callPackage ../servers/mastodon { };
materialize = callPackage ../servers/sql/materialize {
inherit (buildPackages.darwin) bootstrap_cmds;
@ -30420,9 +30421,7 @@ in
})
nix
nixStable
nixUnstable
nixFlakes
nixExperimental;
nixUnstable;
nixStatic = pkgsStatic.nix;

View file

@ -1980,7 +1980,7 @@ in {
djangorestframework = callPackage ../development/python-modules/djangorestframework { };
djangorestframework-jwt = callPackage ../development/python-modules/djangorestframework-jwt { };
djangorestframework-jwt = self.drf-jwt;
djangorestframework-simplejwt = callPackage ../development/python-modules/djangorestframework-simplejwt { };
@ -2098,6 +2098,8 @@ in {
dpkt = callPackage ../development/python-modules/dpkt { };
drf-jwt = callPackage ../development/python-modules/drf-jwt { };
drf-nested-routers = callPackage ../development/python-modules/drf-nested-routers { };
drf-yasg = callPackage ../development/python-modules/drf-yasg { };