From cfc3ac4d4e1f91605bd990ab6a3fa2581450303a Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 10:39:21 +0100 Subject: [PATCH 001/100] azure-cli.extensions-tool: commit removals last These are most likely to require human intervention, having them last simplifies rebase. Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-tool.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-tool.py b/pkgs/by-name/az/azure-cli/extensions-tool.py index 3ba7c3636f40..e6c9a332896f 100644 --- a/pkgs/by-name/az/azure-cli/extensions-tool.py +++ b/pkgs/by-name/az/azure-cli/extensions-tool.py @@ -288,15 +288,6 @@ def main() -> None: for prev, new in updated: logger.info(f" {prev.pname} {prev.version} -> {new.version}") - for ext in removed: - extensions_local.remove(ext) - # TODO: Add additional check why this is removed - # TODO: Add an alias to extensions manual? - commit_msg = f"azure-cli-extensions.{ext.pname}: remove" - _write_extension_set(extension_file, extensions_local) - if args.commit: - _commit(repo, commit_msg, [extension_file]) - for ext in init: extensions_local.add(ext) commit_msg = f"azure-cli-extensions.{ext.pname}: init at {ext.version}" @@ -314,6 +305,15 @@ def main() -> None: if args.commit: _commit(repo, commit_msg, [extension_file]) + for ext in removed: + extensions_local.remove(ext) + # TODO: Add additional check why this is removed + # TODO: Add an alias to extensions manual? + commit_msg = f"azure-cli-extensions.{ext.pname}: remove" + _write_extension_set(extension_file, extensions_local) + if args.commit: + _commit(repo, commit_msg, [extension_file]) + if __name__ == "__main__": main() From b934fc9ec1505fff14aae8c08dfa391ee899c85c Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 10:40:53 +0100 Subject: [PATCH 002/100] azure-cli-extensions.adp: remove Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-generated.json | 7 ------- pkgs/by-name/az/azure-cli/extensions-manual.nix | 1 + 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index b289e4bf7ae7..406df6254163 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -34,13 +34,6 @@ "hash": "sha256-Yd8jThB1npkWwdRHqwK4JjfeEP2XwxoXJS4fUYOFOIM=", "description": "Microsoft Azure Command-Line Tools DomainServicesResourceProvider Extension" }, - "adp": { - "pname": "adp", - "version": "0.1.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/adp-0.1.0-py3-none-any.whl", - "hash": "sha256-/WRRmDL0/TFEMfhxdlB+ECSbjRZVN/gdBcnqUYWuhOw=", - "description": "Microsoft Azure Command-Line Tools Adp Extension" - }, "aem": { "pname": "aem", "version": "0.3.0", diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index c9b907630e9b..71bc0ec86447 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -136,6 +136,7 @@ } // lib.optionalAttrs config.allowAliases { # Removed extensions + adp = throw "The 'adp' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8038 blockchain = throw "The 'blockchain' extension for azure-cli was deprecated upstream"; # Added 2024-04-26 vm-repair = throw "The 'vm-repair' extension for azure-cli was deprecated upstream"; # Added 2024-08-06 } From 6d15c9df9550a7a6f033119eb3e10efaea82c7f9 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 10:40:55 +0100 Subject: [PATCH 003/100] azure-cli-extensions.connection-monitor-preview: remove Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-generated.json | 7 ------- pkgs/by-name/az/azure-cli/extensions-manual.nix | 1 + 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 406df6254163..f90452c7a006 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -230,13 +230,6 @@ "hash": "sha256-tzGoIcYJqui/q34EcLNCuReefgxlSC9KQypg2HpMOV8=", "description": "Microsoft Azure Command-Line Tools Connectedvmware Extension" }, - "connection-monitor-preview": { - "pname": "connection-monitor-preview", - "version": "0.1.0", - "url": "https://azurecliprod.blob.core.windows.net/cli-extensions/connection_monitor_preview-0.1.0-py2.py3-none-any.whl", - "hash": "sha256-mnltUYdXGZDSf+ue/u3eOMGU8T6iHL+ewGExGWv9gh0=", - "description": "Microsoft Azure Command-Line Connection Monitor V2 Extension" - }, "cosmosdb-preview": { "pname": "cosmosdb-preview", "version": "1.0.1", diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index 71bc0ec86447..fca4c289fa84 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -138,5 +138,6 @@ # Removed extensions adp = throw "The 'adp' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8038 blockchain = throw "The 'blockchain' extension for azure-cli was deprecated upstream"; # Added 2024-04-26 + connection-monitor-preview = throw "The 'connection-monitor-preview' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8194 vm-repair = throw "The 'vm-repair' extension for azure-cli was deprecated upstream"; # Added 2024-08-06 } From 9d4aedff0167973f672cb1d7bb1f5461cd2a9504 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 11:22:40 +0100 Subject: [PATCH 004/100] azure-cli-extensions.vm-repair: re-init at 2.0.0 I accidentally removed it during an extensions update. It wasn't actually removed upstream, just has external requirements now. Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-manual.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index fca4c289fa84..758f8c4de86f 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -133,11 +133,20 @@ propagatedBuildInputs = with python3Packages; [ azure-core ]; meta.maintainers = with lib.maintainers; [ katexochen ]; }; + + vm-repair = mkAzExtension rec { + pname = "vm-repair"; + version = "2.0.0"; + url = "https://azcliprod.blob.core.windows.net/cli-extensions/vm_repair-${version}-py2.py3-none-any.whl"; + hash = "sha256-mBa0SgKyGdxrTtrSVDp78Z0yXUMywL/9o0osKeUbhdU="; + description = "Support for repairing Azure Virtual Machines"; + propagatedBuildInputs = with python3Packages; [ opencensus ]; + meta.maintainers = with lib.maintainers; [ ]; + }; } // lib.optionalAttrs config.allowAliases { # Removed extensions adp = throw "The 'adp' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8038 - blockchain = throw "The 'blockchain' extension for azure-cli was deprecated upstream"; # Added 2024-04-26 + blockchain = throw "The 'blockchain' extension for azure-cli was deprecated upstream"; # Added 2024-04-26, https://github.com/Azure/azure-cli-extensions/pull/7370 connection-monitor-preview = throw "The 'connection-monitor-preview' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8194 - vm-repair = throw "The 'vm-repair' extension for azure-cli was deprecated upstream"; # Added 2024-08-06 } From 5139634ead71d83baa899c2f04426e8ddc9e1543 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:32:10 +0100 Subject: [PATCH 005/100] azure-cli.extensions-tool: workaround for commit authorship bug in gitpython Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-tool.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-tool.py b/pkgs/by-name/az/azure-cli/extensions-tool.py index e6c9a332896f..8a9d6559e32a 100644 --- a/pkgs/by-name/az/azure-cli/extensions-tool.py +++ b/pkgs/by-name/az/azure-cli/extensions-tool.py @@ -113,11 +113,11 @@ def _convert_hash_digest_from_hex_to_b64_sri(s: str) -> str: return f"sha256-{base64.b64encode(b).decode('utf-8')}" -def _commit(repo: git.Repo, message: str, files: List[Path]) -> None: +def _commit(repo: git.Repo, message: str, files: List[Path], actor: git.Actor) -> None: repo.index.add([str(f.resolve()) for f in files]) if repo.index.diff("HEAD"): logger.info(f'committing to nixpkgs "{message}"') - repo.index.commit(message) + repo.index.commit(message, author=actor, committer=actor) else: logger.warning("no changes in working tree to commit") @@ -248,6 +248,10 @@ def main() -> None: args = parser.parse_args() repo = git.Repo(Path(".").resolve(), search_parent_directories=True) + # Workaround for https://github.com/gitpython-developers/GitPython/issues/1923 + author = repo.config_reader().get_value("user", "name").lstrip('"').rstrip('"') + email = repo.config_reader().get_value("user", "email").lstrip('"').rstrip('"') + actor = git.Actor(author, email) index = get_extension_index(args.cache_dir) assert index["formatVersion"] == "1" # only support formatVersion 1 @@ -293,7 +297,7 @@ def main() -> None: commit_msg = f"azure-cli-extensions.{ext.pname}: init at {ext.version}" _write_extension_set(extension_file, extensions_local) if args.commit: - _commit(repo, commit_msg, [extension_file]) + _commit(repo, commit_msg, [extension_file], actor) for prev, new in updated: extensions_local.remove(prev) @@ -303,7 +307,7 @@ def main() -> None: ) _write_extension_set(extension_file, extensions_local) if args.commit: - _commit(repo, commit_msg, [extension_file]) + _commit(repo, commit_msg, [extension_file], actor) for ext in removed: extensions_local.remove(ext) @@ -312,7 +316,7 @@ def main() -> None: commit_msg = f"azure-cli-extensions.{ext.pname}: remove" _write_extension_set(extension_file, extensions_local) if args.commit: - _commit(repo, commit_msg, [extension_file]) + _commit(repo, commit_msg, [extension_file], actor) if __name__ == "__main__": From c63210f6e4d7d3a59eadf62f5a4d76fc01fc2652 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:35:26 +0100 Subject: [PATCH 006/100] azure-cli: add extensions-tool to tests Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix index 539571b4fb6d..4744b7d109ee 100644 --- a/pkgs/by-name/az/azure-cli/package.nix +++ b/pkgs/by-name/az/azure-cli/package.nix @@ -380,6 +380,9 @@ py.pkgs.toPythonApplication ( ${lib.getExe az} --version || exit 1 touch $out ''; + + # Ensure the extensions-tool builds. + inherit (azure-cli) extensions-tool; }; generate-extensions = writeScriptBin "${pname}-update-extensions" '' From 3c1249c5d3490b2886ed45db6c8d3ae9ee2bfa93 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:55:29 +0100 Subject: [PATCH 007/100] azure-cli.extensions-tool: add final newline when writing json Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-tool.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/az/azure-cli/extensions-tool.py b/pkgs/by-name/az/azure-cli/extensions-tool.py index 8a9d6559e32a..7a6a6913e2a9 100644 --- a/pkgs/by-name/az/azure-cli/extensions-tool.py +++ b/pkgs/by-name/az/azure-cli/extensions-tool.py @@ -101,6 +101,7 @@ def _write_extension_set(extensions_generated: Path, extensions: Set[Ext]) -> No ls.sort(key=lambda e: e.pname) with open(extensions_generated, "w") as f: json.dump({ext.pname: asdict(ext) for ext in ls}, f, indent=2) + f.write("\n") def _convert_hash_digest_from_hex_to_b64_sri(s: str) -> str: From 69c04ee31869b54e1b76defc7847e5e8f4c7e074 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:56:42 +0100 Subject: [PATCH 008/100] azure-cli.extensions-tool: fix typo in commit message Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-tool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-tool.py b/pkgs/by-name/az/azure-cli/extensions-tool.py index 7a6a6913e2a9..74e58723a099 100644 --- a/pkgs/by-name/az/azure-cli/extensions-tool.py +++ b/pkgs/by-name/az/azure-cli/extensions-tool.py @@ -304,7 +304,7 @@ def main() -> None: extensions_local.remove(prev) extensions_local.add(new) commit_msg = ( - f"azure-cli-extension.{prev.pname}: {prev.version} -> {new.version}" + f"azure-cli-extensions.{prev.pname}: {prev.version} -> {new.version}" ) _write_extension_set(extension_file, extensions_local) if args.commit: From 28a8b311d407117ec5eee15c97a0ef50fd90e315 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:01 +0100 Subject: [PATCH 009/100] azure-cli-extensions.neon: init at 1.0.0b1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index f90452c7a006..a91b798ab6fe 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -706,6 +706,13 @@ "hash": "sha256-rYQ1AWKuh3KH+KFRkgs8S9xjdd1BndYQHCcC22BqXRk=", "description": "Microsoft Azure Command-Line Tools MulticloudConnector Extension" }, + "neon": { + "pname": "neon", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/neon-1.0.0b1-py3-none-any.whl", + "hash": "sha256-JA3DOHznnpjq0nt30tAWLHSUyUv6ihfRt4Qa4l5Dajs=", + "description": "Microsoft Azure Command-Line Tools Neon Extension" + }, "network-analytics": { "pname": "network-analytics", "version": "1.0.0b1", From 8869d9b72a5daddc8cb894bba880976e85a6ab57 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:03 +0100 Subject: [PATCH 010/100] azure-cli-extensions.mcc: init at 1.0.0b1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index a91b798ab6fe..67de741e20a6 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -657,6 +657,13 @@ "hash": "sha256-It30sc3HfpkmLLYInE2WBABlgoodOKJwn9uUXTyFGDk=", "description": "Support for Management Partner preview" }, + "mcc": { + "pname": "mcc", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/mcc-1.0.0b1-py3-none-any.whl", + "hash": "sha256-anNMf7Gdca1dIQFGSyR8e//doeWcJlHphUf/eesZ7U0=", + "description": "Microsoft Connected Cache CLI Commands" + }, "mdp": { "pname": "mdp", "version": "1.0.0b2", From 2036403fdb8b5928825653dc066669d7850c1a3c Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:05 +0100 Subject: [PATCH 011/100] azure-cli-extensions.arcgateway: init at 1.0.0b1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 67de741e20a6..c402b26816ea 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -104,6 +104,13 @@ "hash": "sha256-f9ctJ+Sw7O2jsrTzAcegwwaP6ouW1w+fyq0UIkDefQ0=", "description": "Microsoft Azure Command-Line Tools App Service on Kubernetes Extension" }, + "arcgateway": { + "pname": "arcgateway", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/arcgateway-1.0.0b1-py3-none-any.whl", + "hash": "sha256-Mw/R8ZdL7OFtySTjU3MbHw9EA6WONuM0dwXwHb2/A9E=", + "description": "Microsoft Azure Command-Line Tools Arcgateway Extension" + }, "astronomer": { "pname": "astronomer", "version": "1.0.0", From c0eb4b679409ca44b9a38f3ebe77adcb05511f8f Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:07 +0100 Subject: [PATCH 012/100] azure-cli-extensions.deidservice: init at 1.0.0b1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index c402b26816ea..9f3c030e9d89 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -321,6 +321,13 @@ "hash": "sha256-8agBvQw46y6/nC+04LQ6mEcK57QLvNBesqpZbWlXnJ4=", "description": "Microsoft Azure Command-Line Tools DataShareManagementClient Extension" }, + "deidservice": { + "pname": "deidservice", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/deidservice-1.0.0b1-py3-none-any.whl", + "hash": "sha256-FJw581LzrLlcttM70PuWJwMs8BoaoyCsud1xJ0RZfNA=", + "description": "Microsoft Azure Command-Line Tools Deidservice Extension" + }, "deploy-to-azure": { "pname": "deploy-to-azure", "version": "0.2.0", From e2d832ee427ee59d848aa4293c9308af25ce32de Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:09 +0100 Subject: [PATCH 013/100] azure-cli-extensions.quantum: init at 1.0.0b4 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 9f3c030e9d89..fed7ca42e55c 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -846,6 +846,13 @@ "hash": "sha256-cGzCVQ+9B7i2djRcLybFumZVCQW8jsIkxsTlY3xJcmY=", "description": "Microsoft Azure Command-Line Tools PurviewManagementClient Extension" }, + "quantum": { + "pname": "quantum", + "version": "1.0.0b4", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/quantum-1.0.0b4-py3-none-any.whl", + "hash": "sha256-c8KlBVlkh2jxI95wOayCiMJlzuTYjpTDzthc7LzmtVI=", + "description": "Microsoft Azure Command-Line Tools Quantum Extension" + }, "qumulo": { "pname": "qumulo", "version": "1.0.0", From d68e79cd8f07d083cd68c643b8b2df0e300362b2 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:11 +0100 Subject: [PATCH 014/100] azure-cli-extensions.express-route-cross-connection: 0.1.1 -> 1.0.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index fed7ca42e55c..c81708b03b72 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -435,10 +435,10 @@ }, "express-route-cross-connection": { "pname": "express-route-cross-connection", - "version": "0.1.1", - "url": "https://azurecliprod.blob.core.windows.net/cli-extensions/express_route_cross_connection-0.1.1-py2.py3-none-any.whl", - "hash": "sha256-uD9yO6rg6gRVeofzWPohMbrxXUXNOrp6mrQtFOyA3zg=", - "description": "Manage customer ExpressRoute circuits using an ExpressRoute cross-connection" + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/express_route_cross_connection-1.0.0-py3-none-any.whl", + "hash": "sha256-x1mbd/Y28BcYqEf+T1rZcOHT8wrq9VnWnCfw9rBnl80=", + "description": "Microsoft Azure Command-Line Tools ExpressRouteCrossConnection Extension" }, "firmwareanalysis": { "pname": "firmwareanalysis", From 6eca72a9643bab6f2fe370fb5447df0c3aa19c12 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:12 +0100 Subject: [PATCH 015/100] azure-cli-extensions.scvmm: 1.1.1 -> 1.1.2 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index c81708b03b72..62a9a6b04bb5 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -918,9 +918,9 @@ }, "scvmm": { "pname": "scvmm", - "version": "1.1.1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/scvmm-1.1.1-py2.py3-none-any.whl", - "hash": "sha256-fXBFeLxetguBBd4LSpJBdlgaTPL9FisIltgSRvf3Omg=", + "version": "1.1.2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/scvmm-1.1.2-py2.py3-none-any.whl", + "hash": "sha256-sbLmbA/wV5dtSPGKQ5YPT/WAK1UC6ebS1aXY8bTotvI=", "description": "Microsoft Azure Command-Line Tools SCVMM Extension" }, "self-help": { From 76de7c0b23277be5da2111122360b368914f1658 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:14 +0100 Subject: [PATCH 016/100] azure-cli-extensions.maintenance: 1.6.0 -> 1.7.0b1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 62a9a6b04bb5..b7f7582fecde 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -645,9 +645,9 @@ }, "maintenance": { "pname": "maintenance", - "version": "1.6.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/maintenance-1.6.0-py3-none-any.whl", - "hash": "sha256-Orai2sSLpxsovI7gXSVNqnK2L4TdqVN0n6YhqAyjmuU=", + "version": "1.7.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/maintenance-1.7.0b1-py3-none-any.whl", + "hash": "sha256-cZmLfV3nIjxeKuehwARFtBHROaAjh2+EeI9R8fUQsts=", "description": "Microsoft Azure Command-Line Tools MaintenanceManagementClient Extension" }, "managedccfs": { From ca98256acbc6332ccb89372d7c99a00313668eae Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:16 +0100 Subject: [PATCH 017/100] azure-cli-extensions.apic-extension: 1.0.0b5 -> 1.1.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index b7f7582fecde..6b8b8fa39904 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -92,9 +92,9 @@ }, "apic-extension": { "pname": "apic-extension", - "version": "1.0.0b5", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/apic_extension-1.0.0b5-py3-none-any.whl", - "hash": "sha256-+8ofhEYBMULWdhWbgpL9fC0xdfOeG661xNE/ljcAMlQ=", + "version": "1.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/apic_extension-1.1.0-py3-none-any.whl", + "hash": "sha256-AeXrQi6EJoOW3bAlEjC907nUdfRj6BM/BBX7Dw4DJAs=", "description": "Microsoft Azure Command-Line Tools ApicExtension Extension" }, "appservice-kube": { From 01a93ea8faea26c2f04b8a2f3afdbc4259e4966c Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:18 +0100 Subject: [PATCH 018/100] azure-cli-extensions.stack-hci-vm: 1.3.0 -> 1.4.3 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 6b8b8fa39904..44a2a4852826 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -967,9 +967,9 @@ }, "stack-hci-vm": { "pname": "stack-hci-vm", - "version": "1.3.0", - "url": "https://hciarcvmsstorage.z13.web.core.windows.net/cli-extensions/stack_hci_vm-1.3.0-py3-none-any.whl", - "hash": "sha256-GVU+UNWcr8wZFmvn6RvkPHJferrh2DOJFPjmBDhT/Ak=", + "version": "1.4.3", + "url": "https://hciarcvmsstorage.z13.web.core.windows.net/cli-extensions/stack_hci_vm-1.4.3-py3-none-any.whl", + "hash": "sha256-T1ulOOgw3O8ZUUfIunHHObK9SUy7moq1HoMcQLwfMyk=", "description": "Microsoft Azure Command-Line Tools Stack-HCi-VM Extension" }, "standbypool": { From 7b51dd7de86ad80c093ce0e54d8d892af8b3b42d Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:20 +0100 Subject: [PATCH 019/100] azure-cli-extensions.multicloud-connector: 1.0.0b1 -> 1.0.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 44a2a4852826..3f547a381457 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -722,9 +722,9 @@ }, "multicloud-connector": { "pname": "multicloud-connector", - "version": "1.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/multicloud_connector-1.0.0b1-py3-none-any.whl", - "hash": "sha256-rYQ1AWKuh3KH+KFRkgs8S9xjdd1BndYQHCcC22BqXRk=", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/multicloud_connector-1.0.0-py3-none-any.whl", + "hash": "sha256-8Gb946+K7DwMm5s5GROUciYRkvYvxgB7rB5Y3MRn5t8=", "description": "Microsoft Azure Command-Line Tools MulticloudConnector Extension" }, "neon": { From be2e4972bb558eab2a3f8c107563ad3037742ebc Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:22 +0100 Subject: [PATCH 020/100] azure-cli-extensions.redisenterprise: 1.2.0 -> 1.2.1b1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 3f547a381457..e564ece188cd 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -869,9 +869,9 @@ }, "redisenterprise": { "pname": "redisenterprise", - "version": "1.2.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/redisenterprise-1.2.0-py3-none-any.whl", - "hash": "sha256-bndtRkr6r2ZFbXuObTarGhLxkFRhdHnqjxNjPTpJ/6w=", + "version": "1.2.1b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/redisenterprise-1.2.1b1-py3-none-any.whl", + "hash": "sha256-mBboVxqGiYZJczJ7YzHSQ3A9oxtAwFOe2JE2udv2yeA=", "description": "Microsoft Azure Command-Line Tools RedisEnterprise Extension" }, "reservation": { From ca921dea99bcde1cf12a340fbb48840fcbff1d47 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:24 +0100 Subject: [PATCH 021/100] azure-cli-extensions.connectedmachine: 1.0.0b2 -> 1.0.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index e564ece188cd..3f6750ca2046 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -225,9 +225,9 @@ }, "connectedmachine": { "pname": "connectedmachine", - "version": "1.0.0b2", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/connectedmachine-1.0.0b2-py3-none-any.whl", - "hash": "sha256-i4xDQMTGVS44JiIP+5W/YZRHZ1sEaTBLcfqA4uTjHIE=", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/connectedmachine-1.0.0-py3-none-any.whl", + "hash": "sha256-FJ7q1J0MBG93jqTZnXhEjzgVe4bqWR0e6lRfiJZZZRE=", "description": "Microsoft Azure Command-Line Tools ConnectedMachine Extension" }, "connectedvmware": { From 834bd5aba56cfb33275bb4ce92ace46bdb7043ed Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:25 +0100 Subject: [PATCH 022/100] azure-cli-extensions.standbypool: 1.0.0b1 -> 1.0.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 3f6750ca2046..986a9b9e1fd4 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -974,9 +974,9 @@ }, "standbypool": { "pname": "standbypool", - "version": "1.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/standbypool-1.0.0b1-py3-none-any.whl", - "hash": "sha256-RMA+MgyLSfUjkOPBHWGyWmev7/wY1iuqUiw3MULeDhU=", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/standbypool-1.0.0-py3-none-any.whl", + "hash": "sha256-WlY5U30m/7sG845ovWyTntkJBdmssYwHFhgjcy+yfPk=", "description": "Microsoft Azure Command-Line Tools Standbypool Extension" }, "staticwebapp": { From c2fa0a082f978815febe12ca2271250e87951fcd Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:27 +0100 Subject: [PATCH 023/100] azure-cli-extensions.dataprotection: 1.5.3 -> 1.5.4 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 986a9b9e1fd4..6623c7a0ec24 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -309,9 +309,9 @@ }, "dataprotection": { "pname": "dataprotection", - "version": "1.5.3", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dataprotection-1.5.3-py3-none-any.whl", - "hash": "sha256-RnHOieOQZWlfIWJjUN/K1UOL2+/HFM816F7l6rD5ZmE=", + "version": "1.5.4", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dataprotection-1.5.4-py3-none-any.whl", + "hash": "sha256-vAyVrv0dte1KioEwriEF8oNqrEwN3WSKDC/hyTudQtg=", "description": "Microsoft Azure Command-Line Tools DataProtectionClient Extension" }, "datashare": { From fefd810ce1c55bf49207aa9691ceccb89a6da427 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:29 +0100 Subject: [PATCH 024/100] azure-cli-extensions.managementpartner: 0.1.3 -> 1.0.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 6623c7a0ec24..14187c539645 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -666,9 +666,9 @@ }, "managementpartner": { "pname": "managementpartner", - "version": "0.1.3", - "url": "https://azurecliprod.blob.core.windows.net/cli-extensions/managementpartner-0.1.3-py2.py3-none-any.whl", - "hash": "sha256-It30sc3HfpkmLLYInE2WBABlgoodOKJwn9uUXTyFGDk=", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/managementpartner-1.0.0-py2.py3-none-any.whl", + "hash": "sha256-pdSiZGR4GLShnNw1arXm+N0bCPpnE8AKFSl9LFoFlJQ=", "description": "Support for Management Partner preview" }, "mcc": { From 1c8b1b3663381bf3746161eb920f5b661497ac48 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:31 +0100 Subject: [PATCH 025/100] azure-cli-extensions.cosmosdb-preview: 1.0.1 -> 1.1.0b1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 14187c539645..dee38549d502 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -239,9 +239,9 @@ }, "cosmosdb-preview": { "pname": "cosmosdb-preview", - "version": "1.0.1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/cosmosdb_preview-1.0.1-py2.py3-none-any.whl", - "hash": "sha256-xUABi8XaElLsPj5WRVJlDWrwjzSfP/M5vjmKeYPK8qk=", + "version": "1.1.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/cosmosdb_preview-1.1.0b1-py2.py3-none-any.whl", + "hash": "sha256-D8EbL83XXEhoz8Q+xL4ZwhKP0de2FrYeM2TDwaDEwdo=", "description": "Microsoft Azure Command-Line Tools Cosmosdb-preview Extension" }, "costmanagement": { From 298f842a8aa22faeb33ddc78ed23cb466c6069a2 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:33 +0100 Subject: [PATCH 026/100] azure-cli-extensions.mdp: 1.0.0b2 -> 1.0.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index dee38549d502..2b7ba0f8f435 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -680,9 +680,9 @@ }, "mdp": { "pname": "mdp", - "version": "1.0.0b2", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/mdp-1.0.0b2-py3-none-any.whl", - "hash": "sha256-BirQJtnq95G1koxPt5MUjUDGwpfO4y8XXNOhVesk2T8=", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/mdp-1.0.0-py3-none-any.whl", + "hash": "sha256-wKSuGBcQO1SPHZHX4chVKEFdoBaoPUgxVIWXI7+3jYE=", "description": "Microsoft Azure Command-Line Tools Mdp Extension" }, "microsoft-fabric": { From 654e48a8043c1c970f6340d37fb954a25bbf96a4 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:35 +0100 Subject: [PATCH 027/100] azure-cli-extensions.new-relic: 1.0.0b1 -> 1.0.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 2b7ba0f8f435..bf6c8dfd1056 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -750,9 +750,9 @@ }, "new-relic": { "pname": "new-relic", - "version": "1.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/new_relic-1.0.0b1-py3-none-any.whl", - "hash": "sha256-nOafFoTOoUrLoPL9tHPkfgoGdF44O7UUSVTF6F5BYZk=", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/new_relic-1.0.0-py3-none-any.whl", + "hash": "sha256-MQUxCuwjIdQp8GjnTf4WsLZMcQCqUervLBF2WXHqb1o=", "description": "Microsoft Azure Command-Line Tools NewRelic Extension" }, "next": { From 751ee7a2b97ce7fa9d73b4c40fba18e1b0b1231c Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:37 +0100 Subject: [PATCH 028/100] azure-cli-extensions.amg: 2.4.0 -> 2.5.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index bf6c8dfd1056..1ad7f974c57d 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -78,9 +78,9 @@ }, "amg": { "pname": "amg", - "version": "2.4.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-2.4.0-py3-none-any.whl", - "hash": "sha256-YkyoyEfOk+zIOe5CgRXQmyY8Ts58UtoKvvOIk2RREdY=", + "version": "2.5.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-2.5.0-py3-none-any.whl", + "hash": "sha256-yQAtjGU/VqixCGvzPpGPO6bzJ8yEAGvnWUB4QhiH9B0=", "description": "Microsoft Azure Command-Line Tools Azure Managed Grafana Extension" }, "amlfs": { From b078ecaab2f16efb555235faabc0aa1fb6dd7e86 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:38 +0100 Subject: [PATCH 029/100] azure-cli-extensions.networkcloud: 2.0.0b4 -> 2.0.0b5 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 1ad7f974c57d..5dac1a961bf9 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -743,9 +743,9 @@ }, "networkcloud": { "pname": "networkcloud", - "version": "2.0.0b4", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-2.0.0b4-py3-none-any.whl", - "hash": "sha256-BnB6AIQFc5pWOSMPP9CUAxCEpp+GdkhQOu1AOdEYrZ8=", + "version": "2.0.0b5", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-2.0.0b5-py3-none-any.whl", + "hash": "sha256-rHLPxU7TWDTKbNXHJ6D91x5JQ7zWbmXND/YH6K5JXHo=", "description": "Support for Azure Operator Nexus network cloud commands based on 2024-07-01 API version" }, "new-relic": { From bc06a2ab87e0fcef57f593c2c78d878efc6f3670 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:40 +0100 Subject: [PATCH 030/100] azure-cli-extensions.elastic-san: 1.0.0b2 -> 1.2.0b1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 5dac1a961bf9..8e22dcf1a033 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -421,9 +421,9 @@ }, "elastic-san": { "pname": "elastic-san", - "version": "1.0.0b2", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/elastic_san-1.0.0b2-py3-none-any.whl", - "hash": "sha256-bS8SR6545DHUg0mJ31gc0hJB0WuXBxv2cvuLce461wI=", + "version": "1.2.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/elastic_san-1.2.0b1-py3-none-any.whl", + "hash": "sha256-UvtysdxQsTTOlkSI7exVTH2ESfhB5H2LNV2fGscQzmA=", "description": "Microsoft Azure Command-Line Tools ElasticSan Extension" }, "eventgrid": { From 45a8237acb5971465d2179d0ad3b5e151b82aa24 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:42 +0100 Subject: [PATCH 031/100] azure-cli-extensions.dynatrace: 0.1.0 -> 1.1.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 8e22dcf1a033..702c9601c328 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -393,9 +393,9 @@ }, "dynatrace": { "pname": "dynatrace", - "version": "0.1.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dynatrace-0.1.0-py3-none-any.whl", - "hash": "sha256-ESp+QjRh0bb3w4X+i3O08rhQ4lcMNaVKS7zC6Hr+xmE=", + "version": "1.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dynatrace-1.1.0-py3-none-any.whl", + "hash": "sha256-CR9A2HZCRby5Zn5CLU3TchFMnwCnKggPnI75K0PFGNY=", "description": "Microsoft Azure Command-Line Tools Dynatrace Extension" }, "edgeorder": { From 488c3b55556df8a5c5c160cd84a3c51b1231b640 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:44 +0100 Subject: [PATCH 032/100] azure-cli-extensions.subscription: 0.1.5 -> 1.0.0b1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 702c9601c328..2f6701802097 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -1023,10 +1023,10 @@ }, "subscription": { "pname": "subscription", - "version": "0.1.5", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/subscription-0.1.5-py2.py3-none-any.whl", - "hash": "sha256-/3iWrrxGhiptMKxfTPZL3UDLUOVDfOoplZCJbXXxAT4=", - "description": "Support for subscription management preview" + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/subscription-1.0.0b1-py2.py3-none-any.whl", + "hash": "sha256-Pzu0+7dhF00ToPhjNit084i8ZI9/KW+bbiGRs1UHrk8=", + "description": "Microsoft Azure Command-Line Tools Subscription Extension" }, "support": { "pname": "support", From 5f8e218696bec6f4e608c7832fd2f99e6c847e77 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:46 +0100 Subject: [PATCH 033/100] azure-cli-extensions.spring: 1.25.1 -> 1.26.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 2f6701802097..2550ba6aba79 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -946,9 +946,9 @@ }, "spring": { "pname": "spring", - "version": "1.25.1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/spring-1.25.1-py3-none-any.whl", - "hash": "sha256-nrim8vd7Gcn5gJUmu3AQdlkN2zX2suxDHOMYuWzEBzM=", + "version": "1.26.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/spring-1.26.0-py3-none-any.whl", + "hash": "sha256-6CxqOuyIoHNsdhR3B7ZOZM/ZuFRQM12eD6zHkOHnYbQ=", "description": "Microsoft Azure Command-Line Tools spring Extension" }, "spring-cloud": { From e5f0c98ec1a48b7788348d1374afea80094e4ec6 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:48 +0100 Subject: [PATCH 034/100] azure-cli-extensions.aks-preview: 9.0.0b6 -> 9.0.0b8 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 2550ba6aba79..e36a285646d2 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -50,9 +50,9 @@ }, "aks-preview": { "pname": "aks-preview", - "version": "9.0.0b6", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-9.0.0b6-py2.py3-none-any.whl", - "hash": "sha256-NqIV06L9tUuKl37KszDD9zwydGNoyXc2ThH9XLjgiaQ=", + "version": "9.0.0b8", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-9.0.0b8-py2.py3-none-any.whl", + "hash": "sha256-CYRK4Cug1Y+TaK43OPPUMR9cpyHtzBz3CIb8+KgMv7g=", "description": "Provides a preview for upcoming AKS features" }, "akshybrid": { From 33830c6eadfd4cb2735f4a8c59bce4b3def1b0da Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:50 +0100 Subject: [PATCH 035/100] azure-cli-extensions.traffic-collector: 0.1.3 -> 1.0.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index e36a285646d2..4be44b8ee548 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -1051,9 +1051,9 @@ }, "traffic-collector": { "pname": "traffic-collector", - "version": "0.1.3", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/traffic_collector-0.1.3-py3-none-any.whl", - "hash": "sha256-oUSk/aO86E2yIne9hhEISuGuOeC7jHtQYZ7DeHEfV7o=", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/traffic_collector-1.0.0-py3-none-any.whl", + "hash": "sha256-RpWrtTcj6lCfD3oLxtT0vlzAOC/om3ZnHuB4WgUVffw=", "description": "Microsoft Azure Command-Line Tools TrafficCollector Extension" }, "trustedsigning": { From c7a8bd05d4351c346d54ae9393267e484920c2c5 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:52 +0100 Subject: [PATCH 036/100] azure-cli-extensions.bastion: 1.3.0 -> 1.3.1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 4be44b8ee548..66906785d777 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -169,9 +169,9 @@ }, "bastion": { "pname": "bastion", - "version": "1.3.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/bastion-1.3.0-py3-none-any.whl", - "hash": "sha256-FRqyXU3N4QtGxGk879rx0NWEHhXP4+xkwImqr1XmyMA=", + "version": "1.3.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/bastion-1.3.1-py3-none-any.whl", + "hash": "sha256-DMqkBnT8Mp/p+SV/hpwxnGTWyJwChmSm/1NOuu4dxek=", "description": "Microsoft Azure Command-Line Tools Bastion Extension" }, "billing-benefits": { From b536aa3e96e5b324d35750828bd1b5db149a9c21 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:54 +0100 Subject: [PATCH 037/100] azure-cli-extensions.support: 2.0.0 -> 2.0.1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 66906785d777..da313890e3ed 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -1030,9 +1030,9 @@ }, "support": { "pname": "support", - "version": "2.0.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/support-2.0.0-py2.py3-none-any.whl", - "hash": "sha256-Xd6X+PsS6qJYUw9o7CyuAKlX8wR5g16fXtBXlAMSdBo=", + "version": "2.0.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/support-2.0.1-py2.py3-none-any.whl", + "hash": "sha256-PwcBVPg5RkqiS1SZDYfS26mdbaYOw+8xSnS6IsJo/sQ=", "description": "Microsoft Azure Command-Line Tools Support Extension" }, "terraform": { From 4cbd5a1ab7fe9354f3519e411a90f10c43a731c7 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:56 +0100 Subject: [PATCH 038/100] azure-cli-extensions.k8s-extension: 1.6.1 -> 1.6.2 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index da313890e3ed..20b877c9e264 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -596,9 +596,9 @@ }, "k8s-extension": { "pname": "k8s-extension", - "version": "1.6.1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_extension-1.6.1-py3-none-any.whl", - "hash": "sha256-QYYdZbnYbgtiKYakmEznphH4e5LaV424wFJ+x0M08yw=", + "version": "1.6.2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_extension-1.6.2-py3-none-any.whl", + "hash": "sha256-hS2nusfLVQF8yEPgX1pw6juS6V3eJZLP6JL+1R41Co8=", "description": "Microsoft Azure Command-Line Tools K8s-extension Extension" }, "k8s-runtime": { From d55d16b96d71d7f513faf7e87f064e6003c4acee Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:58 +0100 Subject: [PATCH 039/100] azure-cli-extensions.monitor-pipeline-group: 1.0.0b1 -> 1.0.0b2 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 20b877c9e264..59e059e8c9aa 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -715,9 +715,9 @@ }, "monitor-pipeline-group": { "pname": "monitor-pipeline-group", - "version": "1.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/monitor_pipeline_group-1.0.0b1-py3-none-any.whl", - "hash": "sha256-zzH54/qUWHFvDD0cFWmO95twfFvX0UZ3PSsq/kLmTCk=", + "version": "1.0.0b2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/monitor_pipeline_group-1.0.0b2-py3-none-any.whl", + "hash": "sha256-skfHQJ7vGnKZtaDmAGmjPLtuxNfyHE44pxi1Usl9X9s=", "description": "Microsoft Azure Command-Line Tools MonitorPipelineGroup Extension" }, "multicloud-connector": { From 2fb100c0b33e9e968b389a2869f611d3bcc6cf0d Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:59:00 +0100 Subject: [PATCH 040/100] azure-cli-extensions.oracle-database: 1.0.0b1 -> 1.0.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 59e059e8c9aa..25a7c78dee85 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -792,9 +792,9 @@ }, "oracle-database": { "pname": "oracle-database", - "version": "1.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/oracle_database-1.0.0b1-py3-none-any.whl", - "hash": "sha256-BYw95sHhA/8MYqGIscYGo1CXpmUst+tsPlt3934VtbE=", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/oracle_database-1.0.0-py3-none-any.whl", + "hash": "sha256-CtcW4Rc1noFCf4yRSC8lkgMYd5ZMaVLnaLZhSNtU284=", "description": "Microsoft Azure Command-Line Tools OracleDatabase Extension" }, "orbital": { From fe5219cf42fdd3814cb3311a3e997aa42c48fbf1 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 6 Nov 2024 01:24:23 +0100 Subject: [PATCH 041/100] quickder: move to pkgs/by-name, reformat --- .../qu/quickder/package.nix} | 40 ++++++++++--------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 21 insertions(+), 21 deletions(-) rename pkgs/{development/libraries/quickder/default.nix => by-name/qu/quickder/package.nix} (72%) diff --git a/pkgs/development/libraries/quickder/default.nix b/pkgs/by-name/qu/quickder/package.nix similarity index 72% rename from pkgs/development/libraries/quickder/default.nix rename to pkgs/by-name/qu/quickder/package.nix index c3de38398084..4e66ebf5f360 100644 --- a/pkgs/development/libraries/quickder/default.nix +++ b/pkgs/by-name/qu/quickder/package.nix @@ -1,14 +1,15 @@ -{ lib -, stdenv -, fetchFromGitLab -, python3 -, cmake -, doxygen -, graphviz -, quickmem -, arpa2common -, arpa2cm -, ensureNewerSourcesForZipFilesHook +{ + lib, + stdenv, + fetchFromGitLab, + python3, + cmake, + doxygen, + graphviz, + quickmem, + arpa2common, + arpa2cm, + ensureNewerSourcesForZipFilesHook, }: stdenv.mkDerivation rec { @@ -32,17 +33,18 @@ stdenv.mkDerivation rec { buildInputs = [ arpa2cm arpa2common - (python3.withPackages (ps: with ps; [ - asn1ate - colored - pyparsing - setuptools - six - ])) + (python3.withPackages ( + ps: with ps; [ + asn1ate + colored + pyparsing + setuptools + six + ] + )) quickmem ]; - postPatch = '' substituteInPlace setup.py --replace 'pyparsing==' 'pyparsing>=' ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8cc0cbc90f96..945ab085d9c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22489,8 +22489,6 @@ with pkgs; quesoglc = callPackage ../development/libraries/quesoglc { }; - quickder = callPackage ../development/libraries/quickder { }; - quickmem = callPackage ../development/libraries/quickmem { }; quicksynergy = callPackage ../applications/misc/quicksynergy { }; From a26b3a3bc27a3e05e9cf0e78f1038539ae1b95f3 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 6 Nov 2024 01:27:17 +0100 Subject: [PATCH 042/100] quickder: pin pyparsing to 3.1.2 --- pkgs/by-name/qu/quickder/package.nix | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/qu/quickder/package.nix b/pkgs/by-name/qu/quickder/package.nix index 4e66ebf5f360..981fa635a30b 100644 --- a/pkgs/by-name/qu/quickder/package.nix +++ b/pkgs/by-name/qu/quickder/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchFromGitHub, fetchFromGitLab, python3, cmake, @@ -12,6 +13,26 @@ ensureNewerSourcesForZipFilesHook, }: +let + python = + let + packageOverrides = self: super: { + pyparsing = super.pyparsing.overridePythonAttrs (old: rec { + version = "3.1.2"; + src = fetchFromGitHub { + owner = "pyparsing"; + repo = "pyparsing"; + rev = "refs/tags/${version}"; + hash = "sha256-0B8DjO4kLgvt4sYsk8CZI+5icdKy73XE2tWeqVLqO5A="; + }; + }); + }; + in + python3.override { + inherit packageOverrides; + self = python; + }; +in stdenv.mkDerivation rec { pname = "quickder"; version = "1.7.1"; @@ -33,7 +54,7 @@ stdenv.mkDerivation rec { buildInputs = [ arpa2cm arpa2common - (python3.withPackages ( + (python.withPackages ( ps: with ps; [ asn1ate colored From 82dc05c26db339c935fe5bf604518e8cee36c10e Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 6 Nov 2024 17:07:39 +0800 Subject: [PATCH 043/100] hickory-dns: nixfmt --- pkgs/by-name/hi/hickory-dns/package.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/hi/hickory-dns/package.nix b/pkgs/by-name/hi/hickory-dns/package.nix index cf6226089097..3f7baed6e978 100644 --- a/pkgs/by-name/hi/hickory-dns/package.nix +++ b/pkgs/by-name/hi/hickory-dns/package.nix @@ -1,8 +1,9 @@ -{ lib -, fetchFromGitHub -, openssl -, pkg-config -, rustPlatform +{ + lib, + fetchFromGitHub, + openssl, + pkg-config, + rustPlatform, }: rustPlatform.buildRustPackage rec { @@ -28,7 +29,10 @@ rustPlatform.buildRustPackage rec { homepage = "https://hickory-dns.org/"; maintainers = with maintainers; [ colinsane ]; platforms = platforms.linux; - license = with licenses; [ asl20 mit ]; + license = with licenses; [ + asl20 + mit + ]; mainProgram = "hickory-dns"; }; } From 319f3c98a7f9df80f42db2c4ab1ba38d5867b7f3 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 6 Nov 2024 17:08:24 +0800 Subject: [PATCH 044/100] hickory-dns: add passthru.updateScript --- pkgs/by-name/hi/hickory-dns/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/hi/hickory-dns/package.nix b/pkgs/by-name/hi/hickory-dns/package.nix index 3f7baed6e978..b7c331f78181 100644 --- a/pkgs/by-name/hi/hickory-dns/package.nix +++ b/pkgs/by-name/hi/hickory-dns/package.nix @@ -4,6 +4,7 @@ openssl, pkg-config, rustPlatform, + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -24,12 +25,14 @@ rustPlatform.buildRustPackage rec { # tests expect internet connectivity to query real nameservers like 8.8.8.8 doCheck = false; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Rust based DNS client, server, and resolver"; homepage = "https://hickory-dns.org/"; - maintainers = with maintainers; [ colinsane ]; - platforms = platforms.linux; - license = with licenses; [ + maintainers = with lib.maintainers; [ colinsane ]; + platforms = lib.platforms.linux; + license = with lib.licenses; [ asl20 mit ]; From 28623f8163ac1e1ff8fa527bd7b9d1bce46b8b1c Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 6 Nov 2024 17:18:02 +0800 Subject: [PATCH 045/100] hickory-dns: 0.24.0 -> 0.25.0-alpha.2 --- pkgs/by-name/hi/hickory-dns/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/hi/hickory-dns/package.nix b/pkgs/by-name/hi/hickory-dns/package.nix index b7c331f78181..3c53faa42521 100644 --- a/pkgs/by-name/hi/hickory-dns/package.nix +++ b/pkgs/by-name/hi/hickory-dns/package.nix @@ -9,15 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "hickory-dns"; - version = "0.24.1"; + version = "0.25.0-alpha.2"; src = fetchFromGitHub { owner = "hickory-dns"; repo = "hickory-dns"; - rev = "v${version}"; - hash = "sha256-szq21RuRmkhAfHlzhGQYpwjiIRkavFCPETOt+6TxhP4="; + rev = "refs/tags/v${version}"; + hash = "sha256-bEVApMM6/I3nF1lyRhd+7YtZuSAwiozRkMorRLhLOBY="; }; - cargoHash = "sha256-LcMjHHEuDlhSfDXGIrSMXewraSxEgRw2g2DOoH4i5RU="; + + cargoHash = "sha256-Rq4l1iV70nlhBaJ02hc+dmNZ/Q7qrHoF0Kp0MTmu22A="; buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; From e8361acc3ac252ebb2f9c3e3d11fab4d5f54b9e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:13 -0300 Subject: [PATCH 046/100] lxqt.libdbusmenu-lxqt: 0.1.0 -> 0.2.0 --- pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix b/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix index 62504bb33b54..5c4ac79a2d82 100644 --- a/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix +++ b/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libdbusmenu-lxqt"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-fwYvU62NCmJ6HNrOqHPWKDas7LE1XF3squ0CBEFkNkk="; + hash = "sha256-OF12t08hOuDsl80n4lXO3AFCf29f01eDpoRcbXmI4+I="; }; nativeBuildInputs = [ From 7ac4672737cdcf880076b2c6ce940129e817966b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:13 -0300 Subject: [PATCH 047/100] lxqt.liblxqt: 2.0.0 -> 2.1.0 --- pkgs/desktops/lxqt/liblxqt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix index 430c33c03605..83ed1106ff40 100644 --- a/pkgs/desktops/lxqt/liblxqt/default.nix +++ b/pkgs/desktops/lxqt/liblxqt/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "liblxqt"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-ClAmREsPBb7i7T2aGgf0h3rk1ohUvWQvmSnrlprHzds="; + hash = "sha256-90t7jukm2vNfkgZ3326UDMXNzwJ+FIVEF3kNZ2SgNN8="; }; nativeBuildInputs = [ From 5f87c693d5b1649fbfaf46beecf1368cf869a0d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:13 -0300 Subject: [PATCH 048/100] lxqt.libfm-qt: 2.0.2 -> 2.1.0 --- pkgs/desktops/lxqt/libfm-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix index 694c4452b45a..6bfd1bafb536 100644 --- a/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -15,7 +15,7 @@ , qttools , wrapQtAppsHook , gitUpdater -, version ? "2.0.2" +, version ? "2.1.0" , qtx11extras ? null }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { rev = version; hash = { "1.4.0" = "sha256-QxPYSA7537K+/dRTxIYyg+Q/kj75rZOdzlUsmSdQcn4="; - "2.0.2" = "sha256-Ntj+yixGGGgL8ylRv2IJsWtapxE71JNl9cC9K0JToNU="; + "2.1.0" = "sha256-yH3lyOpmDWjA3bV6msjw7fShs1HnAFOmkGer2Z9N/Tg="; }."${version}"; }; From d5ca691506d58208f12a01f23f949d105a3caaae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:13 -0300 Subject: [PATCH 049/100] lxqt.libqtxdg: 4.0.1 -> 4.1.0 --- pkgs/desktops/lxqt/libqtxdg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix index 5de096ee29e1..ebb4baa05ddd 100644 --- a/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -7,7 +7,7 @@ , lxqt-build-tools , wrapQtAppsHook , gitUpdater -, version ? "4.0.1" +, version ? "4.1.0" }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { rev = version; hash = { "3.12.0" = "sha256-y+3noaHubZnwUUs8vbMVvZPk+6Fhv37QXUb//reedCU="; - "4.0.1" = "sha256-h8uHIB0KuSHQVHI61h5BmpvpJHumloHMKN3GabH66EM="; + "4.1.0" = "sha256-Efn08a8MkR459Ww0WiEb5GXKgQzJwKupIdL2TySpivE="; }."${version}"; }; From d8096ebda60f3fdbd132e08bd38a99f5af1a31ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:14 -0300 Subject: [PATCH 050/100] lxqt.lximage-qt: 2.0.1 -> 2.1.0 --- pkgs/desktops/lxqt/lximage-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix index 6d0248e3e594..4a6013f6eb1a 100644 --- a/pkgs/desktops/lxqt/lximage-qt/default.nix +++ b/pkgs/desktops/lxqt/lximage-qt/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "lximage-qt"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-I0DyC8i+OnHxHcpp/xPsKjr3UgvUHlVO8h9Tjhg7Pg8="; + hash = "sha256-08HEPTbZw4CCq3A9KxMKeT/X1notXwsV1sSSgtRFPO0="; }; nativeBuildInputs = [ From dcc8ea2e01e38f94ec48aeceb9e06aeff3784645 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:14 -0300 Subject: [PATCH 051/100] lxqt.libsysstat: 1.0.0 -> 1.1.0 --- pkgs/desktops/lxqt/libsysstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/libsysstat/default.nix b/pkgs/desktops/lxqt/libsysstat/default.nix index daaad022edf5..09b8450740ad 100644 --- a/pkgs/desktops/lxqt/libsysstat/default.nix +++ b/pkgs/desktops/lxqt/libsysstat/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "libsysstat"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-2rdhw67TPvy/QmyzbtStgiIuIgZ7ZSt07xjCvOywKF4="; + hash = "sha256-CwQz0vaBhMe32xBoSgFkxSwx3tnIHutp9Vs32FvTNVU="; }; nativeBuildInputs = [ From f85e90408df1f0a037740d5c9bc67cdbfb8a95b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:14 -0300 Subject: [PATCH 052/100] lxqt.lxqt-about: 2.0.0 -> 2.1.0 --- pkgs/desktops/lxqt/lxqt-about/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix index 73b49561d886..eaf0d808df08 100644 --- a/pkgs/desktops/lxqt/lxqt-about/default.nix +++ b/pkgs/desktops/lxqt/lxqt-about/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "lxqt-about"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-Y0OF4W0quQEet/QvntwGwFqaqJDDUchWYRh+OWZDS8w="; + hash = "sha256-BjtU63SD6y4LnjAr8QGMqo/aYkcQ0Y+vg3lAOf97ZY8="; }; nativeBuildInputs = [ From 2c6e2101878bda9d01a411617886e8512698a710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:14 -0300 Subject: [PATCH 053/100] lxqt.lxqt-archiver: 1.0.0 -> 1.1.0 --- pkgs/desktops/lxqt/lxqt-archiver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix index 9cef42cdb629..0dabe275542c 100644 --- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix +++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "lxqt-archiver"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-archiver"; rev = version; - hash = "sha256-32Wq0Faphu0uSG0RdOqrDD/igrNaP6l1mtuV+HcsdcQ="; + hash = "sha256-a3NdU1OZI+BqtvpUhqhwylf5upFJxeg8B+1cPTAdDr4="; }; nativeBuildInputs = [ From c8c145fd036048a06a2e9eab03fd8688ea64a170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:14 -0300 Subject: [PATCH 054/100] lxqt.lxqt-admin: 2.0.0 -> 2.1.0 --- pkgs/desktops/lxqt/lxqt-admin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix index e83b1788dc3a..b194f6e09f6a 100644 --- a/pkgs/desktops/lxqt/lxqt-admin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "lxqt-admin"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-Ps+XiCA6OmnsYj0D+pxpvRxfIZfRGFBbZ0t/IPZjlv8="; + hash = "sha256-7RyPUv/M8mMoRO+SopFuru+bY9ZwnKz2BkiLz1cW/wg="; }; nativeBuildInputs = [ From 6360f16e7f31ef8a871f3412b59ebf13f20ca673 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:14 -0300 Subject: [PATCH 055/100] lxqt.lxqt-config: 2.0.0 -> 2.1.0 --- pkgs/desktops/lxqt/lxqt-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix index 3eb1c3a1013f..a7a5d7df7191 100644 --- a/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "lxqt-config"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-lFZTu6MqqWTjytYC7In/YJ38PYksZXduHvA/FRY4v0U="; + hash = "sha256-zAJD1p0iJUEN+pOW1nyVKrCBfew/uqVNqw9aCFq+JY4="; }; nativeBuildInputs = [ From 0755098f0b8ae72c144b6c9a83c8fb130c6c332c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:14 -0300 Subject: [PATCH 056/100] lxqt.lxqt-build-tools: 2.0.0 -> 2.1.0 --- pkgs/desktops/lxqt/lxqt-build-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index 418738f5853b..7c1a96cfe784 100644 --- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -9,7 +9,7 @@ , perl , wrapQtAppsHook , gitUpdater -, version ? "2.0.0" +, version ? "2.1.0" }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { rev = version; hash = { "0.13.0" = "sha256-4/hVlEdqqqd6CNitCRkIzsS1R941vPJdirIklp4acXA="; - "2.0.0" = "sha256-ZFvnIumP03Mp+4OHPe1yMVsSYhMmYUY1idJGCAy5IhA="; + "2.1.0" = "sha256-fZ5DbXnYm6oWDZdwiw2DpWFQMYd7VZ4oKkGIzQkaV94="; }."${version}"; }; From 1039653d0caad377b7a545bad491700011308e84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:14 -0300 Subject: [PATCH 057/100] lxqt.lxqt-globalkeys: 2.0.0 -> 2.1.0 --- pkgs/desktops/lxqt/lxqt-globalkeys/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix index df6972bd80e1..8079df71267e 100644 --- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix +++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "lxqt-globalkeys"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-24alERAnzlU/ZwIlRy9B+58zjRnF9eXunWeEO/lDVxM="; + hash = "sha256-jQdr3epezQtBoyC2hyMBceiqarruZLasSMYa2gDraCI="; }; nativeBuildInputs = [ From a8199e83f62ba6689e73e5c2b3b8c2f24b171eee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:15 -0300 Subject: [PATCH 058/100] lxqt.lxqt-menu-data: 2.0.0 -> 2.1.0 --- pkgs/desktops/lxqt/lxqt-menu-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-menu-data/default.nix b/pkgs/desktops/lxqt/lxqt-menu-data/default.nix index 84b4882f3643..da2e76105939 100644 --- a/pkgs/desktops/lxqt/lxqt-menu-data/default.nix +++ b/pkgs/desktops/lxqt/lxqt-menu-data/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "lxqt-menu-data"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-CNY23xdFiDQKKJf9GccwDOuBWXwfc7WNI7vMv/zOM9U="; + hash = "sha256-Q9VPPGPyMueoFrTTdAMlIR+VnWVXu0J2uXhaOlJPTAs="; }; nativeBuildInputs = [ From 761b105f8f5bb8b2fc901776e31edc29a1603b44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:15 -0300 Subject: [PATCH 059/100] lxqt.lxqt-notificationd: 2.0.1 -> 2.1.0 --- pkgs/desktops/lxqt/lxqt-notificationd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix index 70cb087fcc15..a88f3317b3ea 100644 --- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix +++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "lxqt-notificationd"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-qmBHeXKBJD97Me2zNSn7bNr0UrObGmvj8Pn19GQGktI="; + hash = "sha256-Iu3U036ebh9lMxCn1gt29nCQxs7N2ZLQHfg9HP3FSm0="; }; nativeBuildInputs = [ From 0c871b1337685980a6f4da6554534263c4a611e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:15 -0300 Subject: [PATCH 060/100] lxqt.lxqt-openssh-askpass: 2.0.1 -> 2.1.0 --- pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix index e3e8d52977f1..2a42933d5c49 100644 --- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix +++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "lxqt-openssh-askpass"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-poTOXVvVUdM6m1mHBgQGS+mVHu6O4iBKQRs0JwpU8X0="; + hash = "sha256-oFN4FpTBxOcXtykkkrJvaoxhvwEJKBp+eusrrSBIXIU="; }; nativeBuildInputs = [ From 387bdb9c5e5b712fa37525039e752fcdbf0d705b Mon Sep 17 00:00:00 2001 From: Vladimir Panteleev Date: Sun, 24 Dec 2023 13:33:39 +0000 Subject: [PATCH 061/100] libbytesize: fix Python bindings --- pkgs/by-name/li/libbytesize/package.nix | 12 ++++++++++-- pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libbytesize/package.nix b/pkgs/by-name/li/libbytesize/package.nix index bd395682cc14..5928f4c9a7ed 100644 --- a/pkgs/by-name/li/libbytesize/package.nix +++ b/pkgs/by-name/li/libbytesize/package.nix @@ -11,7 +11,7 @@ mpfr, pcre2, pkg-config, - python3, + python3Packages, stdenv, }: @@ -41,7 +41,8 @@ stdenv.mkDerivation (finalAttrs: { gtk-doc libxslt pkg-config - python3 + python3Packages.python + python3Packages.pythonImportsCheckHook ]; buildInputs = [ @@ -52,6 +53,13 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; + postInstall = '' + substituteInPlace $out/${python3Packages.python.sitePackages}/bytesize/bytesize.py \ + --replace-fail 'CDLL("libbytesize.so.1")' "CDLL('$out/lib/libbytesize.so.1')" + ''; + + pythonImportsCheck = [ "bytesize" ]; + meta = { homepage = "https://github.com/storaged-project/libbytesize"; description = "Tiny library providing a C 'class' for working with arbitrary big sizes in bytes"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bb45317ec90d..dadaea76efec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1923,6 +1923,8 @@ self: super: with self; { bytecode = callPackage ../development/python-modules/bytecode { }; + bytesize = toPythonModule (pkgs.libbytesize.override { python3Packages = self; }); + bytewax = callPackage ../development/python-modules/bytewax { }; bz2file = callPackage ../development/python-modules/bz2file { }; From e09aa2ed43d789b3eabe0e51f045965b262136e7 Mon Sep 17 00:00:00 2001 From: Vladimir Panteleev Date: Mon, 25 Dec 2023 14:10:12 +0000 Subject: [PATCH 062/100] libblockdev: split out Python bindings Allow overriding Python without requiring that the entire dependency graph (e.g. udisks) to be built against that Python. --- pkgs/development/libraries/libblockdev/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index 7679aefe5b95..6e0f9858f730 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -40,12 +40,18 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-WCMedMkaMMhZbB3iJu3c+CTT3AvOjzOSYP45J+NQEDQ="; }; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "out" "dev" "devdoc" "python" ]; postPatch = '' patchShebangs scripts + substituteInPlace src/python/gi/overrides/Makefile.am \ + --replace-fail ''\'''${exec_prefix}' '@PYTHON_EXEC_PREFIX@' ''; + configureFlags = [ + "--with-python_prefix=${placeholder "python"}" + ]; + nativeBuildInputs = [ autoconf-archive autoreconfHook From 1813aaf111ab4db2b59b7b7fddf7bc5a2eb1e645 Mon Sep 17 00:00:00 2001 From: Vladimir Panteleev Date: Sun, 24 Dec 2023 15:01:41 +0000 Subject: [PATCH 063/100] blivet: init at 3.10.1 --- .../python-modules/blivet/default.nix | 109 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 111 insertions(+) create mode 100644 pkgs/development/python-modules/blivet/default.nix diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix new file mode 100644 index 000000000000..e3ca43c8cd22 --- /dev/null +++ b/pkgs/development/python-modules/blivet/default.nix @@ -0,0 +1,109 @@ +{ + lib, + pkgs, + python, + buildPythonPackage, + fetchFromGitHub, + pygobject3, + libblockdev, + bytesize, + pyudev, + dbus-python, + util-linux, + kmod, + libndctl, + nvme-cli, + dosfstools, + e2fsprogs, + hfsprogs, + xfsprogs, + f2fs-tools, + ntfs3g, + btrfs-progs, + reiserfsprogs, + mdadm, + lvm2, + gfs2-utils, + cryptsetup, + multipath-tools, + dracut, + stratisd, +}: + +let + libblockdevPython = (libblockdev.override { python3 = python; }).python; +in +buildPythonPackage rec { + pname = "blivet"; + version = "3.10.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "storaged-project"; + repo = "blivet"; + rev = "blivet-${version}"; + hash = "sha256-Ooc63mf03ZO7zxm8s/Tm8jSQg5LWyKnHAqbyvn1UHB8="; + }; + + postPatch = '' + find blivet -name '*.py' | while IFS= read -r i ; do + substituteInPlace "$i" \ + --replace \ + 'gi.require_version("BlockDev",' \ + 'import gi.repository + gi.require_version("GIRepository", "2.0") + from gi.repository import GIRepository + GIRepository.Repository.prepend_search_path("${libblockdev}/lib/girepository-1.0") + gi.require_version("BlockDev",' + done + ''; + + propagatedBuildInputs = [ + pygobject3 + libblockdevPython + bytesize + pyudev + dbus-python + util-linux + kmod + libndctl + nvme-cli + pkgs.systemd + dosfstools + e2fsprogs + hfsprogs + xfsprogs + f2fs-tools + ntfs3g + btrfs-progs + reiserfsprogs + mdadm + lvm2 + gfs2-utils + cryptsetup + multipath-tools + dracut + stratisd + ]; + + pythonImportsCheck = [ "blivet" ]; + + # Even unit tests require a system D-Bus. + # TODO: Write a NixOS VM test? + doCheck = false; + + # Fails with: TypeError: don't know how to make test from: + # + dontUseSetuptoolsCheck = true; + + meta = { + description = "Python module for system storage configuration"; + homepage = "https://github.com/storaged-project/blivet"; + license = [ + lib.licenses.gpl2Plus + lib.licenses.lgpl2Plus + ]; + maintainers = with lib.maintainers; [ cybershadow ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dadaea76efec..84ce5b5e84a8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1686,6 +1686,8 @@ self: super: with self; { blis = callPackage ../development/python-modules/blis { }; + blivet = callPackage ../development/python-modules/blivet { }; + blobfile = callPackage ../development/python-modules/blobfile { }; blockchain = callPackage ../development/python-modules/blockchain { }; From 052b26573d4584cab10a1731d564ebc33674f889 Mon Sep 17 00:00:00 2001 From: Vladimir Panteleev Date: Sun, 24 Dec 2023 17:07:20 +0000 Subject: [PATCH 064/100] blivet-gui: init at 2.5.0 --- pkgs/by-name/bl/blivet-gui/package.nix | 73 ++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 pkgs/by-name/bl/blivet-gui/package.nix diff --git a/pkgs/by-name/bl/blivet-gui/package.nix b/pkgs/by-name/bl/blivet-gui/package.nix new file mode 100644 index 000000000000..efe4fe2de785 --- /dev/null +++ b/pkgs/by-name/bl/blivet-gui/package.nix @@ -0,0 +1,73 @@ +# Notes for using this package outside of NixOS: +# 1. --pure cannot be used (as pkexec will be used from the path, +# and we can't use nixpkgs polkit due to lack of setuid bit) +# 2. You must prefix the blivet-gui command with "SHELL=/bin/bash" +# (otherwise your system polkit will reject the SHEL Lfrom nixpkgs). + +{ + lib, + python3, + fetchFromGitHub, + gtk3, + util-linux, + gobject-introspection, + adwaita-icon-theme, + hicolor-icon-theme, + wrapGAppsHook3, + pkexecPath ? "pkexec", + testers, + blivet-gui, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "blivet-gui"; + version = "2.5.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "storaged-project"; + repo = "blivet-gui"; + rev = version; + hash = "sha256-fKd2Vj8clZ6Q7bZipfN5umyMW2rBXMUnpAuDE70p67U="; + }; + + postPatch = '' + substituteInPlace blivetgui/gui_utils.py --replace-fail /usr/share $out/share + substituteInPlace blivet-gui --replace-fail "pkexec blivet-gui-daemon" "pkexec $out/bin/blivet-gui-daemon" + substituteInPlace blivet-gui --replace-fail "pkexec" "${pkexecPath}" + ''; + + nativeBuildInputs = [ + util-linux + gobject-introspection + wrapGAppsHook3 + ]; + + buildInputs = [ gtk3 ]; + + dependencies = [ + python3.pkgs.blivet + python3.pkgs.pyparted + python3.pkgs.pid + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + ''${gappsWrapperArgs[@]} + --prefix XDG_DATA_DIRS : ${adwaita-icon-theme}/share + ) + ''; + + passthru.tests.version = testers.testVersion { package = blivet-gui; }; + + meta = { + description = "GUI tool for storage configuration using blivet library"; + homepage = "https://fedoraproject.org/wiki/Blivet"; + license = lib.licenses.gpl2Plus; + mainProgram = "blivet-gui"; + maintainers = with lib.maintainers; [ cybershadow ]; + platforms = lib.platforms.linux; + }; +} From 047c4367c7b7128ff84736d52e2a4777af731027 Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Thu, 7 Nov 2024 12:48:40 +0100 Subject: [PATCH 065/100] museum: 0.9.46 -> 0.9.53 --- pkgs/by-name/mu/museum/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mu/museum/package.nix b/pkgs/by-name/mu/museum/package.nix index 0ef76ad53e83..c8fac5e81d1d 100644 --- a/pkgs/by-name/mu/museum/package.nix +++ b/pkgs/by-name/mu/museum/package.nix @@ -7,15 +7,15 @@ buildGoModule rec { - version = "photos-v0.9.46"; + version = "0.9.53"; pname = "museum"; src = fetchFromGitHub { owner = "ente-io"; repo = "ente"; sparseCheckout = [ "server" ]; - rev = version; - hash = "sha256-dJCZxQLnKb+mFG0iaYNrXyDSaslqKdPTXMK4KwvqBd8="; + rev = "photos-v${version}"; + hash = "sha256-aczWqK6Zymvl46fHN6QXT0f5V2lpC+8kpSbEoTiP+7k="; }; sourceRoot = "${src.name}/server"; From d72427d96597963908e042977e04cf3020bbc09f Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Thu, 7 Nov 2024 12:22:07 +0100 Subject: [PATCH 066/100] python312Packages.scikit-bio: add missing deps --- .../python-modules/scikit-bio/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix index 37d1763b264c..afba3e93ddbd 100644 --- a/pkgs/development/python-modules/scikit-bio/default.nix +++ b/pkgs/development/python-modules/scikit-bio/default.nix @@ -2,9 +2,11 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, cython, oldest-supported-numpy, + requests, decorator, natsort, @@ -12,8 +14,10 @@ pandas, scipy, h5py, - hdmedians, biom-format, + statsmodels, + patsy, + python, pytestCheckHook, }: @@ -44,8 +48,9 @@ buildPythonPackage rec { pandas scipy h5py - hdmedians biom-format + statsmodels + patsy ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -53,6 +58,11 @@ buildPythonPackage rec { # only the $out dir contains the built cython extensions, so we run the tests inside there pytestFlagsArray = [ "${placeholder "out"}/${python.sitePackages}/skbio" ]; + disabledTestPaths = [ + # don't know why, but this segfaults + "${placeholder "out"}/${python.sitePackages}/skbio/metadata/tests/test_intersection.py" + ]; + pythonImportsCheck = [ "skbio" ]; meta = { From f2800a6eb3b8fe677e2ef22ea90791f1373d8984 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 2 Sep 2024 20:41:49 +0200 Subject: [PATCH 067/100] mim-solvers: init at 0.0.5 Co-authored-by: Arne Keller <2012gdwu+github@posteo.de> --- pkgs/by-name/mi/mim-solvers/package.nix | 68 +++++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 ++ 2 files changed, 73 insertions(+) create mode 100644 pkgs/by-name/mi/mim-solvers/package.nix diff --git a/pkgs/by-name/mi/mim-solvers/package.nix b/pkgs/by-name/mi/mim-solvers/package.nix new file mode 100644 index 000000000000..7bc0723a3044 --- /dev/null +++ b/pkgs/by-name/mi/mim-solvers/package.nix @@ -0,0 +1,68 @@ +{ + cmake, + crocoddyl, + fetchFromGitHub, + lib, + llvmPackages, + pkg-config, + proxsuite, + python3Packages, + pythonSupport ? false, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mim-solvers"; + version = "0.0.5"; + + src = fetchFromGitHub { + owner = "machines-in-motion"; + repo = "mim_solvers"; + rev = "v${finalAttrs.version}"; + hash = "sha256-XV8EJqCOTYqljZe2PQvnhIaPUOJ+bBjRIoshdeqZycA="; + }; + + # eigenpy is not used without python support + postPatch = lib.optionalString (!pythonSupport) '' + substituteInPlace CMakeLists.txt --replace-fail \ + "add_project_dependency(eigenpy 2.7.10 REQUIRED)" \ + "" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ] ++ lib.optional pythonSupport python3Packages.pythonImportsCheckHook; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp; + propagatedBuildInputs = + lib.optionals pythonSupport [ + python3Packages.crocoddyl + python3Packages.osqp + python3Packages.proxsuite + python3Packages.scipy + ] + ++ lib.optionals (!pythonSupport) [ + crocoddyl + proxsuite + ]; + + cmakeFlags = + [ + (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) + (lib.cmakeBool "BUILD_WITH_PROXSUITE" true) + ] + ++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) ( + lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'test_solvers'" + ); + + doCheck = true; + pythonImportsCheck = [ "mim_solvers" ]; + + meta = { + description = "Numerical solvers used in the Machines in Motion Laboratory"; + homepage = "https://github.com/machines-in-motion/mim_solvers"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ nim65s ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a9231aecd6e8..591502e44f47 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7870,6 +7870,11 @@ self: super: with self; { millheater = callPackage ../development/python-modules/millheater { }; + mim-solvers = toPythonModule (pkgs.mim-solvers.override { + python3Packages = self; + pythonSupport = true; + }); + minari = callPackage ../development/python-modules/minari { }; mindsdb-evaluator = callPackage ../development/python-modules/mindsdb-evaluator { }; From ba89dccdcda9842284e5b128ad01adc9f9dc1a1c Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Thu, 7 Nov 2024 21:24:52 +0100 Subject: [PATCH 068/100] python312Packages.notion-client: disable http test to fix build --- pkgs/development/python-modules/notion-client/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/notion-client/default.nix b/pkgs/development/python-modules/notion-client/default.nix index 6ec520c3ae47..ca931b8510d6 100644 --- a/pkgs/development/python-modules/notion-client/default.nix +++ b/pkgs/development/python-modules/notion-client/default.nix @@ -43,6 +43,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "notion_client" ]; + disabledTests = [ + "test_api_http_response_error" + ]; + meta = with lib; { description = "Python client for the official Notion API"; homepage = "https://github.com/ramnes/notion-sdk-py"; From 518bc9c5b3c0a7517a5145324dbac62b826b066b Mon Sep 17 00:00:00 2001 From: KX Date: Tue, 25 Jun 2024 14:43:29 +0200 Subject: [PATCH 069/100] nixos/promtail: configFile for passing path as config --- nixos/modules/services/logging/promtail.nix | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/logging/promtail.nix b/nixos/modules/services/logging/promtail.nix index 9eccd34cef23..178b9893525b 100644 --- a/nixos/modules/services/logging/promtail.nix +++ b/nixos/modules/services/logging/promtail.nix @@ -10,15 +10,29 @@ let allowPositionsFile = !lib.hasPrefix "/var/cache/promtail" positionsFile; positionsFile = cfg.configuration.positions.filename; + + configFile = if cfg.configFile != null + then cfg.configFile + else prettyJSON cfg.configuration; + in { options.services.promtail = with types; { enable = mkEnableOption "the Promtail ingresser"; - configuration = mkOption { type = (pkgs.formats.json {}).type; description = '' Specify the configuration for Promtail in Nix. + This option will be ignored if `services.promtail.configFile` is defined. + ''; + }; + + configFile = mkOption { + type = nullOr path; + default = null; + description = '' + Config file path for Promtail. + If this option is defined, the value of `services.promtail.configuration` will be ignored. ''; }; @@ -42,14 +56,14 @@ in { stopIfChanged = false; preStart = '' - ${lib.getExe pkgs.promtail} -config.file=${prettyJSON cfg.configuration} -check-syntax + ${lib.getExe pkgs.promtail} -config.file=${configFile} -check-syntax ''; serviceConfig = { Restart = "on-failure"; TimeoutStopSec = 10; - ExecStart = "${pkgs.promtail}/bin/promtail -config.file=${prettyJSON cfg.configuration} ${escapeShellArgs cfg.extraFlags}"; + ExecStart = "${pkgs.promtail}/bin/promtail -config.file=${configFile} ${escapeShellArgs cfg.extraFlags}"; ProtectSystem = "strict"; ProtectHome = true; From c4cfa34cd6ef34c0c0cd104f65c3be72cae50f56 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Thu, 7 Nov 2024 21:55:19 +0000 Subject: [PATCH 070/100] opencommit: init at 3.2.1 --- pkgs/by-name/op/opencommit/package.nix | 31 ++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/by-name/op/opencommit/package.nix diff --git a/pkgs/by-name/op/opencommit/package.nix b/pkgs/by-name/op/opencommit/package.nix new file mode 100644 index 000000000000..ae89601f8ce3 --- /dev/null +++ b/pkgs/by-name/op/opencommit/package.nix @@ -0,0 +1,31 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: + +buildNpmPackage rec { + pname = "opencommit"; + version = "3.2.1"; + + src = fetchFromGitHub { + owner = "di-sukharev"; + repo = "opencommit"; + rev = "v${version}"; + hash = "sha256-+uKb7qhQJEbuatPsewSGgVd5J6WtsrNO+hE59/KZIJI="; + }; + + npmDepsHash = "sha256-6tzV4iP7YzlbqOTgYf9XoTmIFPSBug0wYDelc6wcbCA="; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "AI-powered commit message generator"; + homepage = "https://www.npmjs.com/package/opencommit"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.matteopacini ]; + mainProgram = "oco"; + }; + +} From 647cac40fb1dd092a412f6f8ad7e9666ec63e362 Mon Sep 17 00:00:00 2001 From: John Chadwick Date: Thu, 7 Nov 2024 18:28:48 -0500 Subject: [PATCH 071/100] ghidra-bin: 10.4 -> 11.2.1 --- pkgs/tools/security/ghidra/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix index 8f39076b4eec..0b12186a9f88 100644 --- a/pkgs/tools/security/ghidra/default.nix +++ b/pkgs/tools/security/ghidra/default.nix @@ -4,7 +4,7 @@ lib, makeWrapper, autoPatchelfHook, - openjdk17, + openjdk21, pam, makeDesktopItem, icoutils, @@ -28,12 +28,12 @@ let in stdenv.mkDerivation rec { pname = "ghidra"; - version = "10.4"; - versiondate = "20230928"; + version = "11.2.1"; + versiondate = "20241105"; src = fetchzip { url = "https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_${version}_build/ghidra_${version}_PUBLIC_${versiondate}.zip"; - hash = "sha256-IiAQ9OKmr8ZgqmGftuW0ITdG06fb9Lr30n2H9GArctk="; + hash = "sha256-w6FCAjF2ggFWH8eo7X8V6ZTbSptGkwRzoEMj9nGL5/M="; }; nativeBuildInputs = [ @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ln -s "${pkg_path}/support/analyzeHeadless" "$out/bin/ghidra-analyzeHeadless" wrapProgram "${pkg_path}/support/launch.sh" \ - --prefix PATH : ${lib.makeBinPath [ openjdk17 ]} + --prefix PATH : ${lib.makeBinPath [ openjdk21 ]} ''; meta = with lib; { From 95faddaab7292bd14f25231430125038b058c6ea Mon Sep 17 00:00:00 2001 From: John Chadwick Date: Thu, 7 Nov 2024 18:54:48 -0500 Subject: [PATCH 072/100] ghidra-bin: add aarch64 platforms --- pkgs/tools/security/ghidra/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix index 0b12186a9f88..357d104c665e 100644 --- a/pkgs/tools/security/ghidra/default.nix +++ b/pkgs/tools/security/ghidra/default.nix @@ -78,7 +78,9 @@ stdenv.mkDerivation rec { homepage = "https://github.com/NationalSecurityAgency/ghidra"; platforms = [ "x86_64-linux" + "aarch64-linux" "x86_64-darwin" + "aarch64-darwin" ]; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; From b496d7ea4e9a10144d0c9bd16055aed47a91278e Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Fri, 8 Nov 2024 02:11:14 +0100 Subject: [PATCH 073/100] sudo: 1.9.15p5 -> 1.9.16 --- pkgs/tools/security/sudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 508cfafc69de..d238ef3166c6 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sudo"; # be sure to check if nixos/modules/security/sudo.nix needs updating when bumping # e.g. links to man pages, value constraints etc. - version = "1.9.15p5"; + version = "1.9.16"; __structuredAttrs = true; src = fetchurl { url = "https://www.sudo.ws/dist/sudo-${finalAttrs.version}.tar.gz"; - hash = "sha256-VY0QuaGZH7O5+n+nsH7EQFt677WzywsIcdvIHjqI5Vg="; + hash = "sha256-wNhNeX8GtzL8Vz0LeYroMSjCvDMFIFfwW1YOxry/oD0="; }; prePatch = '' From c5450fcb4b7e0f3d980b54e477e20de8a41c7645 Mon Sep 17 00:00:00 2001 From: ThinkChaos Date: Sun, 3 Nov 2024 18:35:27 -0500 Subject: [PATCH 074/100] nixos/authelia: start after `network-online.target` --- nixos/modules/services/security/authelia.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/security/authelia.nix b/nixos/modules/services/security/authelia.nix index 1cc137341e11..bbd6bde5ebc1 100644 --- a/nixos/modules/services/security/authelia.nix +++ b/nixos/modules/services/security/authelia.nix @@ -308,7 +308,8 @@ in { description = "Authelia authentication and authorization server"; wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + after = [ "network-online.target" ]; # Checks SMTP notifier creds during startup + wants = [ "network-online.target" ]; environment = (lib.filterAttrs (_: v: v != null) { X_AUTHELIA_CONFIG_FILTERS = lib.mkIf (oidcJwksConfigFile != [ ]) "template"; From 0b163fa12a3f6dab4ecdc202fabc6cf68b07bab8 Mon Sep 17 00:00:00 2001 From: Pedro Mendes Date: Thu, 7 Nov 2024 18:59:57 -0300 Subject: [PATCH 075/100] vimPlugins.one-small-step-for-vimkind: init at 2024-11-07 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 526678171d27..109fec6702f2 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -9930,6 +9930,18 @@ final: prev: meta.homepage = "https://github.com/Almo7aya/openingh.nvim/"; }; + one-small-step-for-vimkind = buildVimPlugin { + pname = "one-small-step-for-vimkind"; + version = "2024-10-15"; + src = fetchFromGitHub { + owner = "jbyuki"; + repo = "one-small-step-for-vimkind"; + rev = "ad065ad2c814249cfb9e344ce5b2b35d36fbc09f"; + sha256 = "sha256-KIxEjUutHkPRUubZQO3ZaFUm9Lm3mUJ6p6HB6hLuJEM="; + }; + meta.homepage = "https://github.com/jbyuki/one-small-step-for-vimkind/"; + }; + openscad-nvim = buildVimPlugin { pname = "openscad.nvim"; version = "2024-04-13"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 25e18fa88d7a..aad3a46ecaf6 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -447,6 +447,7 @@ https://github.com/Darazaki/indent-o-matic/,, https://github.com/Yggdroot/indentLine/,, https://github.com/ciaranm/inkpot/,, https://github.com/jbyuki/instant.nvim/,HEAD, +https://github.com/jbyuki/one-small-step-for-vimkind/,HEAD, https://github.com/pta2002/intellitab.nvim/,HEAD, https://github.com/parsonsmatt/intero-neovim/,, https://github.com/keith/investigate.vim/,, From 872c73caa75e3dd4fb4c9214f4f161bedad998e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:15 -0300 Subject: [PATCH 076/100] lxqt.lxqt-panel: 2.0.1 -> 2.1.1 --- pkgs/desktops/lxqt/lxqt-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index 7d6da7e65f9f..100f1e537dfe 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "lxqt-panel"; - version = "2.0.1"; + version = "2.1.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-m+LUG7hnkIJj48HJIy6pMyv3YZ/RfuSXbdBKJ9mi764="; + hash = "sha256-IlT7qXWMKFkmHNjXJYivawd4HnOBzILtIE6XaM/ZvkM="; }; nativeBuildInputs = [ From d44fb5a6ded5cf068db29627e7b7db3925ec942c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:15 -0300 Subject: [PATCH 077/100] lxqt.lxqt-policykit: 2.0.0 -> 2.1.0 --- pkgs/desktops/lxqt/lxqt-policykit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix index 9484a8e4b16d..3d7ca3ec68a7 100644 --- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix +++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "lxqt-policykit"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-oYKvQBilpD2RLhN1K6qgRNNAfohCOqmBrKcWy1fXZT8="; + hash = "sha256-wj9i09F9If5JZO6W358XcZ/rawt9Oj3QwDvLLRvS2Bc="; }; nativeBuildInputs = [ From 170195dfa890997b7c3f59f90fd3420735254dfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:15 -0300 Subject: [PATCH 078/100] lxqt.lxqt-powermanagement: 2.0.0 -> 2.1.0 --- pkgs/desktops/lxqt/lxqt-powermanagement/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix index f9fae3718f6f..dd46c72fdd90 100644 --- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix +++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "lxqt-powermanagement"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-wtqVUXYQWIPhvHj7Ig9qR6sglCRQzcxG192DM3xq/mA="; + hash = "sha256-S60m8ixz6HnTZe0MTyvU0pXWWOS88KeXfDcQJ/I1Keo="; }; nativeBuildInputs = [ From b25ea955b1037c8fb8051400cafe543cc6b4198d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:15 -0300 Subject: [PATCH 079/100] lxqt.lxqt-qtplugin: 2.0.0 -> 2.1.0 --- pkgs/desktops/lxqt/lxqt-qtplugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix index a496274c73b3..687846ba2e25 100644 --- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix @@ -12,7 +12,7 @@ , qtsvg , qttools , wrapQtAppsHook -, version ? "2.0.0" +, version ? "2.1.0" }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { rev = version; hash = { "1.4.1" = "sha256-sp/LvQNfodMYQ4kNbBv4PTNfs38XjYLezuxRltZd4kc="; - "2.0.0" = "sha256-o5iD4VzsbN81lwDZJuFj8Ugg1RP752M4unu3J5/h8g8="; + "2.1.0" = "sha256-F171IgAhRXJ9sTt8VVDVO9hrmyHbCElsskdDmFr3HB0="; }."${version}"; }; From c9ba2c521e84a852eb5d069c47b03d63842307a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:16 -0300 Subject: [PATCH 080/100] lxqt.lxqt-session: 2.0.0 -> 2.1.0 --- pkgs/desktops/lxqt/lxqt-session/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix index cdfd234a14d7..2519954c9dca 100644 --- a/pkgs/desktops/lxqt/lxqt-session/default.nix +++ b/pkgs/desktops/lxqt/lxqt-session/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "lxqt-session"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-IgpGtIVTcSs0O3jEniIuyIAyKBSkwN/jpGL6yZg3AVo="; + hash = "sha256-t3odaG9znMohROutoEquJ7JYsvPQPjPxOik+WD8WGSA="; }; nativeBuildInputs = [ From c3ccb218d9da2883e3663ae04a4b681204f6e72f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:16 -0300 Subject: [PATCH 081/100] lxqt.lxqt-sudo: 2.0.0 -> 2.1.0 --- pkgs/desktops/lxqt/lxqt-sudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix index f1fc740c7186..91fd56c211f7 100644 --- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix +++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "lxqt-sudo"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-kDcOHqHuAyHTQ7ccsCelPOBieXdRLloEvSMjq9PIa30="; + hash = "sha256-ohB0LsEnDDe3wygRgvP5mFQ2hu1c9xv2RilSdqOQBxA="; }; nativeBuildInputs = [ From 970b83abc39263a640627d09b1128aacb5737eb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:16 -0300 Subject: [PATCH 082/100] lxqt.lxqt-runner: 2.0.0 -> 2.1.0 --- pkgs/desktops/lxqt/lxqt-runner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix index 0ea4ab9dce0f..fd2b586778a5 100644 --- a/pkgs/desktops/lxqt/lxqt-runner/default.nix +++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "lxqt-runner"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-r9rz6rJX60+1/+Wd5APobyZRioXzD1xveFIMToTvpXQ="; + hash = "sha256-NsAlaoWMvisRZ04KkrQzwi5B2eXnaHqg0HtYG4NKLcs="; }; nativeBuildInputs = [ From 79af93c68434b6bc6c8e1b5d924206fe95d968de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:16 -0300 Subject: [PATCH 083/100] lxqt.lxqt-themes: 2.0.0 -> 2.1.0 --- pkgs/desktops/lxqt/lxqt-themes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix index f4283c1927ea..50b814724c51 100644 --- a/pkgs/desktops/lxqt/lxqt-themes/default.nix +++ b/pkgs/desktops/lxqt/lxqt-themes/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "lxqt-themes"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-bAdwC1YrXCT4eJUafTK6kcfQ/YnMbBLHyyWvsBLIisA="; + hash = "sha256-TUBcYQ7mWGVZKHNi4zQh8/ogSuMr20xIAoR+IGYQE0w="; }; nativeBuildInputs = [ From 7336b9ae243528881891b84441c244a23b31eb90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:16 -0300 Subject: [PATCH 084/100] lxqt.pavucontrol-qt: 2.0.0 -> 2.1.0 --- pkgs/desktops/lxqt/pavucontrol-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix index 208d741a9a61..0244300f3ed2 100644 --- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "pavucontrol-qt"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-dhFVVqJIX40oiHCcnG1166RsllXtfaO7MqM6ZNizjQQ="; + hash = "sha256-V3VYwDlTRd7q7EJhC4zHcX56AbUYJdfumqXaKlkLEfg="; }; nativeBuildInputs = [ From 5444f4c890af772d23c723b436c86a7e3c12802a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:16 -0300 Subject: [PATCH 085/100] lxqt.pcmanfm-qt: 2.0.0 -> 2.1.0 --- pkgs/desktops/lxqt/pcmanfm-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index 2b52e53755e5..e375c20791c7 100644 --- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "pcmanfm-qt"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-PyCtcn+QHwX/iy85A3y7Phf8ogdSRrwtXrJYGxrjyLM="; + hash = "sha256-3LdoJLlGoUsv0MdbxIOZrzLaPnZ2hI6m+bLp4GNonng="; }; nativeBuildInputs = [ From 994308a44907790b586544c2d53434725fca7efb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:16 -0300 Subject: [PATCH 086/100] lxqt.qps: 2.9.0 -> 2.10.0 --- pkgs/desktops/lxqt/qps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix index a162c7f21d44..c3cb608538a5 100644 --- a/pkgs/desktops/lxqt/qps/default.nix +++ b/pkgs/desktops/lxqt/qps/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "qps"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-Jit1CdFZyhKOjNytTBH9T4NqqmhxoifXGgPUyVdzJ+4="; + hash = "sha256-FJw1J4c8oLBo7adl1uhCuS+o/ZhJAOyLmbjUgtdt0ss="; }; nativeBuildInputs = [ From 51089e06249cff2150b81018851b469c24e33665 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:17 -0300 Subject: [PATCH 087/100] lxqt.qterminal: 2.0.1 -> 2.1.0 --- pkgs/desktops/lxqt/qterminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix index 0155fdf5322a..1ca75acdc36c 100644 --- a/pkgs/desktops/lxqt/qterminal/default.nix +++ b/pkgs/desktops/lxqt/qterminal/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "qterminal"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-KGghNa1tvxDFd9kEElCx9BoLfwnbeX5UvoksyPBfEjc="; + hash = "sha256-Nluw0waf+lqpbajsPv+HYhPD3y7XmgifSu2r7I/J4RI="; }; nativeBuildInputs = [ From 821a3045db4867c870bfbc6bbdb78bcb0c786bac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:17 -0300 Subject: [PATCH 088/100] lxqt.qtermwidget: 2.0.1 -> 2.1.0 --- pkgs/desktops/lxqt/qtermwidget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix index 30fe20ebeefe..90b1a561bdf2 100644 --- a/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -7,7 +7,7 @@ , lxqt-build-tools , wrapQtAppsHook , gitUpdater -, version ? "2.0.1" +, version ? "2.1.0" }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { rev = version; hash = { "1.4.0" = "sha256-wYUOqAiBjnupX1ITbFMw7sAk42V37yDz9SrjVhE4FgU="; - "2.0.1" = "sha256-dqKsYAtoJgtXYL/MI3/p3N5kzxC7JfyO4Jn6YMhaV78="; + "2.1.0" = "sha256-I8fVggCi9qN+Jpqb/EC5/DfwuhGF55trbPESZQWPZ5M="; }."${version}"; }; From 3911a6abecb8c935404cd0197a0a9ab7600e3df0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:17 -0300 Subject: [PATCH 089/100] lxqt.qtxdg-tools: 4.0.0 -> 4.1.0 --- pkgs/desktops/lxqt/qtxdg-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/qtxdg-tools/default.nix b/pkgs/desktops/lxqt/qtxdg-tools/default.nix index 5243b6e6ef22..4e1b5b4144d8 100644 --- a/pkgs/desktops/lxqt/qtxdg-tools/default.nix +++ b/pkgs/desktops/lxqt/qtxdg-tools/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "qtxdg-tools"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-w9pFHG+q2oT33Lfg88MUzfWSyvHUgC0Fi2V8XcueJ/Q="; + hash = "sha256-I8HV7QwyyRssWB6AjC1GswjlXoYwPJHowE74zgqghX4="; }; nativeBuildInputs = [ From 32dd7af54d7c533dada0de3174d3a1df508f5995 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:17 -0300 Subject: [PATCH 090/100] lxqt.screengrab: 2.8.0 -> 2.9.0 --- pkgs/desktops/lxqt/screengrab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix index a7e65d746b60..fa132756edcf 100644 --- a/pkgs/desktops/lxqt/screengrab/default.nix +++ b/pkgs/desktops/lxqt/screengrab/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "screengrab"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-PMe2NyIoc12n4l/oWPi3GL6pemuHyxL2HFBLTIyD690="; + hash = "sha256-V5ulRkckeSX2EsYmhmA9phVssDtix31M5oZXkOgF660="; }; nativeBuildInputs = [ From 5fff027e315bda2bac4398e66c5e3798669238be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:17 -0300 Subject: [PATCH 091/100] lxqt.xdg-desktop-portal-lxqt: 1.0.2 -> 1.1.0 --- pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix index f88f32fb11fc..4e63d967ffbc 100644 --- a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix +++ b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-lxqt"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-zXZ0Un56uz1hKoPvZitJgQpJ7ko0LrSSFxl+agiqZ4A="; + hash = "sha256-uII6elLoREc/AO6NSe9QsT+jYARd2hgKSa84NCDza10="; }; nativeBuildInputs = [ From 081c63905b498cd0ca50565ae5ea6e44190096da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Thu, 7 Nov 2024 08:01:56 -0300 Subject: [PATCH 092/100] lxqt.lxqt-wayland-session: init at 0.1.0 --- pkgs/desktops/lxqt/default.nix | 2 + .../lxqt/lxqt-wayland-session/default.nix | 70 +++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 pkgs/desktops/lxqt/lxqt-wayland-session/default.nix diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 3efd526cb6bd..059a2531fbbe 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -29,6 +29,7 @@ let lxqt-session = callPackage ./lxqt-session {}; lxqt-sudo = callPackage ./lxqt-sudo {}; lxqt-themes = callPackage ./lxqt-themes {}; + lxqt-wayland-session = callPackage ./lxqt-wayland-session {}; pavucontrol-qt = callPackage ./pavucontrol-qt {}; qtermwidget = callPackage ./qtermwidget {}; @@ -114,6 +115,7 @@ let lxqt-session lxqt-sudo lxqt-themes + lxqt-wayland-session pavucontrol-qt ### CORE 2 diff --git a/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix b/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix new file mode 100644 index 000000000000..21f4ef2548d9 --- /dev/null +++ b/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix @@ -0,0 +1,70 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + kwindowsystem, + liblxqt, + libqtxdg, + lxqt-build-tools, + pkg-config, + qtsvg, + qttools, + xdg-user-dirs, + xkeyboard_config, + gitUpdater, +}: + +stdenv.mkDerivation rec { + pname = "lxqt-wayland-session"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "lxqt"; + repo = "lxqt-wayland-session"; + rev = version; + hash = "sha256-5WdfwJ89HWlXL6y9Lpgs7H3mbN/wbf+9VbP9ERPasBM="; + }; + + nativeBuildInputs = [ + cmake + lxqt-build-tools + pkg-config + qttools + ]; + + buildInputs = [ + kwindowsystem + liblxqt + libqtxdg + qtsvg + xdg-user-dirs + ]; + + postPatch = '' + substituteInPlace startlxqtwayland.in \ + --replace-fail /usr/share/X11/xkb/rules ${xkeyboard_config}/share/X11/xkb/rules + + substituteInPlace configurations/{labwc/autostart,lxqt-hyprland.conf,lxqt-wayfire.ini} \ + --replace-fail /usr/share/lxqt/wallpapers $out/share/lxqt/wallpapers + ''; + + dontWrapQtApps = true; + + passthru.updateScript = gitUpdater { }; + + meta = { + homepage = "https://github.com/lxqt/lxqt-wayland-session"; + description = "Files needed for the LXQt Wayland Session"; + license = with lib.licenses; [ + bsd3 + cc-by-sa-40 + gpl2Only + gpl3Only + lgpl21Only + mit + ]; + platforms = lib.platforms.linux; + maintainers = lib.teams.lxqt.members; + }; +} From 9aa30e6dd110a722bd0496e011043bf5c1af52e8 Mon Sep 17 00:00:00 2001 From: MilesCranmer Date: Mon, 4 Nov 2024 20:00:42 -0500 Subject: [PATCH 093/100] rip2: init at 0.9.0 Co-authored-by: Aleksana --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/by-name/ri/rip2/package.nix | 36 ++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/by-name/ri/rip2/package.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b14f78609e47..06da3c2474da 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14244,6 +14244,12 @@ githubId = 38543128; name = "Miles Breslin"; }; + milescranmer = { + email = "miles.cranmer@gmail.com"; + github = "MilesCranmer"; + githubId = 7593028; + name = "Miles Cranmer"; + }; milibopp = { email = "contact@ebopp.de"; github = "milibopp"; diff --git a/pkgs/by-name/ri/rip2/package.nix b/pkgs/by-name/ri/rip2/package.nix new file mode 100644 index 000000000000..eba6c5f81484 --- /dev/null +++ b/pkgs/by-name/ri/rip2/package.nix @@ -0,0 +1,36 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, +}: + +rustPlatform.buildRustPackage rec { + pname = "rip2"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "MilesCranmer"; + repo = "rip2"; + rev = "v${version}"; + hash = "sha256-9leLWfPilDQHzQRzTUjAFt9olTPEL4GcQgYFWZu3dug="; + }; + + cargoHash = "sha256-l6rbeiyIsr1csBcp+428TpQYSs9RvfJutGoL/wtSGR8="; + + # TODO: Unsure why this test fails, but not a major issue so + # skipping for now. + checkFlags = [ "--skip=test_filetypes::file_type_3___fifo__" ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/rip"; + + meta = { + description = "Safe and ergonomic alternative to rm"; + homepage = "https://github.com/MilesCranmer/rip2"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ milescranmer ]; + mainProgram = "rip"; + }; +} From ef78c48d1abb83e58dd1180a923d3a0551109197 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Nov 2024 05:27:40 +0000 Subject: [PATCH 094/100] python312Packages.django-cachalot: 2.6.3 -> 2.7.0 --- pkgs/development/python-modules/django-cachalot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-cachalot/default.nix b/pkgs/development/python-modules/django-cachalot/default.nix index 95772d937b6c..44a680f4f3dc 100644 --- a/pkgs/development/python-modules/django-cachalot/default.nix +++ b/pkgs/development/python-modules/django-cachalot/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "django-cachalot"; - version = "2.6.3"; + version = "2.7.0"; format = "setuptools"; src = fetchFromGitHub { owner = "noripyt"; repo = "django-cachalot"; rev = "refs/tags/v${version}"; - hash = "sha256-q4w2goxdDqivGVZCRDGOvYARbzmx6P8Gnw9YlYn9Few="; + hash = "sha256-Fi5UvqH2bVb4v/GWDkEYIcBMBVos+35g4kcEnZTOQvw="; }; patches = [ From 3e0cfb6804eb33f075da91f3394b471f6e42a4eb Mon Sep 17 00:00:00 2001 From: ocfox Date: Fri, 8 Nov 2024 13:27:52 +0800 Subject: [PATCH 095/100] showmethekey: 1.14.0 -> 1.15.0 Diff: https://github.com/AlynxZhou/showmethekey/compare/refs/tags/v1.14.0...v1.15.0 Changelog: https://github.com/AlynxZhou/showmethekey/releases/tag/v1.15.0 --- pkgs/by-name/sh/showmethekey/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sh/showmethekey/package.nix b/pkgs/by-name/sh/showmethekey/package.nix index b9842ae0a66b..c7d390e971fe 100644 --- a/pkgs/by-name/sh/showmethekey/package.nix +++ b/pkgs/by-name/sh/showmethekey/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "showmethekey"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "AlynxZhou"; repo = "showmethekey"; rev = "refs/tags/v${version}"; - hash = "sha256-uBhciNkDBXrME8YRztlUdm3oV2y8YiA9Fhib9KLVeBY="; + hash = "sha256-zlLpQZbjEJjgCxlHGaiDFGRZ/6tz5fpKVLVqtjO4pHM="; }; nativeBuildInputs = [ From e134422465913332a5c9cb3ec9161650f7d459c8 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 8 Nov 2024 12:56:36 +0800 Subject: [PATCH 096/100] maintainers: remove expipiplus1 Another year, another exhausting undermoderated thread full of people arguing against being an inclusive community, tone policing and denying that discriminatory behaviour even exists. This clearly isn't getting any better and I'm embarrassed that I stayed around for this long. I can't continue to lend my name to such a project. --- maintainers/maintainer-list.nix | 8 -------- maintainers/team-list.nix | 1 - .../instant-messengers/signald/default.nix | 2 +- .../science/electronics/fped/default.nix | 2 +- .../science/electronics/picoscope/default.nix | 2 +- .../version-management/git-fame/default.nix | 2 +- pkgs/by-name/li/libgpiod_1/package.nix | 2 +- pkgs/by-name/mo/monado/package.nix | 2 +- pkgs/by-name/xr/xrgears/package.nix | 5 +---- pkgs/development/embedded/fpga/ecpdap/default.nix | 2 +- .../configuration-hackage2nix/main.yaml | 10 ---------- .../haskell-modules/hackage-packages.nix | 13 +------------ pkgs/development/libraries/libgpiod/default.nix | 2 +- pkgs/development/libraries/libsurvive/default.nix | 2 +- pkgs/development/libraries/pangolin/default.nix | 2 +- pkgs/development/libraries/swiftshader/default.nix | 2 +- .../tools/build-managers/qbs/default.nix | 2 +- pkgs/servers/mautrix-signal/default.nix | 1 - pkgs/servers/mx-puppet-discord/default.nix | 2 +- .../graphics/directx-shader-compiler/default.nix | 5 +---- .../graphics/vulkan-extension-layer/default.nix | 2 +- pkgs/tools/graphics/vulkan-tools-lunarg/default.nix | 2 +- pkgs/tools/misc/inav-blackbox-tools/default.nix | 2 +- pkgs/tools/misc/lighthouse-steamvr/default.nix | 5 +---- pkgs/tools/misc/opencorsairlink/default.nix | 2 +- 25 files changed, 21 insertions(+), 61 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a844c0b45998..96a3c478cd4b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6881,14 +6881,6 @@ githubId = 873530; name = "Alexey Levan"; }; - expipiplus1 = { - email = "nix@monoid.al"; - matrix = "@ellie:monoid.al"; - github = "expipiplus1"; - githubId = 857308; - name = "Ellie Hermaszewska"; - keys = [ { fingerprint = "FC1D 3E4F CBCA 80DF E870 6397 C811 6E3A 0C1C A76A"; } ]; - }; exploitoverload = { email = "nix@exploitoverload.com"; github = "exploitoverload"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 6542675bbc98..b4f555105051 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -449,7 +449,6 @@ with lib.maintainers; haskell = { members = [ cdepillabout - expipiplus1 maralorn ncfavier sternenseemann diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix index 6131e64e9152..acadc87d9a3d 100644 --- a/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -84,7 +84,7 @@ in stdenv.mkDerivation { binaryBytecode # deps ]; license = licenses.gpl3Plus; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } diff --git a/pkgs/applications/science/electronics/fped/default.nix b/pkgs/applications/science/electronics/fped/default.nix index e3984dba77d8..dbfeb69c6bfa 100644 --- a/pkgs/applications/science/electronics/fped/default.nix +++ b/pkgs/applications/science/electronics/fped/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { mainProgram = "fped"; homepage = "http://projects.qi-hardware.com/index.php/p/fped/"; license = licenses.gpl2; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/electronics/picoscope/default.nix b/pkgs/applications/science/electronics/picoscope/default.nix index 7fc737eb1d38..056a682d1c1c 100644 --- a/pkgs/applications/science/electronics/picoscope/default.nix +++ b/pkgs/applications/science/electronics/picoscope/default.nix @@ -17,7 +17,7 @@ let shared_meta = lib: { homepage = "https://www.picotech.com/downloads/linux"; - maintainers = with lib.maintainers; [ expipiplus1 wirew0rm ] ++ lib.teams.lumiguide.members; + maintainers = with lib.maintainers; [ wirew0rm ] ++ lib.teams.lumiguide.members; platforms = [ "x86_64-linux" ]; license = lib.licenses.unfree; }; diff --git a/pkgs/applications/version-management/git-fame/default.nix b/pkgs/applications/version-management/git-fame/default.nix index d69988eca012..54af934bde8b 100644 --- a/pkgs/applications/version-management/git-fame/default.nix +++ b/pkgs/applications/version-management/git-fame/default.nix @@ -15,7 +15,7 @@ bundlerEnv { ''; homepage = "http://oleander.io/git-fame-rb"; license = licenses.mit; - maintainers = with maintainers; [ expipiplus1 nicknovitski ]; + maintainers = with maintainers; [ nicknovitski ]; platforms = platforms.unix; mainProgram = "git-fame"; }; diff --git a/pkgs/by-name/li/libgpiod_1/package.nix b/pkgs/by-name/li/libgpiod_1/package.nix index 337229c25db7..94644afff3fe 100644 --- a/pkgs/by-name/li/libgpiod_1/package.nix +++ b/pkgs/by-name/li/libgpiod_1/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about/"; license = licenses.lgpl2; - maintainers = [ maintainers.expipiplus1 ]; + maintainers = []; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/mo/monado/package.nix b/pkgs/by-name/mo/monado/package.nix index 84719a4fa8be..f65a83c3d601 100644 --- a/pkgs/by-name/mo/monado/package.nix +++ b/pkgs/by-name/mo/monado/package.nix @@ -155,7 +155,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Open source XR runtime"; homepage = "https://monado.freedesktop.org/"; license = licenses.boost; - maintainers = with maintainers; [ Scrumplex expipiplus1 prusnak ]; + maintainers = with maintainers; [ Scrumplex prusnak ]; platforms = platforms.linux; mainProgram = "monado-cli"; }; diff --git a/pkgs/by-name/xr/xrgears/package.nix b/pkgs/by-name/xr/xrgears/package.nix index 82a801a54be0..96737ae7972e 100644 --- a/pkgs/by-name/xr/xrgears/package.nix +++ b/pkgs/by-name/xr/xrgears/package.nix @@ -65,9 +65,6 @@ stdenv.mkDerivation { mainProgram = "xrgears"; platforms = platforms.linux; license = licenses.mit; - maintainers = with maintainers; [ - expipiplus1 - Scrumplex - ]; + maintainers = with maintainers; [ Scrumplex ]; }; } diff --git a/pkgs/development/embedded/fpga/ecpdap/default.nix b/pkgs/development/embedded/fpga/ecpdap/default.nix index 6d43f107563a..1dfc54e9c3c6 100644 --- a/pkgs/development/embedded/fpga/ecpdap/default.nix +++ b/pkgs/development/embedded/fpga/ecpdap/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/adamgreig/ecpdap"; license = licenses.asl20; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; }; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 53acd512a0ef..b1dc2492f8b9 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -223,16 +223,6 @@ package-maintainers: - tlynx - xmonad - xmonad-contrib - expipiplus1: - - VulkanMemoryAllocator - - autoapply - - exact-real - - language-c - - orbits - - update-nix-fetchgit - - vector-sized - - vulkan - - vulkan-utils erictapen: - hakyll evenbrenden: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 67ba06fe891d..d51851b2c471 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -22317,7 +22317,6 @@ self: { badPlatforms = [ "i686-linux" "armv7l-linux" ] ++ lib.platforms.darwin; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "WAVE" = callPackage @@ -43471,7 +43470,6 @@ self: { description = "Template Haskell to automatically pass values to functions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "autodocodec" = callPackage @@ -103828,7 +103826,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Exact real arithmetic"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "exact-real-positional" = callPackage @@ -188180,7 +188177,6 @@ self: { testHaskellDepends = [ base directory filepath process ]; description = "Analysis and generation of C code"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "language-c-comments" = callPackage @@ -229065,7 +229061,6 @@ self: { ]; description = "Types and functions for Kepler orbits"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "orc" = callPackage @@ -323122,9 +323117,7 @@ self: { description = "A program to update fetchgit values in Nix expressions"; license = lib.licenses.bsd3; mainProgram = "update-nix-fetchgit"; - maintainers = [ - lib.maintainers.expipiplus1 lib.maintainers.sorki - ]; + maintainers = [ lib.maintainers.sorki ]; }) {}; "update-repos" = callPackage @@ -326556,7 +326549,6 @@ self: { ]; description = "Size tagged vectors"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "vector-sized_1_6_1" = callPackage @@ -326576,7 +326568,6 @@ self: { description = "Size tagged vectors"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "vector-space" = callPackage @@ -328393,7 +328384,6 @@ self: { badPlatforms = [ "i686-linux" "armv7l-linux" ] ++ lib.platforms.darwin; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {vulkan = null;}; "vulkan-api" = callPackage @@ -328427,7 +328417,6 @@ self: { description = "Utils for the vulkan package"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "waargonaut" = callPackage diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix index 1880b8310fce..e52a0f83ad3c 100644 --- a/pkgs/development/libraries/libgpiod/default.nix +++ b/pkgs/development/libraries/libgpiod/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { lgpl21Plus # libgpiod lgpl3Plus # C++ bindings ] ++ lib.optional enable-tools gpl2Plus; - maintainers = [ maintainers.expipiplus1 ]; + maintainers = []; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libsurvive/default.nix b/pkgs/development/libraries/libsurvive/default.nix index 53ebe6f18e41..4e5418de689a 100644 --- a/pkgs/development/libraries/libsurvive/default.nix +++ b/pkgs/development/libraries/libsurvive/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "Open Source Lighthouse Tracking System"; homepage = "https://github.com/cntools/libsurvive"; license = licenses.mit; - maintainers = with maintainers; [ expipiplus1 prusnak ]; + maintainers = with maintainers; [ prusnak ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index 7b26f3f12fca..f15a7dfe4490 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/stevenlovegrove/Pangolin"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.expipiplus1 ]; + maintainers = []; platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/swiftshader/default.nix b/pkgs/development/libraries/swiftshader/default.nix index 624d239fa35c..3063ccc3a189 100644 --- a/pkgs/development/libraries/swiftshader/default.nix +++ b/pkgs/development/libraries/swiftshader/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { # Should be possible to support Darwin by changing the install phase with # 's/Linux/Darwin/' and 's/so/dylib/' or something similar. platforms = with platforms; linux; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; }; } diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix index 092f8efe785c..9c642123ee4d 100644 --- a/pkgs/development/tools/build-managers/qbs/default.nix +++ b/pkgs/development/tools/build-managers/qbs/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Tool that helps simplify the build process for developing projects across multiple platforms"; homepage = "https://wiki.qt.io/Qbs"; license = licenses.lgpl3; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; platforms = platforms.linux; }; } diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index 143034ecddee..0b21bd539d1d 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -48,7 +48,6 @@ buildGoModule rec { description = "Matrix-Signal puppeting bridge"; license = licenses.agpl3Plus; maintainers = with maintainers; [ - expipiplus1 niklaskorz ma27 ]; diff --git a/pkgs/servers/mx-puppet-discord/default.nix b/pkgs/servers/mx-puppet-discord/default.nix index 254434a8ba3d..1d86bc472a36 100644 --- a/pkgs/servers/mx-puppet-discord/default.nix +++ b/pkgs/servers/mx-puppet-discord/default.nix @@ -44,7 +44,7 @@ in myNodePackages.package.override { description = "Discord puppeting bridge for matrix"; license = licenses.asl20; homepage = "https://gitlab.com/mx-puppet/discord/mx-puppet-discord"; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; platforms = platforms.unix; # never built on aarch64-darwin since first introduction in nixpkgs broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; diff --git a/pkgs/tools/graphics/directx-shader-compiler/default.nix b/pkgs/tools/graphics/directx-shader-compiler/default.nix index 11deeca44d06..bd5d00aa50d1 100644 --- a/pkgs/tools/graphics/directx-shader-compiler/default.nix +++ b/pkgs/tools/graphics/directx-shader-compiler/default.nix @@ -56,9 +56,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/microsoft/DirectXShaderCompiler"; platforms = with lib.platforms; linux ++ darwin; license = lib.licenses.ncsa; - maintainers = with lib.maintainers; [ - expipiplus1 - Flakebi - ]; + maintainers = with lib.maintainers; [ Flakebi ]; }; }) diff --git a/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/pkgs/tools/graphics/vulkan-extension-layer/default.nix index 268353985889..4b03e4e098f2 100644 --- a/pkgs/tools/graphics/vulkan-extension-layer/default.nix +++ b/pkgs/tools/graphics/vulkan-extension-layer/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/KhronosGroup/Vulkan-ExtensionLayer/"; platforms = platforms.linux; license = licenses.asl20; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; }; } diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix index 1d031d20c1bb..08236ab39a2c 100644 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -88,6 +88,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/LunarG/VulkanTools"; platforms = platforms.linux; license = licenses.asl20; - maintainers = [ maintainers.expipiplus1 ]; + maintainers = []; }; } diff --git a/pkgs/tools/misc/inav-blackbox-tools/default.nix b/pkgs/tools/misc/inav-blackbox-tools/default.nix index 228035108a81..4acfc4d4890e 100644 --- a/pkgs/tools/misc/inav-blackbox-tools/default.nix +++ b/pkgs/tools/misc/inav-blackbox-tools/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "Tools for working with blackbox flight logs"; homepage = "https://github.com/inavflight/blackbox-tools"; license = licenses.gpl3Only; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; platforms = platforms.all; broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/inav-blackbox-tools.x86_64-darwin }; diff --git a/pkgs/tools/misc/lighthouse-steamvr/default.nix b/pkgs/tools/misc/lighthouse-steamvr/default.nix index 90590d01cfdc..9c9f7e97fa68 100644 --- a/pkgs/tools/misc/lighthouse-steamvr/default.nix +++ b/pkgs/tools/misc/lighthouse-steamvr/default.nix @@ -29,10 +29,7 @@ rustPlatform.buildRustPackage rec { description = "VR Lighthouse power state management"; homepage = "https://github.com/ShayBox/Lighthouse"; license = licenses.mit; - maintainers = with maintainers; [ - expipiplus1 - bddvlpr - ]; + maintainers = with maintainers; [ bddvlpr ]; mainProgram = "lighthouse"; }; } diff --git a/pkgs/tools/misc/opencorsairlink/default.nix b/pkgs/tools/misc/opencorsairlink/default.nix index c7e92770b7d6..e4e1791c8971 100644 --- a/pkgs/tools/misc/opencorsairlink/default.nix +++ b/pkgs/tools/misc/opencorsairlink/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/audiohacked/OpenCorsairLink"; license = licenses.gpl2Plus; platforms = platforms.all; - maintainers = [ lib.maintainers.expipiplus1 ]; + maintainers = []; mainProgram = "OpenCorsairLink.elf"; }; } From 59fd9013ac9d1188bc5b44e534da7fef59a40cea Mon Sep 17 00:00:00 2001 From: Yovko Lambrev Date: Fri, 8 Nov 2024 08:41:00 +0200 Subject: [PATCH 097/100] terraform-providers.ccloud: init at 1.6.6 (#354274) --- .../cluster/terraform-providers/providers.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index cea5e5187367..e7616f511744 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -206,6 +206,15 @@ "spdx": "MIT", "vendorHash": "sha256-PFeWgDw1hkW/ekQfubRSYlaD4d4wJ4GOohOJ00QcEqQ=" }, + "ccloud": { + "hash": "sha256-bGyVfB9eenE6QZZw0bAxnve0KW0ZQ54slTaaWZXDBOc=", + "homepage": "https://registry.terraform.io/providers/sapcc/ccloud", + "owner": "sapcc", + "repo": "terraform-provider-ccloud", + "rev": "v1.6.6", + "spdx": "MPL-2.0", + "vendorHash": "sha256-uftDCqDU0HeDj7rjAevulsFCVFFQt3eg8vcFM9YJrow=" + }, "checkly": { "hash": "sha256-4J7pwtlAa920RXF6ZoSoi03qA15NBzUlXQCZRErI2Co=", "homepage": "https://registry.terraform.io/providers/checkly/checkly", From 8f8d0c7219d37255d0d5fb71897fe2a7369dcef9 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Fri, 8 Nov 2024 10:03:26 +0100 Subject: [PATCH 098/100] python312Packages.notion-client: add comment to why test is disabled --- pkgs/development/python-modules/notion-client/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/notion-client/default.nix b/pkgs/development/python-modules/notion-client/default.nix index ca931b8510d6..12500e9fe854 100644 --- a/pkgs/development/python-modules/notion-client/default.nix +++ b/pkgs/development/python-modules/notion-client/default.nix @@ -44,6 +44,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "notion_client" ]; disabledTests = [ + # requires network access "test_api_http_response_error" ]; From efab9a3e06f5af88fda6c619941218206b68eb73 Mon Sep 17 00:00:00 2001 From: Eveeifyeve <88671402+Eveeifyeve@users.noreply.github.com> Date: Fri, 8 Nov 2024 20:19:42 +1100 Subject: [PATCH 099/100] skeditor: add desktopitem, mainProgram (#352836) Co-authored-by: Masum Reza <50095635+JohnRTitor@users.noreply.github.com> --- pkgs/by-name/sk/skeditor/package.nix | 34 ++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/pkgs/by-name/sk/skeditor/package.nix b/pkgs/by-name/sk/skeditor/package.nix index 57ffd6d6b01e..337122b218e7 100644 --- a/pkgs/by-name/sk/skeditor/package.nix +++ b/pkgs/by-name/sk/skeditor/package.nix @@ -3,6 +3,9 @@ buildDotnetModule, fetchFromGitHub, dotnetCorePackages, + makeDesktopItem, + copyDesktopItems, + iconConvTools, }: buildDotnetModule rec { pname = "skeditor"; @@ -22,6 +25,36 @@ buildDotnetModule rec { dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-runtime = dotnetCorePackages.runtime_8_0; + nativeBuildInputs = [ + iconConvTools + copyDesktopItems + ]; + + postInstall = '' + icoFileToHiColorTheme SkEditor/Assets/SkEditor.ico skeditor $out + ''; + + desktopItems = [ + (makeDesktopItem { + name = pname; + desktopName = "SkEditor"; + exec = meta.mainProgram; + icon = "SkEditor"; + startupWMClass = "SkEditor"; + genericName = "Skript Editor"; + keywords = [ + "skeditor" + "SkEditor" + ]; + categories = [ + "Utility" + "TextEditor" + "Development" + "IDE" + ]; + }) + ]; + passthru.updateScript = ./update.sh; meta = { @@ -29,6 +62,7 @@ buildDotnetModule rec { homepage = "https://github.com/SkEditorTeam/SkEditor"; changelog = "https://github.com/SkEditorTeam/SkEditor/releases/tag/v${version}"; license = lib.licenses.mit; + mainProgram = "SkEditor"; maintainers = with lib.maintainers; [ eveeifyeve ]; }; } From b5394df77e04dd7d3a5139ec203e2b087bd377ee Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Fri, 8 Nov 2024 07:13:58 +0100 Subject: [PATCH 100/100] gh: 2.60.0 -> 2.61.0 --- pkgs/applications/version-management/gh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index 83781ea1cfcf..dbfbf72ccd5e 100644 --- a/pkgs/applications/version-management/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "gh"; - version = "2.60.0"; + version = "2.61.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-Tvyf58f/9bOUiUAG6R9nhOerZh5Yt3LyKx88oF3s0jI="; + hash = "sha256-zzcptg2hTQDRWFbC99q/Qy+Nk2vrhekYc5dMr3fjFD0="; }; - vendorHash = "sha256-nwGmYFWyAr34F4rmqFC3cK+fbUq6LRaqXhekx4Ab5sE="; + vendorHash = "sha256-b8HO4mevQcfX/VpJv1ZefXWAeXyhsy6074fvVNoH/8Y="; nativeBuildInputs = [ installShellFiles ];