Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
5c072a088d
|
|
@ -36,6 +36,14 @@ with lib.maintainers; {
|
|||
scope = "Maintain Cinnamon desktop environment and applications made by the LinuxMint team.";
|
||||
};
|
||||
|
||||
deshaw = {
|
||||
# Verify additions to this team with at least one already existing member of the team.
|
||||
members = [
|
||||
limeytexan
|
||||
];
|
||||
scope = "Group registration for D. E. Shaw employees who collectively maintain packages.";
|
||||
};
|
||||
|
||||
freedesktop = {
|
||||
members = [ jtojnar worldofpeace ];
|
||||
scope = "Maintain Freedesktop.org packages for graphical desktop.";
|
||||
|
|
|
|||
|
|
@ -206,6 +206,12 @@ let
|
|||
${cfg.httpConfig}
|
||||
}''}
|
||||
|
||||
${optionalString (cfg.streamConfig != "") ''
|
||||
stream {
|
||||
${cfg.streamConfig}
|
||||
}
|
||||
''}
|
||||
|
||||
${cfg.appendConfig}
|
||||
'';
|
||||
|
||||
|
|
@ -483,6 +489,21 @@ in
|
|||
";
|
||||
};
|
||||
|
||||
streamConfig = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
example = ''
|
||||
server {
|
||||
listen 127.0.0.1:53 udp reuseport;
|
||||
proxy_timeout 20s;
|
||||
proxy_pass 192.168.0.1:53535;
|
||||
}
|
||||
'';
|
||||
description = "
|
||||
Configuration lines to be set inside the stream block.
|
||||
";
|
||||
};
|
||||
|
||||
eventsConfig = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
|
|
|
|||
|
|
@ -35,13 +35,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "strawberry";
|
||||
version = "0.8.4";
|
||||
version = "0.8.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jonaski";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "145djlfvbkx2b1wqipk51mz82dhm27vmh9x00lkn24q1xz1y6h5n";
|
||||
sha256 = "sha256-+ZQ80J94Teqt4Gy6fw/pS7FwILK/TPehtJDy72Bdy1E=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
71
pkgs/applications/science/electronics/diylc/default.nix
Normal file
71
pkgs/applications/science/electronics/diylc/default.nix
Normal file
|
|
@ -0,0 +1,71 @@
|
|||
{ stdenv, fetchurl, makeDesktopItem, unzip, bash, jre8 }:
|
||||
|
||||
let
|
||||
pname = "diylc";
|
||||
version = "4.15.1";
|
||||
files = {
|
||||
app = fetchurl {
|
||||
url = "https://github.com/bancika/diy-layout-creator/releases/download/v${version}/diylc-${version}.zip";
|
||||
sha256 = "09vzbxas654n8npxljqljf930y5gcjfvv3r4dv97dwk5sy66xvaf";
|
||||
};
|
||||
icon16 = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/bancika/diy-layout-creator/v${version}/diylc/diylc-core/src/org/diylc/core/images/icon_small.png";
|
||||
sha256 = "1is50aidfwzwfzwqv57s2hwhx0r5c21cp77bkl93xkdqkh2wd8x4";
|
||||
};
|
||||
icon32 = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/bancika/diy-layout-creator/v${version}/diylc/diylc-core/src/org/diylc/core/images/icon_medium.png";
|
||||
sha256 = "0a45p18n84xz1nd3zv3y16jlimvqzhbzg3q3f4lawgx4rcrn2n3d";
|
||||
};
|
||||
icon48 = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/bancika/diy-layout-creator/v${version}/diylc/diylc-core/src/org/diylc/core/images/icon_large.png";
|
||||
sha256 = "06dkz0dcy8hfmnzr5ri5n1sh8r7mg83kzbvs3zy58wwhgzs1ddk6";
|
||||
};
|
||||
};
|
||||
launcher = makeDesktopItem {
|
||||
name = "diylc";
|
||||
desktopName = "DIY Layout Creator";
|
||||
comment = "Multi platform circuit layout and schematic drawing tool";
|
||||
exec = "diylc";
|
||||
icon = "diylc_icon";
|
||||
categories = "Development;Electronics;";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname version;
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
buildInputs = [ jre8 ];
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
installPhase = ''
|
||||
install -d $out/share/diylc
|
||||
${unzip}/bin/unzip -UU ${files.app} -d $out/share/diylc
|
||||
rm $out/share/diylc/diylc.exe
|
||||
rm $out/share/diylc/run.sh
|
||||
|
||||
# Nope, the icon cannot be named 'diylc' because KDE does not like it.
|
||||
install -Dm644 ${files.icon16} $out/share/icons/hicolor/16x16/apps/diylc_icon.png
|
||||
install -Dm644 ${files.icon32} $out/share/icons/hicolor/32x32/apps/diylc_icon.png
|
||||
install -Dm644 ${files.icon48} $out/share/icons/hicolor/48x48/apps/diylc_icon.png
|
||||
|
||||
install -d $out/share/applications
|
||||
ln -s ${launcher}/share/applications/* $out/share/applications/
|
||||
|
||||
install -d $out/bin
|
||||
cat <<EOF > $out/bin/diylc
|
||||
#!${bash}/bin/sh
|
||||
cd $out/share/diylc
|
||||
${jre8}/bin/java -Xms512m -Xmx2048m -Dorg.diylc.scriptRun=true -Dfile.encoding=UTF-8 -cp diylc.jar:lib org.diylc.DIYLCStarter
|
||||
EOF
|
||||
chmod +x $out/bin/diylc
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Multi platform circuit layout and schematic drawing tool";
|
||||
homepage = "https://bancika.github.io/diy-layout-creator/";
|
||||
changelog = "https://github.com/bancika/diy-layout-creator/releases";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,47 +1,61 @@
|
|||
{ stdenv, lib, fetchFromGitHub, fetchpatch, callPackage, makeWrapper
|
||||
, buildGoPackage, runc, glibc }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, callPackage
|
||||
, makeWrapper
|
||||
, buildGoModule
|
||||
, buildGoPackage
|
||||
, git
|
||||
, glibc
|
||||
}:
|
||||
|
||||
with lib; let
|
||||
|
||||
libnvidia-container = callPackage ./libnvc.nix { };
|
||||
|
||||
nvidia-container-runtime = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = "nvidia-container-runtime";
|
||||
rev = "runtime-v2.0.0";
|
||||
sha256 = "0jcj5xxbg7x7gyhbb67h3ds6vly62gx7j02zm6lg102h34jajj7a";
|
||||
};
|
||||
|
||||
nvidia-container-runtime-hook = buildGoPackage {
|
||||
pname = "nvidia-container-runtime-hook";
|
||||
version = "1.4.0";
|
||||
|
||||
goPackagePath = "nvidia-container-runtime-hook";
|
||||
|
||||
src = "${nvidia-container-runtime}/hook/nvidia-container-runtime-hook";
|
||||
};
|
||||
|
||||
nvidia-runc = runc.overrideAttrs (oldAttrs: rec {
|
||||
name = "nvidia-runc";
|
||||
version = "1.0.0-rc6";
|
||||
nvidia-container-runtime = buildGoPackage rec {
|
||||
pname = "nvidia-container-toolkit";
|
||||
version = "3.4.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencontainers";
|
||||
repo = "runc";
|
||||
owner = "NVIDIA";
|
||||
repo = "nvidia-container-runtime";
|
||||
rev = "v${version}";
|
||||
sha256 = "1jwacb8xnmx5fr86gximhbl9dlbdwj3rpf27hav9q1si86w5pb1j";
|
||||
sha256 = "095mks0r4079vawi50pk4zb5jk0g6s9idg2s1w55a0d27jkknldr";
|
||||
};
|
||||
patches = [ "${nvidia-container-runtime}/runtime/runc/3f2f8b84a77f73d38244dd690525642a72156c64/0001-Add-prestart-hook-nvidia-container-runtime-hook-to-t.patch" ];
|
||||
});
|
||||
goPackagePath = "github.com/nvidia-container-runtime/src";
|
||||
buildFlagsArray = [ "-ldflags=" "-s -w" ];
|
||||
postInstall = ''
|
||||
mv $out/bin/{src,nvidia-container-runtime}
|
||||
'';
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
nvidia-container-toolkit = buildGoModule rec {
|
||||
pname = "nvidia-container-toolkit";
|
||||
version = "1.3.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = "nvidia-container-toolkit";
|
||||
rev = "v${version}";
|
||||
sha256 = "04284bhgx4j55vg9ifvbji2bvmfjfy3h1lq7q356ffgw3yr9n0hn";
|
||||
};
|
||||
vendorSha256 = "17zpiyvf22skfcisflsp6pn56y6a793jcx89kw976fq2x5br1bz7";
|
||||
buildFlagsArray = [ "-ldflags=" "-s -w" ];
|
||||
postInstall = ''
|
||||
mv $out/bin/{pkg,${pname}}
|
||||
cp $out/bin/{${pname},nvidia-container-runtime-hook}
|
||||
'';
|
||||
};
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nvidia-docker";
|
||||
version = "2.0.3";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = "nvidia-docker";
|
||||
rev = "v${version}";
|
||||
sha256 = "1vx5m591mnvcb9vy0196x5lh3r8swjsk0fnlv5h62m7m4m07v6wx";
|
||||
sha256 = "1n1k7fnimky67s12p2ycaq9mgk245fchq62vgd7bl3bzfcbg0z4h";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
@ -50,8 +64,8 @@ in stdenv.mkDerivation rec {
|
|||
mkdir bin
|
||||
cp nvidia-docker bin
|
||||
cp ${libnvidia-container}/bin/nvidia-container-cli bin
|
||||
cp ${nvidia-container-runtime-hook}/bin/nvidia-container-runtime-hook bin
|
||||
cp ${nvidia-runc}/bin/runc bin/nvidia-container-runtime
|
||||
cp ${nvidia-container-toolkit}/bin/nvidia-container-{toolkit,runtime-hook} bin
|
||||
cp ${nvidia-container-runtime}/bin/nvidia-container-runtime bin
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
|
@ -68,5 +82,6 @@ in stdenv.mkDerivation rec {
|
|||
description = "NVIDIA container runtime for Docker";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with lib.maintainers; [ cpcloud ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ index 30e3cfd..6d12a50 100644
|
|||
if (info->libs == NULL)
|
||||
goto fail;
|
||||
if (ldcache_resolve(&ld, LIB_ARCH, root, libs,
|
||||
- info->libs, info->nlibs, select_libraries, info) < 0)
|
||||
- info->libs, info->nlibs, select_libraries_fn, info) < 0)
|
||||
+ info->libs, info->nlibs, info->nvrm_version) < 0)
|
||||
goto fail;
|
||||
|
||||
|
|
@ -95,7 +95,7 @@ index 30e3cfd..6d12a50 100644
|
|||
if (info->libs32 == NULL)
|
||||
goto fail;
|
||||
if (ldcache_resolve(&ld, LIB32_ARCH, root, libs,
|
||||
- info->libs32, info->nlibs32, select_libraries, info) < 0)
|
||||
- info->libs32, info->nlibs32, select_libraries_fn, info) < 0)
|
||||
+ info->libs32, info->nlibs32, info->nvrm_version) < 0)
|
||||
goto fail;
|
||||
rv = 0;
|
||||
|
|
|
|||
|
|
@ -9,23 +9,23 @@
|
|||
, libtirpc
|
||||
}:
|
||||
let
|
||||
modp-ver = "396.51";
|
||||
modp-ver = "450.57";
|
||||
nvidia-modprobe = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = "nvidia-modprobe";
|
||||
rev = modp-ver;
|
||||
sha256 = "1fw2qwc84k64agw6fx2v0mjf88aggph9c6qhs4cv7l3gmflv8qbk";
|
||||
sha256 = "0r4f6lpbbqqs9932xd2mr7bxn6a3xdalcwq332fc1amrrkgzfyv7";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libnvidia-container";
|
||||
version = "1.0.6";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = "libnvidia-container";
|
||||
rev = "v${version}";
|
||||
sha256 = "1pnpc9knwh8d1zqb28zc3spkjc00w0z10vd3jna8ksvpl35jl7w3";
|
||||
sha256 = "0j6b8z9x9hrrs4xp11zyjjd7kyl7fzcicpiis8k1qb1q2afnqsrq";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -58,7 +58,10 @@ stdenv.mkDerivation rec {
|
|||
mkdir -p deps/src/nvidia-modprobe-${modp-ver}
|
||||
cp -r ${nvidia-modprobe}/* deps/src/nvidia-modprobe-${modp-ver}
|
||||
chmod -R u+w deps/src
|
||||
touch deps/src/nvidia-modprobe-${modp-ver}/.download_stamp
|
||||
pushd deps/src
|
||||
patch -p0 < ${./modprobe.patch}
|
||||
touch nvidia-modprobe-${modp-ver}/.download_stamp
|
||||
popd
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,29 @@
|
|||
diff -ruN nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c
|
||||
--- nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c 2020-07-09 17:06:05.000000000 +0000
|
||||
+++ nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c 2020-08-18 12:43:03.223871514 +0000
|
||||
@@ -840,10 +840,10 @@
|
||||
return mknod_helper(major, minor_num, vgpu_dev_name, NV_PROC_REGISTRY_PATH);
|
||||
}
|
||||
|
||||
-static int nvidia_cap_get_device_file_attrs(const char* cap_file_path,
|
||||
- int *major,
|
||||
- int *minor,
|
||||
- char *name)
|
||||
+int nvidia_cap_get_device_file_attrs(const char* cap_file_path,
|
||||
+ int *major,
|
||||
+ int *minor,
|
||||
+ char *name)
|
||||
{
|
||||
char field[32];
|
||||
FILE *fp;
|
||||
diff -ruN nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h
|
||||
--- nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h 2020-07-09 17:06:05.000000000 +0000
|
||||
+++ nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h 2020-08-18 12:43:44.227745050 +0000
|
||||
@@ -81,6 +81,7 @@
|
||||
int nvidia_nvswitch_get_file_state(int minor);
|
||||
int nvidia_cap_mknod(const char* cap_file_path, int *minor);
|
||||
int nvidia_cap_get_file_state(const char* cap_file_path);
|
||||
+int nvidia_cap_get_device_file_attrs(const char* cap_file_path, int *major, int *minor, char *name);
|
||||
int nvidia_get_chardev_major(const char *name);
|
||||
|
||||
#endif /* NV_LINUX */
|
||||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3";
|
||||
version = "1.16.49"; # N.B: if you change this, change botocore too
|
||||
version = "1.16.50"; # N.B: if you change this, change botocore too
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Tcj3YQmJHZFriUIJhl9Nlo5kqv+kySFH/wJ89NVXrGw=";
|
||||
sha256 = "sha256-TVAqhCuB/axLlQ07iKW5BnzhGCE7Eisg9BkgA8sGeYY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore";
|
||||
version = "1.19.49"; # N.B: if you change this, change boto3 and awscli to a matching version
|
||||
version = "1.19.50"; # N.B: if you change this, change boto3 and awscli to a matching version
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-7sxhHtOG3sjkfKCH9F5lwTN5RsS1szr3EyXvmkmucN0=";
|
||||
sha256 = "sha256-cJCQumG7p9+oMbQ31hy0aahSmNjzzluOEs30G9KyvGE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,33 +1,26 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, pytest, fetchpatch }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "h11";
|
||||
version = "0.9.0";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1qfad70h59hya21vrzz8dqyyaiqhac0anl2dx3s3k80gpskvrm1k";
|
||||
sha256 = "0hk0nll6qazsambp3kl8cxxsbl4gv5y9252qadyk0jky0sv2q8j7";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# pytest5 compatability
|
||||
(fetchpatch {
|
||||
url = "https://github.com/python-hyper/h11/commit/241e220493a511a5f5a5d472cb88d72661a92ab1.patch";
|
||||
sha256 = "1s3ipf9s41m1lksws3xv3j133q7jnjdqvmgk4sfnm8q7li2dww39";
|
||||
})
|
||||
];
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
checkPhase = ''
|
||||
py.test
|
||||
'';
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
# Some of the tests use localhost networking.
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Pure-Python, bring-your-own-I/O implementation of HTTP/1.1";
|
||||
homepage = "https://github.com/python-hyper/h11";
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "openwebifpy";
|
||||
version = "3.1.1";
|
||||
version = "3.2.7";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0zqa74i54ww9qjciiv8s58mxbs6vxq06cq5k4pxfarc0l75l4gh2";
|
||||
sha256 = "0n9vi6b0y8b41fd7m9p361y3qb5m3b9p9d8g4fasqi7yy4mw2hns";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyairvisual";
|
||||
version = "5.0.4";
|
||||
version = "5.0.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0z769xrb6w6bhqcq02sjryl1qyvk9dc1xfn06fc3mdqnrbr0xxj3";
|
||||
sha256 = "0jjvng3py5g97gvx6rdbk5zxbn5rw8gq1ki4qi4vfsypchxbpz2q";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry ];
|
||||
|
|
@ -43,13 +43,15 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"tests"
|
||||
];
|
||||
# Ignore the examples as they are prefixed with test_
|
||||
pytestFlagsArray = [ "--ignore examples/" ];
|
||||
pythonImportsCheck = [ "pyairvisual" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple, clean, well-tested Python library for interacting with AirVisual©";
|
||||
license = licenses.mit;
|
||||
description = "Python library for interacting with AirVisual";
|
||||
homepage = "https://github.com/bachya/pyairvisual";
|
||||
changelog = "https://github.com/bachya/pyairvisual/releases/tag/${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
41
pkgs/development/python-modules/pyarlo/default.nix
Normal file
41
pkgs/development/python-modules/pyarlo/default.nix
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, mock
|
||||
, pytestCheckHook
|
||||
, requests
|
||||
, requests-mock
|
||||
, sseclient-py
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyarlo";
|
||||
version = "0.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tchellomello";
|
||||
repo = "python-arlo";
|
||||
rev = version;
|
||||
sha256 = "0pp7y2llk4xnf6zh57j5xas0gw5zqm42qaqssd8p4qa3g5rds8k3";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
sseclient-py
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
mock
|
||||
requests-mock
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pyarlo" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library to work with Netgear Arlo cameras";
|
||||
homepage = "https://github.com/tchellomello/python-arlo";
|
||||
license = with licenses; [ lgpl3Plus ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,18 +1,17 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, sanic }:
|
||||
{ lib, buildPythonPackage, fetchPypi, sanic, pytestCheckHook }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Sanic-Auth";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b7cb9e93296c035ada0aa1ebfb33f9f7b62f7774c519e374b7fe703ff73589cb";
|
||||
sha256 = "0dc24ynqjraqwgvyk0g9bj87zgpq4xnssl24hnsn7l5vlkmk8198";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ sanic ];
|
||||
|
||||
# all tests fail
|
||||
doCheck = false;
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "sanic_auth" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, click
|
||||
|
|
@ -7,21 +8,26 @@
|
|||
, uvloop
|
||||
, websockets
|
||||
, wsproto
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
, pytest-mock
|
||||
, pyyaml
|
||||
, requests
|
||||
, trustme
|
||||
, typing-extensions
|
||||
, isPy27
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "uvicorn";
|
||||
version = "0.11.5";
|
||||
version = "0.13.2";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "encode";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0cf0vw6kzxwlkvk5gw85wv3kg1kdil0wkq3s7rmxpvrk6gjk8jvq";
|
||||
sha256 = "04zgmp9z46k72ay6cz7plga6d3w3a6x41anabm7ramp7jdqf6na9";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -31,25 +37,33 @@ buildPythonPackage rec {
|
|||
uvloop
|
||||
websockets
|
||||
wsproto
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "h11==0.8.*" "h11" \
|
||||
--replace "httptools==0.0.13" "httptools"
|
||||
'';
|
||||
|
||||
checkInputs = [ pytest requests ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
pytest-mock
|
||||
pyyaml
|
||||
requests
|
||||
trustme
|
||||
];
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
# watchgod required the watchgod package, which isn't available in nixpkgs
|
||||
checkPhase = ''
|
||||
pytest --ignore=tests/supervisors/test_watchgodreload.py \
|
||||
-k 'not test_supported_upgrade_request and not test_invalid_upgrade[WSProtocol]'
|
||||
'';
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
pytestFlagsArray = [
|
||||
# watchgod required the watchgod package, which isn't available in nixpkgs
|
||||
"--ignore=tests/supervisors/test_reload.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_supported_upgrade_request"
|
||||
"test_invalid_upgrade"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.uvicorn.org/";
|
||||
description = "The lightning-fast ASGI server";
|
||||
license = licenses.bsd3;
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "voluptuous";
|
||||
version = "0.12.0";
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1p5j3fgbpqj31fajkaisdrz10ah9667sijz4kp3m0sbgw6ag4kis";
|
||||
sha256 = "0js4avmhmmys78z376xk1w9305hq5nad8zqrnksgmpc1j90p4db6";
|
||||
};
|
||||
|
||||
checkInputs = [ nose ];
|
||||
|
|
|
|||
|
|
@ -24,6 +24,6 @@ buildPythonPackage rec {
|
|||
'';
|
||||
homepage = "https://github.com/ymattw/ydiff";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.limeytexan ];
|
||||
maintainers = teams.deshaw.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,19 +1,27 @@
|
|||
{ lib, buildPythonPackage, fetchPypi
|
||||
, aiohttp, zigpy, conftest, asynctest
|
||||
, pytestCheckHook }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, aiohttp
|
||||
, zigpy
|
||||
, conftest
|
||||
, asynctest
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zha-quirks";
|
||||
version = "0.0.47";
|
||||
version = "0.0.51";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zigpy";
|
||||
repo = "zha-device-handlers";
|
||||
rev = version;
|
||||
sha256 = "14v01kclf096ax88cd6ckfs8gcffqissli9vpr0wfzli08afmbi9";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ aiohttp zigpy ];
|
||||
checkInputs = [ pytestCheckHook conftest asynctest ];
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "bf7dbd5d1c1a3849b059e62afcef248b6955f5ceef78f87201ae2fc8420738de";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "ZHA Device Handlers are custom quirks implementations for Zigpy";
|
||||
homepage = "https://github.com/dmulcahey/zha-device-handlers";
|
||||
|
|
|
|||
|
|
@ -1,20 +1,29 @@
|
|||
{ stdenv, buildPythonPackage, fetchPypi
|
||||
, pyserial, pyserial-asyncio, zigpy
|
||||
, pytest, pytest-asyncio, asynctest }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pyserial
|
||||
, pyserial-asyncio
|
||||
, zigpy
|
||||
, pytestCheckHook
|
||||
, pytest-asyncio
|
||||
, asynctest
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zigpy-deconz";
|
||||
version = "0.11.0";
|
||||
version = "0.11.1";
|
||||
|
||||
propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ];
|
||||
checkInputs = [ pytest pytest-asyncio asynctest ];
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a2263f8bc5807ebac55bb665eca553b514384ce270b66f83df02c39184193020";
|
||||
src = fetchFromGitHub {
|
||||
owner = "zigpy";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1p9mdsfc200iyszppcflazzfwqg4v8nqqwqsx114nip5km7a5s37";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ];
|
||||
checkInputs = [ pytestCheckHook pytest-asyncio asynctest ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library which communicates with Deconz radios for zigpy";
|
||||
homepage = "https://github.com/zigpy/zigpy-deconz";
|
||||
license = licenses.gpl3Plus;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "zigpy-zigate";
|
||||
version = "0.7.3";
|
||||
version = "0.7.4";
|
||||
# https://github.com/Martiusweb/asynctest/issues/152
|
||||
# broken by upstream python bug with asynctest and
|
||||
# is used exclusively by home-assistant with python 3.8
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "zigpy";
|
||||
repo = "zigpy-zigate";
|
||||
rev = version;
|
||||
sha256 = "068v8n8yimmpnwqcdz5m9g35z1x0dir478cbc1s1nyhw1xn50vg1";
|
||||
sha256 = "0xl8qgljvmypi602f52m89iv9pcrzsdal3jw619vrcavp40rc04d";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -45,6 +45,11 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# zigpy-znp was too slow to sync up with the zigpy 0.29 release and has API breakage, remove >0.3.0
|
||||
"test_force_remove"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A library for zigpy which communicates with TI ZNP radios";
|
||||
homepage = "https://github.com/zha-ng/zigpy-znp";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, aiosqlite
|
||||
, asynctest
|
||||
, buildPythonPackage
|
||||
, crccheck
|
||||
|
|
@ -14,17 +15,18 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "zigpy";
|
||||
version = "0.26.0";
|
||||
version = "0.29.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zigpy";
|
||||
repo = "zigpy";
|
||||
rev = version;
|
||||
sha256 = "ba8Ru6RCbFOHhctFtklnrxVD3uEpxF4XDvO5RMgXPBs=";
|
||||
sha256 = "1r4i2ya9f241rls9mi24dksx4srrzi8agshnqy12rclxlh7qb1aw";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
aiosqlite
|
||||
crccheck
|
||||
pycrypto
|
||||
pycryptodome
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gopls";
|
||||
version = "0.5.3";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchgit {
|
||||
rev = "gopls/v${version}";
|
||||
url = "https://go.googlesource.com/tools";
|
||||
sha256 = "04dkrvk5190kyfa9swxpl0m3xq9g90qp8j7yxhi87wyb8giqbll2";
|
||||
sha256 = "0hbfxdsbfz044vw8zp223ni6m7gcwqpff4xpjiqmihhgga5849lf";
|
||||
};
|
||||
|
||||
modRoot = "gopls";
|
||||
vendorSha256 = "0ml8n6qnq9nprn7kv138qy0i2q8qawzd0lhh3v2qw39j0aj5fb7z";
|
||||
vendorSha256 = "0r9bffgi9ainqrl4kraqy71rgwdfcbqmv3srs12h3xvj0w5ya5rz";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
|
|
@ -7,28 +8,28 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "texlab";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "latex-lsp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0iydkbmx9z7xpwaif0han5jvy9xh1afmfyldl7fcyy4r906dsmhx";
|
||||
sha256 = "1hiy8klig7j0if4iqbb0432iqsnds00aya6p4xmm913qfpsyh6cq";
|
||||
};
|
||||
|
||||
cargoSha256 = "0iibjh2ll181j69vld1awvjgyv3xwmq0abh10651la4k4jpppx46";
|
||||
cargoSha256 = "0pf8j202rpglcxamsr8r3wwmgsdgih24m52vh1q85l93vj7jkm1v";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
postInstall = ''
|
||||
installManPage texlab.1
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "An implementation of the Language Server Protocol for LaTeX";
|
||||
homepage = "https://texlab.netlify.com/";
|
||||
homepage = "https://texlab.netlify.app";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ doronbehar metadark ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5,19 +5,19 @@
|
|||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.213.a/linux-hardened-4.14.213.a.patch"
|
||||
},
|
||||
"4.19": {
|
||||
"name": "linux-hardened-4.19.164.a.patch",
|
||||
"sha256": "0fzv2sjmf0dmhzp58yr4ggzi3pxbjjhbhmav46pv98rbdm2vjwvk",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.164.a/linux-hardened-4.19.164.a.patch"
|
||||
"name": "linux-hardened-4.19.165.a.patch",
|
||||
"sha256": "06v34jaj4jg6f3v05wbkkfnr69ahxqyyq0gam4ma3wgm74x6cf3s",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.165.a/linux-hardened-4.19.165.a.patch"
|
||||
},
|
||||
"5.10": {
|
||||
"name": "linux-hardened-5.10.4.a.patch",
|
||||
"sha256": "0apnmcis41vz5k74g1ssq0apwxzhl6zg31nyjbplilm3b068a1h4",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.4.a/linux-hardened-5.10.4.a.patch"
|
||||
"name": "linux-hardened-5.10.5.a.patch",
|
||||
"sha256": "1fq2n60brhi6wjazkdgj2aqc4maskvlymbznl03hvj0x5kahjxvx",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.5.a/linux-hardened-5.10.5.a.patch"
|
||||
},
|
||||
"5.4": {
|
||||
"name": "linux-hardened-5.4.86.a.patch",
|
||||
"sha256": "0j1wr6d42rbxd66vhsp9l3lp3nv0p1j0cpir9pxshd8w9zlbdy88",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.86.a/linux-hardened-5.4.86.a.patch"
|
||||
"name": "linux-hardened-5.4.87.a.patch",
|
||||
"sha256": "01hpww6lm00iry8z4z86hh86x66h3xbmxknxhmmhh2zwz6ahkmfd",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.87.a/linux-hardened-5.4.87.a.patch"
|
||||
},
|
||||
"5.9": {
|
||||
"name": "linux-hardened-5.9.16.a.patch",
|
||||
|
|
|
|||
|
|
@ -176,11 +176,6 @@ let
|
|||
maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin mic92 ];
|
||||
};
|
||||
};
|
||||
|
||||
linux-rt-patch = fetchpatch {
|
||||
url = "https://github.com/openzfs/zfs/commit/ab4fb9b74e9d089fc9a261c4f41e19697ad6a4ca.patch";
|
||||
sha256 = "1nrxmb4rhrkgncav6dzwm66l0700fi72qkkcs0w6pkm850srws36";
|
||||
};
|
||||
in {
|
||||
# also check if kernel version constraints in
|
||||
# ./nixos/modules/tasks/filesystems/zfs.nix needs
|
||||
|
|
@ -190,11 +185,11 @@ in {
|
|||
# incompatibleKernelVersion = "4.20";
|
||||
|
||||
# this package should point to the latest release.
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
sha256 = "1kriz6pg8wj98izvjc60wp23lgcp4k3mzhpkgj74np73rzgy6v8r";
|
||||
sha256 = "0wmw823ildwm9rcfyk22pvzg100yhps3y9hfjlrpspfd1hhkbp0d";
|
||||
|
||||
extraPatches = [ linux-rt-patch ];
|
||||
extraPatches = [ ];
|
||||
};
|
||||
|
||||
zfsUnstable = common {
|
||||
|
|
@ -202,10 +197,10 @@ in {
|
|||
# incompatibleKernelVersion = "4.19";
|
||||
|
||||
# this package should point to a version / git revision compatible with the latest kernel release
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
sha256 = "1kriz6pg8wj98izvjc60wp23lgcp4k3mzhpkgj74np73rzgy6v8r";
|
||||
sha256 = "0wmw823ildwm9rcfyk22pvzg100yhps3y9hfjlrpspfd1hhkbp0d";
|
||||
|
||||
extraPatches = [ linux-rt-patch ];
|
||||
extraPatches = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub, makeWrapper, runCommand
|
||||
{ stdenv, fetchFromGitHub, buildGoModule, makeWrapper, runCommand
|
||||
, moreutils, jq, git, zip, rsync, pkgconfig, yarn, python2
|
||||
, nodejs-12_x, libsecret, xorg, ripgrep, nettools }:
|
||||
|
||||
|
|
@ -12,17 +12,31 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "code-server";
|
||||
version = "3.4.1";
|
||||
commit = "d3773c11f147bdd7a4f5acfefdee23c26f069e76";
|
||||
version = "3.6.0";
|
||||
commit = "a4a03c14922ccaec2a9ff8d1b7b2af8522a4214d";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cdr";
|
||||
repo = "code-server";
|
||||
rev = version;
|
||||
sha256 = "PfDD0waloppGZ09zCQ9ggBeVL/Dhfv6QmEs/fs7QLtA=";
|
||||
rev = "v${version}";
|
||||
sha256 = "1c0p1s0bl3az5ysl97mz3gbynyndz6jd2jj7lx2snz6jqqd43y9p";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cloudAgent = buildGoModule rec {
|
||||
pname = "cloud-agent";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cdr";
|
||||
repo = "cloud-agent";
|
||||
rev = version;
|
||||
sha256 = "1p20cvgvs38604km9ixylz0r3k7blkd80lncmma3z05y5n5fqps1";
|
||||
};
|
||||
|
||||
vendorSha256 = "0yky1v1ak3ysykjf3gm1hd7qyj5rm4fw7amga81sb31x0357jlzr";
|
||||
};
|
||||
|
||||
yarnCache = stdenv.mkDerivation {
|
||||
name = "${pname}-${version}-${system}-yarn-cache";
|
||||
inherit src;
|
||||
|
|
@ -45,10 +59,10 @@ in stdenv.mkDerivation rec {
|
|||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
|
||||
# to get hash values use nix-build -A code-server.yarnPrefetchCache
|
||||
# to get hash values use nix-build -A code-server.prefetchYarnCache
|
||||
outputHash = {
|
||||
x86_64-linux = "Zze2hEm2Np+SyQ0KXy5CZr5wilZbHBYXNYcRJBUUkQo=";
|
||||
aarch64-linux = "LiIvGuBismWSL2yV2DuKUWDjIzuIQU/VVxtiD4xJ+6Q=";
|
||||
x86_64-linux = "1443qwkllb714s4qw3b9y1mcc6p2ykgc02pw2k3z2gczvvr0g8qv";
|
||||
aarch64-linux = "1443qwkllb714s4qw3b9y1mcc6p2ykgc02pw2k3z2gczvvr0g8qv";
|
||||
}.${system} or (throw "Unsupported system ${system}");
|
||||
};
|
||||
|
||||
|
|
@ -64,7 +78,7 @@ in stdenv.mkDerivation rec {
|
|||
];
|
||||
buildInputs = [ libsecret xorg.libX11 xorg.libxkbfile ];
|
||||
|
||||
patchPhase = ''
|
||||
postPatch = ''
|
||||
export HOME=$PWD
|
||||
|
||||
patchShebangs ./ci
|
||||
|
|
@ -76,6 +90,21 @@ in stdenv.mkDerivation rec {
|
|||
substituteInPlace lib/vscode/build/npm/postinstall.js \
|
||||
--replace '--ignore-optional' '--offline'
|
||||
|
||||
# remove unnecessary git config command
|
||||
substituteInPlace lib/vscode/build/npm/postinstall.js \
|
||||
--replace "cp.execSync('git config pull.rebase true');" ""
|
||||
|
||||
# allow offline install for postinstall scripts in extensions
|
||||
grep -rl "yarn install" --include package.json lib/vscode/extensions \
|
||||
| xargs sed -i 's/yarn install/yarn install --offline/g'
|
||||
|
||||
# remove download of coder-cloud agent
|
||||
sed -i ':a;N;$!ba;s/OS=.*agent//' ci/build/npm-postinstall.sh
|
||||
|
||||
# use offline cache when installing release packages
|
||||
substituteInPlace ci/build/npm-postinstall.sh \
|
||||
--replace 'yarn --production' 'yarn --production --offline'
|
||||
|
||||
# fix path to ifconfig, so vscode can get mac address
|
||||
substituteInPlace lib/vscode/src/vs/base/node/macAddress.ts \
|
||||
--replace '/sbin/ifconfig' '${nettools}/bin/ifconfig'
|
||||
|
|
@ -111,8 +140,14 @@ in stdenv.mkDerivation rec {
|
|||
# set nodedir, so we can build binaries later
|
||||
npm config set nodedir "${nodeSources}"
|
||||
|
||||
# link coder-cloud agent from nix store
|
||||
ln -s "${cloudAgent}/bin/cloud-agent" ./lib/coder-cloud-agent
|
||||
|
||||
# skip browser downloads for playwright
|
||||
export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD="true"
|
||||
|
||||
# skip unnecessary electron download
|
||||
export ELECTRON_SKIP_BINARY_DOWNLOAD=1
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
|
|
@ -162,6 +197,9 @@ in stdenv.mkDerivation rec {
|
|||
# install only production dependencies
|
||||
yarn --offline --cwd "$out/libexec/code-server" --production
|
||||
|
||||
# link coder-cloud agent from nix store
|
||||
ln -s "${cloudAgent}/bin/cloud-agent" $out/libexec/code-server/lib/coder-cloud-agent
|
||||
|
||||
# create wrapper
|
||||
makeWrapper "${nodejs-12_x}/bin/node" "$out/bin/code-server" \
|
||||
--add-flags "$out/libexec/code-server/out/node/entry.js"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2020.12.2";
|
||||
version = "2021.1.0";
|
||||
components = {
|
||||
"abode" = ps: with ps; [ abodepy ];
|
||||
"accuweather" = ps: with ps; [ accuweather ];
|
||||
|
|
@ -45,7 +45,7 @@
|
|||
"arcam_fmj" = ps: with ps; [ ]; # missing inputs: arcam-fmj
|
||||
"arduino" = ps: with ps; [ ]; # missing inputs: PyMata
|
||||
"arest" = ps: with ps; [ ];
|
||||
"arlo" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: pyarlo
|
||||
"arlo" = ps: with ps; [ ha-ffmpeg pyarlo ];
|
||||
"arris_tg2492lg" = ps: with ps; [ ]; # missing inputs: arris-tg2492lg
|
||||
"aruba" = ps: with ps; [ pexpect ];
|
||||
"arwn" = ps: with ps; [ aiohttp-cors paho-mqtt ];
|
||||
|
|
@ -60,9 +60,8 @@
|
|||
"aurora_abb_powerone" = ps: with ps; [ ]; # missing inputs: aurorapy
|
||||
"auth" = ps: with ps; [ aiohttp-cors ];
|
||||
"automation" = ps: with ps; [ aiohttp-cors ];
|
||||
"avea" = ps: with ps; [ ]; # missing inputs: avea
|
||||
"avea" = ps: with ps; [ avea ];
|
||||
"avion" = ps: with ps; [ ]; # missing inputs: avion
|
||||
"avri" = ps: with ps; [ pycountry ]; # missing inputs: avri-api
|
||||
"awair" = ps: with ps; [ ]; # missing inputs: python_awair
|
||||
"aws" = ps: with ps; [ aiobotocore ];
|
||||
"axis" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: axis
|
||||
|
|
@ -528,7 +527,7 @@
|
|||
"nad" = ps: with ps; [ ]; # missing inputs: nad_receiver
|
||||
"namecheapdns" = ps: with ps; [ defusedxml ];
|
||||
"nanoleaf" = ps: with ps; [ pynanoleaf ];
|
||||
"neato" = ps: with ps; [ pybotvac ];
|
||||
"neato" = ps: with ps; [ aiohttp-cors pybotvac ];
|
||||
"nederlandse_spoorwegen" = ps: with ps; [ ]; # missing inputs: nsapi
|
||||
"nello" = ps: with ps; [ ]; # missing inputs: pynello
|
||||
"ness_alarm" = ps: with ps; [ ]; # missing inputs: nessclient
|
||||
|
|
@ -624,7 +623,7 @@
|
|||
"plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos ];
|
||||
"plugwise" = ps: with ps; [ ]; # missing inputs: plugwise
|
||||
"plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad
|
||||
"pocketcasts" = ps: with ps; [ ]; # missing inputs: pocketcasts
|
||||
"pocketcasts" = ps: with ps; [ ]; # missing inputs: pycketcasts
|
||||
"point" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pypoint
|
||||
"poolsense" = ps: with ps; [ ]; # missing inputs: poolsense
|
||||
"powerwall" = ps: with ps; [ ]; # missing inputs: tesla-powerwall
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ let
|
|||
extraBuildInputs = extraPackages py.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2020.12.2";
|
||||
hassVersion = "2021.1.0";
|
||||
|
||||
in with py.pkgs; buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
|
|
@ -71,6 +71,9 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
# check REQUIRED_PYTHON_VER in homeassistant/const.py
|
||||
disabled = pythonOlder "3.7.1";
|
||||
|
||||
# don't try and fail to strip 6600+ python files, it takes minutes!
|
||||
dontStrip = true;
|
||||
|
||||
inherit availableComponents;
|
||||
|
||||
# PyPI tarball is missing tests/ directory
|
||||
|
|
@ -78,7 +81,7 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = version;
|
||||
sha256 = "1hd3z0bvscrg0ihy26djm1x9cj1pkdbnsgpzhdy42j8vy80q9bxr";
|
||||
sha256 = "14njb2j16h536xq5df4zpna874fxjcd6fqr881y6mq081f00i0r0";
|
||||
};
|
||||
|
||||
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||
|
|
@ -176,6 +179,11 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
"test_cached_event_message"
|
||||
# ValueError: count must be a positive integer (got 0)
|
||||
"test_media_view"
|
||||
# AssertionError: len(events) == 1
|
||||
"test_error_posted_as_event"
|
||||
# keyring.errors.NoKeyringError: No recommended backend was available.
|
||||
"test_secrets_from_unrelated_fails"
|
||||
"test_secrets_credstash"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
|
|
|
|||
|
|
@ -4,13 +4,16 @@ 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 = "20201212.0";
|
||||
version = "20201229.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1nz5f7bpj0xs740af8i6j33idff6yzx7z9vydlah2sxcdgpwmz84";
|
||||
sha256 = "sha256-3JMWugAiVDq/NBgX8ft2Bchim2g493jy7wZvvXrX+Ws=";
|
||||
};
|
||||
|
||||
# there is nothing to strip in this package
|
||||
dontStrip = true;
|
||||
|
||||
# no Python tests implemented
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -31,4 +31,4 @@ sed -i -e "s/hassVersion =.*/hassVersion = \"${TARGET_VERSION}\";/" \
|
|||
)
|
||||
|
||||
git add ./component-packages.nix ./default.nix ./frontend.nix
|
||||
git commit -m "homeassistant: ${CURRENT_VERSION} -> ${TARGET_VERSION}"
|
||||
git commit -m "home-assistant: ${CURRENT_VERSION} -> ${TARGET_VERSION}"
|
||||
|
|
|
|||
|
|
@ -52,6 +52,6 @@ pythonPackages.buildPythonApplication rec {
|
|||
description = "A Template for PostgreSQL HA with ZooKeeper, etcd or Consul";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.limeytexan ];
|
||||
maintainers = teams.deshaw.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,11 +28,11 @@ let
|
|||
|
||||
in with py.pkgs; buildPythonApplication rec {
|
||||
pname = "awscli";
|
||||
version = "1.18.209"; # N.B: if you change this, change botocore to a matching version too
|
||||
version = "1.18.210"; # N.B: if you change this, change botocore to a matching version too
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Le+vjLdXquZiFPuO9v73vm1/iFDaRCNDjXX719AtAxE=";
|
||||
sha256 = "sha256-kt12Dc58UpsdlMen3IeTvRzcZ0HnwArs2q3ojqUBEPw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -27591,6 +27591,8 @@ in
|
|||
|
||||
csxcad = callPackage ../applications/science/electronics/csxcad { };
|
||||
|
||||
diylc = callPackage ../applications/science/electronics/diylc { };
|
||||
|
||||
flatcam = callPackage ../applications/science/electronics/flatcam { };
|
||||
|
||||
fparser = callPackage ../applications/science/electronics/fparser { };
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
# cpan2nix assumes that perl-packages.nix will be used only with perl 5.30.3 or above
|
||||
assert stdenv.lib.versionAtLeast perl.version "5.30.3";
|
||||
let
|
||||
inherit (stdenv.lib) maintainers;
|
||||
inherit (stdenv.lib) maintainers teams;
|
||||
self = _self // (overrides pkgs);
|
||||
_self = with self; {
|
||||
|
||||
|
|
@ -1395,7 +1395,7 @@ let
|
|||
sha256 = "0g8c7825ng2m0yz5sy6838rvfdl8j3vm29524wjgf66ccfhgn74x";
|
||||
};
|
||||
meta = {
|
||||
maintainers = [ maintainers.limeytexan ];
|
||||
maintainers = teams.deshaw.members;
|
||||
description = "BSD process resource limit and priority functions";
|
||||
license = stdenv.lib.licenses.artistic2;
|
||||
};
|
||||
|
|
@ -2798,7 +2798,7 @@ let
|
|||
meta = {
|
||||
description = "Base class for hierarchally ordered objects";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
maintainers = [ maintainers.limeytexan ];
|
||||
maintainers = teams.deshaw.members;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -3407,7 +3407,7 @@ let
|
|||
meta = {
|
||||
description = "A module for reading .ini-style configuration files";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
maintainers = [ maintainers.limeytexan ];
|
||||
maintainers = teams.deshaw.members;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -7845,7 +7845,7 @@ let
|
|||
sha256 = "05p9m7kpmjv8bmmbs5chb5fqyshcgmskbbzq5c9qpskbx2w5894n";
|
||||
};
|
||||
meta = {
|
||||
maintainers = [ maintainers.limeytexan ];
|
||||
maintainers = teams.deshaw.members;
|
||||
description = "simple filename and pathname matching";
|
||||
license = stdenv.lib.licenses.free; # Same as Perl
|
||||
};
|
||||
|
|
@ -7860,7 +7860,7 @@ let
|
|||
};
|
||||
meta = {
|
||||
description = "Find matches to a pattern in a series of files and related functions";
|
||||
maintainers = [ maintainers.limeytexan ];
|
||||
maintainers = teams.deshaw.members;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -8064,7 +8064,7 @@ let
|
|||
meta = {
|
||||
license = stdenv.lib.licenses.free; # Same as Perl
|
||||
description = "Pid File Manipulation";
|
||||
maintainers = [ maintainers.limeytexan ];
|
||||
maintainers = teams.deshaw.members;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -8237,7 +8237,7 @@ let
|
|||
meta = {
|
||||
description = "Perl extension for reading from continously updated files";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
maintainers = [ maintainers.limeytexan ];
|
||||
maintainers = teams.deshaw.members;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -8252,7 +8252,7 @@ let
|
|||
homepage = "https://github.com/neilb/File-Touch";
|
||||
description = "Update file access and modification times, optionally creating files if needed";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
maintainers = [ maintainers.limeytexan ];
|
||||
maintainers = teams.deshaw.members;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -8633,7 +8633,7 @@ let
|
|||
};
|
||||
propagatedBuildInputs = [ Error ];
|
||||
meta = {
|
||||
maintainers = [ maintainers.limeytexan ];
|
||||
maintainers = teams.deshaw.members;
|
||||
description = "This is the Git.pm, plus the other files in the perl/Git directory, from github's git/git";
|
||||
license = stdenv.lib.licenses.free;
|
||||
};
|
||||
|
|
@ -8945,7 +8945,7 @@ let
|
|||
};
|
||||
propagatedBuildInputs = [ pkgs.krb5Full.dev ];
|
||||
meta = {
|
||||
maintainers = [ maintainers.limeytexan ];
|
||||
maintainers = teams.deshaw.members;
|
||||
description = "Perl extension providing access to the GSSAPIv2 library";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
};
|
||||
|
|
@ -11162,7 +11162,7 @@ let
|
|||
buildInputs = [ pkgs.acl ];
|
||||
NIX_CFLAGS_LINK = "-L${pkgs.acl.out}/lib -lacl";
|
||||
meta = {
|
||||
maintainers = [ maintainers.limeytexan ];
|
||||
maintainers = teams.deshaw.members;
|
||||
description = "Perl extension for reading and setting Access Control Lists for files by libacl linux library";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
};
|
||||
|
|
@ -12056,7 +12056,7 @@ let
|
|||
perl -I blib/lib -MMail::Sendmail -e 'print "1..1\nok 1\n"'
|
||||
'';
|
||||
meta = {
|
||||
maintainers = [ maintainers.limeytexan ];
|
||||
maintainers = teams.deshaw.members;
|
||||
description = "Simple platform independent mailer";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
};
|
||||
|
|
@ -15839,7 +15839,7 @@ let
|
|||
rm t/45_class.t
|
||||
'';
|
||||
meta = {
|
||||
maintainers = with maintainers; [ limeytexan ztzg ];
|
||||
maintainers = teams.deshaw.members ++ [ maintainers.ztzg ];
|
||||
homepage = "https://github.com/mark-5/p5-net-zookeeper";
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
};
|
||||
|
|
@ -16048,7 +16048,7 @@ let
|
|||
meta = {
|
||||
description = "General function library for safer, more secure programming";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
maintainers = [ maintainers.limeytexan ];
|
||||
maintainers = teams.deshaw.members;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -16143,7 +16143,7 @@ let
|
|||
meta = {
|
||||
description = "Parser/Generator of human-readable conf files";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
maintainers = [ maintainers.limeytexan ];
|
||||
maintainers = teams.deshaw.members;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -16552,7 +16552,7 @@ let
|
|||
homepage = "http://ldap.perl.org/";
|
||||
description = "LDAP client library";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
maintainers = [ maintainers.limeytexan ];
|
||||
maintainers = teams.deshaw.members;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -16606,7 +16606,7 @@ let
|
|||
meta = {
|
||||
description = "Pure-Perl Core-Only replacement for pkg-config";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
maintainers = [ maintainers.limeytexan ];
|
||||
maintainers = teams.deshaw.members;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -16822,7 +16822,7 @@ let
|
|||
# not present (see below).
|
||||
propagatedBuildInputs = [ pkgs.cacert IOPipely IOTty POETestLoops ];
|
||||
meta = {
|
||||
maintainers = [ maintainers.limeytexan ];
|
||||
maintainers = teams.deshaw.members;
|
||||
description = "Portable multitasking and networking framework for any event loop";
|
||||
license = stdenv.lib.licenses.artistic2;
|
||||
};
|
||||
|
|
@ -16852,7 +16852,7 @@ let
|
|||
sha256 = "0yx4wsljfmdzsiv0ni98x6lw975cm82ahngbwqvzv60wx5pwkl5y";
|
||||
};
|
||||
meta = {
|
||||
maintainers = [ maintainers.limeytexan ];
|
||||
maintainers = teams.deshaw.members;
|
||||
description = "Reusable tests for POE::Loop authors";
|
||||
license = stdenv.lib.licenses.artistic2;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5024,6 +5024,8 @@ in {
|
|||
|
||||
pyannotate = callPackage ../development/python-modules/pyannotate { };
|
||||
|
||||
pyarlo = callPackage ../development/python-modules/pyarlo { };
|
||||
|
||||
pyarrow = callPackage ../development/python-modules/pyarrow { inherit (pkgs) arrow-cpp cmake pkgconfig; };
|
||||
|
||||
pyasn1 = callPackage ../development/python-modules/pyasn1 { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue