Merge branch 'master' into staging-next
This commit is contained in:
Martin Weinelt
GitHub
commit
423119b70b
@ -357,10 +357,10 @@
|
||||
name = "AmirHossein Roozbahani";
|
||||
};
|
||||
ahuzik = {
|
||||
email = "ales.guzik@gmail.com";
|
||||
github = "alesguzik";
|
||||
email = "ah1990au@gmail.com";
|
||||
github = "alesya-h";
|
||||
githubId = 209175;
|
||||
name = "Ales Huzik";
|
||||
name = "Alesya Huzik";
|
||||
};
|
||||
aij = {
|
||||
email = "aij+git@mrph.org";
|
||||
|
||||
@ -1,28 +1,88 @@
|
||||
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, cairo, libxkbcommon, xcbutilcursor, xcbutilkeysyms, xcbutil, libXrandr, libXinerama, libXcursor, alsa-lib, libjack2
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, alsa-lib
|
||||
, freetype
|
||||
, libjack2
|
||||
, lv2
|
||||
, libX11
|
||||
, libXcursor
|
||||
, libXext
|
||||
, libXinerama
|
||||
, libXrandr
|
||||
}:
|
||||
|
||||
let
|
||||
juce-lv2 = stdenv.mkDerivation {
|
||||
pname = "juce-lv2";
|
||||
version = "unstable-2021-12-11";
|
||||
|
||||
# lv2 branch
|
||||
src = fetchFromGitHub {
|
||||
owner = "lv2-porting-project";
|
||||
repo = "JUCE";
|
||||
rev = "5106d9d77b892c22afcb9379c13982f270429e2e";
|
||||
sha256 = "sha256-bpZJ5NEDRfMtmx0RkKQFZWqS/SnYAFRhrDg9MSphh4c=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
cp -r . $out
|
||||
'';
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "surge-XT";
|
||||
version = "unstable-2021-11-07";
|
||||
version = "unstable-2021-12-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "surge-synthesizer";
|
||||
repo = "surge";
|
||||
rev = "ed93833eb44b177c977e3a7b878ffdd9bf9f24e5";
|
||||
sha256 = "0b164659ksl6h5nn7jja5zccx2mwzibqs6b7hg8l98gpcy9fi5r2";
|
||||
rev = "320f68543d0279c11cea8dc7f5170399cccc9602";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-Jcs5FpX5AZl72aKYNbRcfYqb2PRt0r1pQXk957xk0aM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ cairo libxkbcommon xcbutilcursor xcbutilkeysyms xcbutil libXrandr libXinerama libXcursor alsa-lib libjack2 ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
cd ..
|
||||
cmake --build build --config Release --target install
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
freetype
|
||||
libjack2
|
||||
lv2
|
||||
libX11
|
||||
libXcursor
|
||||
libXext
|
||||
libXinerama
|
||||
libXrandr
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DJUCE_SUPPORTS_LV2=ON"
|
||||
"-DSURGE_JUCE_PATH=${juce-lv2}"
|
||||
];
|
||||
|
||||
# JUCE dlopen's these at runtime, crashes without them
|
||||
NIX_LDFLAGS = (toString [
|
||||
"-lX11"
|
||||
"-lXext"
|
||||
"-lXcursor"
|
||||
"-lXinerama"
|
||||
"-lXrandr"
|
||||
]);
|
||||
|
||||
# see https://github.com/NixOS/nixpkgs/pull/149487#issuecomment-991747333
|
||||
postPatch = ''
|
||||
export XDG_DOCUMENTS_DIR=$(mktemp -d)
|
||||
'';
|
||||
|
||||
doInstallCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "LV2 & VST3 synthesizer plug-in (previously released as Vember Audio Surge)";
|
||||
homepage = "https://surge-synthesizer.github.io";
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "vmpk";
|
||||
version = "0.8.4";
|
||||
version = "0.8.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-SSdD8dyn6abti8qkd7N5n8EYr5yMW+EPYUnRm7S9CE4=";
|
||||
sha256 = "sha256-SPome4UKGOWQLT9RMoGZ0wUdwodG8mSIaGFCg0i5CmY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config qttools docbook-xsl-nons ];
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "texstudio";
|
||||
version = "4.1.1";
|
||||
version = "4.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "${pname}-org";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-zsZBqheHrjd17pXDIG0qWd7KI/zhNl3sQS5No0WvnBY=";
|
||||
sha256 = "sha256-+HEA0IvWy0jvjFdU0sG9CzOKzysERMZBs/yHoE0I8B4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ];
|
||||
|
||||
@ -24,10 +24,10 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "auto-multiple-choice";
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
src = fetchurl {
|
||||
url = "https://download.auto-multiple-choice.net/${pname}_${version}_precomp.tar.gz";
|
||||
sha256 = "71831122f7b43245d3289617064e0b561817c0130ee1773c1b957841b28b854c";
|
||||
sha256 = "sha256-AjonJOooSe53Fww3QU6Dft95ojNqWrTuPul3nkIbctM=";
|
||||
};
|
||||
tlType = "run";
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "batsignal";
|
||||
version = "1.2.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "electrickite";
|
||||
repo = "batsignal";
|
||||
rev = version;
|
||||
sha256 = "0yc7xgwb3i4m8m9kg2xspqig3s2qgh2i9bkalvnkziayjb7y59qn";
|
||||
sha256 = "sha256-ClwI3ZbkLul+l0zzzGxNjSOUTuVzIxtwUPNLOeFT2X0=";
|
||||
};
|
||||
|
||||
buildInputs = [ libnotify glib ];
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_15 }:
|
||||
{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "logseq";
|
||||
version = "0.5.1";
|
||||
version = "0.5.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
|
||||
sha256 = "/ZI9kK/9bYRJL8jOyRKpdMcy4Cbau+a28AO+kTUl+SE=";
|
||||
sha256 = "ZlyteVTwP5oM32G+yUzCOmu6b/b19RVLmlEvyOz5hu0=";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
makeWrapper ${electron_15}/bin/electron $out/bin/${pname} \
|
||||
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
|
||||
--add-flags $out/share/${pname}/resources/app
|
||||
'';
|
||||
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ lib, stdenv, fetchurl, fetchFromGitLab, jdk17_headless, coreutils, gradle_6, git, perl
|
||||
, makeWrapper }:
|
||||
, makeWrapper, fetchpatch
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "signald";
|
||||
@ -12,6 +13,11 @@ let
|
||||
sha256 = "ftK+oeqzJ+TxrlvqivFkAi5RCcyJ5Y0oQAJuo0YheBg=";
|
||||
};
|
||||
|
||||
log4j-update-cve-2021-44228 = fetchpatch {
|
||||
url = "https://gitlab.com/signald/signald/-/commit/7f668062ab9ffa09a49d171e995f57cf0a0803a7.patch";
|
||||
sha256 = "sha256-504je6hKciUGelVCGZjxGjHi1qZQaovagXD5PBQP+mM=";
|
||||
};
|
||||
|
||||
buildConfigJar = fetchurl {
|
||||
url = "https://dl.bintray.com/mfuerstenau/maven/gradle/plugin/de/fuerstenau/BuildConfigPlugin/1.1.8/BuildConfigPlugin-1.1.8.jar";
|
||||
sha256 = "0y1f42y7ilm3ykgnm6s3ks54d71n8lsy5649xgd9ahv28lj05x9f";
|
||||
@ -21,6 +27,7 @@ let
|
||||
deps = stdenv.mkDerivation {
|
||||
pname = "${pname}-deps";
|
||||
inherit src version;
|
||||
patches = [ log4j-update-cve-2021-44228 ];
|
||||
nativeBuildInputs = [ gradle_6 perl ];
|
||||
buildPhase = ''
|
||||
export GRADLE_USER_HOME=$(mktemp -d)
|
||||
@ -38,15 +45,18 @@ let
|
||||
outputHashMode = "recursive";
|
||||
# Downloaded jars differ by platform
|
||||
outputHash = {
|
||||
x86_64-linux = "gEaOOsELhfKC1cFV8tqRHbBUI6+M/cDOaqN8FQ1J/TE=";
|
||||
aarch64-linux = "UhnQ+Ge48/NdTqUWIxd0VNadHFvQ9awBTtn65Nz3+UM=";
|
||||
x86_64-linux = "sha256-e2Tehtznc+VsvQzD3lQ50Lg7ipQc7P3ekOnb8XLORO8=";
|
||||
aarch64-linux = "sha256-P48s3vG5vUNxCCga5FhzpODhlvvc+F2ZZGX/G0FVGWc=";
|
||||
}.${stdenv.system} or (throw "Unsupported platform");
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
inherit pname src version;
|
||||
|
||||
patches = [ ./gradle-plugin.patch ];
|
||||
patches = [
|
||||
./gradle-plugin.patch
|
||||
log4j-update-cve-2021-44228
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's|BuildConfig.jar|${buildConfigJar}|' build.gradle
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tixati";
|
||||
version = "2.86";
|
||||
version = "2.87";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz";
|
||||
sha256 = "sha256-E5jZnjIdYRzkZ9hN7gKzIIjC0k2nN47yDptsMYrsvIA=";
|
||||
sha256 = "sha256-URWLuZ/gtv/sX5+11ORu9SUZFIZUuKPn0CUQ1xaSQcQ=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -5,13 +5,13 @@ with lib;
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "nicotine-plus";
|
||||
version = "3.0.6";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nicotine-Plus";
|
||||
repo = "nicotine-plus";
|
||||
rev = version;
|
||||
sha256 = "sha256-NL6TXFRB7OeqNEfdANkEqh+MCOF1+ehR+6RO1XsIix8=";
|
||||
hash = "sha256-NfI2RfxAYhA1qefml1ayfYWjbkrzUL4l9p2Rm/ROnzQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gettext wrapGAppsHook ];
|
||||
@ -21,8 +21,6 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/nicotine $out/bin/nicotine-plus
|
||||
substituteInPlace $out/share/applications/org.nicotine_plus.Nicotine.desktop \
|
||||
--replace "Exec=nicotine" "Exec=$out/bin/nicotine-plus"
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
43
pkgs/applications/office/gnucash/0001-changes.patch
Normal file
43
pkgs/applications/office/gnucash/0001-changes.patch
Normal file
@ -0,0 +1,43 @@
|
||||
diff --git a/libgnucash/engine/test/CMakeLists.txt b/libgnucash/engine/test/CMakeLists.txt
|
||||
index 8e44172ff..c7289e4fd 100644
|
||||
--- a/libgnucash/engine/test/CMakeLists.txt
|
||||
+++ b/libgnucash/engine/test/CMakeLists.txt
|
||||
@@ -167,22 +167,22 @@ set(test_gnc_numeric_SOURCES
|
||||
gnc_add_test(test-gnc-numeric "${test_gnc_numeric_SOURCES}"
|
||||
gtest_engine_INCLUDES gtest_qof_LIBS)
|
||||
|
||||
-set(test_gnc_timezone_SOURCES
|
||||
- ${MODULEPATH}/gnc-timezone.cpp
|
||||
- gtest-gnc-timezone.cpp)
|
||||
-gnc_add_test(test-gnc-timezone "${test_gnc_timezone_SOURCES}"
|
||||
- gtest_engine_INCLUDES gtest_old_engine_LIBS)
|
||||
-
|
||||
-set(test_gnc_datetime_SOURCES
|
||||
- ${MODULEPATH}/gnc-datetime.cpp
|
||||
- ${MODULEPATH}/gnc-timezone.cpp
|
||||
- ${MODULEPATH}/gnc-date.cpp
|
||||
- ${MODULEPATH}/qoflog.cpp
|
||||
- ${CMAKE_SOURCE_DIR}/libgnucash/core-utils/gnc-locale-utils.cpp
|
||||
- ${gtest_engine_win32_SOURCES}
|
||||
- gtest-gnc-datetime.cpp)
|
||||
-gnc_add_test(test-gnc-datetime "${test_gnc_datetime_SOURCES}"
|
||||
- gtest_engine_INCLUDES gtest_qof_LIBS)
|
||||
+#set(test_gnc_timezone_SOURCES
|
||||
+# ${MODULEPATH}/gnc-timezone.cpp
|
||||
+# gtest-gnc-timezone.cpp)
|
||||
+#gnc_add_test(test-gnc-timezone "${test_gnc_timezone_SOURCES}"
|
||||
+# gtest_engine_INCLUDES gtest_old_engine_LIBS)
|
||||
+
|
||||
+#set(test_gnc_datetime_SOURCES
|
||||
+# ${MODULEPATH}/gnc-datetime.cpp
|
||||
+# ${MODULEPATH}/gnc-timezone.cpp
|
||||
+# ${MODULEPATH}/gnc-date.cpp
|
||||
+# ${MODULEPATH}/qoflog.cpp
|
||||
+# ${CMAKE_SOURCE_DIR}/libgnucash/core-utils/gnc-locale-utils.cpp
|
||||
+# ${gtest_engine_win32_SOURCES}
|
||||
+# gtest-gnc-datetime.cpp)
|
||||
+#gnc_add_test(test-gnc-datetime "${test_gnc_datetime_SOURCES}"
|
||||
+# gtest_engine_INCLUDES gtest_qof_LIBS)
|
||||
|
||||
set(test_import_map_SOURCES
|
||||
gtest-import-map.cpp)
|
||||
@ -1,4 +1,4 @@
|
||||
{ fetchurl, fetchpatch, lib, stdenv, pkg-config, makeWrapper, cmake, gtest
|
||||
{ fetchurl, lib, stdenv, pkg-config, makeWrapper, cmake, gtest
|
||||
, boost, icu, libxml2, libxslt, gettext, swig, isocodes, gtk3, glibcLocales
|
||||
, webkitgtk, dconf, hicolor-icon-theme, libofx, aqbanking, gwenhywfar, libdbi
|
||||
, libdbiDrivers, guile, perl, perlPackages
|
||||
@ -26,22 +26,13 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnucash";
|
||||
version = "4.6";
|
||||
version = "4.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0csp8iddhc901vv09gl5lj970g6ili696vwj4vdpkiprp7gh26r5";
|
||||
sha256 = "04pbgx08lfm3l46ndd28ivq5yp3y6zgalbzgi2x8w5inhgzy9f0m";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fixes a warning about an initialized variable that kills enableDebugging gnucash builds on nix.
|
||||
# This will most likely be part of the 4.7 release, it will be safe to remove then.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Gnucash/gnucash/commit/b42052464ba9701a3d1834fc58fa0deb32ab9afe.patch";
|
||||
sha256 = "092957c8jqj4v70fv0ia1wpgl6x34hbwjrichxfbk5ja8l6535gc";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper cmake gtest swig ];
|
||||
|
||||
buildInputs = [
|
||||
@ -56,6 +47,9 @@ stdenv.mkDerivation rec {
|
||||
# glib-2.62 deprecations
|
||||
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
|
||||
|
||||
# this patch disables test-gnc-timezone and test-gnc-datetime which fail due to nix datetime challenges
|
||||
patches = [ ./0001-changes.patch ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
@ -77,20 +71,16 @@ stdenv.mkDerivation rec {
|
||||
--prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules"
|
||||
'';
|
||||
|
||||
# TODO: The following tests FAILED:
|
||||
# 70 - test-load-c (Failed)
|
||||
# 71 - test-modsysver (Failed)
|
||||
# 72 - test-incompatdep (Failed)
|
||||
# 73 - test-agedver (Failed)
|
||||
# 77 - test-gnc-module-swigged-c (Failed)
|
||||
# 78 - test-gnc-module-load-deps (Failed)
|
||||
# 80 - test-gnc-module-scm-module (Failed)
|
||||
# 81 - test-gnc-module-scm-multi (Failed)
|
||||
/*
|
||||
GNUcash's `make check` target does not define its prerequisites but expects them to have already been built.
|
||||
The list of targets below was built through trial and error based on failing tests.
|
||||
*/
|
||||
preCheck = ''
|
||||
export LD_LIBRARY_PATH=$PWD/lib:$PWD/lib/gnucash:$PWD/lib/gnucash/test''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
|
||||
export LD_LIBRARY_PATH=$PWD/lib:$PWD/lib/gnucash:$PWD/lib/gnucash/test:$PWD/lib/gnucash/test/future''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
|
||||
export NIX_CFLAGS_LINK="-lgtest -lgtest_main"
|
||||
make test-scm-query test-split-register-copy-ops test-link-ofx test-import-backend test-import-account-matcher test-import-pending-matches test-qofquerycore test-import-map test-gnc-numeric test-gnc-rational test-gnc-int128 test-qofsession test-kvp-value test-gnc-guid test-numeric test-vendor test-job test-employee test-customer test-address test-business test-recurrence test-transaction-voiding test-transaction-reversal test-split-vs-account test-tokenizer test-aqb test-import-parse test-link-module-tax-us test-dynload test-agedver test-incompatdep test-modsysver test-load-c test-gnc-path-util test-xml2-is-file test-load-example-account test-query test-querynew test-lots test-group-vs-book test-account-object test-engine test-qof test-commodities test-object test-guid test-load-engine test-userdata-dir-invalid-home test-userdata-dir test-resolve-file-path test-gnc-glib-utils test-sqlbe test-column-types test-backend-dbi test-xml-transaction test-xml-pricedb test-xml-commodity test-xml-account test-string-converters test-load-backend test-kvp-frames test-dom-converters1 test-autoclear test-sx test-print-parse-amount gncmod-futuremodsys
|
||||
'';
|
||||
doCheck = false;
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Personal and small-business financial-accounting application";
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
, isPy3k, isPyPy
|
||||
|
||||
, distro, setuptools
|
||||
, distro, setuptools, psutil
|
||||
|
||||
, pkgs
|
||||
}:
|
||||
@ -25,6 +25,7 @@ buildPythonPackage rec {
|
||||
propagatedBuildInputs = [
|
||||
distro
|
||||
setuptools
|
||||
psutil
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkgs.gettext pkgs.which ];
|
||||
|
||||
@ -38,6 +38,7 @@ buildPythonPackage rec {
|
||||
pygobject3
|
||||
pkgs.poppler_gi
|
||||
pkgs.gtk3
|
||||
pkgs.libhandy
|
||||
distro
|
||||
pkgs.pango
|
||||
openpaperwork-core
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
, isPyPy
|
||||
|
||||
, pyenchant
|
||||
, simplebayes
|
||||
, scikit-learn
|
||||
, pypillowfight
|
||||
, pycountry
|
||||
, whoosh
|
||||
@ -41,7 +41,7 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pyenchant
|
||||
simplebayes
|
||||
scikit-learn
|
||||
pypillowfight
|
||||
pycountry
|
||||
whoosh
|
||||
@ -61,12 +61,12 @@ buildPythonPackage rec {
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkgs.gettext pkgs.which ];
|
||||
nativeBuildInputs = [ pkgs.gettext pkgs.which pkgs.shared-mime-info ];
|
||||
preBuild = ''
|
||||
make l10n_compile
|
||||
'';
|
||||
|
||||
checkInputs = [ openpaperwork-gtk psutil ];
|
||||
checkInputs = [ openpaperwork-gtk psutil pkgs.libreoffice ];
|
||||
|
||||
meta = {
|
||||
description = "Backend part of Paperwork (Python API, no UI)";
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{fetchFromGitLab}:
|
||||
rec {
|
||||
version = "2.0.3";
|
||||
version = "2.1.0";
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
repo = "paperwork";
|
||||
group = "World";
|
||||
owner = "OpenPaperwork";
|
||||
rev = version;
|
||||
sha256 = "02c2ysca75j59v87n1axqfncvs167kmdr40m0f05asdh2akwrbi9";
|
||||
sha256 = "0d1cw6k1giqs8ji8h3h97ckb134s8pszgip0nac5hmw0mvqq84xa";
|
||||
};
|
||||
sample_documents = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
@ -15,8 +15,8 @@ rec {
|
||||
group = "World";
|
||||
owner = "OpenPaperwork";
|
||||
# https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/blob/master/paperwork-gtk/src/paperwork_gtk/model/help/screenshot.sh see TEST_DOCS_TAG
|
||||
rev = "1.0";
|
||||
sha256 = "155nhw2jmlgfi6c3wm241vrr3yma6lw85k9lxn844z96kyi7wbpr";
|
||||
rev = "2.1";
|
||||
sha256 = "0m79fgc1ycsj0q0alqgr0axn16klz1sfs2km1h83zn3kysqcs6xr";
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -17,9 +17,11 @@ stdenv.mkDerivation {
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ why3 ] ++ provers;
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
buildPhase = ''
|
||||
mkdir -p $out/share/why3/
|
||||
why3 config --detect-provers -C $out/share/why3/why3.conf
|
||||
why3 config detect -C $out/share/why3/why3.conf
|
||||
awk -i inplace -f ${configAwkScript} $out/share/why3/why3.conf
|
||||
'';
|
||||
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip, pkg-config }:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gitui";
|
||||
version = "0.18.0";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "extrawurst";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NzE2eT3QxnbDW63Cnv6M7IlYgb2XuymphwaL1PTfcyQ=";
|
||||
sha256 = "sha256-PNyXmXHS8StJhx6Qko7zbXrX1CX3owC1HmyX9VV7tEg=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-9SWovdjYfeneqOVl+I+tuJTIC/htC7h1tXi2KUbdYb8=";
|
||||
cargoSha256 = "sha256-Q6QUxIe5bkoEcxZZwhJbihaHhSsX8SLqWzmjp8hFsS4=";
|
||||
|
||||
nativeBuildInputs = [ python3 perl pkg-config ];
|
||||
buildInputs = [ openssl ]
|
||||
|
||||
@ -214,6 +214,7 @@ in stdenv.mkDerivation (fBuildAttrs // {
|
||||
--output_base="$bazelOut" \
|
||||
--output_user_root="$bazelUserRoot" \
|
||||
build \
|
||||
--curses=no \
|
||||
-j $NIX_BUILD_CORES \
|
||||
"''${copts[@]}" \
|
||||
"''${host_copts[@]}" \
|
||||
|
||||
37
pkgs/data/icons/nordzy-cursor-theme/default.nix
Normal file
37
pkgs/data/icons/nordzy-cursor-theme/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nordzy-cursor-theme";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alvatip";
|
||||
repo = "Nordzy-cursors";
|
||||
rev = "v${version}";
|
||||
sha256 = "XabfKFyeII7Xl+ozzpPnc4xFH4B7GzCTLq4M1QPSZPw=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/icons
|
||||
|
||||
cp -r nordzy-dark/ $out/share/icons/Nordzy-cursors
|
||||
mv $out/share/icons/Nordzy-cursors/index.theme $out/share/icons/Nordzy-cursors/cursor.theme
|
||||
mv $out/share/icons/Nordzy-cursors/Nordzy-cursors $out/share/icons/Nordzy-cursors/cursors
|
||||
cp -r nordzy-white/ $out/share/icons/Nordzy-white-cursors
|
||||
mv $out/share/icons/Nordzy-white-cursors/index.theme $out/share/icons/Nordzy-white-cursors/cursor.theme
|
||||
mv $out/share/icons/Nordzy-white-cursors/Nordzy-white-cursors $out/share/icons/Nordzy-white-cursors/cursors
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cursor theme using the Nord color palette and based on Vimix and cz-Viator";
|
||||
homepage = "https://github.com/alvatip/Nordzy-cursors";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [
|
||||
alexnortung
|
||||
];
|
||||
};
|
||||
}
|
||||
@ -24,11 +24,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-calendar";
|
||||
version = "41.1";
|
||||
version = "41.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "m1EmsjPhuPic9MIyYIlXHYKakwPsieplz2IWTmp0IuE=";
|
||||
sha256 = "lWsvGQMiZRxn/mZyI4lviqWs8ztwraWjsFpTYb2mYRo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -215,7 +215,7 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
inherit (nodePkgs) elm-doc-preview elm-live elm-upgrade elm-xref elm-analyse;
|
||||
inherit (nodePkgs) elm-doc-preview elm-live elm-upgrade elm-xref elm-analyse elm-git-install;
|
||||
};
|
||||
|
||||
in hsPkgs.elmPkgs // elmNodePackages // elmRustPackages // {
|
||||
|
||||
@ -10,5 +10,6 @@
|
||||
"elm-xref",
|
||||
"create-elm-app",
|
||||
"elm-optimize-level-2",
|
||||
"elm-review"
|
||||
"elm-review",
|
||||
"elm-git-install"
|
||||
]
|
||||
|
||||
1242
pkgs/development/compilers/elm/packages/node-packages.nix
generated
1242
pkgs/development/compilers/elm/packages/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -15,6 +15,7 @@ let
|
||||
});
|
||||
|
||||
release = {
|
||||
"8.14.0+0.14.0".sha256 = "sha256:1kh80yb791yl771qbqkvwhbhydfii23a7lql0jgifvllm2k8hd8d";
|
||||
"8.14+rc1+0.14.0".sha256 = "1w7d7anvcfx8vz51mnrf1jkw6rlpzjkjlr06avf58wlhymww7pja";
|
||||
"8.13.0+0.13.0".sha256 = "0k69907xn4k61w4mkhwf8kh8drw9pijk9ynijsppihw98j8w38fy";
|
||||
"8.12.0+0.12.1".sha256 = "048x3sgcq4h845hi6hm4j4dsfca8zfj70dm42w68n63qcm6xf9hn";
|
||||
@ -27,7 +28,11 @@ in
|
||||
pname = "serapi";
|
||||
inherit version release;
|
||||
|
||||
defaultVersion = with versions; switch coq.version [
|
||||
defaultVersion = with versions;
|
||||
if isGe "4.12" coq.ocamlPackages.ocaml.version then null
|
||||
else
|
||||
switch coq.version [
|
||||
{ case = isEq "8.14"; out = "8.14.0+0.14.0"; }
|
||||
{ case = isEq "8.13"; out = "8.13.0+0.13.0"; }
|
||||
{ case = isEq "8.12"; out = "8.12.0+0.12.1"; }
|
||||
{ case = isEq "8.11"; out = "8.11.0+0.11.1"; }
|
||||
|
||||
@ -11,6 +11,13 @@ mkDerivation rec {
|
||||
sha256 = "1acb693ad2nrmnn6jxsyrlkc0di3kk2ksj2w9wnyfxrgvfsil7rn";
|
||||
};
|
||||
|
||||
# Remove this once new version of agda-categories is released which
|
||||
# directly references standard-library-1.7.1
|
||||
postPatch = ''
|
||||
substituteInPlace agda-categories.agda-lib \
|
||||
--replace 'standard-library-1.7' 'standard-library-1.7.1'
|
||||
'';
|
||||
|
||||
buildInputs = [ standard-library ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "standard-library";
|
||||
version = "1.7";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "agda-stdlib";
|
||||
owner = "agda";
|
||||
rev = "v${version}";
|
||||
sha256 = "14h3jprm6924g9576v25axn9v6xnip354hvpzlcqsc5qqyj7zzjs";
|
||||
sha256 = "0khl12jvknsvjsq3l5cbp2b5qlw983qbymi1dcgfz9z0b92si3r0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ];
|
||||
|
||||
@ -199,6 +199,7 @@ stdenv.mkDerivation rec {
|
||||
"S3RegionResolutionTest.PublicBucket"
|
||||
"S3RegionResolutionTest.RestrictedBucket"
|
||||
"TestMinioServer.Connect"
|
||||
"TestS3FS.GetFileInfoRoot"
|
||||
"TestS3FS.OpenOutputStreamBackgroundWrites"
|
||||
"TestS3FS.OpenOutputStreamDestructorBackgroundWrites"
|
||||
"TestS3FS.OpenOutputStreamDestructorSyncWrite"
|
||||
|
||||
32
pkgs/development/libraries/imgui/default.nix
Normal file
32
pkgs/development/libraries/imgui/default.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{ stdenv, lib, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "imgui";
|
||||
version = "1.85";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocornut";
|
||||
repo = "imgui";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HQsGlsvmf3ikqhGnJHf/d6SRCY/QDeW7XUTwXQH/JYE=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/include/imgui
|
||||
|
||||
cp *.h $out/include/imgui
|
||||
cp *.cpp $out/include/imgui
|
||||
cp -a backends $out/include/imgui/
|
||||
cp -a misc $out/include/imgui/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Bloat-free Graphical User interface for C++ with minimal dependencies";
|
||||
homepage = "https://github.com/ocornut/imgui";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -1,6 +1,7 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
@ -26,6 +27,15 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-Cu5mZzsqAO4X4Y8QAn851zIFPVPwxj5pB+jvA62L108=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fixes test failure on x86_64-darwin
|
||||
# Drop when fix for https://github.com/libsidplayfp/libsidplayfp/issues/39 in a release (>2.3.1)
|
||||
(fetchpatch {
|
||||
url = "https://github.com/libsidplayfp/libsidplayfp/commit/337020a91caa0113de4f4374e0dc770e4056d2c7.patch";
|
||||
sha256 = "0sd7bqic8k945f05d8sk9mshf5d90ykd7f5p6m0n6v3jjhpwmqlq";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioambient";
|
||||
version = "2021.10.1";
|
||||
version = "2021.12.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-DCh/o7p+lO5BhN3JoLdhImkzfxoyqiscA/6CwwvAnc0=";
|
||||
sha256 = "sha256-nFCLMpkuSVPecKrtJ/z7KuyGw4Z9X79wKXmWsewbxvY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohue";
|
||||
version = "3.0.2";
|
||||
version = "3.0.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "8aaee7fef3fff4c9271728c645896226f3df1e00bfab8dcea2456edfb3395fd0";
|
||||
sha256 = "sha256-ajDwA8zFBQdFeI3oUBBWQZA13PNust21BWxrsB7PcTQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -3,15 +3,13 @@
|
||||
, async-timeout
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiopvapi";
|
||||
version = "unstable-2021-09-27";
|
||||
version = "1.6.19";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
@ -19,8 +17,9 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "sander76";
|
||||
repo = "aio-powerview-api";
|
||||
rev = "7b362e28a8ec8c9a53905879d8b519e03fd88e13";
|
||||
sha256 = "sha256-7bZLCv9PEJr61vimw39m89w/rha3tQWM8TWMtfd8kjQ=";
|
||||
# no tags on git, no sdist on pypi: https://github.com/sander76/aio-powerview-api/issues/12
|
||||
rev = "89711e2a0cb4640eb458767d289dcfa3acafb10f";
|
||||
sha256 = "18gbz9rcf183syvxvvhhl62af3b7463rlqxxs49w4m805hkvirdp";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioymaps";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-8U8I2pqvvm87IW1hhR4CGyIWdM/jsRPRP6u2yYGXdBw=";
|
||||
sha256 = "sha256-ZWolVsh6MSEA3h62ERaCLSVAr+vl53yysPjulMtW4QI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,15 +13,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "buienradar";
|
||||
version = "1.0.4";
|
||||
version = "1.0.5";
|
||||
|
||||
disabled = pythonOlder "3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mjj4791";
|
||||
repo = "python-buienradar";
|
||||
rev = version;
|
||||
sha256 = "1s0m5x7wdvzzsm797lh6531k614ybh7z0cikxjxqw377mivpz4wq";
|
||||
# https://github.com/mjj4791/python-buienradar/issues/14
|
||||
rev = "caa66ea855dbcc7cf6ee13291d9b2ed7ac01ef98";
|
||||
hash = "sha256:0xz03xj5qjayriaah20adh0ycvlvb8jdvgh7w5gm236n64g6krj0";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
47
pkgs/development/python-modules/cart/default.nix
Normal file
47
pkgs/development/python-modules/cart/default.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{ lib
|
||||
, pycryptodome
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, unittest2
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cart";
|
||||
version = "1.2.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CybercentreCanada";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PsdDlNhX0FbuwS5ZXk9P98DjnzDGdigfnRwrdwYa4qY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pycryptodome
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
unittest2
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"unittests"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"cart"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module for the CaRT Neutering format";
|
||||
homepage = "https://github.com/CybercentreCanada/cart";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
38
pkgs/development/python-modules/circuitbreaker/default.nix
Normal file
38
pkgs/development/python-modules/circuitbreaker/default.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, mock
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "circuitbreaker";
|
||||
version = "1.3.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fabfuel";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-3hFa8dwCso5tj26ek2jMdVBRzu5H3vkdjQlDYw2hSH0=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"circuitbreaker"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python Circuit Breaker implementation";
|
||||
homepage = "https://github.com/fabfuel/circuitbreaker";
|
||||
license = with licenses; [ bsd3 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
47
pkgs/development/python-modules/dm-tree/default.nix
Normal file
47
pkgs/development/python-modules/dm-tree/default.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{ autoPatchelfHook
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy39
|
||||
, lib
|
||||
, six
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dm-tree";
|
||||
version = "0.1.6";
|
||||
format = "wheel";
|
||||
|
||||
# At the time of writing (8/19/21), there are releases for 3.6-3.9. Supporting
|
||||
# all of them is a pain, so we focus on 3.9, the current nixpkgs python3
|
||||
# version.
|
||||
disabled = !isPy39;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version format;
|
||||
sha256 = "1f71dy5xa5ywa5chbdhpdf8k0w1v9cvpn3qyk8nnjm79j90la9c4";
|
||||
pname = "dm_tree";
|
||||
dist = "cp39";
|
||||
python = "cp39";
|
||||
abi = "cp39";
|
||||
platform = "manylinux_2_24_x86_64";
|
||||
};
|
||||
|
||||
# Prebuilt wheels are dynamically linked against things that nix can't find.
|
||||
# Run `autoPatchelfHook` to automagically fix them.
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
# Dynamic link dependencies
|
||||
buildInputs = [ stdenv.cc.cc ];
|
||||
|
||||
propagatedBuildInputs = [ six ];
|
||||
|
||||
pythonImportsCheck = [ "tree" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tree is a library for working with nested data structures.";
|
||||
homepage = "https://github.com/deepmind/tree";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ samuela ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
40
pkgs/development/python-modules/ecs-logging/default.nix
Normal file
40
pkgs/development/python-modules/ecs-logging/default.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, flit-core
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ecs-logging";
|
||||
version = "1.1.0";
|
||||
format = "flit";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elastic";
|
||||
repo = "ecs-logging-python";
|
||||
rev = version;
|
||||
sha256 = "sha256-UcQh/+K2d4tiMZaz4IAZ2w/B88vEkHoq2LCPMNZ95Mo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
flit-core
|
||||
];
|
||||
|
||||
# Circular dependency elastic-apm
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"ecs_logging"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Logging formatters for the Elastic Common Schema (ECS) in Python";
|
||||
homepage = "https://github.com/elastic/ecs-logging-python";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
90
pkgs/development/python-modules/elastic-apm/default.nix
Normal file
90
pkgs/development/python-modules/elastic-apm/default.nix
Normal file
@ -0,0 +1,90 @@
|
||||
{ lib
|
||||
, asynctest
|
||||
, aiohttp
|
||||
, blinker
|
||||
, buildPythonPackage
|
||||
, certifi
|
||||
, ecs-logging
|
||||
, fetchFromGitHub
|
||||
, httpx
|
||||
, jinja2
|
||||
, jsonschema
|
||||
, Logbook
|
||||
, mock
|
||||
, pytest-asyncio
|
||||
, pytest-bdd
|
||||
, pytest-localserver
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, sanic
|
||||
, sanic-testing
|
||||
, starlette
|
||||
, structlog
|
||||
, tornado
|
||||
, urllib3
|
||||
, webob
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "elastic-apm";
|
||||
version = "6.7.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elastic";
|
||||
repo = "apm-agent-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NyoFJ3HVxE3AdCCZCZrEk4dDiTIv9cGZYPHVre/PMO4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
blinker
|
||||
certifi
|
||||
sanic
|
||||
starlette
|
||||
tornado
|
||||
urllib3
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
asynctest
|
||||
ecs-logging
|
||||
jinja2
|
||||
jsonschema
|
||||
Logbook
|
||||
mock
|
||||
httpx
|
||||
pytest-asyncio
|
||||
pytest-bdd
|
||||
pytest-mock
|
||||
pytest-localserver
|
||||
sanic-testing
|
||||
pytestCheckHook
|
||||
structlog
|
||||
webob
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"elasticapm_client"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Exclude tornado tests
|
||||
"tests/contrib/asyncio/tornado/tornado_tests.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"elasticapm"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python agent for the Elastic APM";
|
||||
homepage = "https://github.com/elastic/apm-agent-python";
|
||||
license = with licenses; [ bsd3 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flux-led";
|
||||
version = "0.25.13";
|
||||
version = "0.26.11";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "Danielhiversen";
|
||||
repo = "flux_led";
|
||||
rev = version;
|
||||
sha256 = "sha256-ZWaKk9496AKlQIni+VmnyIda9kn5zQfzmaD76DznQNU=";
|
||||
sha256 = "sha256-1+LS9pAJQsXzt5vC4vR2SBzC21GbLj8nZ8oF5CfVWSg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-nest-sdm";
|
||||
version = "0.4.0";
|
||||
version = "0.4.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "allenporter";
|
||||
repo = "python-google-nest-sdm";
|
||||
rev = version;
|
||||
sha256 = "sha256-mm1FhR10asxJI8MQfQipqmQbHQfO3z49jpnnrz38Clo=";
|
||||
sha256 = "sha256-oMYCBmqDTPcGHwP3LFYX3CdbHw2hg41EQQv8iiv+ljE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hatasmota";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "emontnemery";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-KPFnlw6rk+jDKs8Ss/34lIt0MsAQGernCyyF1ImRylA=";
|
||||
sha256 = "sha256-/am6cRhAdiqMq0u7Ed4qhIA+Em2O0gIt7HfP19+2XHw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
59
pkgs/development/python-modules/jproperties/default.nix
Normal file
59
pkgs/development/python-modules/jproperties/default.nix
Normal file
@ -0,0 +1,59 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, six
|
||||
, pytest-datadir
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jproperties";
|
||||
version = "2.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Tblue";
|
||||
repo = "python-jproperties";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-O+ALeGHMNjW1dc9IRyLzO81k8DW2vbGjuZqXxgrhYjo=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
six
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest-datadir
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "setuptools_scm ~= 3.3" "setuptools_scm"
|
||||
substituteInPlace pytest.ini \
|
||||
--replace "--cov=jproperties --cov-report=term --cov-report=html --cov-branch" ""
|
||||
'';
|
||||
|
||||
disabledTestPaths = [
|
||||
# TypeError: 'PosixPath' object...
|
||||
"tests/test_simple_utf8.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"jproperties"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Java Property file parser and writer for Python";
|
||||
homepage = "https://github.com/Tblue/python-jproperties";
|
||||
license = with licenses; [ bsd3 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
36
pkgs/development/python-modules/luhn/default.nix
Normal file
36
pkgs/development/python-modules/luhn/default.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "luhn";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mmcloughlin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-ZifaCjOVhWdXuzi5n6V+6eVN5vrEHKgUdpSOXoMyR18=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"test.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"luhn"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module for generate and verify Luhn check digits";
|
||||
homepage = "https://github.com/mmcloughlin/luhn";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lupupy";
|
||||
version = "0.0.22";
|
||||
version = "0.0.24";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-3yxhuG5aYC6Vx04pJtKxpUKevvw9hyZ9zVi6XmLRIv8=";
|
||||
sha256 = "62b63877aa6a9e6bfecd163a922641906f233cc4b53b1314ee71247e157273c6";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
37
pkgs/development/python-modules/mizani/default.nix
Normal file
37
pkgs/development/python-modules/mizani/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, matplotlib
|
||||
, palettable
|
||||
, pandas
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mizani";
|
||||
version = "0.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "has2k1";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "04r53dp5jbklv8l9ncgc5wiq0gx25y73h65gmmbbfkxwgsl3w78l";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pytest.ini --replace " --cov=mizani --cov-report=xml" ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ matplotlib palettable pandas ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "mizani" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Scales for Python";
|
||||
homepage = "https://github.com/has2k1/mizani";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ samuela ];
|
||||
};
|
||||
}
|
||||
53
pkgs/development/python-modules/ml-collections/default.nix
Normal file
53
pkgs/development/python-modules/ml-collections/default.nix
Normal file
@ -0,0 +1,53 @@
|
||||
{ absl-py
|
||||
, buildPythonPackage
|
||||
, contextlib2
|
||||
, fetchPypi
|
||||
, fetchurl
|
||||
, lib
|
||||
, pyyaml
|
||||
}:
|
||||
|
||||
let
|
||||
requirements = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/google/ml_collections/7f749a281c69f9d0b339c05ecb94b80d95029f25/requirements.txt";
|
||||
sha256 = "1xb351hiscj4zmajfkql3swpacdp6lmz8iwdvwwdx2zqw9a62zps";
|
||||
};
|
||||
requirements-test = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/google/ml_collections/7f749a281c69f9d0b339c05ecb94b80d95029f25/requirements-test.txt";
|
||||
sha256 = "0r457k2nrg5jkf093r0x29yf8xwy6l7jxi6al0fh7mmnfrhr9cb1";
|
||||
};
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "ml-collections";
|
||||
version = "0.1.0";
|
||||
|
||||
# ml-collections does not have any git release tags. See https://github.com/google/ml_collections/issues/8.
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "ml_collections";
|
||||
sha256 = "0g6gxfz8g6fh1sghys869ylxgpda9hq7ylc8jw05608l3k6pz8ar";
|
||||
};
|
||||
|
||||
# The pypi source archive does not include requirements.txt or
|
||||
# requirements-test.txt. See https://github.com/google/ml_collections/issues/7.
|
||||
postPatch = ''
|
||||
cp ${requirements} requirements.txt
|
||||
cp ${requirements-test} requirements-test.txt
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ absl-py contextlib2 pyyaml ];
|
||||
|
||||
# The official test suite uses bazel. With pytestCheckHook there are name
|
||||
# conflicts between files and tests have assumptions that are broken by the
|
||||
# nix-build environment, eg. re module names and __file__ attributes.
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "ml_collections" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "ML Collections is a library of Python collections designed for ML usecases.";
|
||||
homepage = "https://github.com/google/ml_collections";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ samuela ];
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,58 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, docopt
|
||||
, fetchFromGitHub
|
||||
, freezegun
|
||||
, mock
|
||||
, pyjwt
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, requests
|
||||
, requests-mock
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "notifications-python-client";
|
||||
version = "6.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alphagov";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-pfOTVgsfXJQ9GIGowra3RAwxCri76RgnA9iyWbjomCk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
docopt
|
||||
pyjwt
|
||||
requests
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
freezegun
|
||||
mock
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
requests-mock
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pytest-runner'" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"notifications_python_client"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python client for the GOV.UK Notify API";
|
||||
homepage = "https://github.com/alphagov/notifications-python-client";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "plaid-python";
|
||||
version = "8.7.0";
|
||||
version = "8.8.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "16b23f61deab24d406536a1fd172da77bcbb28b3ca322245b8ee9203350fb57d";
|
||||
sha256 = "8689b5c4d69e93026aea252314fb3133359fa70df5819ad6995c4e44a2f84858";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "py17track";
|
||||
version = "3.3.0";
|
||||
version = "2021.12.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1rnq9ybzj2l3699mjyplc29mxla8fayh52x52cnsz21ixlfd9fky";
|
||||
sha256 = "sha256-T0Jjdu6QC8rTqZwe4cdsBbs0hQXUY6CkrImCgYwWL9o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydexcom";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gagebenne";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "19h7r0qbsqd6k6g4nz6z3k9kdmk0sx5zpsrgxwnhsff5fqi0y2ls";
|
||||
sha256 = "sha256-fC8K2NHCFcqzmsH02XPAGZtUTTXWyr0p4524UVv6yU4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyefergy";
|
||||
version = "0.1.4";
|
||||
version = "0.1.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "tkdrob";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-X/dWEBg3WG6SmMore5otLL4iIueGUS5KgjCPYoMSNd0=";
|
||||
sha256 = "sha256-8xcKgsZ6buaQdrKD8Qn7jB5IlQ0NkR0nZGuFk+Dd8Q8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
47
pkgs/development/python-modules/pyoctoprintapi/default.nix
Normal file
47
pkgs/development/python-modules/pyoctoprintapi/default.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
|
||||
# propagated
|
||||
, aiohttp
|
||||
|
||||
# tests
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "pyoctoprintapi";
|
||||
version = "0.1.7";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rfleming71";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XAMHQ7n03e10hFcPIUqyCDlRk2uO8dX8Iq0mdY7wRGE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pyoctoprintapi"
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple async wrapper around the Octoprint API";
|
||||
homepage = "https://github.com/rfleming71/pyoctoprintapi";
|
||||
license = licenses.mit;
|
||||
maintainers= with maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyskyqremote";
|
||||
version = "0.2.49";
|
||||
version = "0.2.52";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "RogerSelwyn";
|
||||
repo = "skyq_remote";
|
||||
rev = version;
|
||||
sha256 = "sha256-Xhr+p/kIp3Sm7swqCsjXHaECntwJnBLyGlcSg2lsxZc=";
|
||||
sha256 = "sha256-iVXi9wopDjtZcqoEWYfg1oPx4RV3e3b9P07rC8ftz9U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
47
pkgs/development/python-modules/python-datemath/default.nix
Normal file
47
pkgs/development/python-modules/python-datemath/default.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{ lib
|
||||
, arrow
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, unittest2
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-datemath";
|
||||
version = "1.5.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nickmaccarthy";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WVWGhyBguE1+KEMQu0N5QxO7IC4rPEJ/2L3VWUCQNi4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
arrow
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
unittest2
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"tests.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"datemath"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module to emulate the date math used in SOLR and Elasticsearch";
|
||||
homepage = "https://github.com/nickmaccarthy/python-datemath";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -19,7 +19,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "simplisafe-python";
|
||||
version = "2021.11.2";
|
||||
version = "2021.12.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-5X2qvrACV9OTVYSZYxFncFOgrgywKvVDbC6IVFnJBtw=";
|
||||
sha256 = "sha256-HWOQAcjsW7iE/AuqOQvdZkubpg53AktReNJxbxHdMFs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
37
pkgs/development/python-modules/subzerod/default.nix
Normal file
37
pkgs/development/python-modules/subzerod/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ lib
|
||||
, aiohttp
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "subzerod";
|
||||
version = "1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-/7g8Upj9Hb4m83JXLI3X2lqa9faCt42LVxh+V9WpI68=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"subzerod"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module to help with the enumeration of subdomains";
|
||||
homepage = "https://github.com/sanderfoobar/subzerod";
|
||||
license = with licenses; [ wtfpl ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -2,6 +2,7 @@
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, aiohttp
|
||||
, yarl
|
||||
, aresponses
|
||||
@ -12,21 +13,21 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "twentemilieu";
|
||||
version = "0.4.2";
|
||||
version = "0.5.0";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "frenck";
|
||||
repo = "python-twentemilieu";
|
||||
rev = "v${version}";
|
||||
sha256 = "1lf31ldbrsmxhbrcg284pwpvjfmwnssv3gqwd5vm2hvd9lwqn6ii";
|
||||
sha256 = "sha256-7HQ0+h8oiyY+TacQdX84K0r994rH0AMZAvZz8PUvQl0=";
|
||||
};
|
||||
|
||||
# coverage tests aren't useful when consuming releases
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace '--cov' ""
|
||||
--replace "--cov" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -19,7 +19,8 @@ buildPythonPackage rec {
|
||||
owner = "Cereal2nd";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-itaYSfZm+/vF/tKRO2BW4qXrDXP0YfBrKiq9bMGFj0M=";
|
||||
sha256 = "0i1vfyhyvn908vz55agmfds3zwp6qpbpip055d995nx79ysxz0j9";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,12 +1,11 @@
|
||||
{ lib
|
||||
, aiohttp
|
||||
, aresponses
|
||||
, awesomeversion
|
||||
, backoff
|
||||
, buildPythonPackage
|
||||
, cachetools
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, yarl
|
||||
, aresponses
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
@ -15,7 +14,8 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "wled";
|
||||
version = "0.10.0";
|
||||
version = "0.10.2";
|
||||
disabled = pythonOlder "3.8";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "frenck";
|
||||
repo = "python-wled";
|
||||
rev = "v${version}";
|
||||
sha256 = "0ivh6yxpswz730i33fwr4hj8nwdmdyw4n6p89x9sxmvjmd7ihkgm";
|
||||
sha256 = "sha256-tqR/edkBFseldSXGoekfRmw//h6Z/Xcg1W0HXJvLhtk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zha-quirks";
|
||||
version = "0.0.63";
|
||||
version = "0.0.65";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zigpy";
|
||||
repo = "zha-device-handlers";
|
||||
rev = version;
|
||||
sha256 = "sha256-jAd/qT+uwylE/AOHFnkKWECHnxFFqgCtCp36mrqFZIE=";
|
||||
sha256 = "sha256-3Lcmc95KotFMlL44zDugIQkHtplMMlyWjSb+SLehaqs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zigpy";
|
||||
version = "0.41.0";
|
||||
version = "0.42.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "zigpy";
|
||||
repo = "zigpy";
|
||||
rev = version;
|
||||
sha256 = "sha256-6B5JquShUhW2EudkhCD1s5eJLJU1q1HmX7C/avoI7vU=";
|
||||
sha256 = "sha256-kSUFcN3QOZWFBgDrOopkYuUyBE9asO6MXf0H9CMjFlc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -0,0 +1,30 @@
|
||||
From 13c633bf0075daa6ff973f368a25cf205caa017e Mon Sep 17 00:00:00 2001
|
||||
From: Pascal Bach <pascal.bach@nextrem.ch>
|
||||
Date: Sat, 11 Dec 2021 10:07:01 +0100
|
||||
Subject: [PATCH] gitlab-runner: don't checked for fixed runtime
|
||||
|
||||
We already use 1.16.12 which has the proper fix
|
||||
---
|
||||
helpers/patches/issue_28732/syscall.go | 7 +------
|
||||
1 file changed, 1 insertion(+), 6 deletions(-)
|
||||
|
||||
diff --git a/helpers/patches/issue_28732/syscall.go b/helpers/patches/issue_28732/syscall.go
|
||||
index 580513b57..fa9e4cc85 100644
|
||||
--- a/helpers/patches/issue_28732/syscall.go
|
||||
+++ b/helpers/patches/issue_28732/syscall.go
|
||||
@@ -2,11 +2,6 @@
|
||||
|
||||
package issue_28732
|
||||
|
||||
-import (
|
||||
- "syscall"
|
||||
-)
|
||||
-
|
||||
func AssertFixPresent() {
|
||||
- // Ensure that Issue28732Fix fixed runtime is used
|
||||
- syscall.Issue28732Fix()
|
||||
+ // Issue already fixed by using go 1.16.12
|
||||
}
|
||||
--
|
||||
2.34.0
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, buildGoPackage, fetchFromGitLab, fetchurl }:
|
||||
|
||||
let
|
||||
version = "14.5.0";
|
||||
version = "14.5.2";
|
||||
in
|
||||
buildGoPackage rec {
|
||||
inherit version;
|
||||
@ -19,10 +19,13 @@ buildGoPackage rec {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-runner";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BxnIrjiEW61J6hl7mWNXc2Vb4ae1cWqOypTy9Xo7Hkc=";
|
||||
sha256 = "07mr9w1rp3rnrlixmqziin1gw78s3gncg47b4z9h9zzpy3acy3xd";
|
||||
};
|
||||
|
||||
patches = [ ./fix-shell-path.patch ];
|
||||
patches = [
|
||||
./fix-shell-path.patch
|
||||
./0001-gitlab-runner-don-t-checked-for-fixed-runtime.patch
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "GitLab Runner the continuous integration executor of GitLab";
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ fetchurl, lib, stdenv, cmake, xlibsWrapper, libGLU, libGL, SDL, openal, freealut, libogg, libvorbis, runtimeShell }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.3.2";
|
||||
pname = "astromenace";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/openastromenace/astromenace-src-${version}.tar.bz2";
|
||||
@ -12,27 +12,29 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ xlibsWrapper libGLU libGL SDL openal freealut libogg libvorbis ];
|
||||
|
||||
buildPhase = ''
|
||||
cmake ./
|
||||
make
|
||||
postBuild = ''
|
||||
./AstroMenace --pack --rawdata=../RAW_VFS_DATA
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
|
||||
cp AstroMenace $out
|
||||
cp gamedata.vfs $out
|
||||
|
||||
cat > $out/bin/AstroMenace << EOF
|
||||
#!${runtimeShell}
|
||||
$out/AstroMenace --dir=$out
|
||||
EOF
|
||||
|
||||
chmod 755 $out/bin/AstroMenace
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Hardcore 3D space shooter with spaceship upgrade possibilities";
|
||||
homepage = "https://www.viewizard.com/";
|
||||
license = lib.licenses.gpl3;
|
||||
platforms = lib.platforms.linux;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "AstroMenace";
|
||||
};
|
||||
}
|
||||
|
||||
@ -4,20 +4,19 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fheroes2";
|
||||
version = "0.9.9";
|
||||
version = "0.9.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ihhub";
|
||||
repo = "fheroes2";
|
||||
rev = version;
|
||||
sha256 = "sha256-vm9/jHRrG7qSP4GKksUrcK0qC3BW9LXlOnH4/pRyEww=";
|
||||
sha256 = "sha256-8HXFt4SsQ+qXu/VJmdAdYX7XoNjA4AHItnwS/nyY6H8=";
|
||||
};
|
||||
|
||||
buildInputs = [ gettext libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ];
|
||||
|
||||
makeFlags = [
|
||||
"FHEROES2_STRICT_COMPILATION=1"
|
||||
"RELEASE=1"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ lib, stdenv, fetchurl, nixosTests, jre_headless }:
|
||||
stdenv.mkDerivation {
|
||||
pname = "minecraft-server";
|
||||
version = "1.18";
|
||||
version = "1.18.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launcher.mojang.com/v1/objects/3cf24a8694aca6267883b17d934efacc5e44440d/server.jar";
|
||||
url = "https://launcher.mojang.com/v1/objects/125e5adf40c659fd3bce3e66e67a16bb49ecc1b9/server.jar";
|
||||
# sha1 because that comes from mojang via api
|
||||
sha1 = "3cf24a8694aca6267883b17d934efacc5e44440d";
|
||||
sha1 = "125e5adf40c659fd3bce3e66e67a16bb49ecc1b9";
|
||||
};
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cifs-utils";
|
||||
version = "6.13";
|
||||
version = "6.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://samba/pub/linux-cifs/cifs-utils/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-Q9h4bIYTysz6hJEwgcHWK8JAlXWFTPiVsFtIrwhj0FY=";
|
||||
sha256 = "sha256-ZgnoB0tUISlf8BKjHwLM2aBYQVxhnIE2Lrt4jb8HVrg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook docutils pkg-config ];
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cpuid";
|
||||
version = "20211129";
|
||||
version = "20211210";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://etallen.com/cpuid/${pname}-${version}.src.tar.gz";
|
||||
sha256 = "sha256-Iwdyu4jERzLmikLS7/Q7z/RtiTv06m4EFR1MtujIji8=";
|
||||
sha256 = "sha256-4CmJVwDeGm+DNgJSgEiSzVi1TR9f869Et7tq/kEOX0Q=";
|
||||
};
|
||||
|
||||
# For pod2man during the build process.
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2021.11.5";
|
||||
version = "2021.12.1";
|
||||
components = {
|
||||
"abode" = ps: with ps; [ abodepy ];
|
||||
"accuweather" = ps: with ps; [ accuweather ];
|
||||
@ -77,6 +77,7 @@
|
||||
"azure_event_hub" = ps: with ps; [ azure-eventhub ];
|
||||
"azure_service_bus" = ps: with ps; [ azure-servicebus ];
|
||||
"baidu" = ps: with ps; [ ]; # missing inputs: baidu-aip
|
||||
"balboa" = ps: with ps; [ pybalboa ];
|
||||
"bayesian" = ps: with ps; [ ];
|
||||
"bbb_gpio" = ps: with ps; [ ]; # missing inputs: Adafruit_BBIO
|
||||
"bbox" = ps: with ps; [ ]; # missing inputs: pybbox
|
||||
@ -112,6 +113,7 @@
|
||||
"bt_home_hub_5" = ps: with ps; [ ]; # missing inputs: bthomehub5-devicelist
|
||||
"bt_smarthub" = ps: with ps; [ ]; # missing inputs: btsmarthub_devicelist
|
||||
"buienradar" = ps: with ps; [ buienradar ];
|
||||
"button" = ps: with ps; [ ];
|
||||
"caldav" = ps: with ps; [ caldav ];
|
||||
"calendar" = ps: with ps; [ aiohttp-cors ];
|
||||
"camera" = ps: with ps; [ pyturbojpeg aiohttp-cors ];
|
||||
@ -166,7 +168,7 @@
|
||||
"default_config" = ps: with ps; [ pynacl pyturbojpeg aiodiscover aiohttp-cors async-upnp-client emoji hass-nabucasa home-assistant-frontend ifaddr pillow pyserial pyudev scapy sqlalchemy zeroconf ];
|
||||
"delijn" = ps: with ps; [ pydelijn ];
|
||||
"deluge" = ps: with ps; [ deluge-client ];
|
||||
"demo" = ps: with ps; [ aiohttp-cors ];
|
||||
"demo" = ps: with ps; [ aiohttp-cors sqlalchemy ];
|
||||
"denon" = ps: with ps; [ ];
|
||||
"denonavr" = ps: with ps; [ denonavr ];
|
||||
"derivative" = ps: with ps; [ ];
|
||||
@ -175,6 +177,7 @@
|
||||
"device_sun_light_trigger" = ps: with ps; [ aiohttp-cors pillow ];
|
||||
"device_tracker" = ps: with ps; [ ];
|
||||
"devolo_home_control" = ps: with ps; [ aiohttp-cors devolo-home-control-api ifaddr zeroconf ];
|
||||
"devolo_home_network" = ps: with ps; [ devolo-plc-api ];
|
||||
"dexcom" = ps: with ps; [ pydexcom ];
|
||||
"dhcp" = ps: with ps; [ aiodiscover scapy ];
|
||||
"dht" = ps: with ps; [ ]; # missing inputs: adafruit-circuitpython-dht
|
||||
@ -204,7 +207,6 @@
|
||||
"dwd_weather_warnings" = ps: with ps; [ dwdwfsapi ];
|
||||
"dweet" = ps: with ps; [ ]; # missing inputs: dweepy
|
||||
"dynalite" = ps: with ps; [ ]; # missing inputs: dynalite_devices
|
||||
"dyson" = ps: with ps; [ aiohttp-cors ifaddr libpurecool zeroconf ];
|
||||
"eafm" = ps: with ps; [ aioeafm ];
|
||||
"ebox" = ps: with ps; [ ]; # missing inputs: pyebox
|
||||
"ebusd" = ps: with ps; [ ]; # missing inputs: ebusdpy
|
||||
@ -246,6 +248,7 @@
|
||||
"etherscan" = ps: with ps; [ ]; # missing inputs: python-etherscan-api
|
||||
"eufy" = ps: with ps; [ ]; # missing inputs: lakeside
|
||||
"everlights" = ps: with ps; [ pyeverlights ];
|
||||
"evil_genius_labs" = ps: with ps; [ pyevilgenius ];
|
||||
"evohome" = ps: with ps; [ evohome-async ];
|
||||
"ezviz" = ps: with ps; [ ha-ffmpeg pyezviz ];
|
||||
"faa_delays" = ps: with ps; [ faadelays ];
|
||||
@ -411,7 +414,6 @@
|
||||
"intent_script" = ps: with ps; [ ];
|
||||
"intesishome" = ps: with ps; [ pyintesishome ];
|
||||
"ios" = ps: with ps; [ aiohttp-cors ifaddr zeroconf ];
|
||||
"iota" = ps: with ps; [ ]; # missing inputs: pyota
|
||||
"iotawatt" = ps: with ps; [ iotawattpy ];
|
||||
"iperf3" = ps: with ps; [ ]; # missing inputs: iperf3
|
||||
"ipma" = ps: with ps; [ pyipma ];
|
||||
@ -424,6 +426,7 @@
|
||||
"itach" = ps: with ps; [ ]; # missing inputs: pyitachip2ir
|
||||
"itunes" = ps: with ps; [ ];
|
||||
"izone" = ps: with ps; [ python-izone ];
|
||||
"jellyfin" = ps: with ps; [ jellyfin-apiclient-python ];
|
||||
"jewish_calendar" = ps: with ps; [ hdate ];
|
||||
"joaoapps_join" = ps: with ps; [ ]; # missing inputs: python-join-api
|
||||
"juicenet" = ps: with ps; [ python-juicenet ];
|
||||
@ -476,7 +479,6 @@
|
||||
"london_air" = ps: with ps; [ ];
|
||||
"london_underground" = ps: with ps; [ ]; # missing inputs: london-tube-status
|
||||
"lookin" = ps: with ps; [ aiolookin ];
|
||||
"loopenergy" = ps: with ps; [ ]; # missing inputs: pyloopenergy
|
||||
"lovelace" = ps: with ps; [ ];
|
||||
"luci" = ps: with ps; [ openwrt-luci-rpc ];
|
||||
"luftdaten" = ps: with ps; [ luftdaten ];
|
||||
@ -519,7 +521,7 @@
|
||||
"microsoft_face_identify" = ps: with ps; [ pyturbojpeg aiohttp-cors ];
|
||||
"miflora" = ps: with ps; [ bluepy ]; # missing inputs: miflora
|
||||
"mikrotik" = ps: with ps; [ librouteros ];
|
||||
"mill" = ps: with ps; [ millheater ];
|
||||
"mill" = ps: with ps; [ mill-local millheater ];
|
||||
"min_max" = ps: with ps; [ ];
|
||||
"minecraft_server" = ps: with ps; [ aiodns getmac mcstatus ];
|
||||
"minio" = ps: with ps; [ minio ];
|
||||
@ -547,7 +549,6 @@
|
||||
"mutesync" = ps: with ps; [ mutesync ];
|
||||
"mvglive" = ps: with ps; [ PyMVGLive ];
|
||||
"my" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ];
|
||||
"mychevy" = ps: with ps; [ ]; # missing inputs: mychevy
|
||||
"mycroft" = ps: with ps; [ ]; # missing inputs: mycroftapi
|
||||
"myq" = ps: with ps; [ pymyq ];
|
||||
"mysensors" = ps: with ps; [ aiohttp-cors paho-mqtt pymysensors ];
|
||||
@ -596,7 +597,7 @@
|
||||
"nzbget" = ps: with ps; [ ]; # missing inputs: pynzbgetapi
|
||||
"oasa_telematics" = ps: with ps; [ ]; # missing inputs: oasatelematics
|
||||
"obihai" = ps: with ps; [ pyobihai ];
|
||||
"octoprint" = ps: with ps; [ ]; # missing inputs: pyoctoprintapi
|
||||
"octoprint" = ps: with ps; [ pyoctoprintapi ];
|
||||
"oem" = ps: with ps; [ oemthermostat ];
|
||||
"ohmconnect" = ps: with ps; [ defusedxml ];
|
||||
"ombi" = ps: with ps; [ pyombi ];
|
||||
@ -695,6 +696,7 @@
|
||||
"random" = ps: with ps; [ ];
|
||||
"raspihats" = ps: with ps; [ smbus-cffi ]; # missing inputs: raspihats
|
||||
"raspyrfm" = ps: with ps; [ ]; # missing inputs: raspyrfm-client
|
||||
"rdw" = ps: with ps; [ vehicle ];
|
||||
"recollect_waste" = ps: with ps; [ aiorecollect ];
|
||||
"recorder" = ps: with ps; [ sqlalchemy ];
|
||||
"recswitch" = ps: with ps; [ ]; # missing inputs: pyrecswitch
|
||||
@ -709,6 +711,7 @@
|
||||
"rest_command" = ps: with ps; [ ];
|
||||
"rflink" = ps: with ps; [ rflink ];
|
||||
"rfxtrx" = ps: with ps; [ pyrfxtrx ];
|
||||
"ridwell" = ps: with ps; [ aioridwell ];
|
||||
"ring" = ps: with ps; [ ha-ffmpeg ring-doorbell ];
|
||||
"ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api
|
||||
"risco" = ps: with ps; [ pyrisco ];
|
||||
@ -852,6 +855,7 @@
|
||||
"tado" = ps: with ps; [ python-tado ];
|
||||
"tag" = ps: with ps; [ ];
|
||||
"tahoma" = ps: with ps; [ tahoma-api ];
|
||||
"tailscale" = ps: with ps; [ tailscale ];
|
||||
"tank_utility" = ps: with ps; [ ]; # missing inputs: tank_utility
|
||||
"tankerkoenig" = ps: with ps; [ pytankerkoenig ];
|
||||
"tapsaff" = ps: with ps; [ ]; # missing inputs: tapsaff
|
||||
@ -867,6 +871,7 @@
|
||||
"temper" = ps: with ps; [ ]; # missing inputs: temperusb
|
||||
"template" = ps: with ps; [ ];
|
||||
"tensorflow" = ps: with ps; [ numpy pillow pycocotools tensorflow ]; # missing inputs: tf-models-official
|
||||
"tesla_wall_connector" = ps: with ps; [ tesla-wall-connector ];
|
||||
"tfiac" = ps: with ps; [ ]; # missing inputs: pytfiac
|
||||
"thermoworks_smoke" = ps: with ps; [ stringcase ]; # missing inputs: thermoworks_smoke
|
||||
"thethingsnetwork" = ps: with ps; [ ];
|
||||
@ -883,6 +888,7 @@
|
||||
"tod" = ps: with ps; [ ];
|
||||
"todoist" = ps: with ps; [ todoist ];
|
||||
"tof" = ps: with ps; [ ]; # missing inputs: RPi.GPIO VL53L1X2
|
||||
"tolo" = ps: with ps; [ tololib ];
|
||||
"tomato" = ps: with ps; [ ];
|
||||
"toon" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa toonapi ];
|
||||
"torque" = ps: with ps; [ aiohttp-cors ];
|
||||
@ -995,7 +1001,7 @@
|
||||
"yamaha_musiccast" = ps: with ps; [ aiohttp-cors aiomusiccast async-upnp-client ifaddr zeroconf ];
|
||||
"yandex_transport" = ps: with ps; [ aioymaps ];
|
||||
"yandextts" = ps: with ps; [ ];
|
||||
"yeelight" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr yeelight ];
|
||||
"yeelight" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr yeelight zeroconf ];
|
||||
"yeelightsunflower" = ps: with ps; [ ]; # missing inputs: yeelightsunflower
|
||||
"yi" = ps: with ps; [ aioftp ha-ffmpeg ];
|
||||
"youless" = ps: with ps; [ youless-api ];
|
||||
|
||||
@ -1,7 +1,10 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, python3
|
||||
, substituteAll
|
||||
, ffmpeg
|
||||
, inetutils
|
||||
, nixosTests
|
||||
|
||||
@ -21,10 +24,6 @@
|
||||
|
||||
let
|
||||
defaultOverrides = [
|
||||
# Remove with Home Assistant 2021.12
|
||||
(mkOverride "aiohue" "2.6.3" "sha256-zpwkDKPrE5TFZQO0A1ifTQ7n+TRFpXi3jai3h5plyGM=")
|
||||
(mkOverride "PyChromecast" "9.4.0" "sha256-Y8PLrjxZHml7BmklEJ/VXGqkRyneAy+QVA5rusPeBHQ=")
|
||||
|
||||
# aiounify 29 breaks integration tests
|
||||
(self: super: {
|
||||
aiounifi = super.aiounifi.overridePythonAttrs (oldAttrs: rec {
|
||||
@ -41,6 +40,87 @@ let
|
||||
# Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt
|
||||
(mkOverride "python-slugify" "4.0.1" "69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270")
|
||||
|
||||
(self: super: {
|
||||
httpcore = super.httpcore.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.14.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "encode";
|
||||
repo = "httpcore";
|
||||
rev = version;
|
||||
sha256 = "sha256-jPsbMhY1lWKBXlh6hsX6DGKXi/g7VQSU00tF6H7qkOo=";
|
||||
};
|
||||
propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ python3.pkgs.certifi ];
|
||||
doCheck = false;
|
||||
});
|
||||
})
|
||||
|
||||
(self: super: {
|
||||
httpx = super.httpx.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.21.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "encode";
|
||||
repo = "httpx";
|
||||
rev = version;
|
||||
sha256 = "sha256-ayhLP+1hPWAx2ds227CKp5cebVkD5B2Z59L+3dzdINc=";
|
||||
};
|
||||
doCheck = false;
|
||||
});
|
||||
})
|
||||
|
||||
(self: super: {
|
||||
pytest-httpx = super.pytest-httpx.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.15.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Colin-bin";
|
||||
repo = "pytest_httpx";
|
||||
rev = "v${version}";
|
||||
sha256 = "08dxvjkxlnam3r0yp17495d1vksyawzzkpykacjql1gi6hqlfrwg";
|
||||
};
|
||||
});
|
||||
})
|
||||
|
||||
(self: super: {
|
||||
respx = super.respx.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.19.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lundberg";
|
||||
repo = "respx";
|
||||
rev = version;
|
||||
sha256 = "sha256-xiAt42kc1+rro99KMwzYKi3XC+wxYVqOY11tM+M/uV8=";
|
||||
};
|
||||
});
|
||||
})
|
||||
|
||||
(self: super: {
|
||||
envoy-reader = super.envoy-reader.overridePythonAttrs (oldAttrs: rec {
|
||||
patches = [
|
||||
# Support for later httpx, https://github.com/jesserizzo/envoy_reader/pull/82
|
||||
(fetchpatch {
|
||||
name = "support-later-httpx.patch";
|
||||
url = "https://github.com/jesserizzo/envoy_reader/commit/6019a89419fe9c830ba839be7d39ec54725268b0.patch";
|
||||
sha256 = "17vsrx13rskvh8swvjisb2dk6x1jdbjcm8ikkpidia35pa24h272";
|
||||
})
|
||||
];
|
||||
});
|
||||
})
|
||||
|
||||
(self: super: {
|
||||
sanic = super.sanic.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "21.9.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sanic-org";
|
||||
repo = "sanic";
|
||||
rev = "v${version}";
|
||||
sha256 = "0m18jdw1mvf7jhpnrxhm96p24pxvv0h9m71a8c7sqqkwnnpa3p5i";
|
||||
};
|
||||
disabledTests = oldAttrs.disabledTests ++ [
|
||||
"test_redirect"
|
||||
"test_chained_redirect"
|
||||
"test_unix_connection"
|
||||
];
|
||||
});
|
||||
})
|
||||
|
||||
(self: super: {
|
||||
huawei-lte-api = super.huawei-lte-api.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.4.18";
|
||||
@ -82,17 +162,7 @@ let
|
||||
});
|
||||
})
|
||||
|
||||
(self: super: {
|
||||
nettigo-air-monitor = super.nettigo-air-monitor.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.1.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "bieniu";
|
||||
repo = "nettigo-air-monitor";
|
||||
rev = version;
|
||||
sha256 = "sha256-OIB1d6XtstUr5P0q/dmyJS7+UbtkFQIiuSnzwcdP1mE=";
|
||||
};
|
||||
});
|
||||
})
|
||||
(mkOverride "jinja2" "3.0.3" "1mvwr02s86zck5wsmd9wjxxb9iaqr17hdi5xza9vkwv8rmrv46v1")
|
||||
|
||||
# Pinned due to API changes in pyruckus>0.12
|
||||
(self: super: {
|
||||
@ -123,6 +193,32 @@ let
|
||||
# Pinned due to API changes in 0.1.0
|
||||
(mkOverride "poolsense" "0.0.8" "09y4fq0gdvgkfsykpxnvmfv92dpbknnq5v82spz43ak6hjnhgcyp")
|
||||
|
||||
# Pinned due to API changes in 0.4.0
|
||||
(self: super: {
|
||||
vilfo-api-client = super.vilfo-api-client.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.3.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ManneW";
|
||||
repo = "vilfo-api-client-python";
|
||||
rev = "v$version}";
|
||||
sha256 = "1gy5gpsg99rcm1cc3m30232za00r9i46sp74zpd12p3vzz1wyyqf";
|
||||
};
|
||||
});
|
||||
})
|
||||
|
||||
# Pinned due to API changes ~1.0
|
||||
(self: super: {
|
||||
vultr = super.vultr.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.1.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "spry-group";
|
||||
repo = "python-vultr";
|
||||
rev = "v${version}";
|
||||
sha256 = "1qjvvr2v9gfnwskdl0ayazpcmiyw9zlgnijnhgq9mcri5gq9jw5h";
|
||||
};
|
||||
});
|
||||
})
|
||||
|
||||
# home-assistant-frontend does not exist in python3.pkgs
|
||||
(self: super: {
|
||||
home-assistant-frontend = self.callPackage ./frontend.nix { };
|
||||
@ -156,7 +252,7 @@ let
|
||||
extraBuildInputs = extraPackages py.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2021.11.5";
|
||||
hassVersion = "2021.12.1";
|
||||
|
||||
in with py.pkgs; buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@ -173,20 +269,25 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = version;
|
||||
sha256 = "sha256-5MxArJLzOg9dU4Q2c6BDjvEzR2u7UVumNZjwE84+br8=";
|
||||
hash = "sha256:11qlalfzykbq5ydn2cagkqcbvdjkmjcdpp6lgiys9lyrw1rxycnb";
|
||||
};
|
||||
|
||||
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||
patches = [
|
||||
./0001-tests-ignore-OSErrors-in-hass-fixture.patch
|
||||
(substituteAll {
|
||||
src = ./patches/ffmpeg-path.patch;
|
||||
ffmpeg = "${lib.getBin ffmpeg}/bin/ffmpeg";
|
||||
})
|
||||
./patches/tests-ignore-OSErrors-in-hass-fixture.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "async_timeout==3.0.1" "async_timeout" \
|
||||
--replace "awesomeversion==21.10.1" "awesomeversion" \
|
||||
--replace "aiohttp==3.7.4.post0" "aiohttp" \
|
||||
--replace "aiohttp==3.8.1" "aiohttp" \
|
||||
--replace "async_timeout==4.0.0" "async_timeout" \
|
||||
--replace "bcrypt==3.1.7" "bcrypt" \
|
||||
--replace "cryptography==35.0.0" "cryptography" \
|
||||
--replace "httpx==0.21.0" "httpx" \
|
||||
--replace "pip>=8.0.3,<20.3" "pip" \
|
||||
--replace "pyyaml==6.0" "pyyaml" \
|
||||
--replace "yarl==1.6.3" "yarl"
|
||||
@ -198,6 +299,7 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
aiohttp
|
||||
astral
|
||||
async-timeout
|
||||
atomicwrites
|
||||
attrs
|
||||
awesomeversion
|
||||
bcrypt
|
||||
@ -347,7 +449,6 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
"dte_energy_bridge"
|
||||
"duckdns"
|
||||
"dunehd"
|
||||
"dyson"
|
||||
"eafm"
|
||||
"ecobee"
|
||||
"econet"
|
||||
@ -406,7 +507,8 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
"geonetnz_quakes"
|
||||
"geonetnz_volcano"
|
||||
"gios"
|
||||
"glances"
|
||||
# updated to incompatible version and overriding is annoying because of async_timeout<4 pin
|
||||
# "glances"
|
||||
"goalzero"
|
||||
"gogogate2"
|
||||
"google"
|
||||
@ -556,6 +658,7 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
"number"
|
||||
"nws"
|
||||
"nx584"
|
||||
"octoprint"
|
||||
"omnilogic"
|
||||
"onboarding"
|
||||
"ondilo_ico"
|
||||
@ -686,8 +789,6 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
"telegram"
|
||||
"tellduslive"
|
||||
"template"
|
||||
# disable tesla comonent tests while typer is incompatible with click>=8.0
|
||||
# "tesla"
|
||||
"threshold"
|
||||
"tibber"
|
||||
"tile"
|
||||
@ -726,7 +827,8 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
"uvc"
|
||||
"vacuum"
|
||||
"velbus"
|
||||
"venstar"
|
||||
# disabled, because it includes onewire component tests, for which we lack p1wire dependency
|
||||
# "venstar"
|
||||
"vera"
|
||||
"verisure"
|
||||
"version"
|
||||
@ -736,8 +838,7 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
"vlc_telnet"
|
||||
"voicerss"
|
||||
"volumio"
|
||||
# disabled, becaused AttributeError: <class 'vultr.vultr.Vultr'> does not have the attribute 'server_list'
|
||||
# "vultr"
|
||||
"vultr"
|
||||
"wake_on_lan"
|
||||
"wallbox"
|
||||
"water_heater"
|
||||
@ -756,7 +857,8 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
"xbox"
|
||||
"xiaomi"
|
||||
"xiaomi_aqara"
|
||||
"xiaomi_miio"
|
||||
# disabled, because we require cryptography>=35.0 for the miio package
|
||||
# "xiaomi_miio"
|
||||
"yamaha"
|
||||
"yandex_transport"
|
||||
"yandextts"
|
||||
@ -873,6 +975,8 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
preCheck = ''
|
||||
export HOME="$TEMPDIR"
|
||||
|
||||
patch -p1 < ${./patches/tests-mock-source-ip.patch}
|
||||
|
||||
# the tests require the existance of a media dir
|
||||
mkdir /build/media
|
||||
|
||||
|
||||
@ -4,11 +4,11 @@ buildPythonPackage rec {
|
||||
# the frontend version corresponding to a specific home-assistant version can be found here
|
||||
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
|
||||
pname = "home-assistant-frontend";
|
||||
version = "20211109.0";
|
||||
version = "20211212.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-DXL+D58kS8q4we6/r6iRuXA/d9NOoYUp9A3vsHQ0KVg=";
|
||||
sha256 = "sha256-cYh8xBUS8rb2koNAq8JwWtrOHSF1jC5v0lq+W1SwiXI=";
|
||||
};
|
||||
|
||||
# there is nothing to strip in this package
|
||||
|
||||
84
pkgs/servers/home-assistant/patches/ffmpeg-path.patch
Normal file
84
pkgs/servers/home-assistant/patches/ffmpeg-path.patch
Normal file
@ -0,0 +1,84 @@
|
||||
diff --git a/homeassistant/components/ffmpeg/__init__.py b/homeassistant/components/ffmpeg/__init__.py
|
||||
index 74c826f47d..91f359da2a 100644
|
||||
--- a/homeassistant/components/ffmpeg/__init__.py
|
||||
+++ b/homeassistant/components/ffmpeg/__init__.py
|
||||
@@ -40,7 +40,7 @@ CONF_FFMPEG_BIN = "ffmpeg_bin"
|
||||
CONF_EXTRA_ARGUMENTS = "extra_arguments"
|
||||
CONF_OUTPUT = "output"
|
||||
|
||||
-DEFAULT_BINARY = "ffmpeg"
|
||||
+DEFAULT_BINARY = "@ffmpeg@"
|
||||
|
||||
CONFIG_SCHEMA = vol.Schema(
|
||||
{
|
||||
diff --git a/tests/components/ffmpeg/test_init.py b/tests/components/ffmpeg/test_init.py
|
||||
index e1730ffdab..e9cd7934fd 100644
|
||||
--- a/tests/components/ffmpeg/test_init.py
|
||||
+++ b/tests/components/ffmpeg/test_init.py
|
||||
@@ -87,7 +87,7 @@ class TestFFmpegSetup:
|
||||
with assert_setup_component(1):
|
||||
setup_component(self.hass, ffmpeg.DOMAIN, {ffmpeg.DOMAIN: {}})
|
||||
|
||||
- assert self.hass.data[ffmpeg.DATA_FFMPEG].binary == "ffmpeg"
|
||||
+ assert self.hass.data[ffmpeg.DATA_FFMPEG].binary == "@ffmpeg@"
|
||||
|
||||
def test_setup_component_test_service(self):
|
||||
"""Set up ffmpeg component test services."""
|
||||
diff --git a/tests/components/ffmpeg/test_sensor.py b/tests/components/ffmpeg/test_sensor.py
|
||||
index a6c9c1f441..f13091da1a 100644
|
||||
--- a/tests/components/ffmpeg/test_sensor.py
|
||||
+++ b/tests/components/ffmpeg/test_sensor.py
|
||||
@@ -27,7 +27,7 @@ class TestFFmpegNoiseSetup:
|
||||
setup_component(self.hass, "binary_sensor", self.config)
|
||||
self.hass.block_till_done()
|
||||
|
||||
- assert self.hass.data["ffmpeg"].binary == "ffmpeg"
|
||||
+ assert self.hass.data["ffmpeg"].binary == "@ffmpeg@"
|
||||
assert self.hass.states.get("binary_sensor.ffmpeg_noise") is not None
|
||||
|
||||
@patch("haffmpeg.sensor.SensorNoise.open_sensor", return_value=mock_coro())
|
||||
@@ -37,7 +37,7 @@ class TestFFmpegNoiseSetup:
|
||||
setup_component(self.hass, "binary_sensor", self.config)
|
||||
self.hass.block_till_done()
|
||||
|
||||
- assert self.hass.data["ffmpeg"].binary == "ffmpeg"
|
||||
+ assert self.hass.data["ffmpeg"].binary == "@ffmpeg@"
|
||||
assert self.hass.states.get("binary_sensor.ffmpeg_noise") is not None
|
||||
|
||||
self.hass.start()
|
||||
@@ -53,7 +53,7 @@ class TestFFmpegNoiseSetup:
|
||||
setup_component(self.hass, "binary_sensor", self.config)
|
||||
self.hass.block_till_done()
|
||||
|
||||
- assert self.hass.data["ffmpeg"].binary == "ffmpeg"
|
||||
+ assert self.hass.data["ffmpeg"].binary == "@ffmpeg@"
|
||||
assert self.hass.states.get("binary_sensor.ffmpeg_noise") is not None
|
||||
|
||||
self.hass.start()
|
||||
@@ -89,7 +89,7 @@ class TestFFmpegMotionSetup:
|
||||
setup_component(self.hass, "binary_sensor", self.config)
|
||||
self.hass.block_till_done()
|
||||
|
||||
- assert self.hass.data["ffmpeg"].binary == "ffmpeg"
|
||||
+ assert self.hass.data["ffmpeg"].binary == "@ffmpeg@"
|
||||
assert self.hass.states.get("binary_sensor.ffmpeg_motion") is not None
|
||||
|
||||
@patch("haffmpeg.sensor.SensorMotion.open_sensor", return_value=mock_coro())
|
||||
@@ -99,7 +99,7 @@ class TestFFmpegMotionSetup:
|
||||
setup_component(self.hass, "binary_sensor", self.config)
|
||||
self.hass.block_till_done()
|
||||
|
||||
- assert self.hass.data["ffmpeg"].binary == "ffmpeg"
|
||||
+ assert self.hass.data["ffmpeg"].binary == "@ffmpeg@"
|
||||
assert self.hass.states.get("binary_sensor.ffmpeg_motion") is not None
|
||||
|
||||
self.hass.start()
|
||||
@@ -115,7 +115,7 @@ class TestFFmpegMotionSetup:
|
||||
setup_component(self.hass, "binary_sensor", self.config)
|
||||
self.hass.block_till_done()
|
||||
|
||||
- assert self.hass.data["ffmpeg"].binary == "ffmpeg"
|
||||
+ assert self.hass.data["ffmpeg"].binary == "@ffmpeg@"
|
||||
assert self.hass.states.get("binary_sensor.ffmpeg_motion") is not None
|
||||
|
||||
self.hass.start()
|
||||
@ -0,0 +1,13 @@
|
||||
diff --git a/homeassistant/components/network/__init__.py b/homeassistant/components/network/__init__.py
|
||||
index 7cc864727d..69333a5454 100644
|
||||
--- a/homeassistant/components/network/__init__.py
|
||||
+++ b/homeassistant/components/network/__init__.py
|
||||
@@ -26,7 +26,7 @@ async def async_get_source_ip(
|
||||
) -> str:
|
||||
"""Get the source ip for a target ip."""
|
||||
adapters = await async_get_adapters(hass)
|
||||
- all_ipv4s = []
|
||||
+ all_ipv4s = ["127.0.0.1"]
|
||||
for adapter in adapters:
|
||||
if adapter["enabled"] and (ipv4s := adapter["ipv4"]):
|
||||
all_ipv4s.extend([ipv4["address"] for ipv4 in ipv4s])
|
||||
@ -6,7 +6,7 @@ set -eux
|
||||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
|
||||
cd "$DIR"
|
||||
|
||||
CURRENT_VERSION=$(nix eval --raw '(with import ../../.. {}; home-assistant.version)')
|
||||
CURRENT_VERSION=$(nix-instantiate ../../.. --eval --strict -A home-assistant.version | tr -d '"')
|
||||
TARGET_VERSION=$(curl https://api.github.com/repos/home-assistant/core/releases/latest | jq -r '.name')
|
||||
MANIFEST=$(curl https://raw.githubusercontent.com/home-assistant/core/${TARGET_VERSION}/homeassistant/components/frontend/manifest.json)
|
||||
FRONTEND_VERSION=$(echo $MANIFEST | jq -r '.requirements[] | select(startswith("home-assistant-frontend")) | sub(".*==(?<vers>.*)"; .vers)')
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tarlz";
|
||||
version = "0.11";
|
||||
version = "0.21";
|
||||
outputs = [ "out" "man" "info" ];
|
||||
|
||||
nativeBuildInputs = [ lzip texinfo ];
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://savannah/lzip/${pname}/${pname}-${version}.tar.lz";
|
||||
sha256 = "sha256-PalRMerepfYDSaDs4irck+1v5Gy/vlB9CyU6omWUXlk=";
|
||||
sha256 = "sha256-D5chEt0/Emo5TVoEEHaVzLu55gPnsZM2e9FxRgfgrfQ=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unrar";
|
||||
version = "6.1.2";
|
||||
version = "6.1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz";
|
||||
sha256 = "sha256-PpZCH1aOQ4r23NrvcXxI65O4JdlwWOvLFzub/FeAe+M=";
|
||||
sha256 = "sha256-0FAiRCAJICp5LliL7FiSHBI/8Eb8dV9/InKHGlvXljY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bgpq4";
|
||||
version = "1.2";
|
||||
version = "1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bgp";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-8r70tetbTq8GxxtFe71gDYy+wg8yBwYpl1gsu5aAHTA=";
|
||||
sha256 = "sha256-EFxINRFrcNXGtXpNqvBIN6pE1kG3OdeDIHYOsG2celI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, nodejs, which, python27, util-linux, nixosTests }:
|
||||
{ lib, stdenv, fetchFromGitHub, nodejs, which, python3, util-linux, nixosTests }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cjdns";
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "NOmk+vMZ8i0E2MjrUzksk+tkJ9XVVNEXlE5OOTNa+Y0=";
|
||||
};
|
||||
|
||||
buildInputs = [ which python27 nodejs ] ++
|
||||
buildInputs = [ which python3 nodejs ] ++
|
||||
# for flock
|
||||
lib.optional stdenv.isLinux util-linux;
|
||||
|
||||
@ -21,12 +21,8 @@ stdenv.mkDerivation rec {
|
||||
+ "bash do";
|
||||
installPhase = ''
|
||||
install -Dt "$out/bin/" cjdroute makekeys privatetopublic publictoip6
|
||||
sed -i 's,/usr/bin/env node,'$(type -P node), \
|
||||
$(find contrib -name "*.js")
|
||||
sed -i 's,/usr/bin/env python,'$(type -P python), \
|
||||
$(find contrib -type f)
|
||||
mkdir -p $out/share/cjdns
|
||||
cp -R contrib tools node_build node_modules $out/share/cjdns/
|
||||
cp -R tools node_build node_modules $out/share/cjdns/
|
||||
'';
|
||||
|
||||
passthru.tests.basic = nixosTests.cjdns;
|
||||
|
||||
@ -16,6 +16,13 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-ZpCp+ZkEV7UFCXonK78sv0zDVXYXb3ZkbjUksOkcF2M=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This adds missing feature checks for TCP_INFO, a Linux feature
|
||||
#
|
||||
# Discussed in https://github.com/Homebrew/homebrew-core/pull/88595
|
||||
./socat-fix-feature-check-tcpinfo.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs test.sh
|
||||
substituteInPlace test.sh \
|
||||
|
||||
@ -0,0 +1,21 @@
|
||||
diff --git a/filan.c b/filan.c
|
||||
index 3465f7c..77c22a4 100644
|
||||
--- a/filan.c
|
||||
+++ b/filan.c
|
||||
@@ -905,6 +905,7 @@ int tcpan(int fd, FILE *outfile) {
|
||||
#if WITH_TCP
|
||||
|
||||
int tcpan2(int fd, FILE *outfile) {
|
||||
+#ifdef TCP_INFO
|
||||
struct tcp_info tcpinfo;
|
||||
socklen_t tcpinfolen = sizeof(tcpinfo);
|
||||
int result;
|
||||
@@ -930,6 +931,8 @@ int tcpan2(int fd, FILE *outfile) {
|
||||
// fprintf(outfile, "%s={%u}\t", "TCPI_", tcpinfo.tcpi_);
|
||||
|
||||
return 0;
|
||||
+#endif
|
||||
+ return -1;
|
||||
}
|
||||
|
||||
#endif /* WITH_TCP */
|
||||
37
pkgs/tools/security/arsenal/default.nix
Normal file
37
pkgs/tools/security/arsenal/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "arsenal";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Orange-Cyberdefense";
|
||||
repo = "arsenal";
|
||||
rev = version;
|
||||
sha256 = "sha256-RZxGSrtEa3hAtowD2lUb9BgwpSWlYo90fU9nDvUfoAk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
libtmux
|
||||
docutils
|
||||
pyperclip
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"arsenal"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to generate commands for security and network tools";
|
||||
homepage = "https://github.com/Orange-Cyberdefense/arsenal";
|
||||
license = with licenses; [ gpl3Only ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "arsenal";
|
||||
};
|
||||
}
|
||||
@ -6,20 +6,20 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubescape";
|
||||
version = "1.0.132";
|
||||
version = "1.0.133";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "armosec";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hx11RCLEUW/2MKNIXz51wOyKC7zv0M3Wvblam/E3rdQ=";
|
||||
sha256 = "sha256-vF98v2tt786TlNo9YetkgYSrbZ20mvL8Y+pLLo2jD0Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
vendorSha256 = "sha256-GrQmWHdCk8Yl/ryS2zLQU8XCkjfS20qjlEScU8AQT0o=";
|
||||
vendorSha256 = "sha256-+CBX4NUeeMXMXiVkJB56oHvC8usUDXWYZUseQvQaW6Y=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
52
pkgs/tools/security/whispers/default.nix
Normal file
52
pkgs/tools/security/whispers/default.nix
Normal file
@ -0,0 +1,52 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "whispers";
|
||||
version = "1.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Skyscanner";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-jruUGyoZCyMu015QKtlvfx5WRMfxo/eYUue9wUIWb6o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
astroid
|
||||
beautifulsoup4
|
||||
jproperties
|
||||
luhn
|
||||
lxml
|
||||
python-Levenshtein
|
||||
pyyaml
|
||||
];
|
||||
|
||||
checkInputs = with python3.pkgs; [
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace '"pytest-runner"' ""
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
# Some tests need the binary available in PATH
|
||||
export PATH=$out/bin:$PATH
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"whispers"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to identify hardcoded secrets in static structured text";
|
||||
homepage = "https://github.com/Skyscanner/whispers";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -9903,6 +9903,8 @@ with pkgs;
|
||||
|
||||
subfinder = callPackage ../tools/networking/subfinder { };
|
||||
|
||||
subzerod = with python3Packages; toPythonApplication subzerod;
|
||||
|
||||
suckit = callPackage ../tools/networking/suckit {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
@ -15706,6 +15708,8 @@ with pkgs;
|
||||
stdenv = overrideCC stdenv buildPackages.gcc6; # hidden symbol `__divmoddi4'
|
||||
});
|
||||
|
||||
arsenal = callPackage ../tools/security/arsenal { };
|
||||
|
||||
assimp = callPackage ../development/libraries/assimp { };
|
||||
|
||||
asio_1_10 = callPackage ../development/libraries/asio/1.10.nix { };
|
||||
@ -17106,6 +17110,8 @@ with pkgs;
|
||||
|
||||
ilmbase = callPackage ../development/libraries/ilmbase { };
|
||||
|
||||
imgui = callPackage ../development/libraries/imgui { };
|
||||
|
||||
imlib = callPackage ../development/libraries/imlib {
|
||||
libpng = libpng12;
|
||||
};
|
||||
@ -23572,6 +23578,8 @@ with pkgs;
|
||||
|
||||
nordic = callPackage ../data/themes/nordic { };
|
||||
|
||||
nordzy-cursor-theme = callPackage ../data/icons/nordzy-cursor-theme { };
|
||||
|
||||
inherit (callPackages ../data/fonts/noto-fonts {})
|
||||
noto-fonts noto-fonts-cjk noto-fonts-emoji noto-fonts-emoji-blob-bin noto-fonts-extra;
|
||||
|
||||
@ -25937,9 +25945,7 @@ with pkgs;
|
||||
|
||||
indigenous-desktop = callPackage ../applications/networking/feedreaders/indigenous-desktop { };
|
||||
|
||||
jackline = callPackage ../applications/networking/instant-messengers/jackline {
|
||||
ocamlPackages = ocaml-ng.ocamlPackages_4_08;
|
||||
};
|
||||
jackline = callPackage ../applications/networking/instant-messengers/jackline { };
|
||||
|
||||
leftwm = callPackage ../applications/window-managers/leftwm { };
|
||||
|
||||
@ -29185,6 +29191,8 @@ with pkgs;
|
||||
|
||||
wafw00f = python3Packages.callPackage ../tools/security/wafw00f { };
|
||||
|
||||
whispers = callPackage ../tools/security/whispers { };
|
||||
|
||||
waon = callPackage ../applications/audio/waon { };
|
||||
|
||||
w3m = callPackage ../applications/networking/browsers/w3m { };
|
||||
|
||||
@ -1410,6 +1410,8 @@ in {
|
||||
|
||||
carrot = callPackage ../development/python-modules/carrot { };
|
||||
|
||||
cart = callPackage ../development/python-modules/cart { };
|
||||
|
||||
cartopy = callPackage ../development/python-modules/cartopy { };
|
||||
|
||||
casa-formats-io = callPackage ../development/python-modules/casa-formats-io { };
|
||||
@ -1538,6 +1540,8 @@ in {
|
||||
|
||||
ci-py = callPackage ../development/python-modules/ci-py { };
|
||||
|
||||
circuitbreaker = callPackage ../development/python-modules/circuitbreaker { };
|
||||
|
||||
cirq = callPackage ../development/python-modules/cirq { };
|
||||
|
||||
cirq-aqt = callPackage ../development/python-modules/cirq-aqt { };
|
||||
@ -2294,6 +2298,8 @@ in {
|
||||
|
||||
dm-sonnet = callPackage ../development/python-modules/dm-sonnet { };
|
||||
|
||||
dm-tree = callPackage ../development/python-modules/dm-tree { };
|
||||
|
||||
dnachisel = callPackage ../development/python-modules/dnachisel { };
|
||||
|
||||
dnslib = callPackage ../development/python-modules/dnslib { };
|
||||
@ -2437,6 +2443,8 @@ in {
|
||||
|
||||
ecpy = callPackage ../development/python-modules/ecpy { };
|
||||
|
||||
ecs-logging = callPackage ../development/python-modules/ecs-logging { };
|
||||
|
||||
ed25519 = callPackage ../development/python-modules/ed25519 { };
|
||||
|
||||
editables = callPackage ../development/python-modules/editables { };
|
||||
@ -2461,6 +2469,8 @@ in {
|
||||
|
||||
elkm1-lib = callPackage ../development/python-modules/elkm1-lib { };
|
||||
|
||||
elastic-apm = callPackage ../development/python-modules/elastic-apm { };
|
||||
|
||||
elasticsearch = callPackage ../development/python-modules/elasticsearch { };
|
||||
|
||||
elasticsearch-dsl = callPackage ../development/python-modules/elasticsearch-dsl { };
|
||||
@ -4062,6 +4072,8 @@ in {
|
||||
inherit (self) systemd pytest;
|
||||
};
|
||||
|
||||
jproperties = callPackage ../development/python-modules/jproperties { };
|
||||
|
||||
jpylyzer = callPackage ../development/python-modules/jpylyzer { };
|
||||
|
||||
JPype1 = callPackage ../development/python-modules/JPype1 { };
|
||||
@ -4626,6 +4638,8 @@ in {
|
||||
|
||||
luftdaten = callPackage ../development/python-modules/luftdaten { };
|
||||
|
||||
luhn = callPackage ../development/python-modules/luhn { };
|
||||
|
||||
luxor = callPackage ../development/python-modules/luxor { };
|
||||
|
||||
luxtronik = callPackage ../development/python-modules/luxtronik { };
|
||||
@ -4905,8 +4919,12 @@ in {
|
||||
|
||||
mixpanel = callPackage ../development/python-modules/mixpanel { };
|
||||
|
||||
mizani = callPackage ../development/python-modules/mizani { };
|
||||
|
||||
mkl-service = callPackage ../development/python-modules/mkl-service { };
|
||||
|
||||
ml-collections = callPackage ../development/python-modules/ml-collections { };
|
||||
|
||||
mlflow = callPackage ../development/python-modules/mlflow { };
|
||||
|
||||
mlrose = callPackage ../development/python-modules/mlrose { };
|
||||
@ -5301,10 +5319,12 @@ in {
|
||||
|
||||
notedown = callPackage ../development/python-modules/notedown { };
|
||||
|
||||
notify2 = callPackage ../development/python-modules/notify2 { };
|
||||
notifications-python-client = callPackage ../development/python-modules/notifications-python-client { };
|
||||
|
||||
notify-py = callPackage ../development/python-modules/notify-py { };
|
||||
|
||||
notify2 = callPackage ../development/python-modules/notify2 { };
|
||||
|
||||
notmuch = callPackage ../development/python-modules/notmuch {
|
||||
inherit (pkgs) notmuch;
|
||||
};
|
||||
@ -6955,6 +6975,8 @@ in {
|
||||
tesseract = pkgs.tesseract4;
|
||||
};
|
||||
|
||||
pyoctoprintapi = callPackage ../development/python-modules/pyoctoprintapi { };
|
||||
|
||||
pyodbc = callPackage ../development/python-modules/pyodbc { };
|
||||
|
||||
pyogg = callPackage ../development/python-modules/pyogg { };
|
||||
@ -7644,6 +7666,8 @@ in {
|
||||
|
||||
python-daemon = callPackage ../development/python-modules/python-daemon { };
|
||||
|
||||
python-datemath = callPackage ../development/python-modules/python-datemath { };
|
||||
|
||||
python-dateutil = callPackage ../development/python-modules/dateutil { };
|
||||
|
||||
python-dbusmock = callPackage ../development/python-modules/python-dbusmock { };
|
||||
@ -9222,6 +9246,8 @@ in {
|
||||
|
||||
subunit2sql = callPackage ../development/python-modules/subunit2sql { };
|
||||
|
||||
subzerod = callPackage ../development/python-modules/subzerod { };
|
||||
|
||||
suds-jurko = callPackage ../development/python-modules/suds-jurko { };
|
||||
|
||||
sumo = callPackage ../development/python-modules/sumo { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user