Compare commits

...

8 Commits

Author SHA1 Message Date
Leona Maroni
e56e0beed4 25.11 is Xantusia 2025-05-16 19:21:55 +02:00
Nikolay Korotkiy
f575a9791f telescope: 0.10.1 → 0.11 (#406082) 2025-05-16 21:20:25 +04:00
nixpkgs-merge-bot[bot]
9d2f5e3e71 tbtools: 0.5.0 -> 0.6.0 (#407634)
Co-authored-by: felixsinger <felixsinger@users.noreply.github.com>
2025-05-16 17:17:59 +00:00
nixpkgs-merge-bot[bot]
918414e589 komga: 1.21.2 -> 1.21.3 (#407545)
Co-authored-by: tebriel <tebriel@users.noreply.github.com>
2025-05-16 17:16:11 +00:00
R. Ryantm
8a82f7fbc8 tbtools: 0.5.0 -> 0.6.0 2025-05-16 13:51:37 +00:00
Nikolay Korotkiy
fd33196b5d telescope: modernize 2025-05-16 11:49:21 +04:00
R. Ryantm
e342786ef7 komga: 1.21.2 -> 1.21.3 2025-05-16 07:23:44 +00:00
Nikolay Korotkiy
4a9ddcc498 telescope: 0.10.1 → 0.11 2025-05-11 21:24:55 +04:00
12 changed files with 25 additions and 22 deletions

View File

@@ -25,8 +25,9 @@ For new packages please briefly describe the package or provide a link to its ho
- made sure NixOS tests are [linked](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#linking-nixos-module-tests-to-a-package) to the relevant packages
- [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"`. Note: all changes have to be committed, also see [nixpkgs-review usage](https://github.com/Mic92/nixpkgs-review#usage)
- [ ] Tested basic functionality of all binary files (usually in `./result/bin/`)
- [25.05 Release Notes](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2505.section.md) (or backporting [24.11](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2411.section.md) and [25.05](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2505.section.md) Release notes)
- [Nixpkgs 25.11 Release Notes](https://github.com/NixOS/nixpkgs/blob/master/doc/release-notes/rl-2511.section.md) (or backporting [24.11](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/release-notes/rl-2411.section.md) and [25.05](https://github.com/NixOS/nixpkgs/blob/master/doc/manual/release-notes/rl-2505.section.md) Nixpkgs Release notes)
- [ ] (Package updates) Added a release notes entry if the change is major or breaking
- [NixOS 25.11 Release Notes](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2511.section.md) (or backporting [24.11](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2411.section.md) and [25.05](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2505.section.md) NixOS Release notes)
- [ ] (Module updates) Added a release notes entry if the change is significant
- [ ] (Module addition) Added a release notes entry if adding a new NixOS module
- [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).

View File

@@ -31,7 +31,7 @@ jobs:
into: staging-next-24.11
- from: staging-next-24.11
into: staging-24.11
- from: master
- from: release-25.05
into: staging-next-25.05
- from: staging-next-25.05
into: staging-25.05

View File

@@ -345,7 +345,7 @@ See [Nix Channel Status](https://status.nixos.org/) for the current channels and
Here's a brief overview of the main Git branches and what channels they're used for:
- `master`: The main branch, used for the unstable channels such as `nixpkgs-unstable`, `nixos-unstable` and `nixos-unstable-small`.
- `release-YY.MM` (e.g. `release-25.05`): The NixOS release branches, used for the stable channels such as `nixos-25.05`, `nixos-25.05-small` and `nixpkgs-25.05-darwin`.
- `release-YY.MM` (e.g. `release-25.11`): The NixOS release branches, used for the stable channels such as `nixos-25.11`, `nixos-25.11-small` and `nixpkgs-25.11-darwin`.
When a channel is updated, a corresponding Git branch is also updated to point to the corresponding commit.
So e.g. the [`nixpkgs-unstable` branch](https://github.com/nixos/nixpkgs/tree/nixpkgs-unstable) corresponds to the Git commit from the [`nixpkgs-unstable` channel](https://channels.nixos.org/nixpkgs-unstable).

View File

@@ -3,5 +3,6 @@
This section lists the release notes for each stable version of Nixpkgs and current unstable revision.
```{=include=} sections
rl-2511.section.md
rl-2505.section.md
```

View File

@@ -1,4 +1,4 @@
# Nixpkgs 25.11 (2025.11/??) {#sec-nixpkgs-release-25.11}
# Nixpkgs 25.11 ("Xantusia", 2025.11/??) {#sec-nixpkgs-release-25.11}
## Highlights {#sec-nixpkgs-release-25.11-highlights}
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

View File

@@ -1 +1 @@
25.05
25.11

View File

@@ -439,7 +439,7 @@ in
On each release the first letter is bumped and a new animal is chosen
starting with that new letter.
*/
codeName = "Warbler";
codeName = "Xantusia";
/**
Returns the current nixpkgs version suffix as string.

View File

@@ -3,6 +3,7 @@
This section lists the release notes for each stable version of NixOS and current unstable revision.
```{=include=} sections
rl-2511.section.md
rl-2505.section.md
rl-2411.section.md
rl-2405.section.md

View File

@@ -1,4 +1,4 @@
# Release 25.11 (2025.11/??) {#sec-release-25.11}
# Release 25.11 ("Xantusia", 2025.11/??) {#sec-release-25.11}
## Highlights {#sec-release-25.11-highlights}

View File

@@ -9,11 +9,11 @@
stdenvNoCC.mkDerivation rec {
pname = "komga";
version = "1.21.2";
version = "1.21.3";
src = fetchurl {
url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar";
sha256 = "sha256-FYw519VT40PU3fVEb7DBoST2bqhPXcEqquHkGeULQ3k=";
sha256 = "sha256-NFj/C1oNRh9PzAi5TUv+4vVea1Nsn/frxf4aZjuYfvA=";
};
nativeBuildInputs = [

View File

@@ -10,17 +10,17 @@
rustPlatform.buildRustPackage rec {
pname = "tbtools";
version = "0.5.0";
version = "0.6.0";
src = fetchFromGitHub {
owner = "intel";
repo = "tbtools";
tag = "v${version}";
hash = "sha256-zq8q3JaoqWAQUat2gIW0Wimi/tZiC6XDphUVjH0viU4=";
hash = "sha256-xLMnB8KliwHVU5y4L7K0a43gfdhLKFxnAx4wxGL9xMc=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-SAHIDjELm4qr4whoQVdt3EuNA72qFqXEg3H0hYr7yLc=";
cargoHash = "sha256-QuiDI2/XzhUKF7BGnoKeJ2143keJtmi+8WG1MpulLZo=";
nativeBuildInputs = [
pkg-config

View File

@@ -12,15 +12,15 @@
buildPackages,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "telescope";
version = "0.10.1";
version = "0.11";
src = fetchFromGitHub {
owner = "omar-polo";
repo = "telescope";
rev = version;
hash = "sha256-MVZ/pvDAETacQiEMEXM0gYM20LXqNiHtMfFGqS1vipY=";
tag = finalAttrs.version;
hash = "sha256-GKeUXa4RKYkoywrCrpenfLt10Rdj9L0xYI3tf2hFAbk=";
};
postPatch = ''
@@ -45,11 +45,11 @@ stdenv.mkDerivation rec {
"HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"
];
meta = with lib; {
meta = {
description = "Telescope is a w3m-like browser for Gemini";
homepage = "https://www.telescope-browser.org/";
license = licenses.isc;
maintainers = with maintainers; [ heph2 ];
platforms = platforms.unix;
homepage = "https://telescope-browser.org/";
license = lib.licenses.isc;
maintainers = with lib.maintainers; [ heph2 ];
platforms = lib.platforms.unix;
};
}
})