mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-03 21:40:12 +00:00
Merge staging-next into staging
This commit is contained in:
@@ -4,6 +4,8 @@ import { dismissReviews, postReview } from './reviews.js'
|
||||
import { classify } from './supportedBranches.js'
|
||||
import withRateLimit from './withRateLimit.js'
|
||||
|
||||
const dirname = import.meta.dirname
|
||||
|
||||
export default async ({ github, context, core, dry, cherryPicks }) => {
|
||||
const reviewKey = 'check-commits'
|
||||
|
||||
@@ -94,7 +96,7 @@ export default async ({ github, context, core, dry, cherryPicks }) => {
|
||||
function diff({ sha, commit, original_sha }) {
|
||||
const diff = execFileSync('git', [
|
||||
'-C',
|
||||
__dirname,
|
||||
dirname,
|
||||
'range-diff',
|
||||
'--no-color',
|
||||
'--ignore-all-space',
|
||||
@@ -121,7 +123,7 @@ export default async ({ github, context, core, dry, cherryPicks }) => {
|
||||
|
||||
const colored_diff = execFileSync('git', [
|
||||
'-C',
|
||||
__dirname,
|
||||
dirname,
|
||||
'range-diff',
|
||||
'--color',
|
||||
'--no-notes',
|
||||
@@ -160,7 +162,7 @@ export default async ({ github, context, core, dry, cherryPicks }) => {
|
||||
// Fetching all commits we need for diff at once is much faster than any other method.
|
||||
execFileSync('git', [
|
||||
'-C',
|
||||
__dirname,
|
||||
dirname,
|
||||
'fetch',
|
||||
'--depth=2',
|
||||
'origin',
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
withUI ? false,
|
||||
withTesserocr ? false,
|
||||
withRapidocr ? false,
|
||||
withCPU ? false,
|
||||
}:
|
||||
|
||||
(python3Packages.toPythonApplication (
|
||||
@@ -13,7 +12,6 @@
|
||||
withUI
|
||||
withTesserocr
|
||||
withRapidocr
|
||||
withCPU
|
||||
;
|
||||
}
|
||||
))
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "mednafen-pce-fast";
|
||||
version = "0-unstable-2026-08-21";
|
||||
version = "0-unstable-2026-08-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "beetle-pce-fast-libretro";
|
||||
rev = "bebe2b13a840fbfd45cb501f5cd0efe01bdb1735";
|
||||
hash = "sha256-z30s5uYhqBht7ZviljAu5WZlOCTS9sYqWBD2/hbWUbs=";
|
||||
rev = "2f623abd033257b969370b73d9da982dcb0c3fdd";
|
||||
hash = "sha256-rGtmnfOh2IZBYS69/xtiwqNegtYV0GcKI3VB3cQ/r74=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "mongodb-atlas-cli";
|
||||
version = "1.58.1";
|
||||
version = "1.58.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mongodb";
|
||||
repo = "mongodb-atlas-cli";
|
||||
tag = "atlascli/v${finalAttrs.version}";
|
||||
hash = "sha256-M5nbCxZdATR8clIsLVqnbuAd2bW0lHsqLIDLLbLR52w=";
|
||||
hash = "sha256-WBKgzKkUczr4N82gH2e+BfT3YNO7Gzl1Ns5RILkn4uc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ODg9COhQsbQCUdV5218J1slK5x37/M7k0+DGgomVmGw=";
|
||||
vendorHash = "sha256-TBP4SoU3UHCYZcD1I/3dcADmTw7w/3NmB4VZTpPnNX0=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -28,25 +28,25 @@ in
|
||||
# runs without an external linter, which leaves `jsPlugins` configs inert.
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "oxlint";
|
||||
version = "1.79.0";
|
||||
version = "1.80.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oxc-project";
|
||||
repo = "oxc";
|
||||
tag = "oxlint_v${finalAttrs.version}";
|
||||
hash = "sha256-eF2iHhPiHONNFDufnv2KjLCaE3l/a07Imunz4vbzvcg=";
|
||||
hash = "sha256-SDpRiNJICbe9PPye2NbvMCOnSepZH0DhKZaw7wg9DDA=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-X2eH2EMaD8cLh7DlPcg5TuOZ/a8oJ5HPtz3eMhJx4RI=";
|
||||
hash = "sha256-3WbThEKOjZys5pOl5uyd43wHewg8LN7geVS9iNVqFgo=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
inherit pnpm;
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-igiyjhUfQy5GW5fn3br0QNZzMiSDdrAxbj0gK6MSvm8=";
|
||||
hash = "sha256-BkoWCB92nr25QwKyWUnJz7kkrs8sdTiJbGAtARlyJy8=";
|
||||
};
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
@@ -7,12 +7,12 @@
|
||||
stdenv,
|
||||
}:
|
||||
let
|
||||
version = "26.2.1";
|
||||
version = "26.2.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "redpanda-data";
|
||||
repo = "redpanda";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-R9brN2OtAAqrQmRbgFh9aND1bYHshbZ8QLqIrgH5mdQ=";
|
||||
sha256 = "sha256-07jGQv07TlnxhBmMOiP8rFgviDTVx0tcACqvvfKl8Fg=";
|
||||
};
|
||||
in
|
||||
buildGoModule rec {
|
||||
@@ -20,7 +20,7 @@ buildGoModule rec {
|
||||
inherit doCheck src version;
|
||||
modRoot = "./src/go/rpk";
|
||||
runVend = false;
|
||||
vendorHash = "sha256-LTd406/hUHOzDXnwjhJ/p/TovmvWwal4bRDzq5Xufvk=";
|
||||
vendorHash = "sha256-954BYQ+GblFWBeVTbj1EsWDwlGhNV5LWs4gH3cHlXyA=";
|
||||
|
||||
ldflags = [
|
||||
''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"''
|
||||
|
||||
@@ -77,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Lightweight, high-performance, and extensible WebAssembly runtime for cloud native, edge, and decentralized applications";
|
||||
changelog = "https://github.com/WasmEdge/WasmEdge/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "wasmedge";
|
||||
maintainers = with lib.maintainers; [ ilkecan ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "worldpainter";
|
||||
version = "2.27.0";
|
||||
version = "2.27.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.worldpainter.net/files/worldpainter_${version}.tar.gz";
|
||||
hash = "sha256-UY2KB6IUlv35wEG9PNU5gWvV5L6KsEiUvJEpqWXSBSA=";
|
||||
hash = "sha256-w+sT1C4eeidVTNyS5q8tnHQgQ+frJSL0+A//XbbYNcY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -46,7 +46,6 @@
|
||||
withUI ? false,
|
||||
withTesserocr ? false,
|
||||
withRapidocr ? false,
|
||||
withCPU ? false,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
@@ -104,8 +103,7 @@ buildPythonPackage (finalAttrs: {
|
||||
++ uvicorn.optional-dependencies.standard
|
||||
++ lib.optionals withUI finalAttrs.passthru.optional-dependencies.ui
|
||||
++ lib.optionals withTesserocr finalAttrs.passthru.optional-dependencies.tesserocr
|
||||
++ lib.optionals withRapidocr finalAttrs.passthru.optional-dependencies.rapidocr
|
||||
++ lib.optionals withCPU finalAttrs.passthru.optional-dependencies.cpu;
|
||||
++ lib.optionals withRapidocr finalAttrs.passthru.optional-dependencies.rapidocr;
|
||||
|
||||
optional-dependencies = {
|
||||
ui = [
|
||||
|
||||
@@ -29,14 +29,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "posthog";
|
||||
version = "7.39.2";
|
||||
version = "7.45.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PostHog";
|
||||
repo = "posthog-python";
|
||||
tag = "posthog-v${finalAttrs.version}";
|
||||
hash = "sha256-HmINi03pq2dkTaCLjdkzMqK7jWOyu5BRCIT5wz3m22g=";
|
||||
hash = "sha256-UZqfNc8u0sG6G0YCzKeoWfwKIASgtmsKRJISjyGyULw=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
Reference in New Issue
Block a user