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

Merge branch 'master' into staging-next

Browse Source 
Conflicts:
	pkgs/tools/networking/inetutils/default.nix
This commit is contained in:
Dmitry Kalinkin 2021-08-26 00:57:08 -04:00
commit 262fd63a72
No known key found for this signature in database
GPG Key ID: 5157B3EC8B2CA333
64 changed files with 286 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/languages-frameworks/beam.section.md
View File

@ -212,7 +212,7 @@ in
Usually, we need to create a `shell.nix` file and do our development inside of the environment specified therein. Just install your version of Erlang and any other interpreters, and then use your normal build tools. As an example with Elixir:
```nix
{ pkgs ? import "<nixpkgs"> {} }:
{ pkgs ? import <nixpkgs> {} }:
with pkgs;

12
maintainers/maintainer-list.nix
View File

@ -5314,6 +5314,12 @@
githubId = 20675;
name = "Joël Perras";
};
jpetrucciani = {
email = "j@cobi.dev";
github = "jpetrucciani";
githubId = 8117202;
name = "Jacobi Petrucciani";
};
jpierre03 = {
email = "nix@prunetwork.fr";
github = "jpierre03";
@ -9730,6 +9736,12 @@
githubId = 1567527;
name = "Sebastian Hyberts";
};
sebbel = {
email = "hej@sebastian-ball.de";
github = "sebbel";
githubId = 1940568;
name = "Sebastian Ball";
};
sebtm = {
email = "mail@sebastian-sellmeier.de";
github = "sebtm";

1
nixos/modules/module-list.nix
View File

@ -121,6 +121,7 @@
./programs/bash-my-aws.nix
./programs/bcc.nix
./programs/browserpass.nix
./programs/calls.nix
./programs/captive-browser.nix
./programs/ccache.nix
./programs/cdemu.nix

25
nixos/modules/programs/calls.nix Normal file
View File

@ -0,0 +1,25 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.programs.calls;
in {
options = {
programs.calls = {
enable = mkEnableOption ''
Whether to enable GNOME calls: a phone dialer and call handler.
'';
};
};
config = mkIf cfg.enable {
environment.systemPackages = [
pkgs.calls
];
services.dbus.packages = [
pkgs.callaudiod
];
};
}

2
nixos/modules/tasks/filesystems.nix
View File

@ -264,6 +264,8 @@ in
#
# To make changes, edit the fileSystems and swapDevices NixOS options
# in your /etc/nixos/configuration.nix file.
#
# <file system> <mount point> <type> <options> <dump> <pass>
# Filesystems.
${concatMapStrings (fs:

2
pkgs/applications/graphics/hydrus/default.nix
View File

@ -17,7 +17,7 @@ python3Packages.buildPythonPackage rec {
owner = "hydrusnetwork";
repo = "hydrus";
rev = "v${version}";
sha256 = "sha256-CSWrmjJ6lFQ6tG403Uf+VAOfvBd1oAhd2kTU/7XA3f0=";
sha256 = "1zzrw1fbbbayq322346dqb3a8bzb3xnx1qmdciq01dmlbc3bmza1";
};
nativeBuildInputs = [

1
pkgs/applications/networking/calls/default.nix
View File

@ -94,6 +94,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A phone dialer and call handler";
longDescription = "GNOME Calls is a phone dialer and call handler. Setting NixOS option `programs.calls.enable = true` is recommended.";
homepage = "https://source.puri.sm/Librem5/calls";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ craigem lheckemann ];

10
pkgs/applications/networking/cluster/argocd/default.nix
View File

@ -2,18 +2,18 @@
buildGoModule rec {
pname = "argocd";
version = "2.0.5";
commit = "4c94d886f56bcb2f9d5b3251fdc049c2d1354b88";
version = "2.1.1";
commit = "57abbf95ed160c88b2634ec4d37df9555cc74fb3";
tag = "v${version}";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo-cd";
rev = tag;
sha256 = "sha256-8YymSR15e+6gGGqr5CH4ERHN8RO3wd9NJkM9K7InlFU=";
sha256 = "0jh7kh4751kb7439vbbh5f03kcy56phdcvzypjw8n0w239n5xmmc";
};
vendorSha256 = "sha256-9dVkGl0gjjMehG2nt1eNpNT5fD9GbJ1mNMzYS8FTm08=";
vendorSha256 = "sha256-KtLEN66Q5WpCi+COId+gPu2XHcs5/D04rYLHV6XohzQ=";
nativeBuildInputs = [ packr makeWrapper installShellFiles ];
@ -46,7 +46,7 @@ buildGoModule rec {
doInstallCheck = true;
installCheckPhase = ''
$out/bin/argocd version --client | grep ${tag} > /dev/null
$out/bin/argocd-util version | grep ${tag} > /dev/null
$out/bin/argocd-util version --client | grep ${tag} > /dev/null
'';
installPhase = ''

6
pkgs/applications/networking/seaweedfs/default.nix
View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "seaweedfs";
version = "2.56";
version = "2.63";
src = fetchFromGitHub {
owner = "chrislusf";
repo = "seaweedfs";
rev = version;
sha256 = "1y9abk2i0qk5c00dnw8wvasy7dmmy6az8d1cf9bq0dwh8g8kylbn";
sha256 = "sha256-sC7BUbI4BcNp7XqNtgxHuzvksyVFP+gXHxldQPy/7UU=";
};
vendorSha256 = "015qvd0h786z1iwv81i107z92mqhzldp1hkcsp75wzf4j7nmzxvf";
vendorSha256 = "sha256-PEMc2NUiGKaolVGwviNRvtpVyhypWsJlNWZ0ysjy+YE=";
subPackages = [ "weed" ];

4
pkgs/applications/office/zotero/default.nix
View File

@ -36,11 +36,11 @@
stdenv.mkDerivation rec {
pname = "zotero";
version = "5.0.96.2";
version = "5.0.96.3";
src = fetchurl {
url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
sha256 = "sha256-ZT+qxNLjdG29DhyV0JXtgDHDi2gYPyKrZwgJOro5III=";
sha256 = "sha256-eqSNzmkGNopGJ7VByvUffFEPJz3WHS7b5+jgUAW/hU4=";
};
nativeBuildInputs = [ wrapGAppsHook ];

2
pkgs/applications/science/biology/stacks/default.nix
View File

@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
description = "Software pipeline for building loci from short-read sequences";
homepage = "http://catchenlab.life.illinois.edu/stacks/";
maintainers = [ lib.maintainers.bzizou ];
license = lib.licenses.gpl3;
license = lib.licenses.gpl3Plus;
};
}

4
pkgs/applications/version-management/sourcehut/core.nix
View File

@ -16,7 +16,7 @@
, cryptography
, beautifulsoup4
, sqlalchemy-utils
, prometheus_client
, prometheus-client
, celery
, alembic
, importlib-metadata
@ -70,7 +70,7 @@ buildPythonPackage rec {
cryptography
beautifulsoup4
sqlalchemy-utils
prometheus_client
prometheus-client
# Unofficial runtime dependencies?
celery

4
pkgs/applications/version-management/sourcehut/meta.nix
View File

@ -14,7 +14,7 @@
, dnspython
, sshpubkeys
, weasyprint
, prometheus_client
, prometheus-client
, python
}:
let
@ -52,7 +52,7 @@ buildPythonPackage rec {
pystache
sshpubkeys
weasyprint
prometheus_client
prometheus-client
dnspython
];

4
pkgs/build-support/vm/default.nix
View File

@ -494,7 +494,9 @@ rec {
tarball must contain an RPM specfile. */
buildRPM = attrs: runInLinuxImage (stdenv.mkDerivation ({
phases = "prepareImagePhase sysInfoPhase buildPhase installPhase";
prePhases = [ prepareImagePhase sysInfoPhase ];
dontUnpack = true;
dontConfigure = true;
outDir = "rpms/${attrs.diskImage.name}";

4
pkgs/build-support/vm/test.nix
View File

@ -1,4 +1,4 @@
with import ../../.. {};
with import ../../.. { };
with vmTools;
{
@ -30,7 +30,7 @@ with vmTools;
src = patchelf.src;
diskImage = diskImages.ubuntu1204i386;
memSize = 512;
phases = "sysInfoPhase unpackPhase patchPhase configurePhase buildPhase checkPhase installPhase fixupPhase distPhase";
prePhases = [ sysInfoPhase ];
sysInfoPhase = ''
dpkg-query --list
'';

4
pkgs/development/interpreters/clojure/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "clojure";
version = "1.10.3.933";
version = "1.10.3.943";
src = fetchurl {
# https://clojure.org/releases/tools
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
sha256 = "sha256-xsm0/HNWr8a/7iLQVC9TbUkASWvw/EI3bD0dMDhLZXA=";
sha256 = "sha256-w3DRvZsie22uoJMrNQTxN5hW0pIFjH5zAw5Z41I1M/s=";
};
nativeBuildInputs = [

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

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "cglm";
version = "0.8.3";
version = "0.8.4";
src = fetchFromGitHub {
owner = "recp";
repo = "cglm";
rev = "v${version}";
sha256 = "0crzkxan3kivyah225md5c65zglg5c1cgrsmwhvp51hmrpmxss5v";
sha256 = "sha256-AJK1M6iyYdL61pZQhbUWzf+YOUE5FEvUyKqxbQqc7H0=";
};
nativeBuildInputs = [ cmake ];

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

@ -19,13 +19,13 @@
stdenv.mkDerivation (rec {
pname = "folly";
version = "2021.08.02.00";
version = "2021.08.23.00";
src = fetchFromGitHub {
owner = "facebook";
repo = "folly";
rev = "v${version}";
sha256 = "sha256-Y2CqPlhbfC++udbbURnI9mvRZswC8kmikp1HY0qJz4k=";
sha256 = "sha256-B+J4h12jjusA15+QRR3egmUEwYRrnegtEWMuQX+QuJk=";
};
nativeBuildInputs = [

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

@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
pname = "libupnp";
version = "1.14.8";
version = "1.14.10";
outputs = [ "out" "dev" ];
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
owner = "pupnp";
repo = "pupnp";
rev = "release-${version}";
sha256 = "sha256-Ipgb7fpIT+P/LwcF8ZmW4C1lj57f5rOQXwUl1Kh/oD8=";
sha256 = "sha256-QlV5V1+VPj/C0M3XgwVIJbxzVXfSvP6yMcJz9al6a+U=";
};
nativeBuildInputs = [

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "aioesphomeapi";
version = "7.0.0";
version = "8.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "esphome";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ho/1fpq4yAgmYNERPqs51oqr08ncaN9+GRTUUuGU7ps=";
sha256 = "sha256-fd77sbtgEhExV/d/LHkF9sheVz7G2SrNXyZsMNeJ4UY=";
};
propagatedBuildInputs = [

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

@ -6,7 +6,7 @@
, mock
, pytz
, tornado
, prometheus_client
, prometheus-client
, pytestCheckHook
}:
@ -30,7 +30,7 @@ buildPythonPackage rec {
pytz
tornado
humanize
prometheus_client
prometheus-client
];
checkInputs = [

7
pkgs/development/python-modules/gradient-utils/default.nix
View File

@ -5,7 +5,7 @@
, mock
, numpy
, poetry-core
, prometheus_client
, prometheus-client
, pytestCheckHook
, requests
}:
@ -26,14 +26,15 @@ buildPythonPackage rec {
substituteInPlace pyproject.toml \
--replace 'numpy = "1.18.5"' 'numpy = "^1.18.5"' \
--replace 'hyperopt = "0.1.2"' 'hyperopt = ">=0.1.2"' \
--replace 'wheel = "^0.35.1"' 'wheel = "*"'
--replace 'wheel = "^0.35.1"' 'wheel = "*"' \
--replace 'prometheus-client = ">=0.8,<0.10"' 'prometheus-client = "*"'
'';
nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [
hyperopt
prometheus_client
prometheus-client
numpy
];

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

@ -17,7 +17,7 @@
, nbconvert
, send2trash
, terminado
, prometheus_client
, prometheus-client
, anyio
, websocket-client
, requests
@ -46,7 +46,7 @@ buildPythonPackage rec {
nbconvert
send2trash
terminado
prometheus_client
prometheus-client
anyio
websocket-client
];

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

@ -13,7 +13,7 @@
, jupyter-telemetry
, oauthlib
, pamela
, prometheus_client
, prometheus-client
, requests
, sqlalchemy
, tornado
@ -121,7 +121,7 @@ buildPythonPackage rec {
jupyter-telemetry
oauthlib
pamela
prometheus_client
prometheus-client
requests
sqlalchemy
tornado

6
pkgs/development/python-modules/karton-dashboard/default.nix
View File

@ -4,7 +4,7 @@
, flask
, karton-core
, mistune
, prometheus_client
, prometheus-client
}:
buildPythonPackage rec {
@ -22,13 +22,13 @@ buildPythonPackage rec {
flask
karton-core
mistune
prometheus_client
prometheus-client
];
postPatch = ''
substituteInPlace requirements.txt \
--replace "Flask==1.1.1" "Flask" \
--replace "prometheus_client==0.9.0" "prometheus-client"
--replace "prometheus-client==0.9.0" "prometheus-client"
'';
# Project has no tests. pythonImportsCheck requires MinIO configuration

4
pkgs/development/python-modules/notebook/2.nix
View File

@ -20,7 +20,7 @@
, requests
, send2trash
, pexpect
, prometheus_client
, prometheus-client
}:
buildPythonPackage rec {
@ -40,7 +40,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
jinja2 tornado ipython_genutils traitlets jupyter_core send2trash
jupyter_client nbformat nbconvert ipykernel terminado requests pexpect
prometheus_client
prometheus-client
];
# disable warning_filters

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

@ -21,7 +21,7 @@
, requests
, send2trash
, pexpect
, prometheus_client
, prometheus-client
, pytestCheckHook
}:
@ -43,7 +43,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
jinja2 tornado ipython_genutils traitlets jupyter_core send2trash
jupyter_client nbformat nbconvert ipykernel terminado requests pexpect
prometheus_client argon2_cffi
prometheus-client argon2_cffi
];
# disable warning_filters

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

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "phonopy";
version = "2.10.0";
version = "2.11.0";
src = fetchPypi {
inherit pname version;
sha256 = "58485042ab7d88fc8b83744d18b2aefd677adb071c8a717ac3710458192743d7";
sha256 = "2ab47d3eb53a5265f3567974d29760b510b3312217358b76efc27ade9bd1a9f0";
};
propagatedBuildInputs = [

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

@ -4,12 +4,12 @@
buildPythonPackage rec {
pname = "premailer";
version = "3.9.0";
version = "3.10.0";
disabled = isPy27; # no longer compatible with urllib
src = fetchPypi {
inherit pname version;
sha256 = "da18b9e8cb908893b67ab9b7451276fef7c0ab179f40189378545f6bb0ab3695";
sha256 = "d1875a8411f5dc92b53ef9f193db6c0f879dc378d618e0ad292723e388bfe4c2";
};
buildInputs = [ mock nose ];

29
pkgs/development/python-modules/prometheus-client/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "prometheus-client";
version = "0.11.0";
src = fetchFromGitHub {
owner = "prometheus";
repo = "client_python";
rev = "v${version}";
sha256 = "14swmy4dgpk6cyjsm2advgc2c8api7xaca1sl7swznblh5fyzgzg";
};
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "prometheus_client" ];
meta = with lib; {
description = "Prometheus instrumentation library for Python applications";
homepage = "https://github.com/prometheus/client_python";
license = licenses.asl20;
};
}

4
pkgs/development/python-modules/prometheus-flask-exporter/default.nix
View File

@ -2,7 +2,7 @@
, buildPythonPackage
, fetchFromGitHub
, flask
, prometheus_client
, prometheus-client
, pytestCheckHook
}:
@ -17,7 +17,7 @@ buildPythonPackage rec {
sha256 = "1dwisp681w0f6zf0000rxd3ksdb48zb9mr38qfdqk2ir24y8w370";
};
propagatedBuildInputs = [ flask prometheus_client ];
propagatedBuildInputs = [ flask prometheus-client ];
checkInputs = [ pytestCheckHook ];
pytestFlagsArray = [ "tests/" ];

19
pkgs/development/python-modules/prometheus_client/default.nix
View File

@ -1,19 +0,0 @@
{ lib, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "prometheus_client";
version = "0.11.0";
src = fetchPypi {
inherit pname version;
sha256 = "3a8baade6cb80bcfe43297e33e7623f3118d660d41387593758e2fb1ea173a86";
};
doCheck = false;
meta = with lib; {
description = "Prometheus instrumentation library for Python applications";
homepage = "https://github.com/prometheus/client_python";
license = licenses.asl20;
};
}

4
pkgs/development/python-modules/py-air-control-exporter/default.nix
View File

@ -5,7 +5,7 @@
, flask
, isPy27
, nixosTests
, prometheus_client
, prometheus-client
, py-air-control
, pytestCheckHook
, setuptools-scm
@ -28,7 +28,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
click
flask
prometheus_client
prometheus-client
py-air-control
];

39
pkgs/development/python-modules/pyee/default.nix
View File

@ -1,28 +1,24 @@
{ buildPythonPackage
{ lib
, buildPythonPackage
, fetchPypi
, lib
, vcversioner
, pytest-runner
, mock
, pytest
, pytestCheckHook
, pytest-asyncio
, pytest-trio
, twisted
, zipp ? null
, pyparsing ? null
, pyhamcrest
, futures ? null
, attrs ? null
, isPy27
, pythonOlder
}:
buildPythonPackage rec {
pname = "pyee";
version = "8.1.0";
version = "8.2.2";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "92dacc5bd2bdb8f95aa8dd2585d47ca1c4840e2adb95ccf90034d64f725bfd31";
sha256 = "sha256-XH5g+N+VcQ2+F1UOFs4BU/g5kMAO90SEG0Pzce1T6+o=";
};
buildInputs = [
@ -31,23 +27,18 @@ buildPythonPackage rec {
checkInputs = [
mock
pyhamcrest
pytest
pytest-asyncio
pytest-trio
pytest-runner
pytestCheckHook
twisted
] ++ lib.optional isPy27 [
attrs
futures
pyparsing
zipp
];
meta = {
description = "A port of Node.js's EventEmitter to python";
pythonImportsCheck = [ "pyee" ];
meta = with lib; {
description = "A port of Node.js's EventEmitter to Python";
homepage = "https://github.com/jfhbrook/pyee";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ kmein ];
license = licenses.mit;
maintainers = with maintainers; [ kmein ];
};
}

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

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "pytools";
version = "2021.2.7";
version = "2021.2.8";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "0538f6fe7f00bf765ca5ab38518db48df72de818460006e54b0575accd24d9fb";
sha256 = "e11adc4914d805ac2bd02656fc6c0ec57c29dd305bd4a44122ca4e651a4bba8b";
};
checkInputs = [ pytest ];

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

@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "ripser";
version = "0.6.0";
version = "0.6.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "5c47deffbf9e163186b0997f2d59486d96a7c65766e76500f754fadfbc89f5d9";
sha256 = "335112a0f94532ccbe686db7826ee8d0714b32f65891abf92c0a02f3cb0fc5fd";
};
checkInputs = [

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

@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "sopel";
version = "7.1.2";
version = "7.1.3";
disabled = isPyPy;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-8RhIw3Qt0BclH1Ws16JNuFfwiRxJ14lM6MBUK9OvNKA=";
sha256 = "0f9e673a7eac9dd3619c2e398e58fa2d8117afca5adb550ba07c66e16a90dbdb";
};
propagatedBuildInputs = [

6
pkgs/development/tools/buf/default.nix
View File

@ -9,15 +9,15 @@
buildGoModule rec {
pname = "buf";
version = "0.51.1";
version = "0.52.0";
src = fetchFromGitHub {
owner = "bufbuild";
repo = pname;
rev = "v${version}";
sha256 = "sha256-iFSmanP+2PgmOXtubDdLfa+AIQSAWHFNpyB1IP6IF5I=";
sha256 = "sha256-WFL+ztFR8kV6cRY1Ax2TheH+xpA58CLnW69jDpMhe3M=";
};
vendorSha256 = "sha256-0rVHINb04GZlH6DSjMt/h7UdNtZJERAyO1S99rAxUyY=";
vendorSha256 = "sha256-vbphThpEYDDm1iipcY0QXhKKuLSD87sAxiIUi7SfrAc=";
patches = [
# Skip a test that requires networking to be available to work.

6
pkgs/development/tools/cloud-nuke/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "cloud-nuke";
version = "0.4.0";
version = "0.5.0";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
sha256 = "sha256-eua+/bfKuIG1TuoC0tA4+O0H2D+u8AbcJIFLDIbzVYg=";
sha256 = "sha256-PVVnls4i19Xc5KXM1AQTHLkxLgmJpIDBFkRW0EGXOUA=";
};
vendorSha256 = "sha256-+rr9TDRIYta0ejOE48O+nZDluvqvSTuGBpRBPZifazA=";
vendorSha256 = "sha256-C9UGpm8JBLQpSFQkvib5Bmn3J88LxUNt4ELJXL4ZQ80=";
buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ];

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

@ -658,7 +658,7 @@
"profiler" = ps: with ps; [ guppy3 objgraph pyprof2calltree ];
"progettihwsw" = ps: with ps; [ ]; # missing inputs: progettihwsw
"proliphix" = ps: with ps; [ ]; # missing inputs: proliphix
"prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ];
"prometheus" = ps: with ps; [ aiohttp-cors prometheus-client ];
"prosegur" = ps: with ps; [ pyprosegur ];
"prowl" = ps: with ps; [ ];
"proximity" = ps: with ps; [ ];

2
pkgs/servers/matrix-synapse/default.nix
View File

@ -40,7 +40,7 @@ buildPythonApplication rec {
netaddr
phonenumbers
pillow
prometheus_client
prometheus-client
psutil
psycopg2
pyasn1

2
pkgs/servers/mautrix-signal/default.nix
View File

@ -19,7 +19,7 @@ python3.pkgs.buildPythonPackage rec {
mautrix
phonenumbers
pillow
prometheus_client
prometheus-client
pycryptodome
python-olm
python_magic

2
pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix
View File

@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
})
];
propagatedBuildInputs = with python3Packages; [ prometheus_client bitcoinlib riprova ];
propagatedBuildInputs = with python3Packages; [ prometheus-client bitcoinlib riprova ];
installPhase = ''
mkdir -p $out/bin

2
pkgs/servers/monitoring/prometheus/kea-exporter.nix
View File

@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec {
propagatedBuildInputs = with python3Packages; [
click
prometheus_client
prometheus-client
];
checkPhase = ''

2
pkgs/servers/monitoring/prometheus/knot-exporter.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
install -Dm0755 knot_exporter $out/bin/knot_exporter
patchShebangs $out/bin
buildPythonPath ${python3.pkgs.prometheus_client}
buildPythonPath ${python3.pkgs.prometheus-client}
patchPythonScript $out/bin/knot_exporter
runHook postInstall

2
pkgs/servers/monitoring/prometheus/tor-exporter.nix
View File

@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
sha256 = "1gzf42z0cgdqijbi9cwpjkqzkvnabaxkkfa5ac5h27r3pxx3q4n0";
};
propagatedBuildInputs = with python3Packages; [ prometheus_client stem retrying ];
propagatedBuildInputs = with python3Packages; [ prometheus-client stem retrying ];
installPhase = ''
mkdir -p $out/share/

2
pkgs/servers/monitoring/prometheus/xmpp-alerts.nix
View File

@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
] ++ (with python3Packages; [
aiohttp
slixmpp
prometheus_client
prometheus-client
pyyaml
]);

10
pkgs/servers/web-apps/matomo/default.nix
View File

@ -3,16 +3,16 @@
let
versions = {
matomo = {
version = "4.3.1";
sha256 = "Ve4P1cVV/uZ59BcQaUZLTTOwpjX7veof9jR0l3Y9xOQ=";
version = "4.4.1";
sha256 = "0y8ljdj97znvd3hkkr7s6s9k8m93agw3z9cfw1azzaxgc46akfcl";
};
matomo-beta = {
version = "4.3.1";
version = "4.4.1";
# `beta` examples: "b1", "rc1", null
# TOOD when updating: use null if stable version is >= latest beta or release candidate
beta = null;
sha256 = "Ve4P1cVV/uZ59BcQaUZLTTOwpjX7veof9jR0l3Y9xOQ=";
sha256 = "0y8ljdj97znvd3hkkr7s6s9k8m93agw3z9cfw1azzaxgc46akfcl";
};
};
common = pname: { version, sha256, beta ? null }:
@ -102,7 +102,7 @@ let
license = licenses.gpl3Plus;
homepage = "https://matomo.org/";
platforms = platforms.all;
maintainers = with maintainers; [ florianjacob kiwi ];
maintainers = with maintainers; [ florianjacob kiwi sebbel ];
};
};
in

2
pkgs/servers/xandikos/default.nix
View File

@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
icalendar
jinja2
multidict
prometheus_client
prometheus-client
];
passthru.tests.xandikos = nixosTests.xandikos;

6
pkgs/shells/nushell/default.nix
View File

@ -18,16 +18,16 @@
rustPlatform.buildRustPackage rec {
pname = "nushell";
version = "0.35.0";
version = "0.36.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "0p5whwx6wk9k7mrxhr7azrppbj9mv53hd4bl1cgygxz231aq8337";
sha256 = "sha256-5vBt0Q7f3ydo74cmY4WpIHqMlNYc0Tl35d0DnWUQZbU=";
};
cargoSha256 = "0xs0s02zf78pgd94ifh465mg14rrwjfg7qbzmmq8jha758gfwdi3";
cargoSha256 = "sha256-F3niVkZbg84cFEY0eGgmMAMEJ+eBHwDS2+3EFRR2fLY=";
nativeBuildInputs = [ pkg-config ]
++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ];

33
pkgs/tools/admin/ossutil/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
buildGoModule rec {
version = "1.7.6";
pname = "ossutil";
src = fetchFromGitHub {
owner = "aliyun";
repo = "ossutil";
rev = version;
sha256 = "1hkdk0hidnm7vz320i7s4z7jngx2j70acc93agii2b3r2bb91l3d";
};
# this patch is required to add go mods to fetch dependencies
patches = [
(fetchpatch {
url = "https://github.com/aliyun/ossutil/commit/64067e979fb24ffb198a0c4eca718e81b63f514e.patch";
sha256 = "2pn0BcbNNL+iMema54LRpG/ca5kyDugLIZQ/TMhYG/8=";
})
];
vendorSha256 = "lem9Jg4Ywv3qcIwhiZHNi1VH5HxxNr6mnefOLCzPL70=";
# don't run tests as they require secret access keys that only travis has
doCheck = false;
meta = with lib; {
homepage = "https://github.com/aliyun/ossutil";
description = "A user friendly command line tool to access Alibaba Cloud OSS";
license = licenses.mit;
maintainers = with maintainers; [ jpetrucciani ];
};
}

2
pkgs/tools/compression/xdelta/default.nix
View File

@ -56,6 +56,6 @@ in stdenv.mkDerivation rec {
'';
homepage = "http://xdelta.org/";
license = licenses.gpl2Plus;
platforms = platforms.linux;
platforms = platforms.unix;
};
}

2
pkgs/tools/misc/fwup/default.nix
View File

@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
xdelta
];
doCheck = true;
doCheck = !stdenv.isDarwin;
meta = with lib; {
description = "Configurable embedded Linux firmware update creator and runner";

2
pkgs/tools/networking/dd-agent/integrations-core.nix
View File

@ -65,7 +65,7 @@ let
pname = "checks-base";
sourceRoot = "datadog_checks_base";
propagatedBuildInputs = with python.pkgs; [
requests protobuf prometheus_client uuid simplejson uptime
requests protobuf prometheus-client uuid simplejson uptime
];
};

10
pkgs/tools/networking/inetutils/default.nix
View File

@ -4,20 +4,20 @@
stdenv.mkDerivation rec {
pname = "inetutils";
version = "1.9.4";
version = "2.0";
src = fetchurl {
url = "mirror://gnu/inetutils/inetutils-${version}.tar.gz";
sha256 = "05n65k4ixl85dc6rxc51b1b732gnmm8xnqi424dy9f1nz7ppb3xy";
url = "mirror://gnu/inetutils/inetutils-${version}.tar.xz";
sha256 = "sha256-5XPVZuVTk5QAmYYuf4mUFkoO0S9ahsM0U4CEK9wSRyI=";
};
outputs = ["out" "apparmor"];
patches = [
./whois-Update-Canadian-TLD-server.patch
./service-name.patch
# https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3
./inetutils-1_9-PATH_PROCNET_DEV.patch
./whois-Update-ORG-TLD-server.patch
./whois-Update-Indian-TLD-server.patch
];
nativeBuildInputs = [ help2man perl /* for `whois' */ ];

11
pkgs/tools/networking/inetutils/service-name.patch
View File

@ -1,11 +0,0 @@
--- inetutils-1.9.4.org/whois/whois.c 2015-03-31 17:40:50.000000000 +0200
+++ inetutils-1.9.4/whois/whois.c 2017-04-20 10:23:38.487358708 +0200
@@ -576,7 +576,7 @@
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_STREAM;
- if ((i = getaddrinfo (server, port ? port : "whois", &hints, &res)) != 0)
+ if ((i = getaddrinfo (server, port ? port : "nicname", &hints, &res)) != 0)
err_quit ("getaddrinfo: %s", gai_strerror (i));
for (ressave = res; res; res = res->ai_next)

27
pkgs/tools/networking/inetutils/whois-Update-Canadian-TLD-server.patch
View File

@ -1,27 +0,0 @@
From 73e2811a0512556fd5359acc4387f46c79a9884a Mon Sep 17 00:00:00 2001
From: Mats Erik Andersson <gnu@gisladisker.se>
Date: Thu, 2 Mar 2017 15:38:38 +0100
Subject: [PATCH] whois: Update Canadian TLD server.
Content-Type: text/plain; charset=utf-8
---
ChangeLog | 8 ++++++++ (OMITTED)
whois/tld_serv_list | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/whois/tld_serv_list b/whois/tld_serv_list
index 056efcf..91697b8 100644
--- a/whois/tld_serv_list
+++ b/whois/tld_serv_list
@@ -81,7 +81,7 @@
#.bw # NIC? www.botsnet.bw
#.by NONE # NIC? http://unibel.by www.open.by
.bz NONE # http://www.psg.com/dns/bz/
-.ca whois.cdnnet.ca
+.ca whois.cira.ca
.cc whois.nic.cc
.cd WEB http://www.nic.cd/database/cd/
#.cf NONE # NIC? http://www.socatel.intnet.cf
--
2.10.0

25
pkgs/tools/networking/inetutils/whois-Update-Indian-TLD-server.patch Normal file
View File

@ -0,0 +1,25 @@
From 1d64e6ae8fa1ef685f3f54c070eb47e7a45895eb Mon Sep 17 00:00:00 2001
From: Ashish SHUKLA <ashish.is@lostca.se>
Date: Sun, 25 Apr 2021 08:17:52 +0530
Subject: [PATCH] whois: Update whois server for .IN
---
whois/tld_serv_list | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/whois/tld_serv_list b/whois/tld_serv_list
index d9257f36..41083c18 100644
--- a/whois/tld_serv_list
+++ b/whois/tld_serv_list
@@ -151,7 +151,7 @@
.ie whois.domainregistry.ie
.il whois.isoc.org.il
.im whois.nic.im
-.in whois.inregistry.net
+.in whois.registry.in
.io whois.nic.io
#.iq # NIC?
.ir whois.nic.ir
--
2.31.1

38
pkgs/tools/networking/inetutils/whois-Update-ORG-TLD-server.patch Normal file
View File

@ -0,0 +1,38 @@
From a7a517ca23682b160a2a3be47f1f3f262f8f306f Mon Sep 17 00:00:00 2001
From: Ashish SHUKLA <ashish.is@lostca.se>
Date: Sun, 25 Apr 2021 08:07:52 +0530
Subject: [PATCH 1/2] whois: .ORG is not handled by InterNIC anymore
See https://www.iana.org/domains/root/db/org.html
---
whois/data.h | 1 -
whois/tld_serv_list | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/whois/data.h b/whois/data.h
index d1eb10ad..82e22b6f 100644
--- a/whois/data.h
+++ b/whois/data.h
@@ -68,7 +68,6 @@ const char *rwhois_servers[] = {
const char *gtlds[] = {
".com",
".net",
- ".org",
".edu",
NULL
};
diff --git a/whois/tld_serv_list b/whois/tld_serv_list
index ad7b9826..d9257f36 100644
--- a/whois/tld_serv_list
+++ b/whois/tld_serv_list
@@ -219,6 +219,7 @@
.nu whois.nic.nu
.nz whois.srs.net.nz
#.om NONE # NIC? http://www.gto.net.om
+.org whois.pir.org
.pa WEB http://www.nic.pa
#.pe whois.rcp.net.pe # kero.yachay.pe valid 2011-03-10
.pe kero.yachay.pe
--
2.31.1

4
pkgs/tools/typesetting/bibclean/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bibclean";
version = "3.04";
version = "3.06";
src = fetchurl {
url = "http://ftp.math.utah.edu/pub/bibclean/bibclean-${version}.tar.xz";
sha256 = "0n5jb6w86y91q5lkcc9sb1kh4c2bk3q2va24gfr0n6v1jzyqp9jg";
sha256 = "sha256-ZXT5uAQrqPoF6uVBazc4o1w40Sn0jnM+JYeOz7qq3kM=";
};
postPatch = ''

8
pkgs/tools/virtualization/linode-cli/default.nix
View File

@ -12,23 +12,23 @@
let
# specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`.
specVersion = "4.101.0";
specVersion = "4.102.0";
spec = fetchurl {
url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml";
sha256 = "1l4xi82b2pvkj7p1bq26ax2ava5vnv324j5sw3hvkkqqf1fmpdl5";
sha256 = "16njk21gdk8r8a9v607ndw2rs0q6za9ylkgdxmix4j0zvrbrw0qv";
};
in
buildPythonApplication rec {
pname = "linode-cli";
version = "5.6.0";
version = "5.8.1";
src = fetchFromGitHub {
owner = "linode";
repo = pname;
rev = version;
sha256 = "sha256-AjO4h0PaE/QFwbwUVNoe98XOPZ24ct0mbLkua5/YsEA=";
sha256 = "19lfnwgm09gxk0mcikwl7v4hw2ai2k9lkdjlalz8fsswf81my7h6";
};
# remove need for git history

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

@ -3203,6 +3203,8 @@ with pkgs;
odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter {};
ossutil = callPackage ../tools/admin/ossutil {};
pastel = callPackage ../applications/misc/pastel {
inherit (darwin.apple_sdk.frameworks) Security;
};

3
pkgs/top-level/python-aliases.nix
View File

@ -54,7 +54,9 @@ mapAliases ({
HAP-python = hap-python; # added 2021-06-01
lammps-cython = throw "no longer builds and is unmaintained";
MechanicalSoup = mechanicalsoup; # added 2021-06-01
pam = python-pam; # added 2020-09-07.
privacyidea = throw "renamed to pkgs.privacyidea"; # added 2021-06-20
prometheus_client = prometheus-client; # added 2021-06-10
prompt_toolkit = prompt-toolkit;
pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20
pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04
@ -64,7 +66,6 @@ mapAliases ({
pytestquickcheck = pytest-quickcheck; # added 2021-07-20
pytestrunner = pytest-runner; # added 2021-01-04
python-lz4 = lz4; # added 2018-06-01
pam = python-pam; # added 2020-09-07.
pytest_xdist = pytest-xdist; # added 2021-01-04
python_simple_hipchat = python-simple-hipchat; # added 2021-07-21
qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09

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

@ -5669,7 +5669,7 @@ in {
progress = callPackage ../development/python-modules/progress { };
prometheus_client = callPackage ../development/python-modules/prometheus_client { };
prometheus-client = callPackage ../development/python-modules/prometheus-client { };
prometheus-flask-exporter = callPackage ../development/python-modules/prometheus-flask-exporter { };