commit 2a1a48405005765139a955b39c0351120f08ed07 · pyrox.dev/nixpkgs

+1 -1

doc/builders/fetchers.chapter.md

···

6
6

7
7

Because fixed output derivations are _identified_ by their hash, a common mistake is to update a fetcher's URL or a version parameter, without updating the hash. **This will cause the old contents to be used.** So remember to always invalidate the hash argument.

8
8

9
9
-
For those who develop and maintain fetcheres, a similar problem arises with changes to the implementation of a fetcher. These may cause a fixed output derivation to fail, but won't normally be caught by tests because the supposed output is already in the store or cache. For the purpose of testing, you can use a trick that is embodied by the [`invalidateFetcherByDrvHash`](#sec-pkgs-invalidateFetcherByDrvHash) function. It uses the derivation `name` to create a unique output path per fetcher implementation, defeating the caching precisely where it would be harmful.

9
9
+
For those who develop and maintain fetchers, a similar problem arises with changes to the implementation of a fetcher. These may cause a fixed output derivation to fail, but won't normally be caught by tests because the supposed output is already in the store or cache. For the purpose of testing, you can use a trick that is embodied by the [`invalidateFetcherByDrvHash`](#sec-pkgs-invalidateFetcherByDrvHash) function. It uses the derivation `name` to create a unique output path per fetcher implementation, defeating the caching precisely where it would be harmful.

10
10

11
11

## `fetchurl` and `fetchzip` {#fetchurl}

12
12

+12 -8

doc/languages-frameworks/r.section.md

···

       96
       96
        
       

     

       97
       97
        
       ## Updating the package set {#updating-the-package-set}

     

       98
       98
        
       

     

       99
       99
       +
       There is a script and associated environment for regenerating the package

     

       100
       100
       +
       sets and synchronising the rPackages tree to the current CRAN and matching

     

       101
       101
       +
       BIOC release. These scripts are found in the `pkgs/development/r-modules`

     

       102
       102
       +
       directory and executed as follows:

     

       103
       103
       +
       

     

       99
       104
        
       ```bash

     

       100
       105
        
       nix-shell generate-shell.nix

     

       101
       106
        
       

     
···

       112
       117
        
       mv bioc-experiment-packages.nix.new bioc-experiment-packages.nix

     

       113
       118
        
       ```

     

       114
       119
        
       

     

       115
       115
       -
       `generate-r-packages.R <repo>` reads  `<repo>-packages.nix`, therefor the renaming.

     

       120
       120
       +
       `generate-r-packages.R <repo>` reads  `<repo>-packages.nix`, therefore

     

       121
       121
       +
       the renaming.

     

       116
       122
        
       

     

       117
       117
       -
       ## Testing if the Nix-expression could be evaluated {#testing-if-the-nix-expression-could-be-evaluated}

     

       118
       118
       -
       

     

       119
       119
       -
       ```bash

     

       120
       120
       -
       nix-build test-evaluation.nix --dry-run

     

       121
       121
       -
       ```

     

       122
       122
       -
       

     

       123
       123
       -
       If this exits fine, the expression is ok. If not, you have to edit `default.nix`

     

       123
       123
       +
       Some packages require overrides to specify external dependencies or other

     

       124
       124
       +
       patches and special requirements. These overrides are specified in the

     

       125
       125
       +
       `pkgs/development/r-modules/default.nix` file. As the `*-packages.nix`

     

       126
       126
       +
       contents are automatically generated it should not be edited and broken

     

       127
       127
       +
       builds should be addressed using overrides.

+1 -1

maintainers/scripts/luarocks-packages.csv

···

       68
       68
        
       luazip,,,,,,

     

       69
       69
        
       lua-yajl,,,,,,pstn

     

       70
       70
        
       luuid,,,,,,

     

       71
       71
       -
       luv,,,,1.30.0-0,,

     

       71
       71
       +
       luv,,,,1.42.0-0,,

     

       72
       72
        
       lyaml,,,,,,lblasc

     

       73
       73
        
       markdown,,,,,,

     

       74
       74
        
       mediator_lua,,,,,,

+65 -14

nixos/modules/services/backup/syncoid.nix

···

       16
       16
        
           lib.concatMapStrings (s: if lib.isList s then "-" else s)

     

       17
       17
        
             (builtins.split "[^a-zA-Z0-9_.\\-]+" name);

     

       18
       18
        
       

     

       19
       19
       -
         # Function to build "zfs allow" and "zfs unallow" commands for the

     

       20
       20
       -
         # filesystems we've delegated permissions to.

     

       21
       21
       -
         buildAllowCommand = zfsAction: permissions: dataset: lib.escapeShellArgs [

     

       22
       22
       -
           # Here we explicitly use the booted system to guarantee the stable API needed by ZFS

     

       23
       23
       -
           "-+/run/booted-system/sw/bin/zfs"

     

       24
       24
       -
           zfsAction

     

       25
       25
       -
           cfg.user

     

       26
       26
       -
           (concatStringsSep "," permissions)

     

       27
       27
       -
           dataset

     

       28
       28
       -
         ];

     

       19
       19
       +
         # Function to build "zfs allow" commands for the filesystems we've

     

       20
       20
       +
         # delegated permissions to. It also checks if the target dataset

     

       21
       21
       +
         # exists before delegating permissions, if it doesn't exist we

     

       22
       22
       +
         # delegate it to the parent dataset. This should solve the case of

     

       23
       23
       +
         # provisoning new datasets.

     

       24
       24
       +
         buildAllowCommand = permissions: dataset: (

     

       25
       25
       +
           "-+${pkgs.writeShellScript "zfs-allow-${dataset}" ''

     

       26
       26
       +
             # Here we explicitly use the booted system to guarantee the stable API needed by ZFS

     

       27
       27
       +
       

     

       28
       28
       +
             # Run a ZFS list on the dataset to check if it exists

     

       29
       29
       +
             if ${lib.escapeShellArgs [

     

       30
       30
       +
               "/run/booted-system/sw/bin/zfs"

     

       31
       31
       +
               "list"

     

       32
       32
       +
               dataset

     

       33
       33
       +
             ]} 2> /dev/null; then

     

       34
       34
       +
               ${lib.escapeShellArgs [

     

       35
       35
       +
                 "/run/booted-system/sw/bin/zfs"

     

       36
       36
       +
                 "allow"

     

       37
       37
       +
                 cfg.user

     

       38
       38
       +
                 (concatStringsSep "," permissions)

     

       39
       39
       +
                 dataset

     

       40
       40
       +
               ]}

     

       41
       41
       +
             else

     

       42
       42
       +
               ${lib.escapeShellArgs [

     

       43
       43
       +
                 "/run/booted-system/sw/bin/zfs"

     

       44
       44
       +
                 "allow"

     

       45
       45
       +
                 cfg.user

     

       46
       46
       +
                 (concatStringsSep "," permissions)

     

       47
       47
       +
                 # Remove the last part of the path

     

       48
       48
       +
                 (builtins.dirOf dataset)

     

       49
       49
       +
               ]}

     

       50
       50
       +
             fi

     

       51
       51
       +
           ''}"

     

       52
       52
       +
         );

     

       53
       53
       +
       

     

       54
       54
       +
         # Function to build "zfs unallow" commands for the filesystems we've

     

       55
       55
       +
         # delegated permissions to. Here we unallow both the target but also

     

       56
       56
       +
         # on the parent dataset because at this stage we have no way of

     

       57
       57
       +
         # knowing if the allow command did execute on the parent dataset or

     

       58
       58
       +
         # not in the pre-hook. We can't run the same if in the post hook

     

       59
       59
       +
         # since the dataset should have been created at this point.

     

       60
       60
       +
         buildUnallowCommand = permissions: dataset: (

     

       61
       61
       +
           "-+${pkgs.writeShellScript "zfs-unallow-${dataset}" ''

     

       62
       62
       +
             # Here we explicitly use the booted system to guarantee the stable API needed by ZFS

     

       63
       63
       +
             ${lib.escapeShellArgs [

     

       64
       64
       +
               "/run/booted-system/sw/bin/zfs"

     

       65
       65
       +
               "unallow"

     

       66
       66
       +
               cfg.user

     

       67
       67
       +
               (concatStringsSep "," permissions)

     

       68
       68
       +
               dataset

     

       69
       69
       +
             ]}

     

       70
       70
       +
             ${lib.escapeShellArgs [

     

       71
       71
       +
               "/run/booted-system/sw/bin/zfs"

     

       72
       72
       +
               "unallow"

     

       73
       73
       +
               cfg.user

     

       74
       74
       +
               (concatStringsSep "," permissions)

     

       75
       75
       +
               # Remove the last part of the path

     

       76
       76
       +
               (builtins.dirOf dataset)

     

       77
       77
       +
             ]}

     

       78
       78
       +
           ''}"

     

       79
       79
       +
         );

     

       29
       80
        
       in

     

       30
       81
        
       {

     

       31
       82
        
       

     
···

       274
       325
        
                   path = [ "/run/booted-system/sw/bin/" ];

     

       275
       326
        
                   serviceConfig = {

     

       276
       327
        
                     ExecStartPre =

     

       277
       277
       -
                       (map (buildAllowCommand "allow" c.localSourceAllow) (localDatasetName c.source)) ++

     

       278
       278
       -
                       (map (buildAllowCommand "allow" c.localTargetAllow) (localDatasetName c.target));

     

       328
       328
       +
                       (map (buildAllowCommand c.localSourceAllow) (localDatasetName c.source)) ++

     

       329
       329
       +
                       (map (buildAllowCommand c.localTargetAllow) (localDatasetName c.target));

     

       279
       330
        
                     ExecStopPost =

     

       280
       280
       -
                       (map (buildAllowCommand "unallow" c.localSourceAllow) (localDatasetName c.source)) ++

     

       281
       281
       -
                       (map (buildAllowCommand "unallow" c.localTargetAllow) (localDatasetName c.target));

     

       331
       331
       +
                       (map (buildUnallowCommand c.localSourceAllow) (localDatasetName c.source)) ++

     

       332
       332
       +
                       (map (buildUnallowCommand c.localTargetAllow) (localDatasetName c.target));

     

       282
       333
        
                     ExecStart = lib.escapeShellArgs ([ "${pkgs.sanoid}/bin/syncoid" ]

     

       283
       334
        
                       ++ optionals c.useCommonArgs cfg.commonArgs

     

       284
       335
        
                       ++ optional c.recursive "-r"

+1 -1

nixos/modules/services/mail/postfix.nix

···

       544
       544
        
               type = types.lines;

     

       545
       545
        
               default = "";

     

       546
       546
        
               description = "

     

       547
       547
       -
                 Entries for the virtual alias map, cf. man-page virtual(8).

     

       547
       547
       +
                 Entries for the virtual alias map, cf. man-page virtual(5).

     

       548
       548
        
               ";

     

       549
       549
        
             };

     

       550
       550

+30 -9

nixos/modules/services/misc/snapper.nix

···

       9
       9
        
       {

     

       10
       10
        
         options.services.snapper = {

     

       11
       11
        
       

     

       12
       12
       +
           snapshotRootOnBoot = mkOption {

     

       13
       13
       +
             type = types.bool;

     

       14
       14
       +
             default = false;

     

       15
       15
       +
             description = ''

     

       16
       16
       +
               Whether to snapshot root on boot

     

       17
       17
       +
             '';

     

       18
       18
       +
           };

     

       19
       19
       +
       

     

       12
       20
        
           snapshotInterval = mkOption {

     

       13
       21
        
             type = types.str;

     

       14
       22
        
             default = "hourly";

     
···

       130
       138
        
               Type = "dbus";

     

       131
       139
        
               BusName = "org.opensuse.Snapper";

     

       132
       140
        
               ExecStart = "${pkgs.snapper}/bin/snapperd";

     

       141
       141
       +
               CapabilityBoundingSet = "CAP_DAC_OVERRIDE CAP_FOWNER CAP_CHOWN CAP_FSETID CAP_SETFCAP CAP_SYS_ADMIN CAP_SYS_MODULE CAP_IPC_LOCK CAP_SYS_NICE";

     

       142
       142
       +
               LockPersonality = true;

     

       143
       143
       +
               NoNewPrivileges = false;

     

       144
       144
       +
               PrivateNetwork = true;

     

       145
       145
       +
               ProtectHostname = true;

     

       146
       146
       +
               RestrictAddressFamilies = "AF_UNIX";

     

       147
       147
       +
               RestrictRealtime = true;

     

       133
       148
        
             };

     

       134
       149
        
           };

     

       135
       150
        
       

     

       136
       151
        
           systemd.services.snapper-timeline = {

     

       137
       152
        
             description = "Timeline of Snapper Snapshots";

     

       138
       153
        
             inherit documentation;

     

       154
       154
       +
             requires = [ "local-fs.target" ];

     

       139
       155
        
             serviceConfig.ExecStart = "${pkgs.snapper}/lib/snapper/systemd-helper --timeline";

     

       140
       140
       -
           };

     

       141
       141
       -
       

     

       142
       142
       -
           systemd.timers.snapper-timeline = {

     

       143
       143
       -
             description = "Timeline of Snapper Snapshots";

     

       144
       144
       -
             inherit documentation;

     

       145
       145
       -
             wantedBy = [ "basic.target" ];

     

       146
       146
       -
             timerConfig.OnCalendar = cfg.snapshotInterval;

     

       156
       156
       +
             startAt = cfg.snapshotInterval;

     

       147
       157
        
           };

     

       148
       158
        
       

     

       149
       159
        
           systemd.services.snapper-cleanup = {

     
···

       155
       165
        
           systemd.timers.snapper-cleanup = {

     

       156
       166
        
             description = "Cleanup of Snapper Snapshots";

     

       157
       167
        
             inherit documentation;

     

       158
       158
       -
             wantedBy = [ "basic.target" ];

     

       168
       168
       +
             wantedBy = [ "timers.target" ];

     

       169
       169
       +
             requires = [ "local-fs.target" ];

     

       159
       170
        
             timerConfig.OnBootSec = "10m";

     

       160
       171
        
             timerConfig.OnUnitActiveSec = cfg.cleanupInterval;

     

       161
       172
        
           };

     

       173
       173
       +
       

     

       174
       174
       +
           systemd.services.snapper-boot = lib.optionalAttrs cfg.snapshotRootOnBoot {

     

       175
       175
       +
             description = "Take snapper snapshot of root on boot";

     

       176
       176
       +
             inherit documentation;

     

       177
       177
       +
             serviceConfig.ExecStart = "${pkgs.snapper}/bin/snapper --config root create --cleanup-algorithm number --description boot";

     

       178
       178
       +
             serviceConfig.type = "oneshot";

     

       179
       179
       +
             requires = [ "local-fs.target" ];

     

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

     

       181
       181
       +
             unitConfig.ConditionPathExists = "/etc/snapper/configs/root";

     

       182
       182
       +
           };

     

       183
       183
       +
       

     

       162
       184
        
         });

     

       163
       185
        
       }

     

       164
       164
       -

+1

nixos/modules/services/monitoring/prometheus/exporters.nix

+41

nixos/modules/services/monitoring/prometheus/exporters/fastly.nix

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let cfg = config.services.prometheus.exporters.fastly;

     

       6
       6
       +
       in

     

       7
       7
       +
       {

     

       8
       8
       +
         port = 9118;

     

       9
       9
       +
         extraOpts = {

     

       10
       10
       +
           debug = mkEnableOption "Debug logging mode for fastly-exporter";

     

       11
       11
       +
       

     

       12
       12
       +
           configFile = mkOption {

     

       13
       13
       +
             type = types.nullOr types.path;

     

       14
       14
       +
             default = null;

     

       15
       15
       +
             description = ''

     

       16
       16
       +
               Path to a fastly-exporter configuration file.

     

       17
       17
       +
               Example one can be generated with <literal>fastly-exporter --config-file-example</literal>.

     

       18
       18
       +
             '';

     

       19
       19
       +
             example = "./fastly-exporter-config.txt";

     

       20
       20
       +
           };

     

       21
       21
       +
       

     

       22
       22
       +
           tokenPath = mkOption {

     

       23
       23
       +
             type = types.nullOr types.path;

     

       24
       24
       +
             apply = final: if final == null then null else toString final;

     

       25
       25
       +
             description = ''

     

       26
       26
       +
               A run-time path to the token file, which is supposed to be provisioned

     

       27
       27
       +
               outside of Nix store.

     

       28
       28
       +
             '';

     

       29
       29
       +
           };

     

       30
       30
       +
         };

     

       31
       31
       +
         serviceOpts = {

     

       32
       32
       +
           script = ''

     

       33
       33
       +
             ${optionalString (cfg.tokenPath != null)

     

       34
       34
       +
             "export FASTLY_API_TOKEN=$(cat ${toString cfg.tokenPath})"}

     

       35
       35
       +
             ${pkgs.fastly-exporter}/bin/fastly-exporter \

     

       36
       36
       +
               -endpoint http://${cfg.listenAddress}:${cfg.port}/metrics

     

       37
       37
       +
               ${optionalString cfg.debug "-debug true"} \

     

       38
       38
       +
               ${optionalString cfg.configFile "-config-file ${cfg.configFile}"}

     

       39
       39
       +
           '';

     

       40
       40
       +
         };

     

       41
       41
       +
       }

+13 -1

nixos/modules/services/web-servers/lighttpd/default.nix

···

       38
       38
        
           "mod_rrdtool"

     

       39
       39
        
           "mod_accesslog"

     

       40
       40
        
           # Remaining list of modules, order assumed to be unimportant.

     

       41
       41
       +
           "mod_authn_dbi"

     

       41
       42
        
           "mod_authn_file"

     

       42
       43
        
           "mod_authn_gssapi"

     

       43
       44
        
           "mod_authn_ldap"

     

       44
       45
        
           "mod_authn_mysql"

     

       46
       46
       +
           "mod_authn_pam"

     

       47
       47
       +
           "mod_authn_sasl"

     

       45
       48
        
           "mod_cml"

     

       46
       49
        
           "mod_deflate"

     

       47
       50
        
           "mod_evasive"

     
···

       129
       132
        
               type = types.bool;

     

       130
       133
        
               description = ''

     

       131
       134
        
                 Enable the lighttpd web server.

     

       135
       135
       +
               '';

     

       136
       136
       +
             };

     

       137
       137
       +
       

     

       138
       138
       +
             package = mkOption {

     

       139
       139
       +
               default = pkgs.lighttpd;

     

       140
       140
       +
               defaultText = "pkgs.lighttpd";

     

       141
       141
       +
               type = types.package;

     

       142
       142
       +
               description = ''

     

       143
       143
       +
                 lighttpd package to use.

     

       132
       144
        
               '';

     

       133
       145
        
             };

     

       134
       146
        
       

     
···

       240
       252
        
             description = "Lighttpd Web Server";

     

       241
       253
        
             after = [ "network.target" ];

     

       242
       254
        
             wantedBy = [ "multi-user.target" ];

     

       243
       243
       -
             serviceConfig.ExecStart = "${pkgs.lighttpd}/sbin/lighttpd -D -f ${configFile}";

     

       255
       255
       +
             serviceConfig.ExecStart = "${cfg.package}/sbin/lighttpd -D -f ${configFile}";

     

       244
       256
        
             # SIGINT => graceful shutdown

     

       245
       257
        
             serviceConfig.KillSignal = "SIGINT";

     

       246
       258
        
           };

+3

pkgs/applications/audio/spot/default.nix

···

       59
       59
        
           libpulseaudio

     

       60
       60
        
         ];

     

       61
       61
        
       

     

       62
       62
       +
         # https://github.com/xou816/spot/issues/313

     

       63
       63
       +
         mesonBuildType = "release";

     

       64
       64
       +
       

     

       62
       65
        
         postPatch = ''

     

       63
       66
        
           chmod +x build-aux/cargo.sh

     

       64
       67
        
           patchShebangs build-aux/cargo.sh build-aux/meson/postinstall.py

+1

pkgs/applications/editors/leo-editor/default.nix

···

       63
       63
        
           longDescription = "Leo is a PIM, IDE and outliner that accelerates the work flow of programmers, authors and web designers.";

     

       64
       64
        
           license = licenses.mit;

     

       65
       65
        
           maintainers = with maintainers; [ leonardoce ];

     

       66
       66
       +
           mainProgram = "leo";

     

       66
       67
        
         };

     

       67
       68
        
       }

+2 -2

pkgs/applications/editors/neovim/default.nix

···

       32
       32
        
       in

     

       33
       33
        
         stdenv.mkDerivation rec {

     

       34
       34
        
           pname = "neovim-unwrapped";

     

       35
       35
       -
           version = "0.5.0";

     

       35
       35
       +
           version = "0.5.1";

     

       36
       36
        
       

     

       37
       37
        
           src = fetchFromGitHub {

     

       38
       38
        
             owner = "neovim";

     

       39
       39
        
             repo = "neovim";

     

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

     

       41
       41
       -
             sha256 = "0lgbf90sbachdag1zm9pmnlbn35964l3khs27qy4462qzpqyi9fi";

     

       41
       41
       +
             sha256 = "0b2gda9h14lvwahrr7kq3ix8wsw99g4ngy1grmhv5544n93ypcyk";

     

       42
       42
        
           };

     

       43
       43
        
       

     

       44
       44
        
           patches = [

+47 -8

pkgs/applications/gis/qgis/unwrapped.nix

···

       1
       1
       -
       { mkDerivation, lib, fetchFromGitHub, cmake, ninja, flex, bison, proj, geos

     

       2
       2
       -
       , xlibsWrapper, sqlite, gsl, qwt, fcgi, python3Packages, libspatialindex

     

       3
       3
       -
       , libspatialite, postgresql, txt2tags, openssl, libzip, hdf5, netcdf, exiv2

     

       4
       4
       -
       , protobuf, qtbase, qtsensors, qca-qt5, qtkeychain, qscintilla, qtserialport

     

       5
       5
       -
       , qtxmlpatterns, withGrass ? true, grass, withWebKit ? true, qtwebkit }:

     

       6
       6
       -
       with lib;

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , mkDerivation

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , fetchpatch

     

       5
       5
       +
       , cmake

     

       6
       6
       +
       , ninja

     

       7
       7
       +
       , flex

     

       8
       8
       +
       , bison

     

       9
       9
       +
       , proj

     

       10
       10
       +
       , geos

     

       11
       11
       +
       , xlibsWrapper

     

       12
       12
       +
       , sqlite

     

       13
       13
       +
       , gsl

     

       14
       14
       +
       , qwt

     

       15
       15
       +
       , fcgi

     

       16
       16
       +
       , python3Packages

     

       17
       17
       +
       , libspatialindex

     

       18
       18
       +
       , libspatialite

     

       19
       19
       +
       , postgresql

     

       20
       20
       +
       , txt2tags

     

       21
       21
       +
       , openssl

     

       22
       22
       +
       , libzip

     

       23
       23
       +
       , hdf5

     

       24
       24
       +
       , netcdf

     

       25
       25
       +
       , exiv2

     

       26
       26
       +
       , protobuf

     

       27
       27
       +
       , qtbase

     

       28
       28
       +
       , qtsensors

     

       29
       29
       +
       , qca-qt5

     

       30
       30
       +
       , qtkeychain

     

       31
       31
       +
       , qscintilla

     

       32
       32
       +
       , qtserialport

     

       33
       33
       +
       , qtxmlpatterns

     

       34
       34
       +
       , withGrass ? true

     

       35
       35
       +
       , grass

     

       36
       36
       +
       , withWebKit ? true

     

       37
       37
       +
       , qtwebkit

     

       38
       38
       +
       }:

     

       39
       39
       +
       

     

       7
       40
        
       let

     

       8
       41
        
         pythonBuildInputs = with python3Packages; [

     

       9
       42
        
           qscintilla-qt5

     
···

       25
       58
        
         ];

     

       26
       59
        
       in mkDerivation rec {

     

       27
       60
        
         version = "3.16.10";

     

       28
       28
       -
         pname = "qgis";

     

       29
       29
       -
         name = "${pname}-unwrapped-${version}";

     

       61
       61
       +
         pname = "qgis-unwrapped";

     

       30
       62
        
       

     

       31
       63
        
         src = fetchFromGitHub {

     

       32
       64
        
           owner = "qgis";

     
···

       34
       66
        
           rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";

     

       35
       67
        
           sha256 = "sha256-/lsfyTDlkZNIVHg5qgZW7qfOyTC2+1r3ZbsnQmEdy30=";

     

       36
       68
        
         };

     

       69
       69
       +
       

     

       70
       70
       +
         patches = [

     

       71
       71
       +
           (fetchpatch {

     

       72
       72
       +
             url = "https://github.com/qgis/QGIS/commit/fc1ac8bef8dcc3194857ecd32519aca4867b4fa1.patch";

     

       73
       73
       +
             sha256 = "106smg3drx8c7yxzfhd1c7xrq757l5cfxx8lklihyvr4a7wc9gpy";

     

       74
       74
       +
           })

     

       75
       75
       +
         ];

     

       37
       76
        
       

     

       38
       77
        
         passthru = {

     

       39
       78
        
           inherit pythonBuildInputs;

+2 -2

pkgs/applications/graphics/feh/default.nix

···

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         pname = "feh";

     

       10
       10
       -
         version = "3.7.1";

     

       10
       10
       +
         version = "3.7.2";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchurl {

     

       13
       13
        
           url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2";

     

       14
       14
       -
           sha256 = "sha256-V6scph9XyWWVh4Bp9VDTb1GFMPiPoxt0zDnNc5+SWLY=";

     

       14
       14
       +
           sha256 = "sha256-hHGP0nIM9UDSRXaElP4OtOWY9Es54jJrrow2ioKcglg=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         outputs = [ "out" "man" "doc" ];

+2

pkgs/applications/kde/akregator.nix

···

       12
       12
        
       mkDerivation {

     

       13
       13
        
         pname = "akregator";

     

       14
       14
        
         meta = {

     

       15
       15
       +
           homepage = "https://apps.kde.org/akregator/";

     

       16
       16
       +
           description = "KDE feed reader";

     

       15
       17
        
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       16
       18
        
           maintainers = kdepimTeam;

     

       17
       19
        
         };

+1

pkgs/applications/kde/ark/default.nix

···

       30
       30
        
         qtWrapperArgs = [ "--prefix" "PATH" ":" (lib.makeBinPath extraTools) ];

     

       31
       31
        
       

     

       32
       32
        
         meta = with lib; {

     

       33
       33
       +
           homepage = "https://apps.kde.org/ark/";

     

       33
       34
        
           description = "Graphical file compression/decompression utility";

     

       34
       35
        
           license = with licenses; [ gpl2 lgpl3 ] ++ optional unfreeEnableUnrar unfree;

     

       35
       36
        
           maintainers = [ maintainers.ttuegel ];

+2

pkgs/applications/kde/dolphin.nix

···

       11
       11
        
       mkDerivation {

     

       12
       12
        
         pname = "dolphin";

     

       13
       13
        
         meta = {

     

       14
       14
       +
           homepage = "https://apps.kde.org/dolphin/";

     

       15
       15
       +
           description = "KDE file manager";

     

       14
       16
        
           license = with lib.licenses; [ gpl2 fdl12 ];

     

       15
       17
        
           maintainers = [ lib.maintainers.ttuegel ];

     

       16
       18
        
           broken = lib.versionOlder qtbase.version "5.14";

+1

pkgs/applications/kde/dragon.nix

···

       10
       10
        
       mkDerivation {

     

       11
       11
        
         pname = "dragon";

     

       12
       12
        
         meta = {

     

       13
       13
       +
           homepage = "https://apps.kde.org/dragonplayer/";

     

       13
       14
        
           license = with lib.licenses; [ gpl2 fdl12 ];

     

       14
       15
        
           description = "A simple media player for KDE";

     

       15
       16
        
           maintainers = [ lib.maintainers.jonathanreeve ];

+1

pkgs/applications/kde/elisa.nix

···

       40
       40
        
         ];

     

       41
       41
        
       

     

       42
       42
        
         meta = with lib; {

     

       43
       43
       +
           homepage = "https://apps.kde.org/elisa/";

     

       43
       44
        
           description = "A simple media player for KDE";

     

       44
       45
        
           license = licenses.gpl3;

     

       45
       46
        
           maintainers = with maintainers; [ peterhoeg ];

+2

pkgs/applications/kde/filelight.nix

···

       7
       7
        
       mkDerivation {

     

       8
       8
        
         pname = "filelight";

     

       9
       9
        
         meta = {

     

       10
       10
       +
           description = "Disk usage statistics";

     

       11
       11
       +
           homepage = "https://apps.kde.org/filelight/";

     

       10
       12
        
           license = with lib.licenses; [ gpl2 ];

     

       11
       13
        
           maintainers = with lib.maintainers; [ fridh vcunat ];

     

       12
       14
        
           broken = lib.versionOlder qtbase.version "5.13";

+2

pkgs/applications/kde/gwenview.nix

···

       9
       9
        
       mkDerivation {

     

       10
       10
        
         pname = "gwenview";

     

       11
       11
        
         meta = {

     

       12
       12
       +
           homepage = "https://apps.kde.org/gwenview/";

     

       13
       13
       +
           description = "KDE image viewer";

     

       12
       14
        
           license = with lib.licenses; [ gpl2 fdl12 ];

     

       13
       15
        
           maintainers = [ lib.maintainers.ttuegel ];

     

       14
       16
        
         };

+2

pkgs/applications/kde/k3b.nix

···

       10
       10
        
       mkDerivation {

     

       11
       11
        
         pname = "k3b";

     

       12
       12
        
         meta = with lib; {

     

       13
       13
       +
           homepage = "https://apps.kde.org/k3b/";

     

       14
       14
       +
           description = "Disk burning application";

     

       13
       15
        
           license = with licenses; [ gpl2Plus ];

     

       14
       16
        
           maintainers = with maintainers; [ sander phreedom ];

     

       15
       17
        
           platforms = platforms.linux;

+2

pkgs/applications/kde/kaddressbook.nix

···

       10
       10
        
       mkDerivation {

     

       11
       11
        
         pname = "kaddressbook";

     

       12
       12
        
         meta = {

     

       13
       13
       +
           homepage = "https://apps.kde.org/kaddressbook/";

     

       14
       14
       +
           description = "KDE contact manager";

     

       13
       15
        
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       14
       16
        
           maintainers = kdepimTeam;

     

       15
       17
        
         };

+2

pkgs/applications/kde/kalarm.nix

···

       19
       19
        
       mkDerivation {

     

       20
       20
        
         pname = "kalarm";

     

       21
       21
        
         meta = {

     

       22
       22
       +
           homepage = "https://apps.kde.org/kalarm/";

     

       23
       23
       +
           description = "Personal alarm scheduler";

     

       22
       24
        
           license = with lib.licenses; [ gpl2 ];

     

       23
       25
        
           maintainers = [ lib.maintainers.rittelle ];

     

       24
       26
        
         };

+5 -1

pkgs/applications/kde/kamoso.nix

···

       37
       37
        
           "--prefix GST_PLUGIN_PATH : ${lib.makeSearchPath "lib/gstreamer-1.0" gst}"

     

       38
       38
        
         ];

     

       39
       39
        
       

     

       40
       40
       -
         meta.license = with lib.licenses; [ lgpl21Only gpl3Only ];

     

       40
       40
       +
         meta = {

     

       41
       41
       +
           homepage = "https://apps.kde.org/kamoso/";

     

       42
       42
       +
           description = "A simple and friendly program to use your camera";

     

       43
       43
       +
           license = with lib.licenses; [ lgpl21Only gpl3Only ];

     

       44
       44
       +
         };

     

       41
       45
        
       }

+2

pkgs/applications/kde/kate.nix

···

       10
       10
        
       mkDerivation {

     

       11
       11
        
         pname = "kate";

     

       12
       12
        
         meta = {

     

       13
       13
       +
           homepage = "https://apps.kde.org/kate/";

     

       14
       14
       +
           description = "Advanced text editor";

     

       13
       15
        
           license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];

     

       14
       16
        
           maintainers = [ lib.maintainers.ttuegel ];

     

       15
       17
        
         };

+5 -1

pkgs/applications/kde/kbreakout.nix

···

       11
       11
        
       

     

       12
       12
        
       mkDerivation {

     

       13
       13
        
         pname = "kbreakout";

     

       14
       14
       -
         meta.license = with lib.licenses; [ lgpl21 gpl3 ];

     

       14
       14
       +
         meta = {

     

       15
       15
       +
           homepage = "KBreakOut";

     

       16
       16
       +
           description = "Breakout-like game";

     

       17
       17
       +
           license = with lib.licenses; [ lgpl21 gpl3 ];

     

       18
       18
       +
         };

     

       15
       19
        
         outputs = [ "out" "dev" ];

     

       16
       20
        
         nativeBuildInputs = [

     

       17
       21
        
           cmake extra-cmake-modules

+2

pkgs/applications/kde/kcachegrind.nix

···

       8
       8
        
       mkDerivation {

     

       9
       9
        
         pname = "kcachegrind";

     

       10
       10
        
         meta = {

     

       11
       11
       +
           homepage = "https://apps.kde.org/kcachegrind/";

     

       12
       12
       +
           description = "Profiler frontend";

     

       11
       13
        
           license = with lib.licenses; [ gpl2 ];

     

       12
       14
        
           maintainers = with lib.maintainers; [ orivej ];

     

       13
       15
        
         };

+2

pkgs/applications/kde/kcalc.nix

···

       8
       8
        
       mkDerivation {

     

       9
       9
        
         pname = "kcalc";

     

       10
       10
        
         meta = {

     

       11
       11
       +
           homepage = "https://apps.kde.org/kcalc/";

     

       12
       12
       +
           description = "Scientific calculator";

     

       11
       13
        
           license = with lib.licenses; [ gpl2 ];

     

       12
       14
        
           maintainers = [ lib.maintainers.fridh ];

     

       13
       15
        
         };

+1

pkgs/applications/kde/kcharselect.nix

···

       7
       7
        
       mkDerivation {

     

       8
       8
        
         pname = "kcharselect";

     

       9
       9
        
         meta = {

     

       10
       10
       +
           homepage = "https://apps.kde.org/kcharselect/";

     

       10
       11
        
           license = lib.licenses.gpl2Plus;

     

       11
       12
        
           maintainers = [ lib.maintainers.schmittlauch ];

     

       12
       13
        
           description = "A tool to select special characters from all installed fonts and copy them into the clipboard";

+2

pkgs/applications/kde/kcolorchooser.nix

···

       7
       7
        
       mkDerivation {

     

       8
       8
        
         pname = "kcolorchooser";

     

       9
       9
        
         meta = {

     

       10
       10
       +
           homepage = "https://apps.kde.org/kcolorchooser/";

     

       11
       11
       +
           description = "Color chooser";

     

       10
       12
        
           license = with lib.licenses; [ mit ];

     

       11
       13
        
           maintainers = [ lib.maintainers.ttuegel ];

     

       12
       14
        
         };

+2

pkgs/applications/kde/kdebugsettings.nix

···

       9
       9
        
       mkDerivation {

     

       10
       10
        
         pname = "kdebugsettings";

     

       11
       11
        
         meta = {

     

       12
       12
       +
           homepage = "https://apps.kde.org/kdebugsettings/";

     

       13
       13
       +
           description = "KDE debug settings";

     

       12
       14
        
           license = with lib.licenses; [ gpl2 ];

     

       13
       15
        
           maintainers = [ lib.maintainers.rittelle ];

     

       14
       16
        
           broken = lib.versionOlder qtbase.version "5.13";

+2

pkgs/applications/kde/kdenlive/default.nix

···

       101
       101
        
         '';

     

       102
       102
        
       

     

       103
       103
        
         meta = {

     

       104
       104
       +
           homepage = "https://apps.kde.org/kdenlive/";

     

       105
       105
       +
           description = "Video editor";

     

       104
       106
        
           license = with lib.licenses; [ gpl2Plus ];

     

       105
       107
        
           maintainers = with lib.maintainers; [ turion ];

     

       106
       108
        
         };

+2

pkgs/applications/kde/kdialog.nix

···

       8
       8
        
         pname = "kdialog";

     

       9
       9
        
       

     

       10
       10
        
         meta = {

     

       11
       11
       +
           homepage = "https://apps.kde.org/kdialog/";

     

       12
       12
       +
           description = "Display dialog boxes from shell scripts";

     

       11
       13
        
           license = with lib.licenses; [ gpl2 fdl12 ];

     

       12
       14
        
           maintainers = with lib.maintainers; [ peterhoeg ];

     

       13
       15
        
         };

+2

pkgs/applications/kde/kfind.nix

···

       7
       7
        
       mkDerivation {

     

       8
       8
        
         pname = "kfind";

     

       9
       9
        
         meta = {

     

       10
       10
       +
           homepage = "https://apps.kde.org/kfind/";

     

       11
       11
       +
           description = "Find files/folders";

     

       10
       12
        
           license = with lib.licenses; [ gpl2 ];

     

       11
       13
        
           maintainers = [ lib.maintainers.iblech ];

     

       12
       14
        
         };

+2

pkgs/applications/kde/kgeography.nix

···

       7
       7
        
       mkDerivation {

     

       8
       8
        
         pname = "kgeography";

     

       9
       9
        
         meta = {

     

       10
       10
       +
           homepage = "https://apps.kde.org/kgeography/";

     

       11
       11
       +
           description = "Geography trainer";

     

       10
       12
        
           license = with lib.licenses; [ gpl2 ];

     

       11
       13
        
           maintainers = [ lib.maintainers.globin ];

     

       12
       14
        
         };

+2

pkgs/applications/kde/kget.nix

···

       16
       16
        
         ];

     

       17
       17
        
       

     

       18
       18
        
         meta = with lib; {

     

       19
       19
       +
           homepage = "https://apps.kde.org/kget/";

     

       20
       20
       +
           description = "Download manager";

     

       19
       21
        
           license = with licenses; [ gpl2 ];

     

       20
       22
        
           maintainers = with maintainers; [ peterhoeg ];

     

       21
       23
        
         };

+2

pkgs/applications/kde/kgpg.nix

···

       18
       18
        
           wrapProgram "$out/bin/kgpg" --prefix PATH : "${lib.makeBinPath [ gnupg ]}"

     

       19
       19
        
         '';

     

       20
       20
        
         meta = {

     

       21
       21
       +
           homepage = "https://apps.kde.org/kgpg/";

     

       22
       22
       +
           description = "Encryption tool";

     

       21
       23
        
           license = [ lib.licenses.gpl2 ];

     

       22
       24
        
           maintainers = [ lib.maintainers.ttuegel ];

     

       23
       25
        
         };

+9 -5

pkgs/applications/kde/khelpcenter.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         mkDerivation,

     

       3
       3
       -
         extra-cmake-modules, kdoctools,

     

       4
       4
       -
         grantlee, kcmutils, kconfig, kcoreaddons, kdbusaddons, ki18n,

     

       5
       5
       -
         kinit, khtml, kservice, xapian

     

       1
       1
       +
       { lib, mkDerivation

     

       2
       2
       +
       , extra-cmake-modules, kdoctools

     

       3
       3
       +
       , grantlee, kcmutils, kconfig, kcoreaddons, kdbusaddons, ki18n

     

       4
       4
       +
       , kinit, khtml, kservice, xapian

     

       6
       5
        
       }:

     

       7
       6
        
       

     

       8
       7
        
       mkDerivation {

     
···

       12
       11
        
           grantlee kcmutils kconfig kcoreaddons kdbusaddons khtml

     

       13
       12
        
           ki18n kinit kservice xapian

     

       14
       13
        
         ];

     

       14
       14
       +
         meta = with lib; {

     

       15
       15
       +
           homepage = "https://apps.kde.org/help/";

     

       16
       16
       +
           description = "Help center";

     

       17
       17
       +
           license = licenses.gpl2Plus;

     

       18
       18
       +
         };

     

       15
       19
        
       }

+2 -1

pkgs/applications/kde/kig.nix

···

       8
       8
        
       mkDerivation {

     

       9
       9
        
         pname = "kig";

     

       10
       10
        
         meta = {

     

       11
       11
       +
           homepage = "https://apps.kde.org/kig/";

     

       12
       12
       +
           description = "Interactive geometry";

     

       11
       13
        
           license = with lib.licenses; [ gpl2 ];

     

       12
       14
        
           maintainers = with lib.maintainers; [ raskin ];

     

       13
       15
        
         };

     
···

       16
       18
        
           boost karchive kcrash kiconthemes kparts ktexteditor qtsvg qtxmlpatterns

     

       17
       19
        
         ];

     

       18
       20
        
       }

     

       19
       19
       -

+2

pkgs/applications/kde/kleopatra.nix

···

       8
       8
        
       mkDerivation {

     

       9
       9
        
         pname = "kleopatra";

     

       10
       10
        
         meta = {

     

       11
       11
       +
           homepage = "https://apps.kde.org/kleopatra/";

     

       12
       12
       +
           description = "Certificate manager and unified crypto GUI";

     

       11
       13
        
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       12
       14
        
           maintainers = kdepimTeam;

     

       13
       15
        
         };

+2

pkgs/applications/kde/kmahjongg.nix

···

       13
       13
        
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       14
       14
        
         buildInputs = [ kdeclarative libkmahjongg knewstuff libkdegames ];

     

       15
       15
        
         meta = {

     

       16
       16
       +
           description = "Mahjongg solitaire";

     

       17
       17
       +
           homepage = "https://apps.kde.org/kmahjongg/";

     

       16
       18
        
           license = with lib.licenses; [ gpl2 ];

     

       17
       19
        
           maintainers = with lib.maintainers; [ ];

     

       18
       20
        
         };

+2

pkgs/applications/kde/kmail.nix

···

       53
       53
        
       mkDerivation {

     

       54
       54
        
         pname = "kmail";

     

       55
       55
        
         meta = {

     

       56
       56
       +
           homepage = "https://apps.kde.org/kmail2/";

     

       57
       57
       +
           description = "Mail client";

     

       56
       58
        
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       57
       59
        
           maintainers = kdepimTeam;

     

       58
       60
        
         };

+2

pkgs/applications/kde/kmix.nix

···

       8
       8
        
       mkDerivation {

     

       9
       9
        
         pname = "kmix";

     

       10
       10
        
         meta = {

     

       11
       11
       +
           homepage = "https://apps.kde.org/kmix/";

     

       12
       12
       +
           description = "Sound mixer";

     

       11
       13
        
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       12
       14
        
           maintainers = [ lib.maintainers.rongcuid ];

     

       13
       15
        
         };

+2

pkgs/applications/kde/kmplot.nix

···

       5
       5
        
       mkDerivation {

     

       6
       6
        
         pname = "kmplot";

     

       7
       7
        
         meta = {

     

       8
       8
       +
           homepage = "https://apps.kde.org/kmplot/";

     

       9
       9
       +
           description = "Mathematical function plotter";

     

       8
       10
        
           license = with lib.licenses; [ gpl2Plus fdl12 ];

     

       9
       11
        
           maintainers = [ lib.maintainers.orivej ];

     

       10
       12
        
         };

+15 -11

pkgs/applications/kde/knotes.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         mkDerivation,

     

       3
       3
       -
         extra-cmake-modules, kdoctools,

     

       4
       4
       -
         kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash,

     

       5
       5
       -
         kdbusaddons, kdnssd, kglobalaccel, kiconthemes, kitemmodels,

     

       6
       6
       -
         kitemviews, kcmutils, knewstuff, knotifications, knotifyconfig,

     

       7
       7
       -
         kparts, ktextwidgets, kwidgetsaddons, kwindowsystem,

     

       8
       8
       -
         grantlee, grantleetheme, qtx11extras,

     

       9
       9
       -
         akonadi, akonadi-notes, akonadi-search, kcalutils,

     

       10
       10
       -
         kontactinterface, libkdepim, kmime, pimcommon, kpimtextedit,

     

       11
       11
       -
         kcalendarcore

     

       1
       1
       +
       { lib, mkDerivation

     

       2
       2
       +
       , extra-cmake-modules, kdoctools

     

       3
       3
       +
       , kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash

     

       4
       4
       +
       , kdbusaddons, kdnssd, kglobalaccel, kiconthemes, kitemmodels

     

       5
       5
       +
       , kitemviews, kcmutils, knewstuff, knotifications, knotifyconfig

     

       6
       6
       +
       , kparts, ktextwidgets, kwidgetsaddons, kwindowsystem

     

       7
       7
       +
       , grantlee, grantleetheme, qtx11extras

     

       8
       8
       +
       , akonadi, akonadi-notes, akonadi-search, kcalutils

     

       9
       9
       +
       , kontactinterface, libkdepim, kmime, pimcommon, kpimtextedit

     

       10
       10
       +
       , kcalendarcore

     

       12
       11
        
       }:

     

       13
       12
        
       

     

       14
       13
        
       mkDerivation {

     
···

       25
       24
        
           akonadi-search

     

       26
       25
        
           kcalendarcore

     

       27
       26
        
         ];

     

       27
       27
       +
         meta = with lib; {

     

       28
       28
       +
           homepage = "https://apps.kde.org/knotes/";

     

       29
       29
       +
           description = "Popup notes";

     

       30
       30
       +
           license = licenses.gpl2Plus;

     

       31
       31
       +
         };

     

       28
       32
        
       }

+2

pkgs/applications/kde/kolf.nix

···

       10
       10
        
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       11
       11
        
         buildInputs = [ libkdegames kio ktextwidgets ];

     

       12
       12
        
         meta = {

     

       13
       13
       +
           homepage = "https://apps.kde.org/kolf/";

     

       14
       14
       +
           description = "Miniature golf";

     

       13
       15
        
           license = with lib.licenses; [ gpl2 ];

     

       14
       16
        
           maintainers = with lib.maintainers; [ peterhoeg ];

     

       15
       17
        
         };

+2

pkgs/applications/kde/kolourpaint.nix

···

       17
       17
        
           kguiaddons kio ktextwidgets kwidgetsaddons kxmlgui libkexiv2

     

       18
       18
        
         ];

     

       19
       19
        
         meta = {

     

       20
       20
       +
           homepage = "https://apps.kde.org/kolourpaint/";

     

       21
       21
       +
           description = "Paint program";

     

       20
       22
        
           maintainers = [ lib.maintainers.fridh ];

     

       21
       23
        
           license = with lib.licenses; [ gpl2 ];

     

       22
       24
        
         };

+5 -1

pkgs/applications/kde/kompare.nix

···

       7
       7
        
       

     

       8
       8
        
       mkDerivation {

     

       9
       9
        
         pname = "kompare";

     

       10
       10
       -
         meta = { license = with lib.licenses; [ gpl2 ]; };

     

       10
       10
       +
         meta = {

     

       11
       11
       +
           homepage = "https://apps.kde.org/kompare/";

     

       12
       12
       +
           description = "Diff/patch frontend";

     

       13
       13
       +
           license = with lib.licenses; [ gpl2 ];

     

       14
       14
       +
         };

     

       11
       15
        
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       12
       16
        
         buildInputs = [

     

       13
       17
        
           kiconthemes kparts ktexteditor kwidgetsaddons libkomparediff2

+2

pkgs/applications/kde/konqueror.nix

···

       22
       22
        
         '';

     

       23
       23
        
       

     

       24
       24
        
         meta = {

     

       25
       25
       +
           homepage = "https://apps.kde.org/konqueror/";

     

       26
       26
       +
           description = "Web browser, file manager and viewer";

     

       25
       27
        
           license = with lib.licenses; [ gpl2 ];

     

       26
       28
        
           maintainers = with lib.maintainers; [ ];

     

       27
       29
        
           broken = lib.versionOlder qtbase.version "5.13";

+2

pkgs/applications/kde/konquest.nix

···

       22
       22
        
           qtquickcontrols

     

       23
       23
        
         ];

     

       24
       24
        
         meta = {

     

       25
       25
       +
           homepage = "https://apps.kde.org/konquest/";

     

       26
       26
       +
           description = "Galactic strategy game";

     

       25
       27
        
           license = with lib.licenses; [ gpl2 ];

     

       26
       28
        
           maintainers = with lib.maintainers; [ lheckemann ];

     

       27
       29
        
         };

+2

pkgs/applications/kde/konsole.nix

···

       10
       10
        
       mkDerivation {

     

       11
       11
        
         pname = "konsole";

     

       12
       12
        
         meta = {

     

       13
       13
       +
           homepage = "https://apps.kde.org/konsole/";

     

       14
       14
       +
           description = "KDE terminal emulator";

     

       13
       15
        
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       14
       16
        
           maintainers = with lib.maintainers; [ ttuegel turion ];

     

       15
       17
        
         };

+2

pkgs/applications/kde/kontact.nix

···

       10
       10
        
       mkDerivation {

     

       11
       11
        
         pname = "kontact";

     

       12
       12
        
         meta = {

     

       13
       13
       +
           homepage = "https://apps.kde.org/kontact/";

     

       14
       14
       +
           description = "Personal information manager";

     

       13
       15
        
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       14
       16
        
           maintainers = kdepimTeam;

     

       15
       17
        
         };

+2

pkgs/applications/kde/korganizer.nix

···

       13
       13
        
       mkDerivation {

     

       14
       14
        
         pname = "korganizer";

     

       15
       15
        
         meta = {

     

       16
       16
       +
           homepage = "https://apps.kde.org/korganizer/";

     

       17
       17
       +
           description = "Personal organizer";

     

       16
       18
        
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       17
       19
        
           maintainers = kdepimTeam;

     

       18
       20
        
         };

+1

pkgs/applications/kde/krdc.nix

···

       18
       18
        
         '';

     

       19
       19
        
         meta = with lib; {

     

       20
       20
        
           homepage = "http://www.kde.org";

     

       21
       21
       +
           description = "Remote desktop client";

     

       21
       22
        
           license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ];

     

       22
       23
        
           maintainers = with maintainers; [ peterhoeg ];

     

       23
       24
        
           platforms = platforms.linux;

+2

pkgs/applications/kde/krfb.nix

···

       10
       10
        
       mkDerivation {

     

       11
       11
        
         pname = "krfb";

     

       12
       12
        
         meta = {

     

       13
       13
       +
           homepage = "https://apps.kde.org/krfb/";

     

       14
       14
       +
           description = "Desktop sharing (VNC)";

     

       13
       15
        
           license = with lib.licenses; [ gpl2 fdl12 ];

     

       14
       16
        
           maintainers = with lib.maintainers; [ jerith666 ];

     

       15
       17
        
         };

+2

pkgs/applications/kde/kruler.nix

···

       7
       7
        
       mkDerivation {

     

       8
       8
        
         pname = "kruler";

     

       9
       9
        
         meta = {

     

       10
       10
       +
           homepage = "https://apps.kde.org/kruler/";

     

       11
       11
       +
           description = "Screen ruler";

     

       10
       12
        
           license = with lib.licenses; [ gpl2 ];

     

       11
       13
        
           maintainers = [ lib.maintainers.vandenoever ];

     

       12
       14
        
         };

+5 -1

pkgs/applications/kde/kspaceduel.nix

···

       11
       11
        
       

     

       12
       12
        
       mkDerivation {

     

       13
       13
        
         pname = "kspaceduel";

     

       14
       14
       -
         meta.license = with lib.licenses; [ lgpl21 gpl3 ];

     

       14
       14
       +
         meta = {

     

       15
       15
       +
           homepage = "https://apps.kde.org/kspaceduel/";

     

       16
       16
       +
           description = "Space arcade game";

     

       17
       17
       +
           license = with lib.licenses; [ lgpl21 gpl3 ];

     

       18
       18
       +
         };

     

       15
       19
        
         outputs = [ "out" "dev" ];

     

       16
       20
        
         nativeBuildInputs = [

     

       17
       21
        
           cmake extra-cmake-modules

+2

pkgs/applications/kde/ksudoku.nix

···

       12
       12
        
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       13
       13
        
         buildInputs = [ libGLU kdeclarative libkdegames ];

     

       14
       14
        
         meta = {

     

       15
       15
       +
           homepage = "https://apps.kde.org/ksudoku/";

     

       16
       16
       +
           description = "Suduko game";

     

       15
       17
        
           license = with lib.licenses; [ gpl2 ];

     

       16
       18
        
           maintainers = with lib.maintainers; [ ];

     

       17
       19
        
         };

+2

pkgs/applications/kde/ksystemlog.nix

···

       11
       11
        
         propagatedBuildInputs = [ karchive kconfig kio ];

     

       12
       12
        
       

     

       13
       13
        
         meta = with lib; {

     

       14
       14
       +
           homepage = "https://apps.kde.org/ksystemlog/";

     

       15
       15
       +
           description = "System log viewer";

     

       14
       16
        
           license = with licenses; [ gpl2 ];

     

       15
       17
        
           maintainers = with maintainers; [ peterhoeg ];

     

       16
       18
        
         };

+17 -17

pkgs/applications/kde/ktouch.nix

···

       7
       7
        
       , xorg

     

       8
       8
        
       }:

     

       9
       9
        
       

     

       10
       10
       -
       

     

       11
       11
       -
         mkDerivation {

     

       12
       12
       -
           pname = "ktouch";

     

       13
       13
       -
           meta = {

     

       14
       14
       -
             license = lib.licenses.gpl2;

     

       15
       15
       -
             maintainers = [ lib.maintainers.schmittlauch ];

     

       16
       16
       -
             description = "A touch typing tutor from the KDE software collection";

     

       17
       17
       -
           };

     

       18
       18
       -
           nativeBuildInputs = [ extra-cmake-modules kdoctools qtdeclarative ];

     

       19
       19
       -
           buildInputs = [

     

       20
       20
       -
             kconfig kconfigwidgets kcoreaddons kdeclarative ki18n

     

       21
       21
       -
             kitemviews kcmutils kio knewstuff ktexteditor kwidgetsaddons

     

       22
       22
       -
             kwindowsystem kxmlgui qtscript qtdeclarative kqtquickcharts

     

       23
       23
       -
             qtx11extras qtgraphicaleffects qtxmlpatterns qtquickcontrols2

     

       24
       24
       -
             xorg.libxkbfile xorg.libxcb

     

       25
       25
       -
           ];

     

       10
       10
       +
       mkDerivation {

     

       11
       11
       +
         pname = "ktouch";

     

       12
       12
       +
         meta = {

     

       13
       13
       +
           homepage = "https://apps.kde.org/ktouch/";

     

       14
       14
       +
           license = lib.licenses.gpl2;

     

       15
       15
       +
           maintainers = [ lib.maintainers.schmittlauch ];

     

       16
       16
       +
           description = "A touch typing tutor from the KDE software collection";

     

       17
       17
       +
         };

     

       18
       18
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools qtdeclarative ];

     

       19
       19
       +
         buildInputs = [

     

       20
       20
       +
           kconfig kconfigwidgets kcoreaddons kdeclarative ki18n

     

       21
       21
       +
           kitemviews kcmutils kio knewstuff ktexteditor kwidgetsaddons

     

       22
       22
       +
           kwindowsystem kxmlgui qtscript qtdeclarative kqtquickcharts

     

       23
       23
       +
           qtx11extras qtgraphicaleffects qtxmlpatterns qtquickcontrols2

     

       24
       24
       +
           xorg.libxkbfile xorg.libxcb

     

       25
       25
       +
         ];

     

       26
       26
        
       

     

       27
       27
       -
           enableParallelBuilding = true;

     

       27
       27
       +
         enableParallelBuilding = true;

     

       28
       28
        
       }

+3

pkgs/applications/kde/kwalletmanager.nix

···

       14
       14
        
       mkDerivation {

     

       15
       15
        
         pname = "kwalletmanager";

     

       16
       16
        
         meta = {

     

       17
       17
       +
           homepage = "https://apps.kde.org/kwalletmanager5/";

     

       18
       18
       +
       

     

       19
       19
       +
           description = "KDE wallet management tool";

     

       17
       20
        
           license = with lib.licenses; [ gpl2 ];

     

       18
       21
        
           maintainers = with lib.maintainers; [ fridh ];

     

       19
       22
        
         };

+5 -1

pkgs/applications/kde/marble.nix

···

       7
       7
        
       

     

       8
       8
        
       mkDerivation {

     

       9
       9
        
         pname = "marble";

     

       10
       10
       -
         meta.license = with lib.licenses; [ lgpl21 gpl3 ];

     

       10
       10
       +
         meta = {

     

       11
       11
       +
           homepage = "https://apps.kde.org/marble/";

     

       12
       12
       +
           description = "Virtual globe";

     

       13
       13
       +
           license = with lib.licenses; [ lgpl21 gpl3 ];

     

       14
       14
       +
         };

     

       11
       15
        
         outputs = [ "out" "dev" ];

     

       12
       16
        
         nativeBuildInputs = [ extra-cmake-modules kdoctools perl ];

     

       13
       17
        
         propagatedBuildInputs = [

+2

pkgs/applications/kde/minuet.nix

···

       8
       8
        
       mkDerivation {

     

       9
       9
        
         pname = "minuet";

     

       10
       10
        
         meta = with lib; {

     

       11
       11
       +
           homepage = "https://apps.kde.org/minuet/";

     

       12
       12
       +
           description = "Music Education Software";

     

       11
       13
        
           license = with licenses; [ lgpl21 gpl3 ];

     

       12
       14
        
           maintainers = with maintainers; [ peterhoeg HaoZeke ];

     

       13
       15
        
           broken = lib.versionOlder qtbase.version "5.14";

+1

pkgs/applications/kde/okular.nix

···

       29
       29
        
       

     

       30
       30
        
         meta = with lib; {

     

       31
       31
        
           homepage = "http://www.kde.org";

     

       32
       32
       +
           description = "KDE document viewer";

     

       32
       33
        
           license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ];

     

       33
       34
        
           maintainers = with maintainers; [ ttuegel turion ];

     

       34
       35
        
           platforms = lib.platforms.linux;

+1

pkgs/applications/kde/picmi.nix

···

       6
       6
        
       mkDerivation {

     

       7
       7
        
         pname = "picmi";

     

       8
       8
        
         meta = with lib; {

     

       9
       9
       +
           homepage = "https://apps.kde.org/picmi/";

     

       9
       10
        
           description = "Nonogram game";

     

       10
       11
        
           longDescription = ''The goal is to reveal the hidden pattern in the board by coloring or

     

       11
       12
        
             leaving blank the cells in a grid according to numbers given at the side of the grid.

+2

pkgs/applications/kde/pim-data-exporter.nix

···

       10
       10
        
       mkDerivation {

     

       11
       11
        
         pname = "pim-data-exporter";

     

       12
       12
        
         meta = {

     

       13
       13
       +
           homepage = "https://apps.kde.org/pimdataexporter/";

     

       14
       14
       +
           description = "Saves and restores all data from PIM apps";

     

       13
       15
        
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       14
       16
        
           maintainers = kdepimTeam;

     

       15
       17
        
         };

+2

pkgs/applications/kde/spectacle.nix

···

       20
       20
        
         '';

     

       21
       21
        
         propagatedUserEnvPkgs = [ kipi-plugins libkipi ];

     

       22
       22
        
         meta = with lib; {

     

       23
       23
       +
           homepage = "https://apps.kde.org/spectacle/";

     

       24
       24
       +
           description = "Screenshot capture utility";

     

       23
       25
        
           maintainers = with maintainers; [ ttuegel ];

     

       24
       26
        
           broken = versionOlder qtbase.version "5.15";

     

       25
       27
        
         };

+3 -3

pkgs/applications/misc/osm2xmap/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, libroxml, proj, libyamlcpp, boost } :

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, libroxml, proj_7, libyamlcpp, boost } :

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "osm2xmap";

     
···

       14
       14
        
         makeFlags = [

     

       15
       15
        
           "GIT_VERSION=${version}"

     

       16
       16
        
           "GIT_TIMESTAMP="

     

       17
       17
       -
           "SHAREDIR=${placeholder "out"}/share/osm2xmap"

     

       17
       17
       +
           "SHAREDIR=${placeholder "out"}/share/osm2xmap/"

     

       18
       18
        
           "INSTALL_BINDIR=${placeholder "out"}/bin"

     

       19
       19
        
           "INSTALL_MANDIR=${placeholder "out"}/share/man/man1"

     

       20
       20
        
         ];

     

       21
       21
        
       

     

       22
       22
        
         NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H";

     

       23
       23
        
       

     

       24
       24
       -
         buildInputs = [ libroxml proj libyamlcpp boost ];

     

       24
       24
       +
         buildInputs = [ libroxml proj_7 libyamlcpp boost ];

     

       25
       25
        
       

     

       26
       26
        
         meta = with lib; {

     

       27
       27
        
           homepage = "https://github.com/sembruk/osm2xmap";

+2 -2

pkgs/applications/misc/survex/default.nix

···

       6
       6
        
       , wxGTK30-gtk3

     

       7
       7
        
       , wxmac

     

       8
       8
        
       , ffmpeg

     

       9
       9
       -
       , proj

     

       9
       9
       +
       , proj_7

     

       10
       10
        
       , perl532

     

       11
       11
        
       , unscii

     

       12
       12
        
       , python

     
···

       29
       29
        
         nativeBuildInputs = [ docbook5 docbook2x autoreconfHook pkg-config perlenv python ];

     

       30
       30
        
       

     

       31
       31
        
         buildInputs = [

     

       32
       32
       -
           libGL libGLU ffmpeg proj

     

       32
       32
       +
           libGL libGLU ffmpeg proj_7

     

       33
       33
        
         ] ++ lib.optionals stdenv.hostPlatform.isDarwin [

     

       34
       34
        
           wxmac Carbon Cocoa

     

       35
       35
        
         ] ++ lib.optionals stdenv.hostPlatform.isLinux [

+2 -2

pkgs/applications/misc/xygrib/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, wrapQtAppsHook, cmake, bzip2, qtbase, qttools, libnova, proj, libpng, openjpeg }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, wrapQtAppsHook, cmake, bzip2, qtbase, qttools, libnova, proj_7, libpng, openjpeg }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         version = "1.2.6.1";

     
···

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ cmake qttools wrapQtAppsHook ];

     

       15
       15
       -
         buildInputs = [ bzip2 qtbase libnova proj openjpeg libpng ];

     

       15
       15
       +
         buildInputs = [ bzip2 qtbase libnova proj_7 openjpeg libpng ];

     

       16
       16
        
         cmakeFlags = [ "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/openjpeg-${lib.versions.majorMinor openjpeg.version}" ]

     

       17
       17
        
           ++ lib.optionals stdenv.isDarwin [ "-DLIBNOVA_LIBRARY=${libnova}/lib/libnova.dylib" ];

     

       18
       18

+2

pkgs/applications/networking/irc/weechat/scripts/default.nix

···

       30
       30
        
         buffer_autoset = callPackage ./buffer_autoset { };

     

       31
       31
        
       

     

       32
       32
        
         highmon = callPackage ./highmon { };

     

       33
       33
       +
       

     

       34
       34
       +
         zncplayback = callPackage ./zncplayback { };

     

       33
       35
        
       }

+28

pkgs/applications/networking/irc/weechat/scripts/zncplayback/default.nix

···

       1
       1
       +
       { lib, stdenv, fetchurl }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation {

     

       4
       4
       +
         pname = "weechat-zncplayback";

     

       5
       5
       +
         version = "0.2.1";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchurl {

     

       8
       8
       +
           url = "https://github.com/weechat/scripts/raw/bcc9643136addd2cd68ac957dd64e336e4f88aa1/python/zncplayback.py";

     

       9
       9
       +
           sha256 = "1k32p6naxg40g664ip48zvm61xza7l9az3v3rawmjw97i0mwz7y3";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         dontUnpack = true;

     

       13
       13
       +
       

     

       14
       14
       +
         installPhase = ''

     

       15
       15
       +
           mkdir -p $out/share

     

       16
       16
       +
           cp $src $out/share/zncplayback.py

     

       17
       17
       +
         '';

     

       18
       18
       +
       

     

       19
       19
       +
         passthru = {

     

       20
       20
       +
           scripts = [ "zncplayback.py" ];

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
         meta = with lib; {

     

       24
       24
       +
           description = "Add support for the ZNC Playback module";

     

       25
       25
       +
           license = licenses.gpl2Plus;

     

       26
       26
       +
           maintainers = with maintainers; [ qyliss ];

     

       27
       27
       +
         };

     

       28
       28
       +
       }

+2 -2

pkgs/applications/radio/sdrangel/default.nix

···

       33
       33
        
       

     

       34
       34
        
       mkDerivation rec {

     

       35
       35
        
         pname = "sdrangel";

     

       36
       36
       -
         version = "6.16.2";

     

       36
       36
       +
         version = "6.16.3";

     

       37
       37
        
       

     

       38
       38
        
         src = fetchFromGitHub {

     

       39
       39
        
           owner = "f4exb";

     

       40
       40
        
           repo = "sdrangel";

     

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

     

       42
       42
       -
           sha256 = "sha256-wWGKJWd3JDaT0dDMUrxv9ShMVe+q4zvH8SjyKw7UIbo=";

     

       42
       42
       +
           sha256 = "sha256-qgFnl9IliKRI4TptpXyK9JHzpLEUQ7NZLIfc0AROCvA=";

     

       43
       43
        
           fetchSubmodules = false;

     

       44
       44
        
         };

     

       45
       45

+54 -16

pkgs/applications/science/misc/gplates/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, qt4, qwt6_qt4, libGLU, libGL, glew, gdal, cgal

     

       2
       2
       -
       , proj, boost, cmake, python2, doxygen, graphviz, gmp, mpfr }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , mkDerivation

     

       3
       3
       +
       , fetchurl

     

       4
       4
       +
       , cmake

     

       5
       5
       +
       , doxygen

     

       6
       6
       +
       , graphviz

     

       7
       7
       +
       , boost

     

       8
       8
       +
       , cgal_5

     

       9
       9
       +
       , gdal

     

       10
       10
       +
       , glew

     

       11
       11
       +
       , gmp

     

       12
       12
       +
       , libGL

     

       13
       13
       +
       , libGLU

     

       14
       14
       +
       , mpfr

     

       15
       15
       +
       , proj

     

       16
       16
       +
       , python3

     

       17
       17
       +
       , qtxmlpatterns

     

       18
       18
       +
       , qwt

     

       19
       19
       +
       }:

     

       3
       20
        
       

     

       4
       4
       -
       stdenv.mkDerivation rec {

     

       21
       21
       +
       let

     

       22
       22
       +
         python = python3.withPackages (ps: with ps; [

     

       23
       23
       +
           numpy

     

       24
       24
       +
         ]);

     

       25
       25
       +
         boost' = boost.override {

     

       26
       26
       +
           enablePython = true;

     

       27
       27
       +
           inherit python;

     

       28
       28
       +
         };

     

       29
       29
       +
         cgal = cgal_5.override {

     

       30
       30
       +
           boost = boost';

     

       31
       31
       +
         };

     

       32
       32
       +
       in mkDerivation rec {

     

       5
       33
        
         pname = "gplates";

     

       6
       6
       -
         version = "2.2.0";

     

       34
       34
       +
         version = "2.3.0";

     

       7
       35
        
       

     

       8
       36
        
         src = fetchurl {

     

       9
       9
       -
           url = "mirror://sourceforge/gplates/${pname}-${version}-unixsrc.tar.bz2";

     

       10
       10
       -
           sha256 = "1jrcv498vpcs8xklhbsgg12yfa90f96p2mwq6x5sjnrlpf8mh50b";

     

       37
       37
       +
           name = "gplates_${version}_src.tar.bz2";

     

       38
       38
       +
           url = "https://www.earthbyte.org/download/8421/?uid=b89bb31428";

     

       39
       39
       +
           sha256 = "0lrcmcxc924ixddii8cyglqlwwxvk7f00g4yzbss5i3fgcbh8n96";

     

       11
       40
        
         };

     

       12
       41
        
       

     

       13
       13
       -
         nativeBuildInputs = [ cmake ];

     

       42
       42
       +
         nativeBuildInputs = [

     

       43
       43
       +
           cmake

     

       44
       44
       +
           doxygen

     

       45
       45
       +
           graphviz

     

       46
       46
       +
         ];

     

       47
       47
       +
       

     

       14
       48
        
         buildInputs = [

     

       15
       15
       -
           qt4 qwt6_qt4 libGLU libGL glew gdal cgal proj python2

     

       16
       16
       -
           doxygen graphviz gmp mpfr

     

       17
       17
       -
           (boost.override {

     

       18
       18
       -
             enablePython = true;

     

       19
       19
       -
             python = python2;

     

       20
       20
       -
           })

     

       49
       49
       +
           boost'

     

       50
       50
       +
           cgal

     

       51
       51
       +
           gdal

     

       52
       52
       +
           glew

     

       53
       53
       +
           gmp

     

       54
       54
       +
           libGL

     

       55
       55
       +
           libGLU

     

       56
       56
       +
           mpfr

     

       57
       57
       +
           proj

     

       58
       58
       +
           python

     

       59
       59
       +
           qtxmlpatterns

     

       60
       60
       +
           qwt

     

       21
       61
        
         ];

     

       22
       62
        
       

     

       23
       23
       -
         NIX_CFLAGS_LINK="-ldl -lpthread -lutil";

     

       24
       24
       -
       

     

       25
       63
        
         meta = with lib; {

     

       26
       64
        
           description = "Desktop software for the interactive visualisation of plate-tectonics";

     

       27
       65
        
           homepage = "https://www.gplates.org";

     

       28
       28
       -
           license = licenses.gpl2;

     

       66
       66
       +
           license = licenses.gpl2Only;

     

       29
       67
        
           platforms = platforms.all;

     

       30
       68
        
         };

     

       31
       69
        
       }

+2 -2

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , fetchFromGitHub

     

       3
       3
       -
       , crystal_0_33

     

       3
       3
       +
       , crystal_1_0

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       let

     

       7
       7
       -
         crystal = crystal_0_33;

     

       7
       7
       +
         crystal = crystal_1_0;

     

       8
       8
        
       

     

       9
       9
        
       in crystal.buildCrystalPackage rec {

     

       10
       10
        
         pname = "thicket";

+2 -2

pkgs/applications/version-management/git-and-tools/thicket/shards.nix

···

       2
       2
        
         ameba = {

     

       3
       3
        
           owner = "veelenga";

     

       4
       4
        
           repo = "ameba";

     

       5
       5
       -
           rev = "v0.10.0";

     

       6
       6
       -
           sha256 = "1yjxzwdhigsyjn0qp362jkj85qvg4dsyzal00pgr1srnh2xry912";

     

       5
       5
       +
           rev = "v0.14.3";

     

       6
       6
       +
           sha256 = "1cfr95xi6hsyxw1wlrh571hc775xhwmssk3k14i8b7dgbwfmm5x1";

     

       7
       7
        
         };

     

       8
       8
        
       }

+4 -4

pkgs/applications/video/shotcut/default.nix

···

       25
       25
        
       

     

       26
       26
        
       mkDerivation rec {

     

       27
       27
        
         pname = "shotcut";

     

       28
       28
       -
         version = "21.03.21";

     

       28
       28
       +
         version = "21.09.20";

     

       29
       29
        
       

     

       30
       30
        
         src = fetchFromGitHub {

     

       31
       31
        
           owner = "mltframework";

     

       32
       32
        
           repo = "shotcut";

     

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

     

       34
       34
       -
           sha256 = "UdeHbNkJ0U9FeTmpbcU4JxiyIHkrlC8ErhtY6zdCZEk=";

     

       34
       34
       +
           sha256 = "1y46n5gmlayfl46l0vhg5g5dbbc0sg909mxb68sia0clkaas8xrh";

     

       35
       35
        
         };

     

       36
       36
        
       

     

       37
       37
        
         nativeBuildInputs = [ pkg-config qmake ];

     
···

       57
       57
        
         ];

     

       58
       58
        
       

     

       59
       59
        
         prePatch = ''

     

       60
       60
       -
           sed 's_shotcutPath, "melt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp

     

       60
       60
       +
           sed 's_shotcutPath, "melt[^"]*"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp

     

       61
       61
        
           sed 's_shotcutPath, "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/jobs/ffmpegjob.cpp

     

       62
       62
        
           sed 's_qApp->applicationDirPath(), "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/docks/encodedock.cpp

     

       63
       63
        
           NICE=$(type -P nice)

     
···

       94
       94
        
             please use the official build from shotcut.org instead.

     

       95
       95
        
           '';

     

       96
       96
        
           homepage = "https://shotcut.org";

     

       97
       97
       -
           license = licenses.gpl3;

     

       97
       97
       +
           license = licenses.gpl3Plus;

     

       98
       98
        
           maintainers = with maintainers; [ goibhniu woffs peti ];

     

       99
       99
        
           platforms = platforms.linux;

     

       100
       100
        
         };

+6 -1

pkgs/build-support/skaware/build-skaware-package.nix

···

       22
       22
        
       , postInstall

     

       23
       23
        
         # : list Maintainer

     

       24
       24
        
       , maintainers ? []

     

       25
       25
       -
       

     

       25
       25
       +
         # : passtrhu arguments (e.g. tests)

     

       26
       26
       +
       , passthru ? {}

     

       26
       27
        
       

     

       27
       28
        
       }:

     

       28
       29
        
       

     
···

       49
       50
        
           "CHANGELOG"

     

       50
       51
        
           "README"

     

       51
       52
        
           "README.*"

     

       53
       53
       +
           "DCO"

     

       54
       54
       +
           "CONTRIBUTING"

     

       52
       55
        
         ];

     

       53
       56
        
       

     

       54
       57
        
       in stdenv.mkDerivation {

     
···

       105
       108
        
           maintainers = with lib.maintainers;

     

       106
       109
        
             [ pmahoney Profpatsch qyliss ] ++ maintainers;

     

       107
       110
        
         };

     

       111
       111
       +
       

     

       112
       112
       +
         inherit passthru;

     

       108
       113
        
       

     

       109
       114
        
       }

+24

pkgs/data/fonts/ocr-a/default.nix

···

       1
       1
       +
       { lib, stdenv, fetchurl }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         pname = "OCR-A";

     

       5
       5
       +
         version = "1.0";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchurl {

     

       8
       8
       +
           url = "mirror://sourceforge/ocr-a-font/OCR-A/${version}/OCRA.ttf";

     

       9
       9
       +
           sha256 = "0kpmjjxwzm84z8maz6lq9sk1b0xv1zkvl28lwj7i0m2xf04qixd0";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         dontUnpack = true;

     

       13
       13
       +
       

     

       14
       14
       +
         installPhase = ''

     

       15
       15
       +
           install -D -m 0644 $src $out/share/fonts/truetype/OCRA.ttf

     

       16
       16
       +
         '';

     

       17
       17
       +
       

     

       18
       18
       +
         meta = with lib; {

     

       19
       19
       +
           description = "ANSI OCR font from the '60s. CYBER";

     

       20
       20
       +
           homepage = "https://sourceforge.net/projects/ocr-a-font/";

     

       21
       21
       +
           license = licenses.publicDomain;

     

       22
       22
       +
           maintainers = with maintainers; [ V ];

     

       23
       23
       +
         };

     

       24
       24
       +
       }

+2 -2

pkgs/data/themes/greybird/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "greybird";

     

       5
       5
       -
         version = "3.22.14";

     

       5
       5
       +
         version = "3.22.15";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "shimmerproject";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "0b0axzrvdsv7aa029idz4rs1jm6df4ff3v4j4d5wf4yiypb48js9";

     

       11
       11
       +
           sha256 = "1fk66fxy2lif9ngazlgkpsziw216i4b1ld2zm97cadf7n97376g9";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [

+2 -2

pkgs/desktops/xfce/applications/xfdashboard/default.nix

···

       17
       17
        
       mkXfceDerivation {

     

       18
       18
        
         category = "apps";

     

       19
       19
        
         pname = "xfdashboard";

     

       20
       20
       -
         version = "0.9.3";

     

       20
       20
       +
         version = "0.9.4";

     

       21
       21
        
         rev-prefix = "";

     

       22
       22
        
         odd-unstable = false;

     

       23
       23
        
       

     

       24
       24
       -
         sha256 = "sha256-xoeqVsfvBH2zzQqDUJGiA47hgVvEkvVf9bNYQmyiytk=";

     

       24
       24
       +
         sha256 = "sha256-ZDrBLSfRBw5/nIs/x1jJQCVgNJer85b8Hm1kkX1Dk3s=";

     

       25
       25
        
       

     

       26
       26
        
         buildInputs = [

     

       27
       27
        
           clutter

+2 -2

pkgs/desktops/xfce/core/thunar/default.nix

···

       21
       21
        
       let unwrapped = mkXfceDerivation {

     

       22
       22
        
         category = "xfce";

     

       23
       23
        
         pname = "thunar";

     

       24
       24
       -
         version = "4.16.9";

     

       24
       24
       +
         version = "4.16.10";

     

       25
       25
        
       

     

       26
       26
       -
         sha256 = "sha256-TpazNC4TwNhcEGQ4AQICxbmfZ1i4RE9vXkM9Zln80vE=";

     

       26
       26
       +
         sha256 = "sha256-BeEy8+zEsJ5fJAbvP37tfekqF5LTHil0RDcE5RY0f64=";

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [

     

       29
       29
        
           docbook_xsl

+3 -4

pkgs/development/compilers/crystal/build-package.nix

···

       10
       10
        
       , format ? "make"

     

       11
       11
        
       , installManPages ? true

     

       12
       12
        
         # Specify binaries to build in the form { foo.src = "src/foo.cr"; }

     

       13
       13
       -
         # The default `crystal build` options can be overridden with { foo.options = [ "--no-debug" ]; }

     

       13
       13
       +
         # The default `crystal build` options can be overridden with { foo.options = [ "--optionname" ]; }

     

       14
       14
        
       , crystalBinaries ? { }

     

       15
       15
        
       , ...

     

       16
       16
        
       }@args:

     
···

       32
       32
        
           })

     

       33
       33
        
           (import shardsFile));

     

       34
       34
        
       

     

       35
       35
       -
         # we previously had --no-debug here but that is not recommended by upstream

     

       36
       36
       -
         defaultOptions = [ "--release" "--progress" "--verbose" ];

     

       35
       35
       +
         defaultOptions = [ "--release" "--progress" "--verbose" "--no-debug" ];

     

       37
       36
        
       

     

       38
       37
        
         buildDirectly = shardsFile == null || crystalBinaries != { };

     

       39
       38
        
       

     
···

       120
       119
        
       

     

       121
       120
        
         installCheckPhase = args.installCheckPhase or ''

     

       122
       121
        
           for f in $out/bin/*; do

     

       123
       123
       -
             $f --help

     

       122
       122
       +
             $f --help > /dev/null

     

       124
       123
        
           done

     

       125
       124
        
         '';

     

       126
       125

+24 -60

pkgs/development/compilers/crystal/default.nix

···

       56
       56
        
             buildCommand = ''

     

       57
       57
        
               mkdir -p $out

     

       58
       58
        
               tar --strip-components=1 -C $out -xf ${src}

     

       59
       59
       +
               patchShebangs $out/bin/crystal

     

       59
       60
        
             '';

     

       60
       61
        
           };

     

       61
       62
        
       

     
···

       93
       94
        
             outputs = [ "out" "lib" "bin" ];

     

       94
       95
        
       

     

       95
       96
        
             postPatch = ''

     

       97
       97
       +
               export TMP=$(mktemp -d)

     

       98
       98
       +
               export HOME=$TMP

     

       99
       99
       +
               mkdir -p $HOME/test

     

       100
       100
       +
       

     

       96
       101
        
               # Add dependency of crystal to docs to avoid issue on flag changes between releases

     

       97
       102
        
               # https://github.com/crystal-lang/crystal/pull/8792#issuecomment-614004782

     

       98
       103
        
               substituteInPlace Makefile \

     
···

       103
       108
        
       

     

       104
       109
        
               ln -sf spec/compiler spec/std

     

       105
       110
        
       

     

       106
       106
       -
               # Dirty fix for when no sandboxing is enabled

     

       107
       107
       -
               rm -rf /tmp/crystal

     

       108
       108
       -
               mkdir -p /tmp/crystal

     

       111
       111
       +
               mkdir -p $TMP/crystal

     

       109
       112
        
       

     

       110
       113
        
               substituteInPlace spec/std/file_spec.cr \

     

       111
       114
        
                 --replace '/bin/ls' '${coreutils}/bin/ls' \

     

       112
       112
       -
                 --replace '/usr/share' '/tmp/crystal' \

     

       113
       113
       -
                 --replace '/usr' '/tmp'

     

       115
       115
       +
                 --replace '/usr/share' "$TMP/crystal" \

     

       116
       116
       +
                 --replace '/usr' "$TMP" \

     

       117
       117
       +
                 --replace '/tmp' "$TMP"

     

       114
       118
        
       

     

       115
       119
        
               substituteInPlace spec/std/process_spec.cr \

     

       116
       120
        
                 --replace '/bin/cat' '${coreutils}/bin/cat' \

     

       117
       121
        
                 --replace '/bin/ls' '${coreutils}/bin/ls' \

     

       118
       122
        
                 --replace '/usr/bin/env' '${coreutils}/bin/env' \

     

       119
       123
        
                 --replace '"env"' '"${coreutils}/bin/env"' \

     

       120
       120
       -
                 --replace '"/usr"' '"/tmp"'

     

       121
       121
       -
       

     

       122
       122
       -
               substituteInPlace spec/std/socket/tcp_server_spec.cr \

     

       123
       123
       -
                 --replace '{% if flag?(:gnu) %}"listen: "{% else %}"bind: "{% end %}' '"bind: "'

     

       124
       124
       +
                 --replace '/usr' "$TMP" \

     

       125
       125
       +
                 --replace '/tmp' "$TMP"

     

       124
       126
        
       

     

       125
       127
        
               substituteInPlace spec/std/system_spec.cr \

     

       126
       128
        
                 --replace '`hostname`' '`${hostname}/bin/hostname`'

     

       127
       129
        
       

     

       128
       128
       -
               # See https://github.com/crystal-lang/crystal/pull/8640

     

       129
       129
       -
               substituteInPlace spec/std/http/cookie_spec.cr \

     

       130
       130
       -
                 --replace '01 Jan 2020' '01 Jan #{Time.utc.year + 2}'

     

       131
       131
       -
       

     

       132
       130
        
               # See https://github.com/crystal-lang/crystal/issues/8629

     

       133
       131
        
               substituteInPlace spec/std/socket/udp_socket_spec.cr \

     

       134
       132
        
                 --replace 'it "joins and transmits to multicast groups"' 'pending "joins and transmits to multicast groups"'

     

       133
       133
       +
             '';

     

       135
       134
        
       

     

       136
       136
       -
               # See https://github.com/crystal-lang/crystal/pull/8699

     

       137
       137
       -
               substituteInPlace spec/std/xml/xml_spec.cr \

     

       138
       138
       -
                 --replace 'it "handles errors"' 'pending "handles errors"'

     

       135
       135
       +
             # Defaults are 4

     

       136
       136
       +
             preBuild = ''

     

       137
       137
       +
               export CRYSTAL_WORKERS=$NIX_BUILD_CORES

     

       138
       138
       +
               export threads=$NIX_BUILD_CORES

     

       139
       139
       +
               export CRYSTAL_CACHE_DIR=$TMP

     

       139
       140
        
             '';

     

       140
       141
        
       

     

       141
       142
        
             buildInputs = commonBuildInputs extraBuildInputs;

     
···

       197
       198
        
             checkTarget = "compiler_spec";

     

       198
       199
        
       

     

       199
       200
        
             preCheck = ''

     

       200
       200
       -
               export HOME=/tmp

     

       201
       201
       -
               mkdir -p $HOME/test

     

       202
       202
       -
       

     

       203
       201
        
               export LIBRARY_PATH=${lib.makeLibraryPath checkInputs}:$LIBRARY_PATH

     

       204
       202
        
               export PATH=${lib.makeBinPath checkInputs}:$PATH

     

       205
       203
        
             '';

     
···

       214
       212
        
               license = licenses.asl20;

     

       215
       213
        
               maintainers = with maintainers; [ david50407 fabianhjr manveru peterhoeg ];

     

       216
       214
        
               platforms = builtins.attrNames archs;

     

       217
       217
       -
               # Error running at_exit handler: Nil assertion failed

     

       218
       218
       -
               broken = lib.versions.minor version == "32" && stdenv.isDarwin;

     

       215
       215
       +
               broken = lib.versionOlder version "0.36.1" && stdenv.isDarwin;

     

       219
       216
        
             };

     

       220
       217
        
           })

     

       221
       218
        
         );

     

       222
       219
        
       

     

       223
       220
        
       in

     

       224
       221
        
       rec {

     

       225
       225
       -
         binaryCrystal_0_31 = genericBinary {

     

       226
       226
       -
           version = "0.31.1";

     

       222
       222
       +
         binaryCrystal_0_36 = genericBinary {

     

       223
       223
       +
           version = "0.36.1";

     

       227
       224
        
           sha256s = {

     

       228
       228
       -
             x86_64-linux = "0r8salf572xrnr4m6ll9q5hz6jj8q7ff1rljlhmqb1r26a8mi2ih";

     

       229
       229
       -
             i686-linux = "0hridnis5vvrswflx0q67xfg5hryhz6ivlwrb9n4pryj5d1gwjrr";

     

       230
       230
       -
             x86_64-darwin = "1dgxgv0s3swkc5cwawzgpbc6bcd2nx4hjxc7iw2h907y1vgmbipz";

     

       225
       225
       +
             x86_64-linux = "065vzq34g7hgzl2mrzy9gwwsfikc78nj7xxsbrk67r6rz0a7bk1q";

     

       226
       226
       +
             i686-linux = "18m4b1lnd682i5ygbg6cljqjny60nn2mlrzrk765h2ip6fljqbm1";

     

       227
       227
       +
             x86_64-darwin = "0xggayk92zh64pb5sz77n12hkcd1hg8kw90z7gb18594q551sf1v";

     

       231
       228
        
           };

     

       232
       229
        
         };

     

       233
       230
        
       

     

       234
       234
       -
         crystal_0_31 = generic {

     

       235
       235
       -
           version = "0.31.1";

     

       236
       236
       -
           sha256 = "1dswxa32w16gnc6yjym12xj7ibg0g6zk3ngvl76lwdjqb1h6lwz8";

     

       237
       237
       -
           doCheck = false; # 5 checks are failing now

     

       238
       238
       -
           binary = binaryCrystal_0_31;

     

       239
       239
       -
         };

     

       240
       240
       -
       

     

       241
       241
       -
         crystal_0_32 = generic {

     

       242
       242
       -
           version = "0.32.1";

     

       243
       243
       -
           sha256 = "120ndi3nhh2r52hjvhwfb49cdggr1bzdq6b8xg7irzavhjinfza6";

     

       244
       244
       -
           binary = crystal_0_31;

     

       245
       245
       -
         };

     

       246
       246
       -
       

     

       247
       247
       -
         crystal_0_33 = generic {

     

       248
       248
       -
           version = "0.33.0";

     

       249
       249
       -
           sha256 = "1zg0qixcws81s083wrh54hp83ng2pa8iyyafaha55mzrh8293jbi";

     

       250
       250
       -
           binary = crystal_0_32;

     

       251
       251
       -
         };

     

       252
       252
       -
       

     

       253
       253
       -
         crystal_0_34 = generic {

     

       254
       254
       -
           version = "0.34.0";

     

       255
       255
       -
           sha256 = "110lfpxk9jnqyznbfnilys65ixj5sdmy8pvvnlhqhc3ccvrlnmq4";

     

       256
       256
       -
           binary = crystal_0_33;

     

       257
       257
       -
         };

     

       258
       258
       -
       

     

       259
       259
       -
         crystal_0_35 = generic {

     

       260
       260
       -
           version = "0.35.1";

     

       261
       261
       -
           sha256 = "0p51bjl1nsvwsm64lqq421dcsxa201w7wwq8plw4r8wqarpq0g69";

     

       262
       262
       -
           binary = crystal_0_34;

     

       263
       263
       -
           # Needs git to build as per https://github.com/crystal-lang/crystal/issues/9789

     

       264
       264
       -
           extraBuildInputs = [ git ];

     

       265
       265
       -
         };

     

       266
       266
       -
       

     

       267
       231
        
         crystal_0_36 = generic {

     

       268
       232
        
           version = "0.36.1";

     

       269
       233
        
           sha256 = "sha256-5rjrvwZKM4lHpmxLyUVbi0Zw98xT+iJKonxwfUwS/Wk=";

     

       270
       270
       -
           binary = crystal_0_35;

     

       234
       234
       +
           binary = binaryCrystal_0_36;

     

       271
       235
        
         };

     

       272
       236
        
       

     

       273
       237
        
         crystal_1_0 = generic {

+7 -3

pkgs/development/interpreters/erlang/generic-builder.nix

···

       84
       84
        
       

     

       85
       85
        
       in

     

       86
       86
        
       stdenv.mkDerivation ({

     

       87
       87
       -
         name = "${baseName}-${version}"

     

       88
       88
       -
           + optionalString javacSupport "-javac"

     

       89
       89
       -
           + optionalString odbcSupport "-odbc";

     

       87
       87
       +
         # name is used instead of pname to

     

       88
       88
       +
         # - not have to pass pnames as argument

     

       89
       89
       +
         # - have a separate pname for erlang (main module)

     

       90
       90
       +
         name = "${baseName}"

     

       91
       91
       +
           + optionalString javacSupport "_javac"

     

       92
       92
       +
           + optionalString odbcSupport "_odbc"

     

       93
       93
       +
           + "-${version}";

     

       90
       94
        
       

     

       91
       95
        
         inherit src version;

     

       92
       96

+11 -52

pkgs/development/interpreters/lua-5/build-lua-package.nix

···

       82
       82
        
         # configured trees)

     

       83
       83
        
         luarocks_config = "luarocks-config.lua";

     

       84
       84
        
         luarocks_content = let

     

       85
       85
       -
           extraVariablesStr = lib.concatStringsSep "\n "

     

       86
       86
       -
             (lib.mapAttrsToList (k: v: "${k}='${v}';") extraVariables);

     

       87
       87
       -
         in ''

     

       88
       88
       -
           local_cache = ""

     

       89
       89
       -
           -- To prevent collisions when creating environments, we install the rock

     

       90
       90
       -
           -- files into per-package subdirectories

     

       91
       91
       -
           rocks_subdir = '${rocksSubdir}'

     

       92
       92
       -
           -- Then we need to tell luarocks where to find the rock files per

     

       93
       93
       -
           -- dependency

     

       94
       94
       -
           rocks_trees = {

     

       95
       95
       -
             ${lib.concatStringsSep "\n, " rocksTrees}

     

       96
       96
       -
           }

     

       97
       97
       -
         '' + lib.optionalString lua.pkgs.isLuaJIT ''

     

       98
       98
       -
           -- Luajit provides some additional functionality built-in; this exposes

     

       99
       99
       -
           -- that to luarock's dependency system

     

       100
       100
       -
           rocks_provided = {

     

       101
       101
       -
             jit='${lua.luaversion}-1';

     

       102
       102
       -
             ffi='${lua.luaversion}-1';

     

       103
       103
       -
             luaffi='${lua.luaversion}-1';

     

       104
       104
       -
             bit='${lua.luaversion}-1';

     

       105
       105
       -
           }

     

       106
       106
       -
         '' + ''

     

       107
       107
       -
           -- For single-output external dependencies

     

       108
       108
       -
           external_deps_dirs = {

     

       109
       109
       -
             ${lib.concatStringsSep "\n, " externalDepsDirs}

     

       110
       110
       -
           }

     

       111
       111
       -
           variables = {

     

       112
       112
       -
             -- Some needed machinery to handle multiple-output external dependencies,

     

       113
       113
       -
             -- as per https://github.com/luarocks/luarocks/issues/766

     

       114
       114
       -
             ${lib.optionalString (lib.length depVariables > 0) ''

     

       115
       115
       -
               ${lib.concatStringsSep "\n  " depVariables}''}

     

       116
       116
       -
             ${extraVariablesStr}

     

       117
       117
       -
           }

     

       118
       118
       -
           ${extraConfig}

     

       119
       119
       -
         '';

     

       85
       85
       +
           generatedConfig = lua.pkgs.lib.generateLuarocksConfig {

     

       86
       86
       +
             inherit externalDeps;

     

       87
       87
       +
             inherit extraVariables;

     

       88
       88
       +
             inherit rocksSubdir;

     

       89
       89
       +
             inherit requiredLuaRocks;

     

       90
       90
       +
           };

     

       91
       91
       +
           in

     

       92
       92
       +
             ''

     

       93
       93
       +
             ${generatedConfig}

     

       94
       94
       +
             ${extraConfig}

     

       95
       95
       +
             '';

     

       120
       96
        
       

     

       121
       97
        
         rocksSubdir = "${attrs.pname}-${version}-rocks";

     

       122
       98
        
       

     

       123
       123
       -
         externalDepsDirs = map

     

       124
       124
       -
           (x: "'${builtins.toString x}'")

     

       125
       125
       -
           (lib.filter (lib.isDerivation) externalDeps);

     

       126
       126
       -
       

     

       127
       127
       -
         rocksTrees = lib.imap0

     

       128
       128
       -
           (i: dep: "{ name = [[dep-${toString i}]], root = '${dep}', rocks_dir = '${dep}/${dep.rocksSubdir}' }")

     

       129
       129
       -
           requiredLuaRocks;

     

       130
       130
       -
       

     

       131
       99
        
         # Filter out the lua derivation itself from the Lua module dependency

     

       132
       100
        
         # closure, as it doesn't have a rock tree :)

     

       133
       101
        
         requiredLuaRocks = lib.filter (d: d ? luaModule)

     

       134
       102
        
           (lua.pkgs.requiredLuaModules propagatedBuildInputs);

     

       135
       135
       -
       

     

       136
       136
       -
         # Explicitly point luarocks to the relevant locations for multiple-output

     

       137
       137
       -
         # derivations that are external dependencies, to work around an issue it has

     

       138
       138
       -
         # (https://github.com/luarocks/luarocks/issues/766)

     

       139
       139
       -
         depVariables = lib.concatMap ({name, dep}: [

     

       140
       140
       -
           "${name}_INCDIR='${lib.getDev dep}/include';"

     

       141
       141
       -
           "${name}_LIBDIR='${lib.getLib dep}/lib';"

     

       142
       142
       -
           "${name}_BINDIR='${lib.getBin dep}/bin';"

     

       143
       143
       -
         ]) externalDeps';

     

       144
       103
        
       

     

       145
       104
        
         # example externalDeps': [ { name = "CRYPTO"; dep = pkgs.openssl; } ]

     

       146
       105
        
         externalDeps' = lib.filter (dep: !lib.isDerivation dep) externalDeps;

+27

pkgs/development/interpreters/lua-5/hooks/default.nix

···

       1
       1
       +
       # Hooks for building lua packages.

     

       2
       2
       +
       { lua

     

       3
       3
       +
       , lib

     

       4
       4
       +
       , makeSetupHook

     

       5
       5
       +
       , findutils

     

       6
       6
       +
       , runCommand

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       let

     

       10
       10
       +
         callPackage = lua.pkgs.callPackage;

     

       11
       11
       +
         luaInterpreter = lua.interpreter;

     

       12
       12
       +
       in {

     

       13
       13
       +
       

     

       14
       14
       +
         lua-setup-hook = LuaPathSearchPaths: LuaCPathSearchPaths:

     

       15
       15
       +
           let

     

       16
       16
       +
             hook = ./setup-hook.sh;

     

       17
       17
       +
           in runCommand "lua-setup-hook.sh" {

     

       18
       18
       +
             # hum doesn't seem to like caps !! BUG ?

     

       19
       19
       +
             luapathsearchpaths=lib.escapeShellArgs LuaPathSearchPaths;

     

       20
       20
       +
             luacpathsearchpaths=lib.escapeShellArgs LuaCPathSearchPaths;

     

       21
       21
       +
           } ''

     

       22
       22
       +
             cp ${hook} hook.sh

     

       23
       23
       +
             substituteAllInPlace hook.sh

     

       24
       24
       +
             mv hook.sh $out

     

       25
       25
       +
           '';

     

       26
       26
       +
       

     

       27
       27
       +
       }

-15

pkgs/development/interpreters/lua-5/setup-hook.nix

···

       1
       1
       -
       { runCommand, lib, }:

     

       2
       2
       -
       

     

       3
       3
       -
       LuaPathSearchPaths: LuaCPathSearchPaths:

     

       4
       4
       -
       

     

       5
       5
       -
       let

     

       6
       6
       -
         hook = ./setup-hook.sh;

     

       7
       7
       -
       in runCommand "lua-setup-hook.sh" {

     

       8
       8
       -
         # hum doesn't seem to like caps !! BUG ?

     

       9
       9
       -
         luapathsearchpaths=lib.escapeShellArgs LuaPathSearchPaths;

     

       10
       10
       -
         luacpathsearchpaths=lib.escapeShellArgs LuaCPathSearchPaths;

     

       11
       11
       -
       } ''

     

       12
       12
       -
         cp ${hook} hook.sh

     

       13
       13
       -
         substituteAllInPlace hook.sh

     

       14
       14
       -
         mv hook.sh $out

     

       15
       15
       -
       ''

pkgs/development/interpreters/lua-5/setup-hook.sh pkgs/development/interpreters/lua-5/hooks/setup-hook.sh

+6 -1

pkgs/development/libraries/capnproto/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl }:

     

       1
       1
       +
       { lib, stdenv, fetchurl, capnproto, cmake }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "capnproto";

     
···

       8
       8
        
           url = "https://capnproto.org/capnproto-c++-${version}.tar.gz";

     

       9
       9
        
           sha256 = "sha256-soBUp6K/6kK/w5LI0AljDZTXLozoaiOtbxi15yV0Bk8=";

     

       10
       10
        
         };

     

       11
       11
       +
       

     

       12
       12
       +
         nativeBuildInputs = [ cmake ]

     

       13
       13
       +
           ++ lib.optional (!(stdenv.hostPlatform.isCompatible stdenv.buildPlatform)) capnproto;

     

       14
       14
       +
       

     

       15
       15
       +
         cmakeFlags = lib.optional (!(stdenv.hostPlatform.isCompatible stdenv.buildPlatform)) "-DEXTERNAL_CAPNP";

     

       11
       16
        
       

     

       12
       17
        
         meta = with lib; {

     

       13
       18
        
           homepage    = "https://capnproto.org/";

+2 -2

pkgs/development/libraries/libarchive-qt/default.nix

···

       2
       2
        
       

     

       3
       3
        
       mkDerivation rec {

     

       4
       4
        
         pname = "libarchive-qt";

     

       5
       5
       -
         version = "2.0.4";

     

       5
       5
       +
         version = "2.0.6";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitLab {

     

       8
       8
        
           owner = "marcusbritanicus";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-onTV9dgk6Yl9H35EvA6/8vk1IrYH8vg9OQNVgzkt4q4";

     

       11
       11
       +
           sha256 = "sha256-Z+2zjQolV1Ncr6v9r7fGrc/fEMt0iMtGwv9eZ2Tu2cA=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [

+2

pkgs/development/libraries/libgpg-error/default.nix

···

       35
       35
        
           ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-gnueabi.h

     

       36
       36
        
         '' + lib.optionalString (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isMusl) ''

     

       37
       37
        
           ln -s lock-obj-pub.x86_64-pc-linux-musl.h src/syscfg/lock-obj-pub.linux-musl.h

     

       38
       38
       +
         '' + lib.optionalString (stdenv.hostPlatform.isi686 && stdenv.hostPlatform.isMusl) ''

     

       39
       39
       +
           ln -s lock-obj-pub.i686-unknown-linux-gnu.h src/syscfg/lock-obj-pub.linux-musl.h

     

       38
       40
        
         '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.hostPlatform.isMusl) ''

     

       39
       41
        
           ln -s src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.arm-unknown-linux-musleabihf.h

     

       40
       42
        
           ln -s src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-musleabihf.h

+2

pkgs/development/libraries/mapnik/default.nix

···

       96
       96
        
           maintainers = with maintainers; [ hrdinka ];

     

       97
       97
        
           license = licenses.lgpl21;

     

       98
       98
        
           platforms = platforms.all;

     

       99
       99
       +
           # https://github.com/mapnik/mapnik/issues/4232

     

       100
       100
       +
           broken = lib.versionAtLeast proj.version "8.0.0";

     

       99
       101
        
         };

     

       100
       102
        
       }

+2 -2

pkgs/development/libraries/nsss/default.nix

···

       4
       4
        
       

     

       5
       5
        
       buildPackage {

     

       6
       6
        
         pname = "nsss";

     

       7
       7
       -
         version = "0.1.0.1";

     

       8
       8
       -
         sha256 = "1nair10m7fddp50mpqnwj0qiggnh5qmnffmyzxis5l1ixcav1ir0";

     

       7
       7
       +
         version = "0.2.0.0";

     

       8
       8
       +
         sha256 = "0zg0lwkvx9ch4a6h9ryc73nqfz733v2pv4gbf65qzpz7ccniwagi";

     

       9
       9
        
       

     

       10
       10
        
         description = "An implementation of a subset of the pwd.h, group.h and shadow.h family of functions.";

     

       11
       11

+58

pkgs/development/libraries/proj/7.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , cmake

     

       5
       5
       +
       , pkg-config

     

       6
       6
       +
       , sqlite

     

       7
       7
       +
       , libtiff

     

       8
       8
       +
       , curl

     

       9
       9
       +
       , gtest

     

       10
       10
       +
       , fetchpatch

     

       11
       11
       +
       }:

     

       12
       12
       +
       

     

       13
       13
       +
       stdenv.mkDerivation rec {

     

       14
       14
       +
         pname = "proj";

     

       15
       15
       +
         version = "7.2.1";

     

       16
       16
       +
       

     

       17
       17
       +
         src = fetchFromGitHub {

     

       18
       18
       +
           owner = "OSGeo";

     

       19
       19
       +
           repo = "PROJ";

     

       20
       20
       +
           rev = version;

     

       21
       21
       +
           sha256 = "0mymvfvs8xggl4axvlj7kc1ksd9g94kaz6w1vdv0x2y5mqk93gx9";

     

       22
       22
       +
         };

     

       23
       23
       +
       

     

       24
       24
       +
         patches = [

     

       25
       25
       +
           (fetchpatch { # https://github.com/OSGeo/PROJ/issues/2557

     

       26
       26
       +
             name = "gie_self_tests-fail.diff"; # included in >= 8.0.1

     

       27
       27
       +
             url = "https://github.com/OSGeo/PROJ/commit/6f1a3c4648bf06862dca0b3725cbb3b7ee0284e3.diff";

     

       28
       28
       +
             sha256 = "0gapny0a9c3r0x9szjgn86sspjrrf4vwbija77b17w6ci5cq4pdf";

     

       29
       29
       +
           })

     

       30
       30
       +
         ];

     

       31
       31
       +
       

     

       32
       32
       +
         postPatch = lib.optionalString (version == "7.2.1") ''

     

       33
       33
       +
           substituteInPlace CMakeLists.txt \

     

       34
       34
       +
             --replace "MAJOR 7 MINOR 2 PATCH 0" "MAJOR 7 MINOR 2 PATCH 1"

     

       35
       35
       +
         '';

     

       36
       36
       +
       

     

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

     

       38
       38
       +
       

     

       39
       39
       +
         nativeBuildInputs = [ cmake pkg-config ];

     

       40
       40
       +
       

     

       41
       41
       +
         buildInputs = [ sqlite libtiff curl ];

     

       42
       42
       +
       

     

       43
       43
       +
         checkInputs = [ gtest ];

     

       44
       44
       +
       

     

       45
       45
       +
         cmakeFlags = [

     

       46
       46
       +
           "-DUSE_EXTERNAL_GTEST=ON"

     

       47
       47
       +
         ];

     

       48
       48
       +
       

     

       49
       49
       +
         doCheck = true;

     

       50
       50
       +
       

     

       51
       51
       +
         meta = with lib; {

     

       52
       52
       +
           description = "Cartographic Projections Library";

     

       53
       53
       +
           homepage = "https://proj4.org";

     

       54
       54
       +
           license = licenses.mit;

     

       55
       55
       +
           platforms = platforms.unix;

     

       56
       56
       +
           maintainers = with maintainers; [ vbgl dotlambda ];

     

       57
       57
       +
         };

     

       58
       58
       +
       }

+5 -22

pkgs/development/libraries/proj/default.nix

···

       7
       7
        
       , libtiff

     

       8
       8
        
       , curl

     

       9
       9
        
       , gtest

     

       10
       10
       -
       , fetchpatch

     

       11
       10
        
       }:

     

       12
       11
        
       

     

       13
       12
        
       stdenv.mkDerivation rec {

     

       14
       13
        
         pname = "proj";

     

       15
       15
       -
         version = "7.2.1";

     

       14
       14
       +
         version = "8.1.1";

     

       16
       15
        
       

     

       17
       16
        
         src = fetchFromGitHub {

     

       18
       17
        
           owner = "OSGeo";

     

       19
       18
        
           repo = "PROJ";

     

       20
       19
        
           rev = version;

     

       21
       21
       -
           sha256 = "0mymvfvs8xggl4axvlj7kc1ksd9g94kaz6w1vdv0x2y5mqk93gx9";

     

       20
       20
       +
           sha256 = "sha256-Z2nruyowC3NG4Wb8AFBL0PME/zp9D7SwQdMSl6VjH/w=";

     

       22
       21
        
         };

     

       23
       22
        
       

     

       24
       24
       -
         patches = [

     

       25
       25
       -
           (fetchpatch { # https://github.com/OSGeo/PROJ/issues/2557

     

       26
       26
       -
             name = "gie_self_tests-fail.diff"; # included in >= 8.0.1

     

       27
       27
       -
             url = "https://github.com/OSGeo/PROJ/commit/6f1a3c4648bf06862dca0b3725cbb3b7ee0284e3.diff";

     

       28
       28
       -
             sha256 = "0gapny0a9c3r0x9szjgn86sspjrrf4vwbija77b17w6ci5cq4pdf";

     

       29
       29
       -
           })

     

       30
       30
       -
         ];

     

       31
       31
       -
       

     

       32
       32
       -
         postPatch = lib.optionalString (version == "7.2.1") ''

     

       33
       33
       -
           substituteInPlace CMakeLists.txt \

     

       34
       34
       -
             --replace "MAJOR 7 MINOR 2 PATCH 0" "MAJOR 7 MINOR 2 PATCH 1"

     

       35
       35
       -
         '';

     

       36
       36
       -
       

     

       37
       23
        
         outputs = [ "out" "dev"];

     

       38
       24
        
       

     

       39
       25
        
         nativeBuildInputs = [ cmake pkg-config ];

     
···

       44
       30
        
       

     

       45
       31
        
         cmakeFlags = [

     

       46
       32
        
           "-DUSE_EXTERNAL_GTEST=ON"

     

       33
       33
       +
           "-DRUN_NETWORK_DEPENDENT_TESTS=OFF"

     

       47
       34
        
         ];

     

       48
       35
        
       

     

       49
       49
       -
         doCheck = stdenv.is64bit;

     

       50
       50
       -
       

     

       51
       51
       -
         preCheck = ''

     

       52
       52
       -
           export HOME=$TMPDIR

     

       53
       53
       -
         '';

     

       36
       36
       +
         doCheck = true;

     

       54
       37
        
       

     

       55
       38
        
         meta = with lib; {

     

       56
       39
        
           description = "Cartographic Projections Library";

     

       57
       57
       -
           homepage = "https://proj4.org";

     

       40
       40
       +
           homepage = "https://proj.org/";

     

       58
       41
        
           license = licenses.mit;

     

       59
       42
        
           platforms = platforms.unix;

     

       60
       43
        
           maintainers = with maintainers; [ vbgl dotlambda ];

+31

pkgs/development/libraries/skalibs/2_10.nix

···

       1
       1
       +
       { skawarePackages }:

     

       2
       2
       +
       

     

       3
       3
       +
       skawarePackages.buildPackage {

     

       4
       4
       +
         pname = "skalibs";

     

       5
       5
       +
         version = "2.10.0.3";

     

       6
       6
       +
         sha256 = "0ka6n5rnxd5sn5lycarf596d5wlak5s535zqqlz0rnhdcnpb105p";

     

       7
       7
       +
       

     

       8
       8
       +
         description = "A set of general-purpose C programming libraries";

     

       9
       9
       +
       

     

       10
       10
       +
         outputs = [ "lib" "dev" "doc" "out" ];

     

       11
       11
       +
       

     

       12
       12
       +
         configureFlags = [

     

       13
       13
       +
           # assume /dev/random works

     

       14
       14
       +
           "--enable-force-devr"

     

       15
       15
       +
           "--libdir=\${lib}/lib"

     

       16
       16
       +
           "--dynlibdir=\${lib}/lib"

     

       17
       17
       +
           "--includedir=\${dev}/include"

     

       18
       18
       +
           "--sysdepdir=\${lib}/lib/skalibs/sysdeps"

     

       19
       19
       +
           # Empty the default path, which would be "/usr/bin:bin".

     

       20
       20
       +
           # It would be set when PATH is empty. This hurts hermeticity.

     

       21
       21
       +
           "--with-default-path="

     

       22
       22
       +
         ];

     

       23
       23
       +
       

     

       24
       24
       +
         postInstall = ''

     

       25
       25
       +
           rm -rf sysdeps.cfg

     

       26
       26
       +
           rm libskarnet.*

     

       27
       27
       +
       

     

       28
       28
       +
           mv doc $doc/share/doc/skalibs/html

     

       29
       29
       +
         '';

     

       30
       30
       +
       

     

       31
       31
       +
       }

+9 -3

pkgs/development/libraries/skalibs/default.nix

···

       1
       1
       -
       { skawarePackages }:

     

       1
       1
       +
       { skawarePackages, pkgs }:

     

       2
       2
        
       

     

       3
       3
        
       with skawarePackages;

     

       4
       4
        
       

     

       5
       5
        
       buildPackage {

     

       6
       6
        
         pname = "skalibs";

     

       7
       7
       -
         version = "2.10.0.3";

     

       8
       8
       -
         sha256 = "0ka6n5rnxd5sn5lycarf596d5wlak5s535zqqlz0rnhdcnpb105p";

     

       7
       7
       +
         version = "2.11.0.0";

     

       8
       8
       +
         sha256 = "1n9l7mb54dlb0iijjaf446jba6nmq1ql9n39s095ngrk5ahcipwq";

     

       9
       9
        
       

     

       10
       10
        
         description = "A set of general-purpose C programming libraries";

     

       11
       11
        
       

     
···

       29
       29
        
       

     

       30
       30
        
           mv doc $doc/share/doc/skalibs/html

     

       31
       31
        
         '';

     

       32
       32
       +
       

     

       33
       33
       +
         passthru.tests = {

     

       34
       34
       +
           # fdtools is one of the few non-skalib packages that depends on skalibs

     

       35
       35
       +
           # and might break if skalibs gets an breaking update.

     

       36
       36
       +
           fdtools = pkgs.fdtools;

     

       37
       37
       +
         };

     

       32
       38
        
       

     

       33
       39
        
       }

+2 -2

pkgs/development/libraries/utmps/default.nix

···

       4
       4
        
       

     

       5
       5
        
       buildPackage {

     

       6
       6
        
         pname = "utmps";

     

       7
       7
       -
         version = "0.1.0.2";

     

       8
       8
       -
         sha256 = "1vjza7m65ziq54q0sv46kb3lss9cmxkkv0n9h3i8505x0h2hlvlb";

     

       7
       7
       +
         version = "0.1.0.3";

     

       8
       8
       +
         sha256 = "0npgg90lzxmhld6hp296gbnrsixip28s7axirc2g6yjpjz2bvcan";

     

       9
       9
        
       

     

       10
       10
        
         description = "A secure utmpx and wtmp implementation";

     

       11
       11

+93 -52

pkgs/development/lua-modules/generated-packages.nix

···

       23
       23
        
         "date": "2017-01-06T13:50:55+03:00",

     

       24
       24
        
         "path": "/nix/store/z72v77cw9188408ynsppwhlzii2dr740-lua-alt-getopt",

     

       25
       25
        
         "sha256": "1kq7r5668045diavsqd1j6i9hxdpsk99w8q4zr8cby9y3ws4q6rv",

     

       26
       26
       +
         "fetchLFS": false,

     

       26
       27
        
         "fetchSubmodules": true,

     

       27
       28
        
         "deepClone": false,

     

       28
       29
        
         "leaveDotGit": false

     
···

       50
       51
        
         "date": "2020-07-08T11:17:50+10:00",

     

       51
       52
        
         "path": "/nix/store/vjm6c826hgvj7h7vqlbgkfpvijsd8yaf-argparse",

     

       52
       53
        
         "sha256": "0idg79d0dfis4qhbkbjlmddq87np75hb2vj41i6prjpvqacvg5v1",

     

       54
       54
       +
         "fetchLFS": false,

     

       53
       55
        
         "fetchSubmodules": true,

     

       54
       56
        
         "deepClone": false,

     

       55
       57
        
         "leaveDotGit": false

     
···

       119
       121
        
         "date": "2015-02-17T10:44:04+01:00",

     

       120
       122
        
         "path": "/nix/store/9kz7kgjmq0w9plrpha866bmwsgp4rfhn-lua-compat-5.2",

     

       121
       123
        
         "sha256": "1ipqlbvb5w394qwhm2f3w6pdrgy8v4q8sps5hh3pqz14dcqwakhj",

     

       124
       124
       +
         "fetchLFS": false,

     

       122
       125
        
         "fetchSubmodules": true,

     

       123
       126
        
         "deepClone": false,

     

       124
       127
        
         "leaveDotGit": false

     
···

       171
       174
        
         "date": "2021-07-19T14:37:34+03:00",

     

       172
       175
        
         "path": "/nix/store/rzsbr6gqg8vhchl24ma3p1h4slhk0xp7-cassowary.lua",

     

       173
       176
        
         "sha256": "1r668qcvd2a1rx17xp7ajp5wjhyvh2fwn0c60xmw0mnarjb5w1pq",

     

       174
       174
       -
         "fetchSubmodules": false,

     

       177
       177
       +
         "fetchLFS": false,

     

       178
       178
       +
         "fetchSubmodules": true,

     

       175
       179
        
         "deepClone": false,

     

       176
       180
        
         "leaveDotGit": false

     

       177
       181
        
       }

     
···

       179
       183
        
       

     

       180
       184
        
         disabled = (luaOlder "5.1");

     

       181
       185
        
         propagatedBuildInputs = [ lua penlight ];

     

       182
       182
       -
         checkInputs = [ busted ];

     

       183
       183
       -
         # Avoid circular dependency issue with busted / penlight, see:

     

       184
       184
       -
         # https://github.com/NixOS/nixpkgs/pull/136453/files#r700982255

     

       185
       185
       -
         doCheck = false;

     

       186
       186
        
       

     

       187
       187
        
         meta = {

     

       188
       188
        
           homepage = "https://github.com/sile-typesetter/cassowary.lua";

     
···

       196
       196
        
         pname = "compat53";

     

       197
       197
        
         version = "0.7-1";

     

       198
       198
        
         knownRockspec = (fetchurl {

     

       199
       199
       -
           url    = "https://luarocks.org/compat53-0.7-1.rockspec";

     

       199
       199
       +
           url    = "https://luafr.org/luarocks/compat53-0.7-1.rockspec";

     

       200
       200
        
           sha256 = "1r7a3q1cjrcmdycrv2ikgl83irjhxs53sa88v2fdpr9aaamlb101";

     

       201
       201
        
         }).outPath;

     

       202
       202
        
         src = fetchurl {

     
···

       228
       228
        
         "date": "2016-06-17T05:39:58-07:00",

     

       229
       229
        
         "path": "/nix/store/k3p4xc4cfihp4h8aj6vacr25rpcsjd96-cosmo",

     

       230
       230
        
         "sha256": "03b5gwsgxd777970d2h6rx86p7ivqx7bry8xmx2r396g3w85qy2p",

     

       231
       231
       +
         "fetchLFS": false,

     

       231
       232
        
         "fetchSubmodules": true,

     

       232
       233
        
         "deepClone": false,

     

       233
       234
        
         "leaveDotGit": false

     
···

       257
       258
        
         "date": "2018-02-26T19:53:11-03:00",

     

       258
       259
        
         "path": "/nix/store/1q4p5qvr6rlwisyarlgnmk4dx6vp8xdl-coxpcall",

     

       259
       260
        
         "sha256": "1k3q1rr2kavkscf99b5njxhibhp6iwhclrjk6nnnp233iwc2jvqi",

     

       261
       261
       +
         "fetchLFS": false,

     

       260
       262
        
         "fetchSubmodules": true,

     

       261
       263
        
         "deepClone": false,

     

       262
       264
        
         "leaveDotGit": false

     
···

       304
       306
        
         "date": "2015-08-21T18:24:54-04:00",

     

       305
       307
        
         "path": "/nix/store/s7n7f80pz8k6lvfav55a5rwy5l45vs4l-lua-cyrussasl",

     

       306
       308
        
         "sha256": "14kzm3vk96k2i1m9f5zvpvq4pnzaf7s91h5g4h4x2bq1mynzw2s1",

     

       309
       309
       +
         "fetchLFS": false,

     

       307
       310
        
         "fetchSubmodules": true,

     

       308
       311
        
         "deepClone": false,

     

       309
       312
        
         "leaveDotGit": false

     
···

       326
       329
        
       

     

       327
       330
        
         src = fetchgit ( removeAttrs (builtins.fromJSON ''{

     

       328
       331
        
         "url": "https://github.com/astoff/digestif",

     

       329
       329
       -
         "rev": "3a9076f76d8121526adcdbb9303d04dd3c721a34",

     

       330
       330
       -
         "date": "2021-06-24T16:18:41+02:00",

     

       331
       331
       -
         "path": "/nix/store/alzrvcxdmdfqqmm0diaxfljyr3jz1zk3-digestif",

     

       332
       332
       -
         "sha256": "110vsqyyp2pvn6nk492a9r56iyzymy0w1f2hvx26pv5x01mxm20x",

     

       332
       332
       +
         "rev": "9f8f299cf7094d72edbd32a455869751246028b7",

     

       333
       333
       +
         "date": "2021-09-25T14:32:42+02:00",

     

       334
       334
       +
         "path": "/nix/store/ln1zx9cw2b7q4x5vzd6hv5nd01c1gsy3-digestif",

     

       335
       335
       +
         "sha256": "1cf14m03jvfs1mwaywfgv759jh0ha3pxrnyj7jxjxlsj6cim89v0",

     

       336
       336
       +
         "fetchLFS": false,

     

       333
       337
        
         "fetchSubmodules": true,

     

       334
       338
        
         "deepClone": false,

     

       335
       339
        
         "leaveDotGit": false

     
···

       395
       399
        
       

     

       396
       400
        
         src = fetchgit ( removeAttrs (builtins.fromJSON ''{

     

       397
       401
        
         "url": "https://github.com/lewis6991/gitsigns.nvim",

     

       398
       398
       -
         "rev": "daa233aabb4dbc7c870ea7300bcfeef96d49c2a3",

     

       399
       399
       -
         "date": "2021-08-29T23:08:52+01:00",

     

       400
       400
       -
         "path": "/nix/store/4685c871dzh0kqf3fs5iqmaysag4m9nx-gitsigns.nvim",

     

       401
       401
       -
         "sha256": "0y0il8v0g8kvsyzir4hbkwvzv9wk2iqs1apxlvijk9ccfdk9ya0p",

     

       402
       402
       +
         "rev": "7e5c1a831f555dc398dd1564489e2b8a5c867754",

     

       403
       403
       +
         "date": "2021-09-25T16:49:34+01:00",

     

       404
       404
       +
         "path": "/nix/store/a1h8xxb9w4kvvmq7q30m1ny2pq3zbmin-gitsigns.nvim",

     

       405
       405
       +
         "sha256": "02kssw0lpprf9k3il6gfd00gj9fbjbksipa4f6xqkgfdq5c9l9fr",

     

       406
       406
       +
         "fetchLFS": false,

     

       402
       407
        
         "fetchSubmodules": true,

     

       403
       408
        
         "deepClone": false,

     

       404
       409
        
         "leaveDotGit": false

     
···

       419
       424
        
         pname = "http";

     

       420
       425
        
         version = "0.3-0";

     

       421
       426
        
         knownRockspec = (fetchurl {

     

       422
       422
       -
           url    = "https://luarocks.org/http-0.3-0.rockspec";

     

       427
       427
       +
           url    = "https://luafr.org/luarocks/http-0.3-0.rockspec";

     

       423
       428
        
           sha256 = "0fn3irkf5nnmfc83alc40b316hs8l7zdq2xlaiaa65sjd8acfvia";

     

       424
       429
        
         }).outPath;

     

       425
       430
        
         src = fetchurl {

     
···

       442
       447
        
         pname = "inspect";

     

       443
       448
        
         version = "3.1.1-0";

     

       444
       449
        
         knownRockspec = (fetchurl {

     

       445
       445
       -
           url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/inspect-3.1.1-0.rockspec";

     

       450
       450
       +
           url    = "https://luarocks.org/inspect-3.1.1-0.rockspec";

     

       446
       451
        
           sha256 = "00spibq2h4an8v0204vr1hny4vv6za720c37ipsahpjk198ayf1p";

     

       447
       452
        
         }).outPath;

     

       448
       453
        
         src = fetchurl {

     
···

       473
       478
        
         "date": "2019-08-16T14:26:05+10:00",

     

       474
       479
        
         "path": "/nix/store/gg4zldd6kx048d6p65b9cimg3arma8yh-ldbus",

     

       475
       480
        
         "sha256": "06wcz4i5b7kphqbry274q3ivnsh331rxiyf7n4qk3zx2kvarq08s",

     

       481
       481
       +
         "fetchLFS": false,

     

       476
       482
        
         "fetchSubmodules": true,

     

       477
       483
        
         "deepClone": false,

     

       478
       484
        
         "leaveDotGit": false

     
···

       499
       505
        
         "date": "2021-06-24T13:07:51+02:00",

     

       500
       506
        
         "path": "/nix/store/pzk1qi4fdviz2pq5bg3q91jmrg8wziqx-LDoc",

     

       501
       507
        
         "sha256": "05wd5m5v3gv777kgikj46216slxyf1zdbzl4idara9lcfw3mfyyw",

     

       508
       508
       +
         "fetchLFS": false,

     

       502
       509
        
         "fetchSubmodules": true,

     

       503
       510
        
         "deepClone": false,

     

       504
       511
        
         "leaveDotGit": false

     
···

       527
       534
        
         "date": "2017-10-09T20:55:55+02:00",

     

       528
       535
        
         "path": "/nix/store/vh82n8pc8dy5c8nph0vssk99vv7q4qg2-lgi",

     

       529
       536
        
         "sha256": "03rbydnj411xpjvwsyvhwy4plm96481d7jax544mvk7apd8sd5jj",

     

       537
       537
       +
         "fetchLFS": false,

     

       530
       538
        
         "fetchSubmodules": true,

     

       531
       539
        
         "deepClone": false,

     

       532
       540
        
         "leaveDotGit": false

     
···

       655
       663
        
         pname = "lpty";

     

       656
       664
        
         version = "1.2.2-1";

     

       657
       665
        
         knownRockspec = (fetchurl {

     

       658
       658
       -
           url    = "https://luarocks.org/lpty-1.2.2-1.rockspec";

     

       666
       666
       +
           url    = "https://luafr.org/luarocks/lpty-1.2.2-1.rockspec";

     

       659
       667
        
           sha256 = "04af4mhiqrw3br4qzz7yznw9zy2m50wddwzgvzkvhd99ng71fkzg";

     

       660
       668
        
         }).outPath;

     

       661
       669
        
         src = fetchurl {

     
···

       677
       685
        
         pname = "lrexlib-gnu";

     

       678
       686
        
         version = "2.9.1-1";

     

       679
       687
        
         knownRockspec = (fetchurl {

     

       680
       680
       -
           url    = "https://luarocks.org/lrexlib-gnu-2.9.1-1.rockspec";

     

       688
       688
       +
           url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lrexlib-gnu-2.9.1-1.rockspec";

     

       681
       689
        
           sha256 = "1jfjxh26iwsavipkwmscwv52l77qxzvibfmlvpskcpawyii7xcw8";

     

       682
       690
        
         }).outPath;

     

       683
       691
        
         src = fetchgit ( removeAttrs (builtins.fromJSON ''{

     
···

       686
       694
        
         "date": "2020-08-07T12:10:29+03:00",

     

       687
       695
        
         "path": "/nix/store/vnnhcc0r9zhqwshmfzrn0ryai61l6xrd-lrexlib",

     

       688
       696
        
         "sha256": "15dsxq0363940rij9za8mc224n9n58i2iqw1z7r1jh3qpkaciw7j",

     

       697
       697
       +
         "fetchLFS": false,

     

       689
       698
        
         "fetchSubmodules": true,

     

       690
       699
        
         "deepClone": false,

     

       691
       700
        
         "leaveDotGit": false

     
···

       715
       724
        
         "date": "2020-08-07T12:10:29+03:00",

     

       716
       725
        
         "path": "/nix/store/vnnhcc0r9zhqwshmfzrn0ryai61l6xrd-lrexlib",

     

       717
       726
        
         "sha256": "15dsxq0363940rij9za8mc224n9n58i2iqw1z7r1jh3qpkaciw7j",

     

       727
       727
       +
         "fetchLFS": false,

     

       718
       728
        
         "fetchSubmodules": true,

     

       719
       729
        
         "deepClone": false,

     

       720
       730
        
         "leaveDotGit": false

     
···

       736
       746
        
         pname = "lrexlib-posix";

     

       737
       747
        
         version = "2.9.1-1";

     

       738
       748
        
         knownRockspec = (fetchurl {

     

       739
       739
       -
           url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lrexlib-posix-2.9.1-1.rockspec";

     

       749
       749
       +
           url    = "https://luafr.org/luarocks/lrexlib-posix-2.9.1-1.rockspec";

     

       740
       750
        
           sha256 = "1zxrx9yifm9ry4wbjgv86rlvq3ff6qivldvib3ha4767azla0j0r";

     

       741
       751
        
         }).outPath;

     

       742
       752
        
         src = fetchgit ( removeAttrs (builtins.fromJSON ''{

     
···

       745
       755
        
         "date": "2020-08-07T12:10:29+03:00",

     

       746
       756
        
         "path": "/nix/store/vnnhcc0r9zhqwshmfzrn0ryai61l6xrd-lrexlib",

     

       747
       757
        
         "sha256": "15dsxq0363940rij9za8mc224n9n58i2iqw1z7r1jh3qpkaciw7j",

     

       758
       758
       +
         "fetchLFS": false,

     

       748
       759
        
         "fetchSubmodules": true,

     

       749
       760
        
         "deepClone": false,

     

       750
       761
        
         "leaveDotGit": false

     
···

       774
       785
        
         "date": "2018-04-19T12:03:43-07:00",

     

       775
       786
        
         "path": "/nix/store/qdpqx2g0xi1c9fknzxx280mcdq6fi8rw-lua-cjson",

     

       776
       787
        
         "sha256": "0i2sjsi6flax1k0bm647yijgmc02jznq9bn88mj71pgii79pfjhw",

     

       788
       788
       +
         "fetchLFS": false,

     

       777
       789
        
         "fetchSubmodules": true,

     

       778
       790
        
         "deepClone": false,

     

       779
       791
        
         "leaveDotGit": false

     
···

       803
       815
        
         "date": "2015-06-03T08:39:04+02:00",

     

       804
       816
        
         "path": "/nix/store/ksqvl7hbd5s7nb6hjffyic1shldac4z2-lua-cmsgpack",

     

       805
       817
        
         "sha256": "0j0ahc9rprgl6dqxybaxggjam2r5i2wqqsd6764n0d7fdpj9fqm0",

     

       818
       818
       +
         "fetchLFS": false,

     

       806
       819
        
         "fetchSubmodules": true,

     

       807
       820
        
         "deepClone": false,

     

       808
       821
        
         "leaveDotGit": false

     
···

       854
       867
        
         "date": "2020-10-17T15:07:11-04:00",

     

       855
       868
        
         "path": "/nix/store/qn9syhm875k1qardhhsp025cm3dbnqvm-lua-lsp",

     

       856
       869
        
         "sha256": "17k3jq61jz6j9bz4vc3hmsfx1s26cfgq1acja8fqyixljklmsbqp",

     

       870
       870
       +
         "fetchLFS": false,

     

       857
       871
        
         "fetchSubmodules": true,

     

       858
       872
        
         "deepClone": false,

     

       859
       873
        
         "leaveDotGit": false

     
···

       905
       919
        
         "date": "2021-04-09T17:11:35+01:00",

     

       906
       920
        
         "path": "/nix/store/zzd1xj4r0iy3srs2hgv4mlm6wflmk24x-lua-resty-http",

     

       907
       921
        
         "sha256": "1whwn2fwm8c9jda4z1sb5636sfy4pfgjdxw0grcgmf6451xi57nw",

     

       922
       922
       +
         "fetchLFS": false,

     

       908
       923
        
         "fetchSubmodules": true,

     

       909
       924
        
         "deepClone": false,

     

       910
       925
        
         "leaveDotGit": false

     
···

       934
       949
        
         "date": "2021-01-20T16:53:57-05:00",

     

       935
       950
        
         "path": "/nix/store/z4a8ffxj2i3gbjp0f8r377cdp88lkzl4-lua-resty-jwt",

     

       936
       951
        
         "sha256": "07w8r8gqbby06x493qzislig7a3giw0anqr4ivp3g2ms8v9fnng6",

     

       952
       952
       +
         "fetchLFS": false,

     

       937
       953
        
         "fetchSubmodules": true,

     

       938
       954
        
         "deepClone": false,

     

       939
       955
        
         "leaveDotGit": false

     
···

       954
       970
        
         pname = "lua-resty-openidc";

     

       955
       971
        
         version = "1.7.4-1";

     

       956
       972
        
         knownRockspec = (fetchurl {

     

       957
       957
       -
           url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua-resty-openidc-1.7.4-1.rockspec";

     

       973
       973
       +
           url    = "https://luarocks.org/lua-resty-openidc-1.7.4-1.rockspec";

     

       958
       974
        
           sha256 = "12r03pzx1lpaxzy71iqh0kf1zs6gx1k89vpxc5va9r7nr47a56vy";

     

       959
       975
        
         }).outPath;

     

       960
       976
        
         src = fetchgit ( removeAttrs (builtins.fromJSON ''{

     
···

       963
       979
        
         "date": "2020-11-17T17:42:16+01:00",

     

       964
       980
        
         "path": "/nix/store/240kss5xx1br5n3qz6djw21cs1fj4pfg-lua-resty-openidc",

     

       965
       981
        
         "sha256": "1gw71av1r0c6v4f1h0bj0l6way2hmipic6wmipnavr17bz7m1q7z",

     

       982
       982
       +
         "fetchLFS": false,

     

       966
       983
        
         "fetchSubmodules": true,

     

       967
       984
        
         "deepClone": false,

     

       968
       985
        
         "leaveDotGit": false

     
···

       981
       998
        
       

     

       982
       999
        
       lua-resty-openssl = buildLuarocksPackage {

     

       983
       1000
        
         pname = "lua-resty-openssl";

     

       984
       984
       -
         version = "0.7.4-1";

     

       1001
       1001
       +
         version = "0.7.5-1";

     

       985
       1002
        
         knownRockspec = (fetchurl {

     

       986
       986
       -
           url    = "https://luarocks.org/lua-resty-openssl-0.7.4-1.rockspec";

     

       987
       987
       -
           sha256 = "1h87nc8rnay2h0hcc9rylkdzrssibjs6whyim53k647wqkm3fslm";

     

       1003
       1003
       +
           url    = "https://luafr.org/luarocks/lua-resty-openssl-0.7.5-1.rockspec";

     

       1004
       1004
       +
           sha256 = "13v14in9cgmjgarmy6br9629ns1qlhw7a30c061y6gncjannnv6y";

     

       988
       1005
        
         }).outPath;

     

       989
       1006
        
         src = fetchgit ( removeAttrs (builtins.fromJSON ''{

     

       990
       1007
        
         "url": "https://github.com/fffonion/lua-resty-openssl.git",

     

       991
       991
       -
         "rev": "5b113a6059e63dbcf7c6fa95a149a9381b904219",

     

       992
       992
       -
         "date": "2021-08-02T18:09:14+08:00",

     

       993
       993
       -
         "path": "/nix/store/qk6fcp5hwqsm4mday34l1mdkx0ba76bx-lua-resty-openssl",

     

       994
       994
       -
         "sha256": "1iar6znh0i45zkx03n8vrkwhx732158hmxfmfjgbpv547mh30ly6",

     

       1008
       1008
       +
         "rev": "6a7f4a1649da7e0499b542b73c61e8dbdf91f57e",

     

       1009
       1009
       +
         "date": "2021-09-18T06:15:54+08:00",

     

       1010
       1010
       +
         "path": "/nix/store/01bninsbgix30zl97lk0p10ycqkc37kx-lua-resty-openssl",

     

       1011
       1011
       +
         "sha256": "1ypji678lna9z3a48lhxs7wrw8d1prln7yfvqfm96lbmfvr5wfxw",

     

       1012
       1012
       +
         "fetchLFS": false,

     

       995
       1013
        
         "fetchSubmodules": true,

     

       996
       1014
        
         "deepClone": false,

     

       997
       1015
        
         "leaveDotGit": false

     
···

       1019
       1037
        
         "date": "2021-01-04T14:02:41+02:00",

     

       1020
       1038
        
         "path": "/nix/store/jqc8arr46mx1xbmrsw503zza1kmz7mcv-lua-resty-session",

     

       1021
       1039
        
         "sha256": "09q8xbxkr431i2k21vdyx740rv325v0zmnx0qa3q9x15kcfsd2fm",

     

       1040
       1040
       +
         "fetchLFS": false,

     

       1022
       1041
        
         "fetchSubmodules": true,

     

       1023
       1042
        
         "deepClone": false,

     

       1024
       1043
        
         "leaveDotGit": false

     
···

       1068
       1087
        
         "date": "2017-12-08T16:30:50-08:00",

     

       1069
       1088
        
         "path": "/nix/store/cnpflpyj441c65jhb68hjr2bcvnj9han-lua-toml",

     

       1070
       1089
        
         "sha256": "0lklhgs4n7gbgva5frs39240da1y4nwlx6yxaj3ix6r5lp9sh07b",

     

       1090
       1090
       +
         "fetchLFS": false,

     

       1071
       1091
        
         "fetchSubmodules": true,

     

       1072
       1092
        
         "deepClone": false,

     

       1073
       1093
        
         "leaveDotGit": false

     
···

       1097
       1117
        
         "date": "2020-11-12T06:22:23-08:00",

     

       1098
       1118
        
         "path": "/nix/store/9acgxpqk52kwn03m5xasn4f6mmsby2r9-lua-yajl",

     

       1099
       1119
        
         "sha256": "1frry90y7vqnw1rd1dfnksilynh0n24gfhkmjd6wwba73prrg0pf",

     

       1120
       1120
       +
         "fetchLFS": false,

     

       1100
       1121
        
         "fetchSubmodules": true,

     

       1101
       1122
        
         "deepClone": false,

     

       1102
       1123
        
         "leaveDotGit": false

     
···

       1118
       1139
        
         pname = "lua-zlib";

     

       1119
       1140
        
         version = "1.2-1";

     

       1120
       1141
        
         knownRockspec = (fetchurl {

     

       1121
       1121
       -
           url    = "https://luarocks.org/lua-zlib-1.2-1.rockspec";

     

       1142
       1142
       +
           url    = "https://luafr.org/luarocks/lua-zlib-1.2-1.rockspec";

     

       1122
       1143
        
           sha256 = "18rpbg9b4vsnh3svapiqrvwwshw1abb5l5fd7441byx1nm3fjq9w";

     

       1123
       1144
        
         }).outPath;

     

       1124
       1145
        
         src = fetchgit ( removeAttrs (builtins.fromJSON ''{

     
···

       1127
       1148
        
         "date": "2017-10-07T08:26:37-07:00",

     

       1128
       1149
        
         "path": "/nix/store/6hjfczd3xkilkdxidgqzdrwmaiwnlf05-lua-zlib",

     

       1129
       1150
        
         "sha256": "1cv12s5c5lihmf3hb0rz05qf13yihy1bjpb7448v8mkiss6y1s5c",

     

       1151
       1151
       +
         "fetchLFS": false,

     

       1130
       1152
        
         "fetchSubmodules": true,

     

       1131
       1153
        
         "deepClone": false,

     

       1132
       1154
        
         "leaveDotGit": false

     
···

       1173
       1195
        
         "date": "2021-08-30T10:14:03+02:00",

     

       1174
       1196
        
         "path": "/nix/store/sdnza0zpmlkz9jppnysasbvqy29f4zia-luabitop",

     

       1175
       1197
        
         "sha256": "1b57f99lrjbwsi4m23cq5kpj0dbpxh3xwr0mxs2rzykr2ijpgwrw",

     

       1198
       1198
       +
         "fetchLFS": false,

     

       1176
       1199
        
         "fetchSubmodules": true,

     

       1177
       1200
        
         "deepClone": false,

     

       1178
       1201
        
         "leaveDotGit": false

     
···

       1202
       1225
        
         "date": "2020-08-20T19:21:52-03:00",

     

       1203
       1226
        
         "path": "/nix/store/8r4x8snxp0kjabn9bsxwh62pfczd8wma-luacheck",

     

       1204
       1227
        
         "sha256": "08jsqibksdvpl6mvf8d6rlh5pii78hqm3fkhbkgzrs6k8kk5a7lf",

     

       1228
       1228
       +
         "fetchLFS": false,

     

       1205
       1229
        
         "fetchSubmodules": true,

     

       1206
       1230
        
         "deepClone": false,

     

       1207
       1231
        
         "leaveDotGit": false

     
···

       1222
       1246
        
         pname = "luacov";

     

       1223
       1247
        
         version = "0.15.0-1";

     

       1224
       1248
        
         knownRockspec = (fetchurl {

     

       1225
       1225
       -
           url    = "https://luarocks.org/luacov-0.15.0-1.rockspec";

     

       1249
       1249
       +
           url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luacov-0.15.0-1.rockspec";

     

       1226
       1250
        
           sha256 = "18byfl23c73pazi60hsx0vd74hqq80mzixab76j36cyn8k4ni9db";

     

       1227
       1251
        
         }).outPath;

     

       1228
       1252
        
         src = fetchgit ( removeAttrs (builtins.fromJSON ''{

     
···

       1231
       1255
        
         "date": "2021-02-15T18:47:58-03:00",

     

       1232
       1256
        
         "path": "/nix/store/9vm38il9knzx2m66m250qj1fzdfzqg0y-luacov",

     

       1233
       1257
        
         "sha256": "08550nna6qcb5jn6ds1hjm6010y8973wx4qbf9vrvrcn1k2yr6ki",

     

       1258
       1258
       +
         "fetchLFS": false,

     

       1234
       1259
        
         "fetchSubmodules": true,

     

       1235
       1260
        
         "deepClone": false,

     

       1236
       1261
        
         "leaveDotGit": false

     
···

       1260
       1285
        
         "date": "2019-01-14T09:39:17+00:00",

     

       1261
       1286
        
         "path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi",

     

       1262
       1287
        
         "sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh",

     

       1288
       1288
       +
         "fetchLFS": false,

     

       1263
       1289
        
         "fetchSubmodules": true,

     

       1264
       1290
        
         "deepClone": false,

     

       1265
       1291
        
         "leaveDotGit": false

     
···

       1280
       1306
        
         pname = "luadbi-mysql";

     

       1281
       1307
        
         version = "0.7.2-1";

     

       1282
       1308
        
         knownRockspec = (fetchurl {

     

       1283
       1283
       -
           url    = "https://luarocks.org/luadbi-mysql-0.7.2-1.rockspec";

     

       1309
       1309
       +
           url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luadbi-mysql-0.7.2-1.rockspec";

     

       1284
       1310
        
           sha256 = "0gnyqnvcfif06rzzrdw6w6hchp4jrjiwm0rmfx2r8ljchj2bvml5";

     

       1285
       1311
        
         }).outPath;

     

       1286
       1312
        
         src = fetchgit ( removeAttrs (builtins.fromJSON ''{

     
···

       1289
       1315
        
         "date": "2019-01-14T09:39:17+00:00",

     

       1290
       1316
        
         "path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi",

     

       1291
       1317
        
         "sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh",

     

       1318
       1318
       +
         "fetchLFS": false,

     

       1292
       1319
        
         "fetchSubmodules": true,

     

       1293
       1320
        
         "deepClone": false,

     

       1294
       1321
        
         "leaveDotGit": false

     
···

       1318
       1345
        
         "date": "2019-01-14T09:39:17+00:00",

     

       1319
       1346
        
         "path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi",

     

       1320
       1347
        
         "sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh",

     

       1348
       1348
       +
         "fetchLFS": false,

     

       1321
       1349
        
         "fetchSubmodules": true,

     

       1322
       1350
        
         "deepClone": false,

     

       1323
       1351
        
         "leaveDotGit": false

     
···

       1347
       1375
        
         "date": "2019-01-14T09:39:17+00:00",

     

       1348
       1376
        
         "path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi",

     

       1349
       1377
        
         "sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh",

     

       1378
       1378
       +
         "fetchLFS": false,

     

       1350
       1379
        
         "fetchSubmodules": true,

     

       1351
       1380
        
         "deepClone": false,

     

       1352
       1381
        
         "leaveDotGit": false

     
···

       1367
       1396
        
         pname = "luaepnf";

     

       1368
       1397
        
         version = "0.3-2";

     

       1369
       1398
        
         knownRockspec = (fetchurl {

     

       1370
       1370
       -
           url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luaepnf-0.3-2.rockspec";

     

       1399
       1399
       +
           url    = "https://luafr.org/luarocks/luaepnf-0.3-2.rockspec";

     

       1371
       1400
        
           sha256 = "0kqmnj11wmfpc9mz04zzq8ab4mnbkrhcgc525wrq6pgl3p5li8aa";

     

       1372
       1401
        
         }).outPath;

     

       1373
       1402
        
         src = fetchgit ( removeAttrs (builtins.fromJSON ''{

     
···

       1376
       1405
        
         "date": "2015-01-15T16:54:10+01:00",

     

       1377
       1406
        
         "path": "/nix/store/n7gb0z26sl7dzdyy3bx1y3cz3npsna7d-lua-luaepnf",

     

       1378
       1407
        
         "sha256": "1lvsi3fklhvz671jgg0iqn0xbkzn9qjcbf2ks41xxjz3lapjr6c9",

     

       1408
       1408
       +
         "fetchLFS": false,

     

       1379
       1409
        
         "fetchSubmodules": true,

     

       1380
       1410
        
         "deepClone": false,

     

       1381
       1411
        
         "leaveDotGit": false

     
···

       1450
       1480
        
         "date": "2021-03-01T11:46:30-05:00",

     

       1451
       1481
        
         "path": "/nix/store/6dwfn64p3clcsxkq41b307q8izi0fvji-luaffifb",

     

       1452
       1482
        
         "sha256": "0nj76fw3yi57vfn35yvbdmpdbg9gmn5j1gw84ajs9w1j86sc0661",

     

       1483
       1483
       +
         "fetchLFS": false,

     

       1453
       1484
        
         "fetchSubmodules": true,

     

       1454
       1485
        
         "deepClone": false,

     

       1455
       1486
        
         "leaveDotGit": false

     
···

       1479
       1510
        
         "date": "2017-09-15T20:07:33-03:00",

     

       1480
       1511
        
         "path": "/nix/store/20xm4942kvnb8kypg76jl7zrym5cz03c-luafilesystem",

     

       1481
       1512
        
         "sha256": "0zmprgkm9zawdf9wnw0v3w6ibaj442wlc6alp39hmw610fl4vghi",

     

       1513
       1513
       +
         "fetchLFS": false,

     

       1482
       1514
        
         "fetchSubmodules": true,

     

       1483
       1515
        
         "deepClone": false,

     

       1484
       1516
        
         "leaveDotGit": false

     
···

       1509
       1541
        
         "date": "2021-08-12T19:29:39+02:00",

     

       1510
       1542
        
         "path": "/nix/store/q1v28n04hh3r7aw37cxakzksfa3kw5qa-lualogging",

     

       1511
       1543
        
         "sha256": "0nj0ik91lgl9rwgizdkn7vy9brddsz1kxfn70c01x861vaxi63iz",

     

       1544
       1544
       +
         "fetchLFS": false,

     

       1512
       1545
        
         "fetchSubmodules": true,

     

       1513
       1546
        
         "deepClone": false,

     

       1514
       1547
        
         "leaveDotGit": false

     
···

       1603
       1636
        
         "date": "2021-08-14T10:28:09-03:00",

     

       1604
       1637
        
         "path": "/nix/store/jk2npg54asnmj5fnpldn8dxym9gx8x4g-luasec",

     

       1605
       1638
        
         "sha256": "14hx72qw3gjgz12v5bwpz3irgbf69f8584z8y7lglccbyydp4jla",

     

       1639
       1639
       +
         "fetchLFS": false,

     

       1606
       1640
        
         "fetchSubmodules": true,

     

       1607
       1641
        
         "deepClone": false,

     

       1608
       1642
        
         "leaveDotGit": false

     
···

       1655
       1689
        
         "date": "2021-08-27T15:17:22-03:00",

     

       1656
       1690
        
         "path": "/nix/store/2374agarn72cnlnk2vripfy1zz2y50la-luasql",

     

       1657
       1691
        
         "sha256": "13xs1g67d2p69x4wzxk1h97xh25388h0kkh9bjgw3l1yss9zlxhx",

     

       1692
       1692
       +
         "fetchLFS": false,

     

       1658
       1693
        
         "fetchSubmodules": true,

     

       1659
       1694
        
         "deepClone": false,

     

       1660
       1695
        
         "leaveDotGit": false

     
···

       1720
       1755
        
         pname = "luautf8";

     

       1721
       1756
        
         version = "0.1.3-1";

     

       1722
       1757
        
         knownRockspec = (fetchurl {

     

       1723
       1723
       -
           url    = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luautf8-0.1.3-1.rockspec";

     

       1758
       1758
       +
           url    = "https://luarocks.org/luautf8-0.1.3-1.rockspec";

     

       1724
       1759
        
           sha256 = "16i9wfgd0f299g1afgjp0hhczlrk5g8i0kq3ka0f8bwj3mp2wmcp";

     

       1725
       1760
        
         }).outPath;

     

       1726
       1761
        
         src = fetchurl {

     
···

       1752
       1787
        
         "date": "2017-09-05T14:02:52+03:00",

     

       1753
       1788
        
         "path": "/nix/store/idllj442c0iwnx1cpkrifx2afb7vh821-luazip",

     

       1754
       1789
        
         "sha256": "1jlqzqlds3aa3hnp737fm2awcx0hzmwyd87klv0cv13ny5v9f2x4",

     

       1790
       1790
       +
         "fetchLFS": false,

     

       1755
       1791
        
         "fetchSubmodules": true,

     

       1756
       1792
        
         "deepClone": false,

     

       1757
       1793
        
         "leaveDotGit": false

     
···

       1792
       1828
        
       

     

       1793
       1829
        
       luv = buildLuarocksPackage {

     

       1794
       1830
        
         pname = "luv";

     

       1795
       1795
       -
         version = "1.30.0-0";

     

       1831
       1831
       +
         version = "1.42.0-0";

     

       1796
       1832
        
         knownRockspec = (fetchurl {

     

       1797
       1797
       -
           url    = "https://luarocks.org/luv-1.30.0-0.rockspec";

     

       1798
       1798
       -
           sha256 = "05j231z6vpfjbxxmsizbigrsr80bk2dg48fcz12isj668lhia32h";

     

       1833
       1833
       +
           url    = "https://luarocks.org/luv-1.42.0-0.rockspec";

     

       1834
       1834
       +
           sha256 = "0pr2gjjnm60w0csb0dacrjalan7ifsfw4lki4ykxx1f4m5snam09";

     

       1799
       1835
        
         }).outPath;

     

       1800
       1836
        
         src = fetchurl {

     

       1801
       1801
       -
           url    = "https://github.com/luvit/luv/releases/download/1.30.0-0/luv-1.30.0-0.tar.gz";

     

       1802
       1802
       -
           sha256 = "1vxmxgdjk2bdnm8d9n3z5lfg6x34cx97j5nh8camm6ps5c0mmisw";

     

       1837
       1837
       +
           url    = "https://github.com/luvit/luv/releases/download/1.42.0-0/luv-1.42.0-0.tar.gz";

     

       1838
       1838
       +
           sha256 = "0dkzjkkm0h516ag6sfz5iji761y9slrcfw325f39zkda1sfql8mm";

     

       1803
       1839
        
         };

     

       1804
       1840
        
       

     

       1805
       1841
        
         disabled = (luaOlder "5.1");

     
···

       1848
       1884
        
         "date": "2015-09-27T17:49:28+03:00",

     

       1849
       1885
        
         "path": "/nix/store/akl80hh077hm20bdqj1lksy0fn2285b5-markdown",

     

       1850
       1886
        
         "sha256": "019bk2qprszqncnm8zy6ns6709iq1nwkf7i86nr38f035j4lc11y",

     

       1887
       1887
       +
         "fetchLFS": false,

     

       1851
       1888
        
         "fetchSubmodules": true,

     

       1852
       1889
        
         "deepClone": false,

     

       1853
       1890
        
         "leaveDotGit": false

     
···

       1899
       1936
        
         "date": "2021-03-18T11:51:52-07:00",

     

       1900
       1937
        
         "path": "/nix/store/xijbk0bgjpxjgmvscbqnghj4r3zdzgxl-moonscript",

     

       1901
       1938
        
         "sha256": "14xx6pij0djblfv3g2hi0xlljh7h0yrbb03f4x90q5j66v693gx7",

     

       1939
       1939
       +
         "fetchLFS": false,

     

       1902
       1940
        
         "fetchSubmodules": true,

     

       1903
       1941
        
         "deepClone": false,

     

       1904
       1942
        
         "leaveDotGit": false

     
···

       1957
       1995
        
       

     

       1958
       1996
        
       penlight = buildLuarocksPackage {

     

       1959
       1997
        
         pname = "penlight";

     

       1960
       1960
       -
         version = "1.11.0-1";

     

       1961
       1961
       -
         knownRockspec = (fetchurl {

     

       1962
       1962
       -
           url    = "https://luarocks.org/penlight-1.11.0-1.rockspec";

     

       1963
       1963
       -
           sha256 = "1sjhnywvamyi9fadhra5pw2an1rhy2hk2byfxmr3n5wi0xrqv004";

     

       1964
       1964
       -
         }).outPath;

     

       1998
       1998
       +
         version = "dev-1";

     

       1999
       1999
       +
       

     

       1965
       2000
        
         src = fetchgit ( removeAttrs (builtins.fromJSON ''{

     

       1966
       2001
        
         "url": "https://github.com/lunarmodules/penlight.git",

     

       1967
       1967
       -
         "rev": "e3712f00fae09a166dd62540b677600165d5bcd7",

     

       1968
       1968
       -
         "date": "2021-08-18T21:37:47+02:00",

     

       1969
       1969
       -
         "path": "/nix/store/i70ndw8qhvcm828ifb3vyj08y22xp0ka-penlight",

     

       1970
       1970
       -
         "sha256": "19n9xqkb4hlak0k7hamk4ixwjvyxslsnyh1zjazdzrl8n736xhkl",

     

       1971
       1971
       -
         "fetchSubmodules": false,

     

       2002
       2002
       +
         "rev": "0653cdb05591454a9804a7fee8c873b8f06b0b8f",

     

       2003
       2003
       +
         "date": "2021-08-31T23:42:29+02:00",

     

       2004
       2004
       +
         "path": "/nix/store/zf3k6z36bxsrbxkkmsa4w6m7vxvlpfgn-penlight",

     

       2005
       2005
       +
         "sha256": "0l1819dyr9hzmimnjjg99fad6k3ksmlm77hgvdybgz8558lj4g1i",

     

       2006
       2006
       +
         "fetchLFS": false,

     

       2007
       2007
       +
         "fetchSubmodules": true,

     

       1972
       2008
        
         "deepClone": false,

     

       1973
       2009
        
         "leaveDotGit": false

     

       1974
       2010
        
       }

     
···

       1976
       2012
        
       

     

       1977
       2013
        
         disabled = (luaOlder "5.1");

     

       1978
       2014
        
         propagatedBuildInputs = [ lua luafilesystem ];

     

       1979
       1979
       -
         checkInputs = [ busted ];

     

       2015
       2015
       +
         checkInputs = [ busted busted ];

     

       1980
       2016
        
         doCheck = false;

     

       1981
       2017
        
       

     

       1982
       2018
        
         meta = {

     
···

       1993
       2029
        
       

     

       1994
       2030
        
         src = fetchgit ( removeAttrs (builtins.fromJSON ''{

     

       1995
       2031
        
         "url": "https://github.com/nvim-lua/plenary.nvim",

     

       1996
       1996
       -
         "rev": "15c3cb9e6311dc1a875eacb9fc8df69ca48d7402",

     

       1997
       1997
       -
         "date": "2021-08-19T19:04:12+02:00",

     

       1998
       1998
       -
         "path": "/nix/store/fjj6gs1yc9gw3qh3xabf7mra4dlyac5a-plenary.nvim",

     

       1999
       1999
       -
         "sha256": "0gdysws82vdcyfsfpkpg9wqw223vg6hh74pf821wxh8p6qg3r26m",

     

       2032
       2032
       +
         "rev": "8c6cc07a68b65eb707be44598f0084647d495978",

     

       2033
       2033
       +
         "date": "2021-09-26T16:13:25+02:00",

     

       2034
       2034
       +
         "path": "/nix/store/j8hmr48blm4brq8rqv7b9m08vmalg8sp-plenary.nvim",

     

       2035
       2035
       +
         "sha256": "05h5n7jj33y9vs6gc8hqlfd628j6i33s3c8fmfl6ahxwfygx2wpd",

     

       2036
       2036
       +
         "fetchLFS": false,

     

       2000
       2037
        
         "fetchSubmodules": true,

     

       2001
       2038
        
         "deepClone": false,

     

       2002
       2039
        
         "leaveDotGit": false

     
···

       2023
       2060
        
         "date": "2021-04-09T19:59:20+08:00",

     

       2024
       2061
        
         "path": "/nix/store/65l71ph27pmipgrq8j4whg6n8h2avvs4-lua-rapidjson",

     

       2025
       2062
        
         "sha256": "1a6srvximxlh6gjkaj5y86d1kf06pc4gby2r6wpdw2pdac8k7xyb",

     

       2063
       2063
       +
         "fetchLFS": false,

     

       2026
       2064
        
         "fetchSubmodules": true,

     

       2027
       2065
        
         "deepClone": false,

     

       2028
       2066
        
         "leaveDotGit": false

     
···

       2090
       2128
        
         "date": "2020-04-15T16:34:01-07:00",

     

       2091
       2129
        
         "path": "/nix/store/rgbn0nn7glm7s52d90ds87j10bx20nij-_debug",

     

       2092
       2130
        
         "sha256": "0p6jz6syh2r8qfk08jf2hp4p902rkamjzpzl8xhkpzf8rdzs937w",

     

       2131
       2131
       +
         "fetchLFS": false,

     

       2093
       2132
        
         "fetchSubmodules": true,

     

       2094
       2133
        
         "deepClone": false,

     

       2095
       2134
        
         "leaveDotGit": false

     
···

       2116
       2155
        
         "date": "2020-04-15T17:16:16-07:00",

     

       2117
       2156
        
         "path": "/nix/store/jr4agcn13fk56b8105p6yr9gn767fkds-normalize",

     

       2118
       2157
        
         "sha256": "0jiykdjxc4b5my12fnzrw3bxracjgxc265xrn8kfx95350kvbzl1",

     

       2158
       2158
       +
         "fetchLFS": false,

     

       2119
       2159
        
         "fetchSubmodules": true,

     

       2120
       2160
        
         "deepClone": false,

     

       2121
       2161
        
         "leaveDotGit": false

     
···

       2165
       2205
        
         "date": "2020-05-06T23:13:06-04:00",

     

       2166
       2206
        
         "path": "/nix/store/a4i9k5hx9xiz38bij4hb505dg088jkss-vstruct",

     

       2167
       2207
        
         "sha256": "0sl9v874mckhh6jbxsan48s5xajzx193k4qlphw69sdbf8kr3p57",

     

       2208
       2208
       +
         "fetchLFS": false,

     

       2168
       2209
        
         "fetchSubmodules": true,

     

       2169
       2210
        
         "deepClone": false,

     

       2170
       2211
        
         "leaveDotGit": false

+68

pkgs/development/lua-modules/lib.nix

···

       60
       60
        
               requiredLuaModules = requiredLuaModules drv.propagatedBuildInputs;

     

       61
       61
        
             };

     

       62
       62
        
           });

     

       63
       63
       +
       

     

       64
       64
       +
         /* generate luarocks config

     

       65
       65
       +
       

     

       66
       66
       +
         generateLuarocksConfig {

     

       67
       67
       +
           externalDeps = [ { name = "CRYPTO"; dep = pkgs.openssl; } ];

     

       68
       68
       +
           rocksSubdir = "subdir";

     

       69
       69
       +
         };

     

       70
       70
       +
         */

     

       71
       71
       +
         generateLuarocksConfig = {

     

       72
       72
       +
           externalDeps

     

       73
       73
       +
           , requiredLuaRocks

     

       74
       74
       +
           , extraVariables ? {}

     

       75
       75
       +
           , rocksSubdir

     

       76
       76
       +
           }: let

     

       77
       77
       +
             rocksTrees = lib.imap0

     

       78
       78
       +
               (i: dep: "{ name = [[dep-${toString i}]], root = '${dep}', rocks_dir = '${dep}/${dep.rocksSubdir}' }")

     

       79
       79
       +
               requiredLuaRocks;

     

       80
       80
       +
       

     

       81
       81
       +
             # Explicitly point luarocks to the relevant locations for multiple-output

     

       82
       82
       +
             # derivations that are external dependencies, to work around an issue it has

     

       83
       83
       +
             # (https://github.com/luarocks/luarocks/issues/766)

     

       84
       84
       +
             depVariables = lib.concatMap ({name, dep}: [

     

       85
       85
       +
               "${name}_INCDIR='${lib.getDev dep}/include';"

     

       86
       86
       +
               "${name}_LIBDIR='${lib.getLib dep}/lib';"

     

       87
       87
       +
               "${name}_BINDIR='${lib.getBin dep}/bin';"

     

       88
       88
       +
             ]) externalDeps';

     

       89
       89
       +
       

     

       90
       90
       +
             # example externalDeps': [ { name = "CRYPTO"; dep = pkgs.openssl; } ]

     

       91
       91
       +
             externalDeps' = lib.filter (dep: !lib.isDerivation dep) externalDeps;

     

       92
       92
       +
       

     

       93
       93
       +
             externalDepsDirs = map

     

       94
       94
       +
               (x: "'${builtins.toString x}'")

     

       95
       95
       +
               (lib.filter (lib.isDerivation) externalDeps);

     

       96
       96
       +
       

     

       97
       97
       +
             extraVariablesStr = lib.concatStringsSep "\n "

     

       98
       98
       +
               (lib.mapAttrsToList (k: v: "${k}='${v}';") extraVariables);

     

       99
       99
       +
         in ''

     

       100
       100
       +
           local_cache = ""

     

       101
       101
       +
           -- To prevent collisions when creating environments, we install the rock

     

       102
       102
       +
           -- files into per-package subdirectories

     

       103
       103
       +
           rocks_subdir = '${rocksSubdir}'

     

       104
       104
       +
           -- Then we need to tell luarocks where to find the rock files per

     

       105
       105
       +
           -- dependency

     

       106
       106
       +
           rocks_trees = {

     

       107
       107
       +
             ${lib.concatStringsSep "\n, " rocksTrees}

     

       108
       108
       +
           }

     

       109
       109
       +
         '' + lib.optionalString lua.pkgs.isLuaJIT ''

     

       110
       110
       +
           -- Luajit provides some additional functionality built-in; this exposes

     

       111
       111
       +
           -- that to luarock's dependency system

     

       112
       112
       +
           rocks_provided = {

     

       113
       113
       +
             jit='${lua.luaversion}-1';

     

       114
       114
       +
             ffi='${lua.luaversion}-1';

     

       115
       115
       +
             luaffi='${lua.luaversion}-1';

     

       116
       116
       +
             bit='${lua.luaversion}-1';

     

       117
       117
       +
           }

     

       118
       118
       +
         '' + ''

     

       119
       119
       +
           -- For single-output external dependencies

     

       120
       120
       +
           external_deps_dirs = {

     

       121
       121
       +
             ${lib.concatStringsSep "\n, " externalDepsDirs}

     

       122
       122
       +
           }

     

       123
       123
       +
           variables = {

     

       124
       124
       +
             -- Some needed machinery to handle multiple-output external dependencies,

     

       125
       125
       +
             -- as per https://github.com/luarocks/luarocks/issues/766

     

       126
       126
       +
             ${lib.optionalString (lib.length depVariables > 0) ''

     

       127
       127
       +
               ${lib.concatStringsSep "\n  " depVariables}''}

     

       128
       128
       +
             ${extraVariablesStr}

     

       129
       129
       +
           }

     

       130
       130
       +
         '';

     

       63
       131
        
       }

+1 -1

pkgs/development/lua-modules/overrides.nix

···

       300
       300
        
               preBuild = self.luv.preBuild + ''

     

       301
       301
        
                 sed -i 's,\(option(BUILD_MODULE.*\)ON,\1OFF,' CMakeLists.txt

     

       302
       302
        
                 sed -i 's,\(option(BUILD_SHARED_LIBS.*\)OFF,\1ON,' CMakeLists.txt

     

       303
       303
       -
                 sed -i 's,${"\${INSTALL_INC_DIR}"},${placeholder "out"}/include/luv,' CMakeLists.txt

     

       303
       303
       +
                 sed -i 's,${"\${.*INSTALL_INC_DIR}"},${placeholder "out"}/include/luv,' CMakeLists.txt

     

       304
       304
        
               '';

     

       305
       305
        
       

     

       306
       306
        
               nativeBuildInputs = [ pkgs.fixDarwinDylibNames ];

+41 -10

pkgs/development/misc/resholve/README.md

···

       2
       2
        
       

     

       3
       3
        
       resholve converts bare executable references in shell scripts to absolute

     

       4
       4
        
       paths. This will hopefully make its way into the Nixpkgs manual soon, but

     

       5
       5
       -
       until then I'll outline how to use the `resholvePackage` function.

     

       5
       5
       +
       until then I'll outline how to use the `resholvePackage`, `resholveScript`,

     

       6
       6
       +
       and `resholveScriptBin` functions.

     

       6
       7
        
       

     

       7
       8
        
       > Fair warning: resholve does *not* aspire to resolving all valid Shell

     

       8
       9
        
       > scripts. It depends on the OSH/Oil parser, which aims to support most (but

     
···

       21
       22
        
       > - Packages with scripts that require conflicting directives can use multiple

     

       22
       23
        
       >   solutions to resolve the scripts separately, but produce a single package.

     

       23
       24
        
       

     

       24
       24
       -
       ## Basic Example

     

       25
       25
       +
       The `resholveScript` and `resholveScriptBin` functions support a _single_

     

       26
       26
       +
       `solution` attrset. This is basically the same as any single solution in `resholvePackage`, except that it doesn't need a `scripts` attr (it is automatically added).

     

       27
       27
       +
       

     

       28
       28
       +
       ## Basic `resholvePackage` Example

     

       25
       29
        
       

     

       26
       30
        
       Here's a simple example from one of my own projects, with annotations:

     

       27
       31
        
       <!--

     
···

       68
       72
        
       }

     

       69
       73
        
       ```

     

       70
       74
        
       

     

       75
       75
       +
       ## Basic `resholveScript` and `resholveScriptBin` examples

     

       76
       76
       +
       

     

       77
       77
       +
       Both of these functions have the same basic API. This example is a little

     

       78
       78
       +
       trivial for now. If you have a real usage that you find helpful, please PR it.

     

       79
       79
       +
       

     

       80
       80
       +
       ```nix

     

       81
       81
       +
       resholvedScript = resholveScript "name" {

     

       82
       82
       +
           inputs = [ file ];

     

       83
       83
       +
           interpreter = "${bash}/bin/bash";

     

       84
       84
       +
         } ''

     

       85
       85
       +
           echo "Hello"

     

       86
       86
       +
           file .

     

       87
       87
       +
         '';

     

       88
       88
       +
       resholvedScriptBin = resholveScriptBin "name" {

     

       89
       89
       +
           inputs = [ file ];

     

       90
       90
       +
           interpreter = "${bash}/bin/bash";

     

       91
       91
       +
         } ''

     

       92
       92
       +
           echo "Hello"

     

       93
       93
       +
           file .

     

       94
       94
       +
         '';

     

       95
       95
       +
       ```

     

       96
       96
       +
       

     

       71
       97
        
       ## Options

     

       72
       98
        
       

     

       73
       99
        
       `resholvePackage` maps Nix types/idioms into the flags and environment variables

     
···

       79
       105
        
       | inputs        | list    | packages to resolve executables from                  |

     

       80
       106
        
       | interpreter   | string  | 'none' or abspath for shebang                         |

     

       81
       107
        
       | prologue      | file    | text to insert before the first code-line             |

     

       82
       82
       -
       | epilogue      | file    | text to isnert after the last code-line               |

     

       108
       108
       +
       | epilogue      | file    | text to insert after the last code-line               |

     

       83
       109
        
       | flags         | list    | strings to pass as flags                              |

     

       84
       110
        
       | fake          | attrset | [directives](#controlling-resolution-with-directives) |

     

       85
       111
        
       | fix           | attrset | [directives](#controlling-resolution-with-directives) |

     
···

       135
       161
        
       ```nix

     

       136
       162
        
       # --fake 'f:setUp;tearDown builtin:setopt source:/etc/bashrc'

     

       137
       163
        
       fake = {

     

       138
       138
       -
         # fake accepts the initial of valid identifier types as a CLI convienience.

     

       164
       164
       +
         # fake accepts the initial of valid identifier types as a CLI convenience.

     

       139
       165
        
         # Use full names in the Nix API.

     

       140
       166
        
         function = [ "setUp" "tearDown" ];

     

       141
       167
        
         builtin = [ "setopt" ];

     

       142
       168
        
         source = [ "/etc/bashrc" ];

     

       143
       169
        
       };

     

       144
       170
        
       

     

       145
       145
       -
       # --fix 'aliases xargs:ls $GIT:gix'

     

       171
       171
       +
       # --fix 'aliases $GIT:gix /bin/bash'

     

       146
       172
        
       fix = {

     

       147
       173
        
         # all single-word directives use `true` as value

     

       148
       174
        
         aliases = true;

     

       149
       149
       -
         xargs = [ "ls" ];

     

       150
       175
        
         "$GIT" = [ "gix" ];

     

       176
       176
       +
         "/bin/bash";

     

       151
       177
        
       };

     

       152
       178
        
       

     

       153
       153
       -
       # --keep 'which:git;ls .:$HOME $LS:exa /etc/bashrc ~/.bashrc'

     

       179
       179
       +
       # --keep 'source:$HOME /etc/bashrc ~/.bashrc'

     

       154
       180
        
       keep = {

     

       155
       155
       -
         which = [ "git" "ls" ];

     

       156
       156
       -
         "." = [ "$HOME" ];

     

       157
       157
       -
         "$LS" = [ "exa" ];

     

       181
       181
       +
         source = [ "$HOME" ];

     

       158
       182
        
         "/etc/bashrc" = true;

     

       159
       183
        
         "~/.bashrc" = true;

     

       160
       184
        
       };

     

       161
       185
        
       ```

     

       186
       186
       +
       

     

       187
       187
       +
       > **Note:** For now, at least, you'll need to reference the manpage to completely understand these examples.

     

       162
       188
        
       

     

       163
       189
        
       ## Controlling nested resolution with lore

     

       164
       190
        
       

     
···

       176
       202
        
         either built-in rules for finding the executable, or human triage.

     

       177
       203
        
       - "wrapper" lore maps shell exec wrappers to the programs they exec so

     

       178
       204
        
         that resholve can substitute an executable's verdict for its wrapper's.

     

       205
       205
       +
       

     

       206
       206
       +
       > **Caution:** At least when it comes to common utilities, it's best to treat

     

       207
       207
       +
       > overrides as a stopgap until they can be properly handled in resholve and/or

     

       208
       208
       +
       > binlore. Please report things you have to override and, if possible, help

     

       209
       209
       +
       > get them sorted.

     

       179
       210
        
       

     

       180
       211
        
       There will be more mechanisms for controlling this process in the future

     

       181
       212
        
       (and your reports/experiences will play a role in shaping them...) For now,

+39 -4

pkgs/development/misc/resholve/default.nix

···

       1
       1
        
       { callPackage

     

       2
       2
       -
       , ...

     

       2
       2
       +
       , writeTextFile

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       let

     
···

       8
       8
        
       in

     

       9
       9
        
       rec {

     

       10
       10
        
         resholve = callPackage ./resholve.nix {

     

       11
       11
       -
           inherit (source) rSrc;

     

       12
       12
       -
           inherit (source) version;

     

       11
       11
       +
           inherit (source) rSrc version;

     

       13
       12
        
           inherit (deps.oil) oildev;

     

       14
       13
        
         };

     

       14
       14
       +
         resholve-utils = callPackage ./resholve-utils.nix {

     

       15
       15
       +
           inherit resholve;

     

       16
       16
       +
         };

     

       15
       17
        
         resholvePackage = callPackage ./resholve-package.nix {

     

       16
       16
       -
           inherit resholve;

     

       18
       18
       +
           inherit resholve resholve-utils;

     

       17
       19
        
         };

     

       20
       20
       +
         resholveScript = name: partialSolution: text:

     

       21
       21
       +
           writeTextFile {

     

       22
       22
       +
             inherit name text;

     

       23
       23
       +
             executable = true;

     

       24
       24
       +
             checkPhase = ''

     

       25
       25
       +
               (

     

       26
       26
       +
                 PS4=$'\x1f'"\033[33m[resholve context]\033[0m "

     

       27
       27
       +
                 set -x

     

       28
       28
       +
                 ${resholve-utils.makeInvocation name (partialSolution // {

     

       29
       29
       +
                   scripts = [ "${placeholder "out"}" ];

     

       30
       30
       +
                 })}

     

       31
       31
       +
               )

     

       32
       32
       +
               ${partialSolution.interpreter} -n $out

     

       33
       33
       +
             '';

     

       34
       34
       +
           };

     

       35
       35
       +
         resholveScriptBin = name: partialSolution: text:

     

       36
       36
       +
           writeTextFile rec {

     

       37
       37
       +
             inherit name text;

     

       38
       38
       +
             executable = true;

     

       39
       39
       +
             destination = "/bin/${name}";

     

       40
       40
       +
             checkPhase = ''

     

       41
       41
       +
               (

     

       42
       42
       +
                 cd "$out"

     

       43
       43
       +
                 PS4=$'\x1f'"\033[33m[resholve context]\033[0m "

     

       44
       44
       +
                 set -x

     

       45
       45
       +
                 : changing directory to $PWD

     

       46
       46
       +
                 ${resholve-utils.makeInvocation name (partialSolution // {

     

       47
       47
       +
                   scripts = [ "bin/${name}" ];

     

       48
       48
       +
                 })}

     

       49
       49
       +
               )

     

       50
       50
       +
               ${partialSolution.interpreter} -n $out/bin/${name}

     

       51
       51
       +
             '';

     

       52
       52
       +
           };

     

       18
       53
        
       }

+16 -7

pkgs/development/misc/resholve/oildev.nix

···

       46
       46
        
           nativeBuildInputs = [ git ];

     

       47
       47
        
         };

     

       48
       48
        
       

     

       49
       49
       +
         /*

     

       50
       50
       +
           Upstream isn't interested in packaging this as a library

     

       51
       51
       +
           (or accepting all of the patches we need to do so).

     

       52
       52
       +
           This creates one without disturbing upstream too much.

     

       53
       53
       +
         */

     

       49
       54
        
         oildev = python27Packages.buildPythonPackage rec {

     

       50
       55
        
           pname = "oildev-unstable";

     

       51
       56
        
           version = "2021-07-14";

     
···

       61
       66
        
               It's not critical to drop most of these; the primary target is

     

       62
       67
        
               the vendored fork of Python-2.7.13, which is ~ 55M and over 3200

     

       63
       68
        
               files, dozens of which get interpreter script patches in fixup.

     

       69
       69
       +
       

     

       70
       70
       +
               Note: -f is necessary to keep it from being a pain to update

     

       71
       71
       +
               hash on rev updates. Command will fail w/o and not print hash.

     

       64
       72
        
             */

     

       65
       73
        
             extraPostFetch = ''

     

       66
       74
        
               rm -rf Python-2.7.13 benchmarks metrics py-yajl rfc gold web testdata services demo devtools cpp

     

       67
       75
        
             '';

     

       68
       76
        
           };

     

       69
       69
       -
       

     

       70
       70
       -
           # TODO: not sure why I'm having to set this for nix-build...

     

       71
       71
       -
           #       can anyone tell if I'm doing something wrong?

     

       72
       72
       -
           SOURCE_DATE_EPOCH = 315532800;

     

       73
       77
        
       

     

       74
       78
        
           # patch to support a python package, pass tests on macOS, etc.

     

       75
       79
        
           patchSrc = fetchFromGitHub {

     

       76
       80
        
             owner = "abathur";

     

       77
       81
        
             repo = "nix-py-dev-oil";

     

       78
       78
       -
             rev = "v0.8.12";

     

       79
       79
       -
             hash = "sha256-/EvwxL201lGsioL0lIhzM8VTghe6FuVbc3PBJgY8c8E=";

     

       82
       82
       +
             rev = "v0.8.12.1";

     

       83
       83
       +
             hash = "sha256-7JVnosdcvmVFN3h6SIeeqcJFcyFkai//fFuzi7ThNMY=";

     

       80
       84
        
           };

     

       81
       85
        
           patches = [

     

       82
       86
        
             "${patchSrc}/0001-add_setup_py.patch"

     
···

       102
       106
        
             patchShebangs asdl build core doctools frontend native oil_lang

     

       103
       107
        
           '';

     

       104
       108
        
       

     

       105
       105
       -
           # TODO: this may be obsolete?

     

       109
       109
       +
           /*

     

       110
       110
       +
           We did convince oil to upstream an env for specifying

     

       111
       111
       +
           this to support a shell.nix. Would need a patch if they

     

       112
       112
       +
           later drop this support. See:

     

       113
       113
       +
           https://github.com/oilshell/oil/blob/46900310c7e4a07a6223eb6c08e4f26460aad285/doctools/cmark.py#L30-L34

     

       114
       114
       +
           */

     

       106
       115
        
           _NIX_SHELL_LIBCMARK = "${cmark}/lib/libcmark${stdenv.hostPlatform.extensions.sharedLibrary}";

     

       107
       116
        
       

     

       108
       117
        
           # See earlier note on glibcLocales TODO: verify needed?

+3 -73

pkgs/development/misc/resholve/resholve-package.nix

···

       1
       1
       -
       { stdenv, lib, resholve, binlore }:

     

       1
       1
       +
       { stdenv, lib, resholve, resholve-utils }:

     

       2
       2
        
       

     

       3
       3
        
       { pname

     

       4
       4
        
       , src

     
···

       9
       9
        
       }@attrs:

     

       10
       10
        
       let

     

       11
       11
        
         inherit stdenv;

     

       12
       12
       -
         /* These functions break up the work of partially validating the

     

       13
       13
       -
           'solutions' attrset and massaging it into env/cli args.

     

       14
       14
       -
       

     

       15
       15
       -
           Note: some of the left-most args do not *have* to be passed as

     

       16
       16
       -
           deep as they are, but I've done so to provide more error context

     

       17
       17
       -
         */

     

       18
       18
       -
       

     

       19
       19
       -
         # for brevity / line length

     

       20
       20
       -
         spaces = l: builtins.concatStringsSep " " l;

     

       21
       21
       -
         semicolons = l: builtins.concatStringsSep ";" l;

     

       22
       22
       -
       

     

       23
       23
       -
         /* Throw a fit with dotted attr path context */

     

       24
       24
       -
         nope = path: msg:

     

       25
       25
       -
           throw "${builtins.concatStringsSep "." path}: ${msg}";

     

       26
       26
       -
       

     

       27
       27
       -
         /* Special-case directive value representations by type */

     

       28
       28
       -
         makeDirective = solution: env: name: val:

     

       29
       29
       -
           if builtins.isInt val then builtins.toString val

     

       30
       30
       -
           else if builtins.isString val then name

     

       31
       31
       -
           else if true == val then name

     

       32
       32
       -
           else if false == val then "" # omit!

     

       33
       33
       -
           else if null == val then "" # omit!

     

       34
       34
       -
           else if builtins.isList val then "${name}:${semicolons val}"

     

       35
       35
       -
           else nope [ solution env name ] "unexpected type: ${builtins.typeOf val}";

     

       36
       36
       -
       

     

       37
       37
       -
         /* Build fake/fix/keep directives from Nix types */

     

       38
       38
       -
         makeDirectives = solution: env: val:

     

       39
       39
       -
           lib.mapAttrsToList (makeDirective solution env) val;

     

       40
       40
       -
       

     

       41
       41
       -
         /* Special-case value representation by type/name */

     

       42
       42
       -
         makeEnvVal = solution: env: val:

     

       43
       43
       -
           if env == "inputs" then lib.makeBinPath val

     

       44
       44
       -
           else if builtins.isString val then val

     

       45
       45
       -
           else if builtins.isList val then spaces val

     

       46
       46
       -
           else if builtins.isAttrs val then spaces (makeDirectives solution env val)

     

       47
       47
       -
           else nope [ solution env ] "unexpected type: ${builtins.typeOf val}";

     

       48
       48
       -
       

     

       49
       49
       -
         /* Shell-format each env value */

     

       50
       50
       -
         shellEnv = solution: env: value:

     

       51
       51
       -
           lib.escapeShellArg (makeEnvVal solution env value);

     

       52
       52
       -
       

     

       53
       53
       -
         /* Build a single ENV=val pair */

     

       54
       54
       -
         makeEnv = solution: env: value:

     

       55
       55
       -
           "RESHOLVE_${lib.toUpper env}=${shellEnv solution env value}";

     

       56
       56
       -
       

     

       57
       57
       -
         /* Discard attrs claimed by makeArgs */

     

       58
       58
       -
         removeCliArgs = value:

     

       59
       59
       -
           removeAttrs value [ "scripts" "flags" ];

     

       60
       60
       -
       

     

       61
       61
       -
         /* Verify required arguments are present */

     

       62
       62
       -
         validateSolution = { scripts, inputs, interpreter, ... }: true;

     

       63
       63
       -
       

     

       64
       64
       -
         /* Pull out specific solution keys to build ENV=val pairs */

     

       65
       65
       -
         makeEnvs = solution: value:

     

       66
       66
       -
           spaces (lib.mapAttrsToList (makeEnv solution) (removeCliArgs value));

     

       67
       67
       -
       

     

       68
       68
       -
         /* Pull out specific solution keys to build CLI argstring */

     

       69
       69
       -
         makeArgs = { flags ? [ ], scripts, ... }:

     

       70
       70
       -
           spaces (flags ++ scripts);

     

       71
       71
       -
       

     

       72
       72
       -
         /* Build a single resholve invocation */

     

       73
       73
       -
         makeInvocation = solution: value:

     

       74
       74
       -
           if validateSolution value then

     

       75
       75
       -
           # we pass resholve a directory

     

       76
       76
       -
             "RESHOLVE_LORE=${binlore.collect { drvs = value.inputs; } } ${makeEnvs solution value} resholve --overwrite ${makeArgs value}"

     

       77
       77
       -
           else throw "invalid solution"; # shouldn't trigger for now

     

       78
       78
       -
       

     

       79
       79
       -
         /* Build resholve invocation for each solution. */

     

       80
       80
       -
         makeCommands = solutions:

     

       81
       81
       -
           lib.mapAttrsToList makeInvocation solutions;

     

       82
       12
        
       

     

       83
       13
        
         self = (stdenv.mkDerivation ((removeAttrs attrs [ "solutions" ])

     

       84
       14
        
           // {

     

       85
       15
        
           inherit pname version src;

     

       86
       86
       -
           buildInputs = [ resholve ];

     

       16
       16
       +
           buildInputs = (lib.optionals (builtins.hasAttr "buildInputs" attrs) attrs.buildInputs) ++ [ resholve ];

     

       87
       17
        
       

     

       88
       18
        
           # enable below for verbose debug info if needed

     

       89
       19
        
           # supports default python.logging levels

     
···

       99
       29
        
               PS4=$'\x1f'"\033[33m[resholve context]\033[0m "

     

       100
       30
        
               set -x

     

       101
       31
        
               : changing directory to $PWD

     

       102
       102
       -
               ${builtins.concatStringsSep "\n" (makeCommands solutions)}

     

       32
       32
       +
               ${builtins.concatStringsSep "\n" (resholve-utils.makeCommands solutions)}

     

       103
       33
        
             )

     

       104
       34
        
           '';

     

       105
       35
        
         }));

+74

pkgs/development/misc/resholve/resholve-utils.nix

···

       1
       1
       +
       { lib, resholve, binlore }:

     

       2
       2
       +
       

     

       3
       3
       +
       rec {

     

       4
       4
       +
         /* These functions break up the work of partially validating the

     

       5
       5
       +
           'solutions' attrset and massaging it into env/cli args.

     

       6
       6
       +
       

     

       7
       7
       +
           Note: some of the left-most args do not *have* to be passed as

     

       8
       8
       +
           deep as they are, but I've done so to provide more error context

     

       9
       9
       +
         */

     

       10
       10
       +
       

     

       11
       11
       +
         # for brevity / line length

     

       12
       12
       +
         spaces = l: builtins.concatStringsSep " " l;

     

       13
       13
       +
         semicolons = l: builtins.concatStringsSep ";" l;

     

       14
       14
       +
       

     

       15
       15
       +
         /* Throw a fit with dotted attr path context */

     

       16
       16
       +
         nope = path: msg:

     

       17
       17
       +
           throw "${builtins.concatStringsSep "." path}: ${msg}";

     

       18
       18
       +
       

     

       19
       19
       +
         /* Special-case directive value representations by type */

     

       20
       20
       +
         makeDirective = solution: env: name: val:

     

       21
       21
       +
           if builtins.isInt val then builtins.toString val

     

       22
       22
       +
           else if builtins.isString val then name

     

       23
       23
       +
           else if true == val then name

     

       24
       24
       +
           else if false == val then "" # omit!

     

       25
       25
       +
           else if null == val then "" # omit!

     

       26
       26
       +
           else if builtins.isList val then "${name}:${semicolons val}"

     

       27
       27
       +
           else nope [ solution env name ] "unexpected type: ${builtins.typeOf val}";

     

       28
       28
       +
       

     

       29
       29
       +
         /* Build fake/fix/keep directives from Nix types */

     

       30
       30
       +
         makeDirectives = solution: env: val:

     

       31
       31
       +
           lib.mapAttrsToList (makeDirective solution env) val;

     

       32
       32
       +
       

     

       33
       33
       +
         /* Special-case value representation by type/name */

     

       34
       34
       +
         makeEnvVal = solution: env: val:

     

       35
       35
       +
           if env == "inputs" then lib.makeBinPath val

     

       36
       36
       +
           else if builtins.isString val then val

     

       37
       37
       +
           else if builtins.isList val then spaces val

     

       38
       38
       +
           else if builtins.isAttrs val then spaces (makeDirectives solution env val)

     

       39
       39
       +
           else nope [ solution env ] "unexpected type: ${builtins.typeOf val}";

     

       40
       40
       +
       

     

       41
       41
       +
         /* Shell-format each env value */

     

       42
       42
       +
         shellEnv = solution: env: value:

     

       43
       43
       +
           lib.escapeShellArg (makeEnvVal solution env value);

     

       44
       44
       +
       

     

       45
       45
       +
         /* Build a single ENV=val pair */

     

       46
       46
       +
         makeEnv = solution: env: value:

     

       47
       47
       +
           "RESHOLVE_${lib.toUpper env}=${shellEnv solution env value}";

     

       48
       48
       +
       

     

       49
       49
       +
         /* Discard attrs claimed by makeArgs */

     

       50
       50
       +
         removeCliArgs = value:

     

       51
       51
       +
           removeAttrs value [ "scripts" "flags" ];

     

       52
       52
       +
       

     

       53
       53
       +
         /* Verify required arguments are present */

     

       54
       54
       +
         validateSolution = { scripts, inputs, interpreter, ... }: true;

     

       55
       55
       +
       

     

       56
       56
       +
         /* Pull out specific solution keys to build ENV=val pairs */

     

       57
       57
       +
         makeEnvs = solution: value:

     

       58
       58
       +
           spaces (lib.mapAttrsToList (makeEnv solution) (removeCliArgs value));

     

       59
       59
       +
       

     

       60
       60
       +
         /* Pull out specific solution keys to build CLI argstring */

     

       61
       61
       +
         makeArgs = { flags ? [ ], scripts, ... }:

     

       62
       62
       +
           spaces (flags ++ scripts);

     

       63
       63
       +
       

     

       64
       64
       +
         /* Build a single resholve invocation */

     

       65
       65
       +
         makeInvocation = solution: value:

     

       66
       66
       +
           if validateSolution value then

     

       67
       67
       +
           # we pass resholve a directory

     

       68
       68
       +
             "RESHOLVE_LORE=${binlore.collect { drvs = value.inputs; } } ${makeEnvs solution value} ${resholve}/bin/resholve --overwrite ${makeArgs value}"

     

       69
       69
       +
           else throw "invalid solution"; # shouldn't trigger for now

     

       70
       70
       +
       

     

       71
       71
       +
         /* Build resholve invocation for each solution. */

     

       72
       72
       +
         makeCommands = solutions:

     

       73
       73
       +
           lib.mapAttrsToList makeInvocation solutions;

     

       74
       74
       +
       }

+2 -2

pkgs/development/misc/resholve/source.nix

···

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       rec {

     

       6
       6
       -
         version = "0.6.0";

     

       6
       6
       +
         version = "0.6.6";

     

       7
       7
        
         rSrc =

     

       8
       8
        
           # local build -> `make ci`; `make clean` to restore

     

       9
       9
        
           # return to remote source

     
···

       14
       14
        
               owner = "abathur";

     

       15
       15
        
               repo = "resholve";

     

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

     

       17
       17
       -
               hash = "sha256-GfhhU9f5kiYcuYTPKWXCIkAGsz7GhAUGjAmIZ8Ww5X4=";

     

       17
       17
       +
               hash = "sha256-bupf3c9tNPAEMzFEDcvg483bSiwZFuB3ZqveG89dgkE=";

     

       18
       18
        
             };

     

       19
       19
        
       }

+17 -1

pkgs/development/misc/resholve/test.nix

···

       23
       23
        
       

     

       24
       24
        
       let

     

       25
       25
        
         inherit (callPackage ./default.nix { })

     

       26
       26
       -
           resholve resholvePackage;

     

       26
       26
       +
           resholve resholvePackage resholveScript resholveScriptBin;

     

       27
       27
        
       

     

       28
       28
        
         # ourCoreutils = coreutils.override { singleBinary = false; };

     

       29
       29
        
       

     
···

       224
       224
        
             fi

     

       225
       225
        
           '';

     

       226
       226
        
         };

     

       227
       227
       +
       

     

       228
       228
       +
         # Caution: ci.nix asserts the equality of both of these w/ diff

     

       229
       229
       +
         resholvedScript = resholveScript "resholved-script" {

     

       230
       230
       +
           inputs = [ file ];

     

       231
       231
       +
           interpreter = "${bash}/bin/bash";

     

       232
       232
       +
         } ''

     

       233
       233
       +
           echo "Hello"

     

       234
       234
       +
           file .

     

       235
       235
       +
         '';

     

       236
       236
       +
         resholvedScriptBin = resholveScriptBin "resholved-script-bin" {

     

       237
       237
       +
           inputs = [ file ];

     

       238
       238
       +
           interpreter = "${bash}/bin/bash";

     

       239
       239
       +
         } ''

     

       240
       240
       +
           echo "Hello"

     

       241
       241
       +
           file .

     

       242
       242
       +
         '';

     

       227
       243
        
       }

+4 -2

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

···

       1
       1
       -
       { stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, qtest, num }:

     

       1
       1
       +
       { stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, qtest, num

     

       2
       2
       +
       , doCheck ? lib.versionAtLeast ocaml.version "4.08" && !stdenv.isAarch64

     

       3
       3
       +
       }:

     

       2
       4
        
       

     

       3
       5
        
       let version = "3.3.0"; in

     

       4
       6
        
       

     
···

       14
       16
        
         checkInputs = [ qtest ];

     

       15
       17
        
         propagatedBuildInputs = [ num ];

     

       16
       18
        
       

     

       17
       17
       -
         doCheck = lib.versionAtLeast ocaml.version "4.04" && !stdenv.isAarch64;

     

       19
       19
       +
         inherit doCheck;

     

       18
       20
        
         checkTarget = "test";

     

       19
       21
        
       

     

       20
       22
        
         createFindlibDestdir = true;

+1 -2

pkgs/development/ocaml-modules/containers/data.nix

···

       6
       6
        
       buildDunePackage {

     

       7
       7
        
         pname = "containers-data";

     

       8
       8
        
       

     

       9
       9
       -
         inherit (containers) src version useDune2;

     

       9
       9
       +
         inherit (containers) src version doCheck useDune2;

     

       10
       10
        
       

     

       11
       11
        
         buildInputs = [ dune-configurator ];

     

       12
       12
       -
         doCheck = true;

     

       13
       12
        
         checkInputs = [ gen iter qcheck ];

     

       14
       13
        
       

     

       15
       14
        
         propagatedBuildInputs = [ containers ];

+1 -1

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

···

       22
       22
        
       

     

       23
       23
        
         checkInputs = [ gen iter ounit qcheck uutf ];

     

       24
       24
        
       

     

       25
       25
       -
         doCheck = true;

     

       25
       25
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       26
       26
        
       

     

       27
       27
        
         meta = {

     

       28
       28
        
           homepage = "https://github.com/c-cube/ocaml-containers";

+7 -10

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

···

       1
       1
        
       { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }:

     

       2
       2
        
       

     

       3
       3
       -
       let version = "0.5"; in

     

       4
       4
       -
       

     

       5
       5
       -
       stdenv.mkDerivation {

     

       6
       6
       -
         name = "ocaml${ocaml.version}-gen-${version}";

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         version = "0.5";

     

       5
       5
       +
         pname = "ocaml${ocaml.version}-gen";

     

       7
       6
        
       

     

       8
       7
        
         src = fetchFromGitHub {

     

       9
       8
        
           owner = "c-cube";

     
···

       13
       12
        
         };

     

       14
       13
        
       

     

       15
       14
        
         nativeBuildInputs = [ ocaml findlib ocamlbuild ];

     

       16
       16
       -
         buildInputs = [ qtest ounit ];

     

       15
       15
       +
         buildInputs = lib.optionals doCheck [ qtest ounit ];

     

       17
       16
        
         strictDeps = true;

     

       18
       17
        
       

     

       19
       19
       -
         configureFlags = [

     

       20
       20
       -
           "--enable-tests"

     

       21
       21
       -
         ];

     

       18
       18
       +
         configureFlags = lib.optional doCheck "--enable-tests";

     

       22
       19
        
       

     

       23
       23
       -
         doCheck = true;

     

       20
       20
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       24
       21
        
         checkTarget = "test";

     

       25
       22
        
       

     

       26
       23
        
         createFindlibDestdir = true;

     
···

       29
       26
        
           homepage = "https://github.com/c-cube/gen";

     

       30
       27
        
           description = "Simple, efficient iterators for OCaml";

     

       31
       28
        
           license = lib.licenses.bsd3;

     

       32
       32
       -
           platforms = ocaml.meta.platforms or [];

     

       29
       29
       +
           inherit (ocaml.meta) platforms;

     

       33
       30
        
         };

     

       34
       31
        
       }

+1 -1

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

···

       18
       18
        
         buildInputs = [ dune-configurator ];

     

       19
       19
        
         propagatedBuildInputs = [ result ];

     

       20
       20
        
       

     

       21
       21
       -
         doCheck = lib.versionAtLeast ocaml.version "4.07";

     

       21
       21
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       22
       22
        
         checkInputs = [ mdx.bin qtest ];

     

       23
       23
        
       

     

       24
       24
        
         meta = {

+1 -1

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

···

       13
       13
        
       

     

       14
       14
        
         propagatedBuildInputs = [ psq ];

     

       15
       15
        
       

     

       16
       16
       -
         doCheck = lib.versionAtLeast ocaml.version "4.05";

     

       16
       16
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       17
       17
        
         checkInputs = [ qcheck-alcotest ];

     

       18
       18
        
       

     

       19
       19
        
         meta = {

+1 -1

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

···

       14
       14
        
       

     

       15
       15
        
         propagatedBuildInputs = [ seq ];

     

       16
       16
        
       

     

       17
       17
       -
         doCheck = lib.versionAtLeast ocaml.version "4.07";

     

       17
       17
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       18
       18
        
         checkInputs = [ qcheck-alcotest ];

     

       19
       19
        
       

     

       20
       20
        
         meta = {

+4 -4

pkgs/development/ocaml-modules/qcheck/core.nix

···

       2
       2
        
       

     

       3
       3
        
       buildDunePackage rec {

     

       4
       4
        
         pname = "qcheck-core";

     

       5
       5
       -
         version = "0.17";

     

       5
       5
       +
         version = "0.18";

     

       6
       6
        
       

     

       7
       7
        
         useDune2 = true;

     

       8
       8
        
       

     

       9
       9
       -
         minimumOCamlVersion = "4.03";

     

       9
       9
       +
         minimalOCamlVersion = "4.08";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "c-cube";

     

       13
       13
        
           repo = "qcheck";

     

       14
       14
       -
           rev = version;

     

       15
       15
       -
           sha256 = "0qfyqhfg98spmfci9z6f527a16gwjnx2lrbbgw67p37ys5acrfar";

     

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

     

       15
       15
       +
           sha256 = "1s652hrj2sxqj30dfl300zjvvqk3r62a1bnzqw1hqyf6pi88qn8x";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         meta = {

+1

pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix

···

       16
       16
        
         meta = {

     

       17
       17
        
           description = "A library containing custom Rely matchers allowing for easily using QCheck with Rely. QCheck is a 'QuickCheck inspired property-based testing for OCaml, and combinators to generate random values to run tests on'";

     

       18
       18
        
           downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/qcheck-rely";

     

       19
       19
       +
           broken = true;

     

       19
       20
        
         };

     

       20
       21
        
       }

+2 -2

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

···

       1
       1
       -
       { lib, fetchurl, fetchpatch, buildDunePackage, qcheck }:

     

       1
       1
       +
       { lib, fetchurl, fetchpatch, buildDunePackage, ocaml, qcheck }:

     

       2
       2
        
       

     

       3
       3
        
       buildDunePackage rec {

     

       4
       4
        
         pname = "stdint";

     
···

       35
       35
        
                       'let pos_int = QCheck.int_range 0 maxi'

     

       36
       36
        
         '';

     

       37
       37
        
       

     

       38
       38
       -
         doCheck = true;

     

       38
       38
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       39
       39
        
         checkInputs = [ qcheck ];

     

       40
       40
        
       

     

       41
       41
        
         meta = {

+1 -1

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

···

       1
       1
        
       { lib, fetchurl, ocaml, buildDunePackage, ounit, qtest

     

       2
       2
        
       # Optionally enable tests; test script use OCaml-4.01+ features

     

       3
       3
       -
       , doCheck ? lib.versionAtLeast ocaml.version "4.04"

     

       3
       3
       +
       , doCheck ? lib.versionAtLeast ocaml.version "4.08"

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       let version = "1.6.0"; in

+2 -1

pkgs/development/ocaml-modules/syslog-message/default.nix

···

       1
       1
        
       { lib, buildDunePackage, fetchurl

     

       2
       2
       +
       , ocaml

     

       2
       3
        
       , astring, ptime, rresult, qcheck

     

       3
       4
        
       }:

     

       4
       5
        
       

     
···

       21
       22
        
           rresult

     

       22
       23
        
         ];

     

       23
       24
        
       

     

       24
       24
       -
         doCheck = true;

     

       25
       25
       +
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       25
       26
        
         checkInputs = [

     

       26
       27
        
           qcheck

     

       27
       28
        
         ];

+9 -2

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

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "cartopy";

     

       11
       11
       -
         version = "0.19.0.post1";

     

       11
       11
       +
         version = "0.20.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchPypi {

     

       14
       14
        
           inherit version;

     

       15
       15
        
           pname = "Cartopy";

     

       16
       16
       -
           sha256 = "0xnm8z3as3hriivdfd26s6vn5b63gb46x6vxw6gh1mwfm5rlg2sb";

     

       16
       16
       +
           sha256 = "eae58aff26806e63cf115b2bce9477cedc4aa9f578c5e477b2c25cfa404f2b7a";

     

       17
       17
        
         };

     

       18
       18
       +
       

     

       19
       19
       +
         postPatch = ''

     

       20
       20
       +
           # https://github.com/SciTools/cartopy/issues/1880

     

       21
       21
       +
           substituteInPlace lib/cartopy/tests/test_crs.py \

     

       22
       22
       +
             --replace "test_osgb(" "dont_test_osgb(" \

     

       23
       23
       +
             --replace "test_epsg(" "dont_test_epsg("

     

       24
       24
       +
         '';

     

       18
       25
        
       

     

       19
       26
        
         buildInputs = [

     

       20
       27
        
           geos proj

+2 -2

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

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "fe25519";

     

       13
       13
       -
         version = "0.3.0";

     

       13
       13
       +
         version = "1.0.0";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchPypi {

     

       16
       16
        
           inherit pname version;

     

       17
       17
       -
           sha256 = "8819659f19b51713199a75fda5107c93fbb6e2cb4afef3164ce7932b5eb276b9";

     

       17
       17
       +
           sha256 = "sha256-947DIkmg56mAegEgLKq8iqETWf2SCvtmeDZi5cxVSJA=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         propagatedBuildInputs = [

+2 -2

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

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "ge25519";

     

       14
       14
       -
         version = "0.2.0";

     

       14
       14
       +
         version = "1.0.0";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchPypi {

     

       17
       17
        
           inherit pname version;

     

       18
       18
       -
           sha256 = "1wgv0vqg8iv9y5d7if14gmcgslwd5zzgk322w9jaxdfbndldddik";

     

       18
       18
       +
           sha256 = "sha256-f7xvZ92zRO3GLSdfgEyhkWVwAFT2TvKHy6+iF+k43bI=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         propagatedBuildInputs = [

+14 -1

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

···

       1
       1
       -
       { lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder

     

       1
       1
       +
       { lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, pythonOlder

     

       2
       2
        
       , pandas, shapely, fiona, pyproj

     

       3
       3
        
       , pytestCheckHook, Rtree }:

     

       4
       4
        
       

     
···

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

     

       14
       14
        
           sha256 = "sha256-58X562OkRzZ4UTNMTwXW4U5czoa5tbSMBCcE90DqbaE=";

     

       15
       15
        
         };

     

       16
       16
       +
       

     

       17
       17
       +
         patches = [

     

       18
       18
       +
           (fetchpatch {

     

       19
       19
       +
             name = "skip-pandas-master-fillna-test.patch";

     

       20
       20
       +
             url = "https://github.com/geopandas/geopandas/pull/1878.patch";

     

       21
       21
       +
             sha256 = "1yw3i4dbhaq7f02n329b9y2cqxbwlz9db81mhgrfc7af3whwysdb";

     

       22
       22
       +
           })

     

       23
       23
       +
           (fetchpatch {

     

       24
       24
       +
             name = "fix-proj4strings-test.patch";

     

       25
       25
       +
             url = "https://github.com/geopandas/geopandas/pull/1958.patch";

     

       26
       26
       +
             sha256 = "0kzmpq5ry87yvhqr6gnh9p2606b06d3ynzjvw0hpp9fncczpc2yn";

     

       27
       27
       +
           })

     

       28
       28
       +
         ];

     

       16
       29
        
       

     

       17
       30
        
         propagatedBuildInputs = [

     

       18
       31
        
           pandas

+39

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , colorlog

     

       4
       4
       +
       , demjson

     

       5
       5
       +
       , fetchPypi

     

       6
       6
       +
       , pythonOlder

     

       7
       7
       +
       , requests

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       buildPythonPackage rec {

     

       11
       11
       +
         pname = "lupupy";

     

       12
       12
       +
         version = "0.0.21";

     

       13
       13
       +
         format = "setuptools";

     

       14
       14
       +
       

     

       15
       15
       +
         disabled = pythonOlder "3.6";

     

       16
       16
       +
       

     

       17
       17
       +
         src = fetchPypi {

     

       18
       18
       +
           inherit pname version;

     

       19
       19
       +
           sha256 = "0cpamb1fp84psiqm7xr156zi4f2fv2wijbjjyk6w87z8fl2aw8xc";

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         propagatedBuildInputs = [

     

       23
       23
       +
           colorlog

     

       24
       24
       +
           demjson

     

       25
       25
       +
           requests

     

       26
       26
       +
         ];

     

       27
       27
       +
       

     

       28
       28
       +
         # Project has no tests

     

       29
       29
       +
         doCheck = false;

     

       30
       30
       +
       

     

       31
       31
       +
         pythonImportsCheck = [ "lupupy" ];

     

       32
       32
       +
       

     

       33
       33
       +
         meta = with lib; {

     

       34
       34
       +
           description = "Python module to control Lupusec alarm control panels";

     

       35
       35
       +
           homepage = "https://github.com/majuss/lupupy";

     

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

     

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

     

       38
       38
       +
         };

     

       39
       39
       +
       }

+2 -2

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

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "mypy-boto3-s3";

     

       11
       11
       -
         version = "1.18.47";

     

       11
       11
       +
         version = "1.18.48";

     

       12
       12
        
         disabled = pythonOlder "3.6";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchPypi {

     

       15
       15
        
           inherit pname version;

     

       16
       16
       -
           sha256 = "0687354a1970a157f293ff57f8b38379497b606643633912cc28f76e0333b301";

     

       16
       16
       +
           sha256 = "a14917021aac10432887b2acb634be8d66401ffb87cdb0fc271aff867929538c";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         propagatedBuildInputs = [

+2 -2

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

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "phonenumbers";

     

       9
       9
       -
         version = "8.12.32";

     

       9
       9
       +
         version = "8.12.33";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "c52c9c3607483072303ba8d8759063edc44d2f8fe7b85afef40bd8d1aafb6483";

     

       13
       13
       +
           sha256 = "de3d5a3cb421c7421f584bb13cb9287e23ee2dd97d832fc35c9b55b96a576a3c";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         checkInputs = [

+17 -25

pkgs/development/python-modules/pyproj/001.proj.patch

···

       1
       1
       -
       diff -Nur a/pyproj/datadir.py b/pyproj/datadir.py

     

       2
       2
       -
       --- a/pyproj/datadir.py	2021-04-10 18:26:52.829018483 +0100

     

       3
       3
       -
       +++ b/pyproj/datadir.py	2021-04-10 18:44:59.155190614 +0100

     

       4
       4
       -
       @@ -70,7 +70,7 @@

     

       1
       1
       +
       diff --git a/pyproj/datadir.py b/pyproj/datadir.py

     

       2
       2
       +
       index 9ca1d25..4198490 100644

     

       3
       3
       +
       --- a/pyproj/datadir.py

     

       4
       4
       +
       +++ b/pyproj/datadir.py

     

       5
       5
       +
       @@ -70,7 +70,7 @@ def get_data_dir() -> str:

     

       6
       6
       +
            global _VALIDATED_PROJ_DATA

     

       5
       7
        
            if _VALIDATED_PROJ_DATA is not None:

     

       6
       8
        
                return _VALIDATED_PROJ_DATA

     

       7
       7
       -
            global _USER_PROJ_DATA

     

       8
       9
        
       -    internal_datadir = Path(__file__).absolute().parent / "proj_dir" / "share" / "proj"

     

       9
       10
        
       +    internal_datadir = Path("@proj@/share/proj")

     

       10
       11
        
            proj_lib_dirs = os.environ.get("PROJ_LIB", "")

     

       11
       12
        
            prefix_datadir = Path(sys.prefix, "share", "proj")

     

       12
       13
        
        

     

       13
       13
       -
       diff -Nur a/setup.py b/setup.py

     

       14
       14
       -
       --- a/setup.py	2021-04-10 18:26:52.817018512 +0100

     

       15
       15
       -
       +++ b/setup.py	2021-04-10 18:46:01.652324424 +0100

     

       16
       16
       -
       @@ -11,7 +11,7 @@

     

       14
       14
       +
       diff --git a/setup.py b/setup.py

     

       15
       15
       +
       index 6bb0c6c..b3d0321 100644

     

       16
       16
       +
       --- a/setup.py

     

       17
       17
       +
       +++ b/setup.py

     

       18
       18
       +
       @@ -12,7 +12,7 @@ from setuptools import Extension, setup

     

       17
       19
        
        PROJ_MIN_VERSION = parse_version("7.2.0")

     

       18
       20
        
        CURRENT_FILE_PATH = Path(__file__).absolute().parent

     

       19
       21
        
        BASE_INTERNAL_PROJ_DIR = Path("proj_dir")

     
···

       22
       24
        
        

     

       23
       25
        
        

     

       24
       26
        
        def get_proj_version(proj_dir: Path) -> str:

     

       25
       25
       -
       @@ -150,7 +150,7 @@

     

       27
       27
       +
       @@ -155,7 +155,7 @@ def get_extension_modules():

     

       26
       28
        
            # By default we'll try to get options PROJ_DIR or the local version of proj

     

       27
       29
        
            proj_dir = get_proj_dir()

     

       28
       30
        
            library_dirs = get_proj_libdirs(proj_dir)

     
···

       31
       33
        
        

     

       32
       34
        
            proj_version = get_proj_version(proj_dir)

     

       33
       35
        
            check_proj_version(proj_version)

     

       34
       34
       -
       diff -Nur a/test/conftest.py b/test/conftest.py

     

       35
       35
       -
       --- a/test/conftest.py	2021-04-10 18:26:52.831018478 +0100

     

       36
       36
       -
       +++ b/test/conftest.py	2021-04-10 18:37:01.605682432 +0100

     

       37
       37
       -
       @@ -2,6 +2,7 @@

     

       38
       38
       -
        from contextlib import contextmanager

     

       39
       39
       -
        from distutils.version import LooseVersion

     

       40
       40
       -
        from pathlib import Path

     

       41
       41
       -
       +import stat

     

       42
       42
       -
        

     

       43
       43
       -
        import pyproj

     

       44
       44
       -
        from pyproj.datadir import get_data_dir, get_user_data_dir, set_data_dir

     

       45
       45
       -
       diff -Nur a/test/test_cli.py b/test/test_cli.py

     

       46
       46
       -
       --- a/test/test_cli.py	2021-04-10 18:26:52.831018478 +0100

     

       47
       47
       -
       +++ b/test/test_cli.py	2021-04-10 22:17:04.665088162 +0100

     

       48
       48
       -
       @@ -14,7 +14,7 @@

     

       36
       36
       +
       diff --git a/test/test_cli.py b/test/test_cli.py

     

       37
       37
       +
       index 7a696de..1b9b777 100644

     

       38
       38
       +
       --- a/test/test_cli.py

     

       39
       39
       +
       +++ b/test/test_cli.py

     

       40
       40
       +
       @@ -14,7 +14,7 @@ from pyproj.sync import _load_grid_geojson

     

       49
       41
        
        from test.conftest import grids_available, proj_env, tmp_chdir

     

       50
       42
        
        

     

       51
       43
        
        PYPROJ_CLI_ENDPONTS = pytest.mark.parametrize(

+2 -2

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

···

       17
       17
        
       

     

       18
       18
        
       buildPythonPackage rec {

     

       19
       19
        
         pname = "pyproj";

     

       20
       20
       -
         version = "3.1.0";

     

       20
       20
       +
         version = "3.2.1";

     

       21
       21
        
         disabled = pythonOlder "3.7";

     

       22
       22
        
       

     

       23
       23
        
         src = fetchFromGitHub {

     

       24
       24
        
           owner = "pyproj4";

     

       25
       25
        
           repo = "pyproj";

     

       26
       26
        
           rev = version;

     

       27
       27
       -
           sha256 = "sha256-UN8cJk5Lgd+d2tKmFuF6QvKr36w1435RKovzGfMXi1E=";

     

       27
       27
       +
           sha256 = "sha256-r343TvXpSr+EMAbvzSUpsfipwP8TFmitOfT0gjgoO00=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         # force pyproj to use ${proj}

+12

pkgs/development/r-modules/generate-r-packages.R

···

       82
       82
        
       nix <- apply(pkgs, 1, function(p) formatPackage(p[1], p[2], p[18], p[4], p[5], p[6]))

     

       83
       83
        
       write("done", stderr())

     

       84
       84
        
       

     

       85
       85
       +
       # Mark deleted packages as broken

     

       86
       86
       +
       setkey(readFormatted, V2)

     

       87
       87
       +
       markBroken <- function(name) {

     

       88
       88
       +
         str <- paste0(readFormatted[name], collapse='"')

     

       89
       89
       +
         if(sum(grep("broken = true;", str)))

     

       90
       90
       +
           return(str)

     

       91
       91
       +
         write(paste("marked", name, "as broken"), stderr())

     

       92
       92
       +
         gsub("};$", "broken = true; };", str)

     

       93
       93
       +
       }

     

       94
       94
       +
       broken <- lapply(setdiff(readFormatted[[2]], pkgs[[1]]), markBroken)

     

       95
       95
       +
       

     

       85
       96
        
       cat("# This file is generated from generate-r-packages.R. DO NOT EDIT.\n")

     

       86
       97
        
       cat("# Execute the following command to update the file.\n")

     

       87
       98
        
       cat("#\n")

     
···

       95
       106
        
       cat(";\n")

     

       96
       107
        
       cat("in with self; {\n")

     

       97
       108
        
       cat(paste(nix, collapse="\n"), "\n", sep="")

     

       109
       109
       +
       cat(paste(broken, collapse="\n"), "\n", sep="")

     

       98
       110
        
       cat("}\n")

     

       99
       111
        
       

     

       100
       112
        
       stopCluster(cl)

+5 -12

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , fetchFromGitHub

     

       3
       3
       -
       , crystal_0_34

     

       4
       4
       -
       , crystal_0_36

     

       3
       3
       +
       , crystal_1_0

     

       5
       4
        
       }:

     

       6
       5
        
       let

     

       7
       6
        
         generic =

     
···

       36
       35
        
       

     

       37
       36
        
       in

     

       38
       37
        
       rec {

     

       39
       39
       -
         # needed for anything that requires the old v1 shards format

     

       40
       40
       -
         shards_0_11 = generic {

     

       41
       41
       -
           version = "0.11.1";

     

       42
       42
       -
           sha256 = "05qnhc23xbmicdl4fwyxfpcvd8jq4inzh6v7jsjjw4n76vzb1f71";

     

       43
       43
       -
           crystal = crystal_0_34;

     

       44
       44
       -
         };

     

       45
       38
        
       

     

       46
       46
       -
         shards_0_14 = generic {

     

       47
       47
       -
           version = "0.14.1";

     

       39
       39
       +
         shards_0_15 = generic {

     

       40
       40
       +
           version = "0.15.0";

     

       48
       41
        
           sha256 = "sha256-/C6whh5RbTBkFWqpn0GqyVe0opbrklm8xPv5MIG99VU=";

     

       49
       49
       -
           crystal = crystal_0_36;

     

       42
       42
       +
           crystal = crystal_1_0;

     

       50
       43
        
         };

     

       51
       44
        
       

     

       52
       52
       -
         shards = shards_0_14;

     

       45
       45
       +
         shards = shards_0_15;

     

       53
       46
        
       }

+19 -3

pkgs/development/tools/misc/bashdb/default.nix

···

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

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchurl

     

       4
       4
       +
       , fetchpatch

     

       5
       5
       +
       , makeWrapper

     

       6
       6
       +
       , python3Packages

     

       7
       7
       +
       }:

     

       2
       8
        
       

     

       3
       9
        
       stdenv.mkDerivation rec {

     

       4
       10
        
         pname = "bashdb";

     

       5
       5
       -
         version = "4.4-1.0.0";

     

       11
       11
       +
         version = "5.0-1.1.2";

     

       6
       12
        
       

     

       7
       13
        
         src = fetchurl {

     

       8
       14
        
           url =  "mirror://sourceforge/bashdb/${pname}-${version}.tar.bz2";

     

       9
       9
       -
           sha256 = "0p7i7bpzs6q1i7swnkr89kxqgzr146xw8d2acmqwqbslzm9dqlml";

     

       15
       15
       +
           sha256 = "sha256-MBdtKtKMWwCy4tIcXqGu+PuvQKj52fcjxnxgUx87czA=";

     

       10
       16
        
         };

     

       17
       17
       +
       

     

       18
       18
       +
         patches = [

     

       19
       19
       +
           # Enable building with bash 5.1/5.2

     

       20
       20
       +
           # Remove with any upstream 5.1-x.y.z release

     

       21
       21
       +
           (fetchpatch {

     

       22
       22
       +
             url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/569fbb806d9ee813afa8b27d2098a44f93433922/devel/bashdb/files/patch-configure";

     

       23
       23
       +
             sha256 = "19zfzcnxavndyn6kfxp775kjcd0gigsm4y3bnh6fz5ilhnnbbbgr";

     

       24
       24
       +
           })

     

       25
       25
       +
         ];

     

       26
       26
       +
         patchFlags = "-p0";

     

       11
       27
        
       

     

       12
       28
        
         nativeBuildInputs = [

     

       13
       29
        
           makeWrapper

+2 -2

pkgs/development/tools/sigrok-cli/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "sigrok-cli";

     

       5
       5
       -
         version = "0.7.1";

     

       5
       5
       +
         version = "0.7.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://sigrok.org/download/source/${pname}/${pname}-${version}.tar.gz";

     

       9
       9
       -
           sha256 = "15vpn1psriadcbl6v9swwgws7dva85ld03yv6g1mgm27kx11697m";

     

       9
       9
       +
           sha256 = "sha256-cdBEPzaJe/Vlcy3sIGgw2+oPJ4m2YBzxBTayhtEUCrg=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ pkg-config ];

+1

pkgs/development/tools/sumneko-lua-language-server/default.nix

···

       59
       59
        
           license = licenses.mit;

     

       60
       60
        
           maintainers = with maintainers; [ mjlbach ];

     

       61
       61
        
           platforms = platforms.linux;

     

       62
       62
       +
           mainProgram = "lua-language-server";

     

       62
       63
        
         };

     

       63
       64
        
       }

+1 -1

pkgs/misc/emulators/wine/base.nix

···

       106
       106
        
       

     

       107
       107
        
         postInstall = let

     

       108
       108
        
           links = prefix: pkg: "ln -s ${pkg} $out/${prefix}/${pkg.name}";

     

       109
       109
       -
         in ''

     

       109
       109
       +
         in lib.optionalString supportFlags.embedInstallers ''

     

       110
       110
        
           mkdir -p $out/share/wine/gecko $out/share/wine/mono/

     

       111
       111
        
           ${lib.strings.concatStringsSep "\n"

     

       112
       112
        
                 ((map (links "share/wine/gecko") geckos)

+2 -1

pkgs/misc/emulators/wine/default.nix

···

       45
       45
        
         faudioSupport ? false,

     

       46
       46
        
         vkd3dSupport ? false,

     

       47
       47
        
         mingwSupport ? wineRelease != "stable",

     

       48
       48
       +
         embedInstallers ? false # The Mono and Gecko MSI installers

     

       48
       49
        
       }:

     

       49
       50
        
       

     

       50
       51
        
       let wine-build = build: release:

     
···

       57
       58
        
                         gsmSupport gphoto2Support ldapSupport fontconfigSupport alsaSupport

     

       58
       59
        
                         pulseaudioSupport xineramaSupport gtkSupport openclSupport xmlSupport tlsSupport

     

       59
       60
        
                         openglSupport gstreamerSupport udevSupport vulkanSupport sdlSupport faudioSupport

     

       60
       60
       -
                         vkd3dSupport mingwSupport;

     

       61
       61
       +
                         vkd3dSupport mingwSupport embedInstallers;

     

       61
       62
        
               };

     

       62
       63
        
             });

     

       63
       64

-12

pkgs/misc/vim-plugins/generated.nix

···

       1289
       1289
        
           meta.homepage = "https://github.com/deoplete-plugins/deoplete-dictionary/";

     

       1290
       1290
        
         };

     

       1291
       1291
        
       

     

       1292
       1292
       -
         deoplete-emoji = buildVimPluginFrom2Nix {

     

       1293
       1293
       -
           pname = "deoplete-emoji";

     

       1294
       1294
       -
           version = "2019-01-20";

     

       1295
       1295
       -
           src = fetchFromGitHub {

     

       1296
       1296
       -
             owner = "fszymanski";

     

       1297
       1297
       -
             repo = "deoplete-emoji";

     

       1298
       1298
       -
             rev = "1dfa2da6ae3ee146ddfbfdba48cf45f0c1d57d7d";

     

       1299
       1299
       -
             sha256 = "0drqbdmy8igq6rv7s2qlxsp391pydcynlr9gkaadzrg7pk4nlgsb";

     

       1300
       1300
       -
           };

     

       1301
       1301
       -
           meta.homepage = "https://github.com/fszymanski/deoplete-emoji/";

     

       1302
       1302
       -
         };

     

       1303
       1303
       -
       

     

       1304
       1292
        
         deoplete-fish = buildVimPluginFrom2Nix {

     

       1305
       1293
        
           pname = "deoplete-fish";

     

       1306
       1294
        
           version = "2020-04-04";

-1

pkgs/misc/vim-plugins/vim-plugin-names

···

       173
       173
        
       fruit-in/brainfuck-vim

     

       174
       174
        
       fruit-in/vim-nong-theme

     

       175
       175
        
       fsharp/vim-fsharp

     

       176
       176
       -
       fszymanski/deoplete-emoji

     

       177
       176
        
       garbas/vim-snipmate

     

       178
       177
        
       gcmt/taboo.vim

     

       179
       178
        
       gcmt/wildfire.vim

+1

pkgs/misc/vim-plugins/vim-utils.nix

···

       399
       399
        
       rec {

     

       400
       400
        
         inherit vimrcFile;

     

       401
       401
        
         inherit vimrcContent;

     

       402
       402
       +
         inherit packDir;

     

       402
       403
        
       

     

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

     

       404
       405
        
         vimWithRC = {

+18

pkgs/misc/vscode-extensions/default.nix

···

       8
       8
        
       , jdk

     

       9
       9
        
       , llvmPackages_8

     

       10
       10
        
       , nixpkgs-fmt

     

       11
       11
       +
       , protobuf

     

       11
       12
        
       , jq

     

       12
       13
        
       , shellcheck

     

       13
       14
        
       , moreutils

     
···

       1675
       1676
        
                 version = "0.0.8";

     

       1676
       1677
        
                 sha256 = "1ln9gly5bb7nvbziilnay4q448h9npdh7sd9xy277122h0qawkci";

     

       1677
       1678
        
               };

     

       1679
       1679
       +
               meta = {

     

       1680
       1680
       +
                 license = lib.licenses.mit;

     

       1681
       1681
       +
               };

     

       1682
       1682
       +
             };

     

       1683
       1683
       +
       

     

       1684
       1684
       +
             zxh404.vscode-proto3 = buildVscodeMarketplaceExtension {

     

       1685
       1685
       +
               mktplcRef = {

     

       1686
       1686
       +
                 name = "vscode-proto3";

     

       1687
       1687
       +
                 publisher = "zxh404";

     

       1688
       1688
       +
                 version = "0.5.4";

     

       1689
       1689
       +
                 sha256 = "08dfl5h1k6s542qw5qx2czm1wb37ck9w2vpjz44kp2az352nmksb";

     

       1690
       1690
       +
               };

     

       1691
       1691
       +
               nativeBuildInputs = [ jq moreutils ];

     

       1692
       1692
       +
               postInstall = ''

     

       1693
       1693
       +
                 cd "$out/$installPrefix"

     

       1694
       1694
       +
                 jq '.contributes.configuration.properties.protoc.properties.path.default = "${protobuf}/bin/protoc"' package.json | sponge package.json

     

       1695
       1695
       +
               '';

     

       1678
       1696
        
               meta = {

     

       1679
       1697
        
                 license = lib.licenses.mit;

     

       1680
       1698
        
               };

+15 -15

pkgs/os-specific/linux/kernel/hardened/patches.json

···

       1
       1
        
       {

     

       2
       2
        
           "4.14": {

     

       3
       3
        
               "extra": "-hardened1",

     

       4
       4
       -
               "name": "linux-hardened-4.14.246-hardened1.patch",

     

       5
       5
       -
               "sha256": "1b15687ac2pkz46qliq1blyja7cjwn19q2bkd0c5912kzly76ghd",

     

       6
       6
       -
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.246-hardened1/linux-hardened-4.14.246-hardened1.patch"

     

       4
       4
       +
               "name": "linux-hardened-4.14.248-hardened1.patch",

     

       5
       5
       +
               "sha256": "1lwqlpd21f8rwqfyz61083w0lg2bjzdjf7rzrqxsw1jz0l879035",

     

       6
       6
       +
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.248-hardened1/linux-hardened-4.14.248-hardened1.patch"

     

       7
       7
        
           },

     

       8
       8
        
           "4.19": {

     

       9
       9
        
               "extra": "-hardened1",

     

       10
       10
       -
               "name": "linux-hardened-4.19.206-hardened1.patch",

     

       11
       11
       -
               "sha256": "12ylhvjvabal29gi00cpjh3s47qj0vav6f2y145z4c9r2z77816k",

     

       12
       12
       -
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.206-hardened1/linux-hardened-4.19.206-hardened1.patch"

     

       10
       10
       +
               "name": "linux-hardened-4.19.208-hardened1.patch",

     

       11
       11
       +
               "sha256": "0bg45n1kgd628gwjkp1vxslxyci6589ygy9mmmhpl7kj3y7370ck",

     

       12
       12
       +
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.208-hardened1/linux-hardened-4.19.208-hardened1.patch"

     

       13
       13
        
           },

     

       14
       14
        
           "5.10": {

     

       15
       15
        
               "extra": "-hardened1",

     

       16
       16
       -
               "name": "linux-hardened-5.10.67-hardened1.patch",

     

       17
       17
       -
               "sha256": "1yvfqkcffrva9hf4ns0jkksnvkj58h87msim0yhanlyp5jyz3l1p",

     

       18
       18
       -
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.67-hardened1/linux-hardened-5.10.67-hardened1.patch"

     

       16
       16
       +
               "name": "linux-hardened-5.10.69-hardened1.patch",

     

       17
       17
       +
               "sha256": "11frhnprvxnqxm8yn1kay2jv2i473i9glnvsjnqz6kj8f0q2gl4v",

     

       18
       18
       +
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.69-hardened1/linux-hardened-5.10.69-hardened1.patch"

     

       19
       19
        
           },

     

       20
       20
        
           "5.13": {

     

       21
       21
        
               "extra": "-hardened1",

     
···

       25
       25
        
           },

     

       26
       26
        
           "5.14": {

     

       27
       27
        
               "extra": "-hardened1",

     

       28
       28
       -
               "name": "linux-hardened-5.14.6-hardened1.patch",

     

       29
       29
       -
               "sha256": "0db5jvbvrk93x745ylxwnmx6ldwhmaqdnb2hfa35j0i2xjaw4hxx",

     

       30
       30
       -
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.6-hardened1/linux-hardened-5.14.6-hardened1.patch"

     

       28
       28
       +
               "name": "linux-hardened-5.14.8-hardened1.patch",

     

       29
       29
       +
               "sha256": "1kg02ixyd2dbk97iz28g26k1nnxi96s0bcyr90wc7diylhf7kz4a",

     

       30
       30
       +
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.8-hardened1/linux-hardened-5.14.8-hardened1.patch"

     

       31
       31
        
           },

     

       32
       32
        
           "5.4": {

     

       33
       33
        
               "extra": "-hardened1",

     

       34
       34
       -
               "name": "linux-hardened-5.4.147-hardened1.patch",

     

       35
       35
       -
               "sha256": "1jkvfpckmj9ig4nsxxiigawkay05lk8r9fps16iaq6lz2mf9vqsb",

     

       36
       36
       -
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.147-hardened1/linux-hardened-5.4.147-hardened1.patch"

     

       34
       34
       +
               "name": "linux-hardened-5.4.149-hardened1.patch",

     

       35
       35
       +
               "sha256": "1v21dz66ngsdsdcld23rgmidz955x74al5nsxnvwasc5gh18ahh9",

     

       36
       36
       +
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.149-hardened1/linux-hardened-5.4.149-hardened1.patch"

     

       37
       37
        
           }

     

       38
       38
        
       }

+2 -2

pkgs/os-specific/linux/kernel/linux-4.14.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       buildLinux (args // rec {

     

       6
       6
       -
         version = "4.14.247";

     

       6
       6
       +
         version = "4.14.248";

     

       7
       7
        
       

     

       8
       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       16
       16
       -
           sha256 = "1kdhlsqpmw68xnfiyx98id8wis6kkxca2d4n7w2ncax0kyzrwyz7";

     

       16
       16
       +
           sha256 = "0m5nsd41b08xppcf7vvx8zgj3h3sp3n6xrgxfkccn6n4bk7yx4y9";

     

       17
       17
        
         };

     

       18
       18
        
       } // (args.argsOverride or {}))

+2 -2

pkgs/os-specific/linux/kernel/linux-4.19.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       buildLinux (args // rec {

     

       6
       6
       -
         version = "4.19.207";

     

       6
       6
       +
         version = "4.19.208";

     

       7
       7
        
       

     

       8
       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       16
       16
       -
           sha256 = "1fb658n89xf9asnaqi0bnh64ir2f78bdqyjvfb983qad9wqsadym";

     

       16
       16
       +
           sha256 = "1556bk46v7pjd2xrvkldq254yc18cn9jll25ba8zig57562ahkg7";

     

       17
       17
        
         };

     

       18
       18
        
       } // (args.argsOverride or {}))

+2 -2

pkgs/os-specific/linux/kernel/linux-4.4.nix

···

       1
       1
        
       { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:

     

       2
       2
        
       

     

       3
       3
        
       buildLinux (args // rec {

     

       4
       4
       -
         version = "4.4.284";

     

       4
       4
       +
         version = "4.4.285";

     

       5
       5
        
         extraMeta.branch = "4.4";

     

       6
       6
        
         extraMeta.broken = stdenv.isAarch64;

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       10
       10
       -
           sha256 = "00xkd2p181cfkys4nri93xy7snmn8g2481x3qz0js7g9p3kz5bqf";

     

       10
       10
       +
           sha256 = "0h8jzb2cg0wg4s07iqkghfxkxrnlxadwk3i3gvg2xs3ra0wrisp1";

     

       11
       11
        
         };

     

       12
       12
        
       } // (args.argsOverride or {}))

+2 -2

pkgs/os-specific/linux/kernel/linux-4.9.nix

···

       1
       1
        
       { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:

     

       2
       2
        
       

     

       3
       3
        
       buildLinux (args // rec {

     

       4
       4
       -
         version = "4.9.283";

     

       4
       4
       +
         version = "4.9.284";

     

       5
       5
        
         extraMeta.branch = "4.9";

     

       6
       6
        
         extraMeta.broken = stdenv.isAarch64;

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       10
       10
       -
           sha256 = "0pdh1lyhdp5c5n39wpr622kgchgf30iqk853a2rv9m3s3fry50lm";

     

       10
       10
       +
           sha256 = "0054b0cm0h2mbf6rxzdgd3c2rfz7xa32qkyr5lv58l2852hf0ri8";

     

       11
       11
        
         };

     

       12
       12
        
       } // (args.argsOverride or {}))

+2 -2

pkgs/os-specific/linux/kernel/linux-5.10.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       buildLinux (args // rec {

     

       6
       6
       -
         version = "5.10.68";

     

       6
       6
       +
         version = "5.10.69";

     

       7
       7
        
       

     

       8
       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

     

       16
       16
       -
           sha256 = "08cl4bg9k331apj5fjl3jx6s6l543dnbjc1cfvin951m7l787ahv";

     

       16
       16
       +
           sha256 = "1jhcl8qh4w4m2jnbp0glr6xbpn7phv17q6w3d247djnc7g2rwbr3";

     

       17
       17
        
         };

     

       18
       18
        
       } // (args.argsOverride or {}))

+2 -2

pkgs/os-specific/linux/kernel/linux-5.14.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       buildLinux (args // rec {

     

       6
       6
       -
         version = "5.14.7";

     

       6
       6
       +
         version = "5.14.8";

     

       7
       7
        
       

     

       8
       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

     

       16
       16
       -
           sha256 = "1avypasvic298823xzpzzkjbmfv9s8bjnmq92ri62qbakx23j9dg";

     

       16
       16
       +
           sha256 = "12cvvrxky92z1g9kj7pgb83yg9pnv2fvi7jf0pyagvqjqladl3na";

     

       17
       17
        
         };

     

       18
       18
        
       } // (args.argsOverride or { }))

+2 -2

pkgs/os-specific/linux/kernel/linux-5.4.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       buildLinux (args // rec {

     

       6
       6
       -
         version = "5.4.148";

     

       6
       6
       +
         version = "5.4.149";

     

       7
       7
        
       

     

       8
       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

     

       16
       16
       -
           sha256 = "1cwibh0y112hip5yd0n692rv44jh4sk2g6mj5n44g754k4i366a6";

     

       16
       16
       +
           sha256 = "1s1zka0iay0drgkdnmzf587jbrg1gx13xv26k5r1qc7dik8xc6p7";

     

       17
       17
        
         };

     

       18
       18
        
       } // (args.argsOverride or {}))

+2 -2

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

···

       4
       4
        
       

     

       5
       5
        
       buildPackage {

     

       6
       6
        
         pname = "mdevd";

     

       7
       7
       -
         version = "0.1.4.0";

     

       8
       8
       -
         sha256 = "1lnwk7qa6x7iia0v12i2jckg42ypi35hk3sa7cjm23ngnhiv5lzz";

     

       7
       7
       +
         version = "0.1.5.0";

     

       8
       8
       +
         sha256 = "01ykxgnbm53wijdrbld10664xy2wkvyzbbs98mfnqnf4h1y064n0";

     

       9
       9
        
       

     

       10
       10
        
         description = "mdev-compatible Linux hotplug manager daemon";

     

       11
       11
        
         platforms = lib.platforms.linux;

+2 -2

pkgs/os-specific/linux/s6-linux-init/default.nix

···

       4
       4
        
       

     

       5
       5
        
       buildPackage {

     

       6
       6
        
         pname = "s6-linux-init";

     

       7
       7
       -
         version = "1.0.6.3";

     

       8
       8
       -
         sha256 = "1idqjcxhl5wgff8yrsvx2812wahjri2hcs7qs6k62g0sdd8niqr9";

     

       7
       7
       +
         version = "1.0.6.4";

     

       8
       8
       +
         sha256 = "0grqk111d6aqym1c4l9j26fdqcgra1hvwb9vdgylrfbvn1c3hlpb";

     

       9
       9
        
       

     

       10
       10
        
         description = "A set of minimalistic tools used to create a s6-based init system, including a /sbin/init binary, on a Linux kernel";

     

       11
       11
        
         platforms = lib.platforms.linux;

+2 -2

pkgs/os-specific/linux/s6-linux-utils/default.nix

···

       4
       4
        
       

     

       5
       5
        
       buildPackage {

     

       6
       6
        
         pname = "s6-linux-utils";

     

       7
       7
       -
         version = "2.5.1.5";

     

       8
       8
       -
         sha256 = "1fj5ldlrc6bx40pphg29rp3byd6fal6869v85kw86c2kdgrxn063";

     

       7
       7
       +
         version = "2.5.1.6";

     

       8
       8
       +
         sha256 = "0hr49nl0d7a6i5w8cfg43xzvzayb8kpqij9xg7bmw2fyvc2z338z";

     

       9
       9
        
       

     

       10
       10
        
         description = "A set of minimalistic Linux-specific system utilities";

     

       11
       11
        
         platforms = lib.platforms.linux;

+4 -6

pkgs/os-specific/linux/sdnotify-wrapper/sdnotify-wrapper.c

···

       2
       2
        
          Copyright: (C)2015-2020 Laurent Bercot.  http://skarnet.org/

     

       3
       3
        
          ISC license. See http://opensource.org/licenses/ISC

     

       4
       4
        
       

     

       5
       5
       -
          Build-time requirements: skalibs.  http://skarnet.org/software/skalibs/

     

       5
       5
       +
          Build-time requirements: skalibs.  https://skarnet.org/software/skalibs/

     

       6
       6
        
          Run-time requirements: none, if you link skalibs statically.

     

       7
       7
       -
        

     

       7
       7
       +
       

     

       8
       8
        
          Compilation:

     

       9
       9
        
            gcc -o sdnotify-wrapper -L/usr/lib/skalibs sdnotify-wrapper.c -lskarnet

     

       10
       10
        
          Use /usr/lib/skalibs/libskarnet.a instead of -lskarnet to link statically.

     
···

       67
       67
        
       #include <skalibs/tai.h>

     

       68
       68
        
       #include <skalibs/iopause.h>

     

       69
       69
        
       #include <skalibs/djbunix.h>

     

       70
       70
       -
       //#include <skalibs/webipc.h>

     

       71
       71
       -
       // svanderburg: This header no longer exists, but socket.h provides the functions this module needs

     

       72
       70
        
       #include <skalibs/socket.h>

     

       73
       71
        
       #include <skalibs/exec.h>

     

       74
       72
        
       

     
···

       106
       104
        
       {

     

       107
       105
        
         char dummy[4096] ;

     

       108
       106
        
         iopause_fd x = { .fd = fd, .events = IOPAUSE_READ } ;

     

       109
       109
       -
         tain_t deadline ;

     

       107
       107
       +
         tain deadline ;

     

       110
       108
        
         tain_now_g() ;

     

       111
       109
        
         if (timeout) tain_from_millisecs(&deadline, timeout) ;

     

       112
       110
        
         else deadline = tain_infinite_relative ;

     
···

       135
       133
        
         int df = 1, keep = 0 ;

     

       136
       134
        
         PROG = "sdnotify-wrapper" ;

     

       137
       135
        
         {

     

       138
       138
       -
           subgetopt_t l = SUBGETOPT_ZERO ;

     

       136
       136
       +
           subgetopt l = SUBGETOPT_ZERO ;

     

       139
       137
        
           for (;;)

     

       140
       138
        
           {

     

       141
       139
        
             int opt = subgetopt_r(argc, argv, "d:ft:k", &l) ;

+77

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchurl

     

       4
       4
       +
       , pkg-config

     

       5
       5
       +
       , autoreconfHook

     

       6
       6
       +
       , python3

     

       7
       7
       +
       , perl

     

       8
       8
       +
       , libxslt

     

       9
       9
       +
       , docbook_xsl

     

       10
       10
       +
       , docbook_xml_dtd_42

     

       11
       11
       +
       , libseccomp

     

       12
       12
       +
       , installTests ? true, gnumake, which

     

       13
       13
       +
       , debugBuild ? false, libunwind

     

       14
       14
       +
       }:

     

       15
       15
       +
       

     

       16
       16
       +
       stdenv.mkDerivation rec {

     

       17
       17
       +
         pname = "sydbox-1";

     

       18
       18
       +
         version = "2.2.0";

     

       19
       19
       +
       

     

       20
       20
       +
         outputs = [ "out" "dev" "man" "doc" ]

     

       21
       21
       +
           ++ lib.optional installTests "installedTests";

     

       22
       22
       +
       

     

       23
       23
       +
         src = fetchurl {

     

       24
       24
       +
           url = "https://git.exherbo.org/${pname}.git/snapshot/${pname}-${version}.tar.xz";

     

       25
       25
       +
           sha256 = "0664myrrzbvsw73q5b7cqwgv4hl9a7vkm642s1r96gaxm16jk0z7";

     

       26
       26
       +
         };

     

       27
       27
       +
       

     

       28
       28
       +
         nativeBuildInputs = [

     

       29
       29
       +
           pkg-config

     

       30
       30
       +
           autoreconfHook

     

       31
       31
       +
           python3

     

       32
       32
       +
           perl

     

       33
       33
       +
           libxslt.bin

     

       34
       34
       +
           docbook_xsl

     

       35
       35
       +
           docbook_xml_dtd_42

     

       36
       36
       +
         ];

     

       37
       37
       +
       

     

       38
       38
       +
         buildInputs = [

     

       39
       39
       +
           libseccomp

     

       40
       40
       +
         ] ++ lib.optional debugBuild libunwind

     

       41
       41
       +
           ++ lib.optionals installTests [

     

       42
       42
       +
             gnumake

     

       43
       43
       +
             python3

     

       44
       44
       +
             perl

     

       45
       45
       +
             which

     

       46
       46
       +
           ];

     

       47
       47
       +
       

     

       48
       48
       +
         enableParallelBuilding = true;

     

       49
       49
       +
       

     

       50
       50
       +
         configureFlags = [ ]

     

       51
       51
       +
           ++ lib.optionals installTests [ "--enable-installed-tests"

     

       52
       52
       +
             "--libexecdir=${placeholder "installedTests"}/libexec" ]

     

       53
       53
       +
           ++ lib.optional debugBuild "--enable-debug";

     

       54
       54
       +
       

     

       55
       55
       +
         makeFlags = [ "SYD_INCLUDEDIR=${stdenv.cc.libc.dev}/include" ];

     

       56
       56
       +
       

     

       57
       57
       +
         doCheck = true;

     

       58
       58
       +
         checkPhase = ''

     

       59
       59
       +
           # Many of the regular test cases in t/ do not work inside the build sandbox

     

       60
       60
       +
           make -C syd check

     

       61
       61
       +
         '';

     

       62
       62
       +
       

     

       63
       63
       +
         postInstall = if installTests then ''

     

       64
       64
       +
           moveToOutput bin/syd-test $installedTests

     

       65
       65
       +
         '' else ''

     

       66
       66
       +
           # Tests are installed despite --disable-installed-tests

     

       67
       67
       +
           rm -r $out/bin/syd-test $out/libexec

     

       68
       68
       +
         '';

     

       69
       69
       +
       

     

       70
       70
       +
         meta = with lib; {

     

       71
       71
       +
           homepage = "https://sydbox.exherbo.org/";

     

       72
       72
       +
           description = "seccomp-based application sandbox";

     

       73
       73
       +
           license = licenses.gpl2;

     

       74
       74
       +
           platforms = platforms.linux;

     

       75
       75
       +
           maintainers = with maintainers; [ mvs ];

     

       76
       76
       +
         };

     

       77
       77
       +
       }

+1 -1

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

···

       478
       478
        
           "lovelace" = ps: with ps; [ ];

     

       479
       479
        
           "luci" = ps: with ps; [ openwrt-luci-rpc ];

     

       480
       480
        
           "luftdaten" = ps: with ps; [ luftdaten ];

     

       481
       481
       -
           "lupusec" = ps: with ps; [ ]; # missing inputs: lupupy

     

       481
       481
       +
           "lupusec" = ps: with ps; [ lupupy ];

     

       482
       482
        
           "lutron" = ps: with ps; [ pylutron ];

     

       483
       483
        
           "lutron_caseta" = ps: with ps; [ aiolip pylutron-caseta ];

     

       484
       484
        
           "lw12wifi" = ps: with ps; [ ]; # missing inputs: lw12

+16 -13

pkgs/servers/http/lighttpd/default.nix

···

       1
       1
        
       { lib, stdenv, buildPackages, fetchurl, pkg-config, pcre, libxml2, zlib, bzip2, which, file

     

       2
       2
       -
       , openssl, enableMagnet ? false, lua5_1 ? null

     

       3
       3
       -
       , enableMysql ? false, libmysqlclient ? null

     

       4
       4
       -
       , enableLdap ? false, openldap ? null

     

       5
       5
       -
       , enableWebDAV ? false, sqlite ? null, libuuid ? null

     

       6
       6
       -
       , enableExtendedAttrs ? false, attr ? null

     

       2
       2
       +
       , openssl

     

       3
       3
       +
       , enableDbi ? false, libdbi

     

       4
       4
       +
       , enableMagnet ? false, lua5_1

     

       5
       5
       +
       , enableMysql ? false, libmysqlclient

     

       6
       6
       +
       , enableLdap ? false, openldap

     

       7
       7
       +
       , enablePam ? false, linux-pam

     

       8
       8
       +
       , enableSasl ? false, cyrus_sasl

     

       9
       9
       +
       , enableWebDAV ? false, sqlite, libuuid

     

       10
       10
       +
       , enableExtendedAttrs ? false, attr

     

       7
       11
        
       , perl

     

       8
       12
        
       }:

     

       9
       13
        
       

     

       10
       10
       -
       assert enableMagnet -> lua5_1 != null;

     

       11
       11
       -
       assert enableMysql -> libmysqlclient != null;

     

       12
       12
       -
       assert enableLdap -> openldap != null;

     

       13
       13
       -
       assert enableWebDAV -> sqlite != null;

     

       14
       14
       -
       assert enableWebDAV -> libuuid != null;

     

       15
       15
       -
       assert enableExtendedAttrs -> attr != null;

     

       16
       16
       -
       

     

       17
       14
        
       stdenv.mkDerivation rec {

     

       18
       15
        
         pname = "lighttpd";

     

       19
       16
        
         version = "1.4.59";

     
···

       33
       30
        
       

     

       34
       31
        
         nativeBuildInputs = [ pkg-config ];

     

       35
       32
        
         buildInputs = [ pcre pcre.dev libxml2 zlib bzip2 which file openssl ]

     

       33
       33
       +
                    ++ lib.optional enableDbi libdbi

     

       36
       34
        
                    ++ lib.optional enableMagnet lua5_1

     

       37
       35
        
                    ++ lib.optional enableMysql libmysqlclient

     

       38
       36
        
                    ++ lib.optional enableLdap openldap

     

       37
       37
       +
                    ++ lib.optional enablePam linux-pam

     

       38
       38
       +
                    ++ lib.optional enableSasl cyrus_sasl

     

       39
       39
        
                    ++ lib.optional enableWebDAV sqlite

     

       40
       40
        
                    ++ lib.optional enableWebDAV libuuid;

     

       41
       41
        
       

     

       42
       42
        
         configureFlags = [ "--with-openssl" ]

     

       43
       43
       +
                       ++ lib.optional enableDbi "--with-dbi"

     

       43
       44
        
                       ++ lib.optional enableMagnet "--with-lua"

     

       44
       45
        
                       ++ lib.optional enableMysql "--with-mysql"

     

       45
       46
        
                       ++ lib.optional enableLdap "--with-ldap"

     

       47
       47
       +
                       ++ lib.optional enablePam "--with-pam"

     

       48
       48
       +
                       ++ lib.optional enableSasl "--with-sasl"

     

       46
       49
        
                       ++ lib.optional enableWebDAV "--with-webdav-props"

     

       47
       50
        
                       ++ lib.optional enableWebDAV "--with-webdav-locks"

     

       48
       51
        
                       ++ lib.optional enableExtendedAttrs "--with-attr";

     
···

       69
       72
        
           homepage = "http://www.lighttpd.net/";

     

       70
       73
        
           license = lib.licenses.bsd3;

     

       71
       74
        
           platforms = platforms.linux ++ platforms.darwin;

     

       72
       72
       -
           maintainers = [ maintainers.bjornfor ];

     

       75
       75
       +
           maintainers = with maintainers; [ bjornfor brecht ];

     

       73
       76
        
         };

     

       74
       77
        
       }

+22

pkgs/servers/monitoring/prometheus/fastly-exporter.nix

···

       1
       1
       +
       { lib, buildGoModule, fetchFromGitHub }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildGoModule rec {

     

       4
       4
       +
         pname = "fastly-exporter";

     

       5
       5
       +
         version = "6.1.0";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "peterbourgon";

     

       9
       9
       +
           repo = pname;

     

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

     

       11
       11
       +
           sha256 = "0my0pcxix5rk73m5ciz513nwmjcm7vjs6r8wg3vddm0xixv7zq94";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         vendorSha256 = "1w9asky8h8l5gc0c6cv89m38qw50hyhma8qbsw3zirplhk9mb3r2";

     

       15
       15
       +
       

     

       16
       16
       +
         meta = with lib; {

     

       17
       17
       +
           description = "Prometheus exporter for the Fastly Real-time Analytics API";

     

       18
       18
       +
           homepage = "https://github.com/peterbourgon/fastly-exporter";

     

       19
       19
       +
           license = licenses.asl20;

     

       20
       20
       +
           maintainers = teams.deshaw.members;

     

       21
       21
       +
         };

     

       22
       22
       +
       }

+5 -2

pkgs/servers/monitoring/zabbix/server.nix

···

       6
       6
        
       , sshSupport ? true, libssh2

     

       7
       7
        
       , mysqlSupport ? false, libmysqlclient

     

       8
       8
        
       , postgresqlSupport ? false, postgresql

     

       9
       9
       +
       , ipmiSupport ? false, openipmi

     

       9
       10
        
       }:

     

       10
       11
        
       

     

       11
       12
        
       # ensure exactly one primary database type is selected

     
···

       41
       42
        
             ++ optional snmpSupport net-snmp

     

       42
       43
        
             ++ optional sshSupport libssh2

     

       43
       44
        
             ++ optional mysqlSupport libmysqlclient

     

       44
       44
       -
             ++ optional postgresqlSupport postgresql;

     

       45
       45
       +
             ++ optional postgresqlSupport postgresql

     

       46
       46
       +
             ++ optional ipmiSupport openipmi;

     

       45
       47
        
       

     

       46
       48
        
             configureFlags = [

     

       47
       49
        
               "--enable-server"

     
···

       59
       61
        
             ++ optional snmpSupport "--with-net-snmp"

     

       60
       62
        
             ++ optional sshSupport "--with-ssh2=${libssh2.dev}"

     

       61
       63
        
             ++ optional mysqlSupport "--with-mysql"

     

       62
       62
       -
             ++ optional postgresqlSupport "--with-postgresql";

     

       64
       64
       +
             ++ optional postgresqlSupport "--with-postgresql"

     

       65
       65
       +
             ++ optional ipmiSupport "--with-openipmi=${openipmi.dev}";

     

       63
       66
        
       

     

       64
       67
        
             prePatch = ''

     

       65
       68
        
               find database -name data.sql -exec sed -i 's|/usr/bin/||g' {} +

+2 -2

pkgs/servers/teleport/default.nix

···

       10
       10
        
       in

     

       11
       11
        
       buildGoModule rec {

     

       12
       12
        
         pname = "teleport";

     

       13
       13
       -
         version = "7.1.2";

     

       13
       13
       +
         version = "7.1.3";

     

       14
       14
        
       

     

       15
       15
        
         # This repo has a private submodule "e" which fetchgit cannot handle without failing.

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "gravitational";

     

       18
       18
        
           repo = "teleport";

     

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

     

       20
       20
       -
           sha256 = "sha256-1/Dmh7jTlGg3CqNZDFNIT8/OvgzkHG2m6Qs0ya4IM18=";

     

       20
       20
       +
           sha256 = "sha256-upzEfImMuYU/6F5HSR3Jah3QiMXEt0XMpNAPzEYV1Nk=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         vendorSha256 = null;

+6 -7

pkgs/servers/web-apps/discourse/default.nix

···

       2
       2
        
       , fetchFromGitHub, bundlerEnv, callPackage

     

       3
       3
        
       

     

       4
       4
        
       , ruby, replace, gzip, gnutar, git, cacert, util-linux, gawk

     

       5
       5
       -
       , imagemagick, optipng, pngquant, libjpeg, jpegoptim, gifsicle, libpsl

     

       6
       6
       -
       , redis, postgresql, which, brotli, procps, rsync, nodePackages, v8

     

       5
       5
       +
       , imagemagick, optipng, pngquant, libjpeg, jpegoptim, gifsicle, jhead

     

       6
       6
       +
       , libpsl, redis, postgresql, which, brotli, procps, rsync

     

       7
       7
       +
       , nodePackages, v8

     

       7
       8
        
       

     

       8
       9
        
       , plugins ? []

     

       9
       10
        
       }@args:

     

       10
       11
        
       

     

       11
       12
        
       let

     

       12
       12
       -
         version = "2.7.7";

     

       13
       13
       +
         version = "2.7.8";

     

       13
       14
        
       

     

       14
       15
        
         src = fetchFromGitHub {

     

       15
       16
        
           owner = "discourse";

     

       16
       17
        
           repo = "discourse";

     

       17
       18
        
           rev = "v${version}";

     

       18
       18
       -
           sha256 = "sha256-rhcTQyirgPX0ITjgotJAYLLSU957GanxAYYhy9j123U=";

     

       19
       19
       +
           sha256 = "sha256-p4eViEvzIU6W89FZRtMBXsT7bvf2H12bTPZ/h3iD8rA=";

     

       19
       20
        
         };

     

       20
       21
        
       

     

       21
       22
        
         runtimeDeps = [

     
···

       41
       42
        
           jpegoptim

     

       42
       43
        
           gifsicle

     

       43
       44
        
           nodePackages.svgo

     

       45
       45
       +
           jhead

     

       44
       46
        
         ];

     

       45
       47
        
       

     

       46
       48
        
         runtimeEnv = {

     
···

       241
       243
        
       

     

       242
       244
        
             # Add a noninteractive admin creation task

     

       243
       245
        
             ./admin_create.patch

     

       244
       244
       -
       

     

       245
       245
       -
             # Disable jhead, which is currently marked as vulnerable

     

       246
       246
       -
             ./disable_jhead.patch

     

       247
       246
        
       

     

       248
       247
        
             # Add the path to the CA cert bundle to make TLS work

     

       249
       248
        
             ./action_mailer_ca_cert.patch

-12

pkgs/servers/web-apps/discourse/disable_jhead.patch

···

       1
       1
       -
       diff --git a/lib/file_helper.rb b/lib/file_helper.rb

     

       2
       2
       -
       index d87da5a85e..f5323292d7 100644

     

       3
       3
       -
       --- a/lib/file_helper.rb

     

       4
       4
       -
       +++ b/lib/file_helper.rb

     

       5
       5
       -
       @@ -127,6 +127,7 @@ class FileHelper

     

       6
       6
       -
                jpegrecompress: false,

     

       7
       7
       -
                # Skip looking for gifsicle, svgo binaries

     

       8
       8
       -
                gifsicle: false,

     

       9
       9
       -
       +        jhead: false,

     

       10
       10
       -
                svgo: false

     

       11
       11
       -
              )

     

       12
       12
       -
            end

+2 -2

pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock

···

       1
       1
        
       GEM

     

       2
       2
        
         remote: https://rubygems.org/

     

       3
       3
        
         specs:

     

       4
       4
       -
           activesupport (6.1.4)

     

       4
       4
       +
           activesupport (6.1.4.1)

     

       5
       5
        
             concurrent-ruby (~> 1.0, >= 1.0.2)

     

       6
       6
        
             i18n (>= 1.6, < 2)

     

       7
       7
        
             minitest (>= 5.1)

     
···

       24
       24
        
         rrule (= 0.4.2)

     

       25
       25
        
       

     

       26
       26
        
       BUNDLED WITH

     

       27
       27
       -
          2.2.20

     

       27
       27
       +
          2.2.24

+2 -2

pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix

···

       6
       6
        
         src = fetchFromGitHub {

     

       7
       7
        
           owner = "discourse";

     

       8
       8
        
           repo = "discourse-calendar";

     

       9
       9
       -
           rev = "519cf403ae3003291de20145aca243e2ffbcb4a2";

     

       10
       10
       -
           sha256 = "0398cf7k03i7j7v5w1mysjzk2npbkvr7icj5sjwa8i8xzg34gck4";

     

       9
       9
       +
           rev = "2f76cdd3064735d484be1df77f43100aca21aea6";

     

       10
       10
       +
           sha256 = "1skpc8p5br1jkii1rksha1q95ias6xxyvi5bnli3q41w7fz1h5j2";

     

       11
       11
        
         };

     

       12
       12
        
         meta = with lib; {

     

       13
       13
        
           homepage = "https://github.com/discourse/discourse-calendar";

+2 -2

pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix

···

       5
       5
        
           platforms = [];

     

       6
       6
        
           source = {

     

       7
       7
        
             remotes = ["https://rubygems.org"];

     

       8
       8
       -
             sha256 = "0kqgywy4cj3h5142dh7pl0xx5nybp25jn0ykk0znziivzks68xdk";

     

       8
       8
       +
             sha256 = "19gx1jcq46x9d1pi1w8xq0bgvvfw239y4lalr8asm291gj3q3ds4";

     

       9
       9
        
             type = "gem";

     

       10
       10
        
           };

     

       11
       11
       -
           version = "6.1.4";

     

       11
       11
       +
           version = "6.1.4.1";

     

       12
       12
        
         };

     

       13
       13
        
         concurrent-ruby = {

     

       14
       14
        
           groups = ["default"];

+2 -2

pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix

···

       5
       5
        
         src = fetchFromGitHub {

     

       6
       6
        
           owner = "discourse";

     

       7
       7
        
           repo = "discourse-canned-replies";

     

       8
       8
       -
           rev = "672a96a8160d3767cf5fd6647309c7b5dcf8a55d";

     

       9
       9
       -
           sha256 = "105zgpc7j3xmlkaz3cgxw1rfgy5d3dzln58ix569jmzifbsijml7";

     

       8
       8
       +
           rev = "1bb77ebbe0577f257bc16783dc8b7bbf2d915092";

     

       9
       9
       +
           sha256 = "0qvx8k9jsxjllqsqpf4k0j4niv1k2sggy6ak067wigs8ha3dkcr0";

     

       10
       10
        
         };

     

       11
       11
        
         meta = with lib; {

     

       12
       12
        
           homepage = "https://github.com/discourse/discourse-canned-replies";

+2 -2

pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix

···

       5
       5
        
         src = fetchFromGitHub {

     

       6
       6
        
           owner = "discourse";

     

       7
       7
        
           repo = "discourse-checklist";

     

       8
       8
       -
           rev = "6e7b9c5040c55795c7fd4db9569b3e93dad092c2";

     

       9
       9
       -
           sha256 = "sha256-2KAVBrfAvhLZC9idi+ijbVqOCq9rSXbDVEOZS+mWJ10=";

     

       8
       8
       +
           rev = "48855d81b7c3a3274f7f78a64312125c344d92d1";

     

       9
       9
       +
           sha256 = "0139v5wpyglfzvd07ka6gic1ssfysisgfiq09dsbjy519gnc9kjw";

     

       10
       10
        
         };

     

       11
       11
        
         meta = with lib; {

     

       12
       12
        
           homepage = "https://github.com/discourse/discourse-checklist";

+2 -2

pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock

···

       3
       3
        
         specs:

     

       4
       4
        
           addressable (2.8.0)

     

       5
       5
        
             public_suffix (>= 2.0.2, < 5.0)

     

       6
       6
       -
           faraday (1.7.0)

     

       6
       6
       +
           faraday (1.8.0)

     

       7
       7
        
             faraday-em_http (~> 1.0)

     

       8
       8
        
             faraday-em_synchrony (~> 1.0)

     

       9
       9
        
             faraday-excon (~> 1.1)

     
···

       40
       40
        
         sawyer (= 0.8.2)

     

       41
       41
        
       

     

       42
       42
        
       BUNDLED WITH

     

       43
       43
       -
          2.2.20

     

       43
       43
       +
          2.2.24

+2 -2

pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix

···

       6
       6
        
         src = fetchFromGitHub {

     

       7
       7
        
           owner = "discourse";

     

       8
       8
        
           repo = "discourse-github";

     

       9
       9
       -
           rev = "b6ad8e39a13e2ad5c6943ea697ca23f2c5f9fec1";

     

       10
       10
       -
           sha256 = "0vxwp4kbf44clcqilb8ni0ykk4jrgiv4rbd05pgfvndcp3izm2i6";

     

       9
       9
       +
           rev = "9aaf4350968fb758f9bff3588f78e3ad24ddb4b0";

     

       10
       10
       +
           sha256 = "0nmpkh1rr0jv68a655f5610v2mn09xriiqv049a0gklap2lgv7p8";

     

       11
       11
        
         };

     

       12
       12
        
         meta = with lib; {

     

       13
       13
        
           homepage = "https://github.com/discourse/discourse-github";

+2 -2

pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix

···

       16
       16
        
           platforms = [];

     

       17
       17
        
           source = {

     

       18
       18
        
             remotes = ["https://rubygems.org"];

     

       19
       19
       -
             sha256 = "0r6ik2yvsbx6jj30vck32da2bbvj4m0gf4jhp09vr75i1d6jzfvb";

     

       19
       19
       +
             sha256 = "0afhlqgby2cizcwgh7h2sq5f77q01axjbdl25bsvfwsry9n7gyyi";

     

       20
       20
        
             type = "gem";

     

       21
       21
        
           };

     

       22
       22
       -
           version = "1.7.0";

     

       22
       22
       +
           version = "1.8.0";

     

       23
       23
        
         };

     

       24
       24
        
         faraday-em_http = {

     

       25
       25
        
           groups = ["default"];

+2 -2

pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix

···

       5
       5
        
         src = fetchFromGitHub {

     

       6
       6
        
           owner = "discourse";

     

       7
       7
        
           repo = "discourse-math";

     

       8
       8
       -
           rev = "aed0c83cee568d5239143bcf1df59c5fbe86b276";

     

       9
       9
       -
           sha256 = "1k6kpnhf8s2l0w9zr5pn3wvn8w0n3gwkv7qkv0mkhkzy246ag20z";

     

       8
       8
       +
           rev = "d7d0180352dd5a7dcb76c0817bfbb08c2a0f08c7";

     

       9
       9
       +
           sha256 = "0y72impvnq965ibbfc9877hr78fxkrwav1xmgyy3r9w87952vcwa";

     

       10
       10
        
         };

     

       11
       11
        
         meta = with lib; {

     

       12
       12
        
           homepage = "https://github.com/discourse/discourse-math";

+2 -2

pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix

···

       5
       5
        
         src = fetchFromGitHub {

     

       6
       6
        
           owner = "discourse";

     

       7
       7
        
           repo = "discourse-solved";

     

       8
       8
       -
           rev = "8bf54370200fe9d94541f69339430a7dc1019d62";

     

       9
       9
       -
           sha256 = "1sk91h4dilkxm1wpv8zw59wgw860ywwlcgiw2kd23ybdk9n7b3lh";

     

       8
       8
       +
           rev = "55cb184f7ef2954326561cc44fc8134798b8a9e0";

     

       9
       9
       +
           sha256 = "0pv5i216zn0v8xfwlndvhvr06vkmxaynj8xjfnc5amy1sp6k76w7";

     

       10
       10
        
         };

     

       11
       11
        
         meta = with lib; {

     

       12
       12
        
           homepage = "https://github.com/discourse/discourse-solved";

+2 -2

pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix

···

       5
       5
        
         src = fetchFromGitHub {

     

       6
       6
        
           owner = "discourse";

     

       7
       7
        
           repo = "discourse-spoiler-alert";

     

       8
       8
       -
           rev = "ec14a2316da0a4fc055cfc21c68a60040188a2b4";

     

       9
       9
       -
           sha256 = "11n977gp8va7jkqa6i3ja279k4nmkhk5l4hg9xhs229450m1rnfp";

     

       8
       8
       +
           rev = "0b93227ea8e2c72afe72029382081ebff89c3638";

     

       9
       9
       +
           sha256 = "0x0dxb41ss15sv5ph7z7q55ayf8a7r22bgkmr17924mny5440b5a";

     

       10
       10
        
         };

     

       11
       11
        
         meta = with lib; {

     

       12
       12
        
           homepage = "https://github.com/discourse/discourse-spoiler-alert";

+2 -2

pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix

···

       5
       5
        
         src = fetchFromGitHub {

     

       6
       6
        
           owner = "discourse";

     

       7
       7
        
           repo = "discourse-yearly-review";

     

       8
       8
       -
           rev = "95149df2282d62eebeb265b4895df15a2b259d03";

     

       9
       9
       -
           sha256 = "02n27al8n8cxz3dx4awlnd4qhv8a0fmjac57yyblmpviapja1wj7";

     

       8
       8
       +
           rev = "cb040562f6af3163d70e8932867b530c6640ab9a";

     

       9
       9
       +
           sha256 = "07h6nq4bafs27ly2f5chkn5vb1wdy909qffwkgp5k1fanhbqvhvs";

     

       10
       10
        
         };

     

       11
       11
        
         meta = with lib; {

     

       12
       12
        
           homepage = "https://github.com/discourse/discourse-yearly-review";

+1 -1

pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock

···

       590
       590
        
         yaml-lint

     

       591
       591
        
       

     

       592
       592
        
       BUNDLED WITH

     

       593
       593
       -
          2.2.20

     

       593
       593
       +
          2.2.24

+3 -3

pkgs/servers/web-apps/vikunja/api.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "vikunja-api";

     

       5
       5
       -
         version = "0.18.0";

     

       5
       5
       +
         version = "0.18.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitea {

     

       8
       8
        
           domain = "kolaente.dev";

     

       9
       9
        
           owner = "vikunja";

     

       10
       10
        
           repo = "api";

     

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

     

       12
       12
       -
           sha256 = "sha256-43y9+y5VVgbCexHPsYZ9/Up84OoPSrThHWiKR0P1h3s=";

     

       12
       12
       +
           sha256 = "sha256-ngdtK8e4mLpbuY9OP1aHk99qPX/cKwnyhb/3ImTwF6M=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs =

     
···

       24
       24
        
               '';

     

       25
       25
        
             in [ fakeGit mage ];

     

       26
       26
        
       

     

       27
       27
       -
         vendorSha256 = "sha256-1tXnlOlVH61Y4jN07XBfTgZhAsU2HeudiEVAtlP+Cpk=";

     

       27
       27
       +
         vendorSha256 = "sha256-0MP04KpWX17Fa1WhLwF4yzIsDqGAeTUXxv81B+BTNe4=";

     

       28
       28
        
       

     

       29
       29
        
         # checks need to be disabled because of needed internet for some checks

     

       30
       30
        
         doCheck = false;

+2 -2

pkgs/servers/web-apps/vikunja/frontend.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "vikunja-frontend";

     

       5
       5
       -
         version = "0.18.0";

     

       5
       5
       +
         version = "0.18.1";

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "https://dl.vikunja.io/frontend/${pname}-${version}.zip";

     

       8
       8
       -
           sha256 = "sha256-LV7+HfXeNcVHuoo+n6fuAQoIb/m0lOs6JYYMNLM/jTA=";

     

       8
       8
       +
           sha256 = "sha256-u4XA6Jqn+p2J0sB2KabwZY/lFwZakZEvUUh/enrhtN4=";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         nativeBuildInputs = [ unzip ];

+3 -3

pkgs/tools/filesystems/apfsprogs/default.nix

···

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation {

     

       7
       7
        
         pname = "apfsprogs";

     

       8
       8
       -
         version = "unstable-2021-05-07";

     

       8
       8
       +
         version = "unstable-2021-08-24";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "linux-apfs";

     

       12
       12
        
           repo = "apfsprogs";

     

       13
       13
       -
           rev = "d360211a30608a907e3ee8ad4468d606c40ec2d7";

     

       14
       14
       -
           sha256 = "sha256-SeFs/GQfIEvnxERyww+mnynjR7E02DdtBA6JsknEM+Q=";

     

       13
       13
       +
           rev = "5efac5a701bcb56e23cfc182b5b3901bff27d343";

     

       14
       14
       +
           sha256 = "sha256-vQE586HwrPkF0uaTKrJ7yXb24ntRI0QmBla7N2ErAU8=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         buildPhase = ''

+2 -2

pkgs/tools/inputmethods/fcitx5/default.nix

···

       41
       41
        
       in

     

       42
       42
        
       stdenv.mkDerivation rec {

     

       43
       43
        
         pname = "fcitx5";

     

       44
       44
       -
         version = "5.0.8";

     

       44
       44
       +
         version = "5.0.9";

     

       45
       45
        
       

     

       46
       46
        
         src = fetchFromGitHub {

     

       47
       47
        
           owner = "fcitx";

     

       48
       48
        
           repo = pname;

     

       49
       49
        
           rev = version;

     

       50
       50
       -
           sha256 = "0czj2awvgk9apdh9rj3vcb04g8x2wp1d4sshvch31nwpqs10hssr";

     

       50
       50
       +
           sha256 = "161xgm2fs51v8l46raz6xxkjmshpgaaax64lz8208m7fcd32ll3a";

     

       51
       51
        
         };

     

       52
       52
        
       

     

       53
       53
        
         prePatch = ''

+2 -2

pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix

···

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation rec {

     

       13
       13
        
         pname = "fcitx5-rime";

     

       14
       14
       -
         version = "5.0.6";

     

       14
       14
       +
         version = "5.0.7";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "fcitx";

     

       18
       18
        
           repo = pname;

     

       19
       19
        
           rev = version;

     

       20
       20
       -
           sha256 = "1r36c1pl63vka9mxa8f5x0kijapjgxzz5b4db8h87ri9kcxk7i2g";

     

       20
       20
       +
           sha256 = "1djakg17rxc38smja4y76i0p4gwdj3lgwym8kybkaspk7lxr62zy";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         cmakeFlags = [

+2 -2

pkgs/tools/misc/execline/default.nix

···

       4
       4
        
       

     

       5
       5
        
       buildPackage {

     

       6
       6
        
         pname = "execline";

     

       7
       7
       -
         version = "2.8.0.1";

     

       8
       8
       -
         sha256 = "1v9swmhw2rcrr9fmkmd7qh8qq0kslhmvxwz2a3bhan9ksabz8wx3";

     

       7
       7
       +
         version = "2.8.1.0";

     

       8
       8
       +
         sha256 = "0msmzf5zwjcsgjlvvq28rd2i0fkdb2skmv8ii0ix8dhyckwwjmav";

     

       9
       9
        
       

     

       10
       10
        
         description = "A small scripting language, to be used in place of a shell in non-interactive scripts";

     

       11
       11

+3 -3

pkgs/tools/misc/fclones/default.nix

···

       7
       7
        
       

     

       8
       8
        
       rustPlatform.buildRustPackage rec {

     

       9
       9
        
         pname = "fclones";

     

       10
       10
       -
         version = "0.15.0";

     

       10
       10
       +
         version = "0.16.0";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "pkolaczk";

     

       14
       14
        
           repo = pname;

     

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

     

       16
       16
       -
           sha256 = "sha256-8NUneKJpnBjC4OcAABEpI9p+saBqAk+l43FS8/tIYjc=";

     

       16
       16
       +
           sha256 = "sha256-BoCbN7EY7SmBYCS3OLFrQ1j1MUvZ+/oQAdoHCw9kCQE=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         cargoSha256 = "sha256-5qX45FJFaiE1vTXjllM9U1w57MX18GgKEFOEBMc64Jk=";

     

       19
       19
       +
         cargoSha256 = "sha256-pAYPfRm7QN4mKwnYUMq5Td+bF1tmy3oGObWvMabmnpw=";

     

       20
       20
        
       

     

       21
       21
        
         buildInputs = lib.optionals stdenv.isDarwin [

     

       22
       22
        
           AppKit

+7 -2

pkgs/tools/misc/fdtools/default.nix

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         pname = "fdtools";

     

       5
       5
       +
         # When you update, check whether we can drop the skalibs pin.

     

       5
       6
        
         version = "2020.05.04";

     

       6
       7
        
         sha256 = "0lnafcp4yipi0dl8gh33zjs8wlpz0mim8mwmiz9s49id0b0fmlla";

     

       8
       8
       +
         skalibs = skawarePackages.skalibs_2_10;

     

       7
       9
        
       

     

       8
       10
        
       in stdenv.mkDerivation {

     

       9
       11
        
         inherit pname version;

     
···

       16
       18
        
         patches = [ ./new-skalibs.patch ];

     

       17
       19
        
         outputs = [ "bin" "lib" "dev" "doc" "out" ];

     

       18
       20
        
       

     

       19
       19
       -
         buildInputs = [ skawarePackages.skalibs ];

     

       21
       21
       +
         buildInputs = [

     

       22
       22
       +
           # temporary, until fdtools catches up to skalibs

     

       23
       23
       +
           skalibs

     

       24
       24
       +
         ];

     

       20
       25
        
       

     

       21
       26
        
         configurePhase = ''

     

       22
       27
        
           cd ${pname}-${version}

     
···

       27
       32
        
             conf-compile/defaults/host_compile.sh \

     

       28
       33
        
             > conf-compile/host_compile.sh

     

       29
       34
        
       

     

       30
       30
       -
           echo "${skawarePackages.skalibs.lib}/lib/skalibs/sysdeps" \

     

       35
       35
       +
           echo "${skalibs.lib}/lib/skalibs/sysdeps" \

     

       31
       36
        
             > conf-compile/depend_skalibs_sysdeps

     

       32
       37
        
         '';

     

       33
       38

+2 -2

pkgs/tools/misc/s6-portable-utils/default.nix

···

       4
       4
        
       

     

       5
       5
        
       buildPackage {

     

       6
       6
        
         pname = "s6-portable-utils";

     

       7
       7
       -
         version = "2.2.3.2";

     

       8
       8
       -
         sha256 = "173nmygkp7ky3093dg4rx3ahvyl7ll86z8qj6pl3jd96xb9s49v6";

     

       7
       7
       +
         version = "2.2.3.3";

     

       8
       8
       +
         sha256 = "132jj5qk8x40kw6lrrn7jiqhvqj9d2h6g6mhl8zma1sp37bg0i84";

     

       9
       9
        
       

     

       10
       10
        
         description = "A set of tiny general Unix utilities optimized for simplicity and small size";

     

       11
       11

+2 -2

pkgs/tools/networking/s6-dns/default.nix

···

       4
       4
        
       

     

       5
       5
        
       buildPackage {

     

       6
       6
        
         pname = "s6-dns";

     

       7
       7
       -
         version = "2.3.5.1";

     

       8
       8
       -
         sha256 = "0qsgqwdr5ms337fc9f2b4aa5cr7myvbzndvgkgswnrdwszjm078c";

     

       7
       7
       +
         version = "2.3.5.2";

     

       8
       8
       +
         sha256 = "0nczzjprvp6wirzycgf5h32dlgx4r8grzkqhif27n3ii6f5g78yw";

     

       9
       9
        
       

     

       10
       10
        
         description = "A suite of DNS client programs and libraries for Unix systems";

     

       11
       11

+2 -3

pkgs/tools/networking/s6-networking/default.nix

···

       19
       19
        
       

     

       20
       20
        
       buildPackage {

     

       21
       21
        
         pname = "s6-networking";

     

       22
       22
       -
         version = "2.4.1.1";

     

       23
       23
       -
         sha256 = "0m55ibx7k2wgrqbpci1n667ij0h925ajzggxalq2pj65kmwcmyx3";

     

       22
       22
       +
         version = "2.5.0.0";

     

       23
       23
       +
         sha256 = "1fn3g9gkwgmnxallhk82f5rly81pnkilj7n49g5fbfmaalsq96mh";

     

       24
       24
        
       

     

       25
       25
        
         description = "A suite of small networking utilities for Unix systems";

     

       26
       26
        
       

     
···

       57
       57
        
         postInstall = ''

     

       58
       58
        
           # remove all s6 executables from build directory

     

       59
       59
        
           rm $(find -name "s6-*" -type f -mindepth 1 -maxdepth 1 -executable)

     

       60
       60
       -
           rm minidentd

     

       61
       60
        
           rm libs6net.* libstls.* libs6tls.* libsbearssl.*

     

       62
       61
        
       

     

       63
       62
        
           mv doc $doc/share/doc/s6-networking/html

+2 -2

pkgs/tools/networking/ytcc/default.nix

···

       2
       2
        
       

     

       3
       3
        
       python3Packages.buildPythonApplication rec {

     

       4
       4
        
         pname = "ytcc";

     

       5
       5
       -
         version = "2.3.0";

     

       5
       5
       +
         version = "2.4.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "woefe";

     

       9
       9
        
           repo = "ytcc";

     

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

     

       11
       11
       -
           sha256 = "1q0w3b7r93416s28qra608n0d7cjh95nwkzgg23z5hp5sq3w3izr";

     

       11
       11
       +
           sha256 = "00fx1zlfz4gj46ahgvawc21rx6s49qrzd8am3p2yzmc12ibfqyhv";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ gettext ];

+2 -2

pkgs/tools/system/s6-rc/default.nix

···

       4
       4
        
       

     

       5
       5
        
       buildPackage {

     

       6
       6
        
         pname = "s6-rc";

     

       7
       7
       -
         version = "0.5.2.2";

     

       8
       8
       -
         sha256 = "12bzc483jpd16xmhfsfrib84daj1k3kwy5s5nc18ap60apa1r39a";

     

       7
       7
       +
         version = "0.5.2.3";

     

       8
       8
       +
         sha256 = "1f92dxw1n8r8avamixi9k0gqbnkpm0r3fmwzz7jd82g6bb2vsg5z";

     

       9
       9
        
       

     

       10
       10
        
         description = "A service manager for s6-based systems";

     

       11
       11
        
         platforms = lib.platforms.unix;

+3 -2

pkgs/tools/system/s6/default.nix

···

       4
       4
        
       

     

       5
       5
        
       buildPackage {

     

       6
       6
        
         pname = "s6";

     

       7
       7
       -
         version = "2.10.0.3";

     

       8
       8
       -
         sha256 = "0mw7blp8dwr09z58m9mrxwmmvvpnjzq9klcf1vgm0hbha4qkf88x";

     

       7
       7
       +
         version = "2.11.0.0";

     

       8
       8
       +
         sha256 = "1a3lj0xfhn1w3a4ygqsxy8q4dr3n48hnwml4xzdpz3nrikhy8if5";

     

       9
       9
        
       

     

       10
       10
        
         description = "skarnet.org's small & secure supervision software suite";

     

       11
       11
        
       

     
···

       34
       34
        
           # remove all s6 executables from build directory

     

       35
       35
        
           rm $(find -type f -mindepth 1 -maxdepth 1 -executable)

     

       36
       36
        
           rm libs6.*

     

       37
       37
       +
           rm ./libs6lockd.a.xyzzy

     

       37
       38
        
       

     

       38
       39
        
           mv doc $doc/share/doc/s6/html

     

       39
       40
        
           mv examples $doc/share/doc/s6/examples

+19 -10

pkgs/top-level/all-packages.nix

···

       3417
       3417
        
       

     

       3418
       3418
        
         swego = callPackage ../servers/swego { };

     

       3419
       3419
        
       

     

       3420
       3420
       +
         sydbox = callPackage ../os-specific/linux/sydbox { };

     

       3421
       3421
       +
       

     

       3420
       3422
        
         syscall_limiter = callPackage ../os-specific/linux/syscall_limiter {};

     

       3421
       3423
        
       

     

       3422
       3424
        
         syslogng = callPackage ../tools/system/syslog-ng { };

     
···

       11118
       11120
        
         inherit (callPackages ../development/compilers/crystal {

     

       11119
       11121
        
           llvmPackages = llvmPackages_10;

     

       11120
       11122
        
         })

     

       11121
       11121
       -
           crystal_0_33

     

       11122
       11122
       -
           crystal_0_34

     

       11123
       11123
       -
           crystal_0_35

     

       11124
       11123
        
           crystal_0_36

     

       11125
       11124
        
           crystal_1_0

     

       11126
       11125
        
           crystal;

     
···

       14721
       14720
        
         shallot = callPackage ../tools/misc/shallot { };

     

       14722
       14721
        
       

     

       14723
       14722
        
         inherit (callPackage ../development/tools/build-managers/shards { })

     

       14724
       14724
       -
           shards_0_11

     

       14725
       14725
       -
           shards_0_14

     

       14723
       14723
       +
           shards_0_15

     

       14726
       14724
        
           shards;

     

       14727
       14725
        
       

     

       14728
       14726
        
         shellcheck = callPackage ../development/tools/shellcheck {};

     
···

       18547
       18545
        
       

     

       18548
       18546
        
         proj = callPackage ../development/libraries/proj { };

     

       18549
       18547
        
       

     

       18548
       18548
       +
         proj_7 = callPackage ../development/libraries/proj/7.nix { };

     

       18549
       18549
       +
       

     

       18550
       18550
        
         proj-datumgrid = callPackage ../development/libraries/proj-datumgrid { };

     

       18551
       18551
        
       

     

       18552
       18552
        
         proselint = callPackage ../tools/text/proselint {

     
···

       18946
       18946
        
         skaffold = callPackage ../development/tools/skaffold { };

     

       18947
       18947
        
       

     

       18948
       18948
        
         skalibs = skawarePackages.skalibs;

     

       18949
       18949
       +
         skalibs_2_10 = skawarePackages.skalibs_2_10;

     

       18949
       18950
        
       

     

       18950
       18951
        
         skawarePackages = recurseIntoAttrs rec {

     

       18951
       18952
        
           cleanPackaging = callPackage ../build-support/skaware/clean-packaging.nix { };

     
···

       18955
       18956
        
           buildManPages = callPackage ../build-support/skaware/build-skaware-man-pages.nix { };

     

       18956
       18957
        
       

     

       18957
       18958
        
           skalibs = callPackage ../development/libraries/skalibs { };

     

       18959
       18959
       +
           skalibs_2_10 = callPackage ../development/libraries/skalibs/2_10.nix { };

     

       18958
       18960
        
           execline = callPackage ../tools/misc/execline { };

     

       18959
       18961
        
       

     

       18960
       18962
        
           execline-man-pages = callPackage ../data/documentation/execline-man-pages {

     
···

       20731
       20733
        
         prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { };

     

       20732
       20734
        
         prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { };

     

       20733
       20735
        
         prometheus-domain-exporter = callPackage ../servers/monitoring/prometheus/domain-exporter.nix { };

     

       20736
       20736
       +
         prometheus-fastly-exporter = callPackage ../servers/monitoring/prometheus/fastly-exporter.nix { };

     

       20734
       20737
        
         prometheus-flow-exporter = callPackage ../servers/monitoring/prometheus/flow-exporter.nix { };

     

       20735
       20738
        
         prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { };

     

       20736
       20739
        
         prometheus-gitlab-ci-pipelines-exporter = callPackage ../servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix { };

     
···

       26535
       26538
        
         obsidian = callPackage ../applications/misc/obsidian { };

     

       26536
       26539
        
       

     

       26537
       26540
        
         octoprint = callPackage ../applications/misc/octoprint { };

     

       26541
       26541
       +
       

     

       26542
       26542
       +
         ocr-a = callPackage ../data/fonts/ocr-a {};

     

       26538
       26543
        
       

     

       26539
       26544
        
         ocrad = callPackage ../applications/graphics/ocrad { };

     

       26540
       26545
        
       

     
···

       26954
       26959
        
       

     

       26955
       26960
        
         qimgv = libsForQt5.callPackage ../applications/graphics/qimgv { };

     

       26956
       26961
        
       

     

       26957
       26957
       -
         qlandkartegt = libsForQt514.callPackage ../applications/misc/qlandkartegt {};

     

       26962
       26962
       +
         qlandkartegt = libsForQt514.callPackage ../applications/misc/qlandkartegt {

     

       26963
       26963
       +
           gdal = gdal.override {

     

       26964
       26964
       +
             libgeotiff = libgeotiff.override { proj = proj_7; };

     

       26965
       26965
       +
             libspatialite = libspatialite.override { proj = proj_7; };

     

       26966
       26966
       +
             proj = proj_7;

     

       26967
       26967
       +
           };

     

       26968
       26968
       +
           proj = proj_7;

     

       26969
       26969
       +
         };

     

       26958
       26970
        
       

     

       26959
       26971
        
         garmindev = callPackage ../applications/misc/qlandkartegt/garmindev.nix {};

     

       26960
       26972
        
       

     
···

       31118
       31130
        
       

     

       31119
       31131
        
         gildas = callPackage ../applications/science/astronomy/gildas { };

     

       31120
       31132
        
       

     

       31121
       31121
       -
         gplates = callPackage ../applications/science/misc/gplates {

     

       31122
       31122
       -
           boost = boost160;

     

       31123
       31123
       -
           cgal = cgal.override { boost = boost160; };

     

       31124
       31124
       -
         };

     

       31133
       31133
       +
         gplates = libsForQt5.callPackage ../applications/science/misc/gplates { };

     

       31125
       31134
        
       

     

       31126
       31135
        
         gravit = callPackage ../applications/science/astronomy/gravit { };

     

       31127
       31136

+6 -10

pkgs/top-level/lua-packages.nix

···

       12
       12
        
       , fetchFromGitHub, which, writeText

     

       13
       13
        
       , pkgs

     

       14
       14
        
       , lib

     

       15
       15
       -
       }:

     

       15
       15
       +
       }@args:

     

       16
       16
        
       

     

       17
       17
        
       let

     

       18
       18
        
         packages = ( self:

     

       19
       19
        
       

     

       20
       20
        
       let

     

       21
       21
       -
       

     

       22
       22
       -
         # a function of lua_path / lua_cpath

     

       23
       23
       -
         lua-setup-hook = callPackage ../development/interpreters/lua-5/setup-hook.nix {

     

       24
       24
       -
           inherit lib;

     

       25
       25
       -
         };

     

       26
       26
       -
       

     

       27
       21
        
         callPackage = pkgs.newScope self;

     

       28
       22
        
       

     

       29
       23
        
         buildLuaApplication = args: buildLuarocksPackage ({namePrefix="";} // args );

     
···

       52
       46
        
         # helper functions for dealing with LUA_PATH and LUA_CPATH

     

       53
       47
        
         lib = luaLib;

     

       54
       48
        
       

     

       55
       55
       -
         getLuaPath = drv: luaLib.getPath drv (luaLib.luaPathList lua.luaversion) ;

     

       56
       56
       -
         getLuaCPath = drv: luaLib.getPath drv (luaLib.luaCPathList lua.luaversion) ;

     

       49
       49
       +
         getLuaPath = drv: getPath drv (luaLib.luaPathList lua.luaversion) ;

     

       50
       50
       +
         getLuaCPath = drv: getPath drv (luaLib.luaCPathList lua.luaversion) ;

     

       57
       51
        
       

     

       52
       52
       +
         inherit (callPackage ../development/interpreters/lua-5/hooks { inherit (args) lib;})

     

       53
       53
       +
           lua-setup-hook;

     

       58
       54
        
       

     

       59
       59
       -
         inherit lua lua-setup-hook callPackage;

     

       55
       55
       +
         inherit lua callPackage;

     

       60
       56
        
         inherit buildLuaPackage buildLuarocksPackage buildLuaApplication;

     

       61
       57
        
         inherit (luaLib) luaOlder luaAtLeast isLua51 isLua52 isLua53 isLuaJIT

     

       62
       58
        
           requiredLuaModules toLuaModule hasLuaModule;

+2

pkgs/top-level/python-packages.nix

···

       4384
       4384
        
       

     

       4385
       4385
        
         lupa = callPackage ../development/python-modules/lupa { };

     

       4386
       4386
        
       

     

       4387
       4387
       +
         lupupy = callPackage ../development/python-modules/lupupy { };

     

       4388
       4388
       +
       

     

       4387
       4389
        
         lxml = callPackage ../development/python-modules/lxml {

     

       4388
       4390
        
           inherit (pkgs) libxml2 libxslt zlib;

     

       4389
       4391
        
         };

+1

pkgs/top-level/wine-packages.nix

···

       47
       47
        
           ldapSupport = true;

     

       48
       48
        
           faudioSupport = true;

     

       49
       49
        
           vkd3dSupport = true;

     

       50
       50
       +
           embedInstallers = true;

     

       50
       51
        
         };

     

       51
       52
        
       

     

       52
       53
        
         stable = base.override { wineRelease = "stable"; };