forked from mirrors/nixpkgs
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
43d7f2e53d
|
|
@ -67,8 +67,6 @@ in buildFHSUserEnv {
|
|||
|
||||
# Redream // "redream is not available for the x86_64 architecture"
|
||||
|
||||
# ResidualVM
|
||||
flac
|
||||
|
||||
# rpcs3 // TODO: "error while loading shared libraries: libz.so.1..."
|
||||
llvm
|
||||
|
|
@ -76,6 +74,9 @@ in buildFHSUserEnv {
|
|||
# ScummVM
|
||||
nasm sndio
|
||||
|
||||
# ResidualVM is now merged with ScummVM and therefore does not exist anymore
|
||||
flac
|
||||
|
||||
# Snes9x
|
||||
libepoxy minizip
|
||||
|
||||
|
|
|
|||
11
pkgs/applications/office/teapot/001-fix-warning.patch
Normal file
11
pkgs/applications/office/teapot/001-fix-warning.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
diff -Naur teapot-2.3.0-old/scanner.c teapot-2.3.0-new/scanner.c
|
||||
--- teapot-2.3.0-old/scanner.c 1969-12-31 21:00:01.000000000 -0300
|
||||
+++ teapot-2.3.0-new/scanner.c 2021-11-25 17:46:49.936673391 -0300
|
||||
@@ -25,6 +25,7 @@
|
||||
#include "main.h"
|
||||
#include "misc.h"
|
||||
#include "scanner.h"
|
||||
+#include "utf8.h"
|
||||
/*}}}*/
|
||||
|
||||
/* identcode -- return number of identifier */ /*{{{*/
|
||||
49
pkgs/applications/office/teapot/002-remove-help.patch
Normal file
49
pkgs/applications/office/teapot/002-remove-help.patch
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
diff -Naur teapot-2.3.0-old/CMakeLists.txt teapot-2.3.0-new/CMakeLists.txt
|
||||
--- teapot-2.3.0-old/CMakeLists.txt 1969-12-31 21:00:01.000000000 -0300
|
||||
+++ teapot-2.3.0-new/CMakeLists.txt 2021-11-25 18:16:06.594423660 -0300
|
||||
@@ -64,46 +64,6 @@
|
||||
install(TARGETS fteapot DESTINATION bin)
|
||||
endif ()
|
||||
|
||||
-if (ENABLE_HELP)
|
||||
- add_custom_command(
|
||||
- OUTPUT teapot.tex teapot.lyx
|
||||
- MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/doc/teapot.lyx
|
||||
- VERBATIM
|
||||
- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/doc/teapot.lyx teapot.lyx
|
||||
- COMMAND lyx -e pdflatex -f main teapot.lyx
|
||||
- )
|
||||
- add_custom_command(
|
||||
- OUTPUT teapot.pdf teapot.aux.old teapot.log teapot.toc
|
||||
- MAIN_DEPENDENCY teapot.tex
|
||||
- VERBATIM
|
||||
- COMMAND pdflatex teapot.tex; diff -q teapot.aux.old teapot.aux && cp teapot.aux teapot.aux.old
|
||||
- COMMAND pdflatex teapot.tex; diff -q teapot.aux.old teapot.aux && cp teapot.aux teapot.aux.old
|
||||
- )
|
||||
- add_custom_command(OUTPUT teapot.pdf teapot.out MAIN_DEPENDENCY teapot.tex teapot.aux.old VERBATIM COMMAND pdflatex teapot.tex; diff -q teapot.aux.old teapot.aux && cp teapot.aux teapot.aux.old)
|
||||
- add_custom_command(
|
||||
- OUTPUT html/ html/index.html .latex2html-init
|
||||
- MAIN_DEPENDENCY teapot.tex
|
||||
- DEPENDS teapot.tex teapot.pdf ${CMAKE_CURRENT_SOURCE_DIR}/doc/.latex2html-init
|
||||
- VERBATIM
|
||||
- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/doc/.latex2html-init .latex2html-init
|
||||
- COMMAND ${CMAKE_COMMAND} -E make_directory html
|
||||
- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/doc/contents.png html/
|
||||
- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/doc/next.png html/
|
||||
- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/doc/next_g.png html/
|
||||
- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/doc/prev.png html/
|
||||
- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/doc/prev_g.png html/
|
||||
- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/doc/up.png html/
|
||||
- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/doc/up_g.png html/
|
||||
- COMMAND latex2html teapot.tex
|
||||
- )
|
||||
- add_custom_target(pdf DEPENDS teapot.pdf)
|
||||
- add_custom_target(html DEPENDS html/index.html)
|
||||
- add_custom_target(doc ALL DEPENDS teapot.pdf html/index.html)
|
||||
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc/teapot FILES_MATCHING PATTERN *.html PATTERN *.png)
|
||||
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/teapot.pdf DESTINATION share/doc/teapot)
|
||||
- set(HELPFILE "${CMAKE_INSTALL_PREFIX}/share/doc/teapot/index.html")
|
||||
-endif ()
|
||||
-
|
||||
install(FILES COPYING README DESTINATION share/doc/teapot)
|
||||
install(FILES teapot.1 DESTINATION share/man/man1)
|
||||
73
pkgs/applications/office/teapot/default.nix
Normal file
73
pkgs/applications/office/teapot/default.nix
Normal file
|
|
@ -0,0 +1,73 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchzip
|
||||
, cmake
|
||||
, libtirpc
|
||||
, ncurses
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "teapot";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchzip {
|
||||
name = "${pname}-${version}";
|
||||
url = "https://www.syntax-k.de/projekte/teapot/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-wzAwZwOMeTsuR5LhfjspGdejT6X1V8YJ8B7v9pcbxaY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# include a local file in order to make cc happy
|
||||
./001-fix-warning.patch
|
||||
# remove the ENABLE_HELP target entirely - lyx and latex are huge!
|
||||
./002-remove-help.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libtirpc
|
||||
ncurses
|
||||
];
|
||||
|
||||
# By no known reason libtirpc is not detected
|
||||
NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ];
|
||||
NIX_LDFLAGS = [ "-ltirpc" ];
|
||||
|
||||
cmakeConfigureFlags = [
|
||||
"-DENABLE_HELP=OFF"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.syntax-k.de/projekte/teapot/";
|
||||
description = "Table Editor And Planner, Or: Teapot!";
|
||||
longDescription = ''
|
||||
Teapot is a compact spreadsheet software originally written by Michael
|
||||
Haardt. It features a (n)curses-based text terminal interface, and
|
||||
recently also a FLTK-based GUI.
|
||||
|
||||
These days, it may seem pointless having yet another spreadsheet program
|
||||
(and one that doesn't even know how to load Microsoft Excel files). Its
|
||||
compact size (130k for the ncurses executable, 140k for the GUI
|
||||
executable, 300k for the self-contained Windows EXE) and the fact that it
|
||||
can run across serial lines and SSH sessions make it an interesting choice
|
||||
for embedded applications and as system administration utility, even more
|
||||
so since it has a batch processing mode and comes with example code for
|
||||
creating graphs from data sets.
|
||||
|
||||
Another interesting feature is its modern approach to spread sheet theory:
|
||||
It sports true three-dimensional tables and iterative expressions. And
|
||||
since it breaks compatibility with the usual notions of big spreadsheet
|
||||
packages, it can also throw old syntactic cruft over board which many
|
||||
spreadsheets still inherit from the days of VisiCalc on ancient CP/M
|
||||
systems.
|
||||
'';
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
# TODO: patch/fix FLTK building
|
||||
# TODO: add documentation from
|
||||
|
|
@ -48,13 +48,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "arcan" + lib.optionalString useStaticOpenAL "-static-openal";
|
||||
version = "0.6.1pre1+unstable=2021-10-16";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "letoram";
|
||||
repo = "arcan";
|
||||
rev = "e0182b944152fbcb49f5c16932d38c05a9fb2680";
|
||||
hash = "sha256-4FodFuO51ehvyjH4YaF/xBY9dwA6cP/e6/BvEsH4w7U=";
|
||||
rev = version;
|
||||
hash = "sha256-2do4+6KB0AAcJk22mN0IA/e/bPaeGipLjI4RSTPqLBg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "durden";
|
||||
version = "0.6.1+unstable=2021-10-15";
|
||||
version = "0.6.1+date=2021-10-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "letoram";
|
||||
repo = pname;
|
||||
rev = "ab6cdaf19e87b74895a9ab5e1d005a07ea9396a6";
|
||||
hash = "sha256-FxqY1TUgbD/PjQjTZZerb7ngn5nkcqmVwqPvbRAYaqo=";
|
||||
rev = "5fb8b0f9bc2952ed9cf7dc20a1c5c0cc44c02ff1";
|
||||
hash = "sha256-+EIsrCkMe9MrUQOCh0R+rsDg/Rqs3iQWO0GZCgZQ+No=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pipeworld";
|
||||
version = "0.pre+unstable=2021-08-01";
|
||||
version = "0.pre+date=2021-11-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "letoram";
|
||||
repo = pname;
|
||||
rev = "311cc91946be63faab3b1578bc1d40668dd30f8c";
|
||||
hash = "sha256-iqcdVzEp4ST/f93+9fGSwvJMj7BznNtoEx4F3oMPCYk=";
|
||||
rev = "9f816db154ca5c54af952ad11c2186ccac5bdd2d";
|
||||
hash = "sha256-uwnrRsMP0RLEGr2mEVQ6kEtV/c6t5qSCHY0ynywPzkw=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,23 +1,30 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zydis";
|
||||
version = "3.2.0";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zyantific";
|
||||
repo = "zydis";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-1XGELwMuFlIt6Z3+kfD6VAgDZOwhhCSG42dkYh7WLf8=";
|
||||
sha256 = "sha256-FB7hGQ9vI3ZE376iROEpdtZm91IiccBhtAFa94JgnUY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://zydis.re/";
|
||||
description = "Fast and lightweight x86/x86-64 disassembler library";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.jbcrail ];
|
||||
maintainers = with maintainers; [ jbcrail AndersonTorres ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,15 +2,19 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, async-timeout
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiopulse";
|
||||
version = "0.4.2";
|
||||
version = "0.4.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0fnscm27l77c8cd7jhbn35axyalq61kksy3fcqzv21fz55lklsm0";
|
||||
sha256 = "sha256-Wp8NUjRlO+6ASqIt3C0YJRh0EKcEukXVMp4I+TCTElo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -20,7 +24,9 @@ buildPythonPackage rec {
|
|||
# tests are not present
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "aiopulse" ];
|
||||
pythonImportsCheck = [
|
||||
"aiopulse"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python Rollease Acmeda Automate Pulse hub protocol implementation";
|
||||
|
|
|
|||
|
|
@ -10,14 +10,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "boschshcpy";
|
||||
version = "0.2.23";
|
||||
version = "0.2.24";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tschamm";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-1mqxtL/9OFg3r+5/dkZlH4qRvRHsHMqHvYPEfCjSrr4=";
|
||||
sha256 = "sha256-hvanimPWTKzOHRwJhynzO/4Z1jGlLopk4ogU3KHTEyc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -30,7 +32,9 @@ buildPythonPackage rec {
|
|||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "boschshcpy" ];
|
||||
pythonImportsCheck = [
|
||||
"boschshcpy"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module to work with the Bosch Smart Home Controller API";
|
||||
|
|
|
|||
|
|
@ -9,14 +9,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fpyutils";
|
||||
version = "2.0.1";
|
||||
version = "2.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "frnmst";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1dksx5ykm7f1bi16wg8kqqqlnc874k3vg9kfjbbbalv8w0g2g2am";
|
||||
sha256 = "sha256-QO7g0wjlaboZwvA+JYL1ax7M8zzCc0hizBdaN2b1TCs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -28,14 +30,18 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [ "fpyutils/tests/*.py" ];
|
||||
pytestFlagsArray = [
|
||||
"fpyutils/tests/*.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Don't run test which requires bash
|
||||
"test_execute_command_live_output"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "fpyutils" ];
|
||||
pythonImportsCheck = [
|
||||
"fpyutils"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Collection of useful non-standard Python functions";
|
||||
|
|
|
|||
51
pkgs/development/python-modules/google-nest-sdm/default.nix
Normal file
51
pkgs/development/python-modules/google-nest-sdm/default.nix
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, google-auth
|
||||
, google-auth-oauthlib
|
||||
, google-cloud-pubsub
|
||||
, pythonOlder
|
||||
, requests_oauthlib
|
||||
, pytest-aiohttp
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-nest-sdm";
|
||||
version = "0.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "allenporter";
|
||||
repo = "python-google-nest-sdm";
|
||||
rev = version;
|
||||
sha256 = "sha256-mm1FhR10asxJI8MQfQipqmQbHQfO3z49jpnnrz38Clo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
google-auth
|
||||
google-auth-oauthlib
|
||||
google-cloud-pubsub
|
||||
requests_oauthlib
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest-aiohttp
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"google_nest_sdm"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module for Google Nest Device Access using the Smart Device Management API";
|
||||
homepage = "https://github.com/allenporter/python-google-nest-sdm";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,31 +1,42 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytest-runner
|
||||
, python-dateutil
|
||||
, babelfish
|
||||
, rebulk
|
||||
, pythonOlder
|
||||
, importlib-resources
|
||||
, pytestCheckHook
|
||||
, pytest-mock
|
||||
, pytest-benchmark
|
||||
, pyyaml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "guessit";
|
||||
version = "3.3.1";
|
||||
version = "3.4.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "8305e0086129614a8820a508303f98f56c584811489499bcc54a7ea6f1b0391e";
|
||||
sha256 = "731e96e6a1f3b065d05accc8c19f35d4485d880b77ab8dc4b262cc353df294f7";
|
||||
};
|
||||
|
||||
# Tests require more packages.
|
||||
doCheck = false;
|
||||
buildInputs = [ pytest-runner ];
|
||||
propagatedBuildInputs = [
|
||||
python-dateutil babelfish rebulk
|
||||
];
|
||||
rebulk
|
||||
babelfish
|
||||
python-dateutil
|
||||
] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
|
||||
|
||||
checkInputs = [ pytestCheckHook pytest-mock pytest-benchmark pyyaml ];
|
||||
|
||||
pytestFlagsArray = [ "--benchmark-disable" ];
|
||||
|
||||
pythonImportsCheck = [ "guessit" ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://pypi.python.org/pypi/guessit";
|
||||
license = lib.licenses.lgpl3;
|
||||
description = "A library for guessing information from video files";
|
||||
homepage = "https://doc.guessit.io/";
|
||||
description = "A Python library that extracts as much information as possible from a video filename";
|
||||
changelog = "https://github.com/guessit-io/guessit/raw/v${version}/CHANGELOG.md";
|
||||
license = lib.licenses.lgpl3Only;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "md-toc";
|
||||
version = "8.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -26,9 +28,18 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [ "md_toc/tests/*.py" ];
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "fpyutils>=2.0,<2.1" "fpyutils>=2.0,<3"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "md_toc" ];
|
||||
pytestFlagsArray = [
|
||||
"md_toc/tests/*.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"md_toc"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Table of contents generator for Markdown";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,37 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, requests_oauthlib
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-google-nest";
|
||||
version = "5.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "y3BOhorVkJ3rFPifNOopLMqk6y1fHX5vxHGiqWvWHhE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests_oauthlib
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"nest"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python API and command line tool for talking to Nest thermostats";
|
||||
homepage = "https://github.com/axlan/python-nest/";
|
||||
license = licenses.cc-by-nc-sa-30;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
49
pkgs/development/python-modules/tololib/default.nix
Normal file
49
pkgs/development/python-modules/tololib/default.nix
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tololib";
|
||||
version = "0.1.0b3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "MatthiasLohr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "qkdMy6/ZuBksbBTbDhPyCPWMjubQODjdMsqHTJ7QvQI=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Test requires network access
|
||||
"test_discovery"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"tololib"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python Library for Controlling TOLO Sauna/Steam Bath Devices";
|
||||
homepage = "https://gitlab.com/MatthiasLohr/tololib";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
{ lib, stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsa-lib
|
||||
, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
|
||||
, openglSupport ? libGLSupported, libGLU, libGL ? null
|
||||
}:
|
||||
|
||||
assert openglSupport -> libGL != null && libGLU != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.1.1";
|
||||
pname = "residualvm";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/residualvm/residualvm-${version}-sources.tar.bz2";
|
||||
sha256 = "99c419b13885a49bdfc10a50a3a6000fd1ba9504f6aae04c74b840ec6f57a963";
|
||||
};
|
||||
|
||||
buildInputs = [ stdenv SDL zlib libmpeg2 libmad libogg libvorbis flac alsa-lib ]
|
||||
++ lib.optionals openglSupport [ libGL libGLU ];
|
||||
|
||||
configureFlags = [ "--enable-all-engines" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Interpreter for LucasArts' Lua-based 3D adventure games";
|
||||
homepage = "http://residualvm.org/";
|
||||
repositories.git = "https://github.com/residualvm/residualvm.git";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -560,7 +560,7 @@
|
|||
"neato" = ps: with ps; [ aiohttp-cors pybotvac ];
|
||||
"nederlandse_spoorwegen" = ps: with ps; [ nsapi ];
|
||||
"ness_alarm" = ps: with ps; [ nessclient ];
|
||||
"nest" = ps: with ps; [ aiohttp-cors ha-ffmpeg python-nest ]; # missing inputs: google-nest-sdm
|
||||
"nest" = ps: with ps; [ aiohttp-cors google-nest-sdm ha-ffmpeg python-nest ];
|
||||
"netatmo" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa pyatmo ];
|
||||
"netdata" = ps: with ps; [ netdata ];
|
||||
"netgear" = ps: with ps; [ ]; # missing inputs: pynetgear
|
||||
|
|
|
|||
|
|
@ -537,6 +537,7 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
"namecheapdns"
|
||||
"neato"
|
||||
"ness_alarm"
|
||||
"nest"
|
||||
"netatmo"
|
||||
"nexia"
|
||||
"nightscout"
|
||||
|
|
|
|||
|
|
@ -26,9 +26,9 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ boringssl' libevent zlib ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBORINGSSL_DIR=${boringssl'}"
|
||||
"-DBORINGSSL_LIB_crypto=${boringssl'}/lib/libcrypto.a"
|
||||
"-DBORINGSSL_LIB_ssl=${boringssl'}/lib/libssl.a"
|
||||
"-DBORINGSSL_DIR=${lib.getDev boringssl'}"
|
||||
"-DBORINGSSL_LIB_crypto=${lib.getLib boringssl'}/lib/libcrypto.a"
|
||||
"-DBORINGSSL_LIB_ssl=${lib.getLib boringssl'}/lib/libssl.a"
|
||||
"-DZLIB_LIB=${zlib}/lib/libz.so"
|
||||
];
|
||||
|
||||
|
|
@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
mkdir combinedlib
|
||||
cd combinedlib
|
||||
ar -x ${boringssl'}/lib/libssl.a
|
||||
ar -x ${boringssl'}/lib/libcrypto.a
|
||||
ar -x ${lib.getLib boringssl'}/lib/libssl.a
|
||||
ar -x ${lib.getLib boringssl'}/lib/libcrypto.a
|
||||
ar -x ../src/liblsquic/liblsquic.a
|
||||
ar rc liblsquic.a *.o
|
||||
ranlib liblsquic.a
|
||||
|
|
|
|||
|
|
@ -14,16 +14,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "czkawka";
|
||||
version = "3.3.0";
|
||||
version = "3.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qarmin";
|
||||
repo = "czkawka";
|
||||
rev = version;
|
||||
sha256 = "0mikgnsqxj8dgapr2k7i9i8mmsza15kp4nasyd6l1vp2cqy8aki6";
|
||||
sha256 = "0p1j5f5jk0cci6bg4jfnnn80gyi9039ni4ma8zwindk7fyn9gpc8";
|
||||
};
|
||||
|
||||
cargoSha256 = "009zfy4lk8y51h1wi71mrjp6kc7xnk3r8jlbxvhyqslhqd9w10fv";
|
||||
cargoSha256 = "1q35c5szavpsnzflw33radg6blzql3sz3jyzyqqz97ac69zns920";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# frozen_string_literal: true
|
||||
source "https://rubygems.org"
|
||||
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.15"
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.16"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
GIT
|
||||
remote: https://github.com/rapid7/metasploit-framework
|
||||
revision: 1dd828ca9f705d3f05d273b535ff666b5941ddd6
|
||||
ref: refs/tags/6.1.15
|
||||
revision: a517e78b4ff21ff15b7f3ac748476ec8de4d9517
|
||||
ref: refs/tags/6.1.16
|
||||
specs:
|
||||
metasploit-framework (6.1.15)
|
||||
metasploit-framework (6.1.16)
|
||||
actionpack (~> 6.0)
|
||||
activerecord (~> 6.0)
|
||||
activesupport (~> 6.0)
|
||||
|
|
@ -128,13 +128,13 @@ GEM
|
|||
arel-helpers (2.12.1)
|
||||
activerecord (>= 3.1.0, < 7)
|
||||
aws-eventstream (1.2.0)
|
||||
aws-partitions (1.533.0)
|
||||
aws-sdk-core (3.122.1)
|
||||
aws-partitions (1.534.0)
|
||||
aws-sdk-core (3.123.0)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
aws-partitions (~> 1, >= 1.525.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
jmespath (~> 1.0)
|
||||
aws-sdk-ec2 (1.281.0)
|
||||
aws-sdk-ec2 (1.283.0)
|
||||
aws-sdk-core (~> 3, >= 3.122.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-iam (1.63.0)
|
||||
|
|
@ -143,7 +143,7 @@ GEM
|
|||
aws-sdk-kms (1.51.0)
|
||||
aws-sdk-core (~> 3, >= 3.122.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-s3 (1.106.0)
|
||||
aws-sdk-s3 (1.107.0)
|
||||
aws-sdk-core (~> 3, >= 3.122.0)
|
||||
aws-sdk-kms (~> 1)
|
||||
aws-sigv4 (~> 1.4)
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@ let
|
|||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "metasploit-framework";
|
||||
version = "6.1.15";
|
||||
version = "6.1.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rapid7";
|
||||
repo = "metasploit-framework";
|
||||
rev = version;
|
||||
sha256 = "sha256-Wz5FeM7AvRS4mV3BJcWOdp1GgAzTOqRnjBAQp4/Oj5E=";
|
||||
sha256 = "sha256-ppt41H803tYHfPXNLJCfdDzLANLFZHajzVC1UMg7MGQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -104,30 +104,30 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "052y91z5xqysfmnclcp0k9cy7dgjk28xv6dskwww42ljdgjxcmxi";
|
||||
sha256 = "1mggk7w7529fxcwvsnmm08ms600nx7nzh51d4kq2d167wf4qqfan";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.533.0";
|
||||
version = "1.534.0";
|
||||
};
|
||||
aws-sdk-core = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "07cdd2jiydn663xgqv5fykd9zfiv96ma3j4k2khwf06czy40cvwq";
|
||||
sha256 = "1390d003vnajh3i2k0al4yzw7xchdk17v92vpdwla6yds68x9kh8";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.122.1";
|
||||
version = "3.123.0";
|
||||
};
|
||||
aws-sdk-ec2 = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "01ywgc5mh1h19ac10l1ck911qgkxqavwbanp4i6h9ddlcd9jmhm1";
|
||||
sha256 = "1i3qvsif62kwdhny226fmnzi4la27qh8hnl0df09w9hiqh6ya0ls";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.281.0";
|
||||
version = "1.283.0";
|
||||
};
|
||||
aws-sdk-iam = {
|
||||
groups = ["default"];
|
||||
|
|
@ -154,10 +154,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "06ix8lw1r0mw77hnc7ns0fqrsl616g35xw8qcsihzwzgvwb2z0mb";
|
||||
sha256 = "0n00hkfy8c44yq23wv0y9aj007mfx1va7jxiaa74g3agf317vrak";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.106.0";
|
||||
version = "1.107.0";
|
||||
};
|
||||
aws-sigv4 = {
|
||||
groups = ["default"];
|
||||
|
|
@ -664,12 +664,12 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
fetchSubmodules = false;
|
||||
rev = "1dd828ca9f705d3f05d273b535ff666b5941ddd6";
|
||||
sha256 = "14cgrs7sf40hiiks8fnk1j04d7bniv2jbhaxk6w19gf0rrw4agjv";
|
||||
rev = "a517e78b4ff21ff15b7f3ac748476ec8de4d9517";
|
||||
sha256 = "0r1h7g451dahrnipcr65s80cng3lky82rkgmgh3xdpilgza7i6x6";
|
||||
type = "git";
|
||||
url = "https://github.com/rapid7/metasploit-framework";
|
||||
};
|
||||
version = "6.1.15";
|
||||
version = "6.1.16";
|
||||
};
|
||||
metasploit-model = {
|
||||
groups = ["default"];
|
||||
|
|
|
|||
|
|
@ -784,6 +784,7 @@ mapAliases ({
|
|||
# due to it being inside the linuxPackagesFor function.
|
||||
rtlwifi_new-firmware = rtw88-firmware; # added 2021-03-14
|
||||
recordmydesktop = throw "recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10
|
||||
residualvm = throw "residualvm was merged to scummvm code in 2018-06-15; consider using scummvm"; # added 2021-11-27
|
||||
retroshare06 = retroshare;
|
||||
gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10
|
||||
qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10
|
||||
|
|
|
|||
|
|
@ -8829,6 +8829,8 @@ with pkgs;
|
|||
|
||||
pyspread = libsForQt5.callPackage ../applications/office/pyspread { };
|
||||
|
||||
teapot = callPackage ../applications/office/teapot { };
|
||||
|
||||
pythonIRClib = pythonPackages.pythonIRClib;
|
||||
|
||||
pyditz = callPackage ../applications/misc/pyditz {
|
||||
|
|
@ -30515,8 +30517,6 @@ with pkgs;
|
|||
|
||||
redeclipse = callPackage ../games/redeclipse { };
|
||||
|
||||
residualvm = callPackage ../games/residualvm { };
|
||||
|
||||
rftg = callPackage ../games/rftg { };
|
||||
|
||||
rigsofrods = callPackage ../games/rigsofrods {
|
||||
|
|
|
|||
|
|
@ -3278,6 +3278,8 @@ in {
|
|||
|
||||
google-i18n-address = callPackage ../development/python-modules/google-i18n-address { };
|
||||
|
||||
google-nest-sdm = callPackage ../development/python-modules/google-nest-sdm { };
|
||||
|
||||
googlemaps = callPackage ../development/python-modules/googlemaps { };
|
||||
|
||||
google-pasta = callPackage ../development/python-modules/google-pasta { };
|
||||
|
|
@ -5843,6 +5845,8 @@ in {
|
|||
|
||||
python-glanceclient = callPackage ../development/python-modules/python-glanceclient { };
|
||||
|
||||
python-google-nest = callPackage ../development/python-modules/python-google-nest { };
|
||||
|
||||
python-heatclient = callPackage ../development/python-modules/python-heatclient { };
|
||||
|
||||
python-ipmi = callPackage ../development/python-modules/python-ipmi { };
|
||||
|
|
@ -9414,6 +9418,8 @@ in {
|
|||
|
||||
tokenlib = callPackage ../development/python-modules/tokenlib { };
|
||||
|
||||
tololib = callPackage ../development/python-modules/tololib { };
|
||||
|
||||
toml = callPackage ../development/python-modules/toml { };
|
||||
|
||||
tomli = callPackage ../development/python-modules/tomli { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue