Merge master into staging-next
This commit is contained in:
commit
0663fa735f
@ -88,6 +88,13 @@ in
|
||||
example = "/run/redis/redis.sock";
|
||||
};
|
||||
|
||||
unixSocketPerm = mkOption {
|
||||
type = types.int;
|
||||
default = 750;
|
||||
description = "Change permissions for the socket";
|
||||
example = 700;
|
||||
};
|
||||
|
||||
logLevel = mkOption {
|
||||
type = types.str;
|
||||
default = "notice"; # debug, verbose, notice, warning
|
||||
@ -204,7 +211,6 @@ in
|
||||
'';
|
||||
example = literalExample ''
|
||||
{
|
||||
unixsocketperm = "700";
|
||||
loadmodule = [ "/path/to/my_module.so" "/path/to/other_module.so" ];
|
||||
}
|
||||
'';
|
||||
@ -256,7 +262,7 @@ in
|
||||
slowlog-max-len = cfg.slowLogMaxLen;
|
||||
}
|
||||
(mkIf (cfg.bind != null) { bind = cfg.bind; })
|
||||
(mkIf (cfg.unixSocket != null) { unixsocket = cfg.unixSocket; })
|
||||
(mkIf (cfg.unixSocket != null) { unixsocket = cfg.unixSocket; unixsocketperm = "${toString cfg.unixSocketPerm}"; })
|
||||
(mkIf (cfg.slaveOf != null) { slaveof = "${cfg.slaveOf.ip} ${cfg.slaveOf.port}"; })
|
||||
(mkIf (cfg.masterAuth != null) { masterauth = cfg.masterAuth; })
|
||||
(mkIf (cfg.requirePass != null) { requirepass = cfg.requirePass; })
|
||||
@ -277,11 +283,18 @@ in
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "${cfg.package}/bin/redis-server /run/redis/redis.conf";
|
||||
RuntimeDirectory = "redis";
|
||||
StateDirectory = "redis";
|
||||
Type = "notify";
|
||||
# User and group
|
||||
User = "redis";
|
||||
Group = "redis";
|
||||
# Runtime directory and mode
|
||||
RuntimeDirectory = "redis";
|
||||
RuntimeDirectoryMode = "0750";
|
||||
# State directory and mode
|
||||
StateDirectory = "redis";
|
||||
StateDirectoryMode = "0700";
|
||||
# Access write directories
|
||||
UMask = "0077";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
@ -17,7 +17,7 @@ in
|
||||
services.redis.unixSocket = redisSocket;
|
||||
|
||||
# Allow access to the unix socket for the "redis" group.
|
||||
services.redis.settings.unixsocketperm = "770";
|
||||
services.redis.unixSocketPerm = 770;
|
||||
|
||||
users.users."member" = {
|
||||
createHome = false;
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bschaffl";
|
||||
version = "1.4.4";
|
||||
version = "1.4.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sjaehn";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-tu5JL0vcqRsZYmoaYGYm/aj95i7wLtnKYGbEPD7AsoM=";
|
||||
sha256 = "sha256-tD4LsIXb2II+TNEfzXBviMR2fq/FtCSsaL2YGun1vu0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
@ -19,13 +19,13 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "udiskie";
|
||||
version = "2.3.2";
|
||||
version = "2.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coldfix";
|
||||
repo = "udiskie";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-eucAFMzLf2RfMfVgFTfPAgVNpDADddvTUZQO/XbBhGo=";
|
||||
hash = "sha256-OeNAcL7jd8GiPVUGxWwX4N/G/jzxfyifaoSD/hXXwyM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -58,8 +58,8 @@ buildPythonApplication rec {
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
nose
|
||||
keyutils
|
||||
nose
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
|
@ -19,16 +19,16 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "argo";
|
||||
version = "2.12.10";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argoproj";
|
||||
repo = "argo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-A4s6D3/1FsqrJ+Jaql4IuyD9ySChL3SXqVvl8wUDRDE=";
|
||||
sha256 = "sha256-TbNqwTVND09WzUH8ZH7YFRwcHV8eX1G0FXtZJi67Sk4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-4XPMixVNj6PUKobNLwpsOBT7Zs/7pkhDtQacLIB5EfE=";
|
||||
vendorSha256 = "sha256-YjVAoMyGKMHLGEPeOOkCKCzeWFiUsXfJIKcw5GYoljg=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
@ -7,7 +7,7 @@ assert enablePython -> pythonPackages != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "librealsense";
|
||||
version = "2.42.0";
|
||||
version = "2.43.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "IntelRealSense";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8r8j0g7EaSUWujX+BNdkIJhzaLITMLsozjhOtQBriTA=";
|
||||
sha256 = "sha256-N7EvpcJjtK3INHK7PgoiEVIMq9zGcHKMeI+/dwZ3bNs=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
37
pkgs/development/python-modules/aiohttp-wsgi/default.nix
Normal file
37
pkgs/development/python-modules/aiohttp-wsgi/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ lib
|
||||
, aiohttp
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohttp-wsgi";
|
||||
version = "0.8.2";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "etianen";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0wirn3xqxxgkpy5spicd7p1bkdnsrch61x2kcpdwpixmx961pq7x";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "aiohttp_wsgi" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "WSGI adapter for aiohttp";
|
||||
homepage = "https://github.com/etianen/aiohttp-wsgi";
|
||||
license = with licenses; [ bsd3 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
77
pkgs/development/python-modules/homematicip/default.nix
Normal file
77
pkgs/development/python-modules/homematicip/default.nix
Normal file
@ -0,0 +1,77 @@
|
||||
{ lib
|
||||
, aenum
|
||||
, aiohttp
|
||||
, aiohttp-wsgi
|
||||
, async-timeout
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pytest-aiohttp
|
||||
, pytest-asyncio
|
||||
, requests
|
||||
, websocket_client
|
||||
, websockets
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "homematicip";
|
||||
version = "1.0.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coreGreenberet";
|
||||
repo = "homematicip-rest-api";
|
||||
rev = version;
|
||||
sha256 = "0bgvrjcf10kiqqkbl56sxx3jydd722b08q2j9c8sxpk0qdrmrinv";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aenum
|
||||
aiohttp
|
||||
async-timeout
|
||||
requests
|
||||
websocket_client
|
||||
websockets
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
aiohttp-wsgi
|
||||
pytest-aiohttp
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Assert issues with datetime
|
||||
"test_contact_interface_device"
|
||||
"test_dimmer"
|
||||
"test_heating_failure_alert_group"
|
||||
"test_heating"
|
||||
"test_humidity_warning_rule_group"
|
||||
"test_meta_group"
|
||||
"test_pluggable_switch_measuring"
|
||||
"test_rotary_handle_sensor"
|
||||
"test_security_group"
|
||||
"test_shutter_device"
|
||||
"test_smoke_detector"
|
||||
"test_switching_group"
|
||||
"test_temperature_humidity_sensor_outdoor"
|
||||
"test_wall_mounted_thermostat_pro"
|
||||
"test_weather_sensor"
|
||||
# Random failures
|
||||
"test_home_getSecurityJournal"
|
||||
"test_home_unknown_types"
|
||||
# Requires network access
|
||||
"test_websocket"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "homematicip" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module for the homematicIP REST API";
|
||||
homepage = "https://github.com/coreGreenberet/homematicip-rest-api";
|
||||
license = with licenses; [ gpl3Only ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
@ -8,11 +8,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "manhole";
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d4ab98198481ed54a5b95c0439f41131f56d7d3755eedaedce5a45ca7ff4aa42";
|
||||
sha256 = "224985bf1dd032f2dc0ca4107f727835b6f50e1df6d78781d6c9f4cae8b585e2";
|
||||
};
|
||||
|
||||
# test_help expects architecture-dependent Linux signal numbers.
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "async-profiler";
|
||||
version = "1.8.4";
|
||||
version = "1.8.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jvm-profiling-tools";
|
||||
repo = "async-profiler";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-R/TFElytq3mBG+jKjb7XlFUqpXBpSZGfbscUdg2vevE=";
|
||||
sha256 = "sha256-vSBueRNraMgLcaprPsBUriX3WZ7N0UrllnSVLL2F738=";
|
||||
};
|
||||
|
||||
buildInputs = [ jdk8 ];
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bazel-kazel";
|
||||
version = "0.2.1";
|
||||
version = "0.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes";
|
||||
repo = "repo-infra";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-g7jfuWe4UeAbNf+kOa0Y9BamUnGEbOGxZ+KdQWdWl48=";
|
||||
sha256 = "sha256-EfK8uJQvZkB5V/SGOLRznAFGsgVGwFv6MWkLPWePYvM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-1+7Mx1Zh1WolqTpWNe560PRzRYaWVUVLvNvUOysaW5I=";
|
||||
|
@ -16,13 +16,13 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "osu-lazer";
|
||||
version = "2021.323.0";
|
||||
version = "2021.331.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ppy";
|
||||
repo = "osu";
|
||||
rev = version;
|
||||
sha256 = "zoJGCsnjvXzPxGy85YsP+WbaN7p8EwcTqiCEX/czMR8=";
|
||||
sha256 = "dCKBxVDBBhJ7LEawmMOU7PKh0yxmDgVw6PL2F0qA5RU=";
|
||||
};
|
||||
|
||||
patches = [ ./bypass-tamper-detection.patch ];
|
||||
|
170
pkgs/games/osu-lazer/deps.nix
generated
170
pkgs/games/osu-lazer/deps.nix
generated
@ -6,8 +6,8 @@
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "DiffPlex";
|
||||
version = "1.6.3";
|
||||
sha256 = "0yi72afddddz0s8phx855rnjrga7n51bcma10dc91l0ffcwf5xwz";
|
||||
version = "1.7.0";
|
||||
sha256 = "09a8hkbx99iwikfl8war629945yv7i8llj9480dbc4kyp6qqlr00";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "DiscordRichPresence";
|
||||
@ -301,79 +301,59 @@
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.AspNetCore.Connections.Abstractions";
|
||||
version = "5.0.2";
|
||||
sha256 = "0qy4wamhcpxi9aqwq9kivhsj4rvhbch2wfwv11610psygb5457vk";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.AspNetCore.Connections.Abstractions";
|
||||
version = "5.0.3";
|
||||
sha256 = "1p4vzsx4q1lx93m2v1iy2z1i2dg2q5s2f6gznw5afbn5rqqqbsff";
|
||||
version = "5.0.4";
|
||||
sha256 = "002a3cvarwvvyic65khwavjxqsqjlnbgqc11sdyj3li15fxflk5g";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.AspNetCore.Http.Connections.Client";
|
||||
version = "5.0.2";
|
||||
sha256 = "0295a87ilrdg43sil5wli74x7jy4apibqdk1fxam8kzj99whl5sk";
|
||||
version = "5.0.4";
|
||||
sha256 = "1s19hx083c0r98wi6a8gqb3j3xjlrp9rkmvbpdxikzw8z4bnrjpn";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.AspNetCore.Http.Connections.Common";
|
||||
version = "5.0.2";
|
||||
sha256 = "094zjf6h5dh87kznmmz7w4s1y37rw52vaz2h4jk4i4ik7hpijd0w";
|
||||
version = "5.0.4";
|
||||
sha256 = "132ahfq7m369iss4ka402fj24rjdnhia41b94l3l135zplzlsl5n";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.AspNetCore.Http.Features";
|
||||
version = "5.0.2";
|
||||
sha256 = "1rprpj1aw9z501rpb9415maqcqnk6pirbdl8yv5n9wpqgcnjizk8";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.AspNetCore.Http.Features";
|
||||
version = "5.0.3";
|
||||
sha256 = "0c6c5wpwkprf7a7mp1h10bvi2gg94lkpr3lznzpry3zjb5g7mk84";
|
||||
version = "5.0.4";
|
||||
sha256 = "064n12ydyngh5q3y597x5cmciib74mpnhkvxicqp0kmgqsixkc7b";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.AspNetCore.SignalR.Client";
|
||||
version = "5.0.2";
|
||||
sha256 = "18pdw4h1j93wzcvlj87jy7n5sxkwlj69nnb7a2qxkc40jvm18ran";
|
||||
version = "5.0.4";
|
||||
sha256 = "0rpafasicnqng7ylx29hyslwp6g2j1l92szs0n9j98siscap17qg";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.AspNetCore.SignalR.Client.Core";
|
||||
version = "5.0.2";
|
||||
sha256 = "1rg3cpqr3yx5hn233c6cmmiry5v49fglfii7ryi1cf6rwqpdqn5l";
|
||||
version = "5.0.4";
|
||||
sha256 = "1fwy2akhgphx72hc3rlax08aiaabvm9fi6jfj2r1dyzb2plcgig3";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.AspNetCore.SignalR.Common";
|
||||
version = "5.0.2";
|
||||
sha256 = "1sbwp00hq0ng891wdj6yhah8hr9hw34zvqr1xzs86g3gpmssgcj5";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.AspNetCore.SignalR.Common";
|
||||
version = "5.0.3";
|
||||
sha256 = "1g19vkc3g76r2fpjy7c1fkbvbihk9pfmx4wfsgpjflvydmvhqf9m";
|
||||
version = "5.0.4";
|
||||
sha256 = "1dy00sf695sz842rlvgbyj2krgiqprx8qcdci8lz388rwp17drk2";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.AspNetCore.SignalR.Protocols.Json";
|
||||
version = "5.0.2";
|
||||
sha256 = "0p9kv2iayhz8y68r30mhzssv0m087v243ai7aax7jd44rqiv1w5i";
|
||||
version = "5.0.4";
|
||||
sha256 = "0xp6ihjq835iqiiaxjl501pfplkqhd40kqxkazfj1icryls8hzhq";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack";
|
||||
version = "5.0.3";
|
||||
sha256 = "0wf53knadwxyww85wc6m82paj0wdgsq4kbg7a3v95r6vbh4pav45";
|
||||
version = "5.0.4";
|
||||
sha256 = "1bvy4pvp3kxl75mbgy7saapjcnczylrqhf8ry0s66r12f7bzjki8";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson";
|
||||
version = "5.0.2";
|
||||
sha256 = "01wi2q5sjazvax8d4gbcggsr7n801m4cx6jcqljv0r4cmz4y478a";
|
||||
version = "5.0.4";
|
||||
sha256 = "1gbkgc3cqv7q10k9hrjfj1ixpwx7b4n0x2f7sn9snsh977w7209j";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.Bcl.AsyncInterfaces";
|
||||
version = "1.0.0";
|
||||
sha256 = "00dx5armvkqjxvkldz3invdlck9nj7w21dlsr2aqp1rqbyrbsbbh";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.Bcl.AsyncInterfaces";
|
||||
version = "1.1.1";
|
||||
sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.Bcl.AsyncInterfaces";
|
||||
version = "5.0.0";
|
||||
@ -401,18 +381,18 @@
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.CodeAnalysis.Common";
|
||||
version = "3.8.0";
|
||||
sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw";
|
||||
version = "3.9.0";
|
||||
sha256 = "1x6l6kn8iv5gk1545nxs2gwzkb8gj4sb9kryai132l7yg9afjqik";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.CodeAnalysis.CSharp";
|
||||
version = "3.8.0";
|
||||
sha256 = "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb";
|
||||
version = "3.9.0";
|
||||
sha256 = "0crb9x5rhija8y7b0iya9axcvinz2hv3bgf80bvz7kv6zpbpszkz";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.CodeAnalysis.CSharp.Workspaces";
|
||||
version = "3.8.0";
|
||||
sha256 = "1jfbqfngwwjx3x1cyqaamf26s7j6wag86ig1n7bh99ny85gd78wb";
|
||||
version = "3.9.0";
|
||||
sha256 = "0cvg6lby34cnjg5a84dx7vnkvjkbvm5vd2p61in9frd6vk0pjwpz";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.CodeAnalysis.NetAnalyzers";
|
||||
@ -421,13 +401,13 @@
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.CodeAnalysis.Workspaces.Common";
|
||||
version = "3.8.0";
|
||||
sha256 = "0qbirv7wxllzw5120pfa42wailfgzvl10373yhacankmfmbz2gnw";
|
||||
version = "3.9.0";
|
||||
sha256 = "1ibr9k1qf93i7sjml0xhp03is7qqgfj91za9dp4i1w00fjnvyf37";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.CodeAnalysis.Workspaces.MSBuild";
|
||||
version = "3.8.0";
|
||||
sha256 = "1ag78ls51s88znv4v004sbklrx3qnbphpdngjq196188a3vljww7";
|
||||
version = "3.9.0";
|
||||
sha256 = "1p8rgd9b9p49dkar97mjcmahkzvrdghw7m5a6csldx62nlknsc9m";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.CSharp";
|
||||
@ -451,8 +431,8 @@
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.Diagnostics.Runtime";
|
||||
version = "2.0.161401";
|
||||
sha256 = "02qcm8nv1ch07g8b0i60ynrjn33b8y5ivyk4rxal3vd9zfi6pvwi";
|
||||
version = "2.0.217201";
|
||||
sha256 = "1r519zbbq13f76kc657wml735h9lcijkyxw6r96akn7cv9vgiwl6";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.DotNet.PlatformAbstractions";
|
||||
@ -571,8 +551,8 @@
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.Extensions.ObjectPool";
|
||||
version = "5.0.3";
|
||||
sha256 = "1slfc4ncl83dl2g1xm95qb04bkyir26zhvz26lkph1jff0ycx2wb";
|
||||
version = "5.0.4";
|
||||
sha256 = "07kyqbm7f7k4bv3fa54b826b87z00385pqgjzd4s8l26j6p39rrm";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Microsoft.Extensions.Options";
|
||||
@ -671,8 +651,8 @@
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Newtonsoft.Json";
|
||||
version = "12.0.3";
|
||||
sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x";
|
||||
version = "13.0.1";
|
||||
sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Newtonsoft.Json";
|
||||
@ -681,48 +661,48 @@
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "NuGet.Common";
|
||||
version = "5.8.0";
|
||||
sha256 = "17l1gqxfcpazadg6wqgwkzg37x8c97sgmk9nr4f9yn3d50zj9hlm";
|
||||
version = "5.9.0";
|
||||
sha256 = "1j0kk8rgssw920r7h8zfqwzsgvh3y5lalz19d5r07l9r9ngcj5w9";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "NuGet.Configuration";
|
||||
version = "5.8.0";
|
||||
sha256 = "02cxqaaxmspv6x0xjwkqr1s0b858cw5gn6lgqa8zhsknnhs6rl41";
|
||||
version = "5.9.0";
|
||||
sha256 = "16wqjflqvhgq5nqa7ips63hv6wd39171q337gk5wkr9ffpwarrx9";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "NuGet.DependencyResolver.Core";
|
||||
version = "5.8.0";
|
||||
sha256 = "0w0hr10gzf0hvh400ybd6h606zal0mi0i1lq5q3yj7kdhy93wb6j";
|
||||
version = "5.9.0";
|
||||
sha256 = "1f1rcvl86qvix3hibm7xm5wzvwah5pc4ik9mnrgavnwixwkix9nz";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "NuGet.Frameworks";
|
||||
version = "5.8.0";
|
||||
sha256 = "16awpn2p8sbzvqpri2hjbjzpnl3ad2klr8d82yd0hrd6s2yyii9j";
|
||||
version = "5.9.0";
|
||||
sha256 = "099kb0mvglhfv5b0r1ddnkl6mm8l2x5kpmm1kqs5qkchk0a1y0ci";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "NuGet.LibraryModel";
|
||||
version = "5.8.0";
|
||||
sha256 = "1fwh6iam6cp9pgz4gqlwj287vfrz8nabmzfmgkbnylrxki0pnwi0";
|
||||
version = "5.9.0";
|
||||
sha256 = "1m6ym5dld0drpk7lm0i0ss30292rpk80b701n1nakqykfnkfhhfy";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "NuGet.Packaging";
|
||||
version = "5.8.0";
|
||||
sha256 = "05ba9aj6hyb5x28c7sn24b7fkzn7g1869x4b2xpbq8r37mfswfw9";
|
||||
version = "5.9.0";
|
||||
sha256 = "0m0sn823v0lb4h2maxcndvj2k1a0iwwl1yndbhna2ir2lq2fi4px";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "NuGet.ProjectModel";
|
||||
version = "5.8.0";
|
||||
sha256 = "1b2brybxg997095b9w2jbgnhadppdrxlkqmwx84dy6snq2blcwhc";
|
||||
version = "5.9.0";
|
||||
sha256 = "06qdfhxz5bsq2wx7i9dkc2rsr4bkk02mpyq27v6zrz36vyrckwx3";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "NuGet.Protocol";
|
||||
version = "5.8.0";
|
||||
sha256 = "151x6b085vsznfsi7ak97086hlc0g3d3mv9xdla974z1qyh6q5a9";
|
||||
version = "5.9.0";
|
||||
sha256 = "1nvfg1xxpjqbpdmw1xa6m7sbdp19ld442vqh3x4967z6c92wvc4n";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "NuGet.Versioning";
|
||||
version = "5.8.0";
|
||||
sha256 = "16awcl6czs6nyhfaf0ixi25flka1y653q4bjmm4rnz3ssi832mi5";
|
||||
version = "5.9.0";
|
||||
sha256 = "1rby89nx39l533vhk0ikf16dd1d6kjjn4ld8b0y88g2mlnrdgz4m";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "NUnit";
|
||||
@ -731,18 +711,18 @@
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "OpenTabletDriver";
|
||||
version = "0.5.2.1";
|
||||
sha256 = "0czbgxjkc5ryrnn9hl68wp464p4xp0883517iq87d1f7qb32gppl";
|
||||
version = "0.5.2.3";
|
||||
sha256 = "1qz5vmdwmfw8glkm6r7n06srcvrz5c3cwld1wv6xw4sagvwf0b6g";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "OpenTabletDriver.Plugin";
|
||||
version = "0.5.2.1";
|
||||
sha256 = "199yasnq5dsb5c37vl8vry8lf536gpgclsk402sxdw9lz11xmmqd";
|
||||
version = "0.5.2.3";
|
||||
sha256 = "0i03n5aydn0rv1v2y9c1cm9a2ss9y7p7l92k1x2yb6mwbx6vkpda";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "ppy.osu.Framework";
|
||||
version = "2021.323.0";
|
||||
sha256 = "1gxgvg8r7xsr94wy7rld5c1yd8ssv4iqsp2zdyp5r0qd5l1g09gc";
|
||||
version = "2021.330.0";
|
||||
sha256 = "01v319nd9szq5z5qq6pa348y1mv93pnhw0vrgbrjwvcs797h7mjl";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "ppy.osu.Framework.NativeLibs";
|
||||
@ -761,8 +741,8 @@
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "ppy.SDL2-CS";
|
||||
version = "1.0.53";
|
||||
sha256 = "0x52pq6xdg4qcgi8cnqlijifqjpszbi8z4nkmsym0xgd9m5bmd7k";
|
||||
version = "1.0.82";
|
||||
sha256 = "0hdfih1hjpqxgblwc947inyfhskkj85f061cagf8gdl69xsp2l1b";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "ppy.squirrel.windows";
|
||||
@ -876,8 +856,8 @@
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "Sentry";
|
||||
version = "3.0.7";
|
||||
sha256 = "1wlfia0ihyx2jd07faz4jqbldxq9bx4hv787xkfk1469h7f2vvwk";
|
||||
version = "3.2.0";
|
||||
sha256 = "1hhgc4sqd7nampqydpdwfrc04hhqlkbv4p4w8cq6dswp5rf5k89b";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "SharpCompress";
|
||||
@ -1109,6 +1089,11 @@
|
||||
version = "4.0.11";
|
||||
sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "System.Formats.Asn1";
|
||||
version = "5.0.0";
|
||||
sha256 = "1axc8z0839yvqi2cb63l73l6d9j6wd20lsbdymwddz9hvrsgfwpn";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "System.Globalization";
|
||||
version = "4.0.11";
|
||||
@ -1199,6 +1184,11 @@
|
||||
version = "5.0.0";
|
||||
sha256 = "08l85pi8jy65las973szqdnir2awxp0r16h21c0bgrz19gxhs11n";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "System.IO.Pipelines";
|
||||
version = "5.0.0";
|
||||
sha256 = "1kdvbzr98sdddm18r3gbsbcxpv58gm1yy3iig8zg9dvp7mli7453";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "System.IO.Pipelines";
|
||||
version = "5.0.1";
|
||||
@ -1511,8 +1501,8 @@
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "System.Security.Cryptography.Cng";
|
||||
version = "5.0.0-preview.3.20214.6";
|
||||
sha256 = "050xx94ki5zmclplfns1v463wlf97ha2knwnxp08vqkgy0bdg1mv";
|
||||
version = "5.0.0";
|
||||
sha256 = "06hkx2za8jifpslkh491dfwzm5dxrsyxzj5lsc0achb6yzg4zqlw";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "System.Security.Cryptography.Csp";
|
||||
@ -1546,8 +1536,8 @@
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "System.Security.Cryptography.Pkcs";
|
||||
version = "5.0.0-preview.3.20214.6";
|
||||
sha256 = "1q38rzpzhzpc8l75m06g6swq23qbl22ijzd9k76jfq08px3wq09k";
|
||||
version = "5.0.0";
|
||||
sha256 = "0hb2mndac3xrw3786bsjxjfh19bwnr991qib54k6wsqjhjyyvbwj";
|
||||
})
|
||||
(fetchNuGet {
|
||||
name = "System.Security.Cryptography.Primitives";
|
||||
|
@ -357,7 +357,7 @@
|
||||
"homekit" = ps: with ps; [ HAP-python pyqrcode pyturbojpeg aiohttp-cors base36 fnvhash ha-ffmpeg zeroconf ];
|
||||
"homekit_controller" = ps: with ps; [ aiohomekit aiohttp-cors zeroconf ];
|
||||
"homematic" = ps: with ps; [ pyhomematic ];
|
||||
"homematicip_cloud" = ps: with ps; [ ]; # missing inputs: homematicip
|
||||
"homematicip_cloud" = ps: with ps; [ homematicip ];
|
||||
"homeworks" = ps: with ps; [ ]; # missing inputs: pyhomeworks
|
||||
"honeywell" = ps: with ps; [ ]; # missing inputs: somecomfort
|
||||
"horizon" = ps: with ps; [ ]; # missing inputs: horimote
|
||||
|
@ -241,6 +241,7 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
"homekit_controller"
|
||||
"homeassistant"
|
||||
"homematic"
|
||||
"homematicip_cloud"
|
||||
"html5"
|
||||
"http"
|
||||
"hue"
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "oapi-codegen";
|
||||
version = "1.5.6";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deepmap";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-edIm1O+LQdmKhH8/5WuSsxVtOcf3VlkObGjIY+30mms=";
|
||||
sha256 = "sha256-doJ1ceuJ/gL9vlGgV/hKIJeAErAseH0dtHKJX2z7pV0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-lhWnPZavtBEa4A76rvr0xw3L5W6HYK1Uw+PW8z8gWuU=";
|
||||
vendorSha256 = "sha256-Y4WM+o+5jiwj8/99UyNHLpBNbtJkKteIGW2P1Jd9L6M=";
|
||||
|
||||
# Tests use network
|
||||
doCheck = false;
|
||||
|
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, buildPythonApplication
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, fetchurl
|
||||
, terminaltables
|
||||
, colorclass
|
||||
@ -13,31 +12,23 @@
|
||||
let
|
||||
|
||||
spec = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/linode/linode-api-docs/v4.67.0/openapi.yaml";
|
||||
sha256 = "0vsblprkqlr9508x5rkm0wj6lc3w72xiwiqxia9asgr5k45hhfnr";
|
||||
url = "https://raw.githubusercontent.com/linode/linode-api-docs/v4.89.0/openapi.yaml";
|
||||
sha256 = "sha256-R7Dmq8ifGEjh47ftuoGrbymYBsPCj/ULz0j1OqJDcwY=";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "linode-cli";
|
||||
version = "2.15.0";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linode";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "06iz9xjj6h1ry176558488fl9j18a5vf724zh4cxlcksdy72dnna";
|
||||
sha256 = "sha256-zelopRaHaDCnbYA/y7dNMBh70g0+wuc6t9LH/VLaUIk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# make enum34 depend on python version
|
||||
( fetchpatch {
|
||||
url = "https://github.com/linode/linode-cli/pull/184/commits/4cf55759c5da33fbc49b9ba664698875d67d4f76.patch";
|
||||
sha256 = "04n9a6yh0abyyymvfzajhav6qxwvzjl2vs8jnqp3yqrma7kl0slj";
|
||||
})
|
||||
];
|
||||
|
||||
# remove need for git history
|
||||
prePatch = ''
|
||||
substituteInPlace setup.py \
|
||||
|
@ -279,6 +279,8 @@ in {
|
||||
|
||||
aiohttp-swagger = callPackage ../development/python-modules/aiohttp-swagger { };
|
||||
|
||||
aiohttp-wsgi = callPackage ../development/python-modules/aiohttp-wsgi { };
|
||||
|
||||
aioitertools = callPackage ../development/python-modules/aioitertools { };
|
||||
|
||||
aiobotocore = callPackage ../development/python-modules/aiobotocore { };
|
||||
@ -3127,6 +3129,8 @@ in {
|
||||
|
||||
homeassistant-pyozw = callPackage ../development/python-modules/homeassistant-pyozw { };
|
||||
|
||||
homematicip = callPackage ../development/python-modules/homematicip { };
|
||||
|
||||
homepluscontrol = callPackage ../development/python-modules/homepluscontrol { };
|
||||
|
||||
hoomd-blue = toPythonModule (callPackage ../development/python-modules/hoomd-blue {
|
||||
|
Loading…
x
Reference in New Issue
Block a user