commit 38a8b47046debec924afec286067325f6770124b · pyrox.dev/nixpkgs

+6

doc/contributing/reviewing-contributions.chapter.md

···

       302
       302
        
       

     

       303
       303
        
       It is possible for community members that have enough knowledge and experience on a special topic to contribute by merging pull requests.

     

       304
       304
        
       

     

       305
       305
       +
       In case the PR is stuck waiting for the original author to apply a trivial

     

       306
       306
       +
       change (a typo, capitalisation change, etc.) and the author allowed the members

     

       307
       307
       +
       to modify the PR, consider applying it yourself. (or commit the existing review

     

       308
       308
       +
       suggestion) You should pay extra attention to make sure the addition doesn't go

     

       309
       309
       +
       against the idea of the original PR and would not be opposed by the author.

     

       310
       310
       +
       

     

       305
       311
        
       <!--

     

       306
       312
        
       The following paragraphs about how to deal with unactive contributors is just a proposition and should be modified to what the community agrees to be the right policy.

     

       307
       313

+1 -1

maintainers/maintainer-list.nix

···

       8803
       8803
        
           email = "megoettlinger@gmail.com";

     

       8804
       8804
        
           github = "mgttlinger";

     

       8805
       8805
        
           githubId = 5120487;

     

       8806
       8806
       -
           name = "Merlin Göttlinger";

     

       8806
       8806
       +
           name = "Merlin Humml";

     

       8807
       8807
        
         };

     

       8808
       8808
        
         mguentner = {

     

       8809
       8809
        
           email = "code@klandest.in";

+2

maintainers/team-list.nix

···

       182
       182
        
           members = [

     

       183
       183
        
             cole-h

     

       184
       184
        
             grahamc

     

       185
       185
       +
             hoverbear

     

       186
       186
       +
             lheckemann

     

       185
       187
        
           ];

     

       186
       188
        
           scope = "Group registration for packages maintained by Determinate Systems.";

     

       187
       189
        
           shortName = "Determinate Systems employees";

+1 -1

nixos/modules/programs/zsh/zsh.nix

···

       184
       184
        
       

     

       185
       185
        
               # Tell zsh how to find installed completions.

     

       186
       186
        
               for p in ''${(z)NIX_PROFILES}; do

     

       187
       187
       -
                   fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions)

     

       187
       187
       +
                   fpath=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions $fpath)

     

       188
       188
        
               done

     

       189
       189
        
       

     

       190
       190
        
               # Setup custom shell init stuff.

+1 -1

nixos/modules/services/audio/navidrome.nix

···

       62
       62
        
               ProtectKernelModules = true;

     

       63
       63
        
               ProtectKernelTunables = true;

     

       64
       64
        
               SystemCallArchitectures = "native";

     

       65
       65
       -
               SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ];

     

       65
       65
       +
               SystemCallFilter = [ "@system-service" "~@privileged" ];

     

       66
       66
        
               RestrictRealtime = true;

     

       67
       67
        
               LockPersonality = true;

     

       68
       68
        
               MemoryDenyWriteExecute = true;

+52 -50

nixos/modules/services/backup/btrbk.nix

···

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

     

       2
       2
        
       let

     

       3
       3
        
         inherit (lib)

     

       4
       4
       +
           concatLists

     

       5
       5
       +
           concatMap

     

       4
       6
        
           concatMapStringsSep

     

       5
       7
        
           concatStringsSep

     

       6
       8
        
           filterAttrs

     

       7
       7
       -
           flatten

     

       8
       9
        
           isAttrs

     

       9
       9
       -
           isString

     

       10
       10
        
           literalExpression

     

       11
       11
        
           mapAttrs'

     

       12
       12
        
           mapAttrsToList

     

       13
       13
        
           mkIf

     

       14
       14
        
           mkOption

     

       15
       15
        
           optionalString

     

       16
       16
       -
           partition

     

       17
       17
       -
           typeOf

     

       16
       16
       +
           sort

     

       18
       17
        
           types

     

       19
       18
        
           ;

     

       20
       19
        
       

     

       21
       21
       -
         cfg = config.services.btrbk;

     

       22
       22
       -
         sshEnabled = cfg.sshAccess != [ ];

     

       23
       23
       -
         serviceEnabled = cfg.instances != { };

     

       24
       24
       -
         attr2Lines = attr:

     

       20
       20
       +
         # The priority of an option or section.

     

       21
       21
       +
         # The configurations format are order-sensitive. Pairs are added as children of

     

       22
       22
       +
         # the last sections if possible, otherwise, they start a new section.

     

       23
       23
       +
         # We sort them in topological order:

     

       24
       24
       +
         # 1. Leaf pairs.

     

       25
       25
       +
         # 2. Sections that may contain (1).

     

       26
       26
       +
         # 3. Sections that may contain (1) or (2).

     

       27
       27
       +
         # 4. Etc.

     

       28
       28
       +
         prioOf = { name, value }:

     

       29
       29
       +
           if !isAttrs value then 0 # Leaf options.

     

       30
       30
       +
           else {

     

       31
       31
       +
             target = 1; # Contains: options.

     

       32
       32
       +
             subvolume = 2; # Contains: options, target.

     

       33
       33
       +
             volume = 3; # Contains: options, target, subvolume.

     

       34
       34
       +
           }.${name} or (throw "Unknow section '${name}'");

     

       35
       35
       +
       

     

       36
       36
       +
         genConfig' = set: concatStringsSep "\n" (genConfig set);

     

       37
       37
       +
         genConfig = set:

     

       25
       38
        
           let

     

       26
       26
       -
             pairs = mapAttrsToList (name: value: { inherit name value; }) attr;

     

       27
       27
       -
             isSubsection = value:

     

       28
       28
       -
               if isAttrs value then true

     

       29
       29
       -
               else if isString value then false

     

       30
       30
       -
               else throw "invalid type in btrbk config ${typeOf value}";

     

       31
       31
       -
             sortedPairs = partition (x: isSubsection x.value) pairs;

     

       39
       39
       +
             pairs = mapAttrsToList (name: value: { inherit name value; }) set;

     

       40
       40
       +
             sortedPairs = sort (a: b: prioOf a < prioOf b) pairs;

     

       32
       41
        
           in

     

       33
       33
       -
           flatten (

     

       34
       34
       -
             # non subsections go first

     

       35
       35
       -
             (

     

       36
       36
       -
               map (pair: [ "${pair.name} ${pair.value}" ]) sortedPairs.wrong

     

       37
       37
       -
             )

     

       38
       38
       -
             ++ # subsections go last

     

       39
       39
       -
             (

     

       40
       40
       -
               map

     

       41
       41
       -
                 (

     

       42
       42
       -
                   pair:

     

       43
       43
       -
                   mapAttrsToList

     

       44
       44
       -
                     (

     

       45
       45
       -
                       childname: value:

     

       46
       46
       -
                         [ "${pair.name} ${childname}" ] ++ (map (x: " " + x) (attr2Lines value))

     

       47
       47
       -
                     )

     

       48
       48
       -
                     pair.value

     

       49
       49
       -
                 )

     

       50
       50
       -
                 sortedPairs.right

     

       51
       51
       -
             )

     

       52
       52
       -
           )

     

       53
       53
       -
         ;

     

       42
       42
       +
             concatMap genPair sortedPairs;

     

       43
       43
       +
         genSection = sec: secName: value:

     

       44
       44
       +
           [ "${sec} ${secName}" ] ++ map (x: " " + x) (genConfig value);

     

       45
       45
       +
         genPair = { name, value }:

     

       46
       46
       +
           if !isAttrs value

     

       47
       47
       +
           then [ "${name} ${value}" ]

     

       48
       48
       +
           else concatLists (mapAttrsToList (genSection name) value);

     

       49
       49
       +
       

     

       54
       50
        
         addDefaults = settings: { backend = "btrfs-progs-sudo"; } // settings;

     

       55
       55
       -
         mkConfigFile = settings: concatStringsSep "\n" (attr2Lines (addDefaults settings));

     

       56
       56
       -
         mkTestedConfigFile = name: settings:

     

       57
       57
       -
           let

     

       58
       58
       -
             configFile = pkgs.writeText "btrbk-${name}.conf" (mkConfigFile settings);

     

       59
       59
       -
           in

     

       60
       60
       -
           pkgs.runCommand "btrbk-${name}-tested.conf" { } ''

     

       61
       61
       -
             mkdir foo

     

       62
       62
       -
             cp ${configFile} $out

     

       63
       63
       -
             if (set +o pipefail; ${pkgs.btrbk}/bin/btrbk -c $out ls foo 2>&1 | grep $out);

     

       64
       64
       -
             then

     

       65
       65
       -
             echo btrbk configuration is invalid

     

       66
       66
       -
             cat $out

     

       67
       67
       -
             exit 1

     

       68
       68
       -
             fi;

     

       51
       51
       +
       

     

       52
       52
       +
         mkConfigFile = name: settings: pkgs.writeTextFile {

     

       53
       53
       +
           name = "btrbk-${name}.conf";

     

       54
       54
       +
           text = genConfig' (addDefaults settings);

     

       55
       55
       +
           checkPhase = ''

     

       56
       56
       +
             set +e

     

       57
       57
       +
             ${pkgs.btrbk}/bin/btrbk -c $out dryrun

     

       58
       58
       +
             # According to btrbk(1), exit status 2 means parse error

     

       59
       59
       +
             # for CLI options or the config file.

     

       60
       60
       +
             if [[ $? == 2 ]]; then

     

       61
       61
       +
               echo "Btrbk configuration is invalid:"

     

       62
       62
       +
               cat $out

     

       63
       63
       +
               exit 1

     

       64
       64
       +
             fi

     

       65
       65
       +
             set -e

     

       69
       66
        
           '';

     

       67
       67
       +
         };

     

       68
       68
       +
       

     

       69
       69
       +
         cfg = config.services.btrbk;

     

       70
       70
       +
         sshEnabled = cfg.sshAccess != [ ];

     

       71
       71
       +
         serviceEnabled = cfg.instances != { };

     

       70
       72
        
       in

     

       71
       73
        
       {

     

       72
       74
        
         meta.maintainers = with lib.maintainers; [ oxalica ];

     
···

       196
       198
        
             (

     

       197
       199
        
               name: instance: {

     

       198
       200
        
                 name = "btrbk/${name}.conf";

     

       199
       199
       -
                 value.source = mkTestedConfigFile name instance.settings;

     

       201
       201
       +
                 value.source = mkConfigFile name instance.settings;

     

       200
       202
        
               }

     

       201
       203
        
             )

     

       202
       204
        
             cfg.instances;

+1 -1

nixos/modules/services/misc/gitea.nix

···

       592
       592
        
               PrivateMounts = true;

     

       593
       593
        
               # System Call Filtering

     

       594
       594
        
               SystemCallArchitectures = "native";

     

       595
       595
       -
               SystemCallFilter = "~@clock @cpu-emulation @debug @keyring @memlock @module @mount @obsolete @raw-io @reboot @resources @setuid @swap";

     

       595
       595
       +
               SystemCallFilter = "~@clock @cpu-emulation @debug @keyring @memlock @module @mount @obsolete @raw-io @reboot @setuid @swap";

     

       596
       596
        
             };

     

       597
       597
        
       

     

       598
       598
        
             environment = {

+16 -16

nixos/modules/services/monitoring/grafana.nix

···

       245
       245
        
           (mkRenamedOptionModule [ "services" "grafana" "users" "autoAssignOrg" ] [ "services" "grafana" "settings" "users" "auto_assign_org" ])

     

       246
       246
        
           (mkRenamedOptionModule [ "services" "grafana" "users" "autoAssignOrgRole" ] [ "services" "grafana" "settings" "users" "auto_assign_org_role" ])

     

       247
       247
        
           (mkRenamedOptionModule [ "services" "grafana" "auth" "disableLoginForm" ] [ "services" "grafana" "settings" "auth" "disable_login_form" ])

     

       248
       248
       -
           (mkRenamedOptionModule [ "services" "grafana" "auth" "anonymous" "enable" ] [ "services" "grafana" "settings" "auth" "anonymous" "enable" ])

     

       249
       249
       -
           (mkRenamedOptionModule [ "services" "grafana" "auth" "anonymous" "org_name" ] [ "services" "grafana" "settings" "auth" "anonymous" "org_name" ])

     

       250
       250
       -
           (mkRenamedOptionModule [ "services" "grafana" "auth" "anonymous" "org_role" ] [ "services" "grafana" "settings" "auth" "anonymous" "org_role" ])

     

       251
       251
       -
           (mkRenamedOptionModule [ "services" "grafana" "auth" "azuread" "enable" ] [ "services" "grafana" "settings" "auth" "azuread" "enable" ])

     

       252
       252
       -
           (mkRenamedOptionModule [ "services" "grafana" "auth" "azuread" "allowSignUp" ] [ "services" "grafana" "settings" "auth" "azuread" "allow_sign_up" ])

     

       253
       253
       -
           (mkRenamedOptionModule [ "services" "grafana" "auth" "azuread" "clientId" ] [ "services" "grafana" "settings" "auth" "azuread" "client_id" ])

     

       254
       254
       -
           (mkRenamedOptionModule [ "services" "grafana" "auth" "azuread" "allowedDomains" ] [ "services" "grafana" "settings" "auth" "azuread" "allowed_domains" ])

     

       255
       255
       -
           (mkRenamedOptionModule [ "services" "grafana" "auth" "azuread" "allowedGroups" ] [ "services" "grafana" "settings" "auth" "azuread" "allowed_groups" ])

     

       256
       256
       -
           (mkRenamedOptionModule [ "services" "grafana" "auth" "google" "enable" ] [ "services" "grafana" "settings" "auth" "google" "enable" ])

     

       257
       257
       -
           (mkRenamedOptionModule [ "services" "grafana" "auth" "google" "allowSignUp" ] [ "services" "grafana" "settings" "auth" "google" "allow_sign_up" ])

     

       258
       258
       -
           (mkRenamedOptionModule [ "services" "grafana" "auth" "google" "clientId" ] [ "services" "grafana" "settings" "auth" "google" "client_id" ])

     

       248
       248
       +
           (mkRenamedOptionModule [ "services" "grafana" "auth" "anonymous" "enable" ] [ "services" "grafana" "settings" "auth.anonymous" "enabled" ])

     

       249
       249
       +
           (mkRenamedOptionModule [ "services" "grafana" "auth" "anonymous" "org_name" ] [ "services" "grafana" "settings" "auth.anonymous" "org_name" ])

     

       250
       250
       +
           (mkRenamedOptionModule [ "services" "grafana" "auth" "anonymous" "org_role" ] [ "services" "grafana" "settings" "auth.anonymous" "org_role" ])

     

       251
       251
       +
           (mkRenamedOptionModule [ "services" "grafana" "auth" "azuread" "enable" ] [ "services" "grafana" "settings" "auth.azuread" "enabled" ])

     

       252
       252
       +
           (mkRenamedOptionModule [ "services" "grafana" "auth" "azuread" "allowSignUp" ] [ "services" "grafana" "settings" "auth.azuread" "allow_sign_up" ])

     

       253
       253
       +
           (mkRenamedOptionModule [ "services" "grafana" "auth" "azuread" "clientId" ] [ "services" "grafana" "settings" "auth.azuread" "client_id" ])

     

       254
       254
       +
           (mkRenamedOptionModule [ "services" "grafana" "auth" "azuread" "allowedDomains" ] [ "services" "grafana" "settings" "auth.azuread" "allowed_domains" ])

     

       255
       255
       +
           (mkRenamedOptionModule [ "services" "grafana" "auth" "azuread" "allowedGroups" ] [ "services" "grafana" "settings" "auth.azuread" "allowed_groups" ])

     

       256
       256
       +
           (mkRenamedOptionModule [ "services" "grafana" "auth" "google" "enable" ] [ "services" "grafana" "settings" "auth.google" "enabled" ])

     

       257
       257
       +
           (mkRenamedOptionModule [ "services" "grafana" "auth" "google" "allowSignUp" ] [ "services" "grafana" "settings" "auth.google" "allow_sign_up" ])

     

       258
       258
       +
           (mkRenamedOptionModule [ "services" "grafana" "auth" "google" "clientId" ] [ "services" "grafana" "settings" "auth.google" "client_id" ])

     

       259
       259
        
           (mkRenamedOptionModule [ "services" "grafana" "analytics" "reporting" "enable" ] [ "services" "grafana" "settings" "analytics" "reporting_enabled" ])

     

       260
       260
        
       

     

       261
       261
        
           (mkRemovedOptionModule [ "services" "grafana" "database" "passwordFile" ] ''

     
···

       351
       351
        
                   protocol = mkOption {

     

       352
       352
        
                     description = lib.mdDoc "Which protocol to listen.";

     

       353
       353
        
                     default = "http";

     

       354
       354
       -
                     type = types.enum ["http" "https" "socket"];

     

       354
       354
       +
                     type = types.enum ["http" "https" "h2" "socket"];

     

       355
       355
        
                   };

     

       356
       356
        
       

     

       357
       357
        
                   http_addr = mkOption {

     
···

       1173
       1173
        
               any (x: x.secure_settings != null) cfg.provision.notifiers

     

       1174
       1174
        
             ) "Notifier secure settings will be stored as plaintext in the Nix store! Use file provider instead.")

     

       1175
       1175
        
             (optional (

     

       1176
       1176
       -
               builtins.isList cfg.provision.datasources

     

       1176
       1176
       +
               builtins.isList cfg.provision.datasources && cfg.provision.datasources != []

     

       1177
       1177
        
             ) ''

     

       1178
       1178
        
                 Provisioning Grafana datasources with options has been deprecated.

     

       1179
       1179
        
                 Use `services.grafana.provision.datasources.settings` or

     

       1180
       1180
        
                 `services.grafana.provision.datasources.path` instead.

     

       1181
       1181
        
               '')

     

       1182
       1182
        
             (optional (

     

       1183
       1183
       -
               builtins.isList cfg.provision.dashboards

     

       1183
       1183
       +
               builtins.isList cfg.provision.datasources && cfg.provision.dashboards != []

     

       1184
       1184
        
             ) ''

     

       1185
       1185
        
                 Provisioning Grafana dashboards with options has been deprecated.

     

       1186
       1186
        
                 Use `services.grafana.provision.dashboards.settings` or

     
···

       1253
       1253
        
               RuntimeDirectory = "grafana";

     

       1254
       1254
        
               RuntimeDirectoryMode = "0755";

     

       1255
       1255
        
               # Hardening

     

       1256
       1256
       -
               AmbientCapabilities = lib.mkIf (cfg.port < 1024) [ "CAP_NET_BIND_SERVICE" ];

     

       1257
       1257
       -
               CapabilityBoundingSet = if (cfg.port < 1024) then [ "CAP_NET_BIND_SERVICE" ] else [ "" ];

     

       1256
       1256
       +
               AmbientCapabilities = lib.mkIf (cfg.settings.server.http_port < 1024) [ "CAP_NET_BIND_SERVICE" ];

     

       1257
       1257
       +
               CapabilityBoundingSet = if (cfg.settings.server.http_port < 1024) then [ "CAP_NET_BIND_SERVICE" ] else [ "" ];

     

       1258
       1258
        
               DeviceAllow = [ "" ];

     

       1259
       1259
        
               LockPersonality = true;

     

       1260
       1260
        
               NoNewPrivileges = true;

-1

nixos/modules/services/networking/dnscrypt-proxy2.nix

···

       111
       111
        
                 "~@aio"

     

       112
       112
        
                 "~@keyring"

     

       113
       113
        
                 "~@memlock"

     

       114
       114
       -
                 "~@resources"

     

       115
       114
        
                 "~@setuid"

     

       116
       115
        
                 "~@timer"

     

       117
       116
        
               ];

+1 -1

nixos/modules/services/security/endlessh-go.nix

···

       126
       126
        
                 RestrictRealtime = true;

     

       127
       127
        
                 RestrictSUIDSGID = true;

     

       128
       128
        
                 SystemCallArchitectures = "native";

     

       129
       129
       -
                 SystemCallFilter = [ "@system-service" "~@resources" "~@privileged" ];

     

       129
       129
       +
                 SystemCallFilter = [ "@system-service" "~@privileged" ];

     

       130
       130
        
               };

     

       131
       131
        
           };

     

       132
       132

+1

nixos/tests/all-tests.nix

···

       102
       102
        
         brscan5 = handleTest ./brscan5.nix {};

     

       103
       103
        
         btrbk = handleTest ./btrbk.nix {};

     

       104
       104
        
         btrbk-no-timer = handleTest ./btrbk-no-timer.nix {};

     

       105
       105
       +
         btrbk-section-order = handleTest ./btrbk-section-order.nix {};

     

       105
       106
        
         buildbot = handleTest ./buildbot.nix {};

     

       106
       107
        
         buildkite-agents = handleTest ./buildkite-agents.nix {};

     

       107
       108
        
         caddy = handleTest ./caddy.nix {};

+51

nixos/tests/btrbk-section-order.nix

···

       1
       1
       +
       # This tests validates the order of generated sections that may contain

     

       2
       2
       +
       # other sections.

     

       3
       3
       +
       # When a `volume` section has both `subvolume` and `target` children,

     

       4
       4
       +
       # `target` must go before `subvolume`. Otherwise, `target` will become

     

       5
       5
       +
       # a child of the last `subvolume` instead of `volume`, due to the

     

       6
       6
       +
       # order-sensitive config format.

     

       7
       7
       +
       #

     

       8
       8
       +
       # Issue: https://github.com/NixOS/nixpkgs/issues/195660

     

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

     

       10
       10
       +
         name = "btrbk-section-order";

     

       11
       11
       +
         meta.maintainers = with lib.maintainers; [ oxalica ];

     

       12
       12
       +
       

     

       13
       13
       +
         nodes.machine = { ... }: {

     

       14
       14
       +
           services.btrbk.instances.local = {

     

       15
       15
       +
             onCalendar = null;

     

       16
       16
       +
             settings = {

     

       17
       17
       +
               timestamp_format = "long";

     

       18
       18
       +
               target."ssh://global-target/".ssh_user = "root";

     

       19
       19
       +
               volume."/btrfs" = {

     

       20
       20
       +
                 snapshot_dir = "/volume-snapshots";

     

       21
       21
       +
                 target."ssh://volume-target/".ssh_user = "root";

     

       22
       22
       +
                 subvolume."@subvolume" = {

     

       23
       23
       +
                   snapshot_dir = "/subvolume-snapshots";

     

       24
       24
       +
                   target."ssh://subvolume-target/".ssh_user = "root";

     

       25
       25
       +
                 };

     

       26
       26
       +
               };

     

       27
       27
       +
             };

     

       28
       28
       +
           };

     

       29
       29
       +
         };

     

       30
       30
       +
       

     

       31
       31
       +
         testScript = ''

     

       32
       32
       +
           machine.wait_for_unit("basic.target")

     

       33
       33
       +
           got = machine.succeed("cat /etc/btrbk/local.conf")

     

       34
       34
       +
           expect = """

     

       35
       35
       +
           backend btrfs-progs-sudo

     

       36
       36
       +
           timestamp_format long

     

       37
       37
       +
           target ssh://global-target/

     

       38
       38
       +
            ssh_user root

     

       39
       39
       +
           volume /btrfs

     

       40
       40
       +
            snapshot_dir /volume-snapshots

     

       41
       41
       +
            target ssh://volume-target/

     

       42
       42
       +
             ssh_user root

     

       43
       43
       +
            subvolume @subvolume

     

       44
       44
       +
             snapshot_dir /subvolume-snapshots

     

       45
       45
       +
             target ssh://subvolume-target/

     

       46
       46
       +
              ssh_user root

     

       47
       47
       +
           """.strip()

     

       48
       48
       +
           print(got)

     

       49
       49
       +
           assert got == expect

     

       50
       50
       +
         '';

     

       51
       51
       +
       })

+14 -8

nixos/tests/grafana/basic.nix

···

       6
       6
        
         baseGrafanaConf = {

     

       7
       7
        
           services.grafana = {

     

       8
       8
        
             enable = true;

     

       9
       9
       -
             addr = "localhost";

     

       10
       10
       -
             analytics.reporting.enable = false;

     

       11
       11
       -
             domain = "localhost";

     

       12
       12
       -
             security = {

     

       13
       13
       -
               adminUser = "testadmin";

     

       14
       14
       -
               adminPassword = "snakeoilpwd";

     

       9
       9
       +
             settings = {

     

       10
       10
       +
               analytics.reporting_enabled = false;

     

       11
       11
       +
       

     

       12
       12
       +
               server = {

     

       13
       13
       +
                 http_addr = "localhost";

     

       14
       14
       +
                 domain = "localhost";

     

       15
       15
       +
               };

     

       16
       16
       +
       

     

       17
       17
       +
               security = {

     

       18
       18
       +
                 admin_user = "testadmin";

     

       19
       19
       +
                 admin_password = "snakeoilpwd";

     

       20
       20
       +
               };

     

       15
       21
        
             };

     

       16
       22
        
           };

     

       17
       23
        
         };

     
···

       24
       30
        
           };

     

       25
       31
        
       

     

       26
       32
        
           postgresql = {

     

       27
       27
       -
             services.grafana.database = {

     

       33
       33
       +
             services.grafana.settings.database = {

     

       28
       34
        
               host = "127.0.0.1:5432";

     

       29
       35
        
               user = "grafana";

     

       30
       36
        
             };

     
···

       40
       46
        
           };

     

       41
       47
        
       

     

       42
       48
        
           mysql = {

     

       43
       43
       -
             services.grafana.database.user = "grafana";

     

       49
       49
       +
             services.grafana.settings.database.user = "grafana";

     

       44
       50
        
             services.mysql = {

     

       45
       51
        
               enable = true;

     

       46
       52
        
               ensureDatabases = [ "grafana" ];

+13 -7

nixos/tests/grafana/provision/default.nix

···

       6
       6
        
         baseGrafanaConf = {

     

       7
       7
        
           services.grafana = {

     

       8
       8
        
             enable = true;

     

       9
       9
       -
             addr = "localhost";

     

       10
       10
       -
             analytics.reporting.enable = false;

     

       11
       11
       -
             domain = "localhost";

     

       12
       12
       -
             security = {

     

       13
       13
       -
               adminUser = "testadmin";

     

       14
       14
       -
               adminPassword = "snakeoilpwd";

     

       15
       15
       -
             };

     

       16
       9
        
             provision.enable = true;

     

       10
       10
       +
             settings = {

     

       11
       11
       +
               analytics.reporting_enabled = false;

     

       12
       12
       +
       

     

       13
       13
       +
               server = {

     

       14
       14
       +
                 http_addr = "localhost";

     

       15
       15
       +
                 domain = "localhost";

     

       16
       16
       +
               };

     

       17
       17
       +
       

     

       18
       18
       +
               security = {

     

       19
       19
       +
                 admin_user = "testadmin";

     

       20
       20
       +
                 admin_password = "snakeoilpwd";

     

       21
       21
       +
               };

     

       22
       22
       +
             };

     

       17
       23
        
           };

     

       18
       24
        
       

     

       19
       25
        
           systemd.tmpfiles.rules = [

+3 -3

pkgs/applications/misc/mangal/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "mangal";

     

       5
       5
       -
         version = "3.12.0";

     

       5
       5
       +
         version = "3.14.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "metafates";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           hash = "sha256-1fWy7riInrbReQ0sQ1TF8GhqWQG0KXk1JzhmxlSuvmk=";

     

       11
       11
       +
           hash = "sha256-IQSRPjtMaxwJuiKGjOYQ7jp0mAPS/V6fA1/Ek/K5yqk=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         proxyVendor = true;

     

       15
       15
       -
         vendorSha256 = "sha256-+HDuGSZinotUtCqffrmFkjHegxdArSJMWwnUG/tnLRc=";

     

       15
       15
       +
         vendorSha256 = "sha256-XslNMrFCI+dGaSw7ro1vBMamFukbMA3m0I3hOl9QccM=";

     

       16
       16
        
       

     

       17
       17
        
         ldflags = [ "-s" "-w" ];

     

       18
       18

+6 -6

pkgs/applications/networking/instant-messengers/zoom-us/default.nix

···

       47
       47
        
         # and often with different versions.  We write them on three lines

     

       48
       48
        
         # like this (rather than using {}) so that the updater script can

     

       49
       49
        
         # find where to edit them.

     

       50
       50
       -
         versions.aarch64-darwin = "5.12.0.11129";

     

       51
       51
       -
         versions.x86_64-darwin = "5.12.0.11129";

     

       52
       52
       -
         versions.x86_64-linux = "5.12.0.4682";

     

       50
       50
       +
         versions.aarch64-darwin = "5.12.3.11845";

     

       51
       51
       +
         versions.x86_64-darwin = "5.12.3.11845";

     

       52
       52
       +
         versions.x86_64-linux = "5.12.2.4816";

     

       53
       53
        
       

     

       54
       54
        
         srcs = {

     

       55
       55
        
           aarch64-darwin = fetchurl {

     

       56
       56
        
             url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";

     

       57
       57
        
             name = "zoomusInstallerFull.pkg";

     

       58
       58
       -
             hash = "sha256-0XhqJrls4X8wO9VNmmmUGexJkA9NDkwJkYRjmyV1kAU=";

     

       58
       58
       +
             hash = "sha256-iDLxqG7/cdo60V0mFE3tX/Msi0rRUjoM8X9yq2rlvf0=";

     

       59
       59
        
           };

     

       60
       60
        
           x86_64-darwin = fetchurl {

     

       61
       61
        
             url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";

     

       62
       62
       -
             hash = "sha256-E7+zMrW4y1RfsR1LrxCJRRVlA+BuhzwMI/sfzqNHObo=";

     

       62
       62
       +
             hash = "sha256-+YOtdoh8S50+GHRLb6TPYCqDtry7SnnNqo7USzkDc7c=";

     

       63
       63
        
           };

     

       64
       64
        
           x86_64-linux = fetchurl {

     

       65
       65
        
             url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";

     

       66
       66
       -
             hash = "sha256-UNtxyR4SMCP9c1Dre/arfdSVZbAV8qoHyHlvj3ZbXIs=";

     

       66
       66
       +
             hash = "sha256-kgjooMqeZurzqIn3ADcgFjlqaC58dQNuIAHLx4M0S9I=";

     

       67
       67
        
           };

     

       68
       68
        
         };

     

       69
       69

+2 -2

pkgs/applications/window-managers/e16/default.nix

···

       21
       21
        
       

     

       22
       22
        
       stdenv.mkDerivation rec {

     

       23
       23
        
         pname = "e16";

     

       24
       24
       -
         version = "1.0.25";

     

       24
       24
       +
         version = "1.0.26";

     

       25
       25
        
       

     

       26
       26
        
         src = fetchurl {

     

       27
       27
        
           url = "mirror://sourceforge/enlightenment/e16-${version}.tar.xz";

     

       28
       28
       -
           hash = "sha256-rUtDaBa4vvC3gO7QSkFrphWuVOmbtkH+pRujQDaUOek=";

     

       28
       28
       +
           hash = "sha256-1FJFE4z8UT5VYv0Ef9pqi5sYq8iIbrDPKaqcUFf9dwE=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         nativeBuildInputs = [

+2 -2

pkgs/development/compilers/ballerina/default.nix

···

       1
       1
        
       { ballerina, lib, writeText, runCommand, makeWrapper, fetchzip, stdenv, openjdk }:

     

       2
       2
        
       let

     

       3
       3
       -
         version = "2201.2.1";

     

       3
       3
       +
         version = "2201.2.2";

     

       4
       4
        
         codeName = "swan-lake";

     

       5
       5
        
       in stdenv.mkDerivation {

     

       6
       6
        
         pname = "ballerina";

     
···

       8
       8
        
       

     

       9
       9
        
         src = fetchzip {

     

       10
       10
        
           url = "https://dist.ballerina.io/downloads/${version}/ballerina-${version}-${codeName}.zip";

     

       11
       11
       -
           sha256 = "sha256-QNXaEivwlqBdbpxGCYnfIN/fQkWlVu8lqGWKfLlVB5s=";

     

       11
       11
       +
           sha256 = "sha256-xBr7lsZJKk4VXuUDt7IRQN/ZDH4WrxYjd1mBIoyb9qs=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ makeWrapper ];

+2 -2

pkgs/development/interpreters/clojure/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "clojure";

     

       5
       5
       -
         version = "1.11.1.1165";

     

       5
       5
       +
         version = "1.11.1.1177";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

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

     

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

     

       10
       10
       -
           sha256 = "sha256-UXukXP6Dt1Clj4JGvO5WmuFJ2HJGkPLbyP8xhxU/6dE=";

     

       10
       10
       +
           sha256 = "sha256-Axutyw+f7TPObxcw8llbu3r0zxYIKxFnBuUp+trR9eI=";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [

+2 -2

pkgs/development/libraries/armadillo/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "armadillo";

     

       5
       5
       -
         version = "11.4.1";

     

       5
       5
       +
         version = "11.4.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";

     

       9
       9
       -
           sha256 = "sha256-2ttf01vE3CUbNvXdgHKcPFiNZeLsvNTk41mtnLBFI/s=";

     

       9
       9
       +
           sha256 = "sha256-5oYBNPGsllbGoczHTHS3X4xZZqyGEoQfL78Mkc459Ok=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ cmake ];

+33

pkgs/development/ocaml-modules/bls12-381-signature/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         fetchzip,

     

       4
       4
       +
         buildDunePackage,

     

       5
       5
       +
         bls12-381,

     

       6
       6
       +
         alcotest,

     

       7
       7
       +
         bisect_ppx,

     

       8
       8
       +
         integers_stubs_js,

     

       9
       9
       +
       }:

     

       10
       10
       +
       

     

       11
       11
       +
       buildDunePackage rec {

     

       12
       12
       +
         pname = "bls12-381-signature";

     

       13
       13
       +
         version = "1.0.0";

     

       14
       14
       +
         src = fetchzip {

     

       15
       15
       +
           url = "https://gitlab.com/nomadic-labs/cryptography/ocaml-${pname}/-/archive/${version}/ocaml-bls12-381-signature-${version}.tar.bz2";

     

       16
       16
       +
           sha256 = "sha256-KaUpAT+BWxmUP5obi4loR9vVUeQmz3p3zG3CBolUuL4=";

     

       17
       17
       +
         };

     

       18
       18
       +
       

     

       19
       19
       +
         minimalOCamlVersion = "4.08";

     

       20
       20
       +
       

     

       21
       21
       +
         propagatedBuildInputs = [ bls12-381 ];

     

       22
       22
       +
       

     

       23
       23
       +
         checkInputs = [alcotest bisect_ppx integers_stubs_js];

     

       24
       24
       +
       

     

       25
       25
       +
         doCheck = true;

     

       26
       26
       +
       

     

       27
       27
       +
         meta = {

     

       28
       28
       +
           description = "Implementation of BLS signatures for the pairing-friendly curve BLS12-381";

     

       29
       29
       +
           license = lib.licenses.mit;

     

       30
       30
       +
           homepage = "https://gitlab.com/nomadic-labs/cryptography/ocaml-bls12-381-signature";

     

       31
       31
       +
           maintainers = [lib.maintainers.ulrikstrid];

     

       32
       32
       +
         };

     

       33
       33
       +
       }

+2 -2

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

···

       8
       8
        
       

     

       9
       9
        
       buildDunePackage rec {

     

       10
       10
        
         pname = "git";

     

       11
       11
       -
         version = "3.9.1";

     

       11
       11
       +
         version = "3.10.0";

     

       12
       12
        
       

     

       13
       13
        
         minimalOCamlVersion = "4.08";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchurl {

     

       16
       16
        
           url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz";

     

       17
       17
       -
           sha256 = "sha256-OyeMW5gsq4fMEWRmhzPq2qardFZtMjoQk6mMKz5+Ds4=";

     

       17
       17
       +
           sha256 = "sha256-slUzAT4qwPzUNzHMbib/ArxaGzcMFl8tg0ynq1y5U1M=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         # remove changelog for the carton package

+2 -2

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

···

       25
       25
        
       

     

       26
       26
        
       buildDunePackage rec {

     

       27
       27
        
         pname = "paf";

     

       28
       28
       -
         version = "0.1.0";

     

       28
       28
       +
         version = "0.2.0";

     

       29
       29
        
       

     

       30
       30
        
         src = fetchurl {

     

       31
       31
        
           url = "https://github.com/dinosaure/paf-le-chien/releases/download/${version}/paf-${version}.tbz";

     

       32
       32
       -
           sha256 = "sha256-JIJjECEbajauowbXot19vtiDhTpGAQiSCBY0AHZOyZM=";

     

       32
       32
       +
           sha256 = "sha256-TzhRxFTPkLMAsLPl0ONC8DRhJRGstF58+QRKbGuJZVE=";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         minimalOCamlVersion = "4.08";

+4 -3

pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/default.nix

···

       4
       4
        
         buildDunePackage,

     

       5
       5
        
         bls12-381,

     

       6
       6
        
         data-encoding,

     

       7
       7
       +
         bigstringaf,

     

       7
       8
        
         alcotest,

     

       8
       9
        
         alcotest-lwt,

     

       9
       10
        
         bisect_ppx,

     
···

       12
       13
        
       

     

       13
       14
        
       buildDunePackage rec {

     

       14
       15
        
         pname = "tezos-bls12-381-polynomial";

     

       15
       15
       -
         version = "0.1.2";

     

       16
       16
       +
         version = "0.1.3";

     

       16
       17
        
         duneVersion = "3";

     

       17
       18
        
         src = fetchFromGitLab {

     

       18
       19
        
           owner = "nomadic-labs/cryptography";

     

       19
       20
        
           repo = "privacy-team";

     

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

     

       21
       21
       -
           sha256 = "sha256-HVeKZCPBRJWQXkcI2J7Fl4qGviYLD5x+4W4pAY/W4jA=";

     

       22
       22
       +
           sha256 = "sha256-H1Wog3GItTIVsawr9JkyyKq+uGqbTQPTR1dacpmxLbs=";

     

       22
       23
        
         };

     

       23
       24
        
       

     

       24
       24
       -
         propagatedBuildInputs = [bls12-381 data-encoding];

     

       25
       25
       +
         propagatedBuildInputs = [bls12-381 data-encoding bigstringaf];

     

       25
       26
        
       

     

       26
       27
        
         checkInputs = [alcotest alcotest-lwt bisect_ppx qcheck-alcotest];

     

       27
       28

+27 -8

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

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, isPy3k, six, httplib2, requests }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , pythonOlder

     

       5
       5
       +
       , requests

     

       6
       6
       +
       , typing-extensions

     

       7
       7
       +
       }:

     

       2
       8
        
       

     

       3
       9
        
       buildPythonPackage rec {

     

       4
       10
        
         pname = "mailmanclient";

     

       5
       5
       -
         version = "3.3.3";

     

       6
       6
       -
         disabled = !isPy3k;

     

       11
       11
       +
         version = "3.3.4";

     

       12
       12
       +
         format = "setuptools";

     

       13
       13
       +
       

     

       14
       14
       +
         disabled = pythonOlder "3.7";

     

       7
       15
        
       

     

       8
       16
        
         src = fetchPypi {

     

       9
       17
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "92fe624675e41f41f59de1208e0125dfaa8d062bbe6138bd7cd79e4dd0b6f85e";

     

       18
       18
       +
           hash = "sha256-0y31HXjvU/bwy0s0PcDOlrX1RdyTTnk41ceD4A0R4p4=";

     

       11
       19
        
         };

     

       12
       20
        
       

     

       13
       13
       -
         propagatedBuildInputs = [ six httplib2 requests ];

     

       21
       21
       +
         propagatedBuildInputs = [

     

       22
       22
       +
           requests

     

       23
       23
       +
         ] ++ lib.optionals (pythonOlder "3.8") [

     

       24
       24
       +
           typing-extensions

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       27
       27
       +
         # Tests require a running Mailman instance

     

       28
       28
       +
         doCheck = false;

     

       29
       29
       +
       

     

       30
       30
       +
         pythonImportsCheck = [

     

       31
       31
       +
           "mailmanclient"

     

       32
       32
       +
         ];

     

       14
       33
        
       

     

       15
       34
        
         meta = with lib; {

     

       16
       16
       -
           homepage = "https://www.gnu.org/software/mailman/";

     

       17
       35
        
           description = "REST client for driving Mailman 3";

     

       18
       18
       -
           license = licenses.lgpl3;

     

       19
       19
       -
           platforms = platforms.linux;

     

       36
       36
       +
           homepage = "https://www.gnu.org/software/mailman/";

     

       37
       37
       +
           license = licenses.lgpl3Plus;

     

       20
       38
        
           maintainers = with maintainers; [ globin qyliss ];

     

       39
       39
       +
           platforms = platforms.linux;

     

       21
       40
        
         };

     

       22
       41
        
       }

+3 -3

pkgs/servers/minio/default.nix

···

       15
       15
        
       in

     

       16
       16
        
       buildGoModule rec {

     

       17
       17
        
         pname = "minio";

     

       18
       18
       -
         version = "2022-10-20T00-55-09Z";

     

       18
       18
       +
         version = "2022-10-21T22-37-48Z";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchFromGitHub {

     

       21
       21
        
           owner = "minio";

     

       22
       22
        
           repo = "minio";

     

       23
       23
        
           rev = "RELEASE.${version}";

     

       24
       24
       -
           sha256 = "sha256-O3+2FKAiprFucx05T9lYcA30yr9KSlDF9VEbAgH4B0E=";

     

       24
       24
       +
           sha256 = "sha256-kdf1V7qg/UwVASYYSAY2kfT8m+cmOnAb69FVzdzvZ5Y=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
       -
         vendorSha256 = "sha256-dl+7K/Vd1ybCc1IHwITaHroeLymyk5kWqqIwmLgYYA8=";

     

       27
       27
       +
         vendorSha256 = "sha256-m2U2VfUBAmPMFOXhSCQCxtwWI1eFh5TLAp8Izqi8HLQ=";

     

       28
       28
        
       

     

       29
       29
        
         doCheck = false;

     

       30
       30

+1 -1

pkgs/tools/admin/coldsnap/default.nix

···

       27
       27
        
           description = "A command line interface for Amazon EBS snapshots";

     

       28
       28
        
           changelog = "https://github.com/awslabs/coldsnap/blob/${src.rev}/CHANGELOG.md";

     

       29
       29
        
           license = licenses.apsl20;

     

       30
       30
       -
           maintainers = with maintainers; [ hoverbear ];

     

       30
       30
       +
           maintainers = teams.determinatesystems.members;

     

       31
       31
        
         };

     

       32
       32
        
       }

+2 -2

pkgs/tools/misc/gummy/default.nix

···

       13
       13
        
       

     

       14
       14
        
       stdenv.mkDerivation rec {

     

       15
       15
        
         pname = "gummy";

     

       16
       16
       -
         version = "0.2";

     

       16
       16
       +
         version = "0.3";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           owner = "fushko";

     

       20
       20
        
           repo = "gummy";

     

       21
       21
        
           rev = version;

     

       22
       22
       -
           sha256 = "sha256-nX5wEJ4HmgFHIgJP2MstBzQjU/9lrXOXoIl1vlolqak=";

     

       22
       22
       +
           sha256 = "sha256-dw2yOXTS61OIe+NOq8MPydhkZvTit13eC7cbL5nFseg=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [

+10 -3

pkgs/tools/security/jadx/default.nix

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         pname = "jadx";

     

       5
       5
       -
         version = "1.4.4";

     

       5
       5
       +
         version = "1.4.5";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "skylot";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           hash = "sha256-ku82SHCJhrruJEiojH6Rp7FUWvM8KtvDivL8CE5C8gc=";

     

       11
       11
       +
           hash = "sha256-so82zzCXIJV5tIVUBJFZEpArThNQVqWASGofNzIobQM=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         deps = stdenv.mkDerivation {

     
···

       37
       37
        
             find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \

     

       38
       38
        
               | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \

     

       39
       39
        
               | sh

     

       40
       40
       +
       

     

       41
       41
       +
             # Work around okio-2.10.0 bug, fixed in 3.0. Remove "-jvm" from filename.

     

       42
       42
       +
             # https://github.com/square/okio/issues/954

     

       43
       43
       +
             mv $out/com/squareup/okio/okio/2.10.0/okio{-jvm,}-2.10.0.jar

     

       40
       44
        
           '';

     

       41
       45
        
       

     

       42
       46
        
           outputHashMode = "recursive";

     

       43
       43
       -
           outputHash = "sha256-nGejkCScX45VMT2nNArqG+fqOGvDwzeH9Xob4XMtdow=";

     

       47
       47
       +
           outputHash = "sha256-J6YpBYVqx+aWiMFX/67T7bhu4RTlKVaT4t359YJ6m7I=";

     

       44
       48
        
         };

     

       45
       49
        
       in stdenv.mkDerivation {

     

       46
       50
        
         inherit pname version src;

     

       47
       51
        
       

     

       48
       52
        
         nativeBuildInputs = [ gradle jdk makeWrapper ];

     

       53
       53
       +
       

     

       54
       54
       +
         # Otherwise, Gradle fails with `java.net.SocketException: Operation not permitted`

     

       55
       55
       +
         __darwinAllowLocalNetworking = true;

     

       49
       56
        
       

     

       50
       57
        
         buildPhase = ''

     

       51
       58
        
           # The installDist Gradle build phase tries to copy some dependency .jar

+1 -3

pkgs/top-level/all-packages.nix

···

       7160
       7160
        
       

     

       7161
       7161
        
         git-latexdiff = callPackage ../tools/typesetting/git-latexdiff { };

     

       7162
       7162
        
       

     

       7163
       7163
       -
         gitea = callPackage ../applications/version-management/gitea {

     

       7164
       7164
       -
           buildGoPackage = buildGo118Package; # nixosTests.gitea fails with 1.19

     

       7165
       7165
       -
         };

     

       7163
       7163
       +
         gitea = callPackage ../applications/version-management/gitea { };

     

       7166
       7164
        
       

     

       7167
       7165
        
         gokart = callPackage ../development/tools/gokart { };

     

       7168
       7166

+2

pkgs/top-level/ocaml-packages.nix

···

       94
       94
        
           bls12-381-gen = callPackage ../development/ocaml-modules/bls12-381/gen.nix { };

     

       95
       95
        
           bls12-381-legacy = callPackage ../development/ocaml-modules/bls12-381/legacy.nix { };

     

       96
       96
        
       

     

       97
       97
       +
           bls12-381-signature = callPackage ../development/ocaml-modules/bls12-381-signature { };

     

       98
       98
       +
       

     

       97
       99
        
           bos = callPackage ../development/ocaml-modules/bos { };

     

       98
       100
        
       

     

       99
       101
        
           brisk-reconciler = callPackage ../development/ocaml-modules/brisk-reconciler { };