mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 17:03:01 +00:00
Merge master into staging-next
This commit is contained in:
commit
11e56ed9bb
@ -80,6 +80,15 @@ in
|
||||
using the EDITOR environment variable.
|
||||
'';
|
||||
};
|
||||
|
||||
startWithGraphical = mkOption {
|
||||
type = types.bool;
|
||||
default = config.services.xserver.enable;
|
||||
defaultText = literalExpression "config.services.xserver.enable";
|
||||
description = lib.mdDoc ''
|
||||
Start emacs with the graphical session instead of any session. Without this, emacs clients will not be able to create frames in the graphical session.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf (cfg.enable || cfg.install) {
|
||||
@ -92,7 +101,13 @@ in
|
||||
ExecStop = "${cfg.package}/bin/emacsclient --eval (kill-emacs)";
|
||||
Restart = "always";
|
||||
};
|
||||
} // optionalAttrs cfg.enable { wantedBy = [ "default.target" ]; };
|
||||
|
||||
unitConfig = optionalAttrs cfg.startWithGraphical {
|
||||
After = "graphical-session.target";
|
||||
};
|
||||
} // optionalAttrs cfg.enable {
|
||||
wantedBy = if cfg.startWithGraphical then [ "graphical-session.target" ] else [ "default.target" ];
|
||||
};
|
||||
|
||||
environment.systemPackages = [ cfg.package editorScript desktopApplicationFile ];
|
||||
|
||||
|
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "free42";
|
||||
version = "3.0.20";
|
||||
version = "3.0.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thomasokken";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Dqrys7bAkSnpbOF0D17RDYi7q47ExlM75d5OOAnHCVU=";
|
||||
hash = "sha256-zRO0buYfKtybUisWZJRkvLJVLJYZwLcDnT04rnQWy+s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kile-wl";
|
||||
version = "unstable-2021-09-30";
|
||||
version = "2.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "snakedye";
|
||||
@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
|
||||
url = "https://gitlab.com/snakedye/kile.git";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-W7rq42Pz+l4TSsR/h2teRTbl3A1zjOcIx6wqgnwyQNA=";
|
||||
cargoSha256 = "sha256-xXliFNm9YDGsAATpMATui7f2IcfKCrB0B7O5dSYuBVQ=";
|
||||
|
||||
nativeBuildInputs = [ scdoc ];
|
||||
|
||||
|
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, qtbase
|
||||
, openrgb
|
||||
, glib
|
||||
@ -13,24 +12,16 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openrgb-plugin-effects";
|
||||
version = "0.8";
|
||||
version = "0.9";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "OpenRGBDevelopers";
|
||||
repo = "OpenRGBEffectsPlugin";
|
||||
rev = "release_${version}";
|
||||
hash = "sha256-2F6yeLWgR0wCwIj75+d1Vdk45osqYwRdenK21lcRoOg=";
|
||||
hash = "sha256-8BnHifcFf7ESJgJi/q3ca38zuIVa++BoGlkWxj7gpog=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Add install rule
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin/-/commit/75f1b3617d9cabfb3b04a7afc75ce0c1b8514bc0.patch";
|
||||
hash = "sha256-X+zMNE3OCZNmUb68S4683r/RbE+CDrI/Jv4BMWPI47E=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Use the source of openrgb from nixpkgs instead of the submodule
|
||||
rm -r OpenRGB
|
||||
|
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, qtbase
|
||||
, openrgb
|
||||
, glib
|
||||
@ -14,28 +13,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openrgb-plugin-hardwaresync";
|
||||
version = "0.8";
|
||||
version = "0.9";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "OpenRGBDevelopers";
|
||||
repo = "OpenRGBHardwareSyncPlugin";
|
||||
rev = "release_${version}";
|
||||
hash = "sha256-P+IitP8pQLUkBdMfcNw4fOggqyFfg6lNlnSfUGjddzo=";
|
||||
hash = "sha256-3sQFiqmXhuavce/6v3XBpp6PAduY7t440nXfbfCX9a0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "use-pkgconfig";
|
||||
url = "https://gitlab.com/OpenRGBDevelopers/OpenRGBHardwareSyncPlugin/-/commit/df2869d679ea43119fb9b174cd0b2cb152022685.patch";
|
||||
hash = "sha256-oBtrHwpvB8Z3xYi4ucDSuw+5WijPEbgBW7vLGELFjfw=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "add-install-rule";
|
||||
url = "https://gitlab.com/OpenRGBDevelopers/OpenRGBHardwareSyncPlugin/-/commit/bfbaa0a32ed05112e0cc8b6b2a8229945596e522.patch";
|
||||
hash = "sha256-76UMMzeXnyQRCEE1tGPNR5XSHTT480rQDnJ9hWhfIqY=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Use the source of openrgb from nixpkgs instead of the submodule
|
||||
rmdir OpenRGB
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openrgb";
|
||||
version = "0.8";
|
||||
version = "0.9";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "CalcProgrammer1";
|
||||
repo = "OpenRGB";
|
||||
rev = "release_${version}";
|
||||
sha256 = "sha256-46dL1D5oVlw6mNuFDCbbrUDmq42yFXV/qFJ1JnPT5/s=";
|
||||
sha256 = "sha256-XBLj4EfupyeVHRc0pVI7hrXFoCNJ7ak2yO0QSfhBsGU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ];
|
||||
|
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "avalanchego";
|
||||
version = "1.10.5";
|
||||
version = "1.10.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ava-labs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mGie45sIvl8BjBB4JJF/U/OJ7naT6iWjo3l50qZvyaY=";
|
||||
hash = "sha256-1SD+0WkqFGInrFtVmXHz3FuOso7rooeCPMAq9eFOSDg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/pNXCRHtoaJvgYsSMyYB05IKH4wG7hTlEHjuoOuifQ0=";
|
||||
vendorHash = "sha256-7O1ENOZUkt0NPXk0KK+ydbeLB9ht17jBSH+/cmpOg8U=";
|
||||
# go mod vendor has a bug, see: https://github.com/golang/go/issues/57529
|
||||
proxyVendor = true;
|
||||
|
||||
@ -40,6 +40,6 @@ buildGoModule rec {
|
||||
homepage = "https://github.com/ava-labs/avalanchego";
|
||||
changelog = "https://github.com/ava-labs/avalanchego/releases/tag/v${version}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ urandom ];
|
||||
maintainers = with maintainers; [ urandom qjoly ];
|
||||
};
|
||||
}
|
||||
|
38
pkgs/applications/networking/cluster/kns/default.nix
Normal file
38
pkgs/applications/networking/cluster/kns/default.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{ stdenvNoCC
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fzf
|
||||
, kubectl
|
||||
}:
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "kns";
|
||||
version = "unstable-2023-04-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "blendle";
|
||||
repo = "kns";
|
||||
rev = "86502949c31432bd95895cfb26d1c5893c533d5c";
|
||||
hash = "sha256-8AR/fEKPAfiKCZrp/AyJo3Ic8dH7SfncYZSdQA2GywQ=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
buildInputs = [ fzf kubectl ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
substituteInPlace bin/kns bin/ktx --replace fzf ${fzf}/bin/fzf --replace kubectl ${kubectl}/bin/kubectl
|
||||
install -D -m755 -t $out/bin bin/kns bin/ktx
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Kubernetes namespace switcher";
|
||||
homepage = "https://github.com/blendle/kns";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ mmlb ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
@ -35,5 +35,6 @@ buildGoModule rec {
|
||||
changelog = "https://github.com/rancher/rke2/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ zimbatm zygot ];
|
||||
mainProgram = "rke2";
|
||||
};
|
||||
}
|
||||
|
@ -7,8 +7,8 @@ let
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
srcVersion = "feb23a";
|
||||
version = "20230201_a";
|
||||
srcVersion = "aug23a";
|
||||
version = "20230801_a";
|
||||
pname = "gildas";
|
||||
|
||||
src = fetchurl {
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
# source code of the previous release to a different directory
|
||||
urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz"
|
||||
"http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ];
|
||||
sha256 = "sha256-A6jtcC8QMtJ7YcNaPiOjwNPDGPAjmRA3jZLEt5iBONE=";
|
||||
sha256 = "sha256-jlyv2K1V+510C4uLek4oofm13d40nGJ46wqjW+tjfq4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config groff perl getopt gfortran which ];
|
||||
@ -38,14 +38,15 @@ stdenv.mkDerivation rec {
|
||||
echo "gag_doc: $out/share/doc/" >> kernel/etc/gag.dico.lcl
|
||||
'';
|
||||
|
||||
userExec = "astro class greg imager mapping sic";
|
||||
|
||||
postInstall=''
|
||||
mkdir -p $out/bin
|
||||
cp -a ../gildas-exe-${srcVersion}/* $out
|
||||
mv $out/$GAG_EXEC_SYSTEM $out/libexec
|
||||
cp admin/wrapper.sh $out/bin/gildas-wrapper.sh
|
||||
chmod 755 $out/bin/gildas-wrapper.sh
|
||||
for i in $out/libexec/bin/* ; do
|
||||
ln -s $out/bin/gildas-wrapper.sh $out/bin/$(basename "$i")
|
||||
for i in ${userExec} ; do
|
||||
cp admin/wrapper.sh $out/bin/$i
|
||||
chmod 755 $out/bin/$i
|
||||
done
|
||||
'';
|
||||
|
||||
|
@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cbmc";
|
||||
version = "5.89.0";
|
||||
version = "5.90.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "diffblue";
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256-pgZdR1X0aOCfCKAGo2h9bAIO2XTTiWL8ERgandOQj/M=";
|
||||
sha256 = "sha256-c6Ms/IStmKug5nz37TzjeexkY3YfWaUqEKIC2viMK9g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -103,6 +103,13 @@ stdenv.mkDerivation rec {
|
||||
url = "https://github.com/sagemath/sage/commit/1a1b49f814cdf4c4c8d0ac8930610f3fef6af5b0.diff";
|
||||
sha256 = "sha256-GqMgoi0tsP7zcCcPumhdsbvhPB6fgw1ufx6gHlc6iSc=";
|
||||
})
|
||||
|
||||
# https://github.com/sagemath/sage/pull/36006, positively reviewed
|
||||
(fetchpatch {
|
||||
name = "gmp-6.3-upgrade.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/d88bc3815c0901bfdeaa3e4a31107c084199f614.diff";
|
||||
sha256 = "sha256-dXaEwk2wXxmx02sCw4Vu9mF0ZrydhFD4LRwNAiQsPgM=";
|
||||
})
|
||||
];
|
||||
|
||||
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
|
||||
|
@ -39,17 +39,17 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "forgejo";
|
||||
version = "1.20.2-0";
|
||||
version = "1.20.3-0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "forgejo";
|
||||
repo = "forgejo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8mFI5Zt2J6EQZqu/qcirFp8WMz+IlrkvHeA+oUb0X5U=";
|
||||
hash = "sha256-pMmP9JJHbaqkHHgtZf2ZgEtXsX97EV0VXiTPT7Lf4P8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZoFs2T3NNixrbTDdp7fqTgjJ+G8DpkxHW8K6BM8tZ9w=";
|
||||
vendorHash = "sha256-dgtZjsLBwblhdge3BvdbK/mN/TeZKps9K5dJbqomtjo=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
@ -22,13 +22,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-camera";
|
||||
version = "1.4.13";
|
||||
version = "6.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-h4oCxtj9GwaZqioZ4vFx2Cq8a1w7lYQvOhDAd7x9gMU=";
|
||||
hash = "sha256-GQQFwlJNfdsi0GvDRMIorUnlbXrgbYl9H9aBedOm+ZQ=";
|
||||
};
|
||||
|
||||
# QLibrary and dlopen work with LD_LIBRARY_PATH
|
||||
@ -66,7 +66,6 @@ stdenv.mkDerivation rec {
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
gst-plugins-bad
|
||||
]);
|
||||
|
||||
cmakeFlags = [ "-DVERSION=${version}" ];
|
||||
|
@ -1,25 +1,24 @@
|
||||
diff --git a/src/src/gstvideowriter.cpp b/src/src/gstvideowriter.cpp
|
||||
index c96c8b0..fcc11da 100644
|
||||
--- a/src/src/gstvideowriter.cpp
|
||||
+++ b/src/src/gstvideowriter.cpp
|
||||
@@ -282,6 +282,7 @@ void GstVideoWriter::loadAppSrcCaps()
|
||||
|
||||
QString GstVideoWriter::libPath(const QString &strlib)
|
||||
{
|
||||
+ return strlib;
|
||||
QDir dir;
|
||||
QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
|
||||
dir.setPath(path);
|
||||
diff --git a/src/src/mainwindow.cpp b/src/src/mainwindow.cpp
|
||||
index d3c6f5c..4817446 100644
|
||||
index d3c6c24..6d313a6 100644
|
||||
--- a/src/src/mainwindow.cpp
|
||||
+++ b/src/src/mainwindow.cpp
|
||||
@@ -781,19 +781,7 @@ void CMainWindow::slotPopupSettingsDialog()
|
||||
@@ -784,6 +784,7 @@ void CMainWindow::slotPopupSettingsDialog()
|
||||
|
||||
QString CMainWindow::libPath(const QString &strlib)
|
||||
{
|
||||
- QDir dir;
|
||||
- QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
|
||||
- dir.setPath(path);
|
||||
- QStringList list = dir.entryList(QStringList() << (strlib + "*"), QDir::NoDotAndDotDot | QDir::Files); //filter name with strlib
|
||||
-
|
||||
- if (list.contains(strlib))
|
||||
- return strlib;
|
||||
-
|
||||
- list.sort();
|
||||
- if (list.size() > 0)
|
||||
- return list.last();
|
||||
-
|
||||
- return "";
|
||||
+ return strlib;
|
||||
}
|
||||
|
||||
void CMainWindow::reflushSnapshotLabel()
|
||||
QDir dir;
|
||||
QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
|
||||
dir.setPath(path);
|
||||
|
@ -2,17 +2,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wasmtime";
|
||||
version = "11.0.1";
|
||||
version = "12.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bytecodealliance";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-uHnHtviGieNyVQHMHsvHocJqC/n9bc6Mv0Uy6lBIuuQ=";
|
||||
hash = "sha256-6bbz8FH87MahD3R7G3cmsJD0461L4OoCbFejyXsuER0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-XTpXVBsZvgY2SnTwe1dh/XYmXapu+LQ0etelO8fj7Nc=";
|
||||
cargoHash = "sha256-QbKYnKdJK9zImZDl057l8/Za4A+N82WrqQCzrOsc6fE=";
|
||||
|
||||
cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ];
|
||||
|
||||
@ -47,6 +47,7 @@ rustPlatform.buildRustPackage rec {
|
||||
"Standalone JIT-style runtime for WebAssembly, using Cranelift";
|
||||
homepage = "https://wasmtime.dev/";
|
||||
license = licenses.asl20;
|
||||
mainProgram = "wasmtime";
|
||||
maintainers = with maintainers; [ ereslibre matthewbauer ];
|
||||
platforms = platforms.unix;
|
||||
changelog = "https://github.com/bytecodealliance/wasmtime/blob/v${version}/RELEASES.md";
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ailment";
|
||||
version = "9.2.64";
|
||||
version = "9.2.65";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-KUJpcP7bf8BjmB/QojTQHSwkmzW0bN4nJaD8GcNbcyE=";
|
||||
hash = "sha256-Bli+zrxMbRY2dzAx25ap3DhROIFTlk+TGpAfrHiMxPc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -5,6 +5,7 @@
|
||||
, buildPythonPackage
|
||||
, docutils
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, poetry-core
|
||||
, pytest-aiohttp
|
||||
, pytest-asyncio
|
||||
@ -27,6 +28,20 @@ buildPythonPackage rec {
|
||||
hash = "sha256-plgO+pyKmG0mYnFZxDcrENcuEg5AG2Og2xWipzuzyHo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This patch removes references to setuptools and wheel that are no longer
|
||||
# necessary and changes poetry to poetry-core, so that we don't need to add
|
||||
# unnecessary nativeBuildInputs.
|
||||
#
|
||||
# https://github.com/bachya/aioguardian/pull/288
|
||||
#
|
||||
(fetchpatch {
|
||||
name = "clean-up-build-dependencies.patch";
|
||||
url = "https://github.com/bachya/aioguardian/commit/ffaad4b396645f599815010995fb71ca976e761e.patch";
|
||||
hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
@ -3,6 +3,7 @@
|
||||
, aresponses
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, poetry-core
|
||||
, pydantic
|
||||
, pytest-aiohttp
|
||||
@ -26,6 +27,20 @@ buildPythonPackage rec {
|
||||
hash = "sha256-/2sF8m5R8YXkP89bi5zR3h13r5LrFOl1OsixAcX0D4o=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This patch removes references to setuptools and wheel that are no longer
|
||||
# necessary and changes poetry to poetry-core, so that we don't need to add
|
||||
# unnecessary nativeBuildInputs.
|
||||
#
|
||||
# https://github.com/bachya/aionotion/pull/269
|
||||
#
|
||||
(fetchpatch {
|
||||
name = "clean-up-build-dependencies.patch";
|
||||
url = "https://github.com/bachya/aionotion/commit/53c7285110d12810f9b43284295f71d052a81b83.patch";
|
||||
hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
@ -35,6 +50,8 @@ buildPythonPackage rec {
|
||||
pydantic
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeCheckInputs = [
|
||||
aresponses
|
||||
pytest-aiohttp
|
||||
|
@ -3,6 +3,7 @@
|
||||
, aresponses
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, poetry-core
|
||||
, pydantic
|
||||
, pytest-aiohttp
|
||||
@ -25,6 +26,20 @@ buildPythonPackage rec {
|
||||
hash = "sha256-YmJH4brWkTpgzyHwu9UnIWrY5qlDCmMtvF+KxQFXwfk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This patch removes references to setuptools and wheel that are no longer
|
||||
# necessary and changes poetry to poetry-core, so that we don't need to add
|
||||
# unnecessary nativeBuildInputs.
|
||||
#
|
||||
# https://github.com/bachya/aiopurpleair/pull/207
|
||||
#
|
||||
(fetchpatch {
|
||||
name = "clean-up-build-dependencies.patch";
|
||||
url = "https://github.com/bachya/aiopurpleair/commit/8c704c51ea50da266f52a7f53198d29d643b30c5.patch";
|
||||
hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'pydantic = "^1.10.2"' 'pydantic = "*"'
|
||||
@ -39,6 +54,8 @@ buildPythonPackage rec {
|
||||
pydantic
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeCheckInputs = [
|
||||
aresponses
|
||||
pytest-aiohttp
|
||||
|
@ -3,6 +3,7 @@
|
||||
, aresponses
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, freezegun
|
||||
, poetry-core
|
||||
, pytest-asyncio
|
||||
@ -12,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiorecollect";
|
||||
version = "2022.10.0";
|
||||
version = "2023.08.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,9 +22,29 @@ buildPythonPackage rec {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-JIh6jr4pFXGZTUi6K7VsymaCxCrTNBevk9xo9TsrFnM=";
|
||||
hash = "sha256-oTkWirq3w0DgQWWe0ziK+ry4pg6j6SQbBESLG4xgDE4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This patch removes references to setuptools and wheel that are no longer
|
||||
# necessary and changes poetry to poetry-core, so that we don't need to add
|
||||
# unnecessary nativeBuildInputs.
|
||||
#
|
||||
# https://github.com/bachya/aiorecollect/pull/207
|
||||
#
|
||||
(fetchpatch {
|
||||
name = "clean-up-dependencies.patch";
|
||||
url = "https://github.com/bachya/aiorecollect/commit/0bfddead1c1b176be4d599b8e12ed608eac97b8b.patch";
|
||||
hash = "sha256-w/LAtyuyYsAAukDeIy8XLlp9QrydC1Wmi2zxEj1Zdm8=";
|
||||
includes = [ "pyproject.toml" ];
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# this is not used directly by the project
|
||||
sed -i '/certifi =/d' pyproject.toml
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
@ -32,6 +53,8 @@ buildPythonPackage rec {
|
||||
aiohttp
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeCheckInputs = [
|
||||
aresponses
|
||||
freezegun
|
||||
|
@ -3,6 +3,7 @@
|
||||
, aresponses
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, freezegun
|
||||
, poetry-core
|
||||
, pyjwt
|
||||
@ -29,6 +30,20 @@ buildPythonPackage rec {
|
||||
hash = "sha256-8EPELXxSq+B9o9eMFeM5ZPVYTa1+kT/S6cO7hKtD18s=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This patch removes references to setuptools and wheel that are no longer
|
||||
# necessary and changes poetry to poetry-core, so that we don't need to add
|
||||
# unnecessary nativeBuildInputs.
|
||||
#
|
||||
# https://github.com/bachya/aioridwell/pull/234
|
||||
#
|
||||
(fetchpatch {
|
||||
name = "clean-up-build-dependencies.patch";
|
||||
url = "https://github.com/bachya/aioridwell/commit/79a9dd7462dcfeb0833abca73a1f184827120a6f.patch";
|
||||
hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
@ -40,6 +55,8 @@ buildPythonPackage rec {
|
||||
titlecase
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeCheckInputs = [
|
||||
aresponses
|
||||
freezegun
|
||||
|
@ -3,6 +3,7 @@
|
||||
, aresponses
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, poetry-core
|
||||
, pytest-aiohttp
|
||||
, pytest-asyncio
|
||||
@ -24,6 +25,20 @@ buildPythonPackage rec {
|
||||
hash = "sha256-rqmsUvVwXC/XkR/v2d9d3t7u6Poms4ORiOci41ajXIo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This patch removes references to setuptools and wheel that are no longer
|
||||
# necessary and changes poetry to poetry-core, so that we don't need to add
|
||||
# unnecessary nativeBuildInputs.
|
||||
#
|
||||
# https://github.com/bachya/aiowatttime/pull/206
|
||||
#
|
||||
(fetchpatch {
|
||||
name = "clean-up-build-dependencies.patch";
|
||||
url = "https://github.com/bachya/aiowatttime/commit/c3cd53f794964c5435148caacd04f4e0ab8f550a.patch";
|
||||
hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
@ -32,6 +47,8 @@ buildPythonPackage rec {
|
||||
aiohttp
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeCheckInputs = [
|
||||
aresponses
|
||||
pytest-aiohttp
|
||||
|
@ -32,7 +32,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "angr";
|
||||
version = "9.2.64";
|
||||
version = "9.2.65";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -41,7 +41,7 @@ buildPythonPackage rec {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-NQopPg7ZAKkbq6T/1U8VYT/9oRz9ssg5yqTBpInNHNk=";
|
||||
hash = "sha256-atVmXsgMIRpmOXgNoatWkk9ID14f9rMJMT6+CWmvbY4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "apscheduler";
|
||||
version = "3.10.1";
|
||||
version = "3.10.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "APScheduler";
|
||||
inherit version;
|
||||
hash = "sha256-ApOTfY9gUaD0kzWUQMGhuT6ILFfa8Bl6/v8Ocnd3uW4=";
|
||||
hash = "sha256-5t8HGyfZvomOSGvHlAp75QtK8unafAjwdEqW1L1M70o=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "archinfo";
|
||||
version = "9.2.64";
|
||||
version = "9.2.65";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/3dc0p6xDFvv8VwFi5hxiXveiWYr9w3s0PwMv3uV2yw=";
|
||||
hash = "sha256-g+inF8eswHNLV6bBVRpyLf6H8PjmPduv7I2svAVEG5U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "atlassian-python-api";
|
||||
version = "3.40.0";
|
||||
version = "3.41.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "atlassian-api";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-2yY1shsdlX40FJV3K7nT6HfKKI14/3zH8dOEnJeTahw=";
|
||||
hash = "sha256-f1i4kX9lZ8ozv/jLzvu1XbCn+BheMn8SQE1mtivaEG8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "claripy";
|
||||
version = "9.2.64";
|
||||
version = "9.2.65";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-vx4wFZdycXow/t2LT4t1kO81JPvsB1mQF1GWgYRZiWs=";
|
||||
hash = "sha256-/Ou2Kl7Fw5QpzoibNOKJPnAwRsR3EDtYypCrOQc7yjI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -16,7 +16,7 @@
|
||||
|
||||
let
|
||||
# The binaries are following the argr projects release cycle
|
||||
version = "9.2.64";
|
||||
version = "9.2.65";
|
||||
|
||||
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
|
||||
binaries = fetchFromGitHub {
|
||||
@ -38,7 +38,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-wF3T8Kr09jqe4b/qctKXzFAnaTTtOkceHEoEN8J0mTs=";
|
||||
hash = "sha256-reJRy2KNk4YrkPkVH7eitMVS7V9MPTZNjo9+Wmgx5vQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -1,27 +1,40 @@
|
||||
{ lib, fetchPypi, buildPythonPackage
|
||||
, click, pytestCheckHook
|
||||
{ lib
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, click
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "click-help-colors";
|
||||
version = "0.9.1";
|
||||
version = "0.9.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "78cbcf30cfa81c5fc2a52f49220121e1a8190cd19197d9245997605d3405824d";
|
||||
hash = "sha256-dWJF5ULSkia7O8BWv6WIhvISuiuC9OjPX8iEF2rJbXI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ click ];
|
||||
propagatedBuildInputs = [
|
||||
click
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "click_help_colors" ];
|
||||
pythonImportsCheck = [
|
||||
"click_help_colors"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Colorization of help messages in Click";
|
||||
homepage = "https://github.com/r-m-n/click-help-colors";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
homepage = "https://github.com/click-contrib/click-help-colors";
|
||||
changelog = "https://github.com/click-contrib/click-help-colors/blob/${version}/CHANGES.rst";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
};
|
||||
}
|
||||
|
@ -30,14 +30,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dbt-core";
|
||||
version = "1.5.3";
|
||||
version = "1.5.5";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dbt-labs";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ZgP11fVMtXpzo9QaTkejvKl0LzCAkIyGBMcOquBirxQ=";
|
||||
hash = "sha256-aAe3sNa4CxqynsFHoTLEYWo12jEF/LAyYMqnpy5cTbg=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/core";
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-data";
|
||||
version = "2.15.1";
|
||||
version = "2.15.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-5Lu/YSLmqWXFQ6w6egALqdePWYwWrDIahVkQn3iQCnA=";
|
||||
hash = "sha256-8lwEf1+deLojhJDjRjII8sHRCGCM6l+igigIvNJidxQ=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
@ -55,14 +55,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc";
|
||||
version = "3.15.3";
|
||||
version = "3.16.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ceN8wgQRiwz3R98iPH+cJXqPTTxlBgnSGkpuVgWLvwY=";
|
||||
hash = "sha256-LbSmyNgRFejDGHurzDJvJxuhjPuRPDJ1t6T6p3f6UQk=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
@ -1,37 +1,54 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, poetry-core
|
||||
, six
|
||||
, cryptography
|
||||
, fetchPypi
|
||||
, mock
|
||||
, poetry-core
|
||||
, pyfakefs
|
||||
, pythonOlder
|
||||
, six
|
||||
, unittestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fido2";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-XcSVyoxZwcM3ODtLjDFNRrktXG/GUOcZhMbX+VQHn8M=";
|
||||
hash = "sha256-YRDZExBvdhmSAbMtJisoV1YsxGuh0LnFH7zjDck2xXM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ six cryptography ];
|
||||
propagatedBuildInputs = [
|
||||
cryptography
|
||||
six
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ unittestCheckHook mock pyfakefs ];
|
||||
nativeCheckInputs = [
|
||||
unittestCheckHook
|
||||
mock
|
||||
pyfakefs
|
||||
];
|
||||
|
||||
unittestFlagsArray = [ "-v" ];
|
||||
unittestFlagsArray = [
|
||||
"-v"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "fido2" ];
|
||||
pythonImportsCheck = [
|
||||
"fido2"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Provides library functionality for FIDO 2.0, including communication with a device over USB.";
|
||||
description = "Provides library functionality for FIDO 2.0, including communication with a device over USB";
|
||||
homepage = "https://github.com/Yubico/python-fido2";
|
||||
changelog = "https://github.com/Yubico/python-fido2/releases/tag/${version}";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ prusnak ];
|
||||
};
|
||||
|
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gocardless-pro";
|
||||
version = "1.45.0";
|
||||
version = "1.46.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gocardless";
|
||||
repo = "gocardless-pro-python";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mzIEHm8roiVtrh84Oc+J87anMpr4zMp5yLFCmuljg8k=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-tfaV/pohDu7IIzDa9B3GpnzOs6U+MVoFM3YZ0ErC7zQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-api-python-client";
|
||||
version = "2.96.0";
|
||||
version = "2.97.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-9xI3PQPTOK9XufX+mMkfS1uqqHZUabAVvGI8RoHFvVE=";
|
||||
hash = "sha256-SCdykYlIdqHKftQSfgVegfgeY0PO0bVEpyAK4sEZ3Nc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -70,7 +70,7 @@ in
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ibis-framework";
|
||||
version = "6.0.0";
|
||||
version = "6.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -80,7 +80,7 @@ buildPythonPackage rec {
|
||||
repo = "ibis";
|
||||
owner = "ibis-project";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-qIxacrRSN/Il9cY6ZsOiYLPyxI20aI+DyDM0/9jr654=";
|
||||
hash = "sha256-+AtXgRNxPryP/fd/GQlLNxWbP6ozikqG2yBCp3dE0tY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -8,6 +8,7 @@
|
||||
, rapidfuzz-capi
|
||||
, scikit-build
|
||||
, setuptools
|
||||
, wheel
|
||||
, jarowinkler-cpp
|
||||
, hypothesis
|
||||
, pytestCheckHook
|
||||
@ -16,11 +17,10 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "jarowinkler";
|
||||
version = "1.2.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxbachmann";
|
||||
repo = "JaroWinkler";
|
||||
@ -28,6 +28,14 @@ buildPythonPackage rec {
|
||||
hash = "sha256-j+ZabVsiVitNkTPhGjDg72XogjvPaL453lTW45ITm90=";
|
||||
};
|
||||
|
||||
# We cannot use Cython version 3.0.0 because the code in jarowinkler has not
|
||||
# been adapted for https://github.com/cython/cython/issues/4280 yet
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'scikit-build==' 'scikit-build>=' \
|
||||
--replace 'Cython==3.0.0a11' 'Cython'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
cython
|
||||
@ -35,6 +43,7 @@ buildPythonPackage rec {
|
||||
rapidfuzz-capi
|
||||
scikit-build
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
@ -6,6 +6,7 @@
|
||||
, mdformat-gfm
|
||||
, mdit-py-plugins
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
@ -37,6 +38,14 @@ buildPythonPackage rec {
|
||||
beautysh
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"mdformat_beautysh"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Mdformat plugin to beautify Bash scripts";
|
||||
homepage = "https://github.com/hukkin/mdformat-beautysh";
|
||||
|
@ -6,7 +6,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mscerts";
|
||||
version = "2023.4.26";
|
||||
version = "2023.8.23";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
owner = "ralphje";
|
||||
repo = "mscerts";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-7aiSFMZsUtuSqXQ1jJ3OhyBhzAH70ZX5+NqOtrpRmmw=";
|
||||
hash = "sha256-Oc02yi7N2W/DekmTxdYllN6UBD1phbVdSBN2dcPo1oI=";
|
||||
};
|
||||
|
||||
# extras_require contains signify -> circular dependency
|
||||
|
@ -1,12 +1,13 @@
|
||||
diff --git a/numba/cuda/cuda_paths.py b/numba/cuda/cuda_paths.py
|
||||
index 0da435d33..7b1fde087 100644
|
||||
index d195bbc29..0699b365b 100644
|
||||
--- a/numba/cuda/cuda_paths.py
|
||||
+++ b/numba/cuda/cuda_paths.py
|
||||
@@ -24,10 +24,7 @@ def _find_valid_path(options):
|
||||
@@ -24,11 +24,7 @@ def _find_valid_path(options):
|
||||
|
||||
def _get_libdevice_path_decision():
|
||||
options = [
|
||||
- ('Conda environment', get_conda_ctk()),
|
||||
- ('Conda environment (NVIDIA package)', get_nvidia_libdevice_ctk()),
|
||||
- ('CUDA_HOME', get_cuda_home('nvvm', 'libdevice')),
|
||||
- ('System', get_system_ctk('nvvm', 'libdevice')),
|
||||
- ('Debian package', get_debian_pkg_libdevice()),
|
||||
@ -14,7 +15,7 @@ index 0da435d33..7b1fde087 100644
|
||||
]
|
||||
by, libdir = _find_valid_path(options)
|
||||
return by, libdir
|
||||
@@ -35,16 +32,14 @@ def _get_libdevice_path_decision():
|
||||
@@ -36,17 +32,14 @@ def _get_libdevice_path_decision():
|
||||
|
||||
def _nvvm_lib_dir():
|
||||
if IS_WIN32:
|
||||
@ -28,13 +29,14 @@ index 0da435d33..7b1fde087 100644
|
||||
def _get_nvvm_path_decision():
|
||||
options = [
|
||||
- ('Conda environment', get_conda_ctk()),
|
||||
- ('Conda environment (NVIDIA package)', get_nvidia_nvvm_ctk()),
|
||||
- ('CUDA_HOME', get_cuda_home(*_nvvm_lib_dir())),
|
||||
- ('System', get_system_ctk(*_nvvm_lib_dir())),
|
||||
+ ('Nix store', get_nix_ctk(*_nvvm_lib_dir())),
|
||||
]
|
||||
by, path = _find_valid_path(options)
|
||||
return by, path
|
||||
@@ -64,14 +59,12 @@ def _cudalib_path():
|
||||
@@ -66,7 +59,7 @@ def _cudalib_path():
|
||||
if IS_WIN32:
|
||||
return 'bin'
|
||||
else:
|
||||
@ -42,19 +44,25 @@ index 0da435d33..7b1fde087 100644
|
||||
+ return 'lib'
|
||||
|
||||
|
||||
def _cuda_home_static_cudalib_path():
|
||||
@@ -78,10 +71,7 @@ def _cuda_home_static_cudalib_path():
|
||||
|
||||
def _get_cudalib_dir_path_decision():
|
||||
options = [
|
||||
- ('Conda environment', get_conda_ctk()),
|
||||
- ('Conda environment (NVIDIA package)', get_nvidia_cudalib_ctk()),
|
||||
- ('CUDA_HOME', get_cuda_home(_cudalib_path())),
|
||||
- ('System', get_system_ctk(_cudalib_path())),
|
||||
+ ('Nix store', get_nix_lib_ctk(_cudalib_path())),
|
||||
]
|
||||
by, libdir = _find_valid_path(options)
|
||||
return by, libdir
|
||||
@@ -82,6 +75,22 @@ def _get_cudalib_dir():
|
||||
return _env_path_tuple(by, libdir)
|
||||
|
||||
|
||||
@@ -239,3 +229,19 @@ def get_debian_pkg_libdevice():
|
||||
if not os.path.exists(pkg_libdevice_location):
|
||||
return None
|
||||
return pkg_libdevice_location
|
||||
+
|
||||
+
|
||||
+def get_nix_ctk(*subdirs):
|
||||
+ """Return path to nix store cudatoolkit; or, None if it doesn't exist.
|
||||
+ """
|
||||
@ -69,8 +77,3 @@ index 0da435d33..7b1fde087 100644
|
||||
+ base = '@cuda_toolkit_lib_path@'
|
||||
+ if os.path.exists(base):
|
||||
+ return os.path.join(base, *subdirs)
|
||||
+
|
||||
+
|
||||
def get_system_ctk(*subdirs):
|
||||
"""Return path to system-wide cudatoolkit; or, None if it doesn't exist.
|
||||
"""
|
||||
|
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pontos";
|
||||
version = "23.8.4";
|
||||
version = "23.8.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "greenbone";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-SXCqptEADWtp295DHWeWvhsmYWAtsxfckIVbPs4ACXc=";
|
||||
hash = "sha256-mWnQIQEG1kTytAarhdNf2AI2Sq4TSfNtCN3riklNAeQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -1,10 +1,10 @@
|
||||
{ lib
|
||||
, aiohttp
|
||||
, aresponses
|
||||
, async-timeout
|
||||
, attrs
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, poetry-core
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
@ -26,29 +26,38 @@ buildPythonPackage rec {
|
||||
hash = "sha256-T0Jjdu6QC8rTqZwe4cdsBbs0hQXUY6CkrImCgYwWL9o=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This patch removes references to setuptools and wheel that are no longer
|
||||
# necessary and changes poetry to poetry-core, so that we don't need to add
|
||||
# unnecessary nativeBuildInputs.
|
||||
#
|
||||
# https://github.com/bachya/py17track/pull/80
|
||||
#
|
||||
(fetchpatch {
|
||||
name = "clean-up-build-dependencies.patch";
|
||||
url = "https://github.com/bachya/py17track/commit/3b52394759aa50c62e2a56581e30cdb94003e2f1.patch";
|
||||
hash = "sha256-iLgklhEZ61rrdzQoO6rp1HGZcqLsqGNitwIiPNLNHQ4=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
async-timeout
|
||||
attrs
|
||||
pytz
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeCheckInputs = [
|
||||
aresponses
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'attrs = ">=19.3,<21.0"' 'attrs = ">=19.3,<22.0"' \
|
||||
--replace 'async-timeout = "^3.0.1"' 'async-timeout = ">=3.0.1,<5.0.0"'
|
||||
'';
|
||||
|
||||
disabledTestPaths = [
|
||||
# Ignore the examples directory as the files are prefixed with test_
|
||||
"examples/"
|
||||
|
@ -0,0 +1,30 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildPythonPackage
|
||||
, packaging
|
||||
, jinja2
|
||||
, pyyaml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyinstaller-versionfile";
|
||||
version = "2.1.1";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DudeNr33";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lz1GuiXU+r8sMld5SsG3qS+FOsWfbvkQmO2bxAR3XcY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ packaging jinja2 pyyaml ];
|
||||
|
||||
meta = {
|
||||
description = "Create a windows version-file from a simple YAML file that can be used by PyInstaller.";
|
||||
homepage = "https://pypi.org/project/pyinstaller-versionfile/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
@ -4,6 +4,7 @@
|
||||
, aresponses
|
||||
, backoff
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, poetry-core
|
||||
, pytest-aiohttp
|
||||
, pytest-asyncio
|
||||
@ -25,6 +26,20 @@ buildPythonPackage rec {
|
||||
hash = "sha256-4xoK/SwpcsjIpGUertWoSlRsKIpgpV1XmuIzDJcZMZg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This patch removes references to setuptools and wheel that are no longer
|
||||
# necessary and changes poetry to poetry-core, so that we don't need to add
|
||||
# unnecessary nativeBuildInputs.
|
||||
#
|
||||
# https://github.com/bachya/pyiqvia/pull/245
|
||||
#
|
||||
(fetchpatch {
|
||||
name = "clean-up-build-dependencies.patch";
|
||||
url = "https://github.com/bachya/pyiqvia/commit/760d5bd1f4d60f3a97f6ea9a9a57860f4be3abdd.patch";
|
||||
hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
@ -34,6 +49,8 @@ buildPythonPackage rec {
|
||||
backoff
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeCheckInputs = [
|
||||
aresponses
|
||||
pytest-aiohttp
|
||||
|
@ -1,20 +1,21 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, mock
|
||||
, psutil
|
||||
, six
|
||||
, future
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylink-square";
|
||||
version = "1.2.0";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "square";
|
||||
repo = "pylink";
|
||||
@ -22,20 +23,32 @@ buildPythonPackage rec {
|
||||
hash = "sha256-rcM7gvUUfXN5pL9uIihzmOCXA7NKjiMt2GaQaGJxD9M=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ psutil six future ];
|
||||
propagatedBuildInputs = [
|
||||
psutil
|
||||
six
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pylink" ];
|
||||
pythonImportsCheck = [
|
||||
"pylink"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# AttributeError: 'called_once_with' is not a valid assertion
|
||||
"test_cp15_register_write_success"
|
||||
"test_jlink_restarted"
|
||||
"test_set_log_file_success"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python interface for the SEGGER J-Link";
|
||||
homepage = "https://github.com/square/pylink";
|
||||
changelog = "https://github.com/square/pylink/blob/${src.rev}/CHANGELOG.md";
|
||||
maintainers = with maintainers; [ dump_stack ];
|
||||
changelog = "https://github.com/square/pylink/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ dump_stack ];
|
||||
};
|
||||
}
|
||||
|
@ -9,6 +9,7 @@
|
||||
, mesa_drivers
|
||||
, numpy
|
||||
, ocl-icd
|
||||
, oldest-supported-numpy
|
||||
, opencl-headers
|
||||
, platformdirs
|
||||
, pybind11
|
||||
@ -17,6 +18,7 @@
|
||||
, pytools
|
||||
, setuptools
|
||||
, six
|
||||
, wheel
|
||||
}:
|
||||
|
||||
let
|
||||
@ -25,7 +27,6 @@ let
|
||||
in buildPythonPackage rec {
|
||||
pname = "pyopencl";
|
||||
version = "2023.1.2";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
@ -33,7 +34,11 @@ in buildPythonPackage rec {
|
||||
hash = "sha256-6wDNV0BJ1ZK2edz4v+erSjbJSjn9Gssaa0XWwNe+mmg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
nativeBuildInputs = [
|
||||
oldest-supported-numpy
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
buildInputs = [ opencl-headers pybind11 ] ++ os-specific-buildInputs;
|
||||
|
||||
|
@ -33,6 +33,17 @@ buildPythonPackage rec {
|
||||
url = "https://github.com/bachya/pyopenuv/commit/af15736b0d82ef811c3f380f5da32007752644fe.patch";
|
||||
hash = "sha256-5uQS3DoM91mhfyxLTNii3JBxwXIDK4/GwtadkVagjuw=";
|
||||
})
|
||||
# This patch removes references to setuptools and wheel that are no longer
|
||||
# necessary and changes poetry to poetry-core, so that we don't need to add
|
||||
# unnecessary nativeBuildInputs.
|
||||
#
|
||||
# https://github.com/bachya/pyopenuv/pull/244
|
||||
#
|
||||
(fetchpatch {
|
||||
name = "clean-up-build-dependencies.patch";
|
||||
url = "https://github.com/bachya/pyopenuv/commit/1663f697dd5528fb03af1400e5ffd3fba076c64c.patch";
|
||||
hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -44,6 +55,8 @@ buildPythonPackage rec {
|
||||
backoff
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeCheckInputs = [
|
||||
aresponses
|
||||
pytest-asyncio
|
||||
|
@ -3,6 +3,7 @@
|
||||
, aresponses
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, poetry-core
|
||||
, pytest-asyncio
|
||||
, pytest-aiohttp
|
||||
@ -25,6 +26,20 @@ buildPythonPackage rec {
|
||||
hash = "sha256-D7oXkKDSg+yF+j1WyG/VVY12hLU6oyhEtxLrF6IkMSA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This patch removes references to setuptools and wheel that are no longer
|
||||
# necessary and changes poetry to poetry-core, so that we don't need to add
|
||||
# unnecessary nativeBuildInputs.
|
||||
#
|
||||
# https://github.com/bachya/pyoutbreaksnearme/pull/174
|
||||
#
|
||||
(fetchpatch {
|
||||
name = "clean-up-build-dependencies.patch";
|
||||
url = "https://github.com/bachya/pyoutbreaksnearme/commit/45fba9f689253a0f79ebde93086ee731a4151553.patch";
|
||||
hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
@ -34,6 +49,8 @@ buildPythonPackage rec {
|
||||
ujson
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeCheckInputs = [
|
||||
aresponses
|
||||
pytest-asyncio
|
||||
|
@ -22,12 +22,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-manilaclient";
|
||||
version = "4.5.0";
|
||||
version = "4.5.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-voeJkwe/7nta2B19+Y5d27XTkhQ/nbWt6MXOicYQZnU=";
|
||||
hash = "sha256-jtcY0yPD6eBcTFNVgANY4brQkrAscADeY8hbfw6M/tI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -3,6 +3,7 @@
|
||||
, aresponses
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, poetry-core
|
||||
, pytest-aiohttp
|
||||
, pytest-asyncio
|
||||
@ -24,6 +25,20 @@ buildPythonPackage rec {
|
||||
hash = "sha256-SFHWhXKC7PIqanJIQyGcpM8klwxOAJPVtzk9w0i2YYA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This patch removes references to setuptools and wheel that are no longer
|
||||
# necessary and changes poetry to poetry-core, so that we don't need to add
|
||||
# unnecessary nativeBuildInputs.
|
||||
#
|
||||
# https://github.com/bachya/pytile/pull/286
|
||||
#
|
||||
(fetchpatch {
|
||||
name = "clean-up-build-dependencies.patch";
|
||||
url = "https://github.com/bachya/pytile/commit/bdb5d96ba9d640bf85a1ae9c3787704dbc2ced23.patch";
|
||||
hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvex";
|
||||
version = "9.2.64";
|
||||
version = "9.2.65";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-dIM/LybJNiQTB8SnZuIVOaxrL6KwZzEuQdRj30pMOeI=";
|
||||
hash = "sha256-iZygYN3874o9miKxp2+0KDgQKFHDX73/45FzMSeSAlg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -3,6 +3,7 @@
|
||||
, aresponses
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, poetry-core
|
||||
, pytest-aiohttp
|
||||
, pytest-asyncio
|
||||
@ -26,6 +27,20 @@ buildPythonPackage rec {
|
||||
hash = "sha256-W5W/2gBraraZs8ai8tyg3aRWvHt6WOQCVICuiAigae0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This patch removes references to setuptools and wheel that are no longer
|
||||
# necessary and changes poetry to poetry-core, so that we don't need to add
|
||||
# unnecessary nativeBuildInputs.
|
||||
#
|
||||
# https://github.com/bachya/regenmaschine/pull/334
|
||||
#
|
||||
(fetchpatch {
|
||||
name = "clean-up-build-dependencies.patch";
|
||||
url = "https://github.com/bachya/regenmaschine/commit/ecc2f771e2ae2e0a8d46f5beab072df4e4727ba3.patch";
|
||||
hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
@ -1,10 +1,10 @@
|
||||
{ lib
|
||||
, aiohttp
|
||||
, aresponses
|
||||
, async-timeout
|
||||
, attrs
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, poetry-core
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
@ -26,17 +26,32 @@ buildPythonPackage rec {
|
||||
hash = "sha256-vMdRXcd0es/LjgsVyWItSLFzlSTEa3oaA6lr/NL4i8U=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This patch removes references to setuptools and wheel that are no longer
|
||||
# necessary and changes poetry to poetry-core, so that we don't need to add
|
||||
# unnecessary nativeBuildInputs.
|
||||
#
|
||||
# https://github.com/McSwindler/seventeentrack/pull/4
|
||||
#
|
||||
(fetchpatch {
|
||||
name = "clean-up-build-dependencies.patch";
|
||||
url = "https://github.com/McSwindler/seventeentrack/commit/9a21e22f796a17628a9628f54e19d19d002b4d0a.patch";
|
||||
hash = "sha256-UvxUpiSkDbP8Jum5XbrWHBnH1HLBYEKUKw6GTV+Kvys=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
async-timeout
|
||||
attrs
|
||||
pytz
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeCheckInputs = [
|
||||
aresponses
|
||||
pytest-asyncio
|
||||
|
@ -6,6 +6,7 @@
|
||||
, buildPythonPackage
|
||||
, docutils
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, poetry-core
|
||||
, pytest-aiohttp
|
||||
, pytest-asyncio
|
||||
@ -31,6 +32,20 @@ buildPythonPackage rec {
|
||||
hash = "sha256-dcWDB9tpKrFbnWf35HLDmgy2zNTzKNeJQrdtRXbSMvs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This patch removes references to setuptools and wheel that are no longer
|
||||
# necessary and changes poetry to poetry-core, so that we don't need to add
|
||||
# unnecessary nativeBuildInputs.
|
||||
#
|
||||
# https://github.com/bachya/simplisafe-python/pull/596
|
||||
#
|
||||
(fetchpatch {
|
||||
name = "clean-up-build-dependencies.patch";
|
||||
url = "https://github.com/bachya/simplisafe-python/commit/60f41c690fac7acb614490b542cbbf2fa0052266.patch";
|
||||
hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
66
pkgs/development/python-modules/tabcmd/default.nix
Normal file
66
pkgs/development/python-modules/tabcmd/default.nix
Normal file
@ -0,0 +1,66 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, python3
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, ftfy
|
||||
, appdirs
|
||||
, requests
|
||||
, setuptools-scm
|
||||
, types-mock
|
||||
, types-appdirs
|
||||
, types-requests
|
||||
, types-setuptools
|
||||
, argparse
|
||||
, doit
|
||||
, pyinstaller-versionfile
|
||||
, tableauserverclient
|
||||
, pytestCheckHook
|
||||
, mock
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tabcmd";
|
||||
version = "2.0.12";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-nsQJWDzSzSc1WRk5TBl/E7Mpfk8wGD1CsETAWILKxCM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ftfy appdirs requests setuptools-scm types-mock types-appdirs argparse doit pyinstaller-versionfile types-requests types-setuptools tableauserverclient ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook mock ];
|
||||
|
||||
# Remove an unneeded dependency that can't be resolved
|
||||
prePatch = ''
|
||||
sed -i "/'argparse',/d" pyproject.toml
|
||||
'';
|
||||
|
||||
# Create a "tabcmd" executable
|
||||
postInstall = ''
|
||||
# Create a directory for our wrapped binary.
|
||||
mkdir -p $out/bin
|
||||
|
||||
cp -r build/lib/tabcmd/__main__.py $out/bin/
|
||||
|
||||
# Create a 'tabcmd' script with python3 shebang
|
||||
echo "#!${python3}/bin/python3" > $out/bin/tabcmd
|
||||
|
||||
# Append __main__.py contents
|
||||
cat $out/bin/__main__.py >> $out/bin/tabcmd
|
||||
|
||||
# Make it executable.
|
||||
chmod +x $out/bin/tabcmd
|
||||
'';
|
||||
|
||||
|
||||
meta = {
|
||||
description = "A command line client for working with Tableau Server.";
|
||||
homepage = "https://pypi.org/project/tabcmd/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
@ -0,0 +1,35 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, python
|
||||
, fetchPypi
|
||||
, defusedxml
|
||||
, requests
|
||||
, packaging
|
||||
, requests-mock
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tableauserverclient";
|
||||
version = "0.25";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-01TRYkXEWagFrSB7zvP6Bj4YvIFoaVkgrIm/gSWkILY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ defusedxml requests packaging ];
|
||||
|
||||
checkInputs = [ requests-mock ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
doCheck = false; # it attempts to create some file artifacts and fails
|
||||
|
||||
meta = {
|
||||
description = "A Python module for working with the Tableau Server REST API.";
|
||||
homepage = "https://pypi.org/project/tableauserverclient/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
21
pkgs/development/python-modules/types-appdirs/default.nix
Normal file
21
pkgs/development/python-modules/types-appdirs/default.nix
Normal file
@ -0,0 +1,21 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-appdirs";
|
||||
version = "1.4.3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-gyaNpkWFNhv6KR+PUGogknYhKgSXvTfwUSqTmz1p/xQ=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "This is a PEP 561 type stub package for the appdirs package. It can be used by type-checking tools like mypy, pyright, pytype, PyCharm, etc. to check code that uses appdirs. ";
|
||||
homepage = "https://pypi.org/project/types-appdirss";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
21
pkgs/development/python-modules/types-mock/default.nix
Normal file
21
pkgs/development/python-modules/types-mock/default.nix
Normal file
@ -0,0 +1,21 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-mock";
|
||||
version = "5.1.0.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-8H1Z3lDqgWq0A7pOJG/4CwCSY7N3vD93Tf3r8LQD+2A=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "This is a PEP 561 type stub package for the mock package. It can be used by type-checking tools like mypy, pyright, pytype, PyCharm, etc. to check code that uses mock.";
|
||||
homepage = "https://pypi.org/project/types-mock";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
@ -22,14 +22,14 @@ with py.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.4.5";
|
||||
version = "2.4.6";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-hx2aDFIYf+9GplioNs446P654KOvsWO/wOiBmjEbeS4=";
|
||||
hash = "sha256-1o8l/c6DeT35GjEV/7+9+LLJwoCpWuq0LBkyr08mWaE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -12,11 +12,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xmake";
|
||||
version = "2.8.1";
|
||||
version = "2.8.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.tar.gz";
|
||||
hash = "sha256-nM0LV3CVaLNbB1EKjc+Ywir2aQ/xWgET2Cu+kh908l8=";
|
||||
hash = "sha256-rA0wiL2kZs+rOSCLXAaX50epK9aL+We4FYgr2/TxRKo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -6,13 +6,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-llvm-cov";
|
||||
version = "0.5.27";
|
||||
version = "0.5.28";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-c48JHEziyrNGfnPk9MB++9jlOtDp/80XYelqQXi7Rfs=";
|
||||
sha256 = "sha256-B+tyDVb/tSuxQAK8x5cEw+Y7Y5IXD+jkr0FeqiDY+g8=";
|
||||
};
|
||||
cargoSha256 = "sha256-ztF+txw6WAtpfiN1/zBzKw8jVjyf4YMHx3EfkGXSi4c=";
|
||||
cargoSha256 = "sha256-lGaMws7Z7qIWkQlfnSnN9cqRojBuxWp81nMAlBXAWEM=";
|
||||
|
||||
# skip tests which require llvm-tools-preview
|
||||
checkFlags = [
|
||||
|
@ -1,14 +1,15 @@
|
||||
{ lib, stdenv, fetchFromGitHub, makeWrapper, perlPackages }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let version = "1.98";
|
||||
in stdenv.mkDerivation {
|
||||
pname = "cloc";
|
||||
version = "1.96";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AlDanial";
|
||||
repo = "cloc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-20vL+SX8Tbp6QxErDn76c6sLWnB1IJwHlQX4YAvj+Eg=";
|
||||
sha256 = "sha256-OTzIzLgE9sdbHZUSARSbVrxD95dW8gPiM8tvMvqm1Bg=";
|
||||
};
|
||||
|
||||
setSourceRoot = ''
|
||||
@ -27,6 +28,28 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postFixup = "wrapProgram $out/bin/cloc --prefix PERL5LIB : $PERL5LIB";
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
|
||||
echo -n 'checking --version...'
|
||||
$out/bin/cloc --version | grep '${version}' > /dev/null
|
||||
echo ' ok'
|
||||
|
||||
cat > test.nix <<EOF
|
||||
{a, b}: {
|
||||
test = a
|
||||
+ b;
|
||||
}
|
||||
EOF
|
||||
|
||||
echo -n 'checking lines in test.nix...'
|
||||
$out/bin/cloc --quiet --csv test.nix | grep '1,Nix,0,0,4' > /dev/null
|
||||
echo ' ok'
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A program that counts lines of source code";
|
||||
homepage = "https://github.com/AlDanial/cloc";
|
||||
|
@ -90,5 +90,7 @@ stdenv.mkDerivation rec {
|
||||
platforms = lib.platforms.all;
|
||||
|
||||
license = lib.licenses.gpl3Plus;
|
||||
|
||||
mainProgram = "find";
|
||||
};
|
||||
}
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dnsproxy";
|
||||
version = "0.52.0";
|
||||
version = "0.54.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdguardTeam";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vHiC7RWPba4LlS0YX088HqS3hLGEt0jHKzL7DcysEkw=";
|
||||
sha256 = "sha256-wA88v8zF5sq3NQwKh8g4k/COviuaegGn6bBTzBMcdGM=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
@ -5,17 +5,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cnspec";
|
||||
version = "8.22.1";
|
||||
version = "8.23.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mondoohq";
|
||||
repo = "cnspec";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-xTYPAipdfrwAhtLcLZkClnmB1qRlgfTwt8Qpq6iSZPk=";
|
||||
hash = "sha256-fqbqbKAj7NKtPXbL6iAI4o8Vpr7n6zp1WM72kQXj/H8=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-PE5RLMUi1bqFjUntvUU3dXmygFfzFJF+HerW5A+OktA=";
|
||||
vendorHash = "sha256-+gTIBLNiXqcYXK0WGucwXXCBjkhkr5rrTjGKUuqn+mY=";
|
||||
|
||||
subPackages = [
|
||||
"apps/cnspec"
|
||||
|
46
pkgs/tools/security/holehe/default.nix
Normal file
46
pkgs/tools/security/holehe/default.nix
Normal file
@ -0,0 +1,46 @@
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "holehe";
|
||||
version = "unstable-2023-05-18";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "megadose";
|
||||
repo = "holehe";
|
||||
rev = "bec2f582c286a4e32de4dfc1f241297f60bd8713";
|
||||
hash = "sha256-dLfuQew6cqb32r9AMubuo51A7TeaIafEdZs0OrQF7Gg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# https://github.com/megadose/holehe/pull/178
|
||||
substituteInPlace setup.py \
|
||||
--replace "bs4" "beautifulsoup4"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
beautifulsoup4
|
||||
colorama
|
||||
httpx
|
||||
termcolor
|
||||
tqdm
|
||||
trio
|
||||
];
|
||||
|
||||
# Project has no test
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"holehe"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI to check if the mail is used on different sites";
|
||||
homepage = "https://github.com/megadose/holehe";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
37
pkgs/tools/security/hstsparser/default.nix
Normal file
37
pkgs/tools/security/hstsparser/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "hstsparser";
|
||||
version = "1.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thebeanogamer";
|
||||
repo = "hstsparser";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-9ZNBzPa4mFXbao73QukEL56sM/3dg4ElOMXgNGTVh1g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
prettytable
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"hstsparser"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to parse Firefox and Chrome HSTS databases into forensic artifacts";
|
||||
homepage = "https://github.com/thebeanogamer/hstsparser";
|
||||
changelog = "https://github.com/thebeanogamer/hstsparser/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
47
pkgs/tools/security/kepler/default.nix
Normal file
47
pkgs/tools/security/kepler/default.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, darwin
|
||||
, fetchFromGitHub
|
||||
, openssl
|
||||
, pkg-config
|
||||
, postgresql
|
||||
, rustPlatform
|
||||
, zstd
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kepler";
|
||||
version = "unstable-2023-07-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Exein-io";
|
||||
repo = "kepler";
|
||||
rev = "9f4f9c617f2477850ed70f1b1d7387807c35d26c";
|
||||
hash = "sha256-jmQ88flSMrS0CB7GNj1Ee60HZgroDKTwLk0i/kg6gVM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+WLb4DsAW6tnO0KdtD9zMnYCEb1t0onZqFhnqhbIStU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
postgresql
|
||||
zstd
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
env = {
|
||||
ZSTD_SYS_USE_PKG_CONFIG = true;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "NIST-based CVE lookup store and API powered by Rust";
|
||||
homepage = "https://github.com/Exein-io/kepler";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "automatic-timezoned";
|
||||
version = "1.0.118";
|
||||
version = "1.0.121";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxbrunet";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kV66aN/eGrGIX61zcdyow1f/VzrYW0m/TVOx13Jq88E=";
|
||||
sha256 = "sha256-B3Ndu6Zyq7tsVOvQqtnBB7Fs8CbxrogeV5LF20u17IQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-705pVGdVixq/Xog8RBktERP8GBLkt8Ch2DozuSngTas=";
|
||||
cargoHash = "sha256-2rVqwmWn59ytLRrMFS1m97CXlJ/FneV7QSMdvqjzmw8=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Automatically update system timezone based on location";
|
||||
|
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ugrep";
|
||||
version = "4.0.0";
|
||||
version = "4.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Genivia";
|
||||
repo = "ugrep";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-kRpHJl/ouYgvwFMk6uO4XobyT2kTCH9kLfeF70IqMuc=";
|
||||
hash = "sha256-g+COkAdXc1Z3yrObbeBU1wtu9Tr3mEhxrf6Qmy3JywY=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
@ -22066,6 +22066,8 @@ with pkgs;
|
||||
|
||||
hstr = callPackage ../applications/misc/hstr { };
|
||||
|
||||
hstsparser = callPackage ../tools/security/hstsparser { };
|
||||
|
||||
htmlcxx = callPackage ../development/libraries/htmlcxx { };
|
||||
|
||||
http-parser = callPackage ../development/libraries/http-parser { };
|
||||
@ -33076,6 +33078,8 @@ with pkgs;
|
||||
|
||||
keet = callPackage ../applications/networking/instant-messengers/keet { };
|
||||
|
||||
kepler = callPackage ../tools/security/kepler { };
|
||||
|
||||
kepubify = callPackage ../tools/misc/kepubify { };
|
||||
|
||||
kermit = callPackage ../tools/misc/kermit { };
|
||||
@ -33126,6 +33130,8 @@ with pkgs;
|
||||
|
||||
kn = callPackage ../applications/networking/cluster/kn { };
|
||||
|
||||
kns = callPackage ../applications/networking/cluster/kns { };
|
||||
|
||||
kondo = callPackage ../applications/misc/kondo { };
|
||||
|
||||
kooha = callPackage ../applications/video/kooha { };
|
||||
@ -39554,6 +39560,8 @@ with pkgs;
|
||||
|
||||
inherit (ocamlPackages) hol_light;
|
||||
|
||||
holehe = callPackage ../tools/security/holehe { };
|
||||
|
||||
hologram = callPackage ../tools/security/hologram { };
|
||||
|
||||
honeytrap = callPackage ../tools/security/honeytrap { };
|
||||
|
@ -5360,7 +5360,9 @@ self: super: with self; {
|
||||
|
||||
jaraco-text = callPackage ../development/python-modules/jaraco-text { };
|
||||
|
||||
jarowinkler = callPackage ../development/python-modules/jarowinkler { };
|
||||
jarowinkler = callPackage ../development/python-modules/jarowinkler {
|
||||
inherit (pkgs) cmake ninja;
|
||||
};
|
||||
|
||||
javaobj-py3 = callPackage ../development/python-modules/javaobj-py3 { };
|
||||
|
||||
@ -8144,6 +8146,8 @@ self: super: with self; {
|
||||
|
||||
pyhumps = callPackage ../development/python-modules/pyhumps { };
|
||||
|
||||
pyinstaller-versionfile = callPackage ../development/python-modules/pyinstaller-versionfile { };
|
||||
|
||||
pyisy = callPackage ../development/python-modules/pyisy { };
|
||||
|
||||
pykrakenapi = callPackage ../development/python-modules/pykrakenapi { };
|
||||
@ -12418,8 +12422,12 @@ self: super: with self; {
|
||||
|
||||
syrupy = callPackage ../development/python-modules/syrupy { };
|
||||
|
||||
tabcmd = callPackage ../development/python-modules/tabcmd { };
|
||||
|
||||
tableaudocumentapi = callPackage ../development/python-modules/tableaudocumentapi { };
|
||||
|
||||
tableauserverclient = callPackage ../development/python-modules/tableauserverclient { };
|
||||
|
||||
tabledata = callPackage ../development/python-modules/tabledata { };
|
||||
|
||||
tables = callPackage ../development/python-modules/tables { };
|
||||
@ -13090,6 +13098,8 @@ self: super: with self; {
|
||||
|
||||
typer = callPackage ../development/python-modules/typer { };
|
||||
|
||||
types-appdirs = callPackage ../development/python-modules/types-appdirs { };
|
||||
|
||||
types-colorama = callPackage ../development/python-modules/types-colorama { };
|
||||
|
||||
types-dateutil = callPackage ../development/python-modules/types-dateutil { };
|
||||
@ -13108,6 +13118,8 @@ self: super: with self; {
|
||||
|
||||
types-ipaddress = callPackage ../development/python-modules/types-ipaddress { };
|
||||
|
||||
types-mock = callPackage ../development/python-modules/types-mock { };
|
||||
|
||||
types-pillow = callPackage ../development/python-modules/types-pillow { };
|
||||
|
||||
types-protobuf = callPackage ../development/python-modules/types-protobuf { };
|
||||
|
Loading…
Reference in New Issue
Block a user