Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -82,8 +82,8 @@ in
|
||||
|
||||
apiServer = mkOption {
|
||||
type = types.str;
|
||||
example = "localhost:8080";
|
||||
description = "host:port to connect to the API. Ignored unless mode is set to 'api'";
|
||||
example = "http://localhost:8080";
|
||||
description = "URI to connect to the API. Ignored unless mode is set to 'api'";
|
||||
};
|
||||
|
||||
extraArguments = mkOption {
|
||||
|
||||
@@ -17,7 +17,8 @@ let
|
||||
};
|
||||
# I think questa_fse/linux/vlm checksums itself, so use FHSUserEnv instead of `patchelf`
|
||||
in buildFHSEnv rec {
|
||||
name = "quartus-prime-lite"; # wrapped
|
||||
pname = "quartus-prime-lite"; # wrapped
|
||||
inherit (unwrapped) version;
|
||||
|
||||
targetPkgs = pkgs: with pkgs; [
|
||||
(runCommand "ld-lsb-compat" {} (''
|
||||
@@ -80,7 +81,7 @@ in buildFHSEnv rec {
|
||||
"${unwrapped}"/questa_fse/linux_x86_64/lmutil
|
||||
)
|
||||
|
||||
wrapper=$out/bin/${name}
|
||||
wrapper=$out/bin/${pname}
|
||||
progs_wrapped=()
|
||||
for prog in ''${progs_to_wrap[@]}; do
|
||||
relname="''${prog#"${unwrapped}/"}"
|
||||
@@ -93,7 +94,7 @@ in buildFHSEnv rec {
|
||||
echo "export NIXPKGS_IS_QUESTA_WRAPPER=1" >> "$wrapped"
|
||||
;;
|
||||
esac
|
||||
echo "$wrapper $prog \"\$@\"" >> "$wrapped"
|
||||
echo "exec $wrapper $prog \"\$@\"" >> "$wrapped"
|
||||
done
|
||||
|
||||
cd $out
|
||||
@@ -160,4 +161,6 @@ in buildFHSEnv rec {
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
inherit (unwrapped) meta;
|
||||
}
|
||||
|
||||
@@ -408,11 +408,11 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "mame",
|
||||
"rev": "3272473e69880675756547fc5896d0869ba14255",
|
||||
"hash": "sha256-DWDPQM4YWuH4oH+03VmFs6yXN2dAKxc5zXSV42YbMyg=",
|
||||
"rev": "1c6d288bf15705ab93c66a11af40eaf9d2a515a2",
|
||||
"hash": "sha256-h5hMfCwoECTyH/VU7IheQg5Jx9skpYrZlA9Xh+4lotQ=",
|
||||
"fetchSubmodules": true
|
||||
},
|
||||
"version": "unstable-2024-05-04"
|
||||
"version": "unstable-2024-05-09"
|
||||
},
|
||||
"mame2000": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
|
||||
@@ -2,12 +2,12 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "fluidd";
|
||||
version = "1.29.1";
|
||||
version = "1.30.0";
|
||||
|
||||
src = fetchurl {
|
||||
name = "fluidd-v${version}.zip";
|
||||
url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip";
|
||||
sha256 = "sha256-Zh/H1XAUcFl20yPLt9uIqBLDvUH8ATL9g6oFwvyhkzw=";
|
||||
sha256 = "sha256-+nPVnKuZtYGFtqC48XNISSjay3lDAYR3l50kq026H3Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
@@ -6,19 +6,19 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "coreth";
|
||||
version = "0.13.2";
|
||||
version = "0.13.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ava-labs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-G3Ovu/tF7gCeddmE91nht/yyqJJtgMyIi7YbTtUFyKo=";
|
||||
hash = "sha256-XVACkk/DUI4AIPRSQgu0g9WHmedjqscZbcz84HIi7jY=";
|
||||
};
|
||||
|
||||
# go mod vendor has a bug, see: golang/go#57529
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-IJFRtoDd0GO8mIx8mmGixaYK5JDQeSpUfk0MPPX6cX8=";
|
||||
vendorHash = "sha256-zqvo0hZIOyF5Bzig1hi4KRUDETNiiy1Ll/FFO9hRmYU=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -25,13 +25,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "haruna";
|
||||
version = "1.0.2";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "multimedia";
|
||||
repo = "haruna";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-L/mTFPJPHl8A6FqkWUwICh+Yl4uIE5KnTkZVnC4kCZ8=";
|
||||
hash = "sha256-403ZqllSSaOdTS1GSf8EIQk9gHOxMsWogbK9qh+MhpY=";
|
||||
domain = "invent.kde.org";
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
pkg-config,
|
||||
bzip2,
|
||||
libxml2,
|
||||
swig,
|
||||
}:
|
||||
stdenv.mkDerivation (attrs: {
|
||||
pname = "libsbml";
|
||||
version = "5.20.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sbmlteam";
|
||||
repo = "libsbml";
|
||||
rev = "v${attrs.version}";
|
||||
hash = "sha256-8JT2r0zuf61VewtZaOAccaOUmDlQPnllA0fXE9rT5X8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This should be in next release, remember to remove fetchpatch
|
||||
(fetchpatch {
|
||||
name = "fix-xmlerror-conversion.patch";
|
||||
url = "https://github.com/sbmlteam/libsbml/pull/358.patch";
|
||||
hash = "sha256-uirG6XJ+w0hqBUEAGDnzhHoVtJVRdN1eqBYeneKMBao=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
swig
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
bzip2.dev
|
||||
libxml2
|
||||
];
|
||||
|
||||
# libSBML doesn't always make use of pkg-config
|
||||
cmakeFlags = [
|
||||
"-DLIBXML_INCLUDE_DIR=${lib.getDev libxml2}/include/libxml2"
|
||||
"-DLIBXML_LIBRARY=${lib.getLib libxml2}/lib/libxml2${stdenv.hostPlatform.extensions.sharedLibrary}"
|
||||
"-DPKG_CONFIG_EXECUTABLE=${lib.getBin pkg-config}/bin/pkg-config"
|
||||
"-DSWIG_EXECUTABLE=${lib.getBin swig}/bin/swig"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for manipulating Systems Biology Markup Language (SBML)";
|
||||
homepage = "https://github.com/sbmlteam/libsbml";
|
||||
license = licenses.lgpl21Only;
|
||||
maintainers = [maintainers.kupac];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
})
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "nuclei-templates";
|
||||
version = "9.8.5";
|
||||
version = "9.8.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "nuclei-templates";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-j1W/Gq002Y+/Lrq51Od8iZoxbMJji20kpbUaCC7ieqE=";
|
||||
hash = "sha256-3hJfWSBciJ/UutVBIGisptcxmtWfvSfTbx55cyWxs4k=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
+74
-67
@@ -1,23 +1,25 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchPypi
|
||||
, python3
|
||||
, makeWrapper
|
||||
, libtorrent-rasterbar-1_2_x
|
||||
, qt5
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchPypi,
|
||||
python3,
|
||||
makeWrapper,
|
||||
libtorrent-rasterbar-1_2_x,
|
||||
qt5,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
let
|
||||
libtorrent = (python3.pkgs.toPythonModule (libtorrent-rasterbar-1_2_x)).python;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tribler";
|
||||
version = "7.13.0";
|
||||
version = "7.14.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-${version}.tar.xz";
|
||||
hash = "sha256-j9+Kq6dOqiJCTY3vuRWGnciuwACU7L0pl73l6nkDLN4=";
|
||||
url = "https://github.com/Tribler/tribler/releases/download/v${finalAttrs.version}/Tribler-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-fQJOs9P4y71De/+svmD7YZ4+tm/bC3rspm7SbOHlSR4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -28,57 +30,55 @@ stdenv.mkDerivation rec {
|
||||
qt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
python3.pkgs.python
|
||||
];
|
||||
buildInputs = [ python3.pkgs.python ];
|
||||
|
||||
pythonPath = [
|
||||
libtorrent
|
||||
] ++ (with python3.pkgs; [
|
||||
# requirements-core.txt
|
||||
aiohttp
|
||||
aiohttp-apispec
|
||||
anyio
|
||||
chardet
|
||||
configobj
|
||||
cryptography
|
||||
decorator
|
||||
faker
|
||||
libnacl
|
||||
lz4
|
||||
marshmallow
|
||||
netifaces
|
||||
networkx
|
||||
pony
|
||||
psutil
|
||||
pyasn1
|
||||
pydantic_1
|
||||
pyopenssl
|
||||
pyyaml
|
||||
sentry-sdk
|
||||
service-identity
|
||||
yappi
|
||||
yarl
|
||||
bitarray
|
||||
(pyipv8.overrideAttrs (p: rec {
|
||||
version = "2.10.0";
|
||||
src = fetchPypi {
|
||||
inherit (p) pname;
|
||||
inherit version;
|
||||
hash = "sha256-yxiXBxBiPokequm+vjsHIoG9kQnRnbsOx3mYOd8nmiU=";
|
||||
};
|
||||
}))
|
||||
libtorrent
|
||||
file-read-backwards
|
||||
brotli
|
||||
human-readable
|
||||
# requirements.txt
|
||||
pillow
|
||||
pyqt5
|
||||
#pyqt5-sip
|
||||
pyqtgraph
|
||||
pyqtwebengine
|
||||
]);
|
||||
pythonPath =
|
||||
[ libtorrent ]
|
||||
++ (with python3.pkgs; [
|
||||
# requirements-core.txt
|
||||
aiohttp
|
||||
aiohttp-apispec
|
||||
anyio
|
||||
chardet
|
||||
configobj
|
||||
cryptography
|
||||
decorator
|
||||
faker
|
||||
libnacl
|
||||
lz4
|
||||
marshmallow
|
||||
netifaces
|
||||
networkx
|
||||
pony
|
||||
psutil
|
||||
pyasn1
|
||||
pydantic_1
|
||||
pyopenssl
|
||||
pyyaml
|
||||
sentry-sdk
|
||||
service-identity
|
||||
yappi
|
||||
yarl
|
||||
bitarray
|
||||
filelock
|
||||
(pyipv8.overrideAttrs (p: rec {
|
||||
version = "2.10.0";
|
||||
src = fetchPypi {
|
||||
inherit (p) pname;
|
||||
inherit version;
|
||||
hash = "sha256-yxiXBxBiPokequm+vjsHIoG9kQnRnbsOx3mYOd8nmiU=";
|
||||
};
|
||||
}))
|
||||
file-read-backwards
|
||||
brotli
|
||||
human-readable
|
||||
# requirements.txt
|
||||
pillow
|
||||
pyqt5
|
||||
#pyqt5-sip
|
||||
pyqtgraph
|
||||
pyqtwebengine
|
||||
]);
|
||||
|
||||
installPhase = ''
|
||||
mkdir -pv $out
|
||||
@@ -106,12 +106,19 @@ stdenv.mkDerivation rec {
|
||||
export QT_PLUGIN_PATH="${qt5.qtsvg.bin}/${qt5.qtbase.qtPluginPrefix}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Decentralised P2P filesharing client based on the Bittorrent protocol";
|
||||
mainProgram = "tribler";
|
||||
homepage = "https://www.tribler.org/";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ xvapx viric mkg20001 ];
|
||||
platforms = platforms.linux;
|
||||
changelog = "https://github.com/Tribler/tribler/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
xvapx
|
||||
viric
|
||||
mkg20001
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zpaqfranz";
|
||||
version = "59.3";
|
||||
version = "59.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcorbelli";
|
||||
repo = "zpaqfranz";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-Ut4NOcmuXDaGkoXff8cixe5Onb84ztyHlFKH1zDUAZE=";
|
||||
hash = "sha256-tdkb/qyxpgORC8UcyDl3giGrU1VI0BAriBN7jDNBJzA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -24,13 +24,13 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "openshadinglanguage";
|
||||
version = "1.13.8.0";
|
||||
version = "1.13.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AcademySoftwareFoundation";
|
||||
repo = "OpenShadingLanguage";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AixN3cj6r/PUGvAhVN4wGfpuLiBt5LglgJp68hFfJMo=";
|
||||
hash = "sha256-3HSmiIvGk+C5rnHzCXnYlFVeOWYa5M0WZRLTSb8Zsh8=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "faudio";
|
||||
version = "24.04";
|
||||
version = "24.05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FNA-XNA";
|
||||
repo = "FAudio";
|
||||
rev = version;
|
||||
sha256 = "sha256-DuQG5AsfLtWHVun9P8iiBqp3xtb67feC5b2gveIRqpA=";
|
||||
sha256 = "sha256-YL5JT/1JTfeKaLUEMnud6OOMk/NSCnBjohk+6qRaU60=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [cmake];
|
||||
|
||||
@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://lttng.org/urcu";
|
||||
changelog = "https://github.com/urcu/userspace-rcu/raw/v${version}/ChangeLog";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.unix;
|
||||
# https://git.liburcu.org/?p=userspace-rcu.git;a=blob;f=include/urcu/arch.h
|
||||
platforms = intersectLists platforms.unix (platforms.x86 ++ platforms.power ++ platforms.s390 ++ platforms.arm ++ platforms.aarch64 ++ platforms.mips ++ platforms.m68k ++ platforms.riscv);
|
||||
maintainers = [ maintainers.bjornfor ];
|
||||
};
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
, fetchFromGitHub
|
||||
, pythonAtLeast
|
||||
, pythonOlder
|
||||
, llvmPackages
|
||||
, pytest7CheckHook
|
||||
, setuptools
|
||||
, numpy
|
||||
@@ -33,6 +34,10 @@ buildPythonPackage rec {
|
||||
hash = "sha256-E20pI5BrcTrMYrhriuOUl5/liSaQQy6eqRyCoauwb9Q=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
llvmPackages.openmp
|
||||
];
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
@@ -103,6 +108,8 @@ buildPythonPackage rec {
|
||||
"accelerate"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://huggingface.co/docs/accelerate";
|
||||
description = "A simple way to train and use PyTorch models with multi-GPU, TPU, mixed-precision";
|
||||
|
||||
@@ -1,29 +1,34 @@
|
||||
{ lib
|
||||
, aesara
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, numdifftools
|
||||
, numpy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, setuptools
|
||||
, aesara
|
||||
, numpy
|
||||
, scipy
|
||||
, numdifftools
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aeppl";
|
||||
version = "0.1.5";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aesara-devs";
|
||||
repo = pname;
|
||||
repo = "aeppl";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-mqBbXwWJwQA2wSHuEdBeXQMfTIcgwYEjpq8AVmOjmHM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
aesara
|
||||
numpy
|
||||
scipy
|
||||
@@ -47,6 +52,14 @@ buildPythonPackage rec {
|
||||
"test_initial_values"
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
# `numpy.distutils` is deprecated since NumPy 1.23.0, as a result of the deprecation of `distutils` itself.
|
||||
# It will be removed for Python >= 3.12. For older Python versions it will remain present.
|
||||
"-Wignore::DeprecationWarning"
|
||||
# Blas cannot be found, allow fallback to the numpy slower implementation
|
||||
"-Wignore::UserWarning"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for an Aesara-based PPL";
|
||||
homepage = "https://github.com/aesara-devs/aeppl";
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
, numba-scipy
|
||||
, numpy
|
||||
, pytestCheckHook
|
||||
, pythonAtLeast
|
||||
, pythonOlder
|
||||
, scipy
|
||||
, typing-extensions
|
||||
@@ -24,9 +25,10 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "aesara";
|
||||
version = "2.9.3";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
# Python 3.12 is not supported: https://github.com/aesara-devs/aesara/issues/1520
|
||||
disabled = pythonOlder "3.8" || pythonAtLeast "3.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aesara-devs";
|
||||
@@ -35,13 +37,13 @@ buildPythonPackage rec {
|
||||
hash = "sha256-aO0+O7Ts9phsV4ghunNolxfAruGBbC+tHjVkmFedcCI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
cython
|
||||
hatch-vcs
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
cons
|
||||
etuples
|
||||
filelock
|
||||
@@ -62,7 +64,8 @@ buildPythonPackage rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "--durations=50" ""
|
||||
--replace-fail "--durations=50" "" \
|
||||
--replace-fail "hatch-vcs >=0.3.0,<0.4.0" "hatch-vcs"
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
@@ -81,12 +84,23 @@ buildPythonPackage rec {
|
||||
"tests/sparse/sandbox/"
|
||||
# JAX is not available on all platform and often broken
|
||||
"tests/link/jax/"
|
||||
|
||||
# 2024-04-27: The current nixpkgs numba version is too recent and incompatible with aesara 2.9.3
|
||||
"tests/link/numba/"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Disable all benchmark tests
|
||||
"test_scan_multiple_output"
|
||||
"test_logsumexp_benchmark"
|
||||
|
||||
# TypeError: exceptions must be derived from Warning, not <class 'NoneType'>
|
||||
"test_api_deprecation_warning"
|
||||
# AssertionError: assert ['Elemwise{Co..._i{0} 0', ...] == ['Elemwise{Co..._i{0} 0', ...]
|
||||
# At index 3 diff: '| |Gemv{inplace} d={0: [0]} 2' != '| |CGemv{inplace} d={0: [0]} 2'
|
||||
"test_debugprint"
|
||||
# ValueError: too many values to unpack (expected 3)
|
||||
"test_ExternalCOp_c_code_cache_version"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ buildPythonPackage
|
||||
, einops
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, jax
|
||||
, jaxlib
|
||||
, lib
|
||||
@@ -10,16 +10,17 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "augmax";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
pyproject = true;
|
||||
|
||||
disbaled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "khdlr";
|
||||
repo = "augmax";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-hDNNoE7KVaH3jrXZA4A8f0UoQJPl6KHA3XwMc3Ccohk=";
|
||||
# Using fetchPypi because the latest version was not tagged on GitHub.
|
||||
# Switch back to fetchFromGitHub when a tag will be available
|
||||
# https://github.com/khdlr/augmax/issues/8
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-pf1DTaHA7D+s2rqwwGYlJrJOI7fok+WOvOCtZhOOGHo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -37,7 +38,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Efficiently Composable Data Augmentation on the GPU with Jax";
|
||||
homepage = "https://github.com/khdlr/augmax";
|
||||
changelog = "https://github.com/khdlr/augmax/blob/${src.rev}/CHANGELOG.md";
|
||||
changelog = "https://github.com/khdlr/augmax/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ samuela ];
|
||||
};
|
||||
|
||||
@@ -1,19 +1,23 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, cryptography
|
||||
, fetchFromGitHub
|
||||
, gssapi
|
||||
, hatchling
|
||||
, ldap3
|
||||
, pyasn1
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, winacl
|
||||
{
|
||||
lib,
|
||||
asn1crypto,
|
||||
buildPythonPackage,
|
||||
cryptography,
|
||||
dnspython,
|
||||
fetchFromGitHub,
|
||||
gssapi,
|
||||
hatchling,
|
||||
ldap3,
|
||||
msldap,
|
||||
pyasn1,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
winacl,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bloodyad";
|
||||
version = "1.1.1";
|
||||
version = "2.0.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -22,28 +26,25 @@ buildPythonPackage rec {
|
||||
owner = "CravateRouge";
|
||||
repo = "bloodyAD";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-wnq+HTAPnC7pSGI2iytSyHmdqtUq2pUnNwZnsGX8CL4=";
|
||||
hash = "sha256-+Lw9Apm+zzUlM19fGgxOb2bTmmKQ1Nd7dUjF9rhHXKQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
hatchling
|
||||
];
|
||||
build-system = [ hatchling ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
asn1crypto
|
||||
cryptography
|
||||
dnspython
|
||||
gssapi
|
||||
ldap3
|
||||
msldap
|
||||
pyasn1
|
||||
winacl
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"bloodyAD"
|
||||
];
|
||||
pythonImportsCheck = [ "bloodyAD" ];
|
||||
|
||||
disabledTests = [
|
||||
# Tests require network access
|
||||
|
||||
@@ -1,30 +1,30 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, python
|
||||
, pythonOlder
|
||||
, cython
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
cython,
|
||||
fetchPypi,
|
||||
python,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastbencode";
|
||||
version = "0.2";
|
||||
format = "setuptools";
|
||||
version = "0.3.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-V465xHANZwXXH7yNfVe8os2Yfsos7B2ed7ngcC2x5W8=";
|
||||
hash = "sha256-X+DLfRc2iRr2HSreQM6UiUHUbpCLFvU4P1XxJ4SNoZc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"fastbencode"
|
||||
];
|
||||
nativeBuildInputs = [ cython ];
|
||||
|
||||
pythonImportsCheck = [ "fastbencode" ];
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} -m unittest fastbencode.tests.test_suite
|
||||
@@ -33,6 +33,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Fast implementation of bencode";
|
||||
homepage = "https://github.com/breezy-team/fastbencode";
|
||||
changelog = "https://github.com/breezy-team/fastbencode/releases/tag/v${version}";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
@@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-ai-generativelanguage";
|
||||
version = "0.6.2";
|
||||
version = "0.6.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-MIeRrDudrQFbNZFylwc5qjdT3VQhQqQW0H+foEfiI4Y=";
|
||||
hash = "sha256-EKEfHhu4Rw/1ADDBrNcps6unopreLDDPHRyRcpE2bGc=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -202,6 +202,8 @@ buildPythonPackage rec {
|
||||
#"-W" "ignore" # uncomment for debugging help
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
# check the binary works outside the build env
|
||||
doInstallCheck = true;
|
||||
postInstallCheck = ''
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langsmith";
|
||||
version = "0.1.56";
|
||||
version = "0.1.57";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -31,7 +31,7 @@ buildPythonPackage rec {
|
||||
owner = "langchain-ai";
|
||||
repo = "langsmith-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-S+l+KA+7kZZX4OeJICeYmK7l7SxSXWiZiV9JgM+JTl8=";
|
||||
hash = "sha256-L725AfkmBEe44LkJ0y6PdDvbnbCf31LXL3YdnOshnqE=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/python";
|
||||
|
||||
@@ -1,34 +1,38 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, capstone
|
||||
, click
|
||||
, cryptography
|
||||
, dnfile
|
||||
, fetchFromGitHub
|
||||
, pefile
|
||||
, pycryptodomex
|
||||
, pyelftools
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, typing-extensions
|
||||
, yara-python
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
capstone,
|
||||
click,
|
||||
cryptography,
|
||||
dnfile,
|
||||
fetchFromGitHub,
|
||||
pefile,
|
||||
pycryptodomex,
|
||||
pyelftools,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
pytestCheckHook,
|
||||
typing-extensions,
|
||||
yara-python,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "malduck";
|
||||
version = "4.4.0";
|
||||
format = "setuptools";
|
||||
version = "4.4.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CERT-Polska";
|
||||
repo = pname;
|
||||
repo = "malduck";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-CXHbU1AudvOJrG9MKYDQXeEtwrJODRPQtK43dQzZASE=";
|
||||
hash = "sha256-Btx0HxiZWrb0TDpBokQGtBE2EDK0htONe/DwqlPgAd4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
capstone
|
||||
click
|
||||
cryptography
|
||||
@@ -40,26 +44,16 @@ buildPythonPackage rec {
|
||||
yara-python
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "pefile==2019.4.18" "pefile" \
|
||||
--replace "dnfile==0.11.0" "dnfile"
|
||||
'';
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"malduck"
|
||||
];
|
||||
pythonImportsCheck = [ "malduck" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Helper for malware analysis";
|
||||
mainProgram = "malduck";
|
||||
homepage = "https://github.com/CERT-Polska/malduck";
|
||||
changelog = "https://github.com/CERT-Polska/malduck/releases/tag/v${version}";
|
||||
license = with licenses; [ bsd3 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "malduck";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,48 +1,32 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchpatch2
|
||||
, html5lib
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
html5lib,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mechanize";
|
||||
version = "0.4.9";
|
||||
version = "0.4.10";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-aaXtsJYvkh6LEINzaMIkLYrQSfC5H/aZzn9gG/xDFSE=";
|
||||
hash = "sha256-HeqUf5vn6gq2EPe7xKTja0XWv9/O6imtPTiaiKGVfd8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
# python 3.11+ compat
|
||||
url = "https://github.com/python-mechanize/mechanize/commit/1324b09b661aaac7d4cdc7e1e9d49e1c3851db2c.patch";
|
||||
hash = "sha256-d0Zuz6m2Uv8pnR8TC0L+AStS82rPPTpQrrjkCZnJliE=";
|
||||
})
|
||||
];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
dependencies = [ html5lib ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
html5lib
|
||||
];
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"mechanize"
|
||||
];
|
||||
pythonImportsCheck = [ "mechanize" ];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Tests require network access
|
||||
|
||||
@@ -1,14 +1,16 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "minidb";
|
||||
version = "2.0.7";
|
||||
format = "setuptools";
|
||||
version = "2.0.8";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@@ -16,16 +18,14 @@ buildPythonPackage rec {
|
||||
owner = "thp";
|
||||
repo = "minidb";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-0f2usKoHs4NO/Ir8MhyiAVZFYnUkVH5avdh3QdHzY6s=";
|
||||
hash = "sha256-e7wVR+xr+5phNoRnGIxnmrjB1QU9JmyfQiu88PYapA8=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"minidb"
|
||||
];
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "minidb" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "SQLite3-based store for Python objects";
|
||||
@@ -34,4 +34,3 @@ buildPythonPackage rec {
|
||||
maintainers = with maintainers; [ tv ];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -3,20 +3,17 @@
|
||||
, cmake
|
||||
, fetchFromGitHub
|
||||
, joblib
|
||||
, jupyter
|
||||
, jupyter-client
|
||||
, matplotlib
|
||||
, nbconvert
|
||||
, ninja
|
||||
, numba
|
||||
, numpy
|
||||
, pandas
|
||||
, pathspec
|
||||
, pyproject-metadata
|
||||
, pybind11
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, scikit-build
|
||||
, scikit-build-core
|
||||
, scipy
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -24,7 +21,7 @@ buildPythonPackage rec {
|
||||
version = "0.12.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KaveIO";
|
||||
@@ -33,58 +30,39 @@ buildPythonPackage rec {
|
||||
hash = "sha256-YsH7vVn6gzejunUjUY/RIcvWtaQ/W1gbciJWKi5LDTk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
cmake
|
||||
ninja
|
||||
scikit-build
|
||||
setuptools
|
||||
pathspec
|
||||
pybind11
|
||||
pyproject-metadata
|
||||
scikit-build-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
joblib
|
||||
numpy
|
||||
scipy
|
||||
pandas
|
||||
matplotlib
|
||||
numba
|
||||
pybind11
|
||||
numpy
|
||||
pandas
|
||||
scipy
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
nbconvert
|
||||
jupyter
|
||||
jupyter-client
|
||||
];
|
||||
|
||||
# Uses setuptools to drive build process
|
||||
# Uses scikit-build-core to drive build process
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"phik"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
rm -r $out/bin
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
# import from $out
|
||||
rm -r phik
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# TypeError: 'numpy.float64' object cannot be interpreted as an integer
|
||||
# https://github.com/KaveIO/PhiK/issues/73
|
||||
"test_significance_matrix_hybrid"
|
||||
"test_significance_matrix_mc"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Don't test integrations
|
||||
"tests/phik_python/integration/"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Phi_K correlation analyzer library";
|
||||
longDescription = ''
|
||||
|
||||
@@ -1,16 +1,18 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, parameterized
|
||||
, ply
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
parameterized,
|
||||
ply,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyomo";
|
||||
version = "6.7.1";
|
||||
format = "setuptools";
|
||||
version = "6.7.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
@@ -18,21 +20,19 @@ buildPythonPackage rec {
|
||||
repo = "pyomo";
|
||||
owner = "pyomo";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-eTItw+wYo5lCla4oKSF97N4TFajjFtCMMq4DU9ahi1U=";
|
||||
hash = "sha256-v3KVb9KZPbUlpRySzJV8dmApScKT06aJc8SULCHcnPI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ply
|
||||
];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ ply ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
parameterized
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pyomo"
|
||||
];
|
||||
pythonImportsCheck = [ "pyomo" ];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d);
|
||||
@@ -53,10 +53,10 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python Optimization Modeling Objects";
|
||||
mainProgram = "pyomo";
|
||||
homepage = "http://pyomo.org";
|
||||
homepage = "http://www.pyomo.org/";
|
||||
changelog = "https://github.com/Pyomo/pyomo/releases/tag/${version}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ];
|
||||
mainProgram = "pyomo";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,41 +1,34 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, zeep
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
zeep,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "total-connect-client";
|
||||
version = "2024.4";
|
||||
version = "2024.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "craigjmidwinter";
|
||||
repo = "total-connect-client";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-LuPyhidbAzt/AU5WuXyxggGxjm9yArHsbn6iAaccMEc=";
|
||||
hash = "sha256-NGiI4gn59U7NiRYtB6UydxOu+lVtmbl8qF3nbAjiYwk=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
zeep
|
||||
];
|
||||
dependencies = [ zeep ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"total_connect_client"
|
||||
];
|
||||
pythonImportsCheck = [ "total_connect_client" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Interact with Total Connect 2 alarm systems";
|
||||
|
||||
@@ -1,18 +1,32 @@
|
||||
{lib
|
||||
,buildPythonPackage
|
||||
,fetchPypi
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
pythonAtLeast,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
pyasyncore,
|
||||
unittestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "wsgitools";
|
||||
version = "0.3.1";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0q6kmrkqf02fgww7z1g9cw8f70fimdzs1bvv9inb7fsk0c3pcf1i";
|
||||
hash = "sha256-MTh2BwNTu7NsTHuvoH+r0YHjEGfphX84f04Ah2eu02A=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
# the built-in asyncore library was removed in python 3.12
|
||||
dependencies = lib.optionals (pythonAtLeast "3.12") [ pyasyncore ];
|
||||
|
||||
pythonImportsCheck = [ "wsgitools" ];
|
||||
|
||||
nativeCheckInputs = [ unittestCheckHook ];
|
||||
|
||||
meta = with lib; {
|
||||
maintainers = with maintainers; [ clkamp ];
|
||||
description = "A set of tools working with WSGI";
|
||||
|
||||
@@ -380,6 +380,7 @@ let
|
||||
LOMAR = [ pkgs.gmp.dev ];
|
||||
lpsymphony = with pkgs; [ pkg-config gfortran gettext ];
|
||||
lwgeom = with pkgs; [ proj geos gdal ];
|
||||
rsbml = [ pkgs.pkg-config ];
|
||||
rvg = [ pkgs.libpng.dev ];
|
||||
MAGEE = [ pkgs.zlib.dev pkgs.bzip2.dev ];
|
||||
magick = [ pkgs.imagemagick.dev ];
|
||||
@@ -589,6 +590,7 @@ let
|
||||
gdtools = [ pkgs.pkg-config ];
|
||||
archive = [ pkgs.libarchive];
|
||||
gdalcubes = with pkgs; [ proj.dev gdal sqlite.dev netcdf ];
|
||||
rsbml = [ pkgs.libsbml ];
|
||||
SuperGauss = [ pkgs.pkg-config pkgs.fftw.dev];
|
||||
specklestar = [ pkgs.fftw.dev ];
|
||||
cartogramR = [ pkgs.fftw.dev ];
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "s3backer";
|
||||
version = "2.0.2";
|
||||
version = "2.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "sha256-xmOtL4v3UxdjrL09sSfXyF5FoMrNerSqG9nvEuwMvNM=";
|
||||
sha256 = "sha256-/WdY++rrcQ3N+4ROeaA113Iq1nMGxOp3LzsCaLsxaaM=";
|
||||
rev = version;
|
||||
repo = "s3backer";
|
||||
owner = "archiecobbs";
|
||||
|
||||
+2187
-307
File diff suppressed because it is too large
Load Diff
@@ -14,13 +14,13 @@
|
||||
|
||||
let
|
||||
pname = "zerotierone";
|
||||
version = "1.12.2";
|
||||
version = "1.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zerotier";
|
||||
repo = "ZeroTierOne";
|
||||
rev = version;
|
||||
sha256 = "sha256-p0zrYgbHTLefj5GTrMnYLytCXZ/nRuqTL+6dEeC+uVw=";
|
||||
sha256 = "sha256-YWcqALUB3ZEukL4er2FKcyNdEbuaf//QU5hRbKAfxDA=";
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
@@ -30,13 +30,14 @@ in stdenv.mkDerivation {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"jwt-0.16.0" = "sha256-P5aJnNlcLe9sBtXZzfqHdRvxNfm6DPBcfcKOVeLZxcM=";
|
||||
"rustfsm-0.1.0" = "sha256-q7J9QgN67iuoNhQC8SDVzUkjCNRXGiNCkE8OsQc5+oI=";
|
||||
};
|
||||
};
|
||||
postPatch = "cp ${./Cargo.lock} Cargo.lock";
|
||||
|
||||
preConfigure = ''
|
||||
cmp ./Cargo.lock ./zeroidc/Cargo.lock || {
|
||||
echo 1>&2 "Please make sure that the derivation's Cargo.lock is identical to ./zeroidc/Cargo.lock!"
|
||||
cmp ./Cargo.lock ./rustybits/Cargo.lock || {
|
||||
echo 1>&2 "Please make sure that the derivation's Cargo.lock is identical to ./rustybits/Cargo.lock!"
|
||||
exit 1
|
||||
}
|
||||
|
||||
|
||||
@@ -3,5 +3,5 @@
|
||||
|
||||
version=$(curl --silent "https://api.github.com/repos/zerotier/ZeroTierOne/releases" | jq '.[0].tag_name' --raw-output)
|
||||
|
||||
curl --silent "https://raw.githubusercontent.com/zerotier/ZeroTierOne/$version/zeroidc/Cargo.lock" > "$(dirname "$0")/Cargo.lock"
|
||||
curl --silent "https://raw.githubusercontent.com/zerotier/ZeroTierOne/$version/rustybits/Cargo.lock" > "$(dirname "$0")/Cargo.lock"
|
||||
update-source-version zerotierone "$version"
|
||||
|
||||
@@ -35017,8 +35017,6 @@ with pkgs;
|
||||
|
||||
tremc = callPackage ../applications/networking/p2p/tremc { };
|
||||
|
||||
tribler = callPackage ../applications/networking/p2p/tribler { };
|
||||
|
||||
trillian-im = callPackage ../applications/networking/instant-messengers/trillian-im { };
|
||||
|
||||
trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { };
|
||||
|
||||
Reference in New Issue
Block a user