mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-20 23:51:03 +00:00
Merge remote-tracking branch 'origin/staging-next' into staging
This commit is contained in:
@@ -433,6 +433,7 @@ stdenv.mkDerivation (
|
||||
armv7l-linux = "linux-arm";
|
||||
aarch64-linux = "linux-arm64";
|
||||
i686-linux = "linux-ia32";
|
||||
loongarch64-linux = "linux-loong64";
|
||||
powerpc64-linux = "linux-ppc64";
|
||||
riscv64-linux = "linux-riscv64";
|
||||
s390x-linux = "linux-s390x";
|
||||
|
||||
@@ -824,11 +824,11 @@
|
||||
"vendorHash": "sha256-JTcIyUKoeCRxAzUWJy9FkMCYy3+D70uyzuiSTW3nHlA="
|
||||
},
|
||||
"kislerdm_neon": {
|
||||
"hash": "sha256-1o5EnAI9X8Q+dXxh1/jZwimy1MmPDF3X2aRc+HO7HpQ=",
|
||||
"hash": "sha256-NvAQY8uoTtBoyx6XF8rruaRXVRARAr1yFKFkBes6Css=",
|
||||
"homepage": "https://registry.terraform.io/providers/kislerdm/neon",
|
||||
"owner": "kislerdm",
|
||||
"repo": "terraform-provider-neon",
|
||||
"rev": "v0.13.0",
|
||||
"rev": "v0.14.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-7mJ+BX7laBKsr4DX1keMXnGi79CZp8M1jD0COQ1lcmU="
|
||||
},
|
||||
|
||||
@@ -17,12 +17,12 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dashy-ui";
|
||||
version = "4.4.2";
|
||||
version = "4.4.5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lissy93";
|
||||
repo = "dashy";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-4AJx/BoRVYA8dU6HrIvGYWflvppxNsi2PWSpnJLWR0w=";
|
||||
hash = "sha256-S9x/qMjOwg0M59E0Ck7Ff3TYntXWkxansSNmNzWmJTk=";
|
||||
};
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = finalAttrs.src + "/yarn.lock";
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "displaycal";
|
||||
version = "3.9.18";
|
||||
version = "3.9.19";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "displaycal";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-mHUtO3vVIREzcIv6IFmPlo4nwuPPGDd9+UbIoXfvLYo=";
|
||||
hash = "sha256-GHx+2VwuxwdMQh6fxY6V/EQJE4CPxer39Aj/QlMWbrw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "drupal";
|
||||
version = "11.4.2";
|
||||
version = "11.4.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "git.drupalcode.org";
|
||||
owner = "project";
|
||||
repo = "drupal";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-GHhavn9H1x7xo72r9KSOSkrOzW4jEBAe033m2ATeh2E=";
|
||||
hash = "sha256-lwD4k4orQQD9gl60/Er9s1JTClN2i7b7JxBFuz5h+4s=";
|
||||
};
|
||||
|
||||
composerNoPlugins = false;
|
||||
vendorHash = "sha256-1Qns0npuzdVONtkDk3tXlGib9VCnbM6zVOVIsMRfZks=";
|
||||
vendorHash = "sha256-mJwOXz+nn1N7kFKofkuqBcbXJGwJDcgRrhKAhhwydik=";
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
|
||||
@@ -17,13 +17,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gforth";
|
||||
version = "0.7.9_20260708";
|
||||
version = "0.7.9_20260715";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "forthy42";
|
||||
repo = "gforth";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-3lKd50Rlhk9OlKb5ATHH4vTWlo40h3iCz+VQfuo/6ys=";
|
||||
hash = "sha256-cMVvNSDRN3384e5gX62sApO6mM3lxIEeO2ZRtJSmcHc=";
|
||||
};
|
||||
|
||||
patches = [ ./use-nproc-instead-of-fhs.patch ];
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "itg3encore";
|
||||
version = "0-unstable-2026-07-07";
|
||||
version = "0-unstable-2026-07-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DarkBahamut162";
|
||||
repo = "itg3encore";
|
||||
rev = "3293fba56b1559f56209fe53574d7d0099e4a74a";
|
||||
hash = "sha256-fFPfYipPbgN1F00m1IO2ef/pqnJfN2TrPE4AUpTTUjc=";
|
||||
rev = "25185e67dd0706a2e5e83ad0e26aca6359d694fe";
|
||||
hash = "sha256-l+GPcqW7p3aYeaDUyOCMnZGfLkjljNB5KhMiLlG88ik=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jasmin-compiler";
|
||||
version = "2026.03.1";
|
||||
version = "2026.03.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jasmin-lang/jasmin/releases/download/v${finalAttrs.version}/jasmin-compiler-v${finalAttrs.version}.tar.bz2";
|
||||
hash = "sha256-eOn5KWNAPx7Z+VMm8mclUyxDlW8Q/MR9EayUxmojb1I=";
|
||||
hash = "sha256-vGUy7SefQaq2xzxlyNfoay54gBqIDbQRp+vSN1V0Lc4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with ocamlPackages; [
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "llmfit";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AlexsJones";
|
||||
repo = "llmfit";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-c5q5ok/81JVGUB02oj3fQuHIiQv2aNeXb3L5VprskCs=";
|
||||
hash = "sha256-y+1BhtxClXAUkPXsLZ0uHHk230Lcn2UdO4DVm/JWpFA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-GoMA0G3YXIkHeeIbW4/bOKSeAf2cQk5Tb1e4Rivwx/U=";
|
||||
cargoHash = "sha256-9HorFfdvPgUAkorDvZmZAsLSgejQEuGTFZu0A/ueoZE=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "openresolv";
|
||||
version = "3.17.0";
|
||||
version = "3.17.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NetworkConfiguration";
|
||||
repo = "openresolv";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-blWfUXTBPkAYj5o2/lqAfMV4mOHUW1wpPGiUx93Bfyo=";
|
||||
sha256 = "sha256-I86BHiSI3G4xlYRJC99elHw8RyUd3eHdkV5kiEGRXNE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
26
pkgs/by-name/ov/OVMF-amdsev/61-edk2-ovmf-x64-amdsev.json
Normal file
26
pkgs/by-name/ov/OVMF-amdsev/61-edk2-ovmf-x64-amdsev.json
Normal file
@@ -0,0 +1,26 @@
|
||||
{
|
||||
"description": "OVMF with AMD SEV-* support, direct kernel boot",
|
||||
"interface-types": [
|
||||
"uefi"
|
||||
],
|
||||
"mapping": {
|
||||
"device": "memory",
|
||||
"filename": "@firmware@"
|
||||
},
|
||||
"targets": [
|
||||
{
|
||||
"architecture": "x86_64",
|
||||
"machines": [
|
||||
"pc-q35-*"
|
||||
]
|
||||
}
|
||||
],
|
||||
"features": [
|
||||
"amd-sev",
|
||||
"amd-sev-es",
|
||||
"amd-sev-snp"
|
||||
],
|
||||
"tags": [
|
||||
|
||||
]
|
||||
}
|
||||
70
pkgs/by-name/ov/OVMF-amdsev/package.nix
Normal file
70
pkgs/by-name/ov/OVMF-amdsev/package.nix
Normal file
@@ -0,0 +1,70 @@
|
||||
{
|
||||
lib,
|
||||
edk2,
|
||||
util-linux,
|
||||
nasm,
|
||||
acpica-tools,
|
||||
debug ? false,
|
||||
}:
|
||||
|
||||
edk2.mkDerivation "OvmfPkg/AmdSev/AmdSevX64.dsc" (finalAttrs: {
|
||||
pname = "OVMF-amdsev";
|
||||
version = lib.getVersion edk2;
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"fd"
|
||||
];
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
util-linux
|
||||
nasm
|
||||
acpica-tools
|
||||
];
|
||||
strictDeps = true;
|
||||
|
||||
hardeningDisable = [
|
||||
"format"
|
||||
"pic"
|
||||
"fortify"
|
||||
];
|
||||
|
||||
buildFlags = lib.optionals debug [ "-D DEBUG_ON_SERIAL_PORT=TRUE" ];
|
||||
buildConfig = if debug then "DEBUG" else "RELEASE";
|
||||
|
||||
# The AmdSev platform embeds a grub image, built by the PREBUILD hook
|
||||
# (OvmfPkg/AmdSev/Grub/grub.sh). Provide an empty grub.efi instead
|
||||
# (the hook keeps an existing, newer grub.efi), like Fedora does.
|
||||
# The resulting firmware supports direct kernel boot only.
|
||||
postPatch = ''
|
||||
touch OvmfPkg/AmdSev/Grub/grub.efi
|
||||
'';
|
||||
|
||||
# AmdSevX64 only produces a unified firmware image. There is no
|
||||
# CODE/VARS split: SEV-SNP attests the initial guest memory, so the
|
||||
# image is mapped read-only via -bios instead of pflash.
|
||||
postInstall = ''
|
||||
mkdir -vp $fd/FV $fd/share/qemu/firmware
|
||||
mv -v $out/FV/OVMF.fd $fd/FV/OVMF.amdsev.fd
|
||||
substitute ${./61-edk2-ovmf-x64-amdsev.json} \
|
||||
$fd/share/qemu/firmware/61-edk2-ovmf-x64-amdsev.json \
|
||||
--subst-var-by firmware "$fd/FV/OVMF.amdsev.fd"
|
||||
'';
|
||||
|
||||
dontPatchELF = true;
|
||||
|
||||
passthru = {
|
||||
firmware = "${finalAttrs.finalPackage.fd}/FV/OVMF.amdsev.fd";
|
||||
mergedFirmware = "${finalAttrs.finalPackage.fd}/FV/OVMF.amdsev.fd";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "UEFI firmware with AMD SEV, SEV-ES and SEV-SNP support, direct kernel boot only";
|
||||
homepage = "https://github.com/tianocore/tianocore.github.io/wiki/OVMF";
|
||||
license = lib.licenses.bsd2;
|
||||
platforms = builtins.filter (lib.hasPrefix "x86_64-") edk2.meta.platforms;
|
||||
maintainers = [ lib.maintainers.katexochen ];
|
||||
};
|
||||
})
|
||||
24
pkgs/by-name/ov/OVMF-inteltdx/61-edk2-ovmf-x64-inteltdx.json
Normal file
24
pkgs/by-name/ov/OVMF-inteltdx/61-edk2-ovmf-x64-inteltdx.json
Normal file
@@ -0,0 +1,24 @@
|
||||
{
|
||||
"description": "OVMF with Intel TDX support",
|
||||
"interface-types": [
|
||||
"uefi"
|
||||
],
|
||||
"mapping": {
|
||||
"device": "memory",
|
||||
"filename": "@firmware@"
|
||||
},
|
||||
"targets": [
|
||||
{
|
||||
"architecture": "x86_64",
|
||||
"machines": [
|
||||
"pc-q35-*"
|
||||
]
|
||||
}
|
||||
],
|
||||
"features": [
|
||||
"intel-tdx"
|
||||
],
|
||||
"tags": [
|
||||
|
||||
]
|
||||
}
|
||||
62
pkgs/by-name/ov/OVMF-inteltdx/package.nix
Normal file
62
pkgs/by-name/ov/OVMF-inteltdx/package.nix
Normal file
@@ -0,0 +1,62 @@
|
||||
{
|
||||
lib,
|
||||
edk2,
|
||||
util-linux,
|
||||
nasm,
|
||||
acpica-tools,
|
||||
debug ? false,
|
||||
}:
|
||||
|
||||
edk2.mkDerivation "OvmfPkg/IntelTdx/IntelTdxX64.dsc" (finalAttrs: {
|
||||
pname = "OVMF-inteltdx";
|
||||
version = lib.getVersion edk2;
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"fd"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
util-linux
|
||||
nasm
|
||||
acpica-tools
|
||||
];
|
||||
strictDeps = true;
|
||||
|
||||
hardeningDisable = [
|
||||
"format"
|
||||
"pic"
|
||||
"fortify"
|
||||
];
|
||||
|
||||
buildFlags = lib.optionals debug [ "-D DEBUG_ON_SERIAL_PORT=TRUE" ];
|
||||
buildConfig = if debug then "DEBUG" else "RELEASE";
|
||||
|
||||
# Only ship the unified firmware image: TDX attests the initial guest
|
||||
# memory, so the image is mapped read-only via -bios instead of pflash
|
||||
# and the CODE/VARS split is not useful.
|
||||
postInstall = ''
|
||||
mkdir -vp $fd/FV $fd/share/qemu/firmware
|
||||
mv -v $out/FV/OVMF.fd $fd/FV/OVMF.inteltdx.fd
|
||||
substitute ${./61-edk2-ovmf-x64-inteltdx.json} \
|
||||
$fd/share/qemu/firmware/61-edk2-ovmf-x64-inteltdx.json \
|
||||
--subst-var-by firmware "$fd/FV/OVMF.inteltdx.fd"
|
||||
'';
|
||||
|
||||
dontPatchELF = true;
|
||||
|
||||
passthru = {
|
||||
firmware = "${finalAttrs.finalPackage.fd}/FV/OVMF.inteltdx.fd";
|
||||
mergedFirmware = "${finalAttrs.finalPackage.fd}/FV/OVMF.inteltdx.fd";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "UEFI firmware with Intel TDX support";
|
||||
homepage = "https://github.com/tianocore/tianocore.github.io/wiki/OVMF";
|
||||
license = lib.licenses.bsd2;
|
||||
platforms = builtins.filter (lib.hasPrefix "x86_64-") edk2.meta.platforms;
|
||||
maintainers = [ lib.maintainers.katexochen ];
|
||||
};
|
||||
})
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "patch2pr";
|
||||
version = "0.45.1";
|
||||
version = "0.46.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bluekeyes";
|
||||
repo = "patch2pr";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-qzS2HslIAPY5cOoa2xc+uLzaSd9rcaBU7zAN4oFxh1A=";
|
||||
hash = "sha256-SMMqLW9Gvrc+lt/AhGD+RRE+dC/6CxSKmUtJJ3SXtLo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-zziijcAoS5juDFAFM1p+B2N22YWt7dkjNktt5S6cj6k=";
|
||||
vendorHash = "sha256-XVEqnYzlm9l2e/grLwopEZlPSTY64po7veL8JqL9S7Y=";
|
||||
|
||||
ldflags = [
|
||||
"-X main.version=${finalAttrs.version}"
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rumdl";
|
||||
version = "0.2.31";
|
||||
version = "0.2.37";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -19,10 +19,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "rvben";
|
||||
repo = "rumdl";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-sKL1Sn7ipv/5fGwblSTwwLnMEmmNqapBv4phS7sELFY=";
|
||||
hash = "sha256-BE098MLhIOmYaV3mprHXUohKZLR8UPI4PApOBwbnRsQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Q9SQq5oyimRgxB+5FuRn73c00pqjeDDxuJ/klcvKck8=";
|
||||
cargoHash = "sha256-mgC5GP5wPGnrxvpVGcHH/MBfELocEhPGtH15GFbeGVY=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--bin=rumdl"
|
||||
|
||||
@@ -11,12 +11,12 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "shopware-cli";
|
||||
version = "0.15.12";
|
||||
version = "0.16.8";
|
||||
src = fetchFromGitHub {
|
||||
repo = "shopware-cli";
|
||||
owner = "shopware";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-9T04G88OPjdgHKWpuRAma5HGudVfep0cN5tR+MHL28Q=";
|
||||
hash = "sha256-PSgtcPEe14+fIJZIDAxbUsuezizQwi2pbBg8dDXNhAQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
|
||||
dart-sass
|
||||
];
|
||||
|
||||
vendorHash = "sha256-VdFA3Ax3aBsJN/MmJq7YYlP+4NVcDhXegVTCKA6MIQ0=";
|
||||
vendorHash = "sha256-e4VDsjRtgL0wca/gZfmAwMW53FKrAXHfnu2zUTgnpc4=";
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd shopware-cli \
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ty";
|
||||
version = "0.0.60";
|
||||
version = "0.0.61";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
repo = "ty";
|
||||
tag = finalAttrs.version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-9sD0xtxtw9hAOvWM0UkCARjwUe/lJw+KdqC7O1o7o6s=";
|
||||
hash = "sha256-wmNYWfIdgNErP8rw7J43IsEyCg8YuQiaPHd34yzH92M=";
|
||||
};
|
||||
|
||||
# For Darwin platforms, remove the integration test for file notifications,
|
||||
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
cargoBuildFlags = [ "--package=ty" ];
|
||||
|
||||
cargoHash = "sha256-r8GvyK9gWryKdCVGzfYzDGJ2DH4H5A693aGA5DyNDZc=";
|
||||
cargoHash = "sha256-9hF5JxwCaARBwKaaNhfOzVL2CAp8EOrJ8nPIFLlkN9g=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
buildInputs = [ rust-jemalloc-sys ];
|
||||
|
||||
@@ -13,7 +13,8 @@ let
|
||||
defaultVersion =
|
||||
|
||||
lib.switch coq.coq-version [
|
||||
(case "9.1" "1.3.2+9.1")
|
||||
(case "9.2" "1.3.3+9.2")
|
||||
(case "9.1" "1.3.3+9.1")
|
||||
(case "9.0" "1.3.2+9.0")
|
||||
(case "8.20" "1.3.2+8.20")
|
||||
(case "8.19" "1.3.2+8.19")
|
||||
@@ -23,6 +24,8 @@ let
|
||||
] null;
|
||||
|
||||
release = {
|
||||
"1.3.3+9.2".hash = "sha256-2KE0mXpGTvoJXLoWsDTHKGrXKF0y8XEUSCXUQ4q+0YA=";
|
||||
"1.3.3+9.1".hash = "sha256-iDOZii/JMXqtVGvuh3I1R4YxjqWKcAwCLWTPYca2Dik=";
|
||||
"1.3.2+9.1".hash = "sha256-tf+Hrfv/ZrLXryTjJchvLfydxzjkXB2hbL7P280Clzw=";
|
||||
"1.3.2+9.0".hash = "sha256-/UHtK9fjpHTbra4/Cnsjt8fg1fvxx7U6kGjQPm15NwM=";
|
||||
"1.3.2+8.20".hash = "sha256-RuX2aInSjwebs/aEOoisNxqcIPqDA2kWehN9tFYqOx4=";
|
||||
|
||||
@@ -2,28 +2,30 @@
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildDunePackage,
|
||||
lwt_log,
|
||||
logs,
|
||||
lwt,
|
||||
}:
|
||||
|
||||
buildDunePackage (finalAttrs: {
|
||||
version = "1.2";
|
||||
version = "1.3";
|
||||
pname = "resource-pooling";
|
||||
|
||||
minimalOCamlVersion = "4.06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocsigen";
|
||||
repo = "resource-pooling";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-GNYPxjMTo7y40y7aQdseuFyeVF/hSCZKXfEaH/WIO9w=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-DkuFBPobl0HJ/n8N9u086oxiHe8s/KiwQ5pR5n8oKLc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ lwt_log ];
|
||||
propagatedBuildInputs = [
|
||||
logs
|
||||
lwt
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
inherit (finalAttrs.src.meta) homepage;
|
||||
homepage = "https://github.com/ocsigen/resource-pooling/";
|
||||
description = "Library for pooling resources like connections, threads, or similar";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
|
||||
@@ -2,19 +2,23 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "csscompressor";
|
||||
version = "0.9.5";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "afa22badbcf3120a4f392e4d22f9fff485c044a1feda4a950ecc5eba9dd31a05";
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-r6IrrbzzEgpPOS5NIvn/9IXARKH+2kqVDsxeup3TGgU=";
|
||||
};
|
||||
|
||||
doCheck = false; # No tests
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = {
|
||||
description = "Python port of YUI CSS Compressor";
|
||||
@@ -22,4 +26,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -2,27 +2,39 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
pytestCheckHook,
|
||||
six,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "datadiff";
|
||||
version = "2.2.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-fOcN/uqMM/HYjbRrDv/ukFzDa023Ofa7BwqC3omB0ws=";
|
||||
};
|
||||
|
||||
# Tests are not part of the PyPI releases
|
||||
doCheck = false;
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
six
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "datadiff" ];
|
||||
|
||||
disabledTests = [
|
||||
# slice is an hashable type in recent python versions
|
||||
"test_unhashable_type"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Library to provide human-readable diffs of Python data structures";
|
||||
homepage = "https://sourceforge.net/projects/datadiff/";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
flit-core,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -18,8 +19,7 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ flit-core ];
|
||||
|
||||
# Tests are not published to pypi
|
||||
doCheck = false;
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "deep_chainmap" ];
|
||||
|
||||
|
||||
@@ -23,18 +23,18 @@ let
|
||||
versionHash =
|
||||
if lib.versionAtLeast ocaml.version "5.5" then
|
||||
{
|
||||
version = "7.0.0-55";
|
||||
hash = "sha256:f71d2910599c230506efe01f43e02d16d4468fdaea34b537e9e3dfd7383cdf56";
|
||||
version = "7.0.1-55";
|
||||
hash = "sha256:8377c0860da82528ebde16a0133f270c1a03de35036bd44bbd8cfb87070a7afb";
|
||||
}
|
||||
else if lib.versionAtLeast ocaml.version "5.4" then
|
||||
{
|
||||
version = "7.0.0-54";
|
||||
hash = "sha256:cb78172b329c1a0a1c120801d2b915c03c83d2027014ba88416e7cafc1251a7c";
|
||||
version = "7.0.1-54";
|
||||
hash = "sha256:49bf9d3dd10d0d7f58abe6755a40c246d36b5fbf6b5e189f2c634c47a9de7f33";
|
||||
}
|
||||
else if lib.versionAtLeast ocaml.version "5.3" then
|
||||
{
|
||||
version = "7.0.0-53";
|
||||
hash = "sha256:2b3d94a770d1ce7d9cf43a83c1e61e176b0a13b7472c166bb6856121b5bd6e64";
|
||||
version = "7.0.1-53";
|
||||
hash = "sha256:25177453269467832be7b6416f1104132265a3309b9098e6b5185b9c0df05150";
|
||||
}
|
||||
else if lib.versionAtLeast ocaml.version "5.2" then
|
||||
{
|
||||
|
||||
@@ -15,14 +15,14 @@ let
|
||||
variants = {
|
||||
# ./update-xanmod.sh lts
|
||||
lts = {
|
||||
version = "6.18.38";
|
||||
hash = "sha256-PJq69EQXiOJKgQnegxsEcJqAaL10G542Joh5dBrZN0I=";
|
||||
version = "6.18.39";
|
||||
hash = "sha256-Kg2p8MPTQT46nTGw0rP3SMS4BOnuBMXL8zertaC9Wcs=";
|
||||
isLTS = true;
|
||||
};
|
||||
# ./update-xanmod.sh main
|
||||
main = {
|
||||
version = "7.1.3";
|
||||
hash = "sha256-EvxKUWDp0KAKhYO4rZKKx22RCGOimzPm5epchME/pJ8=";
|
||||
version = "7.1.4";
|
||||
hash = "sha256-jHYReidaX4aufcpTeWxr/Lu0+W9yHL7SpF7mgjDSyxY=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user