Merge master into staging-next
This commit is contained in:
@@ -86,7 +86,7 @@ in
|
||||
checkPhase = optionalString cfg.checkConfig ''
|
||||
ln -s $out bird.conf
|
||||
${cfg.preCheckConfig}
|
||||
bird -d -p -c bird.conf
|
||||
bird -d -p -c bird.conf || { exit=$?; cat -n bird.conf; exit $exit; }
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@@ -25,10 +25,6 @@ lib.packagesFromDirectoryRecursive {
|
||||
|
||||
elpaca = callPackage ./manual-packages/elpaca { inherit (pkgs) git; };
|
||||
|
||||
emacs-application-framework = callPackage ./manual-packages/emacs-application-framework {
|
||||
inherit (pkgs) git;
|
||||
};
|
||||
|
||||
lsp-bridge = callPackage ./manual-packages/lsp-bridge {
|
||||
inherit (pkgs)
|
||||
basedpyright
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
fetchFromGitHub,
|
||||
# Dependencies
|
||||
aria2,
|
||||
# Java Script dependency
|
||||
# JavaScript dependency
|
||||
nodejs,
|
||||
fetchNpmDeps,
|
||||
npmHooks,
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
# Dependencies
|
||||
delta,
|
||||
ripgrep,
|
||||
# Java Script dependency
|
||||
# JavaScript dependency
|
||||
nodejs,
|
||||
fetchNpmDeps,
|
||||
npmHooks,
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
lib,
|
||||
melpaBuild,
|
||||
fetchFromGitHub,
|
||||
# Java Script dependency
|
||||
# JavaScript dependency
|
||||
nodejs,
|
||||
fetchNpmDeps,
|
||||
npmHooks,
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
lib,
|
||||
melpaBuild,
|
||||
fetchFromGitHub,
|
||||
# Java Script dependency
|
||||
# JavaScript dependency
|
||||
nodejs,
|
||||
fetchNpmDeps,
|
||||
npmHooks,
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
lib,
|
||||
melpaBuild,
|
||||
fetchFromGitHub,
|
||||
# Java Script dependency
|
||||
# JavaScript dependency
|
||||
nodejs,
|
||||
fetchNpmDeps,
|
||||
npmHooks,
|
||||
|
||||
-2
@@ -10,7 +10,6 @@
|
||||
# Emacs dependencies
|
||||
all-the-icons,
|
||||
# Other dependencies
|
||||
git,
|
||||
nodejs,
|
||||
wmctrl,
|
||||
xdotool,
|
||||
@@ -45,7 +44,6 @@ let
|
||||
otherPackageLists = [
|
||||
(
|
||||
[
|
||||
git
|
||||
nodejs
|
||||
wmctrl
|
||||
]
|
||||
@@ -67,11 +67,6 @@ let
|
||||
passthru = (oldAttrs.passthru or { }) // {
|
||||
unwrapped = xeus-cling-unwrapped;
|
||||
};
|
||||
|
||||
meta.badPlatforms = [
|
||||
# fatal error: 'stdlib.h' file not found
|
||||
lib.systems.inspect.patterns.isDarwin
|
||||
];
|
||||
});
|
||||
|
||||
mkKernelSpec = std: {
|
||||
|
||||
@@ -117,11 +117,11 @@
|
||||
"vendorHash": "sha256-2NSP0jGFchh3roqSKxCRbkQ+8lNiGRo4JivvBj6wqdg="
|
||||
},
|
||||
"aviatrix": {
|
||||
"hash": "sha256-uE2E/NWL/ITCIMvq90ul0463/rG9PJHmzw2wMi0imHI=",
|
||||
"hash": "sha256-V1JRVOMHQu5KlPFw7q/qZuHlJjdVSQotI9w7s88v8GM=",
|
||||
"homepage": "https://registry.terraform.io/providers/AviatrixSystems/aviatrix",
|
||||
"owner": "AviatrixSystems",
|
||||
"repo": "terraform-provider-aviatrix",
|
||||
"rev": "v8.1.1",
|
||||
"rev": "v8.1.10",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -705,13 +705,13 @@
|
||||
"vendorHash": "sha256-ctd9V5EXL0c9b4aJ47nfjhqCMTewL55IkjkQ39ShoUk="
|
||||
},
|
||||
"kafka": {
|
||||
"hash": "sha256-5pHYJ7VIWmg8XCfdT9Uq5iNKUdIFsqzuf/j1WGrOcNE=",
|
||||
"hash": "sha256-rTa6c7jAMH027V7h/yUGVGz6TS0PDdObilxU0Vpr6FI=",
|
||||
"homepage": "https://registry.terraform.io/providers/Mongey/kafka",
|
||||
"owner": "Mongey",
|
||||
"repo": "terraform-provider-kafka",
|
||||
"rev": "v0.13.0",
|
||||
"rev": "v0.13.1",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-td8utsV5CBd4BcUg3DQx+EqVkUMieWr1Oa/H+qY+P/Q="
|
||||
"vendorHash": "sha256-JRqBv5N+i5yhKrC+Eenm1xmwylNF7k/EIJXaklrsFfA="
|
||||
},
|
||||
"kafka-connect": {
|
||||
"hash": "sha256-XMGpK22Ww8swvfrnbClxjErVmkBKX3dxdlkjgNJHlCE=",
|
||||
@@ -849,13 +849,13 @@
|
||||
"vendorHash": "sha256-QWBzQXx/dzWZr9dn3LHy8RIvZL1EA9xYqi7Ppzvju7g="
|
||||
},
|
||||
"mongodbatlas": {
|
||||
"hash": "sha256-DaGJHlprTlOfbYmXL0rqbxjbs0azi3aUzdutNv62Kc0=",
|
||||
"hash": "sha256-yBccJeD25hQiwqjMpaYIJM2DhoKzehppjR8NG/IOrQo=",
|
||||
"homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",
|
||||
"owner": "mongodb",
|
||||
"repo": "terraform-provider-mongodbatlas",
|
||||
"rev": "v1.41.0",
|
||||
"rev": "v2.0.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-bSLbYA6phEi3jvsiSrcWfH1f2/ZdW+9JIA25pDRaDnQ="
|
||||
"vendorHash": "sha256-EvTuVhJfNrwAto9+6oi6iYQfgbCnHupkD+dk57vrT/c="
|
||||
},
|
||||
"namecheap": {
|
||||
"hash": "sha256-fHH9sHI1mqQ9q9nX9DHJ0qfEfmDB4/2uzyVvUuIAF18=",
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bootdev-cli";
|
||||
version = "1.20.3";
|
||||
version = "1.20.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bootdotdev";
|
||||
repo = "bootdev";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-vjWlD31NCWCtcmhwh+DCjXZHE12VZxj+PdIQx/A6tOY=";
|
||||
hash = "sha256-ayjHhnnP6YWKMItsAw+nnScf1/eEHN2f7cOIkskE3mM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-jhRoPXgfntDauInD+F7koCaJlX4XDj+jQSe/uEEYIMM=";
|
||||
|
||||
+4
-4
@@ -6,13 +6,13 @@
|
||||
"packages": {
|
||||
"": {
|
||||
"dependencies": {
|
||||
"@anthropic-ai/claude-code": "^1.0.123"
|
||||
"@anthropic-ai/claude-code": "^1.0.126"
|
||||
}
|
||||
},
|
||||
"node_modules/@anthropic-ai/claude-code": {
|
||||
"version": "1.0.123",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.123.tgz",
|
||||
"integrity": "sha512-egniOpnrjpm8pA2ygj9aDw+rZ0jKJdso94CvKlKzdVcLdw0r0FSMvgxWRGGxjHuqcl6BP6yhHGSKlZ6qzd14OA==",
|
||||
"version": "1.0.126",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.126.tgz",
|
||||
"integrity": "sha512-DvzpL0LLB5nXRgJi4h+peDVys8sjfy5/QJMiketpqUd9SebTE673KnZ28lwEY4s944t/ywA80oNaJLXHMbqfcQ==",
|
||||
"license": "SEE LICENSE IN README.md",
|
||||
"bin": {
|
||||
"claude": "cli.js"
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "claude-code";
|
||||
version = "1.0.123";
|
||||
version = "1.0.126";
|
||||
|
||||
nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
|
||||
hash = "sha256-bzI6wYnY3kBA8xKOeQqYpsi672FIrcSj3eAN0nFqz5o=";
|
||||
hash = "sha256-U6uYRkmVqMoJDAAzLHpF9G5OglPhLqPuwe6gWMQPx78=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-UUpss39MY/fBRVjzd1yU9zBQMVW3wMy6zJFcoasivOI=";
|
||||
npmDepsHash = "sha256-m+GYa3uPfkUDV+p95uQToY3n/k0JG8hbppBn0GUeV+8=";
|
||||
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"version" = "1.11.112";
|
||||
"version" = "1.12.0";
|
||||
"hashes" = {
|
||||
"desktopSrcHash" = "sha256-L4/2VwPHBusVTCi8DzxmAUbvW0p1d/ffbz9ZwUmgzEo=";
|
||||
"desktopYarnHash" = "sha256-U+MuOe0N29AFrLCi7Xa9bDW70SmhQqqtjim+x7QAiJg=";
|
||||
"desktopSrcHash" = "sha256-Epkjv6tT0I65JTu4O5nHFRn0q18kE1+7joyTF1S3y+4=";
|
||||
"desktopYarnHash" = "sha256-2zy2xNzamjTyGE+Vm/gacMnby5Z0KfIWbgkl5EI5zi4=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
yarn,
|
||||
nodejs,
|
||||
jq,
|
||||
electron_37,
|
||||
electron_38,
|
||||
element-web,
|
||||
sqlcipher,
|
||||
callPackage,
|
||||
@@ -22,7 +22,7 @@ let
|
||||
pinData = import ./element-desktop-pin.nix;
|
||||
inherit (pinData.hashes) desktopSrcHash desktopYarnHash;
|
||||
executableName = "element-desktop";
|
||||
electron = electron_37;
|
||||
electron = electron_38;
|
||||
keytar = callPackage ./keytar {
|
||||
inherit electron;
|
||||
};
|
||||
@@ -111,11 +111,9 @@ stdenv.mkDerivation (
|
||||
cp $out/share/element/electron/lib/i18n/strings/en_EN.json $out/share/element/electron/lib/i18n/strings/en-us.json
|
||||
ln -s $out/share/element/electron/lib/i18n/strings/en{-us,}.json
|
||||
|
||||
# icons
|
||||
for icon in $out/share/element/electron/build/icons/*.png; do
|
||||
mkdir -p "$out/share/icons/hicolor/$(basename $icon .png)/apps"
|
||||
ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/element.png"
|
||||
done
|
||||
# icon
|
||||
mkdir -p "$out/share/icons/hicolor/icon/apps"
|
||||
ln -s "$out/share/element/electron/build/icon.png" "$out/share/icons/hicolor/icon/apps/element.png"
|
||||
|
||||
# desktop item
|
||||
mkdir -p "$out/share"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"version" = "1.11.112";
|
||||
"version" = "1.12.0";
|
||||
"hashes" = {
|
||||
"webSrcHash" = "sha256-rWbn3ibylEchBZR8ZF6lrPBSjJvF8Ezl/+7ZzgVhz7g=";
|
||||
"webYarnHash" = "sha256-ItrmxNlaRijNpp+gk1g3tTLw4roHuTqW2SnpapIH1Uk=";
|
||||
"webSrcHash" = "sha256-4e76IFOY7YiBX/cGobJNj1epH/Bnak+BgVPSjWC/8+s=";
|
||||
"webYarnHash" = "sha256-qZPHWPmcGFtwfOSCpft0hFLuS7smmq9w1JxJ+oqJZPA=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -19,6 +19,12 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1sgzv547h7hrskb9qd0x5yp45kmhvibjwj2mfswv95lg070h074d";
|
||||
};
|
||||
|
||||
# fix build with cmake v4
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail 'cmake_minimum_required(VERSION 2.8 FATAL_ERROR)' 'cmake_minimum_required(VERSION 3.10)'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "nesting";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org/fleeting";
|
||||
repo = "nesting";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ejoLld1TmwaqTlSyuzyEVEqLyEehu6g7yc0H0Cvkqp4=";
|
||||
hash = "sha256-W4Pv990X3R4ksHGfwycdTYvUfjwm5sxh0AeoG9EZ/0A=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-CyXlK/0VWMFlwSfisoaNCRdknasp8faN/K/zdyRhAQQ=";
|
||||
vendorHash = "sha256-YYHiyNg15VdijyrR5t1PwIjHWXmofHcVD6YMrbwn4Qk=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ];
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "plasmusic-toolbar";
|
||||
version = "3.4.0";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ccatterina";
|
||||
repo = "plasmusic-toolbar";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-yIEgqMIfxDqEbIp4OcgBQz3oPvGE/oBiuNkRMPXZv1A=";
|
||||
hash = "sha256-vP5wBhj5YFJedxwIMSaNhOST+6vbwsAS5YLzyUEAdJQ=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
cmake,
|
||||
doctest,
|
||||
fmt,
|
||||
@@ -48,6 +49,13 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-0qX/rvcEXxzr/PGL2A59T18Mfcalrjz0KJpEWBKJsZg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/rspamd/rspamd/commit/d808fd75ff1db1821b1dd817eb4ba9a118b31090.patch";
|
||||
hash = "sha256-v1Gn3dPxN/h92NYK3PTrZomnbwUcVkAWcYeQCFzQNyo=";
|
||||
})
|
||||
];
|
||||
|
||||
hardeningEnable = [ "pie" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -19,14 +19,14 @@ python3Packages.buildPythonApplication rec {
|
||||
# The websites yt-dlp deals with are a very moving target. That means that
|
||||
# downloads break constantly. Because of that, updates should always be backported
|
||||
# to the latest stable release.
|
||||
version = "2025.09.23";
|
||||
version = "2025.09.26";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yt-dlp";
|
||||
repo = "yt-dlp";
|
||||
tag = version;
|
||||
hash = "sha256-pqdR1JfiqvBs5vSKF7bBBKqq0DRAi3kXCN1zDvaW3nQ=";
|
||||
hash = "sha256-/uzs87Vw+aDNfIJVLOx3C8RyZvWLqjggmnjrOvUX1Eg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "h3";
|
||||
version = "4.3.0";
|
||||
version = "4.3.1";
|
||||
pyproject = true;
|
||||
|
||||
# pypi version does not include tests
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "uber";
|
||||
repo = "h3-py";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-D2imgxGzJpOEQ3xddM42SKWPZEIwuXQ31mm8ZIQhqkE=";
|
||||
hash = "sha256-zt7zbBgSp2P9q7mObZeQZpW9Szip62dAYdPZ2cGTmi4=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -116,7 +116,7 @@
|
||||
grpcio,
|
||||
}:
|
||||
let
|
||||
version = "0.18.14";
|
||||
version = "0.18.15";
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "unstructured";
|
||||
@@ -127,7 +127,7 @@ buildPythonPackage rec {
|
||||
owner = "Unstructured-IO";
|
||||
repo = "unstructured";
|
||||
tag = version;
|
||||
hash = "sha256-vr+RvODTIdQvs8XB5HKbS9DaElYH7T0Az72zIYMvxcs=";
|
||||
hash = "sha256-rzspozQQ+WrS3cKAGe9O7clAIDo4P/6PdZzCXIRdNn8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
Reference in New Issue
Block a user