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

Merge master into staging-nixos

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-12-05 18:06:51 +00:00
committed by GitHub
parent 6d1edefe84 9301fc7291
commit a0bb3f3677
57 changed files with 491 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/release-notes/rl-2605.section.md
+2
View File
@@ -31,6 +31,8 @@
If your SQLite database is corrupted, the migration might fail and require [manual intervention](https://github.com/louislam/uptime-kuma/issues/5281).
See the [migration guide](https://github.com/louislam/uptime-kuma/wiki/Migration-From-v1-To-v2) for more information.
- We now use the upstream wrapper script for Gradle, supporting both the `JAVA_HOME` and `GRADLE_OPTS` environment variables.
## Nixpkgs Library {#sec-nixpkgs-release-26.05-lib}
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
maintainers/maintainer-list.nix
+6
View File
@@ -9705,6 +9705,12 @@
githubId = 6375438;
keys = [ { fingerprint = "5214 2D39 A7CE F8FA 872B CA7F DE62 E1E2 A614 5556"; } ];
};
govindsi = {
email = "govind.sk85@gmail.com";
github = "govindsi";
githubId = 8924200;
name = "Govind Singh";
};
gp2112 = {
email = "me@guip.dev";
github = "gp2112";
pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+2 -2
View File
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "claude-code";
publisher = "anthropic";
version = "2.0.58";
hash = "sha256-/bMiwaYdJHDiSvCsLZsQQmiwbgK3knbeSoYyXFnzzuI=";
version = "2.0.59";
hash = "sha256-rVbKynudnoXLgd5upcCWqkrZsV4739d6qV31HWI2TX0=";
};
meta = {
pkgs/applications/networking/instant-messengers/discord/sources.json
+6 -6
View File
@@ -10,9 +10,9 @@
"version": "0.0.93"
},
"linux-ptb": {
"hash": "sha256-uz3QNIDzmB/4aLNRNgB1wzpNJlc8ous8aUvcqGaHE7c=",
"url": "https://ptb.dl2.discordapp.net/apps/linux/0.0.168/discord-ptb-0.0.168.tar.gz",
"version": "0.0.168"
"hash": "sha256-IK02ro+c2fzsu7vMf/zl0cFxA2jmf7NCv3M2XJ5/EMs=",
"url": "https://ptb.dl2.discordapp.net/apps/linux/0.0.169/discord-ptb-0.0.169.tar.gz",
"version": "0.0.169"
},
"linux-stable": {
"hash": "sha256-PN1E8GjVopEPGW9ISb0y1Lo7nnj30CXylW0nTR1Pc6U=",
@@ -30,9 +30,9 @@
"version": "0.0.105"
},
"osx-ptb": {
"hash": "sha256-Yk9q4GageNb/Tt+R1SGwWnJBRrjG4QIO6qYLjhak460=",
"url": "https://ptb.dl2.discordapp.net/apps/osx/0.0.200/DiscordPTB.dmg",
"version": "0.0.200"
"hash": "sha256-WWWeVzutLK8s1/asR95fMx6CuqM4Q/XFalMNWrBZbrc=",
"url": "https://ptb.dl2.discordapp.net/apps/osx/0.0.201/DiscordPTB.dmg",
"version": "0.0.201"
},
"osx-stable": {
"hash": "sha256-k4S9UyO2GLmT/nnR1BUcUVjhFvxjGeQv2tbuZzEh8Ro=",
pkgs/by-name/am/amp-cli/package-lock.json
Generated
+5 -5
View File
@@ -5,7 +5,7 @@
"packages": {
"": {
"dependencies": {
"@sourcegraph/amp": "^0.0.1764374502-g55c558"
"@sourcegraph/amp": "^0.0.1764921674-g2aab2c"
}
},
"node_modules/@napi-rs/keyring": {
@@ -228,10 +228,10 @@
}
},
"node_modules/@sourcegraph/amp": {
"version": "0.0.1764374502-g55c558",
"resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1764374502-g55c558.tgz",
"integrity": "sha512-YYJXFvE5a3kDmXWU4RjUHuIpwMehHXgiJOLmOuA/ztmLV9H5vRRlx4Nfk6BsOLWbN+HyF45hW/HZUzse3kJF8Q==",
"license": "Sourcegraph Commercial License",
"version": "0.0.1764921674-g2aab2c",
"resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1764921674-g2aab2c.tgz",
"integrity": "sha512-TWDUHrEX1qK0nS1bg740q2+m0z3O/Udr5+8rqU97lchgYBVVzlrNhDrvy/dbzOoAc0m0FX9R1WFsdRTcgWv7bQ==",
"license": "Amp Commercial License",
"dependencies": {
"@napi-rs/keyring": "1.1.9"
},
pkgs/by-name/am/amp-cli/package.nix
+3 -3
View File
@@ -9,11 +9,11 @@
buildNpmPackage (finalAttrs: {
pname = "amp-cli";
version = "0.0.1764374502-g55c558";
version = "0.0.1764921674-g2aab2c";
src = fetchzip {
url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz";
hash = "sha256-klsg2qYdrOCfYsTnLNEqXOJtbeGRKcJxQVyv7jGr77o=";
hash = "sha256-N4BSXADVFAkvpVTDVJTnwGwmavydRT2Utq2SZdQiiVI=";
};
postPatch = ''
@@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: {
chmod +x bin/amp-wrapper.js
'';
npmDepsHash = "sha256-l5z57KOyJst0OZIcYK4qS7+KuZkmJLrpXR3nAJKorfE=";
npmDepsHash = "sha256-RtvUbBeHyKmMMplg+vy49ZW5SulZIFcNXIHhw6kDgpU=";
propagatedBuildInputs = [
ripgrep
pkgs/by-name/an/ansifilter/package.nix
+20 -21
View File
@@ -1,30 +1,28 @@
{
fetchurl,
lib,
stdenv,
fetchFromGitLab,
pkg-config,
boost,
lua,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "ansifilter";
version = "2.22";
src = fetchurl {
url = "http://www.andre-simon.de/zip/ansifilter-${version}.tar.bz2";
hash = "sha256-zP9BynQLgTv5EDhotQAPQkPTKnUwTqkpohTEm5Q+zJM=";
src = fetchFromGitLab {
owner = "saalen";
repo = "ansifilter";
tag = finalAttrs.version;
hash = "sha256-jCgucC5mHkDwVtTKP92RBStxpouQCR7PHWkDt0y+9BM=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [
boost
lua
nativeBuildInputs = [
pkg-config
];
postPatch = ''
# avoid timestamp non-determinism with '-n'
substituteInPlace makefile --replace 'gzip -9f' 'gzip -9nf'
substituteInPlace makefile --replace-fail 'gzip -9f' 'gzip -9nf'
'';
makeFlags = [
@@ -32,16 +30,17 @@ stdenv.mkDerivation rec {
"conf_dir=/etc/ansifilter"
];
meta = with lib; {
description = "Tool to convert ANSI to other formats";
meta = {
description = "ANSI sequence filter";
mainProgram = "ansifilter";
longDescription = ''
Tool to remove ANSI or convert them to another format
(HTML, TeX, LaTeX, RTF, Pango or BBCode)
Ansifilter handles text files containing ANSI terminal escape codes.
The command sequences may be stripped or be interpreted to generate formatted
output (HTML, RTF, TeX, LaTeX, BBCode, Pango).
'';
homepage = "http://www.andre-simon.de/doku/ansifilter/en/ansifilter.html";
license = licenses.gpl3;
maintainers = [ ];
platforms = platforms.linux ++ platforms.darwin;
homepage = "https://gitlab.com/saalen/ansifilter";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ doronbehar ];
platforms = lib.platforms.linux ++ lib.platforms.darwin;
};
}
})
pkgs/by-name/an/antigravity/information.json
+9 -9
View File
@@ -1,22 +1,22 @@
{
"version": "1.11.9",
"version": "1.11.14",
"vscodeVersion": "1.104.0",
"sources": {
"x86_64-linux": {
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.9-4787439284912128/linux-x64/Antigravity.tar.gz",
"sha256": "193a4a61da608c526fbc329670e892ab0a961d3a65ce49485de1ca08804e472d"
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.14-5763785964257280/linux-x64/Antigravity.tar.gz",
"sha256": "983c478f4def33a68623dc07a04156404c2fe2accdd492bb2f067e3d91239e20"
},
"aarch64-linux": {
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.9-4787439284912128/linux-arm/Antigravity.tar.gz",
"sha256": "26bd6a220f10c449e6552f9f6a9b7c7c40aaf70324113877a8339539cf0c3bdc"
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.14-5763785964257280/linux-arm/Antigravity.tar.gz",
"sha256": "df7f9e3888d001d34e1a9550c4cdc26a158d538646720fad7e2abe404e50e9fa"
},
"x86_64-darwin": {
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.9-4787439284912128/darwin-x64/Antigravity.zip",
"sha256": "bdd0d0f239cf408ac21ff264785882285a4790758e48f407893ee035adbbe917"
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.14-5763785964257280/darwin-x64/Antigravity.zip",
"sha256": "5ab684a28a7802cb8df565061438f87d0cbd69eddbdffd0040f0eb18c8962653"
},
"aarch64-darwin": {
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.9-4787439284912128/darwin-arm/Antigravity.zip",
"sha256": "3536282e726713b1f0b0d4fc4f162c15e18584f73466b285c05550a895a21d76"
"url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.14-5763785964257280/darwin-arm/Antigravity.zip",
"sha256": "82312771175f9892096a9d393aaff7adede2a2f681b14b4c705b022dcb81c56a"
}
}
}
pkgs/by-name/ca/cargo-valgrind/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-valgrind";
version = "2.3.3";
version = "2.4.0";
src = fetchFromGitHub {
owner = "jfrimmel";
repo = "cargo-valgrind";
tag = version;
sha256 = "sha256-fAZngB4Z5dd6j+CfX+Tc3NNZHGRCz1C+T7QYmUn96SM=";
sha256 = "sha256-sVW3zNe0a9iQQ0vRWJofqG4gwUJ/w0U4ugVyMNtWX98=";
};
cargoHash = "sha256-hcUZm2h7rtBiYl2JXlt/AuKfhf/5YpqTYYAWxq0dQ8U=";
cargoHash = "sha256-sRJGnbQFCk+SJtG/hnde+8ggZuutrdk0279ziickmnA=";
passthru = {
updateScript = nix-update-script { };
pkgs/by-name/cl/claude-code/package-lock.json
Generated
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "@anthropic-ai/claude-code",
"version": "2.0.58",
"version": "2.0.59",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@anthropic-ai/claude-code",
"version": "2.0.58",
"version": "2.0.59",
"license": "SEE LICENSE IN README.md",
"bin": {
"claude": "cli.js"
pkgs/by-name/cl/claude-code/package.nix
+3 -3
View File
@@ -11,14 +11,14 @@ buildNpmPackage (finalAttrs: {
# ```sh
# nix-shell maintainers/scripts/update.nix --argstr commit true --argstr package vscode-extensions.anthropic.claude-code && nix-shell maintainers/scripts/update.nix --argstr commit true --argstr package claude-code
# ```
version = "2.0.58";
version = "2.0.59";
src = fetchzip {
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
hash = "sha256-6BLpBNqNR2qrKBcXINqvfl2dgaQA6NmxsEsk1ILqeT8=";
hash = "sha256-Fl7KpzW8PemrCqQRju8/oWBTZ1Z3cCg0RZ1CAfMQAkY=";
};
npmDepsHash = "sha256-XOIuOQUJ0HB86pwuUnrv0B121lO9em9XG1DAK0/L4js=";
npmDepsHash = "sha256-VaEsT9Iw+iIqWFqOrpZS2O8PRhNOcxwdPHM3SbnhN8s=";
postPatch = ''
cp ${./package-lock.json} package-lock.json
pkgs/by-name/co/convco/package.nix
+5 -3
View File
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "convco";
version = "0.6.1";
version = "0.6.2";
src = fetchFromGitHub {
owner = "convco";
repo = "convco";
rev = "v${version}";
hash = "sha256-s0rcSekJLe99oxi6JD8VL1S6nqQTUFTn5pdgxnknbaY=";
hash = "sha256-giVaDOYYH3YE9Gy0byt92vGEfyM4rTjpHDsKm5lqlP4=";
};
cargoHash = "sha256-ClkpGHN2me+R3jX7S5hFR1FlsXGhHZ/y6iIGK08Mdfc=";
cargoHash = "sha256-DTeZDpS3OaGcem9AaAPFN+2AWuqWSGfk2KknbcgFzi0=";
nativeBuildInputs = [
cmake
@@ -37,6 +37,8 @@ rustPlatform.buildRustPackage rec {
checkFlags = [
# disable test requiring networking
"--skip=git::tests::test_find_last_unordered_prerelease"
"--skip=git::tests::test_find_matching_prerelease"
"--skip=git::tests::test_find_matching_prerelease_without_matching_release"
];
meta = with lib; {
pkgs/by-name/dt/dtrx/package.nix
+2 -2
View File
@@ -23,14 +23,14 @@
python3Packages.buildPythonApplication rec {
pname = "dtrx";
version = "8.7.0";
version = "8.7.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "dtrx-py";
repo = "dtrx";
rev = version;
sha256 = "sha256-wk+TPUXFLKqfUbjV/ALCTLXUacpLa8WhqR7VawaPWQM=";
sha256 = "sha256-FNSFEGIK0vDNlvqc8BKDCB/0hoxrITfeh59JcyzX3jY=";
};
makeWrapperArgs =
pkgs/by-name/en/envision/package.nix
-11
View File
@@ -22,16 +22,6 @@ buildFHSEnv {
stdenv.cc.libc
gcc
])
++
# OpenHMD dependencies
(
pkgs.openhmd.buildInputs
++ pkgs.openhmd.nativeBuildInputs
++ (with pkgs; [
meson
])
)
++ (
# OpenComposite dependencies
pkgs.opencomposite.buildInputs ++ pkgs.opencomposite.nativeBuildInputs
@@ -138,7 +128,6 @@ buildFHSEnv {
kebabToCamel = x: pascalToCamel (kebabToPascal x);
profiles = [
"lighthouse-default"
"openhmd-default"
"simulated-default"
"survive-default"
"wmr-default"
pkgs/by-name/es/esphome/package.nix
+2 -2
View File
@@ -33,14 +33,14 @@ let
in
python.pkgs.buildPythonApplication rec {
pname = "esphome";
version = "2025.11.2";
version = "2025.11.4";
pyproject = true;
src = fetchFromGitHub {
owner = "esphome";
repo = "esphome";
tag = version;
hash = "sha256-nu5sJkihCptZ3KSBE/8xR31yl7gnFQQdT+auLQ2qEw0=";
hash = "sha256-uV5lSlAFHTxIJqkvwRiDWcB2Hw+z+4+phBm2JHld4jA=";
};
patches = [
pkgs/by-name/ge/gemini-cli/package.nix
+3 -3
View File
@@ -13,16 +13,16 @@
buildNpmPackage (finalAttrs: {
pname = "gemini-cli";
version = "0.18.4";
version = "0.19.3";
src = fetchFromGitHub {
owner = "google-gemini";
repo = "gemini-cli";
tag = "v${finalAttrs.version}";
hash = "sha256-TSHL3X+p74yFGTNFk9r4r+nnul2etgVdXxy8x9BjsRg=";
hash = "sha256-kAb5CSD7PB3b63QnVSbgWxIMPO2Hh5LfmtZ3wE2TUFk=";
};
npmDepsHash = "sha256-2Z6YrmUHlYKRU3pR0ZGwQbBgzNFqakBB6LYZqf66nSs=";
npmDepsHash = "sha256-tCu98oLr/xh4MJR6q+AbySHOmFeZFH7z59rL0K5A9Es=";
nativeBuildInputs = [
jq
pkgs/by-name/li/libkcapi/package.nix
+16 -3
View File
@@ -13,17 +13,24 @@
kcapi-dgstapp ? true,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "libkcapi";
version = "1.5.0";
src = fetchFromGitHub {
owner = "smuellerDD";
repo = "libkcapi";
rev = "v${version}";
rev = "v${finalAttrs.version}";
hash = "sha256-xOI29cjhUGUeHLaYIrPA5ZwwCE9lBdZG6kaW0lo1uL8=";
};
outputs = [
"out"
]
++ lib.optionals kcapi-test [
"selftests"
];
nativeBuildInputs = [ autoreconfHook ];
# libkcapi looks also for a host c compiler when cross-compiling
@@ -33,6 +40,7 @@ stdenv.mkDerivation rec {
buildPackages.stdenv.cc
];
strictDeps = true;
enableParallelBuilding = true;
configureFlags =
@@ -43,6 +51,11 @@ stdenv.mkDerivation rec {
++ lib.optional kcapi-encapp "--enable-kcapi-encapp"
++ lib.optional kcapi-dgstapp "--enable-kcapi-dgstapp";
postInstall = lib.optionalString kcapi-test ''
mkdir -p $selftests/bin
find $out -iname '*.sh' -exec mv {} $selftests/bin/ \;
'';
meta = {
homepage = "http://www.chronox.de/libkcapi.html";
description = "Linux Kernel Crypto API User Space Interface Library";
@@ -56,4 +69,4 @@ stdenv.mkDerivation rec {
thillux
];
};
}
})
pkgs/by-name/mo/monado/package.nix
-2
View File
@@ -36,7 +36,6 @@
nix-update-script,
onnxruntime,
opencv4,
openhmd,
openvr,
orc,
pcre2,
@@ -126,7 +125,6 @@ stdenv.mkDerivation (finalAttrs: {
libXrandr
onnxruntime
opencv4
openhmd
openvr
orc
pcre2
pkgs/by-name/op/openhmd/package.nix
-79
View File
@@ -1,79 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
pkg-config,
hidapi,
SDL2,
libGL,
glew,
withExamples ? true,
}:
let
examplesOnOff = if withExamples then "ON" else "OFF";
in
stdenv.mkDerivation rec {
pname = "openhmd";
version = "0.3.0";
src = fetchFromGitHub {
owner = "OpenHMD";
repo = "OpenHMD";
rev = version;
sha256 = "1hkpdl4zgycag5k8njvqpx01apxmm8m8pvhlsxgxpqiqy9a38ccg";
};
# substitute for CMake 4 compat
# "OpenHMD is currently NOT ACTIVELY MAINTAINED" in upstream README
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
'';
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
hidapi
]
++ lib.optionals withExamples [
SDL2
glew
libGL
];
cmakeFlags = [
"-DBUILD_BOTH_STATIC_SHARED_LIBS=ON"
"-DOPENHMD_EXAMPLE_SIMPLE=${examplesOnOff}"
"-DOPENHMD_EXAMPLE_SDL=${examplesOnOff}"
"-DOpenGL_GL_PREFERENCE=GLVND"
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
postInstall = lib.optionalString withExamples ''
mkdir -p $out/bin
install -D examples/simple/simple $out/bin/openhmd-example-simple
install -D examples/opengl/openglexample $out/bin/openhmd-example-opengl
'';
meta = with lib; {
homepage = "http://www.openhmd.net"; # https does not work
description = "Library API and drivers immersive technology";
longDescription = ''
OpenHMD is a very simple FLOSS C library and a set of drivers
for interfacing with Virtual Reality (VR) Headsets aka
Head-mounted Displays (HMDs), controllers and trackers like
Oculus Rift, HTC Vive, Windows Mixed Reality, and etc.
'';
license = licenses.boost;
maintainers = with maintainers; [ oxij ];
platforms = platforms.unix;
};
}
pkgs/by-name/os/osu-lazer-bin/package.nix
+4 -4
View File
@@ -10,23 +10,23 @@
let
pname = "osu-lazer-bin";
version = "2025.1029.1";
version = "2025.1205.0";
src =
{
aarch64-darwin = fetchzip {
url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Apple.Silicon.zip";
hash = "sha256-Asqz0jiiHTtLcBzvibNzlaRe0jAop5YU4gmooZf/8gw=";
hash = "sha256-2QVFr7OxpjMmfSdIGOe93tTOtC/SHpJURDIFuSkO55Y=";
stripRoot = false;
};
x86_64-darwin = fetchzip {
url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Intel.zip";
hash = "sha256-2ZAZ3CnYz/6VJxqpDNvx6jGcNV/9oo8Eb5/GkSidiv0=";
hash = "sha256-CSV4D9HA62PGbwI7Y5/O5FgoXb14vaX9KVeQovNlAJU=";
stripRoot = false;
};
x86_64-linux = fetchurl {
url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.AppImage";
hash = "sha256-lx+RN20sPiG++pLS0gW6ixIYw3+g1KGCMrAhgW+yZIw=";
hash = "sha256-TlOfkffImBL4Bnnq6g+X8h75BX/wzm/y4fRxg7+7nCs=";
};
}
.${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported.");
pkgs/by-name/os/osu-lazer/deps.json
Generated
+8 -8
View File
@@ -626,8 +626,8 @@
},
{
"pname": "ppy.osu.Framework",
"version": "2025.1028.0",
"hash": "sha256-np5O4DOajO/UB2ihWUYYo81q+he4HWG1AAtn/P5rFgw="
"version": "2025.1205.1",
"hash": "sha256-TDu/mXylhCJ0kgU4rZutVzHDjJ+t6okGuxMqcsTc1ck="
},
{
"pname": "ppy.osu.Framework.NativeLibs",
@@ -636,13 +636,13 @@
},
{
"pname": "ppy.osu.Framework.SourceGeneration",
"version": "2024.1128.0",
"hash": "sha256-7ovye7QXFeFr68IxmwIAWA9Fgm686NTYVTUXGQWtKPM="
"version": "2025.1121.1",
"hash": "sha256-B4uPnJYYtQiuqAEDRbCtW4jJboPE0sRVSfle8eZGYn4="
},
{
"pname": "ppy.osu.Game.Resources",
"version": "2025.1006.0",
"hash": "sha256-ZHwi8l8JVu+wTEtAkgoLSFmt8z8vVJIIsTR29gRbrCA="
"version": "2025.1125.0",
"hash": "sha256-jJHpti142HgEBFhTDl5iThM05mQypVEF0J7JIVskVQ0="
},
{
"pname": "ppy.osuTK.NS20",
@@ -656,8 +656,8 @@
},
{
"pname": "ppy.SDL3-CS",
"version": "2025.920.0",
"hash": "sha256-gNy0f95tR3hXkagzLH/mngGSsDA7UqIMKYyTf00nsCI="
"version": "2025.1205.0",
"hash": "sha256-Mu5kn/yC7afo3+Nz755UzspUmOOEKtZ6/N4ENCzshtM="
},
{
"pname": "ppy.Veldrid",
pkgs/by-name/os/osu-lazer/package.nix
+2 -2
View File
@@ -22,13 +22,13 @@
buildDotnetModule rec {
pname = "osu-lazer";
version = "2025.1029.1";
version = "2025.1205.0";
src = fetchFromGitHub {
owner = "ppy";
repo = "osu";
tag = "${version}-lazer";
hash = "sha256-zIeeZVyI//uTZDH3i7FyuKRDDRcVRaT/43/4F5/Lamw=";
hash = "sha256-pdAQAjfh667PxqtU3VXl9wkSqpteEDpykUQbr9SfVQk=";
};
projectFile = "osu.Desktop/osu.Desktop.csproj";
pkgs/by-name/qu/qutebrowser/package.nix
+2 -2
View File
@@ -35,7 +35,7 @@ let
stripRoot = false;
};
version = "3.6.2";
version = "3.6.3";
in
python3.pkgs.buildPythonApplication {
@@ -45,7 +45,7 @@ python3.pkgs.buildPythonApplication {
src = fetchurl {
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz";
hash = "sha256-GfSkVluSwcCAvLPlW49QLmyWblTrnW9Qgqne0Qy8JJM=";
hash = "sha256-bb4oieYevWMAOuQLMZ4egfMG6SToMWxnla5IhAIcL68=";
};
# Needs tox
pkgs/by-name/ri/river-bedload/build.zig.zon.nix
+3 -3
View File
@@ -8,10 +8,10 @@
linkFarm "zig-packages" [
{
name = "wayland-0.3.0-lQa1kjPIAQDmhGYpY-zxiRzQJFHQ2VqhJkQLbKKdt5wl";
name = "wayland-0.4.0-lQa1khbMAQAsLS2eBR7M5lofyEGPIbu2iFDmoz8lPC27";
path = fetchzip {
url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.3.0.tar.gz";
hash = "sha256-ydEavD9z20wRwn9ZVX56ZI2T5i1tnm3LupVxfa30o84=";
url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.4.0.tar.gz";
hash = "sha256-ulIII5iJpM/W/VJB0HcdktEO2eb9T9J0ln2A1Z94dU4=";
};
}
]
pkgs/by-name/ri/river-bedload/package.nix
+8 -5
View File
@@ -10,25 +10,28 @@
wayland,
wayland-protocols,
wayland-scanner,
zig_0_14,
zig_0_15,
}:
let
zig = zig_0_15;
in
stdenv.mkDerivation (finalAttrs: {
pname = "river-bedload";
version = "0.1.1-unstable-2025-03-19";
version = "0.2.0";
src = fetchFromSourcehut {
owner = "~novakane";
repo = "river-bedload";
rev = "4a2855ca2669372c346975dd6e1f612ca563b131";
hash = "sha256-CQH2LQi2ga4YDD2ZYb998ExDJHK4TGHq5h3z94703Dc=";
tag = "v${finalAttrs.version}";
hash = "sha256-MOZju7mU/AtaSm9CJgb/UqYpCg697tefJC1yvQPK3S8=";
};
deps = callPackage ./build.zig.zon.nix { };
nativeBuildInputs = [
pkg-config
zig_0_14.hook
zig.hook
];
buildInputs = [
pkgs/by-name/ri/river-bedload/update-build-zig-zon.sh
+1 -1
View File
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p bash jq zon2nix
#!nix-shell -i bash -p bash jq zon2nix wget
commit=$(nix-instantiate --eval -A river-bedload.src.rev | jq --raw-output)
pkgs/by-name/si/signal-desktop/package.nix
+5 -5
View File
@@ -52,13 +52,13 @@ let
'';
});
version = "7.80.1";
version = "7.81.0";
src = fetchFromGitHub {
owner = "signalapp";
repo = "Signal-Desktop";
tag = "v${version}";
hash = "sha256-q4eRrMXYu1jVi1/gcFrEcwhmwtiEv2JOepyxf0wTPws=";
hash = "sha256-Ulv4/VZxsMAFKsNshVDdWjqGg4FzazvWdXGohwlyKs4=";
};
sticker-creator = stdenv.mkDerivation (finalAttrs: {
@@ -134,15 +134,15 @@ stdenv.mkDerivation (finalAttrs: {
fetcherVersion = 1;
hash =
if withAppleEmojis then
"sha256-7zw9qmnQt5NYRKI4bLCM5Hg0d/6kVKovy1k8CpZ/1R8="
"sha256-aNef+j0Kw8ERa1KKerGFi1+14U7YEclHThGIjkmQQow="
else
"sha256-Mya7v0uhjP4GVyD412SMiQ8/YHaq99fDIjGHCJOIWxY=";
"sha256-n5wvPqYCqKGC8ApUJ7K7OSwOHJq1rEivXiowK+HzN8M=";
};
env = {
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
SIGNAL_ENV = "production";
SOURCE_DATE_EPOCH = 1764091164;
SOURCE_DATE_EPOCH = 1764799973;
};
preBuild = ''
pkgs/by-name/sp/splitcode/package.nix
+2 -2
View File
@@ -9,13 +9,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "splitcode";
version = "0.31.4";
version = "0.31.5";
src = fetchFromGitHub {
owner = "pachterlab";
repo = "splitcode";
tag = "v${finalAttrs.version}";
hash = "sha256-jaZptrF5HSQSe2KQdBNPprhsVZ2FSudZFgWPn9zQq3A=";
hash = "sha256-x2N+IQHB6gbEKTEofsWy7SwVf1lvRxh5f93avtAs8fM=";
};
nativeBuildInputs = [ cmake ];
pkgs/by-name/st/stern/package.nix
+2 -2
View File
@@ -11,13 +11,13 @@
buildGoModule rec {
pname = "stern";
version = "1.33.0";
version = "1.33.1";
src = fetchFromGitHub {
owner = "stern";
repo = "stern";
rev = "v${version}";
hash = "sha256-JMtdjsXUOf75Djva0qdHUGM16OuWoTLjshDz4LAfllQ=";
hash = "sha256-2GCUPmeSbRg1TE5pD42BiHUwzxqS+9FV9ZYIaZKwNWo=";
};
vendorHash = "sha256-xDkYW542V2M9CvjNBFojRw4KAhcxvlBPVJCndlF+MKw=";
pkgs/by-name/sy/synapse-admin-etkecc/package.nix
+3 -3
View File
@@ -17,18 +17,18 @@ assert lib.asserts.assertMsg (
stdenv.mkDerivation (finalAttrs: {
pname = "synapse-admin-etkecc";
version = "0.11.1-etke49";
version = "0.11.1-etke50";
src = fetchFromGitHub {
owner = "etkecc";
repo = "synapse-admin";
tag = "v${finalAttrs.version}";
hash = "sha256-PbqO+Y740GWqfh584W6OS4HeQtO6Rkz6lc5IaTjadq0=";
hash = "sha256-460Ma0R1WG9BGB2NgHD7yIz+alcywtuhyHZXH4DPxDA=";
};
yarnOfflineCache = fetchYarnDeps {
yarnLock = finalAttrs.src + "/yarn.lock";
hash = "sha256-4o6TVbOSDm7btMDd4ItQR+jCFNZGhTXvycqcIh0FQnk=";
hash = "sha256-qpzrOfBInKHFH/uUViLCSIkjc41XUaHOyTs5oejt5NY=";
};
nativeBuildInputs = [
pkgs/by-name/tr/trgui-ng/package.nix
+5 -5
View File
@@ -15,13 +15,13 @@
webkitgtk_4_1,
}:
let
version = "1.4.0-unstable-2025-05-18";
version = "1.5.0";
src = fetchFromGitHub {
owner = "openscopeproject";
repo = "TrguiNG";
rev = "d2cd93ecc724f196d93c701fa27afa4288d2a37c";
hash = "sha256-Y3ZSpXmG+wi7x7qanKpRp917alssqF78L27Yt9K9Khs=";
tag = "v${version}";
hash = "sha256-N049HA+X9DcXyhmFbnxjfbQoKlf3dA73c1IOYFrDgwc=";
};
meta = {
@@ -34,7 +34,7 @@ let
frontend = buildNpmPackage (finalAttrs: {
pname = "TrguiNG-frontend";
inherit version src;
npmDepsHash = "sha256-sHZHAlV3zVeCmVTlIr0NeS1zxRCKfRMv1w9bW0tOg3g=";
npmDepsHash = "sha256-Ql1/itjEfvYigUzEZDWsGgJj7oZ1p6Bo00eLHRVHi4c=";
npmBuildScript = "webpack-prod";
@@ -58,7 +58,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
pname = "TrguiNG";
inherit version src;
cargoHash = "sha256-TflzT1BNAciMcxcejrlmIOIjXc1tpm/zX0kjk+dpGiM=";
cargoHash = "sha256-YGBLAO8lFvbowbT3yt2m/OQrpGzWghtyyZQJeYVQijA=";
postPatch = ''
cp ${dbip-country-lite}/share/dbip/dbip-country-lite.mmdb src-tauri/dbip.mmdb
pkgs/by-name/tr/trustymail/package.nix
+2 -2
View File
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "trustymail";
version = "1.2.0";
version = "1.2.1";
pyproject = true;
src = fetchFromGitHub {
owner = "cisagov";
repo = "trustymail";
tag = "v${version}";
hash = "sha256-EA8RomXREDAHZIuq8x+t6w7V1ErUOuuo0TUyaxIgdR8=";
hash = "sha256-NF89Am/sG3Ruaws2SUofrbLoEiKdYpgPuXIAKjst9hk=";
};
build-system = with python3.pkgs; [ setuptools ];
pkgs/by-name/vi/vivaldi/package.nix
+3 -3
View File
@@ -66,7 +66,7 @@
stdenv.mkDerivation rec {
pname = "vivaldi";
version = "7.7.3851.56";
version = "7.7.3851.58";
suffix =
{
@@ -79,8 +79,8 @@ stdenv.mkDerivation rec {
url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb";
hash =
{
aarch64-linux = "sha256-bnjFgTXts0qaQY3pqzaKp14apDpcCn2/smZ0hT5SbH0=";
x86_64-linux = "sha256-kXx0CD3hCTl2JWYWQApO73+UXXeAqqE7cujLXCtVcmI=";
aarch64-linux = "sha256-WPJB2wMS9F1WqCxZzAnonA5YkqHnnEmW/SJ4qYJImtU=";
x86_64-linux = "sha256-w10CX3j7Iq1kthLvklynN17k6A77VIkkRl0QT5ui+Bk=";
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};
pkgs/by-name/vu/vunnel/package.nix
+2 -2
View File
@@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "vunnel";
version = "0.43.0";
version = "0.44.0";
pyproject = true;
src = fetchFromGitHub {
owner = "anchore";
repo = "vunnel";
tag = "v${version}";
hash = "sha256-DHuNhizYDY/z3DPAPPOgGWn1m86yGHamiVCHGxlaC1w=";
hash = "sha256-uaB8Qczb+5kIFwrJ1h/derOCzW/4C2QPr2aPOMwxMHk=";
leaveDotGit = true;
};
pkgs/by-name/wi/windsurf/info.json
+9 -9
View File
@@ -1,20 +1,20 @@
{
"aarch64-darwin": {
"version": "1.12.36",
"version": "1.12.39",
"vscodeVersion": "1.105.0",
"url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/9472213c2b01d64c024e510cd6fe81abd9b16fb7/Windsurf-darwin-arm64-1.12.36.zip",
"sha256": "d34eea39a1b6d0f1f60c11062d7951c01b58740e3ba52b6af51516690e1674e0"
"url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/10ebfa84f4e8b018ef2459063f0293b8e9ac01da/Windsurf-darwin-arm64-1.12.39.zip",
"sha256": "1f1af7d5dcaf1314f86a8082dcc28406bca86b92a29048ef296107cdea72a74e"
},
"x86_64-darwin": {
"version": "1.12.36",
"version": "1.12.39",
"vscodeVersion": "1.105.0",
"url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/9472213c2b01d64c024e510cd6fe81abd9b16fb7/Windsurf-darwin-x64-1.12.36.zip",
"sha256": "9b39e8e93cbe434549c54daa44ddd17d08f4899ca41bee64b1a709b264d28232"
"url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/10ebfa84f4e8b018ef2459063f0293b8e9ac01da/Windsurf-darwin-x64-1.12.39.zip",
"sha256": "f422f2148be8e1d824abcd5ed18c86838d5edbb7f91244dcc51e142e9b5ac743"
},
"x86_64-linux": {
"version": "1.12.36",
"version": "1.12.39",
"vscodeVersion": "1.105.0",
"url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/9472213c2b01d64c024e510cd6fe81abd9b16fb7/Windsurf-linux-x64-1.12.36.tar.gz",
"sha256": "144fe8beff7de9e7764b4ef76e2a3a4e1638cd966d7ace70c06bdc268751ab67"
"url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/10ebfa84f4e8b018ef2459063f0293b8e9ac01da/Windsurf-linux-x64-1.12.39.tar.gz",
"sha256": "ce36ec8697ca7c9768678b99b9b8b364d33a044afed242931fea14f544581c68"
}
}
pkgs/by-name/zw/zwave-js-ui/package.nix
+3 -3
View File
@@ -7,15 +7,15 @@
buildNpmPackage rec {
pname = "zwave-js-ui";
version = "11.8.1";
version = "11.8.2";
src = fetchFromGitHub {
owner = "zwave-js";
repo = "zwave-js-ui";
tag = "v${version}";
hash = "sha256-KQjs9oVFUQIL9aAorQ5kZiGJdHBDfCI9ENHjfz/mdng=";
hash = "sha256-OXvdj8DzaVK+5YmFh56FToB43OOOh7+7JZvmW7IQkKE=";
};
npmDepsHash = "sha256-bucQdw3DYCUSUl78fR+/Tt8BL18o5wdtZP6rLzadoEQ=";
npmDepsHash = "sha256-388Iu0rDFNIk3FUy2/TySejgR6sFWc/9BP19KEmfQKk=";
passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui;
pkgs/desktops/lomiri/services/biometryd/default.nix
+2 -2
View File
@@ -25,13 +25,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "biometryd";
version = "0.3.2";
version = "0.3.3";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/core/biometryd";
rev = finalAttrs.version;
hash = "sha256-OTK+JAm8MnlQGZwcKJPh+N1OfUOko24G+IU9GUBjOjI=";
hash = "sha256-MIyWGd4No4Qj8oEH1FQYCE4rQhyetwiAf1y6em4zk2A=";
};
outputs = [
pkgs/desktops/lomiri/services/lomiri-telephony-service/default.nix
+2 -2
View File
@@ -43,13 +43,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "lomiri-telephony-service";
version = "0.6.1";
version = "0.6.2";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/core/lomiri-telephony-service";
tag = finalAttrs.version;
hash = "sha256-7WKKRUEEF3NL8S1xg8E1WcD3dGasrw49pydeC4CyL+c=";
hash = "sha256-CNtJPMust7zCuoXw/CpaK4NVXijTXA3Xs4YMJiZyxes=";
};
postPatch = ''
pkgs/desktops/pantheon/apps/elementary-dock/default.nix
+2 -2
View File
@@ -18,7 +18,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "elementary-dock";
version = "8.3.0";
version = "8.3.1";
outputs = [
"out"
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "elementary";
repo = "dock";
rev = finalAttrs.version;
hash = "sha256-wf0HYpQAnABk0VeSGLXhWZPlO/SMzldt47PLVpWkav8=";
hash = "sha256-BJkJ6U9fnGSFeY/Z9tcomZ0umRDENxPl0koioUYhFYg=";
};
depsBuildBuild = [ pkg-config ];
pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
+2 -2
View File
@@ -12,13 +12,13 @@
stdenvNoCC.mkDerivation rec {
pname = "elementary-gtk-theme";
version = "8.2.1";
version = "8.2.2";
src = fetchFromGitHub {
owner = "elementary";
repo = "stylesheet";
rev = version;
sha256 = "sha256-ymgSe4LKtbJVwmZJOwer1Geb/VgYltp+tSNHkWtaMlg=";
sha256 = "sha256-ZjeufUC3Eg1do3GKN1kW/EceuWfAsFnOkSCmscL+vxg=";
};
nativeBuildInputs = [
pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
+2 -2
View File
@@ -22,13 +22,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel-applications-menu";
version = "8.0.1";
version = "8.0.2";
src = fetchFromGitHub {
owner = "elementary";
repo = "applications-menu";
rev = version;
sha256 = "sha256-bwQI41Znm75GFoXxSbWkY9daAJTMvUo+UHyyPmvzOUA=";
sha256 = "sha256-uc+enFOeYL91fFWaDY+43EJ4VomGqZQ7uZ3+dYm66SI=";
};
patches = [
pkgs/development/python-modules/evohome-async/default.nix
+2 -2
View File
@@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "evohome-async";
version = "1.0.5";
version = "1.0.6";
pyproject = true;
disabled = pythonOlder "3.12";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "zxdavb";
repo = "evohome-async";
tag = version;
hash = "sha256-4eV050Yikr+5ZIj1v11cPQQ1pAlQYckbZXVFHHfYmpA=";
hash = "sha256-8oeW6NWqYcZF+s2kRfeoVAp8JBbuDn+NQ0RU6nxVTAc=";
};
build-system = [ hatchling ];
pkgs/development/python-modules/langchain-fireworks/default.nix
+2 -2
View File
@@ -24,14 +24,14 @@
buildPythonPackage rec {
pname = "langchain-fireworks";
version = "1.0.0";
version = "1.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-fireworks==${version}";
hash = "sha256-JULxbSSSerM7HifVBRxkv5YgpP5jFdm3XzHIJbM8T1Y=";
hash = "sha256-gLc3pPxQZTm6PU5r1o7mxlnRI8tCeg/w9jkbbfUCSec=";
};
sourceRoot = "${src.name}/libs/partners/fireworks";
pkgs/development/python-modules/langchain-xai/default.nix
+2 -2
View File
@@ -25,14 +25,14 @@
buildPythonPackage rec {
pname = "langchain-xai";
version = "1.0.0";
version = "1.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
tag = "langchain-xai==${version}";
hash = "sha256-engdUNTT3KsAGrJ93PiFQoI6jbBFPAqavDsrD073484=";
hash = "sha256-bm7sIa62CIvsYNDdaN+XZKpRnCv5bg9kPZ1Ym8utFcM=";
};
sourceRoot = "${src.name}/libs/partners/xai";
pkgs/development/python-modules/mmengine/default.nix
+30 -3
View File
@@ -128,6 +128,33 @@ buildPythonPackage rec {
# ValueError: User specified autocast device_type must be cuda or cpu, but got mps
"tests/test_runner/test_runner.py::TestRunner::test_test"
"tests/test_runner/test_runner.py::TestRunner::test_val"
# Fails in pytestCheckHook due to multiple copies accessing the same resources (nixpkgs-review
"tests/test_hooks/test_ema_hook.py::TestEMAHook::test_after_test_epoch"
"tests/test_hooks/test_ema_hook.py::TestEMAHook::test_after_val_epoch"
"tests/test_hooks/test_ema_hook.py::TestEMAHook::test_before_test_epoch"
"tests/test_hooks/test_ema_hook.py::TestEMAHook::test_before_val_epoch"
"tests/test_infer/test_infer.py"
"tests/test_runner/test_runner.py::TestRunner::test_checkpoint"
# torch.distributed.DistNetworkError: [...] message: address already in use
# Happens in nixpkgs-review due to the lack of network namespacing
# Note: These all worked fine in nix-build
"tests/test_dist/test_dist.py"
"tests/test_dist/test_utils.py" # fails in _init_dist_env
"tests/test_hooks/test_sync_buffers_hook.py::TestSyncBuffersHook::test_sync_buffers_hook"
"tests/test_model/test_model_utils.py::test_is_model_wrapper"
"tests/test_model/test_wrappers/test_model_wrapper.py::TestDistributedDataParallel"
"tests/test_optim/test_optimizer/test_optimizer.py::TestZeroOptimizer::test_zero_redundancy_optimizer"
"tests/test_runner/test_runner.py::TestRunner::test_custom_loop"
"tests/test_runner/test_runner.py::TestRunner::test_default_scope"
"tests/test_runner/test_runner.py::TestRunner::test_init"
"tests/test_runner/test_runner.py::TestRunner::test_train"
"tests/test_optim/test_optimizer/test_optimizer_wrapper.py::TestOptimWrapper::test_optim_context"
"tests/test_testing/test_runner_test_case.py"
# TypeError: 'BaseDataset' object is not callable
"tests/test_dataset/test_base_dataset.py::TestBaseDataset::test_get_subset[False-True]"
];
disabledTests = [
@@ -149,10 +176,10 @@ buildPythonPackage rec {
# Fails when max-jobs is set to use fewer processes than cores
# for example `AssertionError: assert 14 == 4`
"test_setup_multi_processes"
];
# torch.distributed.DistNetworkError: The server socket has failed to bind.
__darwinAllowLocalNetworking = true;
# Crashes in pytestCheckHook due to MPS incompatibility in torch
"test_with_runner"
];
meta = {
description = "Library for training deep learning models based on PyTorch";
pkgs/development/python-modules/psycopg/default.nix
+2 -2
View File
@@ -35,14 +35,14 @@
let
pname = "psycopg";
version = "3.3.0";
version = "3.3.1";
pyproject = true;
src = fetchFromGitHub {
owner = "psycopg";
repo = "psycopg";
tag = version;
hash = "sha256-X4gpknLotZ1RmWaTdY6I7w+unSJMc56UI1Ddi7edGSg=";
hash = "sha256-nNiiiMHAeaMJ+51RtjHeWRdOML4x05afZ/DBD3B1sM0=";
};
patches = [
pkgs/development/python-modules/pydevccu/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pydevccu";
version = "0.1.18";
version = "0.1.19";
pyproject = true;
disabled = pythonOlder "3.13";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "SukramJ";
repo = "pydevccu";
tag = version;
hash = "sha256-+IUPj27+eU2e215LkF+Qqv5vtRqASPP7dEBTvfT/KEo=";
hash = "sha256-VWnujpPzlGcHGosqjtBLATR2+SFKRjXPqQMY3R5tRlc=";
};
postPatch = ''
pkgs/development/python-modules/types-awscrt/default.nix
+2 -2
View File
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "types-awscrt";
version = "0.29.0";
version = "0.29.2";
pyproject = true;
src = fetchPypi {
pname = "types_awscrt";
inherit version;
hash = "sha256-f4EECEYJXLr2Tmt5BAQ0dQ1PL0h1RNd0i3eMNJ05NRA=";
hash = "sha256-QeAeFNZGh3vTEOfjxJ/xk/g2FIC5Vo6XsWOXdQCbvvo=";
};
build-system = [ setuptools ];
pkgs/development/tools/build-managers/gradle/default.nix
+50 -24
View File
@@ -68,8 +68,8 @@ let
''
cp -a $src/* .
substituteInPlace ./build.gradle --replace-fail '@JAVA_VERSION@' '${javaMajorVersion}'
env GRADLE_USER_HOME=$TMPDIR/gradle org.gradle.native.dir=$TMPDIR/native \
gradle run --no-daemon --quiet --console plain > $out
env GRADLE_USER_HOME=$TMPDIR/gradle GRADLE_OPTS=-Dorg.gradle.native.dir=$TMPDIR/native \
gradle run --no-daemon --quiet --console plain > $out
actual="$(<$out)"
if [[ "${javaVersion}" != "$actual"* ]]; then
echo "Error: Expected '${javaVersion}', to start with '$actual'" >&2
@@ -129,8 +129,11 @@ let
callPackage,
makeWrapper,
unzip,
coreutils,
findutils,
ncurses5,
ncurses6,
gnused,
udev,
testers,
runCommand,
@@ -176,28 +179,47 @@ let
# We only need to patchelf some libs embedded in JARs.
dontAutoPatchelf = true;
# All the installed Gradle libraries and binaries go here. Note that the Gradle wrapper
# will look for a lib directory above its own directory (which is presumed to be bin)
# for loading the main Gradle jar.
gradleLibexec = "${placeholder "out"}/libexec/gradle";
installPhase =
with builtins;
let
# set toolchains via installations.path property in gradle.properties.
# See https://docs.gradle.org/current/userguide/toolchains.html#sec:custom_loc
toolchainPaths = "org.gradle.java.installations.paths=${concatStringsSep "," javaToolchains}";
jnaLibraryPath = if stdenv.hostPlatform.isLinux then lib.makeLibraryPath [ udev ] else "";
jnaFlag =
if stdenv.hostPlatform.isLinux then "--add-flags \"-Djna.library.path=${jnaLibraryPath}\"" else "";
toolchainPaths = "org.gradle.java.installations.paths=${lib.concatStringsSep "," javaToolchains}";
jnaLibraryPath = lib.optionalString stdenv.hostPlatform.isLinux (lib.makeLibraryPath [ udev ]);
jnaFlag = lib.optionalString stdenv.hostPlatform.isLinux ''--add-flags "-Djna.library.path=${jnaLibraryPath}"'';
in
''
mkdir -pv $out/lib/gradle/
cp -rv lib/ $out/lib/gradle/
# Install all the Gradle jars.
mkdir -vp $gradleLibexec
cp -av lib/ $gradleLibexec
[ -f $gradleLibexec/lib/gradle-launcher-*.jar ] || { echo "No Gradle launcher jar found!" >&2 && exit 1; }
gradle_launcher_jar=$(echo $out/lib/gradle/lib/gradle-launcher-*.jar)
test -f $gradle_launcher_jar
makeWrapper ${java}/bin/java $out/bin/gradle \
--set JAVA_HOME ${java} \
${jnaFlag} \
--add-flags "-classpath $gradle_launcher_jar org.gradle.launcher.GradleMain"
# Set up toolchain paths in the gradle.properties.
echo ${lib.escapeShellArg toolchainPaths} > $gradleLibexec/gradle.properties
echo "${toolchainPaths}" > $out/lib/gradle/gradle.properties
# Just use the existing gradle wrapper (usually called `gradlew`) as the main program.
mkdir -vp $gradleLibexec/bin
cp -v bin/gradle $gradleLibexec/bin/gradlew
chmod +x $gradleLibexec/bin/gradlew
patchShebangs --host $gradleLibexec/bin/gradlew
# Ensure that JAVA_HOME is set so the installed Gradle wrapper picks it up.
# The wrapper also needs coreutils, xargs, and sed.
mkdir -vp $out/bin
makeWrapper $gradleLibexec/bin/gradlew $out/bin/gradle \
--set-default JAVA_HOME ${java} \
--suffix PATH : ${
lib.makeBinPath [
coreutils
findutils
gnused
]
} \
${jnaFlag}
'';
dontFixup = !stdenv.hostPlatform.isLinux;
@@ -212,10 +234,10 @@ let
export PATH="${buildPackages.jdk}/bin:$PATH"
. ${./patching.sh}
nativeVersion="$(extractVersion native-platform $out/lib/gradle/lib/native-platform-*.jar)"
nativeVersion="$(extractVersion native-platform $gradleLibexec/lib/native-platform-*.jar)"
for variant in "" "-ncurses5" "-ncurses6"; do
autoPatchelfInJar \
$out/lib/gradle/lib/native-platform-linux-${arch}$variant-''${nativeVersion}.jar \
$gradleLibexec/lib/native-platform-linux-${arch}$variant-''${nativeVersion}.jar \
"${lib.getLib stdenv.cc.cc}/lib64:${
lib.makeLibraryPath [
stdenv.cc.cc
@@ -228,14 +250,14 @@ let
# The file-events library _seems_ to follow the native-platform version, but
# we won’t assume that.
if [ -n "${newFileEvents}" ]; then
fileEventsVersion="$(extractVersion gradle-fileevents $out/lib/gradle/lib/gradle-fileevents-*.jar)"
fileEventsVersion="$(extractVersion gradle-fileevents $gradleLibexec/lib/gradle-fileevents-*.jar)"
autoPatchelfInJar \
$out/lib/gradle/lib/gradle-fileevents-''${fileEventsVersion}.jar \
$gradleLibexec/lib/gradle-fileevents-''${fileEventsVersion}.jar \
"${lib.getLib stdenv.cc.cc}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ]}"
else
fileEventsVersion="$(extractVersion file-events $out/lib/gradle/lib/file-events-*.jar)"
fileEventsVersion="$(extractVersion file-events $gradleLibexec/lib/file-events-*.jar)"
autoPatchelfInJar \
$out/lib/gradle/lib/file-events-linux-${arch}-''${fileEventsVersion}.jar \
$gradleLibexec/lib/file-events-linux-${arch}-''${fileEventsVersion}.jar \
"${lib.getLib stdenv.cc.cc}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ]}"
fi
@@ -253,7 +275,7 @@ let
version = testers.testVersion {
package = finalAttrs.finalPackage;
command = ''
env GRADLE_USER_HOME=$TMPDIR/gradle org.gradle.native.dir=$TMPDIR/native \
env GRADLE_USER_HOME=$TMPDIR/gradle GRADLE_OPTS=-Dorg.gradle.native.dir=$TMPDIR/native \
gradle --version
'';
};
@@ -269,7 +291,11 @@ let
}
''
cp -a $src/* .
env GRADLE_USER_HOME=$TMPDIR/gradle org.gradle.native.dir=$TMPDIR/native \
# Make sure GRADLE_OPTS works.
env \
GRADLE_USER_HOME=$TMPDIR/gradle \
GRADLE_OPTS="-Dorg.gradle.native.dir=$TMPDIR/native -Dnix.test.mainClass=Main" \
gradle run --no-daemon --quiet --console plain > $out
'';
};
pkgs/development/tools/build-managers/gradle/tests/java-application/build.gradle
+9 -1
View File
@@ -2,6 +2,14 @@ plugins {
id('application')
}
String getPropOrDie(String prop, String message) {
def ret = System.getProperty(prop)
if (!ret) {
throw new RuntimeException(message)
}
return ret
}
application {
mainClass = 'Main'
mainClass = getPropOrDie('nix.test.mainClass', 'No main class defined, perhaps GRADLE_OPTS broke?')
}
pkgs/development/web/playwright/driver.nix
-1
View File
@@ -149,7 +149,6 @@ let
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
kalekseev
marie
];
inherit (nodejs.meta) platforms;
};
pkgs/os-specific/linux/morse-driver/0001-fix-build-compatibility-till-Linux-6.12.3-with-stric.patch
+156
View File
@@ -0,0 +1,156 @@
From d144e153686e063ef3febeb3dbcaa5e98c3831ae Mon Sep 17 00:00:00 2001
From: Govind Singh <govind.sk85@gmail.com>
Date: Thu, 6 Nov 2025 11:25:53 +0400
Subject: [PATCH] fix build compatibility till Linux 6.12.3 with strict type
checks
Signed-off-by: Govind Singh <govind.sk85@gmail.com>
---
Makefile | 2 +-
apf.c | 27 +++++++++++++++++++++++++++
debug.h | 2 +-
firmware.h | 4 +++-
mac.c | 1 +
morse.h | 2 +-
vendor.c | 2 --
7 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 5dc7bb2..fce34ba 100644
--- a/Makefile
+++ b/Makefile
@@ -155,6 +155,7 @@ morse-y += coredump.o
morse-y += peer.o
morse-y += led.o
morse-y += bss_stats.o
+morse-y += apf.o
morse-$(CONFIG_MORSE_MONITOR) += monitor.o
morse-$(CONFIG_MORSE_SDIO) += sdio.o
morse-$(CONFIG_MORSE_SPI) += spi.o
@@ -164,7 +165,6 @@ morse-$(CONFIG_MORSE_USER_ACCESS) += uaccess.o
morse-$(CONFIG_MORSE_HW_TRACE) += hw_trace.o
morse-$(CONFIG_MORSE_PAGESET_TRACE) += pageset_trace.o
morse-$(CONFIG_MORSE_BUS_TRACE) += bus_trace.o
-morse-$(CONFIG_ANDROID) += apf.o
ifeq ($(CONFIG_DISABLE_MORSE_RC),y)
morse-y += minstrel_rc.o
diff --git a/apf.c b/apf.c
index baecd05..96b4b1b 100644
--- a/apf.c
+++ b/apf.c
@@ -16,6 +16,7 @@
#define MORSE_APF_WARN(_m, _f, _a...) morse_warn(FEATURE_ID_APF, _m, _f, ##_a)
#define MORSE_APF_ERR(_m, _f, _a...) morse_err(FEATURE_ID_APF, _m, _f, ##_a)
+#ifdef CONFIG_ANDROID
struct nla_policy morse_apf_nla_policy[VENDOR_ATTR_PACKET_FILTER_MAX] = {
[VENDOR_ATTR_PACKET_FILTER_VERSION] = { .type = NLA_U32},
[VENDOR_ATTR_PACKET_FILTER_MAX_LENGTH] = { .type = NLA_U32},
@@ -210,3 +211,29 @@ exit:
kfree(program);
return ret;
}
+#else
+int morse_vendor_cmd_get_supported_feature_set(struct wiphy *wiphy,
+ struct wireless_dev *wdev, const void *data, int data_len)
+{
+ return -EOPNOTSUPP;
+}
+
+int morse_vendor_cmd_apf_get_capabilities(struct wiphy *wiphy,
+ struct wireless_dev *wdev, const void *data, int data_len)
+{
+ return -EOPNOTSUPP;
+}
+
+int morse_vendor_cmd_apf_set_packet_filter(struct wiphy *wiphy,
+ struct wireless_dev *wdev, const void *data, int data_len)
+{
+ return -EOPNOTSUPP;
+}
+
+int morse_vendor_cmd_apf_read_packet_filter_data(struct wiphy *wiphy,
+ struct wireless_dev *wdev, const void *data, int data_len)
+{
+ return -EOPNOTSUPP;
+}
+
+#endif /* CONFIG_ANDROID */
diff --git a/debug.h b/debug.h
index 2b734d5..f03f419 100644
--- a/debug.h
+++ b/debug.h
@@ -156,7 +156,7 @@ extern uint debug_mask;
*
* @returns True if output would be generated and false otherwise.
*/
-bool morse_log_is_enabled(u32 id, u8 level);
+bool morse_log_is_enabled(enum morse_feature_id id, u8 level);
/**
* Set the default logging level for all features.
diff --git a/firmware.h b/firmware.h
index 217339a..0b1815f 100644
--- a/firmware.h
+++ b/firmware.h
@@ -32,6 +32,8 @@
#error "Capability subset filled by firmware is to big"
#endif
+enum morse_config_test_mode;
+
enum morse_fw_info_tlv_type {
MORSE_FW_INFO_TLV_BCF_ADDR = 1,
MORSE_FW_INFO_TLV_COREDUMP_MEM_REGION = 2,
@@ -146,7 +148,7 @@ struct extended_host_table {
u8 ext_host_table_data_tlvs[];
} __packed;
-int morse_firmware_init(struct morse *mors, uint test_mode);
+int morse_firmware_init(struct morse *mors, enum morse_config_test_mode test_mode);
/**
* @brief Do necessary preparation and then initialise firmware
diff --git a/mac.c b/mac.c
index 7844af9..3b3595f 100644
--- a/mac.c
+++ b/mac.c
@@ -4295,6 +4295,7 @@ static void morse_mac_ops_sta_rc_update(struct ieee80211_hw *hw,
#else
struct ieee80211_link_sta *link_sta,
#endif
+
u32 changed)
{
struct morse *mors;
diff --git a/morse.h b/morse.h
index d001ab5..850587c 100644
--- a/morse.h
+++ b/morse.h
@@ -55,7 +55,7 @@
/* Re-Define the IGNORE channel flag, if not defined by the cfg80211 patch.
* The flag won't be used by MM81xx.
*/
-#if defined(__x86_64__)
+#ifndef IEEE80211_CHAN_IGNORE
#define IEEE80211_CHAN_IGNORE IEEE80211_CHAN_DISABLED
#endif
diff --git a/vendor.c b/vendor.c
index 0556715..7fcd31a 100644
--- a/vendor.c
+++ b/vendor.c
@@ -14,9 +14,7 @@
#include "wiphy.h"
#include "vendor.h"
#include "mesh.h"
-#ifdef CONFIG_ANDROID
#include "apf.h"
-#endif
/** Extra overhead to account for any additional netlink framing */
#define VENDOR_EVENT_OVERHEAD (30)
--
2.34.1
pkgs/os-specific/linux/morse-driver/default.nix
+65
View File
@@ -0,0 +1,65 @@
{
lib,
stdenv,
fetchFromGitHub,
kernel,
kernelModuleMakeFlags,
}:
stdenv.mkDerivation {
pname = "morse-driver";
version = "1.16.4-${kernel.version}";
src = fetchFromGitHub {
owner = "MorseMicro";
repo = "morse_driver";
rev = "7f95fe37750a09259b4d2988a9cf22df60f76fdf";
hash = "sha256-kMEFl1sfDGqh96t5emF9UtzOqauFClKXBsXrS1NZ33E=";
fetchSubmodules = true;
};
patches = [
./0001-fix-build-compatibility-till-Linux-6.12.3-with-stric.patch
];
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags =
kernelModuleMakeFlags
++ [
"KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
# --- Morse-specific Kconfig options ---
"CONFIG_WLAN_VENDOR_MORSE=m"
"CONFIG_MORSE_SDIO=y"
"CONFIG_MORSE_SDIO_ALIGNMENT=4"
"CONFIG_MORSE_USER_ACCESS=y"
"CONFIG_MORSE_VENDOR_COMMAND=y"
"CONFIG_MORSE_COUNTRY=US"
"CONFIG_MORSE_DEBUG_MASK=4"
"CONFIG_MORSE_SDIO_RESET_TIME=400"
"CONFIG_MORSE_POWERSAVE_MODE=0"
"CONFIG_ANDROID=n"
"CONFIG_MORSE_WATCHDOG_RESET_DEFAULT_DISABLED=y"
]
++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"CROSS_COMPILE=${stdenv.cc.targetPrefix}"
];
installPhase = ''
mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
install -D -m 644 morse.ko "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/morse.ko"
install -D -m 644 dot11ah/dot11ah.ko "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/dot11ah.ko"
'';
enableParallelBuilding = true;
meta = with lib; {
description = "Morse Micro Wi-Fi driver";
homepage = "https://github.com/MorseMicro/morse_driver";
license = licenses.gpl2Only;
platforms = platforms.linux;
maintainers = with maintainers; [ govindsi ];
broken = kernel.kernelOlder "6.1" || kernel.kernelAtLeast "6.12.56";
};
}
pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
+2 -7
View File
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "pytest-homeassistant-custom-component";
version = "0.13.297";
version = "0.13.298";
pyproject = true;
disabled = pythonOlder "3.13";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "MatthewFlamm";
repo = "pytest-homeassistant-custom-component";
tag = version;
hash = "sha256-5s8c1OpVqQ63BNLZz0mTyqwbsIZLUmckF5yJkyNgzrw=";
hash = "sha256-5yQnEjqG8SKv/RSoTKlpImtOHfs2I9tuyQit0NQ5X6Y=";
};
build-system = [ setuptools ];
@@ -50,11 +50,6 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
disabledTests = [
# incompatible with Home Assistant 2025.12.0
"test_entry_diagnostics"
];
meta = {
changelog = "https://github.com/MatthewFlamm/pytest-homeassistant-custom-component/blob/${src.tag}/CHANGELOG.md";
description = "Package to automatically extract testing plugins from Home Assistant for custom component testing";
pkgs/servers/home-assistant/python-modules/hass-web-proxy-lib/default.nix
+1 -2
View File
@@ -52,8 +52,7 @@ buildPythonPackage rec {
pytest-cov-stub
pytest-homeassistant-custom-component
pytest-timeout
# https://github.com/dermotduffy/hass-web-proxy-lib/issues/110
# pytestCheckHook
pytestCheckHook
];
disabledTests = [
pkgs/top-level/aliases.nix
+1
View File
@@ -1202,6 +1202,7 @@ mapAliases {
opencl-clang = throw "opencl-clang has been integrated into intel-graphics-compiler"; # Added 2025-09-10
openconnect_gnutls = throw "'openconnect_gnutls' has been renamed to/replaced by 'openconnect'"; # Converted to throw 2025-10-27
openexr_3 = throw "'openexr_3' has been renamed to/replaced by 'openexr'"; # Converted to throw 2025-10-27
openhmd = throw "'openhmd' has been removed due to being unmaintained upstream"; # Added 2025-11-05
openimageio2 = throw "'openimageio2' has been renamed to/replaced by 'openimageio'"; # Converted to throw 2025-10-27
openjdk23 = throw "OpenJDK 23 was removed as it has reached its end of life"; # Added 2025-11-04
openjdk23_headless = throw "OpenJDK 23 was removed as it has reached its end of life"; # Added 2025-11-04
pkgs/top-level/linux-kernels.nix
+2
View File
@@ -580,6 +580,8 @@ in
mxu11x0 = callPackage ../os-specific/linux/mxu11x0 { };
morse-driver = callPackage ../os-specific/linux/morse-driver { };
# compiles but has to be integrated into the kernel somehow
# Let's have it uncommented and finish it..
ndiswrapper = callPackage ../os-specific/linux/ndiswrapper { };