Project import generated by Copybara.
GitOrigin-RevId: 667e5581d16745bcda791300ae7e2d73f49fff25
This commit is contained in:
parent
c157d8f91e
commit
1be0098156
757 changed files with 17541 additions and 9877 deletions
|
@ -1670,9 +1670,9 @@ If you need to change a package's attribute(s) from `configuration.nix` you coul
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
nixpkgs.config.packageOverrides = super: {
|
nixpkgs.config.packageOverrides = super: {
|
||||||
python = super.python.override {
|
python3 = super.python3.override {
|
||||||
packageOverrides = python-self: python-super: {
|
packageOverrides = python-self: python-super: {
|
||||||
twisted = python-super.twisted.overrideAttrs (oldAttrs: {
|
twisted = python-super.twisted.overridePythonAttrs (oldAttrs: {
|
||||||
src = super.fetchPypi {
|
src = super.fetchPypi {
|
||||||
pname = "twisted";
|
pname = "twisted";
|
||||||
version = "19.10.0";
|
version = "19.10.0";
|
||||||
|
|
5
third_party/nixpkgs/lib/licenses.nix
vendored
5
third_party/nixpkgs/lib/licenses.nix
vendored
|
@ -109,6 +109,11 @@ in mkLicense lset) ({
|
||||||
fullName = "Apache License 2.0";
|
fullName = "Apache License 2.0";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
bitstreamVera = {
|
||||||
|
spdxId = "Bitstream-Vera";
|
||||||
|
fullName = "Bitstream Vera Font License";
|
||||||
|
};
|
||||||
|
|
||||||
bola11 = {
|
bola11 = {
|
||||||
url = "https://blitiri.com.ar/p/bola/";
|
url = "https://blitiri.com.ar/p/bola/";
|
||||||
fullName = "Buena Onda License Agreement 1.1";
|
fullName = "Buena Onda License Agreement 1.1";
|
||||||
|
|
4
third_party/nixpkgs/lib/modules.nix
vendored
4
third_party/nixpkgs/lib/modules.nix
vendored
|
@ -1135,10 +1135,10 @@ rec {
|
||||||
type = toType;
|
type = toType;
|
||||||
});
|
});
|
||||||
config = mkMerge [
|
config = mkMerge [
|
||||||
{
|
(optionalAttrs (options ? warnings) {
|
||||||
warnings = optional (warn && fromOpt.isDefined)
|
warnings = optional (warn && fromOpt.isDefined)
|
||||||
"The option `${showOption from}' defined in ${showFiles fromOpt.files} has been renamed to `${showOption to}'.";
|
"The option `${showOption from}' defined in ${showFiles fromOpt.files} has been renamed to `${showOption to}'.";
|
||||||
}
|
})
|
||||||
(if withPriority
|
(if withPriority
|
||||||
then mkAliasAndWrapDefsWithPriority (setAttrByPath to) fromOpt
|
then mkAliasAndWrapDefsWithPriority (setAttrByPath to) fromOpt
|
||||||
else mkAliasAndWrapDefinitions (setAttrByPath to) fromOpt)
|
else mkAliasAndWrapDefinitions (setAttrByPath to) fromOpt)
|
||||||
|
|
5
third_party/nixpkgs/lib/systems/default.nix
vendored
5
third_party/nixpkgs/lib/systems/default.nix
vendored
|
@ -183,14 +183,13 @@ rec {
|
||||||
seccompSupport = false;
|
seccompSupport = false;
|
||||||
hostCpuTargets = [ "${final.qemuArch}-linux-user" ];
|
hostCpuTargets = [ "${final.qemuArch}-linux-user" ];
|
||||||
};
|
};
|
||||||
wine-name = "wine${toString final.parsed.cpu.bits}";
|
wine = (pkgs.winePackagesFor "wine${toString final.parsed.cpu.bits}").minimal;
|
||||||
wine = (pkgs.winePackagesFor wine-name).minimal;
|
|
||||||
in
|
in
|
||||||
if final.parsed.kernel.name == pkgs.stdenv.hostPlatform.parsed.kernel.name &&
|
if final.parsed.kernel.name == pkgs.stdenv.hostPlatform.parsed.kernel.name &&
|
||||||
pkgs.stdenv.hostPlatform.canExecute final
|
pkgs.stdenv.hostPlatform.canExecute final
|
||||||
then "${pkgs.runtimeShell} -c '\"$@\"' --"
|
then "${pkgs.runtimeShell} -c '\"$@\"' --"
|
||||||
else if final.isWindows
|
else if final.isWindows
|
||||||
then "${wine}/bin/${wine-name}"
|
then "${wine}/bin/wine${lib.optionalString (final.parsed.cpu.bits == 64) "64"}"
|
||||||
else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux
|
else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux
|
||||||
then "${qemu-user}/bin/qemu-${final.qemuArch}"
|
then "${qemu-user}/bin/qemu-${final.qemuArch}"
|
||||||
else if final.isWasi
|
else if final.isWasi
|
||||||
|
|
7
third_party/nixpkgs/lib/tests/modules.sh
vendored
7
third_party/nixpkgs/lib/tests/modules.sh
vendored
|
@ -348,6 +348,13 @@ checkConfigOutput 'ok' config.freeformItems.foo.bar ./adhoc-freeformType-survive
|
||||||
# because of an `extendModules` bug, issue 168767.
|
# because of an `extendModules` bug, issue 168767.
|
||||||
checkConfigOutput '^1$' config.sub.specialisation.value ./extendModules-168767-imports.nix
|
checkConfigOutput '^1$' config.sub.specialisation.value ./extendModules-168767-imports.nix
|
||||||
|
|
||||||
|
# doRename works when `warnings` does not exist.
|
||||||
|
checkConfigOutput '^1234$' config.c.d.e ./doRename-basic.nix
|
||||||
|
# doRename adds a warning.
|
||||||
|
checkConfigOutput '^"The option `a\.b. defined in `.*/doRename-warnings\.nix. has been renamed to `c\.d\.e.\."$' \
|
||||||
|
config.result \
|
||||||
|
./doRename-warnings.nix
|
||||||
|
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
====== module tests ======
|
====== module tests ======
|
||||||
$pass Pass
|
$pass Pass
|
||||||
|
|
11
third_party/nixpkgs/lib/tests/modules/doRename-basic.nix
vendored
Normal file
11
third_party/nixpkgs/lib/tests/modules/doRename-basic.nix
vendored
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
{ lib, ... }: {
|
||||||
|
imports = [
|
||||||
|
(lib.doRename { from = ["a" "b"]; to = ["c" "d" "e"]; warn = true; use = x: x; visible = true; })
|
||||||
|
];
|
||||||
|
options = {
|
||||||
|
c.d.e = lib.mkOption {};
|
||||||
|
};
|
||||||
|
config = {
|
||||||
|
a.b = 1234;
|
||||||
|
};
|
||||||
|
}
|
14
third_party/nixpkgs/lib/tests/modules/doRename-warnings.nix
vendored
Normal file
14
third_party/nixpkgs/lib/tests/modules/doRename-warnings.nix
vendored
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
{ lib, config, ... }: {
|
||||||
|
imports = [
|
||||||
|
(lib.doRename { from = ["a" "b"]; to = ["c" "d" "e"]; warn = true; use = x: x; visible = true; })
|
||||||
|
];
|
||||||
|
options = {
|
||||||
|
warnings = lib.mkOption { type = lib.types.listOf lib.types.str; };
|
||||||
|
c.d.e = lib.mkOption {};
|
||||||
|
result = lib.mkOption {};
|
||||||
|
};
|
||||||
|
config = {
|
||||||
|
a.b = 1234;
|
||||||
|
result = lib.concatStringsSep "%" config.warnings;
|
||||||
|
};
|
||||||
|
}
|
|
@ -281,6 +281,13 @@
|
||||||
githubId = 124545;
|
githubId = 124545;
|
||||||
name = "Anthony Cowley";
|
name = "Anthony Cowley";
|
||||||
};
|
};
|
||||||
|
adamcstephens = {
|
||||||
|
email = "happy.plan4249@valkor.net";
|
||||||
|
matrix = "@adam:valkor.net";
|
||||||
|
github = "adamcstephens";
|
||||||
|
githubId = 2071575;
|
||||||
|
name = "Adam C. Stephens";
|
||||||
|
};
|
||||||
adamlwgriffiths = {
|
adamlwgriffiths = {
|
||||||
email = "adam.lw.griffiths@gmail.com";
|
email = "adam.lw.griffiths@gmail.com";
|
||||||
github = "adamlwgriffiths";
|
github = "adamlwgriffiths";
|
||||||
|
@ -1648,6 +1655,15 @@
|
||||||
githubId = 214787;
|
githubId = 214787;
|
||||||
name = "Herwig Hochleitner";
|
name = "Herwig Hochleitner";
|
||||||
};
|
};
|
||||||
|
benesim = {
|
||||||
|
name = "Benjamin Isbarn";
|
||||||
|
email = "benjamin.isbarn@gmail.com";
|
||||||
|
github = "benesim";
|
||||||
|
githubId = 29384538;
|
||||||
|
keys = [{
|
||||||
|
fingerprint = "D35E C9CE E631 638F F1D8 B401 6F0E 410D C3EE D02";
|
||||||
|
}];
|
||||||
|
};
|
||||||
benley = {
|
benley = {
|
||||||
email = "benley@gmail.com";
|
email = "benley@gmail.com";
|
||||||
github = "benley";
|
github = "benley";
|
||||||
|
@ -2140,6 +2156,13 @@
|
||||||
githubId = 51231053;
|
githubId = 51231053;
|
||||||
name = "Daniel";
|
name = "Daniel";
|
||||||
};
|
};
|
||||||
|
calavera = {
|
||||||
|
email = "david.calavera@gmail.com";
|
||||||
|
github = "calavera";
|
||||||
|
githubId = 1050;
|
||||||
|
matrix = "@davidcalavera:matrix.org";
|
||||||
|
name = "David Calavera";
|
||||||
|
};
|
||||||
callahad = {
|
callahad = {
|
||||||
email = "dan.callahan@gmail.com";
|
email = "dan.callahan@gmail.com";
|
||||||
github = "callahad";
|
github = "callahad";
|
||||||
|
@ -3478,6 +3501,12 @@
|
||||||
githubId = 8852888;
|
githubId = 8852888;
|
||||||
name = "David Izquierdo";
|
name = "David Izquierdo";
|
||||||
};
|
};
|
||||||
|
djacu = {
|
||||||
|
email = "daniel.n.baker@gmail.com";
|
||||||
|
github = "djacu";
|
||||||
|
githubId = 7043297;
|
||||||
|
name = "Daniel Baker";
|
||||||
|
};
|
||||||
djanatyn = {
|
djanatyn = {
|
||||||
email = "djanatyn@gmail.com";
|
email = "djanatyn@gmail.com";
|
||||||
github = "djanatyn";
|
github = "djanatyn";
|
||||||
|
@ -4450,6 +4479,13 @@
|
||||||
githubId = 9959940;
|
githubId = 9959940;
|
||||||
name = "Andreas Fehn";
|
name = "Andreas Fehn";
|
||||||
};
|
};
|
||||||
|
felipeqq2 = {
|
||||||
|
name = "Felipe Silva";
|
||||||
|
email = "felipeqq2@outlook.com";
|
||||||
|
github = "felipeqq2";
|
||||||
|
githubId = 71830138;
|
||||||
|
keys = [{ fingerprint = "F5F0 2BCE 3580 BF2B 707A AA8C 2FD3 4A9E 2671 91B8"; }];
|
||||||
|
};
|
||||||
felixscheinost = {
|
felixscheinost = {
|
||||||
name = "Felix Scheinost";
|
name = "Felix Scheinost";
|
||||||
email = "felix.scheinost@posteo.de";
|
email = "felix.scheinost@posteo.de";
|
||||||
|
@ -9422,6 +9458,12 @@
|
||||||
githubId = 11706080;
|
githubId = 11706080;
|
||||||
name = "Moritz Clasmeier";
|
name = "Moritz Clasmeier";
|
||||||
};
|
};
|
||||||
|
mtoohey = {
|
||||||
|
name = "Matthew Toohey";
|
||||||
|
email = "contact@mtoohey.com";
|
||||||
|
github = "mtoohey31";
|
||||||
|
githubId = 36740602;
|
||||||
|
};
|
||||||
MtP = {
|
MtP = {
|
||||||
email = "marko.nixos@poikonen.de";
|
email = "marko.nixos@poikonen.de";
|
||||||
github = "MtP76";
|
github = "MtP76";
|
||||||
|
@ -10130,7 +10172,7 @@
|
||||||
matrix = "@obfusk:matrix.org";
|
matrix = "@obfusk:matrix.org";
|
||||||
github = "obfusk";
|
github = "obfusk";
|
||||||
githubId = 1260687;
|
githubId = 1260687;
|
||||||
name = "Felix C. Stegerman";
|
name = "FC Stegerman";
|
||||||
keys = [{
|
keys = [{
|
||||||
fingerprint = "D5E4 A51D F8D2 55B9 FAC6 A9BB 2F96 07F0 9B36 0F2D";
|
fingerprint = "D5E4 A51D F8D2 55B9 FAC6 A9BB 2F96 07F0 9B36 0F2D";
|
||||||
}];
|
}];
|
||||||
|
|
|
@ -2526,10 +2526,9 @@ sudo cp /var/lib/redis/dump.rdb /var/lib/redis-peertube/dump.rdb
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
The logrotate module also has been updated to freeform syntax:
|
The logrotate module also has been updated to freeform syntax:
|
||||||
<link linkend="opt-services.logrotate.paths">services.logrotate.paths</link>
|
<literal>services.logrotate.paths</literal> and
|
||||||
and
|
<literal>services.logrotate.extraConfig</literal> will work,
|
||||||
<link linkend="opt-services.logrotate.extraConfig">services.logrotate.extraConfig</link>
|
but issue deprecation warnings and
|
||||||
will work, but issue deprecation warnings and
|
|
||||||
<link linkend="opt-services.logrotate.settings">services.logrotate.settings</link>
|
<link linkend="opt-services.logrotate.settings">services.logrotate.settings</link>
|
||||||
should now be used instead.
|
should now be used instead.
|
||||||
</para>
|
</para>
|
||||||
|
|
|
@ -507,6 +507,15 @@
|
||||||
<literal>[ "all" ]</literal>.
|
<literal>[ "all" ]</literal>.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
Deprecated settings <literal>logrotate.paths</literal> and
|
||||||
|
<literal>logrotate.extraConfig</literal> have been removed.
|
||||||
|
Please convert any uses to
|
||||||
|
<link linkend="opt-services.logrotate.settings">services.logrotate.settings</link>
|
||||||
|
instead.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
The <literal>isPowerPC</literal> predicate, found on
|
The <literal>isPowerPC</literal> predicate, found on
|
||||||
|
@ -634,6 +643,15 @@
|
||||||
maintainer to update the package.
|
maintainer to update the package.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
ppd files in <literal>pkgs.cups-drv-rastertosag-gdi</literal>
|
||||||
|
are now gzipped. If you refer to such a ppd file with its path
|
||||||
|
(e.g. via
|
||||||
|
<link xlink:href="options.html#opt-hardware.printers.ensurePrinters">hardware.printers.ensurePrinters</link>)
|
||||||
|
you will need to append <literal>.gz</literal> to the path.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
xow package removed along with the
|
xow package removed along with the
|
||||||
|
@ -720,6 +738,13 @@
|
||||||
been removed due to lack of upstream maintenance.
|
been removed due to lack of upstream maintenance.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
The <literal>trace</literal> binary from
|
||||||
|
<literal>perf-linux</literal> package has been removed, due to
|
||||||
|
being a duplicate of the <literal>perf</literal> binary.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
The <literal>aws</literal> package has been removed due to
|
The <literal>aws</literal> package has been removed due to
|
||||||
|
@ -833,6 +858,16 @@
|
||||||
due to upstream dropping support.
|
due to upstream dropping support.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
<literal>cassandra_2_1</literal> and
|
||||||
|
<literal>cassandra_2_2</literal> have been removed. Please
|
||||||
|
update to <literal>cassandra_3_11</literal> or
|
||||||
|
<literal>cassandra_3_0</literal>. See the
|
||||||
|
<link xlink:href="https://github.com/apache/cassandra/blob/cassandra-3.11.14/NEWS.txt">changelog</link>
|
||||||
|
for more information about the upgrade process.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
<literal>mysql57</literal> has been removed. Please update to
|
<literal>mysql57</literal> has been removed. Please update to
|
||||||
|
@ -857,6 +892,13 @@
|
||||||
option, and it is enabled by default, for servers.
|
option, and it is enabled by default, for servers.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
<literal>percona-server56</literal> has been removed. Please
|
||||||
|
migrate to <literal>mysql</literal> or
|
||||||
|
<literal>mariadb</literal> if possible.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
<literal>stylua</literal> no longer accepts
|
<literal>stylua</literal> no longer accepts
|
||||||
|
@ -1153,6 +1195,13 @@
|
||||||
<link xlink:href="options.html#opt-systemd.oomd.enableUserServices">systemd.oomd.enableUserServices</link>.
|
<link xlink:href="options.html#opt-systemd.oomd.enableUserServices">systemd.oomd.enableUserServices</link>.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
The <literal>tt-rss</literal> service performs two database
|
||||||
|
migrations when you first use its web UI after upgrade.
|
||||||
|
Consider backing up its database before updating.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
The <literal>pass-secret-service</literal> package now
|
The <literal>pass-secret-service</literal> package now
|
||||||
|
@ -1187,6 +1236,17 @@
|
||||||
environment.
|
environment.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
PowerDNS has been updated from <literal>4.6.x</literal> to
|
||||||
|
<literal>4.7.x</literal>. Please be sure to review the
|
||||||
|
<link xlink:href="https://doc.powerdns.com/authoritative/upgrading.html#to-4-7-0-or-master">Upgrade
|
||||||
|
Notes</link> provided by upstream before upgrading. Worth
|
||||||
|
specifically noting is that the new Catalog Zones feature
|
||||||
|
comes with a mandatory schema change for the gsql database
|
||||||
|
backends, which has to be manually applied.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
There is a new module for the <literal>thunar</literal>
|
There is a new module for the <literal>thunar</literal>
|
||||||
|
|
|
@ -906,8 +906,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||||
|
|
||||||
- [services.logrotate.enable](#opt-services.logrotate.enable) now defaults to true if any rotate path has
|
- [services.logrotate.enable](#opt-services.logrotate.enable) now defaults to true if any rotate path has
|
||||||
been defined, and some paths have been added by default.
|
been defined, and some paths have been added by default.
|
||||||
- The logrotate module also has been updated to freeform syntax: [services.logrotate.paths](#opt-services.logrotate.paths)
|
- The logrotate module also has been updated to freeform syntax: `services.logrotate.paths`
|
||||||
and [services.logrotate.extraConfig](#opt-services.logrotate.extraConfig) will work, but issue deprecation
|
and `services.logrotate.extraConfig` will work, but issue deprecation
|
||||||
warnings and [services.logrotate.settings](#opt-services.logrotate.settings) should now be used instead.
|
warnings and [services.logrotate.settings](#opt-services.logrotate.settings) should now be used instead.
|
||||||
|
|
||||||
- `security.pam.ussh` has been added, which allows authorizing PAM sessions based on SSH _certificates_ held within an SSH agent, using [pam-ussh](https://github.com/uber/pam-ussh).
|
- `security.pam.ussh` has been added, which allows authorizing PAM sessions based on SSH _certificates_ held within an SSH agent, using [pam-ussh](https://github.com/uber/pam-ussh).
|
||||||
|
|
|
@ -171,6 +171,10 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
|
||||||
This got partially copied over from the minimal profile and reduces the final system size by up to 200MB.
|
This got partially copied over from the minimal profile and reduces the final system size by up to 200MB.
|
||||||
If you require all locales installed set the option to ``[ "all" ]``.
|
If you require all locales installed set the option to ``[ "all" ]``.
|
||||||
|
|
||||||
|
- Deprecated settings `logrotate.paths` and `logrotate.extraConfig` have
|
||||||
|
been removed. Please convert any uses to
|
||||||
|
[services.logrotate.settings](#opt-services.logrotate.settings) instead.
|
||||||
|
|
||||||
- The `isPowerPC` predicate, found on `platform` attrsets (`hostPlatform`, `buildPlatform`, `targetPlatform`, etc) has been removed in order to reduce confusion. The predicate was was defined such that it matches only the 32-bit big-endian members of the POWER/PowerPC family, despite having a name which would imply a broader set of systems. If you were using this predicate, you can replace `foo.isPowerPC` with `(with foo; isPower && is32bit && isBigEndian)`.
|
- The `isPowerPC` predicate, found on `platform` attrsets (`hostPlatform`, `buildPlatform`, `targetPlatform`, etc) has been removed in order to reduce confusion. The predicate was was defined such that it matches only the 32-bit big-endian members of the POWER/PowerPC family, despite having a name which would imply a broader set of systems. If you were using this predicate, you can replace `foo.isPowerPC` with `(with foo; isPower && is32bit && isBigEndian)`.
|
||||||
|
|
||||||
- The `fetchgit` fetcher now uses [cone mode](https://www.git-scm.com/docs/git-sparse-checkout/2.37.0#_internalscone_mode_handling) by default for sparse checkouts. [Non-cone mode](https://www.git-scm.com/docs/git-sparse-checkout/2.37.0#_internalsnon_cone_problems) can be enabled by passing `nonConeMode = true`, but note that non-cone mode is deprecated and this option may be removed alongside a future Git update without notice.
|
- The `fetchgit` fetcher now uses [cone mode](https://www.git-scm.com/docs/git-sparse-checkout/2.37.0#_internalscone_mode_handling) by default for sparse checkouts. [Non-cone mode](https://www.git-scm.com/docs/git-sparse-checkout/2.37.0#_internalsnon_cone_problems) can be enabled by passing `nonConeMode = true`, but note that non-cone mode is deprecated and this option may be removed alongside a future Git update without notice.
|
||||||
|
@ -206,6 +210,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
|
||||||
|
|
||||||
- riak package removed along with `services.riak` module, due to lack of maintainer to update the package.
|
- riak package removed along with `services.riak` module, due to lack of maintainer to update the package.
|
||||||
|
|
||||||
|
- ppd files in `pkgs.cups-drv-rastertosag-gdi` are now gzipped. If you refer to such a ppd file with its path (e.g. via [hardware.printers.ensurePrinters](options.html#opt-hardware.printers.ensurePrinters)) you will need to append `.gz` to the path.
|
||||||
|
|
||||||
- xow package removed along with the `hardware.xow` module, due to the project being deprecated in favor of `xone`, which is available via the `hardware.xone` module.
|
- xow package removed along with the `hardware.xow` module, due to the project being deprecated in favor of `xone`, which is available via the `hardware.xone` module.
|
||||||
|
|
||||||
- dd-agent package removed along with the `services.dd-agent` module, due to the project being deprecated in favor of `datadog-agent`, which is available via the `services.datadog-agent` module.
|
- dd-agent package removed along with the `services.dd-agent` module, due to the project being deprecated in favor of `datadog-agent`, which is available via the `services.datadog-agent` module.
|
||||||
|
@ -235,6 +241,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
|
||||||
`python3.pkgs.influxgraph` packages, have been removed due to lack of upstream
|
`python3.pkgs.influxgraph` packages, have been removed due to lack of upstream
|
||||||
maintenance.
|
maintenance.
|
||||||
|
|
||||||
|
- The `trace` binary from `perf-linux` package has been removed, due to being a duplicate of the `perf` binary.
|
||||||
|
|
||||||
- The `aws` package has been removed due to being abandoned by the upstream. It is recommended to use `awscli` or `awscli2` instead.
|
- The `aws` package has been removed due to being abandoned by the upstream. It is recommended to use `awscli` or `awscli2` instead.
|
||||||
|
|
||||||
- The [CEmu TI-84 Plus CE emulator](https://ce-programming.github.io/CEmu) package has been renamed to `cemu-ti`. The [Cemu Wii U emulator](https://cemu.info) is now packaged as `cemu`.
|
- The [CEmu TI-84 Plus CE emulator](https://ce-programming.github.io/CEmu) package has been renamed to `cemu-ti`. The [Cemu Wii U emulator](https://cemu.info) is now packaged as `cemu`.
|
||||||
|
@ -261,11 +269,15 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
|
||||||
|
|
||||||
- `k3s` no longer supports docker as runtime due to upstream dropping support.
|
- `k3s` no longer supports docker as runtime due to upstream dropping support.
|
||||||
|
|
||||||
|
- `cassandra_2_1` and `cassandra_2_2` have been removed. Please update to `cassandra_3_11` or `cassandra_3_0`. See the [changelog](https://github.com/apache/cassandra/blob/cassandra-3.11.14/NEWS.txt) for more information about the upgrade process.
|
||||||
|
|
||||||
- `mysql57` has been removed. Please update to `mysql80` or `mariadb`. See the [upgrade guide](https://mariadb.com/kb/en/upgrading-from-mysql-to-mariadb/) for more information.
|
- `mysql57` has been removed. Please update to `mysql80` or `mariadb`. See the [upgrade guide](https://mariadb.com/kb/en/upgrading-from-mysql-to-mariadb/) for more information.
|
||||||
|
|
||||||
- Consequently, `cqrlog` and `amorok` now use `mariadb` instead of `mysql57` for their embedded databases. Running `mysql_upgrade` may be neccesary.
|
- Consequently, `cqrlog` and `amorok` now use `mariadb` instead of `mysql57` for their embedded databases. Running `mysql_upgrade` may be neccesary.
|
||||||
- `k3s` supports `clusterInit` option, and it is enabled by default, for servers.
|
- `k3s` supports `clusterInit` option, and it is enabled by default, for servers.
|
||||||
|
|
||||||
|
- `percona-server56` has been removed. Please migrate to `mysql` or `mariadb` if possible.
|
||||||
|
|
||||||
- `stylua` no longer accepts `lua52Support` and `luauSupport` overrides, use `features` instead, which defaults to `[ "lua54" "luau" ]`.
|
- `stylua` no longer accepts `lua52Support` and `luauSupport` overrides, use `features` instead, which defaults to `[ "lua54" "luau" ]`.
|
||||||
|
|
||||||
- `pkgs.fetchNextcloudApp` has been rewritten to circumvent impurities in e.g. tarballs from GitHub and to make it easier to
|
- `pkgs.fetchNextcloudApp` has been rewritten to circumvent impurities in e.g. tarballs from GitHub and to make it easier to
|
||||||
|
@ -352,6 +364,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
|
||||||
[systemd.oomd.enableRootSlice](options.html#opt-systemd.oomd.enableRootSlice),
|
[systemd.oomd.enableRootSlice](options.html#opt-systemd.oomd.enableRootSlice),
|
||||||
[systemd.oomd.enableSystemSlice](options.html#opt-systemd.oomd.enableSystemSlice),
|
[systemd.oomd.enableSystemSlice](options.html#opt-systemd.oomd.enableSystemSlice),
|
||||||
and [systemd.oomd.enableUserServices](options.html#opt-systemd.oomd.enableUserServices).
|
and [systemd.oomd.enableUserServices](options.html#opt-systemd.oomd.enableUserServices).
|
||||||
|
|
||||||
|
- The `tt-rss` service performs two database migrations when you first use its web UI after upgrade. Consider backing up its database before updating.
|
||||||
|
|
||||||
- The `pass-secret-service` package now includes systemd units from upstream, so adding it to the NixOS `services.dbus.packages` option will make it start automatically as a systemd user service when an application tries to talk to the libsecret D-Bus API.
|
- The `pass-secret-service` package now includes systemd units from upstream, so adding it to the NixOS `services.dbus.packages` option will make it start automatically as a systemd user service when an application tries to talk to the libsecret D-Bus API.
|
||||||
|
|
||||||
|
@ -361,6 +375,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
|
||||||
|
|
||||||
- The default package for `services.mullvad-vpn.package` was changed to `pkgs.mullvad`, allowing cross-platform usage of Mullvad. `pkgs.mullvad` only contains the Mullvad CLI tool, so users who rely on the Mullvad GUI will want to change it back to `pkgs.mullvad-vpn`, or add `pkgs.mullvad-vpn` to their environment.
|
- The default package for `services.mullvad-vpn.package` was changed to `pkgs.mullvad`, allowing cross-platform usage of Mullvad. `pkgs.mullvad` only contains the Mullvad CLI tool, so users who rely on the Mullvad GUI will want to change it back to `pkgs.mullvad-vpn`, or add `pkgs.mullvad-vpn` to their environment.
|
||||||
|
|
||||||
|
- PowerDNS has been updated from `4.6.x` to `4.7.x`. Please be sure to review the [Upgrade Notes](https://doc.powerdns.com/authoritative/upgrading.html#to-4-7-0-or-master) provided by upstream before upgrading. Worth specifically noting is that the new Catalog Zones feature comes with a mandatory schema change for the gsql database backends, which has to be manually applied.
|
||||||
|
|
||||||
- There is a new module for the `thunar` program (the Xfce file manager), which depends on the `xfconf` dbus service, and also has a dbus service and a systemd unit. The option `services.xserver.desktopManager.xfce.thunarPlugins` has been renamed to `programs.thunar.plugins`, and in a future release it may be removed.
|
- There is a new module for the `thunar` program (the Xfce file manager), which depends on the `xfconf` dbus service, and also has a dbus service and a systemd unit. The option `services.xserver.desktopManager.xfce.thunarPlugins` has been renamed to `programs.thunar.plugins`, and in a future release it may be removed.
|
||||||
|
|
||||||
- There is a new module for the `xfconf` program (the Xfce configuration storage system), which has a dbus service.
|
- There is a new module for the `xfconf` program (the Xfce configuration storage system), which has a dbus service.
|
||||||
|
|
|
@ -3,7 +3,7 @@ import sys
|
||||||
|
|
||||||
options = json.load(sys.stdin)
|
options = json.load(sys.stdin)
|
||||||
for (name, value) in options.items():
|
for (name, value) in options.items():
|
||||||
print('##', name.replace('<', '\\<').replace('>', '\\>'))
|
print('##', name.replace('<', '<').replace('>', '>'))
|
||||||
print(value['description'])
|
print(value['description'])
|
||||||
print()
|
print()
|
||||||
if 'type' in value:
|
if 'type' in value:
|
||||||
|
|
20
third_party/nixpkgs/nixos/modules/hardware/usb-storage.nix
vendored
Normal file
20
third_party/nixpkgs/nixos/modules/hardware/usb-storage.nix
vendored
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
with lib;
|
||||||
|
|
||||||
|
{
|
||||||
|
options.hardware.usbStorage.manageStartStop = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = true;
|
||||||
|
description = lib.mdDoc ''
|
||||||
|
Enable this option to gracefully spin-down external storage during shutdown.
|
||||||
|
If you suspect improper head parking after poweroff, install `smartmontools` and check
|
||||||
|
for the `Power-Off_Retract_Count` field for an increment.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
config = mkIf config.hardware.usbStorage.manageStartStop {
|
||||||
|
services.udev.extraRules = ''
|
||||||
|
ACTION=="add|change", SUBSYSTEM=="scsi_disk", DRIVERS=="usb-storage", ATTR{manage_start_stop}="1"
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
}
|
|
@ -82,6 +82,7 @@
|
||||||
./hardware/tuxedo-keyboard.nix
|
./hardware/tuxedo-keyboard.nix
|
||||||
./hardware/ubertooth.nix
|
./hardware/ubertooth.nix
|
||||||
./hardware/usb-wwan.nix
|
./hardware/usb-wwan.nix
|
||||||
|
./hardware/usb-storage.nix
|
||||||
./hardware/onlykey/default.nix
|
./hardware/onlykey/default.nix
|
||||||
./hardware/opentabletdriver.nix
|
./hardware/opentabletdriver.nix
|
||||||
./hardware/sata.nix
|
./hardware/sata.nix
|
||||||
|
@ -318,6 +319,7 @@
|
||||||
./services/backup/zfs-replication.nix
|
./services/backup/zfs-replication.nix
|
||||||
./services/backup/znapzend.nix
|
./services/backup/znapzend.nix
|
||||||
./services/blockchain/ethereum/geth.nix
|
./services/blockchain/ethereum/geth.nix
|
||||||
|
./services/blockchain/ethereum/erigon.nix
|
||||||
./services/backup/zrepl.nix
|
./services/backup/zrepl.nix
|
||||||
./services/cluster/corosync/default.nix
|
./services/cluster/corosync/default.nix
|
||||||
./services/cluster/hadoop/default.nix
|
./services/cluster/hadoop/default.nix
|
||||||
|
|
|
@ -35,7 +35,7 @@ let
|
||||||
'';
|
'';
|
||||||
|
|
||||||
babelfishTranslate = path: name:
|
babelfishTranslate = path: name:
|
||||||
pkgs.runCommand "${name}.fish" {
|
pkgs.runCommandLocal "${name}.fish" {
|
||||||
nativeBuildInputs = [ pkgs.babelfish ];
|
nativeBuildInputs = [ pkgs.babelfish ];
|
||||||
} "${pkgs.babelfish}/bin/babelfish < ${path} > $out;";
|
} "${pkgs.babelfish}/bin/babelfish < ${path} > $out;";
|
||||||
|
|
||||||
|
|
105
third_party/nixpkgs/nixos/modules/services/blockchain/ethereum/erigon.nix
vendored
Normal file
105
third_party/nixpkgs/nixos/modules/services/blockchain/ethereum/erigon.nix
vendored
Normal file
|
@ -0,0 +1,105 @@
|
||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
with lib;
|
||||||
|
let
|
||||||
|
|
||||||
|
cfg = config.services.erigon;
|
||||||
|
|
||||||
|
settingsFormat = pkgs.formats.toml { };
|
||||||
|
configFile = settingsFormat.generate "config.toml" cfg.settings;
|
||||||
|
in {
|
||||||
|
|
||||||
|
options = {
|
||||||
|
services.erigon = {
|
||||||
|
enable = mkEnableOption (lib.mdDoc "Ethereum implementation on the efficiency frontier");
|
||||||
|
|
||||||
|
settings = mkOption {
|
||||||
|
description = lib.mdDoc ''
|
||||||
|
Configuration for Erigon
|
||||||
|
Refer to <https://github.com/ledgerwatch/erigon#usage> for details on supported values.
|
||||||
|
'';
|
||||||
|
|
||||||
|
type = settingsFormat.type;
|
||||||
|
|
||||||
|
example = {
|
||||||
|
datadir = "/var/lib/erigon";
|
||||||
|
chain = "mainnet";
|
||||||
|
http = true;
|
||||||
|
"http.port" = 8545;
|
||||||
|
"http.api" = ["eth" "debug" "net" "trace" "web3" "erigon"];
|
||||||
|
ws = true;
|
||||||
|
port = 30303;
|
||||||
|
"authrpc.port" = 8551;
|
||||||
|
"torrent.port" = 42069;
|
||||||
|
"private.api.addr" = "localhost:9090";
|
||||||
|
"log.console.verbosity" = 3; # info
|
||||||
|
};
|
||||||
|
|
||||||
|
defaultText = literalExpression ''
|
||||||
|
{
|
||||||
|
datadir = "/var/lib/erigon";
|
||||||
|
chain = "mainnet";
|
||||||
|
http = true;
|
||||||
|
"http.port" = 8545;
|
||||||
|
"http.api" = ["eth" "debug" "net" "trace" "web3" "erigon"];
|
||||||
|
ws = true;
|
||||||
|
port = 30303;
|
||||||
|
"authrpc.port" = 8551;
|
||||||
|
"torrent.port" = 42069;
|
||||||
|
"private.api.addr" = "localhost:9090";
|
||||||
|
"log.console.verbosity" = 3; # info
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = mkIf cfg.enable {
|
||||||
|
# Default values are the same as in the binary, they are just written here for convenience.
|
||||||
|
services.erigon.settings = {
|
||||||
|
datadir = mkDefault "/var/lib/erigon";
|
||||||
|
chain = mkDefault "mainnet";
|
||||||
|
http = mkDefault true;
|
||||||
|
"http.port" = mkDefault 8545;
|
||||||
|
"http.api" = mkDefault ["eth" "debug" "net" "trace" "web3" "erigon"];
|
||||||
|
ws = mkDefault true;
|
||||||
|
port = mkDefault 30303;
|
||||||
|
"authrpc.port" = mkDefault 8551;
|
||||||
|
"torrent.port" = mkDefault 42069;
|
||||||
|
"private.api.addr" = mkDefault "localhost:9090";
|
||||||
|
"log.console.verbosity" = mkDefault 3; # info
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.services.erigon = {
|
||||||
|
description = "Erigon ethereum implemenntation";
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
after = [ "network.target" ];
|
||||||
|
|
||||||
|
serviceConfig = {
|
||||||
|
ExecStart = "${pkgs.erigon}/bin/erigon --config ${configFile}";
|
||||||
|
Restart = "on-failure";
|
||||||
|
StateDirectory = "erigon";
|
||||||
|
CapabilityBoundingSet = "";
|
||||||
|
DynamicUser = true;
|
||||||
|
NoNewPrivileges = true;
|
||||||
|
PrivateTmp = true;
|
||||||
|
ProtectHome = true;
|
||||||
|
ProtectClock = true;
|
||||||
|
ProtectProc = "noaccess";
|
||||||
|
ProcSubset = "pid";
|
||||||
|
ProtectKernelLogs = true;
|
||||||
|
ProtectKernelModules = true;
|
||||||
|
ProtectKernelTunables = true;
|
||||||
|
ProtectControlGroups = true;
|
||||||
|
ProtectHostname = true;
|
||||||
|
RestrictSUIDSGID = true;
|
||||||
|
RestrictRealtime = true;
|
||||||
|
RestrictNamespaces = true;
|
||||||
|
LockPersonality = true;
|
||||||
|
RemoveIPC = true;
|
||||||
|
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
|
||||||
|
SystemCallFilter = [ "@system-service" "~@privileged" ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -40,6 +40,7 @@ in
|
||||||
after = [ "network.target" ];
|
after = [ "network.target" ];
|
||||||
environment = {
|
environment = {
|
||||||
INFLUXD_CONFIG_PATH = configFile;
|
INFLUXD_CONFIG_PATH = configFile;
|
||||||
|
ZONEINFO = "${pkgs.tzdata}/share/zoneinfo";
|
||||||
};
|
};
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
ExecStart = "${cfg.package}/bin/influxd --bolt-path \${STATE_DIRECTORY}/influxd.bolt --engine-path \${STATE_DIRECTORY}/engine";
|
ExecStart = "${cfg.package}/bin/influxd --bolt-path \${STATE_DIRECTORY}/influxd.bolt --engine-path \${STATE_DIRECTORY}/engine";
|
||||||
|
|
|
@ -70,10 +70,12 @@ in
|
||||||
Packages providing extra SANE backends to enable.
|
Packages providing extra SANE backends to enable.
|
||||||
|
|
||||||
::: {.note}
|
::: {.note}
|
||||||
The example contains the package for HP scanners.
|
The example contains the package for HP scanners, and the package for
|
||||||
|
Apple AirScan and Microsoft WSD support (supports many
|
||||||
|
vendors/devices).
|
||||||
:::
|
:::
|
||||||
'';
|
'';
|
||||||
example = literalExpression "[ pkgs.hplipWithPlugin ]";
|
example = literalExpression "[ pkgs.hplipWithPlugin pkgs.sane-airscan ]";
|
||||||
};
|
};
|
||||||
|
|
||||||
hardware.sane.disabledDefaultBackends = mkOption {
|
hardware.sane.disabledDefaultBackends = mkOption {
|
||||||
|
|
|
@ -433,6 +433,8 @@ in {
|
||||||
componentsUsingBluetooth = [
|
componentsUsingBluetooth = [
|
||||||
# Components that require the AF_BLUETOOTH address family
|
# Components that require the AF_BLUETOOTH address family
|
||||||
"august"
|
"august"
|
||||||
|
"august_ble"
|
||||||
|
"airthings_ble"
|
||||||
"bluemaestro"
|
"bluemaestro"
|
||||||
"bluetooth"
|
"bluetooth"
|
||||||
"bluetooth_le_tracker"
|
"bluetooth_le_tracker"
|
||||||
|
@ -445,15 +447,19 @@ in {
|
||||||
"govee_ble"
|
"govee_ble"
|
||||||
"homekit_controller"
|
"homekit_controller"
|
||||||
"inkbird"
|
"inkbird"
|
||||||
|
"keymitt_ble"
|
||||||
"led_ble"
|
"led_ble"
|
||||||
"melnor"
|
"melnor"
|
||||||
"moat"
|
"moat"
|
||||||
|
"oralb"
|
||||||
"qingping"
|
"qingping"
|
||||||
"sensorpro"
|
"sensorpro"
|
||||||
"sensorpush"
|
"sensorpush"
|
||||||
|
"snooz"
|
||||||
"switchbot"
|
"switchbot"
|
||||||
"thermobeacon"
|
"thermobeacon"
|
||||||
"thermopro"
|
"thermopro"
|
||||||
|
"tilt_ble"
|
||||||
"xiaomi_ble"
|
"xiaomi_ble"
|
||||||
"yalexs_ble"
|
"yalexs_ble"
|
||||||
];
|
];
|
||||||
|
|
|
@ -5,93 +5,9 @@ with lib;
|
||||||
let
|
let
|
||||||
cfg = config.services.logrotate;
|
cfg = config.services.logrotate;
|
||||||
|
|
||||||
# deprecated legacy compat settings
|
|
||||||
# these options will be removed before 22.11 in the following PR:
|
|
||||||
# https://github.com/NixOS/nixpkgs/pull/164169
|
|
||||||
pathOpts = { name, ... }: {
|
|
||||||
options = {
|
|
||||||
enable = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = true;
|
|
||||||
description = lib.mdDoc ''
|
|
||||||
Whether to enable log rotation for this path. This can be used to explicitly disable
|
|
||||||
logging that has been configured by NixOS.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
name = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
internal = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
path = mkOption {
|
|
||||||
type = with types; either str (listOf str);
|
|
||||||
default = name;
|
|
||||||
defaultText = "attribute name";
|
|
||||||
description = lib.mdDoc ''
|
|
||||||
The path to log files to be rotated.
|
|
||||||
Spaces are allowed and normal shell quoting rules apply,
|
|
||||||
with ', ", and \ characters supported.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
user = mkOption {
|
|
||||||
type = with types; nullOr str;
|
|
||||||
default = null;
|
|
||||||
description = lib.mdDoc ''
|
|
||||||
The user account to use for rotation.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
group = mkOption {
|
|
||||||
type = with types; nullOr str;
|
|
||||||
default = null;
|
|
||||||
description = lib.mdDoc ''
|
|
||||||
The group to use for rotation.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
frequency = mkOption {
|
|
||||||
type = types.enum [ "hourly" "daily" "weekly" "monthly" "yearly" ];
|
|
||||||
default = "daily";
|
|
||||||
description = lib.mdDoc ''
|
|
||||||
How often to rotate the logs.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
keep = mkOption {
|
|
||||||
type = types.int;
|
|
||||||
default = 20;
|
|
||||||
description = lib.mdDoc ''
|
|
||||||
How many rotations to keep.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
extraConfig = mkOption {
|
|
||||||
type = types.lines;
|
|
||||||
default = "";
|
|
||||||
description = lib.mdDoc ''
|
|
||||||
Extra logrotate config options for this path. Refer to
|
|
||||||
<https://linux.die.net/man/8/logrotate> for details.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
priority = mkOption {
|
|
||||||
type = types.int;
|
|
||||||
default = 1000;
|
|
||||||
description = lib.mdDoc ''
|
|
||||||
Order of this logrotate block in relation to the others. The semantics are
|
|
||||||
the same as with `lib.mkOrder`. Smaller values have a greater priority.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config.name = name;
|
|
||||||
};
|
|
||||||
|
|
||||||
generateLine = n: v:
|
generateLine = n: v:
|
||||||
if builtins.elem n [ "files" "priority" "enable" "global" ] || v == null then null
|
if builtins.elem n [ "files" "priority" "enable" "global" ] || v == null then null
|
||||||
else if builtins.elem n [ "extraConfig" "frequency" ] then "${v}\n"
|
else if builtins.elem n [ "frequency" ] then "${v}\n"
|
||||||
else if builtins.elem n [ "firstaction" "lastaction" "prerotate" "postrotate" "preremove" ]
|
else if builtins.elem n [ "firstaction" "lastaction" "prerotate" "postrotate" "preremove" ]
|
||||||
then "${n}\n ${v}\n endscript\n"
|
then "${n}\n ${v}\n endscript\n"
|
||||||
else if isInt v then "${n} ${toString v}\n"
|
else if isInt v then "${n} ${toString v}\n"
|
||||||
|
@ -110,25 +26,6 @@ let
|
||||||
${generateSection 2 settings}}
|
${generateSection 2 settings}}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# below two mapPaths are compat functions
|
|
||||||
mapPathOptToSetting = n: v:
|
|
||||||
if n == "keep" then nameValuePair "rotate" v
|
|
||||||
else if n == "path" then nameValuePair "files" v
|
|
||||||
else nameValuePair n v;
|
|
||||||
|
|
||||||
mapPathsToSettings = path: pathOpts:
|
|
||||||
nameValuePair path (
|
|
||||||
filterAttrs (n: v: ! builtins.elem n [ "user" "group" "name" ] && v != "") (
|
|
||||||
(mapAttrs' mapPathOptToSetting pathOpts) //
|
|
||||||
{
|
|
||||||
su =
|
|
||||||
if pathOpts.user != null
|
|
||||||
then "${pathOpts.user} ${pathOpts.group}"
|
|
||||||
else null;
|
|
||||||
}
|
|
||||||
)
|
|
||||||
);
|
|
||||||
|
|
||||||
settings = sortProperties (attrValues (filterAttrs (_: settings: settings.enable) (
|
settings = sortProperties (attrValues (filterAttrs (_: settings: settings.enable) (
|
||||||
foldAttrs recursiveUpdate { } [
|
foldAttrs recursiveUpdate { } [
|
||||||
{
|
{
|
||||||
|
@ -139,15 +36,7 @@ let
|
||||||
frequency = "weekly";
|
frequency = "weekly";
|
||||||
rotate = 4;
|
rotate = 4;
|
||||||
};
|
};
|
||||||
# compat section
|
|
||||||
extraConfig = {
|
|
||||||
enable = (cfg.extraConfig != "");
|
|
||||||
global = true;
|
|
||||||
extraConfig = cfg.extraConfig;
|
|
||||||
priority = 101;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
(mapAttrs' mapPathsToSettings cfg.paths)
|
|
||||||
cfg.settings
|
cfg.settings
|
||||||
{ header = { global = true; priority = 100; }; }
|
{ header = { global = true; priority = 100; }; }
|
||||||
]
|
]
|
||||||
|
@ -200,7 +89,9 @@ let
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
(mkRenamedOptionModule [ "services" "logrotate" "config" ] [ "services" "logrotate" "extraConfig" ])
|
(mkRemovedOptionModule [ "services" "logrotate" "config" ] "Modify services.logrotate.settings.header instead")
|
||||||
|
(mkRemovedOptionModule [ "services" "logrotate" "extraConfig" ] "Modify services.logrotate.settings.header instead")
|
||||||
|
(mkRemovedOptionModule [ "services" "logrotate" "paths" ] "Add attributes to services.logrotate.settings instead")
|
||||||
];
|
];
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
|
@ -218,6 +109,25 @@ in
|
||||||
or settings common to all further files settings.
|
or settings common to all further files settings.
|
||||||
Refer to <https://linux.die.net/man/8/logrotate> for details.
|
Refer to <https://linux.die.net/man/8/logrotate> for details.
|
||||||
'';
|
'';
|
||||||
|
example = literalExpression ''
|
||||||
|
{
|
||||||
|
# global options
|
||||||
|
header = {
|
||||||
|
dateext = true;
|
||||||
|
};
|
||||||
|
# example custom files
|
||||||
|
"/var/log/mylog.log" = {
|
||||||
|
frequency = "daily";
|
||||||
|
rotate = 3;
|
||||||
|
};
|
||||||
|
"multiple paths" = {
|
||||||
|
files = [
|
||||||
|
"/var/log/first*.log"
|
||||||
|
"/var/log/second.log"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
'';
|
||||||
type = types.attrsOf (types.submodule ({ name, ... }: {
|
type = types.attrsOf (types.submodule ({ name, ... }: {
|
||||||
freeformType = with types; attrsOf (nullOr (oneOf [ int bool str ]));
|
freeformType = with types; attrsOf (nullOr (oneOf [ int bool str ]));
|
||||||
|
|
||||||
|
@ -311,76 +221,10 @@ in
|
||||||
in this case you can disable the failing check with this option.
|
in this case you can disable the failing check with this option.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
# deprecated legacy compat settings
|
|
||||||
paths = mkOption {
|
|
||||||
type = with types; attrsOf (submodule pathOpts);
|
|
||||||
default = { };
|
|
||||||
description = lib.mdDoc ''
|
|
||||||
Attribute set of paths to rotate. The order each block appears in the generated configuration file
|
|
||||||
can be controlled by the [priority](#opt-services.logrotate.paths._name_.priority) option
|
|
||||||
using the same semantics as `lib.mkOrder`. Smaller values have a greater priority.
|
|
||||||
This setting has been deprecated in favor of [logrotate settings](#opt-services.logrotate.settings).
|
|
||||||
'';
|
|
||||||
example = literalExpression ''
|
|
||||||
{
|
|
||||||
httpd = {
|
|
||||||
path = "/var/log/httpd/*.log";
|
|
||||||
user = config.services.httpd.user;
|
|
||||||
group = config.services.httpd.group;
|
|
||||||
keep = 7;
|
|
||||||
};
|
|
||||||
|
|
||||||
myapp = {
|
|
||||||
path = "/var/log/myapp/*.log";
|
|
||||||
user = "myuser";
|
|
||||||
group = "mygroup";
|
|
||||||
frequency = "weekly";
|
|
||||||
keep = 5;
|
|
||||||
priority = 1;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
extraConfig = mkOption {
|
|
||||||
default = "";
|
|
||||||
type = types.lines;
|
|
||||||
description = lib.mdDoc ''
|
|
||||||
Extra contents to append to the logrotate configuration file. Refer to
|
|
||||||
<https://linux.die.net/man/8/logrotate> for details.
|
|
||||||
This setting has been deprecated in favor of
|
|
||||||
[logrotate settings](#opt-services.logrotate.settings).
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
assertions =
|
|
||||||
mapAttrsToList
|
|
||||||
(name: pathOpts:
|
|
||||||
{
|
|
||||||
assertion = (pathOpts.user != null) == (pathOpts.group != null);
|
|
||||||
message = ''
|
|
||||||
If either of `services.logrotate.paths.${name}.user` or `services.logrotate.paths.${name}.group` are specified then *both* must be specified.
|
|
||||||
'';
|
|
||||||
})
|
|
||||||
cfg.paths;
|
|
||||||
|
|
||||||
warnings =
|
|
||||||
(mapAttrsToList
|
|
||||||
(name: pathOpts: ''
|
|
||||||
Using config.services.logrotate.paths.${name} is deprecated and will become unsupported in a future release.
|
|
||||||
Please use services.logrotate.settings instead.
|
|
||||||
'')
|
|
||||||
cfg.paths
|
|
||||||
) ++
|
|
||||||
(optional (cfg.extraConfig != "") ''
|
|
||||||
Using config.services.logrotate.extraConfig is deprecated and will become unsupported in a future release.
|
|
||||||
Please use services.logrotate.settings with globals=true instead.
|
|
||||||
'');
|
|
||||||
|
|
||||||
systemd.services.logrotate = {
|
systemd.services.logrotate = {
|
||||||
description = "Logrotate Service";
|
description = "Logrotate Service";
|
||||||
startAt = "hourly";
|
startAt = "hourly";
|
||||||
|
|
|
@ -263,6 +263,15 @@ in {
|
||||||
|
|
||||||
serve = {
|
serve = {
|
||||||
enable = mkEnableOption (lib.mdDoc "Automatic nginx and uwsgi setup for mailman-web");
|
enable = mkEnableOption (lib.mdDoc "Automatic nginx and uwsgi setup for mailman-web");
|
||||||
|
|
||||||
|
virtualRoot = mkOption {
|
||||||
|
default = "/";
|
||||||
|
example = lib.literalExpression "/lists";
|
||||||
|
type = types.str;
|
||||||
|
description = lib.mdDoc ''
|
||||||
|
Path to mount the mailman-web django application on.
|
||||||
|
'';
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
extraPythonPackages = mkOption {
|
extraPythonPackages = mkOption {
|
||||||
|
@ -433,8 +442,8 @@ in {
|
||||||
enable = mkDefault true;
|
enable = mkDefault true;
|
||||||
virtualHosts = lib.genAttrs cfg.webHosts (webHost: {
|
virtualHosts = lib.genAttrs cfg.webHosts (webHost: {
|
||||||
locations = {
|
locations = {
|
||||||
"/".extraConfig = "uwsgi_pass unix:/run/mailman-web.socket;";
|
${cfg.serve.virtualRoot}.extraConfig = "uwsgi_pass unix:/run/mailman-web.socket;";
|
||||||
"/static/".alias = webSettings.STATIC_ROOT + "/";
|
"${cfg.serve.virtualRoot}/static/".alias = webSettings.STATIC_ROOT + "/";
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
@ -561,7 +570,8 @@ in {
|
||||||
type = "normal";
|
type = "normal";
|
||||||
plugins = ["python3"];
|
plugins = ["python3"];
|
||||||
home = webEnv;
|
home = webEnv;
|
||||||
module = "mailman_web.wsgi";
|
manage-script-name = true;
|
||||||
|
mount = "${cfg.serve.virtualRoot}=mailman_web.wsgi:application";
|
||||||
http = "127.0.0.1:18507";
|
http = "127.0.0.1:18507";
|
||||||
};
|
};
|
||||||
uwsgiConfigFile = pkgs.writeText "uwsgi-mailman.json" (builtins.toJSON uwsgiConfig);
|
uwsgiConfigFile = pkgs.writeText "uwsgi-mailman.json" (builtins.toJSON uwsgiConfig);
|
||||||
|
|
|
@ -260,6 +260,7 @@ in {
|
||||||
(mkRenamedOptionModule [ "services" "gitlab" "stateDir" ] [ "services" "gitlab" "statePath" ])
|
(mkRenamedOptionModule [ "services" "gitlab" "stateDir" ] [ "services" "gitlab" "statePath" ])
|
||||||
(mkRenamedOptionModule [ "services" "gitlab" "backupPath" ] [ "services" "gitlab" "backup" "path" ])
|
(mkRenamedOptionModule [ "services" "gitlab" "backupPath" ] [ "services" "gitlab" "backup" "path" ])
|
||||||
(mkRemovedOptionModule [ "services" "gitlab" "satelliteDir" ] "")
|
(mkRemovedOptionModule [ "services" "gitlab" "satelliteDir" ] "")
|
||||||
|
(mkRemovedOptionModule [ "services" "gitlab" "logrotate" "extraConfig" ] "Modify services.logrotate.settings.gitlab directly instead")
|
||||||
];
|
];
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
|
@ -871,15 +872,6 @@ in {
|
||||||
default = 30;
|
default = 30;
|
||||||
description = lib.mdDoc "How many rotations to keep.";
|
description = lib.mdDoc "How many rotations to keep.";
|
||||||
};
|
};
|
||||||
|
|
||||||
extraConfig = mkOption {
|
|
||||||
type = types.lines;
|
|
||||||
default = "";
|
|
||||||
description = lib.mdDoc ''
|
|
||||||
Extra logrotate config options for this path. Refer to
|
|
||||||
<https://linux.die.net/man/8/logrotate> for details.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
workhorse.config = mkOption {
|
workhorse.config = mkOption {
|
||||||
|
@ -1042,7 +1034,6 @@ in {
|
||||||
rotate = cfg.logrotate.keep;
|
rotate = cfg.logrotate.keep;
|
||||||
copytruncate = true;
|
copytruncate = true;
|
||||||
compress = true;
|
compress = true;
|
||||||
extraConfig = cfg.logrotate.extraConfig;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -115,7 +115,7 @@ in
|
||||||
description = "Synergy server";
|
description = "Synergy server";
|
||||||
wantedBy = optional cfgS.autoStart "graphical-session.target";
|
wantedBy = optional cfgS.autoStart "graphical-session.target";
|
||||||
path = [ pkgs.synergy ];
|
path = [ pkgs.synergy ];
|
||||||
serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergys -c ${cfgS.configFile} -f${optionalString (cfgS.address != "") " -a ${cfgS.address}"}${optionalString (cfgS.screenName != "") " -n ${cfgS.screenName}"}${optionalString cfgS.tls.enable " --enable-crypto"}${optionalString (cfgS.tls.cert != null) (" --tls-cert=${cfgS.tls.cert}")}'';
|
serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergys -c ${cfgS.configFile} -f${optionalString (cfgS.address != "") " -a ${cfgS.address}"}${optionalString (cfgS.screenName != "") " -n ${cfgS.screenName}"}${optionalString cfgS.tls.enable " --enable-crypto"}${optionalString (cfgS.tls.cert != null) (" --tls-cert ${cfgS.tls.cert}")}'';
|
||||||
serviceConfig.Restart = "on-failure";
|
serviceConfig.Restart = "on-failure";
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|
|
@ -4,6 +4,8 @@ with lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.services.prometheus.exporters.node;
|
cfg = config.services.prometheus.exporters.node;
|
||||||
|
collectorIsEnabled = final: any (collector: (final == collector)) cfg.enabledCollectors;
|
||||||
|
collectorIsDisabled = final: any (collector: (final == collector)) cfg.disabledCollectors;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
port = 9100;
|
port = 9100;
|
||||||
|
@ -35,15 +37,15 @@ in
|
||||||
${concatMapStringsSep " " (x: "--no-collector." + x) cfg.disabledCollectors} \
|
${concatMapStringsSep " " (x: "--no-collector." + x) cfg.disabledCollectors} \
|
||||||
--web.listen-address ${cfg.listenAddress}:${toString cfg.port} ${concatStringsSep " " cfg.extraFlags}
|
--web.listen-address ${cfg.listenAddress}:${toString cfg.port} ${concatStringsSep " " cfg.extraFlags}
|
||||||
'';
|
'';
|
||||||
RestrictAddressFamilies = optionals (any (collector: (collector == "logind" || collector == "systemd")) cfg.enabledCollectors) [
|
RestrictAddressFamilies = optionals (collectorIsEnabled "logind" || collectorIsEnabled "systemd") [
|
||||||
# needs access to dbus via unix sockets (logind/systemd)
|
# needs access to dbus via unix sockets (logind/systemd)
|
||||||
"AF_UNIX"
|
"AF_UNIX"
|
||||||
] ++ optionals (any (collector: (collector == "network_route" || collector == "wifi")) cfg.enabledCollectors) [
|
] ++ optionals (collectorIsEnabled "network_route" || collectorIsEnabled "wifi" || ! collectorIsDisabled "netdev") [
|
||||||
# needs netlink sockets for wireless collector
|
# needs netlink sockets for wireless collector
|
||||||
"AF_NETLINK"
|
"AF_NETLINK"
|
||||||
];
|
];
|
||||||
# The timex collector needs to access clock APIs
|
# The timex collector needs to access clock APIs
|
||||||
ProtectClock = any (collector: collector == "timex") cfg.disabledCollectors;
|
ProtectClock = collectorIsDisabled "timex";
|
||||||
# Allow space monitoring under /home
|
# Allow space monitoring under /home
|
||||||
ProtectHome = true;
|
ProtectHome = true;
|
||||||
};
|
};
|
||||||
|
|
|
@ -201,7 +201,7 @@ in
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
ExecStart = "@${cfg.package}/bin/consul consul agent -config-dir /etc/consul.d"
|
ExecStart = "@${cfg.package}/bin/consul consul agent -config-dir /etc/consul.d"
|
||||||
+ concatMapStrings (n: " -config-file ${n}") configFiles;
|
+ concatMapStrings (n: " -config-file ${n}") configFiles;
|
||||||
ExecReload = "${cfg.package}/bin/consul reload";
|
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
|
||||||
PermissionsStartOnly = true;
|
PermissionsStartOnly = true;
|
||||||
User = if cfg.dropPrivileges then "consul" else null;
|
User = if cfg.dropPrivileges then "consul" else null;
|
||||||
Restart = "on-failure";
|
Restart = "on-failure";
|
||||||
|
|
|
@ -378,7 +378,7 @@ in
|
||||||
'')
|
'')
|
||||||
cfg.xmppEnvironments))
|
cfg.xmppEnvironments))
|
||||||
+ ''
|
+ ''
|
||||||
${pkgs.jre8_headless}/bin/java -Djava.util.logging.config.file=${./logging.properties-journal} -Dconfig.file=${configFile} -jar ${pkgs.jibri}/opt/jitsi/jibri/jibri.jar --config /var/lib/jibri/jibri.json
|
${pkgs.jdk11_headless}/bin/java -Djava.util.logging.config.file=${./logging.properties-journal} -Dconfig.file=${configFile} -jar ${pkgs.jibri}/opt/jitsi/jibri/jibri.jar --config /var/lib/jibri/jibri.json
|
||||||
'';
|
'';
|
||||||
|
|
||||||
environment.HOME = "/var/lib/jibri";
|
environment.HOME = "/var/lib/jibri";
|
||||||
|
|
|
@ -54,7 +54,7 @@ in {
|
||||||
smtps = {
|
smtps = {
|
||||||
port = mkOption {
|
port = mkOption {
|
||||||
type = types.port;
|
type = types.port;
|
||||||
default = 445;
|
default = 465;
|
||||||
description = lib.mdDoc ''
|
description = lib.mdDoc ''
|
||||||
The SMTPS server port.
|
The SMTPS server port.
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -613,7 +613,7 @@ in {
|
||||||
|
|
||||||
config = mkIf cfg.enable (mkMerge [
|
config = mkIf cfg.enable (mkMerge [
|
||||||
{ warnings = let
|
{ warnings = let
|
||||||
latest = 24;
|
latest = 25;
|
||||||
upgradeWarning = major: nixos:
|
upgradeWarning = major: nixos:
|
||||||
''
|
''
|
||||||
A legacy Nextcloud install (from before NixOS ${nixos}) may be installed.
|
A legacy Nextcloud install (from before NixOS ${nixos}) may be installed.
|
||||||
|
|
|
@ -110,8 +110,6 @@ in {
|
||||||
cage = handleTest ./cage.nix {};
|
cage = handleTest ./cage.nix {};
|
||||||
cagebreak = handleTest ./cagebreak.nix {};
|
cagebreak = handleTest ./cagebreak.nix {};
|
||||||
calibre-web = handleTest ./calibre-web.nix {};
|
calibre-web = handleTest ./calibre-web.nix {};
|
||||||
cassandra_2_1 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_2_1; };
|
|
||||||
cassandra_2_2 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_2_2; };
|
|
||||||
cassandra_3_0 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_0; };
|
cassandra_3_0 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_0; };
|
||||||
cassandra_3_11 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_11; };
|
cassandra_3_11 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_11; };
|
||||||
ceph-multi-node = handleTestOn ["x86_64-linux"] ./ceph-multi-node.nix {};
|
ceph-multi-node = handleTestOn ["x86_64-linux"] ./ceph-multi-node.nix {};
|
||||||
|
@ -431,6 +429,7 @@ in {
|
||||||
nginx-etag = handleTest ./nginx-etag.nix {};
|
nginx-etag = handleTest ./nginx-etag.nix {};
|
||||||
nginx-http3 = handleTest ./nginx-http3.nix {};
|
nginx-http3 = handleTest ./nginx-http3.nix {};
|
||||||
nginx-modsecurity = handleTest ./nginx-modsecurity.nix {};
|
nginx-modsecurity = handleTest ./nginx-modsecurity.nix {};
|
||||||
|
nginx-njs = handleTest ./nginx-njs.nix {};
|
||||||
nginx-pubhtml = handleTest ./nginx-pubhtml.nix {};
|
nginx-pubhtml = handleTest ./nginx-pubhtml.nix {};
|
||||||
nginx-sandbox = handleTestOn ["x86_64-linux"] ./nginx-sandbox.nix {};
|
nginx-sandbox = handleTestOn ["x86_64-linux"] ./nginx-sandbox.nix {};
|
||||||
nginx-sso = handleTest ./nginx-sso.nix {};
|
nginx-sso = handleTest ./nginx-sso.nix {};
|
||||||
|
@ -693,6 +692,7 @@ in {
|
||||||
wmderland = handleTest ./wmderland.nix {};
|
wmderland = handleTest ./wmderland.nix {};
|
||||||
wpa_supplicant = handleTest ./wpa_supplicant.nix {};
|
wpa_supplicant = handleTest ./wpa_supplicant.nix {};
|
||||||
wordpress = handleTest ./wordpress.nix {};
|
wordpress = handleTest ./wordpress.nix {};
|
||||||
|
wrappers = handleTest ./wrappers.nix {};
|
||||||
writefreely = handleTest ./web-apps/writefreely.nix {};
|
writefreely = handleTest ./web-apps/writefreely.nix {};
|
||||||
xandikos = handleTest ./xandikos.nix {};
|
xandikos = handleTest ./xandikos.nix {};
|
||||||
xautolock = handleTest ./xautolock.nix {};
|
xautolock = handleTest ./xautolock.nix {};
|
||||||
|
|
6
third_party/nixpkgs/nixos/tests/bazarr.nix
vendored
6
third_party/nixpkgs/nixos/tests/bazarr.nix
vendored
|
@ -16,11 +16,15 @@ in
|
||||||
enable = true;
|
enable = true;
|
||||||
listenPort = port;
|
listenPort = port;
|
||||||
};
|
};
|
||||||
|
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) ["unrar"];
|
||||||
|
# Workaround for https://github.com/morpheus65535/bazarr/issues/1983
|
||||||
|
# ("Crash when running without timezone info").
|
||||||
|
time.timeZone = "UTC";
|
||||||
};
|
};
|
||||||
|
|
||||||
testScript = ''
|
testScript = ''
|
||||||
machine.wait_for_unit("bazarr.service")
|
machine.wait_for_unit("bazarr.service")
|
||||||
machine.wait_for_open_port(port)
|
machine.wait_for_open_port(${toString port})
|
||||||
machine.succeed("curl --fail http://localhost:${toString port}/")
|
machine.succeed("curl --fail http://localhost:${toString port}/")
|
||||||
'';
|
'';
|
||||||
})
|
})
|
||||||
|
|
3
third_party/nixpkgs/nixos/tests/jibri.nix
vendored
3
third_party/nixpkgs/nixos/tests/jibri.nix
vendored
|
@ -34,9 +34,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
||||||
machine.wait_for_unit("prosody.service")
|
machine.wait_for_unit("prosody.service")
|
||||||
machine.wait_for_unit("jibri.service")
|
machine.wait_for_unit("jibri.service")
|
||||||
|
|
||||||
machine.wait_until_succeeds(
|
|
||||||
"journalctl -b -u jitsi-videobridge2 -o cat | grep -q 'Performed a successful health check'", timeout=30
|
|
||||||
)
|
|
||||||
machine.wait_until_succeeds(
|
machine.wait_until_succeeds(
|
||||||
"journalctl -b -u prosody -o cat | grep -q 'Authenticated as focus@auth.machine'", timeout=31
|
"journalctl -b -u prosody -o cat | grep -q 'Authenticated as focus@auth.machine'", timeout=31
|
||||||
)
|
)
|
||||||
|
|
29
third_party/nixpkgs/nixos/tests/logrotate.nix
vendored
29
third_party/nixpkgs/nixos/tests/logrotate.nix
vendored
|
@ -64,29 +64,6 @@ import ./make-test-python.nix ({ pkgs, ... }: rec {
|
||||||
notifempty = true;
|
notifempty = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
# extraConfig compatibility - should be added to top level, early.
|
|
||||||
services.logrotate.extraConfig = ''
|
|
||||||
nomail
|
|
||||||
'';
|
|
||||||
# paths compatibility
|
|
||||||
services.logrotate.paths = {
|
|
||||||
compat_path = {
|
|
||||||
path = "compat_test_path";
|
|
||||||
};
|
|
||||||
# user/group should be grouped as 'su user group'
|
|
||||||
compat_user = {
|
|
||||||
user = config.users.users.root.name;
|
|
||||||
group = "root";
|
|
||||||
};
|
|
||||||
# extraConfig in path should be added to block
|
|
||||||
compat_extraConfig = {
|
|
||||||
extraConfig = "dateext";
|
|
||||||
};
|
|
||||||
# keep -> rotate
|
|
||||||
compat_keep = {
|
|
||||||
keep = 1;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -127,12 +104,6 @@ import ./make-test-python.nix ({ pkgs, ... }: rec {
|
||||||
"sed -ne '/\"postrotate\" {/,/}/p' /tmp/logrotate.conf | grep endscript",
|
"sed -ne '/\"postrotate\" {/,/}/p' /tmp/logrotate.conf | grep endscript",
|
||||||
"grep '\"file1\"\n\"file2\" {' /tmp/logrotate.conf",
|
"grep '\"file1\"\n\"file2\" {' /tmp/logrotate.conf",
|
||||||
"sed -ne '/\"import\" {/,/}/p' /tmp/logrotate.conf | grep noolddir",
|
"sed -ne '/\"import\" {/,/}/p' /tmp/logrotate.conf | grep noolddir",
|
||||||
"sed -ne '1,/^\"/p' /tmp/logrotate.conf | grep nomail",
|
|
||||||
"grep '\"compat_test_path\" {' /tmp/logrotate.conf",
|
|
||||||
"sed -ne '/\"compat_user\" {/,/}/p' /tmp/logrotate.conf | grep 'su root root'",
|
|
||||||
"sed -ne '/\"compat_extraConfig\" {/,/}/p' /tmp/logrotate.conf | grep dateext",
|
|
||||||
"[[ $(sed -ne '/\"compat_keep\" {/,/}/p' /tmp/logrotate.conf | grep -w rotate) = \" rotate 1\" ]]",
|
|
||||||
"! sed -ne '/\"compat_keep\" {/,/}/p' /tmp/logrotate.conf | grep -w keep",
|
|
||||||
)
|
)
|
||||||
# also check configFile option
|
# also check configFile option
|
||||||
failingMachine.succeed(
|
failingMachine.succeed(
|
||||||
|
|
|
@ -1,8 +1,5 @@
|
||||||
{ lib, pkgs }: {
|
{ lib, pkgs }: {
|
||||||
mariadbPackages = lib.filterAttrs (n: _: lib.hasPrefix "mariadb" n) (pkgs.callPackage ../../../pkgs/servers/sql/mariadb {
|
mariadbPackages = lib.filterAttrs (n: _: lib.hasPrefix "mariadb" n) (import ../../../pkgs/servers/sql/mariadb pkgs);
|
||||||
inherit (pkgs.darwin) cctools;
|
|
||||||
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
|
|
||||||
});
|
|
||||||
mysqlPackages = {
|
mysqlPackages = {
|
||||||
inherit (pkgs) mysql80;
|
inherit (pkgs) mysql80;
|
||||||
};
|
};
|
||||||
|
|
27
third_party/nixpkgs/nixos/tests/nginx-njs.nix
vendored
Normal file
27
third_party/nixpkgs/nixos/tests/nginx-njs.nix
vendored
Normal file
|
@ -0,0 +1,27 @@
|
||||||
|
import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
||||||
|
name = "nginx-njs";
|
||||||
|
|
||||||
|
nodes.machine = { config, lib, pkgs, ... }: {
|
||||||
|
services.nginx = {
|
||||||
|
enable = true;
|
||||||
|
additionalModules = [ pkgs.nginxModules.njs ];
|
||||||
|
commonHttpConfig = ''
|
||||||
|
js_import http from ${builtins.toFile "http.js" ''
|
||||||
|
function hello(r) {
|
||||||
|
r.return(200, "Hello world!");
|
||||||
|
}
|
||||||
|
export default {hello};
|
||||||
|
''};
|
||||||
|
'';
|
||||||
|
virtualHosts."localhost".locations."/".extraConfig = ''
|
||||||
|
js_content http.hello;
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
testScript = ''
|
||||||
|
machine.wait_for_unit("nginx")
|
||||||
|
|
||||||
|
response = machine.wait_until_succeeds("curl -fvvv -s http://127.0.0.1/")
|
||||||
|
assert "Hello world!" == response, f"Expected 'Hello world!', got '{response}'"
|
||||||
|
'';
|
||||||
|
})
|
|
@ -1,5 +1,3 @@
|
||||||
# This test runs podman and checks if simple container starts
|
|
||||||
|
|
||||||
import ../make-test-python.nix (
|
import ../make-test-python.nix (
|
||||||
{ pkgs, lib, ... }: {
|
{ pkgs, lib, ... }: {
|
||||||
name = "podman";
|
name = "podman";
|
||||||
|
@ -8,31 +6,31 @@ import ../make-test-python.nix (
|
||||||
};
|
};
|
||||||
|
|
||||||
nodes = {
|
nodes = {
|
||||||
podman =
|
podman = { pkgs, ... }: {
|
||||||
{ pkgs, ... }:
|
virtualisation.podman.enable = true;
|
||||||
{
|
|
||||||
virtualisation.podman.enable = true;
|
|
||||||
|
|
||||||
# To test docker socket support
|
|
||||||
virtualisation.podman.dockerSocket.enable = true;
|
|
||||||
environment.systemPackages = [
|
|
||||||
pkgs.docker-client
|
|
||||||
];
|
|
||||||
|
|
||||||
users.users.alice = {
|
|
||||||
isNormalUser = true;
|
|
||||||
home = "/home/alice";
|
|
||||||
description = "Alice Foobar";
|
|
||||||
extraGroups = [ "podman" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
users.users.mallory = {
|
|
||||||
isNormalUser = true;
|
|
||||||
home = "/home/mallory";
|
|
||||||
description = "Mallory Foobar";
|
|
||||||
};
|
|
||||||
|
|
||||||
|
users.users.alice = {
|
||||||
|
isNormalUser = true;
|
||||||
};
|
};
|
||||||
|
};
|
||||||
|
docker = { pkgs, ... }: {
|
||||||
|
virtualisation.podman.enable = true;
|
||||||
|
|
||||||
|
virtualisation.podman.dockerSocket.enable = true;
|
||||||
|
|
||||||
|
environment.systemPackages = [
|
||||||
|
pkgs.docker-client
|
||||||
|
];
|
||||||
|
|
||||||
|
users.users.alice = {
|
||||||
|
isNormalUser = true;
|
||||||
|
extraGroups = [ "podman" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
users.users.mallory = {
|
||||||
|
isNormalUser = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
testScript = ''
|
testScript = ''
|
||||||
|
@ -45,6 +43,7 @@ import ../make-test-python.nix (
|
||||||
|
|
||||||
|
|
||||||
podman.wait_for_unit("sockets.target")
|
podman.wait_for_unit("sockets.target")
|
||||||
|
docker.wait_for_unit("sockets.target")
|
||||||
start_all()
|
start_all()
|
||||||
|
|
||||||
with subtest("Run container as root with runc"):
|
with subtest("Run container as root with runc"):
|
||||||
|
@ -74,8 +73,10 @@ import ../make-test-python.nix (
|
||||||
podman.succeed("podman stop sleeping")
|
podman.succeed("podman stop sleeping")
|
||||||
podman.succeed("podman rm sleeping")
|
podman.succeed("podman rm sleeping")
|
||||||
|
|
||||||
# create systemd session for rootless
|
# start systemd session for rootless
|
||||||
podman.succeed("loginctl enable-linger alice")
|
podman.succeed("loginctl enable-linger alice")
|
||||||
|
podman.succeed(su_cmd("whoami"))
|
||||||
|
podman.sleep(1)
|
||||||
|
|
||||||
with subtest("Run container rootless with runc"):
|
with subtest("Run container rootless with runc"):
|
||||||
podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg"))
|
podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg"))
|
||||||
|
@ -120,22 +121,22 @@ import ../make-test-python.nix (
|
||||||
assert pid == "2"
|
assert pid == "2"
|
||||||
|
|
||||||
with subtest("A podman member can use the docker cli"):
|
with subtest("A podman member can use the docker cli"):
|
||||||
podman.succeed(su_cmd("docker version"))
|
docker.succeed(su_cmd("docker version"))
|
||||||
|
|
||||||
with subtest("Run container via docker cli"):
|
with subtest("Run container via docker cli"):
|
||||||
podman.succeed("docker network create default")
|
docker.succeed("docker network create default")
|
||||||
podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
|
docker.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
|
||||||
podman.succeed(
|
docker.succeed(
|
||||||
"docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin localhost/scratchimg /bin/sleep 10"
|
"docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin localhost/scratchimg /bin/sleep 10"
|
||||||
)
|
)
|
||||||
podman.succeed("docker ps | grep sleeping")
|
docker.succeed("docker ps | grep sleeping")
|
||||||
podman.succeed("podman ps | grep sleeping")
|
docker.succeed("podman ps | grep sleeping")
|
||||||
podman.succeed("docker stop sleeping")
|
docker.succeed("docker stop sleeping")
|
||||||
podman.succeed("docker rm sleeping")
|
docker.succeed("docker rm sleeping")
|
||||||
podman.succeed("docker network rm default")
|
docker.succeed("docker network rm default")
|
||||||
|
|
||||||
with subtest("A podman non-member can not use the docker cli"):
|
with subtest("A podman non-member can not use the docker cli"):
|
||||||
podman.fail(su_cmd("docker version", user="mallory"))
|
docker.fail(su_cmd("docker version", user="mallory"))
|
||||||
|
|
||||||
# TODO: add docker-compose test
|
# TODO: add docker-compose test
|
||||||
|
|
||||||
|
|
79
third_party/nixpkgs/nixos/tests/wrappers.nix
vendored
Normal file
79
third_party/nixpkgs/nixos/tests/wrappers.nix
vendored
Normal file
|
@ -0,0 +1,79 @@
|
||||||
|
import ./make-test-python.nix ({ pkgs, ... }:
|
||||||
|
let
|
||||||
|
userUid = 1000;
|
||||||
|
usersGid = 100;
|
||||||
|
busybox = pkgs : pkgs.busybox.override {
|
||||||
|
# Without this, the busybox binary drops euid to ruid for most applets, including id.
|
||||||
|
# See https://bugs.busybox.net/show_bug.cgi?id=15101
|
||||||
|
extraConfig = "CONFIG_FEATURE_SUID n";
|
||||||
|
};
|
||||||
|
in
|
||||||
|
{
|
||||||
|
name = "wrappers";
|
||||||
|
|
||||||
|
nodes.machine = { config, pkgs, ... }: {
|
||||||
|
ids.gids.users = usersGid;
|
||||||
|
|
||||||
|
users.users = {
|
||||||
|
regular = {
|
||||||
|
uid = userUid;
|
||||||
|
isNormalUser = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
security.wrappers = {
|
||||||
|
suidRoot = {
|
||||||
|
owner = "root";
|
||||||
|
group = "root";
|
||||||
|
setuid = true;
|
||||||
|
source = "${busybox pkgs}/bin/busybox";
|
||||||
|
program = "suid_root_busybox";
|
||||||
|
};
|
||||||
|
sgidRoot = {
|
||||||
|
owner = "root";
|
||||||
|
group = "root";
|
||||||
|
setgid = true;
|
||||||
|
source = "${busybox pkgs}/bin/busybox";
|
||||||
|
program = "sgid_root_busybox";
|
||||||
|
};
|
||||||
|
withChown = {
|
||||||
|
owner = "root";
|
||||||
|
group = "root";
|
||||||
|
source = "${pkgs.libcap}/bin/capsh";
|
||||||
|
program = "capsh_with_chown";
|
||||||
|
capabilities = "cap_chown+ep";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
testScript =
|
||||||
|
''
|
||||||
|
def cmd_as_regular(cmd):
|
||||||
|
return "su -l regular -c '{0}'".format(cmd)
|
||||||
|
|
||||||
|
def test_as_regular(cmd, expected):
|
||||||
|
out = machine.succeed(cmd_as_regular(cmd)).strip()
|
||||||
|
assert out == expected, "Expected {0} to output {1}, but got {2}".format(cmd, expected, out)
|
||||||
|
|
||||||
|
test_as_regular('${busybox pkgs}/bin/busybox id -u', '${toString userUid}')
|
||||||
|
test_as_regular('${busybox pkgs}/bin/busybox id -ru', '${toString userUid}')
|
||||||
|
test_as_regular('${busybox pkgs}/bin/busybox id -g', '${toString usersGid}')
|
||||||
|
test_as_regular('${busybox pkgs}/bin/busybox id -rg', '${toString usersGid}')
|
||||||
|
|
||||||
|
test_as_regular('/run/wrappers/bin/suid_root_busybox id -u', '0')
|
||||||
|
test_as_regular('/run/wrappers/bin/suid_root_busybox id -ru', '${toString userUid}')
|
||||||
|
test_as_regular('/run/wrappers/bin/suid_root_busybox id -g', '${toString usersGid}')
|
||||||
|
test_as_regular('/run/wrappers/bin/suid_root_busybox id -rg', '${toString usersGid}')
|
||||||
|
|
||||||
|
test_as_regular('/run/wrappers/bin/sgid_root_busybox id -u', '${toString userUid}')
|
||||||
|
test_as_regular('/run/wrappers/bin/sgid_root_busybox id -ru', '${toString userUid}')
|
||||||
|
test_as_regular('/run/wrappers/bin/sgid_root_busybox id -g', '0')
|
||||||
|
test_as_regular('/run/wrappers/bin/sgid_root_busybox id -rg', '${toString usersGid}')
|
||||||
|
|
||||||
|
# We are only testing the permitted set, because it's easiest to look at with capsh.
|
||||||
|
machine.fail(cmd_as_regular('${pkgs.libcap}/bin/capsh --has-p=CAP_CHOWN'))
|
||||||
|
machine.fail(cmd_as_regular('${pkgs.libcap}/bin/capsh --has-p=CAP_SYS_ADMIN'))
|
||||||
|
machine.succeed(cmd_as_regular('/run/wrappers/bin/capsh_with_chown --has-p=CAP_CHOWN'))
|
||||||
|
machine.fail(cmd_as_regular('/run/wrappers/bin/capsh_with_chown --has-p=CAP_SYS_ADMIN'))
|
||||||
|
'';
|
||||||
|
})
|
|
@ -20,7 +20,7 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "squeekboard";
|
pname = "squeekboard";
|
||||||
version = "1.17.0";
|
version = "1.20.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
domain = "gitlab.gnome.org";
|
domain = "gitlab.gnome.org";
|
||||||
|
@ -28,18 +28,23 @@ stdenv.mkDerivation rec {
|
||||||
owner = "Phosh";
|
owner = "Phosh";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-U46OQ0bXkXv6za8vUZxtbxJKqiF/X/xxJsqQGpnRIpg=";
|
sha256 = "sha256-wx3fKRX/SPYGAFuR9u03JAvVRhtYIPUvW8mAsCdx83I=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||||
inherit src;
|
inherit src;
|
||||||
cargoUpdateHook = ''
|
cargoUpdateHook = ''
|
||||||
cat Cargo.toml.in Cargo.deps > Cargo.toml
|
cat Cargo.toml.in Cargo.deps.newer > Cargo.toml
|
||||||
|
cp Cargo.lock.newer Cargo.lock
|
||||||
'';
|
'';
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
sha256 = "sha256-4q8MW1n/xu538+R5ZlA+p/hd6pOQPKj7jOFwnuMc7sk=";
|
sha256 = "sha256-BbNkapqnqEW/NglrCse10Tm80SXYVQWWrOC5dTN6oi0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
mesonFlags = [
|
||||||
|
"-Dnewer=true"
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
meson
|
meson
|
||||||
ninja
|
ninja
|
||||||
|
@ -67,7 +72,7 @@ stdenv.mkDerivation rec {
|
||||||
description = "A virtual keyboard supporting Wayland";
|
description = "A virtual keyboard supporting Wayland";
|
||||||
homepage = "https://source.puri.sm/Librem5/squeekboard";
|
homepage = "https://source.puri.sm/Librem5/squeekboard";
|
||||||
license = licenses.gpl3Plus;
|
license = licenses.gpl3Plus;
|
||||||
maintainers = with maintainers; [ artturin ];
|
maintainers = with maintainers; [ artturin tomfitzhenry ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchurl
|
, fetchurl
|
||||||
|
, autoreconfHook
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, intltool
|
, intltool
|
||||||
, avahi
|
, avahi
|
||||||
|
@ -24,7 +25,14 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "16nhfb3h5pc7flagfdz7xy0iq6kvgy6h4bfpi523i57rxvlfshhl";
|
sha256 = "16nhfb3h5pc7flagfdz7xy0iq6kvgy6h4bfpi523i57rxvlfshhl";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config gettext intltool wrapGAppsHook ];
|
nativeBuildInputs = [
|
||||||
|
autoreconfHook
|
||||||
|
pkg-config
|
||||||
|
gettext
|
||||||
|
intltool
|
||||||
|
wrapGAppsHook
|
||||||
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
avahi
|
avahi
|
||||||
curl
|
curl
|
||||||
|
@ -36,6 +44,12 @@ stdenv.mkDerivation rec {
|
||||||
taglib
|
taglib
|
||||||
];
|
];
|
||||||
|
|
||||||
|
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||||
|
for file in $out/lib/ario/plugins/*.dylib; do
|
||||||
|
ln -s $file $out/lib/ario/plugins/$(basename $file .dylib).so
|
||||||
|
done
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "GTK client for MPD (Music player daemon)";
|
description = "GTK client for MPD (Music player daemon)";
|
||||||
homepage = "http://ario-player.sourceforge.net/";
|
homepage = "http://ario-player.sourceforge.net/";
|
||||||
|
|
|
@ -6,11 +6,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "bitwig-studio";
|
pname = "bitwig-studio";
|
||||||
version = "4.4.1";
|
version = "4.4.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb";
|
url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb";
|
||||||
sha256 = "sha256-+NvQ7TA8WLnZKbzsB+jLl/CIg7tayKd+W2svtXtDsT4=";
|
sha256 = "sha256-nLXpf0Xi7yuz/Rm8Sfkr1PGLuazN+Lh6sIqkWFBmP3w=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];
|
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, unzip, portaudio, wxGTK, sox }:
|
{ lib, stdenv, fetchurl, pkg-config, unzip, portaudio, wxGTK32, sox }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "espeakedit";
|
pname = "espeakedit";
|
||||||
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config unzip ];
|
nativeBuildInputs = [ pkg-config unzip ];
|
||||||
buildInputs = [ portaudio wxGTK ];
|
buildInputs = [ portaudio wxGTK32 ];
|
||||||
|
|
||||||
# TODO:
|
# TODO:
|
||||||
# Uhm, seems like espeakedit still wants espeak-data/ in $HOME, even thought
|
# Uhm, seems like espeakedit still wants espeak-data/ in $HOME, even thought
|
||||||
|
@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
|
||||||
./espeakedit-configurable-sox-path.patch
|
./espeakedit-configurable-sox-path.patch
|
||||||
./espeakedit-configurable-path-espeak-data.patch
|
./espeakedit-configurable-path-espeak-data.patch
|
||||||
./espeakedit-gcc6.patch
|
./espeakedit-gcc6.patch
|
||||||
|
./espeakedit-wxgtk30.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
32
third_party/nixpkgs/pkgs/applications/audio/espeak/espeakedit-wxgtk30.patch
vendored
Normal file
32
third_party/nixpkgs/pkgs/applications/audio/espeak/espeakedit-wxgtk30.patch
vendored
Normal file
|
@ -0,0 +1,32 @@
|
||||||
|
diff -uNr a/src/espeakedit.cpp b/src/espeakedit.cpp
|
||||||
|
--- a/src/espeakedit.cpp
|
||||||
|
+++ b/src/espeakedit.cpp
|
||||||
|
@@ -123,7 +126,7 @@ bool MyApp::OnInit(void)
|
||||||
|
{//=====================
|
||||||
|
|
||||||
|
int j;
|
||||||
|
-wxChar *p;
|
||||||
|
+const wxChar *p;
|
||||||
|
char param[120];
|
||||||
|
|
||||||
|
|
||||||
|
diff -uNr a/src/spect.cpp b/src/spect.cpp
|
||||||
|
--- a/src/spect.cpp
|
||||||
|
+++ b/src/spect.cpp
|
||||||
|
@@ -1,6 +1,7 @@
|
||||||
|
/***************************************************************************
|
||||||
|
* Copyright (C) 2005 to 2007 by Jonathan Duddington *
|
||||||
|
* email: jonsd@users.sourceforge.net *
|
||||||
|
+ * Copyright (C) 2013 by Reece H. Dunn *
|
||||||
|
* *
|
||||||
|
* This program is free software; you can redistribute it and/or modify *
|
||||||
|
* it under the terms of the GNU General Public License as published by *
|
||||||
|
@@ -92,6 +93,8 @@ float SpectTilt(int value, int freq)
|
||||||
|
|
||||||
|
|
||||||
|
SpectFrame::SpectFrame(SpectFrame *copy)
|
||||||
|
+ : FONT_SMALL(8,wxSWISS,wxNORMAL,wxNORMAL)
|
||||||
|
+ , FONT_MEDIUM(9,wxSWISS,wxNORMAL,wxNORMAL)
|
||||||
|
{//=====================================
|
||||||
|
|
||||||
|
int ix;
|
|
@ -34,7 +34,7 @@ let
|
||||||
homepage = "https://faust.grame.fr/";
|
homepage = "https://faust.grame.fr/";
|
||||||
downloadPage = "https://github.com/grame-cncm/faust/";
|
downloadPage = "https://github.com/grame-cncm/faust/";
|
||||||
license = licenses.gpl2;
|
license = licenses.gpl2;
|
||||||
platforms = platforms.linux;
|
platforms = platforms.unix;
|
||||||
maintainers = with maintainers; [ magnetophon pmahoney ];
|
maintainers = with maintainers; [ magnetophon pmahoney ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
61
third_party/nixpkgs/pkgs/applications/audio/goodvibes/default.nix
vendored
Normal file
61
third_party/nixpkgs/pkgs/applications/audio/goodvibes/default.nix
vendored
Normal file
|
@ -0,0 +1,61 @@
|
||||||
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchFromGitLab
|
||||||
|
, meson
|
||||||
|
, ninja
|
||||||
|
, pkg-config
|
||||||
|
, glib
|
||||||
|
, gtk3
|
||||||
|
, libsoup
|
||||||
|
, keybinder3
|
||||||
|
, gst_all_1
|
||||||
|
, wrapGAppsHook
|
||||||
|
, appstream-glib
|
||||||
|
, desktop-file-utils
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "goodvibes";
|
||||||
|
version = "0.7.5";
|
||||||
|
|
||||||
|
src = fetchFromGitLab {
|
||||||
|
owner = pname;
|
||||||
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
hash = "sha256-CE9f0GnXr7wSpp8jyW0ZxGKx16r6tOaObzQXKcy5nPY=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
meson
|
||||||
|
ninja
|
||||||
|
pkg-config
|
||||||
|
wrapGAppsHook
|
||||||
|
appstream-glib
|
||||||
|
desktop-file-utils
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
glib
|
||||||
|
gtk3
|
||||||
|
libsoup
|
||||||
|
keybinder3
|
||||||
|
] ++ (with gst_all_1; [
|
||||||
|
gstreamer
|
||||||
|
gst-plugins-base
|
||||||
|
gst-plugins-good
|
||||||
|
gst-plugins-bad
|
||||||
|
gst-plugins-ugly
|
||||||
|
]);
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
patchShebangs scripts
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "A lightweight internet radio player";
|
||||||
|
homepage = "https://gitlab.com/goodvibes/goodvibes";
|
||||||
|
license = licenses.gpl3Plus;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
maintainers = with maintainers; [ zendo ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -5,14 +5,14 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "grandorgue";
|
pname = "grandorgue";
|
||||||
version = "3.8.0-1";
|
version = "3.9.0-1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "GrandOrgue";
|
owner = "GrandOrgue";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
sha256 = "sha256-VXf2B5NK6lrcNXUiTTjYhfBVrTWusyadD+5ySkmelsI=";
|
sha256 = "sha256-+LWEjoke7f+6f4K4jO9nCG88Mdg9C49+v3FboM9/NkU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -2,36 +2,32 @@
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, makeWrapper
|
|
||||||
, SDL
|
, SDL
|
||||||
, SDL_image
|
, SDL_image
|
||||||
, SDL_ttf
|
, SDL_ttf
|
||||||
, gtk2
|
, gtk3
|
||||||
, glib
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "hivelytracker";
|
pname = "hivelytracker";
|
||||||
version = "unstable-2020-08-19";
|
version = "1.9";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "pete-gordon";
|
owner = "pete-gordon";
|
||||||
repo = "hivelytracker";
|
repo = "hivelytracker";
|
||||||
rev = "c8e3c7a5ee9f4a07cb4a941caecf7e4c4f4d40e0";
|
rev = "V${lib.replaceStrings ["."] ["_"] version}";
|
||||||
sha256 = "1nqianlf1msir6wqwapi7ys1vbmf6aik58wa54b6cn5v6kwxh75a";
|
sha256 = "148p320sd8phcpmj4m85ns5zly2dawbp8kgx9ryjfdk24pa88xg6";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config
|
pkg-config
|
||||||
makeWrapper
|
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
SDL
|
SDL
|
||||||
SDL_image
|
SDL_image
|
||||||
SDL_ttf
|
SDL_ttf
|
||||||
gtk2
|
gtk3
|
||||||
glib
|
|
||||||
];
|
];
|
||||||
|
|
||||||
makeFlags = [
|
makeFlags = [
|
||||||
|
@ -40,28 +36,12 @@ stdenv.mkDerivation rec {
|
||||||
"PREFIX=$(out)"
|
"PREFIX=$(out)"
|
||||||
];
|
];
|
||||||
|
|
||||||
# TODO: try to exclude gtk and glib from darwin builds
|
|
||||||
NIX_CFLAGS_COMPILE = [
|
|
||||||
"-I${SDL}/include/SDL"
|
|
||||||
"-I${SDL_image}/include/SDL"
|
|
||||||
"-I${SDL_ttf}/include/SDL"
|
|
||||||
"-I${gtk2.dev}/include/gtk-2.0"
|
|
||||||
"-I${glib.dev}/include/glib-2.0"
|
|
||||||
];
|
|
||||||
|
|
||||||
# Also build the hvl2wav tool
|
# Also build the hvl2wav tool
|
||||||
postBuild = ''
|
postBuild = ''
|
||||||
make -C hvl2wav
|
make -C hvl2wav
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
# https://github.com/pete-gordon/hivelytracker/issues/43
|
|
||||||
# Ideally we should patch the sources, but the program can't open
|
|
||||||
# files passed as arguments anyway, so this works well enough until the
|
|
||||||
# issue is fixed.
|
|
||||||
wrapProgram $out/bin/hivelytracker \
|
|
||||||
--chdir "$out/share/hivelytracker"
|
|
||||||
|
|
||||||
# Also install the hvl2wav tool
|
# Also install the hvl2wav tool
|
||||||
install -Dm755 hvl2wav/hvl2wav $out/bin/hvl2wav
|
install -Dm755 hvl2wav/hvl2wav $out/bin/hvl2wav
|
||||||
'';
|
'';
|
||||||
|
@ -86,4 +66,3 @@ stdenv.mkDerivation rec {
|
||||||
broken = stdenv.isDarwin; # TODO: try to use xcbuild
|
broken = stdenv.isDarwin; # TODO: try to use xcbuild
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchpatch
|
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, rustPlatform
|
, rustPlatform
|
||||||
, meson
|
, meson
|
||||||
|
@ -22,26 +21,18 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "netease-cloud-music-gtk";
|
pname = "netease-cloud-music-gtk";
|
||||||
version = "2.0.2";
|
version = "2.0.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "gmg137";
|
owner = "gmg137";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-0pmuzdRQBdUS4ORh3zJQWb/hbhk7SY3P4QMwoy4Mgp8=";
|
hash = "sha256-A3mvf6TZ3+aiWA6rg9G5NMaDKvO0VQzwIM1t0MaTpTc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
(fetchpatch {
|
|
||||||
name = "add-cargo-lock-for-2.0.2.patch";
|
|
||||||
url = "https://github.com/gmg137/netease-cloud-music-gtk/commit/21b5d40d49e661fe7bd35ed10bb8b883ef7fcd9f.patch";
|
|
||||||
hash = "sha256-pSgc+yJQMNyLPYUMc1Kp/Kr+++2tH8srIM5PgVeoZ+E=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||||
inherit src patches;
|
inherit src;
|
||||||
hash = "sha256-7Z5i5Xqtk4ZbBXSVYg1e05ENa2swC88Ctd2paE60Yyo=";
|
hash = "sha256-Y7rZTbg0zd/eoo6E8TmV8JJPs1N0bLlBjvB6W07Kelg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{ lib
|
{ lib
|
||||||
, python3Packages
|
, python3Packages
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
, gettext
|
, gettext
|
||||||
, chromaprint
|
, chromaprint
|
||||||
, qt5
|
, qt5
|
||||||
|
@ -27,6 +28,15 @@ pythonPackages.buildPythonApplication rec {
|
||||||
sha256 = "sha256-KUHciIlwaKXvyCCkAzdh1vpe9cunDizrMUl0SoCpxgY=";
|
sha256 = "sha256-KUHciIlwaKXvyCCkAzdh1vpe9cunDizrMUl0SoCpxgY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# fix for tests failing with newer mutagen, remove after >2.8.3
|
||||||
|
# https://tickets.metabrainz.org/browse/PICARD-2583
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/metabrainz/picard/commit/76c2dff6b61140bbc7675c9e9f62a086b885e539.patch";
|
||||||
|
hash = "sha256-V1/oq1tEcb1mtqbYAA9o7mJcw16vRO0IK3GGmJkwO1Q=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]
|
nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]
|
||||||
++ lib.optionals (pyqt5.multimediaEnabled) [
|
++ lib.optionals (pyqt5.multimediaEnabled) [
|
||||||
qt5.qtmultimedia.bin
|
qt5.qtmultimedia.bin
|
||||||
|
|
|
@ -1,4 +1,8 @@
|
||||||
{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }:
|
{ lib
|
||||||
|
, fetchFromGitHub
|
||||||
|
, python3
|
||||||
|
, wrapQtAppsHook
|
||||||
|
}:
|
||||||
|
|
||||||
# As of 2.1, puddletag has started pinning versions of all dependencies that it
|
# As of 2.1, puddletag has started pinning versions of all dependencies that it
|
||||||
# was built against which is an issue as the chances of us having the exact same
|
# was built against which is an issue as the chances of us having the exact same
|
||||||
|
@ -14,18 +18,11 @@
|
||||||
# ignoring the pinned versions, it's just something we will have to accept
|
# ignoring the pinned versions, it's just something we will have to accept
|
||||||
# unless we want to vendor those versions.
|
# unless we want to vendor those versions.
|
||||||
|
|
||||||
let
|
|
||||||
# NOTE: check if we can drop any of these overrides when bumping the version
|
|
||||||
overrideVersions = [
|
|
||||||
"lxml"
|
|
||||||
"pyparsing"
|
|
||||||
"pyqt5"
|
|
||||||
];
|
|
||||||
|
|
||||||
in
|
python3.pkgs.buildPythonApplication rec {
|
||||||
python3Packages.buildPythonApplication rec {
|
|
||||||
pname = "puddletag";
|
pname = "puddletag";
|
||||||
version = "2.2.0";
|
version = "2.2.0";
|
||||||
|
format = "setuptools";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "puddletag";
|
owner = "puddletag";
|
||||||
|
@ -34,26 +31,29 @@ python3Packages.buildPythonApplication rec {
|
||||||
hash = "sha256-KaFfpOWI9u2ZC/3kuCLneWOOKSmAaIuHPFHptkKMH/g=";
|
hash = "sha256-KaFfpOWI9u2ZC/3kuCLneWOOKSmAaIuHPFHptkKMH/g=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
pythonRelaxDeps = true;
|
||||||
|
|
||||||
|
pythonRemoveDeps = [
|
||||||
|
"chromaprint"
|
||||||
|
"pyqt5-qt5"
|
||||||
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace setup.py \
|
substituteInPlace setup.py \
|
||||||
--replace share/pixmaps share/icons
|
--replace share/pixmaps share/icons
|
||||||
|
'';
|
||||||
|
|
||||||
cp requirements.in requirements.txt
|
nativeBuildInputs = [
|
||||||
sed -i requirements.txt -e 's/^chromaprint$//'
|
python3.pkgs.pythonRelaxDepsHook
|
||||||
'' + lib.concatMapStringsSep "\n"
|
wrapQtAppsHook
|
||||||
(e: ''
|
];
|
||||||
sed -i requirements.txt -e 's/^${e}.*/${e}/'
|
|
||||||
'')
|
|
||||||
overrideVersions;
|
|
||||||
|
|
||||||
nativeBuildInputs = [ wrapQtAppsHook ];
|
propagatedBuildInputs = with python3.pkgs; [
|
||||||
|
|
||||||
propagatedBuildInputs = with python3Packages; [
|
|
||||||
pyacoustid
|
|
||||||
configobj
|
configobj
|
||||||
levenshtein
|
levenshtein
|
||||||
lxml
|
lxml
|
||||||
mutagen
|
mutagen
|
||||||
|
pyacoustid
|
||||||
pyparsing
|
pyparsing
|
||||||
pyqt5
|
pyqt5
|
||||||
rapidfuzz
|
rapidfuzz
|
||||||
|
|
|
@ -2,6 +2,9 @@
|
||||||
, glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify
|
, glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify
|
||||||
, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curlWithGnuTls, zlib, gnome
|
, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curlWithGnuTls, zlib, gnome
|
||||||
, at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon
|
, at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon
|
||||||
|
# High-DPI support: Spotify's --force-device-scale-factor argument
|
||||||
|
# not added if `null`, otherwise, should be a number.
|
||||||
|
, deviceScaleFactor ? null
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -67,7 +70,7 @@ let
|
||||||
in
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "spotify-unwrapped";
|
pname = "spotify";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
||||||
# fetch from snapcraft instead of the debian repository most repos fetch from.
|
# fetch from snapcraft instead of the debian repository most repos fetch from.
|
||||||
|
@ -143,6 +146,9 @@ stdenv.mkDerivation {
|
||||||
librarypath="${lib.makeLibraryPath deps}:$libdir"
|
librarypath="${lib.makeLibraryPath deps}:$libdir"
|
||||||
wrapProgram $out/share/spotify/spotify \
|
wrapProgram $out/share/spotify/spotify \
|
||||||
''${gappsWrapperArgs[@]} \
|
''${gappsWrapperArgs[@]} \
|
||||||
|
${lib.optionalString (deviceScaleFactor != null) ''
|
||||||
|
--add-flags "--force-device-scale-factor=${toString deviceScaleFactor}" \
|
||||||
|
''} \
|
||||||
--prefix LD_LIBRARY_PATH : "$librarypath" \
|
--prefix LD_LIBRARY_PATH : "$librarypath" \
|
||||||
--prefix PATH : "${gnome.zenity}/bin"
|
--prefix PATH : "${gnome.zenity}/bin"
|
||||||
|
|
||||||
|
|
|
@ -1,31 +0,0 @@
|
||||||
{ symlinkJoin
|
|
||||||
, lib
|
|
||||||
, spotify-unwrapped
|
|
||||||
, makeWrapper
|
|
||||||
|
|
||||||
# High-DPI support: Spotify's --force-device-scale-factor argument; not added
|
|
||||||
# if `null`, otherwise, should be a number.
|
|
||||||
, deviceScaleFactor ? null
|
|
||||||
}:
|
|
||||||
|
|
||||||
symlinkJoin {
|
|
||||||
name = "spotify-${spotify-unwrapped.version}";
|
|
||||||
|
|
||||||
paths = [ spotify-unwrapped.out ];
|
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
|
||||||
preferLocalBuild = true;
|
|
||||||
passthru.unwrapped = spotify-unwrapped;
|
|
||||||
postBuild = ''
|
|
||||||
wrapProgram $out/bin/spotify \
|
|
||||||
${lib.optionalString (deviceScaleFactor != null) ''
|
|
||||||
--add-flags ${lib.escapeShellArg "--force-device-scale-factor=${
|
|
||||||
builtins.toString deviceScaleFactor
|
|
||||||
}"}
|
|
||||||
''}
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = spotify-unwrapped.meta // {
|
|
||||||
priority = (spotify-unwrapped.meta.priority or 0) - 1;
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -34,13 +34,13 @@ stdenv.mkDerivation {
|
||||||
pname = binName;
|
pname = binName;
|
||||||
# versions are specified in `squeezelite.h`
|
# versions are specified in `squeezelite.h`
|
||||||
# see https://github.com/ralph-irving/squeezelite/issues/29
|
# see https://github.com/ralph-irving/squeezelite/issues/29
|
||||||
version = "1.9.9.1403";
|
version = "1.9.9.1411";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ralph-irving";
|
owner = "ralph-irving";
|
||||||
repo = "squeezelite";
|
repo = "squeezelite";
|
||||||
rev = "bc72c0de3fff771540a2a45aaafafed539387b3c";
|
rev = "ca44fc6e258bb413d6281d927063b25940f42e5c";
|
||||||
hash = "sha256-205i61mbeQG2MzSE9NtPHSuNeyMbjZzbZVCFFzjqKqQ=";
|
hash = "sha256-aZ+2nyy6tK3VwgTCWGoNaU4//kkHUzd6DZSfTEIgbvY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ flac libmad libvorbis mpg123 ]
|
buildInputs = [ flac libmad libvorbis mpg123 ]
|
||||||
|
@ -82,7 +82,7 @@ stdenv.mkDerivation {
|
||||||
description = "Lightweight headless squeezebox client emulator";
|
description = "Lightweight headless squeezebox client emulator";
|
||||||
homepage = "https://github.com/ralph-irving/squeezelite";
|
homepage = "https://github.com/ralph-irving/squeezelite";
|
||||||
license = with licenses; [ gpl3Plus ] ++ optional dsdSupport bsd2;
|
license = with licenses; [ gpl3Plus ] ++ optional dsdSupport bsd2;
|
||||||
maintainers = with maintainers; [ samdoshi ];
|
maintainers = with maintainers; [ adamcstephens ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,13 +18,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "tagger";
|
pname = "tagger";
|
||||||
version = "2022.10.5";
|
version = "2022.10.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nlogozzo";
|
owner = "nlogozzo";
|
||||||
repo = "NickvisionTagger";
|
repo = "NickvisionTagger";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-rkpeecJUOBom0clrwftBa/VxACTihfMfWVmfbZhMQ50=";
|
hash = "sha256-eo7H2pNtSChUAqjO0ocFjsGt4I0e8ZOHbZ/GoZgUva8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -25,13 +25,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "tauon";
|
pname = "tauon";
|
||||||
version = "7.4.2";
|
version = "7.4.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Taiko2k";
|
owner = "Taiko2k";
|
||||||
repo = "TauonMusicBox";
|
repo = "TauonMusicBox";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-fEEu7GqK1leOop3kd1Ci9BAH2bP31jvTOg3DEL8lIF4=";
|
sha256 = "sha256-eB4fwW5UvylVslSEvDFdCVYcEK3M2H+8VJGHH13vvA0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postUnpack = ''
|
postUnpack = ''
|
||||||
|
|
|
@ -7,14 +7,14 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "termusic";
|
pname = "termusic";
|
||||||
version = "0.7.3";
|
version = "0.7.5";
|
||||||
|
|
||||||
src = fetchCrate {
|
src = fetchCrate {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "sha256-5I9Fu+A5IBfaxaPcYKTzWq3/8ts0BPSOOVeU6D61dbc=";
|
sha256 = "sha256-/wpaxXY0hT7XX44cW1f3JuowE5u46/aLMC2VXgty/jE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-R/hElL0MjeBqboJTQkIREPOh+/YbdKtUAzqPD6BpSPs=";
|
cargoHash = "sha256-TznzZ1dcun57IQ8e2T2FOxSdyqxS6etnuvxOY8n1y14=";
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
buildInputs = [ alsa-lib ];
|
buildInputs = [ alsa-lib ];
|
||||||
|
|
|
@ -14,16 +14,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "alfis";
|
pname = "alfis";
|
||||||
version = "0.8.2";
|
version = "0.8.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Revertron";
|
owner = "Revertron";
|
||||||
repo = "Alfis";
|
repo = "Alfis";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-E0n1keNk5jNnErNvYhb8oe26kK9Opl+IJ5zpsvrqS84=";
|
sha256 = "sha256-QOKFnre5MW9EvrKrKBHWpOxi2fBKTDMhzCDX3ISd2cQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "sha256-kbo3OMLYA/5xctz/YhQNd8IYlyCQB7D/8rCHZwjvlMI=";
|
cargoSha256 = "sha256-D+3HIyj1zbs5m8hwLpITS25u/wrRM5GfnwlUUuLX8DQ=";
|
||||||
|
|
||||||
checkFlags = [
|
checkFlags = [
|
||||||
# these want internet access, disable them
|
# these want internet access, disable them
|
||||||
|
|
|
@ -12,16 +12,16 @@ let
|
||||||
in
|
in
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "electrs";
|
pname = "electrs";
|
||||||
version = "0.9.9";
|
version = "0.9.10";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "romanz";
|
owner = "romanz";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-jU0qN+T5bHn9l/SXDR/Wa8uCGyJhIDUCHzEQe39L2MQ=";
|
hash = "sha256-GqFtCK5hxnEfIfw3ITufeu26yueknuFZhLtGSXmJ8fE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-hdScQd0Fd6gE9/f4kk0zjZLK42oK1aaDzIOcAIsJqbU=";
|
cargoHash = "sha256-p4t+G13XaCl7+IbX5YyBFF0PmARbw4XlRvnA0PRcjvQ=";
|
||||||
|
|
||||||
# needed for librocksdb-sys
|
# needed for librocksdb-sys
|
||||||
nativeBuildInputs = [ llvmPackages.clang ];
|
nativeBuildInputs = [ llvmPackages.clang ];
|
||||||
|
@ -33,6 +33,8 @@ rustPlatform.buildRustPackage rec {
|
||||||
|
|
||||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||||
|
|
||||||
|
passthru.updateScript = ./update.sh;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "An efficient re-implementation of Electrum Server in Rust";
|
description = "An efficient re-implementation of Electrum Server in Rust";
|
||||||
homepage = "https://github.com/romanz/electrs";
|
homepage = "https://github.com/romanz/electrs";
|
||||||
|
|
|
@ -2,17 +2,17 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "erigon";
|
pname = "erigon";
|
||||||
version = "2022.10.01";
|
version = "2.29.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ledgerwatch";
|
owner = "ledgerwatch";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-FuOVI59vfhm5q92hnfgarh3zpLXSDRmZQJuERHf4I7A=";
|
sha256 = "sha256-hxbeneq1ryTsULRWalgpWRa1aIIyj/QKv5hnYvUUgMg=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-B9brjWvYw65ti2Ac3D4nQUEax/q+Uf5DTPBHXeWQybw=";
|
vendorSha256 = "sha256-VJxsmJxqER+q1rGFy1CI9Wm1+JXTGQiMJwJ+yzjRtAI=";
|
||||||
proxyVendor = true;
|
proxyVendor = true;
|
||||||
|
|
||||||
# Build errors in mdbx when format hardening is enabled:
|
# Build errors in mdbx when format hardening is enabled:
|
||||||
|
|
|
@ -9,13 +9,13 @@ let
|
||||||
|
|
||||||
in buildGoModule rec {
|
in buildGoModule rec {
|
||||||
pname = "go-ethereum";
|
pname = "go-ethereum";
|
||||||
version = "1.10.25";
|
version = "1.10.26";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ethereum";
|
owner = "ethereum";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-mnf0kMfQEEQMricZJfyF7ZB/2F1dyPBx9iT2v/rGh1U=";
|
sha256 = "sha256-eefQEOeKb6gZIJdK9cq20WnhwZE1qbyd8Cl0Hqh2+u8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-Dj+xN8lr98LJyYr2FwJ7yUIJkUeUrr1fkcbj4hShJI0=";
|
vendorSha256 = "sha256-Dj+xN8lr98LJyYr2FwJ7yUIJkUeUrr1fkcbj4hShJI0=";
|
||||||
|
@ -46,7 +46,7 @@ in buildGoModule rec {
|
||||||
"cmd/utils"
|
"cmd/utils"
|
||||||
];
|
];
|
||||||
|
|
||||||
# Following upstream: https://github.com/ethereum/go-ethereum/blob/v1.10.25/build/ci.go#L218
|
# Following upstream: https://github.com/ethereum/go-ethereum/blob/v1.10.26/build/ci.go#L218
|
||||||
tags = [ "urfave_cli_no_docs" ];
|
tags = [ "urfave_cli_no_docs" ];
|
||||||
|
|
||||||
# Fix for usb-related segmentation faults on darwin
|
# Fix for usb-related segmentation faults on darwin
|
||||||
|
|
|
@ -2,11 +2,11 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
pname = "ledger-live-desktop";
|
pname = "ledger-live-desktop";
|
||||||
version = "2.49.0";
|
version = "2.49.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
|
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
|
||||||
hash = "sha256-5HrPeLeMPh6hc1OLZVSPWMSV+ZwjgQyUmFCW+ZyYdCA=";
|
hash = "sha256-8KGZRTJu3uGFyf4vogoC9kDrKegD8Op4Z7gqQK+UFl8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
appimageContents = appimageTools.extractType2 {
|
appimageContents = appimageTools.extractType2 {
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "lighthouse";
|
pname = "lighthouse";
|
||||||
version = "3.1.2";
|
version = "3.2.1";
|
||||||
|
|
||||||
# lighthouse/common/deposit_contract/build.rs
|
# lighthouse/common/deposit_contract/build.rs
|
||||||
depositContractSpecVersion = "0.12.1";
|
depositContractSpecVersion = "0.12.1";
|
||||||
|
@ -27,10 +27,10 @@ rustPlatform.buildRustPackage rec {
|
||||||
owner = "sigp";
|
owner = "sigp";
|
||||||
repo = "lighthouse";
|
repo = "lighthouse";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-EJFg6ZjxxijxJNMwKRh0cYeqwujUV3OJgXBvBRsnbVI=";
|
sha256 = "sha256-Aqc3kk1rquhLKNZDlEun4bQpKI4Nsk7+Wr7E2IkJQEs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-iXqRtBqvM9URQsL8qGmpr3CNX2fpbtDOaluibAX/lWo=";
|
cargoSha256 = "sha256-wGEk7OfEmyeRW65kq5stvKCdnCjfssyXUmNWGkGq42M=";
|
||||||
|
|
||||||
buildFeatures = [ "modern" "gnosis" ];
|
buildFeatures = [ "modern" "gnosis" ];
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
pname = "trezor-suite";
|
pname = "trezor-suite";
|
||||||
version = "22.8.2";
|
version = "22.10.3";
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
|
|
||||||
suffix = {
|
suffix = {
|
||||||
|
@ -19,8 +19,8 @@ let
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage";
|
url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage";
|
||||||
sha512 = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'
|
sha512 = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'
|
||||||
aarch64-linux = "sha512-tzGkEDVXOJaTfRPO4UUfDpqaddjeJvVHpf81A9hhpUTRIgbAO4fcOrTgJcgWCBotDo8nHCWjw+n5BG5PEfQ19Q==";
|
aarch64-linux = "sha512-fI0N1V+6SEZ9eNf+G/w5RcY8oeA5MsVzJnpnWoMzkkHZh5jVHgNbcqVgSPbzvQ/WZNv1MX37KETcxmDwRx//yw==";
|
||||||
x86_64-linux = "sha512-qUM3HGYXbVbLRYXetLGbShPU5ochuptCUNn0G5RD3tQeipVZsgRkQCSfZ1Zb3HgoPUOna3u8Mp7Ipu1n8xi3vg==";
|
x86_64-linux = "sha512-zN89Qw6fQh27EaN9ARNwqhiBaiNoMic6Aq2UPG0OSUtOjEOdkGJ2pbR8MgWVccSgRH8ZmAAXZ0snVKfZWHbCjA==";
|
||||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -38,13 +38,13 @@ let
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "cudatext";
|
pname = "cudatext";
|
||||||
version = "1.174.0";
|
version = "1.175.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Alexey-T";
|
owner = "Alexey-T";
|
||||||
repo = "CudaText";
|
repo = "CudaText";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-3jj04ndyuJpfXu9z8j/Pdp8yNybmzLbrPr/S+uV7Rfg=";
|
hash = "sha256-Q4T4CmMK+sxOst18pW4L4uMYzc/heMetntM0L+HrSlo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -11,13 +11,13 @@
|
||||||
},
|
},
|
||||||
"ATFlatControls": {
|
"ATFlatControls": {
|
||||||
"owner": "Alexey-T",
|
"owner": "Alexey-T",
|
||||||
"rev": "2022.10.24",
|
"rev": "2022.11.03",
|
||||||
"hash": "sha256-IXMOZV4NNL7VHzlbzPCcYOPYneV7bDYm5L7Ge/SlnJs="
|
"hash": "sha256-U6jF+gXFOuPY512y4KWL18q8rZlfNwGqB9fTUHAHXl8="
|
||||||
},
|
},
|
||||||
"ATSynEdit": {
|
"ATSynEdit": {
|
||||||
"owner": "Alexey-T",
|
"owner": "Alexey-T",
|
||||||
"rev": "2022.10.25",
|
"rev": "2022.11.03",
|
||||||
"hash": "sha256-eleuHFE+kBmqKBVKOPzUAi+LVgzRr8gIKdCIPzfxUOo="
|
"hash": "sha256-BLKzmkIopcvbngQFWS+f1MQfMBOpZ9S2qch7cDGY7/0="
|
||||||
},
|
},
|
||||||
"ATSynEdit_Cmp": {
|
"ATSynEdit_Cmp": {
|
||||||
"owner": "Alexey-T",
|
"owner": "Alexey-T",
|
||||||
|
@ -36,8 +36,8 @@
|
||||||
},
|
},
|
||||||
"Python-for-Lazarus": {
|
"Python-for-Lazarus": {
|
||||||
"owner": "Alexey-T",
|
"owner": "Alexey-T",
|
||||||
"rev": "2021.10.27",
|
"rev": "2022.10.26",
|
||||||
"hash": "sha256-ikXdDUMJ9MxRejEVAhwUsXYVh0URVFHzEpnXuN5NGpA="
|
"hash": "sha256-pVVO3PMazcGizN3RI4zO2tgLJLDOYIKhwnMLBJ5IiwY="
|
||||||
},
|
},
|
||||||
"Emmet-Pascal": {
|
"Emmet-Pascal": {
|
||||||
"owner": "Alexey-T",
|
"owner": "Alexey-T",
|
||||||
|
|
|
@ -433,25 +433,26 @@ rec {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
gnuarmeclipse = buildEclipseUpdateSite rec {
|
embed-cdt = buildEclipseUpdateSite rec {
|
||||||
name = "gnuarmeclipse-${version}";
|
name = "embed-cdt-${version}";
|
||||||
version = "3.1.1-201606210758";
|
version = "6.3.1";
|
||||||
|
|
||||||
src = fetchzip {
|
src = fetchzip {
|
||||||
stripRoot = false;
|
stripRoot = true;
|
||||||
url = "https://github.com/gnuarmeclipse/plug-ins/releases/download/v${version}/ilg.gnuarmeclipse.repository-${version}.zip";
|
url = "https://github.com/eclipse-embed-cdt/eclipse-plugins/archive/v${version}.zip";
|
||||||
sha256 = "1g77jlhfa3csaxxps1z5lasrd9l2p5ajnddnq9ra5syw8ggkdc2h";
|
sha256 = "sha256-0wHRIls48NGDQzD+wuX79Thgiax+VVYVPJw2Z6NEzsg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "http://gnuarmeclipse.livius.net/";
|
homepage = "https://github.com/eclipse-embed-cdt/eclipse-plugins";
|
||||||
description = "GNU ARM Eclipse Plug-ins";
|
description = "Embedded C/C++ Development Tools (formerly GNU MCU/ARM Eclipse)";
|
||||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||||
license = licenses.epl10;
|
license = licenses.epl20;
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
maintainers = [ maintainers.bjornfor ];
|
maintainers = [ maintainers.bjornfor ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
gnuarmeclipse = embed-cdt; # backward compat alias, added 2022-11-04
|
||||||
|
|
||||||
jsonedit = buildEclipsePlugin rec {
|
jsonedit = buildEclipsePlugin rec {
|
||||||
name = "jsonedit-${version}";
|
name = "jsonedit-${version}";
|
||||||
|
|
|
@ -2,6 +2,8 @@
|
||||||
, trivialBuild
|
, trivialBuild
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, emacs
|
, emacs
|
||||||
|
, evil
|
||||||
|
, markdown-mode
|
||||||
}:
|
}:
|
||||||
|
|
||||||
trivialBuild rec {
|
trivialBuild rec {
|
||||||
|
@ -15,11 +17,9 @@ trivialBuild rec {
|
||||||
hash = "sha256-HBBuZ1VWIn6kwK5CtGIvHM1+9eiNiKPH0GUsyvpUVN8=";
|
hash = "sha256-HBBuZ1VWIn6kwK5CtGIvHM1+9eiNiKPH0GUsyvpUVN8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = propagatedUserEnvPkgs;
|
||||||
emacs
|
|
||||||
] ++ propagatedUserEnvPkgs;
|
|
||||||
|
|
||||||
propagatedUserEnvPkgs = with emacs.pkgs; [
|
propagatedUserEnvPkgs = [
|
||||||
evil
|
evil
|
||||||
markdown-mode
|
markdown-mode
|
||||||
];
|
];
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, lib, fetchgit, pkg-config, meson, ninja
|
{ stdenv, lib, fetchgit, pkg-config, meson, ninja, wrapGAppsHook
|
||||||
, enchant, gtkmm3, libchamplain, libgcrypt, shared-mime-info }:
|
, enchant, gtkmm3, libchamplain, libgcrypt, shared-mime-info }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
|
||||||
ninja
|
ninja
|
||||||
pkg-config
|
pkg-config
|
||||||
shared-mime-info # for update-mime-database
|
shared-mime-info # for update-mime-database
|
||||||
|
wrapGAppsHook
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|
|
@ -1,91 +0,0 @@
|
||||||
diff --git a/data/core/commands/findreplace.lua b/data/core/commands/findreplace.lua
|
|
||||||
index 5d27aa6..db6a2dd 100644
|
|
||||||
--- a/data/core/commands/findreplace.lua
|
|
||||||
+++ b/data/core/commands/findreplace.lua
|
|
||||||
@@ -37,7 +37,7 @@ local function update_preview(sel, search_fn, text)
|
|
||||||
last_view:scroll_to_line(line2, true)
|
|
||||||
found_expression = true
|
|
||||||
else
|
|
||||||
- last_view.doc:set_selection(unpack(sel))
|
|
||||||
+ last_view.doc:set_selection(table.unpack(sel))
|
|
||||||
found_expression = false
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -55,7 +55,7 @@ end
|
|
||||||
local function find(label, search_fn)
|
|
||||||
last_view, last_sel = core.active_view,
|
|
||||||
{ core.active_view.doc:get_selection() }
|
|
||||||
- local text = last_view.doc:get_text(unpack(last_sel))
|
|
||||||
+ local text = last_view.doc:get_text(table.unpack(last_sel))
|
|
||||||
found_expression = false
|
|
||||||
|
|
||||||
core.command_view:set_text(text, true)
|
|
||||||
@@ -69,8 +69,8 @@ local function find(label, search_fn)
|
|
||||||
last_fn, last_text = search_fn, text
|
|
||||||
else
|
|
||||||
core.error("Couldn't find %q", text)
|
|
||||||
- last_view.doc:set_selection(unpack(last_sel))
|
|
||||||
- last_view:scroll_to_make_visible(unpack(last_sel))
|
|
||||||
+ last_view.doc:set_selection(table.unpack(last_sel))
|
|
||||||
+ last_view:scroll_to_make_visible(table.unpack(last_sel))
|
|
||||||
end
|
|
||||||
end, function(text)
|
|
||||||
update_preview(last_sel, search_fn, text)
|
|
||||||
@@ -79,8 +79,8 @@ local function find(label, search_fn)
|
|
||||||
end, function(explicit)
|
|
||||||
core.status_view:remove_tooltip()
|
|
||||||
if explicit then
|
|
||||||
- last_view.doc:set_selection(unpack(last_sel))
|
|
||||||
- last_view:scroll_to_make_visible(unpack(last_sel))
|
|
||||||
+ last_view.doc:set_selection(table.unpack(last_sel))
|
|
||||||
+ last_view:scroll_to_make_visible(table.unpack(last_sel))
|
|
||||||
end
|
|
||||||
end)
|
|
||||||
end
|
|
||||||
diff --git a/data/core/doc/init.lua b/data/core/doc/init.lua
|
|
||||||
index 2e72907..0e61ffb 100644
|
|
||||||
--- a/data/core/doc/init.lua
|
|
||||||
+++ b/data/core/doc/init.lua
|
|
||||||
@@ -198,9 +198,9 @@ local function selection_iterator(invariant, idx)
|
|
||||||
local target = invariant[3] and (idx*4 - 7) or (idx*4 + 1)
|
|
||||||
if target > #invariant[1] or target <= 0 or (type(invariant[3]) == "number" and invariant[3] ~= idx - 1) then return end
|
|
||||||
if invariant[2] then
|
|
||||||
- return idx+(invariant[3] and -1 or 1), sort_positions(unpack(invariant[1], target, target+4))
|
|
||||||
+ return idx+(invariant[3] and -1 or 1), sort_positions(table.unpack(invariant[1], target, target+4))
|
|
||||||
else
|
|
||||||
- return idx+(invariant[3] and -1 or 1), unpack(invariant[1], target, target+4)
|
|
||||||
+ return idx+(invariant[3] and -1 or 1), table.unpack(invariant[1], target, target+4)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
@@ -345,7 +345,7 @@ function Doc:raw_insert(line, col, text, undo_stack, time)
|
|
||||||
|
|
||||||
-- push undo
|
|
||||||
local line2, col2 = self:position_offset(line, col, #text)
|
|
||||||
- push_undo(undo_stack, time, "selection", unpack(self.selections))
|
|
||||||
+ push_undo(undo_stack, time, "selection", table.unpack(self.selections))
|
|
||||||
push_undo(undo_stack, time, "remove", line, col, line2, col2)
|
|
||||||
|
|
||||||
-- update highlighter and assure selection is in bounds
|
|
||||||
@@ -357,7 +357,7 @@ end
|
|
||||||
function Doc:raw_remove(line1, col1, line2, col2, undo_stack, time)
|
|
||||||
-- push undo
|
|
||||||
local text = self:get_text(line1, col1, line2, col2)
|
|
||||||
- push_undo(undo_stack, time, "selection", unpack(self.selections))
|
|
||||||
+ push_undo(undo_stack, time, "selection", table.unpack(self.selections))
|
|
||||||
push_undo(undo_stack, time, "insert", line1, col1, text)
|
|
||||||
|
|
||||||
-- get line content before/after removed text
|
|
||||||
diff --git a/data/core/tokenizer.lua b/data/core/tokenizer.lua
|
|
||||||
index d95baeb..f77fed4 100644
|
|
||||||
--- a/data/core/tokenizer.lua
|
|
||||||
+++ b/data/core/tokenizer.lua
|
|
||||||
@@ -161,7 +161,7 @@ function tokenizer.tokenize(incoming_syntax, text, state)
|
|
||||||
if count % 2 == 0 then break end
|
|
||||||
end
|
|
||||||
until not res[1] or not close or not target[3]
|
|
||||||
- return unpack(res)
|
|
||||||
+ return table.unpack(res)
|
|
||||||
end
|
|
||||||
|
|
||||||
while i <= #text do
|
|
|
@ -3,7 +3,7 @@
|
||||||
, Foundation
|
, Foundation
|
||||||
, freetype
|
, freetype
|
||||||
, lib
|
, lib
|
||||||
, lua5_2
|
, lua5_4
|
||||||
, meson
|
, meson
|
||||||
, ninja
|
, ninja
|
||||||
, pcre2
|
, pcre2
|
||||||
|
@ -15,26 +15,21 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "lite-xl";
|
pname = "lite-xl";
|
||||||
version = "2.0.5";
|
version = "2.1.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "lite-xl";
|
owner = "lite-xl";
|
||||||
repo = "lite-xl";
|
repo = "lite-xl";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-7ppO5ITijhJ37OL6xlQgu1SaQ/snXDH5xJOwuXZNUVA=";
|
sha256 = "sha256-9nQFdii6SY14Cul7Ki0DUEsu75HWTCeEZtXaU6KGRiM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Fixes compatibility with Lua5.2, remove patch when a new release covers this
|
|
||||||
./0001-replace-unpack-with-table-unpack.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [ meson ninja pkg-config ];
|
nativeBuildInputs = [ meson ninja pkg-config ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
agg
|
agg
|
||||||
freetype
|
freetype
|
||||||
lua5_2
|
lua5_4
|
||||||
pcre2
|
pcre2
|
||||||
reproc
|
reproc
|
||||||
SDL2
|
SDL2
|
||||||
|
|
|
@ -281,12 +281,12 @@ final: prev:
|
||||||
|
|
||||||
SchemaStore-nvim = buildVimPluginFrom2Nix {
|
SchemaStore-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "SchemaStore.nvim";
|
pname = "SchemaStore.nvim";
|
||||||
version = "2022-10-31";
|
version = "2022-11-03";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "b0o";
|
owner = "b0o";
|
||||||
repo = "SchemaStore.nvim";
|
repo = "SchemaStore.nvim";
|
||||||
rev = "bfcd9a05ded8ff6cf89b302bee548c35177d9158";
|
rev = "6d856dc67cb85539fae976cce268e853f14079e7";
|
||||||
sha256 = "1mwj6dhk7wpyk766bq504i87hyw3rgspc64ml0kc5xf8wq1mxx4m";
|
sha256 = "09xqfahq1i59bw7fpxh6g16g1j9habsxi68v8ghr1za5lspki768";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
|
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
|
||||||
};
|
};
|
||||||
|
@ -341,12 +341,12 @@ final: prev:
|
||||||
|
|
||||||
SpaceVim = buildVimPluginFrom2Nix {
|
SpaceVim = buildVimPluginFrom2Nix {
|
||||||
pname = "SpaceVim";
|
pname = "SpaceVim";
|
||||||
version = "2022-11-01";
|
version = "2022-11-02";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "SpaceVim";
|
owner = "SpaceVim";
|
||||||
repo = "SpaceVim";
|
repo = "SpaceVim";
|
||||||
rev = "88489db9c24e6c8cbc0b39cc9b8de96d3899cb06";
|
rev = "49e0e52d512a370b53f315fcb83e0e84ebba4d86";
|
||||||
sha256 = "16hn8zpmm9qynzakj8dp3d42pczcqdb3xj5k1di7yw810r8gdycf";
|
sha256 = "19jmaabbwp8vl75ldm18vkl76xcgwfx0krihah52sdimfjy1az8i";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
|
meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
|
||||||
};
|
};
|
||||||
|
@ -365,12 +365,12 @@ final: prev:
|
||||||
|
|
||||||
SudoEdit-vim = buildVimPluginFrom2Nix {
|
SudoEdit-vim = buildVimPluginFrom2Nix {
|
||||||
pname = "SudoEdit.vim";
|
pname = "SudoEdit.vim";
|
||||||
version = "2022-08-15";
|
version = "2022-11-03";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "chrisbra";
|
owner = "chrisbra";
|
||||||
repo = "SudoEdit.vim";
|
repo = "SudoEdit.vim";
|
||||||
rev = "bcf23412e9f307036ae3dbd7968930c1fd48f02b";
|
rev = "e0ffcda0c2f98bec80cb52d1af5f3af26bd38821";
|
||||||
sha256 = "1zrf32d4v5751vivwl976sjy901vjrl1m5b2vzzmp7aic76rji7y";
|
sha256 = "125npjj74zn6ldh0656m5f7bc5035wdh7v3bwhh70jkbw36c3vvm";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/chrisbra/SudoEdit.vim/";
|
meta.homepage = "https://github.com/chrisbra/SudoEdit.vim/";
|
||||||
};
|
};
|
||||||
|
@ -442,7 +442,7 @@ final: prev:
|
||||||
owner = "ycm-core";
|
owner = "ycm-core";
|
||||||
repo = "YouCompleteMe";
|
repo = "YouCompleteMe";
|
||||||
rev = "728b47728c31bcbc92fbc196c00230d601ca2a15";
|
rev = "728b47728c31bcbc92fbc196c00230d601ca2a15";
|
||||||
sha256 = "11g2gby9qffjs4197ajzk2hsmpsjgak33rxfbfijg82m9ypsf3gc";
|
sha256 = "0mlhaxnafi6wdyxhjiy2jdpf7xqwlxh5cqjk658znb05x4kix0pp";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";
|
meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";
|
||||||
|
@ -486,12 +486,12 @@ final: prev:
|
||||||
|
|
||||||
aerial-nvim = buildVimPluginFrom2Nix {
|
aerial-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "aerial.nvim";
|
pname = "aerial.nvim";
|
||||||
version = "2022-10-31";
|
version = "2022-11-02";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "stevearc";
|
owner = "stevearc";
|
||||||
repo = "aerial.nvim";
|
repo = "aerial.nvim";
|
||||||
rev = "159041f5f6e0ba914221f097886f1d31ce419c04";
|
rev = "f15e49cbc0da8840531ed0bddf67735c604994d6";
|
||||||
sha256 = "06b5hjsbk4k9zw64zfz8pq540wd2q3i5z4sv78n3kh0cbcjj9gmw";
|
sha256 = "1lkyl27a3pn7lwcljpyy0q76c7f66jcik1nlbfq5nfr52h040061";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/stevearc/aerial.nvim/";
|
meta.homepage = "https://github.com/stevearc/aerial.nvim/";
|
||||||
|
@ -667,12 +667,12 @@ final: prev:
|
||||||
|
|
||||||
asyncrun-vim = buildVimPluginFrom2Nix {
|
asyncrun-vim = buildVimPluginFrom2Nix {
|
||||||
pname = "asyncrun.vim";
|
pname = "asyncrun.vim";
|
||||||
version = "2022-10-30";
|
version = "2022-11-03";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "skywind3000";
|
owner = "skywind3000";
|
||||||
repo = "asyncrun.vim";
|
repo = "asyncrun.vim";
|
||||||
rev = "4794a74dae54633c586eecd67e31d771323a2f72";
|
rev = "e74f19f430f98fbb5a2f4d3a725ea980876b7314";
|
||||||
sha256 = "1d3xm00xhwdm5yc08mzkvn5897rb58cjrlq86dlbypfrni512sv7";
|
sha256 = "0fasalhsyf86sr5r2y1wh6ixbf2ys7abwvsf5lzav0za59542av4";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/skywind3000/asyncrun.vim/";
|
meta.homepage = "https://github.com/skywind3000/asyncrun.vim/";
|
||||||
};
|
};
|
||||||
|
@ -907,12 +907,12 @@ final: prev:
|
||||||
|
|
||||||
bufdelete-nvim = buildVimPluginFrom2Nix {
|
bufdelete-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "bufdelete.nvim";
|
pname = "bufdelete.nvim";
|
||||||
version = "2022-10-07";
|
version = "2022-11-02";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "famiu";
|
owner = "famiu";
|
||||||
repo = "bufdelete.nvim";
|
repo = "bufdelete.nvim";
|
||||||
rev = "e88dbe0ba5829119d8edb5fc69d3c8553e324a93";
|
rev = "027d356a5caec51881089886893c197f0c27fb48";
|
||||||
sha256 = "0qja5jvx8047v5qbch6flcg8fq00369ffcivrv2gkqkmggg4dvb6";
|
sha256 = "1kg671nqjic4dn275ixf3iapj40q96mmpmi4bssz0pdd4gr37klm";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/famiu/bufdelete.nvim/";
|
meta.homepage = "https://github.com/famiu/bufdelete.nvim/";
|
||||||
};
|
};
|
||||||
|
@ -1723,12 +1723,12 @@ final: prev:
|
||||||
|
|
||||||
coc-nvim = buildVimPluginFrom2Nix {
|
coc-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "coc.nvim";
|
pname = "coc.nvim";
|
||||||
version = "2022-10-31";
|
version = "2022-11-03";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "neoclide";
|
owner = "neoclide";
|
||||||
repo = "coc.nvim";
|
repo = "coc.nvim";
|
||||||
rev = "46571a51028dccca9c10c860a51ea3c8adc92de8";
|
rev = "5f52e41be1ff19ce1f1bd3307144e7d96703b7fd";
|
||||||
sha256 = "1agm4sban6sfg626hf78ayhr98hrvi263jv6i8hk0qhcgv26k32c";
|
sha256 = "0nm8jgdgxbdlvcpl12fs2fgxww5nizjpqd2ywm2n7ca0lsjpqcx0";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/neoclide/coc.nvim/";
|
meta.homepage = "https://github.com/neoclide/coc.nvim/";
|
||||||
};
|
};
|
||||||
|
@ -2011,24 +2011,24 @@ final: prev:
|
||||||
|
|
||||||
coq-artifacts = buildVimPluginFrom2Nix {
|
coq-artifacts = buildVimPluginFrom2Nix {
|
||||||
pname = "coq.artifacts";
|
pname = "coq.artifacts";
|
||||||
version = "2022-11-01";
|
version = "2022-11-04";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ms-jpq";
|
owner = "ms-jpq";
|
||||||
repo = "coq.artifacts";
|
repo = "coq.artifacts";
|
||||||
rev = "47e6f18e8583f9d48c7e71e632ceb4121dc1d6cc";
|
rev = "4e80d710635ef4599391c5da355abe5680931469";
|
||||||
sha256 = "1k425fr1fmq6k7j16m0ylj0z3g11lcdjflw873ivw0wc9kkh6z47";
|
sha256 = "0zhscd3l9f5a0dn1zbc60p101s8447qjsjxhwivbpdyryl14ydqw";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
|
meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
|
||||||
};
|
};
|
||||||
|
|
||||||
coq-thirdparty = buildVimPluginFrom2Nix {
|
coq-thirdparty = buildVimPluginFrom2Nix {
|
||||||
pname = "coq.thirdparty";
|
pname = "coq.thirdparty";
|
||||||
version = "2022-11-01";
|
version = "2022-11-04";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ms-jpq";
|
owner = "ms-jpq";
|
||||||
repo = "coq.thirdparty";
|
repo = "coq.thirdparty";
|
||||||
rev = "eb27fa28ab08dfaf8911d0ac7f1196d8bc0290cc";
|
rev = "079553e07ac79f6416e7751d388e90849d9f2e91";
|
||||||
sha256 = "04ylxsg8xkc7ca4gj4j1r86wagjb8b8vhqwwjxan66igr6lhy2m0";
|
sha256 = "0aw779wcsak7ypq24kjras9bq3ynvxkl7s3mrn26ddpkcdrpkdlz";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
|
meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
|
||||||
};
|
};
|
||||||
|
@ -2047,12 +2047,12 @@ final: prev:
|
||||||
|
|
||||||
coq_nvim = buildVimPluginFrom2Nix {
|
coq_nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "coq_nvim";
|
pname = "coq_nvim";
|
||||||
version = "2022-11-01";
|
version = "2022-11-04";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ms-jpq";
|
owner = "ms-jpq";
|
||||||
repo = "coq_nvim";
|
repo = "coq_nvim";
|
||||||
rev = "0fefc00e9082b9e80345dc7805b146a25773ac2f";
|
rev = "f1668e780b4fbc199ceac58ccba38be5fd5fe7c6";
|
||||||
sha256 = "1ffiyqz8yqq26v81sblgn1rf6f0nxsvlqcz3ag7bxlps24fdq48x";
|
sha256 = "0qyam08y3j7z37iaajah2micq82a0jsl17qv4fjd7a2hamchzgcc";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
|
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
|
||||||
};
|
};
|
||||||
|
@ -2613,12 +2613,12 @@ final: prev:
|
||||||
|
|
||||||
dracula-nvim = buildVimPluginFrom2Nix {
|
dracula-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "dracula.nvim";
|
pname = "dracula.nvim";
|
||||||
version = "2022-10-31";
|
version = "2022-11-02";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Mofiqul";
|
owner = "Mofiqul";
|
||||||
repo = "dracula.nvim";
|
repo = "dracula.nvim";
|
||||||
rev = "09cbd3d9434c781674fafe4da03d616e35a49d51";
|
rev = "7ff76dd8248efeabb322fec87b22d33c129536fe";
|
||||||
sha256 = "06wan9q59bisd9sfdvh8rmw8vj1ahxa87r35gywlkask2jjzq83b";
|
sha256 = "1g94pxa1frc5ym506vdvfpsk7qby2wzhdv3fby5c09a1vnkz7npz";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/Mofiqul/dracula.nvim/";
|
meta.homepage = "https://github.com/Mofiqul/dracula.nvim/";
|
||||||
};
|
};
|
||||||
|
@ -2666,7 +2666,7 @@ final: prev:
|
||||||
owner = "editorconfig";
|
owner = "editorconfig";
|
||||||
repo = "editorconfig-vim";
|
repo = "editorconfig-vim";
|
||||||
rev = "6bba2596601086ddfc882488b1444bf1ea43aab9";
|
rev = "6bba2596601086ddfc882488b1444bf1ea43aab9";
|
||||||
sha256 = "02a8v3z8kla7fsirl6lqk9ijj51flhn3mwb4dsc47k4fnpxr4qcp";
|
sha256 = "16a1c1k9q6db99i0s7rm3j0g6wci8x41y71ky04hb9khqkzv3xm8";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/editorconfig/editorconfig-vim/";
|
meta.homepage = "https://github.com/editorconfig/editorconfig-vim/";
|
||||||
|
@ -2872,7 +2872,7 @@ final: prev:
|
||||||
owner = "andviro";
|
owner = "andviro";
|
||||||
repo = "flake8-vim";
|
repo = "flake8-vim";
|
||||||
rev = "5bc93f7f26ceb18ccbe116830eaf8ff2baa63994";
|
rev = "5bc93f7f26ceb18ccbe116830eaf8ff2baa63994";
|
||||||
sha256 = "1s7rb2ygky1jjjqpwhzp5lsf7js1g0yhnbf6x5lfwygz6646xpy3";
|
sha256 = "142pgasl0b64a0zxmspdsi636axrgvdx6rh3hwjrb1zlsck19y1a";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/andviro/flake8-vim/";
|
meta.homepage = "https://github.com/andviro/flake8-vim/";
|
||||||
|
@ -3455,12 +3455,12 @@ final: prev:
|
||||||
|
|
||||||
haskell-tools-nvim = buildVimPluginFrom2Nix {
|
haskell-tools-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "haskell-tools.nvim";
|
pname = "haskell-tools.nvim";
|
||||||
version = "2022-11-01";
|
version = "2022-11-04";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "MrcJkb";
|
owner = "MrcJkb";
|
||||||
repo = "haskell-tools.nvim";
|
repo = "haskell-tools.nvim";
|
||||||
rev = "249bf253c58b9e70d24a02c5231a75f69d170abe";
|
rev = "f7fa54b4efec69fb0fe5379a2d42baed4629ae76";
|
||||||
sha256 = "0qyfy5ll3rj1svp0ahbq1f3l3ywk02wm5b2d58ccgw6zfcwndm4y";
|
sha256 = "07h0mbaxxkpsp0549dd366249pql58yvns1ip4y5jndzq1164c1r";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
|
meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
|
||||||
};
|
};
|
||||||
|
@ -3960,24 +3960,24 @@ final: prev:
|
||||||
|
|
||||||
lazy-lsp-nvim = buildVimPluginFrom2Nix {
|
lazy-lsp-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "lazy-lsp.nvim";
|
pname = "lazy-lsp.nvim";
|
||||||
version = "2022-10-20";
|
version = "2022-11-02";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "dundalek";
|
owner = "dundalek";
|
||||||
repo = "lazy-lsp.nvim";
|
repo = "lazy-lsp.nvim";
|
||||||
rev = "20f66b6a1ce6b22b3c02d0f53c15dfa7c6a9f3c8";
|
rev = "7866efc6e5bef78e7f14ab2c0118c1fed15947c9";
|
||||||
sha256 = "1yigp01qk2ljzb5sskgqic7igxwa4q8rkg4ga9czb3w4f84kpb09";
|
sha256 = "1d9qk7bffj2ppyd6m6r8g5ip804kqjn64a8k7ckd6jqxfl9w3xga";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/";
|
meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/";
|
||||||
};
|
};
|
||||||
|
|
||||||
lazygit-nvim = buildVimPluginFrom2Nix {
|
lazygit-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "lazygit.nvim";
|
pname = "lazygit.nvim";
|
||||||
version = "2022-10-25";
|
version = "2022-11-02";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "kdheepak";
|
owner = "kdheepak";
|
||||||
repo = "lazygit.nvim";
|
repo = "lazygit.nvim";
|
||||||
rev = "c7a8bfb6062e57f3f7cc735720893f2706e6fc8e";
|
rev = "56045b4a0d8fa7bfee37411267ca5c6d3c1fe789";
|
||||||
sha256 = "1hn6llvqbmghjjygy9vwx3y31sra647f3ys9626c5zn4x7a09kgh";
|
sha256 = "1xpq3adm1d1dpfns2p3abm111dschwjqqns7c55f2biig9f3lapl";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/kdheepak/lazygit.nvim/";
|
meta.homepage = "https://github.com/kdheepak/lazygit.nvim/";
|
||||||
};
|
};
|
||||||
|
@ -4558,6 +4558,18 @@ final: prev:
|
||||||
meta.homepage = "https://github.com/marko-cerovac/material.nvim/";
|
meta.homepage = "https://github.com/marko-cerovac/material.nvim/";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
material-vim = buildVimPluginFrom2Nix {
|
||||||
|
pname = "material.vim";
|
||||||
|
version = "2022-09-14";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "kaicataldo";
|
||||||
|
repo = "material.vim";
|
||||||
|
rev = "81d5d0bb30677b0846a2721a600f2f45db6d10a7";
|
||||||
|
sha256 = "1j23wi0hh5h0pc0rk5dxvsc60k484h5haa2gfxzahjqd7kzil4y8";
|
||||||
|
};
|
||||||
|
meta.homepage = "https://github.com/kaicataldo/material.vim/";
|
||||||
|
};
|
||||||
|
|
||||||
mayansmoke = buildVimPluginFrom2Nix {
|
mayansmoke = buildVimPluginFrom2Nix {
|
||||||
pname = "mayansmoke";
|
pname = "mayansmoke";
|
||||||
version = "2010-10-18";
|
version = "2010-10-18";
|
||||||
|
@ -4572,12 +4584,12 @@ final: prev:
|
||||||
|
|
||||||
mini-nvim = buildVimPluginFrom2Nix {
|
mini-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "mini.nvim";
|
pname = "mini.nvim";
|
||||||
version = "2022-10-30";
|
version = "2022-11-03";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "echasnovski";
|
owner = "echasnovski";
|
||||||
repo = "mini.nvim";
|
repo = "mini.nvim";
|
||||||
rev = "3d6128b8f7c90ef8cdb0ebb7ea2f96544fa8d060";
|
rev = "993e8d200ff6d2a354e717b2beb7b31bd91b2ee4";
|
||||||
sha256 = "1y514ysh0jgx9bjh5mcnmiic4m9jzz0w2jmlsf9n42hpazbi6z22";
|
sha256 = "02gbnc28bg9sjhjmclwrkf2nh3spqibhan0xy0qdnlswms2cpp6s";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/echasnovski/mini.nvim/";
|
meta.homepage = "https://github.com/echasnovski/mini.nvim/";
|
||||||
};
|
};
|
||||||
|
@ -4944,12 +4956,12 @@ final: prev:
|
||||||
|
|
||||||
neodev-nvim = buildVimPluginFrom2Nix {
|
neodev-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "neodev.nvim";
|
pname = "neodev.nvim";
|
||||||
version = "2022-11-01";
|
version = "2022-11-04";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "folke";
|
owner = "folke";
|
||||||
repo = "neodev.nvim";
|
repo = "neodev.nvim";
|
||||||
rev = "d9d2afc71ad32ed1edb2feecfa7c5b30ce78583a";
|
rev = "d41f7e1713f3421c3c8f71c3fe4a026084227a5d";
|
||||||
sha256 = "0bgfq9lihw77x9xyfizi0p5ixf7nx0spn4v3y1469mkmgab9zfm1";
|
sha256 = "17ffq90vhy5w42h3vqczlxpvj7vxl5sznhbbmlf90psl3s1f20sf";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/folke/neodev.nvim/";
|
meta.homepage = "https://github.com/folke/neodev.nvim/";
|
||||||
};
|
};
|
||||||
|
@ -4968,12 +4980,12 @@ final: prev:
|
||||||
|
|
||||||
neogit = buildVimPluginFrom2Nix {
|
neogit = buildVimPluginFrom2Nix {
|
||||||
pname = "neogit";
|
pname = "neogit";
|
||||||
version = "2022-10-27";
|
version = "2022-11-02";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "TimUntersberger";
|
owner = "TimUntersberger";
|
||||||
repo = "neogit";
|
repo = "neogit";
|
||||||
rev = "1acb13c07b34622fe1054695afcecff537d9a00a";
|
rev = "71651625b0cccb95bd1ae152d26bcf26d96e5182";
|
||||||
sha256 = "1wihkwfqhxvaxazn2wsd18jh8qd9cc2rc1m0rd2bw3ywm7jm24aw";
|
sha256 = "06xiqy490jxiayabi135c01vmpvbqm55c20lzczms1f2zcrblkny";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/TimUntersberger/neogit/";
|
meta.homepage = "https://github.com/TimUntersberger/neogit/";
|
||||||
};
|
};
|
||||||
|
@ -5086,14 +5098,26 @@ final: prev:
|
||||||
meta.homepage = "https://github.com/kassio/neoterm/";
|
meta.homepage = "https://github.com/kassio/neoterm/";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
neotest = buildVimPluginFrom2Nix {
|
||||||
|
pname = "neotest";
|
||||||
|
version = "2022-11-03";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "nvim-neotest";
|
||||||
|
repo = "neotest";
|
||||||
|
rev = "7721205f6b8afc0dc6fa6f1f79d228c3714d6b0e";
|
||||||
|
sha256 = "1xldwbmhdm05iimxjsdw03j4xbhf46ia075zqyp6x5zz9gdvcqd0";
|
||||||
|
};
|
||||||
|
meta.homepage = "https://github.com/nvim-neotest/neotest/";
|
||||||
|
};
|
||||||
|
|
||||||
neotest-haskell = buildVimPluginFrom2Nix {
|
neotest-haskell = buildVimPluginFrom2Nix {
|
||||||
pname = "neotest-haskell";
|
pname = "neotest-haskell";
|
||||||
version = "2022-10-29";
|
version = "2022-11-04";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "MrcJkb";
|
owner = "MrcJkb";
|
||||||
repo = "neotest-haskell";
|
repo = "neotest-haskell";
|
||||||
rev = "550815b39a306dddffd133c29a9f8a4907ef4f1a";
|
rev = "74b10216995909d442ce9ffb966ae3194a6da319";
|
||||||
sha256 = "1zxlqqn490sahv3kp0hkxwqmy1a5wm4qixs4gn67vd5xl2d1jprh";
|
sha256 = "184aw9vdvahcxmnhq787yh8861ai1xsai784zfkgzz1pg4s7rvbk";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
|
meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
|
||||||
};
|
};
|
||||||
|
@ -5340,12 +5364,12 @@ final: prev:
|
||||||
|
|
||||||
null-ls-nvim = buildVimPluginFrom2Nix {
|
null-ls-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "null-ls.nvim";
|
pname = "null-ls.nvim";
|
||||||
version = "2022-10-26";
|
version = "2022-11-03";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jose-elias-alvarez";
|
owner = "jose-elias-alvarez";
|
||||||
repo = "null-ls.nvim";
|
repo = "null-ls.nvim";
|
||||||
rev = "f1add2302e6a01531a007c51054392d2029dbed4";
|
rev = "1ac465b1617b28f753cb875d8ac1d0f23c0b96d4";
|
||||||
sha256 = "050lx51x28msshjr4cq04l93brlswbx9w3kzdp35q7mxfmcr6cyg";
|
sha256 = "1f67d5ban0k1902363k3arkfpwkgqj6w1plnxnn11w1w5y3kvj9d";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
|
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
|
||||||
};
|
};
|
||||||
|
@ -5400,12 +5424,12 @@ final: prev:
|
||||||
|
|
||||||
nvim-base16 = buildVimPluginFrom2Nix {
|
nvim-base16 = buildVimPluginFrom2Nix {
|
||||||
pname = "nvim-base16";
|
pname = "nvim-base16";
|
||||||
version = "2022-11-01";
|
version = "2022-11-02";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "RRethy";
|
owner = "RRethy";
|
||||||
repo = "nvim-base16";
|
repo = "nvim-base16";
|
||||||
rev = "a1010173d1cf2fa719618644c2373611ea379402";
|
rev = "bd172d833538c48bd3d589fbc8bc2f3a395ecc7b";
|
||||||
sha256 = "17pwi0haqj7f4d81i148y5p6k5fczj6898p828gjxjm5f0blk2pj";
|
sha256 = "1h9d127s9w7qiq54596wsdgjbmhxvd7ik055n923wr4r84087vcn";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/RRethy/nvim-base16/";
|
meta.homepage = "https://github.com/RRethy/nvim-base16/";
|
||||||
};
|
};
|
||||||
|
@ -5592,12 +5616,12 @@ final: prev:
|
||||||
|
|
||||||
nvim-dap-ui = buildVimPluginFrom2Nix {
|
nvim-dap-ui = buildVimPluginFrom2Nix {
|
||||||
pname = "nvim-dap-ui";
|
pname = "nvim-dap-ui";
|
||||||
version = "2022-10-27";
|
version = "2022-11-03";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "rcarriga";
|
owner = "rcarriga";
|
||||||
repo = "nvim-dap-ui";
|
repo = "nvim-dap-ui";
|
||||||
rev = "f889edb4f2b7fafa2a8f8101aea2dc499849b2ec";
|
rev = "6a8271505e95913b82305eff63406ef22baad778";
|
||||||
sha256 = "18fi54hfybbywyafk0ik2bvgrl99i605qcs49i1a8gw3d6qx8zy1";
|
sha256 = "139qh9m28zv11xy9rjplpwb4r7g4slxcwwfzvha53bzpshn0w2v6";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";
|
meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";
|
||||||
};
|
};
|
||||||
|
@ -5784,12 +5808,12 @@ final: prev:
|
||||||
|
|
||||||
nvim-lint = buildVimPluginFrom2Nix {
|
nvim-lint = buildVimPluginFrom2Nix {
|
||||||
pname = "nvim-lint";
|
pname = "nvim-lint";
|
||||||
version = "2022-10-31";
|
version = "2022-11-02";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mfussenegger";
|
owner = "mfussenegger";
|
||||||
repo = "nvim-lint";
|
repo = "nvim-lint";
|
||||||
rev = "82f43b518460ff4e29f6b3b2b29018012cfd1a83";
|
rev = "56b6d3729e13c049901e0aa1bbea1b71e97b0cda";
|
||||||
sha256 = "17ibqbpslzgccpv447dj7cjyysyhqr4nxysyi383k1rl4a46ksb4";
|
sha256 = "05j1r3lnq4955xlmhhkjf21qyyv6gj8xrsh61b5r8ys0m74ahx98";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
|
meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
|
||||||
};
|
};
|
||||||
|
@ -5830,6 +5854,18 @@ final: prev:
|
||||||
meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/";
|
meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
nvim-luadev = buildVimPluginFrom2Nix {
|
||||||
|
pname = "nvim-luadev";
|
||||||
|
version = "2022-01-26";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "bfredl";
|
||||||
|
repo = "nvim-luadev";
|
||||||
|
rev = "2a2c242bd751c289cfc1bc27f357925f68eba098";
|
||||||
|
sha256 = "0prwzxgg6fqkfmqqs41c1c81lch2x4qrs7287l5b104rz3alcinn";
|
||||||
|
};
|
||||||
|
meta.homepage = "https://github.com/bfredl/nvim-luadev/";
|
||||||
|
};
|
||||||
|
|
||||||
nvim-luapad = buildVimPluginFrom2Nix {
|
nvim-luapad = buildVimPluginFrom2Nix {
|
||||||
pname = "nvim-luapad";
|
pname = "nvim-luapad";
|
||||||
version = "2022-10-26";
|
version = "2022-10-26";
|
||||||
|
@ -5868,12 +5904,12 @@ final: prev:
|
||||||
|
|
||||||
nvim-navic = buildVimPluginFrom2Nix {
|
nvim-navic = buildVimPluginFrom2Nix {
|
||||||
pname = "nvim-navic";
|
pname = "nvim-navic";
|
||||||
version = "2022-10-29";
|
version = "2022-11-02";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "smiteshp";
|
owner = "smiteshp";
|
||||||
repo = "nvim-navic";
|
repo = "nvim-navic";
|
||||||
rev = "eebc4f15132c587c52fcd2ce2f0da78fc19a16c0";
|
rev = "2fad33454cd6e37527a2d41f310d77b552d8c1e0";
|
||||||
sha256 = "1pwshw6r90ycc315f0savp2iid4rchqplphq9ms36nb4x36894mq";
|
sha256 = "1zdcnazqawkyab9gyfqi1mvnzzil9xvzj7mz7hjqd1w6g9r2c1ip";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/smiteshp/nvim-navic/";
|
meta.homepage = "https://github.com/smiteshp/nvim-navic/";
|
||||||
};
|
};
|
||||||
|
@ -6036,12 +6072,12 @@ final: prev:
|
||||||
|
|
||||||
nvim-treesitter = buildVimPluginFrom2Nix {
|
nvim-treesitter = buildVimPluginFrom2Nix {
|
||||||
pname = "nvim-treesitter";
|
pname = "nvim-treesitter";
|
||||||
version = "2022-11-01";
|
version = "2022-11-03";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nvim-treesitter";
|
owner = "nvim-treesitter";
|
||||||
repo = "nvim-treesitter";
|
repo = "nvim-treesitter";
|
||||||
rev = "e7bdcee167ae41295a3e99ad460ae80d2bb961d7";
|
rev = "58f61e563fadd1788052586f4d6869a99022df3c";
|
||||||
sha256 = "1h2aab3zgw4q48pllx211kxqaa47ridfa8w610jb0594sqwhfynx";
|
sha256 = "075645lkq6cr22kfab4kz7ay1cf5r0bg41r3nbhpdb52g1klrz5k";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
|
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
|
||||||
};
|
};
|
||||||
|
@ -6276,12 +6312,12 @@ final: prev:
|
||||||
|
|
||||||
onedarkpro-nvim = buildVimPluginFrom2Nix {
|
onedarkpro-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "onedarkpro.nvim";
|
pname = "onedarkpro.nvim";
|
||||||
version = "2022-10-28";
|
version = "2022-11-03";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "olimorris";
|
owner = "olimorris";
|
||||||
repo = "onedarkpro.nvim";
|
repo = "onedarkpro.nvim";
|
||||||
rev = "62b12ba06cb617fdccfd1553f864e6492dcff2fa";
|
rev = "7610bd6b4d4a6e8b4de5c8c8d81f25de2682a7ab";
|
||||||
sha256 = "1kvnycwid2s7iabaql3iwlin4n88czm56d0qd12hhz2sa6jrriy9";
|
sha256 = "07n36hlyavan02l7jf96lhkm629gkjc7d7lr6lc1fsibqzwfdxa2";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
|
meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
|
||||||
};
|
};
|
||||||
|
@ -6336,12 +6372,12 @@ final: prev:
|
||||||
|
|
||||||
orgmode = buildVimPluginFrom2Nix {
|
orgmode = buildVimPluginFrom2Nix {
|
||||||
pname = "orgmode";
|
pname = "orgmode";
|
||||||
version = "2022-10-23";
|
version = "2022-11-03";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nvim-orgmode";
|
owner = "nvim-orgmode";
|
||||||
repo = "orgmode";
|
repo = "orgmode";
|
||||||
rev = "2479971860e1237e4f0dafb6cbf412dfc8a3d89c";
|
rev = "da9a0cf060ccb27927f234a74714a74277c858f1";
|
||||||
sha256 = "1bjxmlrjpgsc70yjphb8y0mkyyy3amk49j4jsbjyh2qzdfh4bghs";
|
sha256 = "0glps3xlg2pd1gwzmpwvrq3ylcw4mzjwgdq4agdjjl6bh41vdjdq";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/nvim-orgmode/orgmode/";
|
meta.homepage = "https://github.com/nvim-orgmode/orgmode/";
|
||||||
};
|
};
|
||||||
|
@ -6606,7 +6642,7 @@ final: prev:
|
||||||
owner = "python-mode";
|
owner = "python-mode";
|
||||||
repo = "python-mode";
|
repo = "python-mode";
|
||||||
rev = "85d2cd1a196ac1def79d4599b5be69395ed5b603";
|
rev = "85d2cd1a196ac1def79d4599b5be69395ed5b603";
|
||||||
sha256 = "0gr4ag5qymdpx0mlfvx743y4s8bjd7v4a0yzd02jvmz3dyylvavw";
|
sha256 = "0jk8pssliyar4qs42x9m1jgri446cr4yc7iv8l9wc9xn6r3qnm29";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/python-mode/python-mode/";
|
meta.homepage = "https://github.com/python-mode/python-mode/";
|
||||||
|
@ -6626,12 +6662,12 @@ final: prev:
|
||||||
|
|
||||||
pywal-nvim = buildVimPluginFrom2Nix {
|
pywal-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "pywal.nvim";
|
pname = "pywal.nvim";
|
||||||
version = "2022-09-11";
|
version = "2022-11-03";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "AlphaTechnolog";
|
owner = "AlphaTechnolog";
|
||||||
repo = "pywal.nvim";
|
repo = "pywal.nvim";
|
||||||
rev = "c10ea0b90bc049f882517a65fedbef18ba8f8511";
|
rev = "d11b673c0e3d6eb8cbee7ea8cf4a8911f6ee24b9";
|
||||||
sha256 = "1irbzhw1yrds80sncqadz7d2k9xr66h3zs8pnx0malfpvgs41fyk";
|
sha256 = "00lfnbaw83iic68mvlgj75qp384g3xa5mjdhw2xmhnapghjgyv14";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/AlphaTechnolog/pywal.nvim/";
|
meta.homepage = "https://github.com/AlphaTechnolog/pywal.nvim/";
|
||||||
};
|
};
|
||||||
|
@ -6770,12 +6806,12 @@ final: prev:
|
||||||
|
|
||||||
registers-nvim = buildVimPluginFrom2Nix {
|
registers-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "registers.nvim";
|
pname = "registers.nvim";
|
||||||
version = "2022-11-01";
|
version = "2022-11-03";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "tversteeg";
|
owner = "tversteeg";
|
||||||
repo = "registers.nvim";
|
repo = "registers.nvim";
|
||||||
rev = "395e119782845fe8fa3b7d6d17c60745a2004515";
|
rev = "cacd595e794451ce2836539cff6ce0c0c45db046";
|
||||||
sha256 = "0lxfs4rvnvgc7qmcyqspgza70m66khck57fx80v4d6whz9c5ncav";
|
sha256 = "19cwkwmbb626972k8svhm04aiqw174q953bsqxsx72d5sscaisss";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/tversteeg/registers.nvim/";
|
meta.homepage = "https://github.com/tversteeg/registers.nvim/";
|
||||||
};
|
};
|
||||||
|
@ -6794,12 +6830,12 @@ final: prev:
|
||||||
|
|
||||||
rest-nvim = buildNeovimPluginFrom2Nix {
|
rest-nvim = buildNeovimPluginFrom2Nix {
|
||||||
pname = "rest.nvim";
|
pname = "rest.nvim";
|
||||||
version = "2022-09-24";
|
version = "2022-11-03";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "rest-nvim";
|
owner = "rest-nvim";
|
||||||
repo = "rest.nvim";
|
repo = "rest.nvim";
|
||||||
rev = "4a23d38726c0b3c5a2de9f927de5b0b518bdf4f7";
|
rev = "3d4bec4754b41fa1d1a2fe145cdcf3b269b3323a";
|
||||||
sha256 = "10s74zwpr9wnnwjvh079g1k9ffnjpbzpxazwbpr55z9ln02sc2vs";
|
sha256 = "0znrslxik741p8cncf60iii3v9x7ln629wixvm0cm4c6g1mk0x4x";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/rest-nvim/rest.nvim/";
|
meta.homepage = "https://github.com/rest-nvim/rest.nvim/";
|
||||||
};
|
};
|
||||||
|
@ -7276,12 +7312,12 @@ final: prev:
|
||||||
|
|
||||||
srcery-vim = buildVimPluginFrom2Nix {
|
srcery-vim = buildVimPluginFrom2Nix {
|
||||||
pname = "srcery-vim";
|
pname = "srcery-vim";
|
||||||
version = "2022-06-08";
|
version = "2022-11-02";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "srcery-colors";
|
owner = "srcery-colors";
|
||||||
repo = "srcery-vim";
|
repo = "srcery-vim";
|
||||||
rev = "0ff514ff249d0e6b6cc4702d6606f196e3827fc8";
|
rev = "cdb0bc36fda80eb58d38ecddfb1c7b2fab3a4d53";
|
||||||
sha256 = "0l5j9y414nxxiw0vxcygxfd09hn1wbwh3d6a735n6n3kn3z42ww5";
|
sha256 = "0x055kynvxym614vzxi1vv2zcndfadzjhwk92f4h6z5zvld7fpxj";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/srcery-colors/srcery-vim/";
|
meta.homepage = "https://github.com/srcery-colors/srcery-vim/";
|
||||||
};
|
};
|
||||||
|
@ -7469,12 +7505,12 @@ final: prev:
|
||||||
|
|
||||||
tabby-nvim = buildVimPluginFrom2Nix {
|
tabby-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "tabby.nvim";
|
pname = "tabby.nvim";
|
||||||
version = "2022-10-17";
|
version = "2022-11-02";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nanozuki";
|
owner = "nanozuki";
|
||||||
repo = "tabby.nvim";
|
repo = "tabby.nvim";
|
||||||
rev = "18c8effd11f801793e1a8b9adb4d6ef7fbedf57b";
|
rev = "1718f42d4044ce612091fd7a7bff0dc7313ff5b8";
|
||||||
sha256 = "0r68260gc5ln2z338mm7xb4v4y3p8xzkx1wlwagqp35dhgrl2kpn";
|
sha256 = "01p7fkhflv23slsr54j7b4cvz0bl2nwn6x0zq1c373cjq3zq2x5a";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/nanozuki/tabby.nvim/";
|
meta.homepage = "https://github.com/nanozuki/tabby.nvim/";
|
||||||
};
|
};
|
||||||
|
@ -7510,7 +7546,7 @@ final: prev:
|
||||||
owner = "codota";
|
owner = "codota";
|
||||||
repo = "tabnine-vim";
|
repo = "tabnine-vim";
|
||||||
rev = "e27face391a4d9a3e43ff251010f77deddf0c88d";
|
rev = "e27face391a4d9a3e43ff251010f77deddf0c88d";
|
||||||
sha256 = "1204ibnsdksihyvnql22sarn2xgqajwvr0d975bnp35n593chymq";
|
sha256 = "1y5haygvixnav9cck49yvvm14afyy5gyq8rwiybqvkd6vfxlv99f";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/codota/tabnine-vim/";
|
meta.homepage = "https://github.com/codota/tabnine-vim/";
|
||||||
|
@ -7759,12 +7795,12 @@ final: prev:
|
||||||
|
|
||||||
telescope-manix = buildVimPluginFrom2Nix {
|
telescope-manix = buildVimPluginFrom2Nix {
|
||||||
pname = "telescope-manix";
|
pname = "telescope-manix";
|
||||||
version = "2022-10-19";
|
version = "2022-11-04";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "MrcJkb";
|
owner = "MrcJkb";
|
||||||
repo = "telescope-manix";
|
repo = "telescope-manix";
|
||||||
rev = "9f91408328be8719ca1f6c49a3ccc1df6392d5e9";
|
rev = "700279d1d8bc0267404672d2927b522e7ca87ee3";
|
||||||
sha256 = "03wkgmwq3fl92bd4d33ahfp328pdwcmpw0pcjqf9cfaplpi0fzk2";
|
sha256 = "0d10lci5wf84wlixxqnrhn3frl735s5jmzg2yz2l79h37k84xydl";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/MrcJkb/telescope-manix/";
|
meta.homepage = "https://github.com/MrcJkb/telescope-manix/";
|
||||||
};
|
};
|
||||||
|
@ -7877,6 +7913,18 @@ final: prev:
|
||||||
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
|
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
telescope_hoogle = buildVimPluginFrom2Nix {
|
||||||
|
pname = "telescope_hoogle";
|
||||||
|
version = "2022-10-27";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "luc-tielen";
|
||||||
|
repo = "telescope_hoogle";
|
||||||
|
rev = "6322f74655a2773974377a8fc8d170c00f24938f";
|
||||||
|
sha256 = "1pjq5bwnrxb3qhvvqd9v996hqfkbg5ah7qmbzrq1287h13m5jy2n";
|
||||||
|
};
|
||||||
|
meta.homepage = "https://github.com/luc-tielen/telescope_hoogle/";
|
||||||
|
};
|
||||||
|
|
||||||
template-string-nvim = buildVimPluginFrom2Nix {
|
template-string-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "template-string.nvim";
|
pname = "template-string.nvim";
|
||||||
version = "2022-08-18";
|
version = "2022-08-18";
|
||||||
|
@ -8072,12 +8120,12 @@ final: prev:
|
||||||
|
|
||||||
toggleterm-nvim = buildVimPluginFrom2Nix {
|
toggleterm-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "toggleterm.nvim";
|
pname = "toggleterm.nvim";
|
||||||
version = "2022-10-26";
|
version = "2022-11-03";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "akinsho";
|
owner = "akinsho";
|
||||||
repo = "toggleterm.nvim";
|
repo = "toggleterm.nvim";
|
||||||
rev = "8f302c9a05ff53fc3f891cbf09c5f959b10392a3";
|
rev = "3ba683827c623affb4d9aa518e97b34db2623093";
|
||||||
sha256 = "1nvq4zridnz0pr9j9ivcl4b5w8srli8szhjy6ry22vw9c5xllzx3";
|
sha256 = "043rchc7qbn65b7wfgvp6fdg67xijgd3i3jfm82i1rha7dlymb41";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/akinsho/toggleterm.nvim/";
|
meta.homepage = "https://github.com/akinsho/toggleterm.nvim/";
|
||||||
};
|
};
|
||||||
|
@ -8696,12 +8744,12 @@ final: prev:
|
||||||
|
|
||||||
vim-airline-themes = buildVimPluginFrom2Nix {
|
vim-airline-themes = buildVimPluginFrom2Nix {
|
||||||
pname = "vim-airline-themes";
|
pname = "vim-airline-themes";
|
||||||
version = "2022-09-26";
|
version = "2022-11-03";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "vim-airline";
|
owner = "vim-airline";
|
||||||
repo = "vim-airline-themes";
|
repo = "vim-airline-themes";
|
||||||
rev = "cc5d3490c8f4c87d29d97df414941a9df8ceb390";
|
rev = "5552f5e9aa1db1b8d588b9a645a88394452d2b05";
|
||||||
sha256 = "13lslv7rr3ixcjgkklds2zsk9b0p9sx9lpl3fwzdnkcgh1x91vn8";
|
sha256 = "0bzspa5mrhs52x9q6kxkwbxvqg79myim15jg35rf517sraga5v8s";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/vim-airline/vim-airline-themes/";
|
meta.homepage = "https://github.com/vim-airline/vim-airline-themes/";
|
||||||
};
|
};
|
||||||
|
@ -9776,12 +9824,12 @@ final: prev:
|
||||||
|
|
||||||
vim-floaterm = buildVimPluginFrom2Nix {
|
vim-floaterm = buildVimPluginFrom2Nix {
|
||||||
pname = "vim-floaterm";
|
pname = "vim-floaterm";
|
||||||
version = "2022-10-30";
|
version = "2022-11-03";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "voldikss";
|
owner = "voldikss";
|
||||||
repo = "vim-floaterm";
|
repo = "vim-floaterm";
|
||||||
rev = "20cbfc777b783fd93259c83c96eef4a35c6ddbcd";
|
rev = "280b34a0760801168a67f952542b6c49292aa5f3";
|
||||||
sha256 = "02zwq4hq7zpqhmkir16bms8agvydc6fy51sgw6ycqib0hvsb34cd";
|
sha256 = "19hb8bqkk6iqy8lm4gs6kiiw6igjjyvazw9fx6gnmf86pkajk3cw";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/voldikss/vim-floaterm/";
|
meta.homepage = "https://github.com/voldikss/vim-floaterm/";
|
||||||
};
|
};
|
||||||
|
@ -10293,12 +10341,12 @@ final: prev:
|
||||||
|
|
||||||
vim-illuminate = buildVimPluginFrom2Nix {
|
vim-illuminate = buildVimPluginFrom2Nix {
|
||||||
pname = "vim-illuminate";
|
pname = "vim-illuminate";
|
||||||
version = "2022-11-01";
|
version = "2022-11-02";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "RRethy";
|
owner = "RRethy";
|
||||||
repo = "vim-illuminate";
|
repo = "vim-illuminate";
|
||||||
rev = "7a4eccd0fffe8b5dd14ad0d0400d3eab6d80c4b3";
|
rev = "fb83d835eac50baeef49aac20c524a80727db0ac";
|
||||||
sha256 = "0a0d16vjr23a3q6mmz653xn1hmnd7h8dbkldvmsr4dx0spqfydp8";
|
sha256 = "0xk5hhsb3gv3yrfcr3gnxj9g9bcdab8nlfi06q5c7nqgy4fryp6n";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/RRethy/vim-illuminate/";
|
meta.homepage = "https://github.com/RRethy/vim-illuminate/";
|
||||||
};
|
};
|
||||||
|
@ -10762,12 +10810,12 @@ final: prev:
|
||||||
|
|
||||||
vim-maktaba = buildVimPluginFrom2Nix {
|
vim-maktaba = buildVimPluginFrom2Nix {
|
||||||
pname = "vim-maktaba";
|
pname = "vim-maktaba";
|
||||||
version = "2022-10-31";
|
version = "2022-11-02";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "google";
|
owner = "google";
|
||||||
repo = "vim-maktaba";
|
repo = "vim-maktaba";
|
||||||
rev = "88ad116a4b2b4777ce4d0ecf214963a0c9b4fd06";
|
rev = "5d416e84d024538f5e5cf25c394d081802f0a35e";
|
||||||
sha256 = "07mhpr326rjfh47izx4c9hdkb5zhpbl01k0h4bbi1lxbzvsxgs9k";
|
sha256 = "13filvmaxr0dvc44f3ah80g8jhkrn3rqkwqj1a7wxjv6a6xa083z";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/google/vim-maktaba/";
|
meta.homepage = "https://github.com/google/vim-maktaba/";
|
||||||
};
|
};
|
||||||
|
@ -12806,12 +12854,12 @@ final: prev:
|
||||||
pname = "vim-yapf";
|
pname = "vim-yapf";
|
||||||
version = "2018-10-04";
|
version = "2018-10-04";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mindriot101";
|
owner = "simonrw";
|
||||||
repo = "vim-yapf";
|
repo = "vim-yapf";
|
||||||
rev = "b0c31bd73a6d1026765e659bd0a62c625ec057ad";
|
rev = "b0c31bd73a6d1026765e659bd0a62c625ec057ad";
|
||||||
sha256 = "0ncv6kjyywljsq5fz71rkmgmqxm7msyscgndnj055bnx5sh9wk80";
|
sha256 = "0ncv6kjyywljsq5fz71rkmgmqxm7msyscgndnj055bnx5sh9wk80";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/mindriot101/vim-yapf/";
|
meta.homepage = "https://github.com/simonrw/vim-yapf/";
|
||||||
};
|
};
|
||||||
|
|
||||||
vim2hs = buildVimPluginFrom2Nix {
|
vim2hs = buildVimPluginFrom2Nix {
|
||||||
|
@ -12973,12 +13021,12 @@ final: prev:
|
||||||
|
|
||||||
vimtex = buildVimPluginFrom2Nix {
|
vimtex = buildVimPluginFrom2Nix {
|
||||||
pname = "vimtex";
|
pname = "vimtex";
|
||||||
version = "2022-10-31";
|
version = "2022-11-03";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "lervag";
|
owner = "lervag";
|
||||||
repo = "vimtex";
|
repo = "vimtex";
|
||||||
rev = "e148cf1fdc817b6668263817634538d09bafd115";
|
rev = "06c47edcc2c44c1ca87a2c04a411cf0c0bd39a14";
|
||||||
sha256 = "15iikf6w8x75g7wjdp469rsxraz883387cxlahc0zsl0bdbylv5q";
|
sha256 = "0gkq4j2cwc6a4mhhyd3ivkc5qj6m9p4jg469za4v5g1v59w22pch";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/lervag/vimtex/";
|
meta.homepage = "https://github.com/lervag/vimtex/";
|
||||||
};
|
};
|
||||||
|
@ -13334,11 +13382,11 @@ final: prev:
|
||||||
|
|
||||||
catppuccin-nvim = buildVimPluginFrom2Nix {
|
catppuccin-nvim = buildVimPluginFrom2Nix {
|
||||||
pname = "catppuccin-nvim";
|
pname = "catppuccin-nvim";
|
||||||
version = "2022-10-31";
|
version = "2022-11-03";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "catppuccin";
|
owner = "catppuccin";
|
||||||
repo = "nvim";
|
repo = "nvim";
|
||||||
rev = "c4f0f1a88304378cb76ac0a0c00a99f6d58f972f";
|
rev = "72540852ca00d7842ea1123635aecb9353192f0b";
|
||||||
sha256 = "0mb3qhg5aaxvkc8h95sbwg5nm89w719l9apymc5rpmis4r0mr5zg";
|
sha256 = "0mb3qhg5aaxvkc8h95sbwg5nm89w719l9apymc5rpmis4r0mr5zg";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/catppuccin/nvim/";
|
meta.homepage = "https://github.com/catppuccin/nvim/";
|
||||||
|
@ -13358,12 +13406,12 @@ final: prev:
|
||||||
|
|
||||||
chad = buildVimPluginFrom2Nix {
|
chad = buildVimPluginFrom2Nix {
|
||||||
pname = "chad";
|
pname = "chad";
|
||||||
version = "2022-11-01";
|
version = "2022-11-04";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ms-jpq";
|
owner = "ms-jpq";
|
||||||
repo = "chadtree";
|
repo = "chadtree";
|
||||||
rev = "d7b2c15268ffbb4dedebbda34b702c89b2cd782a";
|
rev = "5ec88a8374cd7e2564ffeaa27f82dd75229312d2";
|
||||||
sha256 = "1r53lz0vmfii82mchh0hlzs0zg7d7sjxiihv2bwlapwzwmdp2n4k";
|
sha256 = "1swic358xzzmw0pxp7x2r35yf70ivbg83fljk8p3qi7s9pr0ngr8";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/ms-jpq/chadtree/";
|
meta.homepage = "https://github.com/ms-jpq/chadtree/";
|
||||||
};
|
};
|
||||||
|
|
|
@ -25,12 +25,12 @@
|
||||||
};
|
};
|
||||||
bash = buildGrammar {
|
bash = buildGrammar {
|
||||||
language = "bash";
|
language = "bash";
|
||||||
version = "f1a86d3";
|
version = "77cf8a7";
|
||||||
source = fetchFromGitHub {
|
source = fetchFromGitHub {
|
||||||
owner = "tree-sitter";
|
owner = "tree-sitter";
|
||||||
repo = "tree-sitter-bash";
|
repo = "tree-sitter-bash";
|
||||||
rev = "f1a86d3cc5aeeb67e0e52442e893af7f813025b4";
|
rev = "77cf8a7cab8904baf1a721762e012644ac1d4c7b";
|
||||||
hash = "sha256-zzHA+kGw67WFyPVFRWRyKmhAjxp5jkv0K2yhGxNfFM4=";
|
hash = "sha256-UPMJ7iL8Y0NkAHtPDrkTjG1qFwr8rXuGqvsG+LTWqEY=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
beancount = buildGrammar {
|
beancount = buildGrammar {
|
||||||
|
@ -503,12 +503,12 @@
|
||||||
};
|
};
|
||||||
help = buildGrammar {
|
help = buildGrammar {
|
||||||
language = "help";
|
language = "help";
|
||||||
version = "8df3266";
|
version = "49cdef5";
|
||||||
source = fetchFromGitHub {
|
source = fetchFromGitHub {
|
||||||
owner = "neovim";
|
owner = "neovim";
|
||||||
repo = "tree-sitter-vimdoc";
|
repo = "tree-sitter-vimdoc";
|
||||||
rev = "8df3266b423d24c9ac3f3b4b9928e65eb1e5e741";
|
rev = "49cdef52ded4a886bf34bc474876b09f9270d48f";
|
||||||
hash = "sha256-t9SHuymK5pYlryWGpORGPYLgPZ3xBx0XH69s5RtRnEI=";
|
hash = "sha256-szNY2yw5i9pgF+MpaEAkP8BgSYEe6nrFW+17sbSZ6Yc=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
hjson = buildGrammar {
|
hjson = buildGrammar {
|
||||||
|
@ -633,22 +633,22 @@
|
||||||
};
|
};
|
||||||
julia = buildGrammar {
|
julia = buildGrammar {
|
||||||
language = "julia";
|
language = "julia";
|
||||||
version = "0572ceb";
|
version = "8fb38ab";
|
||||||
source = fetchFromGitHub {
|
source = fetchFromGitHub {
|
||||||
owner = "tree-sitter";
|
owner = "tree-sitter";
|
||||||
repo = "tree-sitter-julia";
|
repo = "tree-sitter-julia";
|
||||||
rev = "0572cebf7b8e8ef5990b4d1e7f44f0b36f62922c";
|
rev = "8fb38abff74652c4faddbf04d2d5bbbc6b4bae25";
|
||||||
hash = "sha256-hN3wZJa7oXEUgdJfN0o2EoTYBsE1UZjGYfFYlGjjvO8=";
|
hash = "sha256-G619Zlb2uL2PskYKNqoG6XXBxRipeGFU4eOLw7u3BRo=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
kotlin = buildGrammar {
|
kotlin = buildGrammar {
|
||||||
language = "kotlin";
|
language = "kotlin";
|
||||||
version = "a4f71eb";
|
version = "b953dbd";
|
||||||
source = fetchFromGitHub {
|
source = fetchFromGitHub {
|
||||||
owner = "fwcd";
|
owner = "fwcd";
|
||||||
repo = "tree-sitter-kotlin";
|
repo = "tree-sitter-kotlin";
|
||||||
rev = "a4f71eb9b8c9b19ded3e0e9470be4b1b77c2b569";
|
rev = "b953dbdd05257fcb2b64bc4d9c1578fac12e3c28";
|
||||||
hash = "sha256-aRMqhmZKbKoggtBOgtFIq0xTP+PgeD3Qz6DPJsAFPRQ=";
|
hash = "sha256-xTbRn7bDN6FR9UOzw43RVHIahI/DFjwLGQj3cYoPurY=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
lalrpop = buildGrammar {
|
lalrpop = buildGrammar {
|
||||||
|
@ -693,12 +693,12 @@
|
||||||
};
|
};
|
||||||
lua = buildGrammar {
|
lua = buildGrammar {
|
||||||
language = "lua";
|
language = "lua";
|
||||||
version = "887dfd4";
|
version = "fb30e8c";
|
||||||
source = fetchFromGitHub {
|
source = fetchFromGitHub {
|
||||||
owner = "MunifTanjim";
|
owner = "MunifTanjim";
|
||||||
repo = "tree-sitter-lua";
|
repo = "tree-sitter-lua";
|
||||||
rev = "887dfd4e83c469300c279314ff1619b1d0b85b91";
|
rev = "fb30e8cb605e2ebd6c643e6981325a63fbbde320";
|
||||||
hash = "sha256-5i+UN6Es+K7KDD1qz3ZrVn8IfGdTswcISUyV2sGtY9M=";
|
hash = "sha256-gT2WHH3rkFzb6iER0ryVU7bqVbh36RbTI9HSWMh3DsI=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
m68k = buildGrammar {
|
m68k = buildGrammar {
|
||||||
|
@ -731,7 +731,6 @@
|
||||||
hash = "sha256-gKbjAcY/x9sIxiG7edolAQp2JWrx78mEGeCpayxFOuE=";
|
hash = "sha256-gKbjAcY/x9sIxiG7edolAQp2JWrx78mEGeCpayxFOuE=";
|
||||||
};
|
};
|
||||||
location = "tree-sitter-markdown";
|
location = "tree-sitter-markdown";
|
||||||
|
|
||||||
};
|
};
|
||||||
markdown_inline = buildGrammar {
|
markdown_inline = buildGrammar {
|
||||||
language = "markdown_inline";
|
language = "markdown_inline";
|
||||||
|
@ -743,7 +742,6 @@
|
||||||
hash = "sha256-gKbjAcY/x9sIxiG7edolAQp2JWrx78mEGeCpayxFOuE=";
|
hash = "sha256-gKbjAcY/x9sIxiG7edolAQp2JWrx78mEGeCpayxFOuE=";
|
||||||
};
|
};
|
||||||
location = "tree-sitter-markdown-inline";
|
location = "tree-sitter-markdown-inline";
|
||||||
|
|
||||||
};
|
};
|
||||||
menhir = buildGrammar {
|
menhir = buildGrammar {
|
||||||
language = "menhir";
|
language = "menhir";
|
||||||
|
@ -815,7 +813,6 @@
|
||||||
hash = "sha256-gTmRBFFCBrA48Yn1MO2mMQPpa6u3uv5McC4BDuMXKuM=";
|
hash = "sha256-gTmRBFFCBrA48Yn1MO2mMQPpa6u3uv5McC4BDuMXKuM=";
|
||||||
};
|
};
|
||||||
location = "ocaml";
|
location = "ocaml";
|
||||||
|
|
||||||
};
|
};
|
||||||
ocaml_interface = buildGrammar {
|
ocaml_interface = buildGrammar {
|
||||||
language = "ocaml_interface";
|
language = "ocaml_interface";
|
||||||
|
@ -827,7 +824,6 @@
|
||||||
hash = "sha256-gTmRBFFCBrA48Yn1MO2mMQPpa6u3uv5McC4BDuMXKuM=";
|
hash = "sha256-gTmRBFFCBrA48Yn1MO2mMQPpa6u3uv5McC4BDuMXKuM=";
|
||||||
};
|
};
|
||||||
location = "interface";
|
location = "interface";
|
||||||
|
|
||||||
};
|
};
|
||||||
ocamllex = buildGrammar {
|
ocamllex = buildGrammar {
|
||||||
language = "ocamllex";
|
language = "ocamllex";
|
||||||
|
@ -983,12 +979,12 @@
|
||||||
};
|
};
|
||||||
racket = buildGrammar {
|
racket = buildGrammar {
|
||||||
language = "racket";
|
language = "racket";
|
||||||
version = "b9b2e74";
|
version = "69ca563";
|
||||||
source = fetchFromGitHub {
|
source = fetchFromGitHub {
|
||||||
owner = "6cdh";
|
owner = "6cdh";
|
||||||
repo = "tree-sitter-racket";
|
repo = "tree-sitter-racket";
|
||||||
rev = "b9b2e7454d7098e44595dd8c1b471b9d1518b910";
|
rev = "69ca563af3bcf9d67220532e0814786f2dc34db1";
|
||||||
hash = "sha256-DxwbIhyCx+E0kDztPQFBa9x65ssKzsMh7vY+TpP3dTM=";
|
hash = "sha256-GLBi/NM7dFsPtmZWbFm/vM0gOwqbihOqXnxMR5k8hWE=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
rasi = buildGrammar {
|
rasi = buildGrammar {
|
||||||
|
@ -1043,12 +1039,12 @@
|
||||||
};
|
};
|
||||||
ruby = buildGrammar {
|
ruby = buildGrammar {
|
||||||
language = "ruby";
|
language = "ruby";
|
||||||
version = "252ca18";
|
version = "c919603";
|
||||||
source = fetchFromGitHub {
|
source = fetchFromGitHub {
|
||||||
owner = "tree-sitter";
|
owner = "tree-sitter";
|
||||||
repo = "tree-sitter-ruby";
|
repo = "tree-sitter-ruby";
|
||||||
rev = "252ca18be76b0918fb6b34c302292b6931876c25";
|
rev = "c91960320d0f337bdd48308a8ad5500bd2616979";
|
||||||
hash = "sha256-8UWHLVrSxQM6iT+tN+2PwTs43n+Z69c0DVnDE3yfqKo=";
|
hash = "sha256-zUNs7s7SLGLU4h08FHLUA3YhbhRotMQVqk+zG9bmtjE=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
rust = buildGrammar {
|
rust = buildGrammar {
|
||||||
|
@ -1123,12 +1119,12 @@
|
||||||
};
|
};
|
||||||
sql = buildGrammar {
|
sql = buildGrammar {
|
||||||
language = "sql";
|
language = "sql";
|
||||||
version = "2743c7b";
|
version = "70c5026";
|
||||||
source = fetchFromGitHub {
|
source = fetchFromGitHub {
|
||||||
owner = "derekstride";
|
owner = "derekstride";
|
||||||
repo = "tree-sitter-sql";
|
repo = "tree-sitter-sql";
|
||||||
rev = "2743c7b5e710e6854d4e8c14c302548b436e2a1f";
|
rev = "70c50264ae022193adb364ffa7a767d765ed9857";
|
||||||
hash = "sha256-lhQxFXphS97tITDosG/pGe85osV4CweW44ulmCd+CxQ=";
|
hash = "sha256-0HlkjL+Wy82SmVLSPXL7o3Y3l/zSDaPeBygLSvdCRZs=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
supercollider = buildGrammar {
|
supercollider = buildGrammar {
|
||||||
|
@ -1163,14 +1159,14 @@
|
||||||
};
|
};
|
||||||
swift = buildGrammar {
|
swift = buildGrammar {
|
||||||
language = "swift";
|
language = "swift";
|
||||||
version = "c88b5d7";
|
version = "d7808f0";
|
||||||
source = fetchFromGitHub {
|
source = fetchFromGitHub {
|
||||||
owner = "alex-pinkus";
|
owner = "alex-pinkus";
|
||||||
repo = "tree-sitter-swift";
|
repo = "tree-sitter-swift";
|
||||||
nativeBuildInputs = [ nodejs tree-sitter ];
|
nativeBuildInputs = [ nodejs tree-sitter ];
|
||||||
postFetch = "pushd $out && tree-sitter generate && popd";
|
postFetch = "pushd $out && tree-sitter generate && popd";
|
||||||
rev = "c88b5d73f193f5b0762b1a5f0299a275e6a728fb";
|
rev = "d7808f030a44dc8768948042baa7566949785e2f";
|
||||||
hash = "sha256-OfFMGxL72SPZW4AtHoThhYtjmKWabStLKAB9TxmjMDw=";
|
hash = "sha256-7Gjpf2isOpeOV3ZMTMibK+F4C4v8ywOPin2Wv86s+AM=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
sxhkdrc = buildGrammar {
|
sxhkdrc = buildGrammar {
|
||||||
|
@ -1245,7 +1241,6 @@
|
||||||
hash = "sha256-Nx+K7Ic/ePKAXPIMlrRn6zELYE59f/FnnZ/LM5ELaU8=";
|
hash = "sha256-Nx+K7Ic/ePKAXPIMlrRn6zELYE59f/FnnZ/LM5ELaU8=";
|
||||||
};
|
};
|
||||||
location = "tsx";
|
location = "tsx";
|
||||||
|
|
||||||
};
|
};
|
||||||
turtle = buildGrammar {
|
turtle = buildGrammar {
|
||||||
language = "turtle";
|
language = "turtle";
|
||||||
|
@ -1259,12 +1254,12 @@
|
||||||
};
|
};
|
||||||
twig = buildGrammar {
|
twig = buildGrammar {
|
||||||
language = "twig";
|
language = "twig";
|
||||||
version = "6a01f20";
|
version = "035f549";
|
||||||
source = fetchFromGitHub {
|
source = fetchFromGitHub {
|
||||||
owner = "gbprod";
|
owner = "gbprod";
|
||||||
repo = "tree-sitter-twig";
|
repo = "tree-sitter-twig";
|
||||||
rev = "6a01f20e73038300d205d370212c361949be3035";
|
rev = "035f549ec8c043e734f04341d7ccdc669bb2ba91";
|
||||||
hash = "sha256-M+57mGl4Sgn0yUGAyxHxE6ShR+E/ki4m8/x/f/KHetA=";
|
hash = "sha256-XSE0E6a9o+WpvmMIXHu0N89VqzaIk9eFHofKAPHtT20=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
typescript = buildGrammar {
|
typescript = buildGrammar {
|
||||||
|
@ -1277,7 +1272,6 @@
|
||||||
hash = "sha256-Nx+K7Ic/ePKAXPIMlrRn6zELYE59f/FnnZ/LM5ELaU8=";
|
hash = "sha256-Nx+K7Ic/ePKAXPIMlrRn6zELYE59f/FnnZ/LM5ELaU8=";
|
||||||
};
|
};
|
||||||
location = "typescript";
|
location = "typescript";
|
||||||
|
|
||||||
};
|
};
|
||||||
v = buildGrammar {
|
v = buildGrammar {
|
||||||
language = "v";
|
language = "v";
|
||||||
|
@ -1289,7 +1283,6 @@
|
||||||
hash = "sha256-d1NeZixsN9992Q1UC5ZKGN4LNxlsvdL91QW2K8d1J9Y=";
|
hash = "sha256-d1NeZixsN9992Q1UC5ZKGN4LNxlsvdL91QW2K8d1J9Y=";
|
||||||
};
|
};
|
||||||
location = "tree_sitter_v";
|
location = "tree_sitter_v";
|
||||||
|
|
||||||
};
|
};
|
||||||
vala = buildGrammar {
|
vala = buildGrammar {
|
||||||
language = "vala";
|
language = "vala";
|
||||||
|
@ -1313,12 +1306,12 @@
|
||||||
};
|
};
|
||||||
vim = buildGrammar {
|
vim = buildGrammar {
|
||||||
language = "vim";
|
language = "vim";
|
||||||
version = "9736af8";
|
version = "4ae7bd6";
|
||||||
source = fetchFromGitHub {
|
source = fetchFromGitHub {
|
||||||
owner = "vigoux";
|
owner = "vigoux";
|
||||||
repo = "tree-sitter-viml";
|
repo = "tree-sitter-viml";
|
||||||
rev = "9736af8ef0a7f20b4c45f6474342c8f5b473e2cc";
|
rev = "4ae7bd67706d7e10afed827ce2ded884ab41650f";
|
||||||
hash = "sha256-cptSrA+EOfntdW9V8qt3pg3PUK7uSwex7OS4XVnwItI=";
|
hash = "sha256-5gNqs6ykt2m48ghFv9y5OxsHDPTWRicdT9eR+DDiXiA=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
vue = buildGrammar {
|
vue = buildGrammar {
|
||||||
|
@ -1363,12 +1356,12 @@
|
||||||
};
|
};
|
||||||
zig = buildGrammar {
|
zig = buildGrammar {
|
||||||
language = "zig";
|
language = "zig";
|
||||||
version = "b1803f2";
|
version = "d90d38d";
|
||||||
source = fetchFromGitHub {
|
source = fetchFromGitHub {
|
||||||
owner = "maxxnino";
|
owner = "maxxnino";
|
||||||
repo = "tree-sitter-zig";
|
repo = "tree-sitter-zig";
|
||||||
rev = "b1803f2a665d228f968a831eac4fcc07a377c7bc";
|
rev = "d90d38d28ce8cc27bfea8b4e0c75211e9e2398ca";
|
||||||
hash = "sha256-WLfecfqwCNh/IPPfmZ55XgsY6cLv62ad0Xhh9pUW3nw=";
|
hash = "sha256-vdfXC9PUyv4YynfrKi7M708zFbNIV6AERBd63/EAp1A=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,11 +3,31 @@
|
||||||
self: super:
|
self: super:
|
||||||
|
|
||||||
let
|
let
|
||||||
builtGrammars = callPackage ./generated.nix {
|
generatedGrammars = callPackage ./generated.nix {
|
||||||
buildGrammar = callPackage ../../../../../development/tools/parsing/tree-sitter/grammar.nix { };
|
buildGrammar = callPackage ../../../../../development/tools/parsing/tree-sitter/grammar.nix { };
|
||||||
};
|
};
|
||||||
|
|
||||||
allGrammars = lib.filter lib.isDerivation (lib.attrValues builtGrammars);
|
generatedDerivations = lib.filterAttrs (_: lib.isDerivation) generatedGrammars;
|
||||||
|
|
||||||
|
# add aliases so grammars from `tree-sitter` are overwritten in `withPlugins`
|
||||||
|
# for example, for ocaml_interface, the following aliases will be added
|
||||||
|
# ocaml-interface
|
||||||
|
# tree-sitter-ocaml-interface
|
||||||
|
# tree-sitter-ocaml_interface
|
||||||
|
builtGrammars = generatedGrammars // lib.listToAttrs
|
||||||
|
(lib.concatLists (lib.mapAttrsToList
|
||||||
|
(k: v:
|
||||||
|
let
|
||||||
|
replaced = lib.replaceStrings [ "_" ] [ "-" ] k;
|
||||||
|
in
|
||||||
|
map (lib.flip lib.nameValuePair v)
|
||||||
|
([ ("tree-sitter-${k}") ] ++ lib.optionals (k != replaced) [
|
||||||
|
replaced
|
||||||
|
"tree-sitter-${replaced}"
|
||||||
|
]))
|
||||||
|
generatedDerivations));
|
||||||
|
|
||||||
|
allGrammars = lib.attrValues generatedDerivations;
|
||||||
|
|
||||||
# Usage:
|
# Usage:
|
||||||
# pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [ p.c p.java ... ])
|
# pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [ p.c p.java ... ])
|
||||||
|
@ -34,5 +54,7 @@ in
|
||||||
|
|
||||||
withAllGrammars = withPlugins (_: allGrammars);
|
withAllGrammars = withPlugins (_: allGrammars);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
meta.maintainers = with lib.maintainers; [ figsoda ];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4,10 +4,10 @@
|
||||||
import json
|
import json
|
||||||
import re
|
import re
|
||||||
import subprocess
|
import subprocess
|
||||||
from os import getenv
|
from os import environ
|
||||||
from os.path import dirname, join
|
from os.path import dirname, join
|
||||||
|
|
||||||
lockfile = json.load(open(join(getenv("NVIM_TREESITTER"), "lockfile.json")))
|
lockfile = json.load(open(join(environ["NVIM_TREESITTER"], "lockfile.json")))
|
||||||
|
|
||||||
configs = json.loads(
|
configs = json.loads(
|
||||||
subprocess.check_output(
|
subprocess.check_output(
|
||||||
|
@ -98,8 +98,7 @@ def generate_grammar(item):
|
||||||
location = info.get("location")
|
location = info.get("location")
|
||||||
if location:
|
if location:
|
||||||
generated += f"""
|
generated += f"""
|
||||||
location = "{location}";
|
location = "{location}";"""
|
||||||
"""
|
|
||||||
|
|
||||||
generated += """
|
generated += """
|
||||||
};
|
};
|
||||||
|
|
|
@ -381,6 +381,7 @@ https://github.com/iamcco/markdown-preview.nvim/,,
|
||||||
https://github.com/chentoast/marks.nvim/,,
|
https://github.com/chentoast/marks.nvim/,,
|
||||||
https://github.com/vim-scripts/matchit.zip/,,
|
https://github.com/vim-scripts/matchit.zip/,,
|
||||||
https://github.com/marko-cerovac/material.nvim/,,
|
https://github.com/marko-cerovac/material.nvim/,,
|
||||||
|
https://github.com/kaicataldo/material.vim/,HEAD,
|
||||||
https://github.com/vim-scripts/mayansmoke/,,
|
https://github.com/vim-scripts/mayansmoke/,,
|
||||||
https://github.com/echasnovski/mini.nvim/,,
|
https://github.com/echasnovski/mini.nvim/,,
|
||||||
https://github.com/wfxr/minimap.vim/,,
|
https://github.com/wfxr/minimap.vim/,,
|
||||||
|
@ -426,6 +427,7 @@ https://github.com/karb94/neoscroll.nvim/,,
|
||||||
https://github.com/Shougo/neosnippet-snippets/,,
|
https://github.com/Shougo/neosnippet-snippets/,,
|
||||||
https://github.com/Shougo/neosnippet.vim/,,
|
https://github.com/Shougo/neosnippet.vim/,,
|
||||||
https://github.com/kassio/neoterm/,,
|
https://github.com/kassio/neoterm/,,
|
||||||
|
https://github.com/nvim-neotest/neotest/,HEAD,
|
||||||
https://github.com/MrcJkb/neotest-haskell/,HEAD,
|
https://github.com/MrcJkb/neotest-haskell/,HEAD,
|
||||||
https://github.com/rose-pine/neovim/,main,rose-pine
|
https://github.com/rose-pine/neovim/,main,rose-pine
|
||||||
https://github.com/Shatur/neovim-ayu/,,
|
https://github.com/Shatur/neovim-ayu/,,
|
||||||
|
@ -490,6 +492,7 @@ https://github.com/mfussenegger/nvim-lint/,,
|
||||||
https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/,,
|
https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/,,
|
||||||
https://github.com/neovim/nvim-lspconfig/,,
|
https://github.com/neovim/nvim-lspconfig/,,
|
||||||
https://github.com/RishabhRD/nvim-lsputils/,,
|
https://github.com/RishabhRD/nvim-lsputils/,,
|
||||||
|
https://github.com/bfredl/nvim-luadev/,HEAD,
|
||||||
https://github.com/rafcamlet/nvim-luapad/,,
|
https://github.com/rafcamlet/nvim-luapad/,,
|
||||||
https://github.com/scalameta/nvim-metals/,,
|
https://github.com/scalameta/nvim-metals/,,
|
||||||
https://github.com/gpanders/nvim-moonwalk/,,
|
https://github.com/gpanders/nvim-moonwalk/,,
|
||||||
|
@ -660,6 +663,7 @@ https://github.com/tom-anders/telescope-vim-bookmarks.nvim/,,
|
||||||
https://github.com/nvim-telescope/telescope-z.nvim/,,
|
https://github.com/nvim-telescope/telescope-z.nvim/,,
|
||||||
https://github.com/jvgrootveld/telescope-zoxide/,,
|
https://github.com/jvgrootveld/telescope-zoxide/,,
|
||||||
https://github.com/nvim-telescope/telescope.nvim/,,
|
https://github.com/nvim-telescope/telescope.nvim/,,
|
||||||
|
https://github.com/luc-tielen/telescope_hoogle/,HEAD,
|
||||||
https://github.com/axelvc/template-string.nvim/,HEAD,
|
https://github.com/axelvc/template-string.nvim/,HEAD,
|
||||||
https://github.com/jacoborus/tender.vim/,,
|
https://github.com/jacoborus/tender.vim/,,
|
||||||
https://github.com/wincent/terminus/,,
|
https://github.com/wincent/terminus/,,
|
||||||
|
|
|
@ -9,11 +9,11 @@ let
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "vis";
|
pname = "vis";
|
||||||
version = "0.7";
|
version = "0.8";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1g05ncsnk57kcqm9wsv6sz8b24kyzj8r5rfpa1wfwj8qkjzx3vji";
|
sha256 = "sha256-XvWj6fZxzXeRA5oCAqIIwlfjrJcHnDrjeiPExEQKSkY=";
|
||||||
repo = "vis";
|
repo = "vis";
|
||||||
owner = "martanne";
|
owner = "martanne";
|
||||||
};
|
};
|
||||||
|
|
|
@ -1244,10 +1244,16 @@ let
|
||||||
mktplcRef = {
|
mktplcRef = {
|
||||||
publisher = "github";
|
publisher = "github";
|
||||||
name = "copilot";
|
name = "copilot";
|
||||||
version = "1.46.6822";
|
version = "1.56.7152";
|
||||||
sha256 = "sha256-L71mC0190ZubqNVliu7es4SDsBTGVokePpcNupABI8Q=";
|
sha256 = "sha256-9WEvTcVY/yMF00GJVj4h57aWhfBYTSatbw10DjjAaAM=";
|
||||||
|
};
|
||||||
|
meta = with lib; {
|
||||||
|
description = "GitHub Copilot uses OpenAI Codex to suggest code and entire functions in real-time right from your editor.";
|
||||||
|
downloadPage = "https://marketplace.visualstudio.com/items?itemName=GitHub.copilot";
|
||||||
|
homepage = "https://github.com/features/copilot";
|
||||||
|
license = licenses.unfree;
|
||||||
|
maintainers = with maintainers; [ Zimmi48 ];
|
||||||
};
|
};
|
||||||
meta = { license = lib.licenses.unfree; };
|
|
||||||
};
|
};
|
||||||
|
|
||||||
github-vscode-theme = buildVscodeMarketplaceExtension {
|
github-vscode-theme = buildVscodeMarketplaceExtension {
|
||||||
|
@ -1679,6 +1685,22 @@ let
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
maximedenes.vscoq = buildVscodeMarketplaceExtension {
|
||||||
|
mktplcRef = {
|
||||||
|
publisher = "maximedenes";
|
||||||
|
name = "vscoq";
|
||||||
|
version = "0.3.6";
|
||||||
|
sha256 = "sha256-b0gCaEzt5yAj53oLFZSXSD3bum9J1fYes/uf9+OlUek=";
|
||||||
|
};
|
||||||
|
meta = with lib; {
|
||||||
|
description = "VsCoq is an extension for Visual Studio Code (VS Code) and VSCodium with support for the Coq Proof Assistant.";
|
||||||
|
downloadPage = "https://marketplace.visualstudio.com/items?itemName=maximedenes.vscoq";
|
||||||
|
homepage = "https://github.com/coq-community/vscoq";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = with maintainers; [ Zimmi48 ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
mhutchie.git-graph = buildVscodeMarketplaceExtension {
|
mhutchie.git-graph = buildVscodeMarketplaceExtension {
|
||||||
mktplcRef = {
|
mktplcRef = {
|
||||||
name = "git-graph";
|
name = "git-graph";
|
||||||
|
@ -2465,8 +2487,8 @@ let
|
||||||
mktplcRef = {
|
mktplcRef = {
|
||||||
name = "code-spell-checker";
|
name = "code-spell-checker";
|
||||||
publisher = "streetsidesoftware";
|
publisher = "streetsidesoftware";
|
||||||
version = "2.10.1";
|
version = "2.11.0";
|
||||||
sha256 = "sha256-FeYkSML6QYtuIHIbAovOqlPwkKfNkHr7IdMCWwkynQ0=";
|
sha256 = "sha256-ZYbkCe/FdSxmipV9TTq0AF/Ft01+LTUeo3sVyKMP3iQ=";
|
||||||
};
|
};
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog";
|
changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog";
|
||||||
|
|
|
@ -7,8 +7,8 @@ in buildVscodeMarketplaceExtension {
|
||||||
mktplcRef = {
|
mktplcRef = {
|
||||||
name = "jupyter";
|
name = "jupyter";
|
||||||
publisher = "ms-toolsai";
|
publisher = "ms-toolsai";
|
||||||
version = "2022.5.1001411044";
|
version = "2022.9.1202862440";
|
||||||
sha256 = "0z6i7a5sba42yc2inp3yvw6lm6m0kings2iv18h4d6zyhm2lb61p";
|
sha256 = "sha256-0F6eTEXt0PJY0+1o/qZEuUcD9sjHSnUrI1OS4IO2WLc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -19,8 +19,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
|
||||||
mktplcRef = {
|
mktplcRef = {
|
||||||
name = "python";
|
name = "python";
|
||||||
publisher = "ms-python";
|
publisher = "ms-python";
|
||||||
version = "2022.15.12711056";
|
version = "2022.17.13011006";
|
||||||
sha256 = "sha256-bksUMN+ZdkmElVD8BC4ihklQyWlKkcpep2VOwUzISnQ=";
|
sha256 = "sha256-f5vbXcqKwCnL+vsTcOX7rWUfoXNih5ZaWr3XUpCYB/M=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ icu ];
|
buildInputs = [ icu ];
|
||||||
|
|
|
@ -18,17 +18,17 @@ let
|
||||||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||||
|
|
||||||
sha256 = {
|
sha256 = {
|
||||||
x86_64-linux = "0cf6zlwslii30877p5vb0varxs6ai5r1g9wxx1b45yrmp7rvda91";
|
x86_64-linux = "1dcp6r78kaq3wzcw7dfra59kfpdzqy9qnlyp1ywayxh610ryjyfc";
|
||||||
x86_64-darwin = "0j9kb7j2rvrgc2dzxhi1nzs78lzhpkfk3gcqcq84hcsga0n59y03";
|
x86_64-darwin = "0ypxjh5z0v83y0wb22m942qqlvx5df7k4dk8ip9wqd4p7h8540q8";
|
||||||
aarch64-linux = "1bf2kvnd2pz2sk26bq1wm868bvvmrg338ipysmryilhk0l490vcx";
|
aarch64-linux = "1qq4zg0j3rpx06cqaic7a1x7ckk5wf8w1gp5y8hwhvkym4s8g4i7";
|
||||||
aarch64-darwin = "1rwwrzabxgw2wryi6rp8sc1jqps54p7a3cjpn4q94kds8rk5j0qn";
|
aarch64-darwin = "18hrsvr7hgmlpi64dbk581i516my6c5zwz6g8awp4fhxilk0wbrg";
|
||||||
armv7l-linux = "0p2kwfq74lz43vpfh90xfrqsz7nwgcjsvqwkifkchp1m3xnil742";
|
armv7l-linux = "1y357ci4gllxg26m5qdv9652i5rra5vj972l7kdnxiimfgm6h83b";
|
||||||
}.${system} or throwSystem;
|
}.${system} or throwSystem;
|
||||||
in
|
in
|
||||||
callPackage ./generic.nix rec {
|
callPackage ./generic.nix rec {
|
||||||
# Please backport all compatible updates to the stable release.
|
# Please backport all compatible updates to the stable release.
|
||||||
# This is important for the extension ecosystem.
|
# This is important for the extension ecosystem.
|
||||||
version = "1.72.2";
|
version = "1.73.0";
|
||||||
pname = "vscode";
|
pname = "vscode";
|
||||||
|
|
||||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||||
|
|
|
@ -15,11 +15,11 @@ let
|
||||||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||||
|
|
||||||
sha256 = {
|
sha256 = {
|
||||||
x86_64-linux = "0bc95mdl19la63yvqrpfcvq9sx68wfv60a3xrz2z5lk308khfpr6";
|
x86_64-linux = "1jp21lnz3vmv4f6crnqbkj6jzr6wl5h2ibniki7azamaqxy51ipi";
|
||||||
x86_64-darwin = "0qb8610ilf69j0zl7z031bmqdsxsj15w1maz7lx0z09yrdyvgi7c";
|
x86_64-darwin = "1msngvngcfhc3zmi2vfg5bgrhmj9ml4pyd9lpr7dpcxycswvifw7";
|
||||||
aarch64-linux = "157arn7wsxgh3qr4bzhy75y7zw9qwz1zch7ny36kr53135d2nhz6";
|
aarch64-linux = "17l4w4vvvninyhyiwkkqhz7nhm68wj7diwwn9sh54x71dmwcqlcs";
|
||||||
aarch64-darwin = "0dwzqv1j1gcjyc1w41f9k1pijazr62r569arh4l53xi7amrp7hx8";
|
aarch64-darwin = "102vciba35sma1810bvnr5xa9qaf0fbvrg8blqchy77gydcrnj8b";
|
||||||
armv7l-linux = "1lam1z8hqdav4al07d1ahq4qh2npv191n2gqpdxg5b1fs7zv3k85";
|
armv7l-linux = "0ihbqy5wda1326nhqgckz26icr9inwk1pvspvpmg221y279s3iwp";
|
||||||
}.${system} or throwSystem;
|
}.${system} or throwSystem;
|
||||||
|
|
||||||
sourceRoot = if stdenv.isDarwin then "" else ".";
|
sourceRoot = if stdenv.isDarwin then "" else ".";
|
||||||
|
@ -29,7 +29,7 @@ in
|
||||||
|
|
||||||
# Please backport all compatible updates to the stable release.
|
# Please backport all compatible updates to the stable release.
|
||||||
# This is important for the extension ecosystem.
|
# This is important for the extension ecosystem.
|
||||||
version = "1.72.2.22289";
|
version = "1.73.0.22306";
|
||||||
pname = "vscodium";
|
pname = "vscodium";
|
||||||
|
|
||||||
executableName = "codium";
|
executableName = "codium";
|
||||||
|
|
|
@ -1,28 +1,55 @@
|
||||||
{ lib, stdenv, fetchurl, aspell, boost, expat, intltool, libxml2, libxslt, pcre, wxGTK, xercesc }:
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchurl
|
||||||
|
, aspell
|
||||||
|
, boost
|
||||||
|
, expat
|
||||||
|
, intltool
|
||||||
|
, pkg-config
|
||||||
|
, libxml2
|
||||||
|
, libxslt
|
||||||
|
, pcre2
|
||||||
|
, wxGTK32
|
||||||
|
, xercesc
|
||||||
|
, Cocoa
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "xmlcopyeditor";
|
pname = "xmlcopyeditor";
|
||||||
version = "1.2.1.3";
|
version = "1.3.1.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
name = "${pname}-${version}.tar.gz";
|
|
||||||
url = "mirror://sourceforge/xml-copy-editor/${pname}-${version}.tar.gz";
|
url = "mirror://sourceforge/xml-copy-editor/${pname}-${version}.tar.gz";
|
||||||
sha256 = "0bwxn89600jbrkvlwyawgc0c0qqxpl453mbgcb9qbbxl8984ns4v";
|
sha256 = "sha256-6HHKl7hqyvF3gJ9vmjLjTT49prJ8KhEEV0qPsJfQfJE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./xmlcopyeditor.patch ];
|
patches = [ ./xmlcopyeditor.patch ];
|
||||||
CPLUS_INCLUDE_PATH = "${libxml2.dev}/include/libxml2";
|
|
||||||
|
|
||||||
nativeBuildInputs = [ intltool ];
|
nativeBuildInputs = [
|
||||||
buildInputs = [ aspell boost expat libxml2 libxslt pcre wxGTK xercesc ];
|
intltool
|
||||||
|
pkg-config
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
aspell
|
||||||
|
boost
|
||||||
|
expat
|
||||||
|
libxml2
|
||||||
|
libxslt
|
||||||
|
pcre2
|
||||||
|
wxGTK32
|
||||||
|
xercesc
|
||||||
|
] ++ lib.optionals stdenv.isDarwin [
|
||||||
|
Cocoa
|
||||||
|
];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A fast, free, validating XML editor";
|
description = "A fast, free, validating XML editor";
|
||||||
homepage = "http://xml-copy-editor.sourceforge.net/";
|
homepage = "https://xml-copy-editor.sourceforge.io/";
|
||||||
license = licenses.gpl2Plus;
|
license = licenses.gpl2Plus;
|
||||||
platforms = platforms.linux;
|
platforms = platforms.unix;
|
||||||
maintainers = with maintainers; [ candeira ];
|
maintainers = with maintainers; [ candeira wegank ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,17 +1,8 @@
|
||||||
From 626c385ba141c6abcff01bef4451fcad062d232c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Javier Candeira <javier@candeira.com>
|
|
||||||
Date: Sat, 7 Apr 2018 20:21:45 +1000
|
|
||||||
Subject: [PATCH] nixpckgs patches
|
|
||||||
|
|
||||||
---
|
|
||||||
src/Makefile.in | 6 +++---
|
|
||||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/Makefile.in b/src/Makefile.in
|
diff --git a/src/Makefile.in b/src/Makefile.in
|
||||||
index e75918f..e04703b 100644
|
index e2b01fc..7f3a21e 100644
|
||||||
--- a/src/Makefile.in
|
--- a/src/Makefile.in
|
||||||
+++ b/src/Makefile.in
|
+++ b/src/Makefile.in
|
||||||
@@ -283,8 +283,8 @@ top_srcdir = @top_srcdir@
|
@@ -427,8 +427,8 @@ top_srcdir = @top_srcdir@
|
||||||
# these are the headers for your project
|
# these are the headers for your project
|
||||||
noinst_HEADERS = $(srcdir)/*.h
|
noinst_HEADERS = $(srcdir)/*.h
|
||||||
xmlcopyeditordir = ${prefix}/share/xmlcopyeditor
|
xmlcopyeditordir = ${prefix}/share/xmlcopyeditor
|
||||||
|
@ -21,16 +12,4 @@ index e75918f..e04703b 100644
|
||||||
+applicationsdir = ${prefix}/share/applications
|
+applicationsdir = ${prefix}/share/applications
|
||||||
|
|
||||||
# the application source, library search path, and link libraries
|
# the application source, library search path, and link libraries
|
||||||
xmlcopyeditor_SOURCES = aboutdialog.cpp associatedialog.cpp binaryfile.cpp \
|
xmlcopyeditor_SOURCES = aboutdialog.cpp \
|
||||||
@@ -357,7 +357,7 @@ EXTRA_DIST = \
|
|
||||||
$(srcdir)/xmlcopyeditor.rc \
|
|
||||||
$(srcdir)/xmlschemaparser.cpp
|
|
||||||
|
|
||||||
-AM_CPPFLAGS = -I/usr/include/libxml2 $(ENCHANT_CFLAGS) $(GTK_CFLAGS)
|
|
||||||
+AM_CPPFLAGS = -I$(CPLUS_INCLUDE_PATH) $(ENCHANT_CFLAGS) $(GTK_CFLAGS)
|
|
||||||
all: all-am
|
|
||||||
|
|
||||||
.SUFFIXES:
|
|
||||||
--
|
|
||||||
2.16.2
|
|
||||||
|
|
||||||
|
|
|
@ -28,13 +28,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "cemu";
|
pname = "cemu";
|
||||||
version = "2.0-10";
|
version = "2.0-13";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "cemu-project";
|
owner = "cemu-project";
|
||||||
repo = "Cemu";
|
repo = "Cemu";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-GJA/lJJqShuHeYirBW1kyVsU44kMpmAn916PSGOnKkY=";
|
hash = "sha256-0yomEJoXMKZV2PAjINegSvtDB6gbYxQ6XcXA60/ZkEM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|
|
@ -9,10 +9,10 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
# Keep these separate so the update script can regex them
|
# Keep these separate so the update script can regex them
|
||||||
rpcs3GitVersion = "14337-5210df688";
|
rpcs3GitVersion = "14358-a00f9e421";
|
||||||
rpcs3Version = "0.0.24-14337-5210df688";
|
rpcs3Version = "0.0.25-14358-a00f9e421";
|
||||||
rpcs3Revision = "5210df688262ec7fd8c21230d30e568d98724c8f";
|
rpcs3Revision = "a00f9e42115527aa9654870f194cf2c64329f2ef";
|
||||||
rpcs3Sha256 = "1m0j53xl6g01s27bi2p9j23m724gq7a3hss7kqhc239a5m9akqdg";
|
rpcs3Sha256 = "0avajihbs02nbfqs4kzgckl0v2z4z8h8fgcjs5m4zxvkgj5701nv";
|
||||||
|
|
||||||
ittapi = fetchFromGitHub {
|
ittapi = fetchFromGitHub {
|
||||||
owner = "intel";
|
owner = "intel";
|
||||||
|
|
|
@ -108,6 +108,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
|
||||||
])
|
])
|
||||||
++ lib.optionals waylandSupport (with pkgs; [
|
++ lib.optionals waylandSupport (with pkgs; [
|
||||||
wayland libxkbcommon wayland-protocols wayland.dev libxkbcommon.dev
|
wayland libxkbcommon wayland-protocols wayland.dev libxkbcommon.dev
|
||||||
|
mesa # for libgbm
|
||||||
])));
|
])));
|
||||||
|
|
||||||
patches = [ ]
|
patches = [ ]
|
||||||
|
|
|
@ -70,12 +70,13 @@ in rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
wayland = fetchFromGitLab rec {
|
wayland = fetchFromGitLab rec {
|
||||||
version = "7.0-rc2";
|
# https://gitlab.collabora.com/alf/wine/-/tree/wayland
|
||||||
sha256 = "sha256-FU9L8cyIIfFQ+8f/AUg7IT+RxTpyNTuSfL0zBnur0SA=";
|
version = "7.20";
|
||||||
|
sha256 = "sha256-UrukAnlfrr6eeVwFSEOWSVSfyMHbMT1o1tfXxow61xY=";
|
||||||
domain = "gitlab.collabora.com";
|
domain = "gitlab.collabora.com";
|
||||||
owner = "alf";
|
owner = "alf";
|
||||||
repo = "wine";
|
repo = "wine";
|
||||||
rev = "95f0154c96a4b7d81e783ee5ba2f5d9cc7cda351";
|
rev = "1dc9821ef0b6109c74d0c95cd5418caf7f9feaf1";
|
||||||
|
|
||||||
inherit (unstable) gecko32 gecko64;
|
inherit (unstable) gecko32 gecko64;
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,8 @@ in stdenv.mkDerivation {
|
||||||
|
|
||||||
# Workaround build failure on -fno-common toolchains:
|
# Workaround build failure on -fno-common toolchains:
|
||||||
# ld: initc.o:(.bss+0x28): multiple definition of `HacksDisable'; cfg.o:(.bss+0x59e3): first defined here
|
# ld: initc.o:(.bss+0x28): multiple definition of `HacksDisable'; cfg.o:(.bss+0x59e3): first defined here
|
||||||
NIX_CFLAGS_COMPILE = "-fcommon";
|
# Use pre-c++17 standard (c++17 forbids throw annotations)
|
||||||
|
NIX_CFLAGS_COMPILE = "-fcommon -std=c++14";
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
cd src
|
cd src
|
||||||
|
|
|
@ -3,11 +3,11 @@
|
||||||
, lib
|
, lib
|
||||||
, fetchurl
|
, fetchurl
|
||||||
# native
|
# native
|
||||||
, autoreconfHook
|
, cmake
|
||||||
, pkg-config
|
, pkg-config
|
||||||
# not native
|
# not native
|
||||||
, gdal
|
, gdal
|
||||||
, wxGTK31
|
, wxGTK32
|
||||||
, proj
|
, proj
|
||||||
, dxflib
|
, dxflib
|
||||||
, curl
|
, curl
|
||||||
|
@ -31,24 +31,20 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "saga";
|
pname = "saga";
|
||||||
version = "7.9.1";
|
version = "8.4.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/saga-gis/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz";
|
url = "mirror://sourceforge/saga-gis/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz";
|
||||||
sha256 = "sha256-Jq1LhBSeJuq9SlNl/ko5I8+jnjZnLMfGYNNUnzVWo7w=";
|
sha256 = "sha256-v6DPwV20fcsznrEaFJk0/ewU4z3cTjzYYuLkyMwSLV0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
sourceRoot = "saga-${version}/saga-gis";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
# Upstream's gnerated ./configure is not reliable
|
cmake
|
||||||
autoreconfHook
|
|
||||||
pkg-config
|
pkg-config
|
||||||
];
|
];
|
||||||
configureFlags = [
|
|
||||||
"--with-system-svm"
|
|
||||||
# hdf is no detected otherwise
|
|
||||||
"HDF5_LIBS=-l${hdf5}/lib"
|
|
||||||
"HDF5_CFLAGS=-I${hdf5.dev}/include"
|
|
||||||
];
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
curl
|
curl
|
||||||
dxflib
|
dxflib
|
||||||
|
@ -56,7 +52,7 @@ mkDerivation rec {
|
||||||
libsvm
|
libsvm
|
||||||
hdf5
|
hdf5
|
||||||
gdal
|
gdal
|
||||||
wxGTK31
|
wxGTK32
|
||||||
proj
|
proj
|
||||||
libharu
|
libharu
|
||||||
opencv
|
opencv
|
||||||
|
@ -77,9 +73,9 @@ mkDerivation rec {
|
||||||
sqlite
|
sqlite
|
||||||
];
|
];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
cmakeFlags = [
|
||||||
|
"-DOpenMP_SUPPORT=${if stdenv.isDarwin then "OFF" else "ON"}"
|
||||||
CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing";
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "System for Automated Geoscientific Analyses";
|
description = "System for Automated Geoscientific Analyses";
|
||||||
|
|
|
@ -25,14 +25,14 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "foxotron";
|
pname = "foxotron";
|
||||||
version = "2022-08-06";
|
version = "2022-11-02";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Gargaj";
|
owner = "Gargaj";
|
||||||
repo = "Foxotron";
|
repo = "Foxotron";
|
||||||
rev = version;
|
rev = version;
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
sha256 = "sha256-IGLoiUeHcTlQ+WJTot3o5/Q+jRJcY52I3xHDAT0zuIU=";
|
sha256 = "sha256-WjsVvFhwVCzclHxA+Gu2YtR2yK0Opqhncwlg9FEhOLk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkg-config makeWrapper ];
|
nativeBuildInputs = [ cmake pkg-config makeWrapper ];
|
||||||
|
|
|
@ -2,10 +2,16 @@
|
||||||
mkDerivation, lib, kdepimTeam,
|
mkDerivation, lib, kdepimTeam,
|
||||||
extra-cmake-modules, shared-mime-info, qtbase, accounts-qt,
|
extra-cmake-modules, shared-mime-info, qtbase, accounts-qt,
|
||||||
boost, kaccounts-integration, kcompletion, kconfigwidgets, kcrash, kdbusaddons,
|
boost, kaccounts-integration, kcompletion, kconfigwidgets, kcrash, kdbusaddons,
|
||||||
kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mariadb, qttools,
|
kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mariadb,
|
||||||
signond, xz,
|
postgresql, qttools, signond, xz,
|
||||||
|
|
||||||
|
mysqlSupport ? true,
|
||||||
|
postgresSupport ? false,
|
||||||
|
defaultDriver ? if mysqlSupport then "MYSQL" else "POSTGRES",
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
assert mysqlSupport || postgresSupport;
|
||||||
|
|
||||||
mkDerivation {
|
mkDerivation {
|
||||||
pname = "akonadi";
|
pname = "akonadi";
|
||||||
meta = {
|
meta = {
|
||||||
|
@ -26,17 +32,19 @@ mkDerivation {
|
||||||
propagatedBuildInputs = [ boost kitemmodels ];
|
propagatedBuildInputs = [ boost kitemmodels ];
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
CXXFLAGS = [
|
CXXFLAGS = [
|
||||||
''-DNIXPKGS_MYSQL_MYSQLD=\"${lib.getBin mariadb}/bin/mysqld\"''
|
''-DNIXPKGS_MYSQL_MYSQLD=\"${lib.optionalString mysqlSupport "${lib.getBin mariadb}/bin/mysqld"}\"''
|
||||||
''-DNIXPKGS_MYSQL_MYSQLADMIN=\"${lib.getBin mariadb}/bin/mysqladmin\"''
|
''-DNIXPKGS_MYSQL_MYSQLADMIN=\"${lib.optionalString mysqlSupport "${lib.getBin mariadb}/bin/mysqladmin"}\"''
|
||||||
''-DNIXPKGS_MYSQL_MYSQL_INSTALL_DB=\"${lib.getBin mariadb}/bin/mysql_install_db\"''
|
''-DNIXPKGS_MYSQL_MYSQL_INSTALL_DB=\"${lib.optionalString mysqlSupport "${lib.getBin mariadb}/bin/mysql_install_db"}\"''
|
||||||
''-DNIXPKGS_MYSQL_MYSQLCHECK=\"${lib.getBin mariadb}/bin/mysqlcheck\"''
|
''-DNIXPKGS_MYSQL_MYSQLCHECK=\"${lib.optionalString mysqlSupport "${lib.getBin mariadb}/bin/mysqlcheck"}\"''
|
||||||
''-DNIXPKGS_POSTGRES_PG_CTL=\"\"''
|
''-DNIXPKGS_POSTGRES_PG_CTL=\"${lib.optionalString postgresSupport "${lib.getBin postgresql}/bin/pg_ctl"}\"''
|
||||||
''-DNIXPKGS_POSTGRES_PG_UPGRADE=\"\"''
|
''-DNIXPKGS_POSTGRES_PG_UPGRADE=\"${lib.optionalString postgresSupport "${lib.getBin postgresql}/bin/pg_upgrade"}\"''
|
||||||
''-DNIXPKGS_POSTGRES_INITDB=\"\"''
|
''-DNIXPKGS_POSTGRES_INITDB=\"${lib.optionalString postgresSupport "${lib.getBin postgresql}/bin/initdb"}\"''
|
||||||
''-DNIX_OUT=\"${placeholder "out"}\"''
|
''-DNIX_OUT=\"${placeholder "out"}\"''
|
||||||
''-I${lib.getDev kio}/include/KF5'' # Fixes: kio_version.h: No such file or directory
|
''-I${lib.getDev kio}/include/KF5'' # Fixes: kio_version.h: No such file or directory
|
||||||
];
|
];
|
||||||
|
|
||||||
|
cmakeFlags = lib.optional (defaultDriver != "MYSQL") "-DDATABASE_BACKEND=${defaultDriver}";
|
||||||
|
|
||||||
# compatibility symlinks for kmymoney, can probably be removed in next kde bump
|
# compatibility symlinks for kmymoney, can probably be removed in next kde bump
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
ln -s $dev/include/KF5/AkonadiCore/Akonadi/Collection $dev/include/KF5/AkonadiCore/Collection
|
ln -s $dev/include/KF5/AkonadiCore/Akonadi/Collection $dev/include/KF5/AkonadiCore/Collection
|
||||||
|
|
|
@ -12,12 +12,12 @@ let
|
||||||
if extension == "zip" then fetchzip args else fetchurl args;
|
if extension == "zip" then fetchzip args else fetchurl args;
|
||||||
|
|
||||||
pname = "1password-cli";
|
pname = "1password-cli";
|
||||||
version = "2.7.2";
|
version = "2.7.3";
|
||||||
sources = rec {
|
sources = rec {
|
||||||
aarch64-linux = fetch "linux_arm64" "sha256-lYY69zbJqE9KuP1Yihfz444GFazHgR9zHVDq9RzZdTA=" "zip";
|
aarch64-linux = fetch "linux_arm64" "sha256-FxApOWyExyfuRFQhxAVBWZGqQNmarBFBRB4jqsreWL0=" "zip";
|
||||||
i686-linux = fetch "linux_386" "sha256-IgTusLxgeOS9u4G1M7JqqxJw2D3hy5L9wl77crgfHjM=" "zip";
|
i686-linux = fetch "linux_386" "sha256-Ta6mdmcsKnNRMz9vwEadZ/xXVBran5BIJQngzNz3PUs=" "zip";
|
||||||
x86_64-linux = fetch "linux_amd64" "sha256-OL/URp5eU3K1ObTlC4nXELa7NkrZDW5tFwhgVdrmPdQ=" "zip";
|
x86_64-linux = fetch "linux_amd64" "sha256-Lvxnp5KmkIj9jnaWg02a27eRYIx7WTNSLx+RJ04Vt+g=" "zip";
|
||||||
aarch64-darwin = fetch "apple_universal" "sha256-pL39V9AO2DjCcWlecteTMCcBBZVb3RXmJ8wk5gyFojg=" "pkg";
|
aarch64-darwin = fetch "apple_universal" "sha256-6qrNgb5ae+qqlNsNDLbKNeWj0o/SRs+2G/4DfK5Wnhg=" "pkg";
|
||||||
x86_64-darwin = aarch64-darwin;
|
x86_64-darwin = aarch64-darwin;
|
||||||
};
|
};
|
||||||
platforms = builtins.attrNames sources;
|
platforms = builtins.attrNames sources;
|
||||||
|
|
|
@ -3,13 +3,13 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "AusweisApp2";
|
pname = "AusweisApp2";
|
||||||
version = "1.24.3";
|
version = "1.24.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Governikus";
|
owner = "Governikus";
|
||||||
repo = "AusweisApp2";
|
repo = "AusweisApp2";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-zwAmMj9Px27e/xJPAsOUh4saCZNQYBdse0bcZu8M3xA=";
|
sha256 = "sha256-YO0K8L03n/KQcINRKwls8BxG8nv5k3Myd95AU8agigI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkg-config ];
|
nativeBuildInputs = [ cmake pkg-config ];
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
, graphicsmagick
|
, graphicsmagick
|
||||||
, gsettings-desktop-schemas
|
, gsettings-desktop-schemas
|
||||||
, gtk3
|
, gtk3
|
||||||
|
, hicolor-icon-theme
|
||||||
, libnotify
|
, libnotify
|
||||||
, librsvg
|
, librsvg
|
||||||
, libxslt
|
, libxslt
|
||||||
|
@ -56,6 +57,8 @@ stdenv.mkDerivation rec {
|
||||||
"LANG_GTKSOURCEVIEW_DIR=/share/gtksourceview-4/language-specs"
|
"LANG_GTKSOURCEVIEW_DIR=/share/gtksourceview-4/language-specs"
|
||||||
# Pretend to be redhat so `install` doesn't try to chown/chgrp.
|
# Pretend to be redhat so `install` doesn't try to chown/chgrp.
|
||||||
"SYSTEM_TYPE=rpm"
|
"SYSTEM_TYPE=rpm"
|
||||||
|
"GCC=${stdenv.cc.targetPrefix}cc"
|
||||||
|
"GCC_PP=${stdenv.cc.targetPrefix}c++"
|
||||||
];
|
];
|
||||||
|
|
||||||
preFixup = ''
|
preFixup = ''
|
||||||
|
@ -82,7 +85,7 @@ stdenv.mkDerivation rec {
|
||||||
XMLSimple
|
XMLSimple
|
||||||
XMLWriter
|
XMLWriter
|
||||||
]}:"$out/share/perl5 \
|
]}:"$out/share/perl5 \
|
||||||
--prefix XDG_DATA_DIRS : "$out/share" \
|
--prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
|
||||||
--set TEXINPUTS ":.:$out/tex/latex"
|
--set TEXINPUTS ":.:$out/tex/latex"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -101,6 +104,7 @@ stdenv.mkDerivation rec {
|
||||||
graphicsmagick
|
graphicsmagick
|
||||||
gsettings-desktop-schemas
|
gsettings-desktop-schemas
|
||||||
gtk3
|
gtk3
|
||||||
|
hicolor-icon-theme
|
||||||
libnotify
|
libnotify
|
||||||
librsvg
|
librsvg
|
||||||
libxslt
|
libxslt
|
||||||
|
|
|
@ -18,10 +18,14 @@ stdenv.mkDerivation rec {
|
||||||
sed -i -e '/^#include <malloc.h>$/d' *.c
|
sed -i -e '/^#include <malloc.h>$/d' *.c
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
# error: 'regparm' is not valid on this platform
|
||||||
|
NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64)
|
||||||
|
"-D__STRICT_ANSI__";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "http://aa-project.sourceforge.net/bb";
|
homepage = "http://aa-project.sourceforge.net/bb";
|
||||||
description = "AA-lib demo";
|
description = "AA-lib demo";
|
||||||
license = licenses.gpl2;
|
license = licenses.gpl2Plus;
|
||||||
maintainers = [ maintainers.rnhmjoj ];
|
maintainers = [ maintainers.rnhmjoj ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
|
|
|
@ -30,11 +30,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "calibre";
|
pname = "calibre";
|
||||||
version = "6.7.1";
|
version = "6.8.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
|
url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
|
||||||
hash = "sha256-B//rBsvOXA5UqGjd2MLcAhDFCvreI7UmtfEpuxaIsa0=";
|
hash = "sha256-d9JaWjAjJzKldjyrdrl6OyX1JSatp9U8agRog7K5n2s=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# https://sources.debian.org/patches/calibre/${version}+dfsg-1
|
# https://sources.debian.org/patches/calibre/${version}+dfsg-1
|
||||||
|
|
|
@ -3,13 +3,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "cheat";
|
pname = "cheat";
|
||||||
version = "4.3.3";
|
version = "4.4.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "cheat";
|
owner = "cheat";
|
||||||
repo = "cheat";
|
repo = "cheat";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-cOryo70eJj2PIJ6R09Kx6lfoguYcduIiWiOBpYp8eqY=";
|
sha256 = "sha256-lEMwPGXvgI8wtXska9ngAy9R2tr41Jq5yO6xQk9V5n4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
subPackages = [ "cmd/cheat" ];
|
subPackages = [ "cmd/cheat" ];
|
||||||
|
|
|
@ -5,7 +5,8 @@
|
||||||
, enableDdc ? true, ddcutil
|
, enableDdc ? true, ddcutil
|
||||||
, enableDpms ? true, libXext
|
, enableDpms ? true, libXext
|
||||||
, enableGamma ? true, libdrm, libXrandr, wayland
|
, enableGamma ? true, libdrm, libXrandr, wayland
|
||||||
, enableScreen ? true }:
|
, enableScreen ? true
|
||||||
|
, enableYoctolight ? true }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "clightd";
|
pname = "clightd";
|
||||||
|
@ -33,10 +34,11 @@ stdenv.mkDerivation rec {
|
||||||
"-DDBUS_CONFIG_DIR=${placeholder "out"}/etc/dbus-1/system.d"
|
"-DDBUS_CONFIG_DIR=${placeholder "out"}/etc/dbus-1/system.d"
|
||||||
# systemd.pc has prefix=${systemd.out}
|
# systemd.pc has prefix=${systemd.out}
|
||||||
"-DMODULE_LOAD_DIR=${placeholder "out"}/lib/modules-load.d"
|
"-DMODULE_LOAD_DIR=${placeholder "out"}/lib/modules-load.d"
|
||||||
] ++ optional enableDdc "-DENABLE_DDC=1"
|
] ++ optional enableDdc "-DENABLE_DDC=1"
|
||||||
++ optional enableDpms "-DENABLE_DPMS=1"
|
++ optional enableDpms "-DENABLE_DPMS=1"
|
||||||
++ optional enableGamma "-DENABLE_GAMMA=1"
|
++ optional enableGamma "-DENABLE_GAMMA=1"
|
||||||
++ optional enableScreen "-DENABLE_SCREEN=1";
|
++ optional enableScreen "-DENABLE_SCREEN=1"
|
||||||
|
++ optional enableYoctolight "-DENABLE_YOCTOLIGHT=1";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
dbus
|
dbus
|
||||||
|
|
|
@ -5,13 +5,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "dmenu-wayland-unstable";
|
pname = "dmenu-wayland-unstable";
|
||||||
version = "2020-07-06";
|
version = "2022-11-04";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nyyManni";
|
owner = "nyyManni";
|
||||||
repo = "dmenu-wayland";
|
repo = "dmenu-wayland";
|
||||||
rev = "304c8e917651ee02b16ebf0b7097a5c53fa2236b";
|
rev = "b60047236ef7a4e5dcde6c4ac0dcfaa070d90041";
|
||||||
sha256 = "0rkpmpk7xkcfbnv9vpg8n65423z5xpgp0hm2vg0rxf9354bjin7k";
|
sha256 = "sha256-CeJWLBPAzE3JITVuS6f4CQxLz9v09WvfG3O0wErJJS4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "out" "man" ];
|
outputs = [ "out" "man" ];
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "dstask";
|
pname = "dstask";
|
||||||
version = "0.23.1";
|
version = "0.25";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "naggie";
|
owner = "naggie";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0rfz8jim0xqcwdb5n28942v9r3hbvhjrwdgzvbwc9f9psqg2s8d2";
|
sha256 = "sha256-nsEn9ZhrSWO0kltyEXaehMcFpqVbivSsXOxu/AX7A9U=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Set vendorSha256 to null because dstask vendors its dependencies (meaning
|
# Set vendorSha256 to null because dstask vendors its dependencies (meaning
|
||||||
|
@ -30,8 +30,6 @@ buildGoModule rec {
|
||||||
"-X github.com/naggie/dstask.GIT_COMMIT=v${version}"
|
"-X github.com/naggie/dstask.GIT_COMMIT=v${version}"
|
||||||
];
|
];
|
||||||
|
|
||||||
subPackages = [ "cmd/dstask.go" ];
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Command line todo list with super-reliable git sync";
|
description = "Command line todo list with super-reliable git sync";
|
||||||
homepage = src.meta.homepage;
|
homepage = src.meta.homepage;
|
||||||
|
|
|
@ -10,13 +10,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "free42";
|
pname = "free42";
|
||||||
version = "3.0.15";
|
version = "3.0.16";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "thomasokken";
|
owner = "thomasokken";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-QeUopHBW3KZGkYklOJIjlNCQG+aab2vwbIsVBfQ07R4=";
|
hash = "sha256-hL4Ytu9zf8x+H/TuvJ3m0E3d8gMZFIDogWEYlaOap+g=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue