commit 8c62479810b6133768092e96a0fc1bb0d3bebbb9 · pyrox.dev/nixpkgs

+1

doc/README.md

···

       3
       3
        
       This directory houses the sources files for the Nixpkgs manual.

     

       4
       4
        
       

     

       5
       5
        
       You can find the [rendered documentation for Nixpkgs `unstable` on nixos.org](https://nixos.org/manual/nixpkgs/unstable/).

     

       6
       6
       +
       The rendering tool is [nixos-render-docs](../pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs), sometimes abbreviated `nrd`.

     

       6
       7
        
       

     

       7
       8
        
       [Docs for Nixpkgs stable](https://nixos.org/manual/nixpkgs/stable/) are also available.

     

       8
       9

+64 -26

lib/options.nix

···

       109
       109
        
       

     

       110
       110
        
            The package is specified in the third argument under `default` as a list of strings

     

       111
       111
        
            representing its attribute path in nixpkgs (or another package set).

     

       112
       112
       -
            Because of this, you need to pass nixpkgs itself (or a subset) as the first argument.

     

       112
       112
       +
            Because of this, you need to pass nixpkgs itself (usually `pkgs` in a module;

     

       113
       113
       +
            alternatively to nixpkgs itself, another package set) as the first argument.

     

       114
       114
       +
       

     

       115
       115
       +
            If you pass another package set you should set the `pkgsText` option.

     

       116
       116
       +
            This option is used to display the expression for the package set. It is `"pkgs"` by default.

     

       117
       117
       +
            If your expression is complex you should parenthesize it, as the `pkgsText` argument

     

       118
       118
       +
            is usually immediately followed by an attribute lookup (`.`).

     

       113
       119
        
       

     

       114
       120
        
            The second argument may be either a string or a list of strings.

     

       115
       121
        
            It provides the display name of the package in the description of the generated option

     
···

       118
       124
        
       

     

       119
       125
        
            To include extra information in the description, pass `extraDescription` to

     

       120
       126
        
            append arbitrary text to the generated description.

     

       127
       127
       +
       

     

       121
       128
        
            You can also pass an `example` value, either a literal string or an attribute path.

     

       122
       129
        
       

     

       123
       123
       -
            The default argument can be omitted if the provided name is

     

       124
       124
       -
            an attribute of pkgs (if name is a string) or a

     

       125
       125
       -
            valid attribute path in pkgs (if name is a list).

     

       130
       130
       +
            The `default` argument can be omitted if the provided name is

     

       131
       131
       +
            an attribute of pkgs (if `name` is a string) or a valid attribute path in pkgs (if `name` is a list).

     

       132
       132
       +
            You can also set `default` to just a string in which case it is interpreted as an attribute name

     

       133
       133
       +
            (a singleton attribute path, if you will).

     

       126
       134
        
       

     

       127
       135
        
            If you wish to explicitly provide no default, pass `null` as `default`.

     

       128
       136
        
       

     

       129
       129
       -
            Type: mkPackageOption :: pkgs -> (string|[string]) -> { default? :: [string], example? :: null|string|[string], extraDescription? :: string } -> option

     

       137
       137
       +
            If you want users to be able to set no package, pass `nullable = true`.

     

       138
       138
       +
            In this mode a `default = null` will not be interpreted as no default and is interpreted literally.

     

       139
       139
       +
       

     

       140
       140
       +
            Type: mkPackageOption :: pkgs -> (string|[string]) -> { nullable? :: bool, default? :: string|[string], example? :: null|string|[string], extraDescription? :: string, pkgsText? :: string } -> option

     

       130
       141
        
       

     

       131
       142
        
            Example:

     

       132
       143
        
              mkPackageOption pkgs "hello" { }

     

       133
       133
       -
              => { _type = "option"; default = «derivation /nix/store/3r2vg51hlxj3cx5vscp0vkv60bqxkaq0-hello-2.10.drv»; defaultText = { ... }; description = "The hello package to use."; type = { ... }; }

     

       144
       144
       +
              => { ...; default = pkgs.hello; defaultText = literalExpression "pkgs.hello"; description = "The hello package to use."; type = package; }

     

       134
       145
        
       

     

       135
       146
        
            Example:

     

       136
       147
        
              mkPackageOption pkgs "GHC" {

     

       137
       148
        
                default = [ "ghc" ];

     

       138
       149
        
                example = "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])";

     

       139
       150
        
              }

     

       140
       140
       -
              => { _type = "option"; default = «derivation /nix/store/jxx55cxsjrf8kyh3fp2ya17q99w7541r-ghc-8.10.7.drv»; defaultText = { ... }; description = "The GHC package to use."; example = { ... }; type = { ... }; }

     

       151
       151
       +
              => { ...; default = pkgs.ghc; defaultText = literalExpression "pkgs.ghc"; description = "The GHC package to use."; example = literalExpression "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])"; type = package; }

     

       141
       152
        
       

     

       142
       153
        
            Example:

     

       143
       143
       -
              mkPackageOption pkgs [ "python39Packages" "pytorch" ] {

     

       154
       154
       +
              mkPackageOption pkgs [ "python3Packages" "pytorch" ] {

     

       144
       155
        
                extraDescription = "This is an example and doesn't actually do anything.";

     

       145
       156
        
              }

     

       146
       146
       -
              => { _type = "option"; default = «derivation /nix/store/gvqgsnc4fif9whvwd9ppa568yxbkmvk8-python3.9-pytorch-1.10.2.drv»; defaultText = { ... }; description = "The pytorch package to use. This is an example and doesn't actually do anything."; type = { ... }; }

     

       157
       157
       +
              => { ...; default = pkgs.python3Packages.pytorch; defaultText = literalExpression "pkgs.python3Packages.pytorch"; description = "The pytorch package to use. This is an example and doesn't actually do anything."; type = package; }

     

       147
       158
        
       

     

       159
       159
       +
            Example:

     

       160
       160
       +
              mkPackageOption pkgs "nushell" {

     

       161
       161
       +
                nullable = true;

     

       162
       162
       +
              }

     

       163
       163
       +
              => { ...; default = pkgs.nushell; defaultText = literalExpression "pkgs.nushell"; description = "The nushell package to use."; type = nullOr package; }

     

       164
       164
       +
       

     

       165
       165
       +
            Example:

     

       166
       166
       +
              mkPackageOption pkgs "coreutils" {

     

       167
       167
       +
                default = null;

     

       168
       168
       +
              }

     

       169
       169
       +
              => { ...; description = "The coreutils package to use."; type = package; }

     

       170
       170
       +
       

     

       171
       171
       +
            Example:

     

       172
       172
       +
              mkPackageOption pkgs "dbus" {

     

       173
       173
       +
                nullable = true;

     

       174
       174
       +
                default = null;

     

       175
       175
       +
              }

     

       176
       176
       +
              => { ...; default = null; description = "The dbus package to use."; type = nullOr package; }

     

       177
       177
       +
       

     

       178
       178
       +
            Example:

     

       179
       179
       +
              mkPackageOption pkgs.javaPackages "OpenJFX" {

     

       180
       180
       +
                default = "openjfx20";

     

       181
       181
       +
                pkgsText = "pkgs.javaPackages";

     

       182
       182
       +
              }

     

       183
       183
       +
              => { ...; default = pkgs.javaPackages.openjfx20; defaultText = literalExpression "pkgs.javaPackages.openjfx20"; description = "The OpenJFX package to use."; type = package; }

     

       148
       184
        
         */

     

       149
       185
        
         mkPackageOption =

     

       150
       150
       -
           # Package set (a specific version of nixpkgs or a subset)

     

       186
       186
       +
           # Package set (an instantiation of nixpkgs such as pkgs in modules or another package set)

     

       151
       187
        
           pkgs:

     

       152
       188
        
             # Name for the package, shown in option description

     

       153
       189
        
             name:

     

       154
       190
        
             {

     

       155
       155
       -
               # Whether the package can be null, for example to disable installing a package altogether.

     

       191
       191
       +
               # Whether the package can be null, for example to disable installing a package altogether (defaults to false)

     

       156
       192
        
               nullable ? false,

     

       157
       157
       -
               # The attribute path where the default package is located (may be omitted)

     

       193
       193
       +
               # The attribute path where the default package is located (may be omitted, in which case it is copied from `name`)

     

       158
       194
        
               default ? name,

     

       159
       195
        
               # A string or an attribute path to use as an example (may be omitted)

     

       160
       196
        
               example ? null,

     

       161
       197
        
               # Additional text to include in the option description (may be omitted)

     

       162
       198
        
               extraDescription ? "",

     

       199
       199
       +
               # Representation of the package set passed as pkgs (defaults to `"pkgs"`)

     

       200
       200
       +
               pkgsText ? "pkgs"

     

       163
       201
        
             }:

     

       164
       202
        
             let

     

       165
       203
        
               name' = if isList name then last name else name;

     

       166
       166
       -
             in mkOption ({

     

       167
       167
       -
               type = with lib.types; (if nullable then nullOr else lib.id) package;

     

       204
       204
       +
               default' = if isList default then default else [ default ];

     

       205
       205
       +
               defaultText = concatStringsSep "." default';

     

       206
       206
       +
               defaultValue = attrByPath default'

     

       207
       207
       +
                 (throw "${defaultText} cannot be found in ${pkgsText}") pkgs;

     

       208
       208
       +
               defaults = if default != null then {

     

       209
       209
       +
                 default = defaultValue;

     

       210
       210
       +
                 defaultText = literalExpression ("${pkgsText}." + defaultText);

     

       211
       211
       +
               } else optionalAttrs nullable {

     

       212
       212
       +
                 default = null;

     

       213
       213
       +
               };

     

       214
       214
       +
             in mkOption (defaults // {

     

       168
       215
        
               description = "The ${name'} package to use."

     

       169
       216
        
                 + (if extraDescription == "" then "" else " ") + extraDescription;

     

       170
       170
       -
             } // (if default != null then let

     

       171
       171
       -
               default' = if isList default then default else [ default ];

     

       172
       172
       -
               defaultPath = concatStringsSep "." default';

     

       173
       173
       -
               defaultValue = attrByPath default'

     

       174
       174
       -
                 (throw "${defaultPath} cannot be found in pkgs") pkgs;

     

       175
       175
       -
             in {

     

       176
       176
       -
               default = defaultValue;

     

       177
       177
       -
               defaultText = literalExpression ("pkgs." + defaultPath);

     

       178
       178
       -
             } else if nullable then {

     

       179
       179
       -
               default = null;

     

       180
       180
       -
             } else { }) // lib.optionalAttrs (example != null) {

     

       217
       217
       +
               type = with lib.types; (if nullable then nullOr else lib.id) package;

     

       218
       218
       +
             } // optionalAttrs (example != null) {

     

       181
       219
        
               example = literalExpression

     

       182
       182
       -
                 (if isList example then "pkgs." + concatStringsSep "." example else example);

     

       220
       220
       +
                 (if isList example then "${pkgsText}." + concatStringsSep "." example else example);

     

       183
       221
        
             });

     

       184
       222
        
       

     

       185
       223
        
         /* Alias of mkPackageOption. Previously used to create options with markdown

+8

lib/tests/modules.sh

···

       227
       227
        
       

     

       228
       228
        
       # Check mkPackageOption

     

       229
       229
        
       checkConfigOutput '^"hello"$' config.package.pname ./declare-mkPackageOption.nix

     

       230
       230
       +
       checkConfigOutput '^"hello"$' config.namedPackage.pname ./declare-mkPackageOption.nix

     

       231
       231
       +
       checkConfigOutput '^".*Hello.*"$' options.namedPackage.description ./declare-mkPackageOption.nix

     

       232
       232
       +
       checkConfigOutput '^"hello"$' config.pathPackage.pname ./declare-mkPackageOption.nix

     

       233
       233
       +
       checkConfigOutput '^"pkgs\.hello\.override \{ stdenv = pkgs\.clangStdenv; \}"$' options.packageWithExample.example.text ./declare-mkPackageOption.nix

     

       234
       234
       +
       checkConfigOutput '^".*Example extra description\..*"$' options.packageWithExtraDescription.description ./declare-mkPackageOption.nix

     

       230
       235
        
       checkConfigError 'The option .undefinedPackage. is used but not defined' config.undefinedPackage ./declare-mkPackageOption.nix

     

       231
       236
        
       checkConfigOutput '^null$' config.nullablePackage ./declare-mkPackageOption.nix

     

       237
       237
       +
       checkConfigOutput '^"null or package"$' options.nullablePackageWithDefault.type.description ./declare-mkPackageOption.nix

     

       238
       238
       +
       checkConfigOutput '^"myPkgs\.hello"$' options.packageWithPkgsText.defaultText.text ./declare-mkPackageOption.nix

     

       239
       239
       +
       checkConfigOutput '^"hello-other"$' options.packageFromOtherSet.default.pname ./declare-mkPackageOption.nix

     

       232
       240
        
       

     

       233
       241
        
       # submoduleWith

     

       234
       242

+34

lib/tests/modules/declare-mkPackageOption.nix

···

       7
       7
        
         options = {

     

       8
       8
        
           package = lib.mkPackageOption pkgs "hello" { };

     

       9
       9
        
       

     

       10
       10
       +
           namedPackage = lib.mkPackageOption pkgs "Hello" {

     

       11
       11
       +
             default = [ "hello" ];

     

       12
       12
       +
           };

     

       13
       13
       +
       

     

       14
       14
       +
           namedPackageSingletonDefault = lib.mkPackageOption pkgs "Hello" {

     

       15
       15
       +
             default = "hello";

     

       16
       16
       +
           };

     

       17
       17
       +
       

     

       18
       18
       +
           pathPackage = lib.mkPackageOption pkgs [ "hello" ] { };

     

       19
       19
       +
       

     

       20
       20
       +
           packageWithExample = lib.mkPackageOption pkgs "hello" {

     

       21
       21
       +
             example = "pkgs.hello.override { stdenv = pkgs.clangStdenv; }";

     

       22
       22
       +
           };

     

       23
       23
       +
       

     

       24
       24
       +
           packageWithPathExample = lib.mkPackageOption pkgs "hello" {

     

       25
       25
       +
             example = [ "hello" ];

     

       26
       26
       +
           };

     

       27
       27
       +
       

     

       28
       28
       +
           packageWithExtraDescription = lib.mkPackageOption pkgs "hello" {

     

       29
       29
       +
             extraDescription = "Example extra description.";

     

       30
       30
       +
           };

     

       31
       31
       +
       

     

       10
       32
        
           undefinedPackage = lib.mkPackageOption pkgs "hello" {

     

       11
       33
        
             default = null;

     

       12
       34
        
           };

     
···

       15
       37
        
             nullable = true;

     

       16
       38
        
             default = null;

     

       17
       39
        
           };

     

       40
       40
       +
       

     

       41
       41
       +
           nullablePackageWithDefault = lib.mkPackageOption pkgs "hello" {

     

       42
       42
       +
             nullable = true;

     

       43
       43
       +
           };

     

       44
       44
       +
       

     

       45
       45
       +
           packageWithPkgsText = lib.mkPackageOption pkgs "hello" {

     

       46
       46
       +
             pkgsText = "myPkgs";

     

       47
       47
       +
           };

     

       48
       48
       +
       

     

       49
       49
       +
           packageFromOtherSet = let myPkgs = {

     

       50
       50
       +
             hello = pkgs.hello // { pname = "hello-other"; };

     

       51
       51
       +
           }; in lib.mkPackageOption myPkgs "hello" { };

     

       18
       52
        
         };

     

       19
       53
        
       }

+10

maintainers/maintainer-list.nix

···

       18062
       18062
        
           githubId = 1607770;

     

       18063
       18063
        
           name = "Ulrik Strid";

     

       18064
       18064
        
         };

     

       18065
       18065
       +
         unclamped = {

     

       18066
       18066
       +
           name = "Maru";

     

       18067
       18067
       +
           email = "clear6860@tutanota.com";

     

       18068
       18068
       +
           matrix = "@unhidden0174:matrix.org";

     

       18069
       18069
       +
           github = "unclamped";

     

       18070
       18070
       +
           githubId = 104658278;

     

       18071
       18071
       +
           keys = [{

     

       18072
       18072
       +
             fingerprint = "57A2 CC43 3068 CB62 89C1  F1DA 9137 BB2E 77AD DE7E";

     

       18073
       18073
       +
           }];

     

       18074
       18074
       +
         };

     

       18065
       18075
        
         unclechu = {

     

       18066
       18076
        
           name = "Viacheslav Lotsmanov";

     

       18067
       18077
        
           email = "lotsmanov89@gmail.com";

+1

nixos/modules/module-list.nix

···

       882
       882
        
         ./services/networking/croc.nix

     

       883
       883
        
         ./services/networking/dae.nix

     

       884
       884
        
         ./services/networking/dante.nix

     

       885
       885
       +
         ./services/networking/deconz.nix

     

       885
       886
        
         ./services/networking/dhcpcd.nix

     

       886
       887
        
         ./services/networking/dnscache.nix

     

       887
       888
        
         ./services/networking/dnscrypt-proxy2.nix

+60 -22

nixos/modules/services/matrix/synapse.nix

···

       72
       72
        
           inherit (cfg) plugins;

     

       73
       73
        
         };

     

       74
       74
        
       

     

       75
       75
       -
         logConfig = logName: {

     

       75
       75
       +
         defaultCommonLogConfig = {

     

       76
       76
        
           version = 1;

     

       77
       77
        
           formatters.journal_fmt.format = "%(name)s: [%(request)s] %(message)s";

     

       78
       78
        
           handlers.journal = {

     

       79
       79
        
             class = "systemd.journal.JournalHandler";

     

       80
       80
        
             formatter = "journal_fmt";

     

       81
       81
       -
             SYSLOG_IDENTIFIER = logName;

     

       82
       81
        
           };

     

       83
       82
        
           root = {

     

       84
       83
        
             level = "INFO";

     
···

       86
       85
        
           };

     

       87
       86
        
           disable_existing_loggers = false;

     

       88
       87
        
         };

     

       88
       88
       +
       

     

       89
       89
       +
         defaultCommonLogConfigText = generators.toPretty { } defaultCommonLogConfig;

     

       90
       90
       +
       

     

       89
       91
        
         logConfigText = logName:

     

       90
       90
       -
           let

     

       91
       91
       -
             expr = ''

     

       92
       92
       -
               {

     

       93
       93
       -
                 version = 1;

     

       94
       94
       -
                 formatters.journal_fmt.format = "%(name)s: [%(request)s] %(message)s";

     

       95
       95
       -
                 handlers.journal = {

     

       96
       96
       -
                   class = "systemd.journal.JournalHandler";

     

       97
       97
       -
                   formatter = "journal_fmt";

     

       98
       98
       -
                   SYSLOG_IDENTIFIER = "${logName}";

     

       99
       99
       -
                 };

     

       100
       100
       -
                 root = {

     

       101
       101
       -
                   level = "INFO";

     

       102
       102
       -
                   handlers = [ "journal" ];

     

       103
       103
       -
                 };

     

       104
       104
       -
                 disable_existing_loggers = false;

     

       105
       105
       -
               };

     

       106
       106
       -
             '';

     

       107
       107
       -
           in

     

       108
       92
        
           lib.literalMD ''

     

       109
       93
        
             Path to a yaml file generated from this Nix expression:

     

       110
       94
        
       

     

       111
       95
        
             ```

     

       112
       112
       -
             ${expr}

     

       96
       96
       +
             ${generators.toPretty { } (

     

       97
       97
       +
               recursiveUpdate defaultCommonLogConfig { handlers.journal.SYSLOG_IDENTIFIER = logName; }

     

       98
       98
       +
             )}

     

       113
       99
        
             ```

     

       114
       100
        
           '';

     

       115
       115
       -
         genLogConfigFile = logName: format.generate "synapse-log-${logName}.yaml" (logConfig logName);

     

       101
       101
       +
       

     

       102
       102
       +
         genLogConfigFile = logName: format.generate

     

       103
       103
       +
           "synapse-log-${logName}.yaml"

     

       104
       104
       +
           (cfg.log // optionalAttrs (cfg.log?handlers.journal) {

     

       105
       105
       +
             handlers.journal = cfg.log.handlers.journal // {

     

       106
       106
       +
               SYSLOG_IDENTIFIER = logName;

     

       107
       107
       +
             };

     

       108
       108
       +
           });

     

       116
       109
        
       in {

     

       117
       110
        
       

     

       118
       111
        
         imports = [

     
···

       393
       386
        
               description = lib.mdDoc ''

     

       394
       387
        
                 The directory where matrix-synapse stores its stateful data such as

     

       395
       388
        
                 certificates, media and uploads.

     

       389
       389
       +
               '';

     

       390
       390
       +
             };

     

       391
       391
       +
       

     

       392
       392
       +
             log = mkOption {

     

       393
       393
       +
               type = types.attrsOf format.type;

     

       394
       394
       +
               defaultText = literalExpression defaultCommonLogConfigText;

     

       395
       395
       +
               description = mdDoc ''

     

       396
       396
       +
                 Default configuration for the loggers used by `matrix-synapse` and its workers.

     

       397
       397
       +
                 The defaults are added with the default priority which means that

     

       398
       398
       +
                 these will be merged with additional declarations. These additional

     

       399
       399
       +
                 declarations also take precedence over the defaults when declared

     

       400
       400
       +
                 with at least normal priority. For instance

     

       401
       401
       +
                 the log-level for synapse and its workers can be changed like this:

     

       402
       402
       +
       

     

       403
       403
       +
                 ```nix

     

       404
       404
       +
                 { lib, ... }: {

     

       405
       405
       +
                   services.matrix-synapse.log.root.level = "WARNING";

     

       406
       406
       +
                 }

     

       407
       407
       +
                 ```

     

       408
       408
       +
       

     

       409
       409
       +
                 And another field can be added like this:

     

       410
       410
       +
       

     

       411
       411
       +
                 ```nix

     

       412
       412
       +
                 {

     

       413
       413
       +
                   services.matrix-synapse.log = {

     

       414
       414
       +
                     loggers."synapse.http.matrixfederationclient".level = "DEBUG";

     

       415
       415
       +
                   };

     

       416
       416
       +
                 }

     

       417
       417
       +
                 ```

     

       418
       418
       +
       

     

       419
       419
       +
                 Additionally, the field `handlers.journal.SYSLOG_IDENTIFIER` will be added to

     

       420
       420
       +
                 each log config, i.e.

     

       421
       421
       +
                 * `synapse` for `matrix-synapse.service`

     

       422
       422
       +
                 * `synapse-<worker name>` for `matrix-synapse-worker-<worker name>.service`

     

       423
       423
       +
       

     

       424
       424
       +
                 This is only done if this option has a `handlers.journal` field declared.

     

       425
       425
       +
       

     

       426
       426
       +
                 To discard all settings declared by this option for each worker and synapse,

     

       427
       427
       +
                 `lib.mkForce` can be used.

     

       428
       428
       +
       

     

       429
       429
       +
                 To discard all settings declared by this option for a single worker or synapse only,

     

       430
       430
       +
                 [](#opt-services.matrix-synapse.workers._name_.worker_log_config) or

     

       431
       431
       +
                 [](#opt-services.matrix-synapse.settings.log_config) can be used.

     

       396
       432
        
               '';

     

       397
       433
        
             };

     

       398
       434
        
       

     
···

       992
       1028
        
       

     

       993
       1029
        
           # default them, so they are additive

     

       994
       1030
        
           services.matrix-synapse.extras = defaultExtras;

     

       1031
       1031
       +
       

     

       1032
       1032
       +
           services.matrix-synapse.log = mapAttrsRecursive (const mkDefault) defaultCommonLogConfig;

     

       995
       1033
        
       

     

       996
       1034
        
           users.users.matrix-synapse = {

     

       997
       1035
        
             group = "matrix-synapse";

+125

nixos/modules/services/networking/deconz.nix

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         cfg = config.services.deconz;

     

       5
       5
       +
         name = "deconz";

     

       6
       6
       +
         stateDir = "/var/lib/${name}";

     

       7
       7
       +
         # ref. upstream deconz.service

     

       8
       8
       +
         capabilities =

     

       9
       9
       +
           lib.optionals (cfg.httpPort < 1024 || cfg.wsPort < 1024) [ "CAP_NET_BIND_SERVICE" ]

     

       10
       10
       +
           ++ lib.optionals (cfg.allowRebootSystem) [ "CAP_SYS_BOOT" ]

     

       11
       11
       +
           ++ lib.optionals (cfg.allowRestartService) [ "CAP_KILL" ]

     

       12
       12
       +
           ++ lib.optionals (cfg.allowSetSystemTime) [ "CAP_SYS_TIME" ];

     

       13
       13
       +
       in

     

       14
       14
       +
       {

     

       15
       15
       +
         options.services.deconz = {

     

       16
       16
       +
       

     

       17
       17
       +
           enable = lib.mkEnableOption "deCONZ, a Zigbee gateway for use with ConBee hardware (https://phoscon.de/en/conbee2)";

     

       18
       18
       +
       

     

       19
       19
       +
           package = lib.mkOption {

     

       20
       20
       +
             type = lib.types.package;

     

       21
       21
       +
             default = pkgs.deconz;

     

       22
       22
       +
             defaultText = lib.literalExpression "pkgs.deconz";

     

       23
       23
       +
             description = "Which deCONZ package to use.";

     

       24
       24
       +
           };

     

       25
       25
       +
       

     

       26
       26
       +
           device = lib.mkOption {

     

       27
       27
       +
             type = lib.types.nullOr lib.types.str;

     

       28
       28
       +
             default = null;

     

       29
       29
       +
             description = ''

     

       30
       30
       +
               Force deCONZ to use a specific USB device (e.g. /dev/ttyACM0). By

     

       31
       31
       +
               default it does a search.

     

       32
       32
       +
             '';

     

       33
       33
       +
           };

     

       34
       34
       +
       

     

       35
       35
       +
           listenAddress = lib.mkOption {

     

       36
       36
       +
             type = lib.types.str;

     

       37
       37
       +
             default = "127.0.0.1";

     

       38
       38
       +
             description = ''

     

       39
       39
       +
               Pin deCONZ to the network interface specified through the provided IP

     

       40
       40
       +
               address. This applies for the webserver as well as the websocket

     

       41
       41
       +
               notifications.

     

       42
       42
       +
             '';

     

       43
       43
       +
           };

     

       44
       44
       +
       

     

       45
       45
       +
           httpPort = lib.mkOption {

     

       46
       46
       +
             type = lib.types.port;

     

       47
       47
       +
             default = 80;

     

       48
       48
       +
             description = "TCP port for the web server.";

     

       49
       49
       +
           };

     

       50
       50
       +
       

     

       51
       51
       +
           wsPort = lib.mkOption {

     

       52
       52
       +
             type = lib.types.port;

     

       53
       53
       +
             default = 443;

     

       54
       54
       +
             description = "TCP port for the WebSocket.";

     

       55
       55
       +
           };

     

       56
       56
       +
       

     

       57
       57
       +
           openFirewall = lib.mkEnableOption "open up the service ports in the firewall";

     

       58
       58
       +
       

     

       59
       59
       +
           allowRebootSystem = lib.mkEnableOption "allow rebooting the system";

     

       60
       60
       +
       

     

       61
       61
       +
           allowRestartService = lib.mkEnableOption "allow killing/restarting processes";

     

       62
       62
       +
       

     

       63
       63
       +
           allowSetSystemTime = lib.mkEnableOption "allow setting the system time";

     

       64
       64
       +
       

     

       65
       65
       +
           extraArgs = lib.mkOption {

     

       66
       66
       +
             type = lib.types.listOf lib.types.str;

     

       67
       67
       +
             default = [ ];

     

       68
       68
       +
             example = [

     

       69
       69
       +
               "--dbg-info=1"

     

       70
       70
       +
               "--dbg-err=2"

     

       71
       71
       +
             ];

     

       72
       72
       +
             description = ''

     

       73
       73
       +
               Extra command line arguments for deCONZ, see

     

       74
       74
       +
               https://github.com/dresden-elektronik/deconz-rest-plugin/wiki/deCONZ-command-line-parameters.

     

       75
       75
       +
             '';

     

       76
       76
       +
           };

     

       77
       77
       +
         };

     

       78
       78
       +
       

     

       79
       79
       +
         config = lib.mkIf cfg.enable {

     

       80
       80
       +
       

     

       81
       81
       +
           networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [

     

       82
       82
       +
             cfg.httpPort

     

       83
       83
       +
             cfg.wsPort

     

       84
       84
       +
           ];

     

       85
       85
       +
       

     

       86
       86
       +
           services.udev.packages = [ cfg.package ];

     

       87
       87
       +
       

     

       88
       88
       +
           systemd.services.deconz = {

     

       89
       89
       +
             description = "deCONZ Zigbee gateway";

     

       90
       90
       +
             wantedBy = [ "multi-user.target" ];

     

       91
       91
       +
             preStart = ''

     

       92
       92
       +
               # The service puts a nix store path reference in here, and that path can

     

       93
       93
       +
               # be garbage collected. Ensure the file gets "refreshed" on every start.

     

       94
       94
       +
               rm -f ${stateDir}/.local/share/dresden-elektronik/deCONZ/zcldb.txt

     

       95
       95
       +
             '';

     

       96
       96
       +
             environment = {

     

       97
       97
       +
               HOME = stateDir;

     

       98
       98
       +
               XDG_RUNTIME_DIR = "/run/${name}";

     

       99
       99
       +
             };

     

       100
       100
       +
             serviceConfig = {

     

       101
       101
       +
               ExecStart =

     

       102
       102
       +
                 "${lib.getExe cfg.package}"

     

       103
       103
       +
                 + " -platform minimal"

     

       104
       104
       +
                 + " --http-listen=${cfg.listenAddress}"

     

       105
       105
       +
                 + " --http-port=${toString cfg.httpPort}"

     

       106
       106
       +
                 + " --ws-port=${toString cfg.wsPort}"

     

       107
       107
       +
                 + " --auto-connect=1"

     

       108
       108
       +
                 + (lib.optionalString (cfg.device != null) " --dev=${cfg.device}")

     

       109
       109
       +
                 + " " + (lib.escapeShellArgs cfg.extraArgs);

     

       110
       110
       +
               Restart = "on-failure";

     

       111
       111
       +
               AmbientCapabilities = capabilities;

     

       112
       112
       +
               CapabilityBoundingSet = capabilities;

     

       113
       113
       +
               UMask = "0027";

     

       114
       114
       +
               DynamicUser = true;

     

       115
       115
       +
               RuntimeDirectory = name;

     

       116
       116
       +
               RuntimeDirectoryMode = "0700";

     

       117
       117
       +
               StateDirectory = name;

     

       118
       118
       +
               WorkingDirectory = stateDir;

     

       119
       119
       +
               # For access to /dev/ttyACM0 (ConBee).

     

       120
       120
       +
               SupplementaryGroups = [ "dialout" ];

     

       121
       121
       +
               ProtectHome = true;

     

       122
       122
       +
             };

     

       123
       123
       +
           };

     

       124
       124
       +
         };

     

       125
       125
       +
       }

+1

nixos/tests/all-tests.nix

···

       216
       216
        
         darling = handleTest ./darling.nix {};

     

       217
       217
        
         dae = handleTest ./dae.nix {};

     

       218
       218
        
         dconf = handleTest ./dconf.nix {};

     

       219
       219
       +
         deconz = handleTest ./deconz.nix {};

     

       219
       220
        
         deepin = handleTest ./deepin.nix {};

     

       220
       221
        
         deluge = handleTest ./deluge.nix {};

     

       221
       222
        
         dendrite = handleTest ./matrix/dendrite.nix {};

+28

nixos/tests/deconz.nix

···

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

     

       2
       2
       +
       let

     

       3
       3
       +
         httpPort = 800;

     

       4
       4
       +
       in

     

       5
       5
       +
       {

     

       6
       6
       +
         name = "deconz";

     

       7
       7
       +
       

     

       8
       8
       +
         meta.maintainers = with lib.maintainers; [

     

       9
       9
       +
           bjornfor

     

       10
       10
       +
         ];

     

       11
       11
       +
       

     

       12
       12
       +
         nodes.machine = { config, pkgs, lib, ... }: {

     

       13
       13
       +
           nixpkgs.config.allowUnfree = true;

     

       14
       14
       +
           services.deconz = {

     

       15
       15
       +
             enable = true;

     

       16
       16
       +
             inherit httpPort;

     

       17
       17
       +
             extraArgs = [

     

       18
       18
       +
               "--dbg-err=2"

     

       19
       19
       +
               "--dbg-info=2"

     

       20
       20
       +
             ];

     

       21
       21
       +
           };

     

       22
       22
       +
         };

     

       23
       23
       +
       

     

       24
       24
       +
         testScript = ''

     

       25
       25
       +
           machine.wait_for_unit("deconz.service")

     

       26
       26
       +
           machine.succeed("curl -sfL http://localhost:${toString httpPort}")

     

       27
       27
       +
         '';

     

       28
       28
       +
       })

+9 -18

pkgs/applications/emulators/emulationstation/default.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub, pkg-config, cmake, curl, boost, eigen

     

       2
       2
       -
       , freeimage, freetype, libGLU, libGL, SDL2, alsa-lib, libarchive

     

       3
       3
       -
       , fetchpatch }:

     

       2
       2
       +
       , freeimage, freetype, libGLU, libGL, rapidjson, SDL2, alsa-lib

     

       3
       3
       +
       , vlc }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation {

     

       6
       6
        
         pname = "emulationstation";

     

       7
       7
       -
         version = "2.0.1a";

     

       7
       7
       +
         version = "2.11.2";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
       -
           owner = "Aloshi";

     

       10
       10
       +
           fetchSubmodules = true;

     

       11
       11
       +
           owner = "RetroPie";

     

       11
       12
        
           repo = "EmulationStation";

     

       12
       12
       -
           rev = "646bede3d9ec0acf0ae378415edac136774a66c5";

     

       13
       13
       -
           sha256 = "0cm0sq2wri2l9cvab1l0g02za59q7klj0h3p028vr96n6njj4w9v";

     

       13
       13
       +
           rev = "cda7de687924c4c1ab83d6b0ceb88aa734fe6cfe";

     

       14
       14
       +
           hash = "sha256-J5h/578FVe4DXJx/AvpRnCIUpqBeFtmvFhUDYH5SErQ=";

     

       14
       15
        
         };

     

       15
       16
        
       

     

       16
       16
       -
         patches = [

     

       17
       17
       -
           (fetchpatch {

     

       18
       18
       -
             url = "https://github.com/Aloshi/EmulationStation/commit/49ccd8fc7a7b1dfd974fc57eb13317c42842f22c.patch";

     

       19
       19
       -
             sha256 = "1v5d81l7bav0k5z4vybrc3rjcysph6lkm5pcfr6m42wlz7jmjw0p";

     

       20
       20
       -
           })

     

       21
       21
       -
         ];

     

       22
       22
       -
       

     

       23
       23
       -
         postPatch = ''

     

       24
       24
       -
           sed -i "7i #include <stack>" es-app/src/views/gamelist/ISimpleGameListView.h

     

       25
       25
       -
         '';

     

       26
       26
       -
       

     

       27
       17
        
         nativeBuildInputs = [ pkg-config cmake ];

     

       28
       28
       -
         buildInputs = [ alsa-lib boost curl eigen freeimage freetype libarchive libGLU libGL SDL2 ];

     

       18
       18
       +
         buildInputs = [ alsa-lib boost curl eigen freeimage freetype libGLU libGL rapidjson SDL2 vlc ];

     

       29
       19
        
       

     

       30
       20
        
         installPhase = ''

     

       31
       21
        
           install -D ../emulationstation $out/bin/emulationstation

     

       22
       22
       +
           cp -r ../resources/ $out/bin/resources/

     

       32
       23
        
         '';

     

       33
       24
        
       

     

       34
       25
        
         meta = {

+41

pkgs/applications/graphics/scantailor/universal.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , mkDerivation

     

       4
       4
       +
       , fetchFromGitHub

     

       5
       5
       +
       , cmake

     

       6
       6
       +
       , qtbase

     

       7
       7
       +
       , qttools

     

       8
       8
       +
       , wrapQtAppsHook

     

       9
       9
       +
       , zlib

     

       10
       10
       +
       , openjpeg

     

       11
       11
       +
       , libjpeg_turbo

     

       12
       12
       +
       , libpng

     

       13
       13
       +
       , libtiff

     

       14
       14
       +
       , boost

     

       15
       15
       +
       , libcanberra

     

       16
       16
       +
       }:

     

       17
       17
       +
       

     

       18
       18
       +
       stdenv.mkDerivation rec {

     

       19
       19
       +
         pname = "scantailor-universal";

     

       20
       20
       +
         version = "0.2.14";

     

       21
       21
       +
       

     

       22
       22
       +
         src = fetchFromGitHub {

     

       23
       23
       +
           owner = "trufanov-nok";

     

       24
       24
       +
           repo = pname;

     

       25
       25
       +
           rev = version;

     

       26
       26
       +
           fetchSubmodules = true;

     

       27
       27
       +
           hash = "sha256-n8NbokK+U0FAuYXtjRJcxlI1XAmI4hk5zV3sF86hB/s=";

     

       28
       28
       +
         };

     

       29
       29
       +
       

     

       30
       30
       +
         buildInputs = [ qtbase zlib libjpeg_turbo libpng libtiff boost libcanberra openjpeg ];

     

       31
       31
       +
         nativeBuildInputs = [ cmake wrapQtAppsHook qttools ];

     

       32
       32
       +
       

     

       33
       33
       +
         meta = with lib; {

     

       34
       34
       +
           description = "Interactive post-processing tool for scanned pages";

     

       35
       35
       +
           homepage = "https://github.com/trufanov-nok/scantailor";

     

       36
       36
       +
           license = licenses.gpl3Plus;

     

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

     

       38
       38
       +
           platforms = platforms.unix;

     

       39
       39
       +
           mainProgram = "scantailor-universal-cli";

     

       40
       40
       +
         };

     

       41
       41
       +
       }

+2 -2

pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix

···

       2
       2
        
       

     

       3
       3
        
       (if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec {

     

       4
       4
        
         pname = "signalbackup-tools";

     

       5
       5
       -
         version = "20231011-1";

     

       5
       5
       +
         version = "20231015";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "bepaald";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           hash = "sha256-AwlhKF7Tsx20v6t4P6j7E4XPlg9Nq+BSYOFVY+3byos=";

     

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

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         postPatch = ''

+2 -2

pkgs/applications/networking/p2p/gnunet/default.nix

···

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         pname = "gnunet";

     

       10
       10
       -
         version = "0.19.4";

     

       10
       10
       +
         version = "0.20.0";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchurl {

     

       13
       13
        
           url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz";

     

       14
       14
       -
           sha256 = "sha256-AKY99AjVmH9bqaUEQfKncYK9n7MvHjAq5WOslOesAJs=";

     

       14
       14
       +
           sha256 = "sha256-VgKeeKmcBNUrE1gJSuUHTkzY6puYz2hV9XrZryeslRg=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         enableParallelBuilding = true;

+4 -4

pkgs/by-name/co/cowsql/package.nix

···

       10
       10
        
       , gitUpdater

     

       11
       11
        
       }:

     

       12
       12
        
       

     

       13
       13
       -
       stdenv.mkDerivation rec {

     

       13
       13
       +
       stdenv.mkDerivation (finalAttrs: {

     

       14
       14
        
         pname = "cowsql";

     

       15
       15
       -
         version = "0.15.2";

     

       15
       15
       +
         version = "1.15.3";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "cowsql";

     

       19
       19
        
           repo = "cowsql";

     

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

     

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

     

       21
       21
        
           hash = "sha256-+za3pIcV4BhoImKvJlKatCK372wL4OyPbApQvGxGGGk=";

     

       22
       22
        
         };

     

       23
       23
        
       

     
···

       55
       55
        
           maintainers = with maintainers; [ adamcstephens ];

     

       56
       56
        
           platforms = platforms.unix;

     

       57
       57
        
         };

     

       58
       58
       -
       }

     

       58
       58
       +
       })

+6 -2

pkgs/development/interpreters/python/cpython/default.nix

···

       58
       58
        
       , reproducibleBuild ? false

     

       59
       59
        
       , pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}"

     

       60
       60
        
       , noldconfigPatch ? ./. + "/${sourceVersion.major}.${sourceVersion.minor}/no-ldconfig.patch"

     

       61
       61
       +
       , testers

     

       61
       62
        
       } @ inputs:

     

       62
       63
        
       

     

       63
       64
        
       # Note: this package is used for bootstrapping fetchurl, and thus

     
···

       232
       233
        
         '';

     

       233
       234
        
       

     

       234
       235
        
         execSuffix = stdenv.hostPlatform.extensions.executable;

     

       235
       235
       -
       in with passthru; stdenv.mkDerivation {

     

       236
       236
       +
       in with passthru; stdenv.mkDerivation (finalAttrs: {

     

       236
       237
        
         pname = "python3";

     

       237
       238
        
         inherit src version;

     

       238
       239
        
       

     
···

       582
       583
        
       

     

       583
       584
        
             nativeBuildInputs = with pkgsBuildBuild.python3.pkgs; [ sphinxHook python_docs_theme ];

     

       584
       585
        
           };

     

       586
       586
       +
       

     

       587
       587
       +
           tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

     

       585
       588
        
         };

     

       586
       589
        
       

     

       587
       590
        
         enableParallelBuilding = true;

     
···

       607
       610
        
             high level dynamic data types.

     

       608
       611
        
           '';

     

       609
       612
        
           license = licenses.psfl;

     

       613
       613
       +
           pkgConfigModules = [ "python3" ];

     

       610
       614
        
           platforms = platforms.linux ++ platforms.darwin ++ platforms.windows;

     

       611
       615
        
           maintainers = with maintainers; [ fridh ];

     

       612
       616
        
           mainProgram = executable;

     

       613
       617
        
         };

     

       614
       614
       -
       }

     

       618
       618
       +
       })

+1 -1

pkgs/development/libraries/geos/default.nix

···

       32
       32
        
         doCheck = true;

     

       33
       33
        
       

     

       34
       34
        
         passthru.tests = {

     

       35
       35
       -
           pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };

     

       35
       35
       +
           pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

     

       36
       36
        
           geos = callPackage ./tests.nix { geos = finalAttrs.finalPackage; };

     

       37
       37
        
         };

     

       38
       38

+9 -4

pkgs/development/libraries/gsasl/default.nix

···

       1
       1
       -
       { fetchurl, lib, stdenv, libidn, libkrb5 }:

     

       1
       1
       +
       { fetchurl, lib, stdenv, libidn, libkrb5

     

       2
       2
       +
       , testers

     

       3
       3
       +
       }:

     

       2
       4
        
       

     

       3
       3
       -
       stdenv.mkDerivation rec {

     

       5
       5
       +
       stdenv.mkDerivation (finalAttrs: {

     

       4
       6
        
         pname = "gsasl";

     

       5
       7
        
         version = "2.2.0";

     

       6
       8
        
       

     

       7
       9
        
         src = fetchurl {

     

       8
       8
       -
           url = "mirror://gnu/gsasl/${pname}-${version}.tar.gz";

     

       10
       10
       +
           url = "mirror://gnu/gsasl/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";

     

       9
       11
        
           sha256 = "sha256-ebho47mXbcSE1ZspygroiXvpbOTTbTKu1dk1p6Mwd1k=";

     

       10
       12
        
         };

     

       11
       13
        
       

     
···

       23
       25
        
           export LOCALDOMAIN="dummydomain"

     

       24
       26
        
         '';

     

       25
       27
        
         doCheck = !stdenv.hostPlatform.isDarwin;

     

       28
       28
       +
       

     

       29
       29
       +
         passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

     

       26
       30
        
       

     

       27
       31
        
         meta = {

     

       28
       32
        
           description = "GNU SASL, Simple Authentication and Security Layer library";

     
···

       38
       42
        
           license = lib.licenses.gpl3Plus;

     

       39
       43
        
       

     

       40
       44
        
           maintainers = with lib.maintainers; [ shlevy ];

     

       45
       45
       +
           pkgConfigModules = [ "libgsasl" ];

     

       41
       46
        
           platforms = lib.platforms.all;

     

       42
       47
        
         };

     

       43
       43
       -
       }

     

       48
       48
       +
       })

+1 -1

pkgs/development/libraries/libicns/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         pname = "libicns";

     

       5
       5
       -
         version = "unstable-2022-04-10";

     

       5
       5
       +
         version = "0.8.1-unstable-2022-04-10";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchgit {

     

       8
       8
        
           name = "libicns";

+9 -4

pkgs/development/libraries/libidn/default.nix

···

       1
       1
       -
       { fetchurl, lib, stdenv, libiconv }:

     

       1
       1
       +
       { fetchurl, lib, stdenv, libiconv

     

       2
       2
       +
       , testers

     

       3
       3
       +
       }:

     

       2
       4
        
       

     

       3
       3
       -
       stdenv.mkDerivation rec {

     

       5
       5
       +
       stdenv.mkDerivation (finalAttrs: {

     

       4
       6
        
         pname = "libidn";

     

       5
       7
        
         version = "1.41";

     

       6
       8
        
       

     

       7
       9
        
         src = fetchurl {

     

       8
       8
       -
           url = "mirror://gnu/libidn/${pname}-${version}.tar.gz";

     

       10
       10
       +
           url = "mirror://gnu/libidn/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";

     

       9
       11
        
           sha256 = "sha256-iE1wY2S4Gr3Re+6Whtj/KudDHFoUZRBHxorfizH9iUU=";

     

       10
       12
        
         };

     

       11
       13
        
       

     
···

       14
       16
        
         hardeningDisable = [ "format" ];

     

       15
       17
        
       

     

       16
       18
        
         buildInputs = lib.optional stdenv.isDarwin libiconv;

     

       19
       19
       +
       

     

       20
       20
       +
         passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

     

       17
       21
        
       

     

       18
       22
        
         meta = {

     

       19
       23
        
           homepage = "https://www.gnu.org/software/libidn/";

     
···

       36
       40
        
           '';

     

       37
       41
        
       

     

       38
       42
        
           license = lib.licenses.lgpl2Plus;

     

       43
       43
       +
           pkgConfigModules = [ "libidn" ];

     

       39
       44
        
           platforms = lib.platforms.all;

     

       40
       45
        
           maintainers = with lib.maintainers; [ lsix ];

     

       41
       46
        
         };

     

       42
       42
       -
       }

     

       47
       47
       +
       })

+13 -6

pkgs/development/libraries/libpng/12.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, zlib }:

     

       1
       1
       +
       { lib, stdenv, fetchurl, zlib

     

       2
       2
       +
       , testers

     

       3
       3
       +
       }:

     

       2
       4
        
       

     

       3
       5
        
       assert stdenv.hostPlatform == stdenv.buildPlatform -> zlib != null;

     

       4
       6
        
       

     

       5
       5
       -
       stdenv.mkDerivation rec {

     

       7
       7
       +
       stdenv.mkDerivation (finalAttrs: {

     

       6
       8
        
         pname = "libpng";

     

       7
       9
        
         version = "1.2.59";

     

       8
       10
        
       

     

       9
       11
        
         src = fetchurl {

     

       10
       10
       -
           url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz";

     

       12
       12
       +
           url = "mirror://sourceforge/libpng/libpng-${finalAttrs.version}.tar.xz";

     

       11
       13
        
           sha256 = "1izw9ybm27llk8531w6h4jp4rk2rxy2s9vil16nwik5dp0amyqxl";

     

       12
       14
        
         };

     

       13
       15
        
       

     

       14
       16
        
         outputs = [ "out" "dev" "man" ];

     

       15
       17
        
       

     

       16
       18
        
         propagatedBuildInputs = [ zlib ];

     

       17
       17
       -
       

     

       18
       18
       -
         passthru = { inherit zlib; };

     

       19
       19
        
       

     

       20
       20
        
         configureFlags = [ "--enable-static" ];

     

       21
       21
        
       

     

       22
       22
        
         postInstall = ''mv "$out/bin" "$dev/bin"'';

     

       23
       23
        
       

     

       24
       24
       +
         passthru = {

     

       25
       25
       +
           inherit zlib;

     

       26
       26
       +
       

     

       27
       27
       +
           tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

     

       28
       28
       +
         };

     

       29
       29
       +
       

     

       24
       30
        
         meta = with lib; {

     

       25
       31
        
           description = "The official reference implementation for the PNG file format";

     

       26
       32
        
           homepage = "http://www.libpng.org/pub/png/libpng.html";

     

       27
       33
        
           license = licenses.libpng;

     

       28
       34
        
           maintainers = [ ];

     

       29
       35
        
           branch = "1.2";

     

       36
       36
       +
           pkgConfigModules = [ "libpng" "libpng12" ];

     

       30
       37
        
           platforms = platforms.unix;

     

       31
       38
        
         };

     

       32
       32
       -
       }

     

       39
       39
       +
       })

+12 -5

pkgs/development/libraries/libpng/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, zlib, apngSupport ? true }:

     

       1
       1
       +
       { lib, stdenv, fetchurl, zlib, apngSupport ? true

     

       2
       2
       +
       , testers

     

       3
       3
       +
       }:

     

       2
       4
        
       

     

       3
       5
        
       assert zlib != null;

     

       4
       6
        
       

     
···

       10
       12
        
         };

     

       11
       13
        
         whenPatched = lib.optionalString apngSupport;

     

       12
       14
        
       

     

       13
       13
       -
       in stdenv.mkDerivation rec {

     

       15
       15
       +
       in stdenv.mkDerivation (finalAttrs: {

     

       14
       16
        
         pname = "libpng" + whenPatched "-apng";

     

       15
       17
        
         version = "1.6.40";

     

       16
       18
        
       

     

       17
       19
        
         src = fetchurl {

     

       18
       18
       -
           url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz";

     

       20
       20
       +
           url = "mirror://sourceforge/libpng/libpng-${finalAttrs.version}.tar.xz";

     

       19
       21
        
           hash = "sha256-U1tHmyRn/yMaPsbZKlJZBvuO8nl4vk9m2+BdPzoBs6E=";

     

       20
       22
        
         };

     

       21
       23
        
         postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1";

     
···

       27
       29
        
       

     

       28
       30
        
         doCheck = true;

     

       29
       31
        
       

     

       30
       30
       -
         passthru = { inherit zlib; };

     

       32
       32
       +
         passthru = {

     

       33
       33
       +
           inherit zlib;

     

       34
       34
       +
       

     

       35
       35
       +
           tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

     

       36
       36
       +
         };

     

       31
       37
        
       

     

       32
       38
        
         meta = with lib; {

     

       33
       39
        
           description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch";

     

       34
       40
        
           homepage = "http://www.libpng.org/pub/png/libpng.html";

     

       35
       41
        
           changelog = "https://github.com/glennrp/libpng/blob/v1.6.40/CHANGES";

     

       36
       42
        
           license = licenses.libpng2;

     

       43
       43
       +
           pkgConfigModules = [ "libpng" "libpng16" ];

     

       37
       44
        
           platforms = platforms.all;

     

       38
       45
        
           maintainers = with maintainers; [ vcunat ];

     

       39
       46
        
         };

     

       40
       40
       -
       }

     

       47
       47
       +
       })

+11 -6

pkgs/development/libraries/libsass/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, autoreconfHook }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, autoreconfHook

     

       2
       2
       +
       , testers

     

       3
       3
       +
       }:

     

       2
       4
        
       

     

       3
       3
       -
       stdenv.mkDerivation rec {

     

       5
       5
       +
       stdenv.mkDerivation (finalAttrs: {

     

       4
       6
        
         pname = "libsass";

     

       5
       7
        
         version = "3.6.5"; # also check sassc for updates

     

       6
       8
        
       

     

       7
       9
        
         src = fetchFromGitHub {

     

       8
       10
        
           owner = "sass";

     

       9
       9
       -
           repo = pname;

     

       10
       10
       -
           rev = version;

     

       11
       11
       +
           repo = finalAttrs.pname;

     

       12
       12
       +
           rev = finalAttrs.version;

     

       11
       13
        
           sha256 = "1cxj6r85d5f3qxdwzxrmkx8z875hig4cr8zsi30w6vj23cyds3l2";

     

       12
       14
        
           # Remove unicode file names which leads to different checksums on HFS+

     

       13
       15
        
           # vs. other filesystems because of unicode normalisation.

     
···

       17
       19
        
         };

     

       18
       20
        
       

     

       19
       21
        
         preConfigure = ''

     

       20
       20
       -
           export LIBSASS_VERSION=${version}

     

       22
       22
       +
           export LIBSASS_VERSION=${finalAttrs.version}

     

       21
       23
        
         '';

     

       22
       24
        
       

     

       23
       25
        
         nativeBuildInputs = [ autoreconfHook ];

     

       24
       26
        
       

     

       27
       27
       +
         passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

     

       28
       28
       +
       

     

       25
       29
        
         meta = with lib; {

     

       26
       30
        
           description = "A C/C++ implementation of a Sass compiler";

     

       27
       31
        
           homepage = "https://github.com/sass/libsass";

     

       28
       32
        
           license = licenses.mit;

     

       29
       33
        
           maintainers = with maintainers; [ codyopel offline ];

     

       34
       34
       +
           pkgConfigModules = [ "libsass" ];

     

       30
       35
        
           platforms = platforms.unix;

     

       31
       36
        
         };

     

       32
       32
       -
       }

     

       37
       37
       +
       })

+2 -2

pkgs/development/libraries/pdfhummus/default.nix

···

       12
       12
        
       

     

       13
       13
        
       stdenv.mkDerivation rec {

     

       14
       14
        
         pname = "pdfhummus";

     

       15
       15
       -
         version = "4.5.12";

     

       15
       15
       +
         version = "4.6";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "galkahana";

     

       19
       19
        
           repo = "PDF-Writer";

     

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

     

       21
       21
       -
           hash = "sha256-n5mzzIDU7Lb2V9YImPvceCBUt9Q+ZeF45CHtW52cGpY=";

     

       21
       21
       +
           hash = "sha256-TP/NDh5fPPHuiRaj6+YZfhtHZmlb+mqtnXfzyjVKAHY=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [

+7 -3

pkgs/development/libraries/taglib/default.nix

···

       3
       3
        
       , fetchFromGitHub

     

       4
       4
        
       , cmake

     

       5
       5
        
       , zlib

     

       6
       6
       +
       , testers

     

       6
       7
        
       }:

     

       7
       8
        
       

     

       8
       8
       -
       stdenv.mkDerivation rec {

     

       9
       9
       +
       stdenv.mkDerivation (finalAttrs: {

     

       9
       10
        
         pname = "taglib";

     

       10
       11
        
         version = "1.13.1";

     

       11
       12
        
       

     

       12
       13
        
         src = fetchFromGitHub {

     

       13
       14
        
           owner = "taglib";

     

       14
       15
        
           repo = "taglib";

     

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

     

       16
       16
       +
           rev = "v${finalAttrs.version}";

     

       16
       17
        
           hash = "sha256-QX0EpHGT36UsgIfRf5iALnwxe0jjLpZvCTbk8vSMFF4=";

     

       17
       18
        
         };

     

       18
       19
        
       

     
···

       28
       29
        
           "-DCMAKE_INSTALL_INCLUDEDIR=include"

     

       29
       30
        
         ];

     

       30
       31
        
       

     

       32
       32
       +
         passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

     

       33
       33
       +
       

     

       31
       34
        
         meta = with lib; {

     

       32
       35
        
           homepage = "https://taglib.org/";

     

       33
       36
        
           description = "A library for reading and editing audio file metadata";

     
···

       39
       42
        
           '';

     

       40
       43
        
           license = with licenses; [ lgpl3 mpl11 ];

     

       41
       44
        
           maintainers = with maintainers; [ ttuegel ];

     

       45
       45
       +
           pkgConfigModules = [ "taglib" "taglib_c" ];

     

       42
       46
        
         };

     

       43
       43
       -
       }

     

       47
       47
       +
       })

+2 -2

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

···

       26
       26
        
       

     

       27
       27
        
       buildPythonPackage rec {

     

       28
       28
        
         pname = "devito";

     

       29
       29
       -
         version = "4.8.2";

     

       29
       29
       +
         version = "4.8.3";

     

       30
       30
        
         format = "setuptools";

     

       31
       31
        
       

     

       32
       32
        
         disabled = pythonOlder "3.7";

     
···

       35
       35
        
           owner = "devitocodes";

     

       36
       36
        
           repo = "devito";

     

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

     

       38
       38
       -
           hash = "sha256-zckFU9Q5Rpj0TPeT96lXfR/yp2SYrV4sjAjqN/y8GDw=";

     

       38
       38
       +
           hash = "sha256-g9rRJF1JrZ6+s3tj4RZHuGOjt5LJjtK9I5CJmq4CJL4=";

     

       39
       39
        
         };

     

       40
       40
        
       

     

       41
       41
        
         pythonRemoveDeps = [

+2 -2

pkgs/development/python-modules/scikit-build-core/default.nix

···

       21
       21
        
       

     

       22
       22
        
       buildPythonPackage rec {

     

       23
       23
        
         pname = "scikit-build-core";

     

       24
       24
       -
         version = "0.5.0";

     

       24
       24
       +
         version = "0.5.1";

     

       25
       25
        
         format = "pyproject";

     

       26
       26
        
       

     

       27
       27
        
         src = fetchPypi {

     

       28
       28
        
           pname = "scikit_build_core";

     

       29
       29
        
           inherit version;

     

       30
       30
       -
           hash = "sha256-pCqVAps0tc+JKFU0LZuURcd0y3l/yyTI/EwvtCsY38o=";

     

       30
       30
       +
           hash = "sha256-xtrVpRJ7Kr+qI8uR0jrCEFn9d83fcSKzP9B3kQJNz78=";

     

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
        
         postPatch = ''

+2 -2

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

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "tskit";

     

       13
       13
       -
         version = "0.5.5";

     

       13
       13
       +
         version = "0.5.6";

     

       14
       14
        
         format = "pyproject";

     

       15
       15
        
         disabled = pythonOlder "3.7";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           hash = "sha256-phhBTAHAPlBnmzSiLmPYDMg1Mui85NZacni3WuYAc6c=";

     

       19
       19
       +
           hash = "sha256-3f4hPxywY822mCF3IwooBezX38fM1zAm4Th4q//SzkY=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         nativeBuildInputs = [

+14 -9

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

···

       13
       13
        
       , pytestCheckHook

     

       14
       14
        
       , pythonOlder

     

       15
       15
        
       }:

     

       16
       16
       +
       

     

       16
       17
        
       buildPythonPackage rec {

     

       17
       18
        
         pname = "w1thermsensor";

     

       18
       18
       -
         version = "2.0.0";

     

       19
       19
       -
         format = "pyproject";

     

       19
       19
       +
         version = "2.3.0";

     

       20
       20
       +
         pyproject = true;

     

       21
       21
       +
       

     

       22
       22
       +
         disabled = pythonOlder "3.7";

     

       20
       23
        
       

     

       21
       24
        
         src = fetchPypi {

     

       22
       25
        
           inherit pname version;

     

       23
       23
       -
           hash = "sha256-EcaEr4B8icbwZu2Ty3z8AAgglf74iZ5BLpLnSOZC2cE=";

     

       26
       26
       +
           hash = "sha256-n7wK4N1mzZtUxtYu17qyuI4UjJh/59UGD0dvkOgcInA=";

     

       24
       27
        
         };

     

       25
       28
        
       

     

       26
       29
        
         postPatch = ''

     
···

       32
       35
        
         ];

     

       33
       36
        
       

     

       34
       37
        
         propagatedBuildInputs = [

     

       35
       35
       -
           aiofiles

     

       36
       38
        
           click

     

       37
       39
        
         ];

     

       38
       40
        
       

     

       41
       41
       +
         passthru.optional-dependencies = {

     

       42
       42
       +
           async = [

     

       43
       43
       +
             aiofiles

     

       44
       44
       +
           ];

     

       45
       45
       +
         };

     

       46
       46
       +
       

     

       39
       47
        
         # Don't try to load the kernel module in tests.

     

       40
       48
        
         env.W1THERMSENSOR_NO_KERNEL_MODULE = 1;

     

       41
       49
        
       

     
···

       45
       53
        
           pytestCheckHook

     

       46
       54
        
         ] ++ lib.optionals (pythonOlder "3.11") [

     

       47
       55
        
           tomli

     

       48
       48
       -
         ];

     

       49
       49
       -
       

     

       50
       50
       -
         # Tests for 2.0.0 currently fail on python3.11

     

       51
       51
       -
         # https://github.com/timofurrer/w1thermsensor/issues/116

     

       52
       52
       -
         doCheck = pythonOlder "3.11";

     

       56
       56
       +
         ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);

     

       53
       57
        
       

     

       54
       58
        
         pythonImportsCheck = [

     

       55
       59
        
           "w1thermsensor"

     
···

       63
       67
        
             devices.

     

       64
       68
        
           '';

     

       65
       69
        
           homepage = "https://github.com/timofurrer/w1thermsensor";

     

       70
       70
       +
           changelog = "https://github.com/timofurrer/w1thermsensor/blob/v${version}/CHANGELOG.rst";

     

       66
       71
        
           license = licenses.mit;

     

       67
       72
        
           maintainers = with maintainers; [ quentin ];

     

       68
       73
        
           platforms = platforms.all;

+2 -2

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

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "west";

     

       14
       14
       -
         version = "1.1.0";

     

       14
       14
       +
         version = "1.2.0";

     

       15
       15
        
         format = "setuptools";

     

       16
       16
        
       

     

       17
       17
        
         disabled = pythonOlder "3.8";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchPypi {

     

       20
       20
        
           inherit pname version;

     

       21
       21
       -
           hash = "sha256-40h/VLa9kEWASJtgPvGm4JnG8uZWAUwrg8SzwhdfpN8=";

     

       21
       21
       +
           hash = "sha256-tB5RrJA5OUT5wB974nAA1LMpYVt+0HT7DvaTtGRoEpc=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/zigpy-xbee/default.nix

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "zigpy-xbee";

     

       14
       14
       -
         version = "0.18.3";

     

       14
       14
       +
         version = "0.19.0";

     

       15
       15
        
         # https://github.com/Martiusweb/asynctest/issues/152

     

       16
       16
        
         # broken by upstream python bug with asynctest and

     

       17
       17
        
         # is used exclusively by home-assistant with python 3.8

     
···

       21
       21
        
           owner = "zigpy";

     

       22
       22
        
           repo = "zigpy-xbee";

     

       23
       23
        
           rev = "refs/tags/${version}";

     

       24
       24
       -
           hash = "sha256-+qtbOC3rsse57kqd4RLl9EKXzru0vdgIIPSl1OQ652U=";

     

       24
       24
       +
           hash = "sha256-KUXXOySuPFNKcW3O08FBYIfm4WwVjOuIF+GefmKnwl0=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         buildInputs = [

+2 -2

pkgs/development/python-modules/zigpy-znp/default.nix

···

       16
       16
        
       

     

       17
       17
        
       buildPythonPackage rec {

     

       18
       18
        
         pname = "zigpy-znp";

     

       19
       19
       -
         version = "0.11.5";

     

       19
       19
       +
         version = "0.11.6";

     

       20
       20
        
         format = "setuptools";

     

       21
       21
        
       

     

       22
       22
        
         disabled = pythonOlder "3.7";

     
···

       25
       25
        
           owner = "zigpy";

     

       26
       26
        
           repo = pname;

     

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

     

       28
       28
       -
           hash = "sha256-Ti8H9FC8/xYS4je+d7EgRmDvBTmlOdiWUbuX+cbE2hY=";

     

       28
       28
       +
           hash = "sha256-K85AmksP/dXKL4DQKadyvjK7y5x6yEgc6vDJAPfblTw=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         postPatch = ''

+8 -1

pkgs/servers/deconz/default.nix

···

       11
       11
        
       , makeWrapper

     

       12
       12
        
       , gzip

     

       13
       13
        
       , gnutar

     

       14
       14
       +
       , nixosTests

     

       14
       15
        
       }:

     

       15
       16
        
       

     

       16
       17
        
       stdenv.mkDerivation rec {

     
···

       73
       74
        
           runHook postInstall

     

       74
       75
        
         '';

     

       75
       76
        
       

     

       77
       77
       +
         passthru = {

     

       78
       78
       +
           tests = { inherit (nixosTests) deconz; };

     

       79
       79
       +
         };

     

       80
       80
       +
       

     

       76
       81
        
         meta = with lib; {

     

       77
       82
        
           description = "Manage Zigbee network with ConBee, ConBee II or RaspBee hardware";

     

       78
       83
        
           homepage = "https://www.dresden-elektronik.com/wireless/software/deconz.html";

     

       79
       84
        
           license = licenses.unfree;

     

       80
       80
       -
           platforms = with platforms; linux;

     

       85
       85
       +
           platforms = with platforms; [ "x86_64-linux" ];

     

       86
       86
       +
           sourceProvenance = with sourceTypes; [ binaryNativeCode ];

     

       81
       87
        
           maintainers = with maintainers; [ bjornfor ];

     

       88
       88
       +
           mainProgram = "deCONZ";

     

       82
       89
        
         };

     

       83
       90
        
       }

+8 -5

pkgs/servers/sql/postgresql/default.nix

···

       17
       17
        
             , version, hash, psqlSchema

     

       18
       18
        
       

     

       19
       19
        
             # for tests

     

       20
       20
       -
             , nixosTests, thisAttr

     

       20
       20
       +
             , testers, nixosTests, thisAttr

     

       21
       21
        
       

     

       22
       22
        
             # JIT

     

       23
       23
        
             , jitSupport ? false

     
···

       34
       34
        
           lz4Enabled = atLeast "14";

     

       35
       35
        
           zstdEnabled = atLeast "15";

     

       36
       36
        
       

     

       37
       37
       +
           pname = "postgresql";

     

       38
       38
       +
       

     

       37
       39
        
           stdenv' = if jitSupport then llvmPackages.stdenv else stdenv;

     

       38
       38
       -
         in stdenv'.mkDerivation rec {

     

       39
       39
       -
           pname = "postgresql";

     

       40
       40
       -
           inherit version;

     

       40
       40
       +
         in stdenv'.mkDerivation (finalAttrs: {

     

       41
       41
       +
           inherit pname version;

     

       41
       42
        
       

     

       42
       43
        
           src = fetchurl {

     

       43
       44
        
             url = "mirror://postgresql/source/v${version}/${pname}-${version}.tar.bz2";

     
···

       283
       284
        
       

     

       284
       285
        
             tests = {

     

       285
       286
        
               postgresql = nixosTests.postgresql-wal-receiver.${thisAttr};

     

       287
       287
       +
               pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

     

       286
       288
        
             } // lib.optionalAttrs jitSupport {

     

       287
       289
        
               postgresql-jit = nixosTests.postgresql-jit.${thisAttr};

     

       288
       290
        
             };

     
···

       295
       297
        
             description = "A powerful, open source object-relational database system";

     

       296
       298
        
             license     = licenses.postgresql;

     

       297
       299
        
             maintainers = with maintainers; [ thoughtpolice danbst globin marsam ivan ma27 ];

     

       300
       300
       +
             pkgConfigModules = [ "libecpg" "libecpg_compat" "libpgtypes" "libpq" ];

     

       298
       301
        
             platforms   = platforms.unix;

     

       299
       302
        
       

     

       300
       303
        
             # JIT support doesn't work with cross-compilation. It is attempted to build LLVM-bytecode

     
···

       309
       312
        
             # a query, postgres would coredump with `Illegal instruction`.

     

       310
       313
        
             broken = jitSupport && (stdenv.hostPlatform != stdenv.buildPlatform);

     

       311
       314
        
           };

     

       312
       312
       -
         };

     

       315
       315
       +
         });

     

       313
       316
        
       

     

       314
       317
        
         postgresqlWithPackages = { postgresql, makeWrapper, buildEnv }: pkgs: f: buildEnv {

     

       315
       318
        
           name = "postgresql-and-plugins-${postgresql.version}";

+6 -1

pkgs/shells/zsh/default.nix

···

       11
       11
        
       , ncurses

     

       12
       12
        
       , pcre

     

       13
       13
        
       , pkg-config

     

       14
       14
       -
       , buildPackages }:

     

       14
       14
       +
       , buildPackages

     

       15
       15
       +
       , nixosTests

     

       16
       16
       +
       }:

     

       15
       17
        
       

     

       16
       18
        
       let

     

       17
       19
        
         version = "5.9";

     
···

       143
       145
        
       

     

       144
       146
        
         passthru = {

     

       145
       147
        
           shellPath = "/bin/zsh";

     

       148
       148
       +
           tests = {

     

       149
       149
       +
             inherit (nixosTests) zsh-history oh-my-zsh;

     

       150
       150
       +
           };

     

       146
       151
        
         };

     

       147
       152
        
       }

+10 -5

pkgs/tools/misc/file/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, file, zlib, libgnurx }:

     

       1
       1
       +
       { lib, stdenv, fetchurl, file, zlib, libgnurx

     

       2
       2
       +
       , testers

     

       3
       3
       +
       }:

     

       2
       4
        
       

     

       3
       5
        
       # Note: this package is used for bootstrapping fetchurl, and thus

     

       4
       6
        
       # cannot use fetchpatch! All mutable patches (generated by GitHub or

     

       5
       7
        
       # cgit) that are needed here should be included directly in Nixpkgs as

     

       6
       8
        
       # files.

     

       7
       9
        
       

     

       8
       8
       -
       stdenv.mkDerivation rec {

     

       10
       10
       +
       stdenv.mkDerivation (finalAttrs: {

     

       9
       11
        
         pname = "file";

     

       10
       12
        
         version = "5.45";

     

       11
       13
        
       

     

       12
       14
        
         src = fetchurl {

     

       13
       15
        
           urls = [

     

       14
       14
       -
             "https://astron.com/pub/file/${pname}-${version}.tar.gz"

     

       15
       15
       -
             "https://distfiles.macports.org/file/${pname}-${version}.tar.gz"

     

       16
       16
       +
             "https://astron.com/pub/file/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"

     

       17
       17
       +
             "https://distfiles.macports.org/file/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"

     

       16
       18
        
           ];

     

       17
       19
        
           hash = "sha256-/Jf1ECm7DiyfTjv/79r2ePDgOe6HK53lwAKm0Jx4TYI=";

     

       18
       20
        
         };

     
···

       37
       39
        
       

     

       38
       40
        
         makeFlags = lib.optional stdenv.hostPlatform.isWindows "FILE_COMPILE=file";

     

       39
       41
        
       

     

       42
       42
       +
         passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

     

       43
       43
       +
       

     

       40
       44
        
         meta = with lib; {

     

       41
       45
        
           homepage = "https://darwinsys.com/file";

     

       42
       46
        
           description = "A program that shows the type of files";

     

       43
       47
        
           maintainers = with maintainers; [ doronbehar ];

     

       44
       48
        
           license = licenses.bsd2;

     

       49
       49
       +
           pkgConfigModules = [ "libmagic" ];

     

       45
       50
        
           platforms = platforms.all;

     

       46
       51
        
           mainProgram = "file";

     

       47
       52
        
         };

     

       48
       48
       -
       }

     

       53
       53
       +
       })

+3 -3

pkgs/tools/misc/kak-lsp/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "kak-lsp";

     

       5
       5
       -
         version = "14.1.0";

     

       5
       5
       +
         version = "14.2.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = pname;

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-5eGp11qPLT1fen39bZmICReK2Ly8Kg9Y3g30ZV0gk04=";

     

       11
       11
       +
           sha256 = "sha256-U4eqIzvYzUfwprVpPHV/OFPKiBXK4/5z2p8kknX2iME=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoSha256 = "sha256-+Sj+QSSXJAgGulMLRCWLgddVG8sIiHaB1xWPojVCgas=";

     

       14
       14
       +
         cargoSha256 = "sha256-g63Kfi4xJZO/+fq6eK2iB1dUGoSGWIIRaJr8BWO/txM=";

     

       15
       15
        
       

     

       16
       16
        
         buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];

     

       17
       17

+17 -1

pkgs/tools/security/mktemp/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, groff }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchurl

     

       4
       4
       +
       , fetchpatch

     

       5
       5
       +
       , groff

     

       6
       6
       +
       }:

     

       2
       7
        
       

     

       3
       8
        
       stdenv.mkDerivation rec {

     

       4
       9
        
         pname = "mktemp";

     
···

       7
       12
        
         # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.

     

       8
       13
        
         NROFF = "${groff}/bin/nroff";

     

       9
       14
        
       

     

       15
       15
       +
         patches = [

     

       16
       16
       +
           # Pull upstream fix for parallel install failures.

     

       17
       17
       +
           (fetchpatch {

     

       18
       18
       +
             name = "parallel-install.patch";

     

       19
       19
       +
             url = "https://www.mktemp.org/repos/mktemp/raw-rev/eb87d96ce8b7";

     

       20
       20
       +
             hash = "sha256-cJ/0pFj8tOkByUwhlMwLNSQgTHyAU8svEkjKWWwsNmY=";

     

       21
       21
       +
           })

     

       22
       22
       +
         ];

     

       23
       23
       +
       

     

       10
       24
        
         # Don't use "install -s"

     

       11
       25
        
         postPatch = ''

     

       12
       26
        
           substituteInPlace Makefile.in --replace " 0555 -s " " 0555 "

     
···

       16
       30
        
           url = "ftp://ftp.mktemp.org/pub/mktemp/mktemp-${version}.tar.gz";

     

       17
       31
        
           sha256 = "0x969152znxxjbj7387xb38waslr4yv6bnj5jmhb4rpqxphvk54f";

     

       18
       32
        
         };

     

       33
       33
       +
       

     

       34
       34
       +
         enableParallelBuilding = true;

     

       19
       35
        
       

     

       20
       36
        
         meta = with lib; {

     

       21
       37
        
           description = "Simple tool to make temporary file handling in shells scripts safe and simple";

+2

pkgs/top-level/all-packages.nix

···

       35212
       35212
        
       

     

       35213
       35213
        
         scantailor-advanced = libsForQt5.callPackage ../applications/graphics/scantailor/advanced.nix { };

     

       35214
       35214
        
       

     

       35215
       35215
       +
         scantailor-universal = libsForQt5.callPackage ../applications/graphics/scantailor/universal.nix { };

     

       35216
       35216
       +
       

     

       35215
       35217
        
         sc-im = callPackage ../applications/misc/sc-im { };

     

       35216
       35218
        
       

     

       35217
       35219
        
         scite = callPackage ../applications/editors/scite { };