Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2024-08-23 06:04:43 +00:00 committed by GitHub
commit 8aed0e83e9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
49 changed files with 696 additions and 586 deletions

View File

@ -1,4 +1,4 @@
{
"rev": "521d48afa9ae596930a95325529df27fa7135ff5",
"sha256": "0a1pa5azw990narsfipdli1wng4nc3vhvrp00hb8v1qfchcq7dc9"
"rev": "4de4818c1ffa76d57787af936e8a23648bda6be4",
"sha256": "0l3b9jr5ydzqgvd10j12imc9jqb6jv5v2bdi1gyy5cwkwplfay67"
}

View File

@ -22,16 +22,16 @@
rustPlatform.buildRustPackage rec {
pname = "oculante";
version = "0.8.22";
version = "0.8.23";
src = fetchFromGitHub {
owner = "woelper";
repo = "oculante";
rev = version;
hash = "sha256-hsXrpHT+B1Oev+ygXj/2Ma3zszMuW6csgQGJGeYCiAM=";
hash = "sha256-Dg1FFB9WVB4SWInSyOYb1TCPAtCa9gwsFLUX+UhL4DY=";
};
cargoHash = "sha256-X6KR+h+f/mdazqxo8xQK5geeZC12h8uQ3ENMKyaw7aw=";
cargoHash = "sha256-Ze3ACs9WyoxNsaeJlZWhR0g+aFsntwNLLYbw2RnmwfE=";
nativeBuildInputs = [
cmake

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "flink";
version = "1.19.1";
version = "1.20.0";
src = fetchurl {
url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.12.tgz";
sha256 = "sha256-WWFp8+/KcdQZMvA/krWJsTf3we3+KFARcibXOeeZvc4=";
sha256 = "sha256-cI/VRMz53cDUsZL+A1eXzhbeLCbx12TFWQcwXv4UCvA=";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -68,8 +68,8 @@ rec {
};
kops_1_29 = mkKops rec {
version = "1.29.0";
sha256 = "sha256-YneB9pc4IR+tYPRFE5CS+4JK/kPOHMo5/70A3k1x1tg=";
version = "1.29.2";
sha256 = "sha256-SRj0x9N+yfTG/UL/hu1ds46Zt6d5SUYU0PA9lPHO6jQ=";
rev = "v${version}";
};
}

View File

@ -25,7 +25,7 @@
, withNgspice ? !stdenv.isDarwin
, libngspice
, withScripting ? true
, python311
, python3
, addons ? [ ]
, debug ? false
, sanitizeAddress ? false
@ -122,14 +122,10 @@ let
else versionsImport.${baseName}.libVersion.version;
wxGTK = wxGTK32;
# KiCAD depends on wxWidgets, which uses distutils (removed in Python 3.12)
# See also: https://github.com/wxWidgets/Phoenix/issues/2104
# Eventually, wxWidgets should support Python 3.12: https://github.com/wxWidgets/Phoenix/issues/2553
# Until then, we use Python 3.11 which still includes distutils
python = python311;
python = python3;
wxPython = python.pkgs.wxpython;
addonPath = "addon.zip";
addonsDrvs = map (pkg: pkg.override { inherit addonPath python; }) addons;
addonsDrvs = map (pkg: pkg.override { inherit addonPath python3; }) addons;
addonsJoined =
runCommand "addonsJoined"
@ -161,7 +157,7 @@ stdenv.mkDerivation rec {
# Common libraries, referenced during runtime, via the wrapper.
passthru.libraries = callPackages ./libraries.nix { inherit libSrc; };
passthru.callPackage = newScope { inherit addonPath python; };
passthru.callPackage = newScope { inherit addonPath python3; };
base = callPackage ./base.nix {
inherit stable testing baseName;
inherit kicadSrc kicadVersion;

View File

@ -4,23 +4,25 @@
, pkg-config
, libgit2
, zlib
, cmake
}:
rustPlatform.buildRustPackage rec {
pname = "gql";
version = "0.9.0";
version = "0.25.0";
src = fetchFromGitHub {
owner = "AmrDeveloper";
repo = "GQL";
rev = version;
hash = "sha256-A9gjCuWIRdNQhMjdRIH0B5cXGZAPQxK+qYSNI5WGZec=";
hash = "sha256-Jys6pdHGIrgBrXnHm3P2PbTPBPiclQErEaUUQSRm1a0=";
};
cargoHash = "sha256-aA7YPUKlBhfIBvT4D6zgZ8+lKNNazsVwGJC5VETAzOY=";
cargoHash = "sha256-JT/Di4HEcXm03/1gVuaX+6JKn0aHAudwpf+gzXgRFfA=";
nativeBuildInputs = [
pkg-config
cmake
];
buildInputs = [

View File

@ -0,0 +1,52 @@
{
lib,
stdenv,
fetchFromGitHub,
autoreconfHook,
pkg-config,
glib,
gsl,
libdivsufsort,
llvmPackages,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "andi";
version = "0.14";
src = fetchFromGitHub {
owner = "evolbioinf";
repo = "andi";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-tjQ9exFyqu/xnbUGpF6k0kE5C1D93kISjRErwHfjW9E=";
};
nativeBuildInputs = [
autoreconfHook
pkg-config
];
buildInputs = [
gsl
libdivsufsort
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ];
configureFlags = [ (lib.enableFeature finalAttrs.finalPackage.doCheck "unit-tests") ];
nativeCheckInputs = [ glib ];
doCheck = true;
preCheck = ''
patchShebangs ./test
'';
meta = {
description = "Efficient Estimation of Evolutionary Distances";
homepage = "https://github.com/evolbioinf/andi";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ natsukium ];
mainProgram = "andi";
platforms = lib.platforms.all;
};
})

View File

@ -0,0 +1,60 @@
{
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
autoreconfHook,
libtool,
pkg-config,
libxml2,
json_c,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "freesasa";
version = "2.1.2";
src = fetchFromGitHub {
owner = "mittinatten";
repo = "freesasa";
rev = "refs/tags/${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-OH1/GGFtMBnHuoOu3pdR+ohVO1m0I/jmCZbxPQ0C0jo=";
};
patches = [
(fetchpatch {
# https://github.com/mittinatten/freesasa/issues/85
name = "fix-linker-error.patch";
url = "https://github.com/mittinatten/freesasa/commit/d5898c13af0f272697726c567a22f1c48af53d62.patch";
includes = [ "src/Makefile.am" ];
hash = "sha256-NA4jMue9ATxP+A0tYIptwz0qCXTmAqoMRBsi5d5uv3E=";
})
];
nativeBuildInputs = [
autoreconfHook
libtool
pkg-config
];
buildInputs = [
json_c
libxml2
];
passthru.tests = {
version = testers.testVersion { package = finalAttrs.finalPackage; };
};
meta = {
description = "C-library for calculating Solvent Accessible Surface Areas";
homepage = "https://github.com/mittinatten/freesasa";
changelog = "https://github.com/mittinatten/freesasa/blob/${finalAttrs.src.rev}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ natsukium ];
mainProgram = "freesasa";
platforms = lib.platforms.unix;
};
})

View File

@ -22,13 +22,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "gfal2";
version = "2.22.2";
version = "2.23.0";
src = fetchFromGitHub {
owner = "cern-fts";
repo = "gfal2";
rev = "v${finalAttrs.version}";
hash = "sha256-xcM29mZRUrnSE0//rHMaJFgPBeT6E4WdB9tCFa/y5+g=";
hash = "sha256-LEvmjd3A+7JHfUOAnyRyXMsJd/8JO2rVpcIT7QGSJoo=";
};
passthru.enablePluginStatus = {

View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "httm";
version = "0.40.4";
version = "0.42.0";
src = fetchFromGitHub {
owner = "kimono-koans";
repo = pname;
rev = version;
hash = "sha256-dWL27Fe8bU8/ikNSh0T3/67XBvFkxd71uvArbJRbqKA=";
hash = "sha256-2NvTo+EDw7GcDbND7epHWnHehcVBo11QyuZ0PoJf7Nc=";
};
cargoHash = "sha256-BAOFPsHjd5EaWhtzzUxzKvsBtO/kOB5mUo3nUlf7mlY=";
cargoHash = "sha256-YSpYg10IeuqUAmjIQzrA59IT7r86/q8DtEKnazjo9rQ=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -17,14 +17,14 @@
, pcbnewtransition
, pybars3
, versioneer
, shapely_1_8
, shapely
}:
let
solidpython = callPackage ./solidpython { };
in
buildPythonApplication rec {
pname = "kikit";
version = "1.5.0";
version = "1.6.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -33,7 +33,7 @@ buildPythonApplication rec {
owner = "yaqwsx";
repo = "KiKit";
rev = "refs/tags/v${version}";
hash = "sha256-f8FB6EEy9Ch4LcMKd9PADXV9QrSb7e22Ui86G6AnQKE=";
hash = "sha256-r8LQcy3I6hmcrU/6HfPAYJd+cEZdhad6DUldC9HvXZU=";
};
propagatedBuildInputs = [
@ -49,8 +49,7 @@ buildPythonApplication rec {
wxpython
pcbnewtransition
pybars3
# https://github.com/yaqwsx/KiKit/issues/574
shapely_1_8
shapely
# https://github.com/yaqwsx/KiKit/issues/576
solidpython
];

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "livekit";
version = "1.7.0";
version = "1.7.2";
src = fetchFromGitHub {
owner = "livekit";
repo = "livekit";
rev = "v${version}";
hash = "sha256-wUMp2U++6LQm8Iyv6CI8NSoc1sL2k/N12m4FVr35RS0=";
hash = "sha256-z3xXvs31SMEq0Wfhm/v+7iznCsz/kNqwhQsMueQmEhw=";
};
vendorHash = "sha256-SN92BqNsbtXHwIcEk6AmVLoKyPr8Pn4MbKEIYS4ZodQ=";
vendorHash = "sha256-aVKCDDlCkFlFa88H1UAR98Hai5junVWVxVZPK5i+nM8=";
subPackages = [ "cmd/server" ];

View File

@ -13839,7 +13839,7 @@ dependencies = [
[[package]]
name = "zed"
version = "0.149.3"
version = "0.149.5"
dependencies = [
"activity_indicator",
"anyhow",

View File

@ -35,13 +35,13 @@ assert withGLES -> stdenv.isLinux;
rustPlatform.buildRustPackage rec {
pname = "zed";
version = "0.149.3";
version = "0.149.5";
src = fetchFromGitHub {
owner = "zed-industries";
repo = "zed";
rev = "refs/tags/v${version}";
hash = "sha256-fz0StzZIqDLmip0M2959h7ZgoB+cdTC5QNKKNRVZItA=";
hash = "sha256-RQGYcJJf65arew9iwtPh/jFYMbXiY9Wg7xEjAsUSvEA=";
fetchSubmodules = true;
};

View File

@ -605,10 +605,6 @@ self: super: {
focuslist = dontCheck super.focuslist;
search = dontCheck super.search;
# see https://github.com/LumiGuide/haskell-opencv/commit/cd613e200aa20887ded83256cf67d6903c207a60
opencv = dontCheck (appendPatch ./patches/opencv-fix-116.patch super.opencv);
opencv-extra = dontCheck (appendPatch ./patches/opencv-fix-116.patch super.opencv-extra);
# https://github.com/ekmett/structures/issues/3
structures = dontCheck super.structures;
@ -2865,10 +2861,6 @@ self: super: {
editedCabalFile = null;
}) super.true-name);
# ffmpeg-light works against the ffmpeg-4 API, but the default ffmpeg in nixpkgs is ffmpeg-5.
# https://github.com/NixOS/nixpkgs/pull/220972#issuecomment-1484017192
ffmpeg-light = super.ffmpeg-light.override { ffmpeg = pkgs.ffmpeg_4; };
# 2024-08-15: primitive >=0.9 && <0.10
posix-api = doJailbreak super.posix-api;

View File

@ -685,9 +685,6 @@ self: super: builtins.intersectAttrs super {
liquid-fixpoint = disableSharedExecutables super.liquid-fixpoint;
liquidhaskell = dontCheck (disableSharedExecutables super.liquidhaskell);
# Without this override, the builds lacks pkg-config.
opencv-extra = addPkgconfigDepend pkgs.opencv3 super.opencv-extra;
# Break cyclic reference that results in an infinite recursion.
partial-semigroup = dontCheck super.partial-semigroup;
colour = dontCheck super.colour;

View File

@ -1,11 +0,0 @@
diff -ur opencv-0.0.2.1.bak/Setup.hs opencv-0.0.2.1/Setup.hs
--- opencv-0.0.2.1.bak/Setup.hs 2018-11-10 17:18:41.355731189 +0100
+++ opencv-0.0.2.1/Setup.hs 2018-11-10 17:18:56.901681162 +0100
@@ -3,6 +3,6 @@
main = do
args <- getArgs
- let args' | "configure" `elem` args = args ++ ["--with-gcc","c++", "--with-ld","c++"]
+ let args' | "configure" `elem` args = args ++ ["--with-gcc","c++"]
| otherwise = args
defaultMainArgs args'

View File

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "wazero";
version = "1.7.3";
version = "1.8.0";
src = fetchFromGitHub {
owner = "tetratelabs";
repo = "wazero";
rev = "v${version}";
hash = "sha256-39elFJ7dDBpD5nbSaw+bpth6PMZiHjmPHQIS2rsFHFw=";
hash = "sha256-m8dv8r1iJGM6RSPDhJk6KM7sHy3YorvsXUACsSb9bCU=";
};
vendorHash = null;

View File

@ -1,12 +1,12 @@
{lib, stdenv, fetchurl}:
stdenv.mkDerivation rec {
version = "6.8.2";
version = "6.10.0";
pname = "commons-bcel";
src = fetchurl {
url = "mirror://apache/commons/bcel/binaries/bcel-${version}-bin.tar.gz";
hash = "sha256-VRCRxy+P3uPW9gWy9xHfJ35muhWCHtXNimRmTfba+04=";
hash = "sha256-RRVXxPtwbT9AX92T60uDJpFWF6DiotcG1KvKrlFfEWU=";
};
installPhase = ''

View File

@ -4,12 +4,12 @@
}:
stdenv.mkDerivation (finalAttrs: {
version = "3.14.0";
version = "3.15.0";
pname = "commons-lang";
src = fetchurl {
url = "mirror://apache/commons/lang/binaries/commons-lang3-${finalAttrs.version}-bin.tar.gz";
hash = "sha256-MXw+P81fzKN4GnmW/x4MUMEyRO6WHpTl9vbYS4RzOxY=";
hash = "sha256-XaI6ajKIA5NiY9UuZJdMCuZ2kIT3cbitpMXJj33lyE4=";
};
installPhase = ''

View File

@ -18,14 +18,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libsidplayfp";
version = "2.8.0";
version = "2.9.0";
src = fetchFromGitHub {
owner = "libsidplayfp";
repo = "libsidplayfp";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-qZharhEZ16q3Vd2PwVsKQaP/b6bT/okwEPKKwvRl5D8=";
hash = "sha256-m1bbbtNJvoY6l2+jMbEN/dR9V7LZ4f1lHHGnn0F4bmU=";
};
outputs = [

View File

@ -0,0 +1,47 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
cython,
freesasa,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "freesasa";
version = "2.2.1";
pyproject = true;
src = fetchFromGitHub {
owner = "freesasa";
repo = "freesasa-python";
rev = "refs/tags/v${version}";
hash = "sha256-/7ymItwXOemY0+IL0k6rWnJI8fAwTFjNXzTV+uf9x9A=";
};
postPatch = ''
ln -s ${freesasa.src}/* lib/
'';
build-system = [
cython
setuptools
];
env.USE_CYTHON = true;
pythonImportsCheck = [ "freesasa" ];
nativeCheckInputs = [ pytestCheckHook ];
pytestFlagsArray = [ "test.py" ];
meta = {
description = "FreeSASA Python Module";
homepage = "https://github.com/freesasa/freesasa-python";
changelog = "https://github.com/freesasa/freesasa-python/blob/${src.rev}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ natsukium ];
};
}

View File

@ -0,0 +1,56 @@
{
lib,
buildPythonPackage,
fetchPypi,
pythonOlder,
google-api-core,
grpc-google-iam-v1,
mock,
proto-plus,
protobuf,
pytest-asyncio,
pytestCheckHook,
setuptools,
}:
buildPythonPackage rec {
pname = "google-cloud-network-connectivity";
version = "2.4.5";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit version;
pname = "google_cloud_network_connectivity";
hash = "sha256-g2N39pKk0HG8f9NkSh/iOmDQNapnTyMf85mPBM0LIe4=";
};
build-system = [ setuptools ];
dependencies = [
google-api-core
grpc-google-iam-v1
proto-plus
protobuf
] ++ google-api-core.optional-dependencies.grpc;
nativeCheckInputs = [
mock
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [
"google.cloud.networkconnectivity"
"google.cloud.networkconnectivity_v1"
];
meta = with lib; {
description = "API Client library for Google Cloud Network Connectivity Center";
homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-network-connectivity";
changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-network-connectivity-v${version}/packages/google-cloud-network-connectivity/CHANGELOG.md";
license = licenses.asl20;
maintainers = with maintainers; [ aksiksi ];
};
}

View File

@ -40,14 +40,14 @@
buildPythonPackage rec {
pname = "graphrag";
version = "0.3.0";
version = "0.3.1";
pyproject = true;
src = fetchFromGitHub {
owner = "microsoft";
repo = "graphrag";
rev = "refs/tags/v${version}";
hash = "sha256-QPUxDMKO2qxF5qrk+vJCrJxyGwVWv7655YAVCis+XwM=";
hash = "sha256-97X9a3ietWDc5UgdgQ2ZSc7DPDEi96LxfO5aVZMNOfg=";
};
build-system = [
@ -55,16 +55,7 @@ buildPythonPackage rec {
poetry-dynamic-versioning
];
pythonRelaxDeps = [
"aiofiles"
"azure-identity"
"json-repair"
"lancedb"
"scipy"
"tenacity"
"textual"
"tiktoken"
];
pythonRelaxDeps = true;
dependencies = [
aiofiles

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "gsd";
version = "3.3.0";
version = "3.3.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "glotzerlab";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-sDb6TJvN7yFiRabc66zIjk6w9CEUYMhpe+fWv+apvkI=";
hash = "sha256-9C66k3OI+Xw+DPe8ZxuQmOiXmPWDTvJ2tVLHhfsEhgU=";
};
nativeBuildInputs = [ cython ];

View File

@ -0,0 +1,34 @@
{
buildPythonPackage,
fetchFromGitHub,
lib,
pytestCheckHook,
setuptools,
}:
buildPythonPackage rec {
pname = "ilcli";
version = "0.3.2";
pyproject = true;
src = fetchFromGitHub {
owner = "cloudant";
repo = "ilcli";
# no tags
rev = "2c033240a18603dd99c2dd8f6185ad0f0169c8c7";
hash = "sha256-6aLkzpeS1xeIbTwFFIT7V1KWOaFLLq3opjIxnUuXOBE=";
};
build-system = [ setuptools ];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "ilcli" ];
meta = {
description = "I like command-line interfaces";
homepage = "https://github.com/cloudant/ilcli";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ tochiaha ];
};
}

View File

@ -25,14 +25,14 @@
buildPythonPackage rec {
pname = "labgrid";
version = "24.0";
version = "24.0.1";
pyproject = true;
src = fetchFromGitHub {
owner = "labgrid-project";
repo = "labgrid";
rev = "refs/tags/v${version}";
hash = "sha256-XlndAmLkDjb4S2BD85noTMJCeqa5srZocjgg1x6Ry/g=";
hash = "sha256-KZO6HeB1Kkc3r6OI0ZXIL1WvGLYL5SLxaOn+EX5akOE=";
};
build-system = [

View File

@ -3,6 +3,7 @@
buildPythonPackage,
fetchPypi,
setuptools,
pytestCheckHook,
}:
buildPythonPackage rec {
@ -12,10 +13,15 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "sha256-vsmSFvMWFe5lOypch8rPtOS2GEwOn3HaGGMA2srpdPM=";
hash = "sha256-vsmSFvMWFe5lOypch8rPtOS2GEwOn3HaGGMA2srpdPM=";
};
build-system = [ setuptools ];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "oschmod" ];
meta = {
description = "Change file permissions on Windows, macOS, and Linux";
homepage = "https://github.com/yakdriver/oschmod";

View File

@ -8,7 +8,7 @@
}:
buildPythonPackage rec {
pname = "pcbnewtransition";
version = "0.4.1";
version = "0.4.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pcbnewTransition";
inherit version;
hash = "sha256-+mRExuDuEYxSSlrkEjSyPK+RRJZo+YJH7WnUVfjblRQ=";
hash = "sha256-fFOzL80m92PcF9SC6NZ69OUuEJn1sl+mWVFjRorhS4M=";
};
propagatedBuildInputs = [ kicad ];

View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "plexapi";
version = "4.15.15";
version = "4.15.16";
pyproject = true;
disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "pkkid";
repo = "python-plexapi";
rev = "refs/tags/${version}";
hash = "sha256-8sn+ttW8JzxrjDYvtRcjlahE0PNufMXySDwFsbg5zqk=";
hash = "sha256-NwGGNN6LC3gvE8zoVL5meNWMbqZjJ+6PcU2ebJTfJmU=";
};
build-system = [ setuptools ];

View File

@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "pyinfra";
version = "3.0.2";
version = "3.1";
pyproject = true;
disabled = pythonOlder "3.10";
@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "Fizzadar";
repo = "pyinfra";
rev = "refs/tags/v${version}";
hash = "sha256-Pjmh/aPsMIwGv5Agf+UGm1T3jv8i9jJQ7SEGc3vDxZg=";
hash = "sha256-uTGJX92AIaMLLLq0XPpfIhL9kFPR+aJgMxxoKYJf0PM=";
};
build-system = [ setuptools ];

View File

@ -1,87 +0,0 @@
{
lib,
stdenv,
buildPythonPackage,
fetchPypi,
pytestCheckHook,
pythonOlder,
substituteAll,
cython_0,
geos_3_11,
numpy,
oldest-supported-numpy,
setuptools,
wheel,
}:
buildPythonPackage rec {
pname = "shapely";
version = "1.8.5";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "Shapely";
inherit version;
hash = "sha256-6CttYOz7EkEgyI/hBqR4WWu+qxQhFtfn9ko2TayQKpI=";
};
# Environment variable used in shapely/_buildcfg.py
GEOS_LIBRARY_PATH = "${geos_3_11}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}";
patches = [
# Patch to search form GOES .so/.dylib files in a Nix-aware way
(substituteAll {
src = ./library-paths.patch;
libgeos_c = GEOS_LIBRARY_PATH;
libc = lib.optionalString (
!stdenv.isDarwin
) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6";
})
];
postPatch = ''
substituteInPlace pyproject.toml --replace "setuptools<64" "setuptools"
'';
nativeBuildInputs = [
cython_0
geos_3_11 # for geos-config
oldest-supported-numpy
setuptools
wheel
];
buildInputs = [ geos_3_11 ];
propagatedBuildInputs = [ numpy ];
nativeCheckInputs = [ pytestCheckHook ];
preCheck = ''
rm -r shapely # prevent import of local shapely
'';
disabledTests = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
# FIXME(lf-): these logging tests are broken, which is definitely our
# fault. I've tried figuring out the cause and failed.
#
# It is apparently some sandbox or no-sandbox related thing on macOS only
# though.
"test_error_handler_exception"
"test_error_handler"
"test_info_handler"
];
pythonImportsCheck = [ "shapely" ];
meta = with lib; {
changelog = "https://github.com/shapely/shapely/blob/${version}/CHANGES.txt";
description = "Manipulation and analysis of geometric objects";
homepage = "https://github.com/shapely/shapely";
license = licenses.bsd3;
maintainers = teams.geospatial.members;
};
}

View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "bacon";
version = "2.19.0";
version = "2.20.0";
src = fetchFromGitHub {
owner = "Canop";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-SAlw1TMl8V31wS/nkW3tPrLPV/FlmQtp+beIjtkQ204=";
hash = "sha256-pfILpDJbHLAwv/hUoMBjQSEyFAmU5VmVYY8lyf6j6NQ=";
};
cargoHash = "sha256-iK59VumYh1k/IAWBh7lXfNQ67xuapw4LuFxi1uo15Uw=";
cargoHash = "sha256-5LwWTmka13Pht7lgBH50AnEC0Y71v1OCuaqloMlr/20=";
buildInputs = lib.optionals stdenv.isDarwin [
CoreServices

View File

@ -3,12 +3,12 @@
buildGraalvmNativeImage rec {
pname = "clj-kondo";
version = "2024.05.24";
version = "2024.08.01";
src = fetchurl {
url =
"https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
sha256 = "sha256-vqdTfsIRPi2VlJLcbesRSqa/KFgqbk13vJBbEYd3heM=";
sha256 = "sha256-sDEZ3Tk2QRlL8oclV7vUZfdXpEdYCfCT45vP82Dccz4=";
};
graalvmDrv = graalvmCEPackages.graalvm-ce;

View File

@ -23,13 +23,13 @@
let
pname = "devpod";
version = "0.5.16";
version = "0.5.19";
src = fetchFromGitHub {
owner = "loft-sh";
repo = pname;
rev = "v${version}";
sha256 = "sha256-J9Qu9flp7l3BnQGHkDBSWTsNdDQSJUwp0W9GhOJehKo=";
sha256 = "sha256-SQac42C6tVFSP5Gx2s6uP4OKW+b+FoT7/+Lo3W178p0=";
};
meta = with lib; {

View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-binstall";
version = "1.6.9";
version = "1.10.2";
src = fetchFromGitHub {
owner = "cargo-bins";
repo = "cargo-binstall";
rev = "v${version}";
hash = "sha256-gByMCbh/RswZFrGY176PcZbBeHRsD0mv8Om4xQ/1wTo=";
hash = "sha256-/VBuRrTrqmLZDnSpuQLpD1wCLGlOViWJQ54YCSkqlvU=";
};
cargoHash = "sha256-GPDDKFM2dxsjQcrNK7y2lydnqGnFBUMcDJZ420jmzlo=";
cargoHash = "sha256-zg10wTrEwPd/fa4S4YIuhUnxRFaG+/+kuDxKQrBPnb4=";
nativeBuildInputs = [
pkg-config

View File

@ -56,7 +56,7 @@
"version": "1.20.6-148"
},
"1.21": {
"hash": "sha256-+WMhuewhpGB/JbVFhZAy+5HmIWwIbbY9fOOD/5oghco=",
"version": "1.21-108"
"hash": "sha256-BiD2eK6xWBogwZFiG0J8ELTw2G4YvwSVX9xE/5vcdY8=",
"version": "1.21-124"
}
}

View File

@ -2,19 +2,19 @@
buildGoModule rec {
pname = "hilbish";
version = "2.2.3";
version = "2.3.2";
src = fetchFromGitHub {
owner = "Rosettea";
repo = "Hilbish";
rev = "v${version}";
hash = "sha256-iqQhgge+m22gIIGlwwmAoYTxfMAs/sKrKjoQzyedil4=";
hash = "sha256-bCV9hiTvtkdEMPEn9r5PxB+MqJk030E5YISN8B/4h4A=";
fetchSubmodules = true;
};
subPackages = [ "." ];
vendorHash = "sha256-jf+S1On3Cib20Uepsm8WeRwEyuRKzSPFfsT2YVkx4fs=";
vendorHash = "sha256-v5YkRZA8oOKwXa6yFGQ33jKEc742zIrmJ0+w8ggmu/0=";
ldflags = [
"-s"

View File

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "ckbcomp";
version = "1.229";
version = "1.230";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "installer-team";
repo = "console-setup";
rev = version;
sha256 = "sha256-5kC41Ekvr6VBoD85P8weS802wgt6SX6GqgFXPPFZWJQ=";
sha256 = "sha256-Akt8c9yg/Q1Dxo5xZtLOdJ8yBlU9E1uMAwp388uQFVk=";
};
buildInputs = [ perl ];

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "analog";
version = "6.0.17";
version = "6.0.18";
src = fetchFromGitHub {
owner = "c-amie";
repo = "analog-ce";
rev = version;
sha256 = "sha256-89nNkIUKzlcKKy0TfthA9T27A446Fqv9hYllGjYkDP4=";
sha256 = "sha256-NCturEibnpl6+paUZezksHzP33WtAzfIolvBLeEHXjY=";
};
postPatch = ''

View File

@ -7,11 +7,11 @@
}:
yarn2nix-moretea.mkYarnPackage {
version = "1.1.26";
version = "1.1.27";
src = fetchzip {
url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.26.tgz";
sha256 = "038gywymz0spsxkfz3gzgv6cpk1n4phx8r1h14wzq30pwkw90nr6";
url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.27.tgz";
sha256 = "1m9wsny6b2lwis2ppalmc9qzn3b8pblgv1cszqbaywb835ll516g";
};
patches = [ ./fix-js-include-paths.patch ];
@ -21,7 +21,7 @@ yarn2nix-moretea.mkYarnPackage {
offlineCache = fetchYarnDeps {
yarnLock = ./yarn.lock;
hash = "sha256-FGlSxmIk6VP/NKZNLfYkFjUgY9m2VM0ZYoNq2b+zTHI=";
hash = "sha256-XQTHIFMxtb4G7gkksAU/oHajdNf0McFbubumW/8Gn1w=";
};
# Tarball has CRLF line endings. This makes patching difficult, so let's convert them.

View File

@ -1,6 +1,6 @@
{
"name": "meshcentral",
"version": "1.1.26",
"version": "1.1.27",
"keywords": [
"Remote Device Management",
"Remote Device Monitoring",

File diff suppressed because it is too large Load Diff

View File

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "moosefs";
version = "3.0.117";
version = "3.0.118";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-6zBMAi9ruPPlcnpdgqwl35QZ5u4MyFPUa70yvGTkHpo=";
sha256 = "sha256-Sm32VwKlE0V5HZj+VXr66gYKS+fcU1+UVQELiZ64DpU=";
};
nativeBuildInputs = [

View File

@ -5,14 +5,14 @@
rustPlatform.buildRustPackage rec {
pname = "grass";
version = "0.13.3";
version = "0.13.4";
src = fetchCrate {
inherit pname version;
hash = "sha256-catGfGiKjB6KZCt6yjwdR5VV0RAaBfiUnjlyCCBguBs=";
hash = "sha256-uk4XLF0QsH9Nhz73PmdSpwhxPdCh+DlNNqtbJtLWgNI=";
};
cargoHash = "sha256-xonfDCJWVIuZQOBSLcrEFnziHwz6ZNQQxvVh+ulueUo=";
cargoHash = "sha256-Vnbda4dkCIRheqKq4umLhn2LCO7lkJQUuPrkExj9708=";
# tests require rust nightly
doCheck = false;

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "vt-cli";
version = "0.10.2";
version = "1.0.1";
src = fetchFromGitHub {
owner = "VirusTotal";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-qwfrNm6XfoOtlpAI2aAaoivkp3Xsw9LnVtwnZ1wXGUs=";
hash = "sha256-NB5eo+6IwIxhQX1lwJzPOZ0pSeFVo7LYIEEmDqE4A7Y=";
};
vendorHash = "sha256-XN6dJpoJe9nJn+Tr9SYD64LE0XFiO2vlpdyI9SrZZjQ=";
vendorHash = "sha256-s90a35fFHO8Tt7Zjf9bk1VVD2xhG1g4rKmtIuMl0bMQ=";
ldflags = [
"-X github.com/VirusTotal/vt-cli/cmd.Version=${version}"

View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "stress-ng";
version = "0.18.01";
version = "0.18.02";
src = fetchFromGitHub {
owner = "ColinIanKing";
repo = pname;
rev = "V${version}";
hash = "sha256-of+sjt8niAR/zEZTlhNP395nyoGoBFQFsHmHmCpX7NQ=";
hash = "sha256-iyAW/vqo+V39kVygLRESI4D9yrTsC3DETrl3dmiGBdM=";
};
postPatch = ''

View File

@ -5,14 +5,14 @@
rustPlatform.buildRustPackage rec {
pname = "pulldown-cmark";
version = "0.11.0";
version = "0.11.2";
src = fetchCrate {
inherit pname version;
hash = "sha256-1RE622jAtIxv9Jk6vMdm1djaaUCyNGXHIIela+WRubI=";
hash = "sha256-Ox/5xp46/RjfJkn74dPcQQSBMa5Mtx98wbVSnpbViks=";
};
cargoHash = "sha256-L1KPpLw1MEYDisVdPEO16ZvSRx/ya22oDReyS+hG5t4=";
cargoHash = "sha256-+bbd/SjHM/hbxaOP2CbzZ7wI5ZzVTIHw9she8wm+M3w=";
meta = {
description = "Pull parser for CommonMark written in Rust";

View File

@ -4703,6 +4703,10 @@ self: super: with self; {
freertos-gdb = callPackage ../development/python-modules/freertos-gdb { };
freesasa = callPackage ../development/python-modules/freesasa {
inherit (pkgs) freesasa;
};
freetype-py = callPackage ../development/python-modules/freetype-py { };
freezegun = callPackage ../development/python-modules/freezegun { };
@ -5145,6 +5149,8 @@ self: super: with self; {
google-cloud-netapp = callPackage ../development/python-modules/google-cloud-netapp { };
google-cloud-network-connectivity = callPackage ../development/python-modules/google-cloud-network-connectivity { };
google-cloud-org-policy = callPackage ../development/python-modules/google-cloud-org-policy { };
google-cloud-os-config = callPackage ../development/python-modules/google-cloud-os-config { };
@ -5918,6 +5924,8 @@ self: super: with self; {
ilua = callPackage ../development/python-modules/ilua { };
ilcli = callPackage ../development/python-modules/ilcli { };
imagecodecs-lite = callPackage ../development/python-modules/imagecodecs-lite { };
imagecorruptions = callPackage ../development/python-modules/imagecorruptions { };
@ -6665,7 +6673,7 @@ self: super: with self; {
khanaa = callPackage ../development/python-modules/khanaa {};
kicad = toPythonModule (pkgs.kicad.override {
python311 = python;
python3 = python;
}).src;
kinparse = callPackage ../development/python-modules/kinparse { };
@ -14372,8 +14380,6 @@ self: super: with self; {
shapely = callPackage ../development/python-modules/shapely { };
shapely_1_8 = callPackage ../development/python-modules/shapely/1.8.nix { };
shaperglot = callPackage ../development/python-modules/shaperglot { };
sharedmem = callPackage ../development/python-modules/sharedmem { };