mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
Merge staging-next into staging
This commit is contained in:
commit
91fdc48f20
21 changed files with 621 additions and 678 deletions
|
|
@ -310,11 +310,11 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"digitalocean_digitalocean": {
|
||||
"hash": "sha256-qiXN8ktqhJuN7Sb9XHf5HFaBfJASEpVkE07pAHg80QU=",
|
||||
"hash": "sha256-LmG3NpDkGgaQRworjC+CEhXxMO1lPbgOVhFTiObNkCA=",
|
||||
"homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean",
|
||||
"owner": "digitalocean",
|
||||
"repo": "terraform-provider-digitalocean",
|
||||
"rev": "v2.85.0",
|
||||
"rev": "v2.85.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
@ -842,13 +842,13 @@
|
|||
"vendorHash": "sha256-OgKOjLwDQxJiv+VWdOzjMcUDPu9LOuhyTRyLyM39vLM="
|
||||
},
|
||||
"linode_linode": {
|
||||
"hash": "sha256-nrNyOcaC5wKJijfubBBuEBKA6dT6Ajo33MR4P80j29k=",
|
||||
"hash": "sha256-prYSxbzRCrB3IDpctEUBLIHpV2iwHHILDlCceRVdIvw=",
|
||||
"homepage": "https://registry.terraform.io/providers/linode/linode",
|
||||
"owner": "linode",
|
||||
"repo": "terraform-provider-linode",
|
||||
"rev": "v3.11.0",
|
||||
"rev": "v3.12.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-91mdCcM5BSNdgW1/mMbuNtAxc4TH1abW8xbRcbHAnNc="
|
||||
"vendorHash": "sha256-4PQGnRL+z3EgVsTbKLXCBYwbzhd57tPije8RMJNrkKs="
|
||||
},
|
||||
"loafoe_htpasswd": {
|
||||
"hash": "sha256-1HCvAGWsYlcYCA8iOmBb/AawxHPLuoxxQWLzNy0x79M=",
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -37,10 +37,10 @@ let
|
|||
yarn-berry = yarn-berry_4;
|
||||
|
||||
pname = "anki";
|
||||
version = "25.09.2";
|
||||
version = "25.09.3";
|
||||
rev = "3890e12c9e48c028c3f12aa58cb64bd9f8895e30";
|
||||
|
||||
srcHash = "sha256-0hLTQR7f7s58DUgAZbDeREMee6VrqAKHyhS1Hs/Em1A=";
|
||||
srcHash = "sha256-vpAWrZAXqm775sn1I5unPb8L9cqaRqPrVEc4A8SxPOk=";
|
||||
cargoHash = "sha256-qcB+r9VzBz6ACZaXPL26MOxxtb/h2OIuxyc54vUgfPM=";
|
||||
yarnHash = "sha256-EmKeHORr/+qsDzAwtearMi7qodcCgjeAQcy+79HL7Vg=";
|
||||
pythonDeps =
|
||||
|
|
@ -58,7 +58,6 @@ let
|
|||
# aqt runtime deps
|
||||
beautifulsoup4
|
||||
flask
|
||||
flask-cors
|
||||
jsonschema
|
||||
pip-system-certs
|
||||
pyqt6
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
stdenv,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
gitMinimal,
|
||||
versionCheckHook,
|
||||
writableTmpDirAsHomeHook,
|
||||
nix-update-script,
|
||||
|
|
@ -10,16 +11,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "buildkite-cli";
|
||||
version = "3.32.2";
|
||||
version = "3.40.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buildkite";
|
||||
repo = "cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-7jBYi9KGkeB6Pu4VDR8QSTG3U4QFFVih3MUp2Sldpqo=";
|
||||
hash = "sha256-8Fij2SG6dLnyc4U2Q+jIx2ZDzbGd6ETTWiiz3ciRaE8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-yi77gGlBIGEQQbYVVsQP74IVFuZo5GAPOdgYmaDnBAs=";
|
||||
vendorHash = "sha256-pxVSzEc/pgPaMMBOl5LYjbmPVpjr1M2obFmeiGqfgik=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
@ -27,6 +28,7 @@ buildGoModule (finalAttrs: {
|
|||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
gitMinimal
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -8,20 +8,20 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "pack";
|
||||
version = "0.37.0";
|
||||
version = "0.40.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buildpacks";
|
||||
repo = "pack";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-QCN0UvWa5u9XX5LvY3yD8Xz2s1XzZUg/WXnAfWwZnY0=";
|
||||
hash = "sha256-KKgF05oJDgMQExJtsAc6weor4OxUZl4xNIFY0VoQfs4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-W8FTk2eJYaTE9gCRwrT+mDhda/ZZeCytqQ9vvVZZHSQ=";
|
||||
vendorHash = "sha256-sRITmNcCwJw4aXLv/wKYOTZai95YY/DY87F4P2+7b5A=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
subPackages = [ "cmd/pack" ];
|
||||
subPackages = [ "." ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
imagemagick,
|
||||
libgbm,
|
||||
libdrm,
|
||||
flutter338,
|
||||
flutter341,
|
||||
pulseaudio,
|
||||
webkitgtk_4_1,
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
|
||||
callPackage,
|
||||
vodozemac-wasm ? callPackage ./vodozemac-wasm.nix { flutter = flutter338; },
|
||||
vodozemac-wasm ? callPackage ./vodozemac-wasm.nix { flutter = flutter341; },
|
||||
|
||||
targetFlutterPlatform ? "linux",
|
||||
}:
|
||||
|
|
@ -25,20 +25,20 @@ let
|
|||
];
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
libwebrtc = fetchzip {
|
||||
url = "https://github.com/flutter-webrtc/flutter-webrtc/releases/download/v1.1.0/libwebrtc.zip";
|
||||
sha256 = "sha256-lRfymTSfoNUtR5tSUiAptAvrrTwbB8p+SaYQeOevMzA=";
|
||||
url = "https://github.com/flutter-webrtc/flutter-webrtc/releases/download/v1.3.0/libwebrtc.zip";
|
||||
sha256 = "sha256-lGvWAicdKbNdMZAQS9Qyxv737G/sBI/hKbge/Xw5bDM=";
|
||||
};
|
||||
in
|
||||
flutter338.buildFlutterApplication (
|
||||
flutter341.buildFlutterApplication (
|
||||
rec {
|
||||
pname = "fluffychat-${targetFlutterPlatform}";
|
||||
version = "2.4.1";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "krille-chan";
|
||||
repo = "fluffychat";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8Q+A5IZW6RjmnE+ovI7HYPZCi0oOoj9SU7o0VUPXxsM=";
|
||||
hash = "sha256-8iMSfF5K/9bQot7Tzc2XuuiQnquLZmS0ucC5t2T/HEA=";
|
||||
};
|
||||
|
||||
inherit pubspecLock;
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fna3d";
|
||||
version = "26.04";
|
||||
version = "26.05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FNA-XNA";
|
||||
repo = "FNA3D";
|
||||
tag = finalAttrs.version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-DZZuJ0bppyoXgewAOrtDnOHi4rKKc9PNxKif1BIN2Zk=";
|
||||
hash = "sha256-b0s7aKRTKNYIIckSItmjsY2Or8td/YvTELx6tOFhiKM=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "git-xet";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "huggingface";
|
||||
repo = "xet-core";
|
||||
tag = "git-xet-v${finalAttrs.version}";
|
||||
hash = "sha256-XnCp9Dt4isFsT124ZVA/ID5y9l4bCSBQRrqrIPpv5Ow=";
|
||||
hash = "sha256-PmAJg7R5IBvDUsQGyDWzUz4bAFsR5ET1pOncpBGiHl4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-0xUik5zHO4T2PjFXrA0XHuy2892piE5Kiw2pcpa7xdY=";
|
||||
cargoHash = "sha256-2f2lLSYcvllIKvyMlT5hphhkb0QY70wdTvncC1Lf4NI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -9,15 +9,15 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "jsonschema-cli";
|
||||
version = "0.46.3";
|
||||
version = "0.46.4";
|
||||
|
||||
src = fetchCrate {
|
||||
pname = "jsonschema-cli";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-/Tebhwn+H8HFTUelaQ33kuU6np3QKCrZpKfpvm7buWI=";
|
||||
hash = "sha256-Yze2iL+4SAR3WUgypGM94OKKFlD4PTLrvsP+nJz9Kho=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-XP8IphAprOmwqHMzkcJN4rOjMZ3yNEhpvwO3tAD203Y=";
|
||||
cargoHash = "sha256-28OtvYDv7OpIio7WghkuVA8t+d0b91bQ9U/llJEFzmw=";
|
||||
|
||||
preCheck = ''
|
||||
export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
|
||||
|
|
|
|||
|
|
@ -25,14 +25,14 @@
|
|||
};
|
||||
"kicad-testing" = {
|
||||
kicadVersion = {
|
||||
version = "10.0-2026-04-22";
|
||||
version = "10.0-2026-04-24";
|
||||
src = {
|
||||
rev = "704a11803d7b882dec23c4fa8623253ba380aadb";
|
||||
sha256 = "04y8vfg5ffx1aawcy4np66jv7k2gqv9yvcagnqlh3k4b3adn7g3b";
|
||||
rev = "af3087321723164309476c75bc60776c70471fc9";
|
||||
sha256 = "1afbky7kbfk8z65jmnfky5p7icjvxv0qm8yikbhmxmzj61ry4fhy";
|
||||
};
|
||||
};
|
||||
libVersion = {
|
||||
version = "10.0-2026-04-22";
|
||||
version = "10.0-2026-04-24";
|
||||
libSources = {
|
||||
symbols.rev = "49f3091e7fea8d9b935635f3328cbf07b7548625";
|
||||
symbols.sha256 = "0iz4lb33wdsw4f82a0ln8ycgaf39gjws03mvl2j1q9npwj6xl1cm";
|
||||
|
|
|
|||
|
|
@ -14,23 +14,23 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kiro-cli";
|
||||
version = "2.2.0";
|
||||
version = "2.2.2";
|
||||
|
||||
src =
|
||||
let
|
||||
darwinDmg = fetchurl {
|
||||
url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/Kiro%20CLI.dmg";
|
||||
hash = "sha256-upHmDcqQ57aZCnxtfvaPZ7NEnyNgStRHV1Nbo3ND9ZM=";
|
||||
hash = "sha256-z+eTOA5PTKYEcjdzHL4/LeFqUO61eXhdl0Yn3dzwtw0=";
|
||||
};
|
||||
in
|
||||
{
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-x86_64-linux.tar.gz";
|
||||
hash = "sha256-z11ujzGvSdt++9KF3xx+nUqjbzIg+ZGyMt+dEemiCq8=";
|
||||
hash = "sha256-QU8akDY0VrNMrcwuQJHZIUiJrCnjYzshmsaqviY0+PY=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-aarch64-linux.tar.gz";
|
||||
hash = "sha256-2A3Ikang4Ii1VUeElbrxmNG1r+H5/iESEYUtK+aa5B8=";
|
||||
hash = "sha256-hFJN6FFE3uY1Wdjibb+PoXIKF6W70osg/euxSuLqCZA=";
|
||||
};
|
||||
x86_64-darwin = darwinDmg;
|
||||
aarch64-darwin = darwinDmg;
|
||||
|
|
|
|||
|
|
@ -18,14 +18,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "lenspect";
|
||||
version = "1.0.4";
|
||||
version = "1.0.5";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmkspv";
|
||||
repo = "lenspect";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-zYIDTFjT9izc4WFjs9fYDPDrQ8z16i2Bko5JW0tgCBk=";
|
||||
hash = "sha256-aGL6o9gv+z7Ey2XR8IZ/4gBXdDqGlaWaQXf0eVDEHlI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@
|
|||
meta = {
|
||||
description = "Server automation framework and application";
|
||||
homepage = "https://github.com/puppetlabs/puppet";
|
||||
changelog = "https://github.com/puppetlabs/puppet/blob/main/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "puppet";
|
||||
maintainers = with lib.maintainers; [ baloo ];
|
||||
|
|
|
|||
|
|
@ -33,6 +33,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
openblas
|
||||
];
|
||||
|
||||
# K&R `T func()` declarations whose definitions take real args
|
||||
env.CFLAGS = "-std=gnu17";
|
||||
|
||||
# Prepare for the Python binding packaging.
|
||||
strictDeps = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "tsshd";
|
||||
version = "0.1.6";
|
||||
version = "0.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trzsz";
|
||||
repo = finalAttrs.pname;
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-B5PTiz9luBxkDA9UMSkGYTcPbnXdL43rkFvbOUS5F6w=";
|
||||
hash = "sha256-9llfXzAAQgAOeaD+o3AVyhP0uL88uQsCNlqAPNfzDVw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-dW05EoAVLqmiPRRG0R4KwKsSijZuxSe15iHkyCImtZY=";
|
||||
vendorHash = "sha256-btTWkuLkT2e58TYqe0e/cE/0Try/g8XoahiABSSFaGU=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "wtfutil";
|
||||
version = "0.46.1";
|
||||
version = "0.49.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wtfutil";
|
||||
repo = "wtf";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-GLLTI/hxlkt3OvtTWRNdzQ9jzO4xzJV9RruiJUyWD5g=";
|
||||
sha256 = "sha256-b7g/EWr8M99jc0BJcu+JTfifuWK/oeFsOi9vkI9RIA0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-OSoQkBAx0kJKiKq0pRGrkkSowTynw/MJvYSdhd1Jt/k=";
|
||||
vendorHash = "sha256-AjrpcP6K937HteHdIyXwEx5srTMWYq4v1Dmd5cch5Pc=";
|
||||
proxyVendor = true;
|
||||
|
||||
doCheck = false;
|
||||
|
|
@ -35,7 +35,9 @@ buildGoModule (finalAttrs: {
|
|||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace flags/flags.go --replace-fail 'version := "dev"' 'version := "v${finalAttrs.version}"'
|
||||
substituteInPlace flags/flags.go \
|
||||
--replace-fail 'version := info.Main.Version' 'version := "v${finalAttrs.version}"' \
|
||||
--replace-fail 'var official bool' 'official := true'
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
xmrig.overrideAttrs (oldAttrs: rec {
|
||||
pname = "xmrig-mo";
|
||||
version = "6.26.0-mo2";
|
||||
version = "6.26.0-mo3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MoneroOcean";
|
||||
repo = "xmrig";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3WYHkxPcGcA+Y9VhEGYfLs1iUKfLhkgzsRgyS8gWXPA=";
|
||||
hash = "sha256-Ceh/B0afhVbAhDQcYen+TWNSswXcSiUzCvrQJizVmpQ=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -12,12 +12,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "colorcet";
|
||||
version = "3.1.0";
|
||||
version = "3.2.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-KSGzzYGiKIqvLWPbwM48JtzYgujDicxQXWiGv3qppOs=";
|
||||
hash = "sha256-SNmmfm5Z3FwKllqhtG/l1Zzclcw2qVlJ8pMT+VCsWfc=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -25,19 +25,19 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "dulwich";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jelmer";
|
||||
repo = "dulwich";
|
||||
tag = "dulwich-${finalAttrs.version}";
|
||||
hash = "sha256-R5vq3mb1nSqEn+LIUaXc8Edrw8TgTb5H4LOXnHgeAzQ=";
|
||||
hash = "sha256-pyBAN1zSYGrOg4tic/SiKROHHUlFMtBSF0OOVNVvkyM=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-r2Ef8ciZW6rNBg8eLr5lkqtTEXugy7B9DjbSCErJkzc=";
|
||||
hash = "sha256-U5X/D3iVg2qunji8HQbNeDzvYMoD4oRe5bL6l035lO0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
boost,
|
||||
gtest,
|
||||
|
|
@ -22,15 +21,15 @@
|
|||
}:
|
||||
|
||||
let
|
||||
nixComponents = nixVersions.nixComponents_2_30;
|
||||
nixComponents = nixVersions.nixComponents_2_34;
|
||||
common = rec {
|
||||
version = "2.9.0";
|
||||
version = "2.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "nixd";
|
||||
tag = version;
|
||||
hash = "sha256-/IU5yJQzUwv/d4mXr+m/AKrw7ufY8r+JAysUhhaHUZY=";
|
||||
hash = "sha256-S/E16Yf3Qh098qXxl0pimSy/5gkkd1n/Os6B9REWleg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -134,17 +133,6 @@ in
|
|||
// {
|
||||
pname = "nixd";
|
||||
|
||||
patches = [
|
||||
# Pull upstream fix for boost-1.89 & boost 1.87 support:
|
||||
# https://github.com/nix-community/nixd/pull/783
|
||||
(fetchpatch {
|
||||
name = "boost-1.89.patch";
|
||||
url = "https://github.com/nix-community/nixd/commit/11dfdf5f2db2e0fc1fea0349fb68739a9c747a41.patch";
|
||||
hash = "sha256-aCb9wRKqZSuUXmamzjpYe0vRqEQh4tenwoScv+juYK8=";
|
||||
stripLen = 1;
|
||||
})
|
||||
];
|
||||
|
||||
sourceRoot = "${common.src.name}/nixd";
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue