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
d3d27dcd8c
28 changed files with 86 additions and 69 deletions
15
.github/workflows/backport.yml
vendored
15
.github/workflows/backport.yml
vendored
|
|
@ -11,7 +11,7 @@ on:
|
|||
|
||||
permissions:
|
||||
contents: read
|
||||
issues: write # adding the 'has: port to stable' label
|
||||
issues: write # adding the 'has: port to stable' and 'has: backport failed' label
|
||||
pull-requests: write # creating backport pull requests
|
||||
|
||||
defaults:
|
||||
|
|
@ -82,3 +82,16 @@ jobs:
|
|||
issue_number: context.payload.pull_request.number,
|
||||
labels: [ '8.has: port to stable' ]
|
||||
})
|
||||
|
||||
- name: "Add 'has: failed backport' label"
|
||||
if: steps.backport.outputs.was_successful == 'false'
|
||||
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
|
||||
with:
|
||||
# Not using the app on purpose to avoid triggering another workflow run after adding this label.
|
||||
script: |
|
||||
await github.rest.issues.addLabels({
|
||||
owner: context.repo.owner,
|
||||
repo: context.repo.repo,
|
||||
issue_number: context.payload.pull_request.number,
|
||||
labels: [ '8.has: failed backport' ]
|
||||
})
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ in
|
|||
name = "i2c-udev-rules";
|
||||
text = ''
|
||||
# allow group ${cfg.group} and users with a seat use of i2c devices
|
||||
ACTION=="add", KERNEL=="i2c-[0-9]*", TAG+="uaccess", GROUP="${cfg.group}", MODE="660"
|
||||
ACTION!="remove", KERNEL=="i2c-[0-9]*", TAG+="uaccess", GROUP="${cfg.group}", MODE="660"
|
||||
'';
|
||||
destination = "/etc/udev/rules.d/70-i2c.rules";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3534,8 +3534,8 @@ let
|
|||
mktplcRef = {
|
||||
publisher = "mvllow";
|
||||
name = "rose-pine";
|
||||
version = "2.15.1";
|
||||
hash = "sha256-GCN201yqr4lf2rc0ZV+iWkZi69qGOXFKhLPMhJ08U2w=";
|
||||
version = "2.15.2";
|
||||
hash = "sha256-5jXlCFk/86BL1yojTRuhRzS3XqcwcCpl/gmApcTdlBw=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
mkLibretroCore {
|
||||
core = "fbneo";
|
||||
version = "0-unstable-2026-04-30";
|
||||
version = "0-unstable-2026-05-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "fbneo";
|
||||
rev = "806cbc866c973caf442b4b6c6058f867b36bd1fb";
|
||||
hash = "sha256-kHB2Zz6mjhZiYDtoMIuaFvB2C/RIU89e2JNeBzHgIuU=";
|
||||
rev = "776ae715211d3ef2413b2828e9e9d50d869a6822";
|
||||
hash = "sha256-NgPs8H8/ysD18J2G9StaLM5e05EzgjLW8c2kTrcOXZI=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "bitrise";
|
||||
version = "2.39.4";
|
||||
version = "2.39.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitrise-io";
|
||||
repo = "bitrise";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Sg7Os1HqxyGQ7WngCFmV0s8HsFHLt/IgX79nd1tBciU=";
|
||||
hash = "sha256-2AT6coAJFXt0eZicXABojGOHay2oU7pe70IKJX/dyk8=";
|
||||
};
|
||||
|
||||
# many tests rely on writable $HOME/.bitrise and require network access
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-deny";
|
||||
version = "0.19.4";
|
||||
version = "0.19.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EmbarkStudios";
|
||||
repo = "cargo-deny";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-faONVJNllTyWWdyNaOUgphZkCXOwXQ5521Nll+yw+qE=";
|
||||
hash = "sha256-/rhdG/N2xQYCRPAddS2GELRuc/LsQVt8puvgn/cdbj4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-NjGGe5K0fpS9EDfuSOmBi9BGiObh8XITHQoSb7iktWc=";
|
||||
cargoHash = "sha256-Xx8t3DpJ9n1v3Cky1r+WiP3/Q4rJ7wDntSiV8VS8qTQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -8,17 +8,17 @@
|
|||
}:
|
||||
|
||||
maven.buildMavenPackage (finalAttrs: {
|
||||
version = "13.2.0";
|
||||
version = "13.4.2";
|
||||
pname = "checkstyle";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "checkstyle";
|
||||
repo = "checkstyle";
|
||||
tag = "checkstyle-${finalAttrs.version}";
|
||||
hash = "sha256-f9jJK9zp7sm8VEn30qQA73+ynARJWY3BxbSMEppEDlk=";
|
||||
hash = "sha256-0ENLO/hP/MXVU358Ys83cH1Adl8CTbT/zcG9/tOBIC8=";
|
||||
};
|
||||
|
||||
mvnHash = "sha256-+l3ubVFWx1QVTSgwVv0yGVyh8RPnxyHBU/vKE4sBRoE=";
|
||||
mvnHash = "sha256-eRNJOrSP9GcuF226kZi5ef3shm1PdTEsGvjpi46cfSw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
maven
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cockpit-files";
|
||||
version = "39";
|
||||
version = "40";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cockpit-project";
|
||||
repo = "cockpit-files";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-RoAlZ3PIJHdF2kBnrBnbJqnwl7/C7po7pvI3xmsRFQc=";
|
||||
hash = "sha256-Mofw8hn/+NtkqFqe2MDI+hp/MyTwXDteY/hv3GofIPs=";
|
||||
|
||||
fetchSubmodules = true;
|
||||
postFetch = "cp $out/node_modules/.package-lock.json $out/package-lock.json";
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cockpit-machines";
|
||||
version = "351";
|
||||
version = "352";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cockpit-project";
|
||||
repo = "cockpit-machines";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-zZ1R6DE7Y+kKnYQFIDGLdwn7ELq4kIvGvtQXaSxxdKI=";
|
||||
hash = "sha256-wDDskuvGVq5MWvi+3+3OXpaswPvea8+NDcic70GiYkg=";
|
||||
|
||||
fetchSubmodules = true;
|
||||
postFetch = "cp $out/node_modules/.package-lock.json $out/package-lock.json";
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cockpit-podman";
|
||||
version = "124";
|
||||
version = "125";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cockpit-project";
|
||||
repo = "cockpit-podman";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-20dGvEJraTxJlj5Z9HbPWtWN96XPVwbCkHGzX4uiDmk=";
|
||||
hash = "sha256-8YKqcm+IEhZwCPdNrMceAXdoBRS5xyRxrQM1FDNCANk=";
|
||||
|
||||
fetchSubmodules = true;
|
||||
postFetch = "cp $out/node_modules/.package-lock.json $out/package-lock.json";
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "free42";
|
||||
version = "3.3.11";
|
||||
version = "3.3.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://thomasokken.com/free42/upstream/free42-nologo-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-Y9tV06K+1tZmoNBLS5tsOoLPjS2unTe8c0AYkHgDVVo=";
|
||||
hash = "sha256-Ybr5IwqYBIXGWcLBM2drKuN2NDBta299X/3hvzvGPeU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gitsign";
|
||||
version = "0.15.0";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigstore";
|
||||
repo = "gitsign";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-oY4My+ZmkGWsVL031A01qZGJPSEQURrqFC8qH9WcUiw=";
|
||||
hash = "sha256-XFeKU956FIfQhaca2M/OtYgCF8qErzPcyMBEGvzPAcc=";
|
||||
};
|
||||
vendorHash = "sha256-fjrdQZVXgBvdKQFnmjtLShBHsKNIp5Y/uW7aU2cP1aY=";
|
||||
|
||||
|
|
|
|||
|
|
@ -110,13 +110,6 @@ stdenv.mkDerivation rec {
|
|||
# https://gitlab.com/gnutls/gnutls/-/issues/1721
|
||||
+ ''
|
||||
sed '2iexit 77' -i tests/system-override-compress-cert.sh
|
||||
''
|
||||
# Upstream packaging bug: stamp_error_codes is missing from EXTRA_DIST in
|
||||
# the release tarball, causing the build to try regenerating it by compiling
|
||||
# and running `errcodes` — which fails when cross-compiling since the binary
|
||||
# is for the target architecture. https://gitlab.com/gnutls/gnutls/-/issues/1797
|
||||
+ lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
|
||||
touch doc/stamp_error_codes
|
||||
'';
|
||||
|
||||
preConfigure = "patchShebangs .";
|
||||
|
|
@ -135,6 +128,10 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
"--enable-ktls"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isMusl [
|
||||
# https://lists.gnu.org/archive/html/bug-gnulib/2026-05/msg00061.html
|
||||
"gl_cv_func_free_preserves_errno=yes"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isMinGW) [
|
||||
"--disable-doc"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@
|
|||
libvorbis,
|
||||
mbedtls,
|
||||
openal,
|
||||
pcre,
|
||||
SDL2,
|
||||
sqlite,
|
||||
}:
|
||||
|
|
@ -45,7 +44,6 @@ stdenv.mkDerivation rec {
|
|||
libvorbis
|
||||
mbedtls
|
||||
openal
|
||||
pcre
|
||||
SDL2
|
||||
sqlite
|
||||
];
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "jackett";
|
||||
version = "0.24.1807";
|
||||
version = "0.24.1831";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jackett";
|
||||
repo = "jackett";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-HkhjHIMZCTzbxaZNb4wFRDAaDJVD9WPS+lNMnM34rEM=";
|
||||
hash = "sha256-ipOlkUz1DK0U01OUI2Kd3gQTF2/MULkk5CVu4EfELmI=";
|
||||
};
|
||||
|
||||
projectFile = "src/Jackett.Server/Jackett.Server.csproj";
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "lisette";
|
||||
version = "0.1.23";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ivov";
|
||||
repo = "lisette";
|
||||
tag = "lisette-v${finalAttrs.version}";
|
||||
hash = "sha256-sSNQKVfclSXXt1hp1AVBUKAjLhG9RSKxpoC8zWvOSz4=";
|
||||
hash = "sha256-dp78bOsAe3KkPI3Lz11zCoRdx60lc1OUWUp45JNoz7o=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-MlRx0lXuGyz7P8DT2tCsxVQ/W5P+W5+8YBt43wTz2IE=";
|
||||
cargoHash = "sha256-ZoGS2DlLeAhTTa0TZi8Jh7bVbWdat2p7oWciRY5KUcE=";
|
||||
|
||||
preCheck = ''
|
||||
export NO_COLOR=true
|
||||
|
|
|
|||
|
|
@ -9,17 +9,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mago";
|
||||
version = "1.19.0";
|
||||
version = "1.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "carthage-software";
|
||||
repo = "mago";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-K3gUZjthTLWMCPnenaSc4jn2lznpWa9GiJ5s6Vus8I4=";
|
||||
hash = "sha256-5rdmDbAqqHZU65C+lFHxV7T8//Tw8v8gQKSNbVHSlno=";
|
||||
forceFetchGit = true; # Does not download all files otherwise
|
||||
};
|
||||
|
||||
cargoHash = "sha256-EjI/dpYnohUdd12qT/mB7rtPetgNTi7RNfOnSgeJxnM=";
|
||||
cargoHash = "sha256-fOxfQTacb3ap5soCVtJnlFPSl3IH+Ju1pPs8xrFBVCw=";
|
||||
|
||||
env = {
|
||||
# Get openssl-sys to use pkg-config
|
||||
|
|
@ -38,7 +38,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
description = "Toolchain for PHP that aims to provide a set of tools to help developers write better code";
|
||||
homepage = "https://github.com/carthage-software/mago";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ hythera ];
|
||||
maintainers = with lib.maintainers; [
|
||||
hythera
|
||||
patka
|
||||
];
|
||||
mainProgram = "mago";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
}:
|
||||
let
|
||||
pname = "open-webui";
|
||||
version = "0.9.2";
|
||||
version = "0.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-webui";
|
||||
repo = "open-webui";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-NiB8V7B5H57t4NjKlAcQdK1E1dfS3nc/+8tWbSE3MBQ=";
|
||||
hash = "sha256-J0B/N4Bb7lRK4/BiILliy/Gw7FayM3liG+4NiskOq9U=";
|
||||
};
|
||||
|
||||
frontend = buildNpmPackage rec {
|
||||
|
|
@ -32,7 +32,7 @@ let
|
|||
url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-8bsC6LM+v7RTbhAjGYHKClKoiC/rLhzt+UGVp3CVDB0=";
|
||||
npmDepsHash = "sha256-jPGSJ+f5xuhnB4E9/FlgQkC37W6Yw2aGh8O8f8ajVC4=";
|
||||
|
||||
# See https://github.com/open-webui/open-webui/issues/15880
|
||||
npmFlags = [
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@
|
|||
},
|
||||
"osquery": {
|
||||
"fetchSubmodules": true,
|
||||
"hash": "sha256-T1diraffNXozuOtwAXweZhfybcIJTFvvTy0s/HFU6M0=",
|
||||
"hash": "sha256-m66JfsC1+YU1k3BKEwHx6jmqpRleaqP6f8M/NXJU8dg=",
|
||||
"owner": "osquery",
|
||||
"repo": "osquery",
|
||||
"rev": "5.22.1"
|
||||
"rev": "5.23.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,20 +10,20 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "pangolin-cli";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fosrl";
|
||||
repo = "cli";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-0G5HsAa9I0ilPQ92qQIuYssfGvoZhLrF3kyO1+0JqEQ=";
|
||||
hash = "sha256-3p2yazDYKORVanPOQNY0XDhj1RbvBcFztKa7oosFW98=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
"-X github.com/fosrl/cli/internal/version.Version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-FCIp0VLmRO6TUPRDNd3Zl/CULwy00D8F4YTo/oQge+s=";
|
||||
vendorHash = "sha256-J6dILAwneeUL/+c6505F24xjg6Nus8t4L3vUAMbaeHM=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,12 +7,12 @@
|
|||
stdenv,
|
||||
}:
|
||||
let
|
||||
version = "26.1.6";
|
||||
version = "26.1.7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "redpanda-data";
|
||||
repo = "redpanda";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XIYhSv30tNe/vS4x5lRax2n+sxy3EnuJfdg3IJHP+Ck=";
|
||||
sha256 = "sha256-RI5+uAg3iGMmWREWYn+ChnEB9WyPa2tImB35Vuhoe7Q=";
|
||||
};
|
||||
in
|
||||
buildGoModule rec {
|
||||
|
|
@ -20,7 +20,7 @@ buildGoModule rec {
|
|||
inherit doCheck src version;
|
||||
modRoot = "./src/go/rpk";
|
||||
runVend = false;
|
||||
vendorHash = "sha256-SiMh5Fi3uNOoKzPGEJ+sBkR/uIpci9mKONJiBG7wjtA=";
|
||||
vendorHash = "sha256-d+qn0JiNF8YcsuhDSp/RPCly5nTy/daHaCUap2hLKCM=";
|
||||
|
||||
ldflags = [
|
||||
''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"''
|
||||
|
|
|
|||
|
|
@ -28,11 +28,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "reqable";
|
||||
version = "3.0.40";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/reqable/reqable-app/releases/download/${finalAttrs.version}/reqable-app-linux-x86_64.deb";
|
||||
hash = "sha256-ddbFkkJjgQyZJEe7sL5cBbpmamSzg7mVg/zr3kXGLzI=";
|
||||
hash = "sha256-lJby2hewmjGpq2MwED/ZJbbGg7qt0aDwwqRVhoo/uys=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -64,13 +64,15 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "shutter";
|
||||
version = "0.99.6";
|
||||
version = "0.99.7";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shutter-project";
|
||||
repo = "shutter";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-2wRPmTpFfgU8xW9Fyn1+TMowcKm3pukT1ck06IWPiGo=";
|
||||
tag = finalAttrs.version;
|
||||
sha256 = "sha256-iri4yj2DujsEfpa6u4f5bpaOhWL0h/XbSlolkSJgKgE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook3 ];
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs.
|
||||
let
|
||||
pname = "zettlr";
|
||||
version = "4.4.0";
|
||||
version = "4.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage";
|
||||
hash = "sha256-Swic0hKZowOQasv5VAhT/1Gc3I03Zpw4c1FIQE1qsCQ=";
|
||||
hash = "sha256-JE1BOGHOyzcHz7zFxDRtU2faqCfaXqCPs/O8K2J20jk=";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
inherit pname version src;
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-files";
|
||||
version = "7.3.0";
|
||||
version = "7.3.1";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
|
|
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "elementary";
|
||||
repo = "files";
|
||||
rev = version;
|
||||
hash = "sha256-/LhQznVm9w8YO69LFrZw7goDY/S34pldAai8CbJpLGo=";
|
||||
hash = "sha256-53JzGLlRIeRVq54/YbZd24M8DiS2LuTvgC3/0pRrja4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,24 +8,25 @@
|
|||
rustPlatform,
|
||||
curl,
|
||||
pcre2,
|
||||
valgrind,
|
||||
libiconv,
|
||||
}:
|
||||
|
||||
buildPecl rec {
|
||||
pname = "ddtrace";
|
||||
version = "1.16.0";
|
||||
version = "1.19.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DataDog";
|
||||
repo = "dd-trace-php";
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-o9g0PT/EbBlB9h2FGyYJsKoNUcJIhGR0hv3owztcvcw=";
|
||||
hash = "sha256-pfhoj5a+kUVOuMnAHgL2s05Pcc6uhlTcp2t5aj1eJ0E=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
hash = "sha256-vcM+iLpJiIxMqw/Xgq4E3hbY77+H1T1UkdJpUOO6dmo=";
|
||||
hash = "sha256-Onkkea1xntfSKVr2aoCy1Z9wGIdv/L7HRh7LGxv738M=";
|
||||
};
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-O2";
|
||||
|
|
@ -48,6 +49,9 @@ buildPecl rec {
|
|||
curl
|
||||
pcre2
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
valgrind
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
libiconv
|
||||
];
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@ let
|
|||
in
|
||||
buildMongoDB {
|
||||
inherit avxSupport;
|
||||
version = "7.0.31";
|
||||
hash = "sha256-Vk/XsnYut0Hfad/X6LZw6gJX1NHc4/6XT8y1KehpLMk=";
|
||||
version = "7.0.32";
|
||||
hash = "sha256-1jK7MhYF+61sa5jAqPpJwmYcXebIZgk/8gFn0037I+E=";
|
||||
patches = [
|
||||
# ModuleNotFoundError: No module named 'mongo_tooling_metrics':
|
||||
# NameError: name 'SConsToolingMetrics' is not defined:
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ stdenvNoCC.mkDerivation {
|
|||
|
||||
meta = {
|
||||
description = "Convenience script to run a virtualized X-Server";
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = [ lib.maintainers.artturin ];
|
||||
mainProgram = "xvfb-run";
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue