Merge master into staging-next
This commit is contained in:
commit
ec161d2240
|
@ -145,7 +145,8 @@ in
|
|||
'';
|
||||
|
||||
systemd.services.systemd-vconsole-setup =
|
||||
{ before = [ "display-manager.service" ];
|
||||
{
|
||||
before = optional config.services.xserver.enable "display-manager.service";
|
||||
after = [ "systemd-udev-settle.service" ];
|
||||
restartTriggers = [ vconsoleConf consoleEnv ];
|
||||
};
|
||||
|
|
|
@ -27,8 +27,8 @@ if (!defined $res || scalar @$res == 0) {
|
|||
my $package = @$res[0]->{package};
|
||||
if ($ENV{"NIX_AUTO_INSTALL"} // "") {
|
||||
print STDERR <<EOF;
|
||||
The program ‘$program’ is currently not installed. It is provided by
|
||||
the package ‘$package’, which I will now install for you.
|
||||
The program '$program' is currently not installed. It is provided by
|
||||
the package '$package', which I will now install for you.
|
||||
EOF
|
||||
;
|
||||
exit 126 if system("nix-env", "-iA", "nixos.$package") == 0;
|
||||
|
@ -36,16 +36,17 @@ EOF
|
|||
exec("nix-shell", "-p", $package, "--run", shell_quote("exec", @ARGV));
|
||||
} else {
|
||||
print STDERR <<EOF;
|
||||
The program ‘$program’ is currently not installed. You can install it by typing:
|
||||
nix-env -iA nixos.$package
|
||||
The program '$program' is not in your PATH. You can make it available in a
|
||||
ephemeral shell by typing:
|
||||
nix-shell -p $package
|
||||
EOF
|
||||
}
|
||||
} else {
|
||||
print STDERR <<EOF;
|
||||
The program ‘$program’ is currently not installed. It is provided by
|
||||
several packages. You can install it by typing one of the following:
|
||||
The program '$program' is not in your PATH. It is provided by several packages.
|
||||
You can make it available in a ephemeral shell by typing one of the following:
|
||||
EOF
|
||||
print STDERR " nix-env -iA nixos.$_->{package}\n" foreach @$res;
|
||||
print STDERR " nix-shell -p $_->{package}\n" foreach @$res;
|
||||
}
|
||||
|
||||
exit 127;
|
||||
|
|
|
@ -8,8 +8,7 @@ let
|
|||
cfg = xcfg.desktopManager.plasma5;
|
||||
|
||||
inherit (pkgs) kdeApplications kdeFrameworks plasma5;
|
||||
libsForQt5 = pkgs.libsForQt514;
|
||||
qt5 = pkgs.qt514;
|
||||
inherit (pkgs) qt5 libsForQt5;
|
||||
inherit (pkgs) writeText;
|
||||
|
||||
pulseaudio = config.hardware.pulseaudio;
|
||||
|
|
|
@ -1,16 +1,16 @@
|
|||
{ mkDerivation, lib, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools
|
||||
, seafile-shared, ccnet, jansson, libsearpc
|
||||
, seafile-shared, jansson, libsearpc
|
||||
, withShibboleth ? true, qtwebengine }:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "seafile-client";
|
||||
version = "7.0.9";
|
||||
version = "7.0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "haiwen";
|
||||
repo = "seafile-client";
|
||||
rev = "v${version}";
|
||||
sha256 = "0pcn6lfzma2hvpwsp9q0002wvym7zabpp8fvq29l101gzirn79m9";
|
||||
sha256 = "082v1qbysrqb7m0lk56fpx8n403fjxbvbj0svm4mkjl6mzs2cv22";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig cmake ];
|
||||
|
@ -21,7 +21,7 @@ mkDerivation rec {
|
|||
++ lib.optional withShibboleth "-DBUILD_SHIBBOLETH_SUPPORT=ON";
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--suffix PATH : ${lib.makeBinPath [ ccnet seafile-shared ]}"
|
||||
"--suffix PATH : ${lib.makeBinPath [ seafile-shared ]}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "qgroundcontrol";
|
||||
version = "4.0.10";
|
||||
version = "4.0.11";
|
||||
|
||||
qtInputs = [
|
||||
qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2
|
||||
|
@ -62,7 +62,7 @@ mkDerivation rec {
|
|||
owner = "mavlink";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1jmhhd2nwxq3m9rzzmrjls8f6hhj52ia71b1sv4vvcjh802cha8g";
|
||||
sha256 = "14pk1vmcpg2cc5p100chbhnynclcwyqmyb2n2w11vvk0l2c9z1gz";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@ index f2db3e9..4ff2602 100644
|
|||
if (read(0, &len, sizeof(unsigned)) == sizeof(unsigned)
|
||||
- && len && len < (1 << 12)) {
|
||||
+ && len) {
|
||||
+ if (len >= (1 << 14)) {
|
||||
+ if (len >= (1 << 20)) {
|
||||
+ fprintf(stderr, "%s: exceeded environment length limit", argv[0]);
|
||||
+ return 1;
|
||||
+ }
|
||||
|
|
|
@ -1,27 +1,35 @@
|
|||
{ stdenv, fetchurl, cmake, pkgconfig, gtest, doxygen
|
||||
, graphviz, lcov }:
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, cmake
|
||||
, pkg-config
|
||||
, gtest
|
||||
, doxygen
|
||||
, graphviz
|
||||
, lcov
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "properties-cpp";
|
||||
version = "0.0.1";
|
||||
|
||||
src = let srcver = version+"+14.10.20140730"; in
|
||||
fetchurl {
|
||||
url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}_${srcver}.orig.tar.gz";
|
||||
sha256 = "08vjyv7ibn6jh2ikj5v48kjpr3n6hlkp9qlvdn8r0vpiwzah0m2w";
|
||||
};
|
||||
src = let srcver = "${version}+14.10.20140730"; in
|
||||
fetchurl {
|
||||
url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}_${srcver}.orig.tar.gz";
|
||||
sha256 = "08vjyv7ibn6jh2ikj5v48kjpr3n6hlkp9qlvdn8r0vpiwzah0m2w";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake gtest doxygen pkgconfig graphviz lcov ];
|
||||
|
||||
patchPhase = ''
|
||||
postPatch = ''
|
||||
sed -i "/add_subdirectory(tests)/d" CMakeLists.txt
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [ gtest doxygen graphviz lcov ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://launchpad.net/properties-cpp";
|
||||
description = "A very simple convenience library for handling properties and signals in C++11";
|
||||
license = licenses.lgpl3;
|
||||
license = licenses.lgpl3Only;
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -28,18 +28,3 @@ diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
|
|||
#define HAVE_SYS_TIMEB_H 1
|
||||
|
||||
#if !PLATFORM(GTK) && !PLATFORM(QT)
|
||||
diff --git a/Source/WTF/wtf/PlatformMac.cmake b/Source/WTF/wtf/PlatformMac.cmake
|
||||
--- a/Source/WTF/wtf/PlatformMac.cmake
|
||||
+++ b/Source/WTF/wtf/PlatformMac.cmake
|
||||
@@ -2,11 +2,9 @@ set(WTF_LIBRARY_TYPE SHARED)
|
||||
|
||||
find_library(COCOA_LIBRARY Cocoa)
|
||||
find_library(COREFOUNDATION_LIBRARY CoreFoundation)
|
||||
-find_library(READLINE_LIBRARY Readline)
|
||||
list(APPEND WTF_LIBRARIES
|
||||
${COREFOUNDATION_LIBRARY}
|
||||
${COCOA_LIBRARY}
|
||||
- ${READLINE_LIBRARY}
|
||||
libicucore.dylib
|
||||
)
|
||||
|
||||
|
|
|
@ -14,28 +14,33 @@ then throw "sedlex is not available for OCaml ${ocaml.version}"
|
|||
else
|
||||
|
||||
let
|
||||
unicodeVersion = "12.1.0";
|
||||
baseUrl = "https://www.unicode.org/Public/${unicodeVersion}";
|
||||
|
||||
DerivedCoreProperties = fetchurl {
|
||||
url = "https://www.unicode.org/Public/12.1.0/ucd/DerivedCoreProperties.txt";
|
||||
url = "${baseUrl}/ucd/DerivedCoreProperties.txt";
|
||||
sha256 = "0s6sn1yr9qmb2i6gf8dir2zpsbjv1frdfzy3i2yjylzvf637msx6";
|
||||
};
|
||||
DerivedGeneralCategory = fetchurl {
|
||||
url = "https://www.unicode.org/Public/12.1.0/ucd/extracted/DerivedGeneralCategory.txt";
|
||||
url = "${baseUrl}/ucd/extracted/DerivedGeneralCategory.txt";
|
||||
sha256 = "1rifzq9ba6c58dn0lrmcb5l5k4ksx3zsdkira3m5p6h4i2wriy3q";
|
||||
};
|
||||
PropList = fetchurl {
|
||||
url = "https://www.unicode.org/Public/12.1.0/ucd/PropList.txt";
|
||||
url = "${baseUrl}/ucd/PropList.txt";
|
||||
sha256 = "0gsb1jpj3mnqbjgbavi4l95gl6g4agq58j82km22fdfg63j3w3fk";
|
||||
};
|
||||
in
|
||||
buildDunePackage rec {
|
||||
pname = "sedlex";
|
||||
version = "2.1";
|
||||
version = "2.2";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocaml-community";
|
||||
repo = "sedlex";
|
||||
rev = "v${version}";
|
||||
sha256 = "05f6qa8x3vhpdz1fcnpqk37fpnyyq13icqsk2gww5idjnh6kng26";
|
||||
sha256 = "18dwl2is5j26z6b1c47b81wvcpxw44fasppdadsrs9vsw63rwcm3";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -43,6 +48,7 @@ buildDunePackage rec {
|
|||
];
|
||||
|
||||
preBuild = ''
|
||||
rm src/generator/data/dune
|
||||
ln -s ${DerivedCoreProperties} src/generator/data/DerivedCoreProperties.txt
|
||||
ln -s ${DerivedGeneralCategory} src/generator/data/DerivedGeneralCategory.txt
|
||||
ln -s ${PropList} src/generator/data/PropList.txt
|
||||
|
|
|
@ -6,9 +6,9 @@
|
|||
let source =
|
||||
if stdenv.lib.versionAtLeast ocaml.version "4.02"
|
||||
then {
|
||||
version = "1.10";
|
||||
url = "https://github.com/ocaml/Zarith/archive/release-1.10.tar.gz";
|
||||
sha256 = "1qxrl0v2mk9wghc1iix3n0vfz2jbg6k5wpn1z7p02m2sqskb0zhb";
|
||||
version = "1.11";
|
||||
url = "https://github.com/ocaml/Zarith/archive/release-1.11.tar.gz";
|
||||
sha256 = "111n33flg4aq5xp5jfksqm4yyz6mzxx9ps9a4yl0dz8h189az5pr";
|
||||
} else {
|
||||
version = "1.3";
|
||||
url = "http://forge.ocamlcore.org/frs/download.php/1471/zarith-1.3.tgz";
|
||||
|
|
|
@ -1,25 +1,31 @@
|
|||
{ stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, async-timeout, pytest, pytest-asyncio }:
|
||||
{ stdenv
|
||||
, async-timeout
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "3.2.10";
|
||||
version = "3.3.1";
|
||||
pname = "asgiref";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
# PyPI tarball doesn't include tests directory
|
||||
src = fetchFromGitHub {
|
||||
owner = "django";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1sj4yy2injaskwfi5pkb542jl8s6ljijnyra81gpw0pgd3d0bgxv";
|
||||
sha256 = "00r4l9x425wkbac6b6c2ksm2yjinrvvdf0ajizrzq32h0jg82016";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ async-timeout ];
|
||||
|
||||
checkInputs = [ pytest pytest-asyncio ];
|
||||
|
||||
checkPhase = ''
|
||||
py.test
|
||||
'';
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Reference ASGI adapters and channel layers";
|
||||
|
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "branca";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1f7drarwiw8fh17hpq8b3p4mfqgjbh3k045dvpx5z12d3a0zg7ca";
|
||||
sha256 = "c111453617b17ab2bda60a4cd71787d6f2b59c85cdf71ab160a737606ac66c31";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest selenium ];
|
||||
|
|
33
pkgs/development/python-modules/hole/default.nix
Normal file
33
pkgs/development/python-modules/hole/default.nix
Normal file
|
@ -0,0 +1,33 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, aiohttp
|
||||
, async-timeout
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hole";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "065fxc0l16j8xkjd0y0qar9cmqmjyp8jcshakbakldkfscpx3s5m";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
async-timeout
|
||||
];
|
||||
|
||||
# no tests are present
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "hole" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python API for interacting with a Pihole instance.";
|
||||
homepage = "https://github.com/home-assistant-ecosystem/python-hole";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mysqlclient";
|
||||
version = "2.0.2";
|
||||
version = "2.0.3";
|
||||
|
||||
nativeBuildInputs = [
|
||||
libmysqlclient
|
||||
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "8df057b08fc27d8f7106bfa997d0a21e2acef017f905f06d6fb0aa6a20d4d2b2";
|
||||
sha256 = "f6ebea7c008f155baeefe16c56cd3ee6239f7a5a9ae42396c2f1860f08a7c432";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
@ -15,12 +15,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sqlite-utils";
|
||||
version = "3.1";
|
||||
version = "3.1.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "53950eb89f77066d6caf553c52ec01701a8bebbaffa9e0a627df3f229ca8720f";
|
||||
sha256 = "54df73364662ff3c763da3b42b9d27b1771ebfb3361caa255e44e1bf1544015b";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -25,12 +25,12 @@ with stdenv.lib;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "trytond";
|
||||
version = "5.8.1";
|
||||
version = "5.8.2";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9c1afca73b13ede07680015d69f611c7dec33b8c22565de70f0cbbf0464b8db7";
|
||||
sha256 = "dea7d11ec0b4584a438fab7a1acb56864b32cc9e7d6ffa166572f75a2b033dc0";
|
||||
};
|
||||
|
||||
# Tells the tests which database to use
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
, libdrm
|
||||
, mesa
|
||||
, libxkbcommon
|
||||
, libappindicator-gtk3
|
||||
}@args:
|
||||
|
||||
let
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
, libdrm
|
||||
, mesa
|
||||
, libxkbcommon
|
||||
, libappindicator-gtk3
|
||||
}:
|
||||
|
||||
version: hashes:
|
||||
|
@ -56,7 +57,7 @@ let
|
|||
};
|
||||
|
||||
electronLibPath = with stdenv.lib; makeLibraryPath (
|
||||
[ libuuid at-spi2-atk at-spi2-core ]
|
||||
[ libuuid at-spi2-atk at-spi2-core libappindicator-gtk3 ]
|
||||
++ optionals (! versionOlder version "9.0.0") [ libdrm mesa ]
|
||||
++ optionals (! versionOlder version "11.0.0") [ libxkbcommon ]
|
||||
);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, fetchFromGitHub, cmake, lzma, boost, libdevil, zlib, p7zip
|
||||
, openal, libvorbis, glew, freetype, xorg, SDL2, libGLU, libGL
|
||||
, asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl, makeWrapper
|
||||
, asciidoc, docbook_xsl, docbook_xsl_ns, curl, makeWrapper
|
||||
, jdk ? null, python ? null, systemd, libunwind, which, minizip
|
||||
, withAI ? true # support for AI Interfaces and Skirmish AIs
|
||||
}:
|
||||
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
# taken from https://github.com/spring/spring/commits/maintenance
|
||||
src = fetchFromGitHub {
|
||||
owner = "spring";
|
||||
repo = "spring";
|
||||
repo = pname;
|
||||
inherit rev;
|
||||
sha256 = "1nx68d894yfmqc6df72hmk75ph26fqdvlmmq58cca0vbwpz9hf5v";
|
||||
fetchSubmodules = true;
|
||||
|
@ -40,14 +40,13 @@ stdenv.mkDerivation rec {
|
|||
"-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON"
|
||||
"-DPREFER_STATIC_LIBS:BOOL=OFF"];
|
||||
|
||||
buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL2
|
||||
xorg.libX11 xorg.libXcursor libGLU libGL glew asciidoc libxslt docbook_xsl curl makeWrapper
|
||||
docbook_xsl_ns systemd libunwind which minizip ]
|
||||
nativeBuildInputs = [ cmake makeWrapper docbook_xsl docbook_xsl_ns asciidoc ];
|
||||
buildInputs = [ lzma boost libdevil zlib p7zip openal libvorbis freetype SDL2
|
||||
xorg.libX11 xorg.libXcursor libGLU libGL glew curl
|
||||
systemd libunwind which minizip ]
|
||||
++ stdenv.lib.optional withAI jdk
|
||||
++ stdenv.lib.optional withAI python;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-fpermissive"; # GL header minor incompatibility
|
||||
|
||||
postInstall = ''
|
||||
|
@ -59,7 +58,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://springrts.com/";
|
||||
description = "A powerful real-time strategy (RTS) game engine";
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.phreedom maintainers.qknight maintainers.domenkozar maintainers.sorki ];
|
||||
maintainers = with maintainers; [ phreedom qknight domenkozar sorki ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
{stdenv, fetchFromGitHub, which, autoreconfHook, pkgconfig, vala, python2, curl, libevent, glib, libsearpc, sqlite, intltool, fuse, ccnet, libuuid }:
|
||||
{stdenv, fetchFromGitHub, which, autoreconfHook, pkgconfig, vala, python2, curl, libevent, glib, libsearpc, sqlite, intltool, fuse, libuuid }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "seafile-shared";
|
||||
version = "7.0.9";
|
||||
version = "7.0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "haiwen";
|
||||
repo = "seafile";
|
||||
rev = "v${version}";
|
||||
sha256 = "1n0jq6d6vgk58qmqgdr7w7jfgcrlicnaafz1za9qf76sbi5vc6fk";
|
||||
sha256 = "0b3297cbagi9x8dnw2gjifmb8dk6vyhg6vfrfsanm1wyx8pgw2jg";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -612,7 +612,7 @@
|
|||
"person" = ps: with ps; [ aiohttp-cors pillow ];
|
||||
"philips_js" = ps: with ps; [ ]; # missing inputs: ha-philipsjs
|
||||
"pi4ioe5v9xxxx" = ps: with ps; [ ]; # missing inputs: pi4ioe5v9xxxx
|
||||
"pi_hole" = ps: with ps; [ ]; # missing inputs: hole
|
||||
"pi_hole" = ps: with ps; [ hole ];
|
||||
"picotts" = ps: with ps; [ ];
|
||||
"piglow" = ps: with ps; [ ]; # missing inputs: piglow
|
||||
"pilight" = ps: with ps; [ ]; # missing inputs: pilight
|
||||
|
|
|
@ -3,14 +3,14 @@ let
|
|||
package = (import ./node.nix { inherit pkgs system; }).package;
|
||||
in
|
||||
package.override rec {
|
||||
version = "1.16.2";
|
||||
version = "1.17.0";
|
||||
reconstructLock = true;
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "Koenkk";
|
||||
repo = "zigbee2mqtt";
|
||||
rev = version;
|
||||
sha256 = "0rpmm4pwm8s4i9fl26ql0czg5kijv42k9wwik7jb3ppi5jzxrakd";
|
||||
sha256 = "152hxx38px9vs0fxhaiv5injsmkdcmjsibszvxrxilnx4fghlww6";
|
||||
};
|
||||
|
||||
passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt;
|
||||
|
|
2761
pkgs/servers/zigbee2mqtt/node-packages.nix
generated
2761
pkgs/servers/zigbee2mqtt/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
@ -98,7 +98,7 @@ common =
|
|||
# when cross-compiling.
|
||||
lib.optionalString (
|
||||
stdenv.buildPlatform != stdenv.hostPlatform &&
|
||||
(lib.versionOlder "2.3.8" (lib.traceVal version) && !is24)
|
||||
(lib.versionOlder "2.3.8" version && !is24)
|
||||
# The additional is24 condition is required as versionOlder doesn't understand nixUnstable version strings
|
||||
) ''
|
||||
mkdir tmp/
|
||||
|
|
|
@ -26422,6 +26422,7 @@ in
|
|||
space-orbit = callPackage ../games/space-orbit { };
|
||||
|
||||
spring = callPackage ../games/spring {
|
||||
asciidoc = asciidoc-full;
|
||||
boost = boost155;
|
||||
};
|
||||
|
||||
|
@ -26797,6 +26798,8 @@ in
|
|||
let
|
||||
mkPlasma5 = import ../desktops/plasma-5;
|
||||
attrs = {
|
||||
# ATTN: The Qt version used in the NixOS Plasma module must be updated
|
||||
# whenever this changes!
|
||||
inherit libsForQt5;
|
||||
inherit lib fetchurl;
|
||||
gconf = gnome2.GConf;
|
||||
|
|
|
@ -2797,6 +2797,8 @@ in {
|
|||
|
||||
hocr-tools = callPackage ../development/python-modules/hocr-tools { };
|
||||
|
||||
hole = callPackage ../development/python-modules/hole { };
|
||||
|
||||
holidays = callPackage ../development/python-modules/holidays { };
|
||||
|
||||
holoviews = callPackage ../development/python-modules/holoviews { };
|
||||
|
|
Loading…
Reference in a new issue