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

Merge branch 'master' into staging-next

This commit is contained in:
Martin Weinelt 2021-04-22 00:54:14 +02:00 committed by GitHub
parent 96bf6939b3 61ecd7c2cd
commit 6292be499b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 221 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/network-filesystems/ipfs.nix
View File

@ -296,7 +296,7 @@ in {
systemd.sockets.ipfs-api = {
wantedBy = [ "sockets.target" ];
# We also include "%t/ipfs.sock" because tere is no way to put the "%t"
# We also include "%t/ipfs.sock" because there is no way to put the "%t"
# in the multiaddr.
socketConfig.ListenStream = let
fromCfg = multiaddrToListenStream cfg.apiAddress;

6
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -1,8 +1,8 @@
{
"stable": {
"version": "90.0.4430.72",
"sha256": "0hw916j55lm3qnidfp92i8w6zywdd47rhihn9pn23b7ziz58ik55",
"sha256bin64": "0k1m786b94kh7r2c58qj8b9a39yr4m30kkrxk5d9q7dn1abl3wa3",
"version": "90.0.4430.85",
"sha256": "08j9shrc6p0vpa3x7av7fj8wapnkr7h6m8ag1gh6gaky9d6mki81",
"sha256bin64": "0li9w6zfsmx5r90jm5v5gfv3l2a76jndg6z5jvb9yx9xvrp9gpir",
"deps": {
"gn": {
"version": "2021-02-09",

6
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View File

@ -88,19 +88,19 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
version = "10.0.15";
version = "10.0.16";
lang = "en-US";
srcs = {
x86_64-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
sha256 = "1ah69jmfgik063f9gkvyv9d4k706pqihmzc4k7cc95zyd17v8wrs";
sha256 = "07h2gd6cwwq17lrwjpfah1xvr8ny8700qvi971qacrr7ssicw2pw";
};
i686-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
sha256 = "0gyhxfs4qpg6ys038d52cxnmb4khbng1w4hcsavi2rlgv18bz75p";
sha256 = "145kniiby5nnd0ll3v2gggzxz52bqbrdp72hvh96i8qnzi0fq25a";
};
};
in

7
pkgs/applications/virtualization/podman/default.nix
View File

@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, installShellFiles
@ -16,13 +17,13 @@
buildGoModule rec {
pname = "podman";
version = "3.1.1";
version = "3.1.2";
src = fetchFromGitHub {
owner = "containers";
repo = "podman";
rev = "v${version}";
sha256 = "1ihpz50c50frw9nrjp0vna2lg50kwlar6y6vr4s5sjiwza1qv2d2";
sha256 = "sha256-PS41e7myv5xCSJIeT+SRj4rLVCXpthq7KeHisYoSiOE=";
};
patches = [

4
pkgs/development/libraries/vapoursynth/default.nix
View File

@ -10,13 +10,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "vapoursynth";
version = "R52";
version = "R53";
src = fetchFromGitHub {
owner = "vapoursynth";
repo = "vapoursynth";
rev = version;
sha256 = "1krfdzc2x2vxv4nq9kiv1c09hgj525qn120ah91fw2ikq8ldvmx4";
sha256 = "0qcsfkpkry0cmvi60khjwvfz4fqhy23nqmn4pb9qrwll26sn9dcr";
};
patches = [

4
pkgs/development/ocaml-modules/irmin/ppx.nix
View File

@ -2,11 +2,11 @@
buildDunePackage rec {
pname = "ppx_irmin";
version = "2.5.2";
version = "2.5.3";
src = fetchurl {
url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz";
sha256 = "ac8d75144cafdaf4b5e106b540a27338245510b7e33a8c412d393c9d50cae490";
sha256 = "2c8ef24cc57379c3a138f121fea350ee7b6077abc22a4fdc6a47d0c81585f3f6";
};
minimumOCamlVersion = "4.08";

4
pkgs/development/php-packages/composer/default.nix
View File

@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, makeWrapper, unzip, lib, php }:
let
pname = "composer";
version = "2.0.11";
version = "2.0.12";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://getcomposer.org/download/${version}/composer.phar";
sha256 = "sha256-6r8pFwcglqlGeRk3YlATGeYh4rNppKElaywn9OaYRHc=";
sha256 = "sha256-guqMFTfPrOt+VvYATHzN+Z3a/OcjfAc3TZIOY1cwpjE=";
};
dontUnpack = true;

41
pkgs/development/python-modules/dsmr-parser/default.nix Normal file
View File

@ -0,0 +1,41 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pyserial
, pyserial-asyncio
, pytestCheckHook
, pytz
, tailer
}:
buildPythonPackage rec {
pname = "dsmr-parser";
version = "0.29";
src = fetchFromGitHub {
owner = "ndokter";
repo = "dsmr_parser";
rev = "v${version}";
sha256 = "11d6cwmabzc8p6jkqwj72nrj7p6cxbvr0x3jdrxyx6zki8chyw4p";
};
propagatedBuildInputs = [
pyserial
pyserial-asyncio
pytz
tailer
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "dsmr_parser" ];
meta = with lib; {
description = "Python module to parse Dutch Smart Meter Requirements (DSMR)";
homepage = "https://github.com/ndokter/dsmr_parser";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

52
pkgs/development/python-modules/hyperion-py/default.nix Normal file
View File

@ -0,0 +1,52 @@
{ lib
, aiohttp
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, poetry-core
, pytest-aiohttp
, pytest-asyncio
}:
buildPythonPackage rec {
pname = "hyperion-py";
version = "0.7.4";
disabled = pythonOlder "3.8";
format = "pyproject";
src = fetchFromGitHub {
owner = "dermotduffy";
repo = pname;
rev = "v${version}";
sha256 = "00x12ppmvlxs3qbdxq06wnzakvwm2m39qhmpp27qfpl137b0qqyj";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiohttp
];
checkInputs = [
pytest-asyncio
pytest-aiohttp
pytestCheckHook
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace " --timeout=9 --cov=hyperion" ""
'';
pythonImportsCheck = [ "hyperion" ];
meta = with lib; {
description = "Python package for Hyperion Ambient Lighting";
homepage = "https://github.com/dermotduffy/hyperion-py";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

32
pkgs/development/python-modules/tailer/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, python
}:
buildPythonPackage rec {
pname = "tailer";
version = "0.4.1";
src = fetchFromGitHub {
owner = "six8";
repo = "pytailer";
rev = version;
sha256 = "1s5p5m3q9k7r1m0wx5wcxf20xzs0rj14qwg1ydwhf6adr17y2w5y";
};
checkPhase = ''
runHook preCheck
${python.interpreter} -m doctest -v src/tailer/__init__.py
runHook postCheck
'';
pythonImportsCheck = [ "tailer" ];
meta = with lib; {
description = "Python implementation implementation of GNU tail and head";
homepage = "https://github.com/six8/pytailer";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

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

@ -0,0 +1,30 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, untokenize
, python
}:
buildPythonPackage rec {
pname = "unify";
version = "0.5";
# PyPi release is missing tests (see https://github.com/myint/unify/pull/18)
src = fetchFromGitHub {
owner = "myint";
repo = "unify";
rev = "v${version}";
sha256 = "1l6xxygaigacsxf0g5f7w5gpqha1ava6mcns81kqqy6vw91pyrbi";
};
propagatedBuildInputs = [ untokenize ];
checkPhase = "${python.interpreter} -m unittest discover";
meta = with lib; {
description = "Modifies strings to all use the same quote where possible";
homepage = "https://github.com/myint/unify";
license = licenses.mit;
maintainers = with maintainers; [ FlorianFranzen ];
};
}

24
pkgs/development/python-modules/untokenize/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ lib
, buildPythonPackage
, fetchPypi
, python
}:
buildPythonPackage rec {
pname = "untokenize";
version = "0.1.1";
src = fetchPypi {
inherit pname version;
sha256 = "3865dbbbb8efb4bb5eaa72f1be7f3e0be00ea8b7f125c69cbd1f5fda926f37a2";
};
checkPhase = "${python.interpreter} -m unittest discover";
meta = with lib; {
description = "Transforms tokens into original source code while preserving whitespace";
homepage = "https://github.com/myint/untokenize";
license = licenses.mit;
maintainers = with maintainers; [ FlorianFranzen ];
};
}

4
pkgs/development/tools/continuous-integration/jenkins/default.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "jenkins";
version = "2.277.2";
version = "2.277.3";
src = fetchurl {
url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
sha256 = "08lv5v5kxp9ln798gjmh8j9a8r8xc471fbhiz2l7gxncpxn50ga2";
sha256 = "1awixb55bkpqcvf2s59aph3kxdd70g9x1a5s5kly33kwrplcf8iy";
};
buildCommand = ''

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

@ -187,7 +187,7 @@
"doorbird" = ps: with ps; [ aiohttp-cors ]; # missing inputs: doorbirdpy
"dovado" = ps: with ps; [ ]; # missing inputs: dovado
"downloader" = ps: with ps; [ ];
"dsmr" = ps: with ps; [ ]; # missing inputs: dsmr_parser
"dsmr" = ps: with ps; [ dsmr-parser ];
"dsmr_reader" = ps: with ps; [ aiohttp-cors paho-mqtt ];
"dte_energy_bridge" = ps: with ps; [ ];
"dublin_bus_transport" = ps: with ps; [ ];
@ -373,7 +373,7 @@
"hunterdouglas_powerview" = ps: with ps; [ ]; # missing inputs: aiopvapi
"hvv_departures" = ps: with ps; [ ]; # missing inputs: pygti
"hydrawise" = ps: with ps; [ hydrawiser ];
"hyperion" = ps: with ps; [ ]; # missing inputs: hyperion-py
"hyperion" = ps: with ps; [ hyperion-py ];
"iammeter" = ps: with ps; [ ]; # missing inputs: iammeter
"iaqualink" = ps: with ps; [ iaqualink ];
"icloud" = ps: with ps; [ pyicloud ];

2
pkgs/servers/home-assistant/default.nix
View File

@ -236,6 +236,7 @@ in with py.pkgs; buildPythonApplication rec {
"devolo_home_control"
"dhcp"
"discovery"
"dsmr"
"econet"
"emulated_hue"
"esphome"
@ -269,6 +270,7 @@ in with py.pkgs; buildPythonApplication rec {
"html5"
"http"
"hue"
"hyperion"
"iaqualink"
"ifttt"
"image"

8
pkgs/tools/package-management/nix-update/default.nix
View File

@ -3,21 +3,23 @@
, fetchFromGitHub
, nixFlakes
, nix-prefetch
, nixpkgs-fmt
, nixpkgs-review
}:
buildPythonApplication rec {
pname = "nix-update";
version = "0.3.2";
version = "0.4.0";
src = fetchFromGitHub {
owner = "Mic92";
repo = pname;
rev = version;
sha256 = "1ykxr0yah7zl06igm7wiji9zx3y0xpjc37hbfhn6gnir6ssa0kqp";
sha256 = "sha256-n3YuNypKFaBtO5Fhf7Z3Wgh0+WH5bQWR0W0uHCYKtuY=";
};
makeWrapperArgs = [
"--prefix" "PATH" ":" (lib.makeBinPath [ nixFlakes nix-prefetch ])
"--prefix" "PATH" ":" (lib.makeBinPath [ nixFlakes nix-prefetch nixpkgs-fmt nixpkgs-review ])
];
checkPhase = ''

4
pkgs/top-level/all-packages.nix
View File

@ -1744,6 +1744,8 @@ in
bindfs = callPackage ../tools/filesystems/bindfs { };
binwalk = with python3Packages; toPythonApplication binwalk;
birdtray = libsForQt5.callPackage ../applications/misc/birdtray { };
bitbucket-cli = python2Packages.bitbucket-cli;
@ -3456,6 +3458,8 @@ in
unifdef = callPackage ../development/tools/misc/unifdef { };
unify = with python3Packages; toPythonApplication unify;
unionfs-fuse = callPackage ../tools/filesystems/unionfs-fuse { };
usb-modeswitch = callPackage ../development/tools/misc/usb-modeswitch { };

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

@ -2031,6 +2031,8 @@ in {
ds-store = callPackage ../development/python-modules/ds-store { };
ds4drv = callPackage ../development/python-modules/ds4drv { };
dsmr-parser = callPackage ../development/python-modules/dsmr-parser { };
duckdb = callPackage ../development/python-modules/duckdb {
inherit (pkgs) duckdb;
@ -3085,6 +3087,8 @@ in {
hyperframe = callPackage ../development/python-modules/hyperframe { };
hyperion-py = callPackage ../development/python-modules/hyperion-py { };
hyperkitty = callPackage ../servers/mail/mailman/hyperkitty.nix { };
hyperlink = callPackage ../development/python-modules/hyperlink { };
@ -7711,6 +7715,8 @@ in {
tahoma-api = callPackage ../development/python-modules/tahoma-api { };
tailer = callPackage ../development/python-modules/tailer { };
tasklib = callPackage ../development/python-modules/tasklib { };
taskw = callPackage ../development/python-modules/taskw { };
@ -8130,6 +8136,8 @@ in {
unifi = callPackage ../development/python-modules/unifi { };
unify = callPackage ../development/python-modules/unify { };
unifiled = callPackage ../development/python-modules/unifiled { };
units = callPackage ../development/python-modules/units { };
@ -8148,6 +8156,8 @@ in {
untangle = callPackage ../development/python-modules/untangle { };
untokenize = callPackage ../development/python-modules/untokenize { };
upass = callPackage ../development/python-modules/upass { };
update_checker = callPackage ../development/python-modules/update_checker { };