alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2023-01-05 06:01:39 +00:00 committed by GitHub
parent 0c98bf3e85 b2bcd1be6e
commit 0c8280b1c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
56 changed files with 1360 additions and 1259 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/default.nix
View file

@ -131,14 +131,15 @@ let
mkAliasAndWrapDefinitions fixMergeModules mkRemovedOptionModule
mkRenamedOptionModule mkRenamedOptionModuleWith
mkMergedOptionModule mkChangedOptionModule
mkAliasOptionModule mkDerivedConfig doRename;
mkAliasOptionModule mkDerivedConfig doRename
mkAliasOptionModuleMD;
inherit (self.options) isOption mkEnableOption mkSinkUndeclaredOptions
mergeDefaultOption mergeOneOption mergeEqualOption mergeUniqueOption
getValues getFiles
optionAttrSetToDocList optionAttrSetToDocList'
scrubOptionValue literalExpression literalExample literalDocBook
showOption showOptionWithDefLocs showFiles
unknownModule mkOption mkPackageOption
unknownModule mkOption mkPackageOption mkPackageOptionMD
mdDoc literalMD;
inherit (self.types) isType setType defaultTypeMerge defaultFunctor
isOptionType mkOptionType;

18
lib/modules.nix
View file

@ -157,6 +157,11 @@ rec {
${if prefix == []
then null # unset => visible
else "internal"} = true;
# TODO: hidden during the markdown transition to not expose downstream
# users of the docs infra to markdown if they're not ready for it.
# we don't make this visible conditionally because it can impact
# performance (https://github.com/NixOS/nixpkgs/pull/208407#issuecomment-1368246192)
visible = false;
# TODO: Change the type of this option to a submodule with a
# freeformType, so that individual arguments can be documented
# separately
@ -1108,6 +1113,15 @@ rec {
visible = true;
warn = false;
use = id;
wrapDescription = lib.id;
};
/* Transitional version of mkAliasOptionModule that uses MD docs. */
mkAliasOptionModuleMD = from: to: doRename {
inherit from to;
visible = true;
warn = false;
use = id;
};
/* mkDerivedConfig : Option a -> (a -> Definition b) -> Definition b
@ -1130,7 +1144,7 @@ rec {
(opt.highestPrio or defaultOverridePriority)
(f opt.value);
doRename = { from, to, visible, warn, use, withPriority ? true }:
doRename = { from, to, visible, warn, use, withPriority ? true, wrapDescription ? lib.mdDoc }:
{ config, options, ... }:
let
fromOpt = getAttrFromPath from options;
@ -1141,7 +1155,7 @@ rec {
{
options = setAttrByPath from (mkOption {
inherit visible;
description = lib.mdDoc "Alias of {option}`${showOption to}`.";
description = wrapDescription "Alias of {option}`${showOption to}`.";
apply = x: use (toOf config);
} // optionalAttrs (toType != null) {
type = toType;

7
lib/options.nix
View file

@ -136,7 +136,7 @@ rec {
let default' = if !isList default then [ default ] else default;
in mkOption {
type = lib.types.package;
description = lib.mdDoc "The ${name} package to use.";
description = "The ${name} package to use.";
default = attrByPath default'
(throw "${concatStringsSep "." default'} cannot be found in pkgs") pkgs;
defaultText = literalExpression ("pkgs." + concatStringsSep "." default');
@ -144,6 +144,11 @@ rec {
(if isList example then "pkgs." + concatStringsSep "." example else example);
};
/* Like mkPackageOption, but emit an mdDoc description instead of DocBook. */
mkPackageOptionMD = args: name: extra:
let option = mkPackageOption args name extra;
in option // { description = lib.mdDoc option.description; };
/* This option accepts anything, but it does not produce any result.
This is useful for sharing a module across different module sets

4
nixos/doc/manual/development/option-declarations.section.md
View file

@ -88,7 +88,7 @@ lib.mkOption {
}
```
### `mkPackageOption` {#sec-option-declarations-util-mkPackageOption}
### `mkPackageOption`, `mkPackageOptionMD` {#sec-option-declarations-util-mkPackageOption}
Usage:
@ -106,6 +106,8 @@ The second argument is the name of the option, used in the description "The \<na
You can omit the default path if the name of the option is also attribute path in nixpkgs.
During the transition to CommonMark documentation `mkPackageOption` creates an option with a DocBook description attribute, once the transition is completed it will create a CommonMark description instead. `mkPackageOptionMD` always creates an option with a CommonMark description attribute and will be removed some time after the transition is completed.
::: {#ex-options-declarations-util-mkPackageOption .title}
Examples:

12
nixos/doc/manual/from_md/development/option-declarations.section.xml
View file

@ -138,7 +138,8 @@ lib.mkOption {
}
</programlisting>
<section xml:id="sec-option-declarations-util-mkPackageOption">
<title><literal>mkPackageOption</literal></title>
<title><literal>mkPackageOption</literal>,
<literal>mkPackageOptionMD</literal></title>
<para>
Usage:
</para>
@ -172,6 +173,15 @@ mkPackageOption pkgs &quot;name&quot; { default = [ &quot;path&quot; &quot;in&qu
You can omit the default path if the name of the option is
also attribute path in nixpkgs.
</para>
<para>
During the transition to CommonMark documentation
<literal>mkPackageOption</literal> creates an option with a
DocBook description attribute, once the transition is
completed it will create a CommonMark description instead.
<literal>mkPackageOptionMD</literal> always creates an option
with a CommonMark description attribute and will be removed
some time after the transition is completed.
</para>
<anchor xml:id="ex-options-declarations-util-mkPackageOption" />
<para>
Examples:

9
nixos/lib/make-options-doc/mergeJSON.py
View file

@ -306,14 +306,17 @@ if hasDocBookErrors:
print("Explanation: The documentation contains descriptions, examples, or defaults written in DocBook. " +
"NixOS is in the process of migrating from DocBook to Markdown, and " +
"DocBook is disallowed for in-tree modules. To change your contribution to "+
"use Markdown, apply mdDoc and literalMD. For example:\n" +
"use Markdown, apply mdDoc and literalMD and use the *MD variants of option creation " +
"functions where they are available. For example:\n" +
"\n" +
" example.foo = mkOption {\n" +
" description = lib.mdDoc ''your description'';\n" +
" defaultText = lib.literalMD ''your description of default'';\n" +
" }\n" +
" };\n" +
"\n" +
" example.enable = mkEnableOption (lib.mdDoc ''your thing'');",
" example.enable = mkEnableOption (lib.mdDoc ''your thing'');\n" +
" example.package = mkPackageOptionMD pkgs \"your-package\" {};\n" +
" imports = [ (mkAliasOptionModuleMD [ \"example\" \"args\" ] [ \"example\" \"settings\" ]) ];",
file = sys.stderr)
if hasErrors:

4
nixos/modules/config/users-groups.nix
View file

@ -444,8 +444,8 @@ let
in {
imports = [
(mkAliasOptionModule [ "users" "extraUsers" ] [ "users" "users" ])
(mkAliasOptionModule [ "users" "extraGroups" ] [ "users" "groups" ])
(mkAliasOptionModuleMD [ "users" "extraUsers" ] [ "users" "users" ])
(mkAliasOptionModuleMD [ "users" "extraGroups" ] [ "users" "groups" ])
(mkRenamedOptionModule ["security" "initialRootPassword"] ["users" "users" "root" "initialHashedPassword"])
];

2
nixos/modules/misc/documentation.nix
View file

@ -50,7 +50,7 @@ let
(name: value:
let
wholeName = "${namePrefix}.${name}";
guard = lib.warn "Attempt to evaluate package ${wholeName} in option documentation; this is not supported and will eventually be an error. Use `mkPackageOption` or `literalExpression` instead.";
guard = lib.warn "Attempt to evaluate package ${wholeName} in option documentation; this is not supported and will eventually be an error. Use `mkPackageOption{,MD}` or `literalExpression` instead.";
in if isAttrs value then
scrubDerivations wholeName value
// optionalAttrs (isDerivation value) {

2
nixos/modules/programs/_1password-gui.nix
View file

@ -27,7 +27,7 @@ in
'';
};
package = mkPackageOption pkgs "1Password GUI" {
package = mkPackageOptionMD pkgs "1Password GUI" {
default = [ "_1password-gui" ];
};
};

2
nixos/modules/programs/_1password.nix
View file

@ -18,7 +18,7 @@ in
programs._1password = {
enable = mkEnableOption (lib.mdDoc "the 1Password CLI tool");
package = mkPackageOption pkgs "1Password CLI" {
package = mkPackageOptionMD pkgs "1Password CLI" {
default = [ "_1password" ];
};
};

2
nixos/modules/programs/flashrom.nix
View file

@ -16,7 +16,7 @@ in
group.
'';
};
package = mkPackageOption pkgs "flashrom" { };
package = mkPackageOptionMD pkgs "flashrom" { };
};
config = mkIf cfg.enable {

4
nixos/modules/programs/skim.nix
View file

@ -1,6 +1,6 @@
{ pkgs, config, lib, ... }:
let
inherit (lib) mdDoc mkEnableOption mkPackageOption optional optionalString;
inherit (lib) mdDoc mkEnableOption mkPackageOptionMD optional optionalString;
cfg = config.programs.skim;
in
{
@ -8,7 +8,7 @@ in
programs.skim = {
fuzzyCompletion = mkEnableOption (mdDoc "fuzzy completion with skim");
keybindings = mkEnableOption (mdDoc "skim keybindings");
package = mkPackageOption pkgs "skim" {};
package = mkPackageOptionMD pkgs "skim" {};
};
};

2
nixos/modules/programs/streamdeck-ui.nix
View file

@ -15,7 +15,7 @@ in
description = lib.mdDoc "Whether streamdeck-ui should be started automatically.";
};
package = mkPackageOption pkgs "streamdeck-ui" {
package = mkPackageOptionMD pkgs "streamdeck-ui" {
default = [ "streamdeck-ui" ];
};

2
nixos/modules/rename.nix
View file

@ -14,7 +14,7 @@ with lib;
# This alias module can't be where _module.check is defined because it would
# be added to submodules as well there
(mkAliasOptionModule [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ])
(mkAliasOptionModuleMD [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ])
# Completely removed modules
(mkRemovedOptionModule [ "environment" "blcr" "enable" ] "The BLCR module has been removed")

2
nixos/modules/services/databases/dgraph.nix
View file

@ -55,7 +55,7 @@ in
services.dgraph = {
enable = mkEnableOption (lib.mdDoc "Dgraph native GraphQL database with a graph backend");
package = lib.mkPackageOption pkgs "dgraph" { };
package = lib.mkPackageOptionMD pkgs "dgraph" { };
settings = mkOption {
type = settingsFormat.type;

2
nixos/modules/services/mail/listmonk.nix
View file

@ -128,7 +128,7 @@ in {
'';
};
};
package = mkPackageOption pkgs "listmonk" {};
package = mkPackageOptionMD pkgs "listmonk" {};
settings = mkOption {
type = types.submodule { freeformType = tomlFormat.type; };
description = lib.mdDoc ''

2
nixos/modules/services/misc/input-remapper.nix
View file

@ -7,7 +7,7 @@ let cfg = config.services.input-remapper; in
options = {
services.input-remapper = {
enable = mkEnableOption (lib.mdDoc "input-remapper, an easy to use tool to change the mapping of your input device buttons.");
package = options.mkPackageOption pkgs "input-remapper" { };
package = mkPackageOptionMD pkgs "input-remapper" { };
enableUdevRules = mkEnableOption (lib.mdDoc "udev rules added by input-remapper to handle hotplugged devices. Currently disabled by default due to https://github.com/sezanzeb/input-remapper/issues/140");
serviceWantedBy = mkOption {
default = [ "graphical.target" ];

2
nixos/modules/services/misc/polaris.nix
View file

@ -13,7 +13,7 @@ in
services.polaris = {
enable = mkEnableOption (lib.mdDoc "Polaris Music Server");
package = mkPackageOption pkgs "polaris" { };
package = mkPackageOptionMD pkgs "polaris" { };
user = mkOption {
type = types.str;

2
nixos/modules/services/networking/openconnect.nix
View file

@ -116,7 +116,7 @@ let
};
in {
options.networking.openconnect = {
package = mkPackageOption pkgs "openconnect" { };
package = mkPackageOptionMD pkgs "openconnect" { };
interfaces = mkOption {
description = lib.mdDoc "OpenConnect interfaces.";

2
nixos/modules/services/networking/radicale.nix
View file

@ -200,5 +200,5 @@ in {
};
};
meta.maintainers = with lib.maintainers; [ aneeshusa infinisil dotlambda ];
meta.maintainers = with lib.maintainers; [ infinisil dotlambda ];
}

2
nixos/modules/services/networking/shellhub-agent.nix
View file

@ -14,7 +14,7 @@ in
enable = mkEnableOption (lib.mdDoc "ShellHub Agent daemon");
package = mkPackageOption pkgs "shellhub-agent" { };
package = mkPackageOptionMD pkgs "shellhub-agent" { };
preferredHostname = mkOption {
type = types.str;

4
nixos/modules/services/networking/ssh/sshd.nix
View file

@ -79,8 +79,8 @@ in
{
imports = [
(mkAliasOptionModule [ "services" "sshd" "enable" ] [ "services" "openssh" "enable" ])
(mkAliasOptionModule [ "services" "openssh" "knownHosts" ] [ "programs" "ssh" "knownHosts" ])
(mkAliasOptionModuleMD [ "services" "sshd" "enable" ] [ "services" "openssh" "enable" ])
(mkAliasOptionModuleMD [ "services" "openssh" "knownHosts" ] [ "programs" "ssh" "knownHosts" ])
(mkRenamedOptionModule [ "services" "openssh" "challengeResponseAuthentication" ] [ "services" "openssh" "kbdInteractiveAuthentication" ])
];

2
nixos/modules/services/networking/vdirsyncer.nix
View file

@ -71,7 +71,7 @@ in
services.vdirsyncer = {
enable = mkEnableOption (mdDoc "vdirsyncer");
package = mkPackageOption pkgs "vdirsyncer" {};
package = mkPackageOptionMD pkgs "vdirsyncer" {};
jobs = mkOption {
description = mdDoc "vdirsyncer job configurations";

2
nixos/modules/services/networking/webhook.nix
View file

@ -36,7 +36,7 @@ in {
which execute configured commands for any person or service that knows the URL
'');
package = mkPackageOption pkgs "webhook" {};
package = mkPackageOptionMD pkgs "webhook" {};
user = mkOption {
type = types.str;
default = defaultUser;

6
nixos/modules/services/torrent/transmission.nix
View file

@ -19,8 +19,8 @@ in
imports = [
(mkRenamedOptionModule ["services" "transmission" "port"]
["services" "transmission" "settings" "rpc-port"])
(mkAliasOptionModule ["services" "transmission" "openFirewall"]
["services" "transmission" "openPeerPorts"])
(mkAliasOptionModuleMD ["services" "transmission" "openFirewall"]
["services" "transmission" "openPeerPorts"])
];
options = {
services.transmission = {
@ -174,7 +174,7 @@ in
};
};
package = mkPackageOption pkgs "transmission" {};
package = mkPackageOptionMD pkgs "transmission" {};
downloadDirPermissions = mkOption {
type = with types; nullOr str;

4
nixos/modules/services/x11/desktop-managers/plasma5.nix
View file

@ -32,7 +32,7 @@ let
inherit (lib)
getBin optionalString literalExpression
mkRemovedOptionModule mkRenamedOptionModule
mkDefault mkIf mkMerge mkOption mkPackageOption types;
mkDefault mkIf mkMerge mkOption mkPackageOptionMD types;
ini = pkgs.formats.ini { };
@ -198,7 +198,7 @@ in
example = literalExpression "[ pkgs.plasma5Packages.oxygen ]";
};
notoPackage = mkPackageOption pkgs "Noto fonts" {
notoPackage = mkPackageOptionMD pkgs "Noto fonts" {
default = [ "noto-fonts" ];
example = "noto-fonts-lgc-plus";
};

2
nixos/modules/services/x11/picom.nix
View file

@ -41,7 +41,7 @@ let
in {
imports = [
(mkAliasOptionModule [ "services" "compton" ] [ "services" "picom" ])
(mkAliasOptionModuleMD [ "services" "compton" ] [ "services" "picom" ])
(mkRemovedOptionModule [ "services" "picom" "refreshRate" ] ''
This option corresponds to `refresh-rate`, which has been unused
since picom v6 and was subsequently removed by upstream.

4
nixos/modules/services/x11/window-managers/katriawm.nix
View file

@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }:
let
inherit (lib) mdDoc mkEnableOption mkIf mkPackageOption singleton;
inherit (lib) mdDoc mkEnableOption mkIf mkPackageOptionMD singleton;
cfg = config.services.xserver.windowManager.katriawm;
in
{
@ -9,7 +9,7 @@ in
options = {
services.xserver.windowManager.katriawm = {
enable = mkEnableOption (mdDoc "katriawm");
package = mkPackageOption pkgs "katriawm" {};
package = mkPackageOptionMD pkgs "katriawm" {};
};
};

2
nixos/modules/services/x11/window-managers/qtile.nix
View file

@ -10,7 +10,7 @@ in
options.services.xserver.windowManager.qtile = {
enable = mkEnableOption (lib.mdDoc "qtile");
package = mkPackageOption pkgs "qtile" { };
package = mkPackageOptionMD pkgs "qtile" { };
};
config = mkIf cfg.enable {

2
nixos/modules/system/boot/systemd/initrd.nix
View file

@ -142,7 +142,7 @@ in {
'';
};
package = (mkPackageOption pkgs "systemd" {
package = (mkPackageOptionMD pkgs "systemd" {
default = "systemdStage1";
}) // {
visible = false;

2
pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
View file

@ -1,6 +1,6 @@
# generated by pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py
{ buildGrammar, fetchFromBitbucket, fetchFromGitHub, fetchFromGitLab, fetchFromGitea, fetchFromGitiles, fetchFromRepoOrCz, fetchFromSourcehut, fetchgit }:
{ buildGrammar, fetchFromBitbucket, fetchFromGitHub, fetchFromGitLab, fetchFromGitea, fetchFromGitiles, fetchFromRepoOrCz, fetchFromSourcehut, fetchgit, fetchhg, fetchsvn }:
{
ada = buildGrammar {

5
pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py
View file

@ -60,10 +60,9 @@ def generate_grammar(item):
generated_file = """# generated by pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py
{ buildGrammar"""
{ buildGrammar, """
for fetcher in subprocess.check_output(["nurl", "-L"], text=True).splitlines():
generated_file += f", {fetcher}"
generated_file += subprocess.check_output(["nurl", "-Ls", ", "], text=True)
generated_file += """ }:

4
pkgs/applications/misc/solaar/default.nix
View file

@ -14,13 +14,13 @@
# instead of adding this to `services.udev.packages` on NixOS,
python3Packages.buildPythonApplication rec {
pname = "solaar";
version = "1.1.5";
version = "1.1.8";
src = fetchFromGitHub {
owner = "pwr-Solaar";
repo = "Solaar";
rev = "refs/tags/${version}";
hash = "sha256-wqSDSLzm2RYV7XZPX0GQDR+TUgj4hLJ9FpVP3DYN7To=";
hash = "sha256-2LD1vMmQvibcnAgBwjfSBJysTnUGptGzPHfi/7tZ0hg=";
};
outputs = [ "out" "udev" ];

8
pkgs/applications/misc/todoist/default.nix
View file

@ -2,23 +2,19 @@
buildGoModule rec {
pname = "todoist";
version = "0.17.0";
version = "0.18.0";
src = fetchFromGitHub {
owner = "sachaos";
repo = "todoist";
rev = "v${version}";
sha256 = "sha256-lnx02fFzf8oaJ9T7MV+Gx4EpA4h7TVJK91o9+GU/Yvs=";
sha256 = "sha256-46wNacsK2kGHaq2MgcW4ELI2TIY+4leraGQwU4V7sVo=";
};
vendorSha256 = "sha256-ly+OcRo8tGeNX4FnqNVaqjPx/A1FALOnScxs04lIOiU=";
doCheck = false;
postPatch = ''
substituteInPlace main.go --replace '0.15.0' '${version}'
'';
meta = {
homepage = "https://github.com/sachaos/todoist";
description = "Todoist CLI Client";

16
pkgs/applications/networking/cluster/terraform-providers/providers.json
View file

@ -231,11 +231,11 @@
"vendorHash": "sha256-Y5z0bRiNu1gOm7nIcQieLWll/sOSgBlKrJlqng2kizQ="
},
"cloudfoundry": {
"hash": "sha256-RIzAUhusyA+lMHkfsWk/27x3ZRGVcAzqgBaoI8erQSY=",
"hash": "sha256-/Zxj9cous0SjYxeDo+8/u61pqDwMGt/UsS/OC1oSR2U=",
"homepage": "https://registry.terraform.io/providers/cloudfoundry-community/cloudfoundry",
"owner": "cloudfoundry-community",
"repo": "terraform-provider-cloudfoundry",
"rev": "v0.50.3",
"rev": "v0.50.4",
"spdx": "MPL-2.0",
"vendorHash": "sha256-mEWhLh4E3SI7xfmal1sJ5PdAYbYJrW/YFoBjTW9w4bA="
},
@ -571,13 +571,13 @@
"vendorHash": null
},
"ibm": {
"hash": "sha256-XWoEUHGTtQ0MFRs5NbW7nA9gvhrlqh78KNqA6M7s+yE=",
"hash": "sha256-DvJow7KDyv1wGBw0QIQQ4MoLgQIT8+Cf6fjc7w4W7Ds=",
"homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",
"owner": "IBM-Cloud",
"repo": "terraform-provider-ibm",
"rev": "v1.48.0",
"rev": "v1.49.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-uzXtXpS2reCJK63vipri8nCyHRCLmQxakFuIoMyl95E="
"vendorHash": "sha256-Vt1AKXJ8KRoDESFvUeZPTjUFm7gwP/Uji4hyU16GhjY="
},
"icinga2": {
"hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=",
@ -1104,13 +1104,13 @@
"vendorHash": null
},
"tfe": {
"hash": "sha256-y9v+13/u91tpRwyI/oLHsd7oUUj0OGFJkqzbk2z8MxU=",
"hash": "sha256-YhsAKyD3YYYWfxIHcAgMxdQc//0WQvXTsa+fVhSCG6U=",
"homepage": "https://registry.terraform.io/providers/hashicorp/tfe",
"owner": "hashicorp",
"repo": "terraform-provider-tfe",
"rev": "v0.40.0",
"rev": "v0.41.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-Z2pIUAe2Beq5Hi7HBxNenFEtAFhJFMPi3k2qiifN+Jg="
"vendorHash": "sha256-LgCS7W6mGGlX4vEhlPYL+Wo/urHv7aiopXWEBoEyL1c="
},
"thunder": {
"hash": "sha256-fXvwBOIW3/76V3O9t25wff0oGViqSaSB2VgMdItXyn4=",

8
pkgs/applications/networking/n8n/default.nix
View file

@ -15,12 +15,16 @@ nodePackages.n8n.override {
pkgs.postgresql
];
# Patch minified source with changes from https://github.com/n8n-io/n8n/pull/5052
preRebuild = ''
patch -p1 -i ${./fix-permissions.diff}
'' +
# Oracle's official package on npm is binary only (WHY?!) and doesn't provide binaries for aarch64.
# This can supposedly be fixed by building a custom copy of the module from source, but that's way
# too much complexity for a setup no one would ever actually run.
#
# NB: If you _are_ actually running n8n on Oracle on aarch64, feel free to submit a patch.
preRebuild = lib.optionalString stdenv.isAarch64 ''
lib.optionalString stdenv.isAarch64 ''
rm -rf node_modules/oracledb
'';
@ -32,7 +36,7 @@ nodePackages.n8n.override {
};
meta = with lib; {
description = "Free and open fair-code licensed node based Workflow Automation Tool";
description = "Free and source-available fair-code licensed workflow automation tool. Easily automate tasks across different services.";
maintainers = with maintainers; [ freezeboy k900 ];
license = {
fullName = "Sustainable Use License";

28
pkgs/applications/networking/n8n/fix-permissions.diff Normal file
View file

@ -0,0 +1,28 @@
--- a/dist/LoadNodesAndCredentials.js
+++ b/dist/LoadNodesAndCredentials.js
@@ -216,6 +216,7 @@
const { types } = loader;
this.types.nodes = this.types.nodes.concat(types.nodes);
this.types.credentials = this.types.credentials.concat(types.credentials);
+ let seen = new Set();
const iconPromises = Object.entries(types).flatMap(([typeName, typesArr]) => typesArr.map((type) => {
var _a;
if (!((_a = type.icon) === null || _a === void 0 ? void 0 : _a.startsWith('file:')))
@@ -226,7 +227,16 @@
type.iconUrl = iconUrl;
const source = path_1.default.join(dir, icon);
const destination = path_1.default.join(constants_1.GENERATED_STATIC_DIR, iconUrl);
- return (0, promises_1.mkdir)(path_1.default.dirname(destination), { recursive: true }).then(async () => (0, promises_1.copyFile)(source, destination));
+ if (!seen.has(destination)) {
+ seen.add(destination);
+ return (0, promises_1.mkdir)(path_1.default.dirname(destination), { recursive: true }).then(async () => {
+ await (0, promises_1.copyFile)(source, destination);
+ await (0, promises_1.chmod)(destination, 0o644);
+ });
+ }
+ else {
+ return Promise.resolve();
+ }
}));
await Promise.all(iconPromises);
for (const nodeTypeName in loader.nodeTypes) {

2174
pkgs/applications/networking/n8n/node-packages.nix generated
View file

File diff suppressed because it is too large Load diff

51
pkgs/applications/networking/remote/freerdp/default.nix
View file

@ -2,23 +2,29 @@
, lib
, fetchFromGitHub
, cmake
, docbook-xsl-nons
, libxslt
, pkg-config
, alsa-lib
, faac
, faad2
, ffmpeg
, glib
, openh264
, openssl
, pcre
, pcre2
, zlib
, libX11
, libXcursor
, libXdamage
, libXdmcp
, libXext
, libXi
, libXinerama
, libXrandr
, libXrender
, libXv
, libXtst
, libXv
, libxkbcommon
, libxkbfile
, wayland
@ -27,7 +33,6 @@
, gst-plugins-good
, libunwind
, orc
, libxslt
, cairo
, libusb1
, libpulseaudio
@ -42,6 +47,7 @@
, Carbon
, Cocoa
, CoreMedia
, withUnfree ? false
}:
let
@ -59,6 +65,8 @@ let
}
];
inherit (lib) optionals;
in
stdenv.mkDerivation rec {
pname = "freerdp";
@ -97,6 +105,7 @@ stdenv.mkDerivation rec {
buildInputs = [
cairo
cups
faad2
ffmpeg
glib
gst-plugins-base
@ -105,6 +114,7 @@ stdenv.mkDerivation rec {
libX11
libXcursor
libXdamage
libXdmcp
libXext
libXi
libXinerama
@ -118,41 +128,50 @@ stdenv.mkDerivation rec {
libusb1
libxkbcommon
libxkbfile
libxslt
openh264
openssl
orc
pcre
pcre2
pcsclite
zlib
] ++ lib.optionals stdenv.isLinux [
] ++ optionals stdenv.isLinux [
alsa-lib
systemd
wayland
] ++ lib.optionals stdenv.isDarwin [
] ++ optionals stdenv.isDarwin [
AudioToolbox
AVFoundation
Carbon
Cocoa
CoreMedia
]
++ optionals withUnfree [
faac
];
nativeBuildInputs = [ cmake pkg-config ];
nativeBuildInputs = [ cmake libxslt docbook-xsl-nons pkg-config ];
doCheck = true;
cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]
++ lib.mapAttrsToList (k: v: "-D${k}=${if v then "ON" else "OFF"}") {
BUILD_TESTING = doCheck;
WITH_CUNIT = doCheck;
# https://github.com/FreeRDP/FreeRDP/issues/8526#issuecomment-1357134746
cmakeFlags = [
"-Wno-dev"
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DDOCBOOKXSL_DIR=${docbook-xsl-nons}/xml/xsl/docbook"
]
++ lib.mapAttrsToList (k: v: "-D${k}=${cmFlag v}") {
BUILD_TESTING = false; # false is recommended by upstream
WITH_CAIRO = (cairo != null);
WITH_CUPS = (cups != null);
WITH_FAAC = (withUnfree && faac != null);
WITH_FAAD2 = (faad2 != null);
WITH_JPEG = (libjpeg_turbo != null);
WITH_OPENH264 = (openh264 != null);
WITH_OSS = false;
WITH_PCSC = (pcsclite != null);
WITH_PULSE = (libpulseaudio != null);
WITH_SERVER = buildServer;
WITH_SSE2 = stdenv.isx86_64;
WITH_VAAPI = true;
WITH_JPEG = (libjpeg_turbo != null);
WITH_CAIRO = (cairo != null);
WITH_VAAPI = false; # false is recommended by upstream
WITH_X11 = true;
};

4
pkgs/development/compilers/sbcl/2.x.nix
View file

@ -61,6 +61,10 @@ let
"2.2.11" = {
sha256 = "sha256-NgfWgBZzGICEXO1dXVXGBUzEnxkSGhUCfmxWB66Elt8=";
};
"2.3.0" = {
sha256 = "sha256-v3Q5SXEq4Cy3ST87i1fOJBlIv2ETHjaGDdszTaFDnJc=";
};
};
in with versionMap.${version};

4
pkgs/development/libraries/liboil/default.nix
View file

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
# fix "argb_paint_i386.c:53:Incorrect register `%rax' used with `l' suffix"
# errors
configureFlags = lib.optional stdenv.isDarwin "--build=x86_64";
configureFlags = lib.optional (stdenv.isDarwin && stdenv.isx86_64) "--build=x86_64";
# fixes a cast in inline asm: easier than patching
buildFlags = lib.optional stdenv.isDarwin "CFLAGS=-fheinous-gnu-extensions";
@ -29,7 +29,5 @@ stdenv.mkDerivation rec {
license = licenses.bsd2;
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.all;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

34
pkgs/development/ocaml-modules/inotify/default.nix
View file

@ -1,42 +1,26 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, ocaml, findlib, ocamlbuild
, ocaml_lwt # optional lwt support
, ounit, fileutils # only for tests
{ lib, fetchFromGitHub, buildDunePackage
, lwt # optional lwt support
, ounit2, fileutils # only for tests
}:
stdenv.mkDerivation rec {
version = "2.3";
pname = "ocaml${ocaml.version}-inotify";
buildDunePackage rec {
version = "2.4.1";
pname = "inotify";
src = fetchFromGitHub {
owner = "whitequark";
repo = "ocaml-inotify";
rev = "v${version}";
sha256 = "1s6vmqpx19hxzsi30jvp3h7p56rqnxfhfddpcls4nz8sqca1cz5y";
hash = "sha256-2ATFF3HeATjhWgW4dG4jheQ9m1oE8xTQ7mpMT/1Jdp8=";
};
patches = [ (fetchpatch {
url = "https://github.com/whitequark/ocaml-inotify/commit/716c8002cc1652f58eb0c400ae92e04003cba8c9.patch";
sha256 = "04lfxrrsmk2mc704kaln8jqx93jc4bkxhijmfy2d4cmk1cim7r6k";
}) ];
nativeBuildInputs = [ ocaml findlib ocamlbuild ];
buildInputs = [ ocaml_lwt ];
checkInputs = [ ounit fileutils ];
buildInputs = [ lwt ];
checkInputs = [ ounit2 fileutils ];
# Otherwise checkInputs can't be found
strictDeps = false;
configureFlags = [ "--enable-lwt"
(lib.optionalString doCheck "--enable-tests") ];
postConfigure = lib.optionalString doCheck ''
echo '<lib_test/test_inotify_lwt.*>: pkg_threads' | tee -a _tags
'';
doCheck = true;
checkTarget = "test";
createFindlibDestdir = true;
meta = {
description = "Bindings for Linux’s filesystem monitoring interface, inotify";

5
pkgs/development/ocaml-modules/ocamlnet/default.nix
View file

@ -2,9 +2,8 @@
, gnutls, nettle
}:
if lib.versionOlder ocaml.version "4.02"
then throw "ocamlnet is not available for OCaml ${ocaml.version}"
else
lib.throwIf (lib.versionOlder ocaml.version "4.02" || lib.versionAtLeast ocaml.version "5.0")
"ocamlnet is not available for OCaml ${ocaml.version}"
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-ocamlnet";

41
pkgs/development/ocaml-modules/wodan/default.nix
View file

@ -1,41 +0,0 @@
{ lib, buildDunePackage, fetchFromGitHub, lwt_ppx, ppx_cstruct, optint
, checkseum, diet, bitv, logs, lru, io-page, mirage-block }:
buildDunePackage rec {
pname = "wodan";
version = "unstable-2020-11-20";
useDune2 = true;
src = fetchFromGitHub {
owner = "mirage";
repo = pname;
rev = "cc08fe25888051c207f1009bcd2d39f8c514484f";
sha256 = "0186vlhnl8wcz2hmpn327n9a0bibnypmjy3w4nxq3yyglh6vj1im";
fetchSubmodules = true;
};
minimumOCamlVersion = "4.08";
propagatedBuildInputs = [
lwt_ppx
ppx_cstruct
optint
checkseum
diet
bitv
/* nocrypto */
logs
lru
io-page
mirage-block
];
meta = with lib; {
broken = true; # nocrypto is no longer available in nixpkgs
inherit (src.meta) homepage;
description = "A flash-friendly, safe and flexible filesystem library";
license = licenses.isc;
maintainers = with maintainers; [ ehmry ];
};
}

25
pkgs/development/ocaml-modules/wodan/irmin.nix
View file

@ -1,25 +0,0 @@
{ lib, buildDunePackage, irmin-chunk, irmin-git
, mirage-block-ramdisk, mirage-block-unix, wodan }:
buildDunePackage rec {
pname = "wodan-irmin";
inherit (wodan) version src useDune2;
propagatedBuildInputs = [
/* io-page-unix */ # No longer available in nixpkgs
irmin-chunk
irmin-git
mirage-block-ramdisk
mirage-block-unix
wodan
];
meta = wodan.meta // {
# wodan is currently incompatible with irmin 2.3.0.
# additionally upgrading to current master (unclear
# if the issue is fixed there) is not possible as it
# depends on a custom fork of mirage-block
broken = true;
description = "Wodan as an Irmin store";
};
}

31
pkgs/development/ocaml-modules/wodan/unix.nix
View file

@ -1,31 +0,0 @@
{ lib, buildDunePackage, base64, benchmark, csv, cmdliner, wodan, afl-persistent
, mirage-block-ramdisk, mirage-block-unix }:
buildDunePackage rec {
outputs = [ "bin" "out" ];
pname = "wodan-unix";
inherit (wodan) version src useDune2;
propagatedBuildInputs = [
afl-persistent
base64
benchmark
cmdliner
csv
/* io-page-unix */
mirage-block-ramdisk
mirage-block-unix
wodan
];
postInstall = ''
moveToOutput bin "''${!outputBin}"
'';
meta = wodan.meta // {
broken = true; # io-page-unix is no longer available
description = "Wodan clients with Unix integration";
mainProgram = "wodanc";
};
}

3
pkgs/development/ocaml-modules/xml-light/default.nix
View file

@ -1,5 +1,8 @@
{ stdenv, lib, fetchFromGitHub, ocaml, findlib, gitUpdater }:
lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
"xml-light is not available for OCaml ${ocaml.version}"
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-xml-light";
version = "2.4";

4
pkgs/development/python-modules/APScheduler/default.nix
View file

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "apscheduler";
version = "3.9.1";
version = "3.9.1.post1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -26,7 +26,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "APScheduler";
inherit version;
hash = "sha256-ZeZXS2OVSY03HQRfKop+T31Qxq0h73MT0VscfPIN8eM=";
hash = "sha256-sr6gMJVp2lOnJhv6DOGcZ92/4VG9p3amqQdXn9vT6yo=";
};
buildInputs = [

2
pkgs/development/python-modules/radicale_infcloud/default.nix
View file

@ -22,6 +22,6 @@ buildPythonPackage {
homepage = "https://github.com/Unrud/RadicaleInfCloud/";
description = "Integrate InfCloud into Radicale's web interface";
license = with licenses; [ agpl3 gpl3 ];
maintainers = with maintainers; [ aneeshusa erictapen ];
maintainers = with maintainers; [ erictapen ];
};
}

16
pkgs/servers/libreddit/default.nix
View file

@ -3,21 +3,31 @@
, nixosTests
, rustPlatform
, fetchFromGitHub
, fetchpatch
, Security
}:
rustPlatform.buildRustPackage rec {
pname = "libreddit";
version = "0.25.1";
version = "0.27.0";
src = fetchFromGitHub {
owner = "libreddit";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-/K79EHjqkclyh1AmRaevYcyUD4XSrTfd5zjnpOmBNcE=";
hash = "sha256-+sSzYewqN3VjTl+wjgan3yxlFiuCg2rprJDpDktuQHo=";
};
cargoSha256 = "sha256-KYuEy5MwgdiHHbDDNyb+NVYyXdvx1tCH7dQdPWCCfQo=";
cargoSha256 = "sha256-HhtslN6JV9DUBhuyesciZGGYVz7mvpdyxVps9xAc+Rs=";
patches = [
# https://github.com/libreddit/libreddit/pull/687
(fetchpatch {
name = "fix-cfg-test.patch";
url = "https://github.com/libreddit/libreddit/commit/dff91da8777dc42d38abf8b5d63addbd71fdabff.patch";
sha256 = "sha256-6np5gf8cyKotF7KJ19mCtRAF7SxDpNFpQCgdy/XDsng=";
})
];
buildInputs = lib.optionals stdenv.isDarwin [
Security

2
pkgs/servers/radicale/2.x.nix
View file

@ -41,6 +41,6 @@ python3.pkgs.buildPythonApplication rec {
on mobile phones or computers.
'';
license = licenses.gpl3Plus;
maintainers = with maintainers; [ edwtjo pSub aneeshusa infinisil ];
maintainers = with maintainers; [ edwtjo pSub infinisil ];
};
}

6
pkgs/servers/routinator/default.nix
View file

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "routinator";
version = "0.12.0";
version = "0.12.1";
src = fetchFromGitHub {
owner = "NLnetLabs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-anc2nFZXYO0Ab5xwDasXGw8/SluNt15C6pRmQfUJVDs=";
sha256 = "sha256-QH4M6Kr6UiDJAaDtEn2GXQT9oSSz3lqkf+VE0GfOqeg=";
};
cargoSha256 = "sha256-EyrQR9gevInCI4kBZvUW5U9FrE0ZHbRUFyLKVZefKEE=";
cargoSha256 = "sha256-lzw26aat+Zk0E70H7/xwZ6azRMkknfQmTrE4wOJRwfo=";
buildInputs = lib.optionals stdenv.isDarwin [ Security ];

9
pkgs/tools/misc/nurl/default.nix
View file

@ -10,22 +10,25 @@
rustPlatform.buildRustPackage rec {
pname = "nurl";
version = "0.3.1";
version = "0.3.3";
src = fetchFromGitHub {
owner = "nix-community";
repo = "nurl";
rev = "v${version}";
hash = "sha256-fLa9gNdwBOSOMisU1UI8KAKGOkDN13LZsBpH+bObqUM=";
hash = "sha256-bZJlhGbRjhrLk8J0WJq3NCY71MZYsxy8f1ippguOsIM=";
};
cargoSha256 = "sha256-vyhsZYYSpR2qbwTXOw8e1DFRQ78RVHktK6zCbiXT7RI=";
cargoSha256 = "sha256-904IOaovvSOuMyXIxZjaG2iqUoz5qq3hftLGaiA8h0U=";
nativeBuildInputs = [
installShellFiles
makeWrapper
];
# tests require internet access
doCheck = false;
postInstall = ''
wrapProgram $out/bin/nurl \
--prefix PATH : ${lib.makeBinPath [ gitMinimal mercurial nix ]}

11
pkgs/tools/system/gdu/default.nix
View file

@ -3,17 +3,19 @@
, buildGoModule
, fetchFromGitHub
, installShellFiles
, testers
, gdu
}:
buildGoModule rec {
pname = "gdu";
version = "5.20.0";
version = "5.21.0";
src = fetchFromGitHub {
owner = "dundee";
repo = pname;
rev = "v${version}";
sha256 = "sha256-8wkp6pu6QDQBrXJVasi9YhxdzyaobDp0WbwNFCQpLag=";
sha256 = "sha256-7zVYki4sA5jsnxWye0ouUwAOwKUBf/TiZDqFuXTm45w=";
};
vendorSha256 = "sha256-UP6IdJLc93gRP4vwKKOJl3sNt4sOFeYXjvwk8QM+D48=";
@ -36,6 +38,10 @@ buildGoModule rec {
doCheck = !stdenv.isDarwin;
passthru.tests.version = testers.testVersion {
package = gdu;
};
meta = with lib; {
description = "Disk usage analyzer with console interface";
longDescription = ''
@ -46,6 +52,5 @@ buildGoModule rec {
homepage = "https://github.com/dundee/gdu";
license = with licenses; [ mit ];
maintainers = [ maintainers.fab maintainers.zowoq ];
platforms = platforms.unix;
};
}

3
pkgs/top-level/all-packages.nix
View file

@ -15665,7 +15665,8 @@ with pkgs;
sbcl_2_2_9 = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.2.9"; };
sbcl_2_2_10 = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.2.10"; };
sbcl_2_2_11 = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.2.11"; };
sbcl = sbcl_2_2_11;
sbcl_2_3_0 = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.0"; };
sbcl = sbcl_2_3_0;
roswell = callPackage ../development/tools/roswell { };

6
pkgs/top-level/ocaml-packages.nix
View file

@ -1517,12 +1517,6 @@ let
webmachine = callPackage ../development/ocaml-modules/webmachine { };
wodan = callPackage ../development/ocaml-modules/wodan { };
wodan-irmin = callPackage ../development/ocaml-modules/wodan/irmin.nix { };
wodan-unix = callPackage ../development/ocaml-modules/wodan/unix.nix { };
wtf8 = callPackage ../development/ocaml-modules/wtf8 { };
x509 = callPackage ../development/ocaml-modules/x509 { };