gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-10-02 17:21:56 +00:00
committed by GitHub
parent 7f2d963f4f 5ad91d4b6f
commit a8a54fbfcf
15 changed files with 206 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
doc/README.md
View File

@@ -213,6 +213,34 @@ Put each sentence in its own line.
This makes reviews and suggestions much easier, since GitHub's review system is based on lines.
It also helps identifying long sentences at a glance.
### Writing Function Documentation
Function documentation is *reference documentation*, for which
[diataxis Reference documentation](https://diataxis.fr/reference/) (8 minutes) is **mandatory reading**.
On top of the diataxis framework, which provides a balanced perspective on what reference documentation should contain, we apply a specific style rule to function documentation:
the first sentence is in present tense, active voice, and the subject is omitted, referring implicitly to the name of the function.
For example:
```nix
/**
Subtracts value `b` from value `a`.
Returns the difference as a number.
*/
subtractValues # ...elided code
```
Renders as:
```md
## `subtractValues`
Subtracts value `b` from value `a`.
Returns the difference as a number.
```
### Callouts and examples
Use the [admonition syntax](#admonitions) for callouts and examples.

55
pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix Normal file
View File

@@ -0,0 +1,55 @@
{
lib,
stdenv,
fetchFromGitHub,
rustPlatform,
libcosmicAppHook,
just,
nix-update-script,
}:
rustPlatform.buildRustPackage {
pname = "cosmic-ext-applet-caffeine";
version = "2025-09-29";
src = fetchFromGitHub {
owner = "tropicbliss";
repo = "cosmic-ext-applet-caffeine";
rev = "a43db670e03894ff402fa19eec3d60f7c7bf663c";
hash = "sha256-0hIc62FdjIGU028z8/WCx2q317e+PCA25CSibBVi/p0=";
};
cargoHash = "sha256-nl/giMIQ5xNSOgjv67OMWkfuAVtdIcqZDbXC1mYwXBM=";
nativeBuildInputs = [
libcosmicAppHook
just
];
dontUseJustBuild = true;
dontUseJustCheck = true;
justFlags = [
"--set"
"prefix"
(placeholder "out")
"--set"
"bin-src"
"target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-ext-applet-caffeine"
];
passthru.updateScript = nix-update-script {
extraArgs = [
"--version"
"branch=HEAD"
];
};
meta = {
description = "Caffeine Applet for the COSMIC desktop";
homepage = "https://github.com/tropicbliss/cosmic-ext-applet-caffeine";
license = lib.licenses.mit;
mainProgram = "cosmic-ext-applet-caffeine";
maintainers = [ lib.maintainers.HeitorAugustoLN ];
platforms = lib.platforms.linux;
};
}

60
pkgs/by-name/co/cosmic-ext-applet-external-monitor-brightness/package.nix Normal file
View File

@@ -0,0 +1,60 @@
{
lib,
stdenv,
rustPlatform,
fetchFromGitHub,
libcosmicAppHook,
just,
pkg-config,
udev,
nix-update-script,
}:
rustPlatform.buildRustPackage {
pname = "cosmic-ext-applet-external-monitor-brightness";
version = "0.0.1-unstable-2025-08-05";
src = fetchFromGitHub {
owner = "cosmic-utils";
repo = "cosmic-ext-applet-external-monitor-brightness";
rev = "23104965bd9ab1988b040a60f3f1e5d64038e7ce";
hash = "sha256-+Hu9bLEbue9bXaGfKa3InhdFI6qsBxccyQY8qzBYFPk=";
};
cargoHash = "sha256-ou7iukl1pHMfcJNemwLdZYYxugbJJQ53XpCYowUTj90=";
nativeBuildInputs = [
libcosmicAppHook
just
pkg-config
];
buildInputs = [ udev ];
dontUseJustBuild = true;
dontUseJustCheck = true;
justFlags = [
"--set"
"prefix"
(placeholder "out")
"--set"
"cargo-target-dir"
"target/${stdenv.hostPlatform.rust.cargoShortTarget}"
];
passthru.updateScript = nix-update-script {
extraArgs = [
"--version"
"branch=HEAD"
];
};
meta = {
description = "Applet to control the brightness of external monitors";
homepage = "https://github.com/cosmic-utils/cosmic-ext-applet-external-monitor-brightness";
license = lib.licenses.gpl3Only;
mainProgram = "cosmic-ext-applet-external-monitor-brightness";
maintainers = with lib.maintainers; [ HeitorAugustoLN ];
platforms = lib.platforms.linux;
};
}

6
pkgs/by-name/ge/gemini-cli/package.nix
View File

@@ -11,16 +11,16 @@
buildNpmPackage (finalAttrs: {
pname = "gemini-cli";
version = "0.6.1";
version = "0.7.0";
src = fetchFromGitHub {
owner = "google-gemini";
repo = "gemini-cli";
tag = "v${finalAttrs.version}";
hash = "sha256-1QeVFPl6IH1iQFxrDZ0U8eTeLd+fIgSw1CkAiSGaL/s=";
hash = "sha256-tAX32t/NLO9j7kRxR9kipfl/afLfANN/jzWKXJC9mS4=";
};
npmDepsHash = "sha256-l5AFQH5h6CPNnuSP0jjla3UbBhjPDVEc8fL5NWcT1XQ=";
npmDepsHash = "sha256-nSNGWjRbAR2IFod3yC7d30Siui7N4Z0KZVxtsJ01UX8=";
nativeBuildInputs = [
jq

11
pkgs/by-name/is/issue2md/package.nix
View File

@@ -6,27 +6,22 @@
buildGoModule (finalAttrs: {
pname = "issue2md";
version = "1.2.0";
version = "1.3.0";
src = fetchFromGitHub {
owner = "bigwhite";
repo = "issue2md";
tag = "v${finalAttrs.version}";
hash = "sha256-jwMaXiGcdNCQZJ2xht1oAcFJohFJiTH3lV3+opZ677g=";
hash = "sha256-bbID2yJkVdzWJ+LcQCTTeoMsQpJdT4op9PhTDwr+D+A=";
};
vendorHash = null;
ldflags = [
"-s"
"-w"
];
meta = {
description = "CLI tool to convert GitHub issue into Markdown file";
homepage = "https://github.com/bigwhite/issue2md";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ ];
maintainers = with lib.maintainers; [ drupol ];
mainProgram = "issue2md";
};
})

4
pkgs/by-name/pr/protonmail-desktop/package.nix
View File

@@ -9,7 +9,7 @@
}:
let
mainProgram = "proton-mail";
version = "1.9.0";
version = "1.9.1";
in
stdenv.mkDerivation {
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://proton.me/download/mail/linux/${version}/ProtonMail-desktop-beta.deb";
sha256 = "sha256-8gUkWDBLzilmLrZCHRjf8EPYrjyHpwpA7ZIU4FQ1azA=";
hash = "sha256-P2i/uX++F1JUgwSUyndYazjLSCK1mP+XSGICPUoo1VE=";
};
dontConfigure = true;

6
pkgs/by-name/te/television/package.nix
View File

@@ -10,16 +10,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "television";
version = "0.13.2";
version = "0.13.4";
src = fetchFromGitHub {
owner = "alexpasmantier";
repo = "television";
tag = finalAttrs.version;
hash = "sha256-Ur6UTd3XsI2ZyVboQA9r3WDkl7hd1wQ0NCgTlYFF/C0=";
hash = "sha256-LImipNu1uK1jcxU18Cw3BayHig2AS37PMGOOO8cJoE4=";
};
cargoHash = "sha256-LfaYRrJ4ZXoNVDsI650t+A7mWB9+2+znATp+mqDwTiE=";
cargoHash = "sha256-c/IYFf9gc3udzy5LPnyPPF0xuzT4vd2BGcLz0Xan2Do=";
nativeBuildInputs = [ makeWrapper ];

6
pkgs/development/interpreters/clojure/default.nix
View File

@@ -4,15 +4,11 @@
bashNonInteractive,
fetchurl,
installShellFiles,
jdk21,
jdk,
rlwrap,
makeWrapper,
writeScript,
}:
let
# set this to an LTS version of java
jdk = jdk21;
in
stdenv.mkDerivation (finalAttrs: {
pname = "clojure";
version = "1.12.2.1565";

4
pkgs/development/python-modules/django/5_1.nix
View File

@@ -44,7 +44,7 @@
buildPythonPackage rec {
pname = "django";
version = "5.1.12";
version = "5.1.13";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -53,7 +53,7 @@ buildPythonPackage rec {
owner = "django";
repo = "django";
rev = "refs/tags/${version}";
hash = "sha256-QWBxP728D/HQb+WLPkaXMOQtlO8b+FWcYxZyHoVcxVI=";
hash = "sha256-y6wBMQ2BA6UUOJDWGhidCFwthtXZU2r0oGOUUSwKvQE=";
};
patches = [

4
pkgs/development/python-modules/django/5_2.nix
View File

@@ -43,7 +43,7 @@
buildPythonPackage rec {
pname = "django";
version = "5.2.6";
version = "5.2.7";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -52,7 +52,7 @@ buildPythonPackage rec {
owner = "django";
repo = "django";
rev = "refs/tags/${version}";
hash = "sha256-Bzm4FTzYeXEEFenkT2gN1IzYnUIo7tlD2GI/sX2THkw=";
hash = "sha256-rvnKa2+QabRtRfj0sauUsoxp0LJLUCmWrFs6ruVrz4k=";
};
patches = [

11
pkgs/os-specific/linux/kernel/common-config.nix
View File

@@ -230,6 +230,7 @@ let
DAMON_DBGFS = whenBetween "5.15" "6.9" yes;
DAMON_RECLAIM = whenAtLeast "5.16" yes;
DAMON_LRU_SORT = whenAtLeast "6.0" yes;
DAMON_STAT = whenAtLeast "6.17" yes;
# Support recovering from memory failures on systems with ECC and MCA recovery.
MEMORY_FAILURE = yes;
@@ -1307,7 +1308,12 @@ let
HOTPLUG_PCI_PCIE = yes; # PCI-Expresscard hotplug support
# Enable AMD's ROCm GPU compute stack
HSA_AMD = lib.mkIf stdenv.hostPlatform.is64bit (yes);
HSA_AMD = lib.mkIf stdenv.hostPlatform.is64bit yes;
# required for P2P DMABUF
DMABUF_MOVE_NOTIFY = lib.mkIf stdenv.hostPlatform.is64bit (whenAtLeast "6.6" yes);
# required for P2P transfers between accelerators
HSA_AMD_P2P = lib.mkIf stdenv.hostPlatform.is64bit (whenAtLeast "6.6" yes);
ZONE_DEVICE = lib.mkIf stdenv.hostPlatform.is64bit (yes);
HMM_MIRROR = yes;
DRM_AMDGPU_USERPTR = yes;
@@ -1475,6 +1481,9 @@ let
# See https://cateee.net/lkddb/web-lkddb/AMD_WBRF.html
AMD_WBRF = whenAtLeast "6.8" yes;
# Enable AMD heterogeneous core hardware feedback interface
AMD_HFI = whenAtLeast "6.17" yes;
# Enable Intel Turbo Boost Max 3.0
INTEL_TURBO_MAX_3 = yes;
};

33
pkgs/os-specific/linux/kernel/kernels-org.json
View File

@@ -5,38 +5,43 @@
"lts": false
},
"6.1": {
"version": "6.1.154",
"hash": "sha256:165im36dhnvhrfkn4x77ds6cgisn40d1cwxvxsci5lnhqf9bl6kg",
"version": "6.1.155",
"hash": "sha256:0wsw99h2jsrcx9fff59nqjx66l40vywj8qi3j6yvqpq8xsp8g4y2",
"lts": true
},
"5.15": {
"version": "5.15.193",
"hash": "sha256:168ymh51hm0l6pd9g2kc33ji28gznc25rwzj7rvhnw82z79640n7",
"version": "5.15.194",
"hash": "sha256:0zi6ihvjmaf940arnc7jjvdqrjf3cvkc9mqc8n24dz85vam6z39l",
"lts": true
},
"5.10": {
"version": "5.10.244",
"hash": "sha256:1h3dqaran5zrfgs0vybwq576yka8s9jirahiy3bb7hpm1763f2i1",
"version": "5.10.245",
"hash": "sha256:17wxs8i8vd5ivv99ra0sri3wmkw5c22wsaw8nf1xcvys2kmpa7hk",
"lts": true
},
"5.4": {
"version": "5.4.299",
"hash": "sha256:0bdzy3bpywm24nx73ah9smwmmlmyhvlf5xcp2kk1z54dxfp9bpl8",
"version": "5.4.300",
"hash": "sha256:0nl1l689d4jq2l39v816yy7z5lzc5dvv8aqn85xlv4najc022jcr",
"lts": true
},
"6.6": {
"version": "6.6.108",
"hash": "sha256:19k834gd9galmzl7gq0v25nv785ld7ryygrmgdh1cpb9m8rd6730",
"version": "6.6.109",
"hash": "sha256:1x1h2x04xvds8k59x36zqxzbj4cm6yl5l6xacgfyxzccfycwscbp",
"lts": true
},
"6.12": {
"version": "6.12.49",
"hash": "sha256:09jm892q3b275liyzmycczg6nyjg1ramsma920jf5k6s8vhj2ii3",
"version": "6.12.50",
"hash": "sha256:19bjzhxasj4r6m1lhsa486a96axfigbm06kqa2lwa7y2s5sbsdf4",
"lts": true
},
"6.16": {
"version": "6.16.9",
"hash": "sha256:13g59jvc6kvp8dzl6ysmzrpq4nh9xvy5va5avrsn6iq5ryiwij3s",
"version": "6.16.10",
"hash": "sha256:1wm8azbwy131cwvxab66v2ccybfkaq7gkxili0p6hjqyhnlbn1mb",
"lts": false
},
"6.17": {
"version": "6.17",
"hash": "sha256:19spyyknps9dzb6mz5sk685a505hzqi144lqc0rdi6f9l5k72q4v",
"lts": false
}
}

2
pkgs/top-level/aliases.nix
View File

@@ -1425,6 +1425,7 @@ mapAliases {
linuxPackages_6_14 = linuxKernel.packages.linux_6_14;
linuxPackages_6_15 = linuxKernel.packages.linux_6_15;
linuxPackages_6_16 = linuxKernel.packages.linux_6_16;
linuxPackages_6_17 = linuxKernel.packages.linux_6_17;
linuxPackages_ham = linuxKernel.packages.linux_ham;
linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1;
linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3;
@@ -1450,6 +1451,7 @@ mapAliases {
linux_6_14 = linuxKernel.kernels.linux_6_14;
linux_6_15 = linuxKernel.kernels.linux_6_15;
linux_6_16 = linuxKernel.kernels.linux_6_16;
linux_6_17 = linuxKernel.kernels.linux_6_17;
linux_ham = linuxKernel.kernels.linux_ham;
linux_rpi0 = linuxKernel.kernels.linux_rpi1;
linux_rpi02w = linuxKernel.kernels.linux_rpi3;

7
pkgs/top-level/all-packages.nix
View File

@@ -5780,7 +5780,12 @@ with pkgs;
xeus-cling
;
clojure = callPackage ../development/interpreters/clojure { };
clojure = callPackage ../development/interpreters/clojure {
# set this to an LTS version of java
# Be careful if you remove this, out-of-tree consumers expect to
# be able to override `jdk`.
jdk = jdk21;
};
clooj = callPackage ../development/interpreters/clojure/clooj.nix { };

11
pkgs/top-level/linux-kernels.nix
View File

@@ -218,6 +218,14 @@ in
];
};
linux_6_17 = callPackage ../os-specific/linux/kernel/mainline.nix {
branch = "6.17";
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
];
};
linux_testing =
let
testing = callPackage ../os-specific/linux/kernel/mainline.nix {
@@ -737,6 +745,7 @@ in
linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6);
linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12);
linux_6_16 = recurseIntoAttrs (packagesFor kernels.linux_6_16);
linux_6_17 = recurseIntoAttrs (packagesFor kernels.linux_6_17);
}
// lib.optionalAttrs config.allowAliases {
linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; # Added 2024-09-21
@@ -809,7 +818,7 @@ in
packageAliases = {
linux_default = packages.linux_6_12;
# Update this when adding the newest kernel major version!
linux_latest = packages.linux_6_16;
linux_latest = packages.linux_6_17;
linux_rt_default = packages.linux_rt_5_15;
linux_rt_latest = packages.linux_rt_6_6;
}