commit cfaff97318c7e837697fe30dcd7d542829b3f11c · pyrox.dev/nixpkgs

+1 -1

lib/default.nix

···

       119
       119
        
             mkFixStrictness mkOrder mkBefore mkAfter mkAliasDefinitions

     

       120
       120
        
             mkAliasAndWrapDefinitions fixMergeModules mkRemovedOptionModule

     

       121
       121
        
             mkRenamedOptionModule mkMergedOptionModule mkChangedOptionModule

     

       122
       122
       -
             mkAliasOptionModule doRename;

     

       122
       122
       +
             mkAliasOptionModule mkDerivedConfig doRename;

     

       123
       123
        
           inherit (self.options) isOption mkEnableOption mkSinkUndeclaredOptions

     

       124
       124
        
             mergeDefaultOption mergeOneOption mergeEqualOption getValues

     

       125
       125
        
             getFiles optionAttrSetToDocList optionAttrSetToDocList'

+20

lib/modules.nix

···

       956
       956
        
           use = id;

     

       957
       957
        
         };

     

       958
       958
        
       

     

       959
       959
       +
         /* mkDerivedConfig : Option a -> (a -> Definition b) -> Definition b

     

       960
       960
       +
       

     

       961
       961
       +
           Create config definitions with the same priority as the definition of another option.

     

       962
       962
       +
           This should be used for option definitions where one option sets the value of another as a convenience.

     

       963
       963
       +
           For instance a config file could be set with a `text` or `source` option, where text translates to a `source`

     

       964
       964
       +
           value using `mkDerivedConfig options.text (pkgs.writeText "filename.conf")`.

     

       965
       965
       +
       

     

       966
       966
       +
           It takes care of setting the right priority using `mkOverride`.

     

       967
       967
       +
         */

     

       968
       968
       +
         # TODO: make the module system error message include information about `opt` in

     

       969
       969
       +
         # error messages about conflicts. E.g. introduce a variation of `mkOverride` which

     

       970
       970
       +
         # adds extra location context to the definition object. This will allow context to be added

     

       971
       971
       +
         # to all messages that report option locations "this value was derived from <full option name>

     

       972
       972
       +
         # which was defined in <locations>". It can provide a trace of options that contributed

     

       973
       973
       +
         # to definitions.

     

       974
       974
       +
         mkDerivedConfig = opt: f:

     

       975
       975
       +
           mkOverride

     

       976
       976
       +
             (opt.highestPrio or defaultPriority)

     

       977
       977
       +
             (f opt.value);

     

       978
       978
       +
       

     

       959
       979
        
         doRename = { from, to, visible, warn, use, withPriority ? true }:

     

       960
       980
        
           { config, options, ... }:

     

       961
       981
        
           let

maintainers/maintainer-list.nix

···

       7578
       7578
        
             fingerprint = "DB43 2895 CF68 F0CE D4B7  EF60 DA01 5B05 B5A1 1B22";

     

       7579
       7579
        
           }];

     

       7580
       7580
        
         };

     

       7581
       7581
       +
         milahu = {

     

       7582
       7582
       +
           email = "milahu@gmail.com";

     

       7583
       7583
       +
           github = "milahu";

     

       7584
       7584
       +
           githubId = 12958815;

     

       7585
       7585
       +
           name = "Milan Hauth";

     

       7586
       7586
       +
         };

     

       7581
       7587
        
         milesbreslin = {

     

       7582
       7588
        
           email = "milesbreslin@gmail.com";

     

       7583
       7589
        
           github = "milesbreslin";

+15

nixos/doc/manual/from_md/release-notes/rl-2111.section.xml

···

       1300
       1300
        
             </listitem>

     

       1301
       1301
        
             <listitem>

     

       1302
       1302
        
               <para>

     

       1303
       1303
       +
                 <literal>nix.daemonNiceLevel</literal> and

     

       1304
       1304
       +
                 <literal>nix.daemonIONiceLevel</literal> have been removed in

     

       1305
       1305
       +
                 favour of the new options

     

       1306
       1306
       +
                 <link xlink:href="options.html#opt-nix.daemonCPUSchedPolicy"><literal>nix.daemonCPUSchedPolicy</literal></link>,

     

       1307
       1307
       +
                 <link xlink:href="options.html#opt-nix.daemonIOSchedClass"><literal>nix.daemonIOSchedClass</literal></link>

     

       1308
       1308
       +
                 and

     

       1309
       1309
       +
                 <link xlink:href="options.html#opt-nix.daemonIOSchedPriority"><literal>nix.daemonIOSchedPriority</literal></link>.

     

       1310
       1310
       +
                 Please refer to the options documentation and the

     

       1311
       1311
       +
                 <literal>sched(7)</literal> and

     

       1312
       1312
       +
                 <literal>ioprio_set(2)</literal> man pages for guidance on how

     

       1313
       1313
       +
                 to use them.

     

       1314
       1314
       +
               </para>

     

       1315
       1315
       +
             </listitem>

     

       1316
       1316
       +
             <listitem>

     

       1317
       1317
       +
               <para>

     

       1303
       1318
        
                 The <literal>coursier</literal> package’s binary was renamed

     

       1304
       1319
        
                 from <literal>coursier</literal> to <literal>cs</literal>.

     

       1305
       1320
        
                 Completions which haven’t worked for a while should now work

nixos/doc/manual/release-notes/rl-2111.section.md

···

       388
       388
        
       

     

       389
       389
        
       - `boot.kernelParams` now only accepts one command line parameter per string. This change is aimed to reduce common mistakes like "param = 12", which would be parsed as 3 parameters.

     

       390
       390
        
       

     

       391
       391
       +
       - `nix.daemonNiceLevel` and `nix.daemonIONiceLevel` have been removed in favour of the new options [`nix.daemonCPUSchedPolicy`](options.html#opt-nix.daemonCPUSchedPolicy), [`nix.daemonIOSchedClass`](options.html#opt-nix.daemonIOSchedClass) and [`nix.daemonIOSchedPriority`](options.html#opt-nix.daemonIOSchedPriority). Please refer to the options documentation and the `sched(7)` and `ioprio_set(2)` man pages for guidance on how to use them.

     

       392
       392
       +
       

     

       391
       393
        
       - The `coursier` package's binary was renamed from `coursier` to `cs`. Completions which haven't worked for a while should now work with the renamed binary. To keep using `coursier`, you can create a shell alias.

     

       392
       394
        
       

     

       393
       395
        
       - The `services.mosquitto` module has been rewritten to support multiple listeners and per-listener configuration.

+41 -23

nixos/modules/services/misc/nix-daemon.nix

···

       184
       184
        
               '';

     

       185
       185
        
             };

     

       186
       186
        
       

     

       187
       187
       -
             daemonNiceLevel = mkOption {

     

       188
       188
       -
               type = types.int;

     

       189
       189
       -
               default = 0;

     

       187
       187
       +
             daemonCPUSchedPolicy = mkOption {

     

       188
       188
       +
               type = types.enum ["other" "batch" "idle"];

     

       189
       189
       +
               default = "other";

     

       190
       190
       +
               example = "batch";

     

       190
       191
        
               description = ''

     

       191
       191
       -
                 Nix daemon process priority. This priority propagates to build processes.

     

       192
       192
       -
                 0 is the default Unix process priority, 19 is the lowest. Note that nix

     

       193
       193
       -
                 bypasses nix-daemon when running as root and this option does not have

     

       194
       194
       -
                 any effect in such a case.

     

       192
       192
       +
                 Nix daemon process CPU scheduling policy. This policy propagates to

     

       193
       193
       +
                 build processes. other is the default scheduling policy for regular

     

       194
       194
       +
                 tasks. The batch policy is similar to other, but optimised for

     

       195
       195
       +
                 non-interactive tasks. idle is for extremely low-priority tasks

     

       196
       196
       +
                 that should only be run when no other task requires CPU time.

     

       197
       197
       +
       

     

       198
       198
       +
                 Please note that while using the idle policy may greatly improve

     

       199
       199
       +
                 responsiveness of a system performing expensive builds, it may also

     

       200
       200
       +
                 slow down and potentially starve crucial configuration updates

     

       201
       201
       +
                 during load.

     

       202
       202
       +
             '';

     

       203
       203
       +
             };

     

       204
       204
       +
       

     

       205
       205
       +
             daemonIOSchedClass = mkOption {

     

       206
       206
       +
               type = types.enum ["best-effort" "idle"];

     

       207
       207
       +
               default = "best-effort";

     

       208
       208
       +
               example = "idle";

     

       209
       209
       +
               description = ''

     

       210
       210
       +
                 Nix daemon process I/O scheduling class. This class propagates to

     

       211
       211
       +
                 build processes. best-effort is the default class for regular tasks.

     

       212
       212
       +
                 The idle class is for extremely low-priority tasks that should only

     

       213
       213
       +
                 perform I/O when no other task does.

     

       195
       214
        
       

     

       196
       196
       -
                 Please note that if used on a recent Linux kernel with group scheduling,

     

       197
       197
       -
                 setting the nice level will only have an effect relative to other threads

     

       198
       198
       -
                 in the same task group. Therefore this option is only useful if

     

       199
       199
       -
                 autogrouping has been disabled (see the kernel.sched_autogroup_enabled

     

       200
       200
       -
                 sysctl) and no systemd unit uses any of the per-service CPU accounting

     

       201
       201
       -
                 features of systemd. Otherwise the Nix daemon process may be placed in a

     

       202
       202
       -
                 separate task group and the nice level setting will have no effect.

     

       203
       203
       -
                 Refer to the man pages sched(7) and systemd.resource-control(5) for

     

       204
       204
       -
                 details.

     

       205
       205
       -
               '';

     

       215
       215
       +
                 Please note that while using the idle scheduling class can improve

     

       216
       216
       +
                 responsiveness of a system performing expensive builds, it might also

     

       217
       217
       +
                 slow down or starve crucial configuration updates during load.

     

       218
       218
       +
             '';

     

       206
       219
        
             };

     

       207
       220
        
       

     

       208
       208
       -
             daemonIONiceLevel = mkOption {

     

       221
       221
       +
             daemonIOSchedPriority = mkOption {

     

       209
       222
        
               type = types.int;

     

       210
       223
        
               default = 0;

     

       224
       224
       +
               example = 1;

     

       211
       225
        
               description = ''

     

       212
       212
       -
                 Nix daemon process I/O priority. This priority propagates to build processes.

     

       213
       213
       -
                 0 is the default Unix process I/O priority, 7 is the lowest.

     

       214
       214
       -
               '';

     

       226
       226
       +
                 Nix daemon process I/O scheduling priority. This priority propagates

     

       227
       227
       +
                 to build processes. The supported priorities depend on the

     

       228
       228
       +
                 scheduling policy: With idle, priorities are not used in scheduling

     

       229
       229
       +
                 decisions. best-effort supports values in the range 0 (high) to 7

     

       230
       230
       +
                 (low).

     

       231
       231
       +
             '';

     

       215
       232
        
             };

     

       216
       233
        
       

     

       217
       234
        
             buildMachines = mkOption {

     
···

       587
       604
        
               unitConfig.RequiresMountsFor = "/nix/store";

     

       588
       605
        
       

     

       589
       606
        
               serviceConfig =

     

       590
       590
       -
                 { Nice = cfg.daemonNiceLevel;

     

       591
       591
       -
                   IOSchedulingPriority = cfg.daemonIONiceLevel;

     

       607
       607
       +
                 { CPUSchedulingPolicy = cfg.daemonCPUSchedPolicy;

     

       608
       608
       +
                   IOSchedulingClass = cfg.daemonIOSchedClass;

     

       609
       609
       +
                   IOSchedulingPriority = cfg.daemonIOSchedPriority;

     

       592
       610
        
                   LimitNOFILE = 4096;

     

       593
       611
        
                 };

     

       594
       612

+3 -2

nixos/modules/system/etc/etc.nix

···

       85
       85
        
             '';

     

       86
       86
        
       

     

       87
       87
        
             type = with types; attrsOf (submodule (

     

       88
       88
       -
               { name, config, ... }:

     

       88
       88
       +
               { name, config, options, ... }:

     

       89
       89
        
               { options = {

     

       90
       90
        
       

     

       91
       91
        
                   enable = mkOption {

     
···

       172
       172
        
                   target = mkDefault name;

     

       173
       173
        
                   source = mkIf (config.text != null) (

     

       174
       174
        
                     let name' = "etc-" + baseNameOf name;

     

       175
       175
       -
                     in mkDefault (pkgs.writeText name' config.text));

     

       175
       175
       +
                     in mkDerivedConfig options.text (pkgs.writeText name')

     

       176
       176
       +
                   );

     

       176
       177
        
                 };

     

       177
       178
        
       

     

       178
       179
        
               }));

+6 -6

pkgs/applications/blockchains/electrs/default.nix

···

       3
       3
        
       , rustPlatform

     

       4
       4
        
       , fetchFromGitHub

     

       5
       5
        
       , llvmPackages

     

       6
       6
       -
       , rocksdb

     

       6
       6
       +
       , rocksdb_6_23

     

       7
       7
        
       , Security

     

       8
       8
        
       }:

     

       9
       9
        
       

     

       10
       10
       +
       let

     

       11
       11
       +
         rocksdb = rocksdb_6_23;

     

       12
       12
       +
       in

     

       10
       13
        
       rustPlatform.buildRustPackage rec {

     

       11
       14
        
         pname = "electrs";

     

       12
       15
        
         version = "0.9.2";

     
···

       24
       27
        
         nativeBuildInputs = [ llvmPackages.clang ];

     

       25
       28
        
         LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";

     

       26
       29
        
       

     

       27
       27
       -
         # temporarily disable dynamic linking, which broke with rocksdb update 6.23.3 -> 6.25.3

     

       28
       28
       -
         # https://github.com/NixOS/nixpkgs/pull/143524#issuecomment-955053331

     

       29
       29
       -
         #

     

       30
       30
        
         # link rocksdb dynamically

     

       31
       31
       -
         # ROCKSDB_INCLUDE_DIR = "${rocksdb}/include";

     

       32
       32
       -
         # ROCKSDB_LIB_DIR = "${rocksdb}/lib";

     

       31
       31
       +
         ROCKSDB_INCLUDE_DIR = "${rocksdb}/include";

     

       32
       32
       +
         ROCKSDB_LIB_DIR = "${rocksdb}/lib";

     

       33
       33
        
       

     

       34
       34
        
         buildInputs = lib.optionals stdenv.isDarwin [ Security ];

     

       35
       35

+4 -4

pkgs/applications/blockchains/lnd/default.nix

···

       6
       6
        
       

     

       7
       7
        
       buildGoModule rec {

     

       8
       8
        
         pname = "lnd";

     

       9
       9
       -
         version = "0.13.3-beta";

     

       9
       9
       +
         version = "0.13.4-beta";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "lightningnetwork";

     

       13
       13
        
           repo = "lnd";

     

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

     

       15
       15
       -
           sha256 = "05ai8nyrc8likq5n7i9klfi9550ki8sqklv8axjvi6ql8v9bzk61";

     

       15
       15
       +
           sha256 = "1ykvhbl5i0kqlh0fpzpjass55clys8bpa28brg7d9fs72zv2ks6x";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         vendorSha256 = "0xf8395g6hifbqwbgapllx38y0759xp374sja7j1wk8sdj5ngql5";

     

       18
       18
       +
         vendorSha256 = "13cjb188bzgd3m3p73szxffkab6l7n6wmbvqvicvi9k3mixn5qql";

     

       19
       19
        
       

     

       20
       20
       -
         subPackages = ["cmd/lncli" "cmd/lnd"];

     

       20
       20
       +
         subPackages = [ "cmd/lncli" "cmd/lnd" ];

     

       21
       21
        
       

     

       22
       22
        
         preBuild = let

     

       23
       23
        
           buildVars = {

+2 -2

pkgs/applications/misc/dbeaver/default.nix

···

       18
       18
        
       

     

       19
       19
        
       stdenv.mkDerivation rec {

     

       20
       20
        
         pname = "dbeaver";

     

       21
       21
       -
         version = "21.2.4"; # When updating also update fetchedMavenDeps.sha256

     

       21
       21
       +
         version = "21.2.5"; # When updating also update fetchedMavenDeps.sha256

     

       22
       22
        
       

     

       23
       23
        
         src = fetchFromGitHub {

     

       24
       24
        
           owner = "dbeaver";

     

       25
       25
        
           repo = "dbeaver";

     

       26
       26
        
           rev = version;

     

       27
       27
       -
           sha256 = "BPcTj2YIGyP3g4qrQlDp13lziJwSUt0Zn00CayDku9g=";

     

       27
       27
       +
           sha256 = "bLZYwf6dtbzS0sWKfQQzv4NqRQZqLkJaT24eW3YOsdQ=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         fetchedMavenDeps = stdenv.mkDerivation {

+45

pkgs/applications/misc/downonspot/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , fetchFromGitHub

     

       3
       3
       +
       , rustPlatform

     

       4
       4
       +
       , pkg-config

     

       5
       5
       +
       , makeWrapper

     

       6
       6
       +
       , alsa-lib

     

       7
       7
       +
       , lame

     

       8
       8
       +
       , openssl

     

       9
       9
       +
       }:

     

       10
       10
       +
       

     

       11
       11
       +
       rustPlatform.buildRustPackage rec {

     

       12
       12
       +
         pname = "downonspot";

     

       13
       13
       +
         version = "unstable-2021-10-13";

     

       14
       14
       +
       

     

       15
       15
       +
         src = fetchFromGitHub {

     

       16
       16
       +
           owner = "oSumAtrIX";

     

       17
       17
       +
           repo = "DownOnSpot";

     

       18
       18
       +
           rev = "9d78ea2acad4dfe653a895a1547ad0abe7c5b47a";

     

       19
       19
       +
           sha256 = "03g99yx9sldcg3i6hvpdxyk70f09f8kfj3kh283vl09b1a2c477w";

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         cargoSha256 = "0k200p6wgwb60ax1r8mjn3aq08zxpkqbfqpi3b25zi3xf83my44d";

     

       23
       23
       +
       

     

       24
       24
       +
         # fixes: error: the option `Z` is only accepted on the nightly compiler

     

       25
       25
       +
         RUSTC_BOOTSTRAP = 1;

     

       26
       26
       +
       

     

       27
       27
       +
         nativeBuildInputs = [

     

       28
       28
       +
           pkg-config

     

       29
       29
       +
           makeWrapper

     

       30
       30
       +
         ];

     

       31
       31
       +
       

     

       32
       32
       +
         buildInputs = [

     

       33
       33
       +
           openssl

     

       34
       34
       +
           alsa-lib

     

       35
       35
       +
           lame

     

       36
       36
       +
         ];

     

       37
       37
       +
       

     

       38
       38
       +
         meta = with lib; {

     

       39
       39
       +
           description = "A Spotify downloader written in rust";

     

       40
       40
       +
           homepage = "https://github.com/oSumAtrIX/DownOnSpot";

     

       41
       41
       +
           license = licenses.gpl3Only;

     

       42
       42
       +
           platforms = platforms.linux;

     

       43
       43
       +
           maintainers = with maintainers; [ onny ];

     

       44
       44
       +
         };

     

       45
       45
       +
       }

+4 -2

pkgs/applications/misc/visidata/default.nix

···

       9
       9
        
       , openpyxl

     

       10
       10
        
       , xlrd

     

       11
       11
        
       , h5py

     

       12
       12
       +
       , odfpy

     

       12
       13
        
       , psycopg2

     

       13
       14
        
       , pyshp

     

       14
       15
        
       , fonttools

     
···

       24
       25
        
       }:

     

       25
       26
        
       buildPythonApplication rec {

     

       26
       27
        
         pname = "visidata";

     

       27
       27
       -
         version = "2.6.1";

     

       28
       28
       +
         version = "2.7";

     

       28
       29
        
       

     

       29
       30
        
         src = fetchFromGitHub {

     

       30
       31
        
           owner = "saulpw";

     

       31
       32
        
           repo = "visidata";

     

       32
       33
        
           rev = "v${version}";

     

       33
       33
       -
           sha256 = "1dmiy87x0yc0d594v3d3km13dl851mx7ym1vgh3bg91llg8ykg33";

     

       34
       34
       +
           sha256 = "0b2h9vy0fch0bk0b33h8p4ssk3a25j67sfn0yvmxhbqjdmhlwv4h";

     

       34
       35
        
         };

     

       35
       36
        
       

     

       36
       37
        
         propagatedBuildInputs = [

     
···

       60
       61
        
           tabulate

     

       61
       62
        
           wcwidth

     

       62
       63
        
           zstandard

     

       64
       64
       +
           odfpy

     

       63
       65
        
           setuptools

     

       64
       66
        
         ] ++ lib.optionals withPcap [ dpkt dnslib ];

     

       65
       67

+1 -1

pkgs/applications/networking/browsers/firefox/wrapper.nix

···

       290
       290
        
               else

     

       291
       291
        
                   for res in 16 32 48 64 128; do

     

       292
       292
        
                   mkdir -p "$out/share/icons/hicolor/''${res}x''${res}/apps"

     

       293
       293
       -
                   icon=( "${browser}/lib/"*"/browser/chrome/icons/default/default''${res}.png" )

     

       293
       293
       +
                   icon=$( find "${browser}/lib/" -name "default''${res}.png" )

     

       294
       294
        
                     if [ -e "$icon" ]; then ln -s "$icon" \

     

       295
       295
        
                       "$out/share/icons/hicolor/''${res}x''${res}/apps/${applicationName}.png"

     

       296
       296
        
                     fi

+1 -1

pkgs/applications/networking/nextcloud-client/default.nix

···

       73
       73
        
           description = "Nextcloud themed desktop client";

     

       74
       74
        
           homepage = "https://nextcloud.com";

     

       75
       75
        
           license = licenses.gpl2Plus;

     

       76
       76
       -
           maintainers = with maintainers; [ caugner kranzes ];

     

       76
       76
       +
           maintainers = with maintainers; [ kranzes ];

     

       77
       77
        
           platforms = platforms.linux;

     

       78
       78
        
         };

     

       79
       79
        
       }

+3 -3

pkgs/applications/radio/flex-ndax/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "flex-ndax";

     

       5
       5
       -
         version = "0.1-20210714.0";

     

       5
       5
       +
         version = "0.2-20211111.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "kc2g-flex-tools";

     

       9
       9
        
           repo = "nDAX";

     

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

     

       11
       11
       -
           sha256 = "16zx6kbax59rcxyz9dhq7m8yx214knz3xayna1gzb85m6maly8v8";

     

       11
       11
       +
           sha256 = "0m2hphj0qvgq25pfm3s76naf672ll43jv7gll8cfs7276ckg1904";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         buildInputs = [ pulseaudio ];

     

       15
       15
        
       

     

       16
       16
       -
         vendorSha256 = "0qn8vg84j9kp0ycn24lkaqjnnk339j3vis4bn48ia3z5vfc22gi5";

     

       16
       16
       +
         vendorSha256 = "1bf0iidb8ggzahy3fvxispf3g940mv6vj9wqd8i3rldc6ca2i3pf";

     

       17
       17
        
       

     

       18
       18
        
         meta = with lib; {

     

       19
       19
        
           homepage = "https://github.com/kc2g-flex-tools/nDAX";

+19 -24

pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch

···

       1
       1
        
       diff --git a/src/elan-dist/src/component/package.rs b/src/elan-dist/src/component/package.rs

     

       2
       2
       -
       index c51e76d..d0a26d7 100644

     

       2
       2
       +
       index c51e76d..ae8159e 100644

     

       3
       3
        
       --- a/src/elan-dist/src/component/package.rs

     

       4
       4
        
       +++ b/src/elan-dist/src/component/package.rs

     

       5
       5
       -
       @@ -56,11 +56,35 @@ fn unpack_without_first_dir<R: Read>(archive: &mut tar::Archive<R>, path: &Path)

     

       5
       5
       +
       @@ -56,6 +56,30 @@ fn unpack_without_first_dir<R: Read>(archive: &mut tar::Archive<R>, path: &Path)

     

       6
       6
        
                entry

     

       7
       7
        
                    .unpack(&full_path)

     

       8
       8
        
                    .chain_err(|| ErrorKind::ExtractingPackage)?;

     

       9
       9
       -
       +        nix_patchelf_if_needed(&full_path);

     

       10
       10
       -
            }

     

       11
       11
       -
        

     

       12
       12
       -
            Ok(())

     

       13
       13
       -
        }

     

       14
       14
       -
        

     

       15
       15
       -
       +fn nix_patchelf_if_needed(dest_path: &Path) {

     

       16
       16
       -
       +    let (is_bin, is_lib) = if let Some(p) = dest_path.parent() {

     

       17
       17
       -
       +        (p.ends_with("bin"), p.ends_with("lib"))

     

       18
       18
       -
       +    } else {

     

       19
       19
       -
       +        (false, false)

     

       20
       20
       -
       +    };

     

       9
       9
       +
       +        nix_patch_if_needed(&full_path)?;

     

       10
       10
       +
       +    }

     

       11
       11
       +
       +

     

       12
       12
       +
       +    Ok(())

     

       13
       13
       +
       +}

     

       21
       14
        
       +

     

       15
       15
       +
       +fn nix_patch_if_needed(dest_path: &Path) -> Result<()> {

     

       16
       16
       +
       +    let is_bin = matches!(dest_path.parent(), Some(p) if p.ends_with("bin"));

     

       22
       17
        
       +    if is_bin {

     

       23
       18
        
       +        let _ = ::std::process::Command::new("@patchelf@/bin/patchelf")

     

       24
       19
        
       +            .arg("--set-interpreter")

     
···

       26
       21
        
       +            .arg(dest_path)

     

       27
       22
        
       +            .output();

     

       28
       23
        
       +    }

     

       29
       29
       -
       +    else if is_lib {

     

       30
       30
       -
       +        let _ = ::std::process::Command::new("@patchelf@/bin/patchelf")

     

       31
       31
       -
       +            .arg("--set-rpath")

     

       32
       32
       -
       +            .arg("@libPath@")

     

       33
       33
       -
       +            .arg(dest_path)

     

       34
       34
       -
       +            .output();

     

       35
       35
       -
       +    }

     

       36
       36
       -
       +}

     

       37
       24
        
       +

     

       38
       38
       -
        #[derive(Debug)]

     

       39
       39
       -
        pub struct ZipPackage<'a>(temp::Dir<'a>);

     

       25
       25
       +
       +    if dest_path.extension() == Some(::std::ffi::OsStr::new("lld")) {

     

       26
       26
       +
       +        use std::os::unix::fs::PermissionsExt;

     

       27
       27
       +
       +        let new_path = dest_path.with_extension("orig");

     

       28
       28
       +
       +        ::std::fs::rename(dest_path, &new_path)?;

     

       29
       29
       +
       +        ::std::fs::write(dest_path, format!(r#"#! @shell@

     

       30
       30
       +
       +exec -a "$0" {} "$@" --dynamic-linker=@dynamicLinker@

     

       31
       31
       +
       +"#, new_path.to_str().unwrap()))?;

     

       32
       32
       +
       +        ::std::fs::set_permissions(dest_path, ::std::fs::Permissions::from_mode(0o755))?;

     

       33
       33
       +
            }

     

       40
       34
        
        

     

       35
       35
       +
            Ok(())

+4 -10

pkgs/applications/science/logic/elan/default.nix

···

       1
       1
       -
       { stdenv, lib, runCommand, patchelf, makeWrapper, pkg-config, curl

     

       2
       2
       -
       , openssl, gmp, zlib, fetchFromGitHub, rustPlatform, libiconv }:

     

       3
       3
       -
       

     

       4
       4
       -
       let

     

       5
       5
       -
         libPath = lib.makeLibraryPath [ gmp ];

     

       6
       6
       -
       in

     

       1
       1
       +
       { stdenv, lib, runCommand, patchelf, makeWrapper, pkg-config, curl, runtimeShell

     

       2
       2
       +
       , openssl, zlib, fetchFromGitHub, rustPlatform, libiconv }:

     

       7
       3
        
       

     

       8
       4
        
       rustPlatform.buildRustPackage rec {

     

       9
       5
        
         pname = "elan";

     
···

       32
       28
        
           (runCommand "0001-dynamically-patchelf-binaries.patch" {

     

       33
       29
        
               CC = stdenv.cc;

     

       34
       30
        
               patchelf = patchelf;

     

       35
       35
       -
               libPath = "$ORIGIN/../lib:${libPath}";

     

       31
       31
       +
               shell = runtimeShell;

     

       36
       32
        
             } ''

     

       37
       33
        
            export dynamicLinker=$(cat $CC/nix-support/dynamic-linker)

     

       38
       34
        
            substitute ${./0001-dynamically-patchelf-binaries.patch} $out \

     

       39
       35
        
              --subst-var patchelf \

     

       40
       36
        
              --subst-var dynamicLinker \

     

       41
       41
       -
              --subst-var libPath

     

       37
       37
       +
              --subst-var shell

     

       42
       38
        
           '')

     

       43
       39
        
         ];

     

       44
       40
        
       

     
···

       49
       45
        
             ln -s elan $link

     

       50
       46
        
           done

     

       51
       47
        
           popd

     

       52
       52
       -
       

     

       53
       53
       -
           wrapProgram $out/bin/elan --prefix "LD_LIBRARY_PATH" : "${libPath}"

     

       54
       48
        
       

     

       55
       49
        
           # tries to create .elan

     

       56
       50
        
           export HOME=$(mktemp -d)

+2 -2

pkgs/applications/terminal-emulators/xterm/default.nix

···

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         pname = "xterm";

     

       7
       7
       -
         version = "369";

     

       7
       7
       +
         version = "370";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           urls = [

     

       11
       11
        
             "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz"

     

       12
       12
        
             "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz"

     

       13
       13
        
           ];

     

       14
       14
       -
           sha256 = "ce1qSNBkiT0hSXQaACeBqXNJb9JNUtrdNk9jQ5p2TiY=";

     

       14
       14
       +
           sha256 = "ljxdhAoPD0wHf/KEWG6LH4Pz+YPcpvdPSzYZdbU4jII=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         strictDeps = true;

+5 -2

pkgs/applications/virtualization/qemu/default.nix

···

       23
       23
        
       , libiscsiSupport ? true, libiscsi

     

       24
       24
        
       , smbdSupport ? false, samba

     

       25
       25
        
       , tpmSupport ? true

     

       26
       26
       +
       , uringSupport ? stdenv.isLinux, liburing

     

       26
       27
        
       , hostCpuOnly ? false

     

       27
       28
        
       , hostCpuTargets ? (if hostCpuOnly

     

       28
       29
        
                           then (lib.optional stdenv.isx86_64 "i386-softmmu"

     
···

       77
       78
        
           ++ lib.optionals openGLSupport [ mesa libepoxy libdrm ]

     

       78
       79
        
           ++ lib.optionals virglSupport [ virglrenderer ]

     

       79
       80
        
           ++ lib.optionals libiscsiSupport [ libiscsi ]

     

       80
       80
       -
           ++ lib.optionals smbdSupport [ samba ];

     

       81
       81
       +
           ++ lib.optionals smbdSupport [ samba ]

     

       82
       82
       +
           ++ lib.optionals uringSupport [ liburing ];

     

       81
       83
        
       

     

       82
       84
        
         dontUseMesonConfigure = true; # meson's configurePhase isn't compatible with qemu build

     

       83
       85
        
       

     
···

       187
       189
        
           ++ lib.optional virglSupport "--enable-virglrenderer"

     

       188
       190
        
           ++ lib.optional tpmSupport "--enable-tpm"

     

       189
       191
        
           ++ lib.optional libiscsiSupport "--enable-libiscsi"

     

       190
       190
       -
           ++ lib.optional smbdSupport "--smbd=${samba}/bin/smbd";

     

       192
       192
       +
           ++ lib.optional smbdSupport "--smbd=${samba}/bin/smbd"

     

       193
       193
       +
           ++ lib.optional uringSupport "--enable-linux-io-uring";

     

       191
       194
        
       

     

       192
       195
        
         doCheck = false; # tries to access /dev

     

       193
       196
        
         dontWrapGApps = true;

+3 -3

pkgs/development/compilers/qbe/default.nix

···

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
         pname = "qbe";

     

       9
       9
       -
         version = "unstable-2021-10-28";

     

       9
       9
       +
         version = "unstable-2021-11-10";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchgit {

     

       12
       12
        
           url = "git://c9x.me/qbe.git";

     

       13
       13
       -
           rev = "0d68986b6f6aa046ab13776f39cc37b67b3477ba";

     

       14
       14
       -
           sha256 = "sha256-K1XpVoJoY8QuUdP5rKnlAs4yTn5jhh9LKZjHalliNKs=";

     

       13
       13
       +
           rev = "b0f16dad64d14f36ffe235b2e9cca96aa3ce35ba";

     

       14
       14
       +
           sha256 = "sha256-oPgr8PDxGNqIWxWsvVr9B8oN0Io/pUuzgIkZfY/qD+o=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         makeFlags = [ "PREFIX=$(out)" ];

+2 -2

pkgs/development/compilers/vala/default.nix

···

       129
       129
        
         };

     

       130
       130
        
       

     

       131
       131
        
         vala_0_52 = generic {

     

       132
       132
       -
           version = "0.52.6";

     

       133
       133
       -
           sha256 = "sha256-FNfrTZZLfDrcFuRTcTIIbdxmJO0eDruBEeKsgierOnI=";

     

       132
       132
       +
           version = "0.52.7";

     

       133
       133
       +
           sha256 = "sha256-C7WptPbRdUmewKWAJK3ANapRcAgPUzwo2cNY0aMsU2o=";

     

       134
       134
        
         };

     

       135
       135
        
       

     

       136
       136
        
         vala_0_54 = generic {

+13 -2

pkgs/development/interpreters/lunatic/default.nix

···

       1
       1
       -
       { cmake, fetchFromGitHub, lib, rustPlatform }:

     

       1
       1
       +
       { lib, rustPlatform, fetchFromGitHub, fetchpatch, cmake, stdenv }:

     

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "lunatic";

     
···

       11
       11
        
           sha256 = "1dz8v19jw9v55p3mz4932v6z24ihp6wk238n4d4lx9xj91mf3g6r";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoSha256 = "1rkxl27l6ydmcq3flc6qbnd7zmpkfmyc86b8q4pi7dwhqnd5g70g";

     

       14
       14
       +
         cargoPatches = [

     

       15
       15
       +
           # NOTE: remove on next update

     

       16
       16
       +
           # update dependencies to resolve incompatibility with rust 1.56

     

       17
       17
       +
           (fetchpatch {

     

       18
       18
       +
             name = "update-wasmtime.patch";

     

       19
       19
       +
             url = "https://github.com/lunatic-solutions/lunatic/commit/cd8db51732712c19a8114db290882d1bb6b928c0.patch";

     

       20
       20
       +
             sha256 = "sha256-eyoIOTqGSU/XNfF55FG+WrQPSMvt9L/S/KBsUQB5z1k=";

     

       21
       21
       +
           })

     

       22
       22
       +
         ];

     

       23
       23
       +
       

     

       24
       24
       +
         cargoSha256 = "sha256-yoG4gCk+nHE8pBqV6ND9NCegx4bxbdGEU5hY5JauloM=";

     

       15
       25
        
       

     

       16
       26
        
         nativeBuildInputs = [ cmake ];

     

       17
       27
        
       

     
···

       20
       30
        
           homepage = "https://lunatic.solutions";

     

       21
       31
        
           license = with licenses; [ mit /* or */ asl20 ];

     

       22
       32
        
           maintainers = with maintainers; [ figsoda ];

     

       33
       33
       +
           broken = stdenv.isDarwin;

     

       23
       34
        
         };

     

       24
       35
        
       }

+142 -108

pkgs/development/interpreters/php/generic.nix

···

       7
       7
        
           , lib

     

       8
       8
        
           , stdenv

     

       9
       9
        
           , nixosTests

     

       10
       10
       +
           , tests

     

       10
       11
        
           , fetchurl

     

       11
       12
        
           , makeWrapper

     

       12
       13
        
           , symlinkJoin

     
···

       31
       32
        
           , sha256

     

       32
       33
        
           , extraPatches ? [ ]

     

       33
       34
        
           , packageOverrides ? (final: prev: { })

     

       35
       35
       +
           , phpAttrsOverrides ? (attrs: { })

     

       34
       36
        
       

     

       35
       37
        
             # Sapi flags

     

       36
       38
        
           , cgiSupport ? true

     
···

       52
       54
        
           }@args:

     

       53
       55
        
       

     

       54
       56
        
           let

     

       57
       57
       +
             # Compose two functions of the type expected by 'overrideAttrs'

     

       58
       58
       +
             # into one where changes made in the first are available to the second.

     

       59
       59
       +
             composeOverrides =

     

       60
       60
       +
               f: g: attrs:

     

       61
       61
       +
               let

     

       62
       62
       +
                 fApplied = f attrs;

     

       63
       63
       +
                 attrs' = attrs // fApplied;

     

       64
       64
       +
               in

     

       65
       65
       +
               fApplied // g attrs';

     

       66
       66
       +
       

     

       55
       67
        
             # buildEnv wraps php to provide additional extensions and

     

       56
       68
        
             # configuration. Its usage is documented in

     

       57
       69
        
             # doc/languages-frameworks/php.section.md.

     
···

       129
       141
        
                   passthru = php.passthru // {

     

       130
       142
        
                     buildEnv = mkBuildEnv allArgs allExtensionFunctions;

     

       131
       143
        
                     withExtensions = mkWithExtensions allArgs allExtensionFunctions;

     

       144
       144
       +
                     overrideAttrs =

     

       145
       145
       +
                       f:

     

       146
       146
       +
                       let

     

       147
       147
       +
                         newPhpAttrsOverrides = composeOverrides (filteredArgs.phpAttrsOverrides or (attrs: { })) f;

     

       148
       148
       +
                         php = generic (filteredArgs // { phpAttrsOverrides = newPhpAttrsOverrides; });

     

       149
       149
       +
                       in

     

       150
       150
       +
                       php.buildEnv { inherit extensions extraConfig; };

     

       132
       151
        
                     phpIni = "${phpWithExtensions}/lib/php.ini";

     

       133
       152
        
                     unwrapped = php;

     

       134
       153
        
                     # Select the right php tests for the php version

     

       135
       135
       -
                     tests = nixosTests."php${lib.strings.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor php.version)}";

     

       154
       154
       +
                     tests = {

     

       155
       155
       +
                       nixos = lib.recurseIntoAttrs nixosTests."php${lib.strings.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor php.version)}";

     

       156
       156
       +
                       package = tests.php;

     

       157
       157
       +
                     };

     

       136
       158
        
                     inherit (php-packages) extensions buildPecl mkExtension;

     

       137
       159
        
                     packages = php-packages.tools;

     

       138
       160
        
                     meta = php.meta // {

     
···

       163
       185
        
             mkWithExtensions = prevArgs: prevExtensionFunctions: extensions:

     

       164
       186
        
               mkBuildEnv prevArgs prevExtensionFunctions { inherit extensions; };

     

       165
       187
        
           in

     

       166
       166
       -
           stdenv.mkDerivation {

     

       167
       167
       -
             pname = "php";

     

       188
       188
       +
           stdenv.mkDerivation (

     

       189
       189
       +
             let

     

       190
       190
       +
               attrs = {

     

       191
       191
       +
                 pname = "php";

     

       168
       192
        
       

     

       169
       169
       -
             inherit version;

     

       193
       193
       +
                 inherit version;

     

       170
       194
        
       

     

       171
       171
       -
             enableParallelBuilding = true;

     

       195
       195
       +
                 enableParallelBuilding = true;

     

       172
       196
        
       

     

       173
       173
       -
             nativeBuildInputs = [ autoconf automake bison flex libtool pkg-config re2c ]

     

       174
       174
       -
               ++ lib.optional stdenv.isDarwin xcbuild;

     

       197
       197
       +
                 nativeBuildInputs = [ autoconf automake bison flex libtool pkg-config re2c ]

     

       198
       198
       +
                   ++ lib.optional stdenv.isDarwin xcbuild;

     

       175
       199
        
       

     

       176
       176
       -
             buildInputs =

     

       177
       177
       -
               # PCRE extension

     

       178
       178
       -
               [ pcre2 ]

     

       200
       200
       +
                 buildInputs =

     

       201
       201
       +
                   # PCRE extension

     

       202
       202
       +
                   [ pcre2 ]

     

       179
       203
        
       

     

       180
       180
       -
               # Enable sapis

     

       181
       181
       -
               ++ lib.optional pearSupport [ libxml2.dev ]

     

       204
       204
       +
                   # Enable sapis

     

       205
       205
       +
                   ++ lib.optional pearSupport [ libxml2.dev ]

     

       182
       206
        
       

     

       183
       183
       -
               # Misc deps

     

       184
       184
       -
               ++ lib.optional apxs2Support apacheHttpd

     

       185
       185
       -
               ++ lib.optional argon2Support libargon2

     

       186
       186
       -
               ++ lib.optional systemdSupport systemd

     

       187
       187
       -
               ++ lib.optional valgrindSupport valgrind

     

       188
       188
       -
             ;

     

       207
       207
       +
                   # Misc deps

     

       208
       208
       +
                   ++ lib.optional apxs2Support apacheHttpd

     

       209
       209
       +
                   ++ lib.optional argon2Support libargon2

     

       210
       210
       +
                   ++ lib.optional systemdSupport systemd

     

       211
       211
       +
                   ++ lib.optional valgrindSupport valgrind

     

       212
       212
       +
                 ;

     

       189
       213
        
       

     

       190
       190
       -
             CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";

     

       214
       214
       +
                 CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";

     

       191
       215
        
       

     

       192
       192
       -
             configureFlags =

     

       193
       193
       -
               # Disable all extensions

     

       194
       194
       -
               [ "--disable-all" ]

     

       216
       216
       +
                 configureFlags =

     

       217
       217
       +
                   # Disable all extensions

     

       218
       218
       +
                   [ "--disable-all" ]

     

       195
       219
        
       

     

       196
       196
       -
               # PCRE

     

       197
       197
       -
               ++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre2.dev}" ]

     

       198
       198
       -
               ++ [ "PCRE_LIBDIR=${pcre2}" ]

     

       220
       220
       +
                   # PCRE

     

       221
       221
       +
                   ++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre2.dev}" ]

     

       222
       222
       +
                   ++ [ "PCRE_LIBDIR=${pcre2}" ]

     

       199
       223
        
       

     

       200
       224
        
       

     

       201
       201
       -
               # Enable sapis

     

       202
       202
       -
               ++ lib.optional (!cgiSupport) "--disable-cgi"

     

       203
       203
       -
               ++ lib.optional (!cliSupport) "--disable-cli"

     

       204
       204
       -
               ++ lib.optional fpmSupport "--enable-fpm"

     

       205
       205
       -
               ++ lib.optional pearSupport [ "--with-pear" "--enable-xml" "--with-libxml" ]

     

       206
       206
       -
               ++ lib.optionals (pearSupport && (lib.versionOlder version "7.4")) [

     

       207
       207
       -
                 "--enable-libxml"

     

       208
       208
       -
                 "--with-libxml-dir=${libxml2.dev}"

     

       209
       209
       -
               ]

     

       210
       210
       -
               ++ lib.optional pharSupport "--enable-phar"

     

       211
       211
       -
               ++ lib.optional (!phpdbgSupport) "--disable-phpdbg"

     

       225
       225
       +
                   # Enable sapis

     

       226
       226
       +
                   ++ lib.optional (!cgiSupport) "--disable-cgi"

     

       227
       227
       +
                   ++ lib.optional (!cliSupport) "--disable-cli"

     

       228
       228
       +
                   ++ lib.optional fpmSupport "--enable-fpm"

     

       229
       229
       +
                   ++ lib.optional pearSupport [ "--with-pear" "--enable-xml" "--with-libxml" ]

     

       230
       230
       +
                   ++ lib.optionals (pearSupport && (lib.versionOlder version "7.4")) [

     

       231
       231
       +
                     "--enable-libxml"

     

       232
       232
       +
                     "--with-libxml-dir=${libxml2.dev}"

     

       233
       233
       +
                   ]

     

       234
       234
       +
                   ++ lib.optional pharSupport "--enable-phar"

     

       235
       235
       +
                   ++ lib.optional (!phpdbgSupport) "--disable-phpdbg"

     

       212
       236
        
       

     

       213
       237
        
       

     

       214
       214
       -
               # Misc flags

     

       215
       215
       -
               ++ lib.optional apxs2Support "--with-apxs2=${apacheHttpd.dev}/bin/apxs"

     

       216
       216
       -
               ++ lib.optional argon2Support "--with-password-argon2=${libargon2}"

     

       217
       217
       -
               ++ lib.optional cgotoSupport "--enable-re2c-cgoto"

     

       218
       218
       -
               ++ lib.optional embedSupport "--enable-embed"

     

       219
       219
       -
               ++ lib.optional (!ipv6Support) "--disable-ipv6"

     

       220
       220
       -
               ++ lib.optional systemdSupport "--with-fpm-systemd"

     

       221
       221
       -
               ++ lib.optional valgrindSupport "--with-valgrind=${valgrind.dev}"

     

       222
       222
       -
               ++ lib.optional (ztsSupport && (lib.versionOlder version "8.0")) "--enable-maintainer-zts"

     

       223
       223
       -
               ++ lib.optional (ztsSupport && (lib.versionAtLeast version "8.0")) "--enable-zts"

     

       238
       238
       +
                   # Misc flags

     

       239
       239
       +
                   ++ lib.optional apxs2Support "--with-apxs2=${apacheHttpd.dev}/bin/apxs"

     

       240
       240
       +
                   ++ lib.optional argon2Support "--with-password-argon2=${libargon2}"

     

       241
       241
       +
                   ++ lib.optional cgotoSupport "--enable-re2c-cgoto"

     

       242
       242
       +
                   ++ lib.optional embedSupport "--enable-embed"

     

       243
       243
       +
                   ++ lib.optional (!ipv6Support) "--disable-ipv6"

     

       244
       244
       +
                   ++ lib.optional systemdSupport "--with-fpm-systemd"

     

       245
       245
       +
                   ++ lib.optional valgrindSupport "--with-valgrind=${valgrind.dev}"

     

       246
       246
       +
                   ++ lib.optional (ztsSupport && (lib.versionOlder version "8.0")) "--enable-maintainer-zts"

     

       247
       247
       +
                   ++ lib.optional (ztsSupport && (lib.versionAtLeast version "8.0")) "--enable-zts"

     

       224
       248
        
       

     

       225
       249
        
       

     

       226
       226
       -
               # Sendmail

     

       227
       227
       -
               ++ [ "PROG_SENDMAIL=${system-sendmail}/bin/sendmail" ]

     

       228
       228
       -
             ;

     

       250
       250
       +
                   # Sendmail

     

       251
       251
       +
                   ++ [ "PROG_SENDMAIL=${system-sendmail}/bin/sendmail" ]

     

       252
       252
       +
                 ;

     

       229
       253
        
       

     

       230
       230
       -
             hardeningDisable = [ "bindnow" ];

     

       254
       254
       +
                 hardeningDisable = [ "bindnow" ];

     

       231
       255
        
       

     

       232
       232
       -
             preConfigure =

     

       233
       233
       -
               # Don't record the configure flags since this causes unnecessary

     

       234
       234
       -
               # runtime dependencies

     

       235
       235
       -
               ''

     

       236
       236
       -
                 for i in main/build-defs.h.in scripts/php-config.in; do

     

       237
       237
       -
                   substituteInPlace $i \

     

       238
       238
       -
                     --replace '@CONFIGURE_COMMAND@' '(omitted)' \

     

       239
       239
       -
                     --replace '@CONFIGURE_OPTIONS@' "" \

     

       240
       240
       -
                     --replace '@PHP_LDFLAGS@' ""

     

       241
       241
       -
                 done

     

       256
       256
       +
                 preConfigure =

     

       257
       257
       +
                   # Don't record the configure flags since this causes unnecessary

     

       258
       258
       +
                   # runtime dependencies

     

       259
       259
       +
                   ''

     

       260
       260
       +
                     for i in main/build-defs.h.in scripts/php-config.in; do

     

       261
       261
       +
                       substituteInPlace $i \

     

       262
       262
       +
                         --replace '@CONFIGURE_COMMAND@' '(omitted)' \

     

       263
       263
       +
                         --replace '@CONFIGURE_OPTIONS@' "" \

     

       264
       264
       +
                         --replace '@PHP_LDFLAGS@' ""

     

       265
       265
       +
                     done

     

       242
       266
        
       

     

       243
       243
       -
                 export EXTENSION_DIR=$out/lib/php/extensions

     

       244
       244
       -
               ''

     

       245
       245
       -
               # PKG_CONFIG need not be a relative path

     

       246
       246
       -
               + lib.optionalString (!lib.versionAtLeast version "7.4") ''

     

       247
       247
       -
                 for i in $(find . -type f -name "*.m4"); do

     

       248
       248
       -
                   substituteInPlace $i \

     

       249
       249
       -
                     --replace 'test -x "$PKG_CONFIG"' 'type -P "$PKG_CONFIG" >/dev/null'

     

       250
       250
       -
                 done

     

       251
       251
       -
               '' + ''

     

       252
       252
       -
                 ./buildconf --copy --force

     

       267
       267
       +
                     export EXTENSION_DIR=$out/lib/php/extensions

     

       268
       268
       +
                   ''

     

       269
       269
       +
                   # PKG_CONFIG need not be a relative path

     

       270
       270
       +
                   + lib.optionalString (!lib.versionAtLeast version "7.4") ''

     

       271
       271
       +
                     for i in $(find . -type f -name "*.m4"); do

     

       272
       272
       +
                       substituteInPlace $i \

     

       273
       273
       +
                         --replace 'test -x "$PKG_CONFIG"' 'type -P "$PKG_CONFIG" >/dev/null'

     

       274
       274
       +
                     done

     

       275
       275
       +
                   '' + ''

     

       276
       276
       +
                     ./buildconf --copy --force

     

       253
       277
        
       

     

       254
       254
       -
                 if test -f $src/genfiles; then

     

       255
       255
       -
                   ./genfiles

     

       256
       256
       -
                 fi

     

       257
       257
       -
               '' + lib.optionalString stdenv.isDarwin ''

     

       258
       258
       -
                 substituteInPlace configure --replace "-lstdc++" "-lc++"

     

       259
       259
       -
               '';

     

       278
       278
       +
                     if test -f $src/genfiles; then

     

       279
       279
       +
                       ./genfiles

     

       280
       280
       +
                     fi

     

       281
       281
       +
                   '' + lib.optionalString stdenv.isDarwin ''

     

       282
       282
       +
                     substituteInPlace configure --replace "-lstdc++" "-lc++"

     

       283
       283
       +
                   '';

     

       260
       284
        
       

     

       261
       261
       -
             postInstall = ''

     

       262
       262
       -
               test -d $out/etc || mkdir $out/etc

     

       263
       263
       -
               cp php.ini-production $out/etc/php.ini

     

       264
       264
       -
             '';

     

       285
       285
       +
                 postInstall = ''

     

       286
       286
       +
                   test -d $out/etc || mkdir $out/etc

     

       287
       287
       +
                   cp php.ini-production $out/etc/php.ini

     

       288
       288
       +
                 '';

     

       265
       289
        
       

     

       266
       266
       -
             postFixup = ''

     

       267
       267
       -
               mkdir -p $dev/bin $dev/share/man/man1

     

       268
       268
       -
               mv $out/bin/phpize $out/bin/php-config $dev/bin/

     

       269
       269
       -
               mv $out/share/man/man1/phpize.1.gz \

     

       270
       270
       -
                  $out/share/man/man1/php-config.1.gz \

     

       271
       271
       -
                  $dev/share/man/man1/

     

       272
       272
       -
             '';

     

       290
       290
       +
                 postFixup = ''

     

       291
       291
       +
                   mkdir -p $dev/bin $dev/share/man/man1

     

       292
       292
       +
                   mv $out/bin/phpize $out/bin/php-config $dev/bin/

     

       293
       293
       +
                   mv $out/share/man/man1/phpize.1.gz \

     

       294
       294
       +
                      $out/share/man/man1/php-config.1.gz \

     

       295
       295
       +
                      $dev/share/man/man1/

     

       296
       296
       +
                 '';

     

       273
       297
        
       

     

       274
       274
       -
             src = fetchurl {

     

       275
       275
       -
               url = "https://www.php.net/distributions/php-${version}.tar.bz2";

     

       276
       276
       -
               inherit sha256;

     

       277
       277
       -
             };

     

       298
       298
       +
                 src = fetchurl {

     

       299
       299
       +
                   url = "https://www.php.net/distributions/php-${version}.tar.bz2";

     

       300
       300
       +
                   inherit sha256;

     

       301
       301
       +
                 };

     

       278
       302
        
       

     

       279
       279
       -
             patches = [ ./fix-paths-php7.patch ] ++ extraPatches;

     

       303
       303
       +
                 patches = [ ./fix-paths-php7.patch ] ++ extraPatches;

     

       280
       304
        
       

     

       281
       281
       -
             separateDebugInfo = true;

     

       305
       305
       +
                 separateDebugInfo = true;

     

       282
       306
        
       

     

       283
       283
       -
             outputs = [ "out" "dev" ];

     

       307
       307
       +
                 outputs = [ "out" "dev" ];

     

       284
       308
        
       

     

       285
       285
       -
             passthru = {

     

       286
       286
       -
               buildEnv = mkBuildEnv { } [ ];

     

       287
       287
       -
               withExtensions = mkWithExtensions { } [ ];

     

       288
       288
       -
               inherit ztsSupport;

     

       289
       289
       -
             };

     

       309
       309
       +
                 passthru = {

     

       310
       310
       +
                   buildEnv = mkBuildEnv { } [ ];

     

       311
       311
       +
                   withExtensions = mkWithExtensions { } [ ];

     

       312
       312
       +
                   overrideAttrs =

     

       313
       313
       +
                     f:

     

       314
       314
       +
                     let

     

       315
       315
       +
                       newPhpAttrsOverrides = composeOverrides phpAttrsOverrides f;

     

       316
       316
       +
                       php = generic (args // { phpAttrsOverrides = newPhpAttrsOverrides; });

     

       317
       317
       +
                     in

     

       318
       318
       +
                     php;

     

       319
       319
       +
                   inherit ztsSupport;

     

       320
       320
       +
                 };

     

       290
       321
        
       

     

       291
       291
       -
             meta = with lib; {

     

       292
       292
       -
               description = "An HTML-embedded scripting language";

     

       293
       293
       -
               homepage = "https://www.php.net/";

     

       294
       294
       -
               license = licenses.php301;

     

       295
       295
       -
               maintainers = teams.php.members;

     

       296
       296
       -
               platforms = platforms.all;

     

       297
       297
       -
               outputsToInstall = [ "out" "dev" ];

     

       298
       298
       -
             };

     

       299
       299
       -
           };

     

       322
       322
       +
                 meta = with lib; {

     

       323
       323
       +
                   description = "An HTML-embedded scripting language";

     

       324
       324
       +
                   homepage = "https://www.php.net/";

     

       325
       325
       +
                   license = licenses.php301;

     

       326
       326
       +
                   maintainers = teams.php.members;

     

       327
       327
       +
                   platforms = platforms.all;

     

       328
       328
       +
                   outputsToInstall = [ "out" "dev" ];

     

       329
       329
       +
                 };

     

       330
       330
       +
               };

     

       331
       331
       +
             in

     

       332
       332
       +
             attrs // phpAttrsOverrides attrs

     

       333
       333
       +
           );

     

       300
       334
        
       in

     

       301
       335
        
       generic

+24 -3

pkgs/development/libraries/ceres-solver/default.nix

···

       1
       1
       -
       { lib, stdenv

     

       2
       2
       -
       , eigen

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchpatch

     

       3
       4
        
       , fetchurl

     

       5
       5
       +
       , blas

     

       4
       6
        
       , cmake

     

       7
       7
       +
       , eigen

     

       5
       8
        
       , gflags

     

       6
       9
        
       , glog

     

       10
       10
       +
       , suitesparse

     

       7
       11
        
       , runTests ? false

     

       12
       12
       +
       , enableStatic ? stdenv.hostPlatform.isStatic

     

       13
       13
       +
       , withBlas ? true

     

       8
       14
        
       }:

     

       9
       15
        
       

     

       10
       16
        
       # gflags is required to run tests

     
···

       19
       25
        
           sha256 = "00vng9vnmdb1qga01m0why90m0041w7bn6kxa2h4m26aflfqla8h";

     

       20
       26
        
         };

     

       21
       27
        
       

     

       28
       28
       +
         outputs = [ "out" "dev" ];

     

       29
       29
       +
       

     

       30
       30
       +
         patches = [

     

       31
       31
       +
           # Enable GNUInstallDirs, see: https://github.com/ceres-solver/ceres-solver/pull/706

     

       32
       32
       +
           (fetchpatch {

     

       33
       33
       +
             url = "https://github.com/ceres-solver/ceres-solver/commit/4998c549396d36a491f1c0638fe57824a40bcb0d.patch";

     

       34
       34
       +
             sha256 = "sha256-mF6Zh2fDVzg2kD4nI2dd9rp4NpvPErmwfdYo5JaBmCA=";

     

       35
       35
       +
           })

     

       36
       36
       +
         ];

     

       37
       37
       +
       

     

       22
       38
        
         nativeBuildInputs = [ cmake ];

     

       23
       39
        
         buildInputs = lib.optional runTests gflags;

     

       24
       24
       -
         propagatedBuildInputs = [ eigen glog ];

     

       40
       40
       +
         propagatedBuildInputs = [ eigen glog ]

     

       41
       41
       +
         ++ lib.optionals withBlas [ blas suitesparse ];

     

       42
       42
       +
       

     

       43
       43
       +
         cmakeFlags = [

     

       44
       44
       +
           "-DBUILD_SHARED_LIBS=${if enableStatic then "OFF" else "ON"}"

     

       45
       45
       +
         ];

     

       25
       46
        
       

     

       26
       47
        
         # The Basel BUILD file conflicts with the cmake build directory on

     

       27
       48
        
         # case-insensitive filesystems, eg. darwin.

+13 -1

pkgs/development/libraries/libwebsockets/default.nix

···

       1
       1
       -
       { fetchFromGitHub, lib, stdenv, cmake, openssl, zlib, libuv }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , cmake

     

       5
       5
       +
       , openssl

     

       6
       6
       +
       , zlib

     

       7
       7
       +
       , libuv

     

       8
       8
       +
       }:

     

       2
       9
        
       

     

       3
       10
        
       let

     

       4
       11
        
         generic = { version, sha256 }: stdenv.mkDerivation rec {

     
···

       63
       70
        
         libwebsockets_4_2 = generic {

     

       64
       71
        
           version = "4.2.1";

     

       65
       72
        
           sha256 = "sha256-C+WGfNF4tAgbp/7aRraBgjNOe4I5ihm+8CGelXzfxbU=";

     

       73
       73
       +
         };

     

       74
       74
       +
       

     

       75
       75
       +
         libwebsockets_4_3 = generic {

     

       76
       76
       +
           version = "4.3.0";

     

       77
       77
       +
           sha256 = "13lxb487mqlzbsbv6fbj50r1717mfwdy87ps592lgfy3307yqpr4";

     

       66
       78
        
         };

     

       67
       79
        
       }

+11 -2

pkgs/development/libraries/libxlsxwriter/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , stdenv

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
       +
       , fetchpatch

     

       4
       5
        
       , minizip

     

       5
       6
        
       , python3

     

       6
       7
        
       , zlib

     
···

       8
       9
        
       

     

       9
       10
        
       stdenv.mkDerivation rec {

     

       10
       11
        
         pname = "libxlsxwriter";

     

       11
       11
       -
         version = "1.1.3";

     

       12
       12
       +
         version = "1.1.4";

     

       12
       13
        
       

     

       13
       14
        
         src = fetchFromGitHub {

     

       14
       15
        
           owner = "jmcnamara";

     

       15
       16
        
           repo = "libxlsxwriter";

     

       16
       17
        
           rev = "RELEASE_${version}";

     

       17
       17
       -
           sha256 = "sha256-j+tplk8Fdx92YKj7PnchMZWctVmBmNirUmDw5ADmJy0=";

     

       18
       18
       +
           sha256 = "sha256-Ef1CipwUEJW/VYx/q98lN0PSxj8c3DbIuql8qU6mTRs=";

     

       18
       19
        
         };

     

       20
       20
       +
       

     

       21
       21
       +
         patches = [

     

       22
       22
       +
           # https://github.com/jmcnamara/libxlsxwriter/pull/357

     

       23
       23
       +
           (fetchpatch {

     

       24
       24
       +
             url = "https://github.com/jmcnamara/libxlsxwriter/commit/723629976ede5e6ec9b03ef970381fed06ef95f0.patch";

     

       25
       25
       +
             sha256 = "14aw698b5svvbhvadc2vr71isck3k02zdv8xjsa7c33n8331h20g";

     

       26
       26
       +
           })

     

       27
       27
       +
         ];

     

       19
       28
        
       

     

       20
       29
        
         nativeBuildInputs = [

     

       21
       30
        
           python3.pkgs.pytest

pkgs/development/libraries/pcl/default.nix

···

       32
       32
        
           sha256 = "0jhvciaw43y6iqqk7hyxnfhn1b4bsw5fpy04s01r5pkcsjjbdbqc";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
       +
         # remove attempt to prevent (x86/x87-specific) extended precision use

     

       36
       36
       +
         # when SSE not detected

     

       37
       37
       +
         postPatch = lib.optionalString (!(stdenv.isi686 || stdenv.isx86_64)) ''

     

       38
       38
       +
           sed -i '/-ffloat-store/d' cmake/pcl_find_sse.cmake

     

       39
       39
       +
         '';

     

       40
       40
       +
       

     

       35
       41
        
         nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ];

     

       36
       42
        
         buildInputs = [

     

       37
       43
        
           eigen

+13

pkgs/development/node-packages/default.nix

···

       340
       340
        
             '';

     

       341
       341
        
           };

     

       342
       342
        
       

     

       343
       343
       +
           reveal-md = super.reveal-md.override (

     

       344
       344
       +
             lib.optionalAttrs (!stdenv.isDarwin) {

     

       345
       345
       +
               nativeBuildInputs = [ pkgs.makeWrapper ];

     

       346
       346
       +
               prePatch = ''

     

       347
       347
       +
                 export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1

     

       348
       348
       +
               '';

     

       349
       349
       +
               postInstall = ''

     

       350
       350
       +
                 wrapProgram $out/bin/reveal-md \

     

       351
       351
       +
                 --set PUPPETEER_EXECUTABLE_PATH ${pkgs.chromium.outPath}/bin/chromium

     

       352
       352
       +
               '';

     

       353
       353
       +
             }

     

       354
       354
       +
           );

     

       355
       355
       +
       

     

       343
       356
        
           ssb-server = super.ssb-server.override {

     

       344
       357
        
             buildInputs = [ pkgs.automake pkgs.autoconf self.node-gyp-build ];

     

       345
       358
        
             meta.broken = since "10";

pkgs/development/node-packages/node-packages.json

···

       239
       239
        
       , "redoc-cli"

     

       240
       240
        
       , "remod-cli"

     

       241
       241
        
       , "reveal.js"

     

       242
       242
       +
       , "reveal-md"

     

       242
       243
        
       , "rimraf"

     

       243
       244
        
       , "rollup"

     

       244
       245
        
       , { "rust-analyzer-build-deps": "../../misc/vscode-extensions/rust-analyzer/build-deps" }

+430 -36

pkgs/development/node-packages/node-packages.nix

···

       30834
       30834
        
               sha512 = "om8L9O5XwqeSdwl5NtHgrzK3wcF4fT9T4gb/NktoH8EyoZipas/tvUZLV48xT7fQfMYr9qvb0WEutqdf0LWSqA==";

     

       30835
       30835
        
             };

     

       30836
       30836
        
           };

     

       30837
       30837
       +
           "highlight.js-10.7.2" = {

     

       30838
       30838
       +
             name = "highlight.js";

     

       30839
       30839
       +
             packageName = "highlight.js";

     

       30840
       30840
       +
             version = "10.7.2";

     

       30841
       30841
       +
             src = fetchurl {

     

       30842
       30842
       +
               url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.2.tgz";

     

       30843
       30843
       +
               sha512 = "oFLl873u4usRM9K63j4ME9u3etNF0PLiJhSQ8rdfuL51Wn3zkD6drf9ZW0dOzjnZI22YYG24z30JcmfCZjMgYg==";

     

       30844
       30844
       +
             };

     

       30845
       30845
       +
           };

     

       30837
       30846
        
           "highlight.js-10.7.3" = {

     

       30838
       30847
        
             name = "highlight.js";

     

       30839
       30848
        
             packageName = "highlight.js";

     
···

       37593
       37602
        
             src = fetchurl {

     

       37594
       37603
        
               url = "https://registry.npmjs.org/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz";

     

       37595
       37604
        
               sha512 = "04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==";

     

       37605
       37605
       +
             };

     

       37606
       37606
       +
           };

     

       37607
       37607
       +
           "livereload-0.9.3" = {

     

       37608
       37608
       +
             name = "livereload";

     

       37609
       37609
       +
             packageName = "livereload";

     

       37610
       37610
       +
             version = "0.9.3";

     

       37611
       37611
       +
             src = fetchurl {

     

       37612
       37612
       +
               url = "https://registry.npmjs.org/livereload/-/livereload-0.9.3.tgz";

     

       37613
       37613
       +
               sha512 = "q7Z71n3i4X0R9xthAryBdNGVGAO2R5X+/xXpmKeuPMrteg+W2U8VusTKV3YiJbXZwKsOlFlHe+go6uSNjfxrZw==";

     

       37614
       37614
       +
             };

     

       37615
       37615
       +
           };

     

       37616
       37616
       +
           "livereload-js-3.3.2" = {

     

       37617
       37617
       +
             name = "livereload-js";

     

       37618
       37618
       +
             packageName = "livereload-js";

     

       37619
       37619
       +
             version = "3.3.2";

     

       37620
       37620
       +
             src = fetchurl {

     

       37621
       37621
       +
               url = "https://registry.npmjs.org/livereload-js/-/livereload-js-3.3.2.tgz";

     

       37622
       37622
       +
               sha512 = "w677WnINxFkuixAoUEXOStewzLYGI76XVag+0JWMMEyjJQKs0ibWZMxkTlB96Lm3EjZ7IeOxVziBEbtxVQqQZA==";

     

       37596
       37623
        
             };

     

       37597
       37624
        
           };

     

       37598
       37625
        
           "ln-accounting-5.0.5" = {

     
···

       45825
       45852
        
               sha512 = "jB5hAtsDOhCy/FNQJwQJOrGlxLUat482Yr14rbA5l2Zb1eOeoS+ccQPO036C1+z9VDBTmOZqzh1tBbI4myzIYw==";

     

       45826
       45853
        
             };

     

       45827
       45854
        
           };

     

       45855
       45855
       +
           "open-8.3.0" = {

     

       45856
       45856
       +
             name = "open";

     

       45857
       45857
       +
             packageName = "open";

     

       45858
       45858
       +
             version = "8.3.0";

     

       45859
       45859
       +
             src = fetchurl {

     

       45860
       45860
       +
               url = "https://registry.npmjs.org/open/-/open-8.3.0.tgz";

     

       45861
       45861
       +
               sha512 = "7INcPWb1UcOwSQxAXTnBJ+FxVV4MPs/X++FWWBtgY69/J5lc+tCteMt/oFK1MnkyHC4VILLa9ntmwKTwDR4Q9w==";

     

       45862
       45862
       +
             };

     

       45863
       45863
       +
           };

     

       45828
       45864
        
           "open-8.4.0" = {

     

       45829
       45865
        
             name = "open";

     

       45830
       45866
        
             packageName = "open";

     
···

       46266
       46302
        
               sha1 = "75e75a96506611eb1c65ba89018ff08a981e2c16";

     

       46267
       46303
        
             };

     

       46268
       46304
        
           };

     

       46305
       46305
       +
           "opts-2.0.2" = {

     

       46306
       46306
       +
             name = "opts";

     

       46307
       46307
       +
             packageName = "opts";

     

       46308
       46308
       +
             version = "2.0.2";

     

       46309
       46309
       +
             src = fetchurl {

     

       46310
       46310
       +
               url = "https://registry.npmjs.org/opts/-/opts-2.0.2.tgz";

     

       46311
       46311
       +
               sha512 = "k41FwbcLnlgnFh69f4qdUfvDQ+5vaSDnVPFI/y5XuhKRq97EnVVneO9F1ESVCdiVu4fCS2L8usX3mU331hB7pg==";

     

       46312
       46312
       +
             };

     

       46313
       46313
       +
           };

     

       46269
       46314
        
           "ora-1.4.0" = {

     

       46270
       46315
        
             name = "ora";

     

       46271
       46316
        
             packageName = "ora";

     
···

       46752
       46797
        
               sha512 = "RpYIIK1zXSNEOdwxcfe7FdvGcs7+y5n8rifMhMNWvaxRNMPINJHF5GDeuVxWqnfrcHPSCnp7Oo5yNXHId9Av2Q==";

     

       46753
       46798
        
             };

     

       46754
       46799
        
           };

     

       46755
       46755
       -
           "p-memoize-4.0.2" = {

     

       46800
       46800
       +
           "p-memoize-4.0.3" = {

     

       46756
       46801
        
             name = "p-memoize";

     

       46757
       46802
        
             packageName = "p-memoize";

     

       46758
       46758
       -
             version = "4.0.2";

     

       46803
       46803
       +
             version = "4.0.3";

     

       46759
       46804
        
             src = fetchurl {

     

       46760
       46760
       -
               url = "https://registry.npmjs.org/p-memoize/-/p-memoize-4.0.2.tgz";

     

       46761
       46761
       -
               sha512 = "REJQ6EIeFmvT9O/u0H/ZVWjRII/1/0GhckleQX0yn+Uk9EdXTtmfnrfa3FwF8ZUrfUEe8NInvlRa0ZBKlMxxTA==";

     

       46805
       46805
       +
               url = "https://registry.npmjs.org/p-memoize/-/p-memoize-4.0.3.tgz";

     

       46806
       46806
       +
               sha512 = "lX9GfP1NT5jheKsmvc1071L74/Vw7vul+uZEnst7LNuMtbKlWYwKItqcLSAVUyJnrfQAqFFCJQ5bt0whrDsWQA==";

     

       46762
       46807
        
             };

     

       46763
       46808
        
           };

     

       46764
       46809
        
           "p-pipe-3.1.0" = {

     
···

       46788
       46833
        
               sha512 = "2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw==";

     

       46789
       46834
        
             };

     

       46790
       46835
        
           };

     

       46836
       46836
       +
           "p-reflect-2.1.0" = {

     

       46837
       46837
       +
             name = "p-reflect";

     

       46838
       46838
       +
             packageName = "p-reflect";

     

       46839
       46839
       +
             version = "2.1.0";

     

       46840
       46840
       +
             src = fetchurl {

     

       46841
       46841
       +
               url = "https://registry.npmjs.org/p-reflect/-/p-reflect-2.1.0.tgz";

     

       46842
       46842
       +
               sha512 = "paHV8NUz8zDHu5lhr/ngGWQiW067DK/+IbJ+RfZ4k+s8y4EKyYCz8pGYWjxCg35eHztpJAt+NUgvN4L+GCbPlg==";

     

       46843
       46843
       +
             };

     

       46844
       46844
       +
           };

     

       46791
       46845
        
           "p-retry-3.0.1" = {

     

       46792
       46846
        
             name = "p-retry";

     

       46793
       46847
        
             packageName = "p-retry";

     
···

       46813
       46867
        
             src = fetchurl {

     

       46814
       46868
        
               url = "https://registry.npmjs.org/p-retry/-/p-retry-4.6.1.tgz";

     

       46815
       46869
        
               sha512 = "e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA==";

     

       46870
       46870
       +
             };

     

       46871
       46871
       +
           };

     

       46872
       46872
       +
           "p-settle-4.1.1" = {

     

       46873
       46873
       +
             name = "p-settle";

     

       46874
       46874
       +
             packageName = "p-settle";

     

       46875
       46875
       +
             version = "4.1.1";

     

       46876
       46876
       +
             src = fetchurl {

     

       46877
       46877
       +
               url = "https://registry.npmjs.org/p-settle/-/p-settle-4.1.1.tgz";

     

       46878
       46878
       +
               sha512 = "6THGh13mt3gypcNMm0ADqVNCcYa3BK6DWsuJWFCuEKP1rpY+OKGp7gaZwVmLspmic01+fsg/fN57MfvDzZ/PuQ==";

     

       46816
       46879
        
             };

     

       46817
       46880
        
           };

     

       46818
       46881
        
           "p-some-4.1.0" = {

     
···

       51730
       51793
        
               sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==";

     

       51731
       51794
        
             };

     

       51732
       51795
        
           };

     

       51796
       51796
       +
           "puppeteer-1.19.0" = {

     

       51797
       51797
       +
             name = "puppeteer";

     

       51798
       51798
       +
             packageName = "puppeteer";

     

       51799
       51799
       +
             version = "1.19.0";

     

       51800
       51800
       +
             src = fetchurl {

     

       51801
       51801
       +
               url = "https://registry.npmjs.org/puppeteer/-/puppeteer-1.19.0.tgz";

     

       51802
       51802
       +
               sha512 = "2S6E6ygpoqcECaagDbBopoSOPDv0pAZvTbnBgUY+6hq0/XDFDOLEMNlHF/SKJlzcaZ9ckiKjKDuueWI3FN/WXw==";

     

       51803
       51803
       +
             };

     

       51804
       51804
       +
           };

     

       51733
       51805
        
           "puppeteer-1.20.0" = {

     

       51734
       51806
        
             name = "puppeteer";

     

       51735
       51807
        
             packageName = "puppeteer";

     
···

       55762
       55834
        
               sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b";

     

       55763
       55835
        
             };

     

       55764
       55836
        
           };

     

       55837
       55837
       +
           "reveal.js-4.1.3" = {

     

       55838
       55838
       +
             name = "reveal.js";

     

       55839
       55839
       +
             packageName = "reveal.js";

     

       55840
       55840
       +
             version = "4.1.3";

     

       55841
       55841
       +
             src = fetchurl {

     

       55842
       55842
       +
               url = "https://registry.npmjs.org/reveal.js/-/reveal.js-4.1.3.tgz";

     

       55843
       55843
       +
               sha512 = "5VbL4nVDUedVKnOIIM3UQAIUlp+CvR/SrUkrN5GDoVfcWJAxH2oIh7PWyShy7+pE7tgkH2q+3e5EikGRpgE+oA==";

     

       55844
       55844
       +
             };

     

       55845
       55845
       +
           };

     

       55765
       55846
        
           "reverse-http-1.3.0" = {

     

       55766
       55847
        
             name = "reverse-http";

     

       55767
       55848
        
             packageName = "reverse-http";

     
···

       58939
       59020
        
               sha512 = "oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA==";

     

       58940
       59021
        
             };

     

       58941
       59022
        
           };

     

       59023
       59023
       +
           "spdx-license-ids-3.0.11" = {

     

       59024
       59024
       +
             name = "spdx-license-ids";

     

       59025
       59025
       +
             packageName = "spdx-license-ids";

     

       59026
       59026
       +
             version = "3.0.11";

     

       59027
       59027
       +
             src = fetchurl {

     

       59028
       59028
       +
               url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz";

     

       59029
       59029
       +
               sha512 = "Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==";

     

       59030
       59030
       +
             };

     

       59031
       59031
       +
           };

     

       58942
       59032
        
           "spdx-license-list-6.4.0" = {

     

       58943
       59033
        
             name = "spdx-license-list";

     

       58944
       59034
        
             packageName = "spdx-license-list";

     
···

       61684
       61774
        
               sha512 = "33+lQwlLxXoxy0o9WLOgw8OjbXeS3Jv+pSl+nxKc2AOClBI28HsdRPpH0u9Xa9OVjHLT9vonnOMw1ug7YXI0dA==";

     

       61685
       61775
        
             };

     

       61686
       61776
        
           };

     

       61687
       61687
       -
           "systeminformation-5.9.12" = {

     

       61777
       61777
       +
           "systeminformation-5.9.13" = {

     

       61688
       61778
        
             name = "systeminformation";

     

       61689
       61779
        
             packageName = "systeminformation";

     

       61690
       61690
       -
             version = "5.9.12";

     

       61780
       61780
       +
             version = "5.9.13";

     

       61691
       61781
        
             src = fetchurl {

     

       61692
       61692
       -
               url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.9.12.tgz";

     

       61693
       61693
       -
               sha512 = "9tCCSA5ChSWBadJrrs7GYSvCBt9oKeqBAp0tv4FaeAIrYjIJ4gxrkFc+2xdMrJd8HEGKBMD2TSTMsXhmn+dBtw==";

     

       61782
       61782
       +
               url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.9.13.tgz";

     

       61783
       61783
       +
               sha512 = "AGL34jWboB7bjmNYIcJ5hbYEVYXQuLPbIq7bJg3rJJNHYZvZkQC9hH15KpH9CPg9ZxCsTqAfUNyGMv1jmv78Tw==";

     

       61694
       61784
        
             };

     

       61695
       61785
        
           };

     

       61696
       61786
        
           "sywac-1.3.0" = {

     
···

       63600
       63690
        
             src = fetchurl {

     

       63601
       63691
        
               url = "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz";

     

       63602
       63692
        
               sha1 = "405923909592d56f78a5818434b0b78489ca5f2b";

     

       63693
       63693
       +
             };

     

       63694
       63694
       +
           };

     

       63695
       63695
       +
           "try-require-1.2.1" = {

     

       63696
       63696
       +
             name = "try-require";

     

       63697
       63697
       +
             packageName = "try-require";

     

       63698
       63698
       +
             version = "1.2.1";

     

       63699
       63699
       +
             src = fetchurl {

     

       63700
       63700
       +
               url = "https://registry.npmjs.org/try-require/-/try-require-1.2.1.tgz";

     

       63701
       63701
       +
               sha1 = "34489a2cac0c09c1cc10ed91ba011594d4333be2";

     

       63603
       63702
        
             };

     

       63604
       63703
        
           };

     

       63605
       63704
        
           "try-resolve-1.0.1" = {

     
···

       65978
       66077
        
               sha1 = "23f89069a6c62f46cf3a1d3b00169cefb90be0c6";

     

       65979
       66078
        
             };

     

       65980
       66079
        
           };

     

       65981
       65981
       -
           "usb-1.9.0" = {

     

       66080
       66080
       +
           "usb-1.9.1" = {

     

       65982
       66081
        
             name = "usb";

     

       65983
       66082
        
             packageName = "usb";

     

       65984
       65984
       -
             version = "1.9.0";

     

       66083
       66083
       +
             version = "1.9.1";

     

       65985
       66084
        
             src = fetchurl {

     

       65986
       65986
       -
               url = "https://registry.npmjs.org/usb/-/usb-1.9.0.tgz";

     

       65987
       65987
       -
               sha512 = "nybH1SzvwYkRQ5s8ko9XXyZkrcWV5VWMMv7yh5H++wALhjBFjt2XBoSJWxBUdu6U/UfceQz42inhv3/maxM8jg==";

     

       66085
       66085
       +
               url = "https://registry.npmjs.org/usb/-/usb-1.9.1.tgz";

     

       66086
       66086
       +
               sha512 = "T6DZbJAFNcxhY1FzaYdXhV2oqoRlvLhtSSmnbFAqyCxahUkc+g0BPZVXv7hIeQQxDCAQnr4Ia8bfOk1JlzNzzw==";

     

       65988
       66087
        
             };

     

       65989
       66088
        
           };

     

       65990
       66089
        
           "use-3.1.1" = {

     
···

       70208
       70307
        
             src = fetchurl {

     

       70209
       70308
        
               url = "https://registry.npmjs.org/yaml-front-matter/-/yaml-front-matter-3.4.1.tgz";

     

       70210
       70309
        
               sha1 = "e52e84fea6983b93755e9b1564dba989b006b5a5";

     

       70310
       70310
       +
             };

     

       70311
       70311
       +
           };

     

       70312
       70312
       +
           "yaml-front-matter-4.1.1" = {

     

       70313
       70313
       +
             name = "yaml-front-matter";

     

       70314
       70314
       +
             packageName = "yaml-front-matter";

     

       70315
       70315
       +
             version = "4.1.1";

     

       70316
       70316
       +
             src = fetchurl {

     

       70317
       70317
       +
               url = "https://registry.npmjs.org/yaml-front-matter/-/yaml-front-matter-4.1.1.tgz";

     

       70318
       70318
       +
               sha512 = "ULGbghCLsN8Hs8vfExlqrJIe8Hl2TUjD7/zsIGMP8U+dgRXEsDXk4yydxeZJgdGiimP1XB7zhmhOB4/HyfqOyQ==";

     

       70211
       70319
        
             };

     

       70212
       70320
        
           };

     

       70213
       70321
        
           "yaml-include-1.2.1" = {

     
···

       97645
       97753
        
                 sources."supports-color-7.2.0"

     

       97646
       97754
        
               ];

     

       97647
       97755
        
             })

     

       97648
       97648
       -
             sources."systeminformation-5.9.12"

     

       97756
       97756
       +
             sources."systeminformation-5.9.13"

     

       97649
       97757
        
             sources."term-canvas-0.0.5"

     

       97650
       97758
        
             sources."type-fest-0.21.3"

     

       97651
       97759
        
             sources."wordwrap-0.0.3"

     
···

       98047
       98155
        
             sources."spdx-correct-3.1.1"

     

       98048
       98156
        
             sources."spdx-exceptions-2.3.0"

     

       98049
       98157
        
             sources."spdx-expression-parse-3.0.1"

     

       98050
       98050
       -
             sources."spdx-license-ids-3.0.10"

     

       98158
       98158
       +
             sources."spdx-license-ids-3.0.11"

     

       98051
       98159
        
             sources."split-string-3.1.0"

     

       98052
       98160
        
             sources."stack-trace-0.0.10"

     

       98053
       98161
        
             (sources."static-extend-0.1.2" // {

     
···

       98444
       98552
        
             sources."spdx-correct-3.1.1"

     

       98445
       98553
        
             sources."spdx-exceptions-2.3.0"

     

       98446
       98554
        
             sources."spdx-expression-parse-3.0.1"

     

       98447
       98447
       -
             sources."spdx-license-ids-3.0.10"

     

       98555
       98555
       +
             sources."spdx-license-ids-3.0.11"

     

       98448
       98556
        
             sources."split-string-3.1.0"

     

       98449
       98557
        
             sources."stack-trace-0.0.10"

     

       98450
       98558
        
             (sources."static-extend-0.1.2" // {

     
···

       102052
       102160
        
             sources."spdx-correct-3.1.1"

     

       102053
       102161
        
             sources."spdx-exceptions-2.3.0"

     

       102054
       102162
        
             sources."spdx-expression-parse-3.0.1"

     

       102055
       102055
       -
             sources."spdx-license-ids-3.0.10"

     

       102163
       102163
       +
             sources."spdx-license-ids-3.0.11"

     

       102056
       102164
        
             sources."split-string-3.1.0"

     

       102057
       102165
        
             sources."sshpk-1.16.1"

     

       102058
       102166
        
             (sources."static-extend-0.1.2" // {

     
···

       104272
       104380
        
             sources."spdx-correct-3.1.1"

     

       104273
       104381
        
             sources."spdx-exceptions-2.3.0"

     

       104274
       104382
        
             sources."spdx-expression-parse-3.0.1"

     

       104275
       104275
       -
             sources."spdx-license-ids-3.0.10"

     

       104383
       104383
       +
             sources."spdx-license-ids-3.0.11"

     

       104276
       104384
        
             sources."split-1.0.1"

     

       104277
       104385
        
             sources."split-on-first-1.1.0"

     

       104278
       104386
        
             sources."split2-3.2.2"

     
···

       106234
       106342
        
             sources."spdx-correct-3.1.1"

     

       106235
       106343
        
             sources."spdx-exceptions-2.3.0"

     

       106236
       106344
        
             sources."spdx-expression-parse-3.0.1"

     

       106237
       106237
       -
             sources."spdx-license-ids-3.0.10"

     

       106345
       106345
       +
             sources."spdx-license-ids-3.0.11"

     

       106238
       106346
        
             sources."split-string-3.1.0"

     

       106239
       106347
        
             sources."sprintf-js-1.0.3"

     

       106240
       106348
        
             sources."sshpk-1.16.1"

     
···

       108206
       108314
        
             sources."spdx-correct-3.1.1"

     

       108207
       108315
        
             sources."spdx-exceptions-2.3.0"

     

       108208
       108316
        
             sources."spdx-expression-parse-3.0.1"

     

       108209
       108209
       -
             sources."spdx-license-ids-3.0.10"

     

       108317
       108317
       +
             sources."spdx-license-ids-3.0.11"

     

       108210
       108318
        
             (sources."sshpk-1.16.1" // {

     

       108211
       108319
        
               dependencies = [

     

       108212
       108320
        
                 sources."assert-plus-1.0.0"

     
···

       108926
       109034
        
             sources."spdx-correct-3.1.1"

     

       108927
       109035
        
             sources."spdx-exceptions-2.3.0"

     

       108928
       109036
        
             sources."spdx-expression-parse-3.0.1"

     

       108929
       108929
       -
             sources."spdx-license-ids-3.0.10"

     

       109037
       109037
       +
             sources."spdx-license-ids-3.0.11"

     

       108930
       109038
        
             sources."sshpk-1.16.1"

     

       108931
       109039
        
             sources."ssri-5.3.0"

     

       108932
       109040
        
             sources."string-width-1.0.2"

     
···

       109490
       109598
        
             sources."p-limit-2.3.0"

     

       109491
       109599
        
             sources."p-locate-4.1.0"

     

       109492
       109600
        
             sources."p-map-4.0.0"

     

       109493
       109493
       -
             (sources."p-memoize-4.0.2" // {

     

       109601
       109601
       +
             (sources."p-memoize-4.0.3" // {

     

       109494
       109602
        
               dependencies = [

     

       109495
       109603
        
                 sources."mimic-fn-3.1.0"

     

       109496
       109604
        
               ];

     

       109497
       109605
        
             })

     

       109606
       109606
       +
             sources."p-reflect-2.1.0"

     

       109607
       109607
       +
             sources."p-settle-4.1.1"

     

       109498
       109608
        
             sources."p-timeout-4.1.0"

     

       109499
       109609
        
             sources."p-try-2.2.0"

     

       109500
       109610
        
             (sources."package-json-6.5.0" // {

     
···

       109594
       109704
        
             sources."spdx-correct-3.1.1"

     

       109595
       109705
        
             sources."spdx-exceptions-2.3.0"

     

       109596
       109706
        
             sources."spdx-expression-parse-3.0.1"

     

       109597
       109597
       -
             sources."spdx-license-ids-3.0.10"

     

       109707
       109707
       +
             sources."spdx-license-ids-3.0.11"

     

       109598
       109708
        
             sources."split-1.0.1"

     

       109599
       109709
        
             sources."string-width-4.2.3"

     

       109600
       109710
        
             sources."strip-ansi-6.0.1"

     
···

       111853
       111963
        
             sources."spdx-correct-3.1.1"

     

       111854
       111964
        
             sources."spdx-exceptions-2.3.0"

     

       111855
       111965
        
             sources."spdx-expression-parse-3.0.1"

     

       111856
       111856
       -
             sources."spdx-license-ids-3.0.10"

     

       111966
       111966
       +
             sources."spdx-license-ids-3.0.11"

     

       111857
       111967
        
             sources."speedometer-0.1.4"

     

       111858
       111968
        
             sources."stream-buffers-2.2.0"

     

       111859
       111969
        
             sources."string-width-1.0.2"

     
···

       112667
       112777
        
             sources."statuses-1.5.0"

     

       112668
       112778
        
             sources."string_decoder-0.10.31"

     

       112669
       112779
        
             sources."supports-color-7.2.0"

     

       112670
       112670
       -
             sources."systeminformation-5.9.12"

     

       112780
       112780
       +
             sources."systeminformation-5.9.13"

     

       112671
       112781
        
             sources."to-regex-range-5.0.1"

     

       112672
       112782
        
             sources."toidentifier-1.0.0"

     

       112673
       112783
        
             sources."tslib-2.3.1"

     
···

       116267
       116377
        
             sources."spdx-correct-3.1.1"

     

       116268
       116378
        
             sources."spdx-exceptions-2.3.0"

     

       116269
       116379
        
             sources."spdx-expression-parse-3.0.1"

     

       116270
       116270
       -
             sources."spdx-license-ids-3.0.10"

     

       116380
       116380
       +
             sources."spdx-license-ids-3.0.11"

     

       116271
       116381
        
             (sources."string-length-3.1.0" // {

     

       116272
       116382
        
               dependencies = [

     

       116273
       116383
        
                 sources."ansi-regex-4.1.0"

     
···

       116315
       116425
        
           bypassCache = true;

     

       116316
       116426
        
           reconstructLock = true;

     

       116317
       116427
        
         };

     

       116428
       116428
       +
         reveal-md = nodeEnv.buildNodePackage {

     

       116429
       116429
       +
           name = "reveal-md";

     

       116430
       116430
       +
           packageName = "reveal-md";

     

       116431
       116431
       +
           version = "5.2.0";

     

       116432
       116432
       +
           src = fetchurl {

     

       116433
       116433
       +
             url = "https://registry.npmjs.org/reveal-md/-/reveal-md-5.2.0.tgz";

     

       116434
       116434
       +
             sha512 = "vd3fS4qP/g7pUwLhbPUONK6YKPcgD3cxExDeZFOq+LRZqLgRWxnzXWMCIPsszvMCo0+n+hXEadNqrf9QrVeWkw==";

     

       116435
       116435
       +
           };

     

       116436
       116436
       +
           dependencies = [

     

       116437
       116437
       +
             sources."@sindresorhus/is-0.14.0"

     

       116438
       116438
       +
             sources."@szmarczak/http-timer-1.1.2"

     

       116439
       116439
       +
             sources."accepts-1.3.7"

     

       116440
       116440
       +
             sources."agent-base-4.3.0"

     

       116441
       116441
       +
             sources."ansi-align-3.0.1"

     

       116442
       116442
       +
             sources."ansi-regex-5.0.1"

     

       116443
       116443
       +
             sources."ansi-styles-4.3.0"

     

       116444
       116444
       +
             sources."anymatch-3.1.2"

     

       116445
       116445
       +
             sources."argparse-1.0.10"

     

       116446
       116446
       +
             sources."array-flatten-1.1.1"

     

       116447
       116447
       +
             sources."async-limiter-1.0.1"

     

       116448
       116448
       +
             sources."balanced-match-1.0.2"

     

       116449
       116449
       +
             sources."binary-extensions-2.2.0"

     

       116450
       116450
       +
             (sources."body-parser-1.19.0" // {

     

       116451
       116451
       +
               dependencies = [

     

       116452
       116452
       +
                 sources."debug-2.6.9"

     

       116453
       116453
       +
                 sources."ms-2.0.0"

     

       116454
       116454
       +
               ];

     

       116455
       116455
       +
             })

     

       116456
       116456
       +
             sources."boxen-5.1.2"

     

       116457
       116457
       +
             sources."brace-expansion-1.1.11"

     

       116458
       116458
       +
             sources."braces-3.0.2"

     

       116459
       116459
       +
             sources."buffer-crc32-0.2.13"

     

       116460
       116460
       +
             sources."buffer-from-1.1.2"

     

       116461
       116461
       +
             sources."bytes-3.1.0"

     

       116462
       116462
       +
             (sources."cacheable-request-6.1.0" // {

     

       116463
       116463
       +
               dependencies = [

     

       116464
       116464
       +
                 sources."get-stream-5.2.0"

     

       116465
       116465
       +
                 sources."lowercase-keys-2.0.0"

     

       116466
       116466
       +
               ];

     

       116467
       116467
       +
             })

     

       116468
       116468
       +
             sources."camelcase-6.2.0"

     

       116469
       116469
       +
             sources."chalk-4.1.2"

     

       116470
       116470
       +
             sources."chokidar-3.5.2"

     

       116471
       116471
       +
             sources."ci-info-2.0.0"

     

       116472
       116472
       +
             sources."cli-boxes-2.2.1"

     

       116473
       116473
       +
             sources."clone-response-1.0.2"

     

       116474
       116474
       +
             sources."color-convert-2.0.1"

     

       116475
       116475
       +
             sources."color-name-1.1.4"

     

       116476
       116476
       +
             sources."commander-6.2.1"

     

       116477
       116477
       +
             sources."concat-map-0.0.1"

     

       116478
       116478
       +
             sources."concat-stream-1.6.2"

     

       116479
       116479
       +
             sources."configstore-5.0.1"

     

       116480
       116480
       +
             sources."content-disposition-0.5.3"

     

       116481
       116481
       +
             sources."content-type-1.0.4"

     

       116482
       116482
       +
             sources."cookie-0.4.0"

     

       116483
       116483
       +
             sources."cookie-signature-1.0.6"

     

       116484
       116484
       +
             sources."core-util-is-1.0.3"

     

       116485
       116485
       +
             sources."crypto-random-string-2.0.0"

     

       116486
       116486
       +
             sources."debug-4.3.2"

     

       116487
       116487
       +
             sources."decompress-response-3.3.0"

     

       116488
       116488
       +
             sources."deep-extend-0.6.0"

     

       116489
       116489
       +
             sources."defer-to-connect-1.1.3"

     

       116490
       116490
       +
             sources."define-lazy-prop-2.0.0"

     

       116491
       116491
       +
             sources."depd-1.1.2"

     

       116492
       116492
       +
             sources."destroy-1.0.4"

     

       116493
       116493
       +
             sources."dot-prop-5.3.0"

     

       116494
       116494
       +
             sources."duplexer3-0.1.4"

     

       116495
       116495
       +
             sources."ee-first-1.1.1"

     

       116496
       116496
       +
             sources."emoji-regex-8.0.0"

     

       116497
       116497
       +
             sources."encodeurl-1.0.2"

     

       116498
       116498
       +
             sources."end-of-stream-1.4.4"

     

       116499
       116499
       +
             sources."es6-promise-4.2.8"

     

       116500
       116500
       +
             sources."es6-promisify-5.0.0"

     

       116501
       116501
       +
             sources."escape-goat-2.1.1"

     

       116502
       116502
       +
             sources."escape-html-1.0.3"

     

       116503
       116503
       +
             sources."esprima-4.0.1"

     

       116504
       116504
       +
             sources."etag-1.8.1"

     

       116505
       116505
       +
             (sources."express-4.17.1" // {

     

       116506
       116506
       +
               dependencies = [

     

       116507
       116507
       +
                 sources."debug-2.6.9"

     

       116508
       116508
       +
                 sources."ms-2.0.0"

     

       116509
       116509
       +
               ];

     

       116510
       116510
       +
             })

     

       116511
       116511
       +
             (sources."extract-zip-1.7.0" // {

     

       116512
       116512
       +
               dependencies = [

     

       116513
       116513
       +
                 sources."debug-2.6.9"

     

       116514
       116514
       +
                 sources."ms-2.0.0"

     

       116515
       116515
       +
               ];

     

       116516
       116516
       +
             })

     

       116517
       116517
       +
             sources."fd-slicer-1.1.0"

     

       116518
       116518
       +
             sources."fill-range-7.0.1"

     

       116519
       116519
       +
             (sources."finalhandler-1.1.2" // {

     

       116520
       116520
       +
               dependencies = [

     

       116521
       116521
       +
                 sources."debug-2.6.9"

     

       116522
       116522
       +
                 sources."ms-2.0.0"

     

       116523
       116523
       +
               ];

     

       116524
       116524
       +
             })

     

       116525
       116525
       +
             sources."forwarded-0.2.0"

     

       116526
       116526
       +
             sources."fresh-0.5.2"

     

       116527
       116527
       +
             sources."fs-extra-10.0.0"

     

       116528
       116528
       +
             sources."fs.realpath-1.0.0"

     

       116529
       116529
       +
             sources."fsevents-2.3.2"

     

       116530
       116530
       +
             sources."get-stream-4.1.0"

     

       116531
       116531
       +
             sources."glob-7.2.0"

     

       116532
       116532
       +
             sources."glob-parent-5.1.2"

     

       116533
       116533
       +
             sources."global-dirs-3.0.0"

     

       116534
       116534
       +
             sources."got-9.6.0"

     

       116535
       116535
       +
             sources."graceful-fs-4.2.8"

     

       116536
       116536
       +
             sources."has-flag-4.0.0"

     

       116537
       116537
       +
             sources."has-yarn-2.1.0"

     

       116538
       116538
       +
             sources."highlight.js-10.7.2"

     

       116539
       116539
       +
             sources."http-cache-semantics-4.1.0"

     

       116540
       116540
       +
             sources."http-errors-1.7.2"

     

       116541
       116541
       +
             (sources."https-proxy-agent-2.2.4" // {

     

       116542
       116542
       +
               dependencies = [

     

       116543
       116543
       +
                 sources."debug-3.2.7"

     

       116544
       116544
       +
               ];

     

       116545
       116545
       +
             })

     

       116546
       116546
       +
             sources."iconv-lite-0.4.24"

     

       116547
       116547
       +
             sources."import-lazy-2.1.0"

     

       116548
       116548
       +
             sources."imurmurhash-0.1.4"

     

       116549
       116549
       +
             sources."inflight-1.0.6"

     

       116550
       116550
       +
             sources."inherits-2.0.3"

     

       116551
       116551
       +
             sources."ini-2.0.0"

     

       116552
       116552
       +
             sources."ipaddr.js-1.9.1"

     

       116553
       116553
       +
             sources."is-binary-path-2.1.0"

     

       116554
       116554
       +
             sources."is-ci-2.0.0"

     

       116555
       116555
       +
             sources."is-docker-2.2.1"

     

       116556
       116556
       +
             sources."is-extglob-2.1.1"

     

       116557
       116557
       +
             sources."is-fullwidth-code-point-3.0.0"

     

       116558
       116558
       +
             sources."is-glob-4.0.3"

     

       116559
       116559
       +
             sources."is-installed-globally-0.4.0"

     

       116560
       116560
       +
             sources."is-npm-5.0.0"

     

       116561
       116561
       +
             sources."is-number-7.0.0"

     

       116562
       116562
       +
             sources."is-obj-2.0.0"

     

       116563
       116563
       +
             sources."is-path-inside-3.0.3"

     

       116564
       116564
       +
             sources."is-typedarray-1.0.0"

     

       116565
       116565
       +
             sources."is-wsl-2.2.0"

     

       116566
       116566
       +
             sources."is-yarn-global-0.3.0"

     

       116567
       116567
       +
             sources."isarray-1.0.0"

     

       116568
       116568
       +
             sources."js-yaml-3.14.1"

     

       116569
       116569
       +
             sources."json-buffer-3.0.0"

     

       116570
       116570
       +
             sources."jsonfile-6.1.0"

     

       116571
       116571
       +
             sources."keyv-3.1.0"

     

       116572
       116572
       +
             sources."latest-version-5.1.0"

     

       116573
       116573
       +
             sources."livereload-0.9.3"

     

       116574
       116574
       +
             sources."livereload-js-3.3.2"

     

       116575
       116575
       +
             sources."lodash-4.17.21"

     

       116576
       116576
       +
             sources."lowercase-keys-1.0.1"

     

       116577
       116577
       +
             sources."lru-cache-6.0.0"

     

       116578
       116578
       +
             (sources."make-dir-3.1.0" // {

     

       116579
       116579
       +
               dependencies = [

     

       116580
       116580
       +
                 sources."semver-6.3.0"

     

       116581
       116581
       +
               ];

     

       116582
       116582
       +
             })

     

       116583
       116583
       +
             sources."media-typer-0.3.0"

     

       116584
       116584
       +
             sources."merge-descriptors-1.0.1"

     

       116585
       116585
       +
             sources."methods-1.1.2"

     

       116586
       116586
       +
             sources."mime-1.6.0"

     

       116587
       116587
       +
             sources."mime-db-1.51.0"

     

       116588
       116588
       +
             sources."mime-types-2.1.34"

     

       116589
       116589
       +
             sources."mimic-response-1.0.1"

     

       116590
       116590
       +
             sources."minimatch-3.0.4"

     

       116591
       116591
       +
             sources."minimist-1.2.5"

     

       116592
       116592
       +
             sources."mkdirp-0.5.5"

     

       116593
       116593
       +
             sources."ms-2.1.2"

     

       116594
       116594
       +
             sources."mustache-4.2.0"

     

       116595
       116595
       +
             sources."negotiator-0.6.2"

     

       116596
       116596
       +
             sources."normalize-path-3.0.0"

     

       116597
       116597
       +
             sources."normalize-url-4.5.1"

     

       116598
       116598
       +
             sources."on-finished-2.3.0"

     

       116599
       116599
       +
             sources."once-1.4.0"

     

       116600
       116600
       +
             sources."open-8.3.0"

     

       116601
       116601
       +
             sources."opts-2.0.2"

     

       116602
       116602
       +
             sources."p-cancelable-1.1.0"

     

       116603
       116603
       +
             (sources."package-json-6.5.0" // {

     

       116604
       116604
       +
               dependencies = [

     

       116605
       116605
       +
                 sources."semver-6.3.0"

     

       116606
       116606
       +
               ];

     

       116607
       116607
       +
             })

     

       116608
       116608
       +
             sources."parseurl-1.3.3"

     

       116609
       116609
       +
             sources."path-is-absolute-1.0.1"

     

       116610
       116610
       +
             sources."path-to-regexp-0.1.7"

     

       116611
       116611
       +
             sources."pend-1.2.0"

     

       116612
       116612
       +
             sources."picomatch-2.3.0"

     

       116613
       116613
       +
             sources."prepend-http-2.0.0"

     

       116614
       116614
       +
             sources."process-nextick-args-2.0.1"

     

       116615
       116615
       +
             sources."progress-2.0.3"

     

       116616
       116616
       +
             sources."proxy-addr-2.0.7"

     

       116617
       116617
       +
             sources."proxy-from-env-1.1.0"

     

       116618
       116618
       +
             sources."pump-3.0.0"

     

       116619
       116619
       +
             sources."pupa-2.1.1"

     

       116620
       116620
       +
             (sources."puppeteer-1.19.0" // {

     

       116621
       116621
       +
               dependencies = [

     

       116622
       116622
       +
                 sources."mime-2.6.0"

     

       116623
       116623
       +
                 sources."ws-6.2.2"

     

       116624
       116624
       +
               ];

     

       116625
       116625
       +
             })

     

       116626
       116626
       +
             sources."qs-6.7.0"

     

       116627
       116627
       +
             sources."range-parser-1.2.1"

     

       116628
       116628
       +
             sources."raw-body-2.4.0"

     

       116629
       116629
       +
             (sources."rc-1.2.8" // {

     

       116630
       116630
       +
               dependencies = [

     

       116631
       116631
       +
                 sources."ini-1.3.8"

     

       116632
       116632
       +
               ];

     

       116633
       116633
       +
             })

     

       116634
       116634
       +
             sources."readable-stream-2.3.7"

     

       116635
       116635
       +
             sources."readdirp-3.6.0"

     

       116636
       116636
       +
             sources."registry-auth-token-4.2.1"

     

       116637
       116637
       +
             sources."registry-url-5.1.0"

     

       116638
       116638
       +
             sources."responselike-1.0.2"

     

       116639
       116639
       +
             sources."reveal.js-4.1.3"

     

       116640
       116640
       +
             sources."rimraf-2.7.1"

     

       116641
       116641
       +
             sources."safe-buffer-5.1.2"

     

       116642
       116642
       +
             sources."safer-buffer-2.1.2"

     

       116643
       116643
       +
             sources."semver-7.3.5"

     

       116644
       116644
       +
             (sources."semver-diff-3.1.1" // {

     

       116645
       116645
       +
               dependencies = [

     

       116646
       116646
       +
                 sources."semver-6.3.0"

     

       116647
       116647
       +
               ];

     

       116648
       116648
       +
             })

     

       116649
       116649
       +
             (sources."send-0.17.1" // {

     

       116650
       116650
       +
               dependencies = [

     

       116651
       116651
       +
                 (sources."debug-2.6.9" // {

     

       116652
       116652
       +
                   dependencies = [

     

       116653
       116653
       +
                     sources."ms-2.0.0"

     

       116654
       116654
       +
                   ];

     

       116655
       116655
       +
                 })

     

       116656
       116656
       +
                 sources."ms-2.1.1"

     

       116657
       116657
       +
               ];

     

       116658
       116658
       +
             })

     

       116659
       116659
       +
             (sources."serve-favicon-2.5.0" // {

     

       116660
       116660
       +
               dependencies = [

     

       116661
       116661
       +
                 sources."ms-2.1.1"

     

       116662
       116662
       +
                 sources."safe-buffer-5.1.1"

     

       116663
       116663
       +
               ];

     

       116664
       116664
       +
             })

     

       116665
       116665
       +
             sources."serve-static-1.14.1"

     

       116666
       116666
       +
             sources."setprototypeof-1.1.1"

     

       116667
       116667
       +
             sources."signal-exit-3.0.5"

     

       116668
       116668
       +
             sources."sprintf-js-1.0.3"

     

       116669
       116669
       +
             sources."statuses-1.5.0"

     

       116670
       116670
       +
             sources."string-width-4.2.3"

     

       116671
       116671
       +
             sources."string_decoder-1.1.1"

     

       116672
       116672
       +
             sources."strip-ansi-6.0.1"

     

       116673
       116673
       +
             sources."strip-json-comments-2.0.1"

     

       116674
       116674
       +
             sources."supports-color-7.2.0"

     

       116675
       116675
       +
             sources."to-readable-stream-1.0.0"

     

       116676
       116676
       +
             sources."to-regex-range-5.0.1"

     

       116677
       116677
       +
             sources."toidentifier-1.0.0"

     

       116678
       116678
       +
             sources."try-require-1.2.1"

     

       116679
       116679
       +
             sources."type-fest-0.20.2"

     

       116680
       116680
       +
             sources."type-is-1.6.18"

     

       116681
       116681
       +
             sources."typedarray-0.0.6"

     

       116682
       116682
       +
             sources."typedarray-to-buffer-3.1.5"

     

       116683
       116683
       +
             sources."unique-string-2.0.0"

     

       116684
       116684
       +
             sources."universalify-2.0.0"

     

       116685
       116685
       +
             sources."unpipe-1.0.0"

     

       116686
       116686
       +
             sources."update-notifier-5.1.0"

     

       116687
       116687
       +
             sources."url-parse-lax-3.0.0"

     

       116688
       116688
       +
             sources."util-deprecate-1.0.2"

     

       116689
       116689
       +
             sources."utils-merge-1.0.1"

     

       116690
       116690
       +
             sources."vary-1.1.2"

     

       116691
       116691
       +
             sources."widest-line-3.1.0"

     

       116692
       116692
       +
             sources."wrap-ansi-7.0.0"

     

       116693
       116693
       +
             sources."wrappy-1.0.2"

     

       116694
       116694
       +
             sources."write-file-atomic-3.0.3"

     

       116695
       116695
       +
             sources."ws-7.5.5"

     

       116696
       116696
       +
             sources."xdg-basedir-4.0.0"

     

       116697
       116697
       +
             sources."yallist-4.0.0"

     

       116698
       116698
       +
             sources."yaml-front-matter-4.1.1"

     

       116699
       116699
       +
             sources."yargs-parser-20.2.9"

     

       116700
       116700
       +
             sources."yauzl-2.10.0"

     

       116701
       116701
       +
           ];

     

       116702
       116702
       +
           buildInputs = globalBuildInputs;

     

       116703
       116703
       +
           meta = {

     

       116704
       116704
       +
             description = "reveal.js on steroids! Get beautiful reveal.js presentations from your Markdown files.";

     

       116705
       116705
       +
             homepage = "https://github.com/webpro/reveal-md#readme";

     

       116706
       116706
       +
             license = "MIT";

     

       116707
       116707
       +
           };

     

       116708
       116708
       +
           production = true;

     

       116709
       116709
       +
           bypassCache = true;

     

       116710
       116710
       +
           reconstructLock = true;

     

       116711
       116711
       +
         };

     

       116318
       116712
        
         rimraf = nodeEnv.buildNodePackage {

     

       116319
       116713
        
           name = "rimraf";

     

       116320
       116714
        
           packageName = "rimraf";

     
···

       118828
       119222
        
             sources."spdx-correct-3.1.1"

     

       118829
       119223
        
             sources."spdx-exceptions-2.3.0"

     

       118830
       119224
        
             sources."spdx-expression-parse-3.0.1"

     

       118831
       118831
       -
             sources."spdx-license-ids-3.0.10"

     

       119225
       119225
       +
             sources."spdx-license-ids-3.0.11"

     

       118832
       119226
        
             sources."speedtest-net-1.6.2"

     

       118833
       119227
        
             sources."string-width-2.1.1"

     

       118834
       119228
        
             sources."strip-ansi-4.0.0"

     
···

       120471
       120865
        
             sources."spdx-correct-3.1.1"

     

       120472
       120866
        
             sources."spdx-exceptions-2.3.0"

     

       120473
       120867
        
             sources."spdx-expression-parse-3.0.1"

     

       120474
       120474
       -
             sources."spdx-license-ids-3.0.10"

     

       120868
       120868
       +
             sources."spdx-license-ids-3.0.11"

     

       120475
       120869
        
             sources."split-1.0.1"

     

       120476
       120870
        
             sources."sprintf-js-1.0.3"

     

       120477
       120871
        
             (sources."sshpk-1.16.1" // {

     
···

       120686
       121080
        
         stylelint = nodeEnv.buildNodePackage {

     

       120687
       121081
        
           name = "stylelint";

     

       120688
       121082
        
           packageName = "stylelint";

     

       120689
       120689
       -
           version = "14.0.1";

     

       121083
       121083
       +
           version = "14.1.0";

     

       120690
       121084
        
           src = fetchurl {

     

       120691
       120691
       -
             url = "https://registry.npmjs.org/stylelint/-/stylelint-14.0.1.tgz";

     

       120692
       120692
       -
             sha512 = "ZcAkmFLVCultmwkQUjxKzxW/o5+CzNmDk6TPJj/d4Y7ipTGGrewIWmNm+InjdSr04PR5/yynsAJeYJY/wisdMg==";

     

       121085
       121085
       +
             url = "https://registry.npmjs.org/stylelint/-/stylelint-14.1.0.tgz";

     

       121086
       121086
       +
             sha512 = "IedkssuNVA11+v++2PIV2OHOU5A3SfRcXVi56vZVSsMhGrgtwmmit69jeM+08/Tun5DTBe7BuH1Zp1mMLmtKLA==";

     

       120693
       121087
        
           };

     

       120694
       121088
        
           dependencies = [

     

       120695
       121089
        
             sources."@babel/code-frame-7.16.0"

     
···

       120859
       121253
        
             sources."spdx-correct-3.1.1"

     

       120860
       121254
        
             sources."spdx-exceptions-2.3.0"

     

       120861
       121255
        
             sources."spdx-expression-parse-3.0.1"

     

       120862
       120862
       -
             sources."spdx-license-ids-3.0.10"

     

       121256
       121256
       +
             sources."spdx-license-ids-3.0.11"

     

       120863
       121257
        
             sources."specificity-0.4.1"

     

       120864
       121258
        
             sources."string-width-4.2.3"

     

       120865
       121259
        
             sources."strip-ansi-6.0.1"

     
···

       121880
       122274
        
             sources."node-addon-api-4.2.0"

     

       121881
       122275
        
             sources."node-gyp-build-4.3.0"

     

       121882
       122276
        
             sources."q-1.5.1"

     

       121883
       121883
       -
             sources."usb-1.9.0"

     

       122277
       122277
       +
             sources."usb-1.9.1"

     

       121884
       122278
        
           ];

     

       121885
       122279
        
           buildInputs = globalBuildInputs;

     

       121886
       122280
        
           meta = {

     
···

       122164
       122558
        
             sources."spdx-correct-3.1.1"

     

       122165
       122559
        
             sources."spdx-exceptions-2.3.0"

     

       122166
       122560
        
             sources."spdx-expression-parse-3.0.1"

     

       122167
       122167
       -
             sources."spdx-license-ids-3.0.10"

     

       122561
       122561
       +
             sources."spdx-license-ids-3.0.11"

     

       122168
       122562
        
             sources."sprintf-js-1.0.3"

     

       122169
       122563
        
             (sources."string-width-1.0.2" // {

     

       122170
       122564
        
               dependencies = [

     
···

       122560
       122954
        
             sources."spdx-correct-3.1.1"

     

       122561
       122955
        
             sources."spdx-exceptions-2.3.0"

     

       122562
       122956
        
             sources."spdx-expression-parse-3.0.1"

     

       122563
       122563
       -
             sources."spdx-license-ids-3.0.10"

     

       122957
       122957
       +
             sources."spdx-license-ids-3.0.11"

     

       122564
       122958
        
             sources."split-0.2.10"

     

       122565
       122959
        
             (sources."split-transform-stream-0.1.1" // {

     

       122566
       122960
        
               dependencies = [

     
···

       126639
       127033
        
             sources."spdx-correct-3.1.1"

     

       126640
       127034
        
             sources."spdx-exceptions-2.3.0"

     

       126641
       127035
        
             sources."spdx-expression-parse-3.0.1"

     

       126642
       126642
       -
             sources."spdx-license-ids-3.0.10"

     

       127036
       127036
       +
             sources."spdx-license-ids-3.0.11"

     

       126643
       127037
        
             sources."split-string-3.1.0"

     

       126644
       127038
        
             sources."sprintf-js-1.0.3"

     

       126645
       127039
        
             sources."stampit-1.2.0"

     
···

       129428
       129822
        
             sources."spdx-correct-3.1.1"

     

       129429
       129823
        
             sources."spdx-exceptions-2.3.0"

     

       129430
       129824
        
             sources."spdx-expression-parse-3.0.1"

     

       129431
       129431
       -
             sources."spdx-license-ids-3.0.10"

     

       129825
       129825
       +
             sources."spdx-license-ids-3.0.11"

     

       129432
       129826
        
             sources."sprintf-js-1.1.2"

     

       129433
       129827
        
             sources."sshpk-1.16.1"

     

       129434
       129828
        
             sources."ssri-8.0.1"

+7 -3

pkgs/development/python-modules/ha-philipsjs/default.nix

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "ha-philipsjs";

     

       15
       15
       -
         version = "2.7.5";

     

       15
       15
       +
         version = "2.7.6";

     

       16
       16
       +
         format = "setuptools";

     

       17
       17
       +
       

     

       16
       18
        
         disabled = pythonOlder "3.8";

     

       17
       19
        
       

     

       18
       20
        
         src = fetchFromGitHub {

     

       19
       21
        
           owner = "danielperna84";

     

       20
       22
        
           repo = pname;

     

       21
       23
        
           rev = version;

     

       22
       22
       -
           sha256 = "sha256-CAYyVNVq1rZZ/AYOAE8bfd7f94+PlAsnFRdguparNtY=";

     

       24
       24
       +
           sha256 = "sha256-U5XigLFkpRoIXcFB4dpxi8pxqcmmb20sv9i9J70s0C0=";

     

       23
       25
        
         };

     

       24
       26
        
       

     

       25
       27
        
         propagatedBuildInputs = [

     
···

       34
       36
        
           respx

     

       35
       37
        
         ];

     

       36
       38
        
       

     

       37
       37
       -
         pythonImportsCheck = [ "haphilipsjs" ];

     

       39
       39
       +
         pythonImportsCheck = [

     

       40
       40
       +
           "haphilipsjs"

     

       41
       41
       +
         ];

     

       38
       42
        
       

     

       39
       43
        
         meta = with lib; {

     

       40
       44
        
           description = "Python library to interact with Philips TVs with jointSPACE API";

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

···

       18
       18
        
         checkInputs = [ pytest xmltodict nbconvert ipywidgets ];

     

       19
       19
        
         propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter-client ];

     

       20
       20
        
       

     

       21
       21
       +
         postFixup =  ''

     

       22
       22
       +
           # Remove until fixed by upstream

     

       23
       23
       +
           # https://github.com/jupyter/nbclient/pull/173#issuecomment-968760082

     

       24
       24
       +
           rm $out/bin/.jupyter-run-wrapped

     

       25
       25
       +
           rm $out/bin/jupyter-run

     

       26
       26
       +
         '';

     

       27
       27
       +
       

     

       21
       28
        
         meta = with lib; {

     

       22
       29
        
           homepage = "https://github.com/jupyter/nbclient";

     

       23
       30
        
           description = "A client library for executing notebooks";

+2 -2

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

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "pyefergy";

     

       12
       12
       -
         version = "0.1.3";

     

       12
       12
       +
         version = "0.1.4";

     

       13
       13
        
         format = "setuptools";

     

       14
       14
        
       

     

       15
       15
        
         disabled = pythonOlder "3.8";

     
···

       18
       18
        
           owner = "tkdrob";

     

       19
       19
        
           repo = pname;

     

       20
       20
        
           rev = version;

     

       21
       21
       -
           sha256 = "sha256-TGvS/ntIRbkcMsD5y0QdqyLE2dcPUbX3d79jHc3ddd0=";

     

       21
       21
       +
           sha256 = "sha256-X/dWEBg3WG6SmMore5otLL4iIueGUS5KgjCPYoMSNd0=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         propagatedBuildInputs = [

+10 -6

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

···

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "pyflunearyou";

     

       18
       18
       -
         version = "2.0.2";

     

       18
       18
       +
         version = "2021.10.0";

     

       19
       19
        
         format = "pyproject";

     

       20
       20
       +
       

     

       20
       21
        
         disabled = pythonOlder "3.6";

     

       21
       22
        
       

     

       22
       23
        
         src = fetchFromGitHub {

     

       23
       24
        
           owner = "bachya";

     

       24
       25
        
           repo = pname;

     

       25
       26
        
           rev = version;

     

       26
       26
       -
           sha256 = "07n2dvnfpfglpdlnwzj4dy41x2zc07ia2krvxdarnv8wzap30y23";

     

       27
       27
       +
           sha256 = "sha256-Q65OSE4qckpvaIvZULBR434i7hwuVM97eSq1Blb1oIU=";

     

       27
       28
        
         };

     

       28
       29
        
       

     

       29
       30
        
         nativeBuildInputs = [

     
···

       44
       45
        
           pytestCheckHook

     

       45
       46
        
         ];

     

       46
       47
        
       

     

       47
       47
       -
         # Ignore the examples directory as the files are prefixed with test_.

     

       48
       48
       -
         # disabledTestFiles doesn't seem to work here

     

       49
       49
       -
         disabledTestPaths = [ "examples/" ];

     

       48
       48
       +
         disabledTestPaths = [

     

       49
       49
       +
           # Ignore the examples directory as the files are prefixed with test_.

     

       50
       50
       +
           "examples/"

     

       51
       51
       +
         ];

     

       50
       52
        
       

     

       51
       51
       -
         pythonImportsCheck = [ "pyflunearyou" ];

     

       53
       53
       +
         pythonImportsCheck = [

     

       54
       54
       +
           "pyflunearyou"

     

       55
       55
       +
         ];

     

       52
       56
        
       

     

       53
       57
        
         meta = with lib; {

     

       54
       58
        
           description = "Python library for retrieving UV-related information from Flu Near You";

+29

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

···

       1
       1
       +
       { buildPythonPackage

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       buildPythonPackage rec {

     

       7
       7
       +
         pname = "slugid";

     

       8
       8
       +
         version = "2.0.0";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchFromGitHub {

     

       11
       11
       +
           owner = "taskcluster";

     

       12
       12
       +
           repo = "slugid.py";

     

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

     

       14
       14
       +
           sha256 = "McBxGRi8KqVhe2Xez5k4G67R5wBCCoh41dRsTKW4xMA=";

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         doCheck = false; # has no tests

     

       18
       18
       +
       

     

       19
       19
       +
         pythonImportsCheck = [

     

       20
       20
       +
           "slugid"

     

       21
       21
       +
         ];

     

       22
       22
       +
       

     

       23
       23
       +
         meta = with lib; {

     

       24
       24
       +
           description = "URL-safe base64 UUID encoder for generating 22 character slugs";

     

       25
       25
       +
           homepage = "https://github.com/taskcluster/slugid.py";

     

       26
       26
       +
           license = licenses.mpl20;

     

       27
       27
       +
           maintainers = with maintainers; [ milahu ];

     

       28
       28
       +
         };

     

       29
       29
       +
       }

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "stripe";

     

       5
       5
       -
         version = "2.61.0";

     

       5
       5
       +
         version = "2.62.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "8131addd3512a22c4c539dda2d869a8f488e06f1b02d1f3a5f0f4848fc56184e";

     

       9
       9
       +
           sha256 = "1fb51d67a961ea889c5be324f020535ed511c6f483bd13a07f48f6e369fa8df0";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         propagatedBuildInputs = [ requests ];

+2 -2

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

···

       5
       5
        
       

     

       6
       6
        
       buildPythonPackage rec {

     

       7
       7
        
         pname = "striprtf";

     

       8
       8
       -
         version = "0.0.15";

     

       8
       8
       +
         version = "0.0.16";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchPypi {

     

       11
       11
        
           inherit pname version;

     

       12
       12
       -
           sha256 = "1yvgnmds034z28mscff0amm0g47ni0753nshvrq2swdpipymiwz0";

     

       12
       12
       +
           sha256 = "690387117f3341354fddd0957913158d1319c207755c0cc54a614f80248887b2";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         meta = with lib; {

+2 -2

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

···

       31
       31
        
       

     

       32
       32
        
       buildPythonPackage rec {

     

       33
       33
        
         pname = "sunpy";

     

       34
       34
       -
         version = "3.1.0";

     

       34
       34
       +
         version = "3.1.1";

     

       35
       35
        
         disabled = pythonOlder "3.6";

     

       36
       36
        
       

     

       37
       37
        
         src = fetchPypi {

     

       38
       38
        
           inherit pname version;

     

       39
       39
       -
           sha256 = "sha256-0DF+/lQpsQKO5omBKJAe3gBjQ6QQb50IdRSacIRL/JA=";

     

       39
       39
       +
           sha256 = "c8fcd3700d8f4b7880a669f28c44f784422da1dbfe59fb175f155703817695ed";

     

       40
       40
        
         };

     

       41
       41
        
       

     

       42
       42
        
         nativeBuildInputs = [

+2 -2

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

···

       24
       24
        
         cudaArchStr = lib.optionalString cudaSupport lib.strings.concatStringsSep ";" pytorch.cudaArchList;

     

       25
       25
        
       in buildPythonPackage rec {

     

       26
       26
        
         pname = "torchvision";

     

       27
       27
       -
         version = "0.10.1";

     

       27
       27
       +
         version = "0.11.1";

     

       28
       28
        
       

     

       29
       29
        
         src = fetchFromGitHub {

     

       30
       30
        
           owner = "pytorch";

     

       31
       31
        
           repo = "vision";

     

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

     

       33
       33
       -
           sha256 = "0dw4q4yf86wwkm38bpsjf0yfzai46icvaly861ymh5v9f90q60jw";

     

       33
       33
       +
           sha256 = "05dg835mmpzf7k2jn101l7x7cnra1kldwbgf19zblym5lfn21zhf";

     

       34
       34
        
         };

     

       35
       35
        
       

     

       36
       36
        
         nativeBuildInputs = [ libpng ninja which ]

+2 -2

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

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "traits";

     

       11
       11
       -
         version = "6.3.0";

     

       11
       11
       +
         version = "6.3.2";

     

       12
       12
        
         disabled = isPy27;

     

       13
       13
        
       

     

       14
       14
        
         src = fetchPypi {

     

       15
       15
        
           inherit pname version;

     

       16
       16
       -
           sha256 = "770241df047feb9e3ed4c26a36c2468a5b754e6082a78eeb737f058bd45344f5";

     

       16
       16
       +
           sha256 = "4520ef4a675181f38be4a5bab1b1d5472691597fe2cfe4faf91023e89407e2c6";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         propagatedBuildInputs = [ numpy ];

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "wcmatch";

     

       5
       5
       -
         version = "8.2";

     

       5
       5
       +
         version = "8.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "4d54ddb506c90b5a5bba3a96a1cfb0bb07127909e19046a71d689ddfb18c3617";

     

       9
       9
       +
           sha256 = "371072912398af61d1e4e78609e18801c6faecd3cb36c54c82556a60abc965db";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         propagatedBuildInputs = [ bracex ];

+2 -2

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

···

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       buildPythonPackage rec {

     

       6
       6
       -
         version = "0.11.1";

     

       6
       6
       +
         version = "0.12.0";

     

       7
       7
        
         pname = "west";

     

       8
       8
        
       

     

       9
       9
        
         disabled = !isPy3k;

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "30771f3ec2a4281cd05c277a90f7dc94ded97d6dc1e1decdf4fe452dbbacc283";

     

       13
       13
       +
           sha256 = "d7ce0d719fd218fee5983442fe93a33a21a6be6a736915a7ffbe75369714e9ce";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         propagatedBuildInputs = [

+2 -2

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

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "yfinance";

     

       12
       12
       -
         version = "0.1.64";

     

       12
       12
       +
         version = "0.1.66";

     

       13
       13
        
       

     

       14
       14
        
         # GitHub source releases aren't tagged

     

       15
       15
        
         src = fetchPypi {

     

       16
       16
        
           inherit pname version;

     

       17
       17
       -
           sha256 = "bde7ff6c04b7179881c15753460c600c4bd877dc9f33cdc98da68e7e1ebbc5a2";

     

       17
       17
       +
           sha256 = "9ea6fd18319fd898a8428a4a3d67171812b54779e330ead4d4ed0c59eb311be5";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/youtube-search-python/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "youtube-search-python";

     

       5
       5
       -
         version = "1.4.9";

     

       5
       5
       +
         version = "1.5.1";

     

       6
       6
        
       

     

       7
       7
        
         disabled = pythonOlder "3.6";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchPypi {

     

       10
       10
        
           inherit pname version;

     

       11
       11
       -
           sha256 = "9c75540d41f6dcfd19f2f70fbe8346406e026a016aae56b87c207a0b4ff571e0";

     

       11
       11
       +
           sha256 = "68c70e1b6a2ce5c2c0ee64ba9c63efc9ab6e6f8acb2f51e19d570b0287e61cc9";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         propagatedBuildInputs = [ httpx ];

+2 -2

pkgs/development/python-modules/youtube-transcript-api/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "youtube-transcript-api";

     

       5
       5
       -
         version = "0.4.1";

     

       5
       5
       +
         version = "0.4.2";

     

       6
       6
        
       

     

       7
       7
        
         # PyPI tarball is missing some test files

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "jdepoix";

     

       10
       10
        
           repo = "youtube-transcript-api";

     

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

     

       12
       12
       -
           sha256 = "1gpk13j1n2bifwsg951gmrfnq8kfxjr15rq46dxn1bhyk9hr1zql";

     

       12
       12
       +
           sha256 = "04x7mfp4q17w3n8dnklbxblz22496g7g4879nz0wzgijg3m6cwlp";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         propagatedBuildInputs = [ requests ];

+3 -3

pkgs/development/tools/stylua/default.nix

···

       8
       8
        
       

     

       9
       9
        
       rustPlatform.buildRustPackage rec {

     

       10
       10
        
         pname = "stylua";

     

       11
       11
       -
         version = "0.11.1";

     

       11
       11
       +
         version = "0.11.2";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "johnnymorganz";

     

       15
       15
        
           repo = pname;

     

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

     

       17
       17
       -
           sha256 = "sha256-+5c8baeToaT4k/2VSK/XQki0NPsWTnS6Ap3NpWvj+yI=";

     

       17
       17
       +
           sha256 = "sha256-rdtFzHpOvv1uJBigJWenWyIZF/wpYP7iBW2FCsfq2d4=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         cargoSha256 = "sha256-uIcP5ZNb8K5pySw0Qq46hev9VUbq8XVqmzBBGPagUfE=";

     

       20
       20
       +
         cargoSha256 = "sha256-/4ZW1FIfK51ak2EIV6dYY3XpucPPR+OZySPWwcKP4v0=";

     

       21
       21
        
       

     

       22
       22
        
         cargoBuildFlags = lib.optionals lua52Support [ "--features" "lua52" ]

     

       23
       23
        
           ++ lib.optionals luauSupport [ "--features" "luau" ];

+2 -2

pkgs/os-specific/linux/cpuid/default.nix

···

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
         pname = "cpuid";

     

       9
       9
       -
         version = "20211031";

     

       9
       9
       +
         version = "20211114";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchurl {

     

       12
       12
        
           url = "http://etallen.com/cpuid/${pname}-${version}.src.tar.gz";

     

       13
       13
       -
           sha256 = "13sxb2ar4gypiv0l87lr7hf3qjccwgsg1r92adv9jvrfxcv36pbn";

     

       13
       13
       +
           sha256 = "1dz10d958hz7qbh77hxf2k6sc7y9nkvlmr2469hv6gwgqs6dq1vi";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         # For pod2man during the build process.

+15 -15

pkgs/servers/blockbook/default.nix

···

       1
       1
       -
       { lib, stdenv

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       2
       3
        
       , buildGoModule

     

       3
       4
        
       , fetchFromGitHub

     

       4
       4
       -
       , packr

     

       5
       5
        
       , pkg-config

     

       6
       6
        
       , bzip2

     

       7
       7
        
       , lz4

     

       8
       8
       -
       , rocksdb

     

       8
       8
       +
       , rocksdb_6_23

     

       9
       9
        
       , snappy

     

       10
       10
        
       , zeromq

     

       11
       11
        
       , zlib

     

       12
       12
        
       , nixosTests

     

       13
       13
        
       }:

     

       14
       14
        
       

     

       15
       15
       +
       let

     

       16
       16
       +
         rocksdb = rocksdb_6_23;

     

       17
       17
       +
       in

     

       15
       18
        
       buildGoModule rec {

     

       16
       19
        
         pname = "blockbook";

     

       17
       17
       -
         version = "0.3.4";

     

       18
       18
       -
         commit = "eb4e10a";

     

       20
       20
       +
         version = "0.3.6";

     

       21
       21
       +
         commit = "5f8cf45";

     

       19
       22
        
       

     

       20
       23
        
         src = fetchFromGitHub {

     

       21
       24
        
           owner = "trezor";

     

       22
       25
        
           repo = "blockbook";

     

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

     

       24
       24
       -
           sha256 = "0da1kav5x2xcmwvdgfk1q70l1k0sqqj3njgx2xx885d40m6qbnrs";

     

       27
       27
       +
           sha256 = "1jb195chy3kbspmv9vyg7llw6kgykkmvz3znd97mxf24f4q622jv";

     

       25
       28
        
         };

     

       26
       29
        
       

     

       27
       27
       -
         runVend = true;

     

       28
       28
       -
         vendorSha256 = "0p7vyw61nwvmaz7gz2bdh9fi6wp62i2vnzw6iz2r8cims4sbz53b";

     

       30
       30
       +
         vendorSha256 = "0d17qaqn33wi7lzw4hlym56d9v4qnmvs6plpm5jiby2g5yckq0mz";

     

       29
       31
        
       

     

       30
       30
       -
         doCheck = false;

     

       31
       31
       -
       

     

       32
       32
       -
         nativeBuildInputs = [ packr pkg-config ];

     

       32
       32
       +
         nativeBuildInputs = [ pkg-config ];

     

       33
       33
        
       

     

       34
       34
        
         buildInputs = [ bzip2 lz4 rocksdb snappy zeromq zlib ];

     

       35
       35
        
       

     
···

       39
       39
        
           "-X github.com/trezor/blockbook/common.buildDate=unknown"

     

       40
       40
        
         ];

     

       41
       41
        
       

     

       42
       42
       +
         tags = [ "rocksdb_6_16" ];

     

       43
       43
       +
       

     

       42
       44
        
         preBuild = lib.optionalString stdenv.isDarwin ''

     

       43
       45
        
           ulimit -n 8192

     

       44
       46
        
         '' + ''

     

       45
       47
        
           export CGO_LDFLAGS="-L${stdenv.cc.cc.lib}/lib -lrocksdb -lz -lbz2 -lsnappy -llz4 -lm -lstdc++"

     

       46
       46
       -
           packr clean && packr

     

       48
       48
       +
           buildFlagsArray+=("-tags=${lib.concatStringsSep " " tags}")

     

       49
       49
       +
           buildFlagsArray+=("-ldflags=${lib.concatStringsSep " " ldflags}")

     

       47
       50
        
         '';

     

       48
       51
        
       

     

       49
       52
        
         subPackages = [ "." ];

     
···

       64
       67
        
           license = licenses.agpl3;

     

       65
       68
        
           maintainers = with maintainers; [ mmahut _1000101 ];

     

       66
       69
        
           platforms = platforms.unix;

     

       67
       67
       -
           # go dependency tecbot/gorocksdb requires rocksdb 5.x but nixpkgs has only rocksdb 6.x

     

       68
       68
       -
           # issue in upstream can be tracked here: https://github.com/trezor/blockbook/issues/617

     

       69
       69
       -
           broken = true;

     

       70
       70
        
         };

     

       71
       71
        
       }

+4 -4

pkgs/servers/monitoring/grafana/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGo117Module rec {

     

       4
       4
        
         pname = "grafana";

     

       5
       5
       -
         version = "8.2.3";

     

       5
       5
       +
         version = "8.2.4";

     

       6
       6
        
       

     

       7
       7
        
         excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)";

     

       8
       8
        
       

     
···

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

     

       11
       11
        
           owner = "grafana";

     

       12
       12
        
           repo = "grafana";

     

       13
       13
       -
           sha256 = "sha256-GC4pHwthsXu/+dXb1cBk5bC0O6NnyiChC+UWleq7JzA=";

     

       13
       13
       +
           sha256 = "sha256-dOV22xwdNLt0TnONzyDw0skGKuAYmiHafhFwhtRMN5M=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         srcStatic = fetchurl {

     

       17
       17
        
           url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";

     

       18
       18
       -
           sha256 = "sha256-LOswYw0P3dy6arrmUbnzBU0ie2YcPtk6xqtp9CowG2s=";

     

       18
       18
       +
           sha256 = "sha256-nfHUpAnFc2lDGAoHB1fJjF08ndfNlaMJAlsMH+TJNy0=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         vendorSha256 = "sha256-yZbdUiuRNFRaXduOYps5ygiaUgvNXw+Ah4wZrfYcJlY=";

     

       21
       21
       +
         vendorSha256 = "sha256-VvmSNSChbxeLWEQDE4JPfoZckQZ7nG7ElupNCc175Fk=";

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [ wire ];

     

       24
       24

pkgs/test/default.nix

···

       37
       37
        
       

     

       38
       38
        
         cross = callPackage ./cross {};

     

       39
       39
        
       

     

       40
       40
       +
         php = recurseIntoAttrs (callPackages ./php {});

     

       41
       41
       +
       

     

       40
       42
        
         rustCustomSysroot = callPackage ./rust-sysroot {};

     

       41
       43
        
         buildRustCrate = callPackage ../build-support/rust/build-rust-crate/test { };

     

       42
       44
        
         importCargoLock = callPackage ../build-support/rust/test/import-cargo-lock { };

+116

pkgs/test/php/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , php

     

       3
       3
       +
       , runCommand

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       let

     

       7
       7
       +
         runTest = name: body: runCommand name { } ''

     

       8
       8
       +
           testFailed=

     

       9
       9
       +
           checking() {

     

       10
       10
       +
             echo -n "Checking $1... " > /dev/stderr

     

       11
       11
       +
           }

     

       12
       12
       +
           ok() {

     

       13
       13
       +
             echo ok > /dev/stderr

     

       14
       14
       +
           }

     

       15
       15
       +
           nok() {

     

       16
       16
       +
             echo fail > /dev/stderr

     

       17
       17
       +
             testFailed=1

     

       18
       18
       +
           }

     

       19
       19
       +
       

     

       20
       20
       +
           ${body}

     

       21
       21
       +
       

     

       22
       22
       +
           if test -n "$testFailed"; then

     

       23
       23
       +
             exit 1

     

       24
       24
       +
           fi

     

       25
       25
       +
       

     

       26
       26
       +
           touch $out

     

       27
       27
       +
         '';

     

       28
       28
       +
       

     

       29
       29
       +
         check = cond: if cond then "ok" else "nok";

     

       30
       30
       +
       in

     

       31
       31
       +
       {

     

       32
       32
       +
         withExtensions-enables-previously-disabled-extensions = runTest "php-test-withExtensions-enables-previously-disabled-extensions" ''

     

       33
       33
       +
           php="${php}"

     

       34
       34
       +
       

     

       35
       35
       +
           checking "that imagick is not present by default"

     

       36
       36
       +
           $php/bin/php -r 'exit(extension_loaded("imagick") ? 1 : 0);' && ok || nok

     

       37
       37
       +
       

     

       38
       38
       +
           phpWithImagick="${php.withExtensions ({ all, ... }: [ all.imagick ])}"

     

       39
       39
       +
           checking "that imagick extension is present when enabled"

     

       40
       40
       +
           $phpWithImagick/bin/php -r 'exit(extension_loaded("imagick") ? 0 : 1);' && ok || nok

     

       41
       41
       +
         '';

     

       42
       42
       +
       

     

       43
       43
       +
         overrideAttrs-preserves-enabled-extensions =

     

       44
       44
       +
           let

     

       45
       45
       +
             customPhp =

     

       46
       46
       +
               (php.withExtensions ({ all, ... }: [ all.imagick ])).overrideAttrs (attrs: {

     

       47
       47
       +
                 postInstall = attrs.postInstall or "" + ''

     

       48
       48
       +
                   touch "$out/oApee-was-here"

     

       49
       49
       +
                 '';

     

       50
       50
       +
               });

     

       51
       51
       +
           in

     

       52
       52
       +
           runTest "php-test-overrideAttrs-preserves-enabled-extensions" ''

     

       53
       53
       +
             php="${customPhp}"

     

       54
       54
       +
             phpUnwrapped="${customPhp.unwrapped}"

     

       55
       55
       +
       

     

       56
       56
       +
             checking "if overrides took hold"

     

       57
       57
       +
             test -f "$phpUnwrapped/oApee-was-here" && ok || nok

     

       58
       58
       +
       

     

       59
       59
       +
             checking "if imagick extension is still present"

     

       60
       60
       +
             $php/bin/php -r 'exit(extension_loaded("imagick") ? 0 : 1);' && ok || nok

     

       61
       61
       +
       

     

       62
       62
       +
             checking "if imagick extension is linked against the overridden PHP"

     

       63
       63
       +
             echo $php

     

       64
       64
       +
             $php/bin/php -r 'exit(extension_loaded("imagick") ? 0 : 1);' && ok || nok

     

       65
       65
       +
           '';

     

       66
       66
       +
       

     

       67
       67
       +
         unwrapped-overrideAttrs-stacks =

     

       68
       68
       +
           let

     

       69
       69
       +
             customPhp =

     

       70
       70
       +
               lib.pipe php.unwrapped [

     

       71
       71
       +
                 (pkg: pkg.overrideAttrs (attrs: {

     

       72
       72
       +
                   postInstall = attrs.postInstall or "" + ''

     

       73
       73
       +
                     touch "$out/oAs-first"

     

       74
       74
       +
                   '';

     

       75
       75
       +
                 }))

     

       76
       76
       +
       

     

       77
       77
       +
                 (pkg: pkg.overrideAttrs (attrs: {

     

       78
       78
       +
                   postInstall = attrs.postInstall or "" + ''

     

       79
       79
       +
                     touch "$out/oAs-second"

     

       80
       80
       +
                   '';

     

       81
       81
       +
                 }))

     

       82
       82
       +
               ];

     

       83
       83
       +
           in

     

       84
       84
       +
           runTest "php-test-unwrapped-overrideAttrs-stacks" ''

     

       85
       85
       +
             checking "if first override remained"

     

       86
       86
       +
             ${check (builtins.match ".*oAs-first.*" customPhp.postInstall != null)}

     

       87
       87
       +
       

     

       88
       88
       +
             checking "if second override is there"

     

       89
       89
       +
             ${check (builtins.match ".*oAs-second.*" customPhp.postInstall != null)}

     

       90
       90
       +
           '';

     

       91
       91
       +
       

     

       92
       92
       +
         wrapped-overrideAttrs-stacks =

     

       93
       93
       +
           let

     

       94
       94
       +
             customPhp =

     

       95
       95
       +
               lib.pipe php [

     

       96
       96
       +
                 (pkg: pkg.overrideAttrs (attrs: {

     

       97
       97
       +
                   postInstall = attrs.postInstall or "" + ''

     

       98
       98
       +
                     touch "$out/oAs-first"

     

       99
       99
       +
                   '';

     

       100
       100
       +
                 }))

     

       101
       101
       +
       

     

       102
       102
       +
                 (pkg: pkg.overrideAttrs (attrs: {

     

       103
       103
       +
                   postInstall = attrs.postInstall or "" + ''

     

       104
       104
       +
                     touch "$out/oAs-second"

     

       105
       105
       +
                   '';

     

       106
       106
       +
                 }))

     

       107
       107
       +
               ];

     

       108
       108
       +
           in

     

       109
       109
       +
           runTest "php-test-wrapped-overrideAttrs-stacks" ''

     

       110
       110
       +
             checking "if first override remained"

     

       111
       111
       +
             ${check (builtins.match ".*oAs-first.*" customPhp.unwrapped.postInstall != null)}

     

       112
       112
       +
       

     

       113
       113
       +
             checking "if second override is there"

     

       114
       114
       +
             ${check (builtins.match ".*oAs-second.*" customPhp.unwrapped.postInstall != null)}

     

       115
       115
       +
           '';

     

       116
       116
       +
       }

+7 -6

pkgs/tools/admin/netplan/default.nix

···

       20
       20
        
           repo = "netplan";

     

       21
       21
        
           rev = version;

     

       22
       22
        
           hash = "sha256-d8Ze8S/w2nyJkATzLfizMqmr7ad2wrK1mjADClee6WE=";

     

       23
       23
       -
           fetchSubmodules = false;

     

       24
       23
        
         };

     

       25
       24
        
       

     

       26
       25
        
         nativeBuildInputs = [

     
···

       39
       38
        
         ];

     

       40
       39
        
       

     

       41
       40
        
         postPatch = ''

     

       42
       42
       -
           substituteInPlace netplan/cli/utils.py --replace "/lib/netplan/generate" "$out/lib/netplan/generate"

     

       43
       43
       -
           substituteInPlace netplan/cli/utils.py --replace "ctypes.util.find_library('netplan')" "\"$out/lib/libnetplan.so\""

     

       41
       41
       +
           substituteInPlace netplan/cli/utils.py \

     

       42
       42
       +
             --replace "/lib/netplan/generate" "$out/lib/netplan/generate" \

     

       43
       43
       +
             --replace "ctypes.util.find_library('netplan')" "\"$out/lib/libnetplan.so\""

     

       44
       44
        
       

     

       45
       45
       -
           substituteInPlace Makefile --replace 'SYSTEMD_GENERATOR_DIR=' 'SYSTEMD_GENERATOR_DIR ?= ' \

     

       46
       46
       -
               --replace 'SYSTEMD_UNIT_DIR=' 'SYSTEMD_UNIT_DIR ?= ' \

     

       47
       47
       -
               --replace 'BASH_COMPLETIONS_DIR=' 'BASH_COMPLETIONS_DIR ?= '

     

       45
       45
       +
           substituteInPlace Makefile \

     

       46
       46
       +
             --replace 'SYSTEMD_GENERATOR_DIR=' 'SYSTEMD_GENERATOR_DIR ?= ' \

     

       47
       47
       +
             --replace 'SYSTEMD_UNIT_DIR=' 'SYSTEMD_UNIT_DIR ?= ' \

     

       48
       48
       +
             --replace 'BASH_COMPLETIONS_DIR=' 'BASH_COMPLETIONS_DIR ?= '

     

       48
       49
        
       

     

       49
       50
        
           # from upstream https://github.com/canonical/netplan/blob/ee0d5df7b1dfbc3197865f02c724204b955e0e58/rpm/netplan.spec#L81

     

       50
       51
        
           sed -e "s/-Werror//g" -i Makefile

+8 -3

pkgs/tools/graphics/pngcheck/default.nix

···

       11
       11
        
       

     

       12
       12
        
         hardeningDisable = [ "format" ];

     

       13
       13
        
       

     

       14
       14
       +
         postPatch = lib.optionalString stdenv.isDarwin ''

     

       15
       15
       +
           substituteInPlace Makefile.unx --replace "gcc" "clang"

     

       16
       16
       +
         '';

     

       17
       17
       +
       

     

       14
       18
        
         makefile = "Makefile.unx";

     

       15
       19
        
         makeFlags = [ "ZPATH=${zlib.static}/lib" ];

     

       16
       20
        
       

     
···

       21
       25
        
           cp pngcheck $out/bin/pngcheck

     

       22
       26
        
         '';

     

       23
       27
        
       

     

       24
       24
       -
         meta = {

     

       28
       28
       +
         meta = with lib; {

     

       25
       29
        
           homepage = "http://pmt.sourceforge.net/pngcrush";

     

       26
       30
        
           description = "Verifies the integrity of PNG, JNG and MNG files";

     

       27
       27
       -
           license = lib.licenses.free;

     

       28
       28
       -
           platforms = with lib.platforms; linux;

     

       31
       31
       +
           license = licenses.free;

     

       32
       32
       +
           platforms = with platforms; [ unix ];

     

       33
       33
       +
           maintainers = with maintainers; [ starcraft66 ];

     

       29
       34
        
         };

     

       30
       35
        
       }

pkgs/tools/misc/apkeep/default.nix

···

       11
       11
        
       

     

       12
       12
        
         cargoSha256 = "sha256-YFs2AOMGp0WNrceK14AnigZdJl+UsQdUchpxaI7HSXw=";

     

       13
       13
        
       

     

       14
       14
       +
         prePatch = ''

     

       15
       15
       +
           rm .cargo/config.toml

     

       16
       16
       +
         '';

     

       17
       17
       +
       

     

       14
       18
        
         nativeBuildInputs = [ pkg-config ];

     

       15
       19
        
       

     

       16
       20
        
         buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];

+7 -3

pkgs/tools/misc/cloud-sql-proxy/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "cloud-sql-proxy";

     

       5
       5
       -
         version = "1.26.0";

     

       5
       5
       +
         version = "1.27.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "GoogleCloudPlatform";

     

       9
       9
        
           repo = "cloudsql-proxy";

     

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

     

       11
       11
       -
           sha256 = "sha256-Xgz8ku6szzbgL3cyiggHJYaj4aUhaqgIOUnwKUE1AeY=";

     

       11
       11
       +
           sha256 = "sha256-x44nG5M2ycBaf/Fbw5crmAV//yv/WtIYbTjJ7/6TnoI=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         subPackages = [ "cmd/cloud_sql_proxy" ];

     

       15
       15
        
       

     

       16
       16
       -
         vendorSha256 = "sha256-7KiLJoQ0xH35ae4NGODF4t1S9h86L0TJbCqFVm+bBmk=";

     

       16
       16
       +
         vendorSha256 = "sha256-Uw8YJ1qzLYlTkx6wR/FKeDRHGSwZm2za/c0f/OKHiE0=";

     

       17
       17
       +
       

     

       18
       18
       +
         # Disables tests that require running fuse with a hardcoded path

     

       19
       19
       +
         doCheck = false;

     

       17
       20
        
       

     

       18
       21
        
         meta = with lib; {

     

       19
       22
        
           description = "An authenticating proxy for Second Generation Google Cloud SQL databases";

     

       20
       23
        
           homepage = "https://github.com/GoogleCloudPlatform/cloudsql-proxy";

     

       21
       24
        
           license = licenses.asl20;

     

       22
       25
        
           maintainers = with maintainers; [ nicknovitski ];

     

       26
       26
       +
           mainProgram = "cloud_sql_proxy";

     

       23
       27
        
         };

     

       24
       28
        
       }

+2 -2

pkgs/tools/misc/less/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "less";

     

       5
       5
       -
         version = "590";

     

       5
       5
       +
         version = "596";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://www.greenwoodsoftware.com/${pname}/${pname}-${version}.tar.gz";

     

       9
       9
       -
           sha256 = "044fl3izmsi8n1vqzsqdp65q0qyyn5kmsg4sk7id0mxzx15zbbba";

     

       9
       9
       +
           sha256 = "sha256-QhqP1ZfnIELu/P6OV2NnerxL6EM/bA321zmhbMDk1cM=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         configureFlags = [ "--sysconfdir=/etc" ] # Look for ‘sysless’ in /etc.

+18 -2

pkgs/top-level/all-packages.nix

···

       4601
       4601
        
       

     

       4602
       4602
        
         dorkscout = callPackage ../tools/security/dorkscout { };

     

       4603
       4603
        
       

     

       4604
       4604
       +
         downonspot = callPackage ../applications/misc/downonspot { };

     

       4605
       4605
       +
       

     

       4604
       4606
        
         sl1-to-photon = python3Packages.callPackage ../applications/misc/sl1-to-photon { };

     

       4605
       4607
        
       

     

       4606
       4608
        
         slade = callPackage ../applications/misc/slade {

     
···

       7313
       7315
        
         inherit (callPackages ../development/libraries/libwebsockets { })

     

       7314
       7316
        
           libwebsockets_3_1

     

       7315
       7317
        
           libwebsockets_3_2

     

       7316
       7316
       -
           libwebsockets_4_2;

     

       7317
       7317
       -
         libwebsockets = libwebsockets_4_2;

     

       7318
       7318
       +
           libwebsockets_4_2

     

       7319
       7319
       +
           libwebsockets_4_3;

     

       7320
       7320
       +
         libwebsockets = libwebsockets_4_3;

     

       7318
       7321
        
       

     

       7319
       7322
        
         licensee = callPackage ../tools/package-management/licensee { };

     

       7320
       7323
        
       

     
···

       9037
       9040
        
         restool = callPackage ../os-specific/linux/restool {};

     

       9038
       9041
        
       

     

       9039
       9042
        
         reuse = callPackage ../tools/package-management/reuse { };

     

       9043
       9043
       +
       

     

       9044
       9044
       +
         inherit (nodePackages) reveal-md;

     

       9040
       9045
        
       

     

       9041
       9046
        
         rewritefs = callPackage ../os-specific/linux/rewritefs { };

     

       9042
       9047
        
       

     
···

       19320
       19325
        
         rocksdb = callPackage ../development/libraries/rocksdb { };

     

       19321
       19326
        
       

     

       19322
       19327
        
         rocksdb_lite = rocksdb.override { enableLite = true; };

     

       19328
       19328
       +
       

     

       19329
       19329
       +
         rocksdb_6_23 = rocksdb.overrideAttrs (old: rec {

     

       19330
       19330
       +
           pname = "rocksdb";

     

       19331
       19331
       +
           version = "6.23.3";

     

       19332
       19332
       +
           src = fetchFromGitHub {

     

       19333
       19333
       +
             owner = "facebook";

     

       19334
       19334
       +
             repo = pname;

     

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

     

       19336
       19336
       +
            sha256 = "sha256-SsDqhjdCdtIGNlsMj5kfiuS3zSGwcxi4KV71d95h7yk=";

     

       19337
       19337
       +
          };

     

       19338
       19338
       +
         });

     

       19323
       19339
        
       

     

       19324
       19340
        
         rotate-backups = callPackage ../tools/backup/rotate-backups { };

     

       19325
       19341

pkgs/top-level/python-packages.nix

···

       8633
       8633
        
       

     

       8634
       8634
        
         slowapi = callPackage ../development/python-modules/slowapi { };

     

       8635
       8635
        
       

     

       8636
       8636
       +
         slugid = callPackage ../development/python-modules/slugid { };

     

       8637
       8637
       +
       

     

       8636
       8638
        
         sly = callPackage ../development/python-modules/sly { };

     

       8637
       8639
        
       

     

       8638
       8640
        
         smart-meter-texas = callPackage ../development/python-modules/smart-meter-texas { };