From b379febffbf19c0508d08cbac86d2940b1f79b7a Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Wed, 5 Apr 2023 19:30:53 -0700 Subject: [PATCH 01/29] coreboot-utils: fix cross-compilation --- pkgs/tools/misc/coreboot-utils/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix index 0ef1424879cd..ef4da4674790 100644 --- a/pkgs/tools/misc/coreboot-utils/default.nix +++ b/pkgs/tools/misc/coreboot-utils/default.nix @@ -22,6 +22,7 @@ let enableParallelBuilding = true; postPatch = '' + substituteInPlace 3rdparty/vboot/Makefile --replace 'ar qc ' '$$AR qc ' cd ${path} patchShebangs . ''; From f5df675dce3209ef975e3613db9bfea19f3676e0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Jun 2023 22:05:29 +0200 Subject: [PATCH 02/29] python311Packages.py-multihash: remove pytest-runner --- .../python-modules/py-multihash/default.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/py-multihash/default.nix b/pkgs/development/python-modules/py-multihash/default.nix index a23ff548cf87..9ae0d1a1d3db 100644 --- a/pkgs/development/python-modules/py-multihash/default.nix +++ b/pkgs/development/python-modules/py-multihash/default.nix @@ -1,9 +1,8 @@ -{ base58 +{ lib +, base58 , buildPythonPackage , fetchFromGitHub -, lib , morphys -, pytest-runner , pytestCheckHook , pythonOlder , six @@ -13,18 +12,21 @@ buildPythonPackage rec { pname = "py-multihash"; version = "2.0.1"; + format = "setuptools"; + disabled = pythonOlder "3.4"; src = fetchFromGitHub { owner = "multiformats"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-z1lmSypGCMFWJNzNgV9hx/IStyXbpd5jvrptFpewuOA="; }; - nativeBuildInputs = [ - pytest-runner - ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner', " "" + ''; propagatedBuildInputs = [ base58 @@ -37,7 +39,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "multihash" ]; + pythonImportsCheck = [ + "multihash" + ]; meta = with lib; { description = "Self describing hashes - for future proofing"; From f3d7f8af3a67a3a874e81e4c7f33024482746ca4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 10 Jun 2023 15:25:54 +0200 Subject: [PATCH 03/29] python310Packages.image-match: remove Module is no longer maintained. https://github.com/rhsimplex/image-match/blob/master/README.md --- .../python-modules/image-match/default.nix | 35 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 pkgs/development/python-modules/image-match/default.nix diff --git a/pkgs/development/python-modules/image-match/default.nix b/pkgs/development/python-modules/image-match/default.nix deleted file mode 100644 index 799f7888cfb2..000000000000 --- a/pkgs/development/python-modules/image-match/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytest-runner, scikit-image }: - -buildPythonPackage { - pname = "image-match"; - version = "1.1.2"; - - src = fetchFromGitHub { - owner = "ascribe"; - repo = "image-match"; - rev = "1c5f3170555540bdf43ff8b8189c4e8c13a8b950"; - sha256 = "0vlmpidmhkpgdzw2k03x5layhijcrjpmyfd93yv2ls77ihz00ix5"; - }; - - buildInputs = [ pytest-runner ]; - - propagatedBuildInputs = [ - scikit-image - ]; - - # remove elasticsearch requirement due to version incompatibility - postPatch = '' - substituteInPlace setup.py --replace "'elasticsearch>=5.0.0,<6.0.0'," "" - ''; - - # tests cannot work without elasticsearch - doCheck = false; - pythonImportsCheck = [ "image_match" ]; - - meta = with lib; { - homepage = "https://github.com/ascribe/image-match"; - description = "Quickly search over billions of images"; - license = licenses.asl20; - maintainers = with maintainers; [ cmcdragonkai ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index f44a985d0199..023c7a48142c 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -145,6 +145,7 @@ mapAliases ({ ihatemoney = throw "ihatemoney was removed because it is no longer maintained downstream"; # added 2023-04-08 IMAPClient = imapclient; # added 2021-10-28 imdbpy = throw "imdbpy has been renamed to cinemagoer"; # added 2022-08-08 + image-match = throw "image-match has been removed because it is no longer maintained"; # added 2023-06-10 intreehook = throw "intreehooks has been removed because it is obsolete as a backend-path key was added to PEP 517"; # added 2023-04-11 ipaddress = throw "ipaddress has been removed because it is no longer required since python 2.7."; # added 2022-05-30 influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e44b27d24d48..7161fa46a767 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4845,8 +4845,6 @@ self: super: with self; { image-go-nord = callPackage ../development/python-modules/image-go-nord { }; - image-match = callPackage ../development/python-modules/image-match { }; - imagesize = callPackage ../development/python-modules/imagesize { }; imantics = callPackage ../development/python-modules/imantics { }; From 66aed5e6a6874536796227826a5dbbb5346c3273 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 10 Jun 2023 17:00:34 +0200 Subject: [PATCH 04/29] python310Packages.markdownsuperscript: remove markdownsuperscript is unmaintained, use pymdown-extensions jambonrose/markdown_superscript_extension#58 --- .../markdownsuperscript/default.nix | 31 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 pkgs/development/python-modules/markdownsuperscript/default.nix diff --git a/pkgs/development/python-modules/markdownsuperscript/default.nix b/pkgs/development/python-modules/markdownsuperscript/default.nix deleted file mode 100644 index 59f4eaf83bae..000000000000 --- a/pkgs/development/python-modules/markdownsuperscript/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, markdown, - pytest, pytest-runner, pytest-cov, coverage }: - -buildPythonPackage rec { - pname = "MarkdownSuperscript"; - version = "2.1.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "2c255b5959c1f5dd364ae80762bd0a568a0fcc9fd4e4a3d7e7b192e88adf8900"; - }; - - propagatedBuildInputs = [ markdown ]; - - postPatch = '' - # remove version bounds for Markdown dependency - sed 's/\["Markdown.*"\]/["Markdown"]/' -i setup.py - - # remove version bounds for test dependencies - sed 's/=.*//' -i requirements/*.txt - ''; - - nativeCheckInputs = [ pytest pytest-runner pytest-cov coverage ]; - - meta = with lib; { - description = "An extension to the Python Markdown package enabling superscript text"; - homepage = "https://github.com/jambonrose/markdown_superscript_extension"; - license = licenses.bsd2; - broken = true; # unmaintained in nixpkgs, barely maintained in pypi, added 2020-11-29 - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index f44a985d0199..f41c44c45429 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -164,6 +164,7 @@ mapAliases ({ loo-py = loopy; # added 2022-05-03 Mako = mako; # added 2023-02-19 Markups = markups; # added 2022-02-14 + markdownsuperscript = throw "markdownsuperscript is unmaintained, use pymdown-extensions"; # added 2023-06-10 MDP = mdp; # added 2023-02-19 MechanicalSoup = mechanicalsoup; # added 2021-06-01 memcached = python-memcached; # added 2022-05-06 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e44b27d24d48..23f3ecdc5f6c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6047,8 +6047,6 @@ self: super: with self; { markdownify = callPackage ../development/python-modules/markdownify { }; - markdownsuperscript = callPackage ../development/python-modules/markdownsuperscript { }; - markupsafe = callPackage ../development/python-modules/markupsafe { }; markuppy = callPackage ../development/python-modules/markuppy { }; From 3e5a369b0733e0013deaf00d5802e3c0d02e5eb0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 11 Jun 2023 04:20:00 +0000 Subject: [PATCH 05/29] ncspot: 0.13.2 -> 0.13.3 Diff: https://github.com/hrkfdn/ncspot/compare/v0.13.2...v0.13.3 --- pkgs/applications/audio/ncspot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index 1f493e2eaf1e..5b7a3ac0411b 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.13.2"; + version = "0.13.3"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - hash = "sha256-DdJa4ax/v86OgO+IAsiFA8/u6pEGcCw+N/3MLXzz8DM="; + hash = "sha256-AXe/ysNYSWC4cuzvN4fLmDyeBxpzciDo8PFjXdzFMl0="; }; - cargoHash = "sha256-HkpFboXgHbJMYJFabJ58Syy1ag+InwqkeJAw8MxAr0A="; + cargoHash = "sha256-y7Vaf4jp2Zds0KsYqF0JBWsbq9IQVu6n0TMo3oGL14A="; nativeBuildInputs = [ pkg-config ] ++ lib.optional withClipboard python3; From a924438b1dea187c2023b663b40a1626de631605 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 11 Jun 2023 04:20:00 +0000 Subject: [PATCH 06/29] ncspot: add changelog to meta --- pkgs/applications/audio/ncspot/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index 5b7a3ac0411b..069c60c0f860 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -56,6 +56,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Cross-platform ncurses Spotify client written in Rust, inspired by ncmpc and the likes"; homepage = "https://github.com/hrkfdn/ncspot"; + changelog = "https://github.com/hrkfdn/ncspot/releases/tag/v${version}"; license = licenses.bsd2; maintainers = [ maintainers.marsam ]; }; From e86fb7d8633eef4ceea4ba917d0347584458483c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Jun 2023 04:58:56 +0000 Subject: [PATCH 07/29] snappymail: 2.27.3 -> 2.28.1 --- pkgs/servers/snappymail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix index 8257bd49b123..1d821f71ed3e 100644 --- a/pkgs/servers/snappymail/default.nix +++ b/pkgs/servers/snappymail/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.27.3"; + version = "2.28.1"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-NSTTWAMyBl0WQg1bEAIUWlUMdnz1yn7JLc5NAENi62M="; + sha256 = "sha256-et3KuILHNPUMaqgOffMh1w73h0ThUbc/lR82pFaG6rM="; }; sourceRoot = "snappymail"; From a7912a08f37205c0e1ac2edca3567e41f7814264 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 11 Jun 2023 17:38:15 +0200 Subject: [PATCH 08/29] python311Packages.pyunifiprotect: 4.10.2 -> 4.10.3 Diff: https://github.com/briis/pyunifiprotect/compare/refs/tags/v4.10.2...v4.10.3 Changelog: https://github.com/AngellusMortis/pyunifiprotect/releases/tag/v4.10.3 --- pkgs/development/python-modules/pyunifiprotect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index 1fa78ef9f72a..00a74879ad07 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.10.2"; + version = "4.10.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "briis"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-q54TLmPVo7dz9IkTZfz2qk13TQkMIopWhxlPac0IBGA="; + hash = "sha256-QCQMCvPRJDNcqOIQ51Pbt+x+05ySlXk2PYio4JKFEuI="; }; postPatch = '' From 7b0bb8cf510d29ed73665e41c8c2e45df99fb7d5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 11 Jun 2023 19:00:25 +0200 Subject: [PATCH 09/29] python311Packages.knx-frontend: 2023.5.31.141540 -> 2023.6.9.195839 Changelog: https://github.com/XKNX/knx-frontend/releases/tag/2023.6.9.195839 --- pkgs/development/python-modules/knx-frontend/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/knx-frontend/default.nix b/pkgs/development/python-modules/knx-frontend/default.nix index 15797260ad3d..f1107d91506b 100644 --- a/pkgs/development/python-modules/knx-frontend/default.nix +++ b/pkgs/development/python-modules/knx-frontend/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "knx-frontend"; - version = "2023.5.31.141540"; + version = "2023.6.9.195839"; format = "pyproject"; # TODO: source build, uses yarn.lock src = fetchPypi { pname = "knx_frontend"; inherit version; - hash = "sha256-j0p3PUYnKsyuDaN+nMrIHhxLYhNXVkZQkgsp//ZTsXE="; + hash = "sha256-lShWlrnELpDamXT2OQvQTKOCOODv+iSxJ9pA5tIgxdM="; }; nativeBuildInputs = [ From a7c4dc5de24b3c4b792ddcc8632b0cec07e26354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anger=20J=C3=A9r=C3=A9my?= Date: Sun, 11 Jun 2023 20:28:40 +0200 Subject: [PATCH 10/29] vpv: 0.8.1 -> 0.8.2 --- pkgs/applications/graphics/vpv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/vpv/default.nix b/pkgs/applications/graphics/vpv/default.nix index 724dd25f8f88..b02d35f93ad9 100644 --- a/pkgs/applications/graphics/vpv/default.nix +++ b/pkgs/applications/graphics/vpv/default.nix @@ -14,13 +14,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vpv"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "kidanger"; repo = "vpv"; rev = "v${finalAttrs.version}"; - sha256 = "0cphgq1pqmwrjdmq524j5y522iaq6yhp2dpjdv0a3f9558dayxix"; + sha256 = "sha256-mlBceYMfsAE7MI6J7xnkJHBJ8RInePooXH5YW9I47YM="; }; cargoRoot = "src/fuzzy-finder"; From 84b290c785583583f67b13a54d7ca62af49c983c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Jun 2023 19:35:50 +0000 Subject: [PATCH 11/29] python310Packages.trove-classifiers: 2023.4.22 -> 2023.5.24 --- pkgs/development/python-modules/trove-classifiers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trove-classifiers/default.nix b/pkgs/development/python-modules/trove-classifiers/default.nix index 46386b52a69a..3454883c6025 100644 --- a/pkgs/development/python-modules/trove-classifiers/default.nix +++ b/pkgs/development/python-modules/trove-classifiers/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "trove-classifiers"; - version = "2023.4.22"; + version = "2023.5.24"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ZejLOSnjeIFB25Cgd2t2/K++tUik++au5L/ZZW6JmTk="; + hash = "sha256-/VoVRig76UH0dUChNb3q6PsmE4CmogTZwYAS8qGwzq4="; }; nativeBuildInputs = [ From d16f5d92cc71b941174ea6b54a26c5e5a6a73294 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Jun 2023 19:57:34 +0000 Subject: [PATCH 12/29] python311Packages.elastic-apm: 6.16.0 -> 6.16.1 --- pkgs/development/python-modules/elastic-apm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix index 9774a97f3639..35b541c6c5c1 100644 --- a/pkgs/development/python-modules/elastic-apm/default.nix +++ b/pkgs/development/python-modules/elastic-apm/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "elastic-apm"; - version = "6.16.0"; + version = "6.16.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "elastic"; repo = "apm-agent-python"; rev = "refs/tags/v${version}"; - hash = "sha256-BPk1F50aUNzROfK/r73AlMX2LIDgsn0R5HUthht/ItU="; + hash = "sha256-m/PjL8pltUpv/ewE/gksISsOhEVsyeWoq6yfd5c1j6s="; }; propagatedBuildInputs = [ From 6b74da4cc33971a438bff8928bb053f3ffba4375 Mon Sep 17 00:00:00 2001 From: benaryorg Date: Sun, 11 Jun 2023 20:11:45 +0000 Subject: [PATCH 13/29] ndi: unpackPhase without interpolation of src The `unpackPhase` as of the previous commit did interpolate the result of the `src` on a nix level. However for any overrides (`overrideAttrs`) to work on the source, for instance to update to a newer version locally, the `src` environment variable of `stdenv` must be used. Otherwise the old, upstream, version will still be pulled in as a dependency and ultimately used for building, which will fail if the old version is not present, or will just deploy the old version if the old version was already downloaded (`requireFile` causes special semi-non-idempotent issues here). Further information was provided in a GitHub comment: https://github.com/NixOS/nixpkgs/issues/219578#issuecomment-1586322972 Signed-off-by: benaryorg --- pkgs/development/libraries/ndi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ndi/default.nix b/pkgs/development/libraries/ndi/default.nix index 1c15455b6add..9cd0d186302b 100644 --- a/pkgs/development/libraries/ndi/default.nix +++ b/pkgs/development/libraries/ndi/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ avahi ]; unpackPhase = '' - unpackFile ${src} + unpackFile $src echo y | ./${installerName}.sh sourceRoot="NDI SDK for Linux"; ''; From 565efb4ad0b5c8c2ba1c212f75ae880787b7db82 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Jun 2023 21:56:12 +0000 Subject: [PATCH 14/29] eks-node-viewer: 0.2.1 -> 0.4.0 --- .../networking/cluster/eks-node-viewer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/eks-node-viewer/default.nix b/pkgs/applications/networking/cluster/eks-node-viewer/default.nix index 10db28179626..044d2d255169 100644 --- a/pkgs/applications/networking/cluster/eks-node-viewer/default.nix +++ b/pkgs/applications/networking/cluster/eks-node-viewer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eks-node-viewer"; - version = "0.2.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XRt9a//0mYKZKsMs2dlcsBt5ikC9ZBMeQ3Vas0eT8a8="; + sha256 = "sha256-p0n7ocoMBgM6i7e6yX+NDIkZBcJ3dT6VNWPihCheeC0="; }; - vendorHash = "sha256-28TKZYZM2kddXAusxmjhrKFy+ATU7kZM4Ad7zvP/F3A="; + vendorHash = "sha256-L1lG+b7MiJQvLqZuLdSjh5zAaApvWdi9SZSDPvObW5w="; meta = with lib; { description = "Tool to visualize dynamic node usage within a cluster"; From aad518563260400780a210725e14be22f7ddfa5a Mon Sep 17 00:00:00 2001 From: Jan Solanti Date: Sun, 11 Jun 2023 16:20:52 +0300 Subject: [PATCH 15/29] tauon: 7.6.4 -> 7.6.5 --- pkgs/applications/audio/tauon/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index 23dd5e8fa6fd..f0e99f0f7ec9 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -23,15 +23,15 @@ , withDiscordRPC ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tauon"; - version = "7.6.4"; + version = "7.6.5"; src = fetchFromGitHub { owner = "Taiko2k"; repo = "TauonMusicBox"; - rev = "v${version}"; - hash = "sha256-xMUQ2LabxuvCdd7dsoXPN3tjkDxfXIQ8UrJcsGQ+EEU="; + rev = "v${finalAttrs.version}"; + hash = "sha256-+K+sX6JbVB7qCRlwlIHMHFR76GwZZrHFh6Jjn8xlMmg="; }; postUnpack = '' @@ -133,9 +133,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The Linux desktop music player from the future"; homepage = "https://tauonmusicbox.rocks/"; - changelog = "https://github.com/Taiko2k/TauonMusicBox/releases/tag/v${version}"; + changelog = "https://github.com/Taiko2k/TauonMusicBox/releases/tag/v${finalAttrs.version}"; license = licenses.gpl3; maintainers = with maintainers; [ jansol ]; platforms = platforms.linux ++ platforms.darwin; }; -} +}) From 1f9be6a55c7ff8bc2e1f21f1ee29815053b3defc Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Mon, 12 Jun 2023 00:04:20 +0200 Subject: [PATCH 16/29] adguardhome: 0.107.29 -> 0.107.31 --- pkgs/servers/adguardhome/bins.nix | 28 ++++++++++++++-------------- pkgs/servers/adguardhome/default.nix | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/servers/adguardhome/bins.nix b/pkgs/servers/adguardhome/bins.nix index db05a61fc46a..f40d530c7ecf 100644 --- a/pkgs/servers/adguardhome/bins.nix +++ b/pkgs/servers/adguardhome/bins.nix @@ -1,31 +1,31 @@ { fetchurl, fetchzip }: { x86_64-darwin = fetchzip { - sha256 = "sha256-ygf5D8s1Yv9J1mVDAZrW9Q/4scQopQ547TfHG+fFwoU="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.29/AdGuardHome_darwin_amd64.zip"; + sha256 = "sha256-W2XSIXrRuNsFGEdiGXD/7aUEShSwYhGp1yvdTXDg7Xc="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.31/AdGuardHome_darwin_amd64.zip"; }; aarch64-darwin = fetchzip { - sha256 = "sha256-s112LwCusgRcTaGmKWcRlUA2XnbdxJ7lVkWzG3QIUqQ="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.29/AdGuardHome_darwin_arm64.zip"; + sha256 = "sha256-hqjuITqHNNZCDX+9ox8WLxrSoXeFZdaaSd1/RXTm2fM="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.31/AdGuardHome_darwin_arm64.zip"; }; i686-linux = fetchurl { - sha256 = "sha256-mBqxPT/qaER4nI1+pmmpUSTJuCb9eax9DMRIY+J92Lk="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.29/AdGuardHome_linux_386.tar.gz"; + sha256 = "sha256-rn8q3N4VT+xjss6OWYlW9DtAy+xfaQoriY0IuMIva6Y="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.31/AdGuardHome_linux_386.tar.gz"; }; x86_64-linux = fetchurl { - sha256 = "sha256-M4VfjRnrqYxKc9neIJndJoa8D44RRIjN5ItE4Ec6VKY="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.29/AdGuardHome_linux_amd64.tar.gz"; + sha256 = "sha256-OdGccAnlo0gGQB0IWFQX9PKz03BeUjeKwKvTjYKS5kU="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.31/AdGuardHome_linux_amd64.tar.gz"; }; aarch64-linux = fetchurl { - sha256 = "sha256-6zekpNnfss4r/Z+g/Te0O+oDpCskKu39NI8Q0e7bHOo="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.29/AdGuardHome_linux_arm64.tar.gz"; + sha256 = "sha256-EKWlhwgksmQv5OXme/4VHVFSREOsI2PGmWj9ArBukPw="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.31/AdGuardHome_linux_arm64.tar.gz"; }; armv6l-linux = fetchurl { - sha256 = "sha256-j0n3lKyaxOXX7YHcpYlC1dpCz741q1tes2kgadHzivI="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.29/AdGuardHome_linux_armv6.tar.gz"; + sha256 = "sha256-eRdAyyNGTzn0oQ/cYcrZ0LAxUjih77yHx4O/1gm+YvY="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.31/AdGuardHome_linux_armv6.tar.gz"; }; armv7l-linux = fetchurl { - sha256 = "sha256-LyD3arGmk5YWXB2FZBLPcMAukvBtlXfFPSQ/mZBJohA="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.29/AdGuardHome_linux_armv7.tar.gz"; + sha256 = "sha256-p5SHPpl33Q8JGmqRBEFJD84VcueFmSXwbp3RssRsJIg="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.31/AdGuardHome_linux_armv7.tar.gz"; }; } diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index f3bbf5fb6db0..42ff11b62112 100644 --- a/pkgs/servers/adguardhome/default.nix +++ b/pkgs/servers/adguardhome/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation rec { pname = "adguardhome"; - version = "0.107.29"; + version = "0.107.31"; src = sources.${system} or (throw "Source for ${pname} is not available for ${system}"); installPhase = '' From 18a7612792e784f13e625085fa7855a9b4f363f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Jun 2023 22:15:40 +0000 Subject: [PATCH 17/29] granted: 0.13.0 -> 0.13.2 --- pkgs/tools/admin/granted/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/granted/default.nix b/pkgs/tools/admin/granted/default.nix index ed2bc901826d..bd9d12491863 100644 --- a/pkgs/tools/admin/granted/default.nix +++ b/pkgs/tools/admin/granted/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "granted"; - version = "0.13.0"; + version = "0.13.2"; src = fetchFromGitHub { owner = "common-fate"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UoU2+RBR6vBLRx5gJsVUswoEtZ8chCn+bSv+k4SCGyU="; + sha256 = "sha256-4+euNW/dv8OoWxVwEonI7R7aTLeM8QfG5xQlu5+PduA="; }; vendorHash = "sha256-P7HeJUdVlqrTEMVXGlvcCr9ezEmqIw5AX/+xdcFQoH4="; From c9c1132a5443c173e3724eb90220275c6ff15b97 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 11 Jun 2023 19:15:10 -0400 Subject: [PATCH 18/29] python3Packages.awkward: 2.2.1 -> 2.2.2 python3Packages.awkward-cpp: 15 -> 16 --- pkgs/development/python-modules/awkward-cpp/default.nix | 4 ++-- pkgs/development/python-modules/awkward/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix index 0a034282eba1..95386c30c8fb 100644 --- a/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/pkgs/development/python-modules/awkward-cpp/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "awkward-cpp"; - version = "15"; + version = "16"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "f6c825db2db981f852903d9574a07015c5d53ef8e4630772f18c7f167045aa0d"; + hash = "sha256-yE1dWFaw4kL6g38NtggIfZWJVheb1VN36jk/E5wbm4Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 0279327da208..76ffbc3d91a5 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "awkward"; - version = "2.2.1"; + version = "2.2.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "653e5b69f1c8e32d1d59445a8414d03f850d327eb933f45aad163f0778861dc2"; + hash = "sha256-Lui3ZJrEkPEGc5yz1M9R8wPDedNw6Iyf4sIZCoWR11M="; }; nativeBuildInputs = [ From c0936ce9ffeff665e3e23dcb729aec5f038b8e2f Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 11 Jun 2023 19:15:51 -0400 Subject: [PATCH 19/29] python3Packages.dask-awkward: 2023.4.2 -> 2023.6.1 --- pkgs/development/python-modules/dask-awkward/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix index 1c6cb7b5bbe5..eaff8eb01199 100644 --- a/pkgs/development/python-modules/dask-awkward/default.nix +++ b/pkgs/development/python-modules/dask-awkward/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dask-awkward"; - version = "2023.4.2"; + version = "2023.6.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "dask-contrib"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-c3NnARost/406cALQDKmeUsl2kFSQHAswAEwgreFXPc="; + hash = "sha256-+3+DABzHque0Iz5boxJQ7YCU52k0eHu2YCgomMTi4+4="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 81c64e5ab81343b0d704ba8e371681bfd31105df Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 11 Jun 2023 19:24:40 -0400 Subject: [PATCH 20/29] clipboard-jh: 0.7.1 -> 0.8.0 --- pkgs/tools/misc/clipboard-jh/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/clipboard-jh/default.nix b/pkgs/tools/misc/clipboard-jh/default.nix index c8cc8036e49a..e95535056b81 100644 --- a/pkgs/tools/misc/clipboard-jh/default.nix +++ b/pkgs/tools/misc/clipboard-jh/default.nix @@ -4,22 +4,22 @@ , cmake , libffi , pkg-config -, patchelf , wayland-protocols , wayland , xorg , darwin +, nix-update-script }: stdenv.mkDerivation rec { pname = "clipboard-jh"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Slackadays"; repo = "clipboard"; rev = version; - hash = "sha256-RLb7R4BXnP7J5gX8hsE9yi6N3kezsutP1HqkmjR3yRs="; + hash = "sha256-1HWWrBI96znHctoMhQyO46Jmbg1jXPcvkDdwiWwp4KE="; }; postPatch = '' @@ -50,6 +50,8 @@ stdenv.mkDerivation rec { patchelf $out/bin/cb --add-rpath $out/lib ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Cut, copy, and paste anything, anywhere, all from the terminal"; homepage = "https://github.com/Slackadays/clipboard"; From 95f29b40089976c321f730dee74b0e4e1772726b Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 12 Jun 2023 09:05:01 +1000 Subject: [PATCH 21/29] vimv-rs: 2.0.0 -> 3.0.0 --- pkgs/tools/misc/vimv-rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/vimv-rs/default.nix b/pkgs/tools/misc/vimv-rs/default.nix index a0da6f236e44..0fbcbcf7a0d8 100644 --- a/pkgs/tools/misc/vimv-rs/default.nix +++ b/pkgs/tools/misc/vimv-rs/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "vimv-rs"; - version = "2.0.0"; + version = "3.0.0"; src = fetchCrate { inherit version; crateName = "vimv"; - hash = "sha256-dc1jN9phrTfLwa6Dx1liXNu49V2qjpiuHqn4KQnPYWQ="; + hash = "sha256-DpdozP/xaMoRAl8YMj5BmhNedGFhVzscM/eFOcVt+Lk="; }; - cargoHash = "sha256-1Oa4R85w5FyC6rjoZe53bJIykSSkUv2X3LQvK4w+qs0="; + cargoHash = "sha256-zKJ8A36/ibAiznm3bK2JSHVRItIAqQ4YFDxvjcZLn3g="; buildInputs = lib.optionals stdenv.isDarwin [ Foundation ]; From 942002584fbf20d9d51a16cb8612e216deb5e28c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Jun 2023 00:50:02 +0000 Subject: [PATCH 22/29] dnsproxy: 0.49.1 -> 0.50.1 --- pkgs/tools/networking/dnsproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index f9d6685106a4..5291439708cd 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.49.1"; + version = "0.50.1"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ImswEptEUUWeHX8hz3L/AJD25xAUAvc17Zli3lYNBjc="; + sha256 = "sha256-lDHfVhhc2fD8a1kTpX74RNogKC6ov1RKvzmjgvu+MNQ="; }; vendorHash = null; From 729752c22ebcd771e5164390c84e04172b0ec2b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Jun 2023 01:59:57 +0000 Subject: [PATCH 23/29] glooctl: 1.14.6 -> 1.14.7 --- pkgs/applications/networking/cluster/glooctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index 1c07a293681d..37fa51d251c6 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "glooctl"; - version = "1.14.6"; + version = "1.14.7"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-rALTZUztLZXBlKA3y9mUe/h9diGD6kOpLcD0nOIHr0w="; + hash = "sha256-nd7/B3GQzcnOn8rWQi8ZzxYa0CBFfacBFtctgpJYKLs="; }; subPackages = [ "projects/gloo/cli/cmd" ]; From b81eddec27d62ea37375d0454cf9a8bc78560988 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Jun 2023 02:12:28 +0000 Subject: [PATCH 24/29] gotrue-supabase: 2.69.2 -> 2.70.0 --- pkgs/tools/security/gotrue/supabase.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gotrue/supabase.nix b/pkgs/tools/security/gotrue/supabase.nix index 43a28e26d415..1583a3f3136c 100644 --- a/pkgs/tools/security/gotrue/supabase.nix +++ b/pkgs/tools/security/gotrue/supabase.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gotrue"; - version = "2.69.2"; + version = "2.70.0"; src = fetchFromGitHub { owner = "supabase"; repo = pname; rev = "v${version}"; - hash = "sha256-Jx9TDTJkf5Bp4VWhJ2j04bqp6zXlrOBriSHLhW414h8="; + hash = "sha256-1xOHf5hu0h+Ak4zALmsu1AoQMzeyWVE0l6JH77sZnfo="; }; - vendorHash = "sha256-gv6ZzteQmx8AwYv6+EbZMSVKttf2T0okQyvfrvKpozM="; + vendorHash = "sha256-ZWY+l8qrtYNul2xAtg9fSmMIS7Z1TlKDTKotwf/fN/4="; ldflags = [ "-s" From bdc9930174dc77a4dabb657061b38ddbaf1eaedd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Jun 2023 02:29:11 +0000 Subject: [PATCH 25/29] miller: 6.7.0 -> 6.8.0 --- pkgs/tools/text/miller/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix index 250c094d3016..6ea68a6a1e5f 100644 --- a/pkgs/tools/text/miller/default.nix +++ b/pkgs/tools/text/miller/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "miller"; - version = "6.7.0"; + version = "6.8.0"; src = fetchFromGitHub { owner = "johnkerl"; repo = "miller"; rev = "v${version}"; - sha256 = "sha256-fKgw4ii/riPTklEB+Q8/sOx2dCMS/kevyvXgpyFlkVs="; + sha256 = "sha256-AgKkB/c7rSgk2jS017vjaLPKdiWJ5y/1K5RM6c9RWQg="; }; - vendorHash = "sha256-uZa9H7Tj2ynwl3fFY9U+WZ0FcNuvHRQf7RCW6rebm5g="; + vendorHash = "sha256-4/BB4RaCXEgtGpBJGtccEAz9diogWTA4BxVLkOOlNMw="; subPackages = [ "cmd/mlr" ]; From abc07527e04ad8f7f80f22180f07825173d5ba98 Mon Sep 17 00:00:00 2001 From: MidAutumnMoon Date: Sun, 11 Jun 2023 20:22:51 +0800 Subject: [PATCH 26/29] dbus-broker: v32 -> v33 Release: https://github.com/bus1/dbus-broker/releases/tag/v33 Diff: https://github.com/bus1/dbus-broker/compare/v32...v33 dbus-broker: adopt finalAttrs pattern --- pkgs/os-specific/linux/dbus-broker/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index c8c437a968a4..847f76a528ce 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -11,6 +11,7 @@ }: let + dep = { pname, version, hash, rev ? "v${version}", buildInputs ? [ ] }: stdenv.mkDerivation { inherit pname version; @@ -30,22 +31,22 @@ let c-dvar = dep { pname = "c-dvar"; version = "1.0.0"; hash = "sha256-P7y7gUHXQn2eyS6IcV7m7yGy4VGtQ2orgBkS7Y729ZY="; buildInputs = [ c-stdaux c-utf8 ]; }; c-ini = dep { pname = "c-ini"; version = "1.0.0"; hash = "sha256-VKxoGexMcquakMmiH5IJt0382TjkV1FLncTSyEqf4X0="; buildInputs = [ c-list c-rbtree c-stdaux c-utf8 ]; }; c-list = dep { pname = "c-list"; version = "3.1.0"; hash = "sha256-fp3EAqcbFCLaT2EstLSzwP2X13pi2EFpFAullhoCtpw="; }; - # TODO: Fetch c-rbtree from a tag after its next release - c-rbtree = dep { pname = "c-rbtree"; version = "unstable-2022-07-07"; rev = "431a4746705223673e43940ca1ad9b5f52473a4b"; hash = "sha256-ExSPgNqhTjSwRgYfZOAyoaehOpFNHKFqPYkcCfptkrs="; buildInputs = [ c-stdaux ]; }; + c-rbtree = dep { pname = "c-rbtree"; version = "3.1.0"; hash = "sha256-ozVzL6FllAn8eHbso0RZc/+PGWwEp6r/R1MR+r4Bi/4="; buildInputs = [ c-stdaux ]; }; c-shquote = dep { pname = "c-shquote"; version = "1.0.0"; hash = "sha256-Ze1enX0VJ6Xi5e4EhWzaiHc7PnuaifrUP+JuJnauv5c="; buildInputs = [ c-stdaux ]; }; - c-stdaux = dep { pname = "c-stdaux"; version = "1.2.0"; hash = "sha256-/D+IFdqn1XHDfdOsDnLMO5IHQ5B4P4ELyMpRcPBg/4s="; }; + c-stdaux = dep { pname = "c-stdaux"; version = "1.4.0"; hash = "sha256-gEqXVBAUE0dHD03ina9QbEP26NU12cHKRpuD7GoPmDs="; }; c-utf8 = dep { pname = "c-utf8"; version = "1.0.0"; hash = "sha256-QEnjmfQ6kxJdsHfyRgXAlP+oGrKLYQ0m9r+D2L+pizI="; buildInputs = [ c-stdaux ]; }; in -stdenv.mkDerivation rec { + +stdenv.mkDerivation ( finalAttrs: { pname = "dbus-broker"; - version = "32"; + version = "33"; src = fetchFromGitHub { owner = "bus1"; repo = "dbus-broker"; - rev = "v${version}"; - hash = "sha256-PVdRyg/t6D3HjSHeap5L8AiEm39iSO5qXohLw2UAUYY="; + rev = "v${finalAttrs.version}"; + hash = "sha256-c5kEUB2k9CCuno9d4QOUUp1wbQfsvraGDLN6Yaa7T2w="; }; patches = [ ./paths.patch ]; @@ -92,4 +93,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; }; -} +} ) From 09c1d496d9cbf3dfdc97aa8fcef395ebcbc3d1fa Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 5 Jun 2023 07:41:51 +0200 Subject: [PATCH 27/29] ocamlPackages.qtest: fix for OCaml 5.0 --- pkgs/development/ocaml-modules/qtest/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/qtest/default.nix b/pkgs/development/ocaml-modules/qtest/default.nix index ea0237201dc1..982e1ed92472 100644 --- a/pkgs/development/ocaml-modules/qtest/default.nix +++ b/pkgs/development/ocaml-modules/qtest/default.nix @@ -4,8 +4,6 @@ buildDunePackage rec { pname = "qtest"; version = "2.11.2"; - duneVersion = "3"; - src = fetchFromGitHub { owner = "vincent-hugot"; repo = pname; @@ -13,6 +11,12 @@ buildDunePackage rec { sha256 = "sha256-VLY8+Nu6md0szW4RVxTFwlSQ9kyrgUqf7wQEA6GW8BE="; }; + preBuild = '' + substituteInPlace src/dune \ + --replace "(libraries bytes)" "" \ + --replace "libraries qcheck ounit2 bytes" "libraries qcheck ounit2" + ''; + propagatedBuildInputs = [ qcheck ]; meta = { From c98657f164494345d8466797528ad6f94b6a3bc9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 5 Jun 2023 07:41:56 +0200 Subject: [PATCH 28/29] ocamlPackages.omd: fix for OCaml 5.0 --- pkgs/development/ocaml-modules/omd/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/ocaml-modules/omd/default.nix b/pkgs/development/ocaml-modules/omd/default.nix index 0512e4a9e6ee..2ccf939ea614 100644 --- a/pkgs/development/ocaml-modules/omd/default.nix +++ b/pkgs/development/ocaml-modules/omd/default.nix @@ -11,6 +11,10 @@ buildDunePackage rec { sha256 = "sha256-YCPhZCYx8I9njrVyWCCHnte7Wj/+53fN7evCjB+F+ts="; }; + preBuild = '' + substituteInPlace src/dune --replace "bytes)" ")" + ''; + meta = { description = "Extensible Markdown library and tool in OCaml"; homepage = "https://github.com/ocaml/omd"; From 4e3d46a3ea37d09c3d6dda557a0623c18ed58afe Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 5 Jun 2023 07:41:59 +0200 Subject: [PATCH 29/29] =?UTF-8?q?ocamlPackages.functoria:=204.3.4=20?= =?UTF-8?q?=E2=86=92=204.3.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/functoria/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/functoria/default.nix b/pkgs/development/ocaml-modules/functoria/default.nix index 346083ddadb3..1b4eb502b64a 100644 --- a/pkgs/development/ocaml-modules/functoria/default.nix +++ b/pkgs/development/ocaml-modules/functoria/default.nix @@ -4,14 +4,13 @@ buildDunePackage rec { pname = "functoria"; - version = "4.3.4"; + version = "4.3.6"; - duneVersion = "3"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-${version}.tbz"; - hash = "sha256-ZN8La2+N19wVo/vBUfIj17JU6FSp0jX7h2nDoIpR1XY="; + hash = "sha256-i/5sZHfxECoKYMdGje+U21GWxJ6dDZreVcQGtbuo4SE="; }; propagatedBuildInputs = [ cmdliner rresult astring fmt logs bos fpath emile uri ];