commit a3d9dd795642accd29906eba2268ff3b5c66320c · pyrox.dev/nixpkgs

+1 -1

doc/stdenv/stdenv.chapter.md

···

       309
       309
        
       passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ];

     

       310
       310
        
       ```

     

       311
       311
        
       

     

       312
       312
       -
       The script will be run with `UPDATE_NIX_ATTR_PATH` environment variable set to the attribute path it is supposed to update.

     

       312
       312
       +
       The script will be run with the `UPDATE_NIX_NAME`, `UPDATE_NIX_PNAME`, `UPDATE_NIX_OLD_VERSION` and `UPDATE_NIX_ATTR_PATH` environment variables set respectively to the name, pname, old version and attribute path of the package it is supposed to update.

     

       313
       313
        
       

     

       314
       314
        
       ::: {.note}

     

       315
       315
        
       The script will be usually run from the root of the Nixpkgs repository but you should not rely on that. Also note that the update scripts will be run in parallel by default; you should avoid running `git commit` or any other commands that cannot handle that.

+6

maintainers/maintainer-list.nix

···

       5235
       5235
        
             fingerprint = "3F35 E4CA CBF4 2DE1 2E90  53E5 03A6 E6F7 8693 6619";

     

       5236
       5236
        
           }];

     

       5237
       5237
        
         };

     

       5238
       5238
       +
         harvidsen = {

     

       5239
       5239
       +
           email = "harvidsen@gmail.com";

     

       5240
       5240
       +
           github = "harvidsen";

     

       5241
       5241
       +
           githubId = 62279738;

     

       5242
       5242
       +
           name = "Håkon Arvidsen";

     

       5243
       5243
       +
         };

     

       5238
       5244
        
         haslersn = {

     

       5239
       5245
        
           email = "haslersn@fius.informatik.uni-stuttgart.de";

     

       5240
       5246
        
           github = "haslersn";

+11 -1

maintainers/scripts/update.py

···

       52
       52
        
           eprint(f" - {package['name']}: UPDATING ...")

     

       53
       53
        
       

     

       54
       54
        
           try:

     

       55
       55
       -
               update_process = await check_subprocess('env', f"UPDATE_NIX_ATTR_PATH={package['attrPath']}", *update_script_command, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE, cwd=worktree)

     

       55
       55
       +
               update_process = await check_subprocess(

     

       56
       56
       +
                   'env',

     

       57
       57
       +
                   f"UPDATE_NIX_NAME={package['name']}",

     

       58
       58
       +
                   f"UPDATE_NIX_PNAME={package['pname']}",

     

       59
       59
       +
                   f"UPDATE_NIX_OLD_VERSION={package['oldVersion']}",

     

       60
       60
       +
                   f"UPDATE_NIX_ATTR_PATH={package['attrPath']}",

     

       61
       61
       +
                   *update_script_command,

     

       62
       62
       +
                   stdout=asyncio.subprocess.PIPE,

     

       63
       63
       +
                   stderr=asyncio.subprocess.PIPE,

     

       64
       64
       +
                   cwd=worktree,

     

       65
       65
       +
               )

     

       56
       66
        
               update_info = await update_process.stdout.read()

     

       57
       67
        
       

     

       58
       68
        
               await merge_changes(merge_lock, package, update_info, temp_dir)

+66 -6

nixos/modules/services/admin/pgadmin.nix

···

       37
       37
        
           };

     

       38
       38
        
       

     

       39
       39
        
           initialEmail = mkOption {

     

       40
       40
       -
             description = lib.mdDoc "Initial email for the pgAdmin account.";

     

       40
       40
       +
             description = lib.mdDoc "Initial email for the pgAdmin account";

     

       41
       41
        
             type = types.str;

     

       42
       42
        
           };

     

       43
       43
        
       

     

       44
       44
        
           initialPasswordFile = mkOption {

     

       45
       45
        
             description = lib.mdDoc ''

     

       46
       46
        
               Initial password file for the pgAdmin account.

     

       47
       47
       -
               NOTE: Should be string not a store path, to prevent the password from being world readable.

     

       47
       47
       +
               NOTE: Should be string not a store path, to prevent the password from being world readable

     

       48
       48
        
             '';

     

       49
       49
        
             type = types.path;

     

       50
       50
        
           };

     

       51
       51
        
       

     

       52
       52
       +
           emailServer = {

     

       53
       53
       +
             enable = mkOption {

     

       54
       54
       +
               description = lib.mdDoc ''

     

       55
       55
       +
                 Enable SMTP email server. This is necessary, if you want to use password recovery or change your own password

     

       56
       56
       +
               '';

     

       57
       57
       +
               type = types.bool;

     

       58
       58
       +
               default = false;

     

       59
       59
       +
             };

     

       60
       60
       +
             address = mkOption {

     

       61
       61
       +
               description = lib.mdDoc "SMTP server for email delivery";

     

       62
       62
       +
               type = types.str;

     

       63
       63
       +
               default = "localhost";

     

       64
       64
       +
             };

     

       65
       65
       +
             port = mkOption {

     

       66
       66
       +
               description = lib.mdDoc "SMTP server port for email delivery";

     

       67
       67
       +
               type = types.port;

     

       68
       68
       +
               default = 25;

     

       69
       69
       +
             };

     

       70
       70
       +
             useSSL = mkOption {

     

       71
       71
       +
               description = lib.mdDoc "SMTP server should use SSL";

     

       72
       72
       +
               type = types.bool;

     

       73
       73
       +
               default = false;

     

       74
       74
       +
             };

     

       75
       75
       +
             useTLS = mkOption {

     

       76
       76
       +
               description = lib.mdDoc "SMTP server should use TLS";

     

       77
       77
       +
               type = types.bool;

     

       78
       78
       +
               default = false;

     

       79
       79
       +
             };

     

       80
       80
       +
             username = mkOption {

     

       81
       81
       +
               description = lib.mdDoc "SMTP server username for email delivery";

     

       82
       82
       +
               type = types.nullOr types.str;

     

       83
       83
       +
               default = null;

     

       84
       84
       +
             };

     

       85
       85
       +
             sender = mkOption {

     

       86
       86
       +
               description = lib.mdDoc ''

     

       87
       87
       +
                 SMTP server sender email for email delivery. Some servers require this to be a valid email address from that server

     

       88
       88
       +
               '';

     

       89
       89
       +
               type = types.str;

     

       90
       90
       +
               example = "noreply@example.com";

     

       91
       91
       +
             };

     

       92
       92
       +
             passwordFile = mkOption {

     

       93
       93
       +
               description = lib.mdDoc ''

     

       94
       94
       +
                 Password for SMTP email account.

     

       95
       95
       +
                 NOTE: Should be string not a store path, to prevent the password from being world readable

     

       96
       96
       +
               '';

     

       97
       97
       +
               type = types.path;

     

       98
       98
       +
             };

     

       99
       99
       +
           };

     

       100
       100
       +
       

     

       52
       101
        
           openFirewall = mkEnableOption (lib.mdDoc "firewall passthrough for pgadmin4");

     

       53
       102
        
       

     

       54
       103
        
           settings = mkOption {

     

       55
       104
        
             description = lib.mdDoc ''

     

       56
       105
        
               Settings for pgadmin4.

     

       57
       57
       -
               [Documentation](https://www.pgadmin.org/docs/pgadmin4/development/config_py.html).

     

       106
       106
       +
               [Documentation](https://www.pgadmin.org/docs/pgadmin4/development/config_py.html)

     

       58
       107
        
             '';

     

       59
       108
        
             type = pyType;

     

       60
       60
       -
             default= {};

     

       109
       109
       +
             default = { };

     

       61
       110
        
           };

     

       62
       111
        
         };

     

       63
       112
        
       

     
···

       69
       118
        
             SERVER_MODE = true;

     

       70
       119
        
           } // (optionalAttrs cfg.openFirewall {

     

       71
       120
        
             DEFAULT_SERVER = mkDefault "::";

     

       121
       121
       +
           }) // (optionalAttrs cfg.emailServer.enable {

     

       122
       122
       +
             MAIL_SERVER = cfg.emailServer.address;

     

       123
       123
       +
             MAIL_PORT = cfg.emailServer.port;

     

       124
       124
       +
             MAIL_USE_SSL = cfg.emailServer.useSSL;

     

       125
       125
       +
             MAIL_USE_TLS = cfg.emailServer.useTLS;

     

       126
       126
       +
             MAIL_USERNAME = cfg.emailServer.username;

     

       127
       127
       +
             SECURITY_EMAIL_SENDER = cfg.emailServer.sender;

     

       72
       128
        
           });

     

       73
       129
        
       

     

       74
       130
        
           systemd.services.pgadmin = {

     
···

       115
       171
        
             group = "pgadmin";

     

       116
       172
        
           };

     

       117
       173
        
       

     

       118
       118
       -
           users.groups.pgadmin = {};

     

       174
       174
       +
           users.groups.pgadmin = { };

     

       119
       175
        
       

     

       120
       176
        
           environment.etc."pgadmin/config_system.py" = {

     

       121
       121
       -
             text = formatPy cfg.settings;

     

       177
       177
       +
             text = lib.optionalString cfg.emailServer.enable ''

     

       178
       178
       +
               with open("${cfg.emailServer.passwordFile}") as f:

     

       179
       179
       +
                 pw = f.read()

     

       180
       180
       +
               MAIL_PASSWORD = pw

     

       181
       181
       +
             '' + formatPy cfg.settings;

     

       122
       182
        
             mode = "0600";

     

       123
       183
        
             user = "pgadmin";

     

       124
       184
        
             group = "pgadmin";

+3

nixos/modules/system/boot/stage-1-init.sh

···

       555
       555
        
       

     

       556
       556
        
             umount /tmp-iso

     

       557
       557
        
             rmdir /tmp-iso

     

       558
       558
       +
             if [ -n "$isoPath" ] && [ $fsType = "iso9660" ] && mountpoint -q /findiso; then

     

       559
       559
       +
              umount /findiso

     

       560
       560
       +
             fi

     

       558
       561
        
             continue

     

       559
       562
        
           fi

     

       560
       563

+9 -10

nixos/tests/pgadmin4.nix

···

       106
       106
        
                  && sed -i 's|driver_local.maximize_window()||' web/regression/runtests.py"

     

       107
       107
        
             )

     

       108
       108
        
       

     

       109
       109
       -
             # don't bother to test LDAP authentification

     

       110
       110
       -
             # exclude resql test due to recent postgres 14.4 update

     

       111
       111
       -
             # see bugreport here https://redmine.postgresql.org/issues/7527

     

       109
       109
       +
             # Don't bother to test LDAP or kerberos authentification

     

       110
       110
       +
             # For now deactivate change_password API test. Current bug report at https://redmine.postgresql.org/issues/7648

     

       111
       111
       +
             # Password change works from the UI, if email SMTP is configured.

     

       112
       112
        
             with subtest("run browser test"):

     

       113
       113
        
                 machine.succeed(

     

       114
       114
        
                      'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \

     

       115
       115
        
                      && python regression/runtests.py \

     

       116
       116
        
                      --pkg browser \

     

       117
       117
       -
                      --exclude browser.tests.test_ldap_login.LDAPLoginTestCase,browser.tests.test_ldap_login,resql'

     

       117
       117
       +
                      --exclude browser.tests.test_ldap_login.LDAPLoginTestCase,browser.tests.test_ldap_login,browser.tests.test_kerberos_with_mocking,browser.tests.test_change_password'

     

       118
       118
        
                 )

     

       119
       119
        
       

     

       120
       120
        
             # fontconfig is necessary for chromium to run

     
···

       126
       126
        
                      && python regression/runtests.py --pkg feature_tests'

     

       127
       127
        
                 )

     

       128
       128
        
       

     

       129
       129
       -
             # reactivate this test again, when the postgres 14.4 test has been fixed

     

       130
       130
       -
             # with subtest("run resql test"):

     

       131
       131
       -
             #    machine.succeed(

     

       132
       132
       -
             #         'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \

     

       133
       133
       -
             #         && python regression/runtests.py --pkg resql'

     

       134
       134
       -
             #    )

     

       129
       129
       +
             with subtest("run resql test"):

     

       130
       130
       +
                machine.succeed(

     

       131
       131
       +
                     'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \

     

       132
       132
       +
                     && python regression/runtests.py --pkg resql'

     

       133
       133
       +
                )

     

       135
       134
        
           '';

     

       136
       135
        
         })

+2 -2

pkgs/applications/audio/famistudio/default.nix

···

       10
       10
        
       

     

       11
       11
        
       stdenv.mkDerivation rec {

     

       12
       12
        
         pname = "famistudio";

     

       13
       13
       -
         version = "4.0.1";

     

       13
       13
       +
         version = "4.0.4";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchzip {

     

       16
       16
        
           url = "https://github.com/BleuBleu/FamiStudio/releases/download/${version}/FamiStudio${lib.strings.concatStrings (lib.splitVersion version)}-LinuxAMD64.zip";

     

       17
       17
        
           stripRoot = false;

     

       18
       18
       -
           sha256 = "sha256-pAULW2aIaKiA61rARpL+hSoffnQO6hfqVpOcEMwD7oo=";

     

       18
       18
       +
           sha256 = "sha256-qdSldObfwC5J1b4tpHT9S/xxJ2StBTsPA80QS7bs2vo=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [

+64

pkgs/applications/misc/databricks-sql-cli/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonApplication

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , fetchpatch

     

       5
       5
       +
       , poetry-core

     

       6
       6
       +
       , pandas

     

       7
       7
       +
       , prompt-toolkit

     

       8
       8
       +
       , databricks-sql-connector

     

       9
       9
       +
       , pygments

     

       10
       10
       +
       , configobj

     

       11
       11
       +
       , sqlparse

     

       12
       12
       +
       , cli-helpers

     

       13
       13
       +
       , click

     

       14
       14
       +
       , pytestCheckHook

     

       15
       15
       +
       }:

     

       16
       16
       +
       

     

       17
       17
       +
       buildPythonApplication rec {

     

       18
       18
       +
         pname = "databricks-sql-cli";

     

       19
       19
       +
         version = "0.1.4";

     

       20
       20
       +
         format = "pyproject";

     

       21
       21
       +
       

     

       22
       22
       +
         src = fetchFromGitHub {

     

       23
       23
       +
           owner = "databricks";

     

       24
       24
       +
           repo = "databricks-sql-cli";

     

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

     

       26
       26
       +
           sha256 = "sha256-gr7LJfnvIu2Jf1XgILqfZoi8CbXeQyq0g1wLEBa5TPM=";

     

       27
       27
       +
         };

     

       28
       28
       +
       

     

       29
       29
       +
         patches = [

     

       30
       30
       +
           # https://github.com/databricks/databricks-sql-cli/pull/38

     

       31
       31
       +
           (fetchpatch {

     

       32
       32
       +
             url = "https://github.com/databricks/databricks-sql-cli/commit/fc294e00819b6966f1605e5c1ce654473510aefe.patch";

     

       33
       33
       +
             sha256 = "sha256-QVrb7mD0fVbHrbrDywI6tsFNYM19x74LY8rhqqC8szE=";

     

       34
       34
       +
           })

     

       35
       35
       +
         ];

     

       36
       36
       +
       

     

       37
       37
       +
         postPatch = ''

     

       38
       38
       +
           substituteInPlace pyproject.toml \

     

       39
       39
       +
             --replace 'python = ">=3.7.1,<4.0"' 'python = ">=3.8,<4.0"' \

     

       40
       40
       +
             --replace 'pandas = "1.3.4"' 'pandas = "~1.4"'

     

       41
       41
       +
         '';

     

       42
       42
       +
       

     

       43
       43
       +
         nativeBuildInputs = [ poetry-core ];

     

       44
       44
       +
       

     

       45
       45
       +
         propagatedBuildInputs = [

     

       46
       46
       +
           prompt-toolkit

     

       47
       47
       +
           pandas

     

       48
       48
       +
           databricks-sql-connector

     

       49
       49
       +
           pygments

     

       50
       50
       +
           configobj

     

       51
       51
       +
           sqlparse

     

       52
       52
       +
           cli-helpers

     

       53
       53
       +
           click

     

       54
       54
       +
         ];

     

       55
       55
       +
       

     

       56
       56
       +
         checkInputs = [ pytestCheckHook ];

     

       57
       57
       +
       

     

       58
       58
       +
         meta = with lib; {

     

       59
       59
       +
           description = "CLI for querying Databricks SQL";

     

       60
       60
       +
           homepage = "https://github.com/databricks/databricks-sql-cli";

     

       61
       61
       +
           license = licenses.databricks;

     

       62
       62
       +
           maintainers = with maintainers; [ kfollesdal ];

     

       63
       63
       +
         };

     

       64
       64
       +
       }

+3 -1

pkgs/applications/networking/gns3/default.nix

···

       20
       20
        
               });

     

       21
       21
        
             };

     

       22
       22
        
           commonOverrides = [

     

       23
       23
       -
             (mkOverride "jsonschema" "3.2.0" "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68")

     

       23
       23
       +
             (self: super: {

     

       24
       24
       +
               jsonschema = super.jsonschema_3;

     

       25
       25
       +
             })

     

       24
       26
        
           ];

     

       25
       27
        
         };

     

       26
       28
        
         mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { };

+2 -15

pkgs/applications/networking/gns3/gui.nix

···

       10
       10
        
       , python3

     

       11
       11
        
       , fetchFromGitHub

     

       12
       12
        
       , wrapQtAppsHook

     

       13
       13
       +
       , packageOverrides ? self: super: {}

     

       13
       14
        
       }:

     

       14
       15
        
       

     

       15
       16
        
       let

     
···

       17
       18
        
         ];

     

       18
       19
        
       

     

       19
       20
        
         python = python3.override {

     

       20
       20
       -
           packageOverrides = lib.foldr lib.composeExtensions (self: super: {

     

       21
       21
       -
             jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec {

     

       22
       22
       -
               version = "3.2.0";

     

       23
       23
       -
       

     

       24
       24
       -
               src = super.fetchPypi {

     

       25
       25
       -
                 inherit (oldAttrs) pname;

     

       26
       26
       -
                 inherit version;

     

       27
       27
       -
                 sha256 = "sha256-yKhbKNN3zHc35G4tnytPRO48Dh3qxr9G3e/HGH0weXo=";

     

       28
       28
       -
               };

     

       29
       29
       -
       

     

       30
       30
       -
               SETUPTOOLS_SCM_PRETEND_VERSION = version;

     

       31
       31
       -
       

     

       32
       32
       -
               doCheck = false;

     

       33
       33
       -
             });

     

       34
       34
       -
           }) defaultOverrides;

     

       21
       21
       +
           packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides);

     

       35
       22
        
         };

     

       36
       23
        
       in python.pkgs.buildPythonPackage rec {

     

       37
       24
        
         pname = "gns3-gui";

-16

pkgs/applications/networking/gns3/server.nix

···

       14
       14
        
       

     

       15
       15
        
       let

     

       16
       16
        
         defaultOverrides = commonOverrides ++ [

     

       17
       17
       -
           (self: super: {

     

       18
       18
       -
             jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec {

     

       19
       19
       -
               version = "3.2.0";

     

       20
       20
       -
       

     

       21
       21
       -
               src = super.fetchPypi {

     

       22
       22
       -
                 inherit (oldAttrs) pname;

     

       23
       23
       -
                 inherit version;

     

       24
       24
       -
                 sha256 = "sha256-yKhbKNN3zHc35G4tnytPRO48Dh3qxr9G3e/HGH0weXo=";

     

       25
       25
       -
               };

     

       26
       26
       -
       

     

       27
       27
       -
               SETUPTOOLS_SCM_PRETEND_VERSION = version;

     

       28
       28
       -
       

     

       29
       29
       -
               doCheck = false;

     

       30
       30
       -
             });

     

       31
       31
       -
       

     

       32
       32
       -
           })

     

       33
       17
        
         ];

     

       34
       18
        
       

     

       35
       19
        
         python = python3.override {

+2 -2

pkgs/applications/networking/instant-messengers/session-desktop/default.nix

···

       8
       8
        
       }:

     

       9
       9
        
       

     

       10
       10
        
       let

     

       11
       11
       -
         version = "1.10.0";

     

       11
       11
       +
         version = "1.10.1";

     

       12
       12
        
         pname = "session-desktop";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage";

     

       16
       16
       -
           sha256 = "sha256-oqwEXwlxyoYBQpVp9SdV5q+GrM0N9TIfu01HHIm9mUw=";

     

       16
       16
       +
           sha256 = "sha256-DArIq5bxyeHy45ZkE+FIpxBl4P6jiHTCN1lVCuF81O8=";

     

       17
       17
        
         };

     

       18
       18
        
         appimage = appimageTools.wrapType2 {

     

       19
       19
        
           inherit version pname src;

+1 -13

pkgs/applications/networking/powerdns-admin/default.nix

···

       13
       13
        
           packageOverrides = self: super: {

     

       14
       14
        
             # The bravado-core dependency is incompatible with jschonschema 4.0:

     

       15
       15
        
             # https://github.com/Yelp/bravado-core/pull/385

     

       16
       16
       -
             jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec {

     

       17
       17
       -
               version = "3.2.0";

     

       18
       18
       -
       

     

       19
       19
       -
               src = oldAttrs.src.override {

     

       20
       20
       -
                 inherit version;

     

       21
       21
       -
                 hash = "sha256-yKhbKNN3zHc35G4tnytPRO48Dh3qxr9G3e/HGH0weXo=";

     

       22
       22
       -
                 sha256 = "";

     

       23
       23
       -
               };

     

       24
       24
       -
       

     

       25
       25
       -
               SETUPTOOLS_SCM_PRETEND_VERSION = version;

     

       26
       26
       -
       

     

       27
       27
       -
               doCheck = false;

     

       28
       28
       -
             });

     

       16
       16
       +
             jsonschema = super.jsonschema_3;

     

       29
       17
        
           };

     

       30
       18
        
         };

     

       31
       19

+2 -2

pkgs/applications/science/misc/snakemake/default.nix

···

       5
       5
        
       

     

       6
       6
        
       python3.pkgs.buildPythonApplication rec {

     

       7
       7
        
         pname = "snakemake";

     

       8
       8
       -
         version = "7.14.0";

     

       8
       8
       +
         version = "7.14.1";

     

       9
       9
        
         format = "setuptools";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "snakemake";

     

       13
       13
        
           repo = pname;

     

       14
       14
        
           rev = "refs/tags/v${version}";

     

       15
       15
       -
           hash = "sha256-JuoZ/xE3Z6uB7iJQj72l+VX0cHHi/ZV+6q3QZ/CYjAk=";

     

       15
       15
       +
           hash = "sha256-o2pERzt6wU/EiXBc9kI2qn9PhXGyvNiEWbSRzI85R8c=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         propagatedBuildInputs = with python3.pkgs; [

+9 -4

pkgs/applications/video/rtabmap/default.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub, pkg-config, cmake, opencv, pcl, libusb1, eigen

     

       2
       2
        
       , wrapQtAppsHook, qtbase, g2o, ceres-solver, libpointmatcher, octomap, freenect

     

       3
       3
       -
       , libdc1394, librealsense, libGL, libGLU, vtkWithQt5, wrapGAppsHook }:

     

       3
       3
       +
       , libdc1394, librealsense, libGL, libGLU, vtkWithQt5, wrapGAppsHook, liblapack

     

       4
       4
       +
       , xorg }:

     

       4
       5
        
       

     

       5
       6
        
       stdenv.mkDerivation rec {

     

       6
       7
        
         pname = "rtabmap";

     

       7
       7
       -
         version = "unstable-2022-02-07";

     

       8
       8
       +
         version = "unstable-2022-09-24";

     

       8
       9
        
       

     

       9
       10
        
         src = fetchFromGitHub {

     

       10
       11
        
           owner = "introlab";

     

       11
       12
        
           repo = "rtabmap";

     

       12
       12
       -
           rev = "f584f42ea423c44138aa0668b5c8eb18f2978fe2";

     

       13
       13
       -
           sha256 = "sha256-xotOcaz5XrmzwEKuVEQZoeq6fEVbACK7PSUW9kULH40=";

     

       13
       13
       +
           rev = "fa31affea0f0bd54edf1097b8289209c7ac0548e";

     

       14
       14
       +
           sha256 = "sha256-kcY+o31fSmwxBcvF/e+Wu6OIqiQzLKgEJJxcj+g3qDM=";

     

       14
       15
        
         };

     

       15
       16
        
       

     

       16
       17
        
         patches = [

     
···

       23
       24
        
           ## Required

     

       24
       25
        
           opencv

     

       25
       26
        
           pcl

     

       27
       27
       +
           liblapack

     

       28
       28
       +
           xorg.libSM

     

       29
       29
       +
           xorg.libICE

     

       30
       30
       +
           xorg.libXt

     

       26
       31
        
           ## Optional

     

       27
       32
        
           libusb1

     

       28
       33
        
           eigen

+3 -3

pkgs/applications/virtualization/nixpacks/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "nixpacks";

     

       5
       5
       -
         version = "0.6.2";

     

       5
       5
       +
         version = "0.7.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "railwayapp";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-PMWaaCcguziQAnuBL5He2AQaAhCTmpNsOHUNnExK0mU=";

     

       11
       11
       +
           sha256 = "sha256-d38PocmvGRvyKMCNMhE8IFNGOn6r42ODLPVo/Ak3q/8=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoSha256 = "sha256-IVlOenWvy6BsUCsSMWuJj7H8XKQRQkJtTYnmUhcesNw=";

     

       14
       14
       +
         cargoSha256 = "sha256-74FIlSV/prlxuMxqVx27M0ltXY3m0ddUVyHTltQLnuM=";

     

       15
       15
        
       

     

       16
       16
        
         # skip test due FHS dependency

     

       17
       17
        
         doCheck = false;

+7

pkgs/desktops/pantheon/desktop/gala/default.nix

···

       53
       53
        
             url = "https://github.com/elementary/gala/commit/e0095415cdbfc369e6482e84b8aaffc6a04cafe7.patch";

     

       54
       54
        
             sha256 = "sha256-n/BJPIrUaCQtBgDotOLq/bCAAccdbL6OwciXY115HsM=";

     

       55
       55
        
           })

     

       56
       56
       +
       

     

       57
       57
       +
           # MultitaskingView: fix allocation assertions

     

       58
       58
       +
           # https://github.com/elementary/gala/pull/1463

     

       59
       59
       +
           (fetchpatch {

     

       60
       60
       +
             url = "https://github.com/elementary/gala/commit/23c7edeb0ee9b0ff0aa48c1d19fbd1739df7af78.patch";

     

       61
       61
       +
             sha256 = "sha256-OfIDBfVEZoY8vMu9F8gtfRg4TYA1MUAG94BSOBKVGcI=";

     

       62
       62
       +
           })

     

       56
       63
        
         ];

     

       57
       64
        
       

     

       58
       65
        
         nativeBuildInputs = [

+14 -8

pkgs/development/coq-modules/metacoq/default.nix

···

       10
       10
        
             { case = "8.12"; out = "1.0-beta2-8.12"; }

     

       11
       11
        
             # Do not provide 8.13 because it does not compile with equations 1.3 provided by default (only 1.2.3)

     

       12
       12
        
             # { case = "8.13"; out = "1.0-beta2-8.13"; }

     

       13
       13
       -
             { case = "8.14"; out = "1.0-8.14"; }

     

       14
       14
       -
             { case = "8.15"; out = "1.0-8.15"; }

     

       15
       15
       -
             { case = "8.16"; out = "1.0-8.16"; }

     

       13
       13
       +
             { case = "8.14"; out = "1.1-8.14"; }

     

       14
       14
       +
             { case = "8.15"; out = "1.1-8.15"; }

     

       15
       15
       +
             { case = "8.16"; out = "1.1-8.16"; }

     

       16
       16
        
           ] null;

     

       17
       17
        
         release = {

     

       18
       18
        
           "1.0-beta2-8.11".sha256 = "sha256-I9YNk5Di6Udvq5/xpLSNflfjRyRH8fMnRzbo3uhpXNs=";

     
···

       21
       21
        
           "1.0-8.14".sha256 = "sha256-iRnaNeHt22JqxMNxOGPPycrO9EoCVjusR2s0GfON1y0=";

     

       22
       22
        
           "1.0-8.15".sha256 = "sha256-8RUC5dHNfLJtJh+IZG4nPTAVC8ZKVh2BHedkzjwLf/k=";

     

       23
       23
        
           "1.0-8.16".sha256 = "sha256-7rkCAN4PNnMgsgUiiLe2TnAliknN75s2SfjzyKCib/o=";

     

       24
       24
       +
           "1.1-8.14".sha256 = "sha256-6vViCNQl6BnGgOHX3P/OLfFXN4aUfv4RbDokfz2BgQI=";

     

       25
       25
       +
           "1.1-8.15".sha256 = "sha256-qCD3wFW4E+8vSVk4XoZ0EU4PVya0al+JorzS9nzmR/0=";

     

       26
       26
       +
           "1.1-8.16".sha256 = "sha256-cTK4ptxpPPlqxAhasZFX3RpSlsoTZwhTqs2A3BZy9sA=";

     

       24
       27
        
         };

     

       25
       28
        
         releaseRev = v: "v${v}";

     

       26
       29
        
       

     
···

       75
       78
        
               };

     

       76
       79
        
             } // optionalAttrs (package != "single")

     

       77
       80
        
               { passthru = genAttrs packages metacoq_; })

     

       78
       78
       -
             ).overrideAttrs (o: {

     

       79
       79
       -
               propagatedBuildInputs = o.propagatedBuildInputs ++

     

       80
       80
       -
                 optional (versionAtLeast o.version "1.0-8.16") coq.ocamlPackages.stdlib-shims;

     

       81
       81
       -
             });

     

       82
       82
       -
           in derivation;

     

       81
       81
       +
             ).overrideAttrs (o:

     

       82
       82
       +
               let requiresOcamlStdlibShims = versionAtLeast o.version "1.0-8.16" ||

     

       83
       83
       +
                                              (o.version == "dev" && (versionAtLeast coq.coq-version "8.16" || coq.coq-version == "dev")) ;

     

       84
       84
       +
               in

     

       85
       85
       +
                 {

     

       86
       86
       +
                   propagatedBuildInputs = o.propagatedBuildInputs ++ optional requiresOcamlStdlibShims coq.ocamlPackages.stdlib-shims;

     

       87
       87
       +
                 });

     

       88
       88
       +
         in derivation;

     

       83
       89
        
       in

     

       84
       90
        
       metacoq_ (if single then "single" else "all")

-52

pkgs/development/libraries/libtorrent-rasterbar/1.1.nix

···

       1
       1
       -
       { stdenv, lib, fetchFromGitHub, pkg-config, automake, autoconf

     

       2
       2
       -
       , zlib, boost, openssl, libtool, python, libiconv, ncurses

     

       3
       3
       -
       }:

     

       4
       4
       -
       

     

       5
       5
       -
       let

     

       6
       6
       -
         version = "1.1.11";

     

       7
       7
       -
         formattedVersion = lib.replaceChars ["."] ["_"] version;

     

       8
       8
       -
       

     

       9
       9
       -
         # Make sure we override python, so the correct version is chosen

     

       10
       10
       -
         # for the bindings, if overridden

     

       11
       11
       -
         boostPython = boost.override { enablePython = true; inherit python; };

     

       12
       12
       -
       

     

       13
       13
       -
       in stdenv.mkDerivation {

     

       14
       14
       -
         pname = "libtorrent-rasterbar";

     

       15
       15
       -
         inherit version;

     

       16
       16
       -
       

     

       17
       17
       -
         src = fetchFromGitHub {

     

       18
       18
       -
           owner = "arvidn";

     

       19
       19
       -
           repo = "libtorrent";

     

       20
       20
       -
           rev = "libtorrent_${formattedVersion}";

     

       21
       21
       -
           sha256 = "0nwdsv6d2gkdsh7l5a46g6cqx27xwh3msify5paf02l1qzjy4s5l";

     

       22
       22
       -
         };

     

       23
       23
       -
       

     

       24
       24
       -
         enableParallelBuilding = true;

     

       25
       25
       -
         nativeBuildInputs = [ automake autoconf libtool pkg-config ];

     

       26
       26
       -
         buildInputs = [ boostPython openssl zlib python libiconv ncurses ];

     

       27
       27
       -
         preConfigure = "./autotool.sh";

     

       28
       28
       -
       

     

       29
       29
       -
         postInstall = ''

     

       30
       30
       -
           moveToOutput "include" "$dev"

     

       31
       31
       -
           moveToOutput "lib/${python.libPrefix}" "$python"

     

       32
       32
       -
         '';

     

       33
       33
       -
       

     

       34
       34
       -
         outputs = [ "out" "dev" "python" ];

     

       35
       35
       -
       

     

       36
       36
       -
         configureFlags = [

     

       37
       37
       -
           "--enable-python-binding"

     

       38
       38
       -
           "--with-libiconv=yes"

     

       39
       39
       -
           "--with-boost=${boostPython.dev}"

     

       40
       40
       -
           "--with-boost-libdir=${boostPython.out}/lib"

     

       41
       41
       -
         ];

     

       42
       42
       -
       

     

       43
       43
       -
         meta = with lib; {

     

       44
       44
       -
           # darwin: never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/libtorrent-rasterbar-1_1_x.x86_64-darwin

     

       45
       45
       -
           broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;

     

       46
       46
       -
           homepage = "https://libtorrent.org/";

     

       47
       47
       -
           description = "A C++ BitTorrent implementation focusing on efficiency and scalability";

     

       48
       48
       -
           license = licenses.bsd3;

     

       49
       49
       -
           maintainers = [ ];

     

       50
       50
       -
           platforms = platforms.unix;

     

       51
       51
       -
         };

     

       52
       52
       -
       }

+2 -2

pkgs/development/libraries/quarto/default.nix

···

       13
       13
        
       

     

       14
       14
        
       stdenv.mkDerivation rec {

     

       15
       15
        
         pname = "quarto";

     

       16
       16
       -
         version = "1.1.189";

     

       16
       16
       +
         version = "1.1.251";

     

       17
       17
        
         src = fetchurl {

     

       18
       18
        
           url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${version}/quarto-${version}-linux-amd64.tar.gz";

     

       19
       19
       -
           sha256 = "1a3xsgqdccm4ky1xjnin1idpp8gsansskq37c00mrxz1raxn1mi7";

     

       19
       19
       +
           sha256 = "sha256-VEYUEI4xzQPXlyTbCThAW2npBCZNPDJ5x2cWnkNz7RE=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         nativeBuildInputs = [

+17 -5

pkgs/development/ocaml-modules/uunf/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, cmdliner }:

     

       1
       1
       +
       { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, cmdliner

     

       2
       2
       +
       , cmdlinerSupport ? lib.versionAtLeast cmdliner.version "1.1"

     

       3
       3
       +
       }:

     

       4
       4
       +
       

     

       2
       5
        
       let

     

       3
       6
        
         pname = "uunf";

     

       4
       7
        
         webpage = "https://erratique.ch/software/${pname}";

     

       5
       5
       -
         version = "14.0.0";

     

       8
       8
       +
         version = "15.0.0";

     

       6
       9
        
       in

     

       7
       10
        
       

     

       8
       11
        
       if lib.versionOlder ocaml.version "4.03"

     
···

       15
       18
        
       

     

       16
       19
        
         src = fetchurl {

     

       17
       20
        
           url = "${webpage}/releases/${pname}-${version}.tbz";

     

       18
       18
       -
           sha256 = "sha256:17wv0nm3vvwcbzb1b09akw8jblmigyhbfmh1sy9lkb5756ni94a2";

     

       21
       21
       +
           sha256 = "sha256-B/prPAwfqS8ZPS3fyDDIzXWRbKofwOCyCfwvh9veuug=";

     

       19
       22
        
         };

     

       20
       23
        
       

     

       21
       24
        
         nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];

     

       22
       22
       -
         buildInputs = [ topkg uutf cmdliner ];

     

       25
       25
       +
         buildInputs = [ topkg uutf ]

     

       26
       26
       +
         ++ lib.optional cmdlinerSupport cmdliner;

     

       23
       27
        
       

     

       24
       28
        
         propagatedBuildInputs = [ uchar ];

     

       25
       29
        
       

     
···

       27
       31
        
       

     

       28
       32
        
         prePatch = lib.optionalString stdenv.isAarch64 "ulimit -s 16384";

     

       29
       33
        
       

     

       30
       30
       -
         inherit (topkg) buildPhase installPhase;

     

       34
       34
       +
         buildPhase = ''

     

       35
       35
       +
           runHook preBuild

     

       36
       36
       +
           ${topkg.run} build \

     

       37
       37
       +
             --with-uutf true \

     

       38
       38
       +
             --with-cmdliner ${lib.boolToString cmdlinerSupport}

     

       39
       39
       +
           runHook postBuild

     

       40
       40
       +
         '';

     

       41
       41
       +
       

     

       42
       42
       +
         inherit (topkg) installPhase;

     

       31
       43
        
       

     

       32
       44
        
         meta = with lib; {

     

       33
       45
        
           description = "An OCaml module for normalizing Unicode text";

+50

pkgs/development/python-modules/databricks-sql-connector/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , thrift

     

       5
       5
       +
       , pandas

     

       6
       6
       +
       , pyarrow

     

       7
       7
       +
       , poetry-core

     

       8
       8
       +
       , pytestCheckHook

     

       9
       9
       +
       }:

     

       10
       10
       +
       

     

       11
       11
       +
       buildPythonPackage rec {

     

       12
       12
       +
         pname = "databricks-sql-connector";

     

       13
       13
       +
         version = "2.0.5";

     

       14
       14
       +
         format = "pyproject";

     

       15
       15
       +
       

     

       16
       16
       +
         src = fetchFromGitHub {

     

       17
       17
       +
           owner = "databricks";

     

       18
       18
       +
           repo = "databricks-sql-python";

     

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

     

       20
       20
       +
           sha256 = "sha256-Qpdyn6z1mbO4bzyUZ2eYdd9pfIkIP/Aj4YgNXaYwxpE=";

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
         postPatch = ''

     

       24
       24
       +
           substituteInPlace pyproject.toml \

     

       25
       25
       +
             --replace 'thrift = "^0.13.0"' 'thrift = ">=0.13.0,<1.0.0"'

     

       26
       26
       +
         '';

     

       27
       27
       +
       

     

       28
       28
       +
         nativeBuildInputs = [

     

       29
       29
       +
           poetry-core

     

       30
       30
       +
         ];

     

       31
       31
       +
       

     

       32
       32
       +
         propagatedBuildInputs = [

     

       33
       33
       +
           thrift

     

       34
       34
       +
           pandas

     

       35
       35
       +
           pyarrow

     

       36
       36
       +
         ];

     

       37
       37
       +
       

     

       38
       38
       +
         checkInputs = [

     

       39
       39
       +
           pytestCheckHook

     

       40
       40
       +
         ];

     

       41
       41
       +
       

     

       42
       42
       +
         pytestFlagsArray = [ "tests/unit" ];

     

       43
       43
       +
       

     

       44
       44
       +
         meta = with lib; {

     

       45
       45
       +
           description = "Databricks SQL Connector for Python";

     

       46
       46
       +
           homepage = https://docs.databricks.com/dev-tools/python-sql-connector.html;

     

       47
       47
       +
           license = licenses.asl20;

     

       48
       48
       +
           maintainers = with maintainers; [ harvidsen ];

     

       49
       49
       +
         };

     

       50
       50
       +
       }

+39

pkgs/development/python-modules/jsonschema/3_x.nix

···

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, isPy27

     

       2
       2
       +
       , attrs

     

       3
       3
       +
       , functools32

     

       4
       4
       +
       , importlib-metadata

     

       5
       5
       +
       , mock

     

       6
       6
       +
       , nose

     

       7
       7
       +
       , pyperf

     

       8
       8
       +
       , pyrsistent

     

       9
       9
       +
       , setuptools-scm

     

       10
       10
       +
       , twisted

     

       11
       11
       +
       , vcversioner

     

       12
       12
       +
       }:

     

       13
       13
       +
       

     

       14
       14
       +
       buildPythonPackage rec {

     

       15
       15
       +
         pname = "jsonschema";

     

       16
       16
       +
         version = "3.2.0";

     

       17
       17
       +
       

     

       18
       18
       +
         src = fetchPypi {

     

       19
       19
       +
           inherit pname version;

     

       20
       20
       +
           sha256 = "c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a";

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       24
       24
       +
         propagatedBuildInputs = [ attrs importlib-metadata functools32 pyrsistent ];

     

       25
       25
       +
         checkInputs = [ nose mock pyperf twisted vcversioner ];

     

       26
       26
       +
       

     

       27
       27
       +
         # zope namespace collides on py27

     

       28
       28
       +
         doCheck = !isPy27;

     

       29
       29
       +
         checkPhase = ''

     

       30
       30
       +
           nosetests

     

       31
       31
       +
         '';

     

       32
       32
       +
       

     

       33
       33
       +
         meta = with lib; {

     

       34
       34
       +
           homepage = "https://github.com/Julian/jsonschema";

     

       35
       35
       +
           description = "An implementation of JSON Schema validation for Python";

     

       36
       36
       +
           license = licenses.mit;

     

       37
       37
       +
           maintainers = with maintainers; [ domenkozar ];

     

       38
       38
       +
         };

     

       39
       39
       +
       }

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "klaus";

     

       5
       5
       -
         version = "2.0.0";

     

       5
       5
       +
         version = "2.0.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "jonashaag";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-GyWlIFmP78t+cyPWjjB/EgA/L+2QqHPnmfJ64W5gsf8=";

     

       11
       11
       +
           sha256 = "sha256-a0MbKjDqPSMakjmGS5gfaDaPegQpK4QA+ZdG7skd9QU=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         prePatch = ''

+2 -2

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

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "minikerberos";

     

       13
       13
       -
         version = "0.3.1";

     

       13
       13
       +
         version = "0.3.2";

     

       14
       14
        
         format = "setuptools";

     

       15
       15
        
       

     

       16
       16
        
         disabled = pythonOlder "3.7";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchPypi {

     

       19
       19
        
           inherit pname version;

     

       20
       20
       -
           hash = "sha256-wFz82EaxlzsrDVAenp+iomNUPXdisFL8gD/B3oSShqM=";

     

       20
       20
       +
           hash = "sha256-6nsc/LVyzjXCtX7GhWbOVc98hPbJZOWAOuys3WPTfYw=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         propagatedBuildInputs = [

+22 -4

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

···

       1
       1
       -
       { lib, pythonOlder, fetchFromGitHub, buildPythonPackage

     

       2
       2
       -
       , six, enum34, pyasn1, cryptography

     

       3
       3
       -
       , pytestCheckHook }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , pythonOlder

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , fetchpatch

     

       5
       5
       +
       , buildPythonPackage

     

       6
       6
       +
       , six

     

       7
       7
       +
       , enum34

     

       8
       8
       +
       , pyasn1

     

       9
       9
       +
       , cryptography

     

       10
       10
       +
       , pytestCheckHook

     

       11
       11
       +
       }:

     

       4
       12
        
       

     

       5
       13
        
       buildPythonPackage rec {

     

       6
       14
        
         pname = "pgpy";

     
···

       10
       18
        
           owner = "SecurityInnovation";

     

       11
       19
        
           repo = "PGPy";

     

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

     

       13
       13
       -
           sha256 = "03pch39y3hi4ici6y6lvz0j0zram8dw2wvnmq1zyjy3vyvm1ms4a";

     

       21
       21
       +
           hash = "sha256-iuga6vZ7eOl/wNVuLnhDVeUPJPibGm8iiyTC4dOA7A4=";

     

       14
       22
        
         };

     

       23
       23
       +
       

     

       24
       24
       +
         patches = [

     

       25
       25
       +
           # Fixes the issue in https://github.com/SecurityInnovation/PGPy/issues/402.

     

       26
       26
       +
           # by pulling in https://github.com/SecurityInnovation/PGPy/pull/403.

     

       27
       27
       +
           (fetchpatch {

     

       28
       28
       +
             name = "crytography-38-support.patch";

     

       29
       29
       +
             url = "https://github.com/SecurityInnovation/PGPy/commit/d84597eb8417a482433ff51dc6b13060d4b2e686.patch";

     

       30
       30
       +
             hash = "sha256-dviXCSGtPguROHVZ1bt/eEfpATjehm8jZ5BeVjxdb8U=";

     

       31
       31
       +
           })

     

       32
       32
       +
         ];

     

       15
       33
        
       

     

       16
       34
        
         propagatedBuildInputs = [

     

       17
       35
        
           six

+2 -2

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

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "pypykatz";

     

       16
       16
       -
         version = "0.6.1";

     

       16
       16
       +
         version = "0.6.2";

     

       17
       17
        
         format = "setuptools";

     

       18
       18
        
       

     

       19
       19
        
         disabled = pythonOlder "3.7";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchPypi {

     

       22
       22
        
           inherit pname version;

     

       23
       23
       -
           hash = "sha256-GbIWxYCVmNXUwn6W4a/cl1XOTbWkpBemKcmjOvnXER4=";

     

       23
       23
       +
           hash = "sha256-djk8b7/H23aDmyGaM60goAcpfZQrpftOIIRKnJjFz50=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/sentry-sdk/default.nix

···

       46
       46
        
       

     

       47
       47
        
       buildPythonPackage rec {

     

       48
       48
        
         pname = "sentry-sdk";

     

       49
       49
       -
         version = "1.9.8";

     

       49
       49
       +
         version = "1.9.9";

     

       50
       50
        
         format = "setuptools";

     

       51
       51
        
       

     

       52
       52
        
         disabled = pythonOlder "3.7";

     
···

       55
       55
        
           owner = "getsentry";

     

       56
       56
        
           repo = "sentry-python";

     

       57
       57
        
           rev = version;

     

       58
       58
       -
           hash = "sha256-x320F7URZTKcCNdhjiR7hMEUSgbFMhv8e5Csl+IxWt0=";

     

       58
       58
       +
           hash = "sha256-DIiShIiTHmJdOtf1WYi4ofJdZnsg13VczVvGW+ngE+I=";

     

       59
       59
        
         };

     

       60
       60
        
       

     

       61
       61
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/tools/oh-my-posh/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "oh-my-posh";

     

       5
       5
       -
         version = "10.1.0";

     

       5
       5
       +
         version = "11.0.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "jandedobbeleer";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-Cbgpmew+2O59+7pvMv0QD0bi9f6cdWN1zAa9wUdJ1qM=";

     

       11
       11
       +
           sha256 = "sha256-ovbhU23m4idWOSmdzPh5RH5/DxPjzsk1qqccIzGjNY4=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = "sha256-A4+sshIzPla7udHfnMmbFqn+fW3SOCrI6g7tArzmh1E=";

+3 -3

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

···

       5
       5
        
       

     

       6
       6
        
       buildGoModule rec {

     

       7
       7
        
         pname = "node_exporter";

     

       8
       8
       -
         version = "1.3.1";

     

       8
       8
       +
         version = "1.4.0";

     

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

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           inherit rev;

     

       13
       13
        
           owner = "prometheus";

     

       14
       14
        
           repo = "node_exporter";

     

       15
       15
       -
           sha256 = "sha256-+0k9LBsHqNHmoOAY1UDzbbqni+ikj+c3ijfT41rCfLc=";

     

       15
       15
       +
           sha256 = "sha256-KO33Cyrc4Oh6vvTMazo5iuekpyxNsi18gIb66Z8B9i4=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         vendorSha256 = "sha256-nAvODyy+PfkGFAaq+3hBhQaPji5GUMU7N8xcgbGQMeI=";

     

       18
       18
       +
         vendorSha256 = "sha256-eJbb56U6VStwfi6iSemWrriDYNaPiDegW3KJr8rH1NU=";

     

       19
       19
        
       

     

       20
       20
        
         # FIXME: tests fail due to read-only nix store

     

       21
       21
        
         doCheck = false;

+21 -2

pkgs/tools/admin/chkservice/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, cmake, ninja, pkg-config, systemd, ncurses, lib }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , fetchpatch

     

       5
       5
       +
       , cmake

     

       6
       6
       +
       , ninja

     

       7
       7
       +
       , pkg-config

     

       8
       8
       +
       , systemd

     

       9
       9
       +
       , ncurses

     

       10
       10
       +
       }:

     

       2
       11
        
       

     

       3
       12
        
       stdenv.mkDerivation rec {

     

       4
       13
        
         pname = "chkservice";

     
···

       8
       17
        
           owner = "linuxenko";

     

       9
       18
        
           repo = "chkservice";

     

       10
       19
        
           rev = version;

     

       11
       11
       -
           hash = "sha256:0dfvm62h6dwg18f17fn58nr09mfh6kylm8wy88j00fiy13l4wnb6";

     

       20
       20
       +
           hash = "sha256-ZllO6Ag+OgAkQp6jSv000NUEskXFuhMcCo83A4Wp2zU=";

     

       12
       21
        
         };

     

       22
       22
       +
       

     

       23
       23
       +
         patches = [

     

       24
       24
       +
           # Pull fix pending upstream inclusion for gcc-11 support:

     

       25
       25
       +
           #   https://github.com/linuxenko/chkservice/pull/38

     

       26
       26
       +
           (fetchpatch {

     

       27
       27
       +
             name = "gcc-11.patch";

     

       28
       28
       +
             url = "https://github.com/linuxenko/chkservice/commit/26b12a7918c8a3bc449c92b458e6cd5c2d7b2e05.patch";

     

       29
       29
       +
             hash = "sha256-LaJLlqRyn1eoahbW2X+hDSt8iV4lhNRn0j0kLHB+RhM=";

     

       30
       30
       +
           })

     

       31
       31
       +
         ];

     

       13
       32
        
       

     

       14
       33
        
         # Tools needed during build time

     

       15
       34
        
         nativeBuildInputs = [

+11 -8

pkgs/tools/admin/pgadmin/default.nix

···

       10
       10
        
       

     

       11
       11
        
       let

     

       12
       12
        
         pname = "pgadmin";

     

       13
       13
       -
         version = "6.12";

     

       13
       13
       +
         version = "6.13";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchurl {

     

       16
       16
        
           url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz";

     

       17
       17
       -
           sha256 = "sha256-cO7GdZDfJ0pq1jpMyrVy0UM49WhrKOIJOmMJauSkbyo=";

     

       17
       17
       +
           sha256 = "sha256-vLItmE76R1IzgMYEGEvIeOmbfQQac5WK12AkkZknTFU=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         yarnDeps = mkYarnModules {

     
···

       72
       72
        
           azure-identity

     

       73
       73
        
         ];

     

       74
       74
        
       

     

       75
       75
       -
         # override necessary on pgadmin4 6.12

     

       75
       75
       +
         # keep the scope, as it is used throughout the derivation and tests

     

       76
       76
       +
         # this also makes potential future overrides easier

     

       76
       77
        
         pythonPackages = python3.pkgs.overrideScope (final: prev: rec {

     

       77
       77
       -
           werkzeug = prev.werkzeug.overridePythonAttrs (oldAttrs: rec {

     

       78
       78
       -
             version = "2.0.3";

     

       78
       78
       +
           # flask 2.2 is incompatible with pgadmin 6.13

     

       79
       79
       +
           # https://redmine.postgresql.org/issues/7651

     

       80
       80
       +
           flask = prev.flask.overridePythonAttrs (oldAttrs: rec {

     

       81
       81
       +
             version = "2.1.3";

     

       79
       82
        
             src = oldAttrs.src.override {

     

       80
       83
        
               inherit version;

     

       81
       81
       -
               sha256 = "sha256-uGP4/wV8UiFktgZ8niiwQRYbS+W6TQ2s7qpQoWOCLTw=";

     

       84
       84
       +
               sha256 = "sha256-FZcuUBffBXXD1sCQuhaLbbkCWeYgrI1+qBOjlrrVtss=";

     

       82
       85
        
             };

     

       83
       86
        
           });

     

       84
       87
        
         });

     
···

       124
       127
        
       

     

       125
       128
        
           # build the documentation

     

       126
       129
        
           cd docs/en_US

     

       127
       127
       -
           ${sphinx}/bin/sphinx-build -W -b html -d _build/doctrees . _build/html

     

       130
       130
       +
           sphinx-build -W -b html -d _build/doctrees . _build/html

     

       128
       131
        
       

     

       129
       132
        
           # Build the clean tree

     

       130
       133
        
           cd ../../web

     
···

       156
       159
        
           cp -v ../pkg/pip/setup_pip.py setup.py

     

       157
       160
        
         '';

     

       158
       161
        
       

     

       159
       159
       -
         nativeBuildInputs = with pythonPackages; [ cython pip ];

     

       162
       162
       +
         nativeBuildInputs = with pythonPackages; [ cython pip sphinx ];

     

       160
       163
        
         buildInputs = [

     

       161
       164
        
           zlib

     

       162
       165
        
           pythonPackages.wheel

+27

pkgs/tools/admin/pgadmin/update.sh

···

       1
       1
       +
       #!/usr/bin/env nix-shell

     

       2
       2
       +
       #!nix-shell -i bash -p curl wget jq yarn2nix yarn common-updater-scripts

     

       3
       3
       +
       

     

       4
       4
       +
       set -eu -o pipefail

     

       5
       5
       +
       

     

       6
       6
       +
       scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd)

     

       7
       7
       +
       nixpkgs=$(realpath "$scriptDir"/../../../..)

     

       8
       8
       +
       

     

       9
       9
       +
       newest_version="$(curl -s https://www.pgadmin.org/versions.json | jq -r .pgadmin4.version)"

     

       10
       10
       +
       old_version=$(nix-instantiate --eval -E "(import \"$nixpkgs\" { config = {}; overlays = []; }).pgadmin4.version" | tr -d '"')

     

       11
       11
       +
       url="https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${newest_version}/source/pgadmin4-${newest_version}.tar.gz"

     

       12
       12
       +
       

     

       13
       13
       +
       if [[ $newest_version == $old_version ]]; then

     

       14
       14
       +
         echo "Already at latest version $newest_version"

     

       15
       15
       +
         exit 0

     

       16
       16
       +
       fi

     

       17
       17
       +
       echo "New version: $newest_version"

     

       18
       18
       +
       

     

       19
       19
       +
       pushd $(mktemp -d --suffix=-pgadmin4-updater)

     

       20
       20
       +
       wget $url

     

       21
       21
       +
       tar -xzf "pgadmin4-$newest_version.tar.gz"

     

       22
       22
       +
       cd "pgadmin4-$newest_version/web"

     

       23
       23
       +
       yarn2nix > yarn.nix

     

       24
       24
       +
       cp yarn.nix yarn.lock package.json "$nixpkgs/pkgs/tools/admin/pgadmin/"

     

       25
       25
       +
       popd

     

       26
       26
       +
       

     

       27
       27
       +
       update-source-version pgadmin4 "$newest_version" --print-changes

+2 -2

pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix

···

       26
       26
        
       

     

       27
       27
        
       stdenv.mkDerivation rec {

     

       28
       28
        
         pname = "fcitx5-gtk";

     

       29
       29
       -
         version = "5.0.18";

     

       29
       29
       +
         version = "5.0.19";

     

       30
       30
        
       

     

       31
       31
        
         src = fetchFromGitHub {

     

       32
       32
        
           owner = "fcitx";

     

       33
       33
        
           repo = pname;

     

       34
       34
        
           rev = version;

     

       35
       35
       -
           sha256 = "sha256-rQ2HLiI0dIerxRV+fbHpTJy4aGmFKmGd6YckKxXmp4s=";

     

       35
       35
       +
           sha256 = "sha256-sD6FN8Ql+OhaQuHLCYreoiqSDC+Xf6OlFWUxg7k9SIk=";

     

       36
       36
        
         };

     

       37
       37
        
       

     

       38
       38
        
         cmakeFlags = [

+11 -6

pkgs/tools/networking/onetun/default.nix

···

       1
       1
        
       { lib

     

       2
       2
       +
       , rustPlatform

     

       3
       3
       +
       , fetchFromGitHub

     

       2
       4
        
       , stdenv

     

       3
       3
       -
       , fetchFromGitHub

     

       4
       4
       -
       , rustPlatform

     

       5
       5
       +
       , Security

     

       5
       6
        
       }:

     

       7
       7
       +
       

     

       6
       8
        
       rustPlatform.buildRustPackage rec {

     

       7
       9
        
         pname = "onetun";

     

       8
       8
       -
         version = "0.3.3";

     

       10
       10
       +
         version = "0.3.4";

     

       9
       11
        
       

     

       10
       12
        
         src = fetchFromGitHub {

     

       11
       13
        
           owner = "aramperes";

     

       12
       14
        
           repo = pname;

     

       13
       15
        
           rev = "v${version}";

     

       14
       14
       -
       

     

       15
       15
       -
           sha256 = "sha256-TYDSAJxWwNF/e42KR9656vrWfIanFMaJKvof0gcZ80U=";

     

       16
       16
       +
           sha256 = "sha256-gVw1aVbYjDPYTtMYIXq3k+LN0gUBAbQm275sxzwoYw8=";

     

       16
       17
        
         };

     

       17
       18
        
       

     

       18
       18
       -
         cargoSha256 = "sha256-aki3jL+0ETPa/0eMyxuBKdF3K1wM86BZx8FrOkaUAFQ=";

     

       19
       19
       +
         cargoSha256 = "sha256-/sOjd0JKk3MNNXYpTEXteFYtqDWYfyVItZrkX4uzjtc=";

     

       20
       20
       +
       

     

       21
       21
       +
         buildInputs = lib.optionals stdenv.isDarwin [

     

       22
       22
       +
           Security

     

       23
       23
       +
         ];

     

       19
       24
        
       

     

       20
       25
        
         meta = with lib; {

     

       21
       26
        
           description = "A cross-platform, user-space WireGuard port-forwarder that requires no root-access or system network configurations";

+3 -3

pkgs/tools/security/scilla/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildGoModule rec {

     

       7
       7
        
         pname = "scilla";

     

       8
       8
       -
         version = "1.2.3";

     

       8
       8
       +
         version = "1.2.4";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "edoardottt";

     

       12
       12
        
           repo = pname;

     

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

     

       14
       14
       -
           sha256 = "sha256-VTX4NG3BzmLpf2sIxZ5DGjg9dnCTSO0VbGx2PMhjBPg=";

     

       14
       14
       +
           sha256 = "sha256-8ZRYgQ4xME71vlO0nKnxiCqeju0G4SwgEXnUol1jQxk=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         vendorSha256 = "sha256-aoz2H7hkk85ntao6e5Chn++T2kA5jogHrd/ltVqNS3A=";

     

       17
       17
       +
         vendorSha256 = "sha256-Y4Zi0Hy6ydGxLTohgJGF3L9O+79z+3t+4ZA64otCJpE=";

     

       18
       18
        
       

     

       19
       19
        
         meta = with lib; {

     

       20
       20
        
           description = "Information gathering tool for DNS, ports and more";

-1

pkgs/top-level/aliases.nix

···

       618
       618
        
         libtensorflow-bin = libtensorflow; # Added 2022-09-25

     

       619
       619
        
         libtidy = throw "'libtidy' has been renamed to/replaced by 'html-tidy'"; # Converted to throw 2022-02-22

     

       620
       620
        
         libtorrentRasterbar = throw "'libtorrentRasterbar' has been renamed to/replaced by 'libtorrent-rasterbar'"; # Converted to throw 2022-09-24

     

       621
       621
       -
         libtorrentRasterbar-1_1_x = throw "'libtorrentRasterbar-1_1_x' has been renamed to/replaced by 'libtorrent-rasterbar-1_1_x'"; # Converted to throw 2022-09-24

     

       622
       621
        
         libtorrentRasterbar-1_2_x = throw "'libtorrentRasterbar-1_2_x' has been renamed to/replaced by 'libtorrent-rasterbar-1_2_x'"; # Converted to throw 2022-09-24

     

       623
       622
        
         libtorrentRasterbar-2_0_x = throw "'libtorrentRasterbar-2_0_x' has been renamed to/replaced by 'libtorrent-rasterbar-2_0_x'"; # Converted to throw 2022-09-24

     

       624
       623
        
         libudev = throw "'libudev' has been renamed to/replaced by 'udev'"; # Converted to throw 2022-02-22

+6 -8

pkgs/top-level/all-packages.nix

···

       208
       208
        
             }

     

       209
       209
        
           '');

     

       210
       210
        
       

     

       211
       211
       -
         chkservice = callPackage ../tools/admin/chkservice {

     

       212
       212
       -
           stdenv = gcc10StdenvCompat;

     

       213
       213
       -
         };

     

       211
       211
       +
         chkservice = callPackage ../tools/admin/chkservice { };

     

       214
       212
        
       

     

       215
       213
        
         addOpenGLRunpath = callPackage ../build-support/add-opengl-runpath { };

     

       216
       214
        
       

     
···

       429
       427
        
         crow-translate = libsForQt5.callPackage ../applications/misc/crow-translate { };

     

       430
       428
        
       

     

       431
       429
        
         cryptowatch-desktop = callPackage ../applications/finance/cryptowatch { };

     

       430
       430
       +
       

     

       431
       431
       +
         databricks-sql-cli = python3Packages.callPackage ../applications/misc/databricks-sql-cli { };

     

       432
       432
        
       

     

       433
       433
        
         datalad = callPackage ../applications/version-management/datalad {

     

       434
       434
        
           python3 = python39;  # `boto` currently broken with Python3.10

     
···

       9542
       9542
        
           inherit (darwin.apple_sdk.frameworks) Security;

     

       9543
       9543
        
         };

     

       9544
       9544
        
       

     

       9545
       9545
       -
         onetun = callPackage ../tools/networking/onetun { };

     

       9545
       9545
       +
         onetun = callPackage ../tools/networking/onetun {

     

       9546
       9546
       +
           inherit (darwin.apple_sdk.frameworks) Security;

     

       9547
       9547
       +
         };

     

       9546
       9548
        
       

     

       9547
       9549
        
         opencorsairlink = callPackage ../tools/misc/opencorsairlink { };

     

       9548
       9550
        
       

     
···

       20355
       20357
        
       

     

       20356
       20358
        
         libtorrent-rasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2.nix {

     

       20357
       20359
        
           inherit (darwin.apple_sdk.frameworks) SystemConfiguration;

     

       20358
       20358
       -
           python = python2;

     

       20359
       20359
       -
         };

     

       20360
       20360
       -
       

     

       20361
       20361
       -
         libtorrent-rasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1.nix {

     

       20362
       20360
        
           python = python2;

     

       20363
       20361
        
         };

     

       20364
       20362

+4

pkgs/top-level/python-packages.nix

···

       2263
       2263
        
       

     

       2264
       2264
        
         databricks-connect = callPackage ../development/python-modules/databricks-connect { };

     

       2265
       2265
        
       

     

       2266
       2266
       +
         databricks-sql-connector = callPackage ../development/python-modules/databricks-sql-connector { };

     

       2267
       2267
       +
       

     

       2266
       2268
        
         dataclasses = callPackage ../development/python-modules/dataclasses { };

     

       2267
       2269
        
       

     

       2268
       2270
        
         dataclasses-json = callPackage ../development/python-modules/dataclasses-json { };

     
···

       4845
       4847
        
         jsons = callPackage ../development/python-modules/jsons { };

     

       4846
       4848
        
       

     

       4847
       4849
        
         jsonschema = callPackage ../development/python-modules/jsonschema { };

     

       4850
       4850
       +
       

     

       4851
       4851
       +
         jsonschema_3 = callPackage ../development/python-modules/jsonschema/3_x.nix { };

     

       4848
       4852
        
       

     

       4849
       4853
        
         jsonschema-spec = callPackage ../development/python-modules/jsonschema-spec { };

     

       4850
       4854