JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-02-20 06:17:59 +00:00 committed by GitHub
commit 4c0670dace
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 343 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maintainers/maintainer-list.nix
View File

@ -9324,7 +9324,7 @@
name = "Jan Beinke";
};
thesola10 = {
email = "thesola10@bobile.fr";
email = "me@thesola.io";
github = "thesola10";
githubId = 7287268;
keys = [{

2
nixos/modules/services/web-apps/miniflux.nix
View File

@ -44,7 +44,7 @@ in
'';
description = ''
Configuration for Miniflux, refer to
<link xlink:href="http://docs.miniflux.app/en/latest/configuration.html"/>
<link xlink:href="https://miniflux.app/docs/configuration.html"/>
for documentation on the supported values.
'';
};

4
pkgs/applications/misc/gpxsee/default.nix
View File

@ -2,13 +2,13 @@
mkDerivation rec {
pname = "gpxsee";
version = "8.5";
version = "8.6";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = version;
sha256 = "sha256-ygBM8HtCF8d4KVOakP4ssFyTgAsPQDfjAMJaEqo+Ml4=";
sha256 = "sha256-RAqTwi65YskQhsjlHxQqy50R5s8z2yriWLkrg5J/eTc=";
};
patches = (substituteAll {

57
pkgs/applications/networking/browsers/firefox/wrapper.nix
View File

@ -51,27 +51,6 @@ let
alsaSupport = browser.alsaSupport or false;
pipewireSupport = browser.pipewireSupport or false;
# FIXME: This should probably be an assertion now?
plugins =
let
removed = lib.filter (a: builtins.hasAttr a cfg) [
"enableAdobeFlash"
"enableAdobeReader"
"enableBluejeans"
"enableDjvu"
"enableFriBIDPlugin"
"enableGoogleTalkPlugin"
"enableMPlayer"
"enableVLC"
"icedtea"
"jre"
];
in if removed != [] then
throw "Your configuration mentions ${lib.concatMapStringsSep ", " (p: browserName + "." + p) removed}. All plugin related options have been removed, since Firefox from version 52 onwards no longer supports npapi plugins (see https://support.mozilla.org/en-US/kb/npapi-plugins)."
else
[]
;
nativeMessagingHosts =
([ ]
++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass)
@ -164,7 +143,24 @@ let
# #
#############################
in stdenv.mkDerivation {
# TODO: remove this after the next release (21.03)
configPlugins = lib.filter (a: builtins.hasAttr a cfg) [
"enableAdobeFlash"
"enableAdobeReader"
"enableBluejeans"
"enableDjvu"
"enableFriBIDPlugin"
"enableGoogleTalkPlugin"
"enableMPlayer"
"enableVLC"
"icedtea"
"jre"
];
pluginsError =
"Your configuration mentions ${lib.concatMapStringsSep ", " (p: browserName + "." + p) configPlugins}. All plugin related options have been removed, since Firefox from version 52 onwards no longer supports npapi plugins (see https://support.mozilla.org/en-US/kb/npapi-plugins).";
in if configPlugins != [] then throw pluginsError else
(stdenv.mkDerivation {
inherit pname version;
desktopItem = makeDesktopItem {
@ -262,12 +258,9 @@ let
makeWrapper "$oldExe" \
"$out${browser.execdir or "/bin"}/${browserName}${nameSuffix}" \
--suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \
--suffix LD_LIBRARY_PATH ':' "$libs" \
--suffix-each GTK_PATH ':' "$gtk_modules" \
--suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \
--prefix PATH ':' "${xdg-utils}/bin" \
--prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \
--suffix PATH ':' "$out${browser.execdir or "/bin"}" \
--set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \
--set MOZ_SYSTEM_DIR "$out/lib/mozilla" \
@ -351,9 +344,6 @@ let
preferLocalBuild = true;
# Let each plugin tell us (through its `mozillaPlugin') attribute
# where to find the plugin in its tree.
plugins = map (x: x + x.mozillaPlugin) plugins;
libs = lib.makeLibraryPath libs + ":" + lib.makeSearchPathOutput "lib" "lib64" libs;
gtk_modules = map (x: x + x.gtkModule) gtk_modules;
@ -362,14 +352,9 @@ let
disallowedRequisites = [ stdenv.cc ];
meta = browser.meta // {
description =
browser.meta.description
+ " (with plugins: "
+ lib.concatStrings (lib.intersperse ", " (map (x: x.name) plugins))
+ ")";
description = browser.meta.description;
hydraPlatforms = [];
priority = (browser.meta.priority or 0) - 1; # prefer wrapper over the package
};
};
in
lib.makeOverridable wrapper
});
in lib.makeOverridable wrapper

4
pkgs/applications/networking/cluster/fluxcd/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "fluxcd";
version = "0.8.1";
version = "0.8.2";
src = fetchFromGitHub {
owner = "fluxcd";
repo = "flux2";
rev = "v${version}";
sha256 = "1xxw6zk0lk4is220lydcx57mrsw6pk2rirsp4wjzvawjlv7wdv25";
sha256 = "1yrjgjagh7jfzgvnj9wr71mk34x7yf66fwyby73f1pfi2cg49nhp";
};
vendorSha256 = "0acxbmc4j1fcdja0s9g04f0kd34x54yfqismibfi40m2gzbg6ljr";

12
pkgs/applications/networking/feedreaders/newsflash/default.nix
View File

@ -19,23 +19,27 @@
rustPlatform.buildRustPackage rec {
pname = "newsflash";
version = "1.1.1";
version = "1.2.2";
src = fetchFromGitLab {
owner = "news-flash";
repo = "news_flash_gtk";
rev = version;
sha256 = "1z47h23g87dqmr9sfjl36fs5xjm2wj7z2bri9g0a4jcpwzl5awsd";
hash = "sha256-TeheK14COX1NIrql74eI8Wx4jtpUP1eO5mugT5LzlPY=";
};
cargoSha256 = "0rnrdh9ganj63hf9j890yj9pahcgza95z7x020w72mbb4648hq26";
cargoHash = "sha256-Fbj4sabrwpfa0QNEN4l91y/6AuPIKu7QPzYNUO6RtU0=";
patches = [
# Post install tries to generate an icon cache & update the
# desktop database. The gtk setup hook drop-icon-theme-cache.sh
# would strip out the icon cache and the desktop database wouldn't
# be included in $out. They will generated by xdg.mime.enable &
# gtk.iconCache.enable instead.
./no-post-install.patch
];
postPatch = ''
chmod +x build-aux/cargo.sh
patchShebangs .
'';

6
pkgs/applications/terminal-emulators/alacritty/default.nix
View File

@ -52,16 +52,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "alacritty";
version = "0.7.1";
version = "0.7.2";
src = fetchFromGitHub {
owner = "alacritty";
repo = pname;
rev = "v${version}";
sha256 = "8alCFtr+3aJsqQ2Ra8u5/SRHfDvMq2kRvRCKo/zwMK0=";
sha256 = "sha256-VXV6w4OnhJBmvMKl7CynbhI9LclTKaSr+5DhHXMwSsc=";
};
cargoSha256 = "kqRlxieChnhWtYYf67gi+2bncIzO56xpnv2uLjcINVM=";
cargoSha256 = "sha256-PWnNTMNZKxsfS1OAXe4G3zjfg5gK1SMTc0JJrW90iSM=";
nativeBuildInputs = [
cmake

4
pkgs/development/python-modules/asyncio-dgram/default.nix
View File

@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "asyncio-dgram";
version = "1.1.1";
version = "1.2.0";
src = fetchFromGitHub {
owner = "jsbronder";
repo = pname;
rev = "v${version}";
sha256 = "1zkmjvq47zw2fsbnzhr5mh9rsazx0z1f8m528ash25jrxsza5crm";
sha256 = "sha256-wgcL/BdNjzitkkaGyRUQbW1uv1enLDnHk30YHClK58o=";
};
# OSError: AF_UNIX path too long

1
pkgs/development/python-modules/geoip2/default.nix
View File

@ -1,7 +1,6 @@
{ buildPythonPackage, lib, fetchPypi, isPy27
, aiohttp
, maxminddb
, mock
, mocket
, requests
, requests-mock

34
pkgs/development/python-modules/getmac/default.nix
View File

@ -1,5 +1,10 @@
{ lib, buildPythonPackage, fetchFromGitHub
, pytest, pytest-benchmark, pytest-mock }:
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytest-benchmark
, pytest-mock
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "getmac";
@ -7,19 +12,32 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "GhostofGoes";
repo = "getmac";
repo = pname;
rev = version;
sha256 = "08d4iv5bjl1s4i9qhzf3pzjgj1rgbwi0x26qypf3ycgdj0a6gvh2";
};
checkInputs = [ pytest pytest-benchmark pytest-mock ];
checkPhase = ''
pytest --ignore tests/test_cli.py
'';
checkInputs = [
pytestCheckHook
pytest-benchmark
pytest-mock
];
disabledTests = [
# Disable CLI tests
"test_cli_main_basic"
"test_cli_main_verbose"
"test_cli_main_debug"
"test_cli_multiple_debug_levels"
# Disable test that require network access
"test_uuid_lanscan_iface"
];
pythonImportsCheck = [ "getmac" ];
meta = with lib; {
description = "Python package to get the MAC address of network interfaces and hosts on the local network";
homepage = "https://github.com/GhostofGoes/getmac";
description = "Pure-Python package to get the MAC address of network interfaces and hosts on the local network.";
license = licenses.mit;
maintainers = with maintainers; [ colemickens ];
};

8
pkgs/development/python-modules/lazr-restfulclient/default.nix
View File

@ -8,6 +8,10 @@
, setuptools
, six
, wadllib
, fixtures
, lazr-uri
, pytestCheckHook
, wsgi-intercept
}:
buildPythonPackage rec {
@ -23,7 +27,9 @@ buildPythonPackage rec {
propagatedBuildInputs = [ distro httplib2 oauthlib setuptools six wadllib ];
doCheck = false; # requires to package lazr.restful, lazr.authentication, and wsgi_intercept
# E ModuleNotFoundError: No module named 'lazr.uri'
doCheck = false;
checkInputs = [ fixtures lazr-uri pytestCheckHook wsgi-intercept ];
pythonImportsCheck = [ "lazr.restfulclient" ];

49
pkgs/development/python-modules/mcstatus/default.nix Normal file
View File

@ -0,0 +1,49 @@
{ lib
, asyncio-dgram
, buildPythonPackage
, click
, dnspython
, fetchFromGitHub
, mock
, pytestCheckHook
, pythonOlder
, six
}:
buildPythonPackage rec {
pname = "mcstatus";
version = "5.1.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "Dinnerbone";
repo = pname;
rev = "release-${version}";
sha256 = "1a3qrl6w76ayqkl1knaz5ai0brrzpjfdk33lyb1n1p7gnc73nhlr";
};
propagatedBuildInputs = [
asyncio-dgram
click
dnspython
six
];
checkInputs = [
mock
pytestCheckHook
];
postPatch = ''
substituteInPlace requirements.txt --replace "dnspython3" "dnspython"
'';
pythonImportsCheck = [ "mcstatus" ];
meta = with lib; {
description = "Python library for checking the status of Minecraft servers";
homepage = "https://github.com/Dinnerbone/mcstatus";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

30
pkgs/development/python-modules/pychannels/default.nix Normal file
View File

@ -0,0 +1,30 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, requests
}:
buildPythonPackage rec {
pname = "pychannels";
version = "1.2.2";
src = fetchFromGitHub {
owner = "fancybits";
repo = pname;
rev = version;
sha256 = "0dqc0vhf6c5r3g7nfbpa668x6z2zxrznk6h907s6sxkq4sbqnhqf";
};
propagatedBuildInputs = [ requests ];
# Project has not published tests yet
doCheck = false;
pythonImportsCheck = [ "pychannels" ];
meta = with lib; {
description = "Python library for interacting with the Channels app";
homepage = "https://github.com/fancybits/pychannels";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

55
pkgs/development/python-modules/pymysensors/default.nix Normal file
View File

@ -0,0 +1,55 @@
{ lib
, buildPythonPackage
, click
, crcmod
, fetchFromGitHub
, getmac
, intelhex
, paho-mqtt
, pyserial
, pyserial-asyncio
, pytest-sugar
, pytest-timeout
, pytestCheckHook
, pythonOlder
, voluptuous
}:
buildPythonPackage rec {
pname = "pymysensors";
version = "0.20.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "theolind";
repo = pname;
rev = version;
sha256 = "1hz3551ydsmd23havd0dljmvkhzjnmd28k41ws60s8ms3gzlzqfy";
};
propagatedBuildInputs = [
click
crcmod
getmac
intelhex
paho-mqtt
pyserial
pyserial-asyncio
voluptuous
];
checkInputs = [
pytest-sugar
pytest-timeout
pytestCheckHook
];
pythonImportsCheck = [ "mysensors" ];
meta = with lib; {
description = "Python API for talking to a MySensors gateway";
homepage = "https://github.com/theolind/pymysensors";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

30
pkgs/development/python-modules/python-velbus/default.nix Normal file
View File

@ -0,0 +1,30 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pyserial
}:
buildPythonPackage rec {
pname = "python-velbus";
version = "2.1.2";
src = fetchFromGitHub {
owner = "thomasdelaet";
repo = pname;
rev = "v${version}";
sha256 = "0dv7dsjp5li87ispdphaz7jd0a9xc328rxwawf2f58b1ii904xr4";
};
propagatedBuildInputs = [ pyserial ];
# Project has not tests
doCheck = false;
pythonImportsCheck = [ "velbus" ];
meta = with lib; {
description = "Python library to control the Velbus home automation system";
homepage = "https://github.com/thomasdelaet/python-velbus";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

30
pkgs/development/python-modules/pyxiaomigateway/default.nix Normal file
View File

@ -0,0 +1,30 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, cryptography
}:
buildPythonPackage rec {
pname = "pyxiaomigateway";
version = "0.13.4";
src = fetchFromGitHub {
owner = "Danielhiversen";
repo = "PyXiaomiGateway";
rev = version;
sha256 = "1xg89sdds04wgil88ihs84cjr3df6lajjbkyb1aymj638ibdyqns";
};
propagatedBuildInputs = [ cryptography ];
# Tests are not mocking the gateway completely
doCheck = false;
pythonImportsCheck = [ "xiaomi_gateway" ];
meta = with lib; {
description = "Python library to communicate with the Xiaomi Gateway";
homepage = "https://github.com/Danielhiversen/PyXiaomiGateway/";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

1
pkgs/development/python-modules/sopel/default.nix
View File

@ -6,7 +6,6 @@
, pyenchant
, pygeoip
, pytestCheckHook
, python
, pytz
, sqlalchemy
, xmltodict

31
pkgs/development/python-modules/wsgi-intercept/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ lib, buildPythonPackage, fetchPypi, six, httplib2, py, pytestCheckHook, requests, urllib3 }:
buildPythonPackage rec {
pname = "wsgi-intercept";
version = "1.9.2";
src = fetchPypi {
pname = "wsgi_intercept";
inherit version;
sha256 = "1b6251d03jnhqywr54bzj9fnc3qzp2kvz22asxpd27jy984qx21n";
};
propagatedBuildInputs = [ six ];
checkInputs = [ httplib2 py pytestCheckHook requests urllib3 ];
disabledTests = [
"test_http_not_intercepted"
"test_https_not_intercepted"
"test_https_no_ssl_verification_not_intercepted"
];
pythonImportsCheck = [ "wsgi_intercept" ];
meta = with lib; {
description = "wsgi_intercept installs a WSGI application in place of a real URI for testing";
homepage = "https://github.com/cdent/wsgi-intercept";
license = licenses.mit;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

4
pkgs/development/tools/sd-local/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "sd-local";
version = "1.0.20";
version = "1.0.21";
src = fetchFromGitHub {
owner = "screwdriver-cd";
repo = pname;
rev = "v${version}";
sha256 = "sha256-SKBSsS8WPsr5/42IMueLkfJCrOQIO/ODlhTp+xrmQ/4=";
sha256 = "sha256-cYglIobBldfFNavso8sLdqHzoWcl6qTurxGRMdoLqGc=";
};
vendorSha256 = "sha256-3KNYG6RBnfFRgIoIyAe7QwAB56ZMF8bHdgt9Ghtod20=";

48
pkgs/games/factorio/versions.json
View File

@ -2,56 +2,56 @@
"x86_64-linux": {
"alpha": {
"experimental": {
"name": "factorio_alpha_x64-1.1.21.tar.xz",
"name": "factorio_alpha_x64-1.1.25.tar.xz",
"needsAuth": true,
"sha256": "0js252wmny46s5fss8b4l83cyy3l5lqsnx31x9n9wqc9akr9c9w7",
"sha256": "1xz03xr144grf5pa194j8pvyniiw77lsidkl32wha9x85fln5jhi",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.21/alpha/linux64",
"version": "1.1.21"
"url": "https://factorio.com/get-download/1.1.25/alpha/linux64",
"version": "1.1.25"
},
"stable": {
"name": "factorio_alpha_x64-1.1.21.tar.xz",
"name": "factorio_alpha_x64-1.1.25.tar.xz",
"needsAuth": true,
"sha256": "0js252wmny46s5fss8b4l83cyy3l5lqsnx31x9n9wqc9akr9c9w7",
"sha256": "1xz03xr144grf5pa194j8pvyniiw77lsidkl32wha9x85fln5jhi",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.21/alpha/linux64",
"version": "1.1.21"
"url": "https://factorio.com/get-download/1.1.25/alpha/linux64",
"version": "1.1.25"
}
},
"demo": {
"experimental": {
"name": "factorio_demo_x64-1.1.21.tar.xz",
"name": "factorio_demo_x64-1.1.25.tar.xz",
"needsAuth": false,
"sha256": "1z049ckiff6sv9f6xym5akmmn3gh37z9mr2wf8a70ch7j1i4z3fn",
"sha256": "1v3rpi9cfx4bg4jqq3h8zwknb5wsidk3lf3qkf55kf4xw6fnkzcj",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.21/demo/linux64",
"version": "1.1.21"
"url": "https://factorio.com/get-download/1.1.25/demo/linux64",
"version": "1.1.25"
},
"stable": {
"name": "factorio_demo_x64-1.1.21.tar.xz",
"name": "factorio_demo_x64-1.1.25.tar.xz",
"needsAuth": false,
"sha256": "1z049ckiff6sv9f6xym5akmmn3gh37z9mr2wf8a70ch7j1i4z3fn",
"sha256": "1v3rpi9cfx4bg4jqq3h8zwknb5wsidk3lf3qkf55kf4xw6fnkzcj",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.21/demo/linux64",
"version": "1.1.21"
"url": "https://factorio.com/get-download/1.1.25/demo/linux64",
"version": "1.1.25"
}
},
"headless": {
"experimental": {
"name": "factorio_headless_x64-1.1.21.tar.xz",
"name": "factorio_headless_x64-1.1.25.tar.xz",
"needsAuth": false,
"sha256": "038342z429cavdp2q3mjczlprw83nca030mjlipjppr43bzg9db0",
"sha256": "0xirxdf41sdsgcknvhdfg6rm12bwmg86bl4ml6ap1skifk8dlia1",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.21/headless/linux64",
"version": "1.1.21"
"url": "https://factorio.com/get-download/1.1.25/headless/linux64",
"version": "1.1.25"
},
"stable": {
"name": "factorio_headless_x64-1.1.21.tar.xz",
"name": "factorio_headless_x64-1.1.25.tar.xz",
"needsAuth": false,
"sha256": "038342z429cavdp2q3mjczlprw83nca030mjlipjppr43bzg9db0",
"sha256": "0xirxdf41sdsgcknvhdfg6rm12bwmg86bl4ml6ap1skifk8dlia1",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.21/headless/linux64",
"version": "1.1.21"
"url": "https://factorio.com/get-download/1.1.25/headless/linux64",
"version": "1.1.25"
}
}
}

10
pkgs/servers/home-assistant/component-packages.nix
View File

@ -110,7 +110,7 @@
"canary" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: py-canary
"cast" = ps: with ps; [ aiohttp-cors hass-nabucasa mutagen plexapi plexauth plexwebsocket PyChromecast zeroconf ];
"cert_expiry" = ps: with ps; [ ];
"channels" = ps: with ps; [ ]; # missing inputs: pychannels
"channels" = ps: with ps; [ pychannels ];
"circuit" = ps: with ps; [ ]; # missing inputs: circuit-webhook
"cisco_ios" = ps: with ps; [ pexpect ];
"cisco_mobility_express" = ps: with ps; [ ciscomobilityexpress ];
@ -499,7 +499,7 @@
"mikrotik" = ps: with ps; [ librouteros ];
"mill" = ps: with ps; [ ]; # missing inputs: millheater
"min_max" = ps: with ps; [ ];
"minecraft_server" = ps: with ps; [ aiodns getmac ]; # missing inputs: mcstatus
"minecraft_server" = ps: with ps; [ aiodns getmac mcstatus ];
"minio" = ps: with ps; [ minio ];
"mitemp_bt" = ps: with ps; [ ]; # missing inputs: mitemp_bt
"mjpeg" = ps: with ps; [ ];
@ -523,7 +523,7 @@
"mychevy" = ps: with ps; [ ]; # missing inputs: mychevy
"mycroft" = ps: with ps; [ ]; # missing inputs: mycroftapi
"myq" = ps: with ps; [ pymyq ];
"mysensors" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: pymysensors
"mysensors" = ps: with ps; [ aiohttp-cors paho-mqtt pymysensors ];
"mystrom" = ps: with ps; [ aiohttp-cors python-mystrom ];
"mythicbeastsdns" = ps: with ps; [ ]; # missing inputs: mbddns
"n26" = ps: with ps; [ ]; # missing inputs: n26
@ -894,7 +894,7 @@
"vacuum" = ps: with ps; [ ];
"vallox" = ps: with ps; [ ]; # missing inputs: vallox-websocket-api
"vasttrafik" = ps: with ps; [ ]; # missing inputs: vtjp
"velbus" = ps: with ps; [ ]; # missing inputs: python-velbus
"velbus" = ps: with ps; [ python-velbus ];
"velux" = ps: with ps; [ pyvlx ];
"venstar" = ps: with ps; [ ]; # missing inputs: venstarcolortouch
"vera" = ps: with ps; [ pyvera ];
@ -948,7 +948,7 @@
"xeoma" = ps: with ps; [ pyxeoma ];
"xfinity" = ps: with ps; [ ]; # missing inputs: xfinity-gateway
"xiaomi" = ps: with ps; [ ha-ffmpeg ];
"xiaomi_aqara" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: PyXiaomiGateway
"xiaomi_aqara" = ps: with ps; [ pyxiaomigateway aiohttp-cors netdisco zeroconf ];
"xiaomi_miio" = ps: with ps; [ construct python-miio ];
"xiaomi_tv" = ps: with ps; [ ]; # missing inputs: pymitv
"xmpp" = ps: with ps; [ slixmpp ];

4
pkgs/tools/admin/docker-credential-gcr/default.nix
View File

@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "docker-credential-gcr";
version = "2.0.2";
version = "2.0.4";
goPackagePath = "github.com/GoogleCloudPlatform/docker-credential-gcr";
@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "GoogleCloudPlatform";
repo = "docker-credential-gcr";
rev = "v${version}";
sha256 = "0m7jx669yf27z2g9gw9vwncpwldrcb3ldlf1xhvbwbijnc2jk866";
sha256 = "sha256-yG8gpsD1KZBSbJnnNTXgZah/mcrOUH1O37s7AGpeHjQ=";
};
meta = with lib; {

12
pkgs/top-level/python-packages.nix
View File

@ -4006,6 +4006,8 @@ in {
mccabe = callPackage ../development/python-modules/mccabe { };
mcstatus = callPackage ../development/python-modules/mcstatus { };
MDP = callPackage ../development/python-modules/mdp { };
measurement = callPackage ../development/python-modules/measurement { };
@ -5311,6 +5313,8 @@ in {
pycfdns = callPackage ../development/python-modules/pycfdns { };
pychannels = callPackage ../development/python-modules/pychannels { };
pychart = callPackage ../development/python-modules/pychart { };
pychef = callPackage ../development/python-modules/pychef { };
@ -5718,6 +5722,8 @@ in {
pymyq = callPackage ../development/python-modules/pymyq { };
pymysensors = callPackage ../development/python-modules/pymysensors { };
pymysql = callPackage ../development/python-modules/pymysql { };
pymysqlsa = callPackage ../development/python-modules/pymysqlsa { };
@ -6493,6 +6499,8 @@ in {
python-vagrant = callPackage ../development/python-modules/python-vagrant { };
python-velbus = callPackage ../development/python-modules/python-velbus { };
python-vipaccess = callPackage ../development/python-modules/python-vipaccess { };
python-vlc = callPackage ../development/python-modules/python-vlc { };
@ -6636,6 +6644,8 @@ in {
pyxeoma = callPackage ../development/python-modules/pyxeoma { };
pyxiaomigateway = callPackage ../development/python-modules/pyxiaomigateway { };
pyxl3 = callPackage ../development/python-modules/pyxl3 { };
pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml { });
@ -8372,6 +8382,8 @@ in {
ws4py = callPackage ../development/python-modules/ws4py { };
wsgi-intercept = callPackage ../development/python-modules/wsgi-intercept { };
wsgiproxy2 = callPackage ../development/python-modules/wsgiproxy2 { };
WSGIProxy = callPackage ../development/python-modules/wsgiproxy { };