commit c76e040c19b29c37473fda47c1cb3540d705674b · pyrox.dev/nixpkgs

-1

nixos/tests/all-tests.nix

···

       520
       520
        
         peering-manager = handleTest ./web-apps/peering-manager.nix {};

     

       521
       521
        
         peertube = handleTestOn ["x86_64-linux"] ./web-apps/peertube.nix {};

     

       522
       522
        
         pgadmin4 = handleTest ./pgadmin4.nix {};

     

       523
       523
       -
         pgadmin4-standalone = handleTest ./pgadmin4-standalone.nix {};

     

       524
       523
        
         pgjwt = handleTest ./pgjwt.nix {};

     

       525
       524
        
         pgmanage = handleTest ./pgmanage.nix {};

     

       526
       525
        
         phosh = handleTest ./phosh.nix {};

-43

nixos/tests/pgadmin4-standalone.nix

···

       1
       1
       -
       import ./make-test-python.nix ({ pkgs, lib, ... }:

     

       2
       2
       -
         # This is separate from pgadmin4 since we don't want both running at once

     

       3
       3
       -
       

     

       4
       4
       -
         {

     

       5
       5
       -
           name = "pgadmin4-standalone";

     

       6
       6
       -
           meta.maintainers = with lib.maintainers; [ mkg20001 ];

     

       7
       7
       -
       

     

       8
       8
       -
           nodes.machine = { pkgs, ... }: {

     

       9
       9
       -
             environment.systemPackages = with pkgs; [

     

       10
       10
       -
               curl

     

       11
       11
       -
             ];

     

       12
       12
       -
       

     

       13
       13
       -
             services.postgresql = {

     

       14
       14
       -
               enable = true;

     

       15
       15
       -
       

     

       16
       16
       -
               authentication = ''

     

       17
       17
       -
                 host    all             all             localhost               trust

     

       18
       18
       -
               '';

     

       19
       19
       -
       

     

       20
       20
       -
               ensureUsers = [

     

       21
       21
       -
                 {

     

       22
       22
       -
                   name = "postgres";

     

       23
       23
       -
                   ensurePermissions = {

     

       24
       24
       -
                     "DATABASE \"postgres\"" = "ALL PRIVILEGES";

     

       25
       25
       -
                   };

     

       26
       26
       -
                 }

     

       27
       27
       -
               ];

     

       28
       28
       -
             };

     

       29
       29
       -
       

     

       30
       30
       -
             services.pgadmin = {

     

       31
       31
       -
               enable = true;

     

       32
       32
       -
               initialEmail = "bruh@localhost.de";

     

       33
       33
       -
               initialPasswordFile = pkgs.writeText "pw" "bruh2012!";

     

       34
       34
       -
             };

     

       35
       35
       -
           };

     

       36
       36
       -
       

     

       37
       37
       -
           testScript = ''

     

       38
       38
       -
             machine.wait_for_unit("postgresql")

     

       39
       39
       -
             machine.wait_for_unit("pgadmin")

     

       40
       40
       -
       

     

       41
       41
       -
             machine.wait_until_succeeds("curl -s localhost:5050")

     

       42
       42
       -
           '';

     

       43
       43
       -
         })

+29 -111

nixos/tests/pgadmin4.nix

···

       1
       1
       -
       import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], pythonEnv ? [ ], ... }:

     

       2
       2
       -
       

     

       3
       3
       -
       /*

     

       4
       4
       -
         This test suite replaces the typical pytestCheckHook function in python

     

       5
       5
       -
         packages. Pgadmin4 test suite needs a running and configured postgresql

     

       6
       6
       -
         server. This is why this test exists.

     

       7
       7
       -
       

     

       8
       8
       -
         To not repeat all the python dependencies needed, this test is called directly

     

       9
       9
       -
         from the pgadmin4 derivation, which also passes the currently

     

       10
       10
       -
         used propagatedBuildInputs and any python overrides.

     

       11
       11
       -
       

     

       12
       12
       -
         Unfortunately, there doesn't seem to be an easy way to otherwise include

     

       13
       13
       -
         the needed packages here.

     

       1
       1
       +
       import ./make-test-python.nix ({ pkgs, lib, ... }:

     

       14
       2
        
       

     

       15
       15
       -
         Due the the needed parameters a direct call to "nixosTests.pgadmin4" fails

     

       16
       16
       -
         and needs to be called as "pgadmin4.tests"

     

       17
       17
       -
       

     

       18
       18
       -
         */

     

       19
       19
       -
       

     

       20
       20
       -
       let

     

       21
       21
       -
         pgadmin4SrcDir = "/pgadmin";

     

       22
       22
       -
         pgadmin4Dir = "/var/lib/pgadmin";

     

       23
       23
       -
         pgadmin4LogDir = "/var/log/pgadmin";

     

       24
       24
       -
       

     

       25
       25
       -
       in

     

       26
       3
        
       {

     

       27
       4
        
         name = "pgadmin4";

     

       28
       28
       -
         meta.maintainers = with lib.maintainers; [ gador ];

     

       5
       5
       +
         meta.maintainers = with lib.maintainers; [ mkg20001 gador ];

     

       29
       6
        
       

     

       30
       7
        
         nodes.machine = { pkgs, ... }: {

     

       31
       31
       -
           imports = [ ./common/x11.nix ];

     

       32
       32
       -
           # needed because pgadmin 6.8 will fail, if those dependencies get updated

     

       33
       33
       -
           nixpkgs.overlays = [

     

       34
       34
       -
             (self: super: {

     

       35
       35
       -
               pythonPackages = pythonEnv;

     

       36
       36
       -
             })

     

       37
       37
       -
           ];

     

       8
       8
       +
       

     

       9
       9
       +
           imports = [ ./common/user-account.nix ];

     

       38
       10
        
       

     

       39
       11
        
           environment.systemPackages = with pkgs; [

     

       40
       40
       -
             pgadmin4

     

       41
       41
       -
             postgresql

     

       42
       42
       -
             chromedriver

     

       43
       43
       -
             chromium

     

       44
       44
       -
             # include the same packages as in pgadmin minus speaklater3

     

       45
       45
       -
             (python3.withPackages

     

       46
       46
       -
               (ps: buildDeps ++

     

       47
       47
       -
                 [

     

       48
       48
       -
                   # test suite package requirements

     

       49
       49
       -
                   pythonPackages.testscenarios

     

       50
       50
       -
                   pythonPackages.selenium

     

       51
       51
       -
                 ])

     

       52
       52
       -
             )

     

       12
       12
       +
             curl

     

       13
       13
       +
             pgadmin4-desktopmode

     

       53
       14
        
           ];

     

       15
       15
       +
       

     

       54
       16
        
           services.postgresql = {

     

       55
       17
        
             enable = true;

     

       56
       18
        
             authentication = ''

     
···

       65
       27
        
               }

     

       66
       28
        
             ];

     

       67
       29
        
           };

     

       30
       30
       +
       

     

       31
       31
       +
           services.pgadmin = {

     

       32
       32
       +
             port = 5051;

     

       33
       33
       +
             enable = true;

     

       34
       34
       +
             initialEmail = "bruh@localhost.de";

     

       35
       35
       +
             initialPasswordFile = pkgs.writeText "pw" "bruh2012!";

     

       36
       36
       +
           };

     

       68
       37
        
         };

     

       69
       38
        
       

     

       70
       39
        
         testScript = ''

     

       71
       71
       -
           machine.wait_for_unit("postgresql")

     

       72
       72
       -
       

     

       73
       73
       -
           # pgadmin4 needs its data and log directories

     

       74
       74
       -
           machine.succeed(

     

       75
       75
       -
               "mkdir -p ${pgadmin4Dir} \

     

       76
       76
       -
               && mkdir -p ${pgadmin4LogDir} \

     

       77
       77
       -
               && mkdir -p ${pgadmin4SrcDir}"

     

       78
       78
       -
           )

     

       79
       79
       -
       

     

       80
       80
       -
           machine.succeed(

     

       81
       81
       -
                "tar xvzf ${pkgs.pgadmin4.src} -C ${pgadmin4SrcDir}"

     

       82
       82
       -
           )

     

       83
       83
       -
       

     

       84
       84
       -
           machine.wait_for_file("${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/README.md")

     

       85
       85
       -
       

     

       86
       86
       -
           # set paths and config for tests

     

       87
       87
       -
           # also ensure Server Mode is set to false, which will automatically exclude some unnecessary tests.

     

       88
       88
       -
           # see https://github.com/pgadmin-org/pgadmin4/blob/fd1c26408bbf154fa455a49ee5c12895933833a3/web/regression/runtests.py#L217-L226

     

       89
       89
       -
           machine.succeed(

     

       90
       90
       -
               "cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version} \

     

       91
       91
       -
               && cp -v web/regression/test_config.json.in web/regression/test_config.json \

     

       92
       92
       -
               && sed -i 's|PostgreSQL 9.4|PostgreSQL|' web/regression/test_config.json \

     

       93
       93
       -
               && sed -i 's|/opt/PostgreSQL/9.4/bin/|${pkgs.postgresql}/bin|' web/regression/test_config.json \

     

       94
       94
       -
               && sed -i 's|\"headless_chrome\": false|\"headless_chrome\": true|' web/regression/test_config.json \

     

       95
       95
       -
               && sed -i 's|builtins.SERVER_MODE = None|builtins.SERVER_MODE = False|' web/regression/runtests.py"

     

       96
       96
       -
           )

     

       97
       97
       -
       

     

       98
       98
       -
           # adapt chrome config to run within a sandbox without GUI

     

       99
       99
       -
           # see https://stackoverflow.com/questions/50642308/webdriverexception-unknown-error-devtoolsactiveport-file-doesnt-exist-while-t#50642913

     

       100
       100
       -
           # add chrome binary path. use spaces to satisfy python indention (tabs throw an error)

     

       101
       101
       -
           machine.succeed(

     

       102
       102
       -
                "cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version} \

     

       103
       103
       -
                && sed -i '\|options.add_argument(\"--disable-infobars\")|a \ \ \ \ \ \ \ \ options.binary_location = \"${pkgs.chromium}/bin/chromium\"' web/regression/runtests.py \

     

       104
       104
       -
                && sed -i '\|options.add_argument(\"--no-sandbox\")|a \ \ \ \ \ \ \ \ options.add_argument(\"--headless\")' web/regression/runtests.py \

     

       105
       105
       -
                && sed -i '\|options.add_argument(\"--disable-infobars\")|a \ \ \ \ \ \ \ \ options.add_argument(\"--disable-dev-shm-usage\")' web/regression/runtests.py \

     

       106
       106
       -
                && sed -i 's|(chrome_options=options)|(executable_path=\"${pkgs.chromedriver}/bin/chromedriver\", chrome_options=options)|' web/regression/runtests.py \

     

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

     

       108
       108
       -
           )

     

       109
       109
       -
       

     

       110
       110
       -
           # don't bother to test kerberos authentication

     

       111
       111
       -
           excluded_tests = [ "browser.tests.test_kerberos_with_mocking",

     

       112
       112
       -
                              ]

     

       113
       113
       -
       

     

       114
       114
       -
           with subtest("run browser test"):

     

       115
       115
       -
               machine.succeed(

     

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

     

       117
       117
       -
                    && python regression/runtests.py \

     

       118
       118
       -
                    --pkg browser \

     

       119
       119
       -
                    --exclude ' + ','.join(excluded_tests)

     

       120
       120
       -
               )

     

       40
       40
       +
           with subtest("Check pgadmin module"):

     

       41
       41
       +
             machine.wait_for_unit("postgresql")

     

       42
       42
       +
             machine.wait_for_unit("pgadmin")

     

       43
       43
       +
             machine.wait_until_succeeds("curl -s localhost:5051")

     

       44
       44
       +
             machine.wait_until_succeeds("curl -s localhost:5051/login | grep \"<title>pgAdmin 4</title>\" > /dev/null")

     

       121
       45
        
       

     

       122
       122
       -
           with subtest("run resql test"):

     

       123
       123
       -
             machine.succeed(

     

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

     

       125
       125
       -
                  && python regression/runtests.py --pkg resql'

     

       126
       126
       -
             )

     

       127
       127
       -
       

     

       128
       128
       -
           # fontconfig is necessary for chromium to run

     

       129
       129
       -
           # https://github.com/NixOS/nixpkgs/issues/136207

     

       130
       130
       -
           # also, the feature_tests require Server Mode = True

     

       131
       131
       -
           with subtest("run feature test"):

     

       132
       132
       -
              machine.succeed(

     

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

     

       134
       134
       -
                   && export FONTCONFIG_FILE=${pkgs.makeFontsConf { fontDirectories = [];}} \

     

       135
       135
       -
                   && sed -i \'s|builtins.SERVER_MODE = False|builtins.SERVER_MODE = True|\' regression/runtests.py \

     

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

     

       137
       137
       -
              )

     

       46
       46
       +
           # pgadmin4 module saves the configuration to /etc/pgadmin/config_system.py

     

       47
       47
       +
           # pgadmin4-desktopmode tries to read that as well. This normally fails with a PermissionError, as the config file

     

       48
       48
       +
           # is owned by the user of the pgadmin module. With the check-system-config-dir.patch this will just throw a warning

     

       49
       49
       +
           # but will continue and not read the file.

     

       50
       50
       +
           # If we run pgadmin4-desktopmode as root (something one really shouldn't do), it can read the config file and fail,

     

       51
       51
       +
           # because of the wrong config for desktopmode.

     

       52
       52
       +
           with subtest("Check pgadmin standalone desktop mode"):

     

       53
       53
       +
             machine.execute("sudo -u alice pgadmin4 >&2 &", timeout=60)

     

       54
       54
       +
             machine.wait_until_succeeds("curl -s localhost:5050")

     

       55
       55
       +
             machine.wait_until_succeeds("curl -s localhost:5050/browser/ | grep \"<title>pgAdmin 4</title>\" > /dev/null")

     

       138
       56
        
         '';

     

       139
       57
        
       })

+2 -2

pkgs/applications/blockchains/btcpayserver/default.nix

···

       6
       6
        
       

     

       7
       7
        
       buildDotnetModule rec {

     

       8
       8
        
         pname = "btcpayserver";

     

       9
       9
       -
         version = "1.7.5";

     

       9
       9
       +
         version = "1.7.7";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = pname;

     

       13
       13
        
           repo = pname;

     

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

     

       15
       15
       -
           sha256 = "sha256-xycNt3jzZY2a4hNv3arWLt+EfMqpFVMDHMuzOWnL7aQ=";

     

       15
       15
       +
           sha256 = "sha256-bflQsVaCwV5zaU5k46wFQ45dIOg3dHmYfBVQHyw+EpM=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         projectFile = "BTCPayServer/BTCPayServer.csproj";

+4 -4

pkgs/applications/blockchains/btcpayserver/deps.nix

···

       8
       8
        
         (fetchNuGet { pname = "AWSSDK.S3"; version = "3.3.110.10"; sha256 = "1lf1hfbx792dpa1hxgn0a0jrrvldd16hgbxx229dk2qcz5qlnc38"; })

     

       9
       9
        
         (fetchNuGet { pname = "BIP78.Sender"; version = "0.2.2"; sha256 = "12pm2s35c0qzc06099q2z1pxwq94rq85n74yz8fs8gwvm2ksgp4p"; })

     

       10
       10
        
         (fetchNuGet { pname = "BTCPayServer.Hwi"; version = "2.0.2"; sha256 = "0lh3n1qncqs4kbrmx65xs271f0d9c7irrs9qnsa9q51cbbqbljh9"; })

     

       11
       11
       -
         (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.18"; sha256 = "1w1h6za2mjk04njkw4hny3lx38h2m03gmvwrihj9h2rak7jf2gij"; })

     

       11
       11
       +
         (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.20"; sha256 = "1vnzmczd4z25vbf987p4vp6sxc09fp6mvhrvq41iwj1ks5zcprlf"; })

     

       12
       12
        
         (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.3.20"; sha256 = "0nk82hkgs67mxfxkgbav8yxxd79m0xyqaan7vay00gg33pjqdjvj"; })

     

       13
       13
       -
         (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.24"; sha256 = "0i0lqpxx0gy9zbssjigz0vq0way88x0slyyfijsx4sasrhrbv5qs"; })

     

       13
       13
       +
         (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.25"; sha256 = "0172czzzlgsljgmhb5wh8cb1cl12ac54qyzmd3w18wbkxmr205qk"; })

     

       14
       14
        
         (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.16"; sha256 = "1g37736b4k0ncpyy2qycbk4l85fqvgwac3k98nbdj0dvhfghp1dn"; })

     

       15
       15
        
         (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.21"; sha256 = "042xwfsxd30zgwiz0w14ynb755w5sldkplxgw1fkw68lrz66x5s4"; })

     

       16
       16
        
         (fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.3.20"; sha256 = "093w82mcxxxbvx66j0sp3lsfm2bkbi3igm80iz9zdghy85845kc9"; })

     

       17
       17
       -
         (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.23"; sha256 = "036cggc386448i05s38pnhzs7qqbix6lml7j2zn84gcgk8w741gi"; })

     

       17
       17
       +
         (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.24"; sha256 = "0dah7q90x29rqhngxd9226pfn1k4bbhhfgnkpjpw64529m29cdks"; })

     

       18
       18
        
         (fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.4.14"; sha256 = "1gzqz34lgk42kf86ldi3z0k4m9x91hlkqh6d7rq93nphl57mwqar"; })

     

       19
       19
       -
         (fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.16"; sha256 = "0l6pnjc6phsacwg145kwsakjpkd44jm1w53y0s166bwzpcdmljq0"; })

     

       19
       19
       +
         (fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.18"; sha256 = "0vnnnm9c5w8ag3a25fzmsjax028ykb7xr4fp7saq4si3bmzkjswp"; })

     

       20
       20
        
         (fetchNuGet { pname = "BTCPayServer.NETCore.Plugins"; version = "1.4.4"; sha256 = "0rk0prmb0539ji5fd33cqy3yvw51i5i8m5hb43admr5z8960dd6l"; })

     

       21
       21
        
         (fetchNuGet { pname = "BTCPayServer.NETCore.Plugins.Mvc"; version = "1.4.4"; sha256 = "1kmmj5m7s41wc1akpqw1b1j7pp4c0vn6sqxb487980ibpj6hyisl"; })

     

       22
       22
        
         (fetchNuGet { pname = "CsvHelper"; version = "15.0.5"; sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma"; })

+2 -2

pkgs/applications/blockchains/nbxplorer/default.nix

···

       6
       6
        
       

     

       7
       7
        
       buildDotnetModule rec {

     

       8
       8
        
         pname = "nbxplorer";

     

       9
       9
       -
         version = "2.3.57";

     

       9
       9
       +
         version = "2.3.60";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "dgarage";

     

       13
       13
        
           repo = "NBXplorer";

     

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

     

       15
       15
       -
           sha256 = "sha256-oLkkGdzjyvgIXi0HZiFPCShzbBR8cOgMf1h1Nf1U6Rk=";

     

       15
       15
       +
           sha256 = "sha256-YUZvTs77dGhG7dpxbQyGhrOMMx+8LotdMJflPflMDAE=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         projectFile = "NBXplorer/NBXplorer.csproj";

+2 -2

pkgs/applications/misc/anytype/default.nix

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         pname = "anytype";

     

       5
       5
       -
         version = "0.29.1";

     

       5
       5
       +
         version = "0.30.0";

     

       6
       6
        
         name = "Anytype-${version}";

     

       7
       7
        
         nameExecutable = pname;

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage";

     

       10
       10
        
           name = "Anytype-${version}.AppImage";

     

       11
       11
       -
           sha256 = "sha256-NyIAOkOX9s9dN6m/5hfMhy4tSENPCDk2w/F8z+J6qqk=";

     

       11
       11
       +
           sha256 = "sha256-LifJc5mLbnt5wBXGM1n1uice0B6mCY80LYf3kEFJy90=";

     

       12
       12
        
         };

     

       13
       13
        
         appimageContents = appimageTools.extractType2 { inherit name src; };

     

       14
       14
        
       in

+40 -9

pkgs/applications/misc/xmrig/default.nix

···

       1
       1
       -
       { stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl, hwloc

     

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , cmake

     

       5
       5
       +
       , libuv

     

       6
       6
       +
       , libmicrohttpd

     

       7
       7
       +
       , openssl

     

       8
       8
       +
       , hwloc

     

       2
       9
        
       , donateLevel ? 0

     

       10
       10
       +
       , darwin

     

       3
       11
        
       }:

     

       4
       12
        
       

     

       13
       13
       +
       let

     

       14
       14
       +
         inherit (darwin.apple_sdk_11_0.frameworks) Carbon CoreServices OpenCL;

     

       15
       15
       +
       in

     

       5
       16
        
       stdenv.mkDerivation rec {

     

       6
       17
        
         pname = "xmrig";

     

       7
       18
        
         version = "6.19.0";

     
···

       10
       21
        
           owner = "xmrig";

     

       11
       22
        
           repo = "xmrig";

     

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

     

       13
       13
       -
           sha256 = "sha256-pMI5SqAa9jauwWvc3JpyWQa+pQvntbTrta1p0qjBaoM=";

     

       24
       24
       +
           hash = "sha256-pMI5SqAa9jauwWvc3JpyWQa+pQvntbTrta1p0qjBaoM=";

     

       14
       25
        
         };

     

       15
       26
        
       

     

       16
       16
       -
         nativeBuildInputs = [ cmake ];

     

       17
       17
       -
         buildInputs = [ libuv libmicrohttpd openssl hwloc ];

     

       18
       18
       -
       

     

       19
       19
       -
         inherit donateLevel;

     

       27
       27
       +
         patches = [

     

       28
       28
       +
           ./donate-level.patch

     

       29
       29
       +
         ];

     

       20
       30
        
       

     

       21
       21
       -
         patches = [ ./donate-level.patch ];

     

       22
       31
        
         postPatch = ''

     

       23
       32
        
           substituteAllInPlace src/donate.h

     

       33
       33
       +
           substituteInPlace cmake/OpenSSL.cmake \

     

       34
       34
       +
             --replace "set(OPENSSL_USE_STATIC_LIBS TRUE)" "set(OPENSSL_USE_STATIC_LIBS FALSE)"

     

       24
       35
        
         '';

     

       25
       36
        
       

     

       37
       37
       +
         nativeBuildInputs = [

     

       38
       38
       +
           cmake

     

       39
       39
       +
         ];

     

       40
       40
       +
       

     

       41
       41
       +
         buildInputs = [

     

       42
       42
       +
           libuv

     

       43
       43
       +
           libmicrohttpd

     

       44
       44
       +
           openssl

     

       45
       45
       +
           hwloc

     

       46
       46
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       47
       47
       +
           Carbon

     

       48
       48
       +
           CoreServices

     

       49
       49
       +
           OpenCL

     

       50
       50
       +
         ];

     

       51
       51
       +
       

     

       52
       52
       +
         inherit donateLevel;

     

       53
       53
       +
       

     

       26
       54
        
         installPhase = ''

     

       55
       55
       +
           runHook preInstall

     

       56
       56
       +
       

     

       27
       57
        
           install -vD xmrig $out/bin/xmrig

     

       58
       58
       +
       

     

       59
       59
       +
           runHook postInstall

     

       28
       60
        
         '';

     

       29
       61
        
       

     

       30
       62
        
         meta = with lib; {

     

       31
       31
       -
           broken = stdenv.isDarwin;

     

       32
       63
        
           description = "Monero (XMR) CPU miner";

     

       33
       64
        
           homepage = "https://github.com/xmrig/xmrig";

     

       34
       65
        
           license = licenses.gpl3Plus;

     

       35
       35
       -
           platforms   = [ "x86_64-linux" "x86_64-darwin" ];

     

       66
       66
       +
           platforms = platforms.unix;

     

       36
       67
        
           maintainers = with maintainers; [ kim0 ];

     

       37
       68
        
         };

     

       38
       69
        
       }

+2 -2

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

···

       7
       7
        
       

     

       8
       8
        
       buildGoModule rec {

     

       9
       9
        
         pname = "arkade";

     

       10
       10
       -
         version = "0.8.60";

     

       10
       10
       +
         version = "0.8.62";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "alexellis";

     

       14
       14
        
           repo = "arkade";

     

       15
       15
        
           rev = version;

     

       16
       16
       -
           sha256 = "sha256-kyWUokQl5n7ko/1pdNs15WxRAAfe8KioYpkTMcLhJjU=";

     

       16
       16
       +
           sha256 = "sha256-lnMinIZ1n94ks7H5tlYmgaDDHyGi5YxTM9dTrckQ9y0=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         CGO_ENABLED = 0;

+3 -3

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

···

       1
       1
        
       { buildGoModule, lib, fetchFromGitHub }:

     

       2
       2
        
       buildGoModule rec {

     

       3
       3
        
         pname = "tfswitch";

     

       4
       4
       -
         version = "0.13.1300";

     

       4
       4
       +
         version = "0.13.1308";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchFromGitHub {

     

       7
       7
        
           owner = "warrensbox";

     

       8
       8
        
           repo = "terraform-switcher";

     

       9
       9
        
           rev = version;

     

       10
       10
       -
           sha256 = "sha256-btvoFllCfwQJNpRWdAB05Cu4JYmT1xynJxDbzO/6LDs=";

     

       10
       10
       +
           sha256 = "sha256-EyA7LwfL3vCNzd2wpyUbrUnvkM0/f7/cQp+jcAcGZsg=";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         vendorSha256 = "sha256-NX+vzI/Fa/n9ZQjpESes4fNVAmKlA1rqPwSKsL2GEUY=";

     

       13
       13
       +
         vendorHash = "sha256-NX+vzI/Fa/n9ZQjpESes4fNVAmKlA1rqPwSKsL2GEUY=";

     

       14
       14
        
       

     

       15
       15
        
         # Disable tests since it requires network access and relies on the

     

       16
       16
        
         # presence of release.hashicorp.com

+3 -3

pkgs/applications/virtualization/podman/default.nix

···

       18
       18
        
       

     

       19
       19
        
       buildGoModule rec {

     

       20
       20
        
         pname = "podman";

     

       21
       21
       -
         version = "4.4.0";

     

       21
       21
       +
         version = "4.4.1";

     

       22
       22
        
       

     

       23
       23
        
         src = fetchFromGitHub {

     

       24
       24
        
           owner = "containers";

     

       25
       25
        
           repo = "podman";

     

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

     

       27
       27
       -
           sha256 = "sha256-kyeON8S7CCVdHt09wigNXDWScgyaLzC4EhOts8ViP2w=";

     

       27
       27
       +
           hash = "sha256-Uha5ueOGNmG2f+1I89uFQKA3pSSp1d02FGy86Fc2eWE=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         patches = [

     
···

       32
       32
        
           ./rm-podman-mac-helper-msg.patch

     

       33
       33
        
         ];

     

       34
       34
        
       

     

       35
       35
       -
         vendorSha256 = null;

     

       35
       35
       +
         vendorHash = null;

     

       36
       36
        
       

     

       37
       37
        
         doCheck = false;

     

       38
       38

+2 -2

pkgs/desktops/pantheon/apps/appcenter/default.nix

···

       25
       25
        
       

     

       26
       26
        
       stdenv.mkDerivation rec {

     

       27
       27
        
         pname = "appcenter";

     

       28
       28
       -
         version = "7.1.0";

     

       28
       28
       +
         version = "7.2.0";

     

       29
       29
        
       

     

       30
       30
        
         src = fetchFromGitHub {

     

       31
       31
        
           owner = "elementary";

     

       32
       32
        
           repo = pname;

     

       33
       33
        
           rev = version;

     

       34
       34
       -
           sha256 = "sha256-ToRY27qB/cNKjKW22MTEojxxOXMBfO1LUusy/pXKJ9A=";

     

       34
       34
       +
           sha256 = "sha256-XWDhQ5Nu+gGj0/TQ/fALxQJ+QXzMiHm0Qh9FlGiskEA=";

     

       35
       35
        
         };

     

       36
       36
        
       

     

       37
       37
        
         patches = [

+25 -27

pkgs/development/compilers/gcc/10/default.nix

···

       158
       158
        
         inherit noSysDirs staticCompiler crossStageStatic

     

       159
       159
        
           libcCross crossMingw;

     

       160
       160
        
       

     

       161
       161
       -
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       162
       162
       -
         nativeBuildInputs = [ texinfo which gettext ]

     

       163
       163
       -
           ++ (optional (perl != null) perl)

     

       164
       164
       -
           ++ (optional langAda gnatboot)

     

       165
       165
       -
           # The builder relies on GNU sed (for instance, Darwin's `sed' fails with

     

       166
       166
       -
           # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.

     

       167
       167
       -
           ++ (optional buildPlatform.isDarwin gnused)

     

       168
       168
       -
           ;

     

       169
       169
       -
       

     

       170
       170
       -
         # For building runtime libs

     

       171
       171
       -
         depsBuildTarget =

     

       172
       172
       -
           (

     

       173
       173
       -
             if hostPlatform == buildPlatform then [

     

       174
       174
       -
               targetPackages.stdenv.cc.bintools # newly-built gcc will be used

     

       175
       175
       -
             ] else assert targetPlatform == hostPlatform; [ # build != host == target

     

       176
       176
       -
               stdenv.cc

     

       177
       177
       -
             ]

     

       178
       178
       -
           )

     

       179
       179
       -
           ++ optional targetPlatform.isLinux patchelf;

     

       180
       180
       -
       

     

       181
       181
       -
         buildInputs = [

     

       182
       182
       -
           gmp mpfr libmpc libxcrypt

     

       183
       183
       -
           targetPackages.stdenv.cc.bintools # For linking code at run-time

     

       184
       184
       -
         ] ++ (optional (isl != null) isl)

     

       185
       185
       -
           ++ (optional (zlib != null) zlib)

     

       161
       161
       +
         inherit (import ../common/dependencies.nix {

     

       162
       162
       +
           inherit

     

       163
       163
       +
             lib

     

       164
       164
       +
             stdenv

     

       165
       165
       +
             buildPackages

     

       166
       166
       +
             targetPackages

     

       167
       167
       +
             crossStageStatic

     

       168
       168
       +
             threadsCross

     

       169
       169
       +
             langAda

     

       170
       170
       +
             libxcrypt

     

       171
       171
       +
             gnatboot

     

       172
       172
       +
             version

     

       173
       173
       +
             texinfo

     

       174
       174
       +
             which

     

       175
       175
       +
             gettext

     

       176
       176
       +
             gnused

     

       177
       177
       +
             patchelf

     

       178
       178
       +
             gmp

     

       179
       179
       +
             mpfr

     

       180
       180
       +
             libmpc

     

       181
       181
       +
             isl

     

       182
       182
       +
             zlib

     

       183
       183
       +
             zip

     

       184
       184
       +
             perl

     

       186
       185
        
           ;

     

       187
       187
       -
       

     

       188
       188
       -
         depsTargetTarget = optional (!crossStageStatic && threadsCross != {} && threadsCross.package != null) threadsCross.package;

     

       186
       186
       +
         }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget;

     

       189
       187
        
       

     

       190
       188
        
         NIX_LDFLAGS = lib.optionalString  hostPlatform.isSunOS "-lm";

     

       191
       189

+25 -27

pkgs/development/compilers/gcc/11/default.nix

···

       164
       164
        
         inherit noSysDirs staticCompiler crossStageStatic

     

       165
       165
        
           libcCross crossMingw;

     

       166
       166
        
       

     

       167
       167
       -
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       168
       168
       -
         nativeBuildInputs = [ texinfo which gettext ]

     

       169
       169
       -
           ++ (optional (perl != null) perl)

     

       170
       170
       -
           ++ (optional langAda gnatboot)

     

       171
       171
       -
           # The builder relies on GNU sed (for instance, Darwin's `sed' fails with

     

       172
       172
       -
           # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.

     

       173
       173
       -
           ++ (optional buildPlatform.isDarwin gnused)

     

       174
       174
       -
           ;

     

       175
       175
       -
       

     

       176
       176
       -
         # For building runtime libs

     

       177
       177
       -
         depsBuildTarget =

     

       178
       178
       -
           (

     

       179
       179
       -
             if hostPlatform == buildPlatform then [

     

       180
       180
       -
               targetPackages.stdenv.cc.bintools # newly-built gcc will be used

     

       181
       181
       -
             ] else assert targetPlatform == hostPlatform; [ # build != host == target

     

       182
       182
       -
               stdenv.cc

     

       183
       183
       -
             ]

     

       184
       184
       -
           )

     

       185
       185
       -
           ++ optional targetPlatform.isLinux patchelf;

     

       186
       186
       -
       

     

       187
       187
       -
         buildInputs = [

     

       188
       188
       -
           gmp mpfr libmpc libxcrypt

     

       189
       189
       -
           targetPackages.stdenv.cc.bintools # For linking code at run-time

     

       190
       190
       -
         ] ++ (optional (isl != null) isl)

     

       191
       191
       -
           ++ (optional (zlib != null) zlib)

     

       167
       167
       +
         inherit (import ../common/dependencies.nix {

     

       168
       168
       +
           inherit

     

       169
       169
       +
             lib

     

       170
       170
       +
             stdenv

     

       171
       171
       +
             buildPackages

     

       172
       172
       +
             targetPackages

     

       173
       173
       +
             crossStageStatic

     

       174
       174
       +
             threadsCross

     

       175
       175
       +
             langAda

     

       176
       176
       +
             libxcrypt

     

       177
       177
       +
             gnatboot

     

       178
       178
       +
             version

     

       179
       179
       +
             texinfo

     

       180
       180
       +
             which

     

       181
       181
       +
             gettext

     

       182
       182
       +
             gnused

     

       183
       183
       +
             patchelf

     

       184
       184
       +
             gmp

     

       185
       185
       +
             mpfr

     

       186
       186
       +
             libmpc

     

       187
       187
       +
             isl

     

       188
       188
       +
             zlib

     

       189
       189
       +
             zip

     

       190
       190
       +
             perl

     

       192
       191
        
           ;

     

       193
       193
       -
       

     

       194
       194
       -
         depsTargetTarget = optional (!crossStageStatic && threadsCross != {} && threadsCross.package != null) threadsCross.package;

     

       192
       192
       +
         }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget;

     

       195
       193
        
       

     

       196
       194
        
         NIX_LDFLAGS = lib.optionalString  hostPlatform.isSunOS "-lm";

     

       197
       195

+27 -28

pkgs/development/compilers/gcc/12/default.nix

···

       198
       198
        
         inherit noSysDirs staticCompiler crossStageStatic

     

       199
       199
        
           libcCross crossMingw;

     

       200
       200
        
       

     

       201
       201
       -
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       202
       202
       -
         nativeBuildInputs = [ texinfo which gettext ]

     

       203
       203
       -
           ++ (optional (perl != null) perl)

     

       204
       204
       -
           ++ (optional langAda gnatboot)

     

       205
       205
       -
           # The builder relies on GNU sed (for instance, Darwin's `sed' fails with

     

       206
       206
       -
           # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.

     

       207
       207
       -
           ++ (optional buildPlatform.isDarwin gnused)

     

       201
       201
       +
         inherit (import ../common/dependencies.nix {

     

       202
       202
       +
           inherit

     

       203
       203
       +
             lib

     

       204
       204
       +
             stdenv

     

       205
       205
       +
             buildPackages

     

       206
       206
       +
             targetPackages

     

       207
       207
       +
             crossStageStatic

     

       208
       208
       +
             threadsCross

     

       209
       209
       +
             langAda

     

       210
       210
       +
             langGo

     

       211
       211
       +
             libucontext

     

       212
       212
       +
             libxcrypt

     

       213
       213
       +
             gnatboot

     

       214
       214
       +
             version

     

       215
       215
       +
             texinfo

     

       216
       216
       +
             which

     

       217
       217
       +
             gettext

     

       218
       218
       +
             gnused

     

       219
       219
       +
             patchelf

     

       220
       220
       +
             gmp

     

       221
       221
       +
             mpfr

     

       222
       222
       +
             libmpc

     

       223
       223
       +
             isl

     

       224
       224
       +
             zlib

     

       225
       225
       +
             zip

     

       226
       226
       +
             perl

     

       208
       227
        
           ;

     

       209
       209
       -
       

     

       210
       210
       -
         # For building runtime libs

     

       211
       211
       -
         depsBuildTarget =

     

       212
       212
       -
           (

     

       213
       213
       -
             if hostPlatform == buildPlatform then [

     

       214
       214
       -
               targetPackages.stdenv.cc.bintools # newly-built gcc will be used

     

       215
       215
       -
             ] else assert targetPlatform == hostPlatform; [ # build != host == target

     

       216
       216
       -
               stdenv.cc

     

       217
       217
       -
             ]

     

       218
       218
       -
           )

     

       219
       219
       -
           ++ optional targetPlatform.isLinux patchelf;

     

       220
       220
       -
       

     

       221
       221
       -
         buildInputs = [

     

       222
       222
       -
           gmp mpfr libmpc libxcrypt

     

       223
       223
       -
           targetPackages.stdenv.cc.bintools # For linking code at run-time

     

       224
       224
       -
         ] ++ (optional (isl != null) isl)

     

       225
       225
       -
           ++ (optional (zlib != null) zlib)

     

       226
       226
       -
           ++ (optional (langGo && stdenv.hostPlatform.isMusl) libucontext)

     

       227
       227
       -
           ;

     

       228
       228
       -
       

     

       229
       229
       -
         depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross.package;

     

       228
       228
       +
         }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget;

     

       230
       229
        
       

     

       231
       230
        
         NIX_LDFLAGS = lib.optionalString  hostPlatform.isSunOS "-lm";

     

       232
       231

+31 -30

pkgs/development/compilers/gcc/4.8/default.nix

···

       158
       158
        
         inherit noSysDirs staticCompiler langJava crossStageStatic

     

       159
       159
        
           libcCross crossMingw;

     

       160
       160
        
       

     

       161
       161
       -
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       162
       162
       -
         nativeBuildInputs = [ texinfo which gettext ]

     

       163
       163
       -
           ++ (optional (perl != null) perl)

     

       164
       164
       -
           ++ (optional javaAwtGtk pkg-config)

     

       165
       165
       -
           # The builder relies on GNU sed (for instance, Darwin's `sed' fails with

     

       166
       166
       -
           # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.

     

       167
       167
       -
           ++ (optional buildPlatform.isDarwin gnused)

     

       161
       161
       +
         inherit (import ../common/dependencies.nix {

     

       162
       162
       +
           inherit

     

       163
       163
       +
             lib

     

       164
       164
       +
             stdenv

     

       165
       165
       +
             buildPackages

     

       166
       166
       +
             targetPackages

     

       167
       167
       +
             crossStageStatic

     

       168
       168
       +
             threadsCross

     

       169
       169
       +
             version

     

       170
       170
       +
             langJava

     

       171
       171
       +
             javaAwtGtk

     

       172
       172
       +
             texinfo

     

       173
       173
       +
             which

     

       174
       174
       +
             gettext

     

       175
       175
       +
             pkg-config

     

       176
       176
       +
             gnused

     

       177
       177
       +
             patchelf

     

       178
       178
       +
             gmp

     

       179
       179
       +
             mpfr

     

       180
       180
       +
             libmpc

     

       181
       181
       +
             cloog

     

       182
       182
       +
             isl

     

       183
       183
       +
             zlib

     

       184
       184
       +
             boehmgc

     

       185
       185
       +
             zip

     

       186
       186
       +
             unzip

     

       187
       187
       +
             gtk2

     

       188
       188
       +
             libart_lgpl

     

       189
       189
       +
             perl

     

       190
       190
       +
             xlibs

     

       168
       191
        
           ;

     

       169
       169
       -
       

     

       170
       170
       -
         # For building runtime libs

     

       171
       171
       -
         depsBuildTarget =

     

       172
       172
       -
           (

     

       173
       173
       -
             if hostPlatform == buildPlatform then [

     

       174
       174
       -
               targetPackages.stdenv.cc.bintools # newly-built gcc will be used

     

       175
       175
       -
             ] else assert targetPlatform == hostPlatform; [ # build != host == target

     

       176
       176
       -
               stdenv.cc

     

       177
       177
       -
             ]

     

       178
       178
       -
           )

     

       179
       179
       -
           ++ optional targetPlatform.isLinux patchelf;

     

       180
       180
       -
       

     

       181
       181
       -
         buildInputs = [

     

       182
       182
       -
           gmp mpfr libmpc

     

       183
       183
       -
           targetPackages.stdenv.cc.bintools # For linking code at run-time

     

       184
       184
       -
         ] ++ (optional (cloog != null) cloog)

     

       185
       185
       -
           ++ (optional (isl != null) isl)

     

       186
       186
       -
           ++ (optional (zlib != null) zlib)

     

       187
       187
       -
           ++ (optionals langJava [ boehmgc zip unzip ])

     

       188
       188
       -
           ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))

     

       189
       189
       -
           ;

     

       190
       190
       -
       

     

       191
       191
       -
         depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross;

     

       192
       192
       +
         }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget;

     

       192
       193
        
       

     

       193
       194
        
         preConfigure = import ../common/pre-configure.nix {

     

       194
       195
        
           inherit lib;

+31 -30

pkgs/development/compilers/gcc/4.9/default.nix

···

       178
       178
        
         inherit noSysDirs staticCompiler langJava crossStageStatic

     

       179
       179
        
           libcCross crossMingw;

     

       180
       180
        
       

     

       181
       181
       -
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       182
       182
       -
         nativeBuildInputs = [ texinfo which gettext ]

     

       183
       183
       -
           ++ (optional (perl != null) perl)

     

       184
       184
       -
           ++ (optional javaAwtGtk pkg-config)

     

       185
       185
       -
           # The builder relies on GNU sed (for instance, Darwin's `sed' fails with

     

       186
       186
       -
           # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.

     

       187
       187
       -
           ++ (optional buildPlatform.isDarwin gnused)

     

       181
       181
       +
         inherit (import ../common/dependencies.nix {

     

       182
       182
       +
           inherit

     

       183
       183
       +
             lib

     

       184
       184
       +
             stdenv

     

       185
       185
       +
             buildPackages

     

       186
       186
       +
             targetPackages

     

       187
       187
       +
             crossStageStatic

     

       188
       188
       +
             threadsCross

     

       189
       189
       +
             version

     

       190
       190
       +
             langJava

     

       191
       191
       +
             javaAwtGtk

     

       192
       192
       +
             texinfo

     

       193
       193
       +
             which

     

       194
       194
       +
             gettext

     

       195
       195
       +
             pkg-config

     

       196
       196
       +
             gnused

     

       197
       197
       +
             patchelf

     

       198
       198
       +
             gmp

     

       199
       199
       +
             mpfr

     

       200
       200
       +
             libmpc

     

       201
       201
       +
             cloog

     

       202
       202
       +
             isl

     

       203
       203
       +
             zlib

     

       204
       204
       +
             boehmgc

     

       205
       205
       +
             zip

     

       206
       206
       +
             unzip

     

       207
       207
       +
             gtk2

     

       208
       208
       +
             libart_lgpl

     

       209
       209
       +
             perl

     

       210
       210
       +
             xlibs

     

       188
       211
        
           ;

     

       189
       189
       -
       

     

       190
       190
       -
         # For building runtime libs

     

       191
       191
       -
         depsBuildTarget =

     

       192
       192
       -
           (

     

       193
       193
       -
             if hostPlatform == buildPlatform then [

     

       194
       194
       -
               targetPackages.stdenv.cc.bintools # newly-built gcc will be used

     

       195
       195
       -
             ] else assert targetPlatform == hostPlatform; [ # build != host == target

     

       196
       196
       -
               stdenv.cc

     

       197
       197
       -
             ]

     

       198
       198
       -
           )

     

       199
       199
       -
           ++ optional targetPlatform.isLinux patchelf;

     

       200
       200
       -
       

     

       201
       201
       -
         buildInputs = [

     

       202
       202
       -
           gmp mpfr libmpc

     

       203
       203
       -
           targetPackages.stdenv.cc.bintools # For linking code at run-time

     

       204
       204
       -
         ] ++ (optional (cloog != null) cloog)

     

       205
       205
       -
           ++ (optional (isl != null) isl)

     

       206
       206
       -
           ++ (optional (zlib != null) zlib)

     

       207
       207
       -
           ++ (optionals langJava [ boehmgc zip unzip ])

     

       208
       208
       -
           ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))

     

       209
       209
       -
           ;

     

       210
       210
       -
       

     

       211
       211
       -
         depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross;

     

       212
       212
       +
         }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget;

     

       212
       213
        
       

     

       213
       214
        
         preConfigure = import ../common/pre-configure.nix {

     

       214
       215
        
           inherit lib;

+33 -31

pkgs/development/compilers/gcc/6/default.nix

···

       193
       193
        
         inherit noSysDirs staticCompiler langJava crossStageStatic

     

       194
       194
        
           libcCross crossMingw;

     

       195
       195
        
       

     

       196
       196
       -
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       197
       197
       -
         nativeBuildInputs = [ texinfo which gettext ]

     

       198
       198
       -
           ++ (optional (perl != null) perl)

     

       199
       199
       -
           ++ (optional javaAwtGtk pkg-config)

     

       200
       200
       -
           ++ (optional (with stdenv.targetPlatform; isVc4 || isRedox) flex)

     

       201
       201
       -
           ++ (optional langAda gnatboot)

     

       202
       202
       -
           # The builder relies on GNU sed (for instance, Darwin's `sed' fails with

     

       203
       203
       -
           # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.

     

       204
       204
       -
           ++ (optional buildPlatform.isDarwin gnused)

     

       205
       205
       -
           ;

     

       206
       206
       -
       

     

       207
       207
       -
         # For building runtime libs

     

       208
       208
       -
         depsBuildTarget =

     

       209
       209
       -
           (

     

       210
       210
       -
             if hostPlatform == buildPlatform then [

     

       211
       211
       -
               targetPackages.stdenv.cc.bintools # newly-built gcc will be used

     

       212
       212
       -
             ] else assert targetPlatform == hostPlatform; [ # build != host == target

     

       213
       213
       -
               stdenv.cc

     

       214
       214
       -
             ]

     

       215
       215
       -
           )

     

       216
       216
       -
           ++ optional targetPlatform.isLinux patchelf;

     

       217
       217
       -
       

     

       218
       218
       -
         buildInputs = [

     

       219
       219
       -
           gmp mpfr libmpc

     

       220
       220
       -
           targetPackages.stdenv.cc.bintools # For linking code at run-time

     

       221
       221
       -
         ] ++ (optional (isl != null) isl)

     

       222
       222
       -
           ++ (optional (zlib != null) zlib)

     

       223
       223
       -
           ++ (optionals langJava [ boehmgc zip unzip ])

     

       224
       224
       -
           ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))

     

       196
       196
       +
         inherit (import ../common/dependencies.nix {

     

       197
       197
       +
           inherit

     

       198
       198
       +
             lib

     

       199
       199
       +
             stdenv

     

       200
       200
       +
             buildPackages

     

       201
       201
       +
             targetPackages

     

       202
       202
       +
             crossStageStatic

     

       203
       203
       +
             threadsCross

     

       204
       204
       +
             version

     

       205
       205
       +
             langAda

     

       206
       206
       +
             gnatboot

     

       207
       207
       +
             flex

     

       208
       208
       +
             langJava

     

       209
       209
       +
             javaAwtGtk

     

       210
       210
       +
             texinfo

     

       211
       211
       +
             which

     

       212
       212
       +
             gettext

     

       213
       213
       +
             pkg-config

     

       214
       214
       +
             gnused

     

       215
       215
       +
             patchelf

     

       216
       216
       +
             gmp

     

       217
       217
       +
             mpfr

     

       218
       218
       +
             libmpc

     

       219
       219
       +
             isl

     

       220
       220
       +
             zlib

     

       221
       221
       +
             boehmgc

     

       222
       222
       +
             zip

     

       223
       223
       +
             unzip

     

       224
       224
       +
             gtk2

     

       225
       225
       +
             libart_lgpl

     

       226
       226
       +
             perl

     

       227
       227
       +
             xlibs

     

       225
       228
        
           ;

     

       226
       226
       -
       

     

       227
       227
       -
         depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross.package;

     

       229
       229
       +
         }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget;

     

       228
       230
        
       

     

       229
       231
        
         NIX_LDFLAGS = lib.optionalString  hostPlatform.isSunOS "-lm";

     

       230
       232

+22 -26

pkgs/development/compilers/gcc/7/default.nix

···

       165
       165
        
         inherit noSysDirs staticCompiler crossStageStatic

     

       166
       166
        
           libcCross crossMingw;

     

       167
       167
        
       

     

       168
       168
       -
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       169
       169
       -
         nativeBuildInputs = [ texinfo which gettext ]

     

       170
       170
       -
           ++ (optional (perl != null) perl)

     

       171
       171
       -
           # The builder relies on GNU sed (for instance, Darwin's `sed' fails with

     

       172
       172
       -
           # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.

     

       173
       173
       -
           ++ (optional buildPlatform.isDarwin gnused)

     

       174
       174
       -
           ;

     

       175
       175
       -
       

     

       176
       176
       -
         # For building runtime libs

     

       177
       177
       -
         depsBuildTarget =

     

       178
       178
       -
           (

     

       179
       179
       -
             if hostPlatform == buildPlatform then [

     

       180
       180
       -
               targetPackages.stdenv.cc.bintools # newly-built gcc will be used

     

       181
       181
       -
             ] else assert targetPlatform == hostPlatform; [ # build != host == target

     

       182
       182
       -
               stdenv.cc

     

       183
       183
       -
             ]

     

       184
       184
       -
           )

     

       185
       185
       -
           ++ optional targetPlatform.isLinux patchelf;

     

       186
       186
       -
       

     

       187
       187
       -
         buildInputs = [

     

       188
       188
       -
           gmp mpfr libmpc

     

       189
       189
       -
           targetPackages.stdenv.cc.bintools # For linking code at run-time

     

       190
       190
       -
         ] ++ (optional (isl != null) isl)

     

       191
       191
       -
           ++ (optional (zlib != null) zlib)

     

       168
       168
       +
         inherit (import ../common/dependencies.nix {

     

       169
       169
       +
           inherit

     

       170
       170
       +
             lib

     

       171
       171
       +
             stdenv

     

       172
       172
       +
             buildPackages

     

       173
       173
       +
             targetPackages

     

       174
       174
       +
             crossStageStatic

     

       175
       175
       +
             threadsCross

     

       176
       176
       +
             version

     

       177
       177
       +
             texinfo

     

       178
       178
       +
             which

     

       179
       179
       +
             gettext

     

       180
       180
       +
             gnused

     

       181
       181
       +
             patchelf

     

       182
       182
       +
             gmp

     

       183
       183
       +
             mpfr

     

       184
       184
       +
             libmpc

     

       185
       185
       +
             isl

     

       186
       186
       +
             zlib

     

       187
       187
       +
             zip

     

       188
       188
       +
             perl

     

       192
       189
        
           ;

     

       193
       193
       -
       

     

       194
       194
       -
         depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross.package;

     

       190
       190
       +
         }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget;

     

       195
       191
        
       

     

       196
       192
        
         NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isClang && langFortran) "-Wno-unused-command-line-argument";

     

       197
       193
        
         NIX_LDFLAGS = lib.optionalString  hostPlatform.isSunOS "-lm";

+22 -26

pkgs/development/compilers/gcc/8/default.nix

···

       147
       147
        
         inherit noSysDirs staticCompiler crossStageStatic

     

       148
       148
        
           libcCross crossMingw;

     

       149
       149
        
       

     

       150
       150
       -
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       151
       151
       -
         nativeBuildInputs = [ texinfo which gettext ]

     

       152
       152
       -
           ++ (optional (perl != null) perl)

     

       153
       153
       -
           # The builder relies on GNU sed (for instance, Darwin's `sed' fails with

     

       154
       154
       -
           # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.

     

       155
       155
       -
           ++ (optional buildPlatform.isDarwin gnused)

     

       156
       156
       -
           ;

     

       157
       157
       -
       

     

       158
       158
       -
         # For building runtime libs

     

       159
       159
       -
         depsBuildTarget =

     

       160
       160
       -
           (

     

       161
       161
       -
             if hostPlatform == buildPlatform then [

     

       162
       162
       -
               targetPackages.stdenv.cc.bintools # newly-built gcc will be used

     

       163
       163
       -
             ] else assert targetPlatform == hostPlatform; [ # build != host == target

     

       164
       164
       -
               stdenv.cc

     

       165
       165
       -
             ]

     

       166
       166
       -
           )

     

       167
       167
       -
           ++ optional targetPlatform.isLinux patchelf;

     

       168
       168
       -
       

     

       169
       169
       -
         buildInputs = [

     

       170
       170
       -
           gmp mpfr libmpc

     

       171
       171
       -
           targetPackages.stdenv.cc.bintools # For linking code at run-time

     

       172
       172
       -
         ] ++ (optional (isl != null) isl)

     

       173
       173
       -
           ++ (optional (zlib != null) zlib)

     

       150
       150
       +
         inherit (import ../common/dependencies.nix {

     

       151
       151
       +
           inherit

     

       152
       152
       +
             lib

     

       153
       153
       +
             stdenv

     

       154
       154
       +
             buildPackages

     

       155
       155
       +
             targetPackages

     

       156
       156
       +
             crossStageStatic

     

       157
       157
       +
             threadsCross

     

       158
       158
       +
             version

     

       159
       159
       +
             texinfo

     

       160
       160
       +
             which

     

       161
       161
       +
             gettext

     

       162
       162
       +
             gnused

     

       163
       163
       +
             patchelf

     

       164
       164
       +
             gmp

     

       165
       165
       +
             mpfr

     

       166
       166
       +
             libmpc

     

       167
       167
       +
             isl

     

       168
       168
       +
             zlib

     

       169
       169
       +
             zip

     

       170
       170
       +
             perl

     

       174
       171
        
           ;

     

       175
       175
       -
       

     

       176
       176
       -
         depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross.package;

     

       172
       172
       +
         }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget;

     

       177
       173
        
       

     

       178
       174
        
         NIX_LDFLAGS = lib.optionalString  hostPlatform.isSunOS "-lm";

     

       179
       175

+24 -27

pkgs/development/compilers/gcc/9/default.nix

···

       158
       158
        
         inherit noSysDirs staticCompiler crossStageStatic

     

       159
       159
        
           libcCross crossMingw;

     

       160
       160
        
       

     

       161
       161
       -
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       162
       162
       -
         nativeBuildInputs = [ texinfo which gettext ]

     

       163
       163
       -
           ++ (optional (perl != null) perl)

     

       164
       164
       -
           ++ (optional langAda gnatboot)

     

       165
       165
       -
           # The builder relies on GNU sed (for instance, Darwin's `sed' fails with

     

       166
       166
       -
           # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.

     

       167
       167
       -
           ++ (optional buildPlatform.isDarwin gnused)

     

       161
       161
       +
         inherit (import ../common/dependencies.nix {

     

       162
       162
       +
           inherit

     

       163
       163
       +
             lib

     

       164
       164
       +
             stdenv

     

       165
       165
       +
             buildPackages

     

       166
       166
       +
             targetPackages

     

       167
       167
       +
             crossStageStatic

     

       168
       168
       +
             threadsCross

     

       169
       169
       +
             langAda

     

       170
       170
       +
             gnatboot

     

       171
       171
       +
             version

     

       172
       172
       +
             texinfo

     

       173
       173
       +
             which

     

       174
       174
       +
             gettext

     

       175
       175
       +
             gnused

     

       176
       176
       +
             patchelf

     

       177
       177
       +
             gmp

     

       178
       178
       +
             mpfr

     

       179
       179
       +
             libmpc

     

       180
       180
       +
             isl

     

       181
       181
       +
             zlib

     

       182
       182
       +
             zip

     

       183
       183
       +
             perl

     

       168
       184
        
           ;

     

       169
       169
       -
       

     

       170
       170
       -
         # For building runtime libs

     

       171
       171
       -
         depsBuildTarget =

     

       172
       172
       -
           (

     

       173
       173
       -
             if hostPlatform == buildPlatform then [

     

       174
       174
       -
               targetPackages.stdenv.cc.bintools # newly-built gcc will be used

     

       175
       175
       -
             ] else assert targetPlatform == hostPlatform; [ # build != host == target

     

       176
       176
       -
               stdenv.cc

     

       177
       177
       -
             ]

     

       178
       178
       -
           )

     

       179
       179
       -
           ++ optional targetPlatform.isLinux patchelf;

     

       180
       180
       -
       

     

       181
       181
       -
         buildInputs = [

     

       182
       182
       -
           gmp mpfr libmpc

     

       183
       183
       -
           targetPackages.stdenv.cc.bintools # For linking code at run-time

     

       184
       184
       -
         ] ++ (optional (isl != null) isl)

     

       185
       185
       -
           ++ (optional (zlib != null) zlib)

     

       186
       186
       -
           ;

     

       187
       187
       -
       

     

       188
       188
       -
         depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross.package;

     

       185
       185
       +
         }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget;

     

       189
       186
        
       

     

       190
       187
        
         NIX_LDFLAGS = lib.optionalString  hostPlatform.isSunOS "-lm";

     

       191
       188

+92

pkgs/development/compilers/gcc/common/dependencies.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , version

     

       4
       4
       +
       , buildPackages

     

       5
       5
       +
       , targetPackages

     

       6
       6
       +
       , texinfo

     

       7
       7
       +
       , which

     

       8
       8
       +
       , gettext

     

       9
       9
       +
       , pkg-config ? null

     

       10
       10
       +
       , gnused

     

       11
       11
       +
       , patchelf

     

       12
       12
       +
       , gmp

     

       13
       13
       +
       , mpfr

     

       14
       14
       +
       , libmpc

     

       15
       15
       +
       , libucontext ? null

     

       16
       16
       +
       , libxcrypt ? null

     

       17
       17
       +
       , cloog ? null

     

       18
       18
       +
       , isl ? null

     

       19
       19
       +
       , zlib ? null

     

       20
       20
       +
       , gnatboot ? null

     

       21
       21
       +
       , flex ? null

     

       22
       22
       +
       , boehmgc ? null

     

       23
       23
       +
       , zip ? null

     

       24
       24
       +
       , unzip ? null

     

       25
       25
       +
       , gtk2 ? null

     

       26
       26
       +
       , libart_lgpl ? null

     

       27
       27
       +
       , perl ? null

     

       28
       28
       +
       , xlibs ? null

     

       29
       29
       +
       , langJava ? false

     

       30
       30
       +
       , javaAwtGtk ? false

     

       31
       31
       +
       , langAda ? false

     

       32
       32
       +
       , langGo ? false

     

       33
       33
       +
       , crossStageStatic ? null

     

       34
       34
       +
       , threadsCross ? null

     

       35
       35
       +
       }:

     

       36
       36
       +
       

     

       37
       37
       +
       let

     

       38
       38
       +
         inherit (lib) optionals;

     

       39
       39
       +
         inherit (stdenv) buildPlatform hostPlatform targetPlatform;

     

       40
       40
       +
       in

     

       41
       41
       +
       

     

       42
       42
       +
       {

     

       43
       43
       +
         # same for all gcc's

     

       44
       44
       +
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       45
       45
       +
       

     

       46
       46
       +
         nativeBuildInputs = [

     

       47
       47
       +
           texinfo

     

       48
       48
       +
           which

     

       49
       49
       +
           gettext

     

       50
       50
       +
         ]

     

       51
       51
       +
         ++ optionals (perl != null) [ perl ]

     

       52
       52
       +
         ++ optionals javaAwtGtk [ pkg-config ]

     

       53
       53
       +
         ++ optionals (with stdenv.targetPlatform; isVc4 || isRedox && flex != null) [ flex ]

     

       54
       54
       +
         ++ optionals langAda [ gnatboot ]

     

       55
       55
       +
         # The builder relies on GNU sed (for instance, Darwin's `sed' fails with

     

       56
       56
       +
         # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.

     

       57
       57
       +
         ++ optionals buildPlatform.isDarwin [ gnused ]

     

       58
       58
       +
         ;

     

       59
       59
       +
       

     

       60
       60
       +
         # For building runtime libs

     

       61
       61
       +
         # same for all gcc's

     

       62
       62
       +
         depsBuildTarget =

     

       63
       63
       +
           (

     

       64
       64
       +
             if hostPlatform == buildPlatform then [

     

       65
       65
       +
               targetPackages.stdenv.cc.bintools # newly-built gcc will be used

     

       66
       66
       +
             ] else assert targetPlatform == hostPlatform; [

     

       67
       67
       +
               # build != host == target

     

       68
       68
       +
               stdenv.cc

     

       69
       69
       +
             ]

     

       70
       70
       +
           )

     

       71
       71
       +
           ++ optionals targetPlatform.isLinux [ patchelf ];

     

       72
       72
       +
       

     

       73
       73
       +
         buildInputs = [

     

       74
       74
       +
           gmp

     

       75
       75
       +
           mpfr

     

       76
       76
       +
           libmpc

     

       77
       77
       +
         ]

     

       78
       78
       +
         ++ optionals (lib.versionAtLeast version "10") [ libxcrypt ]

     

       79
       79
       +
         ++ [

     

       80
       80
       +
           targetPackages.stdenv.cc.bintools # For linking code at run-time

     

       81
       81
       +
         ]

     

       82
       82
       +
         ++ optionals (cloog != null) [ cloog ]

     

       83
       83
       +
         ++ optionals (isl != null) [ isl ]

     

       84
       84
       +
         ++ optionals (zlib != null) [ zlib ]

     

       85
       85
       +
         ++ optionals langJava [ boehmgc zip unzip ]

     

       86
       86
       +
         ++ optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)

     

       87
       87
       +
         ++ optionals (langGo && stdenv.hostPlatform.isMusl) [ libucontext ]

     

       88
       88
       +
         ;

     

       89
       89
       +
       

     

       90
       90
       +
         # threadsCross.package after gcc6 so i assume its okay for 4.8 and 4.9 too

     

       91
       91
       +
         depsTargetTarget = optionals (!crossStageStatic && threadsCross != { } && threadsCross.package != null) [ threadsCross.package ];

     

       92
       92
       +
       }

+8 -2

pkgs/development/libraries/draco/default.nix

···

       16
       16
        
         cmakeBool = b: if b then "ON" else "OFF";

     

       17
       17
        
       in

     

       18
       18
        
       stdenv.mkDerivation rec {

     

       19
       19
       -
         version = "1.5.5";

     

       19
       19
       +
         version = "1.5.6";

     

       20
       20
        
         pname = "draco";

     

       21
       21
        
       

     

       22
       22
        
         src = fetchFromGitHub {

     

       23
       23
        
           owner = "google";

     

       24
       24
        
           repo = "draco";

     

       25
       25
        
           rev = version;

     

       26
       26
       -
           sha256 = "sha256-WYWEUfBPz/Pt7sE8snG3/LnOA3DEUm/SUVLtsH7zG5g=";

     

       26
       26
       +
           hash = "sha256-2YQMav0JJMbJ2bvnN/Xv90tjE/OWLbrZDO4WlaOvcfI=";

     

       27
       27
        
           fetchSubmodules = true;

     

       28
       28
        
         };

     

       29
       29
       +
       

     

       30
       30
       +
         # ld: unknown option: --start-group

     

       31
       31
       +
         postPatch = ''

     

       32
       32
       +
           substituteInPlace cmake/draco_targets.cmake \

     

       33
       33
       +
             --replace "^Clang" "^AppleClang"

     

       34
       34
       +
         '';

     

       29
       35
        
       

     

       30
       36
        
         buildInputs = [ gtest ]

     

       31
       37
        
           ++ lib.optionals withTranscoder [ eigen ghc_filesystem tinygltf ];

+3 -2

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

···

       16
       16
        
       

     

       17
       17
        
       buildPythonPackage rec {

     

       18
       18
        
         pname = "b2sdk";

     

       19
       19
       -
         version = "1.18.0";

     

       19
       19
       +
         version = "1.19.0";

     

       20
       20
        
         format = "setuptools";

     

       21
       21
        
       

     

       22
       22
        
         disabled = pythonOlder "3.7";

     

       23
       23
        
       

     

       24
       24
        
         src = fetchPypi {

     

       25
       25
        
           inherit pname version;

     

       26
       26
       -
           hash = "sha256-knLyjRjUmLZtM9dJoPBeSdm7GpE0+UJhwLi/obVvPuw=";

     

       26
       26
       +
           hash = "sha256-aJpSt+dXjw4S33dBiMkaR6wxzwLru+jseuPKFj2R36Y=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         nativeBuildInputs = [

     
···

       56
       56
        
         disabledTestPaths = [

     

       57
       57
        
           # requires aws s3 auth

     

       58
       58
        
           "test/integration/test_download.py"

     

       59
       59
       +
           "test/integration/test_upload.py"

     

       59
       60
        
         ];

     

       60
       61
        
       

     

       61
       62
        
         disabledTests = [

+2 -2

pkgs/development/python-modules/flask-babel/default.nix

···

       22
       22
        
       

     

       23
       23
        
       buildPythonPackage rec {

     

       24
       24
        
         pname = "flask-babel";

     

       25
       25
       -
         version = "3.0.0";

     

       25
       25
       +
         version = "3.0.1";

     

       26
       26
        
         format = "pyproject";

     

       27
       27
        
       

     

       28
       28
        
         src = fetchFromGitHub {

     

       29
       29
        
           owner = "python-babel";

     

       30
       30
        
           repo = "flask-babel";

     

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

     

       32
       32
       -
           hash = "sha256-c3QKAnyMe1THHuJ3uB2d0jMMo1SYGRAB9mBpIJSAHw0=";

     

       32
       32
       +
           hash = "sha256-bHsB1f7dbZW4k8JteyZOwVCgWRDZMu21XdMcjM5NYjk=";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         outputs = [

+2 -2

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

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "pypinyin";

     

       9
       9
       -
         version = "0.47.1";

     

       9
       9
       +
         version = "0.48.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "mozillazg";

     

       13
       13
        
           repo = "python-pinyin";

     

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

     

       15
       15
       -
           sha256 = "sha256-c9pEO9k5tCFWLPismrXrrYEQYmxYKkciXFgpbrDEGzE=";

     

       15
       15
       +
           sha256 = "sha256-gt0jrDPr6FeLB5P9HCSosCHb/W1sAKSusTrCpkqO26E=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         postPatch = ''

+2 -2

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

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "pyvmomi";

     

       11
       11
       -
         version = "8.0.0.1.1";

     

       11
       11
       +
         version = "8.0.0.1.2";

     

       12
       12
        
         format = "setuptools";

     

       13
       13
        
       

     

       14
       14
        
         disabled = pythonOlder "3.7";

     
···

       17
       17
        
           owner = "vmware";

     

       18
       18
        
           repo = pname;

     

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

     

       20
       20
       -
           hash = "sha256-K3gCG4TYyCiHKhrixPwBtBZ4s0bNd7Z4f3CLGnqCDG0=";

     

       20
       20
       +
           hash = "sha256-t54FUgEXEUpb3SqayY7gCmj1egavIaoXMfuShDL9dBo=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         propagatedBuildInputs = [

+2 -2

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

···

       1
       1
        
       { lib, buildPythonPackage, fetchFromGitHub, python, robotframework }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
       -
         version = "2.1.0";

     

       4
       4
       +
         version = "3.0.0";

     

       5
       5
        
         pname = "robotstatuschecker";

     

       6
       6
        
       

     

       7
       7
        
         # no tests included in PyPI tarball

     
···

       9
       9
        
           owner = "robotframework";

     

       10
       10
        
           repo = "statuschecker";

     

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

     

       12
       12
       -
           sha256 = "0hy1390j3l4kkfna9x9xax4y5mqaa3hdndv3fiyg9wr5f7sx3wnz";

     

       12
       12
       +
           sha256 = "sha256-7xHPqlR7IFZp3Z120mg25ZSg9eI878kE8RF1y3F5O70=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         propagatedBuildInputs = [ robotframework ];

+2 -2

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

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "screenlogicpy";

     

       12
       12
       -
         version = "0.7.0";

     

       12
       12
       +
         version = "0.7.1";

     

       13
       13
        
         format = "setuptools";

     

       14
       14
        
       

     

       15
       15
        
         disabled = pythonOlder "3.6";

     
···

       18
       18
        
           owner = "dieselrabbit";

     

       19
       19
        
           repo = pname;

     

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

     

       21
       21
       -
           hash = "sha256-ah5jllrdZFGACZ9M9sv33b/KFRUqHyu5WckeOsuqbyI=";

     

       21
       21
       +
           hash = "sha256-goziVk8OmPKkDb5oVSo/TVLLzwwqx3/Vlw0s/P9+Wss=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/types-dateutil/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildPythonPackage rec {

     

       7
       7
        
         pname = "types-dateutil";

     

       8
       8
       -
         version = "2.8.19.5";

     

       8
       8
       +
         version = "2.8.19.6";

     

       9
       9
        
         format = "setuptools";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           pname = "types-python-dateutil";

     

       13
       13
        
           inherit version;

     

       14
       14
       -
           hash = "sha256-q5H8X3FffXbZpQ09100MaN/jilTwI5z6BQZXWuTYep0=";

     

       14
       14
       +
           hash = "sha256-Sm9MwZzkuhoIZwhx4pe/OAL1XU8SnmqiRD9UC2z4A9I=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         pythonImportsCheck = [

+4 -2

pkgs/development/tools/backblaze-b2/default.nix

···

       2
       2
        
       

     

       3
       3
        
       python3Packages.buildPythonApplication rec {

     

       4
       4
        
         pname = "backblaze-b2";

     

       5
       5
       -
         version = "3.6.0";

     

       5
       5
       +
         version = "3.7.0";

     

       6
       6
        
       

     

       7
       7
        
         src = python3Packages.fetchPypi {

     

       8
       8
        
           inherit version;

     

       9
       9
        
           pname = "b2";

     

       10
       10
       -
           sha256 = "sha256-qHnnUTSLY1yncqIjG+IMLoNauvgwU04qsvH7dZZ8AlI=";

     

       10
       10
       +
           sha256 = "sha256-sW6gaZWUh3WX+0+qHRlQ4gZzKU4bL8ePPNKWo9rdF84=";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         postPatch = ''

     

       14
       14
       +
           substituteInPlace requirements.txt \

     

       15
       15
       +
             --replace 'phx-class-registry==4.0.5' 'phx-class-registry'

     

       14
       16
        
           substituteInPlace requirements.txt \

     

       15
       17
        
             --replace 'tabulate==0.8.10' 'tabulate'

     

       16
       18
        
           substituteInPlace setup.py \

+3 -3

pkgs/development/tools/go-mockery/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "go-mockery";

     

       5
       5
       -
         version = "2.16.0";

     

       5
       5
       +
         version = "2.18.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "vektra";

     

       9
       9
        
           repo = "mockery";

     

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

     

       11
       11
       -
           sha256 = "sha256-fd+ZR74tApbZEXfMqpUAMk22h9rMRmtByGSd8JcTtK0=";

     

       11
       11
       +
           sha256 = "sha256-Iut45RobHc3KZ0vzOqmQT0F8A/GSP5KCfprnmB3zFAA=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         preCheck = ''

     
···

       22
       22
        
       

     

       23
       23
        
         CGO_ENABLED = false;

     

       24
       24
        
       

     

       25
       25
       -
         vendorSha256 = "sha256-SRTxe3y+wQgxsj7ruquMG16dUEAa92rnTXceysWm+F8=";

     

       25
       25
       +
         vendorHash = "sha256-Dl8Q6fQa7BKp06a4OT82+wHYQRN1aWZ2qK25GzhOw8A=";

     

       26
       26
        
       

     

       27
       27
        
         meta = with lib; {

     

       28
       28
        
           homepage = "https://github.com/vektra/mockery";

+2 -2

pkgs/development/tools/kubernetes-controller-tools/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "controller-tools";

     

       5
       5
       -
         version = "0.11.2";

     

       5
       5
       +
         version = "0.11.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "kubernetes-sigs";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-gTSgfykTg2cWV7PCwNcbuFY89RRk9MoV24L4EuEd378=";

     

       11
       11
       +
           sha256 = "sha256-F+cGJbxXIHrgn9OcIMh2am9g4PBLkdC037tV/9znPSg=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         patches = [ ./version.patch ];

+2 -2

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

···

       6
       6
        
       

     

       7
       7
        
       buildGoModule rec {

     

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

     

       9
       9
       -
         version = "14.2.3";

     

       9
       9
       +
         version = "14.2.4";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "jandedobbeleer";

     

       13
       13
        
           repo = pname;

     

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

     

       15
       15
       -
           hash = "sha256-PghWKyZG19MVmc2fQSQN/BCMbF7YOZWybUSKiQzUxl8=";

     

       15
       15
       +
           hash = "sha256-4o0Z3xXsVTr2dE5td/i2uQoaqsBGOMSrzt2X6C9gYbA=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         vendorHash = "sha256-ehG71B351u+LoXDuKQkuEdEpUdHslVU2HcPKUz6FAnQ=";

+3 -3

pkgs/development/tools/pscale/default.nix

···

       8
       8
        
       

     

       9
       9
        
       buildGoModule rec {

     

       10
       10
        
         pname = "pscale";

     

       11
       11
       -
         version = "0.128.0";

     

       11
       11
       +
         version = "0.129.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "planetscale";

     

       15
       15
        
           repo = "cli";

     

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

     

       17
       17
       -
           sha256 = "sha256-2EIaK7UyJH9YEKlOGnnKrq3ucVgEjbF2jVui0bASNcA=";

     

       17
       17
       +
           sha256 = "sha256-GdJyOZ0FqLBRGeQZ5+qLYXLL8JxqigYCVuDUUs1KbN4=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         vendorHash = "sha256-uQ8/cNNFelG8zzrcEs9fEs8KkY6/odwOGmwMmyxUKS4=";

     

       20
       20
       +
         vendorHash = "sha256-iXT+xvmVDfFVV/bYq+hnmkz2ODUQ4fHR8z2lcaK93TE=";

     

       21
       21
        
       

     

       22
       22
        
         ldflags = [

     

       23
       23
        
           "-s" "-w"

+3 -3

pkgs/development/tools/rust/cargo-insta/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "cargo-insta";

     

       5
       5
       -
         version = "1.20.0";

     

       5
       5
       +
         version = "1.26.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "mitsuhiko";

     

       9
       9
        
           repo = "insta";

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-tzC5AOlms5UDQ8+L7M2Tb5K/RtjZuDs23JSnLGH6pkI=";

     

       11
       11
       +
           sha256 = "sha256-h0jRuY3GSqK85NCeFqdqjyVdNTMbdtD70zU5G3w1STc=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         sourceRoot = "source/cargo-insta";

     

       15
       15
       -
         cargoSha256 = "sha256-9r/RPzjPzDSRamntfu8Xz4XWieAU/bnw2m9wtzwkcwk=";

     

       15
       15
       +
         cargoHash = "sha256-GC2ggTJJV3Aww3qPfsnuND0eII1l3OBoZfi5RtvhO8I=";

     

       16
       16
        
         buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];

     

       17
       17
        
       

     

       18
       18
        
         meta = with lib; {

+3 -3

pkgs/development/tools/skaffold/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "skaffold";

     

       5
       5
       -
         version = "2.0.4";

     

       5
       5
       +
         version = "2.1.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "GoogleContainerTools";

     

       9
       9
        
           repo = "skaffold";

     

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

     

       11
       11
       -
           sha256 = "sha256-TFI715knhQ3QyWF1EwIxZfZQW16uDWAqa6LVNfqC8Ws=";

     

       11
       11
       +
           sha256 = "sha256-D0KcnxfjPBGHLGs5YLdecuKL07jIhF6w/SIr/I/W1rI=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = "sha256-yy1BVorjLEcZR6PqupBiZx2plwPJ6xlxripbyB6RLek=";

     

       15
       15
        
       

     

       16
       16
        
         subPackages = ["cmd/skaffold"];

     

       17
       17
        
       

     

       18
       18
       -
         ldflags = let t = "github.com/GoogleContainerTools/skaffold/pkg/skaffold"; in [

     

       18
       18
       +
         ldflags = let t = "github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold"; in [

     

       19
       19
        
           "-s" "-w"

     

       20
       20
        
           "-X ${t}/version.version=v${version}"

     

       21
       21
        
           "-X ${t}/version.gitCommit=${src.rev}"

+2 -2

pkgs/servers/amqp/rabbitmq-server/default.nix

···

       38
       38
        
       

     

       39
       39
        
       stdenv.mkDerivation rec {

     

       40
       40
        
         pname = "rabbitmq-server";

     

       41
       41
       -
         version = "3.11.7";

     

       41
       41
       +
         version = "3.11.8";

     

       42
       42
        
       

     

       43
       43
        
         # when updating, consider bumping elixir version in all-packages.nix

     

       44
       44
        
         src = fetchurl {

     

       45
       45
        
           url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz";

     

       46
       46
       -
           hash = "sha256-m1O/k/w9WLSRpKADo79DU+vf4z41l6nfJpIwpY1dGgA=";

     

       46
       46
       +
           hash = "sha256-sD9E60xXNJQSg98XbMq6xn+nk3uQn1XnrxApAuSaF44=";

     

       47
       47
        
         };

     

       48
       48
        
       

     

       49
       49
        
         nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync python3 ];

+3 -3

pkgs/servers/libreddit/default.nix

···

       8
       8
        
       

     

       9
       9
        
       rustPlatform.buildRustPackage rec {

     

       10
       10
        
         pname = "libreddit";

     

       11
       11
       -
         version = "0.28.1";

     

       11
       11
       +
         version = "0.29.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "libreddit";

     

       15
       15
        
           repo = pname;

     

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

     

       17
       17
       -
           hash = "sha256-gwI2ASJkHc2kOmC4D65Te7iz0Kozm8bpq2MUYZRBdtk=";

     

       17
       17
       +
           hash = "sha256-ZH1mtFfbM+acEY1oyoFXPltgPbtgI1kzoO59op1zZfo=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         cargoSha256 = "sha256-9NkWYurq7S4ysnP7oLoggMNAIFay5qVWcuer4EOrQEA=";

     

       20
       20
       +
         cargoHash = "sha256-2DBptAvJ0J65AehgHG7f4JZf1QA4ZXn8dqG09wcXsiU=";

     

       21
       21
        
       

     

       22
       22
        
         buildInputs = lib.optionals stdenv.isDarwin [

     

       23
       23
        
           Security

+2 -2

pkgs/servers/snappymail/default.nix

···

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         pname = "snappymail";

     

       10
       10
       -
         version = "2.25.2";

     

       10
       10
       +
         version = "2.25.3";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchurl {

     

       13
       13
        
           url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz";

     

       14
       14
       -
           sha256 = "sha256-45/lE+3lbIlrrlGiZcnyqqYN61BXdBzfufQuP/6W1mk=";

     

       14
       14
       +
           sha256 = "sha256-FK0F1STRdE1Ny+l0ILQMofXSXDhyzoMgZCT+MuCSmcA=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         sourceRoot = "snappymail";

+4 -4

pkgs/tools/admin/afterburn/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "afterburn";

     

       5
       5
       -
         version = "5.3.0";

     

       5
       5
       +
         version = "5.4.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "coreos";

     

       9
       9
        
           repo = "afterburn";

     

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

     

       11
       11
       -
           sha256 = "sha256-yX95qmcyouSSjEHorMpRJjZyrxIjQorwTpGtGZN4s6s=";

     

       11
       11
       +
           sha256 = "sha256-Y9Z2PdQU7yHTlEXW+/C6v9k+5TkeQMagbC/gGG+JssQ=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoSha256 = "sha256-DweJ608aJChn2ezAM7Ly0cwtLAvM1DZ5gc4WUVyKIco=";

     

       14
       14
       +
         cargoHash = "sha256-ZDyB/s2ig3aklEeB1JzNHat+roQniKrMcw4rvy9Z5pk=";

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ pkg-config ];

     

       17
       17
        
         buildInputs = [ openssl ];

     
···

       32
       32
        
           description = "This is a small utility, typically used in conjunction with Ignition, which reads metadata from a given cloud-provider and applies it to the system.";

     

       33
       33
        
           license = licenses.asl20;

     

       34
       34
        
           maintainers = [ maintainers.arianvp ];

     

       35
       35
       -
           platforms = [ "x86_64-linux" ];

     

       35
       35
       +
           platforms = platforms.linux;

     

       36
       36
        
         };

     

       37
       37
        
       }

+17

pkgs/tools/admin/pgadmin/check-system-config-dir.patch

···

       1
       1
       +
       diff --git a/web/config.py b/web/config.py

     

       2
       2
       +
       index 4774043..5b73fd3 100644

     

       3
       3
       +
       --- a/web/config.py

     

       4
       4
       +
       +++ b/web/config.py

     

       5
       5
       +
       @@ -884,6 +884,12 @@ if os.path.exists(system_config_dir + '/config_system.py'):

     

       6
       6
       +
                user_config_settings.update(config_system_settings)

     

       7
       7
       +
            except ImportError:

     

       8
       8
       +
                pass

     

       9
       9
       +
       +    except PermissionError:

     

       10
       10
       +
       +        print(f"Permission denied to open {str(system_config_dir + '/config_system.py')}. \n \

     

       11
       11
       +
       +              If you are running pgadmin4-desktopmode please make sure you disable  \n \

     

       12
       12
       +
       +              the pgadmin NixOS module first. If you rely on settings in \n \

     

       13
       13
       +
       +              {str(system_config_dir + '/config_system.py')}, please check the correct permissions.")

     

       14
       14
       +
       +        pass

     

       15
       15
       +
       

     

       16
       16
       +
        # Update settings for 'LOG_FILE', 'SQLITE_PATH', 'SESSION_DB_PATH',

     

       17
       17
       +
        # 'AZURE_CREDENTIAL_CACHE_DIR', 'KERBEROS_CCACHE_DIR', 'STORAGE_DIR'

+109 -63

pkgs/tools/admin/pgadmin/default.nix

···

       7
       7
        
       , nixosTests

     

       8
       8
        
       , pkgs

     

       9
       9
        
       , fetchPypi

     

       10
       10
       +
       , postgresqlTestHook

     

       11
       11
       +
       , postgresql

     

       12
       12
       +
       , server-mode ? true

     

       10
       13
        
       }:

     

       11
       14
        
       

     

       12
       15
        
       let

     
···

       26
       29
        
           yarnNix = ./yarn.nix;

     

       27
       30
        
         };

     

       28
       31
        
       

     

       29
       29
       -
         # move buildDeps here to easily pass to test suite

     

       30
       30
       -
         buildDeps = with pythonPackages; [

     

       31
       31
       -
           flask

     

       32
       32
       -
           flask-gravatar

     

       33
       33
       -
           flask-login

     

       34
       34
       -
           flask_mail

     

       35
       35
       -
           flask_migrate

     

       36
       36
       -
           flask-sqlalchemy

     

       37
       37
       -
           flask-wtf

     

       38
       38
       -
           flask-compress

     

       39
       39
       -
           passlib

     

       40
       40
       -
           pytz

     

       41
       41
       -
           simplejson

     

       42
       42
       -
           sqlparse

     

       43
       43
       -
           wtforms

     

       44
       44
       -
           flask-paranoid

     

       45
       45
       -
           psutil

     

       46
       46
       -
           psycopg2

     

       47
       47
       -
           python-dateutil

     

       48
       48
       -
           sqlalchemy

     

       49
       49
       -
           itsdangerous

     

       50
       50
       -
           flask-security-too

     

       51
       51
       -
           bcrypt

     

       52
       52
       -
           cryptography

     

       53
       53
       -
           sshtunnel

     

       54
       54
       -
           ldap3

     

       55
       55
       -
           flask-babelex

     

       56
       56
       -
           flask-babel

     

       57
       57
       -
           gssapi

     

       58
       58
       -
           flask-socketio

     

       59
       59
       -
           eventlet

     

       60
       60
       -
           httpagentparser

     

       61
       61
       -
           user-agents

     

       62
       62
       -
           wheel

     

       63
       63
       -
           authlib

     

       64
       64
       -
           qrcode

     

       65
       65
       -
           pillow

     

       66
       66
       -
           pyotp

     

       67
       67
       -
           botocore

     

       68
       68
       -
           boto3

     

       69
       69
       -
           azure-mgmt-subscription

     

       70
       70
       -
           azure-mgmt-rdbms

     

       71
       71
       -
           azure-mgmt-resource

     

       72
       72
       -
           azure-identity

     

       73
       73
       -
           sphinxcontrib-youtube

     

       74
       74
       -
           dnspython

     

       75
       75
       -
           greenlet

     

       76
       76
       -
         ];

     

       77
       32
        
       

     

       78
       33
        
         # keep the scope, as it is used throughout the derivation and tests

     

       79
       34
        
         # this also makes potential future overrides easier

     
···

       134
       89
        
         patches = [

     

       135
       90
        
           # Expose setup.py for later use

     

       136
       91
        
           ./expose-setup.py.patch

     

       92
       92
       +
           # check for permission of /etc/pgadmin/config_system and don't fail

     

       93
       93
       +
           ./check-system-config-dir.patch

     

       137
       94
        
         ];

     

       138
       95
        
       

     

       139
       96
        
         postPatch = ''

     
···

       149
       106
        
       

     

       150
       107
        
           # relax dependencies

     

       151
       108
        
           sed 's|==|>=|g' -i requirements.txt

     

       152
       152
       -
           # don't use Server Mode (can be overridden later)

     

       153
       109
        
           substituteInPlace pkg/pip/setup_pip.py \

     

       154
       154
       -
             --replace "req = req.replace('psycopg2', 'psycopg2-binary')" "req = req" \

     

       155
       155
       -
             --replace "builtins.SERVER_MODE = None" "builtins.SERVER_MODE = False"

     

       110
       110
       +
             --replace "req = req.replace('psycopg2', 'psycopg2-binary')" "req = req"

     

       111
       111
       +
           ${lib.optionalString (!server-mode) ''

     

       112
       112
       +
           substituteInPlace web/config.py \

     

       113
       113
       +
             --replace "SERVER_MODE = True" "SERVER_MODE = False"

     

       114
       114
       +
           ''}

     

       156
       115
        
         '';

     

       157
       116
        
       

     

       158
       117
        
         preBuild = ''

     
···

       200
       159
        
           pythonPackages.wheel

     

       201
       160
        
         ];

     

       202
       161
        
       

     

       203
       203
       -
         # tests need an own data, log directory

     

       204
       204
       -
         # and a working and correctly setup postgres database

     

       205
       205
       -
         # checks will be run through nixos/tests

     

       206
       206
       -
         doCheck = false;

     

       207
       207
       -
       

     

       208
       208
       -
         # speaklater3 is separate because when passing buildDeps

     

       209
       209
       -
         # to the test, it fails there due to a collision with speaklater

     

       210
       210
       -
         propagatedBuildInputs = buildDeps ++ [ pythonPackages.speaklater3 ];

     

       162
       162
       +
         propagatedBuildInputs = with pythonPackages; [

     

       163
       163
       +
           flask

     

       164
       164
       +
           flask-gravatar

     

       165
       165
       +
           flask-login

     

       166
       166
       +
           flask_mail

     

       167
       167
       +
           flask_migrate

     

       168
       168
       +
           flask-sqlalchemy

     

       169
       169
       +
           flask-wtf

     

       170
       170
       +
           flask-compress

     

       171
       171
       +
           passlib

     

       172
       172
       +
           pytz

     

       173
       173
       +
           simplejson

     

       174
       174
       +
           sqlparse

     

       175
       175
       +
           wtforms

     

       176
       176
       +
           flask-paranoid

     

       177
       177
       +
           psutil

     

       178
       178
       +
           psycopg2

     

       179
       179
       +
           python-dateutil

     

       180
       180
       +
           sqlalchemy

     

       181
       181
       +
           itsdangerous

     

       182
       182
       +
           flask-security-too

     

       183
       183
       +
           bcrypt

     

       184
       184
       +
           cryptography

     

       185
       185
       +
           sshtunnel

     

       186
       186
       +
           ldap3

     

       187
       187
       +
           flask-babelex

     

       188
       188
       +
           flask-babel

     

       189
       189
       +
           gssapi

     

       190
       190
       +
           flask-socketio

     

       191
       191
       +
           eventlet

     

       192
       192
       +
           httpagentparser

     

       193
       193
       +
           user-agents

     

       194
       194
       +
           wheel

     

       195
       195
       +
           authlib

     

       196
       196
       +
           qrcode

     

       197
       197
       +
           pillow

     

       198
       198
       +
           pyotp

     

       199
       199
       +
           botocore

     

       200
       200
       +
           boto3

     

       201
       201
       +
           azure-mgmt-subscription

     

       202
       202
       +
           azure-mgmt-rdbms

     

       203
       203
       +
           azure-mgmt-resource

     

       204
       204
       +
           azure-identity

     

       205
       205
       +
           sphinxcontrib-youtube

     

       206
       206
       +
           dnspython

     

       207
       207
       +
           greenlet

     

       208
       208
       +
           speaklater3

     

       209
       209
       +
         ];

     

       211
       210
        
       

     

       212
       211
        
         passthru.tests = {

     

       213
       213
       -
           standalone = nixosTests.pgadmin4-standalone;

     

       214
       214
       -
           # regression and function tests of the package itself

     

       215
       215
       -
           package = import ../../../../nixos/tests/pgadmin4.nix { inherit pkgs buildDeps; pythonEnv = pythonPackages; };

     

       212
       212
       +
           inherit (nixosTests) pgadmin4;

     

       216
       213
        
         };

     

       217
       214
        
       

     

       215
       215
       +
         nativeCheckInputs = [

     

       216
       216
       +
           postgresqlTestHook

     

       217
       217
       +
           postgresql

     

       218
       218
       +
           pythonPackages.testscenarios

     

       219
       219
       +
           pythonPackages.selenium

     

       220
       220
       +
         ];

     

       221
       221
       +
       

     

       222
       222
       +
         checkPhase = ''

     

       223
       223
       +
           runHook preCheck

     

       224
       224
       +
       

     

       225
       225
       +
           ## Setup ##

     

       226
       226
       +
       

     

       227
       227
       +
           # pgadmin needs a home directory to save the configuration

     

       228
       228
       +
           export HOME=$TMPDIR

     

       229
       229
       +
           cd pgadmin4

     

       230
       230
       +
       

     

       231
       231
       +
           # set configuration for postgresql test

     

       232
       232
       +
           # also ensure Server Mode is set to false. If not, the tests will fail, since pgadmin expects read/write permissions

     

       233
       233
       +
           # in /var/lib/pgadmin and /var/log/pgadmin

     

       234
       234
       +
           # see https://github.com/pgadmin-org/pgadmin4/blob/fd1c26408bbf154fa455a49ee5c12895933833a3/web/regression/runtests.py#L217-L226

     

       235
       235
       +
           cp -v regression/test_config.json.in regression/test_config.json

     

       236
       236
       +
           substituteInPlace regression/test_config.json --replace "localhost" "$PGHOST"

     

       237
       237
       +
           substituteInPlace regression/runtests.py --replace "builtins.SERVER_MODE = None" "builtins.SERVER_MODE = False"

     

       238
       238
       +
       

     

       239
       239
       +
           ## Browser test ##

     

       240
       240
       +
       

     

       241
       241
       +
           # don't bother to test kerberos authentication

     

       242
       242
       +
           python regression/runtests.py --pkg browser --exclude browser.tests.test_kerberos_with_mocking

     

       243
       243
       +
       

     

       244
       244
       +
           ## Reverse engineered SQL test ##

     

       245
       245
       +
       

     

       246
       246
       +
           python regression/runtests.py --pkg resql

     

       247
       247
       +
       

     

       248
       248
       +
           runHook postCheck

     

       249
       249
       +
         '';

     

       250
       250
       +
       

     

       218
       251
        
         meta = with lib; {

     

       219
       219
       -
           description = "Administration and development platform for PostgreSQL";

     

       252
       252
       +
           description = "Administration and development platform for PostgreSQL${optionalString (!server-mode) ". Desktop Mode"}";

     

       253
       253
       +
           longDescription = ''

     

       254
       254
       +
             pgAdmin 4 is designed to meet the needs of both novice and experienced Postgres users alike,

     

       255
       255
       +
             providing a powerful graphical interface that simplifies the creation, maintenance and use of database objects.

     

       256
       256
       +
             ${if server-mode then ''

     

       257
       257
       +
             This version is build with SERVER_MODE set to True (the default). It will require access to `/var/lib/pgadmin`

     

       258
       258
       +
             and `/var/log/pgadmin`. This is the default version for the NixOS module `services.pgadmin`.

     

       259
       259
       +
             This should NOT be used in combination with the `pgadmin4-desktopmode` package as they will interfere.

     

       260
       260
       +
             '' else ''

     

       261
       261
       +
             This version is build with SERVER_MODE set to False. It will require access to `~/.pgadmin/`. This version is suitable

     

       262
       262
       +
             for single-user deployment or where access to `/var/lib/pgadmin` cannot be granted or the NixOS module cannot be used.

     

       263
       263
       +
             This should NOT be used in combination with the NixOS module `pgadmin` as they will interfere.

     

       264
       264
       +
             ''}

     

       265
       265
       +
           '';

     

       220
       266
        
           homepage = "https://www.pgadmin.org/";

     

       221
       267
        
           license = licenses.mit;

     

       222
       268
        
           changelog = "https://www.pgadmin.org/docs/pgadmin4/latest/release_notes_${lib.versions.major version}_${lib.versions.minor version}.html";

+3 -1

pkgs/top-level/all-packages.nix

···

       31286
       31286
        
       

     

       31287
       31287
        
         xmr-stak = callPackage ../applications/misc/xmr-stak { };

     

       31288
       31288
        
       

     

       31289
       31289
       -
         xmrig = callPackage ../applications/misc/xmrig { };

     

       31289
       31289
       +
         xmrig = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig { };

     

       31290
       31290
        
       

     

       31291
       31291
        
         xmrig-mo = callPackage ../applications/misc/xmrig/moneroocean.nix { };

     

       31292
       31292
        
       

     
···

       38022
       38022
        
         pgmanage = callPackage ../applications/misc/pgmanage { };

     

       38023
       38023
        
       

     

       38024
       38024
        
         pgadmin4 = callPackage ../tools/admin/pgadmin { };

     

       38025
       38025
       +
       

     

       38026
       38026
       +
         pgadmin4-desktopmode = callPackage ../tools/admin/pgadmin { server-mode = false; };

     

       38025
       38027
        
       

     

       38026
       38028
        
         pgmodeler = qt6Packages.callPackage ../applications/misc/pgmodeler { };

     

       38027
       38029