From 0436d3fbc5d3888bd972a74c68dd19e71f7b8bb4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Jul 2023 04:04:51 +0000 Subject: [PATCH 001/110] ocamlPackages.ssl: 0.5.13 -> 0.6.0 --- pkgs/development/ocaml-modules/ssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix index 67e841ae1b31..14250c662833 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -10,7 +10,7 @@ buildDunePackage rec { pname = "ssl"; - version = "0.5.13"; + version = "0.6.0"; duneVersion = "3"; @@ -18,7 +18,7 @@ buildDunePackage rec { owner = "savonet"; repo = "ocaml-ssl"; rev = version; - sha256 = "sha256-Ws7QZOvZVy0QixMiBFJZEOnYzYlCWrZ1d95gOp/a5a0="; + sha256 = "sha256-zi5Ue6qOlLfsfPjzIwjjR+6ztSS2NwJmB1cCcVVC5TY="; }; nativeBuildInputs = [ pkg-config ]; From 6427a6b6228b8b683531f46f6ca079b575d5bcb5 Mon Sep 17 00:00:00 2001 From: Ionut Nechita Date: Sun, 30 Jul 2023 15:48:26 +0300 Subject: [PATCH 002/110] yandex-browser: 23.5.4.682-1 -> 23.7.1.1148-1 Description: - yandex-browser-beta is updated to: 23.7.1.1148-1 Change-Id: Ib5fbb8259034143c436125c25d1c3a4fa990c6c9 Signed-off-by: Ionut Nechita --- .../networking/browsers/yandex-browser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/yandex-browser/default.nix b/pkgs/applications/networking/browsers/yandex-browser/default.nix index adfb76f485e7..e7a9f8cf6804 100644 --- a/pkgs/applications/networking/browsers/yandex-browser/default.nix +++ b/pkgs/applications/networking/browsers/yandex-browser/default.nix @@ -51,11 +51,11 @@ stdenv.mkDerivation rec { pname = "yandex-browser"; - version = "23.5.4.682-1"; + version = "23.7.1.1148-1"; src = fetchurl { url = "http://repo.yandex.ru/yandex-browser/deb/pool/main/y/${pname}-beta/${pname}-beta_${version}_amd64.deb"; - sha256 = "sha256-ZhPX4K9huCO2uyjfUsWEkaspdvUurB7jNfUMqqIFO4U="; + sha256 = "sha256-SJbuT2MnsXcqOSk4xCUokseDotjbWgAnvwnfNPF9zi4="; }; nativeBuildInputs = [ From 3132d2406edadbc1a3f0f5dc13aaf7c285fe4263 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 6 Aug 2023 16:12:28 +1000 Subject: [PATCH 003/110] nixVersions.stable: 2.15 -> 2.17 --- pkgs/tools/package-management/nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 6ff28eb4e651..3feda09d9ec6 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -208,9 +208,9 @@ in lib.makeExtensible (self: ({ else nix; - stable = self.nix_2_15; + stable = self.nix_2_17; - unstable = self.nix_2_17; + unstable = self.stable; } // lib.optionalAttrs config.allowAliases { nix_2_4 = throw "nixVersions.nix_2_4 has been removed"; From b2c3198256d09a2f4081cb34368ac8ec31c63656 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 6 Aug 2023 16:21:28 +1000 Subject: [PATCH 004/110] nixos/nix-fallback-paths: 2.15.1 -> 2.17.0 https://releases.nixos.org/nix/nix-2.17.0/fallback-paths.nix --- nixos/modules/installer/tools/nix-fallback-paths.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 582334a5aeaf..10c37a46fdac 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,7 +1,7 @@ { - x86_64-linux = "/nix/store/ny9r65799s7xhp605bc2753sjvzkxrrs-nix-2.15.1"; - i686-linux = "/nix/store/ck55dz5klc7szi8rx9ghhm8gi2b5q5bw-nix-2.15.1"; - aarch64-linux = "/nix/store/cl0a02vr28913dgw98hrm45a4baqr3z1-nix-2.15.1"; - x86_64-darwin = "/nix/store/wq228jdbz16pp2lnxf32n8dv27pw53p8-nix-2.15.1"; - aarch64-darwin = "/nix/store/x11cpsjg4q236msfz5scc325pfp9xy64-nix-2.15.1"; + x86_64-linux = "/nix/store/3wqasl97rjiza3vd7fxjnvli2w9l30mk-nix-2.17.0"; + i686-linux = "/nix/store/z360xswxfx55pmm1fng3hw748rbs0kkj-nix-2.17.0"; + aarch64-linux = "/nix/store/9670sxa916xmv8n1kqs7cdvmnsrhrdjv-nix-2.17.0"; + x86_64-darwin = "/nix/store/2rdbky9j8hc3mbgl6pnda4hkjllyfwnn-nix-2.17.0"; + aarch64-darwin = "/nix/store/jl9qma14fb4zk9lq1k0syw2k9qm2gqjw-nix-2.17.0"; } From d40a76e3cc2a3f8911acd11a2de2b1af90f897d3 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 6 Aug 2023 16:16:39 +1000 Subject: [PATCH 005/110] nixos-option: pin to nix_2_15 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a76ab777972..aa6610a623ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40314,7 +40314,9 @@ with pkgs; nix-melt = callPackage ../tools/nix/nix-melt { }; - nixos-option = callPackage ../tools/nix/nixos-option { }; + nixos-option = callPackage ../tools/nix/nixos-option { + nix = nixVersions.nix_2_15; + }; nix-pin = callPackage ../tools/package-management/nix-pin { }; From 1fe4bdb54267f540388220dd8591ae77487872a8 Mon Sep 17 00:00:00 2001 From: Dominik Ritter Date: Mon, 7 Aug 2023 08:00:56 +0200 Subject: [PATCH 006/110] enpass: update update script --- pkgs/tools/security/enpass/update_script.py | 149 +++++++++----------- 1 file changed, 64 insertions(+), 85 deletions(-) mode change 100644 => 100755 pkgs/tools/security/enpass/update_script.py diff --git a/pkgs/tools/security/enpass/update_script.py b/pkgs/tools/security/enpass/update_script.py old mode 100644 new mode 100755 index f8ec715cb5e4..ab0b6ce3f48e --- a/pkgs/tools/security/enpass/update_script.py +++ b/pkgs/tools/security/enpass/update_script.py @@ -1,95 +1,74 @@ -from __future__ import print_function - - -import argparse -import bz2 -import email +#! /usr/bin/env nix-shell +#! nix-shell -i python3 -p python3 python3.pkgs.packaging python3.pkgs.requests +import gzip import json import logging +import pathlib +import re +import subprocess +import sys -from itertools import product -from operator import itemgetter +from packaging import version +import requests -import attr -import pkg_resources +logging.basicConfig(stream=sys.stdout, level=logging.DEBUG) -from pathlib2 import Path -from requests import Session -from six.moves.urllib_parse import urljoin +current_path = pathlib.Path(__file__).parent +DATA_JSON = current_path.joinpath("data.json").resolve() +logging.debug(f"Path to version file: {DATA_JSON}") +last_new_version = None + +with open(DATA_JSON, "r") as versions_file: + versions = json.load(versions_file) + +def find_latest_version(arch): + CHECK_URL = f'https://apt.enpass.io/dists/stable/main/binary-{arch}/Packages.gz' + packages = gzip.decompress(requests.get(CHECK_URL).content).decode() + + # Loop every package to find the newest one! + version_selector = re.compile("Version: (?P.+)") + path_selector = re.compile("Filename: (?P.+)") + hash_selector = re.compile("SHA256: (?P.+)") + last_version = version.parse("0") + for package in packages.split("\n\n"): + matches = version_selector.search(package) + matched_version = matches.group('version') if matches and matches.group('version') else "0" + parsed_version = version.parse(matched_version) + if parsed_version > last_version: + path = path_selector.search(package).group('path') + sha256 = hash_selector.search(package).group('sha256') + last_version = parsed_version + return {"path": path, "sha256": sha256, "version": matched_version} + +for arch in versions.keys(): + current_version = versions[arch]['version'] + logging.info(f"Current Version for {arch} is {current_version}") + new_version = find_latest_version(arch) + + if not new_version or new_version['version'] == current_version: + continue + + last_current_version = current_version + last_new_version = new_version + logging.info(f"Update found ({arch}): enpass: {current_version} -> {new_version['version']}") + versions[arch]['path'] = new_version['path'] + versions[arch]['sha256'] = new_version['sha256'] + versions[arch]['version'] = new_version['version'] -@attr.s -class ReleaseElement(object): - sha256 = attr.ib(repr=False) - size = attr.ib(convert=int) - path = attr.ib() +if not last_new_version: + logging.info('#### No update found ####') + sys.exit(0) -log = logging.getLogger('enpass.updater') +# write new versions back +with open(DATA_JSON, "w") as versions_file: + json.dump(versions, versions_file, indent=2) + versions_file.write("\n") +# Commit the result: +logging.info("Committing changes...") +commit_message = f"enpass: {last_current_version} -> {last_new_version['version']}" +subprocess.run(['git', 'add', DATA_JSON], check=True) +subprocess.run(['git', 'commit', '--file=-'], input=commit_message.encode(), check=True) -parser = argparse.ArgumentParser() -parser.add_argument('--repo') -parser.add_argument('--target', type=Path) - - -session = Session() - - -def parse_bz2_msg(msg): - msg = bz2.decompress(msg) - if '\n\n' in msg: - parts = msg.split('\n\n') - return list(map(email.message_from_string, parts)) - return email.message_from_string(msg) - - -def fetch_meta(repo, name, parse=email.message_from_string, split=False): - url = urljoin(repo, 'dists/stable', name) - response = session.get("{repo}/dists/stable/{name}".format(**locals())) - return parse(response.content) - - -def fetch_filehashes(repo, path): - meta = fetch_meta(repo, path, parse=parse_bz2_msg) - for item in meta: - yield { - 'version': pkg_resources.parse_version(str(item['Version'])), - 'path': item['Filename'], - 'sha256': item['sha256'], - } - - -def fetch_archs(repo): - m = fetch_meta(repo, 'Release') - - architectures = m['Architectures'].split() - elements = [ReleaseElement(*x.split()) for x in m['SHA256'].splitlines()] - elements = [x for x in elements if x.path.endswith('bz2')] - - for arch, elem in product(architectures, elements): - if arch in elem.path: - yield arch, max(fetch_filehashes(repo, elem.path), - key=itemgetter('version')) - - -class OurVersionEncoder(json.JSONEncoder): - def default(self, obj): - # the other way around to avoid issues with - # newer setuptools having strict/legacy versions - if not isinstance(obj, (dict, str)): - return str(obj) - return json.JSONEncoder.default(self, obj) - - -def main(repo, target): - logging.basicConfig(level=logging.DEBUG) - with target.open(mode='wb') as fp: - json.dump( - dict(fetch_archs(repo)), fp, - cls=OurVersionEncoder, - indent=2, - sort_keys=True) - - -opts = parser.parse_args() -main(opts.repo, opts.target) +logging.info("Done.") From a76f019d9ccbc912cc5bfbee39fdb6a572fc475a Mon Sep 17 00:00:00 2001 From: Indexyz Date: Mon, 7 Aug 2023 22:14:34 +0800 Subject: [PATCH 007/110] moonraker: unstable-2022-11-18 -> unstable-2023-08-03 --- pkgs/servers/moonraker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/moonraker/default.nix b/pkgs/servers/moonraker/default.nix index 73595e6909ce..ed2e988d8a66 100644 --- a/pkgs/servers/moonraker/default.nix +++ b/pkgs/servers/moonraker/default.nix @@ -20,13 +20,13 @@ let ]); in stdenvNoCC.mkDerivation rec { pname = "moonraker"; - version = "unstable-2022-11-18"; + version = "unstable-2023-08-03"; src = fetchFromGitHub { owner = "Arksine"; repo = "moonraker"; - rev = "362bc1a3d3ad397416f7fc48b8efe33837428b90"; - sha256 = "sha256-cebRHOx2hg470jM1CoQAk13Whv+KN2qx97BTlpjxSZg="; + rev = "fe120952ee06607d039af8f461028e9f5b817395"; + sha256 = "sha256-TyhpMHu06YoaV5tZGBcYulUrABW6OFYZLyCoZLRmaUU="; }; nativeBuildInputs = [ makeWrapper ]; From af1451de26f430e2bdfd52a4c2584fc5e0117e65 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Aug 2023 09:23:33 +0200 Subject: [PATCH 008/110] python311Packages.pytest-examples: 0.0.9 -> 0.0.10 Diff: https://github.com/pydantic/pytest-examples/compare/refs/tags/v0.0.9...v0.0.10 Changelog: https://github.com/pydantic/pytest-examples/releases/tag/v0.0.10 --- pkgs/development/python-modules/pytest-examples/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-examples/default.nix b/pkgs/development/python-modules/pytest-examples/default.nix index 37e7c2fe6bfe..212938df20b6 100644 --- a/pkgs/development/python-modules/pytest-examples/default.nix +++ b/pkgs/development/python-modules/pytest-examples/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytest-examples"; - version = "0.0.9"; + version = "0.0.10"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pydantic"; repo = "pytest-examples"; rev = "refs/tags/v${version}"; - hash = "sha256-ecxSLbPnHdL60vlc7EjKmw5rATTePqJCa5QIdyxevv0="; + hash = "sha256-jCxOGDJlFkMH9VtaaPsE5zt+p3Z/mrVzhdNSI51/nVM="; }; postPatch = '' From 2e4bd78a4690654e15f6d0345170c80fc5d60021 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Aug 2023 09:19:27 +0000 Subject: [PATCH 009/110] python310Packages.pypiserver: 1.5.1 -> 1.5.2 --- pkgs/development/python-modules/pypiserver/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pypiserver/default.nix b/pkgs/development/python-modules/pypiserver/default.nix index 74ddf37e236d..6e2c02274159 100644 --- a/pkgs/development/python-modules/pypiserver/default.nix +++ b/pkgs/development/python-modules/pypiserver/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "pypiserver"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - hash = "sha256-1tV3pVEC5sIjT0tjbujU7l41Jx7PQ1dCn4B1r94C9xE="; + rev = "refs/tags/v${version}"; + hash = "sha256-jub+iVL/YeGaG9Vzqyyfc4qFi0cR+7xrzuXNHL5W4p4="; }; nativeBuildInputs = [ setuptools-git ]; From 0884271c8dc98d4aad3b7f56d36cd1756efdf12a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Aug 2023 18:22:28 +0200 Subject: [PATCH 010/110] python310Packages.pypiserver: add changelog to meta - add optional dependencies - add format - disable on unsupported Python releases --- .../python-modules/pypiserver/default.nix | 45 ++++++++++++++----- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pypiserver/default.nix b/pkgs/development/python-modules/pypiserver/default.nix index 6e2c02274159..e892a8227c3d 100644 --- a/pkgs/development/python-modules/pypiserver/default.nix +++ b/pkgs/development/python-modules/pypiserver/default.nix @@ -1,17 +1,22 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, lib , passlib , pytestCheckHook +, pythonOlder , setuptools , setuptools-git , twine +, watchdog , webtest }: buildPythonPackage rec { pname = "pypiserver"; version = "1.5.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = pname; @@ -20,38 +25,58 @@ buildPythonPackage rec { hash = "sha256-jub+iVL/YeGaG9Vzqyyfc4qFi0cR+7xrzuXNHL5W4p4="; }; - nativeBuildInputs = [ setuptools-git ]; + nativeBuildInputs = [ + setuptools-git + ]; - propagatedBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ + setuptools + ]; + + passthru.optional-dependencies = { + passlib = [ + passlib + ]; + cache = [ + watchdog + ]; + }; preCheck = '' export HOME=$TMPDIR ''; nativeCheckInputs = [ - passlib pytestCheckHook twine webtest - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); disabledTests = [ - # fails to install the package + # Fails to install the package "test_hash_algos" "test_pip_install_authed_succeeds" "test_pip_install_open_succeeds" + "test_pip_install_authed_fails" + # Tests want to tests upload + "upload" + "register" + "test_partial_authed_open_download" ]; disabledTestPaths = [ - # requires docker service running + # Test requires docker service running "docker/test_docker.py" ]; - pythonImportsCheck = [ "pypiserver" ]; + pythonImportsCheck = [ + "pypiserver" + ]; meta = with lib; { - homepage = "https://github.com/pypiserver/pypiserver"; description = "Minimal PyPI server for use with pip/easy_install"; + homepage = "https://github.com/pypiserver/pypiserver"; + changelog = "https://github.com/pypiserver/pypiserver/releases/tag/v${version}"; license = with licenses; [ mit zlib ]; maintainers = with maintainers; [ austinbutler ]; }; From ef53a1651c985eca87e59ea63efd9b8699ce16a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Aug 2023 05:25:36 +0000 Subject: [PATCH 011/110] python310Packages.django-debug-toolbar: 3.8.1 -> 4.1 --- .../python-modules/django-debug-toolbar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-debug-toolbar/default.nix b/pkgs/development/python-modules/django-debug-toolbar/default.nix index 9f54b9b9ede5..9f6b45f3a776 100644 --- a/pkgs/development/python-modules/django-debug-toolbar/default.nix +++ b/pkgs/development/python-modules/django-debug-toolbar/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "django-debug-toolbar"; - version = "3.8.1"; + version = "4.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "jazzband"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-GlEw25wem8iwwm3rYLk6TFEAIzC1pYjpSHdAkHwtFcE="; + hash = "sha256-UgnWA2JicL6xsnIF5WaWCRIdXEJbwiE89tqiueczEfE="; }; nativeBuildInputs = [ From 75bbe5b0ded8a007cbf4c9a3ef0f3d715a500a90 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Aug 2023 06:05:21 +0000 Subject: [PATCH 012/110] awscli2: 2.13.5 -> 2.13.7 --- pkgs/tools/admin/awscli2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index fa18015c8ff5..130cdb769934 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -24,14 +24,14 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.13.5"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.13.7"; # N.B: if you change this, check if overrides are still up-to-date format = "pyproject"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - hash = "sha256-gtzRHNEReCKzGDdiwS5kngcJYp5oAHmhnOPl/uTyxvU="; + hash = "sha256-SQ9ggHSpQioptic5qjrhCB63t9pld7KGAeCNtq4OJyQ="; }; patches = [ From ff84fed152eb5f6444fd9c1c1ccb2f31ca1c673b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Aug 2023 07:42:19 +0000 Subject: [PATCH 013/110] python310Packages.cheetah3: 3.3.1 -> 3.3.2 --- pkgs/development/python-modules/cheetah3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cheetah3/default.nix b/pkgs/development/python-modules/cheetah3/default.nix index c01b42c64b83..24e3194d80c0 100644 --- a/pkgs/development/python-modules/cheetah3/default.nix +++ b/pkgs/development/python-modules/cheetah3/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "cheetah3"; - version = "3.3.1"; + version = "3.3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "CheetahTemplate3"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-op8CwYISD2Gfsh0Olr8H07yvaT1maKyizb/IN9ZHwmQ="; + hash = "sha256-okQz1wM3k43okKcZDRgHAnn5ScL0Pe1OtUvDBScEamY="; }; doCheck = false; # Circular dependency From 76f47d1546128edae25804084e8995a1d7134c63 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Aug 2023 13:36:00 +0000 Subject: [PATCH 014/110] python310Packages.pyaml: 21.10.1 -> 23.7.0 --- pkgs/development/python-modules/pyaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix index 444b66549af6..96ae8df32df0 100644 --- a/pkgs/development/python-modules/pyaml/default.nix +++ b/pkgs/development/python-modules/pyaml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pyaml"; - version = "21.10.1"; + version = "23.7.0"; src = fetchPypi { inherit pname version; - sha256 = "c6519fee13bf06e3bb3f20cacdea8eba9140385a7c2546df5dbae4887f768383"; + sha256 = "sha256-DFELu4k4MJQA4LHkesFv2Q5W1lKAWpNBcSh4ZxjzNUY="; }; propagatedBuildInputs = [ From e9791e85ecf14a2db5081637795592479b7866f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Aug 2023 16:45:47 +0000 Subject: [PATCH 015/110] python310Packages.cupy: 12.1.0 -> 12.2.0 --- pkgs/development/python-modules/cupy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 656447e2ef4c..e5de149fca14 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -17,13 +17,13 @@ let inherit (cudaPackages) cudatoolkit cudnn cutensor nccl; in buildPythonPackage rec { pname = "cupy"; - version = "12.1.0"; + version = "12.2.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9tMZic2y2WWB2hKCLiixAvKeJUQnGVwgF+rDJ4abcyA="; + hash = "sha256-+V/9Cv6sthewSP4Cjt4HuX3J6VrKFhCgIrHz0gqaAn4="; }; # See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Seting both From 879e291c915691a16cef037d10b1493ea58ab3c5 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 6 Aug 2023 16:27:26 +1000 Subject: [PATCH 016/110] rnix-lsp: pin to nix_2_15 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa6610a623ec..c26d29ca48b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18264,7 +18264,9 @@ with pkgs; pylyzer = callPackage ../development/tools/language-servers/pylyzer { }; - rnix-lsp = callPackage ../development/tools/language-servers/rnix-lsp { }; + rnix-lsp = callPackage ../development/tools/language-servers/rnix-lsp { + nix = nixVersions.nix_2_15; + }; ruff-lsp = python3Packages.callPackage ../development/tools/language-servers/ruff-lsp { }; From fa774ca4e330470197c49e72c48008e652ea4080 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 7 Aug 2023 09:29:01 +1000 Subject: [PATCH 017/110] nurl: use nix stable --- pkgs/tools/misc/nurl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/nurl/default.nix b/pkgs/tools/misc/nurl/default.nix index 16fec1445a57..e0af2ff638dd 100644 --- a/pkgs/tools/misc/nurl/default.nix +++ b/pkgs/tools/misc/nurl/default.nix @@ -7,7 +7,7 @@ , darwin , gitMinimal , mercurial -, nixVersions +, nix }: rustPlatform.buildRustPackage rec { @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' wrapProgram $out/bin/nurl \ - --prefix PATH : ${lib.makeBinPath [ gitMinimal mercurial nixVersions.unstable ]} + --prefix PATH : ${lib.makeBinPath [ gitMinimal mercurial nix ]} installManPage artifacts/nurl.1 installShellCompletion artifacts/nurl.{bash,fish} --zsh artifacts/_nurl ''; From 34fe16d3a28b491b5e672907ab535923a0d19f72 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 10 Aug 2023 13:23:14 +0200 Subject: [PATCH 018/110] python310Packages.django-debug-toolbar: update disabled --- .../python-modules/django-debug-toolbar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-debug-toolbar/default.nix b/pkgs/development/python-modules/django-debug-toolbar/default.nix index 9f6b45f3a776..c57e2911daf8 100644 --- a/pkgs/development/python-modules/django-debug-toolbar/default.nix +++ b/pkgs/development/python-modules/django-debug-toolbar/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { version = "4.1"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "jazzband"; @@ -59,5 +59,5 @@ buildPythonPackage rec { changelog = "https://django-debug-toolbar.readthedocs.io/en/latest/changes.html"; license = licenses.bsd3; maintainers = with maintainers; [ yuu ]; -}; + }; } From ae4e2e8676af606cb5c38f9f51e21f6053e41f10 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Thu, 10 Aug 2023 22:47:13 -0300 Subject: [PATCH 019/110] emacs28-macport: rename from emacs-macport Also, move emacsMacport to aliases.nix. --- pkgs/applications/editors/emacs/default.nix | 2 +- pkgs/applications/editors/emacs/sources.nix | 2 +- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index b2edc8597013..8e737279f413 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -54,7 +54,7 @@ lib.makeScope pkgs.newScope (self: withPgtk = true; }; - emacs-macport = callPackage (self.sources.emacs-macport) { + emacs28-macport = callPackage (self.sources.emacs28-macport) { inherit gconf; inherit (pkgs.darwin) sigtool; diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index 440184d959e0..756dd804c20e 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -62,7 +62,7 @@ in meta = mainlineMeta; }; - emacs-macport = import ./generic.nix { + emacs28-macport = import ./generic.nix { pname = "emacs-mac"; version = "28.2"; variant = "macport"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 580a578731c5..04273984e81d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -460,6 +460,7 @@ mapAliases ({ emacs28NativeComp = emacs28; # Added 2022-06-08 emacs28Packages = emacs28.pkgs; # Added 2021-10-04 emacs28WithPackages = emacs28.pkgs.withPackages; # Added 2021-10-04 + emacsMacport = emacs-macport; # Added 2023-08-10 emacsNativeComp = emacs28NativeComp; # Added 2022-06-08 emacsPackagesGen = throw "'emacsPackagesGen' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2022-02-22 emacsPackagesNg = emacs.pkgs; # Added 2019-08-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 080d6dc5ba03..f7480e9a59ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31121,10 +31121,10 @@ with pkgs; emacs29-gtk3 emacs29-nox emacs29-pgtk - emacs-macport + emacs28-macport ; - emacsMacport = emacs-macport; + emacs-macport = emacs28-macport; emacs = emacs28; emacs-gtk = emacs28-gtk3; emacs-nox = emacs28-nox; From 7e445b6d725fad064012ecf0b76aac68d91186f3 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Thu, 10 Aug 2023 23:14:00 -0300 Subject: [PATCH 020/110] emacs: factor meta --- pkgs/applications/editors/emacs/sources.nix | 39 ++++++++++++--------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index 756dd804c20e..0f8d130981ef 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -4,9 +4,13 @@ }: let - mainlineMeta = { - homepage = "https://www.gnu.org/software/emacs/"; - description = "The extensible, customizable GNU text editor"; + metaFor = variant: version: rev: { + homepage = { + "mainline" = "https://www.gnu.org/software/emacs/"; + "macport" = "https://bitbucket.org/mituharu/emacs-mac/"; + }.${variant}; + description = "The extensible, customizable GNU text editor" + + lib.optionalString (variant == "macport") " - macport variant"; longDescription = '' GNU Emacs is an extensible, customizable text editor—and more. At its core is an interpreter for Emacs Lisp, a dialect of the Lisp programming @@ -21,7 +25,15 @@ let functionality, including a project planner, mail and news reader, debugger interface, calendar, and more. Many of these extensions are distributed with GNU Emacs; others are available separately. + '' + lib.optionalString (variant == "macport") '' + + This release is built from Mitsuharu Yamamoto's patched source code + tailored for macOS. ''; + changelog = { + "mainline" = "https://www.gnu.org/savannah-checkouts/gnu/emacs/news/NEWS.${version}"; + "macport" = "https://bitbucket.org/mituharu/emacs-mac/raw/${rev}/NEWS-mac"; + }.${variant}; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ AndersonTorres @@ -31,7 +43,10 @@ let lovek323 matthewbauer ]; - platforms = lib.platforms.all; + platforms = { + "mainline" = lib.platforms.all; + "macport" = lib.platforms.darwin; + }.${variant}; mainProgram = "emacs"; }; in @@ -46,7 +61,7 @@ in hash = "sha256-4oSLcUDR0MOEt53QOiZSVU8kPJ67GwugmBxdX3F15Ag="; }; - meta = mainlineMeta; + meta = metaFor "mainline" "28.2" "28.2"; }; emacs29 = import ./generic.nix { @@ -59,7 +74,7 @@ in hash = "sha256-p0lBSKsHrFwYTqO5UVIF/PgiqwdhYQE4oUVcPtd+gsU="; }; - meta = mainlineMeta; + meta = metaFor "mainline" "29.1-rc1" "29.1-rc1"; }; emacs28-macport = import ./generic.nix { @@ -73,16 +88,6 @@ in hash = "sha256-Ne2jQ2nVLNiQmnkkOXVc5AkLVkTpm8pFC7VNY2gQjPE="; }; - meta = { - homepage = "https://bitbucket.org/mituharu/emacs-mac/"; - description = mainlineMeta.description + " - with macport patches"; - longDescription = mainlineMeta.longDescription + '' - - This release is built from Mitsuharu Yamamoto's patched source code - tailoired for MacOS X. - ''; - inherit (mainlineMeta) license maintainers; - platforms = lib.platforms.darwin; - }; + meta = metaFor "macport" "28.2" "emacs-28.2-mac-9.1"; }; } From 05d277b11e8b32ce8a05387ea4372716b325fcf1 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Thu, 10 Aug 2023 23:19:12 -0300 Subject: [PATCH 021/110] emacs29: 29.1-rc1 -> 29.1 --- pkgs/applications/editors/emacs/sources.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index 0f8d130981ef..22ecbe778851 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -66,15 +66,15 @@ in emacs29 = import ./generic.nix { pname = "emacs"; - version = "29.1-rc1"; + version = "29.1"; variant = "mainline"; src = fetchFromSavannah { repo = "emacs"; - rev = "29.1-rc1"; - hash = "sha256-p0lBSKsHrFwYTqO5UVIF/PgiqwdhYQE4oUVcPtd+gsU="; + rev = "29.1"; + hash = "sha256-3HDCwtOKvkXwSULf3W7YgTz4GV8zvYnh2RrL28qzGKg="; }; - meta = metaFor "mainline" "29.1-rc1" "29.1-rc1"; + meta = metaFor "mainline" "29.1" "29.1"; }; emacs28-macport = import ./generic.nix { From 2160abc3eddbe826b08bcffdb3758763b093f254 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Thu, 10 Aug 2023 23:24:49 -0300 Subject: [PATCH 022/110] emacs29-macport: init at 29.1 --- pkgs/applications/editors/emacs/default.nix | 9 +++++++++ pkgs/applications/editors/emacs/sources.nix | 15 +++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 25 insertions(+) diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 8e737279f413..fe3c5d9ec512 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -62,4 +62,13 @@ lib.makeScope pkgs.newScope (self: AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit Quartz QuartzCore WebKit; }; + + emacs29-macport = callPackage (self.sources.emacs29-macport) { + inherit gconf; + + inherit (pkgs.darwin) sigtool; + inherit (pkgs.darwin.apple_sdk.frameworks) + AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit Quartz + QuartzCore WebKit; + }; }) diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index 22ecbe778851..b9b18a98ac88 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -90,4 +90,19 @@ in meta = metaFor "macport" "28.2" "emacs-28.2-mac-9.1"; }; + + emacs29-macport = import ./generic.nix { + pname = "emacs-mac"; + version = "29.1"; + variant = "macport"; + + src = fetchFromBitbucket { + owner = "mituharu"; + repo = "emacs-mac"; + rev = "emacs-29.1-mac-10.0"; + hash = "sha256-TE829qJdPjeOQ+kD0SfyO8d5YpJjBge/g+nScwj+XVU="; + }; + + meta = metaFor "macport" "29.1" "emacs-29.1-mac-10.0"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7480e9a59ca..277db155304a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31122,6 +31122,7 @@ with pkgs; emacs29-nox emacs29-pgtk emacs28-macport + emacs29-macport ; emacs-macport = emacs28-macport; From 46865e7ab83e93a676dfd52bec3c4c591968ee09 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Thu, 10 Aug 2023 23:26:40 -0300 Subject: [PATCH 023/110] rl-2311: mention emacs-29 update Co-authored-by: Atemu Co-authored-by: adisbladis Co-authored-by: asymmetric --- nixos/doc/manual/release-notes/rl-2311.section.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index d87d3b5c92f0..b8b052a44f29 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -136,6 +136,10 @@ - `pharo` has been updated to latest stable (PharoVM 10.0.5), which is compatible with the latest stable and oldstable images (Pharo 10 and 11). The VM in question is the 64bit Spur. The 32bit version has been dropped due to lack of maintenance. The Cog VM has been deleted because it is severily outdated. Finally, the `pharo-launcher` package has been deleted because it was not compatible with the newer VM, and due to lack of maintenance. +- Emacs mainline version 29 was introduced. This new version includes many major additions, most notably `tree-sitter` support (enabled by default) and the pgtk variant (useful for Wayland users), which is available under the attribute `emacs29-pgtk`. + +- Emacs macport version 29 was introduced. + ## Other Notable Changes {#sec-release-23.11-notable-changes} - The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration. From 56d038d8f9605a410d7c1f6029ffbaa0aeb57a21 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 11 Aug 2023 18:20:38 +0800 Subject: [PATCH 024/110] pantheon.gala: 7.1.1 -> 7.1.2 https://github.com/elementary/gala/releases/tag/7.1.2 --- pkgs/desktops/pantheon/desktop/gala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 745f8b6c0149..ebf99d6ed0fa 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "7.1.1"; + version = "7.1.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-s63znprGrMvitefAKlbL3r1s0kbo7NA9bhrNH8w0h2o="; + sha256 = "sha256-g+Zcdl6SJ4uO6I1x3Ru6efZkf+O3UaW790n/zxmGkHU="; }; patches = [ From ec07684718da11035737a32eca5f65f8694ad937 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 11 Aug 2023 18:22:13 +0800 Subject: [PATCH 025/110] pantheon.elementary-videos: 2.9.1 -> 3.0.0 https://github.com/elementary/videos/releases/tag/3.0.0 --- .../apps/elementary-videos/default.nix | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index 7bdcd1dbac98..6411971fdb05 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -6,40 +6,34 @@ , meson , ninja , vala -, python3 , gtk3 , granite , libgee , libhandy -, clutter-gst -, clutter-gtk , gst_all_1 , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "elementary-videos"; - version = "2.9.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "videos"; rev = version; - sha256 = "sha256-G961ndONwHiqdeO26Ulxkg71ByfdFMAV35VFzu4TQ3M="; + sha256 = "sha256-O98478E3NlY2NYqjyy8mcXZ3lG+wIV+VrPzdzOp44yA="; }; nativeBuildInputs = [ meson ninja pkg-config - python3 vala wrapGAppsHook ]; buildInputs = [ - clutter-gst - clutter-gtk granite gtk3 libgee @@ -48,16 +42,12 @@ stdenv.mkDerivation rec { gst-libav gst-plugins-bad gst-plugins-base - gst-plugins-good + # https://github.com/elementary/videos/issues/356 + (gst-plugins-good.override { gtkSupport = true; }) gst-plugins-ugly gstreamer ]); - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - passthru = { updateScript = nix-update-script { }; }; From 82ac97f610f58ce58d339d90e105848494a3b1ed Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 11 Aug 2023 18:23:51 +0800 Subject: [PATCH 026/110] pantheon.elementary-onboarding: 7.1.0 -> 7.2.0 https://github.com/elementary/onboarding/releases/tag/7.2.0 --- .../desktop/elementary-onboarding/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix index e5a90d8f4f0a..439d434488ef 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix @@ -5,7 +5,6 @@ , meson , ninja , pkg-config -, python3 , vala , wrapGAppsHook4 , appcenter @@ -19,20 +18,19 @@ stdenv.mkDerivation rec { pname = "elementary-onboarding"; - version = "7.1.0"; + version = "7.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = "onboarding"; rev = version; - sha256 = "sha256-OWALEcVOOh7wjEEvysd+MQhB/iK3105XCIVp5pklMwY="; + sha256 = "sha256-5vEKQUGg5KQSheM6tSK8uieEfCqlY6pABfPb/333FHU="; }; nativeBuildInputs = [ meson ninja pkg-config - python3 vala wrapGAppsHook4 ]; @@ -47,11 +45,6 @@ stdenv.mkDerivation rec { libgee ]; - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - passthru = { updateScript = nix-update-script { }; }; From 3e7a9b2adbd463a57e42e26cb728d222c08fa50e Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Fri, 11 Aug 2023 16:06:15 +0000 Subject: [PATCH 027/110] rofi-bluetooth: add meta.mainProgram Related PR: NixOS#246386 --- pkgs/applications/misc/rofi-bluetooth/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/rofi-bluetooth/default.nix b/pkgs/applications/misc/rofi-bluetooth/default.nix index d9824ca9977a..01307494340c 100644 --- a/pkgs/applications/misc/rofi-bluetooth/default.nix +++ b/pkgs/applications/misc/rofi-bluetooth/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/nickclyde/rofi-bluetooth"; license = licenses.gpl3Only; maintainers = with maintainers; [ MoritzBoehme ]; + mainProgram = "rofi-bluetooth"; platforms = platforms.linux; }; }) From 75529ecc7f0b06ebead54e45032e3279efa52b91 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Fri, 11 Aug 2023 16:06:15 +0000 Subject: [PATCH 028/110] i3lock: add meta.mainProgram Related PR: NixOS#246386 --- pkgs/applications/window-managers/i3/lock.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index 2c0a481676ff..b8dffa259d76 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://i3wm.org/i3lock/"; maintainers = with maintainers; [ malyn domenkozar ]; + mainProgram = "i3lock"; license = licenses.bsd3; platforms = platforms.all; }; From df1b21ab4b401e1ec8c53df5086984c692258fda Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Aug 2023 03:23:07 +0000 Subject: [PATCH 029/110] minizip-ng: 4.0.0 -> 4.0.1 --- pkgs/development/libraries/minizip-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/minizip-ng/default.nix b/pkgs/development/libraries/minizip-ng/default.nix index 385b5707754f..33126eeb60d6 100644 --- a/pkgs/development/libraries/minizip-ng/default.nix +++ b/pkgs/development/libraries/minizip-ng/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "minizip-ng"; - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "zlib-ng"; repo = finalAttrs.pname; rev = finalAttrs.version; - sha256 = "sha256-YgBOsznV1JtnpLUJeqZ06zvdB3tNbOlFhhLd1pMJhEM="; + sha256 = "sha256-3bCGZupdJWcwp2d+XeqKZG3GxzXFm1UftV/PiN0u5iA="; }; nativeBuildInputs = [ cmake pkg-config ]; From 371b0a46ce9e837323b5e0bcd6953a644fd09400 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Aug 2023 04:55:23 +0000 Subject: [PATCH 030/110] igrep: 1.1.0 -> 1.2.0 --- pkgs/tools/text/igrep/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/igrep/default.nix b/pkgs/tools/text/igrep/default.nix index 1e17cda75d5f..34f9202cfa05 100644 --- a/pkgs/tools/text/igrep/default.nix +++ b/pkgs/tools/text/igrep/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "igrep"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "konradsz"; repo = "igrep"; rev = "v${version}"; - sha256 = "sha256-g6DY3+HwBNQ+jxByXyTJK5CjAaC48FpmsDf1qGGO/Lk="; + sha256 = "sha256-L5mHuglU0CvTi02pbR8xfezBoH8L/DS+7jgvYvb4yro="; }; - cargoHash = "sha256-7cSUIwWyWPxFDuRWplidbI93zbBV84T7e4Q//Uwj6N4="; + cargoHash = "sha256-k63tu5Ffus4z0yd8vQ79q4+tokWAXD05Pvv9JByfnDg="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From 01cde27a07c747f50a175697008bc34bc5f05ae0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 12 Aug 2023 07:24:47 +0200 Subject: [PATCH 031/110] mypy: set mainProgram --- pkgs/development/python-modules/mypy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 2623f5c376a6..0528aeaec52b 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -125,6 +125,7 @@ buildPythonPackage rec { description = "Optional static typing for Python"; homepage = "https://www.mypy-lang.org"; license = licenses.mit; + mainProgram = "mypy"; maintainers = with maintainers; [ martingms lnl7 ]; }; } From c3846468c77bf0de9f9faf695d35ce6f63e6a7c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Aug 2023 08:22:20 +0000 Subject: [PATCH 032/110] kustomize: 5.1.0 -> 5.1.1 --- pkgs/development/tools/kustomize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index ef2cdafea325..6f62f7d86c92 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kustomize"; - version = "5.1.0"; + version = "5.1.1"; ldflags = let t = "sigs.k8s.io/kustomize/api/provenance"; in [ @@ -15,7 +15,7 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - hash = "sha256-nYndDoaCMyIvMlhHawgcv8WCCa3HYgAcF+3QxyYxub4="; + hash = "sha256-XtpMws2o3h19PsRJXKg+y5/Zk3bc6mJ4O1LLZ40ioTM="; }; # avoid finding test and development commands From fc6c44d053ab21ffec4c833d67f1f2395e152a57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Aug 2023 08:35:07 +0000 Subject: [PATCH 033/110] cglm: 0.9.0 -> 0.9.1 --- pkgs/development/libraries/cglm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cglm/default.nix b/pkgs/development/libraries/cglm/default.nix index 44d86c7b5f97..f9bc0ebb9083 100644 --- a/pkgs/development/libraries/cglm/default.nix +++ b/pkgs/development/libraries/cglm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cglm"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "recp"; repo = "cglm"; rev = "v${version}"; - sha256 = "sha256-V6qX6f1pETjDHVu+VJXRDcKKiCBYuQnh8Bz48HRyRR8="; + sha256 = "sha256-qOPOJ+h1bq5yKkP3ZNeZnRwiOMSgS7bxTk7s/5tREQw="; }; nativeBuildInputs = [ cmake ]; From 61910e816cfa1b0bf95f2827fe9fbf8106fb9e3b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Aug 2023 10:33:08 +0000 Subject: [PATCH 034/110] dblab: 0.20.0 -> 0.21.0 --- pkgs/development/tools/database/dblab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/dblab/default.nix b/pkgs/development/tools/database/dblab/default.nix index 0dea7530e426..cc4f6a9cfd8e 100644 --- a/pkgs/development/tools/database/dblab/default.nix +++ b/pkgs/development/tools/database/dblab/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "dblab"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "danvergara"; repo = "dblab"; rev = "v${version}"; - hash = "sha256-Wg7BujAf7pTek+WPiVONRof5rYfKixXkU+OS/04m3zY="; + hash = "sha256-3Bmus2yVTwvy0CpoNE1mzVvocpBnRoI11Sf+x2JXhgM="; }; vendorHash = "sha256-vf0CeiLBVqMGV2oqxRHzhvL7SoT9zcg8P5c63z3UR3g="; From 4266da6e72f0eea1e2042166f69b644ffac38172 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Aug 2023 11:00:24 +0000 Subject: [PATCH 035/110] protoc-gen-twirp_php: 0.9.1 -> 0.10.0 --- pkgs/development/tools/protoc-gen-twirp_php/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/protoc-gen-twirp_php/default.nix b/pkgs/development/tools/protoc-gen-twirp_php/default.nix index 1fb1dbfbf791..30b2ff3ce78d 100644 --- a/pkgs/development/tools/protoc-gen-twirp_php/default.nix +++ b/pkgs/development/tools/protoc-gen-twirp_php/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protoc-gen-twirp_php"; - version = "0.9.1"; + version = "0.10.0"; # fetchFromGitHub currently not possible, because go.mod and go.sum are export-ignored src = fetchgit { url = "https://github.com/twirphp/twirp.git"; rev = "v${version}"; - sha256 = "sha256-6tA+iNcs6s4vviWSJ5gCL9hPyCa7OvYXRCCokAAO0T8="; + sha256 = "sha256-YMndB5DiER2Z1ARbw2cpxE1DBFCoVNWhMdsfA3X27EE="; }; - vendorSha256 = "sha256-Kz9tMM4XSMOUmlHb/BE5/C/ZohdE505DTeDj9lGki/I="; + vendorHash = "sha256-Gf8thGuFAKX4pCNFJM3RbJ63vciLNcSqpOULcUOaGNw="; subPackages = [ "protoc-gen-twirp_php" ]; From 8eb09ad93f71a63af9ce7e1312cd1d6337a5941e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Aug 2023 11:05:39 +0000 Subject: [PATCH 036/110] whatsapp-for-linux: 1.6.3 -> 1.6.4 --- .../instant-messengers/whatsapp-for-linux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix index ed9cf85640e2..efca89de7cbb 100644 --- a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "whatsapp-for-linux"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "eneshecan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YmiEzemoGLwCUVfnuTmruSkI0oBg7yNuodWmXTMGh8g="; + sha256 = "sha256-DU9tvIvDfOtBydR68yeRMFYdMjiBrOobCDXIZMmm7pQ="; }; nativeBuildInputs = [ From e2b680668daeb66c7d2679deac2393595171aa8f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Aug 2023 11:42:49 +0000 Subject: [PATCH 037/110] aws-sso-cli: 1.10.0 -> 1.11.0 --- pkgs/tools/admin/aws-sso-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/aws-sso-cli/default.nix b/pkgs/tools/admin/aws-sso-cli/default.nix index 558891d31656..6ff97aa78d8c 100644 --- a/pkgs/tools/admin/aws-sso-cli/default.nix +++ b/pkgs/tools/admin/aws-sso-cli/default.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "aws-sso-cli"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "synfinatic"; repo = pname; rev = "v${version}"; - hash = "sha256-Kcjg2xzW8l/3RViJri1UpG36YkmbHbXIKkDQnVr/26g="; + hash = "sha256-Vem0RMKkCwgqs06Ly3Awz4EcCWLd0H4xjWGRbnAlqbE="; }; vendorHash = "sha256-myjHRZXTjsLXD8kibcdf1/Nhvx50fDsFtmZd63DpiiI="; From 76cacc26c90b2423d862bc9051c545a6ab743c0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Sat, 12 Aug 2023 13:43:21 +0200 Subject: [PATCH 038/110] pixelorama: add changelog --- pkgs/applications/editors/pixelorama/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/pixelorama/default.nix b/pkgs/applications/editors/pixelorama/default.nix index e883ba36d5fb..ee9e557c8833 100644 --- a/pkgs/applications/editors/pixelorama/default.nix +++ b/pkgs/applications/editors/pixelorama/default.nix @@ -52,6 +52,7 @@ in stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://orama-interactive.itch.io/pixelorama"; description = "A free & open-source 2D sprite editor, made with the Godot Engine!"; + changelog = "https://github.com/Orama-Interactive/Pixelorama/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = licenses.mit; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with maintainers; [ felschr ]; From f7cf10ead3cc5e99259bbc60582a65315a4546fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Sat, 12 Aug 2023 13:37:26 +0200 Subject: [PATCH 039/110] pixelorama: 0.11 -> 0.11.1 --- pkgs/applications/editors/pixelorama/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/pixelorama/default.nix b/pkgs/applications/editors/pixelorama/default.nix index ee9e557c8833..6c01f8e05d3a 100644 --- a/pkgs/applications/editors/pixelorama/default.nix +++ b/pkgs/applications/editors/pixelorama/default.nix @@ -9,13 +9,13 @@ let else throw "unsupported platform"; in stdenv.mkDerivation (finalAttrs: { pname = "pixelorama"; - version = "0.11"; + version = "0.11.1"; src = fetchFromGitHub { owner = "Orama-Interactive"; repo = "Pixelorama"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-r4iQJBxXzIbQ7n19Ah6szuIfALmuKlHKcvKsxEzOttk="; + sha256 = "sha256-+gPkuVzQ86MzHQ0AjnPDdyk2p7eIxtggq+KJ43KVbk8="; }; nativeBuildInputs = [ From 779dfd2218e888d8e6da70b556798672fbdc044c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Sat, 12 Aug 2023 10:20:03 -0300 Subject: [PATCH 040/110] godot_4: 4.1-stable -> 4.1.1 --- pkgs/development/tools/godot/4/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/godot/4/default.nix b/pkgs/development/tools/godot/4/default.nix index a39c8e9f5014..e57e22f8f04f 100644 --- a/pkgs/development/tools/godot/4/default.nix +++ b/pkgs/development/tools/godot/4/default.nix @@ -43,14 +43,14 @@ let in stdenv.mkDerivation rec { pname = "godot"; - version = "4.1-stable"; - commitHash = "970459615f6b2b4151742ec6d7ef8559f87fd5c5"; + version = "4.1.1"; + commitHash = "bd6af8e0ea69167dd0627f3bd54f9105bda0f8b5"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = commitHash; - hash = "sha256-v9qKrPYQz4c+xkSu/2ru7ZE5EzKVyXhmrxyHZQkng2U="; + hash = "sha256-0CErsMTrBC/zYcabAtjYn8BWAZ1HxgozKdgiqdsn3q8="; }; nativeBuildInputs = [ From 347b77eba12b3f54850d2824d742f9aa18c1f60d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Sat, 12 Aug 2023 10:20:19 -0300 Subject: [PATCH 041/110] godot_4: add mainProgram --- pkgs/development/tools/godot/4/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/godot/4/default.nix b/pkgs/development/tools/godot/4/default.nix index e57e22f8f04f..986d2d7745f3 100644 --- a/pkgs/development/tools/godot/4/default.nix +++ b/pkgs/development/tools/godot/4/default.nix @@ -148,5 +148,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ twey shiryel ]; + mainProgram = "godot4"; }; } From dfe7b31d9baf4a25ddcee70d69839a4f53c25393 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Aug 2023 13:20:29 +0000 Subject: [PATCH 042/110] charm: 0.12.5 -> 0.12.6 --- pkgs/applications/misc/charm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/charm/default.nix b/pkgs/applications/misc/charm/default.nix index 77e42cda4d23..eac305bd399e 100644 --- a/pkgs/applications/misc/charm/default.nix +++ b/pkgs/applications/misc/charm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "charm"; - version = "0.12.5"; + version = "0.12.6"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "charm"; rev = "v${version}"; - sha256 = "sha256-lTjpvh0bl4Fk+d3mcDvVQY3Ef6UYE23qoS60nltVcsU="; + sha256 = "sha256-RtUHJIMbodICEDIhjH/QZlAS7dxBsL/uNYA2IoObAg0="; }; - vendorSha256 = "sha256-TNxAtx+fT6CEpa2g/tNl9sCwt3kAmNq7G870TPt2MQ4="; + vendorHash = "sha256-V5azvQ8vMkgF2Myt6h5Gw09b+Xwg1XLyTImG52qQ+20="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; From a691c2577a73ee6dff5411755ae71cf64302c68d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Aug 2023 20:11:57 +0000 Subject: [PATCH 043/110] consul: 1.16.0 -> 1.16.1 --- pkgs/servers/consul/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 6f145137567a..1e94991b5c08 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.16.0"; + version = "1.16.1"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - hash = "sha256-7F0kutAWyi22OxI242P8m1Aoj+l/7F91wmxDSt4ttyA="; + hash = "sha256-EEreAhxBQm6Wj1JFGfC9Ql3NARPXNOhqZkzIDJ2NMkg="; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorHash = "sha256-aZRW+z9oW7if+yMOrETNXFC521Wo0feq1FDv8/Q4ejY="; + vendorHash = "sha256-zERHmtmGrPrUPJ2fFc+J0pWKLKQc9TTSFkN2RUOXOoM="; doCheck = false; From 254cecaae37cd61a8486cf42a961522a2c8b8210 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Aug 2023 20:34:21 +0000 Subject: [PATCH 044/110] i3lock-color: 2.13.c.4 -> 2.13.c.5 --- pkgs/applications/window-managers/i3/lock-color.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index 4460c5f90b76..8656db60c4ee 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "2.13.c.4"; + version = "2.13.c.5"; pname = "i3lock-color"; src = fetchFromGitHub { owner = "PandorasFox"; repo = "i3lock-color"; rev = version; - sha256 = "sha256-bbjkvgSKD57sdOtPYGLAKpQoIsJnF6s6ySq4dTWC3tI="; + sha256 = "sha256-fuLeglRif2bruyQRqiL3nm3q6qxoHcPdVdL+QjGBR/k="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 00437b43446439156c80a7a9c819ce1849ae6987 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Aug 2023 20:57:33 +0000 Subject: [PATCH 045/110] easeprobe: 2.1.0 -> 2.1.1 --- pkgs/tools/misc/easeprobe/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/easeprobe/default.nix b/pkgs/tools/misc/easeprobe/default.nix index a46b3c613809..9745364fb7ec 100644 --- a/pkgs/tools/misc/easeprobe/default.nix +++ b/pkgs/tools/misc/easeprobe/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "easeprobe"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "megaease"; repo = pname; rev = "v${version}"; - sha256 = "sha256-z+qwmVsznzm6TjvDOT1/8Zy3wUDPFDrjcpxXXHnb4oo="; + sha256 = "sha256-vdbzDwFpCYVgH9T8e62+1hnMyWsWrT7e6WPaAlBc2H0="; }; - vendorHash = "sha256-N32uSuHAbTfGg+Y1bmngzw4RTx5gR4DGKbSBB0BT+8I="; + vendorHash = "sha256-ZB6q8XvDVSF5/kx2Avq0PYBkYqSoMD6YHhuXRrotFgk="; subPackages = [ "cmd/easeprobe" ]; From 1977f00da697234906cc80193c365f91d0a1a965 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Aug 2023 21:30:15 +0000 Subject: [PATCH 046/110] pyrosimple: 2.9.1 -> 2.10.2 --- pkgs/applications/networking/p2p/pyrosimple/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/pyrosimple/default.nix b/pkgs/applications/networking/p2p/pyrosimple/default.nix index 7ac355690c0b..15e7304ef9b9 100644 --- a/pkgs/applications/networking/p2p/pyrosimple/default.nix +++ b/pkgs/applications/networking/p2p/pyrosimple/default.nix @@ -10,14 +10,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pyrosimple"; - version = "2.9.1"; + version = "2.10.2"; format = "pyproject"; src = fetchFromGitHub { owner = "kannibalox"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-eRj9zHbopzwPvB3YxN5P8A/Dqwvh+FcIr+pEC0ov/xg="; + hash = "sha256-3ZsRJNGbcKGU6v2uYUintMpKY8Z/DyTIDDxTsDEV6lw="; }; pythonRelaxDeps = [ From e1466f164af485cf8e5649c9d7a7a4c87c1aff86 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Aug 2023 21:57:00 +0000 Subject: [PATCH 047/110] jackett: 0.21.584 -> 0.21.635 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 36fce8a205b4..5393188ccd6f 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.21.584"; + version = "0.21.635"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-uv8r39iH1Te7WqmJK/qDbXE46qjUNEFi1YPgSyHRegLZWGjP7QAAn4x5WBTXZ1OLlsbVRg3fJkj/BanHLBuqjg=="; + hash = "sha512-KhQUuRJUqnCOLbwhTJiWOHj/yGsdne9TY9qyuE6c7y0gvAdKPE9Xkolt0RV/pjQtr6Hnbw5MaXahHHDOrhkN5Q=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; From 2bfc68a7774e0727034061df6af1fd36bfe51296 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Aug 2023 22:05:56 +0000 Subject: [PATCH 048/110] tvm: 0.12.0 -> 0.13.0 --- pkgs/development/compilers/tvm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/tvm/default.nix b/pkgs/development/compilers/tvm/default.nix index a26096b540fc..e72cc3cdb93a 100644 --- a/pkgs/development/compilers/tvm/default.nix +++ b/pkgs/development/compilers/tvm/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "tvm"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "apache"; repo = "incubator-tvm"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-NHfYx45Zad+jsILR24c2U+Xmb2rKaTyl8xl5uxAFtak="; + sha256 = "sha256-WG0vU3lxX5FNs0l37mTE1T7rSEEtfTEisE3cMphzeAk="; }; nativeBuildInputs = [ cmake ]; From f29ef2461ca47546bc3be30c5bd848f0cb2f3d01 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Aug 2023 22:11:20 +0000 Subject: [PATCH 049/110] zimfw: 1.11.3 -> 1.12.0 --- pkgs/shells/zsh/zimfw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/zimfw/default.nix b/pkgs/shells/zsh/zimfw/default.nix index 3714f0ee364e..5f58d3d5e9f9 100644 --- a/pkgs/shells/zsh/zimfw/default.nix +++ b/pkgs/shells/zsh/zimfw/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "zimfw"; - version = "1.11.3"; + version = "1.12.0"; src = fetchFromGitHub { owner = "zimfw"; repo = "zimfw"; rev = "v${version}"; ## zim only needs this one file to be installed. sparseCheckout = [ "zimfw.zsh" ]; - sha256 = "sha256-q3OSypjqAc+ul0kF6f3u+wnFyNEm4AKwyPBwQzlVzYU="; + sha256 = "sha256-PwfPiga4KcOrkkObIu3RCUmO2ExoDQkbQx7S+Yncy6k="; }; strictDeps = true; dontConfigure = true; From 999338ba161b548c3088ed2b5e2a5a3a88d1e717 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Aug 2023 22:19:52 +0000 Subject: [PATCH 050/110] consul-template: 0.32.0 -> 0.33.0 --- pkgs/tools/system/consul-template/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix index 5ddc121f9d65..f32f933dbbaa 100644 --- a/pkgs/tools/system/consul-template/default.nix +++ b/pkgs/tools/system/consul-template/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "consul-template"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "consul-template"; rev = "v${version}"; - hash = "sha256-jpUDNtcJBcxlHt4GEVZLGT11QBgLHgOR3Y2TT7GROls="; + hash = "sha256-78RYFFpsW6onWd1aAxDf28GUblIGVtg0uZeURZPla8E="; }; - vendorHash = "sha256-DV+sZkTKsTygO/LOi6z0vSUgavyqYKB4F2fMxuFFdvw="; + vendorHash = "sha256-LRH3wMRSHIpavXSupFA9HLojBqWVObQfL+SM8ah4oBg="; # consul-template tests depend on vault and consul services running to # execute tests so we skip them here From 924a004a93490c72a3e14f49bc3d384fecf3276c Mon Sep 17 00:00:00 2001 From: Dominik Ritter Date: Sun, 13 Aug 2023 00:36:09 +0200 Subject: [PATCH 051/110] enpass: 6.8.5.1173 -> 6.9.0.1467 --- pkgs/tools/security/enpass/data.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/enpass/data.json b/pkgs/tools/security/enpass/data.json index d967b2266ae1..dc6ef2049723 100644 --- a/pkgs/tools/security/enpass/data.json +++ b/pkgs/tools/security/enpass/data.json @@ -1,8 +1,8 @@ { "amd64": { - "path": "pool/main/e/enpass/enpass_6.8.5.1173_amd64.deb", - "sha256": "5855e617041d73682320f3643eb4136c93eef2beaf3be9d37cbadfc76d719b5b", - "version": "6.8.5.1173" + "path": "pool/main/e/enpass/enpass_6.9.0.1467_amd64.deb", + "sha256": "fe405f7119d45822164da3ad009b99c5cd516685198c1d335b7803d84e5ba2ca", + "version": "6.9.0.1467" }, "i386": { "path": "pool/main/e/enpass/enpass_5.6.9_i386.deb", From 4736a95e40ff68058c3eae27a17db8fbcc42f9e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Aug 2023 22:54:18 +0000 Subject: [PATCH 052/110] python310Packages.riprova: 0.2.7 -> 0.3.1 --- pkgs/development/python-modules/riprova/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/riprova/default.nix b/pkgs/development/python-modules/riprova/default.nix index adf327208955..c4a0ee950704 100644 --- a/pkgs/development/python-modules/riprova/default.nix +++ b/pkgs/development/python-modules/riprova/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec{ pname = "riprova"; - version = "0.2.7"; + version = "0.3.1"; src = fetchPypi { inherit pname version; - sha256 = "04drdvjjbh370csv2vb5zamg2aanxqkfm6w361qkybnra4g4g0dz"; + sha256 = "sha256-FgFySbvBjcZU2bjo40/1O7glc6oFWW05jinEOfMWMVI="; }; propagatedBuildInputs = [ six ]; From e24dabc21ad619864415da5982fbdb0ab3cb1958 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sat, 12 Aug 2023 19:57:26 -0400 Subject: [PATCH 053/110] maintainers: add eclairevoyant --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5b1c63beb1c6..ab7046b9e985 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4702,6 +4702,11 @@ githubId = 7875; name = "Rommel Martinez"; }; + eclairevoyant = { + github = "eclairevoyant"; + githubId = 848000; + name = "éclairevoyant"; + }; edanaher = { email = "nixos@edanaher.net"; github = "edanaher"; From ead60eb8b9eff911f75c89b7992255f21bd09451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sat, 12 Aug 2023 20:01:06 -0400 Subject: [PATCH 054/110] grim: add meta.mainProgram and other cleanup --- pkgs/tools/graphics/grim/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/grim/default.nix b/pkgs/tools/graphics/grim/default.nix index 71a268de7d65..f0253c8b6613 100644 --- a/pkgs/tools/graphics/grim/default.nix +++ b/pkgs/tools/graphics/grim/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "~emersion"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5csJqRLNqhyeXR4dEQtnPUSwuZ8oY+BIt6AVICkm1+o="; + hash = "sha256-5csJqRLNqhyeXR4dEQtnPUSwuZ8oY+BIt6AVICkm1+o="; }; mesonFlags = [ @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/emersion/grim"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ buffet ]; + maintainers = with maintainers; [ buffet eclairevoyant ]; + mainProgram = "grim"; }; } From 771191527c09a11a118f97bcac44a673f0cfc847 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Aug 2023 00:16:57 +0000 Subject: [PATCH 055/110] python310Packages.limnoria: 2023.5.27 -> 2023.8.10 --- pkgs/development/python-modules/limnoria/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 35febbffc632..8276af406b14 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2023.5.27"; + version = "2023.8.10"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-HqNBXDmPU0vh1cA0swWK708MnCcAEeiRxf/yaW2Oh/U="; + hash = "sha256-3AHc7Ej0IJ2WCQ8XVbWL0lwTQW6ng2ehemTcmJOQ86U="; }; propagatedBuildInputs = [ From 874d0c3d9b404619e4367e93763b0e7d83338382 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Aug 2023 01:31:41 +0000 Subject: [PATCH 056/110] antidote: 1.9.0 -> 1.9.1 --- pkgs/shells/zsh/antidote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/antidote/default.nix b/pkgs/shells/zsh/antidote/default.nix index 598c72fa132d..a1bb818f6d8f 100644 --- a/pkgs/shells/zsh/antidote/default.nix +++ b/pkgs/shells/zsh/antidote/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation (finalAttrs: { - version = "1.9.0"; + version = "1.9.1"; pname = "antidote"; src = fetchFromGitHub { owner = "mattmc3"; repo = "antidote"; rev = "v${finalAttrs.version}"; - hash = "sha256-YKFG66Kjw/S0YkvPlJK3HC9v00SHEW1Wng6+xcy41Hg="; + hash = "sha256-wRLMjaBpzttQ6MUgl1AFC2SRlEEwjASdEnguGlP+XgU="; }; dontPatch = true; From 10857877697c6b68dde251cbb986556a04ab03d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Aug 2023 01:33:12 +0000 Subject: [PATCH 057/110] upx: 4.0.2 -> 4.1.0 --- pkgs/tools/compression/upx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index d176b32d60cf..4c808acd003e 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "upx"; - version = "4.0.2"; + version = "4.1.0"; src = fetchFromGitHub { owner = "upx"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-5jqEdMlHmsD88kT/EGieL7DktppVdfWyJWGRNRKbRc4="; + sha256 = "sha256-pHJypO+sK7+ytM7yJxJpfBJHTYpGc9nr/JiFGd7hlJM="; }; nativeBuildInputs = [ cmake ]; From 776347d57af5fe9f7e23bcedc2172226c57d5273 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Aug 2023 01:57:18 +0000 Subject: [PATCH 058/110] conky: 1.19.2 -> 1.19.3 --- pkgs/os-specific/linux/conky/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 2c2f21022a77..3eb05f25936f 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -67,13 +67,13 @@ with lib; stdenv.mkDerivation rec { pname = "conky"; - version = "1.19.2"; + version = "1.19.3"; src = fetchFromGitHub { owner = "brndnmtthws"; repo = "conky"; rev = "v${version}"; - hash = "sha256-AKU2kHYwhSmNrqZQWLmY82U+WQiuYiZKCJC5c0jG3KQ="; + hash = "sha256-Wt1g7/2PebpyxvIBihDBsl3DvM1EeRyOhD5ntlk0Oh0="; }; postPatch = '' From c0ce75d219de7d9dda140712496f246402f3b775 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Aug 2023 02:03:00 +0000 Subject: [PATCH 059/110] jfrog-cli: 2.43.1 -> 2.45.0 --- pkgs/tools/misc/jfrog-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/jfrog-cli/default.nix b/pkgs/tools/misc/jfrog-cli/default.nix index e2a5483e54fd..cfa7ad4f47ba 100644 --- a/pkgs/tools/misc/jfrog-cli/default.nix +++ b/pkgs/tools/misc/jfrog-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "jfrog-cli"; - version = "2.43.1"; + version = "2.45.0"; src = fetchFromGitHub { owner = "jfrog"; repo = "jfrog-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-Ad3kcx5F6U6ucamhhD0c5st86nrJxCPX9e62u7yjPYI="; + hash = "sha256-NSkSE1NZIwCCSlCo7hGWq82JvH48uI8fV2RIZHwS5JI="; }; - vendorHash = "sha256-iLjm8k0XbYcA05J52K8mGWleiMhSRjzzkTOrQ28UdVw="; + vendorHash = "sha256-fk+Lhmb+LgjSuGlDfHkentF10TOgqIxbZ1VVGmAmkME="; postInstall = '' # Name the output the same way as the original build script does From 138f361f3226037aaacae2a1f3ecc2abff300de4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Aug 2023 02:25:12 +0000 Subject: [PATCH 060/110] relic: 7.5.6 -> 7.5.9 --- pkgs/development/tools/relic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/relic/default.nix b/pkgs/development/tools/relic/default.nix index cd9b56c51dc4..c2dc1873394a 100644 --- a/pkgs/development/tools/relic/default.nix +++ b/pkgs/development/tools/relic/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "relic"; - version = "7.5.6"; + version = "7.5.9"; src = fetchFromGitHub { owner = "sassoftware"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dg5+vA8AtTglPgfTqz8dRZEt7I6uPs579+4rcmeN/34="; + sha256 = "sha256-x+F/sXZAnGbzMCXKY05VSYM0o0ujf/aWUP/nrUo+FSs="; }; vendorHash = "sha256-EZohpGzMDYKUbjSOIfoUbbsABNDOddrTt52pv+VQLdI="; From a7f563d7c13ece208857101f838ee2ce705c4a76 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Aug 2023 02:45:26 +0000 Subject: [PATCH 061/110] spotify-player: 0.14.1 -> 0.15.0 --- pkgs/applications/audio/spotify-player/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/spotify-player/default.nix b/pkgs/applications/audio/spotify-player/default.nix index 0e75f373dc2c..4c5417ab99fc 100644 --- a/pkgs/applications/audio/spotify-player/default.nix +++ b/pkgs/applications/audio/spotify-player/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "spotify-player"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "aome510"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+YPtu3hsKvk2KskVSpqcFufnWL5PxN8+xbkcz/JXW6g="; + hash = "sha256-5+YBlXHpAzGgw6MqgnMSggCASS++A/WWomftX8Jxe7g="; }; - cargoHash = "sha256-WgQ+v9dJyriqq7+WpXpPhjdwm2Sr0jozA1oW2inSPik="; + cargoHash = "sha256-PIYaJC3rVbPjc2CASzMGWAzUdrBwFnKqhrZO6nywdN8="; nativeBuildInputs = [ pkg-config From e1437548de7d67bae2ce6f087ebf9d073379fea0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Aug 2023 02:51:17 +0000 Subject: [PATCH 062/110] earthly: 0.7.11 -> 0.7.15 --- pkgs/development/tools/earthly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index d57549dd7e30..06983c3e286c 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.7.11"; + version = "0.7.15"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-iIMTDdWO//H8BXEbYMx15vo48IQ15AJjNvMg8Y2oFUY="; + sha256 = "sha256-cCN63eHfYAsCcvRU+hAH+dZJHlmBu7MitvrjGB/qzMU="; }; - vendorHash = "sha256-tEhUywjJtNaWLPSRNeHTcNsPNCZtXzqjg0VG4g4N9E0="; + vendorHash = "sha256-8t7nWVItX9OPo6fsJuzo+w6ZyVcsqwi2e7HE2nqyYck="; subPackages = [ "cmd/earthly" "cmd/debugger" ]; CGO_ENABLED = 0; From 408a6b0c1d5c309511795a2950533bd7da0448e8 Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 7 Aug 2023 02:32:13 +0000 Subject: [PATCH 063/110] mate.engrampa: support cross compilation --- pkgs/desktops/mate/engrampa/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index b781251a7ca7..bdac030ed341 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -6,11 +6,12 @@ , itstool , libxml2 , gtk3 -, file , mate , hicolor-icon-theme , wrapGAppsHook , mateUpdateScript +# can be defaulted to true once engrampa builds with meson (version > 1.27.0) +, withMagic ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, file }: stdenv.mkDerivation rec { @@ -26,20 +27,22 @@ stdenv.mkDerivation rec { pkg-config gettext itstool + libxml2 # for xmllint wrapGAppsHook ]; buildInputs = [ - libxml2 gtk3 - file #libmagic mate.caja hicolor-icon-theme mate.mate-desktop + ] ++ lib.optionals withMagic [ + file ]; configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" + ] ++ lib.optionals withMagic [ "--enable-magic" ]; From df622909ad938070f22fdf2517405bfd0926e8db Mon Sep 17 00:00:00 2001 From: Colin Date: Tue, 1 Aug 2023 06:30:15 +0000 Subject: [PATCH 064/110] mpvScripts.mpris: support cross compilation --- pkgs/applications/video/mpv/scripts/mpris.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/video/mpv/scripts/mpris.nix b/pkgs/applications/video/mpv/scripts/mpris.nix index 063833297b98..4d7bb155f5cc 100644 --- a/pkgs/applications/video/mpv/scripts/mpris.nix +++ b/pkgs/applications/video/mpv/scripts/mpris.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { buildInputs = [ glib mpv-unwrapped ]; + postPatch = '' + substituteInPlace Makefile --replace 'PKG_CONFIG =' 'PKG_CONFIG ?=' + ''; + installFlags = [ "SCRIPTS_DIR=$(out)/share/mpv/scripts" ]; # Otherwise, the shared object isn't `strip`ped. See: From 639f1e328f8de8ddad031ee195bbf618cadc888a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Aug 2023 05:14:28 +0000 Subject: [PATCH 065/110] zed: 1.8.1 -> 1.9.0 --- pkgs/development/tools/zed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/zed/default.nix b/pkgs/development/tools/zed/default.nix index 98e7f37e5c19..8619e3617388 100644 --- a/pkgs/development/tools/zed/default.nix +++ b/pkgs/development/tools/zed/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "zed"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "brimdata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3YLQi/9YTUDyprlSjzCACffF6eXwLbmfsU/LPhEriqA="; + sha256 = "sha256-aLehlxMztOqtItzouWESQs5K2EZ+O8EAwUQT9v7GX08="; }; vendorHash = "sha256-n/7HV3dyV8qsJeEk+vikZvuM5G7nf0QOwVBtInJdU2k="; From 0aa8f3fcc937d8ce59028ece519ae1f2029203a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Aug 2023 05:47:26 +0000 Subject: [PATCH 066/110] re-flex: 3.3.7 -> 3.3.8 --- pkgs/development/tools/parsing/re-flex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/re-flex/default.nix b/pkgs/development/tools/parsing/re-flex/default.nix index 6f19a488649d..0dd520eb9e3f 100644 --- a/pkgs/development/tools/parsing/re-flex/default.nix +++ b/pkgs/development/tools/parsing/re-flex/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "re-flex"; - version = "3.3.7"; + version = "3.3.8"; src = fetchFromGitHub { owner = "Genivia"; repo = "RE-flex"; rev = "v${version}"; - sha256 = "sha256-YLWMVsfmb1cSYWtxCkTkANYRiUenkNZ7n2QFEI6SU1A="; + sha256 = "sha256-ujBdR4NDY9TwHwghtj2uMJoLtuYpzw5cUCMSbEsXlmY="; }; nativeBuildInputs = [ boost autoconf automake ]; From 29656fb5013b9a03d362a792314de9acf221cff9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Sun, 13 Aug 2023 07:50:10 +0200 Subject: [PATCH 067/110] eza: 0.10.6 -> 0.10.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christina Sørensen --- pkgs/tools/misc/eza/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/eza/default.nix b/pkgs/tools/misc/eza/default.nix index c1fa9ad4a1ca..715eee9c05d0 100644 --- a/pkgs/tools/misc/eza/default.nix +++ b/pkgs/tools/misc/eza/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.10.6"; + version = "0.10.7"; src = fetchFromGitHub { - owner = "cafkafk"; + owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-+MA9p15RGPaQ7Drhiljeb7KqThQnXMymjXFFS5sLxdM="; + hash = "sha256-f8js+zToP61lgmxucz2gyh3uRZeZSnoxS4vuqLNVO7c="; }; - cargoHash = "sha256-aplwr9X9MLhKrF5125gMtmuI/72RGf+1GZqkBYyxUSQ="; + cargoHash = "sha256-G3zNv8pG9uS12PsBug51RaS9Hx0sGHHnVEF4bHb+v18="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] @@ -37,7 +37,8 @@ rustPlatform.buildRustPackage rec { postInstall = '' pandoc --standalone -f markdown -t man man/eza.1.md > man/eza.1 pandoc --standalone -f markdown -t man man/eza_colors.5.md > man/eza_colors.5 - installManPage man/eza.1 man/eza_colors.5 + pandoc --standalone -f markdown -t man man/eza_colors-explanation.5.md > man/eza_colors-explanation.5 + installManPage man/eza.1 man/eza_colors.5 man/eza_colors-explanation.5 installShellCompletion \ --bash completions/bash/eza \ --fish completions/fish/eza.fish \ @@ -54,7 +55,7 @@ rustPlatform.buildRustPackage rec { for a directory, or recursing into directories with a tree view. eza is written in Rust, so it’s small, fast, and portable. ''; - homepage = "https://github.com/cafkafk/eza"; + homepage = "https://github.com/eza-community/eza"; license = licenses.mit; maintainers = with maintainers; [ cafkafk ]; }; From 8be0b2848699025e36933035664a7677f1e17d48 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sun, 13 Aug 2023 05:59:28 +0000 Subject: [PATCH 068/110] github-copilot-intellij-agent: 1.2.8.2631 -> 1.2.18.2908 --- .../tools/github-copilot-intellij-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/github-copilot-intellij-agent/default.nix b/pkgs/development/tools/github-copilot-intellij-agent/default.nix index a1f2bc950198..128095d671cb 100644 --- a/pkgs/development/tools/github-copilot-intellij-agent/default.nix +++ b/pkgs/development/tools/github-copilot-intellij-agent/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "github-copilot-intellij-agent"; - version = "1.2.8.2631"; + version = "1.2.18.2908"; src = fetchurl { name = "${pname}-${version}-plugin.zip"; - url = "https://plugins.jetbrains.com/plugin/download?updateId=341846"; - hash = "sha256-0nnSMdx9Vb2WyNHreOJMP15K1+AII/kCEAOiFK5Mhik="; + url = "https://plugins.jetbrains.com/plugin/download?updateId=373346"; + hash = "sha256-ErSj4ckPSaEkOeGTRS27yFKDlj2iZfoPdjbZleSIL1s="; }; nativeBuildInputs = [ unzip ]; From 40c4730f43be346d433d829f9a2a50dabf257ead Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Aug 2023 06:34:56 +0000 Subject: [PATCH 069/110] detekt: 1.23.0 -> 1.23.1 --- pkgs/development/tools/detekt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/detekt/default.nix b/pkgs/development/tools/detekt/default.nix index 599c10e0b7b6..27e11032d939 100644 --- a/pkgs/development/tools/detekt/default.nix +++ b/pkgs/development/tools/detekt/default.nix @@ -1,13 +1,13 @@ { detekt, lib, stdenv, fetchurl, makeWrapper, jre_headless, testers }: stdenv.mkDerivation rec { pname = "detekt"; - version = "1.23.0"; + version = "1.23.1"; jarfilename = "${pname}-${version}-executable.jar"; src = fetchurl { url = "https://github.com/detekt/detekt/releases/download/v${version}/detekt-cli-${version}-all.jar"; - sha256 = "sha256-XmmcyfwWZAE9PQa6TP2HZsn7iADwMUBdxMad8jYWH9o="; + sha256 = "sha256-CJwVQF7FVjrbooXQnOzP8Efrx4iLi7w6OGu8bGdE14g="; }; dontUnpack = true; From d7593e349fffb858a943cc81f039a09fa7e11cbd Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sat, 12 Aug 2023 23:52:41 -0700 Subject: [PATCH 070/110] python3.pkgs.class-doc: patch out poetry dependency --- .../python-modules/class-doc/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/class-doc/default.nix b/pkgs/development/python-modules/class-doc/default.nix index 937a94c953b8..432df1f674ee 100644 --- a/pkgs/development/python-modules/class-doc/default.nix +++ b/pkgs/development/python-modules/class-doc/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , poetry-core , more-itertools , pytestCheckHook @@ -13,21 +14,24 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "danields761"; - repo = "${pname}"; + repo = pname; rev = "9b122d85ce667d096ebee75a49350bbdbd48686d"; # no 0.2.6 version tag hash = "sha256-4Sn/TuBvBpl1nvJBg327+sVrjGavkYKEYP32DwLWako="; }; + patches = [ + # https://github.com/danields761/class-doc/pull/2 + (fetchpatch { + name = "poetry-to-poetry-core.patch"; + url = "https://github.com/danields761/class-doc/commit/03b224ad0a6190c30e4932fa2ccd4a7f0c5c4b5d.patch"; + hash = "sha256-shWPRaZkvtJ1Ae17aCOm6eLs905jxwq84SWOrChEs7M="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; - postPatch = '' - substituteInPlace pyproject.toml --replace \ - "poetry.masonry.api" \ - "poetry.core.masonry.api" - ''; - propagatedBuildInputs = [ more-itertools ]; From abea9edb56f210592dd4f65f2b2a1b30f9a87599 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 13 Aug 2023 15:54:16 +0800 Subject: [PATCH 071/110] python310Packages.edk2-pytool-library: 0.16.1 -> 0.16.2 Diff: https://github.com/tianocore/edk2-pytool-library/compare/v0.16.1...v0.16.2 Changelog: https://github.com/tianocore/edk2-pytool-library/releases/tag/v0.16.2 --- .../python-modules/edk2-pytool-library/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index 51275aafc4c4..181692d4fe22 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.16.1"; + version = "0.16.2"; format = "pyproject"; src = fetchFromGitHub { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "v${version}"; - hash = "sha256-iVNie2VFyqzDdXtgnbZDzeIXsDEm6ugjIPJexLwHqeI="; + hash = "sha256-JL9znvXl+RIEzycKhXkggEJ87bQ+UzspBD1YM3AoYlc="; }; nativeBuildInputs = [ From 17f471961c38e539a3bd8b483d44b1e7e6006678 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 13 Aug 2023 15:55:31 +0800 Subject: [PATCH 072/110] v2ray-domain-list-community: 20230730120627 -> 20230810162343 Diff: https://github.com/v2fly/domain-list-community/compare/20230730120627...20230810162343 --- pkgs/data/misc/v2ray-domain-list-community/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 8864f3923f91..1e07a3a39ebb 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20230730120627"; + version = "20230810162343"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-lnTP8KDYdIa7iq14h0TEVfAlJDtsURfSZaEdQ8L1TRM="; + hash = "sha256-RzYFpbiy0ajOjyu9Fdw+aJX9cLbquXzfWiLPaszyxOY="; }; vendorHash = "sha256-dYaGR5ZBORANKAYuPAi9i+KQn2OAGDGTZxdyVjkcVi8="; meta = with lib; { From e1c17214a3154e61ef027d38ad10443d486c91d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jul 2023 14:51:31 +0000 Subject: [PATCH 073/110] libsForQt5.kirigami-addons: 0.8.0 -> 0.9.0 --- pkgs/development/libraries/kirigami-addons/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kirigami-addons/default.nix b/pkgs/development/libraries/kirigami-addons/default.nix index 481d5e1e2a79..55081d1d94b2 100644 --- a/pkgs/development/libraries/kirigami-addons/default.nix +++ b/pkgs/development/libraries/kirigami-addons/default.nix @@ -12,14 +12,14 @@ mkDerivation rec { pname = "kirigami-addons"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "libraries"; repo = pname; rev = "v${version}"; - hash = "sha256-ObbpM1gVVFhOIHOla5YS8YYe+JoPgdZ8kJ356wLTJq4="; + hash = "sha256-lsqbaF64NIuEBTQdU/GB12kgOsFbsow3XCp221RWB4I="; }; nativeBuildInputs = [ From 4c4c96202c0e450d5e39d7062ff88a246b1d30fc Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 13 Aug 2023 10:06:12 +0200 Subject: [PATCH 074/110] libsForQt5.kirigami-addons: 0.9.0 -> 0.10.0 Signed-off-by: Matthias Beyer --- pkgs/development/libraries/kirigami-addons/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kirigami-addons/default.nix b/pkgs/development/libraries/kirigami-addons/default.nix index 55081d1d94b2..881b49364ee5 100644 --- a/pkgs/development/libraries/kirigami-addons/default.nix +++ b/pkgs/development/libraries/kirigami-addons/default.nix @@ -12,14 +12,14 @@ mkDerivation rec { pname = "kirigami-addons"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "libraries"; repo = pname; rev = "v${version}"; - hash = "sha256-lsqbaF64NIuEBTQdU/GB12kgOsFbsow3XCp221RWB4I="; + hash = "sha256-wwc0PCY8vNCmmwfIYYQhQea9AYkHakvTaERtazz8npQ="; }; nativeBuildInputs = [ From 9437b2dd18ed649ca184f599740b4a2a8fae4dba Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 13 Aug 2023 10:17:38 +0200 Subject: [PATCH 075/110] tagparser: 11.6.0 -> 12.0.0 Signed-off-by: Matthias Beyer --- pkgs/development/libraries/tagparser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tagparser/default.nix b/pkgs/development/libraries/tagparser/default.nix index f20d5a39ea37..7f534979c978 100644 --- a/pkgs/development/libraries/tagparser/default.nix +++ b/pkgs/development/libraries/tagparser/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "tagparser"; - version = "11.6.0"; + version = "12.0.0"; src = fetchFromGitHub { owner = "Martchus"; repo = "tagparser"; rev = "v${version}"; - hash = "sha256-zi1n5Mdto8DmUq5DWxcr4f+DX6Sq/JsK8uzRzj5f0/E="; + hash = "sha256-b6nAVhakQA8oKHP48+1S+4SX6EcI0kxK8uXTZ05cLnQ="; }; nativeBuildInputs = [ cmake ]; From c3084eb4ed72e55bcccd3a46f2285fd35a25dd51 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 13 Aug 2023 10:17:48 +0200 Subject: [PATCH 076/110] tageditor: 3.7.9 -> 3.8.1 Signed-off-by: Matthias Beyer --- pkgs/applications/audio/tageditor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/tageditor/default.nix b/pkgs/applications/audio/tageditor/default.nix index 4360defc18d4..c0cce2efe03e 100644 --- a/pkgs/applications/audio/tageditor/default.nix +++ b/pkgs/applications/audio/tageditor/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "tageditor"; - version = "3.7.9"; + version = "3.8.1"; src = fetchFromGitHub { owner = "martchus"; repo = pname; rev = "v${version}"; - hash = "sha256-QQvc9S+9h0Qy/qBROwJMZIALf/Rbj/9my4PZGxQzlnM="; + hash = "sha256-7YmjrVh8P3XfnNs2I8PoLigfVvzS0UnuAC67ZQp7WdA="; }; nativeBuildInputs = [ From 502362234d218769ebe63986df09e28c9becc9f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Aug 2023 08:37:40 +0000 Subject: [PATCH 077/110] go-mockery: 2.32.0 -> 2.32.4 --- pkgs/development/tools/go-mockery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/go-mockery/default.nix b/pkgs/development/tools/go-mockery/default.nix index 215e7fcfe688..fd92a8035839 100644 --- a/pkgs/development/tools/go-mockery/default.nix +++ b/pkgs/development/tools/go-mockery/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-mockery"; - version = "2.32.0"; + version = "2.32.4"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-fQzXgCRMIcGQRCnKn/vu3GzNrx4/xrMVmzqjOujyNNE="; + sha256 = "sha256-8J8SEPsRj6T6kpCTaouHEojLJQD4K0894m5ldVGdy6I="; }; preCheck = '' From 2ef98d2db92c652286a8d30cbabfd96698123fbc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Aug 2023 08:44:25 +0000 Subject: [PATCH 078/110] notesnook: 2.5.7 -> 2.6.1 --- pkgs/applications/misc/notesnook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/notesnook/default.nix b/pkgs/applications/misc/notesnook/default.nix index 55bd926fb7fa..8206b4815b9a 100644 --- a/pkgs/applications/misc/notesnook/default.nix +++ b/pkgs/applications/misc/notesnook/default.nix @@ -2,7 +2,7 @@ let pname = "notesnook"; - version = "2.5.7"; + version = "2.6.1"; inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; @@ -16,7 +16,7 @@ let src = fetchurl { url = "https://github.com/streetwriters/notesnook/releases/download/v${version}/notesnook_${suffix}"; hash = { - x86_64-linux = "sha256-M/59pjhuKF/MOMpT9/qrlThHO0V8e49cfiaWMkEWHNg="; + x86_64-linux = "sha256-PLHP1Q4+xcHyr0323K4BD+oH57SspsrAcxRe/C6RFDU="; x86_64-darwin = "sha256-cluIizmweIMU6RIFxoEQ3DYChRVEuVLxrPjwfFfeq1w="; aarch64-darwin = "sha256-cbBnKrb8poyDL1D+32UrOl3RXt8Msncw440qra9+Gs0="; }.${system} or throwSystem; From 67c2424991ce41852e742109d35335c55894a5e1 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 13 Aug 2023 01:52:46 -0700 Subject: [PATCH 079/110] python3.pkgs.mpi4py: fix sandbox darwin build --- pkgs/development/python-modules/mpi4py/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index 97a7aed915e1..8584930c31f1 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -43,6 +43,8 @@ buildPythonPackage rec { nativeBuildInputs = [ mpi ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ openssh ]; meta = with lib; { From 883b0f8eeed28b82a8c036731a6a7416685a04b6 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 13 Aug 2023 11:15:06 +0200 Subject: [PATCH 080/110] vimPlugins.fuzzy-nvim: fix by changing dependency --- pkgs/applications/editors/vim/plugins/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index f14cf064c8bd..010476b35491 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -517,7 +517,7 @@ self: super: { }); fuzzy-nvim = super.fuzzy-nvim.overrideAttrs { - dependencies = with self; [ telescope-fzy-native-nvim ]; + dependencies = with self; [ telescope-fzf-native-nvim ]; }; fzf-checkout-vim = super.fzf-checkout-vim.overrideAttrs { From 35cb7461589d87d8e78eeb25ec3a759223d22d34 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sun, 13 Aug 2023 13:55:26 +0300 Subject: [PATCH 081/110] mold: 2.0.0 -> 2.1.0 --- pkgs/development/tools/mold/default.nix | 14 +++-------- .../tools/mold/fix-debug-strip.patch | 23 ------------------- 2 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 pkgs/development/tools/mold/fix-debug-strip.patch diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index 8a83d0566465..18007e302a0d 100644 --- a/pkgs/development/tools/mold/default.nix +++ b/pkgs/development/tools/mold/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "mold"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "rui314"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dEmwVgo9XiU3WtObVL5VbFW7rEzdFfnRepcbyGxX1JM="; + hash = "sha256-4W6quVSkxS2I6KEy3fVyBTypD0fg4EecgeEVM0Yw58s="; }; nativeBuildInputs = [ @@ -34,14 +34,6 @@ stdenv.mkDerivation rec { mimalloc ]; - patches = [ - ./fix-debug-strip.patch # fix --debug-strip; https://github.com/rui314/mold/pull/1038 - ]; - - postPatch = '' - sed -i CMakeLists.txt -e '/.*set(DEST\ .*/d' - ''; - cmakeFlags = [ "-DMOLD_USE_SYSTEM_MIMALLOC:BOOL=ON" ]; @@ -66,7 +58,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/rui314/mold"; changelog = "https://github.com/rui314/mold/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ azahi nitsky ]; + maintainers = with maintainers; [ azahi nitsky paveloom ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/mold/fix-debug-strip.patch b/pkgs/development/tools/mold/fix-debug-strip.patch deleted file mode 100644 index 78906efc73ac..000000000000 --- a/pkgs/development/tools/mold/fix-debug-strip.patch +++ /dev/null @@ -1,23 +0,0 @@ -From b699b73451c57ac01c2680c0b86e1f56ca19e51c Mon Sep 17 00:00:00 2001 -From: Jakub Konka -Date: Sat, 6 May 2023 07:55:46 +0200 -Subject: [PATCH] Fix handling of --debug-strip - -Signed-off-by: Jakub Konka ---- - elf/cmdline.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/elf/cmdline.cc b/elf/cmdline.cc -index 3ac19f237..731af63ab 100644 ---- a/elf/cmdline.cc -+++ b/elf/cmdline.cc -@@ -994,7 +994,7 @@ std::vector parse_nonpositional_args(Context &ctx) { - } else if (read_flag("strip-all") || read_flag("s")) { - ctx.arg.strip_all = true; - } else if (read_flag("strip-debug") || read_flag("S")) { -- ctx.arg.strip_all = true; -+ ctx.arg.strip_debug = true; - } else if (read_flag("warn-unresolved-symbols")) { - ctx.arg.unresolved_symbols = UNRESOLVED_WARN; - } else if (read_flag("error-unresolved-symbols")) { From c3519508e0c8808ded4e7600a7f51ff86ced38bc Mon Sep 17 00:00:00 2001 From: oddlama Date: Sun, 13 Aug 2023 13:34:56 +0200 Subject: [PATCH 082/110] influxdb2-cli: specify meta.mainProgram to allow nix run --- pkgs/servers/nosql/influxdb2/cli.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/nosql/influxdb2/cli.nix b/pkgs/servers/nosql/influxdb2/cli.nix index ee60a8c46f4f..dc7395a7eb7f 100644 --- a/pkgs/servers/nosql/influxdb2/cli.nix +++ b/pkgs/servers/nosql/influxdb2/cli.nix @@ -29,5 +29,6 @@ in buildGoModule { license = licenses.mit; homepage = "https://influxdata.com/"; maintainers = with maintainers; [ abbradar danderson ]; + mainProgram = "influx"; }; } From a4f5b7b8ec8d038ac68cb627fcf016da8842107a Mon Sep 17 00:00:00 2001 From: Christoph Herzog Date: Sun, 13 Aug 2023 13:46:18 +0200 Subject: [PATCH 083/110] cargo-bolero: 0.8.0 -> 0.9.0 Upgrade cargo-bolero to 0.9.0 --- pkgs/development/tools/rust/cargo-bolero/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-bolero/default.nix b/pkgs/development/tools/rust/cargo-bolero/default.nix index 37f22bb925ce..15a3a28183a0 100644 --- a/pkgs/development/tools/rust/cargo-bolero/default.nix +++ b/pkgs/development/tools/rust/cargo-bolero/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bolero"; - version = "0.8.0"; + version = "0.9.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-j6fWCIXfVS5b3NZizhg9pI+kJkWlR1eGUSW9hJO1/mQ="; + sha256 = "sha256-BuqbM55P/st+4XUSCwrqILUUCfwvSlxhKQFO+IZLa8U="; }; - cargoSha256 = "sha256-ycvGw99CcE29axG9UWD0lkQp5kxD6Eguco5Fh9Vfj6E="; + cargoSha256 = "sha256-+TxMOKoId13meXqmr1QjDZMNqBnPEDQF1VSPheq8Ji0="; buildInputs = [ libbfd libopcodes libunwind ]; From b1f7d88470fd0f8451dffda281359a3621bdcc3d Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 12 Aug 2023 12:38:35 +0200 Subject: [PATCH 084/110] nifi: 1.22.0 -> 1.23.0 Fixes CVE-2023-36542, see https://nifi.apache.org/security.html#CVE-2023-36542 Release notes: https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-Version1.23.0 --- pkgs/servers/web-apps/nifi/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/nifi/default.nix b/pkgs/servers/web-apps/nifi/default.nix index 4b66484f7b27..7074fdbe4e8c 100644 --- a/pkgs/servers/web-apps/nifi/default.nix +++ b/pkgs/servers/web-apps/nifi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nifi"; - version = "1.22.0"; + version = "1.23.0"; src = fetchzip { url = "mirror://apache/nifi/${version}/nifi-${version}-bin.zip"; - hash = "sha256-IzTGsD6nL7UrXuHrJc8Dt1C6r137UjT/V4vES2m/8cg="; + hash = "sha256-IWmekIrWGvVTOX2MG+3EkX4phWzdrhxH5vNWpsrsrvM="; }; nativeBuildInputs = [ makeWrapper ]; @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { license = licenses.asl20; homepage = "https://nifi.apache.org"; platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = with maintainers; [ izorkin ]; }; } From 96e34513904e42f401cc642cbcf5ab37571ccaf3 Mon Sep 17 00:00:00 2001 From: esthromeris Date: Sun, 13 Aug 2023 14:05:09 +0200 Subject: [PATCH 085/110] fteqw: unstable-2022-08-09 -> unstable-2023-08-03 --- pkgs/games/fteqw/default.nix | 2 +- pkgs/games/fteqw/generic.nix | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/games/fteqw/default.nix b/pkgs/games/fteqw/default.nix index 984c558180fe..c4129d3974d6 100644 --- a/pkgs/games/fteqw/default.nix +++ b/pkgs/games/fteqw/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchsvn +, fetchFromGitHub , gzip , libvorbis , libmad diff --git a/pkgs/games/fteqw/generic.nix b/pkgs/games/fteqw/generic.nix index a420657ea578..a525cf5a6c44 100644 --- a/pkgs/games/fteqw/generic.nix +++ b/pkgs/games/fteqw/generic.nix @@ -1,5 +1,5 @@ { lib -, fetchsvn +, fetchFromGitHub , stdenv , libopus , xorg @@ -14,12 +14,13 @@ stdenv.mkDerivation { inherit pname buildFlags buildInputs nativeBuildInputs postFixup; - version = "unstable-2022-08-09"; + version = "unstable-2023-08-03"; - src = fetchsvn { - url = "https://svn.code.sf.net/p/fteqw/code/trunk"; - rev = "6303"; - sha256 = "sha256-tSTFX59iVUvndPRdREayKpkQ+YCYKCMQe2PXZfnTgPQ="; + src = fetchFromGitHub { + owner = "fte-team"; + repo = "fteqw"; + rev = "3adec5d0a53ba9ae32a92fc0a805cf6d5ec107fb"; + hash = "sha256-p/U02hwKI+YqlVXIS/7+gujknNDLr5L53unjvG5qLJU="; }; makeFlags = [ @@ -45,7 +46,7 @@ stdenv.mkDerivation { meta = with lib; { inherit description; - homepage = "https://fte.triptohell.info"; + homepage = "https://fteqw.org"; longDescription = '' FTE is a game engine baed on QuakeWorld able to play games such as Quake 1, 2, 3, and Hexen 2. From 4392a7e3bcaf5d076f6d8c8cf1dcee56462c5e18 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 13 Aug 2023 20:08:56 +0800 Subject: [PATCH 086/110] pantheon.elementary-default-settings: Backport picture-uri-dark changes --- .../elementary-default-settings/default.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index 6958547899fa..e3fd576a14e0 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , meson , ninja @@ -24,6 +25,23 @@ stdenv.mkDerivation rec { sha256 = "sha256-YFI1UM7CxjYkoIhSg9Fn81Ze6DX7D7p89xibk7ik8bI="; }; + patches = [ + # Don't set picture-uri-dark. elementary-gsettings-schemas won't + # aware of our custom remove-backgrounds.gschema.override so it + # will be a confusing invalid value otherwise (though gala actually + # can handle it well). + # https://github.com/elementary/default-settings/pull/282 + (fetchpatch { + url = "https://github.com/elementary/default-settings/commit/881f84b8316e549ab627b7ac9acf352e0346a1a4.patch"; + sha256 = "sha256-zf2Anr+ljLjHbn5ZmRj3nCRVJ52rwe4EkwdIfSOGeLQ="; + }) + # https://github.com/elementary/default-settings/pull/283 + (fetchpatch { + url = "https://github.com/elementary/default-settings/commit/37ef6062a8651875dd9d927c5730155c8b26e953.patch"; + sha256 = "sha256-u7rrwuHgMPn1eIyIuwJcBgy8SshaXgrgFTSNm8IHbaY="; + }) + ]; + nativeBuildInputs = [ accountsservice dbus From 07fec85bd90e66bb8f13cf19b00febf173743053 Mon Sep 17 00:00:00 2001 From: "Miao, ZhiCheng" Date: Sun, 13 Aug 2023 15:21:58 +0300 Subject: [PATCH 087/110] owncloud-client: 4.1.0 -> 4.2.0 --- pkgs/applications/networking/owncloud-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index c0b3d3c0f289..7da1a368d845 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "owncloud-client"; - version = "4.1.0"; + version = "4.2.0"; libregraph = callPackage ./libre-graph-api-cpp-qt-client.nix { }; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "owncloud"; repo = "client"; rev = "refs/tags/v${version}"; - hash = "sha256-L0xeLYzlonzNClOcijyucGdwgQHTS7TlczIyJGbVQ5E="; + hash = "sha256-dPNVp5DxCI4ye8eFjHoLGDlf8Ap682o1UB0k2VNr2rs="; }; nativeBuildInputs = [ pkg-config cmake extra-cmake-modules wrapQtAppsHook qttools ]; From 396095b811054b4110c253db955b65a79e318eb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E5=9D=82=E9=9B=85?= <23130178+ShadowRZ@users.noreply.github.com> Date: Sun, 13 Aug 2023 20:28:29 +0800 Subject: [PATCH 088/110] renpy: 8.1.0 -> 8.1.1 --- .../interpreters/renpy/default.nix | 10 ++-- .../renpy/renpy-system-fribidi.diff | 51 ------------------- .../python-modules/pygame_sdl2/default.nix | 2 +- 3 files changed, 7 insertions(+), 56 deletions(-) delete mode 100644 pkgs/development/interpreters/renpy/renpy-system-fribidi.diff diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 3d4ee70e7a04..4bbeb224ce3d 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -8,8 +8,8 @@ let # base_version is of the form major.minor.patch # vc_version is of the form YYMMDDCC # version corresponds to the tag on GitHub - base_version = "8.1.0"; - vc_version = "23051307"; + base_version = "8.1.1"; + vc_version = "23060707"; in stdenv.mkDerivation rec { pname = "renpy"; @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { owner = "renpy"; repo = "renpy"; rev = version; - sha256 = "sha256-5EU4jaBTU+a9UNHRs7xrKQ7ZivhDEqisO3l4W2E6F+c="; + sha256 = "sha256-aJ/MobZ6SNBYRC/EpUxAMLJ3pwK6PC92DV0YL/LF5Ew="; }; nativeBuildInputs = [ @@ -49,9 +49,11 @@ in stdenv.mkDerivation rec { cp tutorial/game/tutorial_director.rpy{m,} cat > renpy/vc_version.py << EOF - vc_version = ${vc_version} + version = '${version}' official = False nightly = False + # Look at https://renpy.org/latest.html for what to put. + version_name = 'Where No One Has Gone Before' EOF ''; diff --git a/pkgs/development/interpreters/renpy/renpy-system-fribidi.diff b/pkgs/development/interpreters/renpy/renpy-system-fribidi.diff deleted file mode 100644 index 8c93b75a7b0f..000000000000 --- a/pkgs/development/interpreters/renpy/renpy-system-fribidi.diff +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/module/renpybidicore.c b/module/renpybidicore.c -index 849430d..d883a52 100644 ---- a/module/renpybidicore.c -+++ b/module/renpybidicore.c -@@ -1,10 +1,6 @@ - #include - --#ifdef RENPY_BUILD - #include --#else --#include --#endif - - #include - -diff --git a/module/setup.py b/module/setup.py -index bd16816..f6b8794 100755 ---- a/module/setup.py -+++ b/module/setup.py -@@ -118,29 +118,17 @@ cython( - sdl + [ png, 'z', 'm' ]) - - FRIBIDI_SOURCES = """ --fribidi-src/lib/fribidi.c --fribidi-src/lib/fribidi-arabic.c --fribidi-src/lib/fribidi-bidi.c --fribidi-src/lib/fribidi-bidi-types.c --fribidi-src/lib/fribidi-deprecated.c --fribidi-src/lib/fribidi-joining.c --fribidi-src/lib/fribidi-joining-types.c --fribidi-src/lib/fribidi-mem.c --fribidi-src/lib/fribidi-mirroring.c --fribidi-src/lib/fribidi-run.c --fribidi-src/lib/fribidi-shape.c - renpybidicore.c - """.split() - cython( - "_renpybidi", - FRIBIDI_SOURCES, -+ ["fribidi"], - includes=[ -- BASE + "/fribidi-src/", -- BASE + "/fribidi-src/lib/", -+ "@fribidi@/include/fribidi/", - ], - define_macros=[ - ("FRIBIDI_ENTRY", ""), -- ("HAVE_CONFIG_H", "1"), - ]) - - if not (android or ios or emscripten): diff --git a/pkgs/development/python-modules/pygame_sdl2/default.nix b/pkgs/development/python-modules/pygame_sdl2/default.nix index 318683f04815..bf123eef02a5 100644 --- a/pkgs/development/python-modules/pygame_sdl2/default.nix +++ b/pkgs/development/python-modules/pygame_sdl2/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchurl { url = "https://www.renpy.org/dl/${renpy_version}/pygame_sdl2-${version}-for-renpy-${renpy_version}.tar.gz"; - hash = "sha256-smJsOVavMvy0aO3C5PC050LlOy5bsG45uWSMbbFMQ+I="; + hash = "sha256-u9DIFKd+uyphH3ETMJWYqt7YFyeIgBWoXUO3rC+RWjc="; }; # force rebuild of headers needed for install From 3907af83872c48b8d26e92e0c52791679a8e28de Mon Sep 17 00:00:00 2001 From: aleksana Date: Mon, 7 Aug 2023 13:22:31 +0800 Subject: [PATCH 089/110] fm: init at unstable-2023-07-25 --- .../applications/file-managers/fm/default.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/applications/file-managers/fm/default.nix diff --git a/pkgs/applications/file-managers/fm/default.nix b/pkgs/applications/file-managers/fm/default.nix new file mode 100644 index 000000000000..9c13e7f42b96 --- /dev/null +++ b/pkgs/applications/file-managers/fm/default.nix @@ -0,0 +1,45 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, wrapGAppsHook4 +, libadwaita +, libpanel +, gtksourceview5 +, poppler +}: + +rustPlatform.buildRustPackage { + pname = "fm"; + version = "unstable-2023-07-25"; + + src = fetchFromGitHub { + owner = "euclio"; + repo = "fm"; + rev = "a0830b5483a48a8b1e40982f20c28dcb5bfe4a6e"; + hash = "sha256-uso7j+bf6PF5wiTzSJymSxNNfzqXVcJygkfGdzQl4xA="; + }; + + cargoHash = "sha256-3IxpnDYbfLI1VAMgqIE4eSkiT9Z6HcC3K6MH6uqD9Ic="; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + libadwaita + libpanel + gtksourceview5 + poppler + ]; + + meta = with lib; { + description = "Small, general purpose file manager built with GTK4"; + homepage = "https://github.com/euclio/fm"; + license = licenses.mit; + maintainers = with maintainers; [ aleksana ]; + mainProgram = "fm"; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82263ec20900..6a3f86eadd96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1740,6 +1740,8 @@ with pkgs; fabs = callPackage ../tools/backup/fabs { }; + fm = callPackage ../applications/file-managers/fm { }; + fm-tune = callPackage ../applications/radio/fm-tune { }; fwbuilder = libsForQt5.callPackage ../tools/security/fwbuilder { }; From 8f5cb9e132367b3390fd6e462ff23115c1013efc Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 13 Aug 2023 14:45:43 +0200 Subject: [PATCH 090/110] notesnook: update darwin hash --- pkgs/applications/misc/notesnook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/notesnook/default.nix b/pkgs/applications/misc/notesnook/default.nix index 8206b4815b9a..cb39e26994f5 100644 --- a/pkgs/applications/misc/notesnook/default.nix +++ b/pkgs/applications/misc/notesnook/default.nix @@ -17,8 +17,8 @@ let url = "https://github.com/streetwriters/notesnook/releases/download/v${version}/notesnook_${suffix}"; hash = { x86_64-linux = "sha256-PLHP1Q4+xcHyr0323K4BD+oH57SspsrAcxRe/C6RFDU="; - x86_64-darwin = "sha256-cluIizmweIMU6RIFxoEQ3DYChRVEuVLxrPjwfFfeq1w="; - aarch64-darwin = "sha256-cbBnKrb8poyDL1D+32UrOl3RXt8Msncw440qra9+Gs0="; + x86_64-darwin = "sha256-gOUL3qLSM+/pr519Gc0baUtbmhA40lG6XzuCRyGILkc="; + aarch64-darwin = "sha256-d1nXdCv1mK4+4Gef1upIkHS3J2d9qzTLXbBWabsJwpw="; }.${system} or throwSystem; }; From 3a034cb60a9cd9fc8711b0c6f89183ca5efa6c30 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Mon, 8 May 2023 14:30:45 +0200 Subject: [PATCH 091/110] yubioath-flutter: 6.1.0 -> 6.2.0 --- pkgs/applications/misc/yubioath-flutter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix index d98021bf6e2e..7a619c4573dd 100644 --- a/pkgs/applications/misc/yubioath-flutter/default.nix +++ b/pkgs/applications/misc/yubioath-flutter/default.nix @@ -10,13 +10,13 @@ flutter37.buildFlutterApplication rec { pname = "yubioath-flutter"; - version = "6.1.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "Yubico"; repo = "yubioath-flutter"; rev = version; - sha256 = "sha256-N9/qwC79mG9r+zMPLHSPjNSQ+srGtnXuKsf0ijtH7CI="; + hash = "sha256-NgzijuvyWNl9sFQzq1Jzk1povF8c/rKuVyVKeve+Vic="; }; passthru.helper = python3.pkgs.callPackage ./helper.nix { inherit src version meta; }; From 91f441cf77e4495bf26bb35c12ac91f350473bbc Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Tue, 9 May 2023 11:28:33 +0200 Subject: [PATCH 092/110] yubioath-flutter: Relax python deps in helper --- pkgs/applications/misc/yubioath-flutter/helper.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/misc/yubioath-flutter/helper.nix b/pkgs/applications/misc/yubioath-flutter/helper.nix index e40f6a78c862..77dd379b6dc8 100644 --- a/pkgs/applications/misc/yubioath-flutter/helper.nix +++ b/pkgs/applications/misc/yubioath-flutter/helper.nix @@ -1,4 +1,5 @@ { buildPythonApplication +, python3 , poetry-core , yubikey-manager , fido2 @@ -19,6 +20,12 @@ buildPythonApplication { sourceRoot = "${src.name}/helper"; format = "pyproject"; + nativeBuildInputs = [ + python3.pkgs.pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ "yubikey-manager" ]; + postPatch = '' sed -i \ -e 's,zxing-cpp = .*,zxing-cpp = "*",g' \ From 895889fffa4e6ab2be74ccdd01d0bc23615d6444 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 13 Aug 2023 13:36:48 +0100 Subject: [PATCH 093/110] yubioath-flutter.helper: relax all dependencies --- pkgs/applications/misc/yubioath-flutter/helper.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/yubioath-flutter/helper.nix b/pkgs/applications/misc/yubioath-flutter/helper.nix index 77dd379b6dc8..ca0bf4472a4c 100644 --- a/pkgs/applications/misc/yubioath-flutter/helper.nix +++ b/pkgs/applications/misc/yubioath-flutter/helper.nix @@ -24,15 +24,12 @@ buildPythonApplication { python3.pkgs.pythonRelaxDepsHook ]; - pythonRelaxDeps = [ "yubikey-manager" ]; + pythonRelaxDeps = true; postPatch = '' - sed -i \ - -e 's,zxing-cpp = .*,zxing-cpp = "*",g' \ - -e 's,mss = .*,mss = "*",g' \ - -e 's,yubikey-manager = .*,yubikey-manager = "*",g' \ - -e 's,Pillow = .*,Pillow = "*",g' \ - pyproject.toml + substituteInPlace pyproject.toml \ + --replace "authenticator-helper" "yubioath-flutter-helper" \ + --replace "0.1.0" "${version}" ''; postInstall = '' From f802e332156140f5416a86ac92fd64a4e4f76842 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 13 Aug 2023 13:37:37 +0100 Subject: [PATCH 094/110] yubioath-flutter: update deps and deps hash --- .../misc/yubioath-flutter/default.nix | 2 +- .../misc/yubioath-flutter/deps.json | 459 ++++++++++++------ 2 files changed, 318 insertions(+), 143 deletions(-) diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix index 7a619c4573dd..77e90802949e 100644 --- a/pkgs/applications/misc/yubioath-flutter/default.nix +++ b/pkgs/applications/misc/yubioath-flutter/default.nix @@ -22,7 +22,7 @@ flutter37.buildFlutterApplication rec { passthru.helper = python3.pkgs.callPackage ./helper.nix { inherit src version meta; }; depsListFile = ./deps.json; - vendorHash = "sha256-WfZiB7MO4wHUg81xm67BMu4zQdC9CfhN5BQol+AI2S8="; + vendorHash = "sha256-q/dNj9Pu7zg0HkV2QkXBbXiTsljsSJOqXhvAQlnoLlA="; postPatch = '' substituteInPlace linux/CMakeLists.txt \ diff --git a/pkgs/applications/misc/yubioath-flutter/deps.json b/pkgs/applications/misc/yubioath-flutter/deps.json index 1ce525f799bd..6d7414da346e 100644 --- a/pkgs/applications/misc/yubioath-flutter/deps.json +++ b/pkgs/applications/misc/yubioath-flutter/deps.json @@ -1,7 +1,7 @@ [ { "name": "yubico_authenticator", - "version": "6.1.0+60100", + "version": "6.2.0+60200", "kind": "root", "source": "root", "dependencies": [ @@ -17,8 +17,18 @@ "freezed_annotation", "window_manager", "qrscanner_zxing", + "screen_retriever", "desktop_drop", "url_launcher", + "path_provider", + "vector_graphics", + "vector_graphics_compiler", + "path", + "file_picker", + "archive", + "crypto", + "tray_manager", + "local_notifier", "integration_test", "flutter_test", "flutter_lints", @@ -29,7 +39,7 @@ }, { "name": "json_serializable", - "version": "6.5.4", + "version": "6.6.1", "kind": "dev", "source": "hosted", "dependencies": [ @@ -60,7 +70,7 @@ }, { "name": "source_gen", - "version": "1.2.6", + "version": "1.2.7", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -69,7 +79,6 @@ "build", "dart_style", "glob", - "meta", "path", "source_span", "yaml" @@ -116,7 +125,7 @@ { "name": "path", "version": "1.8.2", - "kind": "transitive", + "kind": "direct", "source": "hosted", "dependencies": [] }, @@ -127,16 +136,9 @@ "source": "hosted", "dependencies": [] }, - { - "name": "meta", - "version": "1.8.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [] - }, { "name": "glob", - "version": "2.1.0", + "version": "2.1.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -157,6 +159,13 @@ "path" ] }, + { + "name": "meta", + "version": "1.8.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, { "name": "async", "version": "2.10.0", @@ -192,14 +201,14 @@ }, { "name": "args", - "version": "2.3.1", + "version": "2.4.0", "kind": "transitive", "source": "hosted", "dependencies": [] }, { "name": "analyzer", - "version": "5.2.0", + "version": "5.6.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -239,7 +248,7 @@ { "name": "crypto", "version": "3.0.2", - "kind": "transitive", + "kind": "direct", "source": "hosted", "dependencies": [ "typed_data" @@ -265,7 +274,7 @@ }, { "name": "_fe_analyzer_shared", - "version": "50.0.0", + "version": "54.0.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -290,7 +299,7 @@ }, { "name": "logging", - "version": "1.1.0", + "version": "1.1.1", "kind": "direct", "source": "hosted", "dependencies": [] @@ -310,7 +319,7 @@ }, { "name": "json_annotation", - "version": "4.7.0", + "version": "4.8.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -319,7 +328,7 @@ }, { "name": "checked_yaml", - "version": "2.0.1", + "version": "2.0.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -412,7 +421,7 @@ }, { "name": "web_socket_channel", - "version": "2.2.0", + "version": "2.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -432,7 +441,7 @@ }, { "name": "timing", - "version": "1.0.0", + "version": "1.0.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -504,7 +513,7 @@ }, { "name": "mime", - "version": "1.0.3", + "version": "1.0.4", "kind": "transitive", "source": "hosted", "dependencies": [] @@ -520,7 +529,7 @@ }, { "name": "io", - "version": "1.0.3", + "version": "1.0.4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -559,7 +568,7 @@ }, { "name": "code_builder", - "version": "4.3.0", + "version": "4.4.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -582,7 +591,7 @@ }, { "name": "built_value", - "version": "8.4.2", + "version": "8.4.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -594,7 +603,7 @@ }, { "name": "fixnum", - "version": "1.0.1", + "version": "1.1.0", "kind": "transitive", "source": "hosted", "dependencies": [] @@ -634,13 +643,14 @@ }, { "name": "build_resolvers", - "version": "2.1.0", + "version": "2.2.0", "kind": "transitive", "source": "hosted", "dependencies": [ "analyzer", "async", "build", + "collection", "crypto", "graphs", "logging", @@ -654,7 +664,7 @@ }, { "name": "build_daemon", - "version": "3.1.0", + "version": "3.1.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -861,7 +871,7 @@ { "name": "archive", "version": "3.3.2", - "kind": "transitive", + "kind": "direct", "source": "hosted", "dependencies": [ "crypto", @@ -945,44 +955,86 @@ ] }, { - "name": "url_launcher", - "version": "6.1.7", + "name": "local_notifier", + "version": "0.1.5", "kind": "direct", "source": "hosted", "dependencies": [ "flutter", - "url_launcher_android", - "url_launcher_ios", - "url_launcher_linux", - "url_launcher_macos", - "url_launcher_platform_interface", - "url_launcher_web", - "url_launcher_windows" + "uuid" ] }, { - "name": "url_launcher_windows", - "version": "3.0.1", + "name": "uuid", + "version": "3.0.7", "kind": "transitive", "source": "hosted", "dependencies": [ - "flutter", - "url_launcher_platform_interface" + "crypto" ] }, { - "name": "url_launcher_platform_interface", - "version": "2.1.1", - "kind": "transitive", + "name": "tray_manager", + "version": "0.2.0", + "kind": "direct", "source": "hosted", "dependencies": [ "flutter", - "plugin_platform_interface" + "menu_base", + "path", + "shortid" ] }, + { + "name": "shortid", + "version": "0.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "menu_base", + "version": "0.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "file_picker", + "version": "5.2.7", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "flutter_plugin_android_lifecycle", + "plugin_platform_interface", + "ffi", + "path", + "win32" + ] + }, + { + "name": "win32", + "version": "3.1.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "ffi" + ] + }, + { + "name": "ffi", + "version": "2.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, { "name": "plugin_platform_interface", - "version": "2.1.3", + "version": "2.1.4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -990,14 +1042,12 @@ ] }, { - "name": "url_launcher_web", - "version": "2.0.13", + "name": "flutter_plugin_android_lifecycle", + "version": "2.0.7", "kind": "transitive", "source": "hosted", "dependencies": [ - "flutter", - "flutter_web_plugins", - "url_launcher_platform_interface" + "flutter" ] }, { @@ -1015,9 +1065,198 @@ "vector_math" ] }, + { + "name": "vector_graphics_compiler", + "version": "1.1.4", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "args", + "meta", + "path_parsing", + "xml", + "vector_graphics_codec" + ] + }, + { + "name": "vector_graphics_codec", + "version": "1.1.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "xml", + "version": "6.2.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta", + "petitparser" + ] + }, + { + "name": "petitparser", + "version": "5.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "path_parsing", + "version": "1.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "vector_math", + "meta" + ] + }, + { + "name": "vector_graphics", + "version": "1.1.4", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "vector_graphics_codec" + ] + }, + { + "name": "path_provider", + "version": "2.0.14", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "path_provider_android", + "path_provider_foundation", + "path_provider_linux", + "path_provider_platform_interface", + "path_provider_windows" + ] + }, + { + "name": "path_provider_windows", + "version": "2.1.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "ffi", + "flutter", + "path", + "path_provider_platform_interface", + "win32" + ] + }, + { + "name": "path_provider_platform_interface", + "version": "2.0.6", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "platform", + "plugin_platform_interface" + ] + }, + { + "name": "path_provider_linux", + "version": "2.1.9", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "ffi", + "flutter", + "path", + "path_provider_platform_interface", + "xdg_directories" + ] + }, + { + "name": "xdg_directories", + "version": "1.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "path", + "process" + ] + }, + { + "name": "path_provider_foundation", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "path_provider_platform_interface" + ] + }, + { + "name": "path_provider_android", + "version": "2.0.22", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "path_provider_platform_interface" + ] + }, + { + "name": "url_launcher", + "version": "6.1.10", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_android", + "url_launcher_ios", + "url_launcher_linux", + "url_launcher_macos", + "url_launcher_platform_interface", + "url_launcher_web", + "url_launcher_windows" + ] + }, + { + "name": "url_launcher_windows", + "version": "3.0.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_platform_interface" + ] + }, + { + "name": "url_launcher_platform_interface", + "version": "2.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, + { + "name": "url_launcher_web", + "version": "2.0.15", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "url_launcher_platform_interface" + ] + }, { "name": "url_launcher_macos", - "version": "3.0.1", + "version": "3.0.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1027,7 +1266,7 @@ }, { "name": "url_launcher_linux", - "version": "3.0.1", + "version": "3.0.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1037,7 +1276,7 @@ }, { "name": "url_launcher_ios", - "version": "6.0.17", + "version": "6.1.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1047,7 +1286,7 @@ }, { "name": "url_launcher_android", - "version": "6.0.22", + "version": "6.0.24", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1057,7 +1296,7 @@ }, { "name": "desktop_drop", - "version": "0.4.0", + "version": "0.4.1", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1068,7 +1307,7 @@ }, { "name": "cross_file", - "version": "0.3.3+2", + "version": "0.3.3+4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1076,6 +1315,15 @@ "meta" ] }, + { + "name": "screen_retriever", + "version": "0.1.6", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, { "name": "qrscanner_zxing", "version": "1.0.0", @@ -1088,7 +1336,7 @@ }, { "name": "window_manager", - "version": "0.3.0", + "version": "0.3.2", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1097,18 +1345,9 @@ "screen_retriever" ] }, - { - "name": "screen_retriever", - "version": "0.1.4", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter" - ] - }, { "name": "flutter_riverpod", - "version": "2.1.3", + "version": "2.3.2", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1130,7 +1369,7 @@ }, { "name": "riverpod", - "version": "2.1.3", + "version": "2.3.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1142,7 +1381,7 @@ }, { "name": "shared_preferences", - "version": "2.0.16", + "version": "2.1.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1157,7 +1396,7 @@ }, { "name": "shared_preferences_windows", - "version": "2.1.1", + "version": "2.2.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1171,7 +1410,7 @@ }, { "name": "shared_preferences_platform_interface", - "version": "2.1.0", + "version": "2.2.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1179,49 +1418,9 @@ "plugin_platform_interface" ] }, - { - "name": "path_provider_windows", - "version": "2.1.3", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "ffi", - "flutter", - "path", - "path_provider_platform_interface", - "win32" - ] - }, - { - "name": "win32", - "version": "3.1.2", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "ffi" - ] - }, - { - "name": "ffi", - "version": "2.0.1", - "kind": "transitive", - "source": "hosted", - "dependencies": [] - }, - { - "name": "path_provider_platform_interface", - "version": "2.0.5", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "platform", - "plugin_platform_interface" - ] - }, { "name": "shared_preferences_web", - "version": "2.0.4", + "version": "2.1.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1232,7 +1431,7 @@ }, { "name": "shared_preferences_linux", - "version": "2.1.1", + "version": "2.2.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1244,33 +1443,9 @@ "shared_preferences_platform_interface" ] }, - { - "name": "path_provider_linux", - "version": "2.1.7", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "ffi", - "flutter", - "path", - "path_provider_platform_interface", - "xdg_directories" - ] - }, - { - "name": "xdg_directories", - "version": "0.2.0+2", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "meta", - "path", - "process" - ] - }, { "name": "shared_preferences_foundation", - "version": "2.1.1", + "version": "2.2.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1280,7 +1455,7 @@ }, { "name": "shared_preferences_android", - "version": "2.0.14", + "version": "2.1.0", "kind": "transitive", "source": "hosted", "dependencies": [ From 1bc43577f32c53bab984cbe9808a997125a7932b Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 13 Aug 2023 13:37:49 +0100 Subject: [PATCH 095/110] yubioath-flutter: add libnotify and libappindicator dependencies --- pkgs/applications/misc/yubioath-flutter/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix index 77e90802949e..326e03721ece 100644 --- a/pkgs/applications/misc/yubioath-flutter/default.nix +++ b/pkgs/applications/misc/yubioath-flutter/default.nix @@ -3,6 +3,9 @@ , python3 , fetchFromGitHub , pcre2 +, libnotify +, libappindicator +, pkg-config , gnome , makeWrapper , removeReferencesTo @@ -68,10 +71,13 @@ flutter37.buildFlutterApplication rec { nativeBuildInputs = [ makeWrapper removeReferencesTo + pkg-config ]; buildInputs = [ pcre2 + libnotify + libappindicator ]; disallowedReferences = [ From 59dc8ca70e1e25af2490c01a58a2f8893c756427 Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sun, 13 Aug 2023 21:59:12 +0900 Subject: [PATCH 096/110] perlPackages.FinanceQuote: 1.57 -> 1.58 Diff: https://github.com/finance-quote/finance-quote/compare/v1.57...v1.58 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 62a3e6e586af..aff0e71fcca1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9953,10 +9953,10 @@ with self; { FinanceQuote = buildPerlPackage rec { pname = "Finance-Quote"; - version = "1.57"; + version = "1.58"; src = fetchurl { url = "mirror://cpan/authors/id/B/BP/BPSCHUCK/Finance-Quote-${version}.tar.gz"; - hash = "sha256-dm7dUw+RRp+MGiU6nVs4jX167PTMiihFL0SHASOTQs4="; + hash = "sha256-jN3qDTgJo2aVzuaaKGK+qs1hU1f+uv23JkGnerRna4A="; }; buildInputs = [ DateManip DateRange DateSimple DateTime DateTimeFormatISO8601 StringUtil TestKwalitee TestPerlCritic TestPod TestPodCoverage ]; propagatedBuildInputs = [ DateManip DateTimeFormatStrptime Encode HTMLTableExtract HTMLTokeParserSimple HTMLTree HTMLTreeBuilderXPath HTTPCookies JSON IOCompress IOString LWPProtocolHttps Readonly StringUtil SpreadsheetXLSX TextTemplate TryTiny WebScraper XMLLibXML libwwwperl ]; From 0305a6950d54b457c45ffca4850c2dd68aaea663 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Aug 2023 13:10:34 +0000 Subject: [PATCH 097/110] unciv: 4.7.11 -> 4.7.13 --- pkgs/games/unciv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index e0cf519acccb..d5a884a01381 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.7.11"; + version = "4.7.13"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-1QMfGONaw6XX3F2bo5tBghJbnii7z6RE+ZuanIGUF8Q="; + hash = "sha256-KvRDPu2FZY+iZ2vNi/tly/7/Tpg/EN8jHTKizYV5jeY="; }; dontUnpack = true; From f0a3451322f130a516ebe861c45d6955a2a00ab1 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Thu, 10 Aug 2023 14:30:00 +0200 Subject: [PATCH 098/110] jc: add shell completions --- pkgs/development/python-modules/jc/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index 5fdc44912319..cd6f4060fc96 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -1,6 +1,9 @@ { lib +, stdenv +, buildPackages , buildPythonPackage , fetchFromGitHub +, installShellFiles , ruamel-yaml , xmltodict , pygments @@ -22,6 +25,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ]; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = let emulator = stdenv.hostPlatform.emulator buildPackages; in '' + installShellCompletion --cmd jc \ + --bash <(${emulator} $out/bin/jc --bash-comp) \ + --zsh <(${emulator} $out/bin/jc --zsh-comp) + ''; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "jc" ]; From 19cd58a6ca6153a62139128e93876d5e6e703b62 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 13 Aug 2023 14:09:58 +0100 Subject: [PATCH 099/110] flutter37: fix skyNotice hash for version 1a65d409c7a1438a34d21b60bf30a6fd5db59314 Using fetchurl like this means that, if you build the `flutter` derivation first, you will get a file named "LICENSE" in your store with the correct hash. `flutter37` will then build because this file is already in your store, even though the LICENSE to which _it_ refers is different. This is dangerous in this case - but an intentional design decision in the way fetchurl works to allow artifacts which are the same to be fetched from arbitrary sources, or even pre-populated into the store. To avoid this, explicitly tag the fetchurl with a name and the commit hash we're fetching from. This means we _must_ fetch these separately for each flutter version and avoids the problem of accidentally reusing artifacts for a different build. --- .../compilers/flutter/engine-artifacts/default.nix | 4 ++++ .../development/compilers/flutter/engine-artifacts/hashes.nix | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/flutter/engine-artifacts/default.nix b/pkgs/development/compilers/flutter/engine-artifacts/default.nix index 41201bdb94e5..603b1456018d 100644 --- a/pkgs/development/compilers/flutter/engine-artifacts/default.nix +++ b/pkgs/development/compilers/flutter/engine-artifacts/default.nix @@ -19,10 +19,14 @@ let version = engineVersion; dontUnpack = true; src = fetchurl { + pname = "flutter-sky_engine-LICENSE"; + version = engineVersion; url = "https://raw.githubusercontent.com/flutter/engine/${engineVersion}/sky/packages/sky_engine/LICENSE"; sha256 = hashes.skyNotice; }; flutterNotice = fetchurl { + pname = "flutter-LICENSE"; + version = engineVersion; url = "https://raw.githubusercontent.com/flutter/flutter/${flutterVersion}/LICENSE"; sha256 = hashes.flutterNotice; }; diff --git a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix index f51e43b2474f..1c8a5dc4059f 100644 --- a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix +++ b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix @@ -1,6 +1,6 @@ { "1a65d409c7a1438a34d21b60bf30a6fd5db59314" = { - skyNotice = "sha256-n9B26rLlfUqdR6s+2+PNK4H/fN95UE0T7/Vic19W6yo="; + skyNotice = "sha256-+EitMZAAvJ1mIlfm5ZTfY+pk8tfyu33XM7P8qOdj+J8="; flutterNotice = "sha256-pZjblLYpD/vhC17PkRBXtqlDNRxyf92p5fKJHWhwCiA="; android-arm = { "artifacts.zip" = "sha256-KDMiI6SQoZHfFV5LJJZ7VOGyEKC4UxzRc777j4BbXgM="; From 5a5a16c3e073cf73f526febf3c86932f27b07242 Mon Sep 17 00:00:00 2001 From: sbock Date: Sun, 13 Aug 2023 15:23:38 +0200 Subject: [PATCH 100/110] pico-sdk: fix homepage link points to pkg source The homepage linked for the package differed from the actual package source. --- pkgs/development/libraries/pico-sdk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/pico-sdk/default.nix b/pkgs/development/libraries/pico-sdk/default.nix index 12b4cb021c1f..cd860c3629f0 100644 --- a/pkgs/development/libraries/pico-sdk/default.nix +++ b/pkgs/development/libraries/pico-sdk/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/raspberrypi/picotool"; + homepage = "https://github.com/raspberrypi/pico-sdk"; description = "SDK provides the headers, libraries and build system necessary to write programs for the RP2040-based devices"; license = licenses.bsd3; maintainers = with maintainers; [ muscaln ]; From 33da3909e7d6c9685199b4c5e7106a01981664a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Sun, 13 Aug 2023 16:17:18 +0200 Subject: [PATCH 101/110] kamilalisp: 0.2p -> 0.3.0.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christina Sørensen --- pkgs/development/interpreters/kamilalisp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/kamilalisp/default.nix b/pkgs/development/interpreters/kamilalisp/default.nix index 9b990afaa57f..e0554e10b421 100644 --- a/pkgs/development/interpreters/kamilalisp/default.nix +++ b/pkgs/development/interpreters/kamilalisp/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "kamilalisp"; - version = "0.2p"; + version = "0.3.0.1"; src = fetchurl { - url = "https://github.com/kspalaiologos/kamilalisp/releases/download/v${version}/kamilalisp-${lib.versions.majorMinor version}.jar"; - hash = "sha256-6asl9zRTidDxWsgIRxUA1ygYug/aqiQ5XAEwWYNOfKE="; + url = "https://github.com/kspalaiologos/kamilalisp/releases/download/v${version}/kamilalisp-${version}.jar"; + hash = "sha256-SW0U483eHptkYw+yJV/2cImfK3uEjkl8ma54yeagF6s="; }; dontUnpack = true; From c5f4a460368cd1d43c41a72a2523f689ee29e398 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Wed, 3 May 2023 10:43:17 +0200 Subject: [PATCH 102/110] nixos/opensnitch: Add support for EPBF process monitor Co-authored-by: Slime90 --- .../manual/release-notes/rl-2311.section.md | 2 + .../modules/services/security/opensnitch.nix | 14 ++++- .../linux/opensnitch-ebpf/default.nix | 58 +++++++++++++++++++ pkgs/tools/networking/opensnitch/daemon.nix | 6 +- pkgs/top-level/linux-kernels.nix | 2 + 5 files changed, 76 insertions(+), 6 deletions(-) create mode 100644 pkgs/os-specific/linux/opensnitch-ebpf/default.nix diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index e7d404960dac..f6e80cf4957a 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -174,6 +174,8 @@ - `services.fail2ban.jails` can now be configured with attribute sets defining settings and filters instead of lines. The stringed options `daemonConfig` and `extraSettings` have respectively been replaced by `daemonSettings` and `jails.DEFAULT.settings` which use attribute sets. +- The application firewall `opensnitch` now uses the process monitor method eBPF as default as recommended by upstream. The method can be changed with the setting [services.opensnitch.settings.ProcMonitorMethod](#opt-services.opensnitch.settings.ProcMonitorMethod). + - The module [services.ankisyncd](#opt-services.ankisyncd.package) has been switched to [anki-sync-server-rs](https://github.com/ankicommunity/anki-sync-server-rs) from the old python version, which was difficult to update, had not been updated in a while, and did not support recent versions of anki. Unfortunately all servers supporting new clients (newer version of anki-sync-server, anki's built in sync server and this new rust package) do not support the older sync protocol that was used in the old server, so such old clients will also need updating and in particular the anki package in nixpkgs is also being updated in this release. The module update takes care of the new config syntax and the data itself (user login and cards) are compatible, so users of the module will be able to just log in again after updating both client and server without any extra action. diff --git a/nixos/modules/services/security/opensnitch.nix b/nixos/modules/services/security/opensnitch.nix index 98695b1ef060..013aeb16756c 100644 --- a/nixos/modules/services/security/opensnitch.nix +++ b/nixos/modules/services/security/opensnitch.nix @@ -147,7 +147,7 @@ in { config = mkIf cfg.enable { # pkg.opensnitch is referred to elsewhere in the module so we don't need to worry about it being garbage collected - services.opensnitch.settings = mapAttrs (_: v: mkDefault v) (builtins.fromJSON (builtins.unsafeDiscardStringContext (builtins.readFile "${pkgs.opensnitch}/etc/default-config.json"))); + services.opensnitch.settings = mapAttrs (_: v: mkDefault v) (builtins.fromJSON (builtins.unsafeDiscardStringContext (builtins.readFile "${pkgs.opensnitch}/etc/opensnitchd/default-config.json"))); systemd = { packages = [ pkgs.opensnitch ]; @@ -171,9 +171,19 @@ in { ${concatMapStrings ({ file, local }: '' ln -sf '${file}' "${local}" '') rules} + + if [ ! -f /etc/opensnitch-system-fw.json ]; then + cp "${pkgs.opensnitch}/etc/opensnitchd/system-fw.json" "/etc/opensnitchd/system-fw.json" + fi ''); - environment.etc."opensnitchd/default-config.json".source = format.generate "default-config.json" cfg.settings; + environment.etc = mkMerge [ ({ + "opensnitchd/default-config.json".source = format.generate "default-config.json" cfg.settings; + }) (mkIf (cfg.settings.ProcMonitorMethod == "ebpf") { + "opensnitchd/opensnitch.o".source = "${config.boot.kernelPackages.opensnitch-ebpf}/etc/opensnitchd/opensnitch.o"; + "opensnitchd/opensnitch-dns.o".source = "${config.boot.kernelPackages.opensnitch-ebpf}/etc/opensnitchd/opensnitch-dns.o"; + "opensnitchd/opensnitch-procs.o".source = "${config.boot.kernelPackages.opensnitch-ebpf}/etc/opensnitchd/opensnitch-procs.o"; + })]; }; } diff --git a/pkgs/os-specific/linux/opensnitch-ebpf/default.nix b/pkgs/os-specific/linux/opensnitch-ebpf/default.nix new file mode 100644 index 000000000000..70332abbe6ef --- /dev/null +++ b/pkgs/os-specific/linux/opensnitch-ebpf/default.nix @@ -0,0 +1,58 @@ +{ lib +, kernel +, stdenv +, clang-tools +, llvmPackages +, elfutils +, flex +, bison +, bc +, opensnitch +}: + +stdenv.mkDerivation rec { + pname = "opensnitch_ebpf"; + version = "${opensnitch.version}-${kernel.version}"; + + inherit (opensnitch) src; + + sourceRoot = "source/ebpf_prog"; + + nativeBuildInputs = with llvmPackages; [ + bc + bison + clang + clang-tools + elfutils + flex + libllvm + ]; + + # We set -fno-stack-protector here to work around a clang regression. + # This is fine - bpf programs do not use stack protectors + # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=opensnitch-ebpf-module&id=984b952a784eb701f691dd9f2d45dfeb8d15053b + env.NIX_CFLAGS_COMPILE = "-fno-stack-protector"; + + env.KERNEL_DIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"; + env.KERNEL_HEADERS="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; + + extraConfig ='' + CONFIG_UPROBE_EVENTS=y + ''; + + installPhase = '' + runHook preInstall + for file in opensnitch*.o; do + install -Dm644 "$file" "$out/etc/opensnitchd/$file" + done + runHook postInstall + ''; + + meta = with lib; { + description = "eBPF process monitor module for OpenSnitch"; + homepage = "https://github.com/evilsocket/opensnitch"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ onny ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/opensnitch/daemon.nix b/pkgs/tools/networking/opensnitch/daemon.nix index 36c8739781df..86bc8a604142 100644 --- a/pkgs/tools/networking/opensnitch/daemon.nix +++ b/pkgs/tools/networking/opensnitch/daemon.nix @@ -56,10 +56,8 @@ buildGoModule rec { mv $GOPATH/bin/daemon $GOPATH/bin/opensnitchd mkdir -p $out/etc/opensnitchd $out/lib/systemd/system cp system-fw.json $out/etc/opensnitchd/ - substitute default-config.json $out/etc/default-config.json \ - --replace "/var/log/opensnitchd.log" "/dev/stdout" \ - --replace "iptables" "nftables" \ - --replace "ebpf" "proc" + substitute default-config.json $out/etc/opensnitchd/default-config.json \ + --replace "/var/log/opensnitchd.log" "/dev/stdout" substitute opensnitchd.service $out/lib/systemd/system/opensnitchd.service \ --replace "/usr/local/bin/opensnitchd" "$out/bin/opensnitchd" \ --replace "/etc/opensnitchd/rules" "/var/lib/opensnitch/rules" \ diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index c813e7d6e0fb..c68f0345f112 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -450,6 +450,8 @@ in { # Current stable release; don't backport release updates! openafs = openafs_1_8; + opensnitch-ebpf = if lib.versionAtLeast kernel.version "5.10" then callPackage ../os-specific/linux/opensnitch-ebpf { } else null; + facetimehd = callPackage ../os-specific/linux/facetimehd { }; tuxedo-keyboard = if lib.versionAtLeast kernel.version "4.14" then callPackage ../os-specific/linux/tuxedo-keyboard { } else null; From d999615d005cd77829dd75d8f69b2dc4a57b78bf Mon Sep 17 00:00:00 2001 From: oluceps Date: Sun, 13 Aug 2023 22:30:50 +0800 Subject: [PATCH 103/110] dae: 0.2.3 -> 0.2.4 --- pkgs/tools/networking/dae/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/dae/default.nix b/pkgs/tools/networking/dae/default.nix index 9c874f860d27..666340d1fbe2 100644 --- a/pkgs/tools/networking/dae/default.nix +++ b/pkgs/tools/networking/dae/default.nix @@ -9,17 +9,17 @@ }: buildGoModule rec { pname = "dae"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "daeuniverse"; repo = "dae"; rev = "v${version}"; - hash = "sha256-Fk3xpQ8xuZMPulMFZb5fnN0Tisk13XRx49vBN5coanQ="; + hash = "sha256-MVmx37q5nbgaUehPJ2C2UjVyx48/U/vA3NeBx6Zcmg8="; fetchSubmodules = true; }; - vendorHash = "sha256-sqcImm5BYTiUnBmcpWWMR1TuV877VE5gZ8Oth8AxjSg="; + vendorHash = "sha256-oeMAekLWRJzmkmge4LmrVSFRzHZ/dStX+CvLtuYOsog="; proxyVendor = true; From 5ffd4ef38261f35f3ca76ccfda1f3a5d5ae0be1b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 12 Aug 2023 04:20:00 +0000 Subject: [PATCH 104/110] ocamlPackages.odoc: 2.2.0 -> 2.2.1 Diff: https://github.com/ocaml/odoc/compare/2.2.0...2.2.1 Changelog: https://github.com/ocaml/odoc/blob/2.2.1/CHANGES.md --- pkgs/development/ocaml-modules/odoc/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/odoc/default.nix b/pkgs/development/ocaml-modules/odoc/default.nix index c7ff41cebb37..43ec9da28834 100644 --- a/pkgs/development/ocaml-modules/odoc/default.nix +++ b/pkgs/development/ocaml-modules/odoc/default.nix @@ -6,15 +6,13 @@ buildDunePackage rec { pname = "odoc"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { url = "https://github.com/ocaml/odoc/releases/download/${version}/odoc-${version}.tbz"; - sha256 = "sha256-aBjJcfwMPu2dPRQzifgHObFhivcLn9tEOzW9fwEhdAw="; + sha256 = "sha256-F4blO/CCT+HHx7gdKn2EaEal0RZ3lp5jljYfd6OBaAM="; }; - duneVersion = "3"; - nativeBuildInputs = [ cppo ]; buildInputs = [ astring cmdliner fpath result tyxml odoc-parser fmt ]; @@ -35,5 +33,6 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; homepage = "https://github.com/ocaml/odoc"; + changelog = "https://github.com/ocaml/odoc/blob/${version}/CHANGES.md"; }; } From 6d2b127349711f6a8cfa6488215bc83f8343eebe Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 13 Aug 2023 22:52:23 +0800 Subject: [PATCH 105/110] linuxPackages.nvidia_x11.settings: add mainProgram --- pkgs/os-specific/linux/nvidia-x11/settings.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index 454a72739b3d..6112b65eabd9 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -117,6 +117,7 @@ stdenv.mkDerivation { description = "Settings application for NVIDIA graphics cards"; license = licenses.unfreeRedistributable; platforms = nvidia_x11.meta.platforms; + mainProgram = "nvidia-settings"; maintainers = with maintainers; [ abbradar ]; }; } From 8917a70fde55c1a86a5ed3f0873fc0432a9b4495 Mon Sep 17 00:00:00 2001 From: rubyowo Date: Sun, 13 Aug 2023 19:39:56 +0400 Subject: [PATCH 106/110] wayshot: add meta.mainProgram --- pkgs/tools/misc/wayshot/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/wayshot/default.nix b/pkgs/tools/misc/wayshot/default.nix index d5732385bb1d..82b7631f5bed 100644 --- a/pkgs/tools/misc/wayshot/default.nix +++ b/pkgs/tools/misc/wayshot/default.nix @@ -19,5 +19,6 @@ rustPlatform.buildRustPackage rec { license = licenses.bsd2; maintainers = [ maintainers.dit7ya ]; platforms = platforms.linux; + mainProgram = "wayshot"; }; } From 28ea69efc32a521b82e83947b555b489e4694f9a Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 13 Aug 2023 17:52:44 +0200 Subject: [PATCH 107/110] ocamlPackages.ssl: 0.6.0 -> 0.7.0 --- pkgs/development/ocaml-modules/ssl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix index 14250c662833..329dd01f02ea 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -10,15 +10,15 @@ buildDunePackage rec { pname = "ssl"; - version = "0.6.0"; + version = "0.7.0"; duneVersion = "3"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-ssl"; - rev = version; - sha256 = "sha256-zi5Ue6qOlLfsfPjzIwjjR+6ztSS2NwJmB1cCcVVC5TY="; + rev = "v${version}"; + hash = "sha256-gi80iwlKaI4TdAVnCyPG03qRWFa19DHdTrA0KMFBAc4="; }; nativeBuildInputs = [ pkg-config ]; From 0d483de08f2c5895c30bbc0f3895b3f0a8144745 Mon Sep 17 00:00:00 2001 From: oluceps Date: Mon, 14 Aug 2023 00:25:54 +0800 Subject: [PATCH 108/110] juicity: 0.1.2 -> 0.1.3 --- pkgs/tools/networking/juicity/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/juicity/default.nix b/pkgs/tools/networking/juicity/default.nix index 4c3c1bb012f6..53e12094fa7a 100644 --- a/pkgs/tools/networking/juicity/default.nix +++ b/pkgs/tools/networking/juicity/default.nix @@ -4,16 +4,16 @@ }: buildGoModule rec { pname = "juicity"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "juicity"; repo = pname; rev = "v${version}"; - hash = "sha256-k6rx55AxdUWEdnqsTj0Xq9gafx0TCdziNcf61nz//Z8="; + hash = "sha256-aTg2Xo2+3uxLTJ3MRC46FR/4qBs28IpT6K3KMb8i16s="; }; - vendorHash = "sha256-cUbN5/MHawzzQZgrdnt28yRtPClTdIUJZm1GjcWf0dI="; + vendorHash = "sha256-xTpT3Qjg2kAJynLaQLLMmoL/SzpguK2YrlWsq/NYrX4="; proxyVendor = true; From 07f923ae3a22187bc81b55797adcaea0f5c14cdf Mon Sep 17 00:00:00 2001 From: Misaka13514 Date: Sun, 13 Aug 2023 23:23:18 +0800 Subject: [PATCH 109/110] subfinder: 2.6.1 -> 2.6.2 Diff: https://github.com/projectdiscovery/subfinder/compare/v2.6.1...v2.6.2 Changelog: https://github.com/projectdiscovery/subfinder/releases/tag/v2.6.2 --- pkgs/tools/networking/subfinder/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix index cef63629b01f..8f263685fd10 100644 --- a/pkgs/tools/networking/subfinder/default.nix +++ b/pkgs/tools/networking/subfinder/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "subfinder"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SVfBWOaDh2wE0XwoUzXOFohjHcb5upWILdWuUW0dwr8="; + sha256 = "sha256-KyceWyVIgIPx4zw7pUCY2IC9PfbSYzwoDEbw80VhI+s="; }; - vendorHash = "sha256-2Ob2oU7XBnqiWiR3td/lXDWl863ihx7j3iwP2CUGG/U="; + vendorHash = "sha256-vvgXlVPQPH6hO4yA3HYB0C6mva9eI2zMIlBhjtZXOTI="; modRoot = "./v2"; From 6198e6be7f7f29ea0b1ee0482b7f56f904c271cb Mon Sep 17 00:00:00 2001 From: Misaka13514 Date: Sun, 13 Aug 2023 23:24:05 +0800 Subject: [PATCH 110/110] subfinder: add Misaka13514 to maintainers --- pkgs/tools/networking/subfinder/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix index 8f263685fd10..7eaa8c24c524 100644 --- a/pkgs/tools/networking/subfinder/default.nix +++ b/pkgs/tools/networking/subfinder/default.nix @@ -31,6 +31,6 @@ buildGoModule rec { ''; homepage = "https://github.com/projectdiscovery/subfinder"; license = licenses.mit; - maintainers = with maintainers; [ fpletz Br1ght0ne ]; + maintainers = with maintainers; [ fpletz Br1ght0ne Misaka13514 ]; }; }