Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
b92edd0054
|
|
@ -56,7 +56,7 @@ in {
|
|||
serviceConfig = {
|
||||
Type = "idle";
|
||||
KillSignal = "SIGINT";
|
||||
ExecStart = "${cfg.package}/bin/llama-cpp-server --log-disable --host ${cfg.host} --port ${builtins.toString cfg.port} -m ${cfg.model} ${utils.escapeSystemdExecArgs cfg.extraFlags}";
|
||||
ExecStart = "${cfg.package}/bin/llama-server --log-disable --host ${cfg.host} --port ${builtins.toString cfg.port} -m ${cfg.model} ${utils.escapeSystemdExecArgs cfg.extraFlags}";
|
||||
Restart = "on-failure";
|
||||
RestartSec = 300;
|
||||
|
||||
|
|
|
|||
|
|
@ -1866,8 +1866,8 @@ let
|
|||
mktplcRef = {
|
||||
publisher = "github";
|
||||
name = "copilot-chat";
|
||||
version = "0.14.2024030801"; # compatible with vscode >= 1.87
|
||||
sha256 = "sha256-v9RS+pEEQzq2t0EY/gVTTfIwRlGmIuIq2qCockDpsn8=";
|
||||
version = "0.13.2024022301"; # compatible with vscode >= 1.87
|
||||
sha256 = "sha256-WdojLEdrg6iqTH/cNPEWb6VEfk+gIHh2M5GHrAURjy8=";
|
||||
};
|
||||
meta = {
|
||||
description = "GitHub Copilot Chat is a companion extension to GitHub Copilot that houses experimental chat features";
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "glooctl";
|
||||
version = "1.16.7";
|
||||
version = "1.16.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solo-io";
|
||||
repo = "gloo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-046zHSvJY9kl/vY8TL62TUYkg+otvchq0DIyDsro/+U=";
|
||||
hash = "sha256-M8ZNDt+sO8ZtVM1PyISOsFwXrD6q9ACPG0T99bqwk1c=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-UyzqKpF2WBj25Bm4MtkF6yjl87A61vGsteBNCjJV178=";
|
||||
|
|
|
|||
|
|
@ -1188,6 +1188,15 @@
|
|||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-FWwHAaUKUw7DyNs4sAlkLkGNj48wMJgpFvfQgbp8lFs="
|
||||
},
|
||||
"temporalcloud": {
|
||||
"hash": "sha256-ROFjDIzMLifFZAfetpDWOGylyg9Jp6vN9dEDLMZ3tz8=",
|
||||
"homepage": "https://registry.terraform.io/providers/temporalio/temporalcloud",
|
||||
"owner": "temporalio",
|
||||
"repo": "terraform-provider-temporalcloud",
|
||||
"rev": "v0.0.5",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-9sIVFZJXFR0+cJj6xL6bXRTY9dKIB6a+7ZCopeq9upM="
|
||||
},
|
||||
"tencentcloud": {
|
||||
"hash": "sha256-vcq7DvYv4dHd7nO4iwCWePuPwM2mIMfC438FkpG/Iwo=",
|
||||
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "supergfxctl";
|
||||
version = "5.1.2";
|
||||
version = "5.2.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "asus-linux";
|
||||
repo = "supergfxctl";
|
||||
rev = version;
|
||||
hash = "sha256-HJGyjFeN3bq+ArCGfFHAMnjW76wSnNyxPWR0ELcyjLg=";
|
||||
hash = "sha256-gjMLyT3pvQhmjz9SFbYlDAqg+tCX5ORkCkcnyBzO5ws=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-wPqCXbpSYXwsUi1mv9ZBSxdhDgDqsjKxnPzQcURlnDU=";
|
||||
cargoHash = "sha256-ndugyiAYPDyue2Ajxx22BNvYc9iBTxZqP5OxaqmC7U0=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace data/supergfxd.service --replace /usr/bin/supergfxd $out/bin/supergfxd
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "podman-tui";
|
||||
version = "0.17.0";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "podman-tui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-nPSUpGLSuIZMzgvmZtCZ3nqT5b1+0VkCmzPnUMLYkss=";
|
||||
hash = "sha256-T2hiCRoZqdbcB36Tpy597j7Hc1yeR2MijQbuheENfuA=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fast-float";
|
||||
version = "6.1.0";
|
||||
version = "6.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastfloat";
|
||||
repo = "fast_float";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-17GFUHm9FQAf3egqcQwQWqEgs2vH8K17GH2V1/DP8S0=";
|
||||
hash = "sha256-acaTUI+SWKSgmyJ+J4PzR5U7UtunbRiVuf5OsTf1Hko=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gitu";
|
||||
version = "0.6.2";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "altsem";
|
||||
repo = "gitu";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ymAggfyLPpXp4aQPHp1R+olKeCZwrcwu1GldM8yJVtQ=";
|
||||
hash = "sha256-5O6lAevDVU4ivYl7LziO5dE0K2qku+OJwjJ+KgPw3pI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-pIA9AnJoauT5nLxSgzR2Lk3wSo30fXAepAJlMahSuCA=";
|
||||
cargoHash = "sha256-dxiL8XRW2yM9XOhgB6IuZaRgjvic/LVr1bBYapsSAwk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
diff --git a/scripts/fetchPufferfish.sh b/scripts/fetchPufferfish.sh
|
||||
index bf2574e0..42582806 100755
|
||||
index 95e30053..8866767c 100755
|
||||
--- a/scripts/fetchPufferfish.sh
|
||||
+++ b/scripts/fetchPufferfish.sh
|
||||
@@ -11,10 +11,6 @@ CURR_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
|
||||
|
|
@ -17,11 +17,11 @@ index bf2574e0..42582806 100755
|
|||
rm -fr ${INSTALL_DIR}/src/pufferfish
|
||||
fi
|
||||
|
||||
-SVER=salmon-v1.10.2
|
||||
-SVER=salmon-v1.10.3
|
||||
-#SVER=develop
|
||||
-#SVER=sketch-mode
|
||||
-
|
||||
-EXPECTED_SHA256=f225b74833f71dcf767a565345224357fb091f90ce79717abc836814d9ccd101
|
||||
-EXPECTED_SHA256=52b6699de0d33814b73edb3455175568c2330d8014be017dce7b564e54134860
|
||||
-
|
||||
-mkdir -p ${EXTERNAL_DIR}
|
||||
-curl -k -L https://github.com/COMBINE-lab/pufferfish/archive/${SVER}.zip -o ${EXTERNAL_DIR}/pufferfish.zip
|
||||
|
|
|
|||
|
|
@ -20,20 +20,20 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "salmon";
|
||||
version = "1.10.2";
|
||||
version = "1.10.3";
|
||||
|
||||
pufferFishSrc = fetchFromGitHub {
|
||||
owner = "COMBINE-lab";
|
||||
repo = "pufferfish";
|
||||
rev = "salmon-v${finalAttrs.version}";
|
||||
hash = "sha256-JKbUFBEsqnENl4vFqve1FCd4TI3n9bRi2RNHC8QGQGc=";
|
||||
hash = "sha256-g4pfNuc620WQ7UDv8PQHVbbTVt78aGVqcHHMszmBIkA=";
|
||||
};
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "COMBINE-lab";
|
||||
repo = "salmon";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-kwqoUmVCqjr/xRxJjQKaFjjCQW+MFASHJ2f9OiAumNU=";
|
||||
hash = "sha256-HGcDqu0XzgrU3erHavigXCoj3VKk82ixMLY10Kk9MW4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ ballerina, lib, writeText, runCommand, makeWrapper, fetchzip, stdenv, openjdk }:
|
||||
let
|
||||
version = "2201.8.5";
|
||||
version = "2201.8.6";
|
||||
codeName = "swan-lake";
|
||||
in stdenv.mkDerivation {
|
||||
pname = "ballerina";
|
||||
|
|
@ -8,7 +8,7 @@ in stdenv.mkDerivation {
|
|||
|
||||
src = fetchzip {
|
||||
url = "https://dist.ballerina.io/downloads/${version}/ballerina-${version}-${codeName}.zip";
|
||||
hash = "sha256-xqgLEMlc8s7qsrjz9kDBvwmfS0ytTqP4yOaet6xog8A=";
|
||||
hash = "sha256-/oYyYziUTt4OqQfYJdDuRVy9xmMDfhpj24lbisQFfAU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libsmartcols";
|
||||
version = "2.36.1";
|
||||
version = "2.39.3";
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config python3 gtk-doc ];
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "karelzak";
|
||||
repo = "util-linux";
|
||||
rev = "v${version}";
|
||||
sha256 = "0z7nv054pqhlihqiw0vk3h40j0cxk1yxf8zzh0ddmvk6834cnyxs";
|
||||
sha256 = "sha256-X39os2iHqSrrYP6HVHPOkuTfc6vNB3pmsOP3VjW50fI=";
|
||||
};
|
||||
|
||||
configureFlags = [ "--disable-all-programs" "--enable-libsmartcols" ];
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
{ lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python3, pkg-config, bison
|
||||
, flex
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "thrift";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://archive.apache.org/dist/thrift/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "02x1xw0l669idkn6xww39j60kqxzcbmim4mvpb5h9nz8wqnx1292";
|
||||
};
|
||||
|
||||
#enableParallelBuilding = true; problems on hydra
|
||||
|
||||
# Workaround to make the python wrapper not drop this package:
|
||||
# pythonFull.buildEnv.override { extraLibs = [ thrift ]; }
|
||||
pythonPath = [];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
boost zlib libevent openssl bison flex (python3.withPackages (ps: [ps.twisted]))
|
||||
];
|
||||
|
||||
preConfigure = "export PY_PREFIX=$out";
|
||||
|
||||
# TODO: package boost-test, so we can run the test suite. (Currently it fails
|
||||
# to find libboost_unit_test_framework.a.)
|
||||
configureFlags = [ "--enable-tests=no" ];
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for scalable cross-language services";
|
||||
homepage = "https://thrift.apache.org/";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = [ maintainers.bjornfor ];
|
||||
knownVulnerabilities = [
|
||||
"CVE-2018-1320"
|
||||
"CVE-2018-11798"
|
||||
"CVE-2019-0205"
|
||||
"CVE-2019-0210"
|
||||
"CVE-2020-13949"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyterlab-server";
|
||||
version = "2.25.3";
|
||||
version = "2.25.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "jupyterlab_server";
|
||||
inherit version;
|
||||
hash = "sha256-hG8SWooZZWYR31sD5ZEsg5POppAIWbqmT6UV62So3EA=";
|
||||
hash = "sha256-IJgZjh6C4NuYJED5tRNhddc76izUKmSAqm/VAssjxPk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -70,6 +70,10 @@ buildPythonPackage rec {
|
|||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
pytestFlagsArray = [
|
||||
"-W" "ignore::DeprecationWarning"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# require optional language pack packages for tests
|
||||
"tests/test_translation_api.py"
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
, hatch-jupyter-builder
|
||||
, hatchling
|
||||
, async-lru
|
||||
, httpx
|
||||
, packaging
|
||||
, tornado
|
||||
, ipykernel
|
||||
|
|
@ -36,6 +37,7 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
async-lru
|
||||
httpx
|
||||
packaging
|
||||
tornado
|
||||
ipykernel
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mdformat-admon";
|
||||
version = "2.0.0";
|
||||
version = "2.0.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "KyleKing";
|
||||
repo = "mdformat-admon";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-MRcNExMPH/HIXB2DmN9fA89plo0IZPWXryySK9OZHg8=";
|
||||
hash = "sha256-TybbkF6+dIfG+1fGYp+bTEdw2GXINZJfOX0QiAaqiWY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,9 +3,12 @@
|
|||
, fetchFromGitHub
|
||||
, flit-core
|
||||
, mdformat
|
||||
, mdformat-admon
|
||||
, mdformat-gfm
|
||||
, mdit-py-plugins
|
||||
, more-itertools
|
||||
, pythonOlder
|
||||
, pytest-snapshot
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
|
|
@ -29,14 +32,22 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
mdformat
|
||||
mdformat-admon
|
||||
mdformat-gfm
|
||||
mdit-py-plugins
|
||||
more-itertools
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-snapshot
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# AssertionError: assert ParsedText(lines=[LineResult(parsed=ParsedLine(line_...
|
||||
"tests/format/test_parsed_result.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"mdformat_mkdocs"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
, poetry-core
|
||||
, pyopenssl
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, requests
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -24,6 +24,11 @@ buildPythonPackage rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"pyopenssl"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, aiohttp
|
||||
, babel
|
||||
, blinker
|
||||
|
|
@ -8,6 +7,7 @@
|
|||
, doit
|
||||
, feedparser
|
||||
, fetchPypi
|
||||
, fetchpatch2
|
||||
, freezegun
|
||||
, ghp-import
|
||||
, hsluv
|
||||
|
|
@ -54,6 +54,14 @@ buildPythonPackage rec {
|
|||
hash = "sha256-VYuhiGLMTHcOZM8/bGZT7Xx5BOHo9gsMPjufYglrBL0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
name = "nikola-pytest8-compat.patch";
|
||||
url = "https://github.com/getnikola/nikola/commit/5f1003f91cd59f62622d379efe9be5fb19a1ed3e.patch";
|
||||
hash = "sha256-2H3125RUnwvN/XgwgfRe1139rhAz/9viMEcUYRGQMPs=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace-fail "--cov nikola --cov-report term-missing" ""
|
||||
|
|
|
|||
|
|
@ -1,55 +1,77 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, cython
|
||||
, nose
|
||||
, matplotlib
|
||||
, nibabel
|
||||
|
||||
# build-system
|
||||
, cython_3
|
||||
, meson-python
|
||||
, ninja
|
||||
, setuptools
|
||||
|
||||
# dependencies
|
||||
, numpy
|
||||
, scipy
|
||||
, nibabel
|
||||
, sympy
|
||||
, python
|
||||
, transforms3d
|
||||
|
||||
# optional-dependencies
|
||||
, matplotlib
|
||||
|
||||
# tests
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.6.0";
|
||||
format = "setuptools";
|
||||
pname = "nipy";
|
||||
disabled = pythonOlder "2.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-BTn2nV4VMeT8bxTOJTHjRU8I2bxFZCzIZCZVn/QcUrk=";
|
||||
hash = "sha256-BTn2nV4VMeT8bxTOJTHjRU8I2bxFZCzIZCZVn/QcUrk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cython ];
|
||||
buildInputs = lib.optionals doCheck [ nose ];
|
||||
propagatedBuildInputs = [ matplotlib nibabel numpy scipy sympy ];
|
||||
|
||||
preBuild = ''
|
||||
make recythonize
|
||||
postPatch = ''
|
||||
patchShebangs nipy/_build_utils/cythoner.py
|
||||
'';
|
||||
|
||||
checkPhase = '' # wants to be run in a different directory
|
||||
mkdir nosetests
|
||||
cd nosetests
|
||||
${python.interpreter} -c "import nipy; nipy.test()"
|
||||
rm -rf .
|
||||
'';
|
||||
build-system = [
|
||||
cython_3
|
||||
meson-python
|
||||
setuptools
|
||||
ninja
|
||||
numpy
|
||||
];
|
||||
|
||||
# failing test:
|
||||
# nipy.algorithms.statistics.models.tests.test_olsR.test_results(11.593139639404727, 11.593140144880794, 6) # disagrees by 1 at 6th decimal place
|
||||
# erroring tests:
|
||||
# nipy.modalities.fmri.fmristat.tests.test_FIAC.test_altprotocol
|
||||
# nipy.modalities.fmri.fmristat.tests.test_FIAC.test_agreement
|
||||
# nipy.tests.test_scripts.test_nipy_4d_realign # because `nipy_4d_realign` script isn't found at test time; works from nix-shell, so could be patched
|
||||
# nipy.tests.test_scripts.test_nipy_3_4d # ditto re.: `nipy_3_4d` script
|
||||
doCheck = false;
|
||||
dependencies = [
|
||||
nibabel
|
||||
numpy
|
||||
scipy
|
||||
sympy
|
||||
transforms3d
|
||||
];
|
||||
|
||||
optional-dependencies.optional = [
|
||||
matplotlib
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
] ++ optional-dependencies.optional;
|
||||
|
||||
doCheck = false; # partial imports … circular dependencies. needs more time to figure out.
|
||||
|
||||
pythonImportsCheck = [
|
||||
"nipy"
|
||||
"nipy.testing"
|
||||
"nipy.algorithms"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://nipy.org/nipy";
|
||||
description = "Software for structural and functional neuroimaging analysis";
|
||||
downloadPage = "https://github.com/nipy/nipy";
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -23,6 +23,10 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"-W" "ignore::pytest.PytestRemovedIn8Warning"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"nocasedict"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -26,6 +26,10 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"-W" "ignore::pytest.PytestRemovedIn8Warning"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"nocaselist"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pybluez
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
|
|
@ -10,7 +11,7 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "nxt-python";
|
||||
version = "3.3.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
|
@ -21,11 +22,15 @@ buildPythonPackage rec {
|
|||
hash = "sha256-v65KEP5DuJsZAifd1Rh46x9lSAgBZgyo+e8PKSDKnhw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
pyusb
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
optional-dependencies = {
|
||||
bluetooth = [
|
||||
pybluez
|
||||
];
|
||||
|
|
|
|||
|
|
@ -26,7 +26,8 @@ buildPythonPackage rec {
|
|||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "hatchling==1.18.0" "hatchling" \
|
||||
--replace-fail "hatch-vcs==0.3.0" "hatch-vcs"
|
||||
--replace-fail "hatch-vcs==0.3.0" "hatch-vcs" \
|
||||
--replace-fail "hatch-fancy-pypi-readme==23.1.0" "hatch-fancy-pypi-readme"
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -44,8 +44,9 @@ buildPythonPackage rec {
|
|||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "hatch-vcs==0.3.0" "hatch-vcs" \
|
||||
--replace "hatchling==1.18.0" "hatchling"
|
||||
--replace-fail "hatch-vcs==0.3.0" "hatch-vcs" \
|
||||
--replace-fail "hatchling==1.18.0" "hatchling" \
|
||||
--replace-fail "hatch-fancy-pypi-readme==23.1.0" "hatch-fancy-pypi-readme"
|
||||
'';
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
|||
|
|
@ -124,6 +124,8 @@ buildPythonPackage rec {
|
|||
disabledTestPaths = [
|
||||
# require unpackaged kaleido and building it is a bit difficult
|
||||
"tests/visualization_tests"
|
||||
# ImportError: cannot import name 'mock_s3' from 'moto'
|
||||
"tests/artifacts_tests/test_boto3.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
|||
|
|
@ -91,11 +91,20 @@ buildPythonPackage rec {
|
|||
"papermill"
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"-W" "ignore::pytest.PytestRemovedIn8Warning"
|
||||
];
|
||||
|
||||
disabledTests = lib.optionals stdenv.isDarwin [
|
||||
# might fail due to the sandbox
|
||||
"test_end2end_autosave_slow_notebook"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# ImportError: cannot import name 'mock_s3' from 'moto'
|
||||
"papermill/tests/test_s3.py"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
, fetchFromGitHub
|
||||
, cython
|
||||
, joblib
|
||||
, matplotlib
|
||||
, numpy
|
||||
, pandas
|
||||
, scikit-learn
|
||||
|
|
@ -46,7 +47,15 @@ buildPythonPackage rec {
|
|||
cd $out/${python.sitePackages}
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
nativeCheckInputs = [
|
||||
matplotlib
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"-W" "ignore::pytest.PytestRemovedIn8Warning"
|
||||
];
|
||||
|
||||
disabledTests= [
|
||||
# touches internet
|
||||
"test_load_from_web"
|
||||
|
|
|
|||
|
|
@ -22,10 +22,6 @@ buildPythonPackage rec {
|
|||
hash = "sha256-MJ4mwOFswLYHhg2LNZ+/ZwDvSjoxElVxlaWjArHV2NY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./pep-621.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i "/^addopts/d" pyproject.toml
|
||||
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
diff --git a/pyproject.toml b/pyproject.toml
|
||||
index da1376e..88298a7 100644
|
||||
--- a/pyproject.toml
|
||||
+++ b/pyproject.toml
|
||||
@@ -1,11 +1,11 @@
|
||||
-[tool.poetry]
|
||||
+[project]
|
||||
name = "preprocess_cancellation"
|
||||
version = "0.2.0"
|
||||
description = "GCode processor to add klipper cancel-object markers"
|
||||
readme = "README.md"
|
||||
-authors = ["Franklyn Tackitt <im@frank.af>"]
|
||||
-repository = "https://github.com/kageurufu/cancelobject-preprocessor"
|
||||
-license = "GPL-3.0-only"
|
||||
+authors = [ { name = "Franklyn Tackitt", email = "im@frank.af" } ]
|
||||
+urls.repository = "https://github.com/kageurufu/cancelobject-preprocessor"
|
||||
+license.text = "GPL-3.0-only"
|
||||
|
||||
[tool.poetry.urls]
|
||||
"Bug Tracker" = "https://github.com/kageurufu/cancelobject-preprocessor/issues"
|
||||
|
|
@ -2,12 +2,12 @@
|
|||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, setuptools-scm
|
||||
, toml
|
||||
, poetry-core
|
||||
, poetry-dynamic-versioning
|
||||
, pydantic
|
||||
, pytestCheckHook
|
||||
, pytest-benchmark
|
||||
, hatch-vcs
|
||||
, hatchling
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -24,16 +24,29 @@ buildPythonPackage rec {
|
|||
hash = "sha256-sGKnta+agrpJkQB0twFkqRreD5WB2O/06g75N0ic4mc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
hatch-vcs
|
||||
hatchling
|
||||
postPatch = ''
|
||||
sed -i "/addopts =/d" pyproject.toml
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
poetry-core
|
||||
poetry-dynamic-versioning
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
dependencies = [
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pydantic
|
||||
pytestCheckHook
|
||||
pytest-benchmark
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"--benchmark-disable"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pure_protobuf"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -16,8 +16,7 @@ buildPythonPackage rec {
|
|||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "py_stringmatching";
|
||||
inherit version;
|
||||
inherit pname version;
|
||||
hash = "sha256-2XuhtWKtmO/8lGaHxdqwdMF6UVEUqw3PUCIC1c7J8rU=";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
, fastparquet
|
||||
, fetchPypi
|
||||
, fsspec
|
||||
, hatchling
|
||||
, pandas
|
||||
, poetry-core
|
||||
, pyarrow
|
||||
, pythonOlder
|
||||
, sqlalchemy
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,6 +2,12 @@
|
|||
# It is not intended for manual editing.
|
||||
version = 3
|
||||
|
||||
[[package]]
|
||||
name = "arc-swap"
|
||||
version = "1.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7b3d0060af21e8d11a926981cc00c6c1541aa91dd64b9f881985c3da1094425f"
|
||||
|
||||
[[package]]
|
||||
name = "atomic_refcell"
|
||||
version = "0.1.13"
|
||||
|
|
@ -22,9 +28,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
|||
|
||||
[[package]]
|
||||
name = "bumpalo"
|
||||
version = "3.14.0"
|
||||
version = "3.15.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
|
||||
checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa"
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
|
|
@ -33,10 +39,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.1.16"
|
||||
name = "fastrand"
|
||||
version = "2.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
|
||||
checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.2.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"js-sys",
|
||||
|
|
@ -46,10 +61,16 @@ dependencies = [
|
|||
]
|
||||
|
||||
[[package]]
|
||||
name = "indoc"
|
||||
version = "1.0.9"
|
||||
name = "heck"
|
||||
version = "0.4.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306"
|
||||
checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
|
||||
|
||||
[[package]]
|
||||
name = "indoc"
|
||||
version = "2.0.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8"
|
||||
|
||||
[[package]]
|
||||
name = "itoa"
|
||||
|
|
@ -59,18 +80,18 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
|
|||
|
||||
[[package]]
|
||||
name = "js-sys"
|
||||
version = "0.3.66"
|
||||
version = "0.3.69"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca"
|
||||
checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
|
||||
dependencies = [
|
||||
"wasm-bindgen",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.151"
|
||||
version = "0.2.153"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
|
||||
checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
|
||||
|
||||
[[package]]
|
||||
name = "lock_api"
|
||||
|
|
@ -84,9 +105,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "log"
|
||||
version = "0.4.20"
|
||||
version = "0.4.21"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
|
||||
checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
|
||||
|
||||
[[package]]
|
||||
name = "memoffset"
|
||||
|
|
@ -127,23 +148,23 @@ dependencies = [
|
|||
]
|
||||
|
||||
[[package]]
|
||||
name = "ppv-lite86"
|
||||
version = "0.2.17"
|
||||
name = "portable-atomic"
|
||||
version = "1.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
|
||||
checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.71"
|
||||
version = "1.0.79"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8"
|
||||
checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pycrdt"
|
||||
version = "0.8.2"
|
||||
version = "0.8.13"
|
||||
dependencies = [
|
||||
"pyo3",
|
||||
"yrs",
|
||||
|
|
@ -151,15 +172,16 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "pyo3"
|
||||
version = "0.19.2"
|
||||
version = "0.20.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e681a6cfdc4adcc93b4d3cf993749a4552018ee0a9b65fc0ccfad74352c72a38"
|
||||
checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"indoc",
|
||||
"libc",
|
||||
"memoffset",
|
||||
"parking_lot",
|
||||
"portable-atomic",
|
||||
"pyo3-build-config",
|
||||
"pyo3-ffi",
|
||||
"pyo3-macros",
|
||||
|
|
@ -168,9 +190,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "pyo3-build-config"
|
||||
version = "0.19.2"
|
||||
version = "0.20.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "076c73d0bc438f7a4ef6fdd0c3bb4732149136abd952b110ac93e4edb13a6ba5"
|
||||
checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7"
|
||||
dependencies = [
|
||||
"once_cell",
|
||||
"target-lexicon",
|
||||
|
|
@ -178,9 +200,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "pyo3-ffi"
|
||||
version = "0.19.2"
|
||||
version = "0.20.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e53cee42e77ebe256066ba8aa77eff722b3bb91f3419177cf4cd0f304d3284d9"
|
||||
checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"pyo3-build-config",
|
||||
|
|
@ -188,77 +210,38 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "pyo3-macros"
|
||||
version = "0.19.2"
|
||||
version = "0.20.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dfeb4c99597e136528c6dd7d5e3de5434d1ceaf487436a3f03b2d56b6fc9efd1"
|
||||
checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"pyo3-macros-backend",
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pyo3-macros-backend"
|
||||
version = "0.19.2"
|
||||
version = "0.20.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "947dc12175c254889edc0c02e399476c2f652b4b9ebd123aa655c224de259536"
|
||||
checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro2",
|
||||
"pyo3-build-config",
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.33"
|
||||
version = "1.0.35"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
|
||||
checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand"
|
||||
version = "0.7.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
"libc",
|
||||
"rand_chacha",
|
||||
"rand_core",
|
||||
"rand_hc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_chacha"
|
||||
version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
|
||||
dependencies = [
|
||||
"ppv-lite86",
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_core"
|
||||
version = "0.5.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_hc"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
|
||||
dependencies = [
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_syscall"
|
||||
version = "0.4.1"
|
||||
|
|
@ -270,9 +253,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "ryu"
|
||||
version = "1.0.16"
|
||||
version = "1.0.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
|
||||
checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
|
||||
|
||||
[[package]]
|
||||
name = "scopeguard"
|
||||
|
|
@ -282,29 +265,29 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
|
|||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.193"
|
||||
version = "1.0.197"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
|
||||
checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.193"
|
||||
version = "1.0.197"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
|
||||
checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.43",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.108"
|
||||
version = "1.0.114"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
|
||||
checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"ryu",
|
||||
|
|
@ -322,26 +305,15 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "smallvec"
|
||||
version = "1.11.2"
|
||||
version = "1.13.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
|
||||
checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "1.0.109"
|
||||
version = "2.0.53"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.43"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53"
|
||||
checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -350,28 +322,28 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "target-lexicon"
|
||||
version = "0.12.12"
|
||||
version = "0.12.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a"
|
||||
checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
|
||||
|
||||
[[package]]
|
||||
name = "thiserror"
|
||||
version = "1.0.52"
|
||||
version = "1.0.58"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "83a48fd946b02c0a526b2e9481c8e2a17755e47039164a86c4070446e3a4614d"
|
||||
checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
|
||||
dependencies = [
|
||||
"thiserror-impl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror-impl"
|
||||
version = "1.0.52"
|
||||
version = "1.0.58"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3"
|
||||
checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.43",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -382,21 +354,21 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
|
|||
|
||||
[[package]]
|
||||
name = "unindent"
|
||||
version = "0.1.11"
|
||||
version = "0.2.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c"
|
||||
checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce"
|
||||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
version = "0.9.0+wasi-snapshot-preview1"
|
||||
version = "0.11.0+wasi-snapshot-preview1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
|
||||
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen"
|
||||
version = "0.2.89"
|
||||
version = "0.2.92"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e"
|
||||
checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"wasm-bindgen-macro",
|
||||
|
|
@ -404,24 +376,24 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-backend"
|
||||
version = "0.2.89"
|
||||
version = "0.2.92"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826"
|
||||
checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
|
||||
dependencies = [
|
||||
"bumpalo",
|
||||
"log",
|
||||
"once_cell",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.43",
|
||||
"syn",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro"
|
||||
version = "0.2.89"
|
||||
version = "0.2.92"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2"
|
||||
checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"wasm-bindgen-macro-support",
|
||||
|
|
@ -429,22 +401,22 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro-support"
|
||||
version = "0.2.89"
|
||||
version = "0.2.92"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
|
||||
checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.43",
|
||||
"syn",
|
||||
"wasm-bindgen-backend",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-shared"
|
||||
version = "0.2.89"
|
||||
version = "0.2.92"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f"
|
||||
checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
|
||||
|
||||
[[package]]
|
||||
name = "windows-targets"
|
||||
|
|
@ -505,12 +477,13 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
|
|||
|
||||
[[package]]
|
||||
name = "yrs"
|
||||
version = "0.17.2"
|
||||
version = "0.18.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "68aea14c6c33f2edd8a5ff9415360cfa5b98d90cce30c5ee3be59a8419fb15a9"
|
||||
checksum = "5ad19cd99f9c036345d66331db64c7b2c823ca1ac2c30c5ca26eed149c6b4672"
|
||||
dependencies = [
|
||||
"arc-swap",
|
||||
"atomic_refcell",
|
||||
"rand",
|
||||
"fastrand",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"smallstr",
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycrdt";
|
||||
version = "0.8.2";
|
||||
version = "0.8.13";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jupyter-server";
|
||||
repo = "pycrdt";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-RY0ndkMW4a2KxkebkoSEAzCgdUyHujglHJCzkoFCJZA=";
|
||||
hash = "sha256-puYJ0mR1JpwD823P6JrXmNjFvqZUPqEj2T4Wk81oBMU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
, numpy
|
||||
, fluidsynth
|
||||
, stdenv
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -20,16 +19,6 @@ buildPythonPackage rec {
|
|||
hash = "sha256-1Q1LVQc+dYCyo8pHCZK2xRwnnbocVRLchRNVlfQtaIE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fixes error: Unknown integer parameter 'synth.sample-rate'
|
||||
# https://github.com/nwhitehead/pyfluidsynth/pull/44
|
||||
(fetchpatch {
|
||||
name = "add-fluid-synth-get-status-and-fix-some-typing-bugs.patch";
|
||||
url = "https://github.com/nwhitehead/pyfluidsynth/commit/1b31ca6ab00930dbb515c4cc00bb31a65578b7c0.patch";
|
||||
hash = "sha256-ZCqy7aIv5iAAJrWOD7e538xltj11gy5fakIXnAbUsu8=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
wheel
|
||||
|
|
|
|||
|
|
@ -40,7 +40,8 @@ buildPythonPackage rec {
|
|||
|
||||
preCheck = ''
|
||||
# make sure we don't import pykdtree from the source tree
|
||||
mv pykdtree tests
|
||||
mv pykdtree/test_tree.py .
|
||||
rm -rf pykdtree
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildPythonPackage
|
||||
, click
|
||||
, dawg-python
|
||||
, docopt
|
||||
, pytestCheckHook
|
||||
|
|
@ -27,9 +28,13 @@ buildPythonPackage rec {
|
|||
pymorphy3-dicts-uk
|
||||
];
|
||||
|
||||
optional-dependencies.CLI = [
|
||||
click
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
] ++ optional-dependencies.CLI;
|
||||
|
||||
pythonImportsCheck = [ "pymorphy3" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ buildPythonPackage rec {
|
|||
|
||||
pythonRelaxDeps = [
|
||||
"pydantic"
|
||||
"typing-extensions"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ let
|
|||
in
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "2.0.7";
|
||||
version = "2.0.8";
|
||||
pname = "pyscard";
|
||||
pyproject = true;
|
||||
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "LudovicRousseau";
|
||||
repo = "pyscard";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-nkDI1OPQ4SsNhWkg53ZTsG7j0+mvpkJI7dsyaOl1a/8=";
|
||||
hash = "sha256-UpTSbq4mf42tcSWL8wR54MQDZ+z2YjrTW0Ud2F5/J2E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytapo";
|
||||
version = "3.3.18";
|
||||
version = "3.3.19";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-CiLZ+FUmawZaKQxkDxYCv0Qs/djFuIVSyQ0eSi41HDg=";
|
||||
hash = "sha256-Zm/ll6vOFW05euRgJN+SghVmMkSGQc9CVZkRu3h6AQQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildPythonPackage
|
||||
, poetry-core
|
||||
, hatchling
|
||||
, hatch-vcs
|
||||
, pytest
|
||||
, pytest-localserver
|
||||
, pytest-metadata
|
||||
, requests
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
|
|
@ -11,20 +13,21 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-base-url";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pytest-dev";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-v6pLejWNeb9Do6x2EJqmLKj8DNqcMtmYIs+7iDYsbjk=";
|
||||
repo = "pytest-base-url";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-3P3Uk3QoznAtNODLjXFbeNn3AOfp9owWU2jqkxTEAa4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
hatchling
|
||||
hatch-vcs
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -40,6 +43,7 @@ buildPythonPackage rec {
|
|||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-localserver
|
||||
pytest-metadata
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
|
|
@ -58,7 +62,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "pytest plugin for URL based tests";
|
||||
homepage = "https://github.com/pytest-dev/pytest-base-url";
|
||||
changelog = "https://github.com/pytest-dev/pytest-base-url/blob/v${version}/CHANGES.rst";
|
||||
changelog = "https://github.com/pytest-dev/pytest-base-url/blob/${src.rev}/CHANGES.rst";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ sephi ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -12,12 +12,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-mpl";
|
||||
version = "0.17.0";
|
||||
version = "0.16.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-++8F1+ZktLM0UvtpisGI5SJ5HzJ9405+o329/p1SysY=";
|
||||
hash = "sha256-LVcWgRJOj/X04rnA0EfTfQSZ1rbY8vSaG1DN2ZMQRGk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,6 +15,10 @@ buildPythonPackage rec {
|
|||
hash = "sha256-TOuyVH2wKKruy7SBNW3z62yzpmBT6l6RcKhoO1XUFhE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/addopts =/d' setup.cfg
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
matplotlib
|
||||
|
|
|
|||
|
|
@ -22,11 +22,11 @@
|
|||
, scipy
|
||||
, sentencepiece
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, slicer
|
||||
, tqdm
|
||||
, transformers
|
||||
, xgboost
|
||||
, wheel
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -46,7 +46,7 @@ buildPythonPackage rec {
|
|||
nativeBuildInputs = [
|
||||
oldest-supported-numpy
|
||||
setuptools
|
||||
wheel
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
, requests
|
||||
, responses
|
||||
, setuptools
|
||||
, typing-extensions
|
||||
, zeep
|
||||
}:
|
||||
|
||||
|
|
@ -38,6 +39,7 @@ buildPythonPackage rec {
|
|||
pendulum
|
||||
pyjwt
|
||||
requests
|
||||
typing-extensions
|
||||
zeep
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -68,6 +68,9 @@ buildPythonPackage rec {
|
|||
disabledTestPaths = [
|
||||
# we are not interested in linting errors
|
||||
"tests/test_lint.py"
|
||||
# ImportError: cannot import name 'mock_s3' from 'moto'
|
||||
"tests/test_embedding.py"
|
||||
"tests/test_record_writer.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, setuptools
|
||||
, greenlet
|
||||
, trio
|
||||
, outcome
|
||||
, sniffio
|
||||
, exceptiongroup
|
||||
, pytest-trio
|
||||
, pytestCheckHook
|
||||
, pythonAtLeast
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pytest-runner'" ""
|
||||
--replace '"pytest-runner"' ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -35,6 +35,7 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
greenlet
|
||||
trio
|
||||
outcome
|
||||
sniffio
|
||||
|
|
@ -42,6 +43,9 @@ buildPythonPackage rec {
|
|||
exceptiongroup
|
||||
];
|
||||
|
||||
# RuntimeWarning: Can't run the Python asyncio tests because they're not installed. On a Debian/Ubuntu system, you might need to install the libpython3.11-testsuite package.
|
||||
doCheck = false;
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-trio
|
||||
pytestCheckHook
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ buildPythonPackage rec {
|
|||
preCheck = ''
|
||||
cd $TMP
|
||||
'';
|
||||
pytestFlagsArray = ["--pyargs" "uarray"];
|
||||
pytestFlagsArray = ["--pyargs" "uarray" "-W" "ignore::pytest.PytestRemovedIn8Warning" ];
|
||||
pythonImportsCheck = [ "uarray" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "xml2rfc";
|
||||
version = "3.20.0";
|
||||
version = "3.20.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -36,7 +36,7 @@ buildPythonPackage rec {
|
|||
owner = "ietf-tools";
|
||||
repo = "xml2rfc";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-w4wmjY+yA5Nc1roAXBRTqQxqaSI1vzdMhK9hGkbv7Rk=";
|
||||
hash = "sha256-JDJZegJR34aaIzMdq/GYzOpIBH7epe9yHnUaI7OzRes=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cocogitto";
|
||||
version = "6.0.1";
|
||||
version = "6.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oknozor";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-iJH2uXlKsq7I94D3/Fe3pB8SzPfO0CodEk3XNdGleMk=";
|
||||
sha256 = "sha256-yGwGWXME9ZjFJk/3pVDRTa1phG6kd8+YhXe/MxOEdF0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-srcAUrPrrZoNUn7OeyzSRpOiEuyEizxTiEUbaNg9llE=";
|
||||
cargoHash = "sha256-iS/nRfy63bgo7MeL/5jJ3Vn6S7dG49erIZ+0516YxKM=";
|
||||
|
||||
# Test depend on git configuration that would likely exist in a normal user environment
|
||||
# and might be failing to create the test repository it works in.
|
||||
|
|
|
|||
|
|
@ -2,19 +2,19 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "atlas";
|
||||
version = "0.19.2";
|
||||
version = "0.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ariga";
|
||||
repo = "atlas";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-P3KatCF9zoqGRh2N1Rc89wJmsE0bRM5Uoq3zTSdAhTY=";
|
||||
hash = "sha256-PQPf3cHlKP+0PIOkR/SZ4f9sBv+gJ+bJuJl9/OLRpb0=";
|
||||
};
|
||||
|
||||
modRoot = "cmd/atlas";
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-roMEd/R+WmsWdCT9eye0ijqCcYzSSqVFU9mRN1Sw0jk=";
|
||||
vendorHash = "sha256-48UmLwp93SjwPPrdySFVApjVf1Rsj3oNhi1lha4ZvyE=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "vultr-cli";
|
||||
|
|
@ -17,7 +17,7 @@ buildGoModule rec {
|
|||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
postInstall = ''
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd vultr-cli \
|
||||
--bash <($out/bin/vultr-cli completion bash) \
|
||||
--fish <($out/bin/vultr-cli completion fish) \
|
||||
|
|
|
|||
|
|
@ -7,22 +7,22 @@
|
|||
|
||||
let
|
||||
pname = "osu-lazer-bin";
|
||||
version = "2024.312.0";
|
||||
version = "2024.312.1";
|
||||
|
||||
src = {
|
||||
aarch64-darwin = fetchzip {
|
||||
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
|
||||
hash = "sha256-RwOSB/WcAqR8j0xw1QUji1IEn7iHXcHj2xOcKjnpl00=";
|
||||
hash = "sha256-1MsZ9gHTZKArXk1b6XEBNk/ZWAUHKjbVrrn++dLulaQ=";
|
||||
stripRoot = false;
|
||||
};
|
||||
x86_64-darwin = fetchzip {
|
||||
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
|
||||
hash = "sha256-Wnr7CtQIfugKrGsl72NXdHJIsF7rRNhzjV1Q+gRHK10=";
|
||||
hash = "sha256-Xgl8lrMsL9O9YHbEx3Iwwh9fpLOnYZN0Kt28F5X5OwE=";
|
||||
stripRoot = false;
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
|
||||
hash = "sha256-kWNobQXGGS2TWvPkhfheqnlbijfnxfcP36ANUeN6bW0=";
|
||||
hash = "sha256-1dzgs1p3/pf4eCdKvQ9JxowN+oBPBNaZv5e6qHeFPEM=";
|
||||
};
|
||||
}.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported.");
|
||||
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "osu-lazer";
|
||||
version = "2024.312.0";
|
||||
version = "2024.312.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ppy";
|
||||
repo = "osu";
|
||||
rev = version;
|
||||
hash = "sha256-54georjON2Fu/kj4w4SeW0BR/aHomGrKeicJ9N4/Y9s=";
|
||||
hash = "sha256-7xxuVcBtC79EiDz+/x0IqbPofpgwMdz87XjRLqkCBb8=";
|
||||
};
|
||||
|
||||
projectFile = "osu.Desktop/osu.Desktop.csproj";
|
||||
|
|
|
|||
|
|
@ -147,8 +147,8 @@
|
|||
(fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.5-gc8dfc5ca19"; sha256 = "0i6bb79kprrmsfphjq26rgxqfvvf12pxr7dfwcq448dw2xgq6rpy"; })
|
||||
(fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.5-gc8dfc5ca19"; sha256 = "06a4kkfidr7yj60xl3k4yfawz4wzwkkjpaki8fmsanif1yhz69l8"; })
|
||||
(fetchNuGet { pname = "ppy.Veldrid.SPIRV"; version = "1.0.15-gca6cec7843"; sha256 = "09pi4c91ljavilw9kx7kzhcax7ar4zk7zy1qwvqfrqsgxznvyxa1"; })
|
||||
(fetchNuGet { pname = "Realm"; version = "11.7.0"; sha256 = "1vp8rparpcv7rbqx7m55xcji941a6qjamxhb943fgfkjf196z69w"; })
|
||||
(fetchNuGet { pname = "Realm.PlatformHelpers"; version = "11.7.0"; sha256 = "1a7kaap5ad3n7cgf07xa9yc4c1qi7cf2zj3f5hdv7fp84bdzmysg"; })
|
||||
(fetchNuGet { pname = "Realm"; version = "11.5.0"; sha256 = "0r7j5si3n4ncq8xnnjk1q5jjqbj0s1w3ps124y8pgqd14dzvch6a"; })
|
||||
(fetchNuGet { pname = "Realm.PlatformHelpers"; version = "11.5.0"; sha256 = "1ggbmlsf04pxnh1k86hs0wxnvcw0ja2xnn6358qmrp826km0w1g9"; })
|
||||
(fetchNuGet { pname = "Remotion.Linq"; version = "2.2.0"; sha256 = "1y46ni0xswmmiryp8sydjgryafwn458dr91f9xn653w73kdyk4xf"; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; })
|
||||
|
|
@ -168,11 +168,8 @@
|
|||
(fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; })
|
||||
(fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; })
|
||||
(fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; })
|
||||
(fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; })
|
||||
(fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; })
|
||||
(fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; })
|
||||
(fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; })
|
||||
(fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; })
|
||||
(fetchNuGet { pname = "runtime.native.System"; version = "4.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; })
|
||||
(fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; })
|
||||
(fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; })
|
||||
|
|
@ -180,22 +177,14 @@
|
|||
(fetchNuGet { pname = "runtime.native.System.Net.Security"; version = "4.3.0"; sha256 = "0dnqjhw445ay3chpia9p6vy4w2j6s9vy3hxszqvdanpvvyaxijr3"; })
|
||||
(fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; })
|
||||
(fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; })
|
||||
(fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6"; })
|
||||
(fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; })
|
||||
(fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; })
|
||||
(fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; })
|
||||
(fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; })
|
||||
(fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; })
|
||||
(fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; })
|
||||
(fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; })
|
||||
(fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; })
|
||||
(fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; })
|
||||
(fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; })
|
||||
(fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; })
|
||||
(fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; })
|
||||
(fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; })
|
||||
(fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; })
|
||||
(fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; })
|
||||
(fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; })
|
||||
(fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; })
|
||||
(fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; })
|
||||
|
|
@ -258,7 +247,7 @@
|
|||
(fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; })
|
||||
(fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; })
|
||||
(fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; })
|
||||
(fetchNuGet { pname = "System.Net.Security"; version = "4.3.2"; sha256 = "1aw1ca1vssqrillrh4qkarx0lxwc8wcaqdkfdima8376wb98j2q8"; })
|
||||
(fetchNuGet { pname = "System.Net.Security"; version = "4.3.0"; sha256 = "1aa5igz31ivk6kpgsrwck3jccab7wd88wr52lddmgypmbh9mmf87"; })
|
||||
(fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; })
|
||||
(fetchNuGet { pname = "System.Net.WebHeaderCollection"; version = "4.3.0"; sha256 = "0ms3ddjv1wn8sqa5qchm245f3vzzif6l6fx5k92klqpn7zf4z562"; })
|
||||
(fetchNuGet { pname = "System.Net.WebSockets"; version = "4.3.0"; sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; })
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
{ lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre, version, hash }:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "papermc";
|
||||
inherit version;
|
||||
inherit version hash;
|
||||
|
||||
src =
|
||||
let
|
||||
version-split = lib.strings.splitString "-" version;
|
||||
version-split = lib.strings.splitString "-" finalAttrs.version;
|
||||
mcVersion = builtins.elemAt version-split 0;
|
||||
buildNum = builtins.elemAt version-split 1;
|
||||
in
|
||||
fetchurl {
|
||||
url = "https://papermc.io/api/v2/projects/paper/versions/${mcVersion}/builds/${buildNum}/downloads/paper-${version}.jar";
|
||||
inherit hash;
|
||||
url = "https://papermc.io/api/v2/projects/paper/versions/${mcVersion}/builds/${buildNum}/downloads/paper-${mcVersion}-${buildNum}.jar";
|
||||
inherit (finalAttrs) hash;
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
@ -47,4 +47,4 @@ stdenvNoCC.mkDerivation {
|
|||
maintainers = with lib.maintainers; [ aaronjanse neonfuz MayNiklas ];
|
||||
mainProgram = "minecraft-server";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
mkKdeDerivation,
|
||||
qtsvg,
|
||||
qtwayland,
|
||||
qtimageformats,
|
||||
pkg-config,
|
||||
cfitsio,
|
||||
exiv2,
|
||||
|
|
@ -19,6 +20,8 @@ mkKdeDerivation {
|
|||
extraBuildInputs = [
|
||||
qtsvg
|
||||
qtwayland
|
||||
# adds support for webp and other image formats
|
||||
qtimageformats
|
||||
|
||||
cfitsio
|
||||
exiv2
|
||||
|
|
|
|||
|
|
@ -144,6 +144,7 @@ in stdenv.mkDerivation rec {
|
|||
preBuild = ''
|
||||
sconsFlags+=" CC=$CC"
|
||||
sconsFlags+=" CXX=$CXX"
|
||||
'' + optionalString (!stdenv.isDarwin) ''
|
||||
sconsFlags+=" AR=$AR"
|
||||
'' + optionalString stdenv.isAarch64 ''
|
||||
sconsFlags+=" CCFLAGS='-march=armv8-a+crc'"
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "neo4j";
|
||||
version = "5.17.0";
|
||||
version = "5.18.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz";
|
||||
hash = "sha256-l1t5RI5KfgzT9ynDQxSbUtIEdPs1BVCdY4396GHJxEA=";
|
||||
hash = "sha256-XPpX6alLb81o5IBX16eHHkJMi8V/R/2YXWOCxEHKdU0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
diff --git a/configure.py b/configure.py
|
||||
index 25ca951ac..454140420 100755
|
||||
--- a/configure.py
|
||||
+++ b/configure.py
|
||||
@@ -36,13 +36,16 @@ tempfile.tempdir = "./build/tmp"
|
||||
|
||||
configure_args = str.join(' ', [shlex.quote(x) for x in sys.argv[1:]])
|
||||
|
||||
-for line in open('/etc/os-release'):
|
||||
- key, _, value = line.partition('=')
|
||||
- value = value.strip().strip('"')
|
||||
- if key == 'ID':
|
||||
- os_ids = [value]
|
||||
- if key == 'ID_LIKE':
|
||||
- os_ids += value.split(' ')
|
||||
+try:
|
||||
+ for line in open('/etc/os-release'):
|
||||
+ key, _, value = line.partition('=')
|
||||
+ value = value.strip().strip('"')
|
||||
+ if key == 'ID':
|
||||
+ os_ids = [value]
|
||||
+ if key == 'ID_LIKE':
|
||||
+ os_ids += value.split(' ')
|
||||
+except FileNotFoundError:
|
||||
+ os_ids = ["linux"]
|
||||
|
||||
|
||||
# distribution "internationalization", converting package names.
|
||||
|
|
@ -1,104 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
python3Packages,
|
||||
pkg-config,
|
||||
gcc8Stdenv,
|
||||
boost,
|
||||
git,
|
||||
systemd,
|
||||
gnutls,
|
||||
cmake,
|
||||
makeWrapper,
|
||||
ninja,
|
||||
ragel,
|
||||
hwloc,
|
||||
jsoncpp,
|
||||
antlr3,
|
||||
numactl,
|
||||
protobuf,
|
||||
cryptopp,
|
||||
libxfs,
|
||||
yaml-cpp,
|
||||
libsystemtap,
|
||||
lksctp-tools,
|
||||
lz4,
|
||||
libxml2,
|
||||
zlib,
|
||||
libpciaccess,
|
||||
snappy,
|
||||
libtool,
|
||||
thrift
|
||||
}:
|
||||
gcc8Stdenv.mkDerivation {
|
||||
pname = "scylladb";
|
||||
version = "3.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scylladb";
|
||||
repo = "scylla";
|
||||
rev = "403f66ecad6bc773712c69c4a80ebd172eb48b13";
|
||||
sha256 = "sha256-UXOPLA2dhspbH40/se0r+jCdiW82BR895rvnef8Er5I=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [ ./seastar-configure-script-paths.patch ./configure-etc-osrelease.patch ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
cmake
|
||||
makeWrapper
|
||||
ninja
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
antlr3
|
||||
python3Packages.pyparsing
|
||||
boost
|
||||
git
|
||||
systemd
|
||||
gnutls
|
||||
ragel
|
||||
jsoncpp
|
||||
numactl
|
||||
protobuf
|
||||
cryptopp
|
||||
libxfs
|
||||
yaml-cpp
|
||||
libsystemtap
|
||||
lksctp-tools
|
||||
lz4
|
||||
libxml2
|
||||
zlib
|
||||
libpciaccess
|
||||
snappy
|
||||
libtool
|
||||
thrift
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs ./configure.py
|
||||
patchShebangs seastar/json/json2code.py
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
./configure.py --mode=release
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir $out
|
||||
cp -r * $out/
|
||||
'';
|
||||
|
||||
requiredSystemFeatures = [ "big-parallel" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "NoSQL data store using the seastar framework, compatible with Apache Cassandra";
|
||||
homepage = "https://scylladb.com";
|
||||
license = licenses.agpl3;
|
||||
platforms = lib.platforms.linux;
|
||||
hydraPlatforms = []; # It's huge ATM, about 18 GB.
|
||||
maintainers = [ lib.maintainers.farlion ];
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/seastar/configure.py b/seastar/configure.py
|
||||
index 62d9c204..f6520635 100755
|
||||
--- a/seastar/configure.py
|
||||
+++ b/seastar/configure.py
|
||||
@@ -924,7 +924,7 @@ with open(buildfile, 'w') as f:
|
||||
command = ragel -G2 -o $out $in && sed -i -e '1h;2,$$H;$$!d;g' -re 's/static const char _nfa[^;]*;//g' $out
|
||||
description = RAGEL $out
|
||||
rule gen
|
||||
- command = /bin/echo -e $text > $out
|
||||
+ command = echo -e $text > $out
|
||||
description = GEN $out
|
||||
rule swagger
|
||||
command = json/json2code.py -f $in -o $out
|
||||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dolt";
|
||||
version = "1.35.3";
|
||||
version = "1.35.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dolthub";
|
||||
repo = "dolt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-p4hScXdIDa3zAHltUMhg61YyfpdFWZaJ8LAdQi8OZv8=";
|
||||
sha256 = "sha256-9EEqwS7IKlRfE5bwxjScDX7KMCTpmbxixAznRhbaOE0=";
|
||||
};
|
||||
|
||||
modRoot = "./go";
|
||||
subPackages = [ "cmd/dolt" ];
|
||||
vendorHash = "sha256-1fH9JrWi38jtPjaN2lEplCkiLdYa4g6FsdcB8ZQqVD4=";
|
||||
vendorHash = "sha256-TXx+YmXsAwh2J+nHpff0oHatI6G2QY2QZmMMcHAG6Lc=";
|
||||
proxyVendor = true;
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1 @@
|
|||
if has nix_direnv_watch_file; then
|
||||
nix_direnv_watch_file default.nix shell.nix
|
||||
else
|
||||
watch_file default.nix shell.nix
|
||||
fi
|
||||
|
||||
use nix
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "wal-g";
|
||||
version = "2.0.1";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wal-g";
|
||||
repo = "wal-g";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5mwA55aAHwEFabGZ6c3pi8NLcYofvoe4bb/cFj7NWok=";
|
||||
sha256 = "sha256-k+GaOb+o5b+Rmggk+Wq3NscDS+fIvyK0e/EhX6UMlqM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-BbQuY6r30AkxlCZjY8JizaOrqEBdv7rIQet9KQwYB/g=";
|
||||
vendorHash = "sha256-ZsVqR02D4YmZP/tVz2UWpXa6fM7HU7Hi2CSnvuVx9UU=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
@ -21,7 +21,7 @@ buildGoModule rec {
|
|||
|
||||
tags = [ "brotli" "libsodium" ];
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/wal-g/wal-g/cmd/pg.WalgVersion=${version}" "-X github.com/wal-g/wal-g/cmd/pg.GitRevision=${src.rev}" ];
|
||||
ldflags = [ "-s" "-w" "-X github.com/wal-g/wal-g/cmd/pg.walgVersion=${version}" "-X github.com/wal-g/wal-g/cmd/pg.gitRevision=${src.rev}" ];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/pg $out/bin/wal-g
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vips";
|
||||
version = "8.15.1";
|
||||
version = "8.15.2";
|
||||
|
||||
outputs = [ "bin" "out" "man" "dev" ] ++ lib.optionals (!stdenv.isDarwin) [ "devdoc" ];
|
||||
|
||||
|
|
@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
owner = "libvips";
|
||||
repo = "libvips";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-0zfYpOawH7XnTH9k8BdNDtZEKpYUlCXp7GY+fdXalsE=";
|
||||
hash = "sha256-jp6RPceFzzWgFBzcfvggniAkhXaAGszT/sy4H6aCtGc=";
|
||||
# Remove unicode file names which leads to different checksums on HFS+
|
||||
# vs. other filesystems because of unicode normalisation.
|
||||
postFetch = ''
|
||||
|
|
|
|||
|
|
@ -98,22 +98,11 @@ stdenv.mkDerivation rec {
|
|||
# The shared build creates binaries with -shared suffixes,
|
||||
# so we remove these suffixes.
|
||||
''
|
||||
mv ''${!outputBin}/bin/h5clear{-shared,}
|
||||
mv ''${!outputBin}/bin/h5copy{-shared,}
|
||||
mv ''${!outputBin}/bin/h5debug{-shared,}
|
||||
mv ''${!outputBin}/bin/h5delete{-shared,}
|
||||
mv ''${!outputBin}/bin/h5diff{-shared,}
|
||||
mv ''${!outputBin}/bin/h5dump{-shared,}
|
||||
mv ''${!outputBin}/bin/h5format_convert{-shared,}
|
||||
mv ''${!outputBin}/bin/h5import{-shared,}
|
||||
mv ''${!outputBin}/bin/h5jam{-shared,}
|
||||
mv ''${!outputBin}/bin/h5ls{-shared,}
|
||||
mv ''${!outputBin}/bin/h5mkgrp{-shared,}
|
||||
mv ''${!outputBin}/bin/h5repack{-shared,}
|
||||
mv ''${!outputBin}/bin/h5repart{-shared,}
|
||||
mv ''${!outputBin}/bin/h5stat{-shared,}
|
||||
mv ''${!outputBin}/bin/h5unjam{-shared,}
|
||||
mv ''${!outputBin}/bin/h5watch{-shared,}
|
||||
pushd ''${!outputBin}/bin
|
||||
for file in *-shared; do
|
||||
mv "$file" "''${file%%-shared}"
|
||||
done
|
||||
popd
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -1060,6 +1060,7 @@ mapAliases ({
|
|||
schildichat-desktop = schildichat-web;
|
||||
schildichat-desktop-wayland = schildichat-web;
|
||||
scitoken-cpp = scitokens-cpp; # Added 2024-02-12
|
||||
scylladb = throw "'scylladb' has been removed due to being unmaintained"; # Added 2024-03-17
|
||||
sdlmame = throw "'sdlmame' has been renamed to/replaced by 'mame'"; # Converted to throw 2023-09-10
|
||||
searx = throw "'searx' has been removed as it is unmaintained. Please switch to searxng"; # Added 2023-10-03
|
||||
semver-cpp = throw "'semver-cpp' was removed because no packages in nixpkgs use it anymore"; # Added 2024-02-14
|
||||
|
|
@ -1147,6 +1148,7 @@ mapAliases ({
|
|||
tensile = throw "'tensile' has been replaced with 'rocmPackages.tensile'"; # Added 2023-10-08
|
||||
testVersion = testers.testVersion; # Added 2022-04-20
|
||||
tfplugindocs = terraform-plugin-docs; # Added 2023-11-01
|
||||
thrift-0_10 = throw "'thrift-0_10' has been removed because it is impacted by security issues and not used in nixpkgs, move to 'thrift'"; # Added 2024-03-17
|
||||
invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05
|
||||
timescale-prometheus = promscale; # Added 2020-09-29
|
||||
tinygltf = throw "TinyglTF has been embedded in draco due to lack of other users and compatibility breaks."; # Added 2023-06-25
|
||||
|
|
|
|||
|
|
@ -24959,8 +24959,6 @@ with pkgs;
|
|||
|
||||
thrift = callPackage ../development/libraries/thrift { };
|
||||
|
||||
thrift-0_10 = callPackage ../development/libraries/thrift/0.10.nix { };
|
||||
|
||||
tidyp = callPackage ../development/libraries/tidyp { };
|
||||
|
||||
tidal-hifi = callPackage ../applications/audio/tidal-hifi { };
|
||||
|
|
@ -40549,10 +40547,6 @@ with pkgs;
|
|||
|
||||
sct = callPackage ../tools/X11/sct { };
|
||||
|
||||
scylladb = callPackage ../servers/scylladb {
|
||||
thrift = thrift-0_10;
|
||||
};
|
||||
|
||||
seafile-server = callPackage ../servers/seafile-server { };
|
||||
|
||||
seafile-shared = callPackage ../misc/seafile-shared { };
|
||||
|
|
|
|||
Loading…
Reference in New Issue