Merge staging-next into staging
This commit is contained in:
@@ -36,7 +36,7 @@ if test -z "$CABAL_DIR"; then
|
||||
fi
|
||||
fi
|
||||
|
||||
package_list="$(nix-build -A haskell.package-list)/nixos-hackage-packages.csv"
|
||||
package_list="$(nix-build --arg config '{ allowAliases = false; }' -A haskell.package-list)/nixos-hackage-packages.csv"
|
||||
username=$(grep "^username:" "$CABAL_DIR/config" | sed "s/^username: //")
|
||||
password_command=$(grep "^password-command:" "$CABAL_DIR/config" | sed "s/^password-command: //")
|
||||
curl -u "$username:$($password_command | head -n1)" --digest -H "Content-type: text/csv" -T "$package_list" https://hackage.haskell.org/distro/NixOS/packages.csv
|
||||
|
||||
@@ -81,14 +81,6 @@ let
|
||||
Bucket = cfg.storage.gcp.bucket;
|
||||
JSONKey = cfg.storage.gcp.jsonKey;
|
||||
};
|
||||
Minio = {
|
||||
Endpoint = cfg.storage.minio.endpoint;
|
||||
Key = cfg.storage.minio.key;
|
||||
Secret = cfg.storage.minio.secret;
|
||||
EnableSSL = cfg.storage.minio.enableSSL;
|
||||
Bucket = cfg.storage.minio.bucket;
|
||||
region = cfg.storage.minio.region;
|
||||
};
|
||||
Mongo = {
|
||||
URL = cfg.storage.mongo.url;
|
||||
DefaultDBName = cfg.storage.mongo.defaultDBName;
|
||||
@@ -303,7 +295,6 @@ in
|
||||
"disk"
|
||||
"mongo"
|
||||
"gcp"
|
||||
"minio"
|
||||
"s3"
|
||||
"azureblob"
|
||||
"external"
|
||||
@@ -700,44 +691,6 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
minio = {
|
||||
endpoint = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
description = "Endpoint of the minio storage backend.";
|
||||
example = "minio.example.com:9001";
|
||||
default = null;
|
||||
};
|
||||
key = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
description = "Access key id for the minio storage backend.";
|
||||
example = "minio";
|
||||
default = null;
|
||||
};
|
||||
secret = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
description = "Secret key for the minio storage backend. Warning: this is stored in plain text in the config file.";
|
||||
example = "minio123";
|
||||
default = null;
|
||||
};
|
||||
enableSSL = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
description = "Enable SSL for the minio storage backend.";
|
||||
default = false;
|
||||
};
|
||||
bucket = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
description = "Bucket name for the minio storage backend.";
|
||||
example = "gomods";
|
||||
default = null;
|
||||
};
|
||||
region = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
description = "Region for the minio storage backend.";
|
||||
example = "us-east-1";
|
||||
default = null;
|
||||
};
|
||||
};
|
||||
|
||||
mongo = {
|
||||
url = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
@@ -774,7 +727,6 @@ in
|
||||
key = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
description = "Access key id for the S3 storage backend.";
|
||||
example = "minio";
|
||||
default = null;
|
||||
};
|
||||
secret = lib.mkOption {
|
||||
@@ -991,4 +943,12 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
imports = [
|
||||
(lib.mkRemovedOptionModule [
|
||||
"services"
|
||||
"athens"
|
||||
"storage"
|
||||
"minio"
|
||||
] "Support for Minio storage backend has been removed, as minio is unmaintained.")
|
||||
];
|
||||
}
|
||||
|
||||
@@ -66,7 +66,7 @@ let
|
||||
rule_files = optionals (!(cfg.enableAgentMode)) (
|
||||
map (promtoolCheck "check rules" "rules") (
|
||||
cfg.ruleFiles
|
||||
++ [
|
||||
++ optionals (builtins.length cfg.rules > 0) [
|
||||
(pkgs.writeText "prometheus.rules" (concatStringsSep "\n" cfg.rules))
|
||||
]
|
||||
)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ lib, fetchFromGitHub }:
|
||||
rec {
|
||||
version = "9.1.2109";
|
||||
version = "9.1.2148";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -11,7 +11,7 @@ rec {
|
||||
owner = "vim";
|
||||
repo = "vim";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Lglu940Uf0ZOaitoI41XK4Xgk7e1UeXsfdIxOMgNQ18=";
|
||||
hash = "sha256-4ZEbfpffPp6kqSQRp7NFioWGRdG+JsVf7unU0Hqn/Xk=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -1418,13 +1418,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"vancluever_acme": {
|
||||
"hash": "sha256-hviw2syXALi3B47jwfvEn61sOOZ1qvUMWJE7Ob6M36U=",
|
||||
"hash": "sha256-uRIOLFIzT4hIXMtoyHk0UB5R5xGr0DELF5hd+E5Xx1k=",
|
||||
"homepage": "https://registry.terraform.io/providers/vancluever/acme",
|
||||
"owner": "vancluever",
|
||||
"repo": "terraform-provider-acme",
|
||||
"rev": "v2.44.1",
|
||||
"rev": "v2.45.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-FSyJ5ZCaGbMZbDop/Pj8TKaUAeOBNz/RSfV/rkVYbD0="
|
||||
"vendorHash": "sha256-S8eG43mHNyPOm2Iuww9DjU7o/x2MMSJExpmBAQ8QDGY="
|
||||
},
|
||||
"venafi_venafi": {
|
||||
"hash": "sha256-wpAckNRqZjSDt7KpCRpLSYkn6Gm+QPzn5sIJ90wRXjI=",
|
||||
|
||||
+18
-12
@@ -1,6 +1,6 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
stdenv,
|
||||
gitUpdater,
|
||||
testers,
|
||||
fetchFromGitHub,
|
||||
@@ -14,35 +14,40 @@
|
||||
libjpeg,
|
||||
libwebp,
|
||||
zlib,
|
||||
withGUI ? true,
|
||||
qtbase ? null,
|
||||
wrapQtAppsHook ? null,
|
||||
withQt5 ? false,
|
||||
qt5,
|
||||
withQt6 ? false,
|
||||
qt6,
|
||||
}:
|
||||
|
||||
assert withGUI -> qtbase != null && wrapQtAppsHook != null;
|
||||
assert !(withQt5 && withQt6);
|
||||
|
||||
let
|
||||
qt = if withQt5 then qt5 else qt6;
|
||||
withGUI = withQt5 || withQt6;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "alice-tools" + lib.optionalString withGUI "-qt${lib.versions.major qtbase.version}";
|
||||
pname = "alice-tools" + lib.optionalString withGUI "-qt${lib.versions.major qt.qtbase.version}";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nunuhara";
|
||||
repo = "alice-tools";
|
||||
rev = finalAttrs.version;
|
||||
tag = finalAttrs.version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-DazWnBeI5XShkIx41GFZLP3BbE0O8T9uflvKIZUXCHo=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString (withGUI && lib.versionAtLeast qtbase.version "6.0") ''
|
||||
postPatch = lib.optionalString (withGUI && withQt6) ''
|
||||
# Use Meson's Qt6 module
|
||||
substituteInPlace src/meson.build \
|
||||
--replace qt5 qt6
|
||||
|
||||
# For some reason Meson uses QMake instead of pkg-config detection method for Qt6 on Darwin, which gives wrong search paths for tools
|
||||
export PATH=${qtbase.dev}/libexec:$PATH
|
||||
export PATH=${qt.qtbase.dev}/libexec:$PATH
|
||||
'';
|
||||
|
||||
mesonFlags = lib.optionals (withGUI && lib.versionAtLeast qtbase.version "6.0") [
|
||||
mesonFlags = lib.optionals (withGUI && withQt6) [
|
||||
# Qt6 requires at least C++17, project uses compiler's default, default too old on Darwin & aarch64-linux
|
||||
"-Dcpp_std=c++17"
|
||||
];
|
||||
@@ -55,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
flex
|
||||
]
|
||||
++ lib.optionals withGUI [
|
||||
wrapQtAppsHook
|
||||
qt.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -66,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
zlib
|
||||
]
|
||||
++ lib.optionals withGUI [
|
||||
qtbase
|
||||
qt.qtbase
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
@@ -102,6 +107,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ OPNA2608 ];
|
||||
changelog = "https://github.com/nunuhara/alice-tools/releases/tag/${finalAttrs.src.tag}";
|
||||
mainProgram = if withGUI then "galice" else "alice";
|
||||
};
|
||||
})
|
||||
@@ -43,16 +43,16 @@
|
||||
},
|
||||
"ai-examples": {
|
||||
"pname": "ai-examples",
|
||||
"version": "0.2.5",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/ai_examples-0.2.5-py2.py3-none-any.whl",
|
||||
"hash": "sha256-utvfX8LgtKhcQSTT/JKFm1gq348w9XJ0QM6BlCFACZo=",
|
||||
"version": "0.2.6",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/ai_examples-0.2.6-py2.py3-none-any.whl",
|
||||
"hash": "sha256-z5G04SBrhpBQHYR8vkbD7BP2We96TTZ63XTtXo+X1pw=",
|
||||
"description": "Add AI powered examples to help content"
|
||||
},
|
||||
"aks-preview": {
|
||||
"pname": "aks-preview",
|
||||
"version": "19.0.0b18",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-19.0.0b18-py2.py3-none-any.whl",
|
||||
"hash": "sha256-MN2tw4w7jd7d4Ej6c1mVR8XjOHuqLBADphn0GXzyuqk=",
|
||||
"version": "19.0.0b22",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-19.0.0b22-py2.py3-none-any.whl",
|
||||
"hash": "sha256-/TBJnRAsSSDTGP114fkkQeJ2gzryA8LQQMY+7/G71PI=",
|
||||
"description": "Provides a preview for upcoming AKS features"
|
||||
},
|
||||
"alb": {
|
||||
@@ -111,6 +111,13 @@
|
||||
"hash": "sha256-re+iMmNO+fYl5j5oTGy4vm6OHATHytv5TIaYl2k6fVg=",
|
||||
"description": "Microsoft Azure Command-Line Tools ArizeAi Extension"
|
||||
},
|
||||
"artifact-signing": {
|
||||
"pname": "artifact-signing",
|
||||
"version": "1.0.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/artifact_signing-1.0.0-py3-none-any.whl",
|
||||
"hash": "sha256-u9BK1SQm5p6aJBkvL+Di7S21WuYfuRtrizoDA739DH8=",
|
||||
"description": "Microsoft Azure Command-Line Tools Artifact Signing Extension"
|
||||
},
|
||||
"astronomer": {
|
||||
"pname": "astronomer",
|
||||
"version": "1.0.1",
|
||||
@@ -134,16 +141,16 @@
|
||||
},
|
||||
"automation": {
|
||||
"pname": "automation",
|
||||
"version": "1.0.0b1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/automation-1.0.0b1-py3-none-any.whl",
|
||||
"hash": "sha256-0x/gQz+jCm4An3ub7mxBemhu2HUC3Zh7msitETODkVs=",
|
||||
"version": "1.0.0b2",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/automation-1.0.0b2-py3-none-any.whl",
|
||||
"hash": "sha256-sdk0uNtQX6yBiEboywNE8FAreY1pBiimah0PdmCDRYg=",
|
||||
"description": "Microsoft Azure Command-Line Tools AutomationClient Extension"
|
||||
},
|
||||
"azure-firewall": {
|
||||
"pname": "azure-firewall",
|
||||
"version": "2.0.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_firewall-2.0.0-py2.py3-none-any.whl",
|
||||
"hash": "sha256-tIX7vovIVGe9NsBg3N8LbwyVsxgurJKXLUtUYveaZtA=",
|
||||
"version": "2.0.1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_firewall-2.0.1-py2.py3-none-any.whl",
|
||||
"hash": "sha256-SLnSVacJ47P96ICUt33/6cRz+0YRY+FrkwhowtTMD68=",
|
||||
"description": "Manage Azure Firewall resources"
|
||||
},
|
||||
"azurelargeinstance": {
|
||||
@@ -162,9 +169,9 @@
|
||||
},
|
||||
"bastion": {
|
||||
"pname": "bastion",
|
||||
"version": "1.4.2",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/bastion-1.4.2-py3-none-any.whl",
|
||||
"hash": "sha256-TTaKDFaydQ4lW+LfvEHbWX4WARj3Xwg/yeHmq9aNEoI=",
|
||||
"version": "1.4.3",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/bastion-1.4.3-py3-none-any.whl",
|
||||
"hash": "sha256-ikMk58o8e8VhZ7bzq++2RRxOv3p/eQ9eX5+eC7qyFdk=",
|
||||
"description": "Microsoft Azure Command-Line Tools Bastion Extension"
|
||||
},
|
||||
"billing-benefits": {
|
||||
@@ -176,9 +183,9 @@
|
||||
},
|
||||
"blueprint": {
|
||||
"pname": "blueprint",
|
||||
"version": "1.0.0b1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/blueprint-1.0.0b1-py3-none-any.whl",
|
||||
"hash": "sha256-WVBTayQ3Asbs5Q8sE8d4q68xIJN6i0cZiNHV+8szmlQ=",
|
||||
"version": "1.0.0b2",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/blueprint-1.0.0b2-py3-none-any.whl",
|
||||
"hash": "sha256-KVtkhYL1+HnnJnmZt7AtZpfFvve/hcpmFw2EfzSHGLc=",
|
||||
"description": "Microsoft Azure Command-Line Tools Blueprint Extension"
|
||||
},
|
||||
"carbon": {
|
||||
@@ -288,9 +295,9 @@
|
||||
},
|
||||
"databricks": {
|
||||
"pname": "databricks",
|
||||
"version": "1.2.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/databricks-1.2.0-py3-none-any.whl",
|
||||
"hash": "sha256-3Zdbp+OP7mgXQ8cSjidSba8BO8kB4Bx1pWwyFFD+7Yw=",
|
||||
"version": "1.3.1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/databricks-1.3.1-py3-none-any.whl",
|
||||
"hash": "sha256-D6+Sbp49vxPP/IENPPn6TSL3qhwgBZyWBB3KjSgjdCc=",
|
||||
"description": "Microsoft Azure Command-Line Tools DatabricksClient Extension"
|
||||
},
|
||||
"datadog": {
|
||||
@@ -328,6 +335,13 @@
|
||||
"hash": "sha256-8agBvQw46y6/nC+04LQ6mEcK57QLvNBesqpZbWlXnJ4=",
|
||||
"description": "Microsoft Azure Command-Line Tools DataShareManagementClient Extension"
|
||||
},
|
||||
"dell": {
|
||||
"pname": "dell",
|
||||
"version": "1.0.0b1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/dell-1.0.0b1-py3-none-any.whl",
|
||||
"hash": "sha256-v3Ue6o9sjuG9/Nn2nPuNx9O61bWr0h8MS792bYztVFw=",
|
||||
"description": "Support for managing Dell.Storage filesystem resources"
|
||||
},
|
||||
"dependency-map": {
|
||||
"pname": "dependency-map",
|
||||
"version": "1.0.0b1",
|
||||
@@ -358,9 +372,9 @@
|
||||
},
|
||||
"devcenter": {
|
||||
"pname": "devcenter",
|
||||
"version": "7.0.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/devcenter-7.0.0-py3-none-any.whl",
|
||||
"hash": "sha256-UQgGkRRJ3WGPKT3agMb533CKD/A1dq/66Z/4K13VuK0=",
|
||||
"version": "8.0.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/devcenter-8.0.0-py3-none-any.whl",
|
||||
"hash": "sha256-bdtqIfedTken/0rh+2F/MhdDtl1+mshQFXUX2/2ejpA=",
|
||||
"description": "Microsoft Azure Command-Line Tools DevCenter Extension"
|
||||
},
|
||||
"diskpool": {
|
||||
@@ -407,9 +421,9 @@
|
||||
},
|
||||
"edge-action": {
|
||||
"pname": "edge-action",
|
||||
"version": "1.0.0b2",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/edge_action-1.0.0b2-py3-none-any.whl",
|
||||
"hash": "sha256-wtIkeQPRlEAEL/PXTVuPaUoQbabFKDKLc/RML+qaBGM=",
|
||||
"version": "1.0.0b3",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/edge_action-1.0.0b3-py3-none-any.whl",
|
||||
"hash": "sha256-rAC5OVb2crUfQR1DkQmW09Ifft55aAnYgM7s8frPzW4=",
|
||||
"description": "Microsoft Azure Command-Line Tools Extension for Azure Front Door Edge Actions"
|
||||
},
|
||||
"edgeorder": {
|
||||
@@ -463,9 +477,9 @@
|
||||
},
|
||||
"fleet": {
|
||||
"pname": "fleet",
|
||||
"version": "1.8.2",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/fleet-1.8.2-py3-none-any.whl",
|
||||
"hash": "sha256-3YRF7R7NB8zPonNcgv4Cfs3gk55pgTAbeo1tGOH6fsA=",
|
||||
"version": "1.8.3",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/fleet-1.8.3-py3-none-any.whl",
|
||||
"hash": "sha256-KY4lXsFf1Rxhcblyfxw904dWHxdWR17L864qiIpYYOQ=",
|
||||
"description": "Microsoft Azure Command-Line Tools Fleet Extension"
|
||||
},
|
||||
"fluid-relay": {
|
||||
@@ -484,9 +498,9 @@
|
||||
},
|
||||
"front-door": {
|
||||
"pname": "front-door",
|
||||
"version": "1.4.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/front_door-1.4.0-py3-none-any.whl",
|
||||
"hash": "sha256-9chF08+QQe2WYR/vvifE9AzjYV4X26TweeGf2U5zcGA=",
|
||||
"version": "2.1.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/front_door-2.1.0-py3-none-any.whl",
|
||||
"hash": "sha256-7aa9A+tq+qXzMuabG9McHkXpU3TRZVjQWDbmuHTTsFk=",
|
||||
"description": "Manage networking Front Doors"
|
||||
},
|
||||
"fzf": {
|
||||
@@ -533,9 +547,9 @@
|
||||
},
|
||||
"healthbot": {
|
||||
"pname": "healthbot",
|
||||
"version": "0.1.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/healthbot-0.1.0-py3-none-any.whl",
|
||||
"hash": "sha256-kTT60lEVFucUpds0bWOGWvC63wWZrePxwV+soAVVhaM=",
|
||||
"version": "1.0.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/healthbot-1.0.0-py3-none-any.whl",
|
||||
"hash": "sha256-X6M+iVNShC9YBliy2Ynf5TVUDKo3ZTaqu1yvFn6v6Ew=",
|
||||
"description": "Microsoft Azure Command-Line Tools HealthbotClient Extension"
|
||||
},
|
||||
"healthcareapis": {
|
||||
@@ -547,9 +561,9 @@
|
||||
},
|
||||
"hpc-cache": {
|
||||
"pname": "hpc-cache",
|
||||
"version": "0.1.5",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/hpc_cache-0.1.5-py2.py3-none-any.whl",
|
||||
"hash": "sha256-hSy0F6rfCtB+PFFBOFjEE79x6my0m6WCidlXL5o1BQc=",
|
||||
"version": "0.1.6",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/hpc_cache-0.1.6-py2.py3-none-any.whl",
|
||||
"hash": "sha256-aUNk9avjsiJnqOVNULsANeO/IXkjRV76a8u+c5O4Bso=",
|
||||
"description": "Microsoft Azure Command-Line Tools StorageCache Extension"
|
||||
},
|
||||
"image-copy-extension": {
|
||||
@@ -561,9 +575,9 @@
|
||||
},
|
||||
"image-gallery": {
|
||||
"pname": "image-gallery",
|
||||
"version": "1.0.0b1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/image_gallery-1.0.0b1-py2.py3-none-any.whl",
|
||||
"hash": "sha256-WwVNZ7dYcfXELlsSNrkhKgtolYE4oNRIQJ1DoJxzIZE=",
|
||||
"version": "1.0.0b2",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/image_gallery-1.0.0b2-py2.py3-none-any.whl",
|
||||
"hash": "sha256-Q2lgO2YZvvwKoTi+7WDLuBbN2HuCa8DcdcC31RgNLCw=",
|
||||
"description": "Support for Azure Image Gallery"
|
||||
},
|
||||
"import-export": {
|
||||
@@ -603,11 +617,18 @@
|
||||
},
|
||||
"k8s-runtime": {
|
||||
"pname": "k8s-runtime",
|
||||
"version": "2.0.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_runtime-2.0.0-py3-none-any.whl",
|
||||
"hash": "sha256-SSW6qtKarGtCPsi88PWG4IWX5YzTQ9WoyNqiKbx8mok=",
|
||||
"version": "2.0.1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_runtime-2.0.1-py3-none-any.whl",
|
||||
"hash": "sha256-gGI8vYgtiVgf/oQsWYp3O4mzRoDf5uzvkhevkX53dWM=",
|
||||
"description": "Microsoft Azure Command-Line Tools K8sRuntime Extension"
|
||||
},
|
||||
"keyvault-preview": {
|
||||
"pname": "keyvault-preview",
|
||||
"version": "1.0.2",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/keyvault_preview-1.0.2-py3-none-any.whl",
|
||||
"hash": "sha256-2O5Pzvs7z/So+CqgiLe+BOJuvClJIhQABGM4Cxsfmu0=",
|
||||
"description": "Microsoft Azure Command-Line Tools Keyvault-preview Extension"
|
||||
},
|
||||
"kusto": {
|
||||
"pname": "kusto",
|
||||
"version": "0.5.0",
|
||||
@@ -694,9 +715,9 @@
|
||||
},
|
||||
"migrate": {
|
||||
"pname": "migrate",
|
||||
"version": "3.0.0b2",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/migrate-3.0.0b2-py3-none-any.whl",
|
||||
"hash": "sha256-UShJtaTygedXgcITDUStH3PAhxyvFBtwMutz/vYJ+s8=",
|
||||
"version": "3.0.0b3",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/migrate-3.0.0b3-py3-none-any.whl",
|
||||
"hash": "sha256-Yyos4j33u3xCu+xuUt53ifCF5TD2m5YRjw2j66CIah4=",
|
||||
"description": "Support for Azure Migrate preview"
|
||||
},
|
||||
"mixed-reality": {
|
||||
@@ -771,9 +792,9 @@
|
||||
},
|
||||
"nginx": {
|
||||
"pname": "nginx",
|
||||
"version": "2.0.0b9",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/nginx-2.0.0b9-py2.py3-none-any.whl",
|
||||
"hash": "sha256-zJDRh3cN4Qdz4w3QOAuhs+2+C+ku/lKjP54Am3wJXTk=",
|
||||
"version": "2.0.0b10",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/nginx-2.0.0b10-py2.py3-none-any.whl",
|
||||
"hash": "sha256-RYvMtOEopLUbYUPt1RxECyGEyDc4aOAt2hp7Orv0DAM=",
|
||||
"description": "Microsoft Azure Command-Line Tools Nginx Extension"
|
||||
},
|
||||
"notification-hub": {
|
||||
@@ -862,9 +883,9 @@
|
||||
},
|
||||
"quantum": {
|
||||
"pname": "quantum",
|
||||
"version": "1.0.0b10",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/quantum-1.0.0b10-py3-none-any.whl",
|
||||
"hash": "sha256-ihvof5C7EOMq65Ljbv2ax9Lri67AY0kSBb687dUGAv0=",
|
||||
"version": "1.0.0b11",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/quantum-1.0.0b11-py3-none-any.whl",
|
||||
"hash": "sha256-LcfF4Rmfr4L4R0n41g4RngDyfTeRZheZuNqGP4kI5Yk=",
|
||||
"description": "Microsoft Azure Command-Line Tools Quantum Extension"
|
||||
},
|
||||
"qumulo": {
|
||||
@@ -918,9 +939,9 @@
|
||||
},
|
||||
"scheduled-query": {
|
||||
"pname": "scheduled-query",
|
||||
"version": "1.0.0b1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/scheduled_query-1.0.0b1-py2.py3-none-any.whl",
|
||||
"hash": "sha256-/V5p0EOLgInb4ZfVukxBd2rtkGlBysN0dVpMkETErwQ=",
|
||||
"version": "1.0.0b2",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/scheduled_query-1.0.0b2-py2.py3-none-any.whl",
|
||||
"hash": "sha256-UuY4rZntL543bBkYaAwNzCtmGVsZ5npROl0ozVizUJw=",
|
||||
"description": "Microsoft Azure Command-Line Tools Scheduled_query Extension"
|
||||
},
|
||||
"scvmm": {
|
||||
@@ -974,9 +995,9 @@
|
||||
},
|
||||
"stack-hci-vm": {
|
||||
"pname": "stack-hci-vm",
|
||||
"version": "1.11.6",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/stack_hci_vm-1.11.6-py3-none-any.whl",
|
||||
"hash": "sha256-JyLErSQLS0cMKClSc9q97gdwCtfr0X2ilcP4EuE0V60=",
|
||||
"version": "1.11.9",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/stack_hci_vm-1.11.9-py3-none-any.whl",
|
||||
"hash": "sha256-MX5rPOARe9r9kglMz+R8EnMrZ/nxL9ICK5hzXEWXjWk=",
|
||||
"description": "Microsoft Azure Command-Line Tools Stack-HCi-VM Extension"
|
||||
},
|
||||
"standbypool": {
|
||||
@@ -995,9 +1016,9 @@
|
||||
},
|
||||
"storage-actions": {
|
||||
"pname": "storage-actions",
|
||||
"version": "1.0.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/storage_actions-1.0.0-py3-none-any.whl",
|
||||
"hash": "sha256-OzMuN2blvmoj9GuzU1X3O2PJ0Yr8rsnFXYzypAJlF58=",
|
||||
"version": "1.1.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/storage_actions-1.1.0-py3-none-any.whl",
|
||||
"hash": "sha256-Xj0KOug3QlFFUeNMtx/ygecOTZhtLsGYnlTX07dhk04=",
|
||||
"description": "Microsoft Azure Command-Line Tools StorageActions Extension"
|
||||
},
|
||||
"storage-blob-preview": {
|
||||
@@ -1016,9 +1037,9 @@
|
||||
},
|
||||
"storage-mover": {
|
||||
"pname": "storage-mover",
|
||||
"version": "1.2.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/storage_mover-1.2.0-py3-none-any.whl",
|
||||
"hash": "sha256-jIZ2WTXHeK2+DeBOfU8tKN5abXARPzDu45YP5nSNzXA=",
|
||||
"version": "1.2.1",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/storage_mover-1.2.1-py3-none-any.whl",
|
||||
"hash": "sha256-CWybGBqh6g8/+EsrqkFXlAZfkUMqrmKSAhq4d05WG/0=",
|
||||
"description": "Microsoft Azure Command-Line Tools StorageMover Extension"
|
||||
},
|
||||
"storagesync": {
|
||||
@@ -1107,9 +1128,9 @@
|
||||
},
|
||||
"vmware": {
|
||||
"pname": "vmware",
|
||||
"version": "8.0.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/vmware-8.0.0-py2.py3-none-any.whl",
|
||||
"hash": "sha256-Y+3qoZWD1Jx+BrRsHoTZp2lwuFp/NI/l7EYTP8bebuw=",
|
||||
"version": "8.1.0",
|
||||
"url": "https://azcliprod.blob.core.windows.net/cli-extensions/vmware-8.1.0-py2.py3-none-any.whl",
|
||||
"hash": "sha256-QlwHakDfpj37o5mNUbt0MyPhgRyD/aNPfn4oRO5JtWo=",
|
||||
"description": "Azure VMware Solution commands"
|
||||
},
|
||||
"webapp": {
|
||||
|
||||
@@ -280,6 +280,18 @@
|
||||
meta.maintainers = with lib.maintainers; [ obreitwi ];
|
||||
};
|
||||
|
||||
redisenterprise = mkAzExtension rec {
|
||||
pname = "redisenterprise";
|
||||
version = "1.4.0";
|
||||
url = "https://azcliprod.blob.core.windows.net/cli-extensions/redisenterprise-${version}-py3-none-any.whl";
|
||||
hash = "sha256-vMKLLC/q39SZ2MbqxmcjUiylr01D1olaLujQ1LbFqak=";
|
||||
description = "Microsoft Azure Command-Line Tools RedisEnterprise Extension";
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
redis
|
||||
pyjwt
|
||||
];
|
||||
};
|
||||
|
||||
serial-console = mkAzExtension {
|
||||
pname = "serial-console";
|
||||
version = "1.0.0b2";
|
||||
|
||||
@@ -26,14 +26,14 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.82.0";
|
||||
version = "2.83.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "azure-cli-${version}-src";
|
||||
owner = "Azure";
|
||||
repo = "azure-cli";
|
||||
tag = "azure-cli-${version}";
|
||||
hash = "sha256-C9qsgJI/+4NKiUSrOANWnGtZPlAt5SaQTtRwcqjwIkk=";
|
||||
hash = "sha256-ptmqcRbjLWMZ9i+rt0amfjpVC+VuE+L3Np2gPpF7Urg=";
|
||||
};
|
||||
|
||||
# put packages that needs to be overridden in the py package scope
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "backblaze-b2";
|
||||
version = "4.5.1";
|
||||
version = "4.6.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Backblaze";
|
||||
repo = "B2_Command_Line_Tool";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0BF4+L47Cx7GNGeNm8nJkEfTLYb6jLxSH3WE+h9B6zA=";
|
||||
hash = "sha256-/JCvCydW+oaPSs94Crfia9VFNSuHO02j6n+CFnxMKDE=";
|
||||
};
|
||||
|
||||
patches = [ ./0001-fix-error-with-pytest-4.0.patch ];
|
||||
@@ -28,25 +28,21 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
argcomplete
|
||||
];
|
||||
|
||||
build-system = with python3Packages; [
|
||||
pdm-backend
|
||||
];
|
||||
build-system = with python3Packages; [ pdm-backend ];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
argcomplete
|
||||
arrow
|
||||
b2sdk
|
||||
phx-class-registry
|
||||
docutils
|
||||
platformdirs
|
||||
rst2ansi
|
||||
setuptools
|
||||
tabulate
|
||||
tqdm
|
||||
platformdirs
|
||||
packaging
|
||||
setuptools
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [ "phx-class-registry" ];
|
||||
pythonRelaxDeps = [ "docutils" ];
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
backoff
|
||||
|
||||
@@ -44,7 +44,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
substitute ${./wrapper} $out/bin/ccls \
|
||||
--replace-fail '@clang@' '${llvmPackages.clang}' \
|
||||
--replace-fail '@shell@' '${runtimeShell}' \
|
||||
--replace-fail '@wrapped@' "$wrapped"
|
||||
--replace-fail '@wrapped@' "$wrapped" \
|
||||
--replace-fail '@out@' "$out"
|
||||
chmod --reference=$out/bin/$wrapped $out/bin/ccls
|
||||
'';
|
||||
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
#! @shell@ -e
|
||||
|
||||
dirpath=$(CDPATH= cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
|
||||
|
||||
printf -v extraArgs ',\"%s\"' \
|
||||
$(cat @clang@/nix-support/libc-cflags \
|
||||
@clang@/nix-support/libcxx-cxxflags) \
|
||||
${NIX_CFLAGS_COMPILE}
|
||||
initString="--init={\"clang\":{\"extraArgs\":[${extraArgs:1}],\"resourceDir\":\"@clang@/resource-root\"}}"
|
||||
|
||||
exec -a "$0" "$dirpath/@wrapped@" "${initString}" "$@"
|
||||
exec -a "$0" "@out@/bin/@wrapped@" "${initString}" "$@"
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
buildNpmPackage rec {
|
||||
pname = "clever-tools";
|
||||
|
||||
version = "4.6.0";
|
||||
version = "4.6.1";
|
||||
|
||||
nodejs = nodejs_22;
|
||||
|
||||
@@ -19,10 +19,10 @@ buildNpmPackage rec {
|
||||
owner = "CleverCloud";
|
||||
repo = "clever-tools";
|
||||
rev = version;
|
||||
hash = "sha256-0c2SBArtMUffQ7hd2fH9l5DMGm+UIWNeY/aSU0cUHzg=";
|
||||
hash = "sha256-n/iDQdvAaINeIfCbvnL6OGuJ35xS6HsTtFxZ4nKiPWA=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-Quzpdmu9qvJ4P77nsXzqLg3k7tQvuYtvEioDuUSU0+M=";
|
||||
npmDepsHash = "sha256-muuDE5bd35IlAhq2mOCsp+5U2zf4RuaMxhvkmw8WCHc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "cloudlog";
|
||||
version = "2.8.7";
|
||||
version = "2.8.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "magicbug";
|
||||
repo = "Cloudlog";
|
||||
rev = version;
|
||||
hash = "sha256-/zMZbM9TvFMZTUkAN4wqutZ+YQA9sVtdXZwEGISm6NA=";
|
||||
hash = "sha256-Mr5418UTU44glFSvo1abKcjHQJRMQCgHcWsh/Kabr9Y=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -33,14 +33,14 @@ let
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "esphome";
|
||||
version = "2026.2.1";
|
||||
version = "2026.2.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esphome";
|
||||
repo = "esphome";
|
||||
tag = version;
|
||||
hash = "sha256-7gCUSR2jLhCre84JggSPvNHIRzAA6ZSVGTe1pQ+D8ok=";
|
||||
hash = "sha256-VfiIeuwvc7CLuR3SjHH8foS2b4bKVOw/bjOYnDnmWkw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ft2-clone";
|
||||
version = "2.04";
|
||||
version = "2.05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "8bitbubsy";
|
||||
repo = "ft2-clone";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-nLuorUpw42zuGG5hIk2Gr8lEjQ2wEWe7svx8IC+rFso=";
|
||||
hash = "sha256-wMR0S8knfMncjRVDExXkfKGJlDGOjrgAh+bbe0023dw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "gemini-cli-bin";
|
||||
version = "0.29.5";
|
||||
version = "0.30.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/google-gemini/gemini-cli/releases/download/v${finalAttrs.version}/gemini.js";
|
||||
hash = "sha256-Yzqi2l41XLNMGNqeVGru0SALc1ZVa2LS4Qk2QiiSasY=";
|
||||
hash = "sha256-N4pfjiaawx8kvaOFoQ53owJehD69fECJPpt5DxKVJ7k=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -17,18 +17,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "geopard";
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ranfdev";
|
||||
repo = "geopard";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-etx8YPEFGSNyiSLpTNIXTZZiLSgAntQsM93On7dPGI0=";
|
||||
hash = "sha256-wOkzylRfFJsdu9KC4TvF/qYkGf8OZVd1tRre5TbNOX4=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-FHYWpMmJvcHuAHr9fFKl1qIhJb32NJEA/0j3R6/mVgQ=";
|
||||
hash = "sha256-g7pHEBrR/tdKP+kuYJ44Py7kaAx0tXcMkC4UdsfSfDQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
fetchurl,
|
||||
SDL2,
|
||||
ftgl,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
libpng,
|
||||
libjpeg,
|
||||
@@ -31,9 +32,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
postPatch = ''
|
||||
# remove bundled library
|
||||
rm -r src/tinyxml
|
||||
|
||||
# Fix build with boost 1.89
|
||||
rm m4/ax_boost_system.m4
|
||||
substituteInPlace configure.ac \
|
||||
--replace-fail "AX_BOOST_SYSTEM" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glew
|
||||
SDL2
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
requireFile,
|
||||
fetchItchIo,
|
||||
cmake,
|
||||
pkg-config,
|
||||
SDL2,
|
||||
@@ -31,19 +31,12 @@ let
|
||||
sha256 = "09h9r65z8bar2z89s09j6px0gdq355kjf38rmd85xb2aqwnm6xig";
|
||||
};
|
||||
|
||||
# TODO: Replace this with fetchItchIo
|
||||
assets_src = requireFile {
|
||||
assets_src = fetchItchIo {
|
||||
name = "koboredux-${version}-Linux.tar.bz2";
|
||||
gameUrl = "https://olofson.itch.io/kobo-redux";
|
||||
sha256 = "11bmicx9i11m4c3dp19jsql0zy4rjf5a28x4hd2wl8h3bf8cdgav";
|
||||
message = ''
|
||||
Please purchase the game on https://olofson.itch.io/kobo-redux
|
||||
and download the Linux build.
|
||||
|
||||
Once you have downloaded the file, please use the following command
|
||||
and re-run the installation:
|
||||
|
||||
nix-prefetch-url file://\$PWD/koboredux-${version}-Linux.tar.bz2
|
||||
|
||||
upload = "709961";
|
||||
extraMessage = ''
|
||||
Alternatively, install the "koboredux-free" package, which replaces the
|
||||
proprietary assets with a placeholder theme.
|
||||
'';
|
||||
|
||||
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "LASzip";
|
||||
repo = "LASzip";
|
||||
rev = finalAttrs.version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-v/oLU69zqDW1o1HTlay7GDh1Kbmv1rarII2Fz5HWCqg=";
|
||||
};
|
||||
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
description = "Turn quickly bulky LAS files into compact LAZ files without information loss";
|
||||
homepage = "https://laszip.org";
|
||||
changelog = "https://github.com/LASzip/LASzip/releases/tag/${finalAttrs.src.rev}";
|
||||
changelog = "https://github.com/LASzip/LASzip/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.lgpl2;
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
{
|
||||
stdenv,
|
||||
fetchYarnDeps,
|
||||
yarnConfigHook,
|
||||
yarnBuildHook,
|
||||
nodejs,
|
||||
src,
|
||||
version,
|
||||
meta,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "listmonk-email-builder";
|
||||
inherit version;
|
||||
|
||||
src = "${src}/frontend/email-builder";
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/frontend/email-builder/yarn.lock";
|
||||
hash = "sha256-glt7tMfP3x0Mr/hFG1t6TfwVJ+yZ551jeZK2UPIKI8g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
yarnConfigHook
|
||||
yarnBuildHook
|
||||
nodejs
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out
|
||||
cp -R dist/* $out
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
inherit meta;
|
||||
}
|
||||
@@ -49,6 +49,7 @@ buildGoModule (finalAttrs: {
|
||||
"${finalAttrs.passthru.frontend}/altcha.umd.js:/public/static/altcha.umd.js"
|
||||
"static/email-templates"
|
||||
"${finalAttrs.passthru.frontend}/admin:/admin"
|
||||
"${finalAttrs.passthru.email-builder}:/admin/static/email-builder"
|
||||
"i18n:/i18n"
|
||||
];
|
||||
in
|
||||
@@ -59,11 +60,14 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
passthru = {
|
||||
frontend = callPackage ./frontend.nix { inherit (finalAttrs) meta version src; };
|
||||
email-builder = callPackage ./email-builder.nix { inherit (finalAttrs) meta version src; };
|
||||
tests = { inherit (nixosTests) listmonk; };
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"-s"
|
||||
"frontend"
|
||||
"-s"
|
||||
"email-builder"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
autoPatchelfHook,
|
||||
common-updater-scripts,
|
||||
curl,
|
||||
expat,
|
||||
fetchurl,
|
||||
ffmpeg,
|
||||
lib,
|
||||
@@ -51,6 +52,7 @@ stdenv.mkDerivation (
|
||||
qt5.wrapQtAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
expat
|
||||
ffmpeg
|
||||
openssl
|
||||
qt5.qtbase
|
||||
|
||||
@@ -36,14 +36,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mame";
|
||||
version = "0.285";
|
||||
version = "0.286";
|
||||
srcVersion = builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mamedev";
|
||||
repo = "mame";
|
||||
rev = "mame${finalAttrs.srcVersion}";
|
||||
hash = "sha256-vuGQ1VOjIAEopV4X+qP1k+bgH7lJJLZ9RtYevUxgIQg=";
|
||||
hash = "sha256-NsCW8cFSaCW85iXmCro5mj3xTlKUM/nE0nBF92UZAeQ=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -2,6 +2,8 @@
|
||||
stdenvNoCC,
|
||||
lib,
|
||||
opencloud,
|
||||
applyPatches,
|
||||
fetchpatch,
|
||||
pnpm_10,
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
@@ -10,7 +12,18 @@
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "opencloud-idp-web";
|
||||
|
||||
inherit (opencloud) version src;
|
||||
inherit (opencloud) version;
|
||||
|
||||
src = applyPatches {
|
||||
src = opencloud.src;
|
||||
patches = [
|
||||
# Fixes broken kopano tarball, remove in next version
|
||||
(fetchpatch {
|
||||
url = "https://github.com/opencloud-eu/opencloud/commit/212846f2f4e23e89ed675e5a689d87ba1de55b70.patch";
|
||||
hash = "sha256-i+fkWTY4nrZ5fVGlQhhamxy9yrBL9OtDdm7CfV13oak=";
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
pnpmRoot = "services/idp";
|
||||
|
||||
@@ -18,8 +31,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_10;
|
||||
sourceRoot = "${finalAttrs.src.name}/${finalAttrs.pnpmRoot}";
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-NW7HK2B9h5JprK3JcIGi/OHcyoa5VTs/P0s3BZr+4FU=";
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-W5odz//dONpBg4eRQQoVrBMVsEQVkkP89hzMdIXxG7w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -30,18 +43,22 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
cd $pnpmRoot
|
||||
pnpm build
|
||||
mkdir -p assets/identifier/static
|
||||
cp -v src/images/favicon.svg assets/identifier/static/favicon.svg
|
||||
cp -v src/images/icon-lilac.svg assets/identifier/static/icon-lilac.svg
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir $out
|
||||
cp -r assets $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
;
|
||||
|
||||
cargoRoot = "packages/desktop/src-tauri";
|
||||
cargoHash = "sha256-6YOygSNNhAAD49ZkhWS03qGwVP2mvwItzJeyg0/ARLg=";
|
||||
cargoHash = "sha256-WI48iYdxmizF1YgOQtk05dvrBEMqFjHP9s3+zBFAat0=";
|
||||
buildAndTestSubdir = finalAttrs.cargoRoot;
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -14,12 +14,12 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "opencode";
|
||||
version = "1.2.9";
|
||||
version = "1.2.13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "anomalyco";
|
||||
repo = "opencode";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MPr+bJ3GVuVf5P/wCHxg+fk3+4Aca4EaV5NVtshAhuk=";
|
||||
hash = "sha256-Svup7XCVQuIb5Ye7fb90L7dy3VcDy1gBBrqZ5ikOOC4=";
|
||||
};
|
||||
|
||||
node_modules = stdenvNoCC.mkDerivation {
|
||||
@@ -68,7 +68,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
# NOTE: Required else we get errors that our fixed-output derivation references store paths
|
||||
dontFixup = true;
|
||||
|
||||
outputHash = "sha256-jxCPz0vSIuF/E6idil2eEH92sWuo+7bGEAhr4JrNWj0=";
|
||||
outputHash = "sha256-Diu/C8b5eKUn7MRTFBcN5qgJZTp0szg0ECkgEaQZ87Y=";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
};
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "polarity";
|
||||
version = "latest-unstable-2026-01-29";
|
||||
version = "latest-unstable-2026-02-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "polarity-lang";
|
||||
repo = "polarity";
|
||||
rev = "d83922b7bbac56c8c06265c1a23a04687caa3322";
|
||||
hash = "sha256-E1EzX4RKwL72cqqHzbkAM7O5b+t896MxC5ni53uSh84=";
|
||||
rev = "630a1bb3b97c7c1a13087407a50cc78316a2526e";
|
||||
hash = "sha256-IuT1LJiMEOS+c4dUamCpboDNqHGDVxsjYBJ4NEmLZa4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-4oDFW2Ob098BVRXiDRbBwRM+vIATbximzG54BKSA9+I=";
|
||||
cargoHash = "sha256-FrCOsgbb0xQH3cKnWqa2n17uDpppnSd0PyVrrCPXCYw=";
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
rainfrog,
|
||||
}:
|
||||
let
|
||||
version = "0.3.16";
|
||||
version = "0.3.17";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit version;
|
||||
@@ -17,10 +17,10 @@ rustPlatform.buildRustPackage {
|
||||
owner = "achristmascarl";
|
||||
repo = "rainfrog";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Bz1YNR3/RnCZgU4rZWU6ATclkuUamYE3Umja4qXlmXk=";
|
||||
hash = "sha256-26pB4A1RR2d++Bh9u6IkNrJ552y6KALTxv1NwRzQ+UE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-qpUUInE0XmyAXWZcqXNyNHy5SDKR+M7DG2YRNlr8rug=";
|
||||
cargoHash = "sha256-AeRh4xozRZs7IK7ez63DuglE+WUm3F3Gl4ohq1W/ZSg=";
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
|
||||
@@ -20,26 +20,26 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rclone-ui";
|
||||
version = "3.4.2";
|
||||
version = "3.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rclone-ui";
|
||||
repo = "rclone-ui";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-aDwtRZGs2JhD2xbzVR3wDdSIjWied9BKknt5WETefvU=";
|
||||
hash = "sha256-YKlznqgKePx6x6P+1nE6sZwYSRZwvpAvMSDjd+MKCvg=";
|
||||
};
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
|
||||
inherit (finalAttrs) src;
|
||||
forceGitDeps = true;
|
||||
hash = "sha256-iyO9Eg+rWV3T50uWyrPHjGcvREnMgSyr0Gq8dxOMPWg=";
|
||||
hash = "sha256-SW2bWKM/H3fuRD0Q0Sctbpk13bfpMawU+HohJxfWg+E=";
|
||||
};
|
||||
|
||||
cargoRoot = "src-tauri";
|
||||
buildAndTestSubdir = finalAttrs.cargoRoot;
|
||||
|
||||
cargoHash = "sha256-sCsH+jjHMR3zsPoFfDq2vVuTc8PvYuR/3ZY5bcW7X0o=";
|
||||
cargoHash = "sha256-toq1lscvDvVyQP0oPtf4IeNpxBTxrqJa8JH3cC3iQzk=";
|
||||
|
||||
# Disable tauri bundle updater, can be removed when #389107 is merged
|
||||
patches = [ ./remove_updater.patch ];
|
||||
|
||||
@@ -36,6 +36,8 @@ buildGoModule (finalAttrs: {
|
||||
"cmd/sing-box"
|
||||
];
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
ldflags = [
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "skim";
|
||||
version = "3.4.0";
|
||||
version = "3.5.0";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -24,14 +24,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "skim-rs";
|
||||
repo = "skim";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-s0aC+gHqxX/SEiWsqB4mgl27eZ65RtVmgXX/veus1IQ=";
|
||||
hash = "sha256-Jm0mrxhjjggnfgp0mnau/LI0HwA8A9NkLIwm/ongI/s=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-Y3WQlzzciYVqVjq0UtAb+4wZwKXLOUpYozriG/w5lJI=";
|
||||
cargoHash = "sha256-AU7Mkyjq3I6RmVlYz6A/AEgEyL0q1LwmagYT9v3j60U=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
nativeCheckInputs = [
|
||||
|
||||
@@ -51,6 +51,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
substituteInPlace src/vdrift/paths.cpp \
|
||||
--replace-fail "@GAME_DATA_DIR@" "$out/share/stuntrally3/data" \
|
||||
--replace-fail "@GAME_CONFIG_DIR@" "$out/share/stuntrally3/config"
|
||||
|
||||
# Fix build with boost 1.89
|
||||
substituteInPlace CMake/AddMissingTargets.cmake --replace-fail \
|
||||
'find_package(Boost REQUIRED COMPONENTS system thread filesystem)' \
|
||||
'find_package(Boost REQUIRED COMPONENTS thread filesystem)'
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -55,6 +55,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
substituteInPlace external/discord-sdk/CMakeLists.txt --replace-fail \
|
||||
'cmake_minimum_required (VERSION 3.2.0)' \
|
||||
'cmake_minimum_required (VERSION 4.0)'
|
||||
# Fix build with boost 1.89.
|
||||
substituteInPlace CMakeLists.txt --replace-fail \
|
||||
'find_package(Boost REQUIRED COMPONENTS filesystem system date_time locale)' \
|
||||
'find_package(Boost REQUIRED COMPONENTS filesystem date_time locale)'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "systemd-manager-tui";
|
||||
version = "1.2.2";
|
||||
version = "1.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Matheus-git";
|
||||
repo = "systemd-manager-tui";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-hPsHsa4eY7kOxKj9YiDK3uQyVOp2/JcR53ygFZXrkO4=";
|
||||
hash = "sha256-cai+5DugKSupFZASNg4QelB3sPi4MvTy5YkA0hB13wo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-/8QN/QU6Ayx8FAI4bwaWqOoL9fYIT5m65908zXpm3gk=";
|
||||
cargoHash = "sha256-y3RoekDMK+COaC0zuSTD6l/Ugl81qLG/3VSWYTDRA5o=";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/Matheus-git/systemd-manager-tui";
|
||||
|
||||
@@ -18,16 +18,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "uv";
|
||||
version = "0.10.4";
|
||||
version = "0.10.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "uv";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-+6u8rmTLwZlEvbnF7Ng/06uYcs6HJGAEyOhEwzYVHVE=";
|
||||
hash = "sha256-KOoAj5v0k9SDsiFmjjaiLMRGn+VELulF//Rvv62U7CU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-jpaOD98n0FBnYzexDiLhtHLRLmzSOZN38KKzcc+o5WQ=";
|
||||
cargoHash = "sha256-IY1Js0PrUjYX4pqUQY44BX41YGpjxCY5tceRaoiiz0o=";
|
||||
|
||||
buildInputs = [
|
||||
rust-jemalloc-sys
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "versatiles";
|
||||
version = "3.6.2";
|
||||
version = "3.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "versatiles-org";
|
||||
repo = "versatiles-rs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-OK+rcnWxr1s4kGsXJ8u1WK7VWzfGO7LhD/HYg9Cy1u8=";
|
||||
hash = "sha256-EskBVrMBn0km6oWSbgluG+4hdTek4MWDbEoEYdVj6/o=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-/8Nnau4zkEY6oTYh08/XiN2rQ5M/bTMYyZTVD6UjAgU=";
|
||||
cargoHash = "sha256-dStQIMT8+lszEmh8r/mBHgpK5kLeLWlFpkUX9Vqsn2g=";
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
|
||||
@@ -87,12 +87,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
|
||||
};
|
||||
|
||||
# disable code signing on macos
|
||||
# https://github.com/electron-userland/electron-builder/blob/77f977435c99247d5db395895618b150f5006e8f/docs/code-signing.md#how-to-disable-code-signing-during-the-build-process-on-macos
|
||||
postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
export CSC_IDENTITY_AUTO_DISCOVERY=false
|
||||
'';
|
||||
|
||||
# electron builds must be writable
|
||||
preBuild = ''
|
||||
# Validate electron version matches upstream package.json
|
||||
@@ -119,7 +113,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
--dir \
|
||||
-c.asarUnpack="**/*.node" \
|
||||
-c.electronDist=${if stdenv.hostPlatform.isDarwin then "." else "electron-dist"} \
|
||||
-c.electronVersion=${electron.version}
|
||||
-c.electronVersion=${electron.version} \
|
||||
${lib.optionalString stdenv.hostPlatform.isDarwin "-c.mac.identity=null"} # disable code signing on macos, https://github.com/electron-userland/electron-builder/blob/77f977435c99247d5db395895618b150f5006e8f/docs/code-signing.md#how-to-disable-code-signing-during-the-build-process-on-macos
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "youki";
|
||||
version = "0.5.7";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "youki";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-b2R9/ADoZfRSu1Qh7hImR1Y+ZX15Uhk7JFwD8ipec6o=";
|
||||
hash = "sha256-O5tk/W2Bybq+6aY7FX/AcJtBKWEYI2Ywk7vYLqvuFos=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
"youki"
|
||||
];
|
||||
|
||||
cargoHash = "sha256-R/1wE7twjMwlSns7ZV5nr8PZ/OzghcslvU+0Ic/oamQ=";
|
||||
cargoHash = "sha256-QOugjSoJVqeiRfpzyuD6nFsBUdlfJLvbXavXFyiHWSo=";
|
||||
|
||||
meta = {
|
||||
description = "Container runtime written in Rust";
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zapret";
|
||||
version = "72.9";
|
||||
version = "72.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bol-van";
|
||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-w2HpEoEAhdk1tOS8IM3K56FqpMW2VgqB+iwISCNB7n4=";
|
||||
hash = "sha256-m9MKyOwAUeH8LZ1GgbuYdHdNTrI3mJ7+Q9R9JT5y2gY=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -0,0 +1,127 @@
|
||||
{
|
||||
lib,
|
||||
mkCoqDerivation,
|
||||
which,
|
||||
coq,
|
||||
stdlib,
|
||||
metarocq,
|
||||
version ? null,
|
||||
single ? false,
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "TypedExtraction";
|
||||
repo = "rocq-typed-extraction";
|
||||
owner = "peregrine-project";
|
||||
domain = "github.com";
|
||||
|
||||
inherit version;
|
||||
defaultVersion =
|
||||
let
|
||||
case = coq: mr: out: {
|
||||
cases = [
|
||||
coq
|
||||
mr
|
||||
];
|
||||
inherit out;
|
||||
};
|
||||
in
|
||||
lib.switch
|
||||
[
|
||||
coq.coq-version
|
||||
metarocq.version
|
||||
]
|
||||
[
|
||||
(case "9.1" (lib.versions.range "1.4" "1.4.1") "0.2.0")
|
||||
]
|
||||
null;
|
||||
release = {
|
||||
"0.2.0".sha256 = "sha256-rgg39X45IXjcnejBhh8N7wMiH+gHQrfO8pBbFEWOGVI=";
|
||||
};
|
||||
releaseRev = v: "v${v}";
|
||||
|
||||
packages = {
|
||||
"common" = [ ];
|
||||
"elm" = [
|
||||
"common"
|
||||
];
|
||||
"rust" = [
|
||||
"common"
|
||||
];
|
||||
"plugin" = [
|
||||
"elm"
|
||||
"rust"
|
||||
];
|
||||
"all" = [
|
||||
"plugin"
|
||||
];
|
||||
};
|
||||
|
||||
typedextraction_ =
|
||||
package:
|
||||
let
|
||||
typedextraction-deps = lib.optionals (package != "single") (
|
||||
map typedextraction_ packages.${package}
|
||||
);
|
||||
pkgpath = if package == "single" then "./" else "./${package}";
|
||||
pname = if package == "all" then "TypedExtraction" else "TypedExtraction-${package}";
|
||||
pkgallMake = ''
|
||||
mkdir all
|
||||
echo "all:" > all/Makefile
|
||||
echo "install:" >> all/Makefile
|
||||
'';
|
||||
derivation = (
|
||||
mkCoqDerivation (
|
||||
{
|
||||
inherit
|
||||
version
|
||||
pname
|
||||
defaultVersion
|
||||
release
|
||||
releaseRev
|
||||
repo
|
||||
owner
|
||||
;
|
||||
|
||||
mlPlugin = true;
|
||||
propagatedBuildInputs = [
|
||||
stdlib
|
||||
coq.ocamlPackages.findlib
|
||||
metarocq
|
||||
]
|
||||
++ typedextraction-deps;
|
||||
|
||||
patchPhase = ''
|
||||
patchShebangs ./configure.sh
|
||||
patchShebangs ./plugin/process_extraction.sh
|
||||
'';
|
||||
|
||||
configurePhase =
|
||||
lib.optionalString (package == "all") pkgallMake
|
||||
+ ''
|
||||
touch ${pkgpath}/_config
|
||||
''
|
||||
+ lib.optionalString (package == "single") ''
|
||||
./configure.sh local
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
cd ${pkgpath}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://peregrine-project.github.io/";
|
||||
description = "A framework for extracting Rocq programs to Rust and Elm";
|
||||
maintainers = with lib.maintainers; [ _4ever2 ];
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
// lib.optionalAttrs (package != "single") {
|
||||
passthru = lib.mapAttrs (package: deps: typedextraction_ package) packages;
|
||||
}
|
||||
)
|
||||
);
|
||||
in
|
||||
derivation;
|
||||
in
|
||||
typedextraction_ (if single then "single" else "all")
|
||||
@@ -14,6 +14,10 @@ mkCoqDerivation {
|
||||
defaultVersion =
|
||||
with lib.versions;
|
||||
lib.switch coq.coq-version [
|
||||
{
|
||||
case = range "8.20" "9.1";
|
||||
out = "8.20";
|
||||
}
|
||||
{
|
||||
case = range "8.14" "8.20";
|
||||
out = "8.18";
|
||||
@@ -36,6 +40,7 @@ mkCoqDerivation {
|
||||
}
|
||||
] null;
|
||||
|
||||
release."8.20".sha256 = "sha256-bwQPgxCVm6iFRJjNplPtUJqRfr6vXPaWs7OxLNnMjs8=";
|
||||
release."8.18".sha256 = "sha256-KObBEYerWhIStmq90G3vs9K5LUEOfB2SPxirwLiWQ6E=";
|
||||
release."8.17".sha256 = "sha256-D878t/PijVCopRKHYqfwdNvt3arGlI8yxbK/vI6qZUY=";
|
||||
release."8.15".sha256 = "sha256:1zr2q52r08na8265019pj9spcz982ivixk6cnzk6l1srn2g328gv";
|
||||
|
||||
@@ -112,10 +112,12 @@ with haskellLib;
|
||||
(
|
||||
let
|
||||
# !!! Use cself/csuper inside for the actual overrides
|
||||
cabalInstallOverlay = cself: csuper: {
|
||||
Cabal = cself.Cabal_3_16_1_0;
|
||||
Cabal-syntax = cself.Cabal-syntax_3_16_1_0;
|
||||
};
|
||||
cabalInstallOverlay =
|
||||
cself: csuper:
|
||||
lib.optionalAttrs (lib.versionOlder csuper.ghc.version "9.14") {
|
||||
Cabal = cself.Cabal_3_16_1_0;
|
||||
Cabal-syntax = cself.Cabal-syntax_3_16_1_0;
|
||||
};
|
||||
in
|
||||
{
|
||||
cabal-install =
|
||||
|
||||
@@ -74,6 +74,10 @@ with haskellLib;
|
||||
# Version upgrades
|
||||
#
|
||||
|
||||
parallel = doDistribute self.parallel_3_3_0_0;
|
||||
tagged = doDistribute self.tagged_0_8_10;
|
||||
unordered-containers = doDistribute self.unordered-containers_0_2_21;
|
||||
|
||||
#
|
||||
# Jailbreaks
|
||||
#
|
||||
@@ -81,10 +85,46 @@ with haskellLib;
|
||||
primitive = doJailbreak (dontCheck super.primitive); # base <4.22 and a lot of dependencies on packages not yet working.
|
||||
splitmix = doJailbreak super.splitmix; # base <4.22
|
||||
|
||||
# https://github.com/haskellari/indexed-traversable/issues/49
|
||||
indexed-traversable = doJailbreak super.indexed-traversable;
|
||||
# https://github.com/haskellari/indexed-traversable/issues/50
|
||||
indexed-traversable-instances = doJailbreak super.indexed-traversable-instances;
|
||||
# https://github.com/haskellari/these/issues/211
|
||||
these = doJailbreak super.these;
|
||||
# https://github.com/haskellari/these/issues/207
|
||||
semialign = doJailbreak super.semialign;
|
||||
# https://github.com/haskellari/time-compat/issues/48
|
||||
time-compat = doJailbreak super.time-compat;
|
||||
# https://github.com/haskell-hvr/uuid/issues/95
|
||||
uuid-types = doJailbreak super.uuid-types;
|
||||
# https://github.com/haskellari/qc-instances/issues/110
|
||||
quickcheck-instances = doJailbreak super.quickcheck-instances;
|
||||
# https://github.com/haskell/aeson/issues/1155
|
||||
text-iso8601 = doJailbreak super.text-iso8601;
|
||||
aeson = doJailbreak super.aeson;
|
||||
|
||||
# https://github.com/well-typed/cborg/issues/373
|
||||
cborg = doJailbreak super.cborg;
|
||||
serialise = doJailbreak (
|
||||
appendPatches [
|
||||
# This removes support for older versions of time (think GHC 8.6) and, in doing so,
|
||||
# drops a Cabal flag that prevents jailbreak from working
|
||||
(pkgs.fetchpatch {
|
||||
name = "serialise-no-old-time.patch";
|
||||
url = "https://github.com/well-typed/cborg/commit/308afc2795062f847171463958e5e1bbd9c03381.patch";
|
||||
hash = "sha256-Gutu9c+houcwAvq2Z+ZQUQbNK+u+OCJRZfKBtx8/V4c=";
|
||||
relative = "serialise";
|
||||
})
|
||||
] super.serialise
|
||||
);
|
||||
|
||||
# https://github.com/sjakobi/newtype-generics/pull/28/files
|
||||
newtype-generics = warnAfterVersion "0.6.2" (doJailbreak super.newtype-generics);
|
||||
|
||||
#
|
||||
# Test suite issues
|
||||
#
|
||||
|
||||
# Fails to compile with GHC 9.14 https://github.com/snoyberg/mono-traversable/pull/261
|
||||
mono-traversable = dontCheck super.mono-traversable;
|
||||
}
|
||||
|
||||
@@ -181,10 +181,12 @@ let
|
||||
nativeBuildInputs = [ buildPackages.cabal2nix-unwrapped ];
|
||||
preferLocalBuild = true;
|
||||
allowSubstitutes = false;
|
||||
LANG = "en_US.UTF-8";
|
||||
LOCALE_ARCHIVE = pkgs.lib.optionalString (
|
||||
buildPlatform.libc == "glibc"
|
||||
) "${buildPackages.glibcLocales}/lib/locale/locale-archive";
|
||||
env = {
|
||||
LANG = "en_US.UTF-8";
|
||||
}
|
||||
// lib.optionalAttrs (buildPlatform.libc == "glibc") {
|
||||
LOCALE_ARCHIVE = "${buildPackages.glibcLocales}/lib/locale/locale-archive";
|
||||
};
|
||||
}
|
||||
''
|
||||
export HOME="$TMP"
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
coqPackages,
|
||||
version ?
|
||||
if lib.versionAtLeast ocaml.version "4.13" then
|
||||
"3.4.2"
|
||||
"3.4.5"
|
||||
else if lib.versionAtLeast ocaml.version "4.08" then
|
||||
"1.20.0"
|
||||
else
|
||||
@@ -34,6 +34,9 @@ in
|
||||
|
||||
let
|
||||
fetched = coqPackages.metaFetch {
|
||||
release."3.4.5".sha256 = "sha256-cck6XqC98Z9lb3CYS8K/aB1WOckjAyXzZ14vX41nJvI=";
|
||||
release."3.4.4".sha256 = "sha256-SvNNAyBYIkSMv3rhx0wVu2JjHdGYUOqaFzZKGBMMebs=";
|
||||
release."3.4.3".sha256 = "sha256-2bzUzUO/Ps1uxHHIzQx0pULme9upYxBBggenxaQrd+I=";
|
||||
release."3.4.2".sha256 = "sha256-w7GjKYZrVrfezJN0NLmzpVm6CFGVKxXszHADFGCw5cc=";
|
||||
release."3.4.1".sha256 = "sha256-3rQPw91dHAqp61KTHk1UOEqh5syWrZZ1V1/1eE8cyI8=";
|
||||
release."3.3.0".sha256 = "sha256:963f95eea48b8f853cca9cbe4db49f22343c58e88dc961bc1da303356ef50dcd";
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
fetchFromGitHub,
|
||||
logfury,
|
||||
annotated-types,
|
||||
packaging,
|
||||
pdm-backend,
|
||||
hatchling,
|
||||
hatch-vcs,
|
||||
pytest-lazy-fixtures,
|
||||
pytest-mock,
|
||||
pytest-timeout,
|
||||
@@ -14,27 +14,30 @@
|
||||
pythonOlder,
|
||||
requests,
|
||||
responses,
|
||||
tenacity,
|
||||
tqdm,
|
||||
typing-extensions,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "b2sdk";
|
||||
version = "2.10.2";
|
||||
version = "2.10.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Backblaze";
|
||||
repo = "b2-sdk-python";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-RWHD1ARPSKHmGKY0xdCBn3Qj4GxAfn4o8eacMQ5RT1k=";
|
||||
hash = "sha256-Gu4MRfjNWuwEFn13U49dEndWA/HNPwrQdX9VEz1ny+M=";
|
||||
};
|
||||
|
||||
build-system = [ pdm-backend ];
|
||||
build-system = [
|
||||
hatchling
|
||||
hatch-vcs
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
annotated-types
|
||||
packaging
|
||||
logfury
|
||||
requests
|
||||
]
|
||||
@@ -46,6 +49,7 @@ buildPythonPackage rec {
|
||||
pytest-timeout
|
||||
pytestCheckHook
|
||||
responses
|
||||
tenacity
|
||||
tqdm
|
||||
];
|
||||
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "hdfury";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "glenndehaan";
|
||||
repo = "python-hdfury";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-UVJgmCwsvtx/Zq2qqTI8E1DmC4ayoWWI7duaommUQ2I=";
|
||||
hash = "sha256-ndJpxFebSsfXQ1aUe20Ajbgks3gA3KXo8kY5FaJ/BW0=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -1,34 +1,40 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
numpy,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
hatchling,
|
||||
|
||||
# depenencies
|
||||
laszip,
|
||||
lazrs,
|
||||
setuptools,
|
||||
numpy,
|
||||
|
||||
# tests
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "laspy";
|
||||
version = "2.7.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-9W/rVEXnXW/xLugUqrajUzkpDnUmT/J3xr9VPzAlo/U=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "laspy";
|
||||
repo = "laspy";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-/wvwUE+lzBgAZVtLB05Fpuq0ElajMxWqCIa1Y3sjB5k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
build-system = [ hatchling ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
numpy
|
||||
laszip
|
||||
lazrs # much faster laz reading, see https://laspy.readthedocs.io/en/latest/installation.html#laz-support
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"laspy"
|
||||
# `laspy` supports multiple backends and detects them dynamically.
|
||||
@@ -37,13 +43,17 @@ buildPythonPackage rec {
|
||||
"lazrs"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Interface for reading/modifying/creating .LAS LIDAR files";
|
||||
mainProgram = "laspy";
|
||||
homepage = "https://github.com/laspy/laspy";
|
||||
changelog = "https://github.com/laspy/laspy/blob/${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/laspy/laspy/blob/${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [ matthewcroughan ];
|
||||
teams = [ lib.teams.geospatial ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,42 +1,31 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
|
||||
# build-system
|
||||
scikit-build-core,
|
||||
pybind11,
|
||||
cmake,
|
||||
laszip,
|
||||
ninja,
|
||||
|
||||
# buildInputs
|
||||
laszip,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "laszip-python";
|
||||
version = "0.2.3";
|
||||
version = "0.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tmontaigu";
|
||||
repo = "laszip-python";
|
||||
rev = version;
|
||||
hash = "sha256-MiPzL9TDCf1xnCv7apwdfcpkFnBRi4PO/atTQxqL8cw=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-fg9Joe5iDNT4w2j+zQuQIoxyAYpCAgLwhuqsBsJn6lU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Removes depending on the cmake and ninja PyPI packages, since we can pass
|
||||
# in the tools directly, and scikit-build-core can use them.
|
||||
# https://github.com/tmontaigu/laszip-python/pull/9
|
||||
(fetchpatch {
|
||||
name = "remove-cmake-ninja-pypi-dependencies.patch";
|
||||
url = "https://github.com/tmontaigu/laszip-python/commit/17e648d04945fa2d095d6d74d58c790a4fcde84a.patch";
|
||||
hash = "sha256-k58sS1RqVzT1WPh2OVt/D4Y045ODtj6U3bUjegd44VY=";
|
||||
})
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-std=c++17";
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
cmake
|
||||
ninja
|
||||
pybind11
|
||||
@@ -55,8 +44,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Unofficial bindings between Python and LASzip made using pybind11";
|
||||
homepage = "https://github.com/tmontaigu/laszip-python";
|
||||
changelog = "https://github.com/tmontaigu/laszip-python/blob/${src.rev}/Changelog.md";
|
||||
changelog = "https://github.com/tmontaigu/laszip-python/blob/${finalAttrs.src.tag}/Changelog.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ matthewcroughan ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -36,13 +36,13 @@ assert !lapack.isILP64;
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "meep";
|
||||
version = "1.31.0";
|
||||
version = "1.32.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NanoComp";
|
||||
repo = "meep";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-x5OMdV/LJfklcK1KlYS0pdotsXP/SYzF7AOW5DlJvq0=";
|
||||
hash = "sha256-XyGs4U8r3ZaqCq2ArMeeI/wFmJEig8iBaPytf7QIehw=";
|
||||
};
|
||||
|
||||
pyproject = false;
|
||||
|
||||
@@ -48,10 +48,28 @@ buildPythonPackage rec {
|
||||
hash = "sha256-7rMatpaZvHuNPpiXR5eUHultqNnLER1iW+GR3dwgkyo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://numpy.org/devdocs/release/2.4.0-notes.html#removed-interpolation-parameter-from-quantile-and-percentile-functions
|
||||
# Upstream PR: https://github.com/plotly/plotly.py/pull/5505
|
||||
./numpy-2.4-percentile-interpolation.patch
|
||||
|
||||
# https://numpy.org/devdocs/release/2.4.0-notes.html#removed-numpy-in1d
|
||||
# Upstream PR: https://github.com/plotly/plotly.py/pull/5522
|
||||
./numpy-2.4-in1d.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail '"hatch", ' "" \
|
||||
--replace-fail "jupyter_packaging~=0.10.0" jupyter_packaging
|
||||
|
||||
# `pytest_ignore_collect` takes only `collection_path` starting with
|
||||
# pytest 9. Most of the paths referenced in `plotly/conftest.py`
|
||||
# don't exist anymore and wouldn't be collected anyway, so we can just
|
||||
# remove the file.
|
||||
# https://docs.pytest.org/en/latest/deprecations.html#py-path-local-arguments-for-hooks-replaced-with-pathlib-path
|
||||
# Upstream PR: https://github.com/plotly/plotly.py/pull/5521
|
||||
rm plotly/conftest.py
|
||||
'';
|
||||
|
||||
env.SKIP_NPM = true;
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
From 9531e7ff00be577560f2cebf6739343646d3c770 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Hunze <dev@thunze.de>
|
||||
Date: Mon, 23 Feb 2026 19:21:45 +0100
|
||||
Subject: [PATCH] Use `np.isin` instead of `np.in1d` to fix numpy 2.4 test
|
||||
compatibility
|
||||
|
||||
https://numpy.org/devdocs/release/2.4.0-notes.html#removed-numpy-in1d
|
||||
---
|
||||
tests/test_optional/test_px/test_px.py | 2 +-
|
||||
tests/test_optional/test_px/test_px_functions.py | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tests/test_optional/test_px/test_px.py b/tests/test_optional/test_px/test_px.py
|
||||
index 6c65925a727..a74c4680540 100644
|
||||
--- a/tests/test_optional/test_px/test_px.py
|
||||
+++ b/tests/test_optional/test_px/test_px.py
|
||||
@@ -36,7 +36,7 @@ def test_custom_data_scatter(backend):
|
||||
)
|
||||
for data in fig.data:
|
||||
assert np.all(
|
||||
- np.in1d(data.customdata[:, 1], iris.get_column("petal_width").to_numpy())
|
||||
+ np.isin(data.customdata[:, 1], iris.get_column("petal_width").to_numpy())
|
||||
)
|
||||
# Hover and custom data, no repeated arguments
|
||||
fig = px.scatter(
|
||||
diff --git a/tests/test_optional/test_px/test_px_functions.py b/tests/test_optional/test_px/test_px_functions.py
|
||||
index 0814898f89d..8220ec7a33a 100644
|
||||
--- a/tests/test_optional/test_px/test_px_functions.py
|
||||
+++ b/tests/test_optional/test_px/test_px_functions.py
|
||||
@@ -307,7 +307,7 @@ def test_sunburst_treemap_with_path_color(constructor):
|
||||
fig = px.sunburst(
|
||||
df.to_native(), path=path, color="sectors", color_discrete_map=cmap
|
||||
)
|
||||
- assert np.all(np.in1d(fig.data[0].marker.colors, list(cmap.values())))
|
||||
+ assert np.all(np.isin(fig.data[0].marker.colors, list(cmap.values())))
|
||||
|
||||
# Numerical column in path
|
||||
df = (
|
||||
@@ -0,0 +1,17 @@
|
||||
diff --git a/plotly/figure_factory/_violin.py b/plotly/figure_factory/_violin.py
|
||||
index 55924e692..e89db0e11 100644
|
||||
--- a/plotly/figure_factory/_violin.py
|
||||
+++ b/plotly/figure_factory/_violin.py
|
||||
@@ -17,9 +17,9 @@ def calc_stats(data):
|
||||
x = np.asarray(data, float)
|
||||
vals_min = np.min(x)
|
||||
vals_max = np.max(x)
|
||||
- q2 = np.percentile(x, 50, interpolation="linear")
|
||||
- q1 = np.percentile(x, 25, interpolation="lower")
|
||||
- q3 = np.percentile(x, 75, interpolation="higher")
|
||||
+ q2 = np.percentile(x, 50, method="linear")
|
||||
+ q1 = np.percentile(x, 25, method="lower")
|
||||
+ q3 = np.percentile(x, 75, method="higher")
|
||||
iqr = q3 - q1
|
||||
whisker_dist = 1.5 * iqr
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
{
|
||||
lib,
|
||||
fetchpatch2,
|
||||
fetchFromGitLab,
|
||||
addBinToPathHook,
|
||||
|
||||
@@ -47,21 +46,17 @@ buildPythonPackage (finalAttrs: {
|
||||
hash = "sha256-m8c+g9XXbg9OSC+NNoQkw4RKXvNFRIPWkDjAs6oH3kc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Remove in the next version
|
||||
# Patch to avoid using pythonRelaxDeps
|
||||
(fetchpatch2 {
|
||||
url = "https://gitlab.com/py3dtiles/py3dtiles/-/commit/0f60691434b9ad4afebec29b2eedfcbbe0b8420d.patch";
|
||||
includes = [ "pyproject.toml" ];
|
||||
hash = "sha256-TLoKeltI1xxSONX0uu56HKl2fXzAp1ufunsBPRr5Pus=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"mapbox_earcut"
|
||||
"numba"
|
||||
"numpy"
|
||||
"pyzmq"
|
||||
];
|
||||
dependencies = [
|
||||
lz4
|
||||
mapbox-earcut
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycdlib";
|
||||
version = "1.15.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "clalancette";
|
||||
repo = "pycdlib";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-BD33nA60x6YvwkYGXPA0E6s8N/XhWaY/+tTRbFN9ai4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
disabledTestPaths = [
|
||||
# These tests require a Fedora-patched genisoimage
|
||||
"tests/integration/test_hybrid.py"
|
||||
"tests/integration/test_parse.py"
|
||||
"tests/tools/test_pycdlib_genisoimage.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Timezone-dependent tests fail in the sandbox
|
||||
"test_volumedescdate_new_nonzero"
|
||||
"test_gmtoffset_from_tm"
|
||||
"test_gmtoffset_from_tm_day_rollover"
|
||||
"test_gmtoffset_from_tm_2023_rollover"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pycdlib" ];
|
||||
|
||||
meta = {
|
||||
description = "Pure python library to read and write ISO9660 files";
|
||||
homepage = "https://github.com/clalancette/pycdlib";
|
||||
license = lib.licenses.lgpl2Only;
|
||||
maintainers = with lib.maintainers; [ Enzime ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "python-gvm";
|
||||
version = "26.9.1";
|
||||
version = "26.10.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greenbone";
|
||||
repo = "python-gvm";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZClhWPo0Tnx62RE/YzADq2QmUnpWdPBX98IIXK0sfOA=";
|
||||
hash = "sha256-8xrjgKFzSn5dThp+z36q3WLTKvIiCVGO9rlkSxa6++w=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -14,21 +14,21 @@
|
||||
urllib3,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "qualysclient";
|
||||
version = "0.0.4.8.3";
|
||||
version = "0.0.4.8.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "woodtechie1428";
|
||||
repo = "qualysclient";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-+SZICysgSC4XeXC9CCl6Yxb47V9c1eMp7KcpH8J7kK0=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2m/WHxkomHBudWpFpsgXHN8n+hfLU+lf9fvxhh/3HjA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace-fail "version=__version__," 'version="${version}",'
|
||||
--replace-fail "version=__version__," 'version="${finalAttrs.version}",'
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -53,8 +53,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Python SDK for interacting with the Qualys API";
|
||||
homepage = "https://qualysclient.readthedocs.io/";
|
||||
changelog = "https://github.com/woodtechie1428/qualysclient/releases/tag/v${version}";
|
||||
changelog = "https://github.com/woodtechie1428/qualysclient/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,18 +1,20 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
fetchFromGitHub,
|
||||
docutils,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
pname = "rst2ansi";
|
||||
version = "0.1.5";
|
||||
version = "0.1.5-unstable-2025-02-12";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Gxf7mmKNQPV5M60aOqlSNGREvgaUaVCOc+lQYNoz/m8=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Snaipe";
|
||||
repo = "python-rst2ansi";
|
||||
rev = "3728e16f8b8b1dc338e5df90ba2c4a93ee054b3f";
|
||||
hash = "sha256-V7tl/YJcPvEgBfH334t6CU7OXKQqBqRo/zZPiOlyCmE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ docutils ];
|
||||
|
||||
@@ -18,9 +18,10 @@
|
||||
|
||||
# tests
|
||||
pytestCheckHook,
|
||||
pythonAtLeast,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "samplerate";
|
||||
version = "0.2.3";
|
||||
pyproject = true;
|
||||
@@ -28,7 +29,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "tuxu";
|
||||
repo = "python-samplerate";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-7FAdIqsYCapmEAYiAuoS5m/jFExXZX3hn3kwxn9NWEc=";
|
||||
};
|
||||
|
||||
@@ -37,8 +38,8 @@ buildPythonPackage rec {
|
||||
./numpy-2.4-compat.patch
|
||||
];
|
||||
|
||||
# unvendor pybind11, libsamplerate
|
||||
postPatch = ''
|
||||
# unvendor pybind11, libsamplerate
|
||||
rm -r external
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "add_subdirectory(external)" "find_package(pybind11 REQUIRED)"
|
||||
@@ -55,7 +56,7 @@ buildPythonPackage rec {
|
||||
|
||||
buildInputs = [ libsamplerate ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
cffi
|
||||
numpy
|
||||
];
|
||||
@@ -68,11 +69,18 @@ buildPythonPackage rec {
|
||||
rm -rf samplerate
|
||||
'';
|
||||
|
||||
disabledTests = lib.optionals (pythonAtLeast "3.14") [
|
||||
# ValueError: cannot resize an array that references or is referenced
|
||||
"test_callback_with_2x"
|
||||
"test_process"
|
||||
"test_resize"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Python bindings for libsamplerate based on CFFI and NumPy";
|
||||
homepage = "https://github.com/tuxu/python-samplerate";
|
||||
changelog = "https://github.com/tuxu/python-samplerate/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/tuxu/python-samplerate/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -38,14 +38,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "uiprotect";
|
||||
version = "10.1.0";
|
||||
version = "10.2.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uilibs";
|
||||
repo = "uiprotect";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-tQeDZMukKg3xL/tGeQ7+Rm3lzNJQEcDkErbLfKnaxN8=";
|
||||
hash = "sha256-4zgE5XbjCZzu+Ug66cgKy/Zqy1oyTDIVsPpyDrcra24=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -17,7 +17,7 @@ let
|
||||
in
|
||||
with lib.versions;
|
||||
lib.switch rocq-core.rocq-version [
|
||||
(case (range "9.0" "9.1") "3.4.2")
|
||||
(case (range "9.0" "9.1") "3.4.5")
|
||||
(case (range "9.0" "9.1") "2.0.7")
|
||||
] { };
|
||||
elpi = rocq-core.ocamlPackages.elpi.override { version = default-elpi-version; };
|
||||
|
||||
@@ -16,9 +16,9 @@ let
|
||||
variants = {
|
||||
# ./update-zen.py zen
|
||||
zen = {
|
||||
version = "6.18.9"; # zen
|
||||
version = "6.18.13"; # zen
|
||||
suffix = "zen1"; # zen
|
||||
sha256 = "1kwb5lbm3y7nhsyx18fhpc3852v76lyl74008rjai9shr3p4zp40"; # zen
|
||||
sha256 = "0x6s3pa7c6zlvr3w2fv6i15v54cy1pschvgk7b4vrzx1bcrjdxf7"; # zen
|
||||
isLqx = false;
|
||||
};
|
||||
# ./update-zen.py lqx
|
||||
|
||||
@@ -87,13 +87,26 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optional withStatic "--enable-static";
|
||||
|
||||
patches = [
|
||||
# Accept multiple default kernel module dirs at build-time, instead
|
||||
# of hardcoding a single /lib/modules, and adjust module search logic
|
||||
# accordingly (to account for multiple default directories)
|
||||
./module-dir.patch
|
||||
|
||||
# Use portable implementation for basename API
|
||||
#
|
||||
# musl has removed the non-prototype declaration of basename from string.h
|
||||
# which now results in build errors with clang-17+ compiler
|
||||
#
|
||||
# Implement GNU basename behavior using strchr which is portable across libcs
|
||||
#
|
||||
# Fixes "call to undeclared function 'basename'" error on clang+musl
|
||||
(fetchpatch {
|
||||
name = "musl.patch";
|
||||
url = "https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/patch/?id=11eb9bc67c319900ab00523997323a97d2d08ad2";
|
||||
hash = "sha256-CYG615elMWces6QGQRg2H/NL7W4XsG9Zvz5H+xsdFFo=";
|
||||
})
|
||||
]
|
||||
# Force configure.ac to accept --enable-static (no other changes necessary)
|
||||
++ lib.optional withStatic ./enable-static.patch;
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "jwillemsen";
|
||||
domain = "daikin_onecta";
|
||||
version = "4.4.8";
|
||||
version = "4.4.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jwillemsen";
|
||||
repo = "daikin_onecta";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-NbMZGX2MchjoNwsUxs6CjQzkz1bJEucRHgpuFyVU3u0=";
|
||||
hash = "sha256-Ra1KL4t3aNECQuAfdqaIOctIb0qvrk43+bAh3YlpGbM=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -990,13 +990,8 @@ with pkgs;
|
||||
akkuPackages
|
||||
;
|
||||
|
||||
alice-tools = callPackage ../tools/games/alice-tools {
|
||||
withGUI = false;
|
||||
};
|
||||
|
||||
alice-tools-qt5 = libsForQt5.callPackage ../tools/games/alice-tools { };
|
||||
|
||||
alice-tools-qt6 = qt6Packages.callPackage ../tools/games/alice-tools { };
|
||||
alice-tools-qt5 = alice-tools.override { withQt5 = true; };
|
||||
alice-tools-qt6 = alice-tools.override { withQt6 = true; };
|
||||
|
||||
auditwheel = with python3Packages; toPythonApplication auditwheel;
|
||||
|
||||
|
||||
@@ -223,6 +223,11 @@ let
|
||||
tlc = callPackage ../development/coq-modules/tlc { };
|
||||
topology = callPackage ../development/coq-modules/topology { };
|
||||
trakt = callPackage ../development/coq-modules/trakt { };
|
||||
TypedExtraction = callPackage ../development/coq-modules/TypedExtraction { };
|
||||
TypedExtraction-common = self.TypedExtraction.common;
|
||||
TypedExtraction-elm = self.TypedExtraction.elm;
|
||||
TypedExtraction-rust = self.TypedExtraction.rust;
|
||||
TypedExtraction-plugin = self.TypedExtraction.plugin;
|
||||
unicoq = callPackage ../development/coq-modules/unicoq { };
|
||||
validsdp = callPackage ../development/coq-modules/validsdp { };
|
||||
vcfloat = callPackage ../development/coq-modules/vcfloat (
|
||||
|
||||
@@ -13256,6 +13256,8 @@ self: super: with self; {
|
||||
|
||||
pycdio = callPackage ../development/python-modules/pycdio { };
|
||||
|
||||
pycdlib = callPackage ../development/python-modules/pycdlib { };
|
||||
|
||||
pycec = callPackage ../development/python-modules/pycec { };
|
||||
|
||||
pycep-parser = callPackage ../development/python-modules/pycep-parser { };
|
||||
|
||||
Reference in New Issue
Block a user