commit 450e66080b41ec05043f2a2249bcebe2b475e86e · pyrox.dev/nixpkgs

-1

nixos/tests/systemd-networkd.nix

···

       6
       6
        
             networking.firewall.enable = false;

     

       7
       7
        
             virtualisation.vlans = [ 1 ];

     

       8
       8
        
             environment.systemPackages = with pkgs; [ wireguard-tools ];

     

       9
       9
       -
             boot.extraModulePackages = [ config.boot.kernelPackages.wireguard ];

     

       10
       9
        
             systemd.network = {

     

       11
       10
        
               enable = true;

     

       12
       11
        
               netdevs = {

+2 -2

pkgs/applications/audio/squeezelite/default.nix

···

       2
       2
        
       , alsaLib, flac, libmad, libvorbis, mpg123

     

       3
       3
        
       , dsdSupport ? true

     

       4
       4
        
       , faad2Support ? true, faad2

     

       5
       5
       -
       , ffmpegSupport ? true, ffmpeg_3

     

       5
       5
       +
       , ffmpegSupport ? true, ffmpeg

     

       6
       6
        
       , opusSupport ? true, opusfile

     

       7
       7
        
       , resampleSupport ? true, soxr

     

       8
       8
        
       , sslSupport ? true, openssl

     
···

       35
       35
        
       

     

       36
       36
        
         buildInputs = [ alsaLib flac libmad libvorbis mpg123 ]

     

       37
       37
        
           ++ optional faad2Support faad2

     

       38
       38
       -
           ++ optional ffmpegSupport ffmpeg_3

     

       38
       38
       +
           ++ optional ffmpegSupport ffmpeg

     

       39
       39
        
           ++ optional opusSupport opusfile

     

       40
       40
        
           ++ optional resampleSupport soxr

     

       41
       41
        
           ++ optional sslSupport openssl;

+2 -2

pkgs/applications/networking/browsers/palemoon/default.nix

···

       142
       142
        
           ac_add_options --enable-jemalloc

     

       143
       143
        
           ac_add_options --enable-strip

     

       144
       144
        
           ac_add_options --enable-devtools

     

       145
       145
       +
           # Missing from build instructions, https://forum.palemoon.org/viewtopic.php?f=5&t=25843#p214767

     

       146
       146
       +
           ac_add_options --enable-av1

     

       145
       147
        
       

     

       146
       148
        
           ac_add_options --disable-eme

     

       147
       149
        
           ac_add_options --disable-webrtc

     
···

       158
       160
        
           export MOZILLA_OFFICIAL=1

     

       159
       161
        
       

     

       160
       162
        
           ac_add_options --x-libraries=${lib.makeLibraryPath [ xorg.libX11 ]}

     

       161
       161
       -
       

     

       162
       162
       -
           export MOZ_PKG_SPECIAL=gtk$_GTK_VERSION

     

       163
       163
        
       

     

       164
       164
        
           #

     

       165
       165
        
           # NixOS-specific adjustments

+2 -2

pkgs/applications/version-management/git-repo/default.nix

···

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         pname = "git-repo";

     

       7
       7
       -
         version = "2.13.1";

     

       7
       7
       +
         version = "2.14.5";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "android";

     

       11
       11
        
           repo = "tools_repo";

     

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

     

       13
       13
       -
           sha256 = "sha256-D6gh14XOZ6Fjypfhg9l5ozPhyf6u6M0Wc8HdagdPM/Q=";

     

       13
       13
       +
           sha256 = "sha256-3FSkWpHda1jVhy/633B+ippWcbKd83IlQcJYS9Qx5wQ=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         patches = [ ./import-ssl-module.patch ];

-25

pkgs/development/idris-modules/data.nix

···

       1
       1
       -
       { build-idris-package

     

       2
       2
       -
       , fetchFromGitHub

     

       3
       3
       -
       , contrib

     

       4
       4
       -
       , lib

     

       5
       5
       -
       }:

     

       6
       6
       -
       build-idris-package  {

     

       7
       7
       -
         name = "data";

     

       8
       8
       -
         version = "2018-03-19";

     

       9
       9
       -
       

     

       10
       10
       -
         idrisDeps = [ contrib ];

     

       11
       11
       -
       

     

       12
       12
       -
         src = fetchFromGitHub {

     

       13
       13
       -
           owner = "jdevuyst";

     

       14
       14
       -
           repo = "idris-data";

     

       15
       15
       -
           rev = "105b78ac13235edc596287367a675d7cd04ce5d5";

     

       16
       16
       -
           sha256 = "17wz4jddan39984qibx2x7nv2zkqznv0fpab20nrm4zgy17v77ii";

     

       17
       17
       -
         };

     

       18
       18
       -
       

     

       19
       19
       -
         meta = {

     

       20
       20
       -
           description = "Functional data structures in Idris";

     

       21
       21
       -
           homepage = "https://github.com/jdevuyst/idris-data";

     

       22
       22
       -
           license = lib.licenses.bsd3;

     

       23
       23
       -
           maintainers = [ lib.maintainers.brainrape ];

     

       24
       24
       -
         };

     

       25
       25
       -
       }

-2

pkgs/development/idris-modules/default.nix

···

       75
       75
        
       

     

       76
       76
        
           cube = callPackage ./cube.nix {};

     

       77
       77
        
       

     

       78
       78
       -
           data = callPackage ./data.nix {};

     

       79
       79
       -
       

     

       80
       78
        
           derive = callPackage ./derive.nix {};

     

       81
       79
        
       

     

       82
       80
        
           descncrunch = callPackage ./descncrunch.nix {};

+2 -2

pkgs/development/php-packages/phpcbf/default.nix

···

       1
       1
        
       { mkDerivation, fetchurl, lib, php, makeWrapper }:

     

       2
       2
        
       let

     

       3
       3
        
         pname = "phpcbf";

     

       4
       4
       -
         version = "3.5.8";

     

       4
       4
       +
         version = "3.6.0";

     

       5
       5
        
       in

     

       6
       6
        
       mkDerivation {

     

       7
       7
        
         inherit pname version;

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar";

     

       11
       11
       -
           sha256 = "15ci30yvw3p9zlmzsk9s4mxzb3wax3gl9p55slhf1bzwn1xxwyb0";

     

       11
       11
       +
           sha256 = "04wb1imm4934mpy2hxcmqh4cn7md1vwmfii39p6mby809325b5z1";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         phases = [ "installPhase" ];

+2 -2

pkgs/development/php-packages/phpcs/default.nix

···

       1
       1
        
       { mkDerivation, fetchurl, makeWrapper, lib, php }:

     

       2
       2
        
       let

     

       3
       3
        
         pname = "phpcs";

     

       4
       4
       -
         version = "3.5.8";

     

       4
       4
       +
         version = "3.6.0";

     

       5
       5
        
       in

     

       6
       6
        
       mkDerivation {

     

       7
       7
        
         inherit pname version;

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar";

     

       11
       11
       -
           sha256 = "037mdnpbgd9xaj556pf14h02a4a6f5zzdg58p2z1sivxcygf8aka";

     

       11
       11
       +
           sha256 = "0sdi78hrwd3r5p1b38qmp89m41kfszh2qn4n5zhq2dmhsjdhjziz";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         phases = [ "installPhase" ];

+36

pkgs/development/python-modules/ldaptor/19.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , twisted

     

       5
       5
       +
       , passlib

     

       6
       6
       +
       , pyopenssl

     

       7
       7
       +
       , pyparsing

     

       8
       8
       +
       , service-identity

     

       9
       9
       +
       , zope_interface

     

       10
       10
       +
       , isPy3k

     

       11
       11
       +
       , python

     

       12
       12
       +
       }:

     

       13
       13
       +
       

     

       14
       14
       +
       buildPythonPackage rec {

     

       15
       15
       +
         pname = "ldaptor";

     

       16
       16
       +
         version = "19.1.0";

     

       17
       17
       +
       

     

       18
       18
       +
         src = fetchPypi {

     

       19
       19
       +
           inherit pname version;

     

       20
       20
       +
           sha256 = "64c7b870c77e34e4f5f9cfdf330b9702e89b4dd0f64275704f86c1468312c755";

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
         propagatedBuildInputs = [

     

       24
       24
       +
           twisted passlib pyopenssl pyparsing service-identity zope_interface

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       27
       27
       +
         disabled = isPy3k;

     

       28
       28
       +
       

     

       29
       29
       +
         doCheck = false;

     

       30
       30
       +
       

     

       31
       31
       +
         meta = {

     

       32
       32
       +
           description = "A Pure-Python Twisted library for LDAP";

     

       33
       33
       +
           homepage = "https://github.com/twisted/ldaptor";

     

       34
       34
       +
           license = lib.licenses.mit;

     

       35
       35
       +
         };

     

       36
       36
       +
       }

+6 -6

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

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "msal";

     

       12
       12
       -
         version = "1.10.0";

     

       12
       12
       +
         version = "1.11.0";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchPypi {

     

       15
       15
        
           inherit pname version;

     

       16
       16
       -
           sha256 = "582e92e3b9fa68084dca6ecfd8db866ddc75cd9043de267c79d6b6277dd27f55";

     

       16
       16
       +
           sha256 = "sha256-RnrwK7lKh6G2lbUb+GdmfoKKzA3Twd5fpUP2kALbSfo=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         propagatedBuildInputs = [

     
···

       22
       22
        
         ];

     

       23
       23
        
       

     

       24
       24
        
         # Tests assume Network Connectivity:

     

       25
       25
       -
         #   https://github.com/AzureAD/microsoft-authentication-library-for-python/blob/e2958961e8ec16d0af4199f60c36c3f913497e48/tests/test_authority.py#L73

     

       25
       25
       +
         # https://github.com/AzureAD/microsoft-authentication-library-for-python/blob/e2958961e8ec16d0af4199f60c36c3f913497e48/tests/test_authority.py#L73

     

       26
       26
        
         doCheck = false;

     

       27
       27
        
       

     

       28
       28
       +
         pythonImportsCheck = [ "msal" ];

     

       29
       29
       +
       

     

       28
       30
        
         meta = with lib; {

     

       29
       31
        
           description = "The Microsoft Authentication Library (MSAL) for Python library enables your app to access the Microsoft Cloud by supporting authentication of users with Microsoft Azure Active Directory accounts (AAD) and Microsoft Accounts (MSA) using industry standard OAuth2 and OpenID Connect";

     

       30
       32
        
           homepage = "https://github.com/AzureAD/microsoft-authentication-library-for-python";

     

       31
       33
        
           license = licenses.mit;

     

       32
       32
       -
           maintainers = with maintainers; [

     

       33
       33
       -
             kamadorueda

     

       34
       34
       -
           ];

     

       34
       34
       +
           maintainers = with maintainers; [ kamadorueda ];

     

       35
       35
        
         };

     

       36
       36
        
       }

+18 -4

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

···

       17
       17
        
           sha256 = "9e0d70a1fa6f452584de1cb853ae6c11f41233549f7839cfb879f99410f6ad46";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         # package has no tests

     

       20
       20
       +
         propagatedBuildInputs = [

     

       21
       21
       +
           oauthlib

     

       22
       22
       +
           pyjwt

     

       23
       23
       +
           requests

     

       24
       24
       +
           requests_oauthlib

     

       25
       25
       +
           six

     

       26
       26
       +
         ];

     

       27
       27
       +
       

     

       28
       28
       +
         postPatch = ''

     

       29
       29
       +
           # https://github.com/mediawiki-utilities/python-mwoauth/pull/43

     

       30
       30
       +
           substituteInPlace setup.py --replace "PyJWT>=1.0.1,<2.0.0" "PyJWT>=1.0.1"

     

       31
       31
       +
         '';

     

       32
       32
       +
       

     

       33
       33
       +
         # PyPI source has no tests included

     

       34
       34
       +
         # https://github.com/mediawiki-utilities/python-mwoauth/issues/44

     

       21
       35
        
         doCheck = false;

     

       22
       36
        
       

     

       23
       23
       -
         propagatedBuildInputs = [ six pyjwt requests oauthlib requests_oauthlib ];

     

       37
       37
       +
         pythonImportsCheck = [ "mwoauth" ];

     

       24
       38
        
       

     

       25
       39
        
         meta = with lib; {

     

       26
       26
       -
           description = "A library designed to provide a simple means to performing an OAuth handshake with a MediaWiki installation with the OAuth Extension installed.";

     

       27
       27
       -
           homepage =  "https://github.com/mediawiki-utilities/python-mwoauth";

     

       40
       40
       +
           description = "Python library to perform OAuth handshakes with a MediaWiki installation";

     

       41
       41
       +
           homepage = "https://github.com/mediawiki-utilities/python-mwoauth";

     

       28
       42
        
           license = licenses.mit;

     

       29
       43
        
           maintainers = with maintainers; [ ixxie ];

     

       30
       44
        
         };

+16 -4

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

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "oauthenticator";

     

       17
       17
       -
         version = "0.13.0";

     

       17
       17
       +
         version = "14.0.0";

     

       18
       18
        
         disabled = pythonOlder "3.6";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchPypi {

     

       21
       21
        
           inherit pname version;

     

       22
       22
       -
           sha256 = "5202adcd96ddbbccbc267da02f2d14e977300c81291aaa77be4fd9f2e27cfa37";

     

       22
       22
       +
           sha256 = "1zfcl3dq9ladqg7fnpx6kgxf1ckjzlc8v3j6wa8w6iwglm40ax4r";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         propagatedBuildInputs = [

     

       26
       26
        
           jupyterhub

     

       27
       27
        
         ];

     

       28
       28
        
       

     

       29
       29
       -
         pytestFlagsArray = [ "oauthenticator/tests" ];

     

       30
       30
       -
       

     

       31
       29
        
         checkInputs = [

     

       32
       30
        
           google-api-python-client

     

       33
       31
        
           google-auth-oauthlib

     
···

       37
       35
        
           pytestCheckHook

     

       38
       36
        
           requests-mock

     

       39
       37
        
         ];

     

       38
       38
       +
       

     

       39
       39
       +
         postPatch = ''

     

       40
       40
       +
         # The constraint was removed. No longer needed for > 14.0.0

     

       41
       41
       +
         # https://github.com/jupyterhub/oauthenticator/pull/431

     

       42
       42
       +
           substituteInPlace test-requirements.txt --replace "pyjwt>=1.7,<2.0" "pyjwt"

     

       43
       43
       +
         '';

     

       44
       44
       +
       

     

       45
       45
       +
         disabledTests = [

     

       46
       46
       +
           # Test are outdated, https://github.com/jupyterhub/oauthenticator/issues/432

     

       47
       47
       +
           "test_azuread"

     

       48
       48
       +
           "test_mediawiki"

     

       49
       49
       +
         ];

     

       50
       50
       +
       

     

       51
       51
       +
         pythonImportsCheck = [ "oauthenticator" ];

     

       40
       52
        
       

     

       41
       53
        
         meta = with lib; {

     

       42
       54
        
           description = "Authenticate JupyterHub users with common OAuth providers, including GitHub, Bitbucket, and more.";

+4 -4

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

···

       1
       1
        
       { lib, buildPythonPackage, fetchFromGitHub, cacert, openssl, python, nixosTests

     

       2
       2
        
       

     

       3
       3
        
       , cryptography, pyrad, pymysql, python-dateutil, flask-versioned, flask_script

     

       4
       4
       -
       , defusedxml, croniter, flask_migrate, pyjwt, configobj, sqlsoup, pillow

     

       4
       4
       +
       , defusedxml, croniter, flask_migrate, pyjwt1, configobj, sqlsoup, pillow

     

       5
       5
        
       , python-gnupg, passlib, pyopenssl, beautifulsoup4, smpplib, flask-babel

     

       6
       6
        
       , ldap3, huey, pyyaml, qrcode, oauth2client, requests, lxml, cbor2, psycopg2

     

       7
       7
       -
       , pydash

     

       7
       7
       +
       , pydash, ecdsa

     

       8
       8
        
       

     

       9
       9
        
       , mock, pytestCheckHook, responses, testfixtures

     

       10
       10
        
       }:

     
···

       29
       29
        
       

     

       30
       30
        
         propagatedBuildInputs = [

     

       31
       31
        
           cryptography pyrad pymysql python-dateutil flask-versioned flask_script

     

       32
       32
       -
           defusedxml croniter flask_migrate pyjwt configobj sqlsoup pillow

     

       32
       32
       +
           defusedxml croniter flask_migrate pyjwt1 configobj sqlsoup pillow

     

       33
       33
        
           python-gnupg passlib pyopenssl beautifulsoup4 smpplib flask-babel

     

       34
       34
        
           ldap3 huey pyyaml qrcode oauth2client requests lxml cbor2 psycopg2

     

       35
       35
       -
           pydash

     

       35
       35
       +
           pydash ecdsa

     

       36
       36
        
         ];

     

       37
       37
        
       

     

       38
       38
        
         passthru.tests = { inherit (nixosTests) privacyidea; };

+9

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

···

       41
       41
        
           pytestCheckHook

     

       42
       42
        
         ];

     

       43
       43
        
       

     

       44
       44
       +
         postPatch = ''

     

       45
       45
       +
           # https://github.com/ChrisMandich/PyFlume/issues/18

     

       46
       46
       +
           substituteInPlace setup.py \

     

       47
       47
       +
             --replace "pyjwt==2.0.1" "pyjwt>=2.0.1" \

     

       48
       48
       +
             --replace "ratelimit==2.2.1" "ratelimit>=2.2.1" \

     

       49
       49
       +
             --replace "pytz==2019.2" "pytz>=2019.2" \

     

       50
       50
       +
             --replace "requests==2.24.0" "requests>=2.24.0"

     

       51
       51
       +
         '';

     

       52
       52
       +
       

     

       44
       53
        
         pythonImportsCheck = [ "pyflume" ];

     

       45
       54
        
       

     

       46
       55
        
         meta = with lib; {

+24 -17

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

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi

     

       2
       2
       -
       , cryptography, ecdsa

     

       3
       3
       -
       , pytestrunner, pytestcov, pytest }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , cryptography

     

       5
       5
       +
       , ecdsa

     

       6
       6
       +
       , pytest-cov

     

       7
       7
       +
       , pytestCheckHook

     

       8
       8
       +
       , pythonOlder

     

       9
       9
       +
       }:

     

       4
       10
        
       

     

       5
       11
        
       buildPythonPackage rec {

     

       6
       6
       -
         pname = "PyJWT";

     

       7
       7
       -
         version = "2.0.1";

     

       12
       12
       +
         pname = "pyjwt";

     

       13
       13
       +
         version = "2.1.0";

     

       14
       14
       +
         disabled = pythonOlder "3.6";

     

       8
       15
        
       

     

       9
       16
        
         src = fetchPypi {

     

       10
       10
       -
           inherit pname version;

     

       11
       11
       -
           sha256 = "a5c70a06e1f33d81ef25eecd50d50bd30e34de1ca8b2b9fa3fe0daaabcf69bf7";

     

       17
       17
       +
           pname = "PyJWT";

     

       18
       18
       +
           inherit version;

     

       19
       19
       +
           sha256 = "sha256-+6ROeJi7yhYKKytQH0koJPyDgkhdOm8Rul0MGTfOYTA=";

     

       12
       20
        
         };

     

       13
       21
        
       

     

       14
       14
       -
         propagatedBuildInputs = [ cryptography ecdsa ];

     

       15
       15
       -
       

     

       16
       16
       -
         checkInputs = [ pytestrunner pytestcov pytest ];

     

       22
       22
       +
         propagatedBuildInputs = [

     

       23
       23
       +
           cryptography

     

       24
       24
       +
           ecdsa

     

       25
       25
       +
         ];

     

       17
       26
        
       

     

       18
       18
       -
         postPatch = ''

     

       19
       19
       -
           substituteInPlace setup.py --replace "pytest>=4.0.1,<5.0.0" "pytest"

     

       20
       20
       -
         '';

     

       27
       27
       +
         checkInputs = [

     

       28
       28
       +
           pytest-cov

     

       29
       29
       +
           pytestCheckHook

     

       30
       30
       +
         ];

     

       21
       31
        
       

     

       22
       22
       -
         # ecdsa changed internal behavior

     

       23
       23
       -
         checkPhase = ''

     

       24
       24
       -
           pytest tests -k 'not ec_verify_should_return_false_if_signature_invalid'

     

       25
       25
       -
         '';

     

       32
       32
       +
         pythonImportsCheck = [ "jwt" ];

     

       26
       33
        
       

     

       27
       34
        
         meta = with lib; {

     

       28
       35
        
           description = "JSON Web Token implementation in Python";

+19 -15

pkgs/development/python-modules/snowflake-connector-python/default.nix

···

       1
       1
       -
       { buildPythonPackage

     

       2
       2
       -
       , isPy27

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , pythonOlder

     

       3
       4
        
       , asn1crypto

     

       4
       5
        
       , azure-storage-blob

     

       5
       6
        
       , boto3

     
···

       10
       11
        
       , idna

     

       11
       12
        
       , ijson

     

       12
       13
        
       , isPy3k

     

       13
       13
       -
       , lib

     

       14
       14
        
       , oscrypto

     

       15
       15
        
       , pyarrow

     

       16
       16
        
       , pyasn1-modules

     
···

       25
       25
        
       

     

       26
       26
        
       buildPythonPackage rec {

     

       27
       27
        
         pname = "snowflake-connector-python";

     

       28
       28
       -
         version = "2.4.1";

     

       29
       29
       -
         disabled = isPy27;

     

       28
       28
       +
         version = "2.4.3";

     

       29
       29
       +
         disabled = pythonOlder "3.6";

     

       30
       30
        
       

     

       31
       31
        
         src = fetchPypi {

     

       32
       32
        
           inherit pname version;

     

       33
       33
       -
           sha256 = "5c9180e61202a7beb1df83231688423091ca0a04ee559d2a78ff77f9c727baae";

     

       33
       33
       +
           sha256 = "sha256-+jAfUwaofWM5Ef1kk4AEAbBM/UES8/ZzLd4QJfkEQsM=";

     

       34
       34
        
         };

     

       35
       35
        
       

     

       36
       36
       -
         postPatch = ''

     

       37
       37
       -
           substituteInPlace setup.py \

     

       38
       38
       -
             --replace "'pyOpenSSL>=16.2.0,<20.0.0'," "'pyOpenSSL'," \

     

       39
       39
       -
             --replace 'pytz<2021.0' 'pytz'

     

       40
       40
       -
         '';

     

       41
       41
       -
       

     

       42
       36
        
         propagatedBuildInputs = [

     

       43
       37
        
           azure-storage-blob

     

       44
       38
        
           asn1crypto

     
···

       55
       49
        
           pytz

     

       56
       50
        
           requests

     

       57
       51
        
           six

     

       58
       58
       -
         ] ++ lib.optionals (!isPy3k) [

     

       59
       52
        
           pyarrow

     

       60
       53
        
           pyasn1-modules

     

       61
       54
        
           urllib3

     

       62
       55
        
         ];

     

       63
       56
        
       

     

       64
       64
       -
         # tests require encrypted secrets, see

     

       57
       57
       +
         postPatch = ''

     

       58
       58
       +
           # https://github.com/snowflakedb/snowflake-connector-python/issues/705

     

       59
       59
       +
           substituteInPlace setup.py \

     

       60
       60
       +
             --replace "idna>=2.5,<3" "idna" \

     

       61
       61
       +
             --replace "chardet>=3.0.2,<4" "chardet"

     

       62
       62
       +
         '';

     

       63
       63
       +
       

     

       64
       64
       +
         # Tests require encrypted secrets, see

     

       65
       65
        
         # https://github.com/snowflakedb/snowflake-connector-python/tree/master/.github/workflows/parameters

     

       66
       66
        
         doCheck = false;

     

       67
       67
       -
         pythonImportsCheck = [ "snowflake" "snowflake.connector" ];

     

       67
       67
       +
       

     

       68
       68
       +
         pythonImportsCheck = [

     

       69
       69
       +
           "snowflake"

     

       70
       70
       +
           "snowflake.connector"

     

       71
       71
       +
         ];

     

       68
       72
        
       

     

       69
       73
        
         meta = with lib; {

     

       70
       74
        
           description = "Snowflake Connector for Python";

+2 -2

pkgs/development/tools/misc/nimlsp/default.nix

···

       16
       16
        
       in

     

       17
       17
        
       stdenv.mkDerivation rec {

     

       18
       18
        
         pname = "nimlsp";

     

       19
       19
       -
         version = "0.2.6";

     

       19
       19
       +
         version = "0.3.2";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromGitHub {

     

       22
       22
        
           owner = "PMunch";

     

       23
       23
        
           repo = "nimlsp";

     

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

     

       25
       25
       -
           sha256 = "13kw3zjh0iqymwqxwhyj8jz6hgswwahf1rjd6iad7c6gcwrrg6yl";

     

       25
       25
       +
           sha256 = "1lm823nvpp3bj9527jd8n1jxh6y8p8ngkfkj91p94m7ffai6jazq";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [ nim ];

+4 -4

pkgs/servers/radarr/default.nix

···

       9
       9
        
         }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

     

       10
       10
        
       

     

       11
       11
        
         hash = {

     

       12
       12
       -
           x64-linux_hash = "sha256-bTh+Z5w5ZkL2iPteStqVcoFDGZIbpVjuXn20TZsfgtY=";

     

       13
       13
       -
           arm64-linux_hash = "sha256-aIzVSIRuGNiIFJPToXCQwYsbICKuPtwKATnQhkxvJuA=";

     

       14
       14
       -
           x64-osx_hash = "sha256-FxRSAJvRQya2x1kei6yRceGcyQ2mCaFveyeMGw0Jqw4=";

     

       12
       12
       +
           x64-linux_hash = "sha256-5W4X1E7794hFVPo4+s826CNIrw6Z/n0cDjj6pmsj2Dk=";

     

       13
       13
       +
           arm64-linux_hash = "sha256-gqCgToAVIS+IEulFY4mo2Mtcb3nyFpzDBqVEewREQcs=";

     

       14
       14
       +
           x64-osx_hash = "sha256-MFpIzSYAvAWVHMdEd+aP67s3po+yb3qWzSd/Ko++5Jc=";

     

       15
       15
        
         }."${arch}-${os}_hash";

     

       16
       16
        
       

     

       17
       17
        
       in stdenv.mkDerivation rec {

     

       18
       18
        
         pname = "radarr";

     

       19
       19
       -
         version = "3.0.2.4552";

     

       19
       19
       +
         version = "3.1.1.4954";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchurl {

     

       22
       22
        
           url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz";

+2 -2

pkgs/servers/sql/mariadb/default.nix

···

       22
       22
        
       };

     

       23
       23
        
       

     

       24
       24
        
       common = rec { # attributes common to both builds

     

       25
       25
       -
         version = "10.5.8";

     

       25
       25
       +
         version = "10.5.10";

     

       26
       26
        
       

     

       27
       27
        
         src = fetchurl {

     

       28
       28
        
           urls = [

     

       29
       29
        
             "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz"

     

       30
       30
        
             "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz"

     

       31
       31
        
           ];

     

       32
       32
       -
           sha256 = "1s3vfm73911cddjhgpcbkya6nz7ag2zygg56qqzwscn5ybv28j7b";

     

       32
       32
       +
           sha256 = "1fxsq2xgcb8j81z043bifpmxblj6nb3wqjm9rgsnpwmazkwk5zx5";

     

       33
       33
        
           name   = "mariadb-${version}.tar.gz";

     

       34
       34
        
         };

     

       35
       35

+11 -28

pkgs/servers/sql/mariadb/galera/default.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub, buildEnv

     

       2
       2
       -
       , asio, boost, check, openssl, scons

     

       2
       2
       +
       , asio, boost, check, openssl, cmake

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       let

     
···

       10
       10
        
       

     

       11
       11
        
       in stdenv.mkDerivation rec {

     

       12
       12
        
         pname = "mariadb-galera";

     

       13
       13
       -
         version = "26.4.7";

     

       13
       13
       +
         version = "26.4.8";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "codership";

     

       17
       17
        
           repo = "galera";

     

       18
       18
        
           rev = "release_${version}";

     

       19
       19
       -
           sha256 = "0h7s670pcasq8wzprhyxqfca2cghi62b8xz2kikb2a86wd453qil";

     

       19
       19
       +
           sha256 = "0rx710dfijiykpi41rhxx8vafk07bffv2nbl3d4ggc32rzv88369";

     

       20
       20
        
           fetchSubmodules = true;

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
       -
         buildInputs = [ asio boost check openssl scons ];

     

       24
       24
       -
       

     

       25
       25
       -
         postPatch = ''

     

       26
       26
       -
           substituteInPlace SConstruct \

     

       27
       27
       -
             --replace "boost_library_path = '''" "boost_library_path = '${boost}/lib'"

     

       28
       28
       -
         '';

     

       23
       23
       +
         buildInputs = [ asio boost check openssl cmake ];

     

       29
       24
        
       

     

       30
       25
        
         preConfigure = ''

     

       31
       31
       -
           export CPPFLAGS="-I${asio}/include -I${boost.dev}/include -I${check}/include -I${openssl.dev}/include"

     

       32
       32
       -
           export LIBPATH="${galeraLibs}/lib"

     

       26
       26
       +
           # make sure bundled asio cannot be used, but leave behind license, because it gets installed

     

       27
       27
       +
           rm -r asio/{asio,asio.hpp}

     

       33
       28
        
         '';

     

       34
       29
        
       

     

       35
       35
       -
         sconsFlags = "ssl=1 system_asio=1 strict_build_flags=0";

     

       36
       36
       -
       

     

       37
       37
       -
         enableParallelBuilding = true;

     

       38
       38
       -
       

     

       39
       39
       -
         installPhase = ''

     

       40
       40
       -
           # copied with modifications from scripts/packages/freebsd.sh

     

       41
       41
       -
           GALERA_LICENSE_DIR="$share/licenses/${pname}-${version}"

     

       42
       42
       -
           install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR}

     

       43
       43
       -
           install -m 555 "garb/garbd"                       "$out/bin/garbd"

     

       44
       44
       -
           install -m 444 "libgalera_smm.so"                 "$out/lib/galera/libgalera_smm.so"

     

       45
       45
       -
           install -m 444 "scripts/packages/README"          "$out/share/doc/galera/"

     

       46
       46
       -
           install -m 444 "scripts/packages/README-MySQL"    "$out/share/doc/galera/"

     

       47
       47
       -
           install -m 444 "scripts/packages/freebsd/LICENSE" "$out/$GALERA_LICENSE_DIR"

     

       48
       48
       -
           install -m 444 "LICENSE"                          "$out/$GALERA_LICENSE_DIR/GPLv2"

     

       49
       49
       -
           install -m 444 "asio/LICENSE_1_0.txt"             "$out/$GALERA_LICENSE_DIR/LICENSE.asio"

     

       30
       30
       +
         postInstall = ''

     

       31
       31
       +
           # for backwards compatibility

     

       32
       32
       +
           ln -s . $out/lib/galera

     

       50
       33
        
         '';

     

       51
       34
        
       

     

       52
       35
        
         meta = with lib; {

     

       53
       36
        
           description = "Galera 3 wsrep provider library";

     

       54
       37
        
           homepage = "https://galeracluster.com/";

     

       55
       55
       -
           license = licenses.lgpl2;

     

       56
       56
       -
           maintainers = with maintainers; [ izorkin ];

     

       38
       38
       +
           license = licenses.lgpl2Only;

     

       39
       39
       +
           maintainers = with maintainers; [ ajs124 izorkin ];

     

       57
       40
        
           platforms = platforms.all;

     

       58
       41
        
         };

     

       59
       42
        
       }

+3 -3

pkgs/tools/admin/lxd/default.nix

···

       18
       18
        
       in

     

       19
       19
        
       buildGoPackage rec {

     

       20
       20
        
         pname = "lxd";

     

       21
       21
       -
         version = "4.13";

     

       21
       21
       +
         version = "4.14";

     

       22
       22
        
       

     

       23
       23
        
         goPackagePath = "github.com/lxc/lxd";

     

       24
       24
        
       

     

       25
       25
        
         src = fetchurl {

     

       26
       26
       -
           url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";

     

       27
       27
       -
           sha256 = "0w2r80wf86jijgfxbkv06lgfhz4p2aaidsqd96bx3q1382nrbzcf";

     

       26
       26
       +
           url = "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz";

     

       27
       27
       +
           sha256 = "1x9gv70j333w254jgg1n0kvxpwv6vww0v0i862pglq48xhdaa7hy";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         postPatch = ''

+2 -2

pkgs/tools/graphics/agi/default.nix

···

       14
       14
        
       

     

       15
       15
        
       stdenv.mkDerivation rec {

     

       16
       16
        
         pname = "agi";

     

       17
       17
       -
         version = "1.1.0-dev-20210504";

     

       17
       17
       +
         version = "1.1.0-dev-20210506";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchzip {

     

       20
       20
        
           url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip";

     

       21
       21
       -
           sha256 = "sha256-q9xWe1gGX7SV/tAUHu/uBB709aqegIsNLTPM5zljgYY=";

     

       21
       21
       +
           sha256 = "sha256-VB9AL2h+e+92lhsfdYHbSgv5AIrgEPJsa74VGncDHGo=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [

+2 -2

pkgs/tools/misc/esphome/default.nix

···

       8
       8
        
       

     

       9
       9
        
       python3.pkgs.buildPythonApplication rec {

     

       10
       10
        
         pname = "esphome";

     

       11
       11
       -
         version = "1.17.1";

     

       11
       11
       +
         version = "1.17.2";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = pname;

     

       15
       15
        
           repo = pname;

     

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

     

       17
       17
       -
           sha256 = "0483glwi155ca1wnffwhmwn17d7kwk4hjwmckb8zs197rfqmb55v";

     

       17
       17
       +
           sha256 = "1md52xzlrzf99s5q2152s1b7yql2h02ss451g68ky207xz660aj1";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         postPatch = ''

+3 -3

pkgs/tools/networking/croc/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "croc";

     

       5
       5
       -
         version = "9.1.1";

     

       5
       5
       +
         version = "9.1.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "schollz";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-MiTc8uT4FUHqEgE37kZ0pc7y1aK6u+4LqYQ8l1j2jA4=";

     

       11
       11
       +
           sha256 = "sha256-7v8vz0n35ATWdmMcM2U7z1sONbmsaWQahHsramivm88=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-UGFFzpbBeL4YS3VSjCa31E2fiqND8j3E4FjRflg1NFc=";

     

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

     

       15
       15
        
       

     

       16
       16
        
         doCheck = false;

     

       17
       17

+1

pkgs/tools/system/bottom/default.nix

···

       33
       33
        
           license = licenses.mit;

     

       34
       34
        
           maintainers = with maintainers; [ berbiche ];

     

       35
       35
        
           platforms = platforms.unix;

     

       36
       36
       +
           mainProgram = "btm";

     

       36
       37
        
         };

     

       37
       38
        
       }

+3 -1

pkgs/top-level/python-packages.nix

···

       5181
       5181
        
       

     

       5182
       5182
        
         prison = callPackage ../development/python-modules/prison { };

     

       5183
       5183
        
       

     

       5184
       5184
       -
         privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea/ldap-proxy.nix { };

     

       5184
       5184
       +
         privacyidea = callPackage ../development/python-modules/privacyidea { };

     

       5185
       5185
       +
       

     

       5186
       5186
       +
         pyjwt1 = callPackage ../development/python-modules/pyjwt/1.nix { };

     

       5185
       5187
        
       

     

       5186
       5188
        
         proboscis = callPackage ../development/python-modules/proboscis { };

     

       5187
       5189

+3 -1

pkgs/top-level/python2-packages.nix

···

       383
       383
        
       

     

       384
       384
        
         prettytable = callPackage ../development/python-modules/prettytable/1.nix { };

     

       385
       385
        
       

     

       386
       386
       -
         privacyidea = callPackage ../development/python-modules/privacyidea { };

     

       386
       386
       +
         privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea/ldap-proxy.nix { };

     

       387
       387
       +
       

     

       388
       388
       +
         ldaptor = callPackage ../development/python-modules/ldaptor/19.nix { };

     

       387
       389
        
       

     

       388
       390
        
         progressbar231 = callPackage ../development/python-modules/progressbar231 { };

     

       389
       391