From f6d43fcff88a41a158e3f11af364d7d3cadbddc8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Nov 2024 15:39:59 +0000 Subject: [PATCH 1/9] proxmark3: 4.18994 -> 4.19552 --- pkgs/tools/security/proxmark3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/proxmark3/default.nix b/pkgs/tools/security/proxmark3/default.nix index 265f8e2cc753..fbc0b9f1a2d2 100644 --- a/pkgs/tools/security/proxmark3/default.nix +++ b/pkgs/tools/security/proxmark3/default.nix @@ -26,13 +26,13 @@ assert withBlueshark -> stdenv.hostPlatform.isLinux; stdenv.mkDerivation (finalAttrs: { pname = "proxmark3"; - version = "4.18994"; + version = "4.19552"; src = fetchFromGitHub { owner = "RfidResearchGroup"; repo = "proxmark3"; rev = "v${finalAttrs.version}"; - hash = "sha256-LeVQnidlCGFwtgJZdGlIFEYgf3M3BtfxoBKsxSFEo2w="; + hash = "sha256-5Rlw5QlceQGiIuVFNZhyrszCdG+idFo8Vvps46VJSlE="; }; patches = [ From 796d9387ed2f7aa600ccf49cf84caadbcfcab0a9 Mon Sep 17 00:00:00 2001 From: aleksana Date: Wed, 27 Nov 2024 19:55:23 +0800 Subject: [PATCH 2/9] folio: 24.12 -> 24.13 Diff: https://github.com/toolstack/Folio/compare/24.12...24.13 Changelog: https://github.com/toolstack/Folio/releases/tag/24.13 --- pkgs/by-name/fo/folio/package.nix | 41 ++++++++++++++++--------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/fo/folio/package.nix b/pkgs/by-name/fo/folio/package.nix index ea331f178fd1..9670c01d20a6 100644 --- a/pkgs/by-name/fo/folio/package.nix +++ b/pkgs/by-name/fo/folio/package.nix @@ -1,27 +1,28 @@ -{ lib -, stdenv -, fetchFromGitHub -, meson -, ninja -, pkg-config -, vala -, blueprint-compiler -, wrapGAppsHook4 -, desktop-file-utils -, libadwaita -, libgee -, gtksourceview5 +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + vala, + blueprint-compiler, + wrapGAppsHook4, + desktop-file-utils, + libadwaita, + libgee, + gtksourceview5, }: stdenv.mkDerivation rec { pname = "folio"; - version = "24.12"; + version = "24.13"; src = fetchFromGitHub { owner = "toolstack"; repo = "Folio"; - rev = version; - hash = "sha256-0Aq8R+5k5LCmciRHauTvxuJWCyN3FN4sP9aEPNlMn+k="; + rev = "refs/tags/${version}"; + hash = "sha256-mtUo1auHpE0kmbF0EvJUtGrPehuRfP1y/m8rDmqWYPs="; }; nativeBuildInputs = [ @@ -40,12 +41,12 @@ stdenv.mkDerivation rec { gtksourceview5 ]; - meta = with lib; { + meta = { description = "Beautiful markdown note-taking app for GNOME (forked from Paper)"; homepage = "https://github.com/toolstack/Folio"; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; mainProgram = "com.toolstack.Folio"; - maintainers = with maintainers; [ aleksana ]; - platforms = platforms.unix; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.unix; }; } From 535e0c8a58247ddfad00cd3a3f13fa2bf58c0cb4 Mon Sep 17 00:00:00 2001 From: tengkuizdihar Date: Tue, 26 Nov 2024 21:43:11 +0700 Subject: [PATCH 3/9] pegasus-frontend: 0-unstable-2023-12-05 -> 0-unstable-2024-11-11 --- pkgs/games/pegasus-frontend/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/pegasus-frontend/default.nix b/pkgs/games/pegasus-frontend/default.nix index 1b1a6d38294c..be763bc6ae72 100644 --- a/pkgs/games/pegasus-frontend/default.nix +++ b/pkgs/games/pegasus-frontend/default.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { pname = "pegasus-frontend"; - version = "0-unstable-2023-12-05"; + version = "0-unstable-2024-11-11"; src = fetchFromGitHub { owner = "mmatyas"; repo = "pegasus-frontend"; - rev = "86d3eed534ef8e79f412270b955dc2ffd4d172a3"; + rev = "54362976fd4c6260e755178d97e9db51f7a896af"; fetchSubmodules = true; - hash = "sha256-lUoL63yFOVwTOcsGd8+pWqgcS5b3a6uuR8M4L6OvlXM="; + hash = "sha256-DqtkvDg0oQL9hGB+6rNXe3sDBywvnqy9N31xfyl6nbI="; }; nativeBuildInputs = [ From 6d53ec21a0267c9b9ae39b7633bec6b9c06e2dfa Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Tue, 26 Nov 2024 14:49:09 +0100 Subject: [PATCH 4/9] lla: init at 0.2.9 --- pkgs/by-name/ll/lla/package.nix | 52 +++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 pkgs/by-name/ll/lla/package.nix diff --git a/pkgs/by-name/ll/lla/package.nix b/pkgs/by-name/ll/lla/package.nix new file mode 100644 index 000000000000..1cf6fe437eae --- /dev/null +++ b/pkgs/by-name/ll/lla/package.nix @@ -0,0 +1,52 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + makeBinaryWrapper, + versionCheckHook, + nix-update-script, +}: +let + version = "0.2.9"; +in +rustPlatform.buildRustPackage { + pname = "lla"; + inherit version; + + src = fetchFromGitHub { + owner = "triyanox"; + repo = "lla"; + rev = "refs/tags/v${version}"; + hash = "sha256-bemu4MuZYmn6LDIGxCAxIuS78alz8UE6qHhLoxtZSUk="; + }; + + nativeBuildInputs = [ makeBinaryWrapper ]; + + cargoHash = "sha256-sjJUG32jchAG/q4y649PyTJ2kqjT+0COSvO2QM6GnV0="; + + cargoBuildFlags = [ "--workspace" ]; + + postFixup = '' + wrapProgram $out/bin/lla \ + --add-flags "--plugins-dir $out/lib" + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Modern alternative to ls"; + longDescription = '' + `lla` is a high-performance, extensible alternative to the traditional ls command, written in Rust. + It offers enhanced functionality, customizable output, and a plugin system for extended capabilities. + ''; + homepage = "https://github.com/triyanox/lla"; + changelog = "https://github.com/triyanox/lla/blob/refs/tags/v${version}/CHANGELOG.md"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ pluiedev ]; + platforms = lib.platforms.unix; + mainProgram = "lla"; + }; +} From d60e537249093794b3f9776019d999fb02dab6dd Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 29 Nov 2024 01:37:13 +0100 Subject: [PATCH 5/9] release notes: Move agorakit to 25.05 (#359942) release notes: Move agorakit to 2505 It's not included in 2411 --- nixos/doc/manual/release-notes/rl-2411.section.md | 2 -- nixos/doc/manual/release-notes/rl-2505.section.md | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index f06b60c42a68..caaaad012e55 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -153,8 +153,6 @@ - [zeronsd](https://github.com/zerotier/zeronsd), a DNS server for ZeroTier users. Available with [services.zeronsd.servedNetworks](#opt-services.zeronsd.servedNetworks). -- [agorakit](https://github.com/agorakit/agorakit), an organization tool for citizens' collectives. Available with [services.agorakit](#opt-services.agorakit.enable). - - [Collabora Online](https://www.collaboraonline.com/), a collaborative online office suite based on LibreOffice technology. Available as [services.collabora-online](options.html#opt-services.collabora-online.enable). - [wg-access-server](https://github.com/freifunkMUC/wg-access-server/), an all-in-one WireGuard VPN solution with a WebUI for connecting devices. Available as [services.wg-access-server](#opt-services.wg-access-server.enable). diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index be4351684fdb..347cbf0d6127 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -16,6 +16,8 @@ - [Amazon CloudWatch Agent](https://github.com/aws/amazon-cloudwatch-agent), the official telemetry collector for AWS CloudWatch and AWS X-Ray. Available as [services.amazon-cloudwatch-agent](#opt-services.amazon-cloudwatch-agent.enable). +- [agorakit](https://github.com/agorakit/agorakit), an organization tool for citizens' collectives. Available with [services.agorakit](#opt-services.agorakit.enable). + ## Backward Incompatibilities {#sec-release-25.05-incompatibilities} From 39a078a3ef580c6fff40ef8d7651ddd7c2fcc39c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 29 Nov 2024 12:09:04 +1000 Subject: [PATCH 6/9] python312Packages.mss: 9.0.2 -> 10.0.0 (#359644) https://github.com/BoboTiG/python-mss/blob/v10.0.0/CHANGELOG.md?rgh-link-date=2024-11-27T18%3A33%3A05Z --- pkgs/development/python-modules/mss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mss/default.nix b/pkgs/development/python-modules/mss/default.nix index a967c90bd858..f7b5a590b1ba 100644 --- a/pkgs/development/python-modules/mss/default.nix +++ b/pkgs/development/python-modules/mss/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "mss"; - version = "9.0.2"; + version = "10.0.0"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-yWpOxzIk2n2yK8B+88+qGPi4aQDRhy4pETu87wCToh4="; + hash = "sha256-2QPg1RJivw+HgoQc8W6qbX4+HxLq41q0HC4xiDfGY38="; }; patches = lib.optionals stdenv.hostPlatform.isLinux [ From abf234f409a95f8d6e30691b8fe05ee9fce768e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Nov 2024 07:44:49 +0000 Subject: [PATCH 7/9] sgt-puzzles: 20240928.182b3d9 -> 20241123.5e74004 --- pkgs/games/sgt-puzzles/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index a73837b6e9a4..9fda50f71ba2 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "sgt-puzzles"; - version = "20240928.182b3d9"; + version = "20241123.5e74004"; src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - hash = "sha256-D4Mdec7h7MPG+WStDDapzjWLiaLWzqbOipmfWUpk7bA="; + hash = "sha256-r96rQWq2UJoLoIB+w1xcxIvd5kNGGYq+Wri/Vojeb0Q="; }; sgt-puzzles-menu = fetchurl { From 65d311a74581cbe14e45f5b3b897e3ebf27323a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Nov 2024 05:06:20 +0000 Subject: [PATCH 8/9] php84Extensions.xdebug: 3.3.2 -> 3.4.0 --- pkgs/development/php-packages/xdebug/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix index 56fff995095e..cd340771376e 100644 --- a/pkgs/development/php-packages/xdebug/default.nix +++ b/pkgs/development/php-packages/xdebug/default.nix @@ -6,7 +6,7 @@ }: let - version = "3.3.2"; + version = "3.4.0"; in buildPecl { inherit version; @@ -17,7 +17,7 @@ buildPecl { owner = "xdebug"; repo = "xdebug"; rev = version; - hash = "sha256-3Hj/6pFLwJkVfsUIkX9lP8cOa1cVjobqHZd/cnH0TaU="; + hash = "sha256-Gt6/ARrUzmsAhsdkKPNiX0CBmWTv7D3mHnxvvWjbLnE="; }; doCheck = true; From 68321766661132c44729d5284f95815a5dd7adeb Mon Sep 17 00:00:00 2001 From: toastal Date: Fri, 29 Nov 2024 05:45:48 +0000 Subject: [PATCH 9/9] nginxModules.subsFilter: 2022-01-24 (#359905) Fixes issues with newer PCRE --- pkgs/servers/http/nginx/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 3a29bd72b44e..449e1cc660e4 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -853,8 +853,8 @@ let self = { name = "subsFilter"; owner = "yaoweibin"; repo = "ngx_http_substitutions_filter_module"; - rev = "b8a71eacc7f986ba091282ab8b1bbbc6ae1807e0"; - sha256 = "027jxzx66q9a6ycn47imjh40xmnqr0z423lz0ds3w4rf1c2x130f"; + rev = "e12e965ac1837ca709709f9a26f572a54d83430e"; + sha256 = "sha256-3sWgue6QZYwK69XSi9q8r3WYGVyMCIgfqqLvPBHqJKU="; }; meta = with lib; {