commit 22c23dbb8de9969e8c9b898a06d2f36b10d0b809 · pyrox.dev/nixpkgs

+4 -1

doc/languages-frameworks/vim.section.md

···

       18
       18
        
       

     

       19
       19
        
       ```nix

     

       20
       20
        
       vim_configurable.customize {

     

       21
       21
       -
         # `name` specifies the name of the executable and package

     

       21
       21
       +
         # `name` optionally specifies the name of the executable and package

     

       22
       22
        
         name = "vim-with-plugins";

     

       23
       23
        
       

     

       24
       24
        
         vimrcConfig.customRC = ''

     
···

       28
       28
        
       ```

     

       29
       29
        
       

     

       30
       30
        
       This configuration is used when Vim is invoked with the command specified as name, in this case `vim-with-plugins`.

     

       31
       31
       +
       You can also omit `name` to customize Vim itself. See the

     

       32
       32
       +
       [definition of `vimUtils.makeCustomizable`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/vim-utils.nix#L408)

     

       33
       33
       +
       for all supported options.

     

       31
       34
        
       

     

       32
       35
        
       For Neovim the `configure` argument can be overridden to achieve the same:

     

       33
       36

+22

maintainers/maintainer-list.nix

···

       929
       929
        
           githubId = 1296771;

     

       930
       930
        
           name = "Anders Riutta";

     

       931
       931
        
         };

     

       932
       932
       +
         arjan-s = {

     

       933
       933
       +
           email = "github@anymore.nl";

     

       934
       934
       +
           github = "arjan-s";

     

       935
       935
       +
           githubId = 10400299;

     

       936
       936
       +
           name = "Arjan Schrijver";

     

       937
       937
       +
         };

     

       932
       938
        
         arkivm = {

     

       933
       939
        
           email = "vikram186@gmail.com";

     

       934
       940
        
           github = "arkivm";

     
···

       10306
       10312
        
           githubId = 16487165;

     

       10307
       10313
        
           name = "Rafael Basso";

     

       10308
       10314
        
         };

     

       10315
       10315
       +
         rbreslow = {

     

       10316
       10316
       +
           name = "Rocky Breslow";

     

       10317
       10317
       +
           email = "1774125+rbreslow@users.noreply.github.com";

     

       10318
       10318
       +
           github = "rbreslow";

     

       10319
       10319
       +
           githubId = 1774125;

     

       10320
       10320
       +
           keys = [{

     

       10321
       10321
       +
             longkeyid = "ed25519/0xA0D32ACCA38B88ED";

     

       10322
       10322
       +
             fingerprint = "B5B7 BCA0 EE6F F31E 263A  69E3 A0D3 2ACC A38B 88ED";

     

       10323
       10323
       +
           }];

     

       10324
       10324
       +
         };

     

       10309
       10325
        
         rbrewer = {

     

       10310
       10326
        
           email = "rwb123@gmail.com";

     

       10311
       10327
        
           github = "rbrewer123";

     
···

       13226
       13242
        
           github = "wchresta";

     

       13227
       13243
        
           githubId = 34962284;

     

       13228
       13244
        
           name = "wchresta";

     

       13245
       13245
       +
         };

     

       13246
       13246
       +
         wdavidw = {

     

       13247
       13247
       +
           name = "David Worms";

     

       13248
       13248
       +
           email = "david@adaltas.com";

     

       13249
       13249
       +
           github = "wdavidw";

     

       13250
       13250
       +
           githubId = 46896;

     

       13229
       13251
        
         };

     

       13230
       13252
        
         wedens = {

     

       13231
       13253
        
           email = "kirill.wedens@gmail.com";

+57

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

···

       851
       851
        
             </listitem>

     

       852
       852
        
             <listitem>

     

       853
       853
        
               <para>

     

       854
       854
       +
                 The <literal>vim.customize</literal> function produced by

     

       855
       855
       +
                 <literal>vimUtils.makeCustomizable</literal> now has a

     

       856
       856
       +
                 slightly different interface:

     

       857
       857
       +
               </para>

     

       858
       858
       +
               <itemizedlist spacing="compact">

     

       859
       859
       +
                 <listitem>

     

       860
       860
       +
                   <para>

     

       861
       861
       +
                     The wrapper now includes everything in the given Vim

     

       862
       862
       +
                     derivation if <literal>name</literal> is

     

       863
       863
       +
                     <literal>&quot;vim&quot;</literal> (the default). This

     

       864
       864
       +
                     makes the <literal>wrapManual</literal> argument obsolete,

     

       865
       865
       +
                     but this behavior can be overriden by setting the

     

       866
       866
       +
                     <literal>standalone</literal> argument.

     

       867
       867
       +
                   </para>

     

       868
       868
       +
                 </listitem>

     

       869
       869
       +
                 <listitem>

     

       870
       870
       +
                   <para>

     

       871
       871
       +
                     All the executables present in the given derivation (or,

     

       872
       872
       +
                     in <literal>standalone</literal> mode, only the

     

       873
       873
       +
                     <literal>*vim</literal> ones) are wrapped. This makes the

     

       874
       874
       +
                     <literal>wrapGui</literal> argument obsolete.

     

       875
       875
       +
                   </para>

     

       876
       876
       +
                 </listitem>

     

       877
       877
       +
                 <listitem>

     

       878
       878
       +
                   <para>

     

       879
       879
       +
                     The <literal>vimExecutableName</literal> and

     

       880
       880
       +
                     <literal>gvimExecutableName</literal> arguments were

     

       881
       881
       +
                     replaced by a single <literal>executableName</literal>

     

       882
       882
       +
                     argument in which the shell variable

     

       883
       883
       +
                     <literal>$exe</literal> can be used to refer to the

     

       884
       884
       +
                     wrapped executable’s name.

     

       885
       885
       +
                   </para>

     

       886
       886
       +
                 </listitem>

     

       887
       887
       +
               </itemizedlist>

     

       888
       888
       +
               <para>

     

       889
       889
       +
                 See the comments in

     

       890
       890
       +
                 <literal>pkgs/applications/editors/vim/plugins/vim-utils.nix</literal>

     

       891
       891
       +
                 for more details.

     

       892
       892
       +
               </para>

     

       893
       893
       +
               <para>

     

       894
       894
       +
                 <literal>vimUtils.vimWithRC</literal> was removed. You should

     

       895
       895
       +
                 instead use <literal>customize</literal> on a Vim derivation,

     

       896
       896
       +
                 which now accepts <literal>vimrcFile</literal> and

     

       897
       897
       +
                 <literal>gvimrcFile</literal> arguments.

     

       898
       898
       +
               </para>

     

       899
       899
       +
             </listitem>

     

       900
       900
       +
             <listitem>

     

       901
       901
       +
               <para>

     

       854
       902
        
                 <literal>tilp2</literal> was removed together with its module

     

       855
       903
        
               </para>

     

       856
       904
        
             </listitem>

     
···

       1372
       1420
        
                 value of <literal>true</literal> is now deprecated and will be

     

       1373
       1421
        
                 changed to <literal>false</literal> in 22.11. Configurations

     

       1374
       1422
        
                 using this default will print a warning when rebuilt.

     

       1423
       1423
       +
               </para>

     

       1424
       1424
       +
             </listitem>

     

       1425
       1425
       +
             <listitem>

     

       1426
       1426
       +
               <para>

     

       1427
       1427
       +
                 The <literal>services.unifi-video.openPorts</literal> option

     

       1428
       1428
       +
                 default value of <literal>true</literal> is now deprecated and

     

       1429
       1429
       +
                 will be changed to <literal>false</literal> in 22.11.

     

       1430
       1430
       +
                 Configurations using this default will print a warning when

     

       1431
       1431
       +
                 rebuilt.

     

       1375
       1432
        
               </para>

     

       1376
       1433
        
             </listitem>

     

       1377
       1434
        
             <listitem>

+12

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

···

       331
       331
        
       

     

       332
       332
        
       - `pkgs._7zz` is now correctly licensed as LGPL3+ and BSD3 with optional unfree unRAR licensed code

     

       333
       333
        
       

     

       334
       334
       +
       - The `vim.customize` function produced by `vimUtils.makeCustomizable` now has a slightly different interface:

     

       335
       335
       +
         * The wrapper now includes everything in the given Vim derivation if `name` is `"vim"` (the default). This makes the `wrapManual` argument obsolete, but this behavior can be overriden by setting the `standalone` argument.

     

       336
       336
       +
         * All the executables present in the given derivation (or, in `standalone` mode, only the `*vim` ones) are wrapped. This makes the `wrapGui` argument obsolete.

     

       337
       337
       +
         * The `vimExecutableName` and `gvimExecutableName` arguments were replaced by a single `executableName` argument in which the shell variable `$exe` can be used to refer to the wrapped executable's name.

     

       338
       338
       +
       

     

       339
       339
       +
         See the comments in `pkgs/applications/editors/vim/plugins/vim-utils.nix` for more details.

     

       340
       340
       +
       

     

       341
       341
       +
         `vimUtils.vimWithRC` was removed. You should instead use `customize` on a Vim derivation, which now accepts `vimrcFile` and `gvimrcFile` arguments.

     

       342
       342
       +
       

     

       334
       343
        
       - `tilp2` was removed together with its module

     

       335
       344
        
       

     

       336
       345
        
       - The F-PROT antivirus (`fprot` package) and its service module were removed because it

     
···

       499
       508
        
       - `programs.zsh.autosuggestions.strategy` now takes a list of strings instead of a string.

     

       500
       509
        
       

     

       501
       510
        
       - The `services.unifi.openPorts` option default value of `true` is now deprecated and will be changed to `false` in 22.11.

     

       511
       511
       +
         Configurations using this default will print a warning when rebuilt.

     

       512
       512
       +
       

     

       513
       513
       +
       - The `services.unifi-video.openPorts` option default value of `true` is now deprecated and will be changed to `false` in 22.11.

     

       502
       514
        
         Configurations using this default will print a warning when rebuilt.

     

       503
       515
        
       

     

       504
       516
        
       - `security.acme` certificates will now correctly check for CA

+9

nixos/modules/services/games/factorio.nix

···

       53
       53
        
               '';

     

       54
       54
        
             };

     

       55
       55
        
       

     

       56
       56
       +
             bind = mkOption {

     

       57
       57
       +
               type = types.str;

     

       58
       58
       +
               default = "0.0.0.0";

     

       59
       59
       +
               description = ''

     

       60
       60
       +
                 The address to which the service should bind.

     

       61
       61
       +
               '';

     

       62
       62
       +
             };

     

       63
       63
       +
       

     

       56
       64
        
             admins = mkOption {

     

       57
       65
        
               type = types.listOf types.str;

     

       58
       66
        
               default = [];

     
···

       241
       249
        
                 "${cfg.package}/bin/factorio"

     

       242
       250
        
                 "--config=${cfg.configFile}"

     

       243
       251
        
                 "--port=${toString cfg.port}"

     

       252
       252
       +
                 "--bind=${cfg.bind}"

     

       244
       253
        
                 "--start-server=${mkSavePath cfg.saveName}"

     

       245
       254
        
                 "--server-settings=${serverSettingsFile}"

     

       246
       255
        
                 (optionalString (cfg.mods != []) "--mod-directory=${modDir}")

+2 -6

nixos/modules/services/hardware/joycond.nix

···

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         config = mkIf cfg.enable {

     

       25
       25
       -
           environment.systemPackages = [

     

       26
       26
       -
             kernelPackages.hid-nintendo

     

       27
       27
       -
             cfg.package

     

       28
       28
       -
           ];

     

       25
       25
       +
           environment.systemPackages = [ cfg.package ];

     

       29
       26
        
       

     

       30
       30
       -
           boot.extraModulePackages = [ kernelPackages.hid-nintendo ];

     

       31
       31
       -
           boot.kernelModules = [ "hid_nintendo" ];

     

       27
       27
       +
           boot.extraModulePackages = optional (versionOlder kernelPackages.kernel.version "5.16") kernelPackages.hid-nintendo;

     

       32
       28
        
       

     

       33
       29
        
           services.udev.packages = [ cfg.package ];

     

       34
       30

+5

nixos/modules/services/monitoring/grafana.nix

···

       214
       214
        
                 type = types.path;

     

       215
       215
        
                 description = "Path grafana will watch for dashboards.";

     

       216
       216
        
               };

     

       217
       217
       +
               foldersFromFilesStructure = mkOption {

     

       218
       218
       +
                 type = types.bool;

     

       219
       219
       +
                 default = false;

     

       220
       220
       +
                 description = "Use folder names from filesystem to create folders in Grafana.";

     

       221
       221
       +
               };

     

       217
       222
        
             };

     

       218
       223
        
           };

     

       219
       224
        
         };

+5 -3

nixos/modules/services/networking/dhcpd.nix

···

       7
       7
        
         cfg4 = config.services.dhcpd4;

     

       8
       8
        
         cfg6 = config.services.dhcpd6;

     

       9
       9
        
       

     

       10
       10
       -
         writeConfig = cfg: pkgs.writeText "dhcpd.conf"

     

       10
       10
       +
         writeConfig = postfix: cfg: pkgs.writeText "dhcpd.conf"

     

       11
       11
        
           ''

     

       12
       12
        
             default-lease-time 600;

     

       13
       13
        
             max-lease-time 7200;

     
···

       21
       21
        
                 (machine: ''

     

       22
       22
        
                   host ${machine.hostName} {

     

       23
       23
        
                     hardware ethernet ${machine.ethernetAddress};

     

       24
       24
       -
                     fixed-address ${machine.ipAddress};

     

       24
       24
       +
                     fixed-address${

     

       25
       25
       +
                       optionalString (postfix == "6") postfix

     

       26
       26
       +
                     } ${machine.ipAddress};

     

       25
       27
        
                   }

     

       26
       28
        
                 '')

     

       27
       29
        
                 cfg.machines

     
···

       33
       35
        
             configFile =

     

       34
       36
        
               if cfg.configFile != null

     

       35
       37
        
                 then cfg.configFile

     

       36
       36
       -
                 else writeConfig cfg;

     

       38
       38
       +
                 else writeConfig postfix cfg;

     

       37
       39
        
             leaseFile = "/var/lib/dhcpd${postfix}/dhcpd.leases";

     

       38
       40
        
             args = [

     

       39
       41
        
               "@${pkgs.dhcp}/sbin/dhcpd" "dhcpd${postfix}" "-${postfix}"

+32

nixos/modules/services/security/sslmate-agent.nix

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
         cfg = config.services.sslmate-agent;

     

       7
       7
       +
       

     

       8
       8
       +
       in {

     

       9
       9
       +
         meta.maintainers = with maintainers; [ wolfangaukang ];

     

       10
       10
       +
       

     

       11
       11
       +
         options = {

     

       12
       12
       +
           services.sslmate-agent = {

     

       13
       13
       +
             enable = mkEnableOption "sslmate-agent, a daemon for managing SSL/TLS certificates on a server";

     

       14
       14
       +
           };

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         config = mkIf cfg.enable {

     

       18
       18
       +
           environment.systemPackages = with pkgs; [ sslmate-agent ];

     

       19
       19
       +
       

     

       20
       20
       +
           systemd = {

     

       21
       21
       +
             packages = [ pkgs.sslmate-agent ];

     

       22
       22
       +
             services.sslmate-agent = {

     

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

     

       24
       24
       +
               serviceConfig = {

     

       25
       25
       +
                 ConfigurationDirectory = "sslmate-agent";

     

       26
       26
       +
                 LogsDirectory = "sslmate-agent";

     

       27
       27
       +
                 StateDirectory = "sslmate-agent";

     

       28
       28
       +
               };

     

       29
       29
       +
             };

     

       30
       30
       +
           };

     

       31
       31
       +
         };

     

       32
       32
       +
       }

+85 -81

nixos/modules/services/video/unifi-video.nix

···

       16
       16
        
           -pidfile ${cfg.pidFile} \

     

       17
       17
        
           -procname unifi-video \

     

       18
       18
        
           -Djava.security.egd=file:/dev/./urandom \

     

       19
       19
       -
           -Xmx${cfg.maximumJavaHeapSize}M \

     

       19
       19
       +
           -Xmx${toString cfg.maximumJavaHeapSize}M \

     

       20
       20
        
           -Xss512K \

     

       21
       21
        
           -XX:+UseG1GC \

     

       22
       22
        
           -XX:+UseStringDeduplication \

     
···

       91
       91
        
         stateDir = "/var/lib/unifi-video";

     

       92
       92
        
       

     

       93
       93
        
       in

     

       94
       94
       -
         {

     

       94
       94
       +
       {

     

       95
       95
        
       

     

       96
       96
       -
           options.services.unifi-video = {

     

       97
       97
       -
             enable = mkOption {

     

       98
       98
       -
               type = types.bool;

     

       99
       99
       -
               default = false;

     

       100
       100
       -
               description = ''

     

       101
       101
       -
                 Whether or not to enable the unifi-video service.

     

       102
       102
       -
               '';

     

       103
       103
       -
             };

     

       96
       96
       +
         options.services.unifi-video = {

     

       104
       97
        
       

     

       105
       105
       -
             jrePackage = mkOption {

     

       106
       106
       -
               type = types.package;

     

       107
       107
       -
               default = pkgs.jre8;

     

       108
       108
       -
               defaultText = literalExpression "pkgs.jre8";

     

       109
       109
       -
               description = ''

     

       110
       110
       -
                 The JRE package to use. Check the release notes to ensure it is supported.

     

       111
       111
       -
               '';

     

       112
       112
       -
             };

     

       98
       98
       +
           enable = mkOption {

     

       99
       99
       +
             type = types.bool;

     

       100
       100
       +
             default = false;

     

       101
       101
       +
             description = ''

     

       102
       102
       +
               Whether or not to enable the unifi-video service.

     

       103
       103
       +
             '';

     

       104
       104
       +
           };

     

       113
       105
        
       

     

       114
       114
       -
             unifiVideoPackage = mkOption {

     

       115
       115
       -
               type = types.package;

     

       116
       116
       -
               default = pkgs.unifi-video;

     

       117
       117
       -
               defaultText = literalExpression "pkgs.unifi-video";

     

       118
       118
       -
               description = ''

     

       119
       119
       -
                 The unifi-video package to use.

     

       120
       120
       -
               '';

     

       121
       121
       -
             };

     

       106
       106
       +
           jrePackage = mkOption {

     

       107
       107
       +
             type = types.package;

     

       108
       108
       +
             default = pkgs.jre8;

     

       109
       109
       +
             defaultText = literalExpression "pkgs.jre8";

     

       110
       110
       +
             description = ''

     

       111
       111
       +
               The JRE package to use. Check the release notes to ensure it is supported.

     

       112
       112
       +
             '';

     

       113
       113
       +
           };

     

       122
       114
        
       

     

       123
       123
       -
             mongodbPackage = mkOption {

     

       124
       124
       -
               type = types.package;

     

       125
       125
       -
               default = pkgs.mongodb-4_0;

     

       126
       126
       -
               defaultText = literalExpression "pkgs.mongodb";

     

       127
       127
       -
               description = ''

     

       128
       128
       -
                 The mongodb package to use.

     

       129
       129
       -
               '';

     

       130
       130
       -
             };

     

       115
       115
       +
           unifiVideoPackage = mkOption {

     

       116
       116
       +
             type = types.package;

     

       117
       117
       +
             default = pkgs.unifi-video;

     

       118
       118
       +
             defaultText = literalExpression "pkgs.unifi-video";

     

       119
       119
       +
             description = ''

     

       120
       120
       +
               The unifi-video package to use.

     

       121
       121
       +
             '';

     

       122
       122
       +
           };

     

       131
       123
        
       

     

       132
       132
       -
             logDir = mkOption {

     

       133
       133
       -
               type = types.str;

     

       134
       134
       -
               default = "${stateDir}/logs";

     

       135
       135
       -
               description = ''

     

       136
       136
       -
                 Where to store the logs.

     

       137
       137
       -
               '';

     

       138
       138
       -
             };

     

       124
       124
       +
           mongodbPackage = mkOption {

     

       125
       125
       +
             type = types.package;

     

       126
       126
       +
             default = pkgs.mongodb-4_0;

     

       127
       127
       +
             defaultText = literalExpression "pkgs.mongodb";

     

       128
       128
       +
             description = ''

     

       129
       129
       +
               The mongodb package to use.

     

       130
       130
       +
             '';

     

       131
       131
       +
           };

     

       139
       132
        
       

     

       140
       140
       -
             dataDir = mkOption {

     

       141
       141
       -
               type = types.str;

     

       142
       142
       -
               default = "${stateDir}/data";

     

       143
       143
       -
               description = ''

     

       144
       144
       -
                 Where to store the database and other data.

     

       145
       145
       -
               '';

     

       146
       146
       -
             };

     

       133
       133
       +
           logDir = mkOption {

     

       134
       134
       +
             type = types.str;

     

       135
       135
       +
             default = "${stateDir}/logs";

     

       136
       136
       +
             description = ''

     

       137
       137
       +
               Where to store the logs.

     

       138
       138
       +
             '';

     

       139
       139
       +
           };

     

       147
       140
        
       

     

       148
       148
       -
             openPorts = mkOption {

     

       149
       149
       -
               type = types.bool;

     

       150
       150
       -
               default = true;

     

       151
       151
       -
               description = ''

     

       152
       152
       -
                 Whether or not to open the required ports on the firewall.

     

       153
       153
       -
               '';

     

       154
       154
       -
             };

     

       141
       141
       +
           dataDir = mkOption {

     

       142
       142
       +
             type = types.str;

     

       143
       143
       +
             default = "${stateDir}/data";

     

       144
       144
       +
             description = ''

     

       145
       145
       +
               Where to store the database and other data.

     

       146
       146
       +
             '';

     

       147
       147
       +
           };

     

       148
       148
       +
       

     

       149
       149
       +
           openFirewall = mkOption {

     

       150
       150
       +
             type = types.bool;

     

       151
       151
       +
             default = true;

     

       152
       152
       +
             description = ''

     

       153
       153
       +
               Whether or not to open the required ports on the firewall.

     

       154
       154
       +
             '';

     

       155
       155
       +
           };

     

       156
       156
       +
       

     

       157
       157
       +
           maximumJavaHeapSize = mkOption {

     

       158
       158
       +
             type = types.nullOr types.int;

     

       159
       159
       +
             default = 1024;

     

       160
       160
       +
             example = 4096;

     

       161
       161
       +
             description = ''

     

       162
       162
       +
               Set the maximimum heap size for the JVM in MB.

     

       163
       163
       +
             '';

     

       164
       164
       +
           };

     

       165
       165
       +
       

     

       166
       166
       +
           pidFile = mkOption {

     

       167
       167
       +
             type = types.path;

     

       168
       168
       +
             default = "${cfg.dataDir}/unifi-video.pid";

     

       169
       169
       +
             defaultText = literalExpression ''"''${config.${opt.dataDir}}/unifi-video.pid"'';

     

       170
       170
       +
             description = "Location of unifi-video pid file.";

     

       171
       171
       +
           };

     

       155
       172
        
       

     

       156
       156
       -
             maximumJavaHeapSize = mkOption {

     

       157
       157
       -
               type = types.nullOr types.int;

     

       158
       158
       -
               default = 1024;

     

       159
       159
       -
               example = 4096;

     

       160
       160
       -
               description = ''

     

       161
       161
       -
                 Set the maximimum heap size for the JVM in MB.

     

       162
       162
       -
               '';

     

       163
       163
       -
             };

     

       173
       173
       +
         };

     

       164
       174
        
       

     

       165
       165
       -
             pidFile = mkOption {

     

       166
       166
       -
               type = types.path;

     

       167
       167
       -
               default = "${cfg.dataDir}/unifi-video.pid";

     

       168
       168
       -
               defaultText = literalExpression ''"''${config.${opt.dataDir}}/unifi-video.pid"'';

     

       169
       169
       -
               description = "Location of unifi-video pid file.";

     

       170
       170
       -
             };

     

       175
       175
       +
         config = mkIf cfg.enable {

     

       171
       176
        
       

     

       172
       172
       -
       };

     

       177
       177
       +
           warnings = optional

     

       178
       178
       +
             (options.services.unifi-video.openFirewall.highestPrio >= (mkOptionDefault null).priority)

     

       179
       179
       +
             "The current services.unifi-video.openFirewall = true default is deprecated and will change to false in 22.11. Set it explicitly to silence this warning.";

     

       173
       180
        
       

     

       174
       174
       -
       config = mkIf cfg.enable {

     

       175
       175
       -
         users = {

     

       176
       176
       -
           users.unifi-video = {

     

       181
       181
       +
           users.users.unifi-video = {

     

       177
       182
        
             description = "UniFi Video controller daemon user";

     

       178
       183
        
             home = stateDir;

     

       179
       184
        
             group = "unifi-video";

     

       180
       185
        
             isSystemUser = true;

     

       181
       186
        
           };

     

       182
       182
       -
           groups.unifi-video = {};

     

       183
       183
       -
         };

     

       187
       187
       +
           users.groups.unifi-video = {};

     

       184
       188
        
       

     

       185
       185
       -
         networking.firewall = mkIf cfg.openPorts {

     

       189
       189
       +
           networking.firewall = mkIf cfg.openFirewall {

     

       186
       190
        
             # https://help.ui.com/hc/en-us/articles/217875218-UniFi-Video-Ports-Used

     

       187
       191
        
             allowedTCPPorts = [

     

       188
       192
        
               7080 # HTTP portal

     
···

       237
       241
        
             "L+ '${stateDir}/conf/server.xml' 0700 unifi-video unifi-video - ${pkgs.unifi-video}/lib/unifi-video/conf/server.xml"

     

       238
       242
        
             "L+ '${stateDir}/conf/tomcat-users.xml' 0700 unifi-video unifi-video - ${pkgs.unifi-video}/lib/unifi-video/conf/tomcat-users.xml"

     

       239
       243
        
             "L+ '${stateDir}/conf/web.xml' 0700 unifi-video unifi-video - ${pkgs.unifi-video}/lib/unifi-video/conf/web.xml"

     

       240
       240
       -
       

     

       241
       244
        
           ];

     

       242
       245
        
       

     

       243
       246
        
           systemd.services.unifi-video = {

     
···

       258
       261
        
               WorkingDirectory = "${stateDir}";

     

       259
       262
        
             };

     

       260
       263
        
           };

     

       264
       264
       +
         };

     

       261
       265
        
       

     

       262
       262
       -
         };

     

       266
       266
       +
         imports = [

     

       267
       267
       +
           (mkRenamedOptionModule [ "services" "unifi-video" "openPorts" ] [ "services" "unifi-video" "openFirewall" ])

     

       268
       268
       +
         ];

     

       263
       269
        
       

     

       264
       264
       -
         meta = {

     

       265
       265
       -
           maintainers = with lib.maintainers; [ rsynnest ];

     

       266
       266
       -
         };

     

       270
       270
       +
         meta.maintainers = with lib.maintainers; [ rsynnest ];

     

       267
       271
        
       }

+1 -1

nixos/modules/tasks/network-interfaces.nix

···

       1451
       1451
        
                 sysctl-value = tempaddrValues.${cfg.tempAddresses}.sysctl;

     

       1452
       1452
        
               in ''

     

       1453
       1453
        
                 # enable and prefer IPv6 privacy addresses by default

     

       1454
       1454
       -
                 ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.bash}/bin/sh -c 'echo ${sysctl-value} > /proc/sys/net/ipv6/conf/%k/use_tempaddr'"

     

       1454
       1454
       +
                 ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.bash}/bin/sh -c 'echo ${sysctl-value} > /proc/sys/net/ipv6/conf/$name/use_tempaddr'"

     

       1455
       1455
        
               '';

     

       1456
       1456
        
             })

     

       1457
       1457
        
             (pkgs.writeTextFile rec {

+60

pkgs/applications/audio/tonelib-metal/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchurl

     

       4
       4
       +
       , autoPatchelfHook

     

       5
       5
       +
       , dpkg

     

       6
       6
       +
       , alsa-lib

     

       7
       7
       +
       , freetype

     

       8
       8
       +
       , libglvnd

     

       9
       9
       +
       , mesa

     

       10
       10
       +
       , curl

     

       11
       11
       +
       , libXcursor

     

       12
       12
       +
       , libXinerama

     

       13
       13
       +
       , libXrandr

     

       14
       14
       +
       , libXrender

     

       15
       15
       +
       , libjack2

     

       16
       16
       +
       }:

     

       17
       17
       +
       

     

       18
       18
       +
       stdenv.mkDerivation rec {

     

       19
       19
       +
         pname = "tonelib-metal";

     

       20
       20
       +
         version = "1.1.0";

     

       21
       21
       +
       

     

       22
       22
       +
         src = fetchurl {

     

       23
       23
       +
           url = "https://www.tonelib.net/download/220218/ToneLib-Metal-amd64.deb";

     

       24
       24
       +
           sha256 = "sha256-F5EKwNQ9f/kdZLFI+QDZHvwevV/vDnxMdSmT/vnX6ug=";

     

       25
       25
       +
         };

     

       26
       26
       +
       

     

       27
       27
       +
         nativeBuildInputs = [ autoPatchelfHook dpkg ];

     

       28
       28
       +
       

     

       29
       29
       +
         buildInputs = [

     

       30
       30
       +
           stdenv.cc.cc.lib

     

       31
       31
       +
           alsa-lib

     

       32
       32
       +
           freetype

     

       33
       33
       +
           libglvnd

     

       34
       34
       +
           mesa

     

       35
       35
       +
         ] ++ runtimeDependencies;

     

       36
       36
       +
       

     

       37
       37
       +
         runtimeDependencies = map lib.getLib [

     

       38
       38
       +
           curl

     

       39
       39
       +
           libXcursor

     

       40
       40
       +
           libXinerama

     

       41
       41
       +
           libXrandr

     

       42
       42
       +
           libXrender

     

       43
       43
       +
           libjack2

     

       44
       44
       +
         ];

     

       45
       45
       +
       

     

       46
       46
       +
         unpackCmd = "dpkg -x $curSrc source";

     

       47
       47
       +
       

     

       48
       48
       +
         installPhase = ''

     

       49
       49
       +
           mv usr $out

     

       50
       50
       +
           substituteInPlace $out/share/applications/ToneLib-Metal.desktop --replace /usr/ $out/

     

       51
       51
       +
        '';

     

       52
       52
       +
       

     

       53
       53
       +
         meta = with lib; {

     

       54
       54
       +
           description = "ToneLib Metal – Guitar amp simulator targeted at metal players";

     

       55
       55
       +
           homepage = "https://tonelib.net/";

     

       56
       56
       +
           license = licenses.unfree;

     

       57
       57
       +
           maintainers = with maintainers; [ dan4ik605743 ];

     

       58
       58
       +
           platforms = [ "x86_64-linux" ];

     

       59
       59
       +
         };

     

       60
       60
       +
       }

+4 -1

pkgs/applications/blockchains/polkadot/default.nix

···

       5
       5
        
       , protobuf

     

       6
       6
        
       , rustPlatform

     

       7
       7
        
       , writeShellScriptBin

     

       8
       8
       +
       , Security

     

       8
       9
        
       }:

     

       9
       10
        
       rustPlatform.buildRustPackage rec {

     

       10
       11
        
         pname = "polkadot";

     
···

       31
       32
        
         };

     

       32
       33
        
       

     

       33
       34
        
         cargoSha256 = "sha256-Gc5WbayQUlsl7Fk8NyLPh2Zg2yrLl3WJqKorNZMLi94=";

     

       35
       35
       +
       

     

       36
       36
       +
         buildInputs = [ Security ];

     

       34
       37
        
       

     

       35
       38
        
         nativeBuildInputs = [ clang ];

     

       36
       39
        
       

     
···

       56
       59
        
           homepage = "https://polkadot.network";

     

       57
       60
        
           license = licenses.gpl3Only;

     

       58
       61
        
           maintainers = with maintainers; [ akru andresilva asymmetric FlorianFranzen RaghavSood ];

     

       59
       59
       -
           platforms = platforms.linux;

     

       62
       62
       +
           platforms = platforms.unix;

     

       60
       63
        
         };

     

       61
       64
        
       }

+12 -6

pkgs/applications/editors/bless/default.nix

···

       1
       1
       -
       { lib, stdenv

     

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , lib

     

       2
       3
        
       , fetchFromGitHub

     

       3
       4
        
       , pkg-config

     

       4
       5
        
       , mono

     
···

       12
       13
        
       , libxslt

     

       13
       14
        
       , docbook_xsl

     

       14
       15
        
       , python3

     

       16
       16
       +
       , itstool

     

       15
       17
        
       }:

     

       16
       18
        
       

     

       17
       19
        
       stdenv.mkDerivation rec {

     
···

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

     

       25
       27
        
           hash = "sha256-rS+vJX0y9v1TiPsRfABroHiTuENQKEOxNsyKwagRuHM=";

     

       26
       28
        
         };

     

       27
       27
       -
       

     

       28
       28
       -
         postPatch = ''

     

       29
       29
       -
           sed "s|get_option('tests')|false|g" -i meson.build

     

       30
       30
       -
           patchShebangs .

     

       31
       31
       -
         '';

     

       32
       29
        
       

     

       33
       30
        
         buildInputs = [

     

       34
       31
        
           gtk-sharp-2_0

     
···

       47
       44
        
           libxslt

     

       48
       45
        
           docbook_xsl

     

       49
       46
        
           python3

     

       47
       47
       +
           itstool

     

       50
       48
        
         ];

     

       49
       49
       +
       

     

       50
       50
       +
         mesonFlags = [

     

       51
       51
       +
           "-Dtests=false" # requires NUnit

     

       52
       52
       +
         ];

     

       53
       53
       +
       

     

       54
       54
       +
         postPatch = ''

     

       55
       55
       +
           patchShebangs .

     

       56
       56
       +
         '';

     

       51
       57
        
       

     

       52
       58
        
         preFixup = ''

     

       53
       59
        
           MPATH="${gtk-sharp-2_0}/lib/mono/gtk-sharp-2.0:${glib.out}/lib:${gtk2-x11}/lib:${gtk-sharp-2_0}/lib"

+2 -2

pkgs/applications/editors/bluej/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "bluej";

     

       5
       5
       -
         version = "5.0.2";

     

       5
       5
       +
         version = "5.0.3";

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           # We use the deb here. First instinct might be to go for the "generic" JAR

     

       8
       8
        
           # download, but that is actually a graphical installer that is much harder

     

       9
       9
        
           # to unpack than the deb.

     

       10
       10
        
           url = "https://www.bluej.org/download/files/BlueJ-linux-${builtins.replaceStrings ["."] [""] version}.deb";

     

       11
       11
       -
           sha256 = "sha256-9sWfVQF/wCiVDKBmesMpM+5BHjFUPszm6U1SgJNQ8lE=";

     

       11
       11
       +
           sha256 = "sha256-OarqmptxZc7xEEYeoCVqHXkAvfzfSYx5nUp/iWPyoqw=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ makeWrapper ];

+2 -2

pkgs/applications/editors/cudatext/default.nix

···

       38
       38
        
       in

     

       39
       39
        
       stdenv.mkDerivation rec {

     

       40
       40
        
         pname = "cudatext";

     

       41
       41
       -
         version = "1.159.0";

     

       41
       41
       +
         version = "1.159.2";

     

       42
       42
        
       

     

       43
       43
        
         src = fetchFromGitHub {

     

       44
       44
        
           owner = "Alexey-T";

     

       45
       45
        
           repo = "CudaText";

     

       46
       46
        
           rev = version;

     

       47
       47
       -
           sha256 = "sha256-DRVJLzAdhw+ke+B2KFlkgLXgU4+Mq3LQ0PRYg52Aq/o=";

     

       47
       47
       +
           sha256 = "sha256-dSZd+Dsln7xUfN/cqTZSdnpnINHsDCBrbNGcDLwqzzU=";

     

       48
       48
        
         };

     

       49
       49
        
       

     

       50
       50
        
         postPatch = ''

+4 -4

pkgs/applications/editors/cudatext/deps.json

···

       26
       26
        
         },

     

       27
       27
        
         "EControl": {

     

       28
       28
        
           "owner": "Alexey-T",

     

       29
       29
       -
           "rev": "2022.03.23",

     

       30
       30
       -
           "sha256": "sha256-QXq75VoAnYqAhe3Fvsz1szZyBz4dHEpYJZqTSCR80v8="

     

       29
       29
       +
           "rev": "2022.03.28",

     

       30
       30
       +
           "sha256": "sha256-jh3lqisiPNMxCapP6O5oJdUL3PLQ3JyomtgWix+bML0="

     

       31
       31
        
         },

     

       32
       32
        
         "ATSynEdit_Ex": {

     

       33
       33
        
           "owner": "Alexey-T",

     

       34
       34
       -
           "rev": "2022.03.23",

     

       35
       35
       -
           "sha256": "sha256-m1rkWvRC1i1nLPIhiG6g8LGU96vTuGGqLFrSzw9A9x0="

     

       34
       34
       +
           "rev": "2022.03.28",

     

       35
       35
       +
           "sha256": "sha256-TpAaL7/bhnrQgAq1mUTdEWXecSmznWy/iAw+TMMrQGo="

     

       36
       36
        
         },

     

       37
       37
        
         "Python-for-Lazarus": {

     

       38
       38
        
           "owner": "Alexey-T",

+1 -3

pkgs/applications/editors/neovim/neovim-remote.nix

···

       4
       4
        
       , neovim

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
       -
       with lib;

     

       8
       8
       -
       

     

       9
       7
        
       with python3.pkgs; buildPythonApplication rec {

     

       10
       8
        
         pname = "neovim-remote";

     

       11
       9
        
         version = "2.4.0";

     
···

       35
       33
        
           "test_escape_double_quotes_in_filenames"

     

       36
       34
        
         ];

     

       37
       35
        
       

     

       38
       38
       -
         meta = {

     

       36
       36
       +
         meta = with lib; {

     

       39
       37
        
           description = "A tool that helps controlling nvim processes from a terminal";

     

       40
       38
        
           homepage = "https://github.com/mhinz/neovim-remote/";

     

       41
       39
        
           license = licenses.mit;

+7 -34

pkgs/applications/editors/vim/configurable.nix

···

       3
       3
        
       , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu

     

       4
       4
        
       , libICE

     

       5
       5
        
       , vimPlugins

     

       6
       6
       -
       , makeWrapper

     

       6
       6
       +
       , makeWrapper, makeBinaryWrapper

     

       7
       7
        
       , wrapGAppsHook

     

       8
       8
        
       , runtimeShell

     

       9
       9
        
       

     
···

       25
       25
        
       , ximSupport        ? config.vim.xim or true        # less than 15KB, needed for deadkeys

     

       26
       26
        
       , darwinSupport     ? config.vim.darwin or false    # Enable Darwin support

     

       27
       27
        
       , ftNixSupport      ? config.vim.ftNix or true      # Add .nix filetype detection and minimal syntax highlighting support

     

       28
       28
       -
       , ...

     

       29
       28
        
       }:

     

       30
       29
        
       

     

       31
       30
        
       

     
···

       134
       133
        
         ++ lib.optional wrapPythonDrv makeWrapper

     

       135
       134
        
         ++ lib.optional nlsSupport gettext

     

       136
       135
        
         ++ lib.optional perlSupport perl

     

       137
       137
       -
         ++ lib.optional (guiSupport == "gtk3") wrapGAppsHook

     

       136
       136
       +
         # Make the inner wrapper binary to avoid double wrapping issues with wrapPythonDrv

     

       137
       137
       +
         # (https://github.com/NixOS/nixpkgs/pull/164163)

     

       138
       138
       +
         ++ lib.optional (guiSupport == "gtk3") (wrapGAppsHook.override { makeWrapper = makeBinaryWrapper; })

     

       138
       139
        
         ;

     

       139
       140
        
       

     

       140
       141
        
         buildInputs = [

     
···

       174
       175
        
         postInstall = ''

     

       175
       176
        
           ln -s $out/bin/vim $out/bin/vi

     

       176
       177
        
         '' + lib.optionalString stdenv.isLinux ''

     

       177
       177
       -
           patchelf --set-rpath \

     

       178
       178
       -
             "$(patchelf --print-rpath $out/bin/vim):${lib.makeLibraryPath buildInputs}" \

     

       179
       179
       -
             "$out"/bin/vim

     

       180
       180
       -
           if [[ -e "$out"/bin/gvim ]]; then

     

       181
       181
       -
             patchelf --set-rpath \

     

       182
       182
       -
               "$(patchelf --print-rpath $out/bin/vim):${lib.makeLibraryPath buildInputs}" \

     

       183
       183
       -
               "$out"/bin/gvim

     

       184
       184
       -
           fi

     

       178
       178
       +
           ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc

     

       179
       179
       +
         '';

     

       185
       180
        
       

     

       186
       186
       -
           ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc

     

       187
       187
       -
         '' + lib.optionalString wrapPythonDrv ''

     

       181
       181
       +
         postFixup = lib.optionalString wrapPythonDrv ''

     

       188
       182
        
           wrapProgram "$out/bin/vim" --prefix PATH : "${python3}/bin" \

     

       189
       183
        
             --set NIX_PYTHONPATH "${python3}/${python3.sitePackages}"

     

       190
       190
       -
         '' + lib.optionalString (guiSupport == "gtk3") ''

     

       191
       191
       -
       

     

       192
       192
       -
           rewrap () {

     

       193
       193
       -
             rm -f "$out/bin/$1"

     

       194
       194
       -
             echo -e '#!${runtimeShell}\n"'"$out/bin/vim"'" '"$2"' "$@"' > "$out/bin/$1"

     

       195
       195
       -
             chmod a+x "$out/bin/$1"

     

       196
       196
       -
           }

     

       197
       197
       -
       

     

       198
       198
       -
           rewrap ex -e

     

       199
       199
       -
           rewrap view -R

     

       200
       200
       -
           rewrap gvim -g

     

       201
       201
       -
           rewrap gex -eg

     

       202
       202
       -
           rewrap gview -Rg

     

       203
       203
       -
           rewrap rvim -Z

     

       204
       204
       -
           rewrap rview -RZ

     

       205
       205
       -
           rewrap rgvim -gZ

     

       206
       206
       -
           rewrap rgview -RgZ

     

       207
       207
       -
           rewrap evim    -y

     

       208
       208
       -
           rewrap eview   -yR

     

       209
       209
       -
           rewrap vimdiff -d

     

       210
       210
       -
           rewrap gvimdiff -gd

     

       211
       184
        
         '';

     

       212
       185
        
       

     

       213
       186
        
         dontStrip = true;

+72 -54

pkgs/applications/editors/vim/plugins/vim-utils.nix

···

       1
       1
        
       # tests available at pkgs/test/vim

     

       2
       2
       -
       { lib, stdenv, vim, vimPlugins, vim_configurable, buildEnv, writeText, writeScriptBin

     

       2
       2
       +
       { lib, stdenv, vim, vimPlugins, vim_configurable, buildEnv, writeText

     

       3
       3
       +
       , runCommand, makeWrapper

     

       3
       4
        
       , nix-prefetch-hg, nix-prefetch-git

     

       4
       5
        
       , fetchFromGitHub, runtimeShell

     

       5
       6
        
       , hasLuaModule

     
···

       16
       17
        
       vim-with-plugins in PATH:

     

       17
       18
        
       

     

       18
       19
        
         vim_configurable.customize {

     

       19
       19
       -
           name = "vim-with-plugins";

     

       20
       20
       +
           name = "vim-with-plugins"; # optional

     

       20
       21
        
       

     

       21
       22
        
           # add custom .vimrc lines like this:

     

       22
       23
        
           vimrcConfig.customRC = ''

     
···

       404
       405
        
         inherit vimrcContent;

     

       405
       406
        
         inherit packDir;

     

       406
       407
        
       

     

       407
       407
       -
         # shell script with custom name passing [-u vimrc] [-U gvimrc] to vim

     

       408
       408
       -
         vimWithRC = {

     

       409
       409
       -
           vimExecutable,

     

       410
       410
       -
           gvimExecutable,

     

       411
       411
       -
           vimManPages,

     

       412
       412
       -
           wrapManual,

     

       413
       413
       -
           wrapGui,

     

       414
       414
       -
           name ? "vim",

     

       415
       415
       -
           vimrcFile ? null,

     

       416
       416
       -
           gvimrcFile ? null,

     

       417
       417
       -
           vimExecutableName,

     

       418
       418
       -
           gvimExecutableName,

     

       419
       419
       -
         }:

     

       420
       420
       -
           let

     

       421
       421
       -
             rcOption = o: file: lib.optionalString (file != null) "-${o} ${file}";

     

       422
       422
       -
             vimWrapperScript = writeScriptBin vimExecutableName ''

     

       423
       423
       -
               #!${runtimeShell}

     

       424
       424
       -
               exec ${vimExecutable} ${rcOption "u" vimrcFile} ${rcOption "U" gvimrcFile} "$@"

     

       425
       425
       -
             '';

     

       426
       426
       -
             gvimWrapperScript = writeScriptBin gvimExecutableName ''

     

       427
       427
       -
               #!${stdenv.shell}

     

       428
       428
       -
               exec ${gvimExecutable} ${rcOption "u" vimrcFile} ${rcOption "U" gvimrcFile} "$@"

     

       429
       429
       -
             '';

     

       430
       430
       -
           in

     

       431
       431
       -
             buildEnv {

     

       432
       432
       -
               inherit name;

     

       433
       433
       -
               paths = [

     

       434
       434
       -
                 vimWrapperScript

     

       435
       435
       -
               ] ++ lib.optional wrapGui gvimWrapperScript

     

       436
       436
       -
                 ++ lib.optional wrapManual vimManPages

     

       437
       437
       -
               ;

     

       438
       438
       -
             };

     

       408
       408
       +
         makeCustomizable = let

     

       409
       409
       +
           mkVimrcFile = vimrcFile; # avoid conflict with argument name

     

       410
       410
       +
         in vim: vim // {

     

       411
       411
       +
           # Returns a customized vim that uses the specified vimrc configuration.

     

       412
       412
       +
           customize =

     

       413
       413
       +
             { # The name of the derivation.

     

       414
       414
       +
               name ? "vim"

     

       415
       415
       +
             , # A shell word used to specify the names of the customized executables.

     

       416
       416
       +
               # The shell variable $exe can be used to refer to the wrapped executable's name.

     

       417
       417
       +
               # Examples: "my-$exe", "$exe-with-plugins", "\${exe/vim/v1m}"

     

       418
       418
       +
               executableName ?

     

       419
       419
       +
                 if lib.hasInfix "vim" name then

     

       420
       420
       +
                   lib.replaceStrings [ "vim" ] [ "$exe" ] name

     

       421
       421
       +
                 else

     

       422
       422
       +
                   "\${exe/vim/${lib.escapeShellArg name}}"

     

       423
       423
       +
             , # A custom vimrc configuration, treated as an argument to vimrcContent (see the documentation in this file).

     

       424
       424
       +
               vimrcConfig ? null

     

       425
       425
       +
             , # A custom vimrc file.

     

       426
       426
       +
               vimrcFile ? null

     

       427
       427
       +
             , # A custom gvimrc file.

     

       428
       428
       +
               gvimrcFile ? null

     

       429
       429
       +
             , # If set to true, return the *vim wrappers only.

     

       430
       430
       +
               # If set to false, overlay the wrappers on top of the original vim derivation.

     

       431
       431
       +
               # This ensures that things like man pages and .desktop files are available.

     

       432
       432
       +
               standalone ? name != "vim" && wrapManual != true

     

       433
       433
       +
       

     

       434
       434
       +
             , # deprecated arguments (TODO: remove eventually)

     

       435
       435
       +
               wrapManual ? null, wrapGui ? null, vimExecutableName ? null, gvimExecutableName ? null,

     

       436
       436
       +
             }:

     

       437
       437
       +
             lib.warnIf (wrapManual != null) ''

     

       438
       438
       +
               vim.customize: wrapManual is deprecated: the manual is now included by default if `name == "vim"`.

     

       439
       439
       +
               ${if wrapManual == true && name != "vim" then "Set `standalone = false` to include the manual."

     

       440
       440
       +
               else if wrapManual == false && name == "vim" then "Set `standalone = true` to get the *vim wrappers only."

     

       441
       441
       +
               else ""}''

     

       442
       442
       +
             lib.warnIf (wrapGui != null)

     

       443
       443
       +
               "vim.customize: wrapGui is deprecated: gvim is now automatically included if present"

     

       444
       444
       +
             lib.throwIfNot (vimExecutableName == null && gvimExecutableName == null)

     

       445
       445
       +
               "vim.customize: (g)vimExecutableName is deprecated: use executableName instead (see source code for examples)"

     

       446
       446
       +
             (let

     

       447
       447
       +
               vimrc =

     

       448
       448
       +
                 if vimrcFile != null then vimrcFile

     

       449
       449
       +
                 else if vimrcConfig != null then mkVimrcFile vimrcConfig

     

       450
       450
       +
                 else throw "at least one of vimrcConfig and vimrcFile must be specified";

     

       451
       451
       +
               bin = runCommand "${name}-bin" { buildInputs = [ makeWrapper ]; } ''

     

       452
       452
       +
                 vimrc=${lib.escapeShellArg vimrc}

     

       453
       453
       +
                 gvimrc=${if gvimrcFile != null then lib.escapeShellArg gvimrcFile else ""}

     

       439
       454
        
       

     

       440
       440
       -
         # add a customize option to a vim derivation

     

       441
       441
       -
         makeCustomizable = vim: vim // {

     

       442
       442
       -
           customize = {

     

       443
       443
       -
             name,

     

       444
       444
       -
             vimrcConfig,

     

       445
       445
       -
             wrapManual ? true,

     

       446
       446
       -
             wrapGui ? false,

     

       447
       447
       -
             vimExecutableName ? name,

     

       448
       448
       -
             gvimExecutableName ? (lib.concatStrings [ "g" name ]),

     

       449
       449
       -
           }: vimWithRC {

     

       450
       450
       -
             vimExecutable = "${vim}/bin/vim";

     

       451
       451
       -
             gvimExecutable = "${vim}/bin/gvim";

     

       452
       452
       -
             inherit name wrapManual wrapGui vimExecutableName gvimExecutableName;

     

       453
       453
       -
             vimrcFile = vimrcFile vimrcConfig;

     

       454
       454
       -
             vimManPages = buildEnv {

     

       455
       455
       -
               name = "vim-doc";

     

       456
       456
       -
               paths = [ vim ];

     

       457
       457
       -
               pathsToLink = [ "/share/man" ];

     

       458
       458
       -
             };

     

       459
       459
       -
           };

     

       455
       455
       +
                 mkdir -p "$out/bin"

     

       456
       456
       +
                 for exe in ${

     

       457
       457
       +
                   if standalone then "{,g,r,rg,e}vim {,g}vimdiff"

     

       458
       458
       +
                   else "{,g,r,rg,e}{vim,view} {,g}vimdiff ex"

     

       459
       459
       +
                 }; do

     

       460
       460
       +
                   if [[ -e ${vim}/bin/$exe ]]; then

     

       461
       461
       +
                     dest="$out/bin/${executableName}"

     

       462
       462
       +
                     if [[ -e $dest ]]; then

     

       463
       463
       +
                       echo "ambiguous executableName: ''${dest##*/} already exists"

     

       464
       464
       +
                       continue

     

       465
       465
       +
                     fi

     

       466
       466
       +
                     makeWrapper ${vim}/bin/"$exe" "$dest" \

     

       467
       467
       +
                       --add-flags "-u ''${vimrc@Q} ''${gvimrc:+-U ''${gvimrc@Q}}"

     

       468
       468
       +
                   fi

     

       469
       469
       +
                 done

     

       470
       470
       +
               '';

     

       471
       471
       +
             in if standalone then bin else

     

       472
       472
       +
               buildEnv {

     

       473
       473
       +
                 inherit name;

     

       474
       474
       +
                 paths = [ (lib.lowPrio vim) bin ];

     

       475
       475
       +
               });

     

       460
       476
        
       

     

       461
       477
        
           override = f: makeCustomizable (vim.override f);

     

       462
       478
        
           overrideAttrs = f: makeCustomizable (vim.overrideAttrs f);

     

       463
       479
        
         };

     

       480
       480
       +
       

     

       481
       481
       +
         vimWithRC = throw "vimWithRC was removed, please use vim.customize instead";

     

       464
       482
        
       

     

       465
       483
        
         pluginnames2Nix = {name, namefiles} : vim_configurable.customize {

     

       466
       484
        
           inherit name;

+52

pkgs/applications/emulators/flycast/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , cmake

     

       5
       5
       +
       , pkg-config

     

       6
       6
       +
       , alsa-lib

     

       7
       7
       +
       , libX11

     

       8
       8
       +
       , libevdev

     

       9
       9
       +
       , udev

     

       10
       10
       +
       , libpulseaudio

     

       11
       11
       +
       , SDL2

     

       12
       12
       +
       , libzip

     

       13
       13
       +
       , miniupnpc

     

       14
       14
       +
       }:

     

       15
       15
       +
       

     

       16
       16
       +
       stdenv.mkDerivation rec {

     

       17
       17
       +
         pname = "flycast";

     

       18
       18
       +
         version = "1.2";

     

       19
       19
       +
       

     

       20
       20
       +
         src = fetchFromGitHub {

     

       21
       21
       +
           owner = "flyinghead";

     

       22
       22
       +
           repo = "flycast";

     

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

     

       24
       24
       +
           sha256 = "sha256-MzHAGK++oukIs84OR/l6gBwCJssdi8Iyte5Rtro2+Q0=";

     

       25
       25
       +
           fetchSubmodules = true;

     

       26
       26
       +
         };

     

       27
       27
       +
       

     

       28
       28
       +
         nativeBuildInputs = [

     

       29
       29
       +
           cmake

     

       30
       30
       +
           pkg-config

     

       31
       31
       +
         ];

     

       32
       32
       +
       

     

       33
       33
       +
         buildInputs = [

     

       34
       34
       +
           alsa-lib

     

       35
       35
       +
           libX11

     

       36
       36
       +
           libevdev

     

       37
       37
       +
           udev

     

       38
       38
       +
           libpulseaudio

     

       39
       39
       +
           SDL2

     

       40
       40
       +
           libzip

     

       41
       41
       +
           miniupnpc

     

       42
       42
       +
         ];

     

       43
       43
       +
       

     

       44
       44
       +
         meta = with lib; {

     

       45
       45
       +
           homepage = "https://github.com/flyinghead/flycast";

     

       46
       46
       +
           changelog = "https://github.com/flyinghead/flycast/releases/tag/v${version}";

     

       47
       47
       +
           description = "A multi-platform Sega Dreamcast, Naomi and Atomiswave emulator";

     

       48
       48
       +
           license = licenses.gpl2Only;

     

       49
       49
       +
           platforms = platforms.unix;

     

       50
       50
       +
           maintainers = [ maintainers.ivar ];

     

       51
       51
       +
         };

     

       52
       52
       +
       }

-52

pkgs/applications/emulators/reicast/default.nix

···

       1
       1
       -
       { lib, stdenv

     

       2
       2
       -
       , fetchFromGitHub

     

       3
       3
       -
       , cmake

     

       4
       4
       -
       , pkg-config

     

       5
       5
       -
       , curl

     

       6
       6
       -
       , alsa-lib

     

       7
       7
       -
       , libGLU

     

       8
       8
       -
       , libX11

     

       9
       9
       -
       , libevdev

     

       10
       10
       -
       , udev

     

       11
       11
       -
       , libpulseaudio

     

       12
       12
       -
       }:

     

       13
       13
       -
       

     

       14
       14
       -
       stdenv.mkDerivation rec {

     

       15
       15
       -
         pname = "reicast";

     

       16
       16
       -
         version = "20.04";

     

       17
       17
       -
       

     

       18
       18
       -
         src = fetchFromGitHub {

     

       19
       19
       -
           owner = "reicast";

     

       20
       20
       -
           repo = "reicast-emulator";

     

       21
       21
       -
           rev = "r${version}";

     

       22
       22
       -
           sha256 = "0vz3b1hg1qj6nycnqq5zcpzqpcbxw1c2ffamia5z3x7rapjx5d71";

     

       23
       23
       -
         };

     

       24
       24
       -
       

     

       25
       25
       -
         nativeBuildInputs = [ cmake pkg-config ];

     

       26
       26
       -
         buildInputs = [

     

       27
       27
       -
           curl

     

       28
       28
       -
           alsa-lib

     

       29
       29
       -
           libGLU

     

       30
       30
       -
           libX11

     

       31
       31
       -
           libevdev

     

       32
       32
       -
           udev

     

       33
       33
       -
           libpulseaudio

     

       34
       34
       -
         ];

     

       35
       35
       -
       

     

       36
       36
       -
         # No rule to make target 'install'

     

       37
       37
       -
         installPhase = ''

     

       38
       38
       -
           runHook preInstall

     

       39
       39
       -
       

     

       40
       40
       -
           install -D ./reicast $out/bin/reicast

     

       41
       41
       -
       

     

       42
       42
       -
           runHook postInstall

     

       43
       43
       -
         '';

     

       44
       44
       -
       

     

       45
       45
       -
         meta = with lib; {

     

       46
       46
       -
           homepage = "https://reicast.com/";

     

       47
       47
       -
           description = "A multi-platform Sega Dreamcast emulator";

     

       48
       48
       -
           license = with licenses; [ bsd3 gpl2Only lgpl2Only ];

     

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

     

       50
       50
       -
           maintainers = [ maintainers.ivar ];

     

       51
       51
       -
         };

     

       52
       52
       -
       }

+2 -2

pkgs/applications/graphics/drawio/default.nix

···

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation rec {

     

       13
       13
        
         pname = "drawio";

     

       14
       14
       -
         version = "17.2.1";

     

       14
       14
       +
         version = "17.2.4";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchurl {

     

       17
       17
        
           url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm";

     

       18
       18
       -
           sha256 = "28019774a18f6e74c0d126346ae3551b5eb9c73aae13fe87f6d49120c183697a";

     

       18
       18
       +
           sha256 = "sha256-dKl7DxNneoQEL+QhZmpfQCd15RoeDRnkZt3sv8t2KM4=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [

+4 -15

pkgs/applications/misc/obsidian/default.nix

···

       12
       12
        
       let

     

       13
       13
        
         inherit (stdenv.hostPlatform) system;

     

       14
       14
        
         pname = "obsidian";

     

       15
       15
       -
         version = "0.13.31";

     

       15
       15
       +
         version = "0.14.2";

     

       16
       16
        
         meta = with lib; {

     

       17
       17
        
           description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files";

     

       18
       18
        
           homepage = "https://obsidian.md";

     
···

       21
       21
        
           maintainers = with maintainers; [ conradmearns zaninime opeik ];

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
       +
         filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz";

     

       24
       25
        
         src = fetchurl {

     

       25
       25
       -
           url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}${extension}";

     

       26
       26
       -
           inherit sha256;

     

       26
       26
       +
           url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";

     

       27
       27
       +
           sha256 = if stdenv.isDarwin then "128kgqkf54ljkglwqa6i0qnfqhhmsv7hwbaqnml95n5dzyxrbm4s" else "00gip6pvkbywywlx71j87sxyh8yhkd36i1ydncbpnhsplr6smsq3";

     

       27
       28
        
         };

     

       28
       28
       -
       

     

       29
       29
       -
         sha256 = rec {

     

       30
       30
       -
           x86_64-linux = "v3Zm5y8V1KyWDQeJxhryBojz56OTT7gfT+pLGDUD4zs=";

     

       31
       31
       -
           x86_64-darwin = "m/81uuDhMJJ1tHTUPww+xNdwsaYCOmeNtbjdwMAwhBU=";

     

       32
       32
       -
           aarch64-darwin = x86_64-darwin;

     

       33
       33
       -
         }.${system};

     

       34
       34
       -
       

     

       35
       35
       -
         extension = rec {

     

       36
       36
       -
           x86_64-linux = ".tar.gz";

     

       37
       37
       -
           x86_64-darwin = "-universal.dmg";

     

       38
       38
       -
           aarch64-darwin = x86_64-darwin;

     

       39
       39
       -
         }.${system};

     

       40
       29
        
       

     

       41
       30
        
         linux = stdenv.mkDerivation rec {

     

       42
       31
        
           icon = fetchurl {

+5 -4

pkgs/applications/misc/slic3r/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchgit, perl, makeWrapper

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, perl, makeWrapper

     

       2
       2
        
       , makeDesktopItem, which, perlPackages, boost

     

       3
       3
        
       }:

     

       4
       4
        
       

     
···

       6
       6
        
         version = "1.3.0";

     

       7
       7
        
         pname = "slic3r";

     

       8
       8
        
       

     

       9
       9
       -
         src = fetchgit {

     

       10
       10
       -
           url = "https://github.com/alexrj/Slic3r";

     

       9
       9
       +
         src = fetchFromGitHub {

     

       10
       10
       +
           owner = "alexrj";

     

       11
       11
       +
           repo = "Slic3r";

     

       11
       12
        
           rev = version;

     

       12
       12
       -
           sha256 = "1pg4jxzb7f58ls5s8mygza8kqdap2c50kwlsdkf28bz1xi611zbi";

     

       13
       13
       +
           sha256 = "sha256-cf0QTOzhLyTcbJryCQoTVzU8kfrPV6SLpqi4s36X5N0=";

     

       13
       14
        
         };

     

       14
       15
        
       

     

       15
       16
        
         buildInputs =

+8

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

···

       179
       179
        
         ];

     

       180
       180
        
       

     

       181
       181
        
         patches = [

     

       182
       182
       +
           (fetchpatch {

     

       183
       183
       +
             # RDD Sandbox paths for NixOS, remove with Firefox>=100

     

       184
       184
       +
             # https://hg.mozilla.org/integration/autoland/rev/5ac6a69a01f47ca050d90704a9791b8224d30f14

     

       185
       185
       +
             # https://bugzilla.mozilla.org/show_bug.cgi?id=1761692

     

       186
       186
       +
             name = "mozbz-1761692-rdd-sandbox-paths.patch";

     

       187
       187
       +
             url = "https://hg.mozilla.org/integration/autoland/raw-rev/5ac6a69a01f47ca050d90704a9791b8224d30f14";

     

       188
       188
       +
             hash = "sha256-+NGRUxXA7HGvPaAwvDveqRsdXof5nBIc+l4hdf7cC/Y=";

     

       189
       189
       +
           })

     

       182
       190
        
         ]

     

       183
       191
        
         ++ lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch

     

       184
       192
        
         ++ lib.optional (lib.versionAtLeast version "90" && lib.versionOlder version "95") ./no-buildconfig-ffx90.patch

+31

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

···

       1
       1
       +
       { lib, buildGoModule, fetchFromGitHub }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildGoModule rec {

     

       4
       4
       +
         pname = "krelay";

     

       5
       5
       +
         version = "0.0.2";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "knight42";

     

       9
       9
       +
           repo = pname;

     

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

     

       11
       11
       +
           sha256 = "sha256-7P+pGiML/1aZEpYAWtAPEhrBAo8e8ATcemrH8tD73w8=";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         vendorSha256 = "sha256-PrL3GYP5K6ZaSAShwuDQA7WfOVJeQraxZ8jrtnajR9g=";

     

       15
       15
       +
       

     

       16
       16
       +
         subPackages = [ "cmd/client" ];

     

       17
       17
       +
       

     

       18
       18
       +
         ldflags = [ "-s" "-w" "-X github.com/knight42/krelay/pkg/constants.ClientVersion=${version}" ];

     

       19
       19
       +
       

     

       20
       20
       +
         postInstall = ''

     

       21
       21
       +
           mv $out/bin/client $out/bin/kubectl-relay

     

       22
       22
       +
         '';

     

       23
       23
       +
       

     

       24
       24
       +
         meta = with lib; {

     

       25
       25
       +
           description = "A better alternative to `kubectl port-forward` that can forward TCP or UDP traffic to IP/Host which is accessible inside the cluster.";

     

       26
       26
       +
           homepage = "https://github.com/knight42/krelay";

     

       27
       27
       +
           changelog = "https://github.com/knight42/krelay/releases/tag/v${version}";

     

       28
       28
       +
           license = licenses.mit;

     

       29
       29
       +
           maintainers = with maintainers; [ ivankovnatsky ];

     

       30
       30
       +
         };

     

       31
       31
       +
       }

+3 -1

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

···

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = "sha256-C1K7iEugA4HBLthcOI7EZ6H4YHW6el8X6FjVN1BeJR0=";

     

       15
       15
        
       

     

       16
       16
       +
         ldflags = [ "-s" "-w" "-X main.Version=${version}" ];

     

       17
       17
       +
       

     

       16
       18
        
         meta = with lib; {

     

       17
       19
        
           description = "Colorizes kubectl output";

     

       18
       20
        
           homepage = "https://github.com/hidetatz/kubecolor";

     

       19
       21
        
           changelog = "https://github.com/hidetatz/kubecolor/releases/tag/v${version}";

     

       20
       22
        
           license = licenses.mit;

     

       21
       21
       -
           maintainers = [ maintainers.ivankovnatsky ];

     

       23
       23
       +
           maintainers = with maintainers; [ ivankovnatsky SuperSandro2000 ];

     

       22
       24
        
         };

     

       23
       25
        
       }

+9

pkgs/applications/networking/cluster/terraform-providers/providers.json

···

       1141
       1141
        
           "vendorSha256": null,

     

       1142
       1142
        
           "version": "1.31.0"

     

       1143
       1143
        
         },

     

       1144
       1144
       +
         "utils": {

     

       1145
       1145
       +
           "owner": "cloudposse",

     

       1146
       1146
       +
           "provider-source-address": "registry.terraform.io/cloudposse/utils",

     

       1147
       1147
       +
           "repo": "terraform-provider-utils",

     

       1148
       1148
       +
           "rev": "0.17.17",

     

       1149
       1149
       +
           "sha256": "sha256-QJtdCEw8bnVku4fqAX5MBU9tkPv5jwjra9lGPfUPGQw=",

     

       1150
       1150
       +
           "vendorSha256": "sha256-5EelFIfHVLRiRJig6EeJG6KGJuQ05LX3M5CNxUxQAas=",

     

       1151
       1151
       +
           "version": "0.17.17"

     

       1152
       1152
       +
         },

     

       1144
       1153
        
         "vault": {

     

       1145
       1154
        
           "owner": "hashicorp",

     

       1146
       1155
        
           "provider-source-address": "registry.terraform.io/hashicorp/vault",

+2 -2

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

···

       5
       5
        
         /* Do not use "dev" as a version. If you do, Tilt will consider itself

     

       6
       6
        
           running in development environment and try to serve assets from the

     

       7
       7
        
           source tree, which is not there once build completes.  */

     

       8
       8
       -
         version = "0.26.2";

     

       8
       8
       +
         version = "0.26.3";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner  = "tilt-dev";

     

       12
       12
        
           repo   = pname;

     

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

     

       14
       14
       -
           sha256 = "sha256-UYvTsoNJwH8DOa/Ns9QlckcMVf/+k9/5UX8gO/el0jw=";

     

       14
       14
       +
           sha256 = "sha256-jrVf6vNlEkTgALS93o3kIiticvsyFHm5oA2Fh1edAGY=";

     

       15
       15
        
         };

     

       16
       16
        
         vendorSha256 = null;

     

       17
       17

+40 -2

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

···

       1
       1
        
       { lib

     

       2
       2
       +
       , makeDesktopItem

     

       3
       3
       +
       , copyDesktopItems

     

       4
       4
       +
       , stdenvNoCC

     

       2
       5
        
       , fetchurl

     

       3
       6
        
       , appimageTools

     

       4
       7
        
       }:

     

       5
       8
        
       

     

       6
       6
       -
       appimageTools.wrapType2 rec {

     

       9
       9
       +
       let

     

       10
       10
       +
         version = "1.7.9";

     

       7
       11
        
         pname = "session-desktop-appimage";

     

       8
       8
       -
         version = "1.7.9";

     

       12
       12
       +
       

     

       9
       13
        
         src = fetchurl {

     

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

     

       11
       15
        
           sha256 = "ca7754e59146633b71e66b02a90cff87e4f2574e57ff831ca4a5f983b7e2fbef";

     

       12
       16
        
         };

     

       17
       17
       +
         appimage = appimageTools.wrapType2 {

     

       18
       18
       +
           inherit version pname src;

     

       19
       19
       +
         };

     

       20
       20
       +
         appimage-contents = appimageTools.extractType2 {

     

       21
       21
       +
           inherit version pname src;

     

       22
       22
       +
         };

     

       23
       23
       +
       in

     

       24
       24
       +
       stdenvNoCC.mkDerivation {

     

       25
       25
       +
         inherit version pname;

     

       26
       26
       +
         src = appimage;

     

       27
       27
       +
       

     

       28
       28
       +
         nativeBuildInputs = [ copyDesktopItems ];

     

       29
       29
       +
       

     

       30
       30
       +
         desktopItems = [

     

       31
       31
       +
           (makeDesktopItem {

     

       32
       32
       +
             name = "Session";

     

       33
       33
       +
             desktopName = "Session";

     

       34
       34
       +
             comment = "Onion routing based messenger";

     

       35
       35
       +
             exec = "${appimage}/bin/session-desktop-appimage-${version}";

     

       36
       36
       +
             icon = "${appimage-contents}/session-desktop.png";

     

       37
       37
       +
             terminal = false;

     

       38
       38
       +
             type = "Application";

     

       39
       39
       +
             categories = [ "Network" ];

     

       40
       40
       +
           })

     

       41
       41
       +
         ];

     

       42
       42
       +
       

     

       43
       43
       +
         installPhase = ''

     

       44
       44
       +
           runHook preInstall

     

       45
       45
       +
       

     

       46
       46
       +
           mkdir -p $out/

     

       47
       47
       +
           cp -r bin $out/bin

     

       48
       48
       +
       

     

       49
       49
       +
           runHook postInstall

     

       50
       50
       +
         '';

     

       13
       51
        
       

     

       14
       52
        
         meta = with lib; {

     

       15
       53
        
           description = "Onion routing based messenger";

+5 -5

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

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkg-config, python2

     

       2
       2
       -
       , boost, db, openssl, geoip, libiconv, miniupnpc

     

       3
       3
       -
       , srcOnly, fetchgit

     

       2
       2
       +
       , boost, db, openssl, geoip, libiconv, miniupnpc, srcOnly

     

       4
       3
        
       }:

     

       5
       4
        
       

     

       6
       5
        
       let

     

       7
       6
        
         twisterHTML = srcOnly {

     

       8
       7
        
           name = "twister-html";

     

       9
       9
       -
           src = fetchgit {

     

       10
       10
       -
             url = "https://github.com/miguelfreitas/twister-html.git";

     

       8
       8
       +
           src = fetchFromGitHub {

     

       9
       9
       +
             owner = "miguelfreitas";

     

       10
       10
       +
             repo = "twister-html";

     

       11
       11
        
             rev = "01e7f7ca9b7e42ed90f91bc42da2c909ca5c0b9b";

     

       12
       12
       -
             sha256 = "0scjbin6s1kmi0bqq0dx0qyjw4n5xgmj567n0156i39f9h0dabqy";

     

       12
       12
       +
             sha256 = "sha256-Hi/VAEwujWhKAPaYIuvrxRIuPQa9AYwXiHUGbWxckmk=";

     

       13
       13
        
           };

     

       14
       14
        
         };

     

       15
       15

+49

pkgs/applications/science/biology/flywheel-cli/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchurl

     

       4
       4
       +
       , unzip

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       let

     

       8
       8
       +
         inherit (stdenv.targetPlatform) system;

     

       9
       9
       +
         throwSystem = throw "Unsupported system: ${system}";

     

       10
       10
       +
       

     

       11
       11
       +
         os = {

     

       12
       12
       +
           x86_64-darwin = "darwin";

     

       13
       13
       +
           x86_64-linux = "linux";

     

       14
       14
       +
         }.${system} or throwSystem;

     

       15
       15
       +
       

     

       16
       16
       +
         sha256 = {

     

       17
       17
       +
           x86_64-darwin = "sha256-OIyEu3Hsobui9s5+T9nC10SxMw0MhgmTA4SN9Ridyzo=";

     

       18
       18
       +
           x86_64-linux = "sha256-SxBjRd95hoh2zwX6IDnkZnTWVduQafPHvnWw8qTuM78=";

     

       19
       19
       +
         }.${system} or throwSystem;

     

       20
       20
       +
       in

     

       21
       21
       +
       stdenv.mkDerivation rec {

     

       22
       22
       +
         pname = "flywheel-cli";

     

       23
       23
       +
         version = "16.2.0";

     

       24
       24
       +
       

     

       25
       25
       +
         src = fetchurl {

     

       26
       26
       +
           url = "https://storage.googleapis.com/flywheel-dist/cli/${version}/fw-${os}_amd64-${version}.zip";

     

       27
       27
       +
           inherit sha256;

     

       28
       28
       +
         };

     

       29
       29
       +
       

     

       30
       30
       +
         nativeBuildInputs = [ unzip ];

     

       31
       31
       +
       

     

       32
       32
       +
         unpackPhase = ''

     

       33
       33
       +
           unzip ${src}

     

       34
       34
       +
         '';

     

       35
       35
       +
       

     

       36
       36
       +
         installPhase = ''

     

       37
       37
       +
           runHook preInstall

     

       38
       38
       +
           install -Dt $out/bin ./${os}_amd64/fw

     

       39
       39
       +
           runHook postInstall

     

       40
       40
       +
         '';

     

       41
       41
       +
       

     

       42
       42
       +
         meta = with lib; {

     

       43
       43
       +
           description = "Library and command line interface for interacting with a Flywheel site";

     

       44
       44
       +
           homepage = "https://gitlab.com/flywheel-io/public/python-cli";

     

       45
       45
       +
           license = licenses.mit;

     

       46
       46
       +
           maintainers = with maintainers; [ rbreslow ];

     

       47
       47
       +
           platforms = [ "x86_64-darwin" "x86_64-linux" ];

     

       48
       48
       +
         };

     

       49
       49
       +
       }

+2 -2

pkgs/applications/version-management/gerrit/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "gerrit";

     

       5
       5
       -
         version = "3.4.1";

     

       5
       5
       +
         version = "3.5.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war";

     

       9
       9
       -
           sha256 = "sha256-pHomYKYpV60SIKLoST5y9i3FprMV1VGy+5GjhpRhBUo=";

     

       9
       9
       +
           sha256 = "3fb5de878b6470dc8ef65ce22f2709cb8baecb5f16d89497dfaa33a0f33f7920";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         buildCommand = ''

+5 -4

pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchgit, ruby, gnugrep, diffutils, git, darcs }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, ruby, gnugrep, diffutils, git, darcs }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         pname = "darcs-to-git";

     

       5
       5
        
         version = "2015-06-04";

     

       6
       6
        
       

     

       7
       7
       -
         src = fetchgit {

     

       8
       8
       -
           url = "https://github.com/purcell/darcs-to-git.git";

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "purcell";

     

       9
       9
       +
           repo = "darcs-to-git";

     

       9
       10
        
           rev = "e5fee32495908fe0f7d700644c7b37347b7a0a5b";

     

       10
       10
       -
           sha256 = "0lxcx0x0m1cv2j4x9ykpjf6r2zg6lh5rya016x93vkmlzxm3f0ji";

     

       11
       11
       +
           sha256 = "sha256-UQI3av+0zj1SNwEonwuk5n2RjZN3+tSJFJuFCjrorFM=";

     

       11
       12
        
         };

     

       12
       13
        
       

     

       13
       14
        
         patchPhase = let

+2 -2

pkgs/applications/virtualization/runc/default.nix

···

       16
       16
        
       

     

       17
       17
        
       buildGoModule rec {

     

       18
       18
        
         pname = "runc";

     

       19
       19
       -
         version = "1.1.0";

     

       19
       19
       +
         version = "1.1.1";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromGitHub {

     

       22
       22
        
           owner = "opencontainers";

     

       23
       23
        
           repo = "runc";

     

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

     

       25
       25
       -
           sha256 = "sha256-svLxxfiRDLWkdRuHXaDyH5Ta6qmptI8z+s41iZKgbWM=";

     

       25
       25
       +
           sha256 = "sha256-6g2km+Y45INo2MTWMFFQFhfF8DAR5Su+YrJS8k3LYBY=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         vendorSha256 = null;

+27

pkgs/data/fonts/dancing-script/default.nix

···

       1
       1
       +
       { lib, fetchFromGitHub }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         pname = "dancing-script";

     

       5
       5
       +
         version = "2.0";

     

       6
       6
       +
       in fetchFromGitHub {

     

       7
       7
       +
         name = "${pname}-${version}";

     

       8
       8
       +
       

     

       9
       9
       +
         owner = "impallari";

     

       10
       10
       +
         repo = "DancingScript";

     

       11
       11
       +
         rev = "f7f54bc1b8836601dae8696666bfacd306f77e34";

     

       12
       12
       +
         sha256 = "dfFvh8h+oMhAQL9XKMrNr07VUkdQdxAsA8+q27KWWCA=";

     

       13
       13
       +
       

     

       14
       14
       +
         postFetch = ''

     

       15
       15
       +
           tar xf $downloadedFile --strip=1

     

       16
       16
       +
           install -m444 -Dt $out/share/fonts/truetype fonts/ttf/*.ttf

     

       17
       17
       +
         '';

     

       18
       18
       +
       

     

       19
       19
       +
         meta = with lib; {

     

       20
       20
       +
           description = "Dancing Script";

     

       21
       21
       +
           longDescription = "A lively casual script where the letters bounce and change size slightly.";

     

       22
       22
       +
           homepage = "https://github.com/impallari/DancingScript";

     

       23
       23
       +
           license = licenses.ofl;

     

       24
       24
       +
           platforms = platforms.all;

     

       25
       25
       +
           maintainers = with maintainers; [ wdavidw ];

     

       26
       26
       +
         };

     

       27
       27
       +
       }

+2 -2

pkgs/desktops/gnome/core/gnome-color-manager/default.nix

···

       21
       21
        
       

     

       22
       22
        
       stdenv.mkDerivation rec {

     

       23
       23
        
         pname = "gnome-color-manager";

     

       24
       24
       -
         version = "3.36.0";

     

       24
       24
       +
         version = "3.32.0";

     

       25
       25
        
       

     

       26
       26
        
         src = fetchurl {

     

       27
       27
        
           url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

     

       28
       28
       -
           sha256 = "nduea2Ry4RmAE4H5CQUzLsHUJYmBchu6gxyiRs6zrTs=";

     

       28
       28
       +
           sha256 = "1vpxa2zjz3lkq9ldjg0fl65db9s6b4kcs8nyaqfz3jygma7ifg3w";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         nativeBuildInputs = [

+8

pkgs/desktops/gnome/core/gnome-control-center/default.nix

···

       2
       2
        
       , lib

     

       3
       3
        
       , stdenv

     

       4
       4
        
       , substituteAll

     

       5
       5
       +
       , fetchpatch

     

       5
       6
        
       , accountsservice

     

       6
       7
        
       , adwaita-icon-theme

     

       7
       8
        
       , colord

     
···

       77
       78
        
             gnome_desktop = gnome-desktop;

     

       78
       79
        
             inherit glibc libgnomekbd tzdata;

     

       79
       80
        
             inherit cups networkmanagerapplet;

     

       81
       81
       +
           })

     

       82
       82
       +
       

     

       83
       83
       +
           # Fix Online Accounts configuration on X11

     

       84
       84
       +
           # https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/1272

     

       85
       85
       +
           (fetchpatch {

     

       86
       86
       +
             url = "https://gitlab.gnome.org/GNOME/gnome-control-center/-/commit/7fe322b9cedae313cd9af6f403eab9bfc6027674.patch";

     

       87
       87
       +
             sha256 = "cv1abqv0Kbfkfu7mZzEaZKXPE85yVBcQbjNHW+8ODFE=";

     

       80
       88
        
           })

     

       81
       89
        
         ];

     

       82
       90

+2 -2

pkgs/desktops/gnome/core/gnome-terminal/default.nix

···

       28
       28
        
       

     

       29
       29
        
       stdenv.mkDerivation rec {

     

       30
       30
        
         pname = "gnome-terminal";

     

       31
       31
       -
         version = "3.43.90";

     

       31
       31
       +
         version = "3.44.0";

     

       32
       32
        
       

     

       33
       33
        
         src = fetchurl {

     

       34
       34
        
           url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

     

       35
       35
       -
           sha256 = "pQpyOodNNkoP78GfmU2IVUWqYKUdaBimL/kPgv9TydY=";

     

       35
       35
       +
           sha256 = "qpZxie62CUWebApGigHqcMuMRTDaHVALLT9PxDi4/io=";

     

       36
       36
        
         };

     

       37
       37
        
       

     

       38
       38
        
         nativeBuildInputs = [

+2 -2

pkgs/desktops/gnome/core/yelp/default.nix

···

       18
       18
        
       

     

       19
       19
        
       stdenv.mkDerivation rec {

     

       20
       20
        
         pname = "yelp";

     

       21
       21
       -
         version = "42.0";

     

       21
       21
       +
         version = "42.1";

     

       22
       22
        
       

     

       23
       23
        
         src = fetchurl {

     

       24
       24
        
           url = "mirror://gnome/sources/yelp/${lib.versions.major version}/${pname}-${version}.tar.xz";

     

       25
       25
       -
           sha256 = "sha256-IIglVqnF29MHWTAkXnA3HGusMOqnpe0Jx9sSfNogE/c=";

     

       25
       25
       +
           sha256 = "sha256-JbEUarhUmIilqNoGf2O0cLDw+AC2roicrNEU0B1xO0E=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [

+10 -1

pkgs/desktops/mate/mate-backgrounds/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, meson, ninja, gettext, mateUpdateScript }:

     

       1
       1
       +
       { lib, stdenv, fetchurl, fetchpatch, meson, ninja, gettext, mateUpdateScript }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "mate-backgrounds";

     
···

       8
       8
        
           url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

     

       9
       9
        
           sha256 = "0379hngy3ap1r5kmqvmzs9r710k2c9nal2ps3hq765df4ir15j8d";

     

       10
       10
        
         };

     

       11
       11
       +
       

     

       12
       12
       +
         patches = [

     

       13
       13
       +
           # Fix build with meson 0.61, can be removed on next update.

     

       14
       14
       +
           # https://github.com/mate-desktop/mate-backgrounds/pull/39

     

       15
       15
       +
           (fetchpatch {

     

       16
       16
       +
             url = "https://github.com/mate-desktop/mate-backgrounds/commit/0096e237d420e6247a75a1c6940a818e309ac2a7.patch";

     

       17
       17
       +
             sha256 = "HEF8VWunFO+NCG18fZA7lbE2l8pc6Z3jcD+rSZ1Jsqg=";

     

       18
       18
       +
           })

     

       19
       19
       +
         ];

     

       11
       20
        
       

     

       12
       21
        
         nativeBuildInputs = [

     

       13
       22
        
           gettext

+5 -4

pkgs/development/compilers/ghcjs/ghcjs-base.nix

···

       1
       1
        
       { mkDerivation, aeson, array, attoparsec, base, binary, bytestring

     

       2
       2
       -
       , containers, deepseq, directory, dlist, fetchgit, ghc-prim

     

       2
       2
       +
       , containers, deepseq, directory, dlist, fetchFromGitHub, ghc-prim

     

       3
       3
        
       , ghcjs-prim, hashable, HUnit, integer-gmp, primitive, QuickCheck

     

       4
       4
        
       , quickcheck-unicode, random, scientific, test-framework

     

       5
       5
        
       , test-framework-hunit, test-framework-quickcheck2, text, time

     
···

       9
       9
        
       mkDerivation {

     

       10
       10
        
         pname = "ghcjs-base";

     

       11
       11
        
         version = "0.2.0.3";

     

       12
       12
       -
         src = fetchgit {

     

       13
       13
       -
           url = "https://github.com/ghcjs/ghcjs-base";

     

       14
       14
       -
           sha256 = "15fdkjv0l7hpbbsn5238xxgzfdg61g666nzbv2sgxkwryn5rycv0";

     

       12
       12
       +
         src = fetchFromGitHub {

     

       13
       13
       +
           owner = "ghcjs";

     

       14
       14
       +
           repo = "ghcjs-base";

     

       15
       15
        
           rev = "85e31beab9beffc3ea91b954b61a5d04e708b8f2";

     

       16
       16
       +
           sha256 = "sha256-YDOfi/WZz/602OtbY8wL5jX3X+9oiGL1WhceCraczZU=";

     

       16
       17
        
         };

     

       17
       18
        
         libraryHaskellDepends = [

     

       18
       19
        
           aeson attoparsec base binary bytestring containers deepseq dlist

+2 -2

pkgs/development/interpreters/clojure/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "clojure";

     

       5
       5
       -
         version = "1.11.0.1097";

     

       5
       5
       +
         version = "1.11.0.1100";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

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

     

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

     

       10
       10
       -
           sha256 = "sha256-8n/XOguemlqzVq9Vihd3QT5PsHSKcW3tTlOJtClrzKs=";

     

       10
       10
       +
           sha256 = "sha256-9KEsO32118fvKE1Gls+9nAeRdlhTKfmJylsiSYCoKKU=";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [

+3 -1

pkgs/development/interpreters/picoc/default.nix

···

       13
       13
        
       

     

       14
       14
        
         buildInputs = [ readline ];

     

       15
       15
        
       

     

       16
       16
       +
         makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];

     

       17
       17
       +
       

     

       16
       18
        
         postPatch = ''

     

       17
       19
        
           substituteInPlace Makefile --replace '`svnversion -n`' "${version}"

     

       18
       20
        
         '';

     
···

       46
       48
        
           homepage = "https://github.com/zsaleeba/picoc";

     

       47
       49
        
           downloadPage = "https://code.google.com/p/picoc/downloads/list";

     

       48
       50
        
           license = licenses.bsd3;

     

       49
       49
       -
           platforms = platforms.linux;

     

       51
       51
       +
           platforms = platforms.unix;

     

       50
       52
        
         };

     

       51
       53
        
       }

+5 -4

pkgs/development/interpreters/scsh/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchgit, autoreconfHook, scheme48 }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, autoreconfHook, scheme48 }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         pname = "scsh";

     

       5
       5
        
         version = "0.7pre";

     

       6
       6
        
       

     

       7
       7
       -
         src = fetchgit {

     

       8
       8
       -
           url = "https://github.com/scheme/scsh.git";

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "scheme";

     

       9
       9
       +
           repo = "scsh";

     

       9
       10
        
           rev = "f99b8c5293628cfeaeb792019072e3a96841104f";

     

       11
       11
       +
           sha256 = "sha256-vcVtqoUhozdJq1beUN8/rcI2qOJYUN+0CPSiDWGCIjI=";

     

       10
       12
        
           fetchSubmodules = true;

     

       11
       11
       -
           sha256 = "0ci2h9hhv8pl12sdyl2qwal3dhmd7zgm1pjnmd4kg8r1hnm6vidx";

     

       12
       13
        
         };

     

       13
       14
        
       

     

       14
       15
        
         nativeBuildInputs = [ autoreconfHook ];

+2 -2

pkgs/development/libraries/vte/default.nix

···

       27
       27
        
       

     

       28
       28
        
       stdenv.mkDerivation rec {

     

       29
       29
        
         pname = "vte";

     

       30
       30
       -
         version = "0.67.90";

     

       30
       30
       +
         version = "0.68.0";

     

       31
       31
        
       

     

       32
       32
        
         outputs = [ "out" "dev" ];

     

       33
       33
        
       

     

       34
       34
        
         src = fetchurl {

     

       35
       35
        
           url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

     

       36
       36
       -
           sha256 = "sha256-RkCe1x/DqkfX3DkCSaU+i4E6xsCYvawVFuEL23wg2zg=";

     

       36
       36
       +
           sha256 = "sha256-E+fUeJyiFqM3gAMNJGybE92/0ECUxjFu6n/5IoTdF0k=";

     

       37
       37
        
         };

     

       38
       38
        
       

     

       39
       39
        
         patches = [

+1 -1

pkgs/development/ocaml-modules/ipaddr/cstruct.nix

···

       5
       5
        
       buildDunePackage rec {

     

       6
       6
        
         pname = "ipaddr-cstruct";

     

       7
       7
        
       

     

       8
       8
       -
         inherit (ipaddr) version src useDune2 minimumOCamlVersion;

     

       8
       8
       +
         inherit (ipaddr) version src;

     

       9
       9
        
       

     

       10
       10
        
         propagatedBuildInputs = [ ipaddr cstruct ];

     

       11
       11

+1 -1

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

···

       6
       6
        
       buildDunePackage rec {

     

       7
       7
        
         pname = "ipaddr";

     

       8
       8
        
       

     

       9
       9
       -
         inherit (macaddr) version src useDune2 minimumOCamlVersion;

     

       9
       9
       +
         inherit (macaddr) version src;

     

       10
       10
        
       

     

       11
       11
        
         propagatedBuildInputs = [ macaddr domain-name stdlib-shims ];

     

       12
       12

+1 -1

pkgs/development/ocaml-modules/ipaddr/sexp.nix

···

       5
       5
        
       buildDunePackage rec {

     

       6
       6
        
         pname = "ipaddr-sexp";

     

       7
       7
        
       

     

       8
       8
       -
         inherit (ipaddr) version src useDune2 minimumOCamlVersion;

     

       8
       8
       +
         inherit (ipaddr) version src;

     

       9
       9
        
       

     

       10
       10
        
         propagatedBuildInputs = [ ipaddr ];

     

       11
       11

+1 -3

pkgs/development/ocaml-modules/macaddr/cstruct.nix

···

       5
       5
        
       buildDunePackage {

     

       6
       6
        
         pname = "macaddr-cstruct";

     

       7
       7
        
       

     

       8
       8
       -
         inherit (macaddr) version src minimumOCamlVersion;

     

       9
       9
       -
       

     

       10
       10
       -
         useDune2 = true;

     

       8
       8
       +
         inherit (macaddr) version src;

     

       11
       9
        
       

     

       12
       10
        
         propagatedBuildInputs = [ macaddr cstruct ];

     

       13
       11

+4 -6

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

···

       4
       4
        
       

     

       5
       5
        
       buildDunePackage rec {

     

       6
       6
        
         pname = "macaddr";

     

       7
       7
       -
         version = "5.2.0";

     

       7
       7
       +
         version = "5.3.0";

     

       8
       8
        
       

     

       9
       9
       -
         useDune2 = true;

     

       10
       10
       -
       

     

       11
       11
       -
         minimumOCamlVersion = "4.04";

     

       9
       9
       +
         minimalOCamlVersion = "4.04";

     

       12
       10
        
       

     

       13
       11
        
         src = fetchurl {

     

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

     

       15
       15
       -
           sha256 = "f98d237cc1f783a0ba7dff0c6c69b5f519fec056950e3e3e7c15e5511ee5b7ec";

     

       12
       12
       +
           url = "https://github.com/mirage/ocaml-ipaddr/releases/download/v${version}/ipaddr-${version}.tbz";

     

       13
       13
       +
           sha256 = "0mdp38mkvk2f5h2q7nb9fc70a8hyssblnl7kam0d8r5lckgrx5rn";

     

       16
       14
        
         };

     

       17
       15
        
       

     

       18
       16
        
         checkInputs = [ ppx_sexp_conv ounit ];

+1 -3

pkgs/development/ocaml-modules/macaddr/sexp.nix

···

       5
       5
        
       buildDunePackage {

     

       6
       6
        
         pname = "macaddr-sexp";

     

       7
       7
        
       

     

       8
       8
       -
         inherit (macaddr) version src minimumOCamlVersion;

     

       9
       9
       -
       

     

       10
       10
       -
         useDune2 = true;

     

       8
       8
       +
         inherit (macaddr) version src;

     

       11
       9
        
       

     

       12
       10
        
         propagatedBuildInputs = [ ppx_sexp_conv ];

     

       13
       11

+3 -7

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

···

       1
       1
        
       { lib, buildDunePackage, fetchurl

     

       2
       2
       -
       , fmt, mirage-flow, result, rresult, cstruct, logs, ke, lwt

     

       3
       3
       -
       , alcotest, alcotest-lwt, bigstringaf, bigarray-compat

     

       2
       2
       +
       , fmt, mirage-flow, cstruct, logs, ke, lwt

     

       3
       3
       +
       , alcotest, alcotest-lwt, bigstringaf

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       buildDunePackage rec {

     

       7
       7
        
         pname = "mimic";

     

       8
       8
        
         version = "0.0.4";

     

       9
       9
        
       

     

       10
       10
       -
         minimumOCamlVersion = "4.08";

     

       11
       11
       -
         useDune2 = true;

     

       10
       10
       +
         minimalOCamlVersion = "4.08";

     

       12
       11
        
       

     

       13
       12
        
         src = fetchurl {

     

       14
       13
        
           url = "https://github.com/dinosaure/mimic/releases/download/${version}/mimic-${version}.tbz";

     
···

       19
       18
        
           fmt

     

       20
       19
        
           lwt

     

       21
       20
        
           mirage-flow

     

       22
       22
       -
           result

     

       23
       23
       -
           rresult

     

       24
       21
        
           logs

     

       25
       22
        
         ];

     

       26
       23
        
       

     
···

       29
       26
        
           alcotest

     

       30
       27
        
           alcotest-lwt

     

       31
       28
        
           bigstringaf

     

       32
       32
       -
           bigarray-compat

     

       33
       29
        
           cstruct

     

       34
       30
        
           ke

     

       35
       31
        
         ];

+2 -2

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

···

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
        
         pname = "aioairzone";

     

       10
       10
       -
         version = "0.2.0";

     

       10
       10
       +
         version = "0.2.1";

     

       11
       11
        
         format = "setuptools";

     

       12
       12
        
       

     

       13
       13
        
         disabled = pythonOlder "3.8";

     
···

       16
       16
        
           owner = "Noltari";

     

       17
       17
        
           repo = pname;

     

       18
       18
        
           rev = version;

     

       19
       19
       -
           hash = "sha256-jMmPACC8eVDYqBI2642R/ChKFObmK+yWRzRBQUmi1C0=";

     

       19
       19
       +
           hash = "sha256-R5OK/B7fq15lpt8nKECiHMmfK9xmiLPtoKC65C7H/7c=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/ansible-later/default.nix

···

       21
       21
        
       

     

       22
       22
        
       buildPythonPackage rec {

     

       23
       23
        
         pname = "ansible-later";

     

       24
       24
       -
         version = "2.0.6";

     

       24
       24
       +
         version = "2.0.8";

     

       25
       25
        
         format = "pyproject";

     

       26
       26
        
       

     

       27
       27
        
         disabled = pythonOlder "3.8";

     
···

       30
       30
        
           owner = "thegeeklab";

     

       31
       31
        
           repo = pname;

     

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

     

       33
       33
       -
           hash = "sha256-vg9ryzl9ZeOGuFLL1yeJ3vGNPdo3ONmCQozY6DK6miY=";

     

       33
       33
       +
           hash = "sha256-oPlm9uxyN3hyf4gFv37YWEn/HOkg0QQ1Ya3tjLd53rQ=";

     

       34
       34
        
         };

     

       35
       35
        
       

     

       36
       36
        
         nativeBuildInputs = [

+2 -2

pkgs/development/python-modules/azure-keyvault-administration/default.nix

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "azure-keyvault-administration";

     

       9
       9
       -
         version = "4.0.0";

     

       9
       9
       +
         version = "4.1.0";

     

       10
       10
        
         disabled = isPy27;

     

       11
       11
        
       

     

       12
       12
        
         src = fetchPypi {

     

       13
       13
        
           inherit pname version;

     

       14
       14
        
           extension = "zip";

     

       15
       15
       -
           sha256 = "b05a0372f35921cedb7a231426077745eee9a65881088de6d4d8b73d9709a6cb";

     

       15
       15
       +
           sha256 = "sha256-V8tppRExyvSt41nN+j2QoxGSund6RKvE4g5p6AWZ3qI=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         propagatedBuildInputs = [

+13 -4

pkgs/development/python-modules/azure-keyvault-certificates/default.nix

···

       5
       5
        
       , azure-core

     

       6
       6
        
       , msrest

     

       7
       7
        
       , msrestazure

     

       8
       8
       +
       , pythonOlder

     

       8
       9
        
       }:

     

       9
       10
        
       

     

       10
       11
        
       buildPythonPackage rec {

     

       11
       12
        
         pname = "azure-keyvault-certificates";

     

       12
       12
       -
         version = "4.3.0";

     

       13
       13
       +
         version = "4.4.0";

     

       14
       14
       +
         format = "setuptools";

     

       15
       15
       +
       

     

       16
       16
       +
         disabled = pythonOlder "3.6";

     

       13
       17
        
       

     

       14
       18
        
         src = fetchPypi {

     

       15
       19
        
           inherit pname version;

     

       16
       20
        
           extension = "zip";

     

       17
       17
       -
           sha256 = "4e0a9bae9fd4c222617fbce6b31f97e2e0622774479de3c387239cbfbb828d87";

     

       21
       21
       +
           hash = "sha256-DAFU84AbI4Tdf6TtYDZvSwrpERxf/MqHjQU2igBLh88=";

     

       18
       22
        
         };

     

       19
       23
        
       

     

       20
       24
        
         propagatedBuildInputs = [

     
···

       24
       28
        
           msrestazure

     

       25
       29
        
         ];

     

       26
       30
        
       

     

       27
       27
       -
         pythonNamespaces = [ "azure.keyvault" ];

     

       31
       31
       +
         pythonNamespaces = [

     

       32
       32
       +
           "azure.keyvault"

     

       33
       33
       +
         ];

     

       28
       34
        
       

     

       29
       35
        
         # has no tests

     

       30
       36
        
         doCheck = false;

     

       31
       31
       -
         pythonImportsCheck = [ "azure.keyvault.certificates" ];

     

       37
       37
       +
       

     

       38
       38
       +
         pythonImportsCheck = [

     

       39
       39
       +
           "azure.keyvault.certificates"

     

       40
       40
       +
         ];

     

       32
       41
        
       

     

       33
       42
        
         meta = with lib; {

     

       34
       43
        
           description = "Microsoft Azure Key Vault Certificates Client Library for Python";

+17 -6

pkgs/development/python-modules/azure-keyvault-keys/default.nix

···

       1
       1
       -
       { lib, buildPythonPackage, isPy27, fetchPypi

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , pythonOlder

     

       4
       4
       +
       , fetchPypi

     

       2
       5
        
       , aiohttp

     

       3
       6
        
       , azure-common

     

       4
       7
        
       , azure-core

     
···

       9
       12
        
       

     

       10
       13
        
       buildPythonPackage rec {

     

       11
       14
        
         pname = "azure-keyvault-keys";

     

       12
       12
       -
         version = "4.4.0";

     

       13
       13
       -
         disabled = isPy27;

     

       15
       15
       +
         version = "4.5.0";

     

       16
       16
       +
         format = "setuptools";

     

       17
       17
       +
       

     

       18
       18
       +
         disabled = pythonOlder "3.6";

     

       14
       19
        
       

     

       15
       20
        
         src = fetchPypi {

     

       16
       21
        
           inherit pname version;

     

       17
       22
        
           extension = "zip";

     

       18
       18
       -
           sha256 = "7792ad0d5e63ad9eafa68bdce5de91b3ffcc7ca7a6afdc576785e6a2793caed0";

     

       23
       23
       +
           hash = "sha256-x1AhiARXZXcky3A+DJXoCrvkqsonlkgdrdr6es/VY3s=";

     

       19
       24
        
         };

     

       20
       25
        
       

     

       21
       26
        
         propagatedBuildInputs = [

     
···

       25
       30
        
           cryptography

     

       26
       31
        
         ];

     

       27
       32
        
       

     

       28
       28
       -
         pythonNamespaces = [ "azure.keyvault" ];

     

       33
       33
       +
         checkInputs = [

     

       34
       34
       +
           aiohttp

     

       35
       35
       +
           pytestCheckHook

     

       36
       36
       +
         ];

     

       37
       37
       +
       

     

       38
       38
       +
         pythonNamespaces = [

     

       39
       39
       +
           "azure.keyvault"

     

       40
       40
       +
         ];

     

       29
       41
        
       

     

       30
       42
        
         # requires relative paths to utilities in the mono-repo

     

       31
       43
        
         doCheck = false;

     

       32
       32
       -
         checkInputs = [ aiohttp pytestCheckHook ];

     

       33
       44
        
       

     

       34
       45
        
         pythonImportsCheck = [

     

       35
       46
        
           "azure"

+2 -10

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

···

       3
       3
        
       , fetchPypi

     

       4
       4
        
       , setuptools-scm

     

       5
       5
        
       , isPy3k

     

       6
       6
       -
       , pytest

     

       7
       7
       -
       , pytest-black

     

       8
       8
       -
       , pytest-flake8

     

       9
       9
       -
       , pytest-cov

     

       6
       6
       +
       , pytestCheckHook

     

       10
       7
        
       }:

     

       11
       8
        
       

     

       12
       9
        
       buildPythonPackage rec {

     
···

       20
       17
        
       

     

       21
       18
        
         nativeBuildInputs = [ setuptools-scm ];

     

       22
       19
        
       

     

       23
       23
       -
         checkInputs = [ pytest pytest-flake8 pytest-black pytest-cov ];

     

       24
       24
       -
         # ironically, they fail a linting test, and pytest.ini forces that test suite

     

       25
       25
       -
         checkPhase = ''

     

       26
       26
       -
           rm backports/functools_lru_cache.py

     

       27
       27
       -
           pytest -k 'not format'

     

       28
       28
       -
         '';

     

       20
       20
       +
         checkInputs = [ pytestCheckHook ];

     

       29
       21
        
       

     

       30
       22
        
         # Test fail on Python 2

     

       31
       23
        
         doCheck = isPy3k;

+2 -2

pkgs/development/python-modules/bids-validator/default.nix

···

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       buildPythonPackage rec {

     

       7
       7
       -
         version = "1.9.2";

     

       7
       7
       +
         version = "1.9.3";

     

       8
       8
        
         pname = "bids-validator";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchPypi {

     

       11
       11
        
           inherit pname version;

     

       12
       12
       -
           sha256 = "sha256-JxPOHeK8glWwAhYwlCVJtfWeMtU6KHgvNg5b2DgGxGc=";

     

       12
       12
       +
           sha256 = "sha256-ATJi4eCWV0i3Z8AsgV/DtiCn8Qzi2cMDtId5jXCoDL0=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         # needs packages which are not available in nixpkgs

+12

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

···

       5
       5
        
       , importlib-metadata

     

       6
       6
        
       , locale

     

       7
       7
        
       , pytestCheckHook

     

       8
       8
       +
       

     

       9
       9
       +
       # large-rebuild downstream dependencies

     

       10
       10
       +
       , flask

     

       11
       11
       +
       , black

     

       12
       12
       +
       

     

       13
       13
       +
       # applications

     

       14
       14
       +
       , magic-wormhole

     

       15
       15
       +
       , mitmproxy

     

       8
       16
        
       }:

     

       9
       17
        
       

     

       10
       18
        
       buildPythonPackage rec {

     
···

       28
       36
        
         checkInputs = [

     

       29
       37
        
           pytestCheckHook

     

       30
       38
        
         ];

     

       39
       39
       +
       

     

       40
       40
       +
         passthru.tests = {

     

       41
       41
       +
           inherit black flask magic-wormhole mitmproxy;

     

       42
       42
       +
         };

     

       31
       43
        
       

     

       32
       44
        
         meta = with lib; {

     

       33
       45
        
           homepage = "https://click.palletsprojects.com/";

+2 -2

pkgs/development/python-modules/google-auth-oauthlib/default.nix

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "google-auth-oauthlib";

     

       15
       15
       -
         version = "0.5.0";

     

       15
       15
       +
         version = "0.5.1";

     

       16
       16
        
         format = "setuptools";

     

       17
       17
        
       

     

       18
       18
        
         disabled = pythonOlder "3.6";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchPypi {

     

       21
       21
        
           inherit pname version;

     

       22
       22
       -
           hash = "sha256-BsTOs6sqk7hbiXa76Gy7gq4dHALS3tPP0IR6i2lVJjs=";

     

       22
       22
       +
           sha256 = "sha256-MFlrgk/GgI/ayi8EjkmYzED7SzWZ6upm0o3HCFs2xbg=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         propagatedBuildInputs = [

+32 -8

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

···

       1
       1
       -
       { lib, fetchPypi, buildPythonApplication, editorconfig, pytest, six }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , fetchPypi

     

       3
       3
       +
       , buildPythonApplication

     

       4
       4
       +
       , editorconfig

     

       5
       5
       +
       , pytestCheckHook

     

       6
       6
       +
       , pythonOlder

     

       7
       7
       +
       , six

     

       8
       8
       +
       }:

     

       2
       9
        
       

     

       3
       10
        
       buildPythonApplication rec {

     

       4
       11
        
         pname = "jsbeautifier";

     

       5
       5
       -
         version = "1.14.0";

     

       12
       12
       +
         version = "1.14.1";

     

       13
       13
       +
         format = "setuptools";

     

       6
       14
        
       

     

       7
       7
       -
         propagatedBuildInputs = [ six editorconfig ];

     

       8
       8
       -
         checkInputs = [ pytest ];

     

       15
       15
       +
         disabled = pythonOlder "3.7";

     

       9
       16
        
       

     

       10
       17
        
         src = fetchPypi {

     

       11
       18
        
           inherit pname version;

     

       12
       12
       -
           sha256 = "84fdb008d8af89619269a6aca702288b48f837a99427a0f529aa57ecfb36ee3c";

     

       19
       19
       +
           hash = "sha256-ZfT3dLDkywIutJmbRc1ndi92Qnxe80CCq6VLwdjvI+s=";

     

       13
       20
        
         };

     

       14
       21
        
       

     

       22
       22
       +
         propagatedBuildInputs = [

     

       23
       23
       +
           editorconfig

     

       24
       24
       +
           six

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       27
       27
       +
         checkInputs = [

     

       28
       28
       +
           pytestCheckHook

     

       29
       29
       +
         ];

     

       30
       30
       +
       

     

       31
       31
       +
         pythonImportsCheck = [

     

       32
       32
       +
           "jsbeautifier"

     

       33
       33
       +
         ];

     

       34
       34
       +
       

     

       35
       35
       +
         pytestFlagsArray = [

     

       36
       36
       +
           "jsbeautifier/tests/testindentation.py"

     

       37
       37
       +
         ];

     

       38
       38
       +
       

     

       15
       39
        
         meta = with lib; {

     

       16
       16
       -
           homepage    = "http://jsbeautifier.org";

     

       17
       17
       -
           description = "JavaScript unobfuscator and beautifier.";

     

       18
       18
       -
           license     = licenses.mit;

     

       40
       40
       +
           description = "JavaScript unobfuscator and beautifier";

     

       41
       41
       +
           homepage = "http://jsbeautifier.org";

     

       42
       42
       +
           license = licenses.mit;

     

       19
       43
        
           maintainers = with maintainers; [ apeyroux ];

     

       20
       44
        
         };

     

       21
       45
        
       }

-4

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

···

       1
       1
        
       { lib

     

       2
       2
       -
       , black

     

       3
       2
        
       , buildPythonPackage

     

       4
       3
        
       , dataclasses

     

       5
       4
        
       , fetchFromGitHub

     

       6
       5
        
       , hypothesis

     

       7
       7
       -
       , isort

     

       8
       6
        
       , pytestCheckHook

     

       9
       7
        
       , python

     

       10
       8
        
       , pythonOlder

     
···

       63
       61
        
         ];

     

       64
       62
        
       

     

       65
       63
        
         checkInputs = [

     

       66
       66
       -
           black

     

       67
       67
       -
           isort

     

       68
       64
        
           pytestCheckHook

     

       69
       65
        
         ];

     

       70
       66

+2 -2

pkgs/development/python-modules/mypy-boto3-builder/default.nix

···

       16
       16
        
       

     

       17
       17
        
       buildPythonPackage rec {

     

       18
       18
        
         pname = "mypy-boto3-builder";

     

       19
       19
       -
         version = "7.5.3";

     

       19
       19
       +
         version = "7.5.4";

     

       20
       20
        
         format = "pyproject";

     

       21
       21
        
       

     

       22
       22
        
         disabled = pythonOlder "3.10";

     
···

       25
       25
        
           owner = "vemel";

     

       26
       26
        
           repo = "mypy_boto3_builder";

     

       27
       27
        
           rev = version;

     

       28
       28
       -
           hash = "sha256-nG4V2xA5nZfprMjiP+QePHelE0ZvryYH+kCfobKpAMQ=";

     

       28
       28
       +
           hash = "sha256-NS8lFetL/8hcvCnIHw+GDtdEKFsN81MPybEA4PGaP/Q=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         nativeBuildInputs = [

+52

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonApplication

     

       3
       3
       +
       , isPy3k

     

       4
       4
       +
       , fetchFromGitHub

     

       5
       5
       +
       , notmuch

     

       6
       6
       +
       , pygobject3

     

       7
       7
       +
       , gobject-introspection

     

       8
       8
       +
       , libnotify

     

       9
       9
       +
       , wrapGAppsHook

     

       10
       10
       +
       , gtk3

     

       11
       11
       +
       }:

     

       12
       12
       +
       

     

       13
       13
       +
       buildPythonApplication rec {

     

       14
       14
       +
         pname = "notifymuch";

     

       15
       15
       +
         version = "0.1";

     

       16
       16
       +
         disabled = !isPy3k;

     

       17
       17
       +
       

     

       18
       18
       +
         src = fetchFromGitHub {

     

       19
       19
       +
           owner = "kspi";

     

       20
       20
       +
           repo = "notifymuch";

     

       21
       21
       +
           # https://github.com/kspi/notifymuch/issues/11

     

       22
       22
       +
           rev = "9d4aaf54599282ce80643b38195ff501120807f0";

     

       23
       23
       +
           sha256 = "1lssr7iv43mp5v6nzrfbqlfzx8jcc7m636wlfyhhnd8ydd39n6k4";

     

       24
       24
       +
         };

     

       25
       25
       +
       

     

       26
       26
       +
         propagatedBuildInputs = [

     

       27
       27
       +
           notmuch

     

       28
       28
       +
           pygobject3

     

       29
       29
       +
           libnotify

     

       30
       30
       +
           gtk3

     

       31
       31
       +
         ];

     

       32
       32
       +
       

     

       33
       33
       +
         nativeBuildInputs = [

     

       34
       34
       +
           gobject-introspection

     

       35
       35
       +
           wrapGAppsHook

     

       36
       36
       +
         ];

     

       37
       37
       +
       

     

       38
       38
       +
         dontWrapGApps = true;

     

       39
       39
       +
       

     

       40
       40
       +
         preFixup = ''

     

       41
       41
       +
           makeWrapperArgs+=("''${gappsWrapperArgs[@]}")

     

       42
       42
       +
         '';

     

       43
       43
       +
       

     

       44
       44
       +
         strictDeps = false;

     

       45
       45
       +
       

     

       46
       46
       +
         meta = with lib; {

     

       47
       47
       +
           description = "Display desktop notifications for unread mail in a notmuch database";

     

       48
       48
       +
           homepage = "https://github.com/kspi/notifymuch";

     

       49
       49
       +
           maintainers = with maintainers; [ arjan-s ];

     

       50
       50
       +
           license = licenses.gpl3;

     

       51
       51
       +
         };

     

       52
       52
       +
       }

+2

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

···

       9
       9
        
       , pandas-stubs

     

       10
       10
        
       , requests

     

       11
       11
        
       , tqdm

     

       12
       12
       +
       , wandb

     

       12
       13
        
       

     

       13
       14
        
       # Check dependencies

     

       14
       15
        
       , pytest-mock

     
···

       35
       36
        
           pandas-stubs

     

       36
       37
        
           requests

     

       37
       38
        
           tqdm

     

       39
       39
       +
           wandb

     

       38
       40
        
         ];

     

       39
       41
        
       

     

       40
       42
        
         pythonImportsCheck = [ "openai" ];

+2 -2

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

···

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "osmnx";

     

       6
       6
       -
         version = "1.1.1";

     

       6
       6
       +
         version = "1.1.2";

     

       7
       7
        
         disabled = pythonOlder "3.6";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner  = "gboeing";

     

       11
       11
        
           repo   = pname;

     

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

     

       13
       13
       -
           sha256 = "0dkv3fnlq23d7d30lhdf4a313lxy3a5qfldidvszs1z9n16ycnwb";

     

       13
       13
       +
           sha256 = "sha256-qrTAXZFm88elMrVjvGwfdNwTA/PRdCOHFqpcgoKVGNk=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         propagatedBuildInputs = [ geopandas matplotlib networkx numpy pandas requests Rtree shapely folium scikit-learn scipy gdal rasterio ];

+12 -2

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

···

       9
       9
        
       , pynacl

     

       10
       10
        
       , pytest-relaxed

     

       11
       11
        
       , pytestCheckHook

     

       12
       12
       +
       , fetchpatch

     

       12
       13
        
       }:

     

       13
       14
        
       

     

       14
       15
        
       buildPythonPackage rec {

     

       15
       16
        
         pname = "paramiko";

     

       16
       16
       -
         version = "2.9.2";

     

       17
       17
       +
         version = "2.10.3";

     

       17
       18
        
         format = "setuptools";

     

       18
       19
        
       

     

       19
       20
        
         src = fetchPypi {

     

       20
       21
        
           inherit pname version;

     

       21
       21
       -
           sha256 = "944a9e5dbdd413ab6c7951ea46b0ab40713235a9c4c5ca81cfe45c6f14fa677b";

     

       22
       22
       +
           sha256 = "sha256-3bGXeFOu+CgEs11yoOWXskT6MmxATDUL0AxbAdv+5xo=";

     

       22
       23
        
         };

     

       23
       24
        
       

     

       24
       25
        
         propagatedBuildInputs = [

     
···

       46
       47
        
       

     

       47
       48
        
         pythonImportsCheck = [

     

       48
       49
        
           "paramiko"

     

       50
       50
       +
         ];

     

       51
       51
       +
       

     

       52
       52
       +
         patches = [

     

       53
       53
       +
           # Fix usage of dsa keys

     

       54
       54
       +
           # https://github.com/paramiko/paramiko/pull/1606/

     

       55
       55
       +
           (fetchpatch {

     

       56
       56
       +
             url = "https://github.com/paramiko/paramiko/commit/18e38b99f515056071fb27b9c1a4f472005c324a.patch";

     

       57
       57
       +
             sha256 = "sha256-bPDghPeLo3NiOg+JwD5CJRRLv2VEqmSx1rOF2Tf8ZDA=";

     

       58
       58
       +
           })

     

       49
       59
        
         ];

     

       50
       60
        
       

     

       51
       61
        
         __darwinAllowLocalNetworking = true;

+10 -6

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

···

       5
       5
        
       , pythonOlder

     

       6
       6
        
       , scandir ? null

     

       7
       7
        
       , glibcLocales

     

       8
       8
       -
       , mock ? null

     

       8
       8
       +
       , mock

     

       9
       9
       +
       , typing

     

       9
       10
        
       }:

     

       10
       11
        
       

     

       11
       12
        
       buildPythonPackage rec {

     
···

       17
       18
        
           sha256 = "sha256-n+DtrYmLg8DD4ZnIQrJ+0hZkXS4Xd1ey3Wc4TUETxkE=";

     

       18
       19
        
         };

     

       19
       20
        
       

     

       20
       20
       -
         propagatedBuildInputs = [ six ] ++ lib.optional (pythonOlder "3.5") scandir;

     

       21
       21
       -
         checkInputs = [ glibcLocales ] ++ lib.optional (pythonOlder "3.3") mock;

     

       21
       21
       +
         propagatedBuildInputs = [ six ]

     

       22
       22
       +
           ++ lib.optionals (pythonOlder "3.5") [ scandir typing ];

     

       23
       23
       +
         checkInputs = [ glibcLocales ]

     

       24
       24
       +
           ++ lib.optional (pythonOlder "3.3") mock;

     

       22
       25
        
       

     

       23
       26
        
         preCheck = ''

     

       24
       27
        
           export LC_ALL="en_US.UTF-8"

     

       25
       28
        
         '';

     

       26
       29
        
       

     

       27
       27
       -
         meta = {

     

       30
       30
       +
         meta = with lib; {

     

       28
       31
        
           description = "This module offers classes representing filesystem paths with semantics appropriate for different operating systems.";

     

       29
       29
       -
           homepage = "https://pypi.python.org/pypi/pathlib2/";

     

       30
       30
       -
           license = with lib.licenses; [ mit ];

     

       32
       32
       +
           homepage = "https://pypi.org/project/pathlib2/";

     

       33
       33
       +
           license = with licenses; [ mit ];

     

       34
       34
       +
           maintainers = with maintainers; [ SuperSandro2000 ];

     

       31
       35
        
         };

     

       32
       36
        
       }

-13

pkgs/development/python-modules/portend/black-19.10b0.patch

···

       1
       1
       -
       diff --git a/test_portend.py b/test_portend.py

     

       2
       2
       -
       index b2de8c2..3f90276 100644

     

       3
       3
       -
       --- a/test_portend.py

     

       4
       4
       -
       +++ b/test_portend.py

     

       5
       5
       -
       @@ -21,7 +21,7 @@ def socket_infos():

     

       6
       6
       -
        

     

       7
       7
       -
        

     

       8
       8
       -
        def id_for_info(info):

     

       9
       9
       -
       -    af, = info[:1]

     

       10
       10
       -
       +    (af,) = info[:1]

     

       11
       11
       -
            return str(af)

     

       12
       12
       -
        

     

       13
       13
       -

+2 -10

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

···

       1
       1
        
       { lib, buildPythonPackage, fetchPypi

     

       2
       2
       -
       , pytest, setuptools-scm, tempora, pytest-black, pytest-cov }:

     

       2
       2
       +
       , pytestCheckHook, setuptools-scm, tempora  }:

     

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "portend";

     
···

       9
       9
        
           inherit pname version;

     

       10
       10
        
           sha256 = "239e3116045ea823f6df87d6168107ad75ccc0590e37242af0cc1e98c5d224e4";

     

       11
       11
        
         };

     

       12
       12
       -
       

     

       13
       13
       -
         postPatch = ''

     

       14
       14
       -
           substituteInPlace pytest.ini --replace "--flake8" ""

     

       15
       15
       -
         '';

     

       16
       12
        
       

     

       17
       13
        
         nativeBuildInputs = [ setuptools-scm ];

     

       18
       14
        
       

     

       19
       15
        
         propagatedBuildInputs = [ tempora ];

     

       20
       16
        
       

     

       21
       21
       -
         checkInputs = [ pytest pytest-black pytest-cov ];

     

       22
       22
       -
       

     

       23
       23
       -
         checkPhase = ''

     

       24
       24
       -
           py.test --deselect=test_portend.py::TestChecker::test_check_port_listening

     

       25
       25
       -
         '';

     

       17
       17
       +
         checkInputs = [ pytestCheckHook ];

     

       26
       18
        
       

     

       27
       19
        
         # Some of the tests use localhost networking.

     

       28
       20
        
         __darwinAllowLocalNetworking = true;

+7 -6

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

···

       3
       3
        
       , fetchFromGitHub

     

       4
       4
        
       , pythonOlder

     

       5
       5
        
       , bson

     

       6
       6
       -
       , pytest

     

       7
       7
       -
       , pytest-cov

     

       8
       8
       -
       , pytest-runner

     

       9
       6
        
       , pytestCheckHook

     

       10
       7
        
       , pyyaml

     

       11
       8
        
       , setuptools

     
···

       23
       20
        
           sha256 = "sha256-Ds8JV2mtLRcKXBvPs84Hdj3MxxqpeV5muKCSlAFCj1A=";

     

       24
       21
        
         };

     

       25
       22
        
       

     

       23
       23
       +
         postPatch = ''

     

       24
       24
       +
           substituteInPlace setup.py \

     

       25
       25
       +
             --replace "'pytest-runner'" ""

     

       26
       26
       +
           substituteInPlace setup.cfg \

     

       27
       27
       +
             --replace "--cov=pymarshal --cov-report=html --cov-report=term" ""

     

       28
       28
       +
         '';

     

       29
       29
       +
       

     

       26
       30
        
         nativeBuildInputs = [

     

       27
       31
        
           setuptools

     

       28
       28
       -
           pytest-runner

     

       29
       32
        
         ];

     

       30
       33
        
       

     

       31
       34
        
         propagatedBuildInputs = [

     
···

       35
       38
        
         checkInputs = [

     

       36
       39
        
           pytestCheckHook

     

       37
       40
        
           bson

     

       38
       38
       -
           pytest

     

       39
       39
       -
           pytest-cov

     

       40
       41
        
           pyyaml

     

       41
       42
        
         ];

     

       42
       43

+2 -2

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

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "pyrogram";

     

       15
       15
       -
         version = "1.4.9";

     

       15
       15
       +
         version = "1.4.12";

     

       16
       16
        
       

     

       17
       17
        
         disabled = pythonOlder "3.6";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchPypi {

     

       20
       20
        
           pname = "Pyrogram";

     

       21
       21
        
           inherit version;

     

       22
       22
       -
           hash = "sha256-iAPzQDHRyFl8m/23zTGOFXA3v5ONU5BGp7KT1ZSywA4=";

     

       22
       22
       +
           hash = "sha256-rNGdWnZuhCU0Kg/CkeNjazKb76h8/VanZdF4yi0KWGU=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         propagatedBuildInputs = [

+7 -6

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

···

       6
       6
        
       , buildPythonPackage

     

       7
       7
        
       , cachetools

     

       8
       8
        
       , fetchFromGitHub

     

       9
       9
       -
       , poetry

     

       9
       9
       +
       , poetry-core

     

       10
       10
        
       , pytest-asyncio

     

       11
       11
        
       , pytestCheckHook

     

       12
       12
        
       , pythonOlder

     
···

       16
       16
        
       

     

       17
       17
        
       buildPythonPackage rec {

     

       18
       18
        
         pname = "rokuecp";

     

       19
       19
       -
         version = "0.15.0";

     

       19
       19
       +
         version = "0.16.0";

     

       20
       20
        
         format = "pyproject";

     

       21
       21
        
       

     

       22
       22
        
         disabled = pythonOlder "3.9";

     
···

       25
       25
        
           owner = "ctalkington";

     

       26
       26
        
           repo = "python-rokuecp";

     

       27
       27
        
           rev = version;

     

       28
       28
       -
           hash = "sha256-yNmnCoHIBlpQCLd+YcsKCKd1wWh8WZNpILWmChZGWH4=";

     

       28
       28
       +
           hash = "sha256-MeugjIZorwO8d0Yb7bthI6f4NNo6GX9JrRbxrVSdWv0=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         nativeBuildInputs = [

     

       32
       32
       -
           # Requires poetry not poetry-core

     

       33
       33
       -
           poetry

     

       32
       32
       +
           poetry-core

     

       34
       33
        
         ];

     

       35
       34
        
       

     

       36
       35
        
         propagatedBuildInputs = [

     
···

       50
       49
        
       

     

       51
       50
        
         postPatch = ''

     

       52
       51
        
           substituteInPlace pyproject.toml \

     

       52
       52
       +
             --replace 'version = "0.0.0"' 'version = "${version}"' \

     

       53
       53
        
             --replace " --cov" ""

     

       54
       54
        
         '';

     

       55
       55
        
       

     

       56
       56
        
         disabledTests = [

     

       57
       57
       -
           # https://github.com/ctalkington/python-rokuecp/issues/249

     

       57
       57
       +
           # Network related tests are having troube in the sandbox

     

       58
       58
        
           "test_resolve_hostname"

     

       59
       59
       +
           "test_get_dns_state"

     

       59
       60
        
           # Assertion issue

     

       60
       61
        
           "test_guess_stream_format"

     

       61
       62
        
         ];

+2 -2

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

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "scmrepo";

     

       17
       17
       -
         version = "0.0.13";

     

       17
       17
       +
         version = "0.0.14";

     

       18
       18
        
         format = "pyproject";

     

       19
       19
        
       

     

       20
       20
        
         disabled = pythonOlder "3.7";

     
···

       23
       23
        
           owner = "iterative";

     

       24
       24
        
           repo = pname;

     

       25
       25
        
           rev = version;

     

       26
       26
       -
           hash = "sha256-VWdewy4sfnM5zwDmeL8PdNZINN07rBosg4+GOWkkhVE=";

     

       26
       26
       +
           hash = "sha256-/J8cCcGAWGrJmUvznOKXtNiHasdOJ3CzsGMeakgL0sY=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         propagatedBuildInputs = [

+5 -2

pkgs/development/python-modules/sense-energy/default.nix

···

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
        
       , aiohttp

     

       5
       5
       +
       , pythonOlder

     

       5
       6
        
       , requests

     

       6
       7
        
       , websocket-client

     

       7
       8
        
       , websockets

     
···

       9
       10
        
       

     

       10
       11
        
       buildPythonPackage rec {

     

       11
       12
        
         pname = "sense-energy";

     

       12
       12
       -
         version = "0.10.3";

     

       13
       13
       +
         version = "0.10.4";

     

       13
       14
        
         format = "setuptools";

     

       14
       15
        
       

     

       16
       16
       +
         disabled = pythonOlder "3.7";

     

       17
       17
       +
       

     

       15
       18
        
         src = fetchFromGitHub {

     

       16
       19
        
           owner = "scottbonline";

     

       17
       20
        
           repo = "sense";

     

       18
       21
        
           rev = version;

     

       19
       19
       -
           hash = "sha256-oekzLnEQleJPYO6QI2EwflXsbnrQVbqXQOZOnCfEHdg=";

     

       22
       22
       +
           hash = "sha256-yflI17lLZMXXB0ye+jz3VWWMdZtcBTwbg8deA4ENmWw=";

     

       20
       23
        
         };

     

       21
       24
        
       

     

       22
       25
        
         propagatedBuildInputs = [

+7

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

···

       10
       10
        
           sha256 = "sha256-IE8CQNuJmadJ1jiph7NRhhhD5pI5uBHsPRiBQSw3BqY=";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       +
         patches = [

     

       14
       14
       +
           # on non-x86 Linux platforms, sip incorrectly detects the manylinux version

     

       15
       15
       +
           # and PIP will refuse to install the resulting wheel.

     

       16
       16
       +
           # remove once upstream fixes this, hopefully in 6.5.2

     

       17
       17
       +
           ./fix-manylinux-version.patch

     

       18
       18
       +
         ];

     

       19
       19
       +
       

     

       13
       20
        
         propagatedBuildInputs = [ packaging toml ];

     

       14
       21
        
       

     

       15
       22
        
         # There aren't tests

+19

pkgs/development/python-modules/sip/fix-manylinux-version.patch

···

       1
       1
       +
       diff --git a/sipbuild/project.py b/sipbuild/project.py

     

       2
       2
       +
       --- a/sipbuild/project.py

     

       3
       3
       +
       +++ b/sipbuild/project.py

     

       4
       4
       +
       @@ -336,13 +336,13 @@ class Project(AbstractProject, Configurable):

     

       5
       5
       +
                    # We expect a two part tag so leave anything else unchanged.

     

       6
       6
       +
                    parts = platform_tag.split('-')

     

       7
       7
       +
                    if len(parts) == 2:

     

       8
       8
       +
       -                if self.minimum_glibc_version > (2, 17):

     

       9
       9
       +
       +                if self.minimum_glibc_version > (2, 17) or parts[1] not in {"x86_64", "i686", "aarch64", "armv7l", "ppc64", "ppc64le", "s390x"}:

     

       10
       10
       +
                            # PEP 600.

     

       11
       11
       +
                            parts[0] = 'manylinux'

     

       12
       12
       +
                            parts.insert(1,

     

       13
       13
       +
                                    '{}.{}'.format(self.minimum_glibc_version[0],

     

       14
       14
       +
                                            self.minimum_glibc_version[1]))

     

       15
       15
       +
       -                elif self.minimum_glibc_version > (2, 12):

     

       16
       16
       +
       +                elif self.minimum_glibc_version > (2, 12) or parts[1] not in {"x86_64", "i686"}:

     

       17
       17
       +
                            # PEP 599.

     

       18
       18
       +
                            parts[0] = 'manylinux2014'

     

       19
       19
       +
                        elif self.minimum_glibc_version > (2, 5):

+4

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

···

       114
       114
        
           "tests/test_tables.py"

     

       115
       115
        
         ];

     

       116
       116
        
       

     

       117
       117
       +
         # Disable test that fails on darwin due to issue with python3Packages.psutil:

     

       118
       118
       +
         # https://github.com/giampaolo/psutil/issues/1219

     

       119
       119
       +
         disabledTests = lib.optional stdenv.isDarwin "test_tpu_system_stats";

     

       120
       120
       +
       

     

       117
       121
        
         checkInputs = [

     

       118
       122
        
           azure-core

     

       119
       123
        
           bokeh

+4 -2

pkgs/development/tools/build-managers/fac/default.nix

···

       1
       1
       -
       { lib, rustPlatform, fetchCrate, git }:

     

       1
       1
       +
       { lib, stdenv, rustPlatform, fetchCrate, git, CoreServices }:

     

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "fac-build";

     
···

       10
       10
        
           sha256 = "sha256-+JJVuKUdnjJoQJ4a2EE0O6jZdVoFxPwbPgfD2LfiDPI=";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       +
       

     

       14
       14
       +
         buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];

     

       13
       15
        
         cargoSha256 = "sha256-XT4FQVE+buORuZAFZK5Qnf/Fl3QSvw4SHUuCzWhxUdk=";

     

       14
       16
        
       

     

       15
       17
        
         # fac includes a unit test called ls_files_works which assumes it's

     
···

       40
       42
        
           '';

     

       41
       43
        
           homepage = "https://physics.oregonstate.edu/~roundyd/fac";

     

       42
       44
        
           license = licenses.gpl2Plus;

     

       43
       43
       -
           platforms = platforms.linux;

     

       45
       45
       +
           platforms = platforms.unix;

     

       44
       46
        
           maintainers = with maintainers; [ dpercy ];

     

       45
       47
        
           mainProgram = "fac";

     

       46
       48
        
         };

+5 -5

pkgs/development/tools/misc/clojure-lsp/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGraalvmNativeImage rec {

     

       4
       4
        
         pname = "clojure-lsp";

     

       5
       5
       -
         version = "2022.02.23-12.12.12";

     

       5
       5
       +
         version = "2022.03.26-18.47.08";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = pname;

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-PfO1G66Z3zQ+Hyjb6J0bomsT8juQURwF2mPKJY5auMw=";

     

       11
       11
       +
           sha256 = "sha256-tlI4h9/DTc3JwqCM58YC5x4FDpuPm7Qeik3PJe64nVA=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         jar = fetchurl {

     

       15
       15
        
           url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar";

     

       16
       16
       -
           sha256 = "sha256-f8bEALl9j0aDkKZtThLTseqibeYIUeOx4ulelPWQkoo=";

     

       16
       16
       +
           sha256 = "4973f5cf45f0b8120206d057d88d6a7fca03e071c8ad1ecd7229db46a0604ed2";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         extraNativeImageBuildArgs = [

     
···

       42
       42
        
       

     

       43
       43
        
           latest_version=$(curl -s https://api.github.com/repos/clojure-lsp/clojure-lsp/releases/latest | jq --raw-output .tag_name)

     

       44
       44
        
       

     

       45
       45
       -
           old_jar_hash=$(nix-instantiate --eval --strict -A "clojure-lsp-standalone.jar.drvAttrs.outputHash" | tr -d '"' | sed -re 's|[+]|\\&|g')

     

       45
       45
       +
           old_jar_hash=$(nix-instantiate --eval --strict -A "clojure-lsp.jar.drvAttrs.outputHash" | tr -d '"' | sed -re 's|[+]|\\&|g')

     

       46
       46
        
       

     

       47
       47
       -
           curl -o clojure-lsp.jar -sL https://github.com/clojure-lsp/clojure-lsp/releases/download/$latest_version/clojure-lsp-standalone.jar

     

       47
       47
       +
           curl -o clojure-lsp-standalone.jar -sL https://github.com/clojure-lsp/clojure-lsp/releases/download/$latest_version/clojure-lsp-standalone.jar

     

       48
       48
        
           new_jar_hash=$(nix-hash --flat --type sha256 clojure-lsp-standalone.jar | sed -re 's|[+]|\\&|g')

     

       49
       49
        
       

     

       50
       50
        
           rm -f clojure-lsp-standalone.jar

+5 -4

pkgs/development/tools/parsing/hammer/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchgit, glib, pkg-config, scons }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, glib, pkg-config, scons }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         pname = "hammer";

     

       5
       5
        
         version = "e7aa734";

     

       6
       6
        
       

     

       7
       7
       -
         src = fetchgit {

     

       8
       8
       -
           url = "https://github.com/UpstandingHackers/hammer";

     

       9
       9
       -
           sha256 = "01l0wbhz7dymxlndacin2vi8sqwjlw81ds2i9xyi200w51nsdm38";

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "UpstandingHackers";

     

       9
       9
       +
           repo = "hammer";

     

       10
       10
        
           rev = "47f34b81e4de834fd3537dd71928c4f3cdb7f533";

     

       11
       11
       +
           sha256 = "sha256-aNSmbSgcABF9T1HoFhCnkmON4hY2MtUs7dW38+HigAY=";

     

       11
       12
        
         };

     

       12
       13
        
       

     

       13
       14
        
         nativeBuildInputs = [ pkg-config scons ];

+40

pkgs/development/tools/sslmate-agent/default.nix

···

       1
       1
       +
       { lib, stdenv, fetchurl, dpkg, autoPatchelfHook }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         pname = "sslmate-agent";

     

       5
       5
       +
         version = "1.99.11";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchurl {

     

       8
       8
       +
           url = "https://packages.sslmate.com/debian/pool/sslmate2/s/sslmate-client/${pname}_${version}-1_amd64.deb";

     

       9
       9
       +
           sha256 = "sha256-LBiZI0pGAFWnvTigEhtkhHq4FGdbYiMzjLheMuP0YTU=";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         nativeBuildInputs = [

     

       13
       13
       +
           dpkg

     

       14
       14
       +
           autoPatchelfHook

     

       15
       15
       +
         ];

     

       16
       16
       +
       

     

       17
       17
       +
         unpackCmd = ''

     

       18
       18
       +
           dpkg-deb -x ${src} ./sslmate-agent-${pname}

     

       19
       19
       +
         '';

     

       20
       20
       +
       

     

       21
       21
       +
         installPhase = ''

     

       22
       22
       +
           runHook preInstall

     

       23
       23
       +
       

     

       24
       24
       +
           # Not moving etc because it only contains init.rd setttings

     

       25
       25
       +
           mv usr $out

     

       26
       26
       +
           mv lib $out

     

       27
       27
       +
       

     

       28
       28
       +
           substituteInPlace $out/lib/systemd/system/sslmate-agent.service \

     

       29
       29
       +
             --replace "/usr/s" "$out/"

     

       30
       30
       +
       

     

       31
       31
       +
           runHook postInstall

     

       32
       32
       +
         '';

     

       33
       33
       +
       

     

       34
       34
       +
         meta = with lib; {

     

       35
       35
       +
           description = "Daemon for managing SSL/TLS certificates on a server";

     

       36
       36
       +
           homepage = "https://sslmate.com/";

     

       37
       37
       +
           license = licenses.unfree;

     

       38
       38
       +
           maintainers = with maintainers; [ wolfangaukang ];

     

       39
       39
       +
         };

     

       40
       40
       +
       }

+3 -1

pkgs/games/xtris/default.nix

···

       18
       18
        
         '';

     

       19
       19
        
         buildInputs = [ xorg.libX11 ];

     

       20
       20
        
       

     

       21
       21
       +
         makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];

     

       22
       22
       +
       

     

       21
       23
        
         meta = with lib; {

     

       22
       24
        
           description = "A multi-player version of the classical game of Tetris, for the X Window system";

     

       23
       25
        
           homepage = "https://web.archive.org/web/20120315061213/http://www.iagora.com/~espel/xtris/xtris.html";

     

       24
       26
        
           license = licenses.gpl2;

     

       25
       25
       -
           platforms = platforms.linux;

     

       27
       27
       +
           platforms = platforms.unix;

     

       26
       28
        
         };

     

       27
       29
        
       }

+5 -4

pkgs/os-specific/linux/disk-indicator/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchgit, libX11 }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, libX11 }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         pname = "disk-indicator";

     

       5
       5
        
         version = "unstable-2014-05-19";

     

       6
       6
        
       

     

       7
       7
       -
         src = fetchgit {

     

       8
       8
       -
           url = "https://github.com/MeanEYE/Disk-Indicator.git";

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "MeanEYE";

     

       9
       9
       +
           repo = "Disk-Indicator";

     

       9
       10
        
           rev = "51ef4afd8141b8d0659cbc7dc62189c56ae9c2da";

     

       10
       10
       -
           sha256 = "10jx6mx9qarn21p2l2jayxkn1gmqhvck1wymgsr4jmbwxl8ra5kd";

     

       11
       11
       +
           sha256 = "sha256-bRaVEe18VUmyftXzMNmGuL5gZ/dKCipuEDYrnHo1XYI=";

     

       11
       12
        
         };

     

       12
       13
        
       

     

       13
       14
        
         buildInputs = [ libX11 ];

+5 -5

pkgs/os-specific/linux/lvm2/common.nix

···

       9
       9
        
       , libaio

     

       10
       10
        
       , enableCmdlib ? false

     

       11
       11
        
       , enableDmeventd ? false

     

       12
       12
       -
       , udevSupport ? !stdenv.targetPlatform.isStatic, udev ? null

     

       13
       13
       -
       , onlyLib ? stdenv.targetPlatform.isStatic

     

       12
       12
       +
       , udevSupport ? !stdenv.hostPlatform.isStatic, udev ? null

     

       13
       13
       +
       , onlyLib ? stdenv.hostPlatform.isStatic

     

       14
       14
        
       , nixosTests

     

       15
       15
        
       }:

     

       16
       16
        
       

     
···

       56
       56
        
         ] ++ lib.optionals udevSupport [

     

       57
       57
        
           "--enable-udev_rules"

     

       58
       58
        
           "--enable-udev_sync"

     

       59
       59
       -
         ] ++ lib.optionals stdenv.targetPlatform.isStatic [

     

       59
       59
       +
         ] ++ lib.optionals stdenv.hostPlatform.isStatic [

     

       60
       60
        
           "--enable-static_link"

     

       61
       61
        
         ];

     

       62
       62
        
       

     
···

       91
       91
        
             url = "https://git.alpinelinux.org/aports/plain/main/lvm2/mallinfo.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50";

     

       92
       92
        
             sha256 = "0g6wlqi215i5s30bnbkn8w7axrs27y3bnygbpbnf64wwx7rxxlj0";

     

       93
       93
        
           })

     

       94
       94
       -
         ] ++ lib.optionals stdenv.targetPlatform.isStatic [

     

       94
       94
       +
         ] ++ lib.optionals stdenv.hostPlatform.isStatic [

     

       95
       95
        
           ./no-shared.diff

     

       96
       96
        
         ];

     

       97
       97
        
       

     
···

       114
       114
        
         ];

     

       115
       115
        
       

     

       116
       116
        
         installPhase = lib.optionalString onlyLib ''

     

       117
       117
       -
           install -D -t $out/lib libdm/ioctl/libdevmapper.${if stdenv.targetPlatform.isStatic then "a" else "so"}

     

       117
       117
       +
           install -D -t $out/lib libdm/ioctl/libdevmapper.${if stdenv.hostPlatform.isStatic then "a" else "so"}

     

       118
       118
        
           make -C libdm install_include

     

       119
       119
        
           make -C libdm install_pkgconfig

     

       120
       120
        
         '';

+2 -4

pkgs/servers/clickhouse/default.nix

···

       8
       8
        
       

     

       9
       9
        
       stdenv.mkDerivation rec {

     

       10
       10
        
         pname = "clickhouse";

     

       11
       11
       -
         version = "21.8.12.29";

     

       11
       11
       +
         version = "22.3.2.2";

     

       12
       12
        
       

     

       13
       13
        
         broken = stdenv.buildPlatform.is32bit; # not supposed to work on 32-bit https://github.com/ClickHouse/ClickHouse/pull/23959#issuecomment-835343685

     

       14
       14
        
       

     
···

       17
       17
        
           repo   = "ClickHouse";

     

       18
       18
        
           rev    = "v${version}-lts";

     

       19
       19
        
           fetchSubmodules = true;

     

       20
       20
       -
           sha256 = "1qqacb7v7mhr9k162yll8mcbh0cxa347f5hypz0a8l54v1dz5fyl";

     

       20
       20
       +
           sha256 = "0rhzgm0gvwpx4h5xyr7y393y7s9slcr4a7grw9316f5m70frxg2v";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [ cmake libtool llvm-bintools ninja ];

     
···

       36
       36
        
           substituteInPlace utils/check-style/check-duplicate-includes.sh \

     

       37
       37
        
             --replace 'git rev-parse --show-toplevel' '$src'

     

       38
       38
        
           substituteInPlace utils/check-style/check-ungrouped-includes.sh \

     

       39
       39
       -
             --replace 'git rev-parse --show-toplevel' '$src'

     

       40
       40
       -
           substituteInPlace utils/generate-ya-make/generate-ya-make.sh \

     

       41
       39
        
             --replace 'git rev-parse --show-toplevel' '$src'

     

       42
       40
        
           substituteInPlace utils/list-licenses/list-licenses.sh \

     

       43
       41
        
             --replace 'git rev-parse --show-toplevel' '$src'

+1 -1

pkgs/servers/home-assistant/component-packages.nix

···

       2
       2
        
       # Do not edit!

     

       3
       3
        
       

     

       4
       4
        
       {

     

       5
       5
       -
         version = "2022.3.7";

     

       5
       5
       +
         version = "2022.3.8";

     

       6
       6
        
         components = {

     

       7
       7
        
           "abode" = ps: with ps; [ abodepy ];

     

       8
       8
        
           "accuweather" = ps: with ps; [ accuweather ];

+2 -2

pkgs/servers/home-assistant/default.nix

···

       176
       176
        
         extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);

     

       177
       177
        
       

     

       178
       178
        
         # Don't forget to run parse-requirements.py after updating

     

       179
       179
       -
         hassVersion = "2022.3.7";

     

       179
       179
       +
         hassVersion = "2022.3.8";

     

       180
       180
        
       

     

       181
       181
        
       in python.pkgs.buildPythonApplication rec {

     

       182
       182
        
         pname = "homeassistant";

     
···

       194
       194
        
           owner = "home-assistant";

     

       195
       195
        
           repo = "core";

     

       196
       196
        
           rev = version;

     

       197
       197
       -
           hash = "sha256-AewJf4GS3jfEN8Xq82NDV8PNpXXZIs2DHix/+tJpB8c=";

     

       197
       197
       +
           hash = "sha256-FGsMFt/EEokaast81iiwKHqSsB1E4Si5ejTw+MV1MnQ=";

     

       198
       198
        
         };

     

       199
       199
        
       

     

       200
       200
        
         # leave this in, so users don't have to constantly update their downstream patch handling

+3 -3

pkgs/servers/traefik/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "traefik";

     

       5
       5
       -
         version = "2.6.1";

     

       5
       5
       +
         version = "2.6.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchzip {

     

       8
       8
        
           url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";

     

       9
       9
       -
           sha256 = "sha256-uaROz7DQcy5FlR9/U/QmanqA1qJPJj/ix725Gnei2U0=";

     

       9
       9
       +
           sha256 = "sha256-DVmszzDre0pWXARUqXuqGfY3pX1Ijh33G0Gsdmp8f98=";

     

       10
       10
        
           stripRoot = false;

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         vendorSha256 = "sha256-H67oCOCkS/xpkCZ4C3BuIzpUKuLvItDqC4tNSNKjv0E=";

     

       13
       13
       +
         vendorSha256 = "sha256-tqrfCpZ/fRYZBZ/SBAvvJebLBeD2M/AVJEPiseehJHY=";

     

       14
       14
        
       

     

       15
       15
        
         doCheck = false;

     

       16
       16

+2 -2

pkgs/servers/unifi/default.nix

···

       65
       65
        
         };

     

       66
       66
        
       

     

       67
       67
        
         unifi7 = generic {

     

       68
       68
       -
           version = "7.0.23";

     

       69
       69
       -
           sha256 = "1y2z02blgbqa6xvwjrvzx6mfwbbbmmv50rq409rsg1hkkzispxmw";

     

       68
       68
       +
           version = "7.0.25";

     

       69
       69
       +
           sha256 = "sha256-DZi2xy6mS3hfqxX1ikiHKPlJ12eaoZVgyl9jKYt91hg=";

     

       70
       70
        
         };

     

       71
       71
        
       }

+5 -4

pkgs/tools/audio/pa-applet/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchgit, libpulseaudio, pkg-config, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, libpulseaudio, pkg-config, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         pname = "pa-applet";

     

       5
       5
        
         version = "unstable-2012-04-11";

     

       6
       6
        
       

     

       7
       7
       -
         src = fetchgit {

     

       8
       8
       -
           url = "https://github.com/fernandotcl/pa-applet.git";

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "fernandotcl";

     

       9
       9
       +
           repo = "pa-applet";

     

       9
       10
        
           rev = "005f192df9ba6d2e6491f9aac650be42906b135a";

     

       10
       10
       -
           sha256 = "1242sdri67wnm1cd0hr40mxarkh7qs7mb9n2m0g9dbz0f4axj6wa";

     

       11
       11
       +
           sha256 = "sha256-ihvZFXHgr5YeqMKmVY/GB86segUkQ9BYqJYfE3PTgog=";

     

       11
       12
        
         };

     

       12
       13
        
       

     

       13
       14
        
         nativeBuildInputs = [ pkg-config ];

+3 -3

pkgs/tools/misc/gotify-desktop/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "gotify-desktop";

     

       5
       5
       -
         version = "1.2.0";

     

       5
       5
       +
         version = "1.3.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "desbma";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-QQpZeXFv8BqFOQ+7ANWmtsgNlMakAL2ML4rlG2cFZJE=";

     

       11
       11
       +
           sha256 = "sha256-EDLOSxmODC7OzVSZJxwKNnFA2yh+QKE8aXmYJ+Dnv40=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoSha256 = "sha256-zcSAsI/yGGJer7SPKDKZ6NQ3UgTdBcDighS6VTNITMo=";

     

       14
       14
       +
         cargoSha256 = "sha256-opSXndOjdmYG5DJ3CDUHWhN6O7AQp4Cleldzq1Hfr1o=";

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ pkg-config ];

     

       17
       17

+7 -5

pkgs/tools/misc/nbench/default.nix

···

       9
       9
        
           sha256 = "1b01j7nmm3wd92ngvsmn2sbw43sl9fpx4xxmkrink68fz1rx0gbj";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ stdenv.cc.libc.static ];

     

       13
       12
        
         prePatch = ''

     

       14
       13
        
           substituteInPlace nbench1.h --replace '"NNET.DAT"' "\"$out/NNET.DAT\""

     

       15
       15
       -
         '';

     

       16
       16
       -
         preBuild = ''

     

       17
       17
       -
           makeFlagsArray=(CC=$CC)

     

       14
       14
       +
           substituteInPlace sysspec.h --replace "malloc.h" "stdlib.h"

     

       15
       15
       +
         '' + lib.optionalString stdenv.isDarwin ''

     

       16
       16
       +
           substituteInPlace Makefile --replace "-static" ""

     

       18
       17
        
         '';

     

       18
       18
       +
       

     

       19
       19
       +
         makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];

     

       20
       20
       +
       

     

       19
       21
        
         installPhase = ''

     

       20
       22
        
           mkdir -p $out/bin

     

       21
       23
        
           cp nbench $out/bin

     
···

       25
       27
        
         meta = with lib; {

     

       26
       28
        
           homepage = "https://www.math.utah.edu/~mayer/linux/bmark.html";

     

       27
       29
        
           description = "A synthetic computing benchmark program";

     

       28
       28
       -
           platforms = platforms.linux;

     

       30
       30
       +
           platforms = platforms.unix;

     

       29
       31
        
           maintainers = with lib.maintainers; [ bennofs ];

     

       30
       32
        
         };

     

       31
       33
        
       }

+23 -28

pkgs/tools/misc/sam-ba/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchzip, libX11, libXScrnSaver, libXext, libXft, libXrender

     

       2
       2
       -
       , freetype, zlib, fontconfig

     

       3
       3
       -
       }:

     

       1
       1
       +
       { lib, stdenv, fetchzip, glib, zlib, libglvnd, python3, autoPatchelfHook }:

     

       4
       2
        
       

     

       5
       5
       -
       let

     

       6
       6
       -
         maybe64 = if stdenv.isx86_64 then "_64" else "";

     

       7
       7
       -
         libPath = lib.makeLibraryPath

     

       8
       8
       -
           [ stdenv.cc.cc.lib libX11 libXScrnSaver libXext libXft libXrender freetype

     

       9
       9
       -
             zlib fontconfig

     

       10
       10
       -
           ];

     

       11
       11
       -
       in

     

       12
       3
        
       stdenv.mkDerivation rec {

     

       13
       13
       -
         version = "2.16";

     

       4
       4
       +
         version = "3.5";

     

       14
       5
        
         pname = "sam-ba";

     

       15
       6
        
       

     

       16
       7
        
         src = fetchzip {

     

       17
       17
       -
           url = "http://www.atmel.com/dyn/resources/prod_documents/sam-ba_${version}_linux.zip";

     

       18
       18
       -
           sha256 = "18lsi4747900cazq3bf0a87n3pc7751j5papj9sxarjymcz9vks4";

     

       8
       8
       +
           url = "https://ww1.microchip.com/downloads/en/DeviceDoc/sam-ba_${version}-linux_x86_64.tar.gz";

     

       9
       9
       +
           sha256 = "1k0nbgyc98z94nphm2q7s82b274clfnayf4a2kv93l5594rzdbp1";

     

       19
       10
        
         };

     

       20
       11
        
       

     

       21
       21
       -
         # Pre-built binary package. Install everything to /opt/sam-ba to not mess up

     

       22
       22
       -
         # the internal directory structure. Then create wrapper in /bin. Attemts to

     

       23
       23
       -
         # use "patchelf --set-rpath" instead of setting LD_PRELOAD_PATH failed.

     

       12
       12
       +
         buildInputs = [

     

       13
       13
       +
           glib

     

       14
       14
       +
           libglvnd

     

       15
       15
       +
           zlib

     

       16
       16
       +
       

     

       17
       17
       +
           (python3.withPackages (ps: [ps.pyserial]))

     

       18
       18
       +
         ];

     

       19
       19
       +
       

     

       20
       20
       +
         nativeBuildInputs = [ autoPatchelfHook ];

     

       21
       21
       +
       

     

       24
       22
        
         installPhase = ''

     

       23
       23
       +
           runHook preInstall

     

       24
       24
       +
       

     

       25
       25
        
           mkdir -p "$out/bin/" \

     

       26
       26
        
                    "$out/opt/sam-ba/"

     

       27
       27
        
           cp -a . "$out/opt/sam-ba/"

     

       28
       28
       -
           patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/opt/sam-ba/sam-ba${maybe64}"

     

       29
       29
       -
           cat > "$out/bin/sam-ba" << EOF

     

       30
       30
       -
           export LD_LIBRARY_PATH="${libPath}"

     

       31
       31
       -
           exec "$out/opt/sam-ba/sam-ba${maybe64}"

     

       32
       32
       -
           EOF

     

       33
       33
       -
           chmod +x "$out/bin/sam-ba"

     

       28
       28
       +
           ln -sr "$out/opt/sam-ba/sam-ba" "$out/bin/"

     

       29
       29
       +
           ln -sr "$out/opt/sam-ba/multi_sam-ba.py" "$out/bin/"

     

       30
       30
       +
       

     

       31
       31
       +
           runHook postInstall

     

       34
       32
        
         '';

     

       35
       35
       -
       

     

       36
       36
       -
         # Do our own thing

     

       37
       37
       -
         dontPatchELF = true;

     

       38
       33
        
       

     

       39
       34
        
         meta = with lib; {

     

       40
       35
        
           description = "Programming tools for Atmel SAM3/7/9 ARM-based microcontrollers";

     
···

       42
       37
        
             Atmel SAM-BA software provides an open set of tools for programming the

     

       43
       38
        
             Atmel SAM3, SAM7 and SAM9 ARM-based microcontrollers.

     

       44
       39
        
           '';

     

       40
       40
       +
           # Alternatively: https://www.microchip.com/en-us/development-tool/SAM-BA-In-system-Programmer

     

       45
       41
        
           homepage = "http://www.at91.com/linux4sam/bin/view/Linux4SAM/SoftwareTools";

     

       46
       46
       -
           # License in <source>/doc/readme.txt

     

       47
       47
       -
           license = "BSD-like (partly binary-only)";  # according to Buildroot

     

       48
       48
       -
           platforms = [ "x86_64-linux" ];  # patchelf fails on i686-linux

     

       42
       42
       +
           license = lib.licenses.gpl2Only;

     

       43
       43
       +
           platforms = [ "x86_64-linux" ];

     

       49
       44
        
           maintainers = [ maintainers.bjornfor ];

     

       50
       45
        
         };

     

       51
       46
        
       }

+5 -4

pkgs/tools/networking/carddav-util/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchgit, python3Packages, makeWrapper }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, python3Packages, makeWrapper }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         pname = "carddav";

     

       5
       5
        
         version = "0.1-2014-02-26";

     

       6
       6
        
       

     

       7
       7
       -
         src = fetchgit {

     

       8
       8
       -
           url = "https://github.com/ljanyst/carddav-util";

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "ljanyst";

     

       9
       9
       +
           repo = "carddav-util";

     

       9
       10
        
           rev = "53b181faff5f154bcd180467dd04c0ce69405564";

     

       10
       10
       -
           sha256 = "0f0raffdy032wlnxfck6ky60r163nhqfbr311y4ry55l60s4497n";

     

       11
       11
       +
           sha256 = "sha256-9iRCNDC0FJ+JD2Hk5TC0w4QMjJ9mMtct5WIA35xTGTg=";

     

       11
       12
        
         };

     

       12
       13
        
       

     

       13
       14
        
         nativeBuildInputs = [ makeWrapper ];

+9 -9

pkgs/tools/package-management/nixui/default.nix

···

       1
       1
       -
       { lib, stdenv, pkgs, fetchgit, nix, node_webkit, makeDesktopItem

     

       1
       1
       +
       { lib, stdenv, pkgs, fetchFromGitHub, nix, node_webkit, makeDesktopItem

     

       2
       2
        
       , writeScript }:

     

       3
       3
        
       let

     

       4
       4
       -
         version = "0.2.1";

     

       5
       5
       -
         src = fetchgit {

     

       6
       6
       -
           url = "https://github.com/matejc/nixui.git";

     

       7
       7
       -
           rev = "845a5f4a33f1d0c509c727c130d0792a5b450a38";

     

       8
       8
       -
           sha256 = "1ay3i4lgzs3axbby06l4vvspxi0aa9pwiil84qj0dqq1jb6isara";

     

       9
       9
       -
         };

     

       10
       4
        
         nixui = (import ./nixui.nix {

     

       11
       5
        
           inherit pkgs;

     

       12
       6
        
           inherit (stdenv.hostPlatform) system;

     
···

       24
       18
        
           genericName = "NixUI";

     

       25
       19
        
         };

     

       26
       20
        
       in

     

       27
       27
       -
       stdenv.mkDerivation {

     

       21
       21
       +
       stdenv.mkDerivation rec {

     

       28
       22
        
         pname = "nixui";

     

       29
       29
       -
         inherit version src;

     

       23
       23
       +
         version = "0.2.1";

     

       24
       24
       +
         src = fetchFromGitHub {

     

       25
       25
       +
           owner = "matejc";

     

       26
       26
       +
           repo = "nixui";

     

       27
       27
       +
           rev = version;

     

       28
       28
       +
           sha256 = "sha256-KisdzZIB4wYkJojGyG9SCsR+9d6EGuDX6mro/yiJw6s=";

     

       29
       29
       +
         };

     

       30
       30
        
         installPhase = ''

     

       31
       31
        
           mkdir -p $out/bin

     

       32
       32
        
           ln -s ${script} $out/bin/nixui

+3 -3

pkgs/tools/system/monit/default.nix

···

       12
       12
        
       

     

       13
       13
        
       stdenv.mkDerivation rec {

     

       14
       14
        
         pname = "monit";

     

       15
       15
       -
         version = "5.31.0";

     

       15
       15
       +
         version = "5.32.0";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchurl {

     

       18
       18
       -
           url = "${meta.homepage}dist/monit-${version}.tar.gz";

     

       19
       19
       -
           sha256 = "sha256-6ucfKJQftmPux0waWbaVRsZZUpeWVQvZwMVE6bUqwFU=";

     

       18
       18
       +
           url = "https://mmonit.com/monit/dist/monit-${version}.tar.gz";

     

       19
       19
       +
           sha256 = "sha256-EHcFLUxOhIrEfRT5s3dU1GQZrsvoyaB+H4ackU+vMhY=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         nativeBuildInputs = [ bison flex ];

+35 -7

pkgs/tools/typesetting/lowdown/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, fixDarwinDylibNames, which }:

     

       1
       1
       +
       { lib, stdenv, fetchurl, fixDarwinDylibNames, which

     

       2
       2
       +
       , enableShared ? !(stdenv.hostPlatform.isStatic)

     

       3
       3
       +
       , enableStatic ? stdenv.hostPlatform.isStatic

     

       4
       4
       +
       }:

     

       2
       5
        
       

     

       3
       6
        
       stdenv.mkDerivation rec {

     

       4
       7
        
         pname = "lowdown";

     

       5
       5
       -
         version = "0.10.0";

     

       8
       8
       +
         version = "0.11.1";

     

       6
       9
        
       

     

       7
       10
        
         outputs = [ "out" "lib" "dev" "man" ];

     

       8
       11
        
       

     

       9
       12
        
         src = fetchurl {

     

       10
       13
        
           url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz";

     

       11
       11
       -
           sha512 = "3gq6awxvkz2hb8xzcwqhdhdqgspvqjfzm50bq9i29qy2iisq9vzb91bdp3f4q2sqcmk3gms44xyxyn3ih2hwlzsnk0f5prjzyg97fjj";

     

       14
       14
       +
           sha512 = "1l0055g8v0dygyxvk5rchp4sn1g2lakbf6hhq0wkj6nxkfpl43mkyc4vpb02r7v6iqfdwq4461dmdi78blsb3nj8b1gcjx75v7x9pa1";

     

       12
       15
        
         };

     

       13
       16
        
       

     

       17
       17
       +
         # Upstream always passes GNU-style "soname", but cctools expects "install_name".

     

       18
       18
       +
         # Whatever name is inserted will be replaced by fixDarwinDylibNames.

     

       19
       19
       +
         # https://github.com/kristapsdz/lowdown/issues/87

     

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

     

       21
       21
       +
           substituteInPlace Makefile --replace soname install_name

     

       22
       22
       +
         '';

     

       23
       23
       +
       

     

       14
       24
        
         nativeBuildInputs = [ which ]

     

       15
       25
        
           ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ];

     

       16
       26
        
       

     
···

       27
       37
        
           runHook postConfigure

     

       28
       38
        
         '';

     

       29
       39
        
       

     

       40
       40
       +
         makeFlags = [

     

       41
       41
       +
           "bins" # prevents shared object from being built unnecessarily

     

       42
       42
       +
         ];

     

       43
       43
       +
       

     

       44
       44
       +
         installTargets = [

     

       45
       45
       +
           "install"

     

       46
       46
       +
         ] ++ lib.optionals enableShared [

     

       47
       47
       +
           "install_shared"

     

       48
       48
       +
         ] ++ lib.optionals enableStatic [

     

       49
       49
       +
           "install_static"

     

       50
       50
       +
         ];

     

       51
       51
       +
       

     

       30
       52
        
         # Fix lib extension so that fixDarwinDylibNames detects it

     

       31
       31
       -
         postInstall = lib.optionalString stdenv.isDarwin ''

     

       32
       32
       -
           mv $lib/lib/liblowdown.{so,dylib}

     

       33
       33
       -
         '';

     

       53
       53
       +
         # Symlink liblowdown.so to liblowdown.so.1 (or equivalent)

     

       54
       54
       +
         postInstall =

     

       55
       55
       +
           let

     

       56
       56
       +
             inherit (stdenv.hostPlatform.extensions) sharedLibrary;

     

       57
       57
       +
           in

     

       34
       58
        
       

     

       35
       35
       -
         patches = lib.optional (!stdenv.hostPlatform.isStatic) ./shared.patch;

     

       59
       59
       +
           lib.optionalString (enableShared && stdenv.isDarwin) ''

     

       60
       60
       +
             mv $lib/lib/liblowdown.{so.1,1.dylib}

     

       61
       61
       +
           '' + lib.optionalString enableShared ''

     

       62
       62
       +
             ln -s $lib/lib/liblowdown*${sharedLibrary}* $lib/lib/liblowdown${sharedLibrary}

     

       63
       63
       +
           '';

     

       36
       64
        
       

     

       37
       65
        
         doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform;

     

       38
       66
        
         installCheckPhase = ''

-42

pkgs/tools/typesetting/lowdown/shared.patch

···

       1
       1
       -
       diff --git a/Makefile b/Makefile

     

       2
       2
       -
       index 955f737..2c9532c 100644

     

       3
       3
       -
       --- a/Makefile

     

       4
       4
       -
       +++ b/Makefile

     

       5
       5
       -
       @@ -80,7 +80,7 @@ REGRESS_ARGS	+= "--parse-no-autolink"

     

       6
       6
       -
        REGRESS_ARGS	+= "--parse-no-cmark"

     

       7
       7
       -
        REGRESS_ARGS	+= "--parse-no-deflists"

     

       8
       8
       -
        

     

       9
       9
       -
       -all: lowdown lowdown-diff lowdown.pc

     

       10
       10
       -
       +all: lowdown lowdown-diff liblowdown.so lowdown.pc

     

       11
       11
       -
        

     

       12
       12
       -
        www: $(HTMLS) $(PDFS) $(THUMBS) lowdown.tar.gz lowdown.tar.gz.sha512

     

       13
       13
       -
        

     

       14
       14
       -
       @@ -101,6 +101,10 @@ lowdown-diff: lowdown

     

       15
       15
       -
        liblowdown.a: $(OBJS) $(COMPAT_OBJS)

     

       16
       16
       -
        	$(AR) rs $@ $(OBJS) $(COMPAT_OBJS)

     

       17
       17
       -
        

     

       18
       18
       -
       +%.o: CFLAGS += -fPIC

     

       19
       19
       -
       +liblowdown.so: $(OBJS) $(COMPAT_OBJS)

     

       20
       20
       -
       +	$(CC) -shared -o $@ $(OBJS) $(COMPAT_OBJS) $(LDFLAGS)

     

       21
       21
       -
       +

     

       22
       22
       -
        install: all

     

       23
       23
       -
        	mkdir -p $(DESTDIR)$(BINDIR)

     

       24
       24
       -
        	mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig

     

       25
       25
       -
       @@ -111,7 +114,7 @@ install: all

     

       26
       26
       -
        	$(INSTALL_DATA) lowdown.pc $(DESTDIR)$(LIBDIR)/pkgconfig

     

       27
       27
       -
        	$(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR)

     

       28
       28
       -
        	$(INSTALL_PROGRAM) lowdown-diff $(DESTDIR)$(BINDIR)

     

       29
       29
       -
       -	$(INSTALL_LIB) liblowdown.a $(DESTDIR)$(LIBDIR)

     

       30
       30
       -
       +	$(INSTALL_LIB) liblowdown.so $(DESTDIR)$(LIBDIR)

     

       31
       31
       -
        	$(INSTALL_DATA) lowdown.h $(DESTDIR)$(INCLUDEDIR)

     

       32
       32
       -
        	for f in $(MANS) ; do \

     

       33
       33
       -
        		name=`basename $$f .html` ; \

     

       34
       34
       -
       @@ -199,7 +202,7 @@ main.o: lowdown.h

     

       35
       35
       -
        

     

       36
       36
       -
        clean:

     

       37
       37
       -
        	rm -f $(OBJS) $(COMPAT_OBJS) main.o

     

       38
       38
       -
       -	rm -f lowdown lowdown-diff liblowdown.a lowdown.pc

     

       39
       39
       -
       +	rm -f lowdown lowdown-diff liblowdown.so lowdown.pc

     

       40
       40
       -
        	rm -f index.xml diff.xml diff.diff.xml README.xml lowdown.tar.gz.sha512 lowdown.tar.gz

     

       41
       41
       -
        	rm -f $(PDFS) $(HTMLS) $(THUMBS)

     

       42
       42
       -

+1

pkgs/top-level/aliases.nix

···

       1012
       1012
        
         readline80 = throw "readline-8.0 is no longer supported in nixpkgs, please use 'readline' for main supported version or 'readline81' for most recent version"; # Added 2021-04-22

     

       1013
       1013
        
         redkite = throw "redkite was archived by upstream"; # Added 2021-04-12

     

       1014
       1014
        
         redshift-wlr = throw "redshift-wlr has been replaced by gammastep"; # Added 2021-12-25

     

       1015
       1015
       +
         reicast = throw "reicast has been removed from nixpkgs as it is unmaintained, please use flycast instead"; # Added 2022-03-07

     

       1015
       1016
        
         renpy = throw "renpy has been removed from nixpkgs, it was unmaintained and the latest packaged version required python2"; # Added 2022-01-12

     

       1016
       1017
        
         residualvm = throw "residualvm was merged to scummvm code in 2018-06-15; consider using scummvm"; # Added 2021-11-27

     

       1017
       1018
        
         retroArchCores = throw "retroArchCores has been removed. Please use overrides instead, e.g.: `retroarch.override { cores = with libretro; [ ... ]; }`"; # Added 2021-11-19

+26 -13

pkgs/top-level/all-packages.nix

···

       2853
       2853
        
       

     

       2854
       2854
        
         damon = callPackage ../tools/admin/damon { };

     

       2855
       2855
        
       

     

       2856
       2856
       +
         dancing-script = callPackage ../data/fonts/dancing-script { };

     

       2857
       2857
       +
       

     

       2856
       2858
        
         dante = callPackage ../servers/dante { };

     

       2857
       2859
        
       

     

       2858
       2860
        
         dapr-cli = callPackage ../development/tools/dapr/cli {};

     
···

       3452
       3454
        
         klog = qt5.callPackage ../applications/radio/klog { };

     

       3453
       3455
        
       

     

       3454
       3456
        
         krapslog = callPackage ../tools/misc/krapslog { };

     

       3457
       3457
       +
       

     

       3458
       3458
       +
         krelay = callPackage ../applications/networking/cluster/krelay { };

     

       3455
       3459
        
       

     

       3456
       3460
        
         krill = callPackage ../servers/krill {

     

       3457
       3461
        
           inherit (darwin.apple_sdk.frameworks) Security;

     
···

       9478
       9482
        
       

     

       9479
       9483
        
         repseek = callPackage ../applications/science/biology/repseek { };

     

       9480
       9484
        
       

     

       9481
       9481
       -
         reicast = callPackage ../applications/emulators/reicast { };

     

       9482
       9482
       -
       

     

       9483
       9485
        
         reredirect = callPackage ../tools/misc/reredirect { };

     

       9484
       9486
        
       

     

       9485
       9487
        
         retext = libsForQt5.callPackage ../applications/editors/retext { };

     
···

       10256
       10258
        
         sslscan = callPackage ../tools/security/sslscan { };

     

       10257
       10259
        
       

     

       10258
       10260
        
         sslmate = callPackage ../development/tools/sslmate { };

     

       10261
       10261
       +
       

     

       10262
       10262
       +
         sslmate-agent = callPackage ../development/tools/sslmate-agent { };

     

       10259
       10263
        
       

     

       10260
       10264
        
         sshoogr = callPackage ../tools/networking/sshoogr { };

     

       10261
       10265
        
       

     
···

       12154
       12158
        
         fennel = callPackage ../development/compilers/fennel { };

     

       12155
       12159
        
       

     

       12156
       12160
        
         flasm = callPackage ../development/compilers/flasm { };

     

       12161
       12161
       +
       

     

       12162
       12162
       +
         flycast = callPackage ../applications/emulators/flycast { };

     

       12157
       12163
        
       

     

       12158
       12164
        
         flyctl = callPackage ../development/web/flyctl { };

     

       12159
       12165
        
       

     
···

       21290
       21296
        
         clamsmtp = callPackage ../servers/mail/clamsmtp { };

     

       21291
       21297
        
       

     

       21292
       21298
        
         clickhouse = callPackage ../servers/clickhouse {

     

       21293
       21293
       -
           # upstream requires llvm10 as of v20.11.4.13

     

       21294
       21294
       -
           inherit (llvmPackages_10) clang-unwrapped lld llvm;

     

       21295
       21295
       -
           llvm-bintools = llvmPackages_10.bintools;

     

       21299
       21299
       +
           # upstream requires llvm12 as of v22.3.2.2

     

       21300
       21300
       +
           inherit (llvmPackages_12) clang-unwrapped lld llvm;

     

       21301
       21301
       +
           llvm-bintools = llvmPackages_12.bintools;

     

       21302
       21302
       +
           stdenv = llvmPackages_12.stdenv;

     

       21296
       21303
        
         };

     

       21297
       21304
        
       

     

       21298
       21305
        
         clickhouse-cli = with python3Packages; toPythonApplication clickhouse-cli;

     
···

       22990
       22997
        
         lvm2-2_02 = callPackage ../os-specific/linux/lvm2/2_02.nix {

     

       22991
       22998
        
           udev = systemdMinimal;

     

       22992
       22999
        
         };

     

       22993
       22993
       -
         lvm2 = if stdenv.targetPlatform.isMusl then lvm2-2_02 else lvm2-2_03;

     

       23000
       23000
       +
         lvm2 = if stdenv.hostPlatform.isMusl then lvm2-2_02 else lvm2-2_03;

     

       22994
       23001
        
       

     

       22995
       23002
        
         lvm2_dmeventd = lvm2.override {

     

       22996
       23003
        
           enableDmeventd = true;

     
···

       24803
       24810
        
         assign-lb-ip = callPackage ../applications/networking/cluster/assign-lb-ip { };

     

       24804
       24811
        
       

     

       24805
       24812
        
         astroid = callPackage ../applications/networking/mailreaders/astroid {

     

       24806
       24806
       -
           vim = vim_configurable.override { features = "normal"; gui = "auto"; };

     

       24813
       24813
       +
           vim = vim_configurable.override { features = "normal"; };

     

       24807
       24814
        
         };

     

       24808
       24815
        
       

     

       24809
       24816
        
         aucatctl = callPackage ../applications/audio/aucatctl { };

     
···

       29631
       29638
        
       

     

       29632
       29639
        
         tonelib-zoom = callPackage ../applications/audio/tonelib-zoom { };

     

       29633
       29640
        
       

     

       29641
       29641
       +
         tonelib-metal = callPackage ../applications/audio/tonelib-metal { };

     

       29642
       29642
       +
       

     

       29634
       29643
        
         tony = libsForQt514.callPackage ../applications/audio/tony { };

     

       29635
       29644
        
       

     

       29636
       29645
        
         toot = callPackage ../applications/misc/toot { };

     
···

       29798
       29807
        
       

     

       29799
       29808
        
         veusz = libsForQt5.callPackage ../applications/graphics/veusz { };

     

       29800
       29809
        
       

     

       29801
       29801
       -
         vim = callPackage ../applications/editors/vim {

     

       29810
       29810
       +
         vim = vimUtils.makeCustomizable (callPackage ../applications/editors/vim {

     

       29802
       29811
        
           inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;

     

       29803
       29803
       -
         };

     

       29812
       29812
       +
         });

     

       29804
       29813
        
       

     

       29805
       29814
        
         vimiv = callPackage ../applications/graphics/vimiv { };

     

       29806
       29815
        
       

     
···

       29813
       29822
        
         vim_configurable = vimUtils.makeCustomizable (callPackage ../applications/editors/vim/configurable.nix {

     

       29814
       29823
        
           inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData;

     

       29815
       29824
        
           inherit (darwin) libobjc;

     

       29816
       29816
       -
           gtk2 = if stdenv.isDarwin then gtk2-x11 else gtk2;

     

       29817
       29817
       -
           gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3;

     

       29818
       29825
        
         });

     

       29819
       29826
        
       

     

       29820
       29827
        
         vim-darwin = (vim_configurable.override {

     
···

       30837
       30844
        
       

     

       30838
       30845
        
         openethereum = callPackage ../applications/blockchains/openethereum { };

     

       30839
       30846
        
       

     

       30840
       30840
       -
         polkadot = callPackage ../applications/blockchains/polkadot { };

     

       30847
       30847
       +
         polkadot = callPackage ../applications/blockchains/polkadot {

     

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

     

       30849
       30849
       +
         };

     

       30841
       30850
        
       

     

       30842
       30851
        
         particl-core = callPackage ../applications/blockchains/particl-core { miniupnpc = miniupnpc_2; };

     

       30843
       30852
        
       

     
···

       32277
       32286
        
         fastp = callPackage ../applications/science/biology/fastp { };

     

       32278
       32287
        
       

     

       32279
       32288
        
         febio-studio = libsForQt5.callPackage ../applications/science/biology/febio-studio { };

     

       32289
       32289
       +
       

     

       32290
       32290
       +
         flywheel-cli = callPackage ../applications/science/biology/flywheel-cli { };

     

       32280
       32291
        
       

     

       32281
       32292
        
         hisat2 = callPackage ../applications/science/biology/hisat2 { };

     

       32282
       32293
        
       

     
···

       34998
       35009
        
       

     

       34999
       35010
        
         unifi-poller = callPackage ../servers/monitoring/unifi-poller {};

     

       35000
       35011
        
       

     

       35001
       35001
       -
         fac-build = callPackage ../development/tools/build-managers/fac {};

     

       35012
       35012
       +
         fac-build = callPackage ../development/tools/build-managers/fac {

     

       35013
       35013
       +
           inherit (darwin.apple_sdk.frameworks) CoreServices;

     

       35014
       35014
       +
         };

     

       35002
       35015
        
       

     

       35003
       35016
        
         treefmt = callPackage ../development/tools/treefmt { };

     

       35004
       35017

+4

pkgs/top-level/perl-packages.nix

···

       18200
       18200
        
             sha256 = "0278anidj7bgassj32g20cbki2kkqakkr3axyq4k90nj4snw7p6x";

     

       18201
       18201
        
           };

     

       18202
       18202
        
           propagatedBuildInputs = [ Future IOAsync PPI PPR PathTiny PerlCritic PerlTidy PodMarkdown URI ];

     

       18203
       18203
       +
           nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;

     

       18204
       18204
       +
           postInstall = lib.optionalString stdenv.isDarwin ''

     

       18205
       18205
       +
             shortenPerlShebang $out/bin/pls

     

       18206
       18206
       +
           '';

     

       18203
       18207
        
           meta = {

     

       18204
       18208
        
             homepage = "https://github.com/FractalBoy/perl-language-server";

     

       18205
       18209
        
             description = "Perl Language Server";

+2

pkgs/top-level/python-packages.nix

···

       5626
       5626
        
       

     

       5627
       5627
        
         notify2 = callPackage ../development/python-modules/notify2 { };

     

       5628
       5628
        
       

     

       5629
       5629
       +
         notifymuch = callPackage ../development/python-modules/notifymuch {};

     

       5630
       5630
       +
       

     

       5629
       5631
        
         notmuch = callPackage ../development/python-modules/notmuch {

     

       5630
       5632
        
           inherit (pkgs) notmuch;

     

       5631
       5633
        
         };