Merge master into staging-next
This commit is contained in:
@@ -6,11 +6,11 @@
|
|||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
pname = "chatbox";
|
pname = "chatbox";
|
||||||
version = "1.16.4";
|
version = "1.17.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.chatboxai.app/releases/Chatbox-${version}-x86_64.AppImage";
|
url = "https://download.chatboxai.app/releases/Chatbox-${version}-x86_64.AppImage";
|
||||||
hash = "sha256-hLYOiSIOOTjBH0bxWeji7IzH9F38+e10MCXm88YgYdQ=";
|
hash = "sha256-1TXaRZmmN8dYhCODDBXYDIE/0Rf4K5/4MAliuAZjmJw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
appimageContents = appimageTools.extract { inherit pname version src; };
|
appimageContents = appimageTools.extract { inherit pname version src; };
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{ mkDprintPlugin }:
|
{ mkDprintPlugin }:
|
||||||
mkDprintPlugin {
|
mkDprintPlugin {
|
||||||
description = "TypeScript/JavaScript code formatter";
|
description = "TypeScript/JavaScript code formatter";
|
||||||
hash = "sha256-azXAPEwle+VeKFWeWooNn7dPv0DD6zaKer0mdr1K9II=";
|
hash = "sha256-gBYx23MC6Biz8FIIZLBW3d7SOxtpmCml4N6554Wh0Pc=";
|
||||||
initConfig = {
|
initConfig = {
|
||||||
configExcludes = [ "**/node_modules" ];
|
configExcludes = [ "**/node_modules" ];
|
||||||
configKey = "typescript";
|
configKey = "typescript";
|
||||||
@@ -16,6 +16,6 @@ mkDprintPlugin {
|
|||||||
};
|
};
|
||||||
pname = "dprint-plugin-typescript";
|
pname = "dprint-plugin-typescript";
|
||||||
updateUrl = "https://plugins.dprint.dev/dprint/typescript/latest.json";
|
updateUrl = "https://plugins.dprint.dev/dprint/typescript/latest.json";
|
||||||
url = "https://plugins.dprint.dev/typescript-0.95.11.wasm";
|
url = "https://plugins.dprint.dev/typescript-0.95.12.wasm";
|
||||||
version = "0.95.11";
|
version = "0.95.12";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,11 +21,17 @@ gnuradioMinimal.pkgs.mkDerivation rec {
|
|||||||
sha256 = "sha256-yY2W2hQpj8TIxiQBSbQHq0J16n74OfIwMDxFt3mLZYc=";
|
sha256 = "sha256-yY2W2hQpj8TIxiQBSbQHq0J16n74OfIwMDxFt3mLZYc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace CMakeLists.txt \
|
||||||
|
--replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
|
||||||
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
qt5.wrapQtAppsHook
|
qt5.wrapQtAppsHook
|
||||||
pkg-config
|
pkg-config
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
fftwFloat
|
fftwFloat
|
||||||
liquid-dsp
|
liquid-dsp
|
||||||
|
|||||||
@@ -6,16 +6,13 @@
|
|||||||
blas,
|
blas,
|
||||||
lapack,
|
lapack,
|
||||||
gfortran,
|
gfortran,
|
||||||
enableAMPL ? true,
|
|
||||||
libamplsolver,
|
|
||||||
enableMUMPS ? true,
|
|
||||||
mumps,
|
mumps,
|
||||||
mpi,
|
|
||||||
enableSPRAL ? true,
|
|
||||||
spral,
|
spral,
|
||||||
|
libamplsolver,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert (!blas.isILP64) && (!lapack.isILP64);
|
assert (!blas.isILP64) && (!lapack.isILP64);
|
||||||
|
assert !mumps.mpiSupport;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "ipopt";
|
pname = "ipopt";
|
||||||
@@ -28,47 +25,39 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "sha256-85fUBMwQtG+RWQYk9YzdZYK3CYcDKgWroo4blhVWBzE=";
|
sha256 = "sha256-85fUBMwQtG+RWQYk9YzdZYK3CYcDKgWroo4blhVWBzE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
CXXDEFS = [
|
outputs = [
|
||||||
"-DHAVE_RAND"
|
"bin"
|
||||||
"-DHAVE_CSTRING"
|
"dev"
|
||||||
"-DHAVE_CSTDIO"
|
"out"
|
||||||
];
|
"doc"
|
||||||
|
|
||||||
configureFlags =
|
|
||||||
lib.optionals enableAMPL [
|
|
||||||
"--with-asl-cflags=-I${libamplsolver}/include"
|
|
||||||
"--with-asl-lflags=-lamplsolver"
|
|
||||||
]
|
|
||||||
++ lib.optionals enableMUMPS [
|
|
||||||
"--with-mumps-cflags=-I${mumps}/include"
|
|
||||||
"--with-mumps-lflags=-ldmumps"
|
|
||||||
]
|
|
||||||
++ lib.optionals enableSPRAL [
|
|
||||||
"--with-spral-cflags=-I${spral}/include"
|
|
||||||
"--with-spral-lflags=-lspral"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config
|
pkg-config
|
||||||
gfortran
|
gfortran
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
blas
|
blas
|
||||||
lapack
|
lapack
|
||||||
]
|
|
||||||
++ lib.optionals enableAMPL [ libamplsolver ]
|
|
||||||
++ lib.optionals enableMUMPS [
|
|
||||||
mumps
|
mumps
|
||||||
mpi
|
spral
|
||||||
]
|
libamplsolver
|
||||||
++ lib.optionals enableSPRAL [ spral ];
|
];
|
||||||
|
|
||||||
|
configureFlags = [
|
||||||
|
"--with-mumps-cflags=-I${lib.getDev mumps}/include/mumps_seq"
|
||||||
|
"--with-mumps-lflags=-ldmumps"
|
||||||
|
"--with-spral-lflags=-lspral"
|
||||||
|
"--with-asl-lflags=-lamplsolver"
|
||||||
|
];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Software package for large-scale nonlinear optimization";
|
description = "Software package for large-scale nonlinear optimization";
|
||||||
homepage = "https://projects.coin-or.org/Ipopt";
|
homepage = "https://projects.coin-or.org/Ipopt";
|
||||||
license = lib.licenses.epl10;
|
license = lib.licenses.epl20;
|
||||||
platforms = lib.platforms.unix;
|
platforms = lib.platforms.unix;
|
||||||
maintainers = with lib.maintainers; [
|
maintainers = with lib.maintainers; [
|
||||||
nim65s
|
nim65s
|
||||||
|
|||||||
@@ -20,13 +20,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libdeltachat";
|
pname = "libdeltachat";
|
||||||
version = "2.23.0";
|
version = "2.24.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "chatmail";
|
owner = "chatmail";
|
||||||
repo = "core";
|
repo = "core";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-abSLSXD1bZ4Md2cs9pm7wlielLQicyl+/11TeShIsYI=";
|
hash = "sha256-OCC1qHeDSJJcbTmsyVKiwzXiIQAmofu/EhF56cRJ3kE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
|||||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||||
pname = "chatmail-core";
|
pname = "chatmail-core";
|
||||||
inherit version src;
|
inherit version src;
|
||||||
hash = "sha256-dLcJV2WUwQJ1YdfqrsGp3nkMyilDhmtYA304jeSjxVQ=";
|
hash = "sha256-/PRIVdW2pnioqaYoIX/87cBbPezRaSbX5RWN6yuwpe8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|||||||
@@ -21,13 +21,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "libmamba";
|
pname = "libmamba";
|
||||||
version = "2.3.2";
|
version = "2.3.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mamba-org";
|
owner = "mamba-org";
|
||||||
repo = "mamba";
|
repo = "mamba";
|
||||||
tag = finalAttrs.version;
|
tag = finalAttrs.version;
|
||||||
hash = "sha256-344CRyIIrIFrDFbdxdGH7iOidoDhfovd3EySXlOF+4M=";
|
hash = "sha256-a1lumBYNEvKVu92JmnhvUvZFsRXy+n1bu6jKOg4pDM0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
@@ -58,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
passthru.updateScript = nix-update-script { };
|
passthru.updateScript = nix-update-script { };
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
changelog = "https://github.com/mamba-org/mamba/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||||
description = "Library for the fast Cross-Platform Package Manager";
|
description = "Library for the fast Cross-Platform Package Manager";
|
||||||
homepage = "https://github.com/mamba-org/mamba";
|
homepage = "https://github.com/mamba-org/mamba";
|
||||||
license = lib.licenses.bsd3;
|
license = lib.licenses.bsd3;
|
||||||
|
|||||||
@@ -24,13 +24,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "ponyc";
|
pname = "ponyc";
|
||||||
version = "0.60.3";
|
version = "0.60.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ponylang";
|
owner = "ponylang";
|
||||||
repo = "ponyc";
|
repo = "ponyc";
|
||||||
tag = version;
|
tag = version;
|
||||||
hash = "sha256-VlmIy2i7BZ8jK96KVnTzdjyXWTyOuWE5M3yNp7gcVCA=";
|
hash = "sha256-L5qqAu0OozsN6zxC3iwdYTLdd1ux4Dl3bFx6XDD3ZbY=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -40,5 +40,7 @@ stdenv.mkDerivation {
|
|||||||
license = licenses.gpl2;
|
license = licenses.gpl2;
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
maintainers = [ maintainers.bjornfor ];
|
maintainers = [ maintainers.bjornfor ];
|
||||||
|
# last successful hydra build on darwin was in 2019
|
||||||
|
broken = stdenv.hostPlatform.isDarwin;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ let
|
|||||||
stripRoot = false;
|
stripRoot = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
version = "3.6.0";
|
version = "3.6.1";
|
||||||
in
|
in
|
||||||
|
|
||||||
python3.pkgs.buildPythonApplication {
|
python3.pkgs.buildPythonApplication {
|
||||||
@@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication {
|
|||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz";
|
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz";
|
||||||
hash = "sha256-XBtRjAiBvSMRFwdW1RZK2ZQnxwhzdjfK5O6SZrHUZ7w=";
|
hash = "sha256-9b31UPJzmsGCXmCAIb+8XMEjKnvFIEO0MozWluHYbZA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Needs tox
|
# Needs tox
|
||||||
|
|||||||
@@ -5,13 +5,13 @@
|
|||||||
}:
|
}:
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "tfswitch";
|
pname = "tfswitch";
|
||||||
version = "1.8.0";
|
version = "1.9.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "warrensbox";
|
owner = "warrensbox";
|
||||||
repo = "terraform-switcher";
|
repo = "terraform-switcher";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-9N6C2y+lGyWSJgDiPsMKo03ji6lhq+0OI1idi1VcrAA=";
|
sha256 = "sha256-0yK4/eQ2WNnNopA2dMbvMr5mv3w9vQhfQuJExQM2gvc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-4qZ5egtNN0O+ESkvavprNd6Xtxh/eyD5INolqKXo674=";
|
vendorHash = "sha256-4qZ5egtNN0O+ESkvavprNd6Xtxh/eyD5INolqKXo674=";
|
||||||
|
|||||||
@@ -19,14 +19,14 @@
|
|||||||
}:
|
}:
|
||||||
llvmPackages_20.stdenv.mkDerivation {
|
llvmPackages_20.stdenv.mkDerivation {
|
||||||
pname = "xenia-canary";
|
pname = "xenia-canary";
|
||||||
version = "0-unstable-2025-10-24";
|
version = "0-unstable-2025-11-01";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "xenia-canary";
|
owner = "xenia-canary";
|
||||||
repo = "xenia-canary";
|
repo = "xenia-canary";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
rev = "5d01ac0c45e04d99364888a6e391697bee5ab12d";
|
rev = "b800011265bf47ea6b3f4f2b234d25249823a9be";
|
||||||
hash = "sha256-elbWtd1isE+B+JESWzSp5WhkjpsrHrIp1qGTZN5B0Yw=";
|
hash = "sha256-XufXayBfpq8PUReAiNxAbt4gUhH+aYxMN10ZU7HVhJs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
dontConfigure = true;
|
dontConfigure = true;
|
||||||
|
|||||||
@@ -89,7 +89,7 @@ let
|
|||||||
in
|
in
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
pname = "xpra";
|
pname = "xpra";
|
||||||
version = "6.3.4";
|
version = "6.3.5";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
stdenv = if withNvenc then cudaPackages.backendStdenv else args.stdenv;
|
stdenv = if withNvenc then cudaPackages.backendStdenv else args.stdenv;
|
||||||
@@ -98,7 +98,7 @@ buildPythonApplication rec {
|
|||||||
owner = "Xpra-org";
|
owner = "Xpra-org";
|
||||||
repo = "xpra";
|
repo = "xpra";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-Wx8s1e0nhFyNrwHYD2aVutudjNSc8ukTLPqaiYHp8n8=";
|
hash = "sha256-f4neqEqln7F3tUR1ZF5lyl5HkcPAJWFCdx2qOKLHd74=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
stdenv,
|
stdenv,
|
||||||
lib,
|
lib,
|
||||||
fetchFromGitLab,
|
fetchFromGitLab,
|
||||||
fetchpatch,
|
|
||||||
gitUpdater,
|
gitUpdater,
|
||||||
testers,
|
testers,
|
||||||
boost,
|
boost,
|
||||||
@@ -29,13 +28,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "lomiri-download-manager";
|
pname = "lomiri-download-manager";
|
||||||
version = "0.2.1";
|
version = "0.2.2";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "ubports";
|
owner = "ubports";
|
||||||
repo = "development/core/lomiri-download-manager";
|
repo = "development/core/lomiri-download-manager";
|
||||||
tag = finalAttrs.version;
|
tag = finalAttrs.version;
|
||||||
hash = "sha256-dVyel4NL5LFORNTQzOyeTFkt9Wn23+4uwHsKcj+/0rk=";
|
hash = "sha256-e4HyUi8GXImEtM5I7dH27cDceUn+VCFpb9xgbMpQBJU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [
|
outputs = [
|
||||||
@@ -44,15 +43,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
]
|
]
|
||||||
++ lib.optionals withDocumentation [ "doc" ];
|
++ lib.optionals withDocumentation [ "doc" ];
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Remove when version > 0.2.1
|
|
||||||
(fetchpatch {
|
|
||||||
name = "0001-lomiri-download-manager-treewide-Make-pkg-config-includedir-values-reasonable.patch";
|
|
||||||
url = "https://gitlab.com/ubports/development/core/lomiri-download-manager/-/commit/230aa1965917f90d235f55477a257eca1f5eaf46.patch";
|
|
||||||
hash = "sha256-Kdmu4U98Yc213pHS0o4DjpG8T5p50Q5hijRgdvscA/c=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
# Substitute systemd's prefix in pkg-config call
|
# Substitute systemd's prefix in pkg-config call
|
||||||
substituteInPlace CMakeLists.txt \
|
substituteInPlace CMakeLists.txt \
|
||||||
|
|||||||
@@ -190,18 +190,21 @@ let
|
|||||||
map (
|
map (
|
||||||
archive:
|
archive:
|
||||||
(fetchurl {
|
(fetchurl {
|
||||||
|
pname = packageInfo.name;
|
||||||
|
version = packageInfo.revision;
|
||||||
inherit (archive) url sha1;
|
inherit (archive) url sha1;
|
||||||
inherit meta;
|
inherit meta;
|
||||||
passthru = {
|
passthru = {
|
||||||
info = packageInfo;
|
info = packageInfo;
|
||||||
};
|
};
|
||||||
}).overrideAttrs
|
}).overrideAttrs
|
||||||
(prev: {
|
(
|
||||||
# fetchurl won't generate the correct filename if we specify pname and version,
|
finalAttrs: previousAttrs: {
|
||||||
# and we still want the version attribute to show up in search, so specify these in an override
|
# fetchurl prioritize `pname` and `version` over the specified `name`,
|
||||||
pname = packageInfo.name;
|
# so specify custom `name` in an override.
|
||||||
version = packageInfo.revision;
|
name = baseNameOf (lib.head (finalAttrs.urls));
|
||||||
})
|
}
|
||||||
|
)
|
||||||
) validArchives
|
) validArchives
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -32,14 +32,14 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "anndata";
|
pname = "anndata";
|
||||||
version = "0.12.2";
|
version = "0.12.4";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "scverse";
|
owner = "scverse";
|
||||||
repo = "anndata";
|
repo = "anndata";
|
||||||
tag = version;
|
tag = version;
|
||||||
hash = "sha256-uGkeSlYcphRnIFfe9UcLvnupKeMzAIm5wT8fp3gmPKw=";
|
hash = "sha256-8tHM46wRr896JzZcWKBDy1QLrz/iwKE8YKfRby2Fmb8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [
|
build-system = [
|
||||||
|
|||||||
@@ -10,14 +10,14 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "cwcwidth";
|
pname = "cwcwidth";
|
||||||
version = "0.1.10";
|
version = "0.1.12";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "sebastinas";
|
owner = "sebastinas";
|
||||||
repo = "cwcwidth";
|
repo = "cwcwidth";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-JrzItV+nCpQCz9MM1pcq5FtGZOsWNbgAra6i5WT4Mcg=";
|
hash = "sha256-mkyBtqAFqu7dxpb46qMOnXmXpUV3qtpknfIgVQQt5nY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [
|
build-system = [
|
||||||
|
|||||||
@@ -7,14 +7,14 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "knx-frontend";
|
pname = "knx-frontend";
|
||||||
version = "2025.10.26.81530";
|
version = "2025.10.31.195356";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
# TODO: source build, uses yarn.lock
|
# TODO: source build, uses yarn.lock
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
pname = "knx_frontend";
|
pname = "knx_frontend";
|
||||||
inherit version;
|
inherit version;
|
||||||
hash = "sha256-8JRiKgltnY8aPlcVP4yr1/z9mJYG0Axr1KnXPK9XgLI=";
|
hash = "sha256-m490gincBGm5qN1ndVfw8HZYnIh9RNLHQkW6w4duTTE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [ setuptools ];
|
build-system = [ setuptools ];
|
||||||
|
|||||||
@@ -6,8 +6,7 @@
|
|||||||
ninja,
|
ninja,
|
||||||
libmamba,
|
libmamba,
|
||||||
pybind11,
|
pybind11,
|
||||||
setuptools,
|
scikit-build-core,
|
||||||
scikit-build,
|
|
||||||
fmt,
|
fmt,
|
||||||
spdlog,
|
spdlog,
|
||||||
tl-expected,
|
tl-expected,
|
||||||
@@ -18,25 +17,24 @@
|
|||||||
curl,
|
curl,
|
||||||
zstd,
|
zstd,
|
||||||
bzip2,
|
bzip2,
|
||||||
wheel,
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage {
|
buildPythonPackage rec {
|
||||||
pname = "libmambapy";
|
pname = "libmambapy";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
inherit (libmamba) version src;
|
inherit (libmamba) version src;
|
||||||
|
|
||||||
nativeBuildInputs = [
|
sourceRoot = "${src.name}/libmambapy";
|
||||||
|
|
||||||
|
build-system = [
|
||||||
cmake
|
cmake
|
||||||
ninja
|
ninja
|
||||||
|
pybind11
|
||||||
|
scikit-build-core
|
||||||
];
|
];
|
||||||
|
|
||||||
env = {
|
dontUseCmakeConfigure = true;
|
||||||
NIX_CFLAGS_COMPILE = toString [
|
|
||||||
"-Wno-error=deprecated-declarations"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
(libmamba.override { python3 = python; })
|
(libmamba.override { python3 = python; })
|
||||||
@@ -52,42 +50,13 @@ buildPythonPackage {
|
|||||||
libsolv
|
libsolv
|
||||||
];
|
];
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
scikit-build
|
|
||||||
pybind11
|
|
||||||
];
|
|
||||||
|
|
||||||
build-system = [
|
|
||||||
setuptools
|
|
||||||
wheel
|
|
||||||
];
|
|
||||||
|
|
||||||
# patch needed to fix setuptools errors
|
|
||||||
# see these for reference
|
|
||||||
# https://stackoverflow.com/questions/72294299/multiple-top-level-packages-discovered-in-a-flat-layout
|
|
||||||
# https://github.com/pypa/setuptools/issues/3197#issuecomment-1078770109
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace libmambapy/setup.py --replace-warn "setuptools.setup()" "setuptools.setup(py_modules=[])"
|
|
||||||
'';
|
|
||||||
|
|
||||||
cmakeFlags = [
|
|
||||||
"-GNinja"
|
|
||||||
(lib.cmakeBool "BUILD_LIBMAMBAPY" true)
|
|
||||||
];
|
|
||||||
|
|
||||||
buildPhase = ''
|
|
||||||
ninjaBuildPhase
|
|
||||||
cp -r libmambapy ../libmambapy
|
|
||||||
cd ../libmambapy
|
|
||||||
pypaBuildPhase
|
|
||||||
'';
|
|
||||||
|
|
||||||
pythonImportsCheck = [
|
pythonImportsCheck = [
|
||||||
"libmambapy"
|
"libmambapy"
|
||||||
"libmambapy.bindings"
|
"libmambapy.bindings"
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
changelog = "https://github.com/mamba-org/mamba/blob/${src.tag}/libmambapy/CHANGELOG.md";
|
||||||
description = "Python library for the fast Cross-Platform Package Manager";
|
description = "Python library for the fast Cross-Platform Package Manager";
|
||||||
homepage = "https://github.com/mamba-org/mamba";
|
homepage = "https://github.com/mamba-org/mamba";
|
||||||
license = lib.licenses.bsd3;
|
license = lib.licenses.bsd3;
|
||||||
|
|||||||
@@ -10,7 +10,9 @@
|
|||||||
# optional/test dependencies
|
# optional/test dependencies
|
||||||
gdcm,
|
gdcm,
|
||||||
pillow,
|
pillow,
|
||||||
|
pydicom,
|
||||||
pyjpegls,
|
pyjpegls,
|
||||||
|
pylibjpeg,
|
||||||
pylibjpeg-libjpeg,
|
pylibjpeg-libjpeg,
|
||||||
writableTmpDirAsHomeHook,
|
writableTmpDirAsHomeHook,
|
||||||
}:
|
}:
|
||||||
@@ -46,11 +48,12 @@ buildPythonPackage rec {
|
|||||||
pixeldata = [
|
pixeldata = [
|
||||||
pillow
|
pillow
|
||||||
pyjpegls
|
pyjpegls
|
||||||
#pylibjpeg.optional-dependencies.openjpeg # infinite recursion
|
pylibjpeg
|
||||||
#pylibjpeg.optional-dependencies.rle # infinite recursion
|
|
||||||
pylibjpeg-libjpeg
|
pylibjpeg-libjpeg
|
||||||
gdcm
|
gdcm
|
||||||
];
|
]
|
||||||
|
++ pylibjpeg.optional-dependencies.openjpeg
|
||||||
|
++ pylibjpeg.optional-dependencies.rle;
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeCheckInputs = [
|
nativeCheckInputs = [
|
||||||
@@ -61,6 +64,12 @@ buildPythonPackage rec {
|
|||||||
|
|
||||||
passthru.pydicom-data = test_data;
|
passthru.pydicom-data = test_data;
|
||||||
|
|
||||||
|
doCheck = false; # circular dependency
|
||||||
|
|
||||||
|
passthru.tests.pytest = pydicom.overridePythonAttrs {
|
||||||
|
doCheck = true;
|
||||||
|
};
|
||||||
|
|
||||||
# Setting $HOME to prevent pytest to try to create a folder inside
|
# Setting $HOME to prevent pytest to try to create a folder inside
|
||||||
# /homeless-shelter which is read-only.
|
# /homeless-shelter which is read-only.
|
||||||
# Linking pydicom-data dicom files to $HOME/.pydicom/data
|
# Linking pydicom-data dicom files to $HOME/.pydicom/data
|
||||||
|
|||||||
@@ -10,14 +10,14 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "yoto-api";
|
pname = "yoto-api";
|
||||||
version = "1.26.5";
|
version = "2.1.2";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "cdnninja";
|
owner = "cdnninja";
|
||||||
repo = "yoto_api";
|
repo = "yoto_api";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-QlcZZjyMPIPGG5zHTFM9E2Y8sa/etbvMmxRp15NzKEo=";
|
hash = "sha256-bRJjDgmMLJcmWyyxTg0BLjBukGi8JX9WWz9IoUl9Fcw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [ setuptools ];
|
build-system = [ setuptools ];
|
||||||
|
|||||||
@@ -8,13 +8,13 @@
|
|||||||
buildHomeAssistantComponent rec {
|
buildHomeAssistantComponent rec {
|
||||||
owner = "cdnninja";
|
owner = "cdnninja";
|
||||||
domain = "yoto";
|
domain = "yoto";
|
||||||
version = "1.24.5";
|
version = "2.2.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "cdnninja";
|
owner = "cdnninja";
|
||||||
repo = "yoto_ha";
|
repo = "yoto_ha";
|
||||||
tag = "v${version}";
|
tag = "v${version}";
|
||||||
hash = "sha256-z9BrZAjjtt9EC84CzDe3AzmJHQtCBLgEoWrCJpOPBK0=";
|
hash = "sha256-2h9lrs6vl4JVYbwaMkQKq2Sq/Iu1Sn1HmMJuso46SSE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
|||||||
@@ -6,16 +6,16 @@
|
|||||||
|
|
||||||
buildNpmPackage rec {
|
buildNpmPackage rec {
|
||||||
pname = "hourly-weather";
|
pname = "hourly-weather";
|
||||||
version = "6.7.1";
|
version = "6.8.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "decompil3d";
|
owner = "decompil3d";
|
||||||
repo = "lovelace-hourly-weather";
|
repo = "lovelace-hourly-weather";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-o2whcxLcPQcSvv9aMpZxAk7iqGez2yqhwdB+zU7OwMY=";
|
hash = "sha256-vpV4BQVSaHm06fjSMzsN2IGeaK9ygV3/E0QvCko0Drc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
npmDepsHash = "sha256-C4ca6bTXzNmmzA5yK825JwdOYa3KKtGK+eYuKxgspUY=";
|
npmDepsHash = "sha256-J089Schvtdv1xJTY0XAwe2QU/SeM/yoWplKq799xFMg=";
|
||||||
|
|
||||||
env.CYPRESS_INSTALL_BINARY = "0";
|
env.CYPRESS_INSTALL_BINARY = "0";
|
||||||
|
|
||||||
|
|||||||
@@ -33293,12 +33293,12 @@ with self;
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
Test2Harness = buildPerlPackage {
|
Test2Harness = buildPerlPackage rec {
|
||||||
pname = "Test2-Harness";
|
pname = "Test2-Harness";
|
||||||
version = "1.000155";
|
version = "1.000161";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Harness-1.000155.tar.gz";
|
url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Harness-${version}.tar.gz";
|
||||||
hash = "sha256-Hvi/euDKALaHu24RXzq4yVBI5ICsmuUylzabxpSkc4s=";
|
hash = "sha256-SXO3mx7tUwVxXuc9itySNtp5XH1AkNg7FQ6hMc1ltBQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
@@ -33324,6 +33324,7 @@ with self;
|
|||||||
gotofile
|
gotofile
|
||||||
];
|
];
|
||||||
meta = {
|
meta = {
|
||||||
|
changelog = "https://github.com/Test-More/Test2-Harness/blob/v${version}/Changes";
|
||||||
description = "New and improved test harness with better Test2 integration";
|
description = "New and improved test harness with better Test2 integration";
|
||||||
license = with lib.licenses; [
|
license = with lib.licenses; [
|
||||||
artistic1
|
artistic1
|
||||||
|
|||||||
Reference in New Issue
Block a user