commit a3d9dd795642accd29906eba2268ff3b5c66320c · pyrox.dev/nixpkgs

+1 -1

doc/stdenv/stdenv.chapter.md

···

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

     

       310
        
       ```

     

       311
        
       

     

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

     

       313
        
       

     

       314
        
       ::: {.note}

     

       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.

···

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

     

       310
        
       ```

     

       311
        
       

     

       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
        
       

     

       314
        
       ::: {.note}

     

       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.

maintainers/maintainer-list.nix

···

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

     

       5236
        
           }];

     

       5237
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       5238
        
         haslersn = {

     

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

     

       5240
        
           github = "haslersn";

···

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

     

       5236
        
           }];

     

       5237
        
         };

     

       5238
       +
         harvidsen = {

     

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

     

       5240
       +
           github = "harvidsen";

     

       5241
       +
           githubId = 62279738;

     

       5242
       +
           name = "Håkon Arvidsen";

     

       5243
       +
         };

     

       5244
        
         haslersn = {

     

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

     

       5246
        
           github = "haslersn";

+11 -1

maintainers/scripts/update.py

···

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

     

       53
        
       

     

       54
        
           try:

     

       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)

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       56
        
               update_info = await update_process.stdout.read()

     

       57
        
       

     

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

···

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

     

       53
        
       

     

       54
        
           try:

     

       55
       +
               update_process = await check_subprocess(

     

       56
       +
                   'env',

     

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

     

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

     

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

     

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

     

       61
       +
                   *update_script_command,

     

       62
       +
                   stdout=asyncio.subprocess.PIPE,

     

       63
       +
                   stderr=asyncio.subprocess.PIPE,

     

       64
       +
                   cwd=worktree,

     

       65
       +
               )

     

       66
        
               update_info = await update_process.stdout.read()

     

       67
        
       

     

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

+66 -6

nixos/modules/services/admin/pgadmin.nix

···

       37
        
           };

     

       38
        
       

     

       39
        
           initialEmail = mkOption {

     

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

     

       41
        
             type = types.str;

     

       42
        
           };

     

       43
        
       

     

       44
        
           initialPasswordFile = mkOption {

     

       45
        
             description = lib.mdDoc ''

     

       46
        
               Initial password file for the pgAdmin account.

     

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

     

       48
        
             '';

     

       49
        
             type = types.path;

     

       50
        
           };

     

       51
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

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

     

       53
        
       

     

       54
        
           settings = mkOption {

     

       55
        
             description = lib.mdDoc ''

     

       56
        
               Settings for pgadmin4.

     

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

     

       58
        
             '';

     

       59
        
             type = pyType;

     

       60
       -
             default= {};

     

       61
        
           };

     

       62
        
         };

     

       63
        
       

     
···

       69
        
             SERVER_MODE = true;

     

       70
        
           } // (optionalAttrs cfg.openFirewall {

     

       71
        
             DEFAULT_SERVER = mkDefault "::";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       72
        
           });

     

       73
        
       

     

       74
        
           systemd.services.pgadmin = {

     
···

       115
        
             group = "pgadmin";

     

       116
        
           };

     

       117
        
       

     

       118
       -
           users.groups.pgadmin = {};

     

       119
        
       

     

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

     

       121
       -
             text = formatPy cfg.settings;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       122
        
             mode = "0600";

     

       123
        
             user = "pgadmin";

     

       124
        
             group = "pgadmin";

···

       37
        
           };

     

       38
        
       

     

       39
        
           initialEmail = mkOption {

     

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

     

       41
        
             type = types.str;

     

       42
        
           };

     

       43
        
       

     

       44
        
           initialPasswordFile = mkOption {

     

       45
        
             description = lib.mdDoc ''

     

       46
        
               Initial password file for the pgAdmin account.

     

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

     

       48
        
             '';

     

       49
        
             type = types.path;

     

       50
        
           };

     

       51
        
       

     

       52
       +
           emailServer = {

     

       53
       +
             enable = mkOption {

     

       54
       +
               description = lib.mdDoc ''

     

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

     

       56
       +
               '';

     

       57
       +
               type = types.bool;

     

       58
       +
               default = false;

     

       59
       +
             };

     

       60
       +
             address = mkOption {

     

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

     

       62
       +
               type = types.str;

     

       63
       +
               default = "localhost";

     

       64
       +
             };

     

       65
       +
             port = mkOption {

     

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

     

       67
       +
               type = types.port;

     

       68
       +
               default = 25;

     

       69
       +
             };

     

       70
       +
             useSSL = mkOption {

     

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

     

       72
       +
               type = types.bool;

     

       73
       +
               default = false;

     

       74
       +
             };

     

       75
       +
             useTLS = mkOption {

     

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

     

       77
       +
               type = types.bool;

     

       78
       +
               default = false;

     

       79
       +
             };

     

       80
       +
             username = mkOption {

     

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

     

       82
       +
               type = types.nullOr types.str;

     

       83
       +
               default = null;

     

       84
       +
             };

     

       85
       +
             sender = mkOption {

     

       86
       +
               description = lib.mdDoc ''

     

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

     

       88
       +
               '';

     

       89
       +
               type = types.str;

     

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

     

       91
       +
             };

     

       92
       +
             passwordFile = mkOption {

     

       93
       +
               description = lib.mdDoc ''

     

       94
       +
                 Password for SMTP email account.

     

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

     

       96
       +
               '';

     

       97
       +
               type = types.path;

     

       98
       +
             };

     

       99
       +
           };

     

       100
       +
       

     

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

     

       102
        
       

     

       103
        
           settings = mkOption {

     

       104
        
             description = lib.mdDoc ''

     

       105
        
               Settings for pgadmin4.

     

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

     

       107
        
             '';

     

       108
        
             type = pyType;

     

       109
       +
             default = { };

     

       110
        
           };

     

       111
        
         };

     

       112
        
       

     
···

       118
        
             SERVER_MODE = true;

     

       119
        
           } // (optionalAttrs cfg.openFirewall {

     

       120
        
             DEFAULT_SERVER = mkDefault "::";

     

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

     

       122
       +
             MAIL_SERVER = cfg.emailServer.address;

     

       123
       +
             MAIL_PORT = cfg.emailServer.port;

     

       124
       +
             MAIL_USE_SSL = cfg.emailServer.useSSL;

     

       125
       +
             MAIL_USE_TLS = cfg.emailServer.useTLS;

     

       126
       +
             MAIL_USERNAME = cfg.emailServer.username;

     

       127
       +
             SECURITY_EMAIL_SENDER = cfg.emailServer.sender;

     

       128
        
           });

     

       129
        
       

     

       130
        
           systemd.services.pgadmin = {

     
···

       171
        
             group = "pgadmin";

     

       172
        
           };

     

       173
        
       

     

       174
       +
           users.groups.pgadmin = { };

     

       175
        
       

     

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

     

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

     

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

     

       179
       +
                 pw = f.read()

     

       180
       +
               MAIL_PASSWORD = pw

     

       181
       +
             '' + formatPy cfg.settings;

     

       182
        
             mode = "0600";

     

       183
        
             user = "pgadmin";

     

       184
        
             group = "pgadmin";

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

···

       555
        
       

     

       556
        
             umount /tmp-iso

     

       557
        
             rmdir /tmp-iso

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       558
        
             continue

     

       559
        
           fi

     

       560

···

       555
        
       

     

       556
        
             umount /tmp-iso

     

       557
        
             rmdir /tmp-iso

     

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

     

       559
       +
              umount /findiso

     

       560
       +
             fi

     

       561
        
             continue

     

       562
        
           fi

     

       563

+9 -10

nixos/tests/pgadmin4.nix

···

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

     

       107
        
             )

     

       108
        
       

     

       109
       -
             # don't bother to test LDAP authentification

     

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

     

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

     

       112
        
             with subtest("run browser test"):

     

       113
        
                 machine.succeed(

     

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

     

       115
        
                      && python regression/runtests.py \

     

       116
        
                      --pkg browser \

     

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

     

       118
        
                 )

     

       119
        
       

     

       120
        
             # fontconfig is necessary for chromium to run

     
···

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

     

       127
        
                 )

     

       128
        
       

     

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

     

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

     

       131
       -
             #    machine.succeed(

     

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

     

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

     

       134
       -
             #    )

     

       135
        
           '';

     

       136
        
         })

···

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

     

       107
        
             )

     

       108
        
       

     

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

     

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

     

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

     

       112
        
             with subtest("run browser test"):

     

       113
        
                 machine.succeed(

     

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

     

       115
        
                      && python regression/runtests.py \

     

       116
        
                      --pkg browser \

     

       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
        
                 )

     

       119
        
       

     

       120
        
             # fontconfig is necessary for chromium to run

     
···

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

     

       127
        
                 )

     

       128
        
       

     

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

     

       130
       +
                machine.succeed(

     

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

     

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

     

       133
       +
                )

     

       0
        
       
     

       134
        
           '';

     

       135
        
         })

+2 -2

pkgs/applications/audio/famistudio/default.nix

···

       10
        
       

     

       11
        
       stdenv.mkDerivation rec {

     

       12
        
         pname = "famistudio";

     

       13
       -
         version = "4.0.1";

     

       14
        
       

     

       15
        
         src = fetchzip {

     

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

     

       17
        
           stripRoot = false;

     

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

     

       19
        
         };

     

       20
        
       

     

       21
        
         nativeBuildInputs = [

···

       10
        
       

     

       11
        
       stdenv.mkDerivation rec {

     

       12
        
         pname = "famistudio";

     

       13
       +
         version = "4.0.4";

     

       14
        
       

     

       15
        
         src = fetchzip {

     

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

     

       17
        
           stripRoot = false;

     

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

     

       19
        
         };

     

       20
        
       

     

       21
        
         nativeBuildInputs = [

+64

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

···

       1
       +
       { lib

     

       2
       +
       , buildPythonApplication

     

       3
       +
       , fetchFromGitHub

     

       4
       +
       , fetchpatch

     

       5
       +
       , poetry-core

     

       6
       +
       , pandas

     

       7
       +
       , prompt-toolkit

     

       8
       +
       , databricks-sql-connector

     

       9
       +
       , pygments

     

       10
       +
       , configobj

     

       11
       +
       , sqlparse

     

       12
       +
       , cli-helpers

     

       13
       +
       , click

     

       14
       +
       , pytestCheckHook

     

       15
       +
       }:

     

       16
       +
       

     

       17
       +
       buildPythonApplication rec {

     

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

     

       19
       +
         version = "0.1.4";

     

       20
       +
         format = "pyproject";

     

       21
       +
       

     

       22
       +
         src = fetchFromGitHub {

     

       23
       +
           owner = "databricks";

     

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

     

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

     

       26
       +
           sha256 = "sha256-gr7LJfnvIu2Jf1XgILqfZoi8CbXeQyq0g1wLEBa5TPM=";

     

       27
       +
         };

     

       28
       +
       

     

       29
       +
         patches = [

     

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

     

       31
       +
           (fetchpatch {

     

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

     

       33
       +
             sha256 = "sha256-QVrb7mD0fVbHrbrDywI6tsFNYM19x74LY8rhqqC8szE=";

     

       34
       +
           })

     

       35
       +
         ];

     

       36
       +
       

     

       37
       +
         postPatch = ''

     

       38
       +
           substituteInPlace pyproject.toml \

     

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

     

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

     

       41
       +
         '';

     

       42
       +
       

     

       43
       +
         nativeBuildInputs = [ poetry-core ];

     

       44
       +
       

     

       45
       +
         propagatedBuildInputs = [

     

       46
       +
           prompt-toolkit

     

       47
       +
           pandas

     

       48
       +
           databricks-sql-connector

     

       49
       +
           pygments

     

       50
       +
           configobj

     

       51
       +
           sqlparse

     

       52
       +
           cli-helpers

     

       53
       +
           click

     

       54
       +
         ];

     

       55
       +
       

     

       56
       +
         checkInputs = [ pytestCheckHook ];

     

       57
       +
       

     

       58
       +
         meta = with lib; {

     

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

     

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

     

       61
       +
           license = licenses.databricks;

     

       62
       +
           maintainers = with maintainers; [ kfollesdal ];

     

       63
       +
         };

     

       64
       +
       }

+3 -1

pkgs/applications/networking/gns3/default.nix

···

       20
        
               });

     

       21
        
             };

     

       22
        
           commonOverrides = [

     

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

     

       0
        
       
     

       0
        
       
     

       24
        
           ];

     

       25
        
         };

     

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

···

       20
        
               });

     

       21
        
             };

     

       22
        
           commonOverrides = [

     

       23
       +
             (self: super: {

     

       24
       +
               jsonschema = super.jsonschema_3;

     

       25
       +
             })

     

       26
        
           ];

     

       27
        
         };

     

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

+2 -15

pkgs/applications/networking/gns3/gui.nix

···

       10
        
       , python3

     

       11
        
       , fetchFromGitHub

     

       12
        
       , wrapQtAppsHook

     

       0
        
       
     

       13
        
       }:

     

       14
        
       

     

       15
        
       let

     
···

       17
        
         ];

     

       18
        
       

     

       19
        
         python = python3.override {

     

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

     

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

     

       22
       -
               version = "3.2.0";

     

       23
       -
       

     

       24
       -
               src = super.fetchPypi {

     

       25
       -
                 inherit (oldAttrs) pname;

     

       26
       -
                 inherit version;

     

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

     

       28
       -
               };

     

       29
       -
       

     

       30
       -
               SETUPTOOLS_SCM_PRETEND_VERSION = version;

     

       31
       -
       

     

       32
       -
               doCheck = false;

     

       33
       -
             });

     

       34
       -
           }) defaultOverrides;

     

       35
        
         };

     

       36
        
       in python.pkgs.buildPythonPackage rec {

     

       37
        
         pname = "gns3-gui";

···

       10
        
       , python3

     

       11
        
       , fetchFromGitHub

     

       12
        
       , wrapQtAppsHook

     

       13
       +
       , packageOverrides ? self: super: {}

     

       14
        
       }:

     

       15
        
       

     

       16
        
       let

     
···

       18
        
         ];

     

       19
        
       

     

       20
        
         python = python3.override {

     

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

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       22
        
         };

     

       23
        
       in python.pkgs.buildPythonPackage rec {

     

       24
        
         pname = "gns3-gui";

-16

pkgs/applications/networking/gns3/server.nix

···

       14
        
       

     

       15
        
       let

     

       16
        
         defaultOverrides = commonOverrides ++ [

     

       17
       -
           (self: super: {

     

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

     

       19
       -
               version = "3.2.0";

     

       20
       -
       

     

       21
       -
               src = super.fetchPypi {

     

       22
       -
                 inherit (oldAttrs) pname;

     

       23
       -
                 inherit version;

     

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

     

       25
       -
               };

     

       26
       -
       

     

       27
       -
               SETUPTOOLS_SCM_PRETEND_VERSION = version;

     

       28
       -
       

     

       29
       -
               doCheck = false;

     

       30
       -
             });

     

       31
       -
       

     

       32
       -
           })

     

       33
        
         ];

     

       34
        
       

     

       35
        
         python = python3.override {

···

       14
        
       

     

       15
        
       let

     

       16
        
         defaultOverrides = commonOverrides ++ [

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       17
        
         ];

     

       18
        
       

     

       19
        
         python = python3.override {

+2 -2

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

···

       8
        
       }:

     

       9
        
       

     

       10
        
       let

     

       11
       -
         version = "1.10.0";

     

       12
        
         pname = "session-desktop";

     

       13
        
       

     

       14
        
         src = fetchurl {

     

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

     

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

     

       17
        
         };

     

       18
        
         appimage = appimageTools.wrapType2 {

     

       19
        
           inherit version pname src;

···

       8
        
       }:

     

       9
        
       

     

       10
        
       let

     

       11
       +
         version = "1.10.1";

     

       12
        
         pname = "session-desktop";

     

       13
        
       

     

       14
        
         src = fetchurl {

     

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

     

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

     

       17
        
         };

     

       18
        
         appimage = appimageTools.wrapType2 {

     

       19
        
           inherit version pname src;

+1 -13

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

···

       13
        
           packageOverrides = self: super: {

     

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

     

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

     

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

     

       17
       -
               version = "3.2.0";

     

       18
       -
       

     

       19
       -
               src = oldAttrs.src.override {

     

       20
       -
                 inherit version;

     

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

     

       22
       -
                 sha256 = "";

     

       23
       -
               };

     

       24
       -
       

     

       25
       -
               SETUPTOOLS_SCM_PRETEND_VERSION = version;

     

       26
       -
       

     

       27
       -
               doCheck = false;

     

       28
       -
             });

     

       29
        
           };

     

       30
        
         };

     

       31

···

       13
        
           packageOverrides = self: super: {

     

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

     

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

     

       16
       +
             jsonschema = super.jsonschema_3;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       17
        
           };

     

       18
        
         };

     

       19

+2 -2

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

···

       5
        
       

     

       6
        
       python3.pkgs.buildPythonApplication rec {

     

       7
        
         pname = "snakemake";

     

       8
       -
         version = "7.14.0";

     

       9
        
         format = "setuptools";

     

       10
        
       

     

       11
        
         src = fetchFromGitHub {

     

       12
        
           owner = "snakemake";

     

       13
        
           repo = pname;

     

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

     

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

     

       16
        
         };

     

       17
        
       

     

       18
        
         propagatedBuildInputs = with python3.pkgs; [

···

       5
        
       

     

       6
        
       python3.pkgs.buildPythonApplication rec {

     

       7
        
         pname = "snakemake";

     

       8
       +
         version = "7.14.1";

     

       9
        
         format = "setuptools";

     

       10
        
       

     

       11
        
         src = fetchFromGitHub {

     

       12
        
           owner = "snakemake";

     

       13
        
           repo = pname;

     

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

     

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

     

       16
        
         };

     

       17
        
       

     

       18
        
         propagatedBuildInputs = with python3.pkgs; [

+9 -4

pkgs/applications/video/rtabmap/default.nix

···

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

     

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

     

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

     

       0
        
       
     

       4
        
       

     

       5
        
       stdenv.mkDerivation rec {

     

       6
        
         pname = "rtabmap";

     

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

     

       8
        
       

     

       9
        
         src = fetchFromGitHub {

     

       10
        
           owner = "introlab";

     

       11
        
           repo = "rtabmap";

     

       12
       -
           rev = "f584f42ea423c44138aa0668b5c8eb18f2978fe2";

     

       13
       -
           sha256 = "sha256-xotOcaz5XrmzwEKuVEQZoeq6fEVbACK7PSUW9kULH40=";

     

       14
        
         };

     

       15
        
       

     

       16
        
         patches = [

     
···

       23
        
           ## Required

     

       24
        
           opencv

     

       25
        
           pcl

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       26
        
           ## Optional

     

       27
        
           libusb1

     

       28
        
           eigen

···

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

     

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

     

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

     

       4
       +
       , xorg }:

     

       5
        
       

     

       6
        
       stdenv.mkDerivation rec {

     

       7
        
         pname = "rtabmap";

     

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

     

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner = "introlab";

     

       12
        
           repo = "rtabmap";

     

       13
       +
           rev = "fa31affea0f0bd54edf1097b8289209c7ac0548e";

     

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

     

       15
        
         };

     

       16
        
       

     

       17
        
         patches = [

     
···

       24
        
           ## Required

     

       25
        
           opencv

     

       26
        
           pcl

     

       27
       +
           liblapack

     

       28
       +
           xorg.libSM

     

       29
       +
           xorg.libICE

     

       30
       +
           xorg.libXt

     

       31
        
           ## Optional

     

       32
        
           libusb1

     

       33
        
           eigen

+3 -3

pkgs/applications/virtualization/nixpacks/default.nix

···

       2
        
       

     

       3
        
       rustPlatform.buildRustPackage rec {

     

       4
        
         pname = "nixpacks";

     

       5
       -
         version = "0.6.2";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "railwayapp";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "sha256-PMWaaCcguziQAnuBL5He2AQaAhCTmpNsOHUNnExK0mU=";

     

       12
        
         };

     

       13
        
       

     

       14
       -
         cargoSha256 = "sha256-IVlOenWvy6BsUCsSMWuJj7H8XKQRQkJtTYnmUhcesNw=";

     

       15
        
       

     

       16
        
         # skip test due FHS dependency

     

       17
        
         doCheck = false;

···

       2
        
       

     

       3
        
       rustPlatform.buildRustPackage rec {

     

       4
        
         pname = "nixpacks";

     

       5
       +
         version = "0.7.1";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "railwayapp";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

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

     

       12
        
         };

     

       13
        
       

     

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

     

       15
        
       

     

       16
        
         # skip test due FHS dependency

     

       17
        
         doCheck = false;

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

···

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

     

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

     

       55
        
           })

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       56
        
         ];

     

       57
        
       

     

       58
        
         nativeBuildInputs = [

···

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

     

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

     

       55
        
           })

     

       56
       +
       

     

       57
       +
           # MultitaskingView: fix allocation assertions

     

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

     

       59
       +
           (fetchpatch {

     

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

     

       61
       +
             sha256 = "sha256-OfIDBfVEZoY8vMu9F8gtfRg4TYA1MUAG94BSOBKVGcI=";

     

       62
       +
           })

     

       63
        
         ];

     

       64
        
       

     

       65
        
         nativeBuildInputs = [

+14 -8

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

···

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

     

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

     

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

     

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

     

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

     

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

     

       16
        
           ] null;

     

       17
        
         release = {

     

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

     
···

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

     

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

     

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

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       24
        
         };

     

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

     

       26
        
       

     
···

       75
        
               };

     

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

     

       77
        
               { passthru = genAttrs packages metacoq_; })

     

       78
       -
             ).overrideAttrs (o: {

     

       79
       -
               propagatedBuildInputs = o.propagatedBuildInputs ++

     

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

     

       81
       -
             });

     

       82
       -
           in derivation;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       83
        
       in

     

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

···

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

     

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

     

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

     

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

     

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

     

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

     

       16
        
           ] null;

     

       17
        
         release = {

     

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

     
···

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

     

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

     

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

     

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

     

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

     

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

     

       27
        
         };

     

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

     

       29
        
       

     
···

       78
        
               };

     

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

     

       80
        
               { passthru = genAttrs packages metacoq_; })

     

       81
       +
             ).overrideAttrs (o:

     

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

     

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

     

       84
       +
               in

     

       85
       +
                 {

     

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

     

       87
       +
                 });

     

       88
       +
         in derivation;

     

       89
        
       in

     

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

-52

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

···

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

     

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

     

       3
       -
       }:

     

       4
       -
       

     

       5
       -
       let

     

       6
       -
         version = "1.1.11";

     

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

     

       8
       -
       

     

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

     

       10
       -
         # for the bindings, if overridden

     

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

     

       12
       -
       

     

       13
       -
       in stdenv.mkDerivation {

     

       14
       -
         pname = "libtorrent-rasterbar";

     

       15
       -
         inherit version;

     

       16
       -
       

     

       17
       -
         src = fetchFromGitHub {

     

       18
       -
           owner = "arvidn";

     

       19
       -
           repo = "libtorrent";

     

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

     

       21
       -
           sha256 = "0nwdsv6d2gkdsh7l5a46g6cqx27xwh3msify5paf02l1qzjy4s5l";

     

       22
       -
         };

     

       23
       -
       

     

       24
       -
         enableParallelBuilding = true;

     

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

     

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

     

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

     

       28
       -
       

     

       29
       -
         postInstall = ''

     

       30
       -
           moveToOutput "include" "$dev"

     

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

     

       32
       -
         '';

     

       33
       -
       

     

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

     

       35
       -
       

     

       36
       -
         configureFlags = [

     

       37
       -
           "--enable-python-binding"

     

       38
       -
           "--with-libiconv=yes"

     

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

     

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

     

       41
       -
         ];

     

       42
       -
       

     

       43
       -
         meta = with lib; {

     

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

     

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

     

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

     

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

     

       48
       -
           license = licenses.bsd3;

     

       49
       -
           maintainers = [ ];

     

       50
       -
           platforms = platforms.unix;

     

       51
       -
         };

     

       52
       -
       }

+2 -2

pkgs/development/libraries/quarto/default.nix

···

       13
        
       

     

       14
        
       stdenv.mkDerivation rec {

     

       15
        
         pname = "quarto";

     

       16
       -
         version = "1.1.189";

     

       17
        
         src = fetchurl {

     

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

     

       19
       -
           sha256 = "1a3xsgqdccm4ky1xjnin1idpp8gsansskq37c00mrxz1raxn1mi7";

     

       20
        
         };

     

       21
        
       

     

       22
        
         nativeBuildInputs = [

···

       13
        
       

     

       14
        
       stdenv.mkDerivation rec {

     

       15
        
         pname = "quarto";

     

       16
       +
         version = "1.1.251";

     

       17
        
         src = fetchurl {

     

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

     

       19
       +
           sha256 = "sha256-VEYUEI4xzQPXlyTbCThAW2npBCZNPDJ5x2cWnkNz7RE=";

     

       20
        
         };

     

       21
        
       

     

       22
        
         nativeBuildInputs = [

+17 -5

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

···

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

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       2
        
       let

     

       3
        
         pname = "uunf";

     

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

     

       5
       -
         version = "14.0.0";

     

       6
        
       in

     

       7
        
       

     

       8
        
       if lib.versionOlder ocaml.version "4.03"

     
···

       15
        
       

     

       16
        
         src = fetchurl {

     

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

     

       18
       -
           sha256 = "sha256:17wv0nm3vvwcbzb1b09akw8jblmigyhbfmh1sy9lkb5756ni94a2";

     

       19
        
         };

     

       20
        
       

     

       21
        
         nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];

     

       22
       -
         buildInputs = [ topkg uutf cmdliner ];

     

       0
        
       
     

       23
        
       

     

       24
        
         propagatedBuildInputs = [ uchar ];

     

       25
        
       

     
···

       27
        
       

     

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

     

       29
        
       

     

       30
       -
         inherit (topkg) buildPhase installPhase;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       31
        
       

     

       32
        
         meta = with lib; {

     

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

···

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

     

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

     

       3
       +
       }:

     

       4
       +
       

     

       5
        
       let

     

       6
        
         pname = "uunf";

     

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

     

       8
       +
         version = "15.0.0";

     

       9
        
       in

     

       10
        
       

     

       11
        
       if lib.versionOlder ocaml.version "4.03"

     
···

       18
        
       

     

       19
        
         src = fetchurl {

     

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

     

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

     

       22
        
         };

     

       23
        
       

     

       24
        
         nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];

     

       25
       +
         buildInputs = [ topkg uutf ]

     

       26
       +
         ++ lib.optional cmdlinerSupport cmdliner;

     

       27
        
       

     

       28
        
         propagatedBuildInputs = [ uchar ];

     

       29
        
       

     
···

       31
        
       

     

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

     

       33
        
       

     

       34
       +
         buildPhase = ''

     

       35
       +
           runHook preBuild

     

       36
       +
           ${topkg.run} build \

     

       37
       +
             --with-uutf true \

     

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

     

       39
       +
           runHook postBuild

     

       40
       +
         '';

     

       41
       +
       

     

       42
       +
         inherit (topkg) installPhase;

     

       43
        
       

     

       44
        
         meta = with lib; {

     

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

+50

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

···

       1
       +
       { lib

     

       2
       +
       , buildPythonPackage

     

       3
       +
       , fetchFromGitHub

     

       4
       +
       , thrift

     

       5
       +
       , pandas

     

       6
       +
       , pyarrow

     

       7
       +
       , poetry-core

     

       8
       +
       , pytestCheckHook

     

       9
       +
       }:

     

       10
       +
       

     

       11
       +
       buildPythonPackage rec {

     

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

     

       13
       +
         version = "2.0.5";

     

       14
       +
         format = "pyproject";

     

       15
       +
       

     

       16
       +
         src = fetchFromGitHub {

     

       17
       +
           owner = "databricks";

     

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

     

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

     

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

     

       21
       +
         };

     

       22
       +
       

     

       23
       +
         postPatch = ''

     

       24
       +
           substituteInPlace pyproject.toml \

     

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

     

       26
       +
         '';

     

       27
       +
       

     

       28
       +
         nativeBuildInputs = [

     

       29
       +
           poetry-core

     

       30
       +
         ];

     

       31
       +
       

     

       32
       +
         propagatedBuildInputs = [

     

       33
       +
           thrift

     

       34
       +
           pandas

     

       35
       +
           pyarrow

     

       36
       +
         ];

     

       37
       +
       

     

       38
       +
         checkInputs = [

     

       39
       +
           pytestCheckHook

     

       40
       +
         ];

     

       41
       +
       

     

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

     

       43
       +
       

     

       44
       +
         meta = with lib; {

     

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

     

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

     

       47
       +
           license = licenses.asl20;

     

       48
       +
           maintainers = with maintainers; [ harvidsen ];

     

       49
       +
         };

     

       50
       +
       }

+39

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

···

       1
       +
       { lib, buildPythonPackage, fetchPypi, isPy27

     

       2
       +
       , attrs

     

       3
       +
       , functools32

     

       4
       +
       , importlib-metadata

     

       5
       +
       , mock

     

       6
       +
       , nose

     

       7
       +
       , pyperf

     

       8
       +
       , pyrsistent

     

       9
       +
       , setuptools-scm

     

       10
       +
       , twisted

     

       11
       +
       , vcversioner

     

       12
       +
       }:

     

       13
       +
       

     

       14
       +
       buildPythonPackage rec {

     

       15
       +
         pname = "jsonschema";

     

       16
       +
         version = "3.2.0";

     

       17
       +
       

     

       18
       +
         src = fetchPypi {

     

       19
       +
           inherit pname version;

     

       20
       +
           sha256 = "c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a";

     

       21
       +
         };

     

       22
       +
       

     

       23
       +
         nativeBuildInputs = [ setuptools-scm ];

     

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

     

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

     

       26
       +
       

     

       27
       +
         # zope namespace collides on py27

     

       28
       +
         doCheck = !isPy27;

     

       29
       +
         checkPhase = ''

     

       30
       +
           nosetests

     

       31
       +
         '';

     

       32
       +
       

     

       33
       +
         meta = with lib; {

     

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

     

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

     

       36
       +
           license = licenses.mit;

     

       37
       +
           maintainers = with maintainers; [ domenkozar ];

     

       38
       +
         };

     

       39
       +
       }

+2 -2

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

···

       2
        
       

     

       3
        
       buildPythonPackage rec {

     

       4
        
         pname = "klaus";

     

       5
       -
         version = "2.0.0";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "jonashaag";

     

       9
        
           repo = pname;

     

       10
        
           rev = version;

     

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

     

       12
        
         };

     

       13
        
       

     

       14
        
         prePatch = ''

···

       2
        
       

     

       3
        
       buildPythonPackage rec {

     

       4
        
         pname = "klaus";

     

       5
       +
         version = "2.0.1";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "jonashaag";

     

       9
        
           repo = pname;

     

       10
        
           rev = version;

     

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

     

       12
        
         };

     

       13
        
       

     

       14
        
         prePatch = ''

+2 -2

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

···

       10
        
       

     

       11
        
       buildPythonPackage rec {

     

       12
        
         pname = "minikerberos";

     

       13
       -
         version = "0.3.1";

     

       14
        
         format = "setuptools";

     

       15
        
       

     

       16
        
         disabled = pythonOlder "3.7";

     

       17
        
       

     

       18
        
         src = fetchPypi {

     

       19
        
           inherit pname version;

     

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

     

       21
        
         };

     

       22
        
       

     

       23
        
         propagatedBuildInputs = [

···

       10
        
       

     

       11
        
       buildPythonPackage rec {

     

       12
        
         pname = "minikerberos";

     

       13
       +
         version = "0.3.2";

     

       14
        
         format = "setuptools";

     

       15
        
       

     

       16
        
         disabled = pythonOlder "3.7";

     

       17
        
       

     

       18
        
         src = fetchPypi {

     

       19
        
           inherit pname version;

     

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

     

       21
        
         };

     

       22
        
       

     

       23
        
         propagatedBuildInputs = [

+22 -4

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

···

       1
       -
       { lib, pythonOlder, fetchFromGitHub, buildPythonPackage

     

       2
       -
       , six, enum34, pyasn1, cryptography

     

       3
       -
       , pytestCheckHook }:

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       4
        
       

     

       5
        
       buildPythonPackage rec {

     

       6
        
         pname = "pgpy";

     
···

       10
        
           owner = "SecurityInnovation";

     

       11
        
           repo = "PGPy";

     

       12
        
           rev = "v${version}";

     

       13
       -
           sha256 = "03pch39y3hi4ici6y6lvz0j0zram8dw2wvnmq1zyjy3vyvm1ms4a";

     

       14
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       15
        
       

     

       16
        
         propagatedBuildInputs = [

     

       17
        
           six

···

       1
       +
       { lib

     

       2
       +
       , pythonOlder

     

       3
       +
       , fetchFromGitHub

     

       4
       +
       , fetchpatch

     

       5
       +
       , buildPythonPackage

     

       6
       +
       , six

     

       7
       +
       , enum34

     

       8
       +
       , pyasn1

     

       9
       +
       , cryptography

     

       10
       +
       , pytestCheckHook

     

       11
       +
       }:

     

       12
        
       

     

       13
        
       buildPythonPackage rec {

     

       14
        
         pname = "pgpy";

     
···

       18
        
           owner = "SecurityInnovation";

     

       19
        
           repo = "PGPy";

     

       20
        
           rev = "v${version}";

     

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

     

       22
        
         };

     

       23
       +
       

     

       24
       +
         patches = [

     

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

     

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

     

       27
       +
           (fetchpatch {

     

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

     

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

     

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

     

       31
       +
           })

     

       32
       +
         ];

     

       33
        
       

     

       34
        
         propagatedBuildInputs = [

     

       35
        
           six

+2 -2

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

···

       13
        
       

     

       14
        
       buildPythonPackage rec {

     

       15
        
         pname = "pypykatz";

     

       16
       -
         version = "0.6.1";

     

       17
        
         format = "setuptools";

     

       18
        
       

     

       19
        
         disabled = pythonOlder "3.7";

     

       20
        
       

     

       21
        
         src = fetchPypi {

     

       22
        
           inherit pname version;

     

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

     

       24
        
         };

     

       25
        
       

     

       26
        
         propagatedBuildInputs = [

···

       13
        
       

     

       14
        
       buildPythonPackage rec {

     

       15
        
         pname = "pypykatz";

     

       16
       +
         version = "0.6.2";

     

       17
        
         format = "setuptools";

     

       18
        
       

     

       19
        
         disabled = pythonOlder "3.7";

     

       20
        
       

     

       21
        
         src = fetchPypi {

     

       22
        
           inherit pname version;

     

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

     

       24
        
         };

     

       25
        
       

     

       26
        
         propagatedBuildInputs = [

+2 -2

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

···

       46
        
       

     

       47
        
       buildPythonPackage rec {

     

       48
        
         pname = "sentry-sdk";

     

       49
       -
         version = "1.9.8";

     

       50
        
         format = "setuptools";

     

       51
        
       

     

       52
        
         disabled = pythonOlder "3.7";

     
···

       55
        
           owner = "getsentry";

     

       56
        
           repo = "sentry-python";

     

       57
        
           rev = version;

     

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

     

       59
        
         };

     

       60
        
       

     

       61
        
         propagatedBuildInputs = [

···

       46
        
       

     

       47
        
       buildPythonPackage rec {

     

       48
        
         pname = "sentry-sdk";

     

       49
       +
         version = "1.9.9";

     

       50
        
         format = "setuptools";

     

       51
        
       

     

       52
        
         disabled = pythonOlder "3.7";

     
···

       55
        
           owner = "getsentry";

     

       56
        
           repo = "sentry-python";

     

       57
        
           rev = version;

     

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

     

       59
        
         };

     

       60
        
       

     

       61
        
         propagatedBuildInputs = [

+2 -2

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

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "oh-my-posh";

     

       5
       -
         version = "10.1.0";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "jandedobbeleer";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

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

     

       12
        
         };

     

       13
        
       

     

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

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "oh-my-posh";

     

       5
       +
         version = "11.0.1";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "jandedobbeleer";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

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

     

       12
        
         };

     

       13
        
       

     

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

+3 -3

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

···

       5
        
       

     

       6
        
       buildGoModule rec {

     

       7
        
         pname = "node_exporter";

     

       8
       -
         version = "1.3.1";

     

       9
        
         rev = "v${version}";

     

       10
        
       

     

       11
        
         src = fetchFromGitHub {

     

       12
        
           inherit rev;

     

       13
        
           owner = "prometheus";

     

       14
        
           repo = "node_exporter";

     

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

     

       16
        
         };

     

       17
        
       

     

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

     

       19
        
       

     

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

     

       21
        
         doCheck = false;

···

       5
        
       

     

       6
        
       buildGoModule rec {

     

       7
        
         pname = "node_exporter";

     

       8
       +
         version = "1.4.0";

     

       9
        
         rev = "v${version}";

     

       10
        
       

     

       11
        
         src = fetchFromGitHub {

     

       12
        
           inherit rev;

     

       13
        
           owner = "prometheus";

     

       14
        
           repo = "node_exporter";

     

       15
       +
           sha256 = "sha256-KO33Cyrc4Oh6vvTMazo5iuekpyxNsi18gIb66Z8B9i4=";

     

       16
        
         };

     

       17
        
       

     

       18
       +
         vendorSha256 = "sha256-eJbb56U6VStwfi6iSemWrriDYNaPiDegW3KJr8rH1NU=";

     

       19
        
       

     

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

     

       21
        
         doCheck = false;

+21 -2

pkgs/tools/admin/chkservice/default.nix

···

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

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "chkservice";

     
···

       8
        
           owner = "linuxenko";

     

       9
        
           repo = "chkservice";

     

       10
        
           rev = version;

     

       11
       -
           hash = "sha256:0dfvm62h6dwg18f17fn58nr09mfh6kylm8wy88j00fiy13l4wnb6";

     

       12
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       13
        
       

     

       14
        
         # Tools needed during build time

     

       15
        
         nativeBuildInputs = [

···

       1
       +
       { lib

     

       2
       +
       , stdenv

     

       3
       +
       , fetchFromGitHub

     

       4
       +
       , fetchpatch

     

       5
       +
       , cmake

     

       6
       +
       , ninja

     

       7
       +
       , pkg-config

     

       8
       +
       , systemd

     

       9
       +
       , ncurses

     

       10
       +
       }:

     

       11
        
       

     

       12
        
       stdenv.mkDerivation rec {

     

       13
        
         pname = "chkservice";

     
···

       17
        
           owner = "linuxenko";

     

       18
        
           repo = "chkservice";

     

       19
        
           rev = version;

     

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

     

       21
        
         };

     

       22
       +
       

     

       23
       +
         patches = [

     

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

     

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

     

       26
       +
           (fetchpatch {

     

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

     

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

     

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

     

       30
       +
           })

     

       31
       +
         ];

     

       32
        
       

     

       33
        
         # Tools needed during build time

     

       34
        
         nativeBuildInputs = [

+11 -8

pkgs/tools/admin/pgadmin/default.nix

···

       10
        
       

     

       11
        
       let

     

       12
        
         pname = "pgadmin";

     

       13
       -
         version = "6.12";

     

       14
        
       

     

       15
        
         src = fetchurl {

     

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

     

       17
       -
           sha256 = "sha256-cO7GdZDfJ0pq1jpMyrVy0UM49WhrKOIJOmMJauSkbyo=";

     

       18
        
         };

     

       19
        
       

     

       20
        
         yarnDeps = mkYarnModules {

     
···

       72
        
           azure-identity

     

       73
        
         ];

     

       74
        
       

     

       75
       -
         # override necessary on pgadmin4 6.12

     

       0
        
       
     

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

     

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

     

       78
       -
             version = "2.0.3";

     

       0
        
       
     

       0
        
       
     

       79
        
             src = oldAttrs.src.override {

     

       80
        
               inherit version;

     

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

     

       82
        
             };

     

       83
        
           });

     

       84
        
         });

     
···

       124
        
       

     

       125
        
           # build the documentation

     

       126
        
           cd docs/en_US

     

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

     

       128
        
       

     

       129
        
           # Build the clean tree

     

       130
        
           cd ../../web

     
···

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

     

       157
        
         '';

     

       158
        
       

     

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

     

       160
        
         buildInputs = [

     

       161
        
           zlib

     

       162
        
           pythonPackages.wheel

···

       10
        
       

     

       11
        
       let

     

       12
        
         pname = "pgadmin";

     

       13
       +
         version = "6.13";

     

       14
        
       

     

       15
        
         src = fetchurl {

     

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

     

       17
       +
           sha256 = "sha256-vLItmE76R1IzgMYEGEvIeOmbfQQac5WK12AkkZknTFU=";

     

       18
        
         };

     

       19
        
       

     

       20
        
         yarnDeps = mkYarnModules {

     
···

       72
        
           azure-identity

     

       73
        
         ];

     

       74
        
       

     

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

     

       76
       +
         # this also makes potential future overrides easier

     

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

     

       78
       +
           # flask 2.2 is incompatible with pgadmin 6.13

     

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

     

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

     

       81
       +
             version = "2.1.3";

     

       82
        
             src = oldAttrs.src.override {

     

       83
        
               inherit version;

     

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

     

       85
        
             };

     

       86
        
           });

     

       87
        
         });

     
···

       127
        
       

     

       128
        
           # build the documentation

     

       129
        
           cd docs/en_US

     

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

     

       131
        
       

     

       132
        
           # Build the clean tree

     

       133
        
           cd ../../web

     
···

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

     

       160
        
         '';

     

       161
        
       

     

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

     

       163
        
         buildInputs = [

     

       164
        
           zlib

     

       165
        
           pythonPackages.wheel

+27

pkgs/tools/admin/pgadmin/update.sh

···

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

     

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

     

       3
       +
       

     

       4
       +
       set -eu -o pipefail

     

       5
       +
       

     

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

     

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

     

       8
       +
       

     

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

     

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

     

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

     

       12
       +
       

     

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

     

       14
       +
         echo "Already at latest version $newest_version"

     

       15
       +
         exit 0

     

       16
       +
       fi

     

       17
       +
       echo "New version: $newest_version"

     

       18
       +
       

     

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

     

       20
       +
       wget $url

     

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

     

       22
       +
       cd "pgadmin4-$newest_version/web"

     

       23
       +
       yarn2nix > yarn.nix

     

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

     

       25
       +
       popd

     

       26
       +
       

     

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

+2 -2

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

···

       26
        
       

     

       27
        
       stdenv.mkDerivation rec {

     

       28
        
         pname = "fcitx5-gtk";

     

       29
       -
         version = "5.0.18";

     

       30
        
       

     

       31
        
         src = fetchFromGitHub {

     

       32
        
           owner = "fcitx";

     

       33
        
           repo = pname;

     

       34
        
           rev = version;

     

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

     

       36
        
         };

     

       37
        
       

     

       38
        
         cmakeFlags = [

···

       26
        
       

     

       27
        
       stdenv.mkDerivation rec {

     

       28
        
         pname = "fcitx5-gtk";

     

       29
       +
         version = "5.0.19";

     

       30
        
       

     

       31
        
         src = fetchFromGitHub {

     

       32
        
           owner = "fcitx";

     

       33
        
           repo = pname;

     

       34
        
           rev = version;

     

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

     

       36
        
         };

     

       37
        
       

     

       38
        
         cmakeFlags = [

+11 -6

pkgs/tools/networking/onetun/default.nix

···

       1
        
       { lib

     

       0
        
       
     

       0
        
       
     

       2
        
       , stdenv

     

       3
       -
       , fetchFromGitHub

     

       4
       -
       , rustPlatform

     

       5
        
       }:

     

       0
        
       
     

       6
        
       rustPlatform.buildRustPackage rec {

     

       7
        
         pname = "onetun";

     

       8
       -
         version = "0.3.3";

     

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner = "aramperes";

     

       12
        
           repo = pname;

     

       13
        
           rev = "v${version}";

     

       14
       -
       

     

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

     

       16
        
         };

     

       17
        
       

     

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

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       19
        
       

     

       20
        
         meta = with lib; {

     

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

···

       1
        
       { lib

     

       2
       +
       , rustPlatform

     

       3
       +
       , fetchFromGitHub

     

       4
        
       , stdenv

     

       5
       +
       , Security

     

       0
        
       
     

       6
        
       }:

     

       7
       +
       

     

       8
        
       rustPlatform.buildRustPackage rec {

     

       9
        
         pname = "onetun";

     

       10
       +
         version = "0.3.4";

     

       11
        
       

     

       12
        
         src = fetchFromGitHub {

     

       13
        
           owner = "aramperes";

     

       14
        
           repo = pname;

     

       15
        
           rev = "v${version}";

     

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

     

       0
        
       
     

       17
        
         };

     

       18
        
       

     

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

     

       20
       +
       

     

       21
       +
         buildInputs = lib.optionals stdenv.isDarwin [

     

       22
       +
           Security

     

       23
       +
         ];

     

       24
        
       

     

       25
        
         meta = with lib; {

     

       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
        
       

     

       6
        
       buildGoModule rec {

     

       7
        
         pname = "scilla";

     

       8
       -
         version = "1.2.3";

     

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner = "edoardottt";

     

       12
        
           repo = pname;

     

       13
        
           rev = "v${version}";

     

       14
       -
           sha256 = "sha256-VTX4NG3BzmLpf2sIxZ5DGjg9dnCTSO0VbGx2PMhjBPg=";

     

       15
        
         };

     

       16
        
       

     

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

     

       18
        
       

     

       19
        
         meta = with lib; {

     

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

···

       5
        
       

     

       6
        
       buildGoModule rec {

     

       7
        
         pname = "scilla";

     

       8
       +
         version = "1.2.4";

     

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           owner = "edoardottt";

     

       12
        
           repo = pname;

     

       13
        
           rev = "v${version}";

     

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

     

       15
        
         };

     

       16
        
       

     

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

     

       18
        
       

     

       19
        
         meta = with lib; {

     

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

-1

pkgs/top-level/aliases.nix

···

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

     

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

     

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

     

       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
        
         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
        
         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
        
         libudev = throw "'libudev' has been renamed to/replaced by 'udev'"; # Converted to throw 2022-02-22

···

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

     

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

     

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

     

       0
        
       
     

       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

     

       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

     

       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
        
             }

     

       209
        
           '');

     

       210
        
       

     

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

     

       212
       -
           stdenv = gcc10StdenvCompat;

     

       213
       -
         };

     

       214
        
       

     

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

     

       216
        
       

     
···

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

     

       430
        
       

     

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

     

       0
        
       
     

       0
        
       
     

       432
        
       

     

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

     

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

     
···

       9542
        
           inherit (darwin.apple_sdk.frameworks) Security;

     

       9543
        
         };

     

       9544
        
       

     

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

     

       0
        
       
     

       0
        
       
     

       9546
        
       

     

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

     

       9548
        
       

     
···

       20355
        
       

     

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

     

       20357
        
           inherit (darwin.apple_sdk.frameworks) SystemConfiguration;

     

       20358
       -
           python = python2;

     

       20359
       -
         };

     

       20360
       -
       

     

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

     

       20362
        
           python = python2;

     

       20363
        
         };

     

       20364

···

       208
        
             }

     

       209
        
           '');

     

       210
        
       

     

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

     

       0
        
       
     

       0
        
       
     

       212
        
       

     

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

     

       214
        
       

     
···

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

     

       428
        
       

     

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

     

       430
       +
       

     

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

     

       432
        
       

     

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

     

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

     
···

       9542
        
           inherit (darwin.apple_sdk.frameworks) Security;

     

       9543
        
         };

     

       9544
        
       

     

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

     

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

     

       9547
       +
         };

     

       9548
        
       

     

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

     

       9550
        
       

     
···

       20357
        
       

     

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

     

       20359
        
           inherit (darwin.apple_sdk.frameworks) SystemConfiguration;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       20360
        
           python = python2;

     

       20361
        
         };

     

       20362

pkgs/top-level/python-packages.nix

···

       2263
        
       

     

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

     

       2265
        
       

     

       0
        
       
     

       0
        
       
     

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

     

       2267
        
       

     

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

     
···

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

     

       4846
        
       

     

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

     

       0
        
       
     

       0
        
       
     

       4848
        
       

     

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

     

       4850

···

       2263
        
       

     

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

     

       2265
        
       

     

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

     

       2267
       +
       

     

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

     

       2269
        
       

     

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

     
···

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

     

       4848
        
       

     

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

     

       4850
       +
       

     

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

     

       4852
        
       

     

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

     

       4854