From dd36c0a3f522635af4ec36cb1d67bcdf3cd8eca2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jun 2025 12:47:27 +0000 Subject: [PATCH 01/23] wideriver: 1.2.0 -> 1.2.1 --- pkgs/by-name/wi/wideriver/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wi/wideriver/package.nix b/pkgs/by-name/wi/wideriver/package.nix index 496aa561e8ca..06e3484a9d4e 100644 --- a/pkgs/by-name/wi/wideriver/package.nix +++ b/pkgs/by-name/wi/wideriver/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wideriver"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "alex-courtis"; repo = "wideriver"; tag = finalAttrs.version; - hash = "sha256-D1JHfMnq6u057FrBqgZ4UlfeOlkTWKkKzFYM29+vIJo="; + hash = "sha256-nDjK6BjRH4G+9ySTE4uV7SxaV8P3XKTgsFyDsx8Ld1U="; }; nativeBuildInputs = [ From 8d8b56a7c151d76993b607cf2b862ed1c81cfa5d Mon Sep 17 00:00:00 2001 From: Saterfield990 Date: Thu, 19 Jun 2025 13:12:34 +0300 Subject: [PATCH 02/23] xmake: 2.9.9 -> 3.0.0 --- pkgs/by-name/xm/xmake/package.nix | 32 +++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/xm/xmake/package.nix b/pkgs/by-name/xm/xmake/package.nix index f641be01c91f..ba55f2a309f3 100644 --- a/pkgs/by-name/xm/xmake/package.nix +++ b/pkgs/by-name/xm/xmake/package.nix @@ -1,28 +1,40 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, nix-update-script, + versionCheckHook, }: -stdenv.mkDerivation rec { + +stdenv.mkDerivation (finalAttrs: { pname = "xmake"; - version = "2.9.9"; - src = fetchurl { - url = "https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.tar.gz"; - hash = "sha256-6SUFuDvJd2KG6ucZ1YvOp/8ld6/hLLXMsnnIHn28cC0="; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "xmake-io"; + repo = "xmake"; + tag = "v${finalAttrs.version}"; + hash = "sha256-JY94DaSZ12pRrcCPxoPaECRA8rMK6/fNNyr/F8Htu8A="; + fetchSubmodules = true; }; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + passthru = { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { + changelog = "https://github.com/xmake-io/xmake/releases/tag/v${finalAttrs.version}"; description = "Cross-platform build utility based on Lua"; homepage = "https://xmake.io"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ rewine rennsax ]; + mainProgram = "xmake"; }; -} +}) From 045ceafca08a350b402f3a3ae60773b1490f7e88 Mon Sep 17 00:00:00 2001 From: Rowan Skewes Date: Sun, 2 Feb 2025 15:37:04 +1100 Subject: [PATCH 03/23] maintainers: add rskew --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cbbdba9a9094..7d8e5e8a6d92 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -21787,6 +21787,12 @@ keys = [ { fingerprint = "6AE2 A847 23D5 6D98 5B34 0BC0 8E5F A470 9F69 E911"; } ]; name = "Ralph Seichter"; }; + rskew = { + name = "Rowan Skewes"; + email = "rowan.skewes@gmail.com"; + github = "rskew"; + githubId = 16100155; + }; rski = { name = "rski"; email = "rom.skiad+nix@gmail.com"; From 06b8eafa8ebc4137b6f794ba6ab786af2882a299 Mon Sep 17 00:00:00 2001 From: Rowan Skewes Date: Mon, 19 May 2025 12:43:08 +1000 Subject: [PATCH 04/23] python3Packages.logging-tree: init at 1.10 --- .../python-modules/logging-tree/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/logging-tree/default.nix diff --git a/pkgs/development/python-modules/logging-tree/default.nix b/pkgs/development/python-modules/logging-tree/default.nix new file mode 100644 index 000000000000..884b0056f371 --- /dev/null +++ b/pkgs/development/python-modules/logging-tree/default.nix @@ -0,0 +1,32 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + unittestCheckHook, +}: + +buildPythonPackage rec { + pname = "logging-tree"; + version = "1.10"; + + src = fetchFromGitHub { + owner = "brandon-rhodes"; + repo = "logging_tree"; + tag = version; + hash = "sha256-9MeCx708EUe5dmFkol+HISzdBX+yar1HjKIAwmg1msA="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ unittestCheckHook ]; + + pythonImportsCheck = [ "logging_tree" ]; + + meta = { + description = "Debug Python logging problems by printing out the tree of handlers you have defined"; + homepage = "https://github.com/brandon-rhodes/logging_tree"; + license = [ lib.licenses.bsd2 ]; + maintainers = [ lib.maintainers.rskew ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1b091dda03be..1318b805fd1d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8492,6 +8492,8 @@ self: super: with self; { logging-journald = callPackage ../development/python-modules/logging-journald { }; + logging-tree = callPackage ../development/python-modules/logging-tree { }; + logical-unification = callPackage ../development/python-modules/logical-unification { }; logilab-common = callPackage ../development/python-modules/logilab/common.nix { From 005f1ba61be25dddba9cc5c91b29b8b545bb706e Mon Sep 17 00:00:00 2001 From: "Berk D. Demir" Date: Sat, 21 Jun 2025 03:20:03 +0000 Subject: [PATCH 05/23] _1password-gui: 8.10.78 -> 8.10.80 --- pkgs/by-name/_1/_1password-gui/sources.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/_1/_1password-gui/sources.json b/pkgs/by-name/_1/_1password-gui/sources.json index 60b0a7e93b46..215982d364b1 100644 --- a/pkgs/by-name/_1/_1password-gui/sources.json +++ b/pkgs/by-name/_1/_1password-gui/sources.json @@ -1,28 +1,28 @@ { "stable": { "linux": { - "version": "8.10.78", + "version": "8.10.80", "sources": { "x86_64": { - "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.10.78.x64.tar.gz", - "hash": "sha256-COmXSjbCetPsbm40OrWGVtULPheEgnHEO0ZcIgWaG1w=" + "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.10.80.x64.tar.gz", + "hash": "sha256-fxhLeeJzzbIhRZcrLnkBvrwAA+jzGeOhnmiH3ErlDTE=" }, "aarch64": { - "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.10.78.arm64.tar.gz", - "hash": "sha256-diy7VhKRluSnVSR35Ogamf9RDHdqxSJifLOOYmMrJHE=" + "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.10.80.arm64.tar.gz", + "hash": "sha256-Ffr7Xow6ZMGE4Spf3QfDoSydR3OXasMpM3ttiiPup+Q=" } } }, "darwin": { - "version": "8.10.78", + "version": "8.10.80", "sources": { "x86_64": { - "url": "https://downloads.1password.com/mac/1Password-8.10.78-x86_64.zip", - "hash": "sha256-8fbjEc/Z0xCdXq/uHp4bQE5Js5hNLbVCRZxnepUdLUs=" + "url": "https://downloads.1password.com/mac/1Password-8.10.80-x86_64.zip", + "hash": "sha256-4b7mocNt/H9xiai9E9pqT5LWNsRi6Skr+F1vctfmU3k=" }, "aarch64": { - "url": "https://downloads.1password.com/mac/1Password-8.10.78-aarch64.zip", - "hash": "sha256-x03dZ/eVrvFcbese1cBAvyJKwtWe6rOcgytn0OsEFDQ=" + "url": "https://downloads.1password.com/mac/1Password-8.10.80-aarch64.zip", + "hash": "sha256-8PJq6VVTAMQWLP9rLwOhtK02KZckn7ps4evDPL6EvYs=" } } } From caf9bd6fff6c8c52c52bd884dc106e50b12202c3 Mon Sep 17 00:00:00 2001 From: "Berk D. Demir" Date: Sat, 21 Jun 2025 03:20:38 +0000 Subject: [PATCH 06/23] _1password-gui-beta: 8.10.80-18.BETA -> 8.10.82-27.BETA --- pkgs/by-name/_1/_1password-gui/sources.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/_1/_1password-gui/sources.json b/pkgs/by-name/_1/_1password-gui/sources.json index 215982d364b1..c8641d52ce56 100644 --- a/pkgs/by-name/_1/_1password-gui/sources.json +++ b/pkgs/by-name/_1/_1password-gui/sources.json @@ -29,28 +29,28 @@ }, "beta": { "linux": { - "version": "8.10.80-18.BETA", + "version": "8.10.82-27.BETA", "sources": { "x86_64": { - "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.10.80-18.BETA.x64.tar.gz", - "hash": "sha256-X2Wu/dQQ7fv+tTAU2/70S38wL6WdJuc/DXWoiHZvSP4=" + "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.10.82-27.BETA.x64.tar.gz", + "hash": "sha256-6ncTm+rgEPGRwMquOCWH8sXin9CrjiHsUDLKo3CrLIM=" }, "aarch64": { - "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.10.80-18.BETA.arm64.tar.gz", - "hash": "sha256-52aRg6QD/fKOzOHoG88q8VNJIizxnISFnpxek7bJ05w=" + "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.10.82-27.BETA.arm64.tar.gz", + "hash": "sha256-fRgTfZjQRrPbYUKIub+y9iYSBvsElN90ag0maPKTM2g=" } } }, "darwin": { - "version": "8.10.80-18.BETA", + "version": "8.10.82-27.BETA", "sources": { "x86_64": { - "url": "https://downloads.1password.com/mac/1Password-8.10.80-18.BETA-x86_64.zip", - "hash": "sha256-kUU+nm19DmdY8ZG6d+EJFQXcCy/BOauXh83suQLSvz0=" + "url": "https://downloads.1password.com/mac/1Password-8.10.82-27.BETA-x86_64.zip", + "hash": "sha256-jCxzPxRvb7gjhDeZVcTcuED4N436aJsivpfgae9dVc0=" }, "aarch64": { - "url": "https://downloads.1password.com/mac/1Password-8.10.80-18.BETA-aarch64.zip", - "hash": "sha256-eZG0QaB5NRwRCYcmlfZA/HTceLq7eUzR+AvzDeOrzAY=" + "url": "https://downloads.1password.com/mac/1Password-8.10.82-27.BETA-aarch64.zip", + "hash": "sha256-PibtIpKpyp0+jkzZ9odNow6Gew/fjWy9EvdIgeewpA4=" } } } From 3332264100e09315411e3f697b930b9635fdafd7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jun 2025 08:36:53 +0000 Subject: [PATCH 07/23] chatbox: 1.13.4 -> 1.14.1 --- pkgs/by-name/ch/chatbox/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ch/chatbox/package.nix b/pkgs/by-name/ch/chatbox/package.nix index 79b25131fa83..fada7d9f5d88 100644 --- a/pkgs/by-name/ch/chatbox/package.nix +++ b/pkgs/by-name/ch/chatbox/package.nix @@ -6,11 +6,11 @@ }: let pname = "chatbox"; - version = "1.13.4"; + version = "1.14.1"; src = fetchurl { url = "https://download.chatboxai.app/releases/Chatbox-${version}-x86_64.AppImage"; - hash = "sha256-pNRHDP3xbOix0wqSGaBAksGbzDXnq6I00t/A7cDkPzQ="; + hash = "sha256-2k2G6VMO83ztuknr4FRE0eUtsweV0eu9JSNgKaVuatQ="; }; appimageContents = appimageTools.extract { inherit pname version src; }; From c48b594afc3079d26a1393494c68c01c82c73180 Mon Sep 17 00:00:00 2001 From: Mica Semrick Date: Sat, 21 Jun 2025 09:59:41 -0700 Subject: [PATCH 08/23] darktable: 5.0.1 -> 5.2.0 --- pkgs/by-name/da/darktable/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix index 03e4a14efc04..bfd11d3ae64e 100644 --- a/pkgs/by-name/da/darktable/package.nix +++ b/pkgs/by-name/da/darktable/package.nix @@ -80,12 +80,12 @@ }: stdenv.mkDerivation rec { - version = "5.0.1"; + version = "5.2.0"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - hash = "sha256-SpGNCU67qYPvZ6EMxxXD1+jKc4AJkgqf9l0zQXtt2YQ="; + hash = "sha256-U6Rs1G73EYSFxKv0q0B8GBY5u4Y0JD7A7R98HoKZvsY="; }; nativeBuildInputs = [ @@ -193,6 +193,10 @@ stdenv.mkDerivation rec { ) ''; + postPatch = '' + patchShebangs ./tools/generate_styles_string.sh + ''; + nativeInstallCheckInputs = [ versionCheckHook ]; From ce2b5cc39f6a3fab3d90d8d39cf4d3a6314f8f0f Mon Sep 17 00:00:00 2001 From: Dustin Frisch Date: Fri, 20 Jun 2025 13:25:57 +0200 Subject: [PATCH 09/23] pullomatic: init at 0.2.2 --- pkgs/by-name/pu/pullomatic/package.nix | 43 ++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 pkgs/by-name/pu/pullomatic/package.nix diff --git a/pkgs/by-name/pu/pullomatic/package.nix b/pkgs/by-name/pu/pullomatic/package.nix new file mode 100644 index 000000000000..b5cf431dfc10 --- /dev/null +++ b/pkgs/by-name/pu/pullomatic/package.nix @@ -0,0 +1,43 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + libgit2, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "pullomatic"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "fooker"; + repo = "pullomatic"; + tag = "v${finalAttrs.version}"; + hash = "sha256-qPuJ2mqbqQQxncsz5DexOYyNctIInX0Of5mdAGu/t/M="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-+B/DzDaF3qQlPzjh97CBMAseyeUClgsgzE0EJ8kTlqg="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + libgit2 + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Automates Git repository syncing through pure configuration"; + homepage = "https://github.com/fooker/pullomatic"; + license = lib.licenses.mit; + mainProgram = "pullomatic"; + maintainers = with lib.maintainers; [ fooker ]; + }; +}) From 39539129842fda2118cd00c9c797a28198330569 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jun 2025 19:27:05 +0000 Subject: [PATCH 10/23] mpd-discord-rpc: 1.8.0 -> 1.8.1 --- pkgs/by-name/mp/mpd-discord-rpc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mp/mpd-discord-rpc/package.nix b/pkgs/by-name/mp/mpd-discord-rpc/package.nix index 51578dd19063..007789134e8b 100644 --- a/pkgs/by-name/mp/mpd-discord-rpc/package.nix +++ b/pkgs/by-name/mp/mpd-discord-rpc/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "mpd-discord-rpc"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "JakeStanger"; repo = "mpd-discord-rpc"; rev = "v${version}"; - hash = "sha256-RuXH0RaR0VVN7tja0pcc8QH826/JzH4tyVVCbrK7ldI="; + hash = "sha256-6PSwfvmGdcxQvmnbloTBWEiz5vbN/RxK4Afq1PgUX94="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ewmg5t0JljnvxjrGDJzokRwndv7UNw9NMQ7Cx6oDWjg="; + cargoHash = "sha256-ecGhzcaqvTDAvbeWkr/3uXu5GD3NqlgHAiywzHfmsaA="; nativeBuildInputs = [ pkg-config From 76e2d08c30045092cc7303076920573e95349d13 Mon Sep 17 00:00:00 2001 From: Mostafa Khaled Date: Sun, 22 Jun 2025 23:25:37 +0300 Subject: [PATCH 11/23] python3Packages.djoser: fix attribute ordering Move pyproject and build-system to conventional positions and correct dependencies attribute name. --- pkgs/development/python-modules/djoser/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/djoser/default.nix b/pkgs/development/python-modules/djoser/default.nix index f0f9669cc046..cffcd3376600 100644 --- a/pkgs/development/python-modules/djoser/default.nix +++ b/pkgs/development/python-modules/djoser/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "djoser"; version = "2.3.1"; + pyproject = true; src = fetchFromGitHub { owner = "sunscrapers"; @@ -19,18 +20,14 @@ buildPythonPackage rec { hash = "sha256-xPhf7FiJSq5bHfAU5RKbobgnsRh/6cLcXP6vfrLdzJA="; }; - buildInputs = [ + build-system = [ poetry-core ]; + + dependencies = [ django djangorestframework-simplejwt social-auth-app-django ]; - pyproject = true; - - build-system = [ - poetry-core - ]; - # djet isn't packaged yet # nativeCheckInputs = [ pytestCheckHook ]; From 8dfb4412a7c5710546759c8b610762cd68c07c4c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 22 Jun 2025 23:56:49 +0200 Subject: [PATCH 12/23] engelsystem: unvendor composer and yarn dependencies --- .../modules/services/web-apps/engelsystem.nix | 4 +- pkgs/by-name/en/engelsystem/package.nix | 70 ++++++++++++------- 2 files changed, 47 insertions(+), 27 deletions(-) diff --git a/nixos/modules/services/web-apps/engelsystem.nix b/nixos/modules/services/web-apps/engelsystem.nix index 6528d17469b2..792bf1c29f82 100644 --- a/nixos/modules/services/web-apps/engelsystem.nix +++ b/nixos/modules/services/web-apps/engelsystem.nix @@ -134,7 +134,7 @@ in enable = true; virtualHosts."${cfg.domain}".locations = { "/" = { - root = "${cfg.package}/share/engelsystem/public"; + root = "${cfg.package}/share/php/engelsystem/public"; extraConfig = '' index index.php; try_files $uri $uri/ /index.php?$args; @@ -142,7 +142,7 @@ in ''; }; "~ \\.php$" = { - root = "${cfg.package}/share/engelsystem/public"; + root = "${cfg.package}/share/php/engelsystem/public"; extraConfig = '' fastcgi_pass unix:${config.services.phpfpm.pools.engelsystem.socket}; fastcgi_index index.php; diff --git a/pkgs/by-name/en/engelsystem/package.nix b/pkgs/by-name/en/engelsystem/package.nix index 65e241e8133d..320638ed0d6e 100644 --- a/pkgs/by-name/en/engelsystem/package.nix +++ b/pkgs/by-name/en/engelsystem/package.nix @@ -1,48 +1,68 @@ { lib, - fetchzip, + fetchFromGitHub, + fetchYarnDeps, + nodejs, + yarn, + yarnBuildHook, + yarnConfigHook, nixosTests, php, - stdenv, - writeText, }: -stdenv.mkDerivation rec { +php.buildComposerProject2 (finalAttrs: { pname = "engelsystem"; version = "3.6.0"; - src = fetchzip { - url = "https://github.com/engelsystem/engelsystem/releases/download/v${version}/engelsystem-v${version}.zip"; - hash = "sha256-AZVW04bcSlESSRmtfvP2oz15xvZLlGEz/X9rX7PuRGg="; + src = fetchFromGitHub { + owner = "engelsystem"; + repo = "engelsystem"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Pi+nowImUvENx2c4gsku1KkFb3pLM84oT8WevI6ImQg="; }; - buildInputs = [ php ]; + inherit php; - installPhase = '' - runHook preInstall + vendorHash = "sha256-0Mv48mB/pTQtYd2do6wTdhD/c2zwbU1gTYsdU7rELPY="; + composoerNoDev = true; + composerStrictValidation = false; - # prepare - rm -r ./storage/ + yarnOfflineCache = fetchYarnDeps { + pname = "${finalAttrs.pname}-yarn-deps"; + yarnLock = "${finalAttrs.src}/yarn.lock"; + hash = "sha256-nyCLM9OF2qwlW+VK38kiRMo6jMlupNFG+91N3Fb/WLY="; + }; + strictDeps = true; + + nativeBuildInputs = [ + nodejs + yarn + yarnConfigHook + ]; + + preBuild = '' + yarn build + ''; + + preInstall = '' + rm -rf node_modules + + # link config and storage into FHS locations ln -sf /etc/engelsystem/config.php ./config/config.php - ln -sf /var/lib/engelsystem/storage/ ./storage + rm -rf storage + ln -snf /var/lib/engelsystem/storage/ ./storage + ''; - mkdir -p $out/share/engelsystem - mkdir -p $out/bin - cp -r . $out/share/engelsystem - - echo $(command -v php) - # The patchShebangAuto function always used the php without extensions, so path the shebang manually - sed -i -e "1 s|.*|#\!${lib.getExe php}|" "$out/share/engelsystem/bin/migrate" - ln -s "$out/share/engelsystem/bin/migrate" "$out/bin/migrate" - - runHook postInstall + postInstall = '' + mkdir $out/bin + ln -s $out/share/php/engelsystem/bin/migrate $out/bin/migrate ''; passthru.tests = nixosTests.engelsystem; meta = { - changelog = "https://github.com/engelsystem/engelsystem/releases/tag/v${version}"; + changelog = "https://github.com/engelsystem/engelsystem/releases/tag/v${finalAttrs.version}"; description = "Coordinate your volunteers in teams, assign them to work shifts or let them decide for themselves when and where they want to help with what"; homepage = "https://engelsystem.de"; license = lib.licenses.gpl2Only; @@ -50,4 +70,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; -} +}) From 1b1eb2bfcd5d9dcba8e8aba7a26957067398adeb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Jun 2025 00:30:24 +0000 Subject: [PATCH 13/23] vdrPlugins.markad: 4.2.12 -> 4.2.14 --- pkgs/applications/video/vdr/markad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vdr/markad/default.nix b/pkgs/applications/video/vdr/markad/default.nix index b085b465528e..05dc617c25af 100644 --- a/pkgs/applications/video/vdr/markad/default.nix +++ b/pkgs/applications/video/vdr/markad/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-markad"; - version = "4.2.12"; + version = "4.2.14"; src = fetchFromGitHub { repo = "vdr-plugin-markad"; owner = "kfb77"; - hash = "sha256-b2DSHbjMnRSY4pf5gSizU3Jbq8gEGC5xFYHCdIaYMfs="; + hash = "sha256-ro7bva0eDik6GbA70aXnBy6UgdzSLx/N4oGjCbzmw8Q="; tag = "V${version}"; }; From e0bfbb4ff7ec29d757571a6308ab5ea3e9b22061 Mon Sep 17 00:00:00 2001 From: aleksana Date: Mon, 23 Jun 2025 10:13:37 +0800 Subject: [PATCH 14/23] fastfetch: fix bash and zsh completion --- pkgs/by-name/fa/fastfetch/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index d23690f03995..5df30d1c4c39 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -245,7 +245,7 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' - substituteInPlace completions/fastfetch.fish --replace-fail python3 '${python3.interpreter}' + substituteInPlace completions/fastfetch.{bash,fish,zsh} --replace-fail python3 '${python3.interpreter}' ''; postInstall = From 3a48674fe4d1a9a85a39e907702f03619f17cc6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Jun 2025 08:49:34 +0000 Subject: [PATCH 15/23] terraform-providers.mongodbatlas: 1.35.1 -> 1.36.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a64a3377b48d..c7f378c1731b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -840,13 +840,13 @@ "vendorHash": "sha256-QWBzQXx/dzWZr9dn3LHy8RIvZL1EA9xYqi7Ppzvju7g=" }, "mongodbatlas": { - "hash": "sha256-+JYvL6xGA2zIOg2fl8Bl7CYU4x9N4aVJpIl/6PYdyPU=", + "hash": "sha256-bLz/tYvOXe2MPa1WY4CZmm8Pcjv9C67oEHl/7TIuBRE=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.35.1", + "rev": "v1.36.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-fz6e/QEcWQY7ZrWyUbk8M/+RPB8dwN3NHPLmNLyGVhQ=" + "vendorHash": "sha256-0te8WmbzRbuU3t2YmgEd4Emhu4nUhI78V9F/QLKMXzk=" }, "namecheap": { "hash": "sha256-fHH9sHI1mqQ9q9nX9DHJ0qfEfmDB4/2uzyVvUuIAF18=", From b3df107bc9372fb076d96c6e335c5e9f8795e546 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Jun 2025 03:20:45 +0000 Subject: [PATCH 16/23] terraform-providers.bitwarden: 0.13.6 -> 0.14.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c7f378c1731b..eceadaeca441 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -189,13 +189,13 @@ "vendorHash": "sha256-AcHndbTWMMsE7CSnLtUdnfyIfkKVfmOobNOhvtrTh4I=" }, "bitwarden": { - "hash": "sha256-pEvTdaXuxsfrmJmgYo9mC3OSzU7q0DHEj2esXiumpMk=", + "hash": "sha256-eqWyKPzSINSZcO8Ho0WHTeVDOxbUynOzupXu6vzTtuU=", "homepage": "https://registry.terraform.io/providers/maxlaverse/bitwarden", "owner": "maxlaverse", "repo": "terraform-provider-bitwarden", - "rev": "v0.13.6", + "rev": "v0.14.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-nL0kii/BGihXiNp/69Kk/2J5o4lmYPHx6IqTF/IyWaU=" + "vendorHash": "sha256-TmlnrCsIM9k2ApPFcSpFUoggIIDrT9S/BeD3kKI2Klc=" }, "brightbox": { "hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=", From f88c04fe338e3e9732878c633c323b636decd77a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Jun 2025 19:26:38 +0000 Subject: [PATCH 17/23] terraform-providers.linode: 2.41.0 -> 3.0.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index eceadaeca441..c641fb8856e8 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -759,13 +759,13 @@ "vendorHash": "sha256-fP6brpY/wRI1Yjgapzi+FfOci65gxWeOZulXbGdilrE=" }, "linode": { - "hash": "sha256-DNH+q9FSRlT/SoyW9+n+FLzy/Zi5l82sRigBZIaKabc=", + "hash": "sha256-3EBaRDf1ChC92iaYowJEpCIn/br/MxeQGqd47/xuEHo=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v2.41.0", + "rev": "v3.0.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-j/YgQ4w89XRZPYMCGAT72ervryIeutvk0ivFPR8E1yI=" + "vendorHash": "sha256-o4C58i+/IhMQSziF6Ldb8P+3ojTYyXx9CS65/9ExLpE=" }, "linuxbox": { "hash": "sha256-svQRz1/PdVLpHoxOam1sfRTwHqgqs4ohJQs3IPMMAM4=", From 2bf0366e03a2c22f77d102880e31dd014f292725 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jun 2025 21:19:24 +0000 Subject: [PATCH 18/23] terraform-providers.cloudflare: 5.5.0 -> 5.6.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c641fb8856e8..bbd67d35e909 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -261,13 +261,13 @@ "vendorHash": "sha256-shRiTPn4A1rmwBnoSlRDfdYuHqSFvL4o6o8vAJutu3Q=" }, "cloudflare": { - "hash": "sha256-REHAEG7Ux+Twv0kA13NQpthBdb+LulYm0McquE6gL14=", + "hash": "sha256-RChYMs2i4E+7RqRnYfeQftETUyHMWh/UeUd4/6kNmag=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v5.5.0", + "rev": "v5.6.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-PRzjEL+6XIacWmO4jmCOMsbPF+R3l1VMeUKUR7vPMmQ=" + "vendorHash": "sha256-BecQ41WKBb+w3eWGH3U/h6GjIKceCB+xDSzQSqrqJ2k=" }, "cloudfoundry": { "hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=", From daa1e01575a7f377619c66abf756336028e02b01 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jun 2025 19:19:06 +0000 Subject: [PATCH 19/23] terraform-providers.tailscale: 0.20.0 -> 0.21.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index bbd67d35e909..e27efad980c0 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1300,13 +1300,13 @@ "vendorHash": "sha256-L+XwC7c4ph4lM0+BhHB9oi1R/Av8jlDcqHewOmtPU1s=" }, "tailscale": { - "hash": "sha256-0QBQv3KbCjQsHDiPYRVaskzhBt6MsrpFvXSYM83AFKY=", + "hash": "sha256-p96Jv4sIxWHWcpxcAWXASf2m06M7lsIvCCygM9KEALY=", "homepage": "https://registry.terraform.io/providers/tailscale/tailscale", "owner": "tailscale", "repo": "terraform-provider-tailscale", - "rev": "v0.20.0", + "rev": "v0.21.1", "spdx": "MIT", - "vendorHash": "sha256-f+2SYxdPVXDpwFY6ra9Abe/aXil6zzXk8wQTr49QkC8=" + "vendorHash": "sha256-nTKqpoJKabvtMDdI++Luq41vB0X2NWS6gufJbru2ZPI=" }, "talos": { "hash": "sha256-O5S0XYdTyNGihPx4hQhYN5+ApnMuCaIcWlHA9D9/3nM=", From 4114149bce936db2bb6f3ce69cca0ca01ee6bb2a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jun 2025 03:44:25 +0000 Subject: [PATCH 20/23] terraform-providers.tencentcloud: 1.81.199 -> 1.82.2 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index e27efad980c0..b202b8d824e3 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1327,11 +1327,11 @@ "vendorHash": "sha256-Sqi4MLQTF5n3AZyEkaI03KhFvgy34ROqbd8Rx1N6/oY=" }, "tencentcloud": { - "hash": "sha256-3r3DCZ1bmoBieF0BQ37ai3UxzxWbf5orJ4mvh8aeUhQ=", + "hash": "sha256-VoXdT/ZZp3CGxYg9xjyvnt2TLLWUwCkCzI9i6NWlTQg=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.81.199", + "rev": "v1.82.2", "spdx": "MPL-2.0", "vendorHash": null }, From b3911c74da644333e208e1d6d654d5ce0f15fdaf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jun 2025 11:55:43 +0000 Subject: [PATCH 21/23] terraform-providers.yandex: 0.142.0 -> 0.144.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b202b8d824e3..0b5bbae055ab 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1499,12 +1499,12 @@ "vendorHash": "sha256-GRnVhGpVgFI83Lg34Zv1xgV5Kp8ioKTFV5uaqS80ATg=" }, "yandex": { - "hash": "sha256-zwwFvbQWsreZ/4QFmqIk8xXMUaLqfUFnTZig3lGW//w=", + "hash": "sha256-VPmAwHQnpQTEW+hKoInsuFiLXMi2rZY7lFfmDZ5BAW8=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.142.0", + "rev": "v0.144.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-RrtTtQdiAWxLEefIH/pcpeAlCjqY7PYy9ZCDd+gIEEk=" + "vendorHash": "sha256-Gks/EvJ2SvXry5UC34gzxXZRcSrSIxv2SHQ7ZDILM3s=" } } From 9b7c6dd29cbf552b2228ab5544045cba0d4e15aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Jun 2025 04:52:49 +0000 Subject: [PATCH 22/23] vscode-extensions.visualjj.visualjj: 0.15.1 -> 0.15.4 --- .../vscode/extensions/visualjj.visualjj/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix index 33a1ea90272f..0c096a93a107 100644 --- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix +++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix @@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-3JEqkFY1vuI11HdM+X1rZkbVOrFpykAy7CdYxtyfu+0="; + hash = "sha256-/6V4hjwp3Vy4WEwTtcYvJk6Rt3AIeKqXWJ09Zsp9CZg="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-yqb0PdhSpCecUxEO2ZUpFzn1wZcaDcfvFPXJW0gYgh4="; + hash = "sha256-bMwiMIhsvF6Q12vCgt9Os109acqW8Ovpt3o9Y8Sf+gk="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-CUpfezfvhVSROFBV8ZI9W+DpwxyH6QLvhOOO8O5PYag="; + hash = "sha256-SwBHNKqif3mGqNSF6Y100HCDaLmARe0jApPol7AzsOQ="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-AGc6wI15C7tZJAJ8yfx1xlQ8wQj/f8S3xHKwp+C/5x4="; + hash = "sha256-SGTQdjvrXkEaCuHv9dfJfCBUgkfOtf+kLPiHYAqJ7+8="; }; }; in { name = "visualjj"; publisher = "visualjj"; - version = "0.15.1"; + version = "0.15.4"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); From 407ff82478b2559ad1bea7e509cabe77a037082e Mon Sep 17 00:00:00 2001 From: Sibi Prabakaran Date: Thu, 19 Jun 2025 10:25:59 +0530 Subject: [PATCH 23/23] tombi: init at 0.4.9 This provides a TOML language server. More details at https://tombi-toml.github.io/tombi/ --- pkgs/by-name/to/tombi/package.nix | 41 +++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 pkgs/by-name/to/tombi/package.nix diff --git a/pkgs/by-name/to/tombi/package.nix b/pkgs/by-name/to/tombi/package.nix new file mode 100644 index 000000000000..f6a9a8e01d01 --- /dev/null +++ b/pkgs/by-name/to/tombi/package.nix @@ -0,0 +1,41 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "tombi"; + version = "0.4.9"; + + src = fetchFromGitHub { + owner = "tombi-toml"; + repo = "tombi"; + tag = "v${finalAttrs.version}"; + hash = "sha256-2516aT6zaI5bntjjJ/p/yk0gWW6fzixQx5ESs29aS6Q="; + }; + + # Tests relies on the presence of network + doCheck = false; + cargoBuildFlags = [ "--package tombi-cli" ]; + cargoHash = "sha256-cVj0dL9vGVm3WPQ5IA2LDxDLHia5T+pLi6rTQxAqoC4="; + + postPatch = '' + substituteInPlace Cargo.toml \ + --replace-fail 'version = "0.0.0-dev"' 'version = "${finalAttrs.version}"' + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + + meta = { + description = "TOML Formatter / Linter / Language Server"; + homepage = "https://github.com/tombi-toml/tombi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ psibi ]; + mainProgram = "tombi"; + }; +})