commit 262fd63a721dfc2733c55b8db8b8d0881fc5c7c1 · pyrox.dev/nixpkgs

+1 -1

doc/languages-frameworks/beam.section.md

···

       212
       212
        
       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:

     

       213
       213
        
       

     

       214
       214
        
       ```nix

     

       215
       215
       -
       { pkgs ? import "<nixpkgs"> {} }:

     

       215
       215
       +
       { pkgs ? import <nixpkgs> {} }:

     

       216
       216
        
       

     

       217
       217
        
       with pkgs;

     

       218
       218

+12

maintainers/maintainer-list.nix

···

       5314
       5314
        
           githubId = 20675;

     

       5315
       5315
        
           name = "Joël Perras";

     

       5316
       5316
        
         };

     

       5317
       5317
       +
         jpetrucciani = {

     

       5318
       5318
       +
           email = "j@cobi.dev";

     

       5319
       5319
       +
           github = "jpetrucciani";

     

       5320
       5320
       +
           githubId = 8117202;

     

       5321
       5321
       +
           name = "Jacobi Petrucciani";

     

       5322
       5322
       +
         };

     

       5317
       5323
        
         jpierre03 = {

     

       5318
       5324
        
           email = "nix@prunetwork.fr";

     

       5319
       5325
        
           github = "jpierre03";

     
···

       9729
       9735
        
           github = "SEbbaDK";

     

       9730
       9736
        
           githubId = 1567527;

     

       9731
       9737
        
           name = "Sebastian Hyberts";

     

       9738
       9738
       +
         };

     

       9739
       9739
       +
         sebbel = {

     

       9740
       9740
       +
           email = "hej@sebastian-ball.de";

     

       9741
       9741
       +
           github = "sebbel";

     

       9742
       9742
       +
           githubId = 1940568;

     

       9743
       9743
       +
           name = "Sebastian Ball";

     

       9732
       9744
        
         };

     

       9733
       9745
        
         sebtm = {

     

       9734
       9746
        
           email = "mail@sebastian-sellmeier.de";

+1

nixos/modules/module-list.nix

···

       121
       121
        
         ./programs/bash-my-aws.nix

     

       122
       122
        
         ./programs/bcc.nix

     

       123
       123
        
         ./programs/browserpass.nix

     

       124
       124
       +
         ./programs/calls.nix

     

       124
       125
        
         ./programs/captive-browser.nix

     

       125
       126
        
         ./programs/ccache.nix

     

       126
       127
        
         ./programs/cdemu.nix

+25

nixos/modules/programs/calls.nix

···

       1
       1
       +
       { config, lib, pkgs, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
         cfg = config.programs.calls;

     

       7
       7
       +
       in {

     

       8
       8
       +
         options = {

     

       9
       9
       +
           programs.calls = {

     

       10
       10
       +
             enable = mkEnableOption ''

     

       11
       11
       +
               Whether to enable GNOME calls: a phone dialer and call handler.

     

       12
       12
       +
             '';

     

       13
       13
       +
           };

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         config = mkIf cfg.enable {

     

       17
       17
       +
           environment.systemPackages = [

     

       18
       18
       +
             pkgs.calls

     

       19
       19
       +
           ];

     

       20
       20
       +
       

     

       21
       21
       +
           services.dbus.packages = [

     

       22
       22
       +
             pkgs.callaudiod

     

       23
       23
       +
           ];

     

       24
       24
       +
         };

     

       25
       25
       +
       }

+2

nixos/modules/tasks/filesystems.nix

···

       264
       264
        
               #

     

       265
       265
        
               # To make changes, edit the fileSystems and swapDevices NixOS options

     

       266
       266
        
               # in your /etc/nixos/configuration.nix file.

     

       267
       267
       +
               #

     

       268
       268
       +
               # <file system> <mount point>   <type>  <options>       <dump>  <pass>

     

       267
       269
        
       

     

       268
       270
        
               # Filesystems.

     

       269
       271
        
               ${concatMapStrings (fs:

+1 -1

pkgs/applications/graphics/hydrus/default.nix

···

       17
       17
        
           owner = "hydrusnetwork";

     

       18
       18
        
           repo = "hydrus";

     

       19
       19
        
           rev = "v${version}";

     

       20
       20
       -
           sha256 = "sha256-CSWrmjJ6lFQ6tG403Uf+VAOfvBd1oAhd2kTU/7XA3f0=";

     

       20
       20
       +
           sha256 = "1zzrw1fbbbayq322346dqb3a8bzb3xnx1qmdciq01dmlbc3bmza1";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [

+1

pkgs/applications/networking/calls/default.nix

···

       94
       94
        
       

     

       95
       95
        
         meta = with lib; {

     

       96
       96
        
           description = "A phone dialer and call handler";

     

       97
       97
       +
           longDescription = "GNOME Calls is a phone dialer and call handler. Setting NixOS option `programs.calls.enable = true` is recommended.";

     

       97
       98
        
           homepage = "https://source.puri.sm/Librem5/calls";

     

       98
       99
        
           license = licenses.gpl3Plus;

     

       99
       100
        
           maintainers = with maintainers; [ craigem lheckemann ];

+5 -5

pkgs/applications/networking/cluster/argocd/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "argocd";

     

       5
       5
       -
         version = "2.0.5";

     

       6
       6
       -
         commit = "4c94d886f56bcb2f9d5b3251fdc049c2d1354b88";

     

       5
       5
       +
         version = "2.1.1";

     

       6
       6
       +
         commit = "57abbf95ed160c88b2634ec4d37df9555cc74fb3";

     

       7
       7
        
         tag = "v${version}";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "argoproj";

     

       11
       11
        
           repo = "argo-cd";

     

       12
       12
        
           rev = tag;

     

       13
       13
       -
           sha256 = "sha256-8YymSR15e+6gGGqr5CH4ERHN8RO3wd9NJkM9K7InlFU=";

     

       13
       13
       +
           sha256 = "0jh7kh4751kb7439vbbh5f03kcy56phdcvzypjw8n0w239n5xmmc";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       -
         vendorSha256 = "sha256-9dVkGl0gjjMehG2nt1eNpNT5fD9GbJ1mNMzYS8FTm08=";

     

       16
       16
       +
         vendorSha256 = "sha256-KtLEN66Q5WpCi+COId+gPu2XHcs5/D04rYLHV6XohzQ=";

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [ packr makeWrapper installShellFiles ];

     

       19
       19
        
       

     
···

       46
       46
        
         doInstallCheck = true;

     

       47
       47
        
         installCheckPhase = ''

     

       48
       48
        
           $out/bin/argocd version --client | grep ${tag} > /dev/null

     

       49
       49
       -
           $out/bin/argocd-util version | grep ${tag} > /dev/null

     

       49
       49
       +
           $out/bin/argocd-util version --client | grep ${tag} > /dev/null

     

       50
       50
        
         '';

     

       51
       51
        
       

     

       52
       52
        
         installPhase = ''

+3 -3

pkgs/applications/networking/seaweedfs/default.nix

···

       7
       7
        
       

     

       8
       8
        
       buildGoModule rec {

     

       9
       9
        
         pname = "seaweedfs";

     

       10
       10
       -
         version = "2.56";

     

       10
       10
       +
         version = "2.63";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "chrislusf";

     

       14
       14
        
           repo = "seaweedfs";

     

       15
       15
        
           rev = version;

     

       16
       16
       -
           sha256 = "1y9abk2i0qk5c00dnw8wvasy7dmmy6az8d1cf9bq0dwh8g8kylbn";

     

       16
       16
       +
           sha256 = "sha256-sC7BUbI4BcNp7XqNtgxHuzvksyVFP+gXHxldQPy/7UU=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         vendorSha256 = "015qvd0h786z1iwv81i107z92mqhzldp1hkcsp75wzf4j7nmzxvf";

     

       19
       19
       +
         vendorSha256 = "sha256-PEMc2NUiGKaolVGwviNRvtpVyhypWsJlNWZ0ysjy+YE=";

     

       20
       20
        
       

     

       21
       21
        
         subPackages = [ "weed" ];

     

       22
       22

+2 -2

pkgs/applications/office/zotero/default.nix

···

       36
       36
        
       

     

       37
       37
        
       stdenv.mkDerivation rec {

     

       38
       38
        
         pname = "zotero";

     

       39
       39
       -
         version = "5.0.96.2";

     

       39
       39
       +
         version = "5.0.96.3";

     

       40
       40
        
       

     

       41
       41
        
         src = fetchurl {

     

       42
       42
        
           url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";

     

       43
       43
       -
           sha256 = "sha256-ZT+qxNLjdG29DhyV0JXtgDHDi2gYPyKrZwgJOro5III=";

     

       43
       43
       +
           sha256 = "sha256-eqSNzmkGNopGJ7VByvUffFEPJz3WHS7b5+jgUAW/hU4=";

     

       44
       44
        
         };

     

       45
       45
        
       

     

       46
       46
        
         nativeBuildInputs = [ wrapGAppsHook ];

+1 -1

pkgs/applications/science/biology/stacks/default.nix

···

       14
       14
        
           description = "Software pipeline for building loci from short-read sequences";

     

       15
       15
        
           homepage = "http://catchenlab.life.illinois.edu/stacks/";

     

       16
       16
        
           maintainers = [ lib.maintainers.bzizou ];

     

       17
       17
       -
           license = lib.licenses.gpl3;

     

       17
       17
       +
           license = lib.licenses.gpl3Plus;

     

       18
       18
        
         };

     

       19
       19
        
       }

+2 -2

pkgs/applications/version-management/sourcehut/core.nix

···

       16
       16
        
       , cryptography

     

       17
       17
        
       , beautifulsoup4

     

       18
       18
        
       , sqlalchemy-utils

     

       19
       19
       -
       , prometheus_client

     

       19
       19
       +
       , prometheus-client

     

       20
       20
        
       , celery

     

       21
       21
        
       , alembic

     

       22
       22
        
       , importlib-metadata

     
···

       70
       70
        
           cryptography

     

       71
       71
        
           beautifulsoup4

     

       72
       72
        
           sqlalchemy-utils

     

       73
       73
       -
           prometheus_client

     

       73
       73
       +
           prometheus-client

     

       74
       74
        
       

     

       75
       75
        
           # Unofficial runtime dependencies?

     

       76
       76
        
           celery

+2 -2

pkgs/applications/version-management/sourcehut/meta.nix

···

       14
       14
        
       , dnspython

     

       15
       15
        
       , sshpubkeys

     

       16
       16
        
       , weasyprint

     

       17
       17
       -
       , prometheus_client

     

       17
       17
       +
       , prometheus-client

     

       18
       18
        
       , python

     

       19
       19
        
       }:

     

       20
       20
        
       let

     
···

       52
       52
        
           pystache

     

       53
       53
        
           sshpubkeys

     

       54
       54
        
           weasyprint

     

       55
       55
       -
           prometheus_client

     

       55
       55
       +
           prometheus-client

     

       56
       56
        
           dnspython

     

       57
       57
        
         ];

     

       58
       58

+3 -1

pkgs/build-support/vm/default.nix

···

       494
       494
        
            tarball must contain an RPM specfile. */

     

       495
       495
        
       

     

       496
       496
        
         buildRPM = attrs: runInLinuxImage (stdenv.mkDerivation ({

     

       497
       497
       -
           phases = "prepareImagePhase sysInfoPhase buildPhase installPhase";

     

       497
       497
       +
           prePhases = [ prepareImagePhase sysInfoPhase ];

     

       498
       498
       +
           dontUnpack = true;

     

       499
       499
       +
           dontConfigure = true;

     

       498
       500
        
       

     

       499
       501
        
           outDir = "rpms/${attrs.diskImage.name}";

     

       500
       502

+2 -2

pkgs/build-support/vm/test.nix

···

       1
       1
       -
       with import ../../.. {};

     

       1
       1
       +
       with import ../../.. { };

     

       2
       2
        
       with vmTools;

     

       3
       3
        
       

     

       4
       4
        
       {

     
···

       30
       30
        
           src = patchelf.src;

     

       31
       31
        
           diskImage = diskImages.ubuntu1204i386;

     

       32
       32
        
           memSize = 512;

     

       33
       33
       -
           phases = "sysInfoPhase unpackPhase patchPhase configurePhase buildPhase checkPhase installPhase fixupPhase distPhase";

     

       33
       33
       +
           prePhases = [ sysInfoPhase ];

     

       34
       34
        
           sysInfoPhase = ''

     

       35
       35
        
             dpkg-query --list

     

       36
       36
        
           '';

+2 -2

pkgs/development/interpreters/clojure/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "clojure";

     

       5
       5
       -
         version = "1.10.3.933";

     

       5
       5
       +
         version = "1.10.3.943";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           # https://clojure.org/releases/tools

     

       9
       9
        
           url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";

     

       10
       10
       -
           sha256 = "sha256-xsm0/HNWr8a/7iLQVC9TbUkASWvw/EI3bD0dMDhLZXA=";

     

       10
       10
       +
           sha256 = "sha256-w3DRvZsie22uoJMrNQTxN5hW0pIFjH5zAw5Z41I1M/s=";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [

+2 -2

pkgs/development/libraries/cglm/default.nix

···

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
         pname = "cglm";

     

       9
       9
       -
         version = "0.8.3";

     

       9
       9
       +
         version = "0.8.4";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "recp";

     

       13
       13
        
           repo = "cglm";

     

       14
       14
        
           rev = "v${version}";

     

       15
       15
       -
           sha256 = "0crzkxan3kivyah225md5c65zglg5c1cgrsmwhvp51hmrpmxss5v";

     

       15
       15
       +
           sha256 = "sha256-AJK1M6iyYdL61pZQhbUWzf+YOUE5FEvUyKqxbQqc7H0=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [ cmake ];

+2 -2

pkgs/development/libraries/folly/default.nix

···

       19
       19
        
       

     

       20
       20
        
       stdenv.mkDerivation (rec {

     

       21
       21
        
         pname = "folly";

     

       22
       22
       -
         version = "2021.08.02.00";

     

       22
       22
       +
         version = "2021.08.23.00";

     

       23
       23
        
       

     

       24
       24
        
         src = fetchFromGitHub {

     

       25
       25
        
           owner = "facebook";

     

       26
       26
        
           repo = "folly";

     

       27
       27
        
           rev = "v${version}";

     

       28
       28
       -
           sha256 = "sha256-Y2CqPlhbfC++udbbURnI9mvRZswC8kmikp1HY0qJz4k=";

     

       28
       28
       +
           sha256 = "sha256-B+J4h12jjusA15+QRR3egmUEwYRrnegtEWMuQX+QuJk=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         nativeBuildInputs = [

+2 -2

pkgs/development/libraries/pupnp/default.nix

···

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
         pname = "libupnp";

     

       9
       9
       -
         version = "1.14.8";

     

       9
       9
       +
         version = "1.14.10";

     

       10
       10
        
       

     

       11
       11
        
         outputs = [ "out" "dev" ];

     

       12
       12
        
       

     
···

       14
       14
        
           owner = "pupnp";

     

       15
       15
        
           repo = "pupnp";

     

       16
       16
        
           rev = "release-${version}";

     

       17
       17
       -
           sha256 = "sha256-Ipgb7fpIT+P/LwcF8ZmW4C1lj57f5rOQXwUl1Kh/oD8=";

     

       17
       17
       +
           sha256 = "sha256-QlV5V1+VPj/C0M3XgwVIJbxzVXfSvP6yMcJz9al6a+U=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [

+2 -2

pkgs/development/python-modules/aioesphomeapi/default.nix

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "aioesphomeapi";

     

       14
       14
       -
         version = "7.0.0";

     

       14
       14
       +
         version = "8.0.0";

     

       15
       15
        
         format = "setuptools";

     

       16
       16
        
       

     

       17
       17
        
         disabled = pythonOlder "3.7";

     
···

       20
       20
        
           owner = "esphome";

     

       21
       21
        
           repo = pname;

     

       22
       22
        
           rev = "v${version}";

     

       23
       23
       -
           sha256 = "sha256-ho/1fpq4yAgmYNERPqs51oqr08ncaN9+GRTUUuGU7ps=";

     

       23
       23
       +
           sha256 = "sha256-fd77sbtgEhExV/d/LHkF9sheVz7G2SrNXyZsMNeJ4UY=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/flower/default.nix

···

       6
       6
        
       , mock

     

       7
       7
        
       , pytz

     

       8
       8
        
       , tornado

     

       9
       9
       -
       , prometheus_client

     

       9
       9
       +
       , prometheus-client

     

       10
       10
        
       , pytestCheckHook

     

       11
       11
        
       }:

     

       12
       12
        
       

     
···

       30
       30
        
           pytz

     

       31
       31
        
           tornado

     

       32
       32
        
           humanize

     

       33
       33
       -
           prometheus_client

     

       33
       33
       +
           prometheus-client

     

       34
       34
        
         ];

     

       35
       35
        
       

     

       36
       36
        
         checkInputs = [

+4 -3

pkgs/development/python-modules/gradient-utils/default.nix

···

       5
       5
        
       , mock

     

       6
       6
        
       , numpy

     

       7
       7
        
       , poetry-core

     

       8
       8
       -
       , prometheus_client

     

       8
       8
       +
       , prometheus-client

     

       9
       9
        
       , pytestCheckHook

     

       10
       10
        
       , requests

     

       11
       11
        
       }:

     
···

       26
       26
        
           substituteInPlace pyproject.toml \

     

       27
       27
        
             --replace 'numpy = "1.18.5"' 'numpy = "^1.18.5"' \

     

       28
       28
        
             --replace 'hyperopt = "0.1.2"' 'hyperopt = ">=0.1.2"' \

     

       29
       29
       -
             --replace 'wheel = "^0.35.1"' 'wheel = "*"'

     

       29
       29
       +
             --replace 'wheel = "^0.35.1"' 'wheel = "*"' \

     

       30
       30
       +
             --replace 'prometheus-client = ">=0.8,<0.10"' 'prometheus-client = "*"'

     

       30
       31
        
         '';

     

       31
       32
        
       

     

       32
       33
        
         nativeBuildInputs = [ poetry-core ];

     

       33
       34
        
       

     

       34
       35
        
         propagatedBuildInputs = [

     

       35
       36
        
           hyperopt

     

       36
       36
       -
           prometheus_client

     

       37
       37
       +
           prometheus-client

     

       37
       38
        
           numpy

     

       38
       39
        
         ];

     

       39
       40

+2 -2

pkgs/development/python-modules/jupyter_server/default.nix

···

       17
       17
        
       , nbconvert

     

       18
       18
        
       , send2trash

     

       19
       19
        
       , terminado

     

       20
       20
       -
       , prometheus_client

     

       20
       20
       +
       , prometheus-client

     

       21
       21
        
       , anyio

     

       22
       22
        
       , websocket-client

     

       23
       23
        
       , requests

     
···

       46
       46
        
           nbconvert

     

       47
       47
        
           send2trash

     

       48
       48
        
           terminado

     

       49
       49
       -
           prometheus_client

     

       49
       49
       +
           prometheus-client

     

       50
       50
        
           anyio

     

       51
       51
        
           websocket-client

     

       52
       52
        
         ];

+2 -2

pkgs/development/python-modules/jupyterhub/default.nix

···

       13
       13
        
       , jupyter-telemetry

     

       14
       14
        
       , oauthlib

     

       15
       15
        
       , pamela

     

       16
       16
       -
       , prometheus_client

     

       16
       16
       +
       , prometheus-client

     

       17
       17
        
       , requests

     

       18
       18
        
       , sqlalchemy

     

       19
       19
        
       , tornado

     
···

       121
       121
        
           jupyter-telemetry

     

       122
       122
        
           oauthlib

     

       123
       123
        
           pamela

     

       124
       124
       -
           prometheus_client

     

       124
       124
       +
           prometheus-client

     

       125
       125
        
           requests

     

       126
       126
        
           sqlalchemy

     

       127
       127
        
           tornado

+3 -3

pkgs/development/python-modules/karton-dashboard/default.nix

···

       4
       4
        
       , flask

     

       5
       5
        
       , karton-core

     

       6
       6
        
       , mistune

     

       7
       7
       -
       , prometheus_client

     

       7
       7
       +
       , prometheus-client

     

       8
       8
        
       }:

     

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     
···

       22
       22
        
           flask

     

       23
       23
        
           karton-core

     

       24
       24
        
           mistune

     

       25
       25
       -
           prometheus_client

     

       25
       25
       +
           prometheus-client

     

       26
       26
        
         ];

     

       27
       27
        
       

     

       28
       28
        
         postPatch = ''

     

       29
       29
        
           substituteInPlace requirements.txt \

     

       30
       30
        
             --replace "Flask==1.1.1" "Flask" \

     

       31
       31
       -
             --replace "prometheus_client==0.9.0" "prometheus-client"

     

       31
       31
       +
             --replace "prometheus-client==0.9.0" "prometheus-client"

     

       32
       32
        
         '';

     

       33
       33
        
       

     

       34
       34
        
         # Project has no tests. pythonImportsCheck requires MinIO configuration

+2 -2

pkgs/development/python-modules/notebook/2.nix

···

       20
       20
        
       , requests

     

       21
       21
        
       , send2trash

     

       22
       22
        
       , pexpect

     

       23
       23
       -
       , prometheus_client

     

       23
       23
       +
       , prometheus-client

     

       24
       24
        
       }:

     

       25
       25
        
       

     

       26
       26
        
       buildPythonPackage rec {

     
···

       40
       40
        
         propagatedBuildInputs = [

     

       41
       41
        
           jinja2 tornado ipython_genutils traitlets jupyter_core send2trash

     

       42
       42
        
           jupyter_client nbformat nbconvert ipykernel terminado requests pexpect

     

       43
       43
       -
           prometheus_client

     

       43
       43
       +
           prometheus-client

     

       44
       44
        
         ];

     

       45
       45
        
       

     

       46
       46
        
         # disable warning_filters

+2 -2

pkgs/development/python-modules/notebook/default.nix

···

       21
       21
        
       , requests

     

       22
       22
        
       , send2trash

     

       23
       23
        
       , pexpect

     

       24
       24
       -
       , prometheus_client

     

       24
       24
       +
       , prometheus-client

     

       25
       25
        
       , pytestCheckHook

     

       26
       26
        
       }:

     

       27
       27
        
       

     
···

       43
       43
        
         propagatedBuildInputs = [

     

       44
       44
        
           jinja2 tornado ipython_genutils traitlets jupyter_core send2trash

     

       45
       45
        
           jupyter_client nbformat nbconvert ipykernel terminado requests pexpect

     

       46
       46
       -
           prometheus_client argon2_cffi

     

       46
       46
       +
           prometheus-client argon2_cffi

     

       47
       47
        
         ];

     

       48
       48
        
       

     

       49
       49
        
         # disable warning_filters

+2 -2

pkgs/development/python-modules/phonopy/default.nix

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "phonopy";

     

       15
       15
       -
         version = "2.10.0";

     

       15
       15
       +
         version = "2.11.0";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           sha256 = "58485042ab7d88fc8b83744d18b2aefd677adb071c8a717ac3710458192743d7";

     

       19
       19
       +
           sha256 = "2ab47d3eb53a5265f3567974d29760b510b3312217358b76efc27ade9bd1a9f0";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/premailer/default.nix

···

       4
       4
        
       

     

       5
       5
        
       buildPythonPackage rec {

     

       6
       6
        
         pname = "premailer";

     

       7
       7
       -
         version = "3.9.0";

     

       7
       7
       +
         version = "3.10.0";

     

       8
       8
        
         disabled = isPy27; # no longer compatible with urllib

     

       9
       9
        
       

     

       10
       10
        
         src = fetchPypi {

     

       11
       11
        
           inherit pname version;

     

       12
       12
       -
           sha256 = "da18b9e8cb908893b67ab9b7451276fef7c0ab179f40189378545f6bb0ab3695";

     

       12
       12
       +
           sha256 = "d1875a8411f5dc92b53ef9f193db6c0f879dc378d618e0ad292723e388bfe4c2";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         buildInputs = [ mock nose ];

+29

pkgs/development/python-modules/prometheus-client/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , pytestCheckHook

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       buildPythonPackage rec {

     

       8
       8
       +
         pname = "prometheus-client";

     

       9
       9
       +
         version = "0.11.0";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchFromGitHub {

     

       12
       12
       +
           owner = "prometheus";

     

       13
       13
       +
           repo = "client_python";

     

       14
       14
       +
           rev = "v${version}";

     

       15
       15
       +
           sha256 = "14swmy4dgpk6cyjsm2advgc2c8api7xaca1sl7swznblh5fyzgzg";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         checkInputs = [

     

       19
       19
       +
           pytestCheckHook

     

       20
       20
       +
         ];

     

       21
       21
       +
       

     

       22
       22
       +
         pythonImportsCheck = [ "prometheus_client" ];

     

       23
       23
       +
       

     

       24
       24
       +
         meta = with lib; {

     

       25
       25
       +
           description = "Prometheus instrumentation library for Python applications";

     

       26
       26
       +
           homepage = "https://github.com/prometheus/client_python";

     

       27
       27
       +
           license = licenses.asl20;

     

       28
       28
       +
         };

     

       29
       29
       +
       }

+2 -2

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

···

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
        
       , flask

     

       5
       5
       -
       , prometheus_client

     

       5
       5
       +
       , prometheus-client

     

       6
       6
        
       , pytestCheckHook

     

       7
       7
        
       }:

     

       8
       8
        
       

     
···

       17
       17
        
           sha256 = "1dwisp681w0f6zf0000rxd3ksdb48zb9mr38qfdqk2ir24y8w370";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         propagatedBuildInputs = [ flask prometheus_client ];

     

       20
       20
       +
         propagatedBuildInputs = [ flask prometheus-client ];

     

       21
       21
        
       

     

       22
       22
        
         checkInputs = [ pytestCheckHook ];

     

       23
       23
        
         pytestFlagsArray = [ "tests/" ];

-19

pkgs/development/python-modules/prometheus_client/default.nix

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi }:

     

       2
       2
       -
       

     

       3
       3
       -
       buildPythonPackage rec {

     

       4
       4
       -
         pname = "prometheus_client";

     

       5
       5
       -
         version = "0.11.0";

     

       6
       6
       -
       

     

       7
       7
       -
         src = fetchPypi {

     

       8
       8
       -
           inherit pname version;

     

       9
       9
       -
           sha256 = "3a8baade6cb80bcfe43297e33e7623f3118d660d41387593758e2fb1ea173a86";

     

       10
       10
       -
         };

     

       11
       11
       -
       

     

       12
       12
       -
         doCheck = false;

     

       13
       13
       -
       

     

       14
       14
       -
         meta = with lib; {

     

       15
       15
       -
           description = "Prometheus instrumentation library for Python applications";

     

       16
       16
       -
           homepage = "https://github.com/prometheus/client_python";

     

       17
       17
       -
           license = licenses.asl20;

     

       18
       18
       -
         };

     

       19
       19
       -
       }

+2 -2

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

···

       5
       5
        
       , flask

     

       6
       6
        
       , isPy27

     

       7
       7
        
       , nixosTests

     

       8
       8
       -
       , prometheus_client

     

       8
       8
       +
       , prometheus-client

     

       9
       9
        
       , py-air-control

     

       10
       10
        
       , pytestCheckHook

     

       11
       11
        
       , setuptools-scm

     
···

       28
       28
        
         propagatedBuildInputs = [

     

       29
       29
        
           click

     

       30
       30
        
           flask

     

       31
       31
       -
           prometheus_client

     

       31
       31
       +
           prometheus-client

     

       32
       32
        
           py-air-control

     

       33
       33
        
         ];

     

       34
       34

+15 -24

pkgs/development/python-modules/pyee/default.nix

···

       1
       1
       -
       { buildPythonPackage

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       2
       3
        
       , fetchPypi

     

       3
       3
       -
       , lib

     

       4
       4
        
       , vcversioner

     

       5
       5
       -
       , pytest-runner

     

       6
       5
        
       , mock

     

       7
       7
       -
       , pytest

     

       6
       6
       +
       , pytestCheckHook

     

       8
       7
        
       , pytest-asyncio

     

       9
       8
        
       , pytest-trio

     

       10
       9
        
       , twisted

     

       11
       11
       -
       , zipp ? null

     

       12
       12
       -
       , pyparsing ? null

     

       13
       13
       -
       , pyhamcrest

     

       14
       14
       -
       , futures ? null

     

       15
       15
       -
       , attrs ? null

     

       16
       16
       -
       , isPy27

     

       10
       10
       +
       , pythonOlder

     

       17
       11
        
       }:

     

       18
       12
        
       

     

       19
       13
        
       buildPythonPackage rec {

     

       20
       14
        
         pname = "pyee";

     

       21
       21
       -
         version = "8.1.0";

     

       15
       15
       +
         version = "8.2.2";

     

       16
       16
       +
       

     

       17
       17
       +
         disabled = pythonOlder "3.6";

     

       22
       18
        
       

     

       23
       19
        
         src = fetchPypi {

     

       24
       20
        
           inherit pname version;

     

       25
       25
       -
           sha256 = "92dacc5bd2bdb8f95aa8dd2585d47ca1c4840e2adb95ccf90034d64f725bfd31";

     

       21
       21
       +
           sha256 = "sha256-XH5g+N+VcQ2+F1UOFs4BU/g5kMAO90SEG0Pzce1T6+o=";

     

       26
       22
        
         };

     

       27
       23
        
       

     

       28
       24
        
         buildInputs = [

     
···

       31
       27
        
       

     

       32
       28
        
         checkInputs = [

     

       33
       29
        
           mock

     

       34
       34
       -
           pyhamcrest

     

       35
       35
       -
           pytest

     

       36
       30
        
           pytest-asyncio

     

       37
       31
        
           pytest-trio

     

       38
       38
       -
           pytest-runner

     

       32
       32
       +
           pytestCheckHook

     

       39
       33
        
           twisted

     

       40
       40
       -
         ] ++ lib.optional isPy27 [

     

       41
       41
       -
           attrs

     

       42
       42
       -
           futures

     

       43
       43
       -
           pyparsing

     

       44
       44
       -
           zipp

     

       45
       34
        
         ];

     

       46
       35
        
       

     

       47
       47
       -
         meta = {

     

       48
       48
       -
           description = "A port of Node.js's EventEmitter to python";

     

       36
       36
       +
         pythonImportsCheck = [ "pyee" ];

     

       37
       37
       +
       

     

       38
       38
       +
         meta = with lib; {

     

       39
       39
       +
           description = "A port of Node.js's EventEmitter to Python";

     

       49
       40
        
           homepage = "https://github.com/jfhbrook/pyee";

     

       50
       50
       -
           license = lib.licenses.mit;

     

       51
       51
       -
           maintainers = with lib.maintainers; [ kmein ];

     

       41
       41
       +
           license = licenses.mit;

     

       42
       42
       +
           maintainers = with maintainers; [ kmein ];

     

       52
       43
        
         };

     

       53
       44
        
       }

+2 -2

pkgs/development/python-modules/pytools/default.nix

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "pytools";

     

       14
       14
       -
         version = "2021.2.7";

     

       14
       14
       +
         version = "2021.2.8";

     

       15
       15
        
         disabled = pythonOlder "3.6";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           sha256 = "0538f6fe7f00bf765ca5ab38518db48df72de818460006e54b0575accd24d9fb";

     

       19
       19
       +
           sha256 = "e11adc4914d805ac2bd02656fc6c0ec57c29dd305bd4a44122ca4e651a4bba8b";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         checkInputs = [ pytest ];

+2 -2

pkgs/development/python-modules/ripser/default.nix

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "ripser";

     

       15
       15
       -
         version = "0.6.0";

     

       15
       15
       +
         version = "0.6.1";

     

       16
       16
        
         disabled = pythonOlder "3.6";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchPypi {

     

       19
       19
        
           inherit pname version;

     

       20
       20
       -
           sha256 = "5c47deffbf9e163186b0997f2d59486d96a7c65766e76500f754fadfbc89f5d9";

     

       20
       20
       +
           sha256 = "335112a0f94532ccbe686db7826ee8d0714b32f65891abf92c0a02f3cb0fc5fd";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         checkInputs = [

+2 -2

pkgs/development/python-modules/sopel/default.nix

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "sopel";

     

       16
       16
       -
         version = "7.1.2";

     

       16
       16
       +
         version = "7.1.3";

     

       17
       17
        
         disabled = isPyPy;

     

       18
       18
        
       

     

       19
       19
        
         src = fetchPypi {

     

       20
       20
        
           inherit pname version;

     

       21
       21
       -
           sha256 = "sha256-8RhIw3Qt0BclH1Ws16JNuFfwiRxJ14lM6MBUK9OvNKA=";

     

       21
       21
       +
           sha256 = "0f9e673a7eac9dd3619c2e398e58fa2d8117afca5adb550ba07c66e16a90dbdb";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         propagatedBuildInputs = [

+3 -3

pkgs/development/tools/buf/default.nix

···

       9
       9
        
       

     

       10
       10
        
       buildGoModule rec {

     

       11
       11
        
         pname = "buf";

     

       12
       12
       -
         version = "0.51.1";

     

       12
       12
       +
         version = "0.52.0";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "bufbuild";

     

       16
       16
        
           repo = pname;

     

       17
       17
        
           rev = "v${version}";

     

       18
       18
       -
           sha256 = "sha256-iFSmanP+2PgmOXtubDdLfa+AIQSAWHFNpyB1IP6IF5I=";

     

       18
       18
       +
           sha256 = "sha256-WFL+ztFR8kV6cRY1Ax2TheH+xpA58CLnW69jDpMhe3M=";

     

       19
       19
        
         };

     

       20
       20
       -
         vendorSha256 = "sha256-0rVHINb04GZlH6DSjMt/h7UdNtZJERAyO1S99rAxUyY=";

     

       20
       20
       +
         vendorSha256 = "sha256-vbphThpEYDDm1iipcY0QXhKKuLSD87sAxiIUi7SfrAc=";

     

       21
       21
        
       

     

       22
       22
        
         patches = [

     

       23
       23
        
           # Skip a test that requires networking to be available to work.

+3 -3

pkgs/development/tools/cloud-nuke/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "cloud-nuke";

     

       5
       5
       -
         version = "0.4.0";

     

       5
       5
       +
         version = "0.5.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "gruntwork-io";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-eua+/bfKuIG1TuoC0tA4+O0H2D+u8AbcJIFLDIbzVYg=";

     

       11
       11
       +
           sha256 = "sha256-PVVnls4i19Xc5KXM1AQTHLkxLgmJpIDBFkRW0EGXOUA=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-+rr9TDRIYta0ejOE48O+nZDluvqvSTuGBpRBPZifazA=";

     

       14
       14
       +
         vendorSha256 = "sha256-C9UGpm8JBLQpSFQkvib5Bmn3J88LxUNt4ELJXL4ZQ80=";

     

       15
       15
        
       

     

       16
       16
        
         buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ];

     

       17
       17

+1 -1

pkgs/servers/home-assistant/component-packages.nix

···

       658
       658
        
           "profiler" = ps: with ps; [ guppy3 objgraph pyprof2calltree ];

     

       659
       659
        
           "progettihwsw" = ps: with ps; [ ]; # missing inputs: progettihwsw

     

       660
       660
        
           "proliphix" = ps: with ps; [ ]; # missing inputs: proliphix

     

       661
       661
       -
           "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ];

     

       661
       661
       +
           "prometheus" = ps: with ps; [ aiohttp-cors prometheus-client ];

     

       662
       662
        
           "prosegur" = ps: with ps; [ pyprosegur ];

     

       663
       663
        
           "prowl" = ps: with ps; [ ];

     

       664
       664
        
           "proximity" = ps: with ps; [ ];

+1 -1

pkgs/servers/matrix-synapse/default.nix

···

       40
       40
        
           netaddr

     

       41
       41
        
           phonenumbers

     

       42
       42
        
           pillow

     

       43
       43
       -
           prometheus_client

     

       43
       43
       +
           prometheus-client

     

       44
       44
        
           psutil

     

       45
       45
        
           psycopg2

     

       46
       46
        
           pyasn1

+1 -1

pkgs/servers/mautrix-signal/default.nix

···

       19
       19
        
           mautrix

     

       20
       20
        
           phonenumbers

     

       21
       21
        
           pillow

     

       22
       22
       -
           prometheus_client

     

       22
       22
       +
           prometheus-client

     

       23
       23
        
           pycryptodome

     

       24
       24
        
           python-olm

     

       25
       25
        
           python_magic

+1 -1

pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix

···

       22
       22
        
           })

     

       23
       23
        
         ];

     

       24
       24
        
       

     

       25
       25
       -
         propagatedBuildInputs = with python3Packages; [ prometheus_client bitcoinlib riprova ];

     

       25
       25
       +
         propagatedBuildInputs = with python3Packages; [ prometheus-client bitcoinlib riprova ];

     

       26
       26
        
       

     

       27
       27
        
         installPhase = ''

     

       28
       28
        
           mkdir -p $out/bin

+1 -1

pkgs/servers/monitoring/prometheus/kea-exporter.nix

···

       11
       11
        
       

     

       12
       12
        
         propagatedBuildInputs = with python3Packages; [

     

       13
       13
        
           click

     

       14
       14
       -
           prometheus_client

     

       14
       14
       +
           prometheus-client

     

       15
       15
        
         ];

     

       16
       16
        
       

     

       17
       17
        
         checkPhase = ''

+1 -1

pkgs/servers/monitoring/prometheus/knot-exporter.nix

···

       21
       21
        
       

     

       22
       22
        
           install -Dm0755 knot_exporter $out/bin/knot_exporter

     

       23
       23
        
           patchShebangs $out/bin

     

       24
       24
       -
           buildPythonPath ${python3.pkgs.prometheus_client}

     

       24
       24
       +
           buildPythonPath ${python3.pkgs.prometheus-client}

     

       25
       25
        
           patchPythonScript $out/bin/knot_exporter

     

       26
       26
        
       

     

       27
       27
        
           runHook postInstall

+1 -1

pkgs/servers/monitoring/prometheus/tor-exporter.nix

···

       14
       14
        
           sha256 = "1gzf42z0cgdqijbi9cwpjkqzkvnabaxkkfa5ac5h27r3pxx3q4n0";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         propagatedBuildInputs = with python3Packages; [ prometheus_client stem retrying ];

     

       17
       17
       +
         propagatedBuildInputs = with python3Packages; [ prometheus-client stem retrying ];

     

       18
       18
        
       

     

       19
       19
        
         installPhase = ''

     

       20
       20
        
           mkdir -p $out/share/

+1 -1

pkgs/servers/monitoring/prometheus/xmpp-alerts.nix

···

       20
       20
        
         ] ++ (with python3Packages; [

     

       21
       21
        
           aiohttp

     

       22
       22
        
           slixmpp

     

       23
       23
       -
           prometheus_client

     

       23
       23
       +
           prometheus-client

     

       24
       24
        
           pyyaml

     

       25
       25
        
         ]);

     

       26
       26

+5 -5

pkgs/servers/web-apps/matomo/default.nix

···

       3
       3
        
       let

     

       4
       4
        
         versions = {

     

       5
       5
        
           matomo = {

     

       6
       6
       -
             version = "4.3.1";

     

       7
       7
       -
             sha256 = "Ve4P1cVV/uZ59BcQaUZLTTOwpjX7veof9jR0l3Y9xOQ=";

     

       6
       6
       +
             version = "4.4.1";

     

       7
       7
       +
             sha256 = "0y8ljdj97znvd3hkkr7s6s9k8m93agw3z9cfw1azzaxgc46akfcl";

     

       8
       8
        
           };

     

       9
       9
        
       

     

       10
       10
        
           matomo-beta = {

     

       11
       11
       -
             version = "4.3.1";

     

       11
       11
       +
             version = "4.4.1";

     

       12
       12
        
             # `beta` examples: "b1", "rc1", null

     

       13
       13
        
             # TOOD when updating: use null if stable version is >= latest beta or release candidate

     

       14
       14
        
             beta = null;

     

       15
       15
       -
             sha256 = "Ve4P1cVV/uZ59BcQaUZLTTOwpjX7veof9jR0l3Y9xOQ=";

     

       15
       15
       +
             sha256 = "0y8ljdj97znvd3hkkr7s6s9k8m93agw3z9cfw1azzaxgc46akfcl";

     

       16
       16
        
           };

     

       17
       17
        
         };

     

       18
       18
        
         common = pname: { version, sha256, beta ? null }:

     
···

       102
       102
        
                 license = licenses.gpl3Plus;

     

       103
       103
        
                 homepage = "https://matomo.org/";

     

       104
       104
        
                 platforms = platforms.all;

     

       105
       105
       -
                 maintainers = with maintainers; [ florianjacob kiwi ];

     

       105
       105
       +
                 maintainers = with maintainers; [ florianjacob kiwi sebbel ];

     

       106
       106
        
               };

     

       107
       107
        
             };

     

       108
       108
        
       in

+1 -1

pkgs/servers/xandikos/default.nix

···

       22
       22
        
           icalendar

     

       23
       23
        
           jinja2

     

       24
       24
        
           multidict

     

       25
       25
       -
           prometheus_client

     

       25
       25
       +
           prometheus-client

     

       26
       26
        
         ];

     

       27
       27
        
       

     

       28
       28
        
         passthru.tests.xandikos = nixosTests.xandikos;

+3 -3

pkgs/shells/nushell/default.nix

···

       18
       18
        
       

     

       19
       19
        
       rustPlatform.buildRustPackage rec {

     

       20
       20
        
         pname = "nushell";

     

       21
       21
       -
         version = "0.35.0";

     

       21
       21
       +
         version = "0.36.0";

     

       22
       22
        
       

     

       23
       23
        
         src = fetchFromGitHub {

     

       24
       24
        
           owner = pname;

     

       25
       25
        
           repo = pname;

     

       26
       26
        
           rev = version;

     

       27
       27
       -
           sha256 = "0p5whwx6wk9k7mrxhr7azrppbj9mv53hd4bl1cgygxz231aq8337";

     

       27
       27
       +
           sha256 = "sha256-5vBt0Q7f3ydo74cmY4WpIHqMlNYc0Tl35d0DnWUQZbU=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
       -
         cargoSha256 = "0xs0s02zf78pgd94ifh465mg14rrwjfg7qbzmmq8jha758gfwdi3";

     

       30
       30
       +
         cargoSha256 = "sha256-F3niVkZbg84cFEY0eGgmMAMEJ+eBHwDS2+3EFRR2fLY=";

     

       31
       31
        
       

     

       32
       32
        
         nativeBuildInputs = [ pkg-config ]

     

       33
       33
        
           ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ];

+33

pkgs/tools/admin/ossutil/default.nix

···

       1
       1
       +
       { lib, buildGoModule, fetchFromGitHub, fetchpatch }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildGoModule rec {

     

       4
       4
       +
         version = "1.7.6";

     

       5
       5
       +
         pname = "ossutil";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "aliyun";

     

       9
       9
       +
           repo = "ossutil";

     

       10
       10
       +
           rev = version;

     

       11
       11
       +
           sha256 = "1hkdk0hidnm7vz320i7s4z7jngx2j70acc93agii2b3r2bb91l3d";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         # this patch is required to add go mods to fetch dependencies

     

       15
       15
       +
         patches = [

     

       16
       16
       +
           (fetchpatch {

     

       17
       17
       +
             url = "https://github.com/aliyun/ossutil/commit/64067e979fb24ffb198a0c4eca718e81b63f514e.patch";

     

       18
       18
       +
             sha256 = "2pn0BcbNNL+iMema54LRpG/ca5kyDugLIZQ/TMhYG/8=";

     

       19
       19
       +
           })

     

       20
       20
       +
         ];

     

       21
       21
       +
       

     

       22
       22
       +
         vendorSha256 = "lem9Jg4Ywv3qcIwhiZHNi1VH5HxxNr6mnefOLCzPL70=";

     

       23
       23
       +
       

     

       24
       24
       +
         # don't run tests as they require secret access keys that only travis has

     

       25
       25
       +
         doCheck = false;

     

       26
       26
       +
       

     

       27
       27
       +
         meta = with lib; {

     

       28
       28
       +
           homepage = "https://github.com/aliyun/ossutil";

     

       29
       29
       +
           description = "A user friendly command line tool to access Alibaba Cloud OSS";

     

       30
       30
       +
           license = licenses.mit;

     

       31
       31
       +
           maintainers = with maintainers; [ jpetrucciani ];

     

       32
       32
       +
         };

     

       33
       33
       +
       }

+1 -1

pkgs/tools/compression/xdelta/default.nix

···

       56
       56
        
           '';

     

       57
       57
        
           homepage = "http://xdelta.org/";

     

       58
       58
        
           license = licenses.gpl2Plus;

     

       59
       59
       -
           platforms = platforms.linux;

     

       59
       59
       +
           platforms = platforms.unix;

     

       60
       60
        
         };

     

       61
       61
        
       }

+1 -1

pkgs/tools/misc/fwup/default.nix

···

       59
       59
        
           xdelta

     

       60
       60
        
         ];

     

       61
       61
        
       

     

       62
       62
       -
         doCheck = true;

     

       62
       62
       +
         doCheck = !stdenv.isDarwin;

     

       63
       63
        
       

     

       64
       64
        
         meta = with lib; {

     

       65
       65
        
           description = "Configurable embedded Linux firmware update creator and runner";

+1 -1

pkgs/tools/networking/dd-agent/integrations-core.nix

···

       65
       65
        
           pname = "checks-base";

     

       66
       66
        
           sourceRoot = "datadog_checks_base";

     

       67
       67
        
           propagatedBuildInputs = with python.pkgs; [

     

       68
       68
       -
             requests protobuf prometheus_client uuid simplejson uptime

     

       68
       68
       +
             requests protobuf prometheus-client uuid simplejson uptime

     

       69
       69
        
           ];

     

       70
       70
        
         };

     

       71
       71

+5 -5

pkgs/tools/networking/inetutils/default.nix

···

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         pname = "inetutils";

     

       7
       7
       -
         version = "1.9.4";

     

       7
       7
       +
         version = "2.0";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
       -
           url = "mirror://gnu/inetutils/inetutils-${version}.tar.gz";

     

       11
       11
       -
           sha256 = "05n65k4ixl85dc6rxc51b1b732gnmm8xnqi424dy9f1nz7ppb3xy";

     

       10
       10
       +
           url = "mirror://gnu/inetutils/inetutils-${version}.tar.xz";

     

       11
       11
       +
           sha256 = "sha256-5XPVZuVTk5QAmYYuf4mUFkoO0S9ahsM0U4CEK9wSRyI=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         outputs = ["out" "apparmor"];

     

       15
       15
        
       

     

       16
       16
        
         patches = [

     

       17
       17
       -
           ./whois-Update-Canadian-TLD-server.patch

     

       18
       18
       -
           ./service-name.patch

     

       19
       17
        
           # https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3

     

       20
       18
        
           ./inetutils-1_9-PATH_PROCNET_DEV.patch

     

       19
       19
       +
           ./whois-Update-ORG-TLD-server.patch

     

       20
       20
       +
           ./whois-Update-Indian-TLD-server.patch

     

       21
       21
        
         ];

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [ help2man perl /* for `whois' */ ];

-11

pkgs/tools/networking/inetutils/service-name.patch

···

       1
       1
       -
       --- inetutils-1.9.4.org/whois/whois.c	2015-03-31 17:40:50.000000000 +0200

     

       2
       2
       -
       +++ inetutils-1.9.4/whois/whois.c	2017-04-20 10:23:38.487358708 +0200

     

       3
       3
       -
       @@ -576,7 +576,7 @@

     

       4
       4
       -
          hints.ai_family = AF_UNSPEC;

     

       5
       5
       -
          hints.ai_socktype = SOCK_STREAM;

     

       6
       6
       -
        

     

       7
       7
       -
       -  if ((i = getaddrinfo (server, port ? port : "whois", &hints, &res)) != 0)

     

       8
       8
       -
       +  if ((i = getaddrinfo (server, port ? port : "nicname", &hints, &res)) != 0)

     

       9
       9
       -
            err_quit ("getaddrinfo: %s", gai_strerror (i));

     

       10
       10
       -
        

     

       11
       11
       -
          for (ressave = res; res; res = res->ai_next)

-27

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

···

       1
       1
       -
       From 73e2811a0512556fd5359acc4387f46c79a9884a Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: Mats Erik Andersson <gnu@gisladisker.se>

     

       3
       3
       -
       Date: Thu, 2 Mar 2017 15:38:38 +0100

     

       4
       4
       -
       Subject: [PATCH] whois: Update Canadian TLD server.

     

       5
       5
       -
       Content-Type: text/plain; charset=utf-8

     

       6
       6
       -
       

     

       7
       7
       -
       ---

     

       8
       8
       -
        ChangeLog           | 8 ++++++++ (OMITTED)

     

       9
       9
       -
        whois/tld_serv_list | 2 +-

     

       10
       10
       -
        2 files changed, 9 insertions(+), 1 deletion(-)

     

       11
       11
       -
       

     

       12
       12
       -
       diff --git a/whois/tld_serv_list b/whois/tld_serv_list

     

       13
       13
       -
       index 056efcf..91697b8 100644

     

       14
       14
       -
       --- a/whois/tld_serv_list

     

       15
       15
       -
       +++ b/whois/tld_serv_list

     

       16
       16
       -
       @@ -81,7 +81,7 @@

     

       17
       17
       -
        #.bw			# NIC? www.botsnet.bw

     

       18
       18
       -
        #.by	NONE		# NIC? http://unibel.by www.open.by

     

       19
       19
       -
        .bz	NONE		# http://www.psg.com/dns/bz/

     

       20
       20
       -
       -.ca	whois.cdnnet.ca

     

       21
       21
       -
       +.ca	whois.cira.ca

     

       22
       22
       -
        .cc	whois.nic.cc

     

       23
       23
       -
        .cd	WEB http://www.nic.cd/database/cd/

     

       24
       24
       -
        #.cf	NONE		# NIC? http://www.socatel.intnet.cf

     

       25
       25
       -
       -- 

     

       26
       26
       -
       2.10.0

     

       27
       27
       -

+25

pkgs/tools/networking/inetutils/whois-Update-Indian-TLD-server.patch

···

       1
       1
       +
       From 1d64e6ae8fa1ef685f3f54c070eb47e7a45895eb Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Ashish SHUKLA <ashish.is@lostca.se>

     

       3
       3
       +
       Date: Sun, 25 Apr 2021 08:17:52 +0530

     

       4
       4
       +
       Subject: [PATCH] whois: Update whois server for .IN

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        whois/tld_serv_list | 2 +-

     

       8
       8
       +
        1 file changed, 1 insertion(+), 1 deletion(-)

     

       9
       9
       +
       

     

       10
       10
       +
       diff --git a/whois/tld_serv_list b/whois/tld_serv_list

     

       11
       11
       +
       index d9257f36..41083c18 100644

     

       12
       12
       +
       --- a/whois/tld_serv_list

     

       13
       13
       +
       +++ b/whois/tld_serv_list

     

       14
       14
       +
       @@ -151,7 +151,7 @@

     

       15
       15
       +
        .ie	whois.domainregistry.ie

     

       16
       16
       +
        .il	whois.isoc.org.il

     

       17
       17
       +
        .im	whois.nic.im

     

       18
       18
       +
       -.in	whois.inregistry.net

     

       19
       19
       +
       +.in	whois.registry.in

     

       20
       20
       +
        .io	whois.nic.io

     

       21
       21
       +
        #.iq			# NIC?

     

       22
       22
       +
        .ir	whois.nic.ir

     

       23
       23
       +
       -- 

     

       24
       24
       +
       2.31.1

     

       25
       25
       +

+38

pkgs/tools/networking/inetutils/whois-Update-ORG-TLD-server.patch

···

       1
       1
       +
       From a7a517ca23682b160a2a3be47f1f3f262f8f306f Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Ashish SHUKLA <ashish.is@lostca.se>

     

       3
       3
       +
       Date: Sun, 25 Apr 2021 08:07:52 +0530

     

       4
       4
       +
       Subject: [PATCH 1/2] whois: .ORG is not handled by InterNIC anymore

     

       5
       5
       +
       

     

       6
       6
       +
       See https://www.iana.org/domains/root/db/org.html

     

       7
       7
       +
       ---

     

       8
       8
       +
        whois/data.h        | 1 -

     

       9
       9
       +
        whois/tld_serv_list | 1 +

     

       10
       10
       +
        2 files changed, 1 insertion(+), 1 deletion(-)

     

       11
       11
       +
       

     

       12
       12
       +
       diff --git a/whois/data.h b/whois/data.h

     

       13
       13
       +
       index d1eb10ad..82e22b6f 100644

     

       14
       14
       +
       --- a/whois/data.h

     

       15
       15
       +
       +++ b/whois/data.h

     

       16
       16
       +
       @@ -68,7 +68,6 @@ const char *rwhois_servers[] = {

     

       17
       17
       +
        const char *gtlds[] = {

     

       18
       18
       +
          ".com",

     

       19
       19
       +
          ".net",

     

       20
       20
       +
       -  ".org",

     

       21
       21
       +
          ".edu",

     

       22
       22
       +
          NULL

     

       23
       23
       +
        };

     

       24
       24
       +
       diff --git a/whois/tld_serv_list b/whois/tld_serv_list

     

       25
       25
       +
       index ad7b9826..d9257f36 100644

     

       26
       26
       +
       --- a/whois/tld_serv_list

     

       27
       27
       +
       +++ b/whois/tld_serv_list

     

       28
       28
       +
       @@ -219,6 +219,7 @@

     

       29
       29
       +
        .nu	whois.nic.nu

     

       30
       30
       +
        .nz	whois.srs.net.nz

     

       31
       31
       +
        #.om	NONE		# NIC? http://www.gto.net.om

     

       32
       32
       +
       +.org	whois.pir.org

     

       33
       33
       +
        .pa	WEB http://www.nic.pa

     

       34
       34
       +
        #.pe	whois.rcp.net.pe	# kero.yachay.pe valid 2011-03-10

     

       35
       35
       +
        .pe	kero.yachay.pe

     

       36
       36
       +
       -- 

     

       37
       37
       +
       2.31.1

     

       38
       38
       +

+2 -2

pkgs/tools/typesetting/bibclean/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "bibclean";

     

       5
       5
       -
         version = "3.04";

     

       5
       5
       +
         version = "3.06";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "http://ftp.math.utah.edu/pub/bibclean/bibclean-${version}.tar.xz";

     

       9
       9
       -
           sha256 = "0n5jb6w86y91q5lkcc9sb1kh4c2bk3q2va24gfr0n6v1jzyqp9jg";

     

       9
       9
       +
           sha256 = "sha256-ZXT5uAQrqPoF6uVBazc4o1w40Sn0jnM+JYeOz7qq3kM=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         postPatch = ''

+4 -4

pkgs/tools/virtualization/linode-cli/default.nix

···

       12
       12
        
       

     

       13
       13
        
       let

     

       14
       14
        
         # specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`.

     

       15
       15
       -
         specVersion = "4.101.0";

     

       15
       15
       +
         specVersion = "4.102.0";

     

       16
       16
        
         spec = fetchurl {

     

       17
       17
        
           url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml";

     

       18
       18
       -
           sha256 = "1l4xi82b2pvkj7p1bq26ax2ava5vnv324j5sw3hvkkqqf1fmpdl5";

     

       18
       18
       +
           sha256 = "16njk21gdk8r8a9v607ndw2rs0q6za9ylkgdxmix4j0zvrbrw0qv";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
       in

     

       22
       22
        
       

     

       23
       23
        
       buildPythonApplication rec {

     

       24
       24
        
         pname = "linode-cli";

     

       25
       25
       -
         version = "5.6.0";

     

       25
       25
       +
         version = "5.8.1";

     

       26
       26
        
       

     

       27
       27
        
         src = fetchFromGitHub {

     

       28
       28
        
           owner = "linode";

     

       29
       29
        
           repo = pname;

     

       30
       30
        
           rev = version;

     

       31
       31
       -
           sha256 = "sha256-AjO4h0PaE/QFwbwUVNoe98XOPZ24ct0mbLkua5/YsEA=";

     

       31
       31
       +
           sha256 = "19lfnwgm09gxk0mcikwl7v4hw2ai2k9lkdjlalz8fsswf81my7h6";

     

       32
       32
        
         };

     

       33
       33
        
       

     

       34
       34
        
         # remove need for git history

+2

pkgs/top-level/all-packages.nix

···

       3203
       3203
        
       

     

       3204
       3204
        
         odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter {};

     

       3205
       3205
        
       

     

       3206
       3206
       +
         ossutil = callPackage ../tools/admin/ossutil {};

     

       3207
       3207
       +
       

     

       3206
       3208
        
         pastel = callPackage ../applications/misc/pastel {

     

       3207
       3209
        
           inherit (darwin.apple_sdk.frameworks) Security;

     

       3208
       3210
        
         };

+2 -1

pkgs/top-level/python-aliases.nix

···

       54
       54
        
         HAP-python = hap-python; # added 2021-06-01

     

       55
       55
        
         lammps-cython = throw "no longer builds and is unmaintained";

     

       56
       56
        
         MechanicalSoup = mechanicalsoup; # added 2021-06-01

     

       57
       57
       +
         pam = python-pam; # added 2020-09-07.

     

       57
       58
        
         privacyidea = throw "renamed to pkgs.privacyidea"; # added 2021-06-20

     

       59
       59
       +
         prometheus_client = prometheus-client; # added 2021-06-10

     

       58
       60
        
         prompt_toolkit = prompt-toolkit;

     

       59
       61
        
         pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20

     

       60
       62
        
         pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04

     
···

       64
       66
        
         pytestquickcheck = pytest-quickcheck; # added 2021-07-20

     

       65
       67
        
         pytestrunner = pytest-runner; # added 2021-01-04

     

       66
       68
        
         python-lz4 = lz4; # added 2018-06-01

     

       67
       67
       -
         pam = python-pam; # added 2020-09-07.

     

       68
       69
        
         pytest_xdist = pytest-xdist; # added 2021-01-04

     

       69
       70
        
         python_simple_hipchat = python-simple-hipchat; # added 2021-07-21

     

       70
       71
        
         qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09

+1 -1

pkgs/top-level/python-packages.nix

···

       5669
       5669
        
       

     

       5670
       5670
        
         progress = callPackage ../development/python-modules/progress { };

     

       5671
       5671
        
       

     

       5672
       5672
       -
         prometheus_client = callPackage ../development/python-modules/prometheus_client { };

     

       5672
       5672
       +
         prometheus-client = callPackage ../development/python-modules/prometheus-client { };

     

       5673
       5673
        
       

     

       5674
       5674
        
         prometheus-flask-exporter = callPackage ../development/python-modules/prometheus-flask-exporter { };

     

       5675
       5675