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]
2026-01-13 12:07:51 +00:00
committed by GitHub
parent 00593223c9 892e95f560
commit 88d2346afe
67 changed files with 354 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/github-teams.json
+3 -6
View File
@@ -170,8 +170,8 @@
"emilazy": 18535642
},
"members": {
"reckenrode": 7413633,
"Samasaur1": 30577766,
"reckenrode": 7413633,
"toonn": 1486805
},
"name": "darwin-core"
@@ -212,7 +212,6 @@
"emilazy": 18535642,
"ethancedwards8": 60861925,
"fiddlerwoaroof": 808745,
"frogamic": 10263813,
"gador": 1883533,
"griff": 4368,
"groodt": 343415,
@@ -277,9 +276,7 @@
"documentation-team": {
"description": "Maintain nixpkgs/NixOS documentation and tools for building it. https://nixos.org/community/teams/documentation",
"id": 6590023,
"maintainers": {
"alejandrosame": 1078000
},
"maintainers": {},
"members": {
"hsjobeki": 50398876,
"wamirez": 24505474
@@ -485,9 +482,9 @@
"wrmilling": 6162814
},
"members": {
"azey7f": 41077433,
"frederictobiasc": 26125115,
"heywoodlh": 18178614,
"maevii": 41077433,
"rorosen": 76747196
},
"name": "k3s"
maintainers/maintainer-list.nix
+14 -8
View File
@@ -2809,14 +2809,6 @@
githubId = 426541;
name = "Tim Kleinschmidt";
};
azey7f = {
email = "me@azey.net";
github = "azey7f";
githubId = 41077433;
name = "azey";
# assuming my nameservers are up: gpg --auto-key-locate clear,nodefault,cert,dane --locate-keys me@azey.net
keys = [ { fingerprint = "2CCB 3403 43FE 8A2B 91CE 7F75 F94F 4A71 C5C2 1E8F"; } ];
};
azuwis = {
email = "azuwis@gmail.com";
github = "azuwis";
@@ -15860,6 +15852,14 @@
githubId = 38541651;
name = "maeve";
};
maevii = {
email = "me@maevi.net";
github = "maevii";
githubId = 41077433;
name = "Maevi";
# assuming my nameservers are up: gpg --auto-key-locate clear,nodefault,cert,dane --locate-keys me@maevi.net
keys = [ { fingerprint = "A176 4D41 E826 A6E5 A5A1 8231 7670 F0F0 C946 12F4"; } ];
};
mafo = {
email = "Marc.Fontaine@gmx.de";
github = "MarcFontaine";
@@ -23754,6 +23754,12 @@
name = "Otto Sabart";
keys = [ { fingerprint = "0AF6 4C3B 1F12 14B3 8C8C 5786 1FA2 DBE6 7438 7CC3"; } ];
};
sebimarkgraf = {
email = "sebastian-markgraf@t-online.de";
github = "sebimarkgraf";
githubId = 24530526;
name = "Sebastian Mossburger";
};
sebrut = {
email = "kontakt@sebastian-rutofski.de";
github = "sebrut";
pkgs/applications/editors/jetbrains/default.nix
+2 -2
View File
@@ -124,7 +124,7 @@ in
pycharm-community =
lib.warnOnInstantiate
"pycharm-comminity: PyCharm Community has been discontinued by Jetbrains. This deprecated alias uses the, no longer updated, binary build on Darwin. On Linux it uses PyCharm Open Source, built from source. Either switch to 'jetbrains.pycharm-oss' or 'jetbrains.pycharm'. See: https://blog.jetbrains.com/pycharm/2025/04/pycharm-2025"
"pycharm-community: PyCharm Community has been discontinued by Jetbrains. This deprecated alias uses the, no longer updated, binary build on Darwin. On Linux it uses PyCharm Open Source, built from source. Either switch to 'jetbrains.pycharm-oss' or 'jetbrains.pycharm'. See: https://blog.jetbrains.com/pycharm/2025/04/pycharm-2025"
(
if stdenv.hostPlatform.isDarwin then
pycharm-community-bin
@@ -134,7 +134,7 @@ in
pycharm-community-bin =
lib.warnOnInstantiate
"pycharm-comminity-bin: PyCharm Community has been discontinued by Jetbrains. This binary build is no longer updated. Switch to 'jetbrains.pycharm-oss' for open source builds (from source) or 'jetbrains.pycharm' for commercial builds (binary, unfree). See: https://blog.jetbrains.com/pycharm/2025/04/pycharm-2025"
"pycharm-community-bin: PyCharm Community has been discontinued by Jetbrains. This binary build is no longer updated. Switch to 'jetbrains.pycharm-oss' for open source builds (from source) or 'jetbrains.pycharm' for commercial builds (binary, unfree). See: https://blog.jetbrains.com/pycharm/2025/04/pycharm-2025"
(mkBinIde ./ides/pycharm-community.nix { inherit pyCharmCommonOverrides; });
pycharm-community-src =
pkgs/applications/editors/vscode/extensions/sourcegraph.amp/default.nix
+2 -2
View File
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "sourcegraph";
name = "amp";
version = "0.0.1767715893";
hash = "sha256-/r+OMv0Ilyk6Ep1nF0LMFy9e0We3XfhpQhSt+L/UoOg=";
version = "0.0.1768263519";
hash = "sha256-uOvvkzXvyHiJP3ZxHBJhXW/M8Ju1DjSXpwflAkKjgxs=";
};
meta = {
pkgs/applications/networking/cluster/rke2/builder.nix
+1 -1
View File
@@ -159,7 +159,7 @@ buildGoModule (finalAttrs: {
changelog = "https://github.com/rancher/rke2/releases/tag/v${finalAttrs.version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
azey7f
maevii
rorosen
zimbatm
zygot
pkgs/by-name/an/ansel/package.nix
+3 -3
View File
@@ -82,13 +82,13 @@ let
in
stdenv.mkDerivation {
pname = "ansel";
version = "0-unstable-2026-01-06";
version = "0-unstable-2026-01-09";
src = fetchFromGitHub {
owner = "aurelienpierreeng";
repo = "ansel";
rev = "b9a2bbdea71aa8114e2de0d6e944d322ead76a97";
hash = "sha256-364KKrs0g6VgmyTKDhHVYUK+VERc32qFAbxZAjXG4kU=";
rev = "1d3af0ff6899a96a4fb916806696e563c1accb80";
hash = "sha256-XLKuQPCXAsH1qpC8Sw6AFSwXhl10pD0X1PSaRIhrnzs=";
fetchSubmodules = true;
};
pkgs/by-name/ar/ares/package.nix
+2 -2
View File
@@ -29,11 +29,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ares";
version = "146";
version = "147";
src = fetchzip {
url = "https://github.com/ares-emulator/ares/releases/download/v${finalAttrs.version}/ares-source.tar.gz";
hash = "sha256-D4N0u9NNlhs4nMoUrAY+sg6Ybt1xQPMiH1u0cV0Qixs=";
hash = "sha256-KkcrcFshNesnSp5fl+as3HFXjytgODvMv8m73Ni2euw=";
stripRoot = false;
};
pkgs/by-name/aw/aws-nuke/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "aws-nuke";
version = "3.61.0";
version = "3.62.2";
src = fetchFromGitHub {
owner = "ekristen";
repo = "aws-nuke";
tag = "v${version}";
hash = "sha256-XP/bJfrzo2GxjHyqcapCVteNlAzzL5Fn5XF1wPF50G8=";
hash = "sha256-NHZ5pPekRe7Mv4QLKvvqclmS+PCwOs2RK+N1aCu2v4I=";
};
vendorHash = "sha256-4/FHINd+xeHgaJmEP54KiP2AQo+3L4p4/QO0GqIspvQ=";
vendorHash = "sha256-9EM2IjQk20TY3q/4FqrvRe1Ku4lfrkgMqQnooZlpW1o=";
subPackages = [ "." ];
pkgs/by-name/bo/botan3/package.nix
+16 -20
View File
@@ -2,7 +2,7 @@
lib,
stdenv,
libcxxStdenv,
fetchurl,
fetchFromGitHub,
pkgsStatic,
runCommandLocal,
binutils,
@@ -73,9 +73,11 @@ stdenv.mkDerivation (finalAttrs: {
"selftests"
];
src = fetchurl {
url = "http://botan.randombit.net/releases/Botan-${finalAttrs.version}.tar.xz";
hash = "sha256-/eGUI29tVDTxNuoKBif2zJ0mr4uW6fHhx9jILNkPTyQ=";
src = fetchFromGitHub {
owner = "randombit";
repo = "botan";
tag = finalAttrs.version;
hash = "sha256-E4kKk4ry3SMn2DbnUTVx22lcAWDxxbo8DLyixjr/S6A=";
};
nativeBuildInputs = [
@@ -90,15 +92,12 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals (stdenv.hostPlatform.isLinux && withTpm2) [
tpm2-tss
]
++ lib.optionals (lib.versionAtLeast finalAttrs.version "3.6.0" && !stdenv.hostPlatform.isMinGW) [
++ lib.optionals (!stdenv.hostPlatform.isMinGW) [
jitterentropy
]
++
lib.optionals
(lib.versionAtLeast finalAttrs.version "3.7.0" && withEsdm && !stdenv.hostPlatform.isMinGW)
[
esdm
]
++ lib.optionals (withEsdm && !stdenv.hostPlatform.isMinGW) [
esdm
]
++ lib.optionals (stdenv.hostPlatform.isMinGW) [
windows.pthreads
];
@@ -130,19 +129,16 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals (stdenv.hostPlatform.isLinux && withTpm2) [
"--with-tpm2"
]
++ lib.optionals (lib.versionAtLeast finalAttrs.version "3.6.0" && !stdenv.hostPlatform.isMinGW) [
++ lib.optionals (!stdenv.hostPlatform.isMinGW) [
"--enable-modules=jitter_rng"
]
++
lib.optionals
(lib.versionAtLeast finalAttrs.version "3.7.0" && withEsdm && !stdenv.hostPlatform.isMinGW)
[
"--enable-modules=esdm_rng"
]
++ lib.optionals (lib.versionAtLeast finalAttrs.version "3.8.0" && policy != null) [
++ lib.optionals (withEsdm && !stdenv.hostPlatform.isMinGW) [
"--enable-modules=esdm_rng"
]
++ lib.optionals (policy != null) [
"--module-policy=${policy}"
]
++ lib.optionals (lib.versionAtLeast finalAttrs.version "3.8.0" && policy == "bsi") [
++ lib.optionals (policy == "bsi") [
"--enable-module=ffi"
"--enable-module=shake"
]
pkgs/by-name/ca/cargo-sort-derives/package.nix
+27
View File
@@ -0,0 +1,27 @@
{
fetchFromGitHub,
lib,
rustPlatform,
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-sort-derives";
version = "0.12.0";
src = fetchFromGitHub {
owner = "lusingander";
repo = "cargo-sort-derives";
tag = "v${version}";
hash = "sha256-91sfRTMcI2/MyTrv+uJmhqfL4KUAc6//yzRR9FxvPHo=";
};
cargoHash = "sha256-kQTAYBb/xhrfO3PSJvnZrZKr6B3fgtlElf1mNCSf7eg=";
meta = {
description = "Cargo subcommand to sort derive attributes";
mainProgram = "cargo-sort-derives";
homepage = "https://lusingander.github.io/cargo-sort-derives/";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ sebimarkgraf ];
};
}
pkgs/by-name/cl/claude-code-router/package.nix
+8 -50
View File
@@ -1,6 +1,5 @@
{
buildNpmPackage,
esbuild,
fetchFromGitHub,
lib,
makeBinaryWrapper,
@@ -17,17 +16,17 @@ let
in
buildNpmPackage' (finalAttrs: {
pname = "claude-code-router";
version = "1.0.73";
version = "2.0.0";
src = fetchFromGitHub {
owner = "musistudio";
repo = "claude-code-router";
rev = "a7e20325dbb2a8827db0c9ee12924bdecfa19fd9";
hash = "sha256-E5m5DiuCaZy8ac4bejpnyooaJ+YKc0ZqMIOhI2aOclk=";
tag = "v${finalAttrs.version}";
hash = "sha256-Pw+MkOr/yN3Oq88YtpHqYHNQx3AZD/UcJZ1xdcX3DZ8=";
};
postPatch = ''
substituteInPlace src/cli.ts \
substituteInPlace packages/cli/src/{cli.ts,utils/index.ts} \
--replace-fail '"node"' '"${lib.getExe nodejs}"'
'';
@@ -35,33 +34,22 @@ buildNpmPackage' (finalAttrs: {
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname src;
pnpm = pnpm';
fetcherVersion = 2;
hash = "sha256-xvbw0+w6LxiQj2CpF+diVTsoKrxT8HXub1ASrGrlXR4=";
fetcherVersion = 3;
hash = "sha256-8184F3ShoC6j7nov35CSZWz2dzPFQC7Bty1iTNs1qzc=";
};
nativeBuildInputs = [
esbuild
makeBinaryWrapper
pnpm'
];
npmConfigHook = pnpmConfigHook;
buildPhase = ''
runHook preBuild
esbuild src/cli.ts --bundle --platform=node --outfile=dist/cli.js
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/lib/claude-code-router/dist
cp dist/cli.js $out/lib/claude-code-router/dist/
cp node_modules/tiktoken/tiktoken_bg.wasm $out/lib/claude-code-router/dist/
cp ${finalAttrs.passthru.ui}/index.html $out/lib/claude-code-router/dist/
mkdir -p $out/lib/claude-code-router
cp -r dist $out/lib/claude-code-router
mkdir -p $out/bin
makeBinaryWrapper ${lib.getExe nodejs} $out/bin/ccr \
@@ -74,36 +62,6 @@ buildNpmPackage' (finalAttrs: {
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "-v";
passthru.ui = buildNpmPackage' (finalAttrs': {
pname = finalAttrs.pname + "-ui";
inherit (finalAttrs) version src;
sourceRoot = "${finalAttrs'.src.name}/ui";
npmDeps = null;
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs') pname src sourceRoot;
pnpm = pnpm';
fetcherVersion = 2;
hash = "sha256-YtOcuqhJLJYg0C8J0/THA7UfKMVHE8oN5BcJQ2zSpWQ=";
};
nativeBuildInputs = [
pnpm'
];
npmConfigHook = pnpmConfigHook;
installPhase = ''
runHook preInstall
mkdir -p $out
cp dist/index.html $out/
runHook postInstall
'';
});
meta = {
description = "Tool to route Claude Code requests to different models and customize any request";
homepage = "https://github.com/musistudio/claude-code-router";
pkgs/by-name/co/codex-acp/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "codex-acp";
version = "0.7.4";
version = "0.8.2";
src = fetchFromGitHub {
owner = "zed-industries";
repo = "codex-acp";
tag = "v${version}";
hash = "sha256-QGK4CkcH3eaOsjBwCoUSIYglFQ7pw0KtIfJAR9tTpbI=";
hash = "sha256-f3hT7sriur7hO8HY98fMlkugMstZTyeKnKjU7BoWerw=";
};
cargoHash = "sha256-Cojr5+ZZTpnOYA0QJ622UFlMhiEbdkkxvnVQqkFxBEI=";
cargoHash = "sha256-HpoFJgPZnEo9cI9Qake3Z1S00O1KJEtmIde1vXbj8hA=";
nativeBuildInputs = [
pkg-config
pkgs/by-name/de/deno/package.nix
+3 -3
View File
@@ -29,17 +29,17 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "deno";
version = "2.6.3";
version = "2.6.4";
src = fetchFromGitHub {
owner = "denoland";
repo = "deno";
tag = "v${finalAttrs.version}";
fetchSubmodules = true; # required for tests
hash = "sha256-qJ5ZIGfUqV/ayZVABbrcOBGa6xFLZ53WGuBz8JsXvOw=";
hash = "sha256-g2NZz8yLozle9LvEHbG9KIOBKc7x/RIkZLUyPUKd6U8=";
};
cargoHash = "sha256-DNwuybqdHQtosQwtVgbds4gu0YCXY3tnX2IqXhhyfs8=";
cargoHash = "sha256-FB/8RuFRKzihGLfyOoUNuhIGgo8RzDTtrUh8nsqp0GE=";
patches = [
./patches/0002-tests-replace-hardcoded-paths.patch
pkgs/by-name/de/dependency-track/package.nix
+1 -1
View File
@@ -65,7 +65,7 @@ maven.buildMavenPackage rec {
'';
mvnJdk = jre_headless;
mvnHash = "sha256-Y4imt+eB9KrLN6f1X5CqYoj0FiGU/6ST79R5tK4rWw4=";
mvnHash = "sha256-UrLni4shNCv9aHvaGdkzFNBVe8BT4/z4cQ6Ekjr0l9s=";
manualMvnArtifacts = [ "com.coderplus.maven.plugins:copy-rename-maven-plugin:1.0.1" ];
buildOffline = true;
pkgs/by-name/gi/git-credential-oauth/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "git-credential-oauth";
version = "0.17.0";
version = "0.17.1";
src = fetchFromGitHub {
owner = "hickford";
repo = "git-credential-oauth";
rev = "v${version}";
hash = "sha256-uzgWFjrX2Ux5/nn2EOcWaN4IQX3xmZJASuwdfvq1/Zw=";
hash = "sha256-QvR09UiLWzonmFPZopXJozMSd58nGW4yVxn/JkAmV3A=";
};
nativeBuildInputs = [ installShellFiles ];
pkgs/by-name/gi/gitify/package.nix
+3 -3
View File
@@ -15,13 +15,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "gitify";
version = "6.14.1";
version = "6.15.0";
src = fetchFromGitHub {
owner = "gitify-app";
repo = "gitify";
tag = "v${finalAttrs.version}";
hash = "sha256-nZoWqfocEg33C22CfVIkayUWkkZ29A8FcAEXx+tJGUU=";
hash = "sha256-rSz8lBlKIBVIEhFZayeFweMSzR4QtH+JxI1ltzIzB8M=";
};
nativeBuildInputs = [
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
inherit (finalAttrs) pname version src;
pnpm = pnpm_10;
fetcherVersion = 2;
hash = "sha256-LnYwUXwGm/2yx7QrMcPu32oPtRJKnuqysecwwH25QIg=";
hash = "sha256-2sDJazY9VB87cKUwfVyhk/muoWxmcPlzJdepbJ83Rrk=";
};
env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
pkgs/by-name/go/go-critic/package.nix
+2 -2
View File
@@ -9,13 +9,13 @@
buildGoModule (finalAttrs: {
pname = "go-critic";
version = "0.14.2";
version = "0.14.3";
src = fetchFromGitHub {
owner = "go-critic";
repo = "go-critic";
rev = "v${finalAttrs.version}";
hash = "sha256-+PYIZBjq3kHaTXoZInfqT0EJDeil2+kyTxgKY2sKTs0=";
hash = "sha256-lgOK2KvHkFzPdEfpUU9AgU6y8uQHtCk9u0/1XJLq+FU=";
};
vendorHash = "sha256-2tzBJI2d9/EY1lPgJDrOGfgh8dz2bYwP5kWifJ46a8I=";
pkgs/by-name/hi/hifile/package.nix
+2 -2
View File
@@ -2,8 +2,8 @@
lib,
appimageTools,
fetchurl,
version ? "0.9.13.1",
hash ? "sha256-2IIm6frUgyZ7Xe/wmw2H3bvg4WB1EZtlM1ikSvMK9rQ=",
version ? "0.9.14.0",
hash ? "sha256-ABAGXTszJPdmVuRuJddZ2VgMhiABtAYFuxAteP8S44w=",
}:
let
pkgs/by-name/ho/home-manager/package.nix
+3 -3
View File
@@ -19,14 +19,14 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "home-manager";
version = "0-unstable-2025-12-25";
version = "0-unstable-2026-01-07";
src = fetchFromGitHub {
name = "home-manager-source";
owner = "nix-community";
repo = "home-manager";
rev = "91cdb0e2d574c64fae80d221f4bf09d5592e9ec2";
hash = "sha256-GKO35onS711ThCxwWcfuvbIBKXwriahGqs+WZuJ3v9E=";
rev = "4fee4bd14b5e4178855ad0041df89fa44f3f2bea";
hash = "sha256-DRhbz2dZaEmj5MgLFMXjEPfmKYfMG6LwNT9Bv8zeLPQ=";
};
nativeBuildInputs = [
pkgs/by-name/jj/jj-pre-push/package.nix
+2 -2
View File
@@ -7,14 +7,14 @@
python3Packages.buildPythonApplication rec {
pname = "jj-pre-push";
version = "0.3.2";
version = "0.3.3";
pyproject = true;
src = fetchFromGitHub {
owner = "acarapetis";
repo = "jj-pre-push";
tag = "v${version}";
hash = "sha256-/fh06T7kTlyyzj+ez9JkbU5h80Ez9B0nwZ/znjwTUJg=";
hash = "sha256-dZrZjzygT6Q7jIPkasYgJ2uN3eyPQXsg0opksookLYI=";
};
build-system = [
pkgs/by-name/ku/kubectl-ktop/package.nix
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "kubectl-ktop";
version = "0.5.1";
version = "0.5.3";
src = fetchFromGitHub {
owner = "vladimirvivien";
repo = "ktop";
rev = "v${version}";
sha256 = "sha256-Hf9Vywi67Xjyea+4RJJll8htrCWTtpT/xakBjR+n/ak=";
sha256 = "sha256-CUMQsgXhypSSR1MC7hJtkZgRcM2/x6jsPVudIvRy9qM=";
};
vendorHash = "sha256-kSDbQFiZ8XMKyW7aYKe1s0pq038YC+RORCtMXFI+knA=";
pkgs/by-name/la/ladybird/package.nix
+3 -3
View File
@@ -35,13 +35,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ladybird";
version = "0-unstable-2025-12-24";
version = "0-unstable-2026-01-11";
src = fetchFromGitHub {
owner = "LadybirdBrowser";
repo = "ladybird";
rev = "5b4341996b2d22e549f0bc6f749b188e5014847f";
hash = "sha256-EVP8OoFqOySAhy02nQpc4CKYCV/rPW87pjMxb/IdBxM=";
rev = "7814b497850ce131dfbfff8bd48836c121c2b237";
hash = "sha256-MMIk1FF9GB4pPNDdeSAGMjqqbVybn67EVtzcEOVbRIg=";
};
postPatch = ''
pkgs/by-name/li/libdeltachat/package.nix
+3 -3
View File
@@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "libdeltachat";
version = "2.36.0";
version = "2.37.0";
src = fetchFromGitHub {
owner = "chatmail";
repo = "core";
tag = "v${version}";
hash = "sha256-w9OxYrKqJJRfxCi4EjmRhqRv+7WPgQwag5CE1qNYeYU=";
hash = "sha256-K1voAhkhp0BrXCOahpFtiv25wFKPd/j3IAube3qCt9o=";
};
patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
cargoDeps = rustPlatform.fetchCargoVendor {
pname = "chatmail-core";
inherit version src;
hash = "sha256-o1CtEgjuy+wVbtfCEd3401pt5oBdDoR4xlroi1Q9WQ0=";
hash = "sha256-ysg1NK4yxftiyjP2/Xplq6Hkno/sD55tyLcYLnlVamo=";
};
nativeBuildInputs = [
pkgs/by-name/li/libmnl/package.nix
+1 -1
View File
@@ -25,6 +25,6 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://netfilter.org/projects/libmnl/index.html";
license = lib.licenses.lgpl21Plus;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ azey7f ];
maintainers = with lib.maintainers; [ maevii ];
};
})
pkgs/by-name/li/libresplit/package.nix
+3 -3
View File
@@ -14,13 +14,13 @@
gcc15Stdenv.mkDerivation {
pname = "libresplit";
version = "0-unstable-2025-12-26";
version = "0-unstable-2026-01-09";
src = fetchFromGitHub {
owner = "LibreSplit";
repo = "LibreSplit";
rev = "11fcc57ff3ebbf58b3bb91b69575afbe4a8409b1";
hash = "sha256-b743CPRpBZI5H+jFRn1O/s0LZzp8B5QWhjZ2N3iSz+g=";
rev = "5cce8434645c249b2a8bfc4bcf10ce8766df9fe6";
hash = "sha256-nn6EmsG0RqpljylX4lAXDJC1JTWzzMDVCT+ObhVl5E4=";
};
nativeBuildInputs = [
pkgs/by-name/ma/mailpit/source.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{
version = "1.28.1";
hash = "sha256-Uu84G9DzlNT/ePiYMuZLlXKiyaiqjf79DJzKsM5WtEU=";
version = "1.28.2";
hash = "sha256-KqNMykpeNwY86DmpxH0+AGsVsQlICIyU49Y8P1wko+A=";
npmDepsHash = "sha256-17cX1tGjHade5sxNqlZGITBKleZR2IwTujVqecsb9Po=";
vendorHash = "sha256-pzzzji+MflKwFzAMkWQrGt99M9yanVsguHrHKB6VXSc=";
}
pkgs/by-name/mi/microsoft-edge/package.nix
+2 -2
View File
@@ -162,11 +162,11 @@ let
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "microsoft-edge";
version = "143.0.3650.96";
version = "143.0.3650.139";
src = fetchurl {
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
hash = "sha256-waOUu1ZdcTJ4XE2rr1ChMzAhmXxTUDcPKikny4l6OWo=";
hash = "sha256-sLn8llw8wdLLAl0wGbBUT4nyjYiZcgXS7LNCwpTb/qQ=";
};
# With strictDeps on, some shebangs were not being patched correctly
pkgs/by-name/op/opengothic/package.nix
+11 -11
View File
@@ -17,21 +17,16 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "opengothic";
version = "1.0.3010";
version = "1.0.3549";
src = fetchFromGitHub {
owner = "Try";
repo = "OpenGothic";
tag = "opengothic-v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-ELDuyoAZmulMjFFctuCmdKDUMtrbVVndJxIf9Xo82N4=";
hash = "sha256-dXKZPfV434HHVPgulZZEKhypR6q+uACgmoNWvNQv92w=";
};
outputs = [
"dev"
"out"
];
nativeBuildInputs = [
cmake
glslang
@@ -54,13 +49,18 @@ stdenv.mkDerivation (finalAttrs: {
--replace-fail "-Werror" ""
'';
cmakeFlags = [
(lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10")
];
installPhase = ''
runHook preInstall
install -Dm755 -t $out/bin opengothic/Gothic2Notr
install -Dm755 -t $out/lib opengothic/libTempest.so
runHook postInstall
'';
postFixup = ''
wrapProgram $out/bin/Gothic2Notr \
--set LD_PRELOAD "${lib.getLib alsa-lib}/lib/libasound.so.2"
--prefix LD_PRELOAD : "${lib.getLib alsa-lib}/lib/libasound.so.2"
'';
passthru.updateScript = nix-update-script {
pkgs/by-name/pr/primesieve/package.nix
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "primesieve";
version = "12.10";
version = "12.11";
src = fetchFromGitHub {
owner = "kimwalisch";
repo = "primesieve";
rev = "v${finalAttrs.version}";
hash = "sha256-7aXNpVKOfsQHvHJbR100QF6TSglPv5kcq22YTX2GkG4=";
hash = "sha256-gkaN92sDJimB/mY5f/3amVSXaTg6PukGvZvH6VklDnQ=";
};
outputs = [
pkgs/by-name/py/pyradio/package.nix
+2 -2
View File
@@ -7,14 +7,14 @@
python3Packages.buildPythonApplication rec {
pname = "pyradio";
version = "0.9.3.11.21";
version = "0.9.3.11.22";
pyproject = true;
src = fetchFromGitHub {
owner = "coderholic";
repo = "pyradio";
tag = version;
hash = "sha256-elNApj+zslOd2BvXKxLPaCrUhLYBN38yqi6xgFAponI=";
hash = "sha256-JUVlaKKprgnGiZzZ0J6VSePrSdCWuWQzhuTTiCeB12U=";
};
nativeBuildInputs = [
pkgs/by-name/ro/rogue/package.nix
+2
View File
@@ -20,6 +20,8 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [ ncurses5 ];
env.NIX_CFLAGS_COMPILE = "-std=gnu17";
meta = {
homepage = "http://rogue.rogueforge.net/rogue-5-4/";
description = "Final version of the original Rogue game developed for the UNIX operating system";
pkgs/by-name/s7/s7/package.nix
+3 -3
View File
@@ -26,14 +26,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "s7";
version = "11.7-unstable-2025-12-31";
version = "11.7-unstable-2026-01-07";
src = fetchFromGitLab {
domain = "cm-gitlab.stanford.edu";
owner = "bil";
repo = "s7";
rev = "6d5a3fcf7c62653c6fa7e611b74338cd38b75794";
hash = "sha256-9MnxpUe148O3FbvbE9sBElmZU42mNb6d5vVs7coJNo4=";
rev = "5f6a6ab3af054cf74280d3798aff63a6deb22c86";
hash = "sha256-QEEq6ac0OxnmH0p/M/uLRMd5uBIE9JnLdkjtsDqlT48=";
};
buildInputs =
pkgs/by-name/se/seaweedfs/package.nix
+3 -3
View File
@@ -11,16 +11,16 @@
buildGoModule (finalAttrs: {
pname = "seaweedfs";
version = "4.05";
version = "4.06";
src = fetchFromGitHub {
owner = "seaweedfs";
repo = "seaweedfs";
tag = finalAttrs.version;
hash = "sha256-R59I/xRr/JsRVfQGsZ5dzzQbpBOOCxhsr/q9QQ/Nang=";
hash = "sha256-6pdRL5YceoMkToRmGxMeCghwyqmwhpm+MXajpiS7plM=";
};
vendorHash = "sha256-kTkEiUwUEXB3IPXW8LjdGSHXKGmes0rjueTNyf8Bgf0=";
vendorHash = "sha256-H56gS8E4MdO3MXC3yd2+r5ueffNfrDt5kTD7lkUuYBg=";
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libredirect.hook ];
pkgs/by-name/si/simdutf/package.nix
+2 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "simdutf";
version = "7.7.1";
version = "8.0.0";
src = fetchFromGitHub {
owner = "simdutf";
repo = "simdutf";
rev = "v${finalAttrs.version}";
hash = "sha256-/sz1GVMkHPlUkQxhbMGpoEg6byFH9WNMjEo6hjGRhE8=";
hash = "sha256-v9t/2EgxEOVostS/BY+DkDZbpq/coBhk2LaVpI2/y9c=";
};
# Fix build on darwin
pkgs/by-name/sq/sqlit-tui/package.nix
+12 -10
View File
@@ -1,28 +1,30 @@
{
lib,
fetchFromGitHub,
lib,
python3Packages,
writableTmpDirAsHomeHook,
}:
python3Packages.buildPythonApplication rec {
pname = "sqlit-tui";
version = "1.0.1";
version = "1.2.6";
pyproject = true;
src = fetchFromGitHub {
owner = "Maxteabag";
repo = "sqlit";
tag = "v${version}";
hash = "sha256-O2/kbKXSjsdSrTFnnNwif2IfV0HG4IPYLrD1eznuhuo=";
hash = "sha256-5uGdKK7z/Rvb4VHZDJOjwPFXedX8l8RTvGvCQs7iAq8=";
};
build-system = with python3Packages; [
hatch-vcs
hatchling
uv-build
setuptools-scm
];
dependencies = with python3Packages; [
docker
duckdb
keyring
mariadb
@@ -32,8 +34,10 @@ python3Packages.buildPythonApplication rec {
psycopg2
pyodbc
pyperclip
sqlparse
sshtunnel
textual
textual-fastdatatable
];
pythonRelaxDeps = [
@@ -41,19 +45,17 @@ python3Packages.buildPythonApplication rec {
];
nativeCheckInputs = with python3Packages; [
pytestCheckHook
pytest-asyncio
pytestCheckHook
writableTmpDirAsHomeHook
];
pythonImportsCheck = [
"sqlit"
];
pythonImportsCheck = [ "sqlit" ];
disabledTests = [
# UI tests fail in the sandbox
"tests/ui/"
"tests/ui/" # UI tests fail in the sandbox
"test_installer_cancel_terminates_process" # timeout error
"test_detect_strategy_pip_user_fallback" # AssertionError: assert 'externally-managed' == 'pip-user'
];
meta = {
pkgs/by-name/sr/src-cli/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "src-cli";
version = "6.11.0";
version = "6.12.0";
src = fetchFromGitHub {
owner = "sourcegraph";
repo = "src-cli";
rev = version;
hash = "sha256-uJAiNBrZmaDV7Etr3xAkDHXs7H9YZYLsyTcnaHGVJfI=";
hash = "sha256-9LAThwBnW4JB7qOz7A4M/JLcjGqNyvKgXOQjdVgvsiU=";
};
vendorHash = "sha256-H8xJtlAWkk7AcZBYR/xggs/Ut0cnHC49XiScEcdlkMc=";
vendorHash = "sha256-z4Clm+WdwMcdO+tMLqUQx6tNiGJ+ZSK+Zt0JKwrQdVk=";
subPackages = [
"cmd/src"
pkgs/by-name/su/subunit/package.nix
+1 -1
View File
@@ -53,6 +53,6 @@ stdenv.mkDerivation (finalAttrs: {
bsd3
];
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ azey7f ];
maintainers = with lib.maintainers; [ maevii ];
};
})
pkgs/by-name/sw/swt/package.nix
+11 -3
View File
@@ -11,8 +11,10 @@
stdenv.mkDerivation (finalAttrs: {
pname = "swt";
version = "4.34";
fullVersion = "${finalAttrs.version}-202411201800";
# NOTE: In case you wish to override, don't override version, override
# `fullVersion`.
version = builtins.elemAt (lib.splitString "-" finalAttrs.fullVersion) 1;
fullVersion = "R-4.34-202411201800";
hardeningDisable = [ "format" ];
@@ -44,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
in
assert srcMetadata != null;
fetchzip {
url = "https://archive.eclipse.org/eclipse/downloads/drops4/R-${finalAttrs.fullVersion}/swt-${finalAttrs.version}-${srcMetadata.platform}.zip";
url = "https://download.eclipse.org/eclipse/downloads/drops4/${finalAttrs.fullVersion}/swt-${finalAttrs.version}-${srcMetadata.platform}.zip";
inherit (srcMetadata) hash;
stripRoot = false;
postFetch =
@@ -142,6 +144,12 @@ stdenv.mkDerivation (finalAttrs: {
mpl20
];
maintainers = [ ];
# The darwin src zip file holds simply a prebuilt swt.jar file
sourceProvenance = lib.optionals stdenv.hostPlatform.isDarwin [
lib.sourceTypes.binaryNativeCode
];
platforms = lib.attrNames finalAttrs.passthru.srcMetadataByPlatform;
# Fails with: `java.nio.file.NoSuchFileException: ../swt.jar`
broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
};
})
pkgs/by-name/te/terminus_font/package.nix
+1 -1
View File
@@ -58,6 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
'';
homepage = "https://terminus-font.sourceforge.net/";
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ azey7f ];
maintainers = with lib.maintainers; [ maevii ];
};
})
pkgs/by-name/te/terminus_font_ttf/package.nix
+1 -1
View File
@@ -34,6 +34,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
'';
homepage = "https://files.ax86.net/terminus-ttf";
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ azey7f ];
maintainers = with lib.maintainers; [ maevii ];
};
})
pkgs/by-name/tu/tuxguitar/package.nix
+2 -1
View File
@@ -75,8 +75,9 @@ stdenv.mkDerivation (finalAttrs: {
'';
homepage = "https://github.com/helge17/tuxguitar";
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
license = lib.licenses.lgpl2;
license = lib.licenses.lgpl21Plus;
maintainers = with lib.maintainers; [ ardumont ];
platforms = [ "x86_64-linux" ];
mainProgram = "tuxguitar";
};
})
pkgs/by-name/vp/vpp/package.nix
+1 -1
View File
@@ -134,6 +134,6 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.asl20;
platforms = lib.platforms.linux;
mainProgram = "vpp";
maintainers = with lib.maintainers; [ azey7f ];
maintainers = with lib.maintainers; [ maevii ];
};
})
pkgs/by-name/wa/warzone2100/package.nix
+5 -4
View File
@@ -36,14 +36,15 @@
gitUpdater,
withVideos ? false,
withVideos ? true,
}:
let
pname = "warzone2100";
sequences_src = fetchurl {
sequences = fetchurl {
url = "mirror://sourceforge/${pname}/warzone2100/Videos/high-quality-en/sequences.wz";
sha256 = "90ff552ca4a70e2537e027e22c5098ea4ed1bc11bb7fc94138c6c941a73d29fa";
hash = "sha256-kP9VLKSnDiU34CfiLFCY6k7RvBG7f8lBOMbJQac9Kfo=";
};
in
@@ -114,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optional stdenv.hostPlatform.isDarwin "-P../configure_mac.cmake";
postInstall = lib.optionalString withVideos ''
cp ${sequences_src} $out/share/warzone2100/sequences.wz
ln -sn ${sequences} $out/share/warzone2100/sequences.wz
'';
passthru.tests = {
pkgs/by-name/we/wechat/package.nix
+2 -2
View File
@@ -30,14 +30,14 @@ let
# https://dldir1.qq.com/weixin/mac/mac-release.xml
any-darwin =
let
version = "4.1.6.37-33433";
version = "4.1.6.47-33480";
version' = lib.replaceString "-" "_" version;
in
{
inherit version;
src = fetchurl {
url = "https://dldir1v6.qq.com/weixin/Universal/Mac/xWeChatMac_universal_${version'}.dmg";
hash = "sha256-2FWfC0W07fE4PI5H8mZzRfffIzWv0qVCsQaI1C3NDtM=";
hash = "sha256-oEaMi1O6zdCIxPHQt61QYLQMqO+GAFO5d+zHUuJUk9U=";
};
};
in
pkgs/development/ocaml-modules/cohttp/async.nix
+8 -4
View File
@@ -1,4 +1,5 @@
{
lib,
buildDunePackage,
ppx_sexp_conv,
base,
@@ -18,6 +19,7 @@
ounit,
mirage-crypto,
core,
digestif,
}:
buildDunePackage {
@@ -28,7 +30,7 @@ buildDunePackage {
src
;
minimalOCamlVersion = "4.14";
minimalOCamlVersion = if lib.versionOlder cohttp.version "6.0.0" then "4.14" else "5.1";
buildInputs = [ ppx_sexp_conv ];
@@ -49,12 +51,14 @@ buildDunePackage {
ipaddr
];
# Examples don't compile with core 0.15. See https://github.com/mirage/ocaml-cohttp/pull/864.
doCheck = false;
doCheck = true;
checkInputs = [
ounit
mirage-crypto
core
digestif
]
++ lib.optionals (lib.versionOlder cohttp.version "6.0.0") [
mirage-crypto
];
meta = cohttp.meta // {
pkgs/development/ocaml-modules/cohttp/default.nix
+24 -6
View File
@@ -2,26 +2,35 @@
lib,
fetchurl,
buildDunePackage,
ocaml,
ppx_sexp_conv,
base64,
jsonm,
http,
logs,
re,
stringext,
ipaddr,
uri-sexp,
fmt,
alcotest,
crowbar,
}:
buildDunePackage rec {
buildDunePackage (finalAttrs: {
pname = "cohttp";
version = "5.3.1";
version = if lib.versionAtLeast ocaml.version "4.13" then "6.2.0" else "5.3.1";
minimalOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-${version}.tbz";
hash = "sha256-9eJz08Lyn/R71+Ftsj4fPWzQGkC+ACCJhbxDTIjUV2s=";
url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${finalAttrs.version}/cohttp-${finalAttrs.version}.tbz";
hash =
{
"6.2.0" = "sha256-bwV1TK8z1rdeii4aISDKe1Ag4TiLwgJIRC0TOZNt3zs=";
"5.3.1" = "sha256-9eJz08Lyn/R71+Ftsj4fPWzQGkC+ACCJhbxDTIjUV2s=";
}
."${finalAttrs.version}";
};
postPatch = ''
@@ -29,8 +38,10 @@ buildDunePackage rec {
'';
buildInputs = [
jsonm
ppx_sexp_conv
]
++ lib.optionals (lib.versionOlder finalAttrs.version "6.0.0") [
jsonm
];
propagatedBuildInputs = [
@@ -38,12 +49,19 @@ buildDunePackage rec {
re
stringext
uri-sexp
]
++ lib.optionals (lib.versionAtLeast finalAttrs.version "6.0.0") [
http
ipaddr
logs
];
doCheck = true;
checkInputs = [
fmt
alcotest
]
++ lib.optionals (lib.versionOlder finalAttrs.version "6.0.0") [
crowbar
];
@@ -53,4 +71,4 @@ buildDunePackage rec {
maintainers = [ lib.maintainers.vbgl ];
homepage = "https://github.com/mirage/ocaml-cohttp";
};
}
})
pkgs/development/ocaml-modules/cohttp/eio.nix
+46
View File
@@ -0,0 +1,46 @@
{
buildDunePackage,
cohttp,
eio,
fmt,
http,
logs,
ptime,
uri,
alcotest,
ca-certs,
eio_main,
tls-eio,
}:
buildDunePackage {
pname = "cohttp-eio";
inherit (cohttp)
version
src
;
minimalOCamlVersion = "5.1";
propagatedBuildInputs = [
cohttp
eio
fmt
http
logs
ptime
uri
];
doCheck = true;
checkInputs = [
alcotest
ca-certs
eio_main
tls-eio
];
meta = cohttp.meta // {
description = "CoHTTP implementation with eio backend";
};
}
pkgs/development/ocaml-modules/cohttp/http.nix
+21
View File
@@ -0,0 +1,21 @@
{
buildDunePackage,
cohttp,
ppx_expect,
}:
buildDunePackage {
pname = "http";
inherit (cohttp)
version
src
;
minimalOCamlVersion = "5.1";
propagatedBuildInputs = [ ppx_expect ];
meta = cohttp.meta // {
description = "CoHTTP implementation using the Lwt concurrency library";
};
}
pkgs/development/ocaml-modules/cohttp/lwt-jsoo.nix
-2
View File
@@ -15,8 +15,6 @@ buildDunePackage {
pname = "cohttp-lwt-jsoo";
inherit (cohttp-lwt) version src;
duneVersion = "3";
propagatedBuildInputs = [
cohttp
cohttp-lwt
pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
-2
View File
@@ -16,8 +16,6 @@ buildDunePackage {
pname = "cohttp-lwt-unix";
inherit (cohttp-lwt) version src;
duneVersion = "3";
buildInputs = [
cmdliner
ppx_sexp_conv
pkgs/development/ocaml-modules/cohttp/lwt.nix
+5 -2
View File
@@ -1,6 +1,8 @@
{
lib,
buildDunePackage,
cohttp,
ipaddr,
lwt,
uri,
ppx_sexp_conv,
@@ -15,8 +17,6 @@ buildDunePackage {
src
;
duneVersion = "3";
buildInputs = [ ppx_sexp_conv ];
propagatedBuildInputs = [
@@ -25,6 +25,9 @@ buildDunePackage {
logs
sexplib0
uri
]
++ lib.optionals (lib.versionAtLeast cohttp.version "6.0.0") [
ipaddr
];
meta = cohttp.meta // {
pkgs/development/ocaml-modules/cohttp/top.nix
-2
View File
@@ -4,8 +4,6 @@ buildDunePackage {
pname = "cohttp-top";
inherit (cohttp) version src;
duneVersion = "3";
propagatedBuildInputs = [ cohttp ];
doCheck = true;
pkgs/development/ocaml-modules/curly/default.nix
+3
View File
@@ -41,6 +41,9 @@ buildDunePackage rec {
postPatch = ''
substituteInPlace src/curly.ml \
--replace "exe=\"curl\"" "exe=\"${curl}/bin/curl\""
substituteInPlace test/test_curly.ml \
--replace-fail "let body_header b = [\"content-length\", string_of_int (String.length b)]" \
"let body_header b = [\"connection\", \"keep-alive\"; \"content-length\", string_of_int (String.length b)]"
'';
meta = {
pkgs/development/ocaml-modules/eliom/default.nix
+1 -1
View File
@@ -69,7 +69,7 @@ buildDunePackage rec {
'';
license = lib.licenses.lgpl21;
broken = lib.versionAtLeast ocaml.version "5.3";
broken = true;
maintainers = [ lib.maintainers.gal_bolle ];
};
}
pkgs/development/ocaml-modules/graphql/cohttp.nix
+5
View File
@@ -36,6 +36,11 @@ buildDunePackage rec {
doCheck = true;
postPatch = ''
substituteInPlace graphql-cohttp/src/graphql_websocket.ml \
--replace-fail "~flush:true ()" "~version:\`HTTP_1_1 ()"
'';
meta = graphql.meta // {
description = "Run GraphQL servers with “cohttp”";
};
pkgs/development/ocaml-modules/janestreet/0.15.nix
+2 -2
View File
@@ -333,7 +333,7 @@ with self;
propagatedBuildInputs = [
async_ssl
async_websocket
cohttp-async
cohttp-async_5_3
ppx_jane
uri-sexp
];
@@ -344,7 +344,7 @@ with self;
version = "0.15.0";
hash = "sha256-ENaH8ChvjeMc9WeNIhkeNBB7YK9vB4lw95o6FFZI1ys=";
meta.description = "Library for easily creating a cohttp handler for static files";
propagatedBuildInputs = [ cohttp-async ];
propagatedBuildInputs = [ cohttp-async_5_3 ];
};
core = janePackage {
pkgs/development/ocaml-modules/janestreet/0.16.nix
+2 -2
View File
@@ -374,7 +374,7 @@ with self;
propagatedBuildInputs = [
async_ssl
async_websocket
cohttp-async
cohttp-async_5_3
ppx_jane
uri-sexp
];
@@ -384,7 +384,7 @@ with self;
pname = "cohttp_static_handler";
hash = "sha256-7NCnJVArudBEvWARQUGlJuEq3kSCjpn5YtsLsL04bf4=";
meta.description = "Library for easily creating a cohttp handler for static files";
propagatedBuildInputs = [ cohttp-async ];
propagatedBuildInputs = [ cohttp-async_5_3 ];
};
content_security_policy = janePackage {
pkgs/development/ocaml-modules/janestreet/0.17.nix
+2 -2
View File
@@ -433,7 +433,7 @@ with self;
propagatedBuildInputs = [
async_ssl
async_websocket
cohttp-async
cohttp-async_5_3
ppx_jane
uri-sexp
];
@@ -443,7 +443,7 @@ with self;
pname = "cohttp_static_handler";
hash = "sha256-RB/sUq1tL8A3m9YhHHx2LFqoExTX187VeZI9MRb1NeA=";
meta.description = "Library for easily creating a cohttp handler for static files";
propagatedBuildInputs = [ cohttp-async ];
propagatedBuildInputs = [ cohttp-async_5_3 ];
};
content_security_policy = janePackage {
pkgs/development/ocaml-modules/ocsigen-server/conduit.patch
-14
View File
@@ -1,14 +0,0 @@
diff --git a/src/server/ocsigen_cohttp.ml b/src/server/ocsigen_cohttp.ml
index 66895339..edbfcbf2 100644
--- a/src/server/ocsigen_cohttp.ml
+++ b/src/server/ocsigen_cohttp.ml
@@ -105,7 +105,8 @@ let handler ~ssl ~address ~port ~connector (flow, conn) request body =
let rec getsockname = function
| `TCP (ip, port) -> Unix.ADDR_INET (Ipaddr_unix.to_inet_addr ip, port)
| `Unix_domain_socket path -> Unix.ADDR_UNIX path
- | `TLS (_, edn) -> getsockname edn
+ | `TLS (_, edn) -> getsockname (edn :> Conduit_lwt_unix.endp)
+ | `TLS_tunnel _ -> raise (Failure "TLS tunnel not supported")
| `Unknown err -> raise (Failure ("resolution failed: " ^ err))
| `Vchan_direct _ -> raise (Failure "VChan not supported")
| `Vchan_domain_socket _ -> raise (Failure "VChan not supported")
pkgs/development/ocaml-modules/ocsigen-server/default.nix
+6 -16
View File
@@ -22,6 +22,7 @@
cohttp-lwt-unix,
lwt_log,
re,
logs-syslog,
cryptokit,
xml-light,
ipaddr,
@@ -51,8 +52,8 @@ let
];
in
buildDunePackage rec {
version = "6.0.0";
buildDunePackage {
version = "6.0.0-unstable-2025-08-11";
pname = "ocsigenserver";
minimalOCamlVersion = "4.08";
@@ -60,12 +61,10 @@ buildDunePackage rec {
src = fetchFromGitHub {
owner = "ocsigen";
repo = "ocsigenserver";
tag = version;
hash = "sha256-T3bgPZpDO6plgebLJDBtBuR2eR/bN3o24UAUv1VwgtI=";
rev = "0d3c74d71fbdf738d1e45a98814b7ebdd1efe6c1";
hash = "sha256-KEHTw4cCPRJSE4SAnUFWzeoiEz8y9nUQFpaFiNxAsiU=";
};
patches = [ ./conduit.patch ];
nativeBuildInputs = [
makeWrapper
which
@@ -84,23 +83,14 @@ buildDunePackage rec {
lwt_log
lwt_ssl
re
logs-syslog
xml-light
];
configureFlags = [
"--root $(out)"
"--prefix /"
"--temproot ''"
];
dontAddPrefix = true;
dontAddStaticConfigureFlags = true;
configurePlatforms = [ ];
postConfigure = ''
make -C src confs
'';
postInstall = ''
make install.files
'';
pkgs/development/python-modules/aafigure/default.nix
+10 -7
View File
@@ -2,23 +2,26 @@
lib,
buildPythonPackage,
fetchPypi,
setuptools,
pillow,
pytestCheckHook,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "aafigure";
version = "0.6";
format = "setuptools";
pyproject = true;
src = fetchPypi {
inherit pname version;
sha256 = "49f2c1fd2b579c1fffbac1386a2670b3f6f475cc7ff6cc04d8b984888c2d9e1e";
inherit (finalAttrs) pname version;
hash = "sha256-SfLB/StXnB//usE4aiZws/b0dcx/9swE2LmEiIwtnh4=";
};
build-system = [ setuptools ];
propagatedBuildInputs = [ pillow ];
# error: invalid command 'test'
doCheck = false;
nativeCheckInputs = [ pytestCheckHook ];
# Fix impurity. TODO: Do the font lookup using fontconfig instead of this
# manual method. Until that is fixed, we get this whenever we run aafigure:
@@ -35,4 +38,4 @@ buildPythonPackage rec {
maintainers = with lib.maintainers; [ bjornfor ];
platforms = lib.platforms.unix;
};
}
})
pkgs/development/python-modules/iamdata/default.nix
+2 -2
View File
@@ -8,14 +8,14 @@
buildPythonPackage (finalAttrs: {
pname = "iamdata";
version = "0.1.202601121";
version = "0.1.202601131";
pyproject = true;
src = fetchFromGitHub {
owner = "cloud-copilot";
repo = "iam-data-python";
tag = "v${finalAttrs.version}";
hash = "sha256-rgoFr4C/SZdggbUoPURPk5ptDM4rgnJkpWNj185SBIU=";
hash = "sha256-FIsB/t36rnquArxqWGA+wQUzyGsPxhGTaimE1rJALxg=";
};
__darwinAllowLocalNetworking = true;
pkgs/development/python-modules/opower/default.nix
+2 -2
View File
@@ -15,14 +15,14 @@
buildPythonPackage (finalAttrs: {
pname = "opower";
version = "0.16.1";
version = "0.16.2";
pyproject = true;
src = fetchFromGitHub {
owner = "tronikos";
repo = "opower";
tag = "v${finalAttrs.version}";
hash = "sha256-+Jpse32N1D697jQnutEPvdcL/AmE0ntO1IGyG3qHN1w=";
hash = "sha256-6VqGM8HhqXVXVTXjWxr8IO5IMshcpeZBUF2VUoOnX0I=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/starlette-compress/default.nix
+5 -2
View File
@@ -3,9 +3,11 @@
buildPythonPackage,
fetchFromGitHub,
hatchling,
isPyPy,
brotli,
brotlicffi,
starlette,
pythonOlder,
zstandard,
pytestCheckHook,
httpx,
@@ -27,9 +29,10 @@ buildPythonPackage rec {
build-system = [ hatchling ];
dependencies = [
brotli
brotlicffi
(if isPyPy then brotlicffi else brotli)
starlette
]
++ lib.optionals (pythonOlder "3.14") [
zstandard
];
pkgs/development/python-modules/xknx/default.nix
+6 -6
View File
@@ -10,16 +10,16 @@
setuptools,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "xknx";
version = "3.13.0";
version = "3.14.0";
pyproject = true;
src = fetchFromGitHub {
owner = "XKNX";
repo = "xknx";
tag = version;
hash = "sha256-mfcPbxThl69XqTSUwPz/m+wiAAOOuaQe8PSgBJRMdzM=";
tag = finalAttrs.version;
hash = "sha256-22xKxdjf0WEF2efHiGCYVhTCZ5jrD+26oqBdlxHwYdU=";
};
build-system = [ setuptools ];
@@ -55,9 +55,9 @@ buildPythonPackage rec {
packets. It provides support for KNX/IP routing and tunneling devices.
'';
homepage = "https://github.com/XKNX/xknx";
changelog = "https://github.com/XKNX/xknx/releases/tag/${src.tag}";
changelog = "https://github.com/XKNX/xknx/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
platforms = lib.platforms.linux;
};
}
})
pkgs/kde/gear/kpmcore/default.nix
+3 -1
View File
@@ -9,6 +9,7 @@
smartmontools,
systemdMinimal,
util-linux,
bcachefs-tools,
btrfs-progs,
dosfstools,
e2fsprogs,
@@ -23,7 +24,7 @@
zfs,
}:
let
# https://github.com/KDE/kpmcore/blob/06f15334ecfbe871730a90dbe2b694ba060ee998/src/util/externalcommand_whitelist.h
# https://github.com/KDE/kpmcore/blob/v25.12.1/src/util/externalcommand_whitelist.h
runtimeDeps = [
cryptsetup
lvm2
@@ -32,6 +33,7 @@ let
systemdMinimal
util-linux
bcachefs-tools
btrfs-progs
dosfstools
e2fsprogs
pkgs/top-level/ocaml-packages.nix
+19 -2
View File
@@ -254,10 +254,21 @@ let
cohttp = callPackage ../development/ocaml-modules/cohttp { };
cohttp_5_3 = cohttp.overrideAttrs (_: {
version = "5.3.1";
__intentionallyOverridingVersion = true;
});
cohttp-async = callPackage ../development/ocaml-modules/cohttp/async.nix { };
cohttp-async_5_3 = cohttp-async.override { cohttp = cohttp_5_3; };
cohttp-eio = callPackage ../development/ocaml-modules/cohttp/eio.nix { };
cohttp-lwt = callPackage ../development/ocaml-modules/cohttp/lwt.nix { };
cohttp-lwt_5_3 = cohttp-lwt.override { cohttp = cohttp_5_3; };
cohttp-lwt-jsoo = callPackage ../development/ocaml-modules/cohttp/lwt-jsoo.nix { };
cohttp-lwt-unix = callPackage ../development/ocaml-modules/cohttp/lwt-unix.nix { };
@@ -793,6 +804,8 @@ let
hpack = callPackage ../development/ocaml-modules/hpack { };
http = callPackage ../development/ocaml-modules/cohttp/http.nix { };
http-mirage-client = callPackage ../development/ocaml-modules/http-mirage-client { };
httpaf = callPackage ../development/ocaml-modules/httpaf { };
@@ -1149,7 +1162,9 @@ let
magic-mime = callPackage ../development/ocaml-modules/magic-mime { };
magic-trace = callPackage ../development/ocaml-modules/magic-trace { };
magic-trace = callPackage ../development/ocaml-modules/magic-trace {
cohttp = cohttp_5_3; # due to cohttp_static_handler pulling in cohttp_5_3
};
mariadb = callPackage ../development/ocaml-modules/mariadb {
inherit (pkgs) mariadb;
@@ -1646,7 +1661,9 @@ let
paf = callPackage ../development/ocaml-modules/paf { };
paf-cohttp = callPackage ../development/ocaml-modules/paf/cohttp.nix { };
paf-cohttp = callPackage ../development/ocaml-modules/paf/cohttp.nix {
cohttp-lwt = cohttp-lwt_5_3;
};
parany = callPackage ../development/ocaml-modules/parany { };