From 24b2d78030d2b6d3dcd3be74083556a65bb70e22 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Sun, 23 Mar 2025 21:15:26 +0100 Subject: [PATCH 1/6] readest: 0.9.23 -> 0.9.25 Changelog: https://github.com/readest/readest/releases/tag/v0.9.25 Diff: https://github.com/readest/readest/compare/v0.9.23...v0.9.25 --- pkgs/by-name/re/readest/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix index 2e39521699a3..85be4df34677 100644 --- a/pkgs/by-name/re/readest/package.nix +++ b/pkgs/by-name/re/readest/package.nix @@ -19,13 +19,13 @@ rustPlatform.buildRustPackage rec { pname = "readest"; - version = "0.9.23"; + version = "0.9.25"; src = fetchFromGitHub { owner = "readest"; repo = "readest"; tag = "v${version}"; - hash = "sha256-MveWZ+9SSd6mPw580U8d8aP7c4rl4861VzCKHpOKiXU="; + hash = "sha256-AHPSkrCmtoM7K8v6+vu+jeKJ7u2srro1d7vn5oSIHX8="; fetchSubmodules = true; }; From 75030954102e285a6ac97bb4cb655764592e75d8 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Wed, 26 Mar 2025 18:05:58 +0100 Subject: [PATCH 2/6] readest: 0.9.25 -> 0.9.26 Changelog: https://github.com/readest/readest/releases/tag/v0.9.26 Diff: https://github.com/readest/readest/compare/v0.9.25...v0.9.26 --- pkgs/by-name/re/readest/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix index 85be4df34677..f0b3879c8e46 100644 --- a/pkgs/by-name/re/readest/package.nix +++ b/pkgs/by-name/re/readest/package.nix @@ -19,13 +19,13 @@ rustPlatform.buildRustPackage rec { pname = "readest"; - version = "0.9.25"; + version = "0.9.26"; src = fetchFromGitHub { owner = "readest"; repo = "readest"; tag = "v${version}"; - hash = "sha256-AHPSkrCmtoM7K8v6+vu+jeKJ7u2srro1d7vn5oSIHX8="; + hash = "sha256-gNhuxbHnCT31VHVQfhep4oCyaLf5N9y4vQXIaZzvL8Y="; fetchSubmodules = true; }; @@ -38,14 +38,14 @@ rustPlatform.buildRustPackage rec { pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; - hash = "sha256-faLytJLMlWs80HZpN0TnCCEWPe9SPP9QH0bx3HLDO5o="; + hash = "sha256-VcPxhCpDrKaqKtGMsvPwXwniPy0rbJ/i03gbZ3i87aE="; }; pnpmRoot = "../.."; useFetchCargoVendor = true; - cargoHash = "sha256-5E+3Hpa6hiOORtZ5ykrXVOPucbppwO5KVVS1mb9mVXY="; + cargoHash = "sha256-0eyG9qmSuH2QCvl1L0+jgzRI136hDYLuq/2ZkQ/IofE="; cargoRoot = "../.."; From 864a983826853662d645c7135d3b7418c20bbb5d Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Wed, 26 Mar 2025 20:32:12 +0100 Subject: [PATCH 3/6] readest: use finalAttrs --- pkgs/by-name/re/readest/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix index f0b3879c8e46..b95f722a18f3 100644 --- a/pkgs/by-name/re/readest/package.nix +++ b/pkgs/by-name/re/readest/package.nix @@ -17,14 +17,14 @@ jq, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "readest"; version = "0.9.26"; src = fetchFromGitHub { owner = "readest"; repo = "readest"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-gNhuxbHnCT31VHVQfhep4oCyaLf5N9y4vQXIaZzvL8Y="; fetchSubmodules = true; }; @@ -34,10 +34,10 @@ rustPlatform.buildRustPackage rec { chmod -R +w . ''; - sourceRoot = "${src.name}/apps/readest-app"; + sourceRoot = "${finalAttrs.src.name}/apps/readest-app"; pnpmDeps = pnpm_9.fetchDeps { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-VcPxhCpDrKaqKtGMsvPwXwniPy0rbJ/i03gbZ3i87aE="; }; @@ -95,10 +95,10 @@ rustPlatform.buildRustPackage rec { meta = { description = "Modern, feature-rich ebook reader"; homepage = "https://github.com/readest/readest"; - changelog = "https://github.com/readest/readest/releases/tag/v${version}"; + changelog = "https://github.com/readest/readest/releases/tag/v${finalAttrs.version}"; mainProgram = "readest"; license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; -} +}) From a217d0f0158b691673fc0d88bce747b5d222b79f Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Sat, 29 Mar 2025 10:38:12 +0100 Subject: [PATCH 4/6] readest: 0.9.26 -> 0.9.27 Changelog: https://github.com/readest/readest/releases/tag/v0.9.27 Diff: https://github.com/readest/readest/compare/v0.9.26...v0.9.27 --- pkgs/by-name/re/readest/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix index b95f722a18f3..ab4defc3c0b8 100644 --- a/pkgs/by-name/re/readest/package.nix +++ b/pkgs/by-name/re/readest/package.nix @@ -19,13 +19,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "readest"; - version = "0.9.26"; + version = "0.9.27"; src = fetchFromGitHub { owner = "readest"; repo = "readest"; tag = "v${finalAttrs.version}"; - hash = "sha256-gNhuxbHnCT31VHVQfhep4oCyaLf5N9y4vQXIaZzvL8Y="; + hash = "sha256-p6aMIhvSQx81YtBHdp3YXkeEeJCTaIrePDizuKIGAxM="; fetchSubmodules = true; }; @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: { useFetchCargoVendor = true; - cargoHash = "sha256-0eyG9qmSuH2QCvl1L0+jgzRI136hDYLuq/2ZkQ/IofE="; + cargoHash = "sha256-guUe2liie2x87VXNo8UeJhVLgvfPViKJKQol1XWA3fw="; cargoRoot = "../.."; From 682dc6e1a37c5c07a8fbca109209acbd3aacd3ca Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Sat, 29 Mar 2025 10:39:59 +0100 Subject: [PATCH 5/6] readest: add eljamm as maintainer as requested in https://github.com/NixOS/nixpkgs/pull/392500#issuecomment-2763240138 --- pkgs/by-name/re/readest/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix index ab4defc3c0b8..1da13d2e0a4e 100644 --- a/pkgs/by-name/re/readest/package.nix +++ b/pkgs/by-name/re/readest/package.nix @@ -98,7 +98,7 @@ rustPlatform.buildRustPackage (finalAttrs: { changelog = "https://github.com/readest/readest/releases/tag/v${finalAttrs.version}"; mainProgram = "readest"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ eljamm ]; platforms = lib.platforms.linux; }; }) From 83f156b6e1f8672777f03693428d22d904168954 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Sat, 29 Mar 2025 20:21:05 +0100 Subject: [PATCH 6/6] readest: 0.9.27 -> 0.9.28 Changelog: https://github.com/readest/readest/releases/tag/v0.9.28 Diff: https://github.com/readest/readest/compare/v0.9.27...v0.9.28 --- pkgs/by-name/re/readest/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix index 1da13d2e0a4e..591776c30a37 100644 --- a/pkgs/by-name/re/readest/package.nix +++ b/pkgs/by-name/re/readest/package.nix @@ -19,13 +19,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "readest"; - version = "0.9.27"; + version = "0.9.28"; src = fetchFromGitHub { owner = "readest"; repo = "readest"; tag = "v${finalAttrs.version}"; - hash = "sha256-p6aMIhvSQx81YtBHdp3YXkeEeJCTaIrePDizuKIGAxM="; + hash = "sha256-jIAvpppOB50KA+4jmx8QN/4e1Dkn6V9Oo3lHUWb5cyI="; fetchSubmodules = true; };