From c569ab488713faa42b49107ff9eeda4315eadfc9 Mon Sep 17 00:00:00 2001 From: oaksoaj Date: Mon, 19 Dec 2022 11:13:01 +0100 Subject: [PATCH 01/24] maintainers-list.nix: add maintainer oaksoaj --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0b77e5429e2e..5b4f6f2006e6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11676,6 +11676,12 @@ githubId = 30825096; name = "Ning Zhang"; }; + oaksoaj = { + email = "oaksoaj@riseup.net"; + name = "Oaksoaj"; + github = "oaksoaj"; + githubId = 103952141; + }; obadz = { email = "obadz-nixos@obadz.com"; github = "obadz"; From bf62e7316242cf26cb4fabb634d6746cbc150a38 Mon Sep 17 00:00:00 2001 From: oaksoaj Date: Tue, 13 Dec 2022 22:40:13 +0100 Subject: [PATCH 02/24] basez: init at 1.6.2 --- pkgs/tools/misc/basez/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/misc/basez/default.nix diff --git a/pkgs/tools/misc/basez/default.nix b/pkgs/tools/misc/basez/default.nix new file mode 100644 index 000000000000..e7fe906836e3 --- /dev/null +++ b/pkgs/tools/misc/basez/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchurl } : + +stdenv.mkDerivation rec { + pname = "basez"; + version = "1.6.2"; + + src = fetchurl { + url = "http://www.quarkline.net/basez/download/basez-${version}.tar.gz"; + sha256 = "sha256-Kp+CFIh5HCdj7wEgx1xD3IPdFlZ7fEFvMDMYif1ZiTc="; + }; + + doCheck = true; + + meta = with lib; { + description = "Base 16/32/64 encode/decode data to standard output"; + longDescription = '' + Encode data into/decode data from base16, base32, base32hex, base64 or + base64url stream per RFC 4648; MIME base64 Content-Transfer-Encoding + per RFC 2045; or PEM Printable Encoding per RFC 1421. + ''; + homepage = "http://www.quarkline.net/basez/"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.oaksoaj ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68bed0c68649..f3f57161ec58 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1485,6 +1485,8 @@ with pkgs; balena-cli = callPackage ../tools/admin/balena-cli { }; + basez = callPackage ../tools/misc/basez { }; + butler = callPackage ../games/itch/butler.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; }; From 24fcf7b0d447cbf33abc52f62634ceca39e95e8c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Jun 2023 12:08:03 +0000 Subject: [PATCH 03/24] vintagestory: 1.17.11 -> 1.18.5 --- pkgs/games/vintagestory/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/vintagestory/default.nix b/pkgs/games/vintagestory/default.nix index 046fbefb4318..0a8eb2e6a0f8 100644 --- a/pkgs/games/vintagestory/default.nix +++ b/pkgs/games/vintagestory/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "vintagestory"; - version = "1.17.11"; + version = "1.18.5"; src = fetchurl { url = "https://cdn.vintagestory.at/gamefiles/stable/vs_archive_${version}.tar.gz"; - sha256 = "sha256-iIQRwnJX+7GJcOqXJutInqpSX2fKlPmwFFAq6TqNWWY="; + sha256 = "sha256-VW85a8Yi1s+cOSZU5E/Rhhz4IMNLMtdAfOZKJ0axApA="; }; nativeBuildInputs = [ makeWrapper copyDesktopItems ]; From a0a92f60b2d5c00e8be5f73325f964eaa73ae3a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Jun 2023 18:18:20 +0000 Subject: [PATCH 04/24] lima: 0.15.1 -> 0.16.0 --- pkgs/applications/virtualization/lima/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 7924d7f70f6f..cf40f599785c 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "lima"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uZE827dc79i7JPxHDI3kmAANN9XUIuhR0c9BUe92DyQ="; + sha256 = "sha256-6BNUuYAy3rUpPeUsbLRpz0+LdgVeHjlVjmQRcuFSXEg="; }; - vendorHash = "sha256-CysPzlup8TVVR4rCm3cWTjnxwJznMv0wbaeCC0ofWSU="; + vendorHash = "sha256-KuMEAlXvW5FhTC7HQa3CoqRlhtwSBzjk+dgAnzScfno="; nativeBuildInputs = [ makeWrapper installShellFiles ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ]; From 05087faf4d6f808fd5e619d9290ea36dc5f01dbd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Jun 2023 14:14:43 +0000 Subject: [PATCH 05/24] exodus: 23.5.8 -> 23.5.22 --- pkgs/applications/blockchains/exodus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index 22981064a1cb..c85008cbcffc 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }: stdenv.mkDerivation rec { pname = "exodus"; - version = "23.5.8"; + version = "23.5.22"; src = fetchzip { url = "https://downloads.exodus.com/releases/${pname}-linux-x64-${version}.zip"; - sha256 = "sha256-3mABHkxEMS985NqQBZ7HijtTiun1iSXFJmi0qOh3m7g="; + sha256 = "sha256-CZuT0nlKyF7LRGqNezm98MHcQa2Uhd8y+NiKE5mi0jk="; }; installPhase = '' From 604210ed34edcab2f7c1d604e75889c6438b3d2d Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 3 Jun 2023 10:19:31 -0400 Subject: [PATCH 06/24] delta: 0.16.4 -> 0.16.5, add figsoda as a maintainer Diff: https://github.com/dandavison/delta/compare/0.16.4...0.16.5 Changelog: https://github.com/dandavison/delta/releases/tag/0.16.5 --- .../version-management/delta/default.nix | 41 +++++++++++-------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/version-management/delta/default.nix b/pkgs/applications/version-management/delta/default.nix index 2711196ca318..79c511ec2c8c 100644 --- a/pkgs/applications/version-management/delta/default.nix +++ b/pkgs/applications/version-management/delta/default.nix @@ -1,38 +1,47 @@ -{ stdenv -, lib -, fetchFromGitHub +{ lib , rustPlatform +, fetchFromGitHub , installShellFiles -, DiskArbitration -, Foundation -, libiconv -, Security +, pkg-config +, oniguruma +, stdenv +, darwin , git }: rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.16.4"; + version = "0.16.5"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - hash = "sha256-lIOJPDnSwyPVhmBUPCiWtpNNxXGRKVruidBKIF9tFvo="; + hash = "sha256-W6XtfXfOP8QfQ0t5hquFdYvCO9muE50N1fQsNtnOzfM="; }; - cargoHash = "sha256-7+SwJ64PJvBi0YOeYcfqsN2f5ehj/t7XhniWd4jWJnM="; + cargoHash = "sha256-SNKbgEyelJCHKCaBRfCGc3RECGABtZzMC2rCbhzqZtU="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + pkg-config + ]; - buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation libiconv Security ]; + buildInputs = [ + oniguruma + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk_11_0.frameworks.Foundation + ]; nativeCheckInputs = [ git ]; + env = { + RUSTONIG_SYSTEM_LIBONIG = true; + }; + postInstall = '' - installShellCompletion --bash --name delta.bash etc/completion/completion.bash - installShellCompletion --zsh --name _delta etc/completion/completion.zsh - installShellCompletion --fish --name delta.fish etc/completion/completion.fish + installShellCompletion --cmd delta \ + etc/completion/completion.{bash,fish,zsh} ''; checkFlags = lib.optionals stdenv.isDarwin [ @@ -44,6 +53,6 @@ rustPlatform.buildRustPackage rec { description = "A syntax-highlighting pager for git"; changelog = "https://github.com/dandavison/delta/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ marsam zowoq SuperSandro2000 ]; + maintainers = with maintainers; [ marsam zowoq SuperSandro2000 figsoda ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 192662252060..71bc1a49dbd7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1881,9 +1881,7 @@ with pkgs; darcs-to-git = callPackage ../applications/version-management/darcs-to-git { }; - delta = darwin.apple_sdk_11_0.callPackage ../applications/version-management/delta { - inherit (darwin.apple_sdk_11_0.frameworks) DiskArbitration Foundation Security; - }; + delta = darwin.apple_sdk_11_0.callPackage ../applications/version-management/delta { }; diff-so-fancy = callPackage ../applications/version-management/diff-so-fancy { }; From bae4cfeef94ea60fbb0e4fe9c49acf3ab60964c6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Jun 2023 16:37:13 +0200 Subject: [PATCH 07/24] python311Packages.aio-pika: 9.0.7 -> 9.1.2 Diff: https://github.com/mosquito/aio-pika/compare/refs/tags/9.0.7...9.1.2 Changelog: https://github.com/mosquito/aio-pika/blob/9.1.2/CHANGELOG.md --- pkgs/development/python-modules/aio-pika/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aio-pika/default.nix b/pkgs/development/python-modules/aio-pika/default.nix index 18cb7dd3c5cd..3bed23499552 100644 --- a/pkgs/development/python-modules/aio-pika/default.nix +++ b/pkgs/development/python-modules/aio-pika/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aio-pika"; - version = "9.0.7"; + version = "9.1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "mosquito"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-4RZxpLQ8YcPRXrF0mJcteUwejlIQx0CIy0cFpfMW/RU="; + hash = "sha256-iyy6HaB3S/CPYuo62SThe3m96eg9rPTMaKg2KWt0Kf0="; }; nativeBuildInputs = [ From 51b7a2368852877603d26094d8ea81173b68f1eb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Jun 2023 16:38:14 +0200 Subject: [PATCH 08/24] python311Packages.aiokafka: 0.8.0 -> 0.8.1 Diff: https://github.com/aio-libs/aiokafka/compare/refs/tags/v0.8.0...v0.8.1 Changelog: https://github.com/aio-libs/aiokafka/releases/tag/v0.8.1 --- pkgs/development/python-modules/aiokafka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiokafka/default.nix b/pkgs/development/python-modules/aiokafka/default.nix index 03957073c149..1335db763d12 100644 --- a/pkgs/development/python-modules/aiokafka/default.nix +++ b/pkgs/development/python-modules/aiokafka/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiokafka"; - version = "0.8.0"; + version = "0.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-g7xUB5RfjG4G7J9Upj3KXKSePa+VDit1Zf8pWHfui1o="; + hash = "sha256-O5cDP0PWFrxNSdwWqUUkErUKf1Tt9agKJqWIjd4jGqk="; }; nativeBuildInputs = [ From 4604fceae34c3b6c4f97f6fe64b50b75042fa0a9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Jun 2023 16:39:09 +0200 Subject: [PATCH 09/24] python311Packages.aiopvpc: 4.1.0 -> 4.2.1 Diff: https://github.com/azogue/aiopvpc/compare/refs/tags/v4.1.0...v4.2.1 Changelog: https://github.com/azogue/aiopvpc/blob/v4.2.1/CHANGELOG.md --- pkgs/development/python-modules/aiopvpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiopvpc/default.nix b/pkgs/development/python-modules/aiopvpc/default.nix index 14f3a83481d5..e4afdbadbfa5 100644 --- a/pkgs/development/python-modules/aiopvpc/default.nix +++ b/pkgs/development/python-modules/aiopvpc/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiopvpc"; - version = "4.1.0"; + version = "4.2.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "azogue"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ixHLFVPlDZKQkPMrOt8PG5z+e84UlygQutkyS8wCZR4="; + hash = "sha256-gfF/SFfiZgkWH0cQZF3hxEp6xxRi46nfDBB23Gerv5g="; }; postPatch = '' From 9847358579aab54965520a742c7c960abece50b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Jun 2023 18:44:02 +0000 Subject: [PATCH 10/24] odo: 3.10.0 -> 3.11.0 --- pkgs/applications/networking/cluster/odo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/odo/default.nix b/pkgs/applications/networking/cluster/odo/default.nix index 10e71f806a5f..1099c1b08195 100644 --- a/pkgs/applications/networking/cluster/odo/default.nix +++ b/pkgs/applications/networking/cluster/odo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "odo"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = "redhat-developer"; repo = "odo"; rev = "v${version}"; - sha256 = "sha256-J8Oiw7/jPwIoPh8erL7auSiQCRzvY7i4COPmtI3qPXY="; + sha256 = "sha256-+5oX6/J/WpJZr/o9l8TZhMJoxonnT0DeIEWffAjZYww="; }; vendorHash = null; From 229e4bd29a63ddeb2aed3cfa0a7f373b929a34a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Jun 2023 18:53:12 +0000 Subject: [PATCH 11/24] jackett: 0.21.88 -> 0.21.114 --- 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 3887b8ed424c..0d99f276ca33 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.21.88"; + version = "0.21.114"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-N1+6DK8o7pDUtpVcxvCCFAE9+mvk1QNk1Hkx0boOxYwhvxDX+QIULEioJ2H4ClZDat5riaFT873cWnNNtBJsaQ=="; + hash = "sha512-CwK6nKsI9SrY9lE8THRVe+q0fMLxiLAdeCW7rewI2XtIeIDUy7kDYBujIlbxNdAjT+QgsN3E0oC/+nIyRqqFUg=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; From 55936ead43b9cfe0568694f46b49cea610811b42 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Jun 2023 19:33:05 +0000 Subject: [PATCH 12/24] terragrunt: 0.45.16 -> 0.45.18 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 9c9eb889be40..0e9056da62e1 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.45.16"; + version = "0.45.18"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-q12MXqYf4yXC1ifXCuHE75Eb553TWbohDB2GusRpNIM="; + hash = "sha256-J4edaMLvL9Bs1bwF+m0LMGiGmEKa7Xcb3SgOiDldTyY="; }; vendorHash = "sha256-5Umoqi2D6iUk2Ut7YB/nmkOyA6Rx2qFhy/ZbfqoX5qA="; From 03c74cf46ebd9e913389f0875c1b3a6e529d2fb5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Jun 2023 19:56:25 +0000 Subject: [PATCH 13/24] ddosify: 1.0.1 -> 1.0.3 --- pkgs/development/tools/ddosify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ddosify/default.nix b/pkgs/development/tools/ddosify/default.nix index dd54db22925d..778a08b383f7 100644 --- a/pkgs/development/tools/ddosify/default.nix +++ b/pkgs/development/tools/ddosify/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ddosify"; - version = "1.0.1"; + version = "1.0.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-QinC03SdJ0V2t69LJYsoV+KV13D+OcTkLetFe8vLF3Y="; + sha256 = "sha256-SkKETcKlH6OF6+gLBq/6P7txcmMRxoXc1Mm005piCHc="; }; vendorHash = "sha256-cGhMhX+SEv9fejViLZrEwXg584o204OQ5iR6AkxKnXo="; From b8c7d0de3107d8f7e4db4d70ff8d220d94da1ebe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Sat, 3 Jun 2023 21:45:27 +0200 Subject: [PATCH 14/24] ferdium: 6.2.6 -> 6.3.0 Bump Ferdium version from 6.2.6 -> 6.3.0 (skipping 6.2.7) Changelog (6.3.0): https://github.com/ferdium/ferdium-app/releases/tag/v6.3.0 Changelog (6.2.7): https://github.com/ferdium/ferdium-app/releases/tag/v6.2.7 --- .../networking/instant-messengers/ferdium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/ferdium/default.nix b/pkgs/applications/networking/instant-messengers/ferdium/default.nix index 0ff76e418862..c68dae7edaa8 100644 --- a/pkgs/applications/networking/instant-messengers/ferdium/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdium/default.nix @@ -3,10 +3,10 @@ mkFranzDerivation rec { pname = "ferdium"; name = "Ferdium"; - version = "6.2.6"; + version = "6.3.0"; src = fetchurl { url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-amd64.deb"; - sha256 = "sha256-jG3NdolWqQzj/62jYwnqJHz5uT6QIuOkrpL/FcLl56k="; + sha256 = "sha256-3i3cEGwUXNITABJRXV+xQ2knYjuG1F818EvhLBrVep8="; }; extraBuildInputs = [ xorg.libxshmfence ]; From a903a11e38092b5f8c683cf7fdad102a7f37c84c Mon Sep 17 00:00:00 2001 From: Ricardo Steijn Date: Sat, 3 Jun 2023 22:08:59 +0200 Subject: [PATCH 15/24] swayfx: 0.3 -> 0.3.1 --- pkgs/applications/window-managers/sway/fx.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/sway/fx.nix b/pkgs/applications/window-managers/sway/fx.nix index c77273c13a37..d79c9d59bf21 100644 --- a/pkgs/applications/window-managers/sway/fx.nix +++ b/pkgs/applications/window-managers/sway/fx.nix @@ -2,13 +2,13 @@ sway-unwrapped.overrideAttrs (oldAttrs: rec { pname = "swayfx"; - version = "0.3"; + version = "0.3.1"; src = fetchFromGitHub { owner = "WillPower3309"; repo = "swayfx"; rev = version; - sha256 = "sha256-3Odyeb10AGbNf6TI1W79sLiwB4PrszC5VzjCr7FuPz4="; + sha256 = "sha256-Ox+ror8sCc4mFOqZ1H9782hWbkTSUs5IVYEubHuyoJQ="; }; # This patch was backported into SwayFX From f7d28825d3429e0635c8a9b0f6ae283802048c5f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Jun 2023 20:39:21 +0000 Subject: [PATCH 16/24] gh-markdown-preview: 1.4.0 -> 1.4.1 --- pkgs/tools/misc/gh-markdown-preview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/gh-markdown-preview/default.nix b/pkgs/tools/misc/gh-markdown-preview/default.nix index 036e91b371ff..6d148b31b86b 100644 --- a/pkgs/tools/misc/gh-markdown-preview/default.nix +++ b/pkgs/tools/misc/gh-markdown-preview/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gh-markdown-preview"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "yusukebe"; repo = "gh-markdown-preview"; rev = "v${version}"; - hash = "sha256-WAKGtwz0CNqx86YOeLKWwfJiFcRAm1+X5kJOfsPgtjY="; + hash = "sha256-Q+e3j+X/ZsLdkTBkuu028Rl4iw+oES2w6CDQiwN+CtU="; }; vendorHash = "sha256-O6Q9h5zcYAoKLjuzGu7f7UZY0Y5rL2INqFyJT2QZJ/E="; From 449a46278e821babb4fac2a39f669dbf3046e5f1 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 3 Jun 2023 23:43:41 +0300 Subject: [PATCH 17/24] strip-nondeterminism: fix zip handler https://salsa.debian.org/reproducible-builds/strip-nondeterminism/-/blob/master/lib/File/StripNondeterminism/handlers/zip.pm#L29 it was working on linux because the tests are run on linux --- pkgs/development/perl-modules/strip-nondeterminism/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/perl-modules/strip-nondeterminism/default.nix b/pkgs/development/perl-modules/strip-nondeterminism/default.nix index f867e8437432..3dac3868e664 100644 --- a/pkgs/development/perl-modules/strip-nondeterminism/default.nix +++ b/pkgs/development/perl-modules/strip-nondeterminism/default.nix @@ -28,10 +28,9 @@ buildPerlPackage rec { buildInputs = [ ArchiveZip ArchiveCpio + SubOverride ]; - nativeCheckInputs = [ SubOverride ]; - postPatch = '' substituteInPlace lib/File/StripNondeterminism.pm \ --replace "exec('file'" "exec('${lib.getExe file}'" From c99d4fc4d0bc5343cf7b7e6b94261082e6aefff3 Mon Sep 17 00:00:00 2001 From: Winter Date: Mon, 29 May 2023 11:38:26 -0400 Subject: [PATCH 18/24] thelounge: reorder/cleanup imports --- .../applications/networking/irc/thelounge/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/irc/thelounge/default.nix b/pkgs/applications/networking/irc/thelounge/default.nix index bee360d55e66..2760a73352b5 100644 --- a/pkgs/applications/networking/irc/thelounge/default.nix +++ b/pkgs/applications/networking/irc/thelounge/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, fetchYarnDeps, yarn, fixup_yarn_lock, nodejs, npmHooks, nixosTests }: +{ lib +, stdenv +, fetchFromGitHub +, fetchYarnDeps +, nodejs +, yarn +, fixup_yarn_lock +, npmHooks +, nixosTests +}: stdenv.mkDerivation (finalAttrs: { pname = "thelounge"; From a1cfd90e10d129d093aa5917326718d43d0a3661 Mon Sep 17 00:00:00 2001 From: Winter Date: Mon, 29 May 2023 11:32:51 -0400 Subject: [PATCH 19/24] thelounge: fix sqlite logging Previously, we never actually built the SQLite binding, causing The Lounge to bail when attempting to load SQLite logs [0]. It wasn't caught before because it wasn't thrown fatally, for whatever reason. Perhaps we should fix this in the future with a patch and/or more robust tests, but for now, let's just fix the issue. [0]: https://github.com/NixOS/nixpkgs/pull/233511#issuecomment-1567182450 --- .../networking/irc/thelounge/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/thelounge/default.nix b/pkgs/applications/networking/irc/thelounge/default.nix index 2760a73352b5..0ccca903f179 100644 --- a/pkgs/applications/networking/irc/thelounge/default.nix +++ b/pkgs/applications/networking/irc/thelounge/default.nix @@ -5,7 +5,12 @@ , nodejs , yarn , fixup_yarn_lock +, python3 , npmHooks +, darwin +, sqlite +, srcOnly +, buildPackages , nixosTests }: @@ -33,7 +38,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-OKLsNGl94EDyLgP2X2tiwihgRQFXGvf5XgXwgX+JEpk="; }; - nativeBuildInputs = [ nodejs yarn fixup_yarn_lock npmHooks.npmInstallHook ]; + nativeBuildInputs = [ nodejs yarn fixup_yarn_lock python3 npmHooks.npmInstallHook ] ++ lib.optional stdenv.isDarwin darwin.cctools; + buildInputs = [ sqlite ]; configurePhase = '' runHook preConfigure @@ -58,8 +64,14 @@ stdenv.mkDerivation (finalAttrs: { # `npm prune` doesn't work and/or hangs for whatever reason. preInstall = '' - rm -rf node_modules yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive --production + patchShebangs node_modules + + # Build the sqlite3 package. + npm_config_nodedir="${srcOnly nodejs}" npm_config_node_gyp="${buildPackages.nodejs}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js" npm rebuild --verbose --sqlite=${sqlite.dev} + + # These files seemingly aren't needed, and also might not exist when the Darwin sandbox is disabled? + rm -rf node_modules/sqlite3/build-tmp-napi-v6/{Release/obj.target,node_sqlite3.target.mk} ''; dontNpmPrune = true; From eacc2adee83794177d181160c79b160b3a67b591 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Jun 2023 21:03:09 +0000 Subject: [PATCH 20/24] kubedog: 0.9.11 -> 0.9.12 --- pkgs/applications/networking/cluster/kubedog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubedog/default.nix b/pkgs/applications/networking/cluster/kubedog/default.nix index cf858efef97a..dc67ccc36e63 100644 --- a/pkgs/applications/networking/cluster/kubedog/default.nix +++ b/pkgs/applications/networking/cluster/kubedog/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "kubedog"; - version = "0.9.11"; + version = "0.9.12"; src = fetchFromGitHub { owner = "werf"; repo = "kubedog"; rev = "v${version}"; - hash = "sha256-yHyCmUjxvMzeHpG5OqC3nAjWaiHErTXrbmS+/0Y4A7E="; + hash = "sha256-B667EnlOD0kXqkW73XXcyQwROWh5SmsM8565sjcGinI="; }; vendorHash = "sha256-OgfgCsysNtY7mZQXdmHFyJ0FqmBD3SeQdTLd5Lw3F7k="; From 037db8f0b6dc8d72818829fb933cdf62969f8b14 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Jun 2023 23:08:45 +0200 Subject: [PATCH 21/24] qovery-cli: 0.58.15 -> 0.59.0 Diff: https://github.com/Qovery/qovery-cli/compare/v0.58.15...v0.59.0 Changelog: https://github.com/Qovery/qovery-cli/releases/tag/v0.59.0 --- pkgs/tools/admin/qovery-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index 43059055263b..c9239c0b6e9c 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.58.15"; + version = "0.59.0"; src = fetchFromGitHub { owner = "Qovery"; repo = pname; rev = "v${version}"; - hash = "sha256-sADeiFzVSk4Y0ZHvSoBVbtGp/YWO8ioYzZ+FXO9A7Tg="; + hash = "sha256-EPnuCmkJrjj9STO/FlDNYZmyqTAgTHvqxTxmQcgJLmQ="; }; - vendorHash = "sha256-Jwg+c+61kCytOkrwzJJCOjIGrv832G7n/kUDLGIJ5xA="; + vendorHash = "sha256-nW1PZ/cg7rU3e729H9I4Mqi/Q9wbSFMvtl0Urv9Fl8E="; nativeBuildInputs = [ installShellFiles ]; From 12d0400e9b73c19145df3635a94e45ecc228dc09 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Jun 2023 23:32:48 +0200 Subject: [PATCH 22/24] python310Packages.rns: 0.5.3 -> 0.5.4 Diff: https://github.com/markqvist/Reticulum/compare/refs/tags/0.5.3...0.5.4 Changelog: https://github.com/markqvist/Reticulum/releases/tag/0.5.4 --- pkgs/development/python-modules/rns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index b937058f40c3..8295ca7dd54b 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.5.3"; + version = "0.5.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-SZx0GBpYDC7p7yLVY5WZmBgpbpcl9GbsfdqH0YBrUgQ="; + hash = "sha256-OFU61RX6XtC/7x3SWbRCsODTrs3k3FCTCvEapkkeWQU="; }; propagatedBuildInputs = [ From 6ddd842a4a90a700a6f997befd5f1d241f57873d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Jun 2023 23:39:28 +0200 Subject: [PATCH 23/24] python310Packages.bitarray: 2.7.3 -> 2.7.4 Changelog: https://github.com/ilanschnell/bitarray/raw/2.7.4/CHANGE_LOG --- pkgs/development/python-modules/bitarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index eaf0770dcb93..3d480ea63098 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.7.3"; + version = "2.7.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9xJWoyYJsDatrZMuEii2amtOLK5r45fliN3Aur2aeLk="; + hash = "sha256-FD1PZeH0WlM+E1Ib4dxVengjF+z3ZSDqvVqQOybssYc="; }; checkPhase = '' From dd4982554e18b936790da07c4ea2db7c7600f283 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 3 Jun 2023 19:51:01 -0400 Subject: [PATCH 24/24] hyperfine: 1.16.1 -> 0.17.0 (#235842) Diff: https://github.com/sharkdp/hyperfine/compare/v1.16.1...v0.17.0 Changelog: https://github.com/sharkdp/hyperfine/blob/v0.17.0/CHANGELOG.md --- pkgs/tools/misc/hyperfine/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix index 3cca1891147a..2acff9bb5ebd 100644 --- a/pkgs/tools/misc/hyperfine/default.nix +++ b/pkgs/tools/misc/hyperfine/default.nix @@ -1,6 +1,6 @@ { lib , rustPlatform -, fetchCrate +, fetchFromGitHub , installShellFiles , stdenv , Security @@ -8,14 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "hyperfine"; - version = "1.16.1"; + version = "0.17.0"; - src = fetchCrate { - inherit pname version; - sha256 = "sha256-OdOlFdhIYxBi3e94QAief0xZqVdr+wnbaPFSKJ20DNM="; + src = fetchFromGitHub { + owner = "sharkdp"; + repo = "hyperfine"; + rev = "v${version}"; + hash = "sha256-IUjOklkEiy/U2HjjMt1X1uSpIkTAYOPiPQ+70xvvxKA="; }; - cargoSha256 = "sha256-RgoMq52GkRbfhsBipMKhCSu3YQoOtDB/Fdg+9OPzGtk="; + cargoHash = "sha256-cm6opZrdSEY4qsYQzgCJ8wx6iIIuytySWh3F3Roo/JQ="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optional stdenv.isDarwin Security;