···

       
179
       
179
       
 
       
          xargs -I{} -P"$cores" \

     

       
180
       
180
       
 
       
          ${singleChunk} "$chunkSize" {} "$evalSystem" "$chunkOutputDir"

     

       
181
       
181
       
 
       


     

       
182
       
182
       
+
       
        cp -r "$chunkOutputDir"/stats $out/stats-by-chunk

     

       
183
       
183
       
+
       


     

       
182
       
184
       
 
       
        if (( chunkSize * chunkCount != attrCount )); then

     

       
183
       
185
       
 
       
          # A final incomplete chunk would mess up the stats, don't include it

     

       
184
       
186
       
 
       
          rm "$chunkOutputDir"/stats/"$seq_end"

     
···

       
253
       
255
       
 
       
          done

     

       
254
       
256
       
 
       
        } |

     

       
255
       
257
       
 
       
          jq -s from_entries > $out/stats.json

     

       
258
       
258
       
+
       


     

       
259
       
259
       
+
       
        mkdir -p $out/stats

     

       
260
       
260
       
+
       


     

       
261
       
261
       
+
       
        for d in ${resultsDir}/*; do

     

       
262
       
262
       
+
       
          cp -r "$d"/stats-by-chunk $out/stats/$(basename "$d")

     

       
263
       
263
       
+
       
        done

     

       
256
       
264
       
 
       
      '';

     

       
257
       
265
       
 
       


     

       
258
       
266
       
 
       
  compare = import ./compare {

     

···

       
39
       
39
       
 
       
    htpasswd-file = lib.mkOption {

     

       
40
       
40
       
 
       
      default = null;

     

       
41
       
41
       
 
       
      type = lib.types.nullOr lib.types.path;

     

       
42
       
42
       
-
       
      description = "The path to the servers .htpasswd file. Defaults to {dataDir}/htpasswd.";

     

       
42
       
42
       
+
       
      description = "The path to the servers .htpasswd file. Defaults to `\${dataDir}/.htpasswd`.";

     

       
43
       
43
       
 
       
    };

     

       
44
       
44
       
 
       


     

       
45
       
45
       
 
       
    privateRepos = lib.mkOption {

     

···

       
68
       
68
       
 
       
  options.services.mautrix-signal = {

     

       
69
       
69
       
 
       
    enable = lib.mkEnableOption "mautrix-signal, a Matrix-Signal puppeting bridge";

     

       
70
       
70
       
 
       


     

       
71
       
71
       
+
       
    package = lib.mkPackageOption pkgs "mautrix-signal" { };

     

       
72
       
72
       
+
       


     

       
71
       
73
       
 
       
    settings = lib.mkOption {

     

       
72
       
74
       
 
       
      apply = lib.recursiveUpdate defaultConfig;

     

       
73
       
75
       
 
       
      type = settingsFormat.type;

     
···

       
206
       
208
       
 
       


     

       
207
       
209
       
 
       
        # generate the appservice's registration file if absent

     

       
208
       
210
       
 
       
        if [ ! -f '${registrationFile}' ]; then

     

       
209
       
209
       
-
       
          ${pkgs.mautrix-signal}/bin/mautrix-signal \

     

       
211
       
211
       
+
       
          ${cfg.package}/bin/mautrix-signal \

     

       
210
       
212
       
 
       
            --generate-registration \

     

       
211
       
213
       
 
       
            --config='${settingsFile}' \

     

       
212
       
214
       
 
       
            --registration='${registrationFile}'

     
···

       
234
       
236
       
 
       
        StateDirectory = baseNameOf dataDir;

     

       
235
       
237
       
 
       
        WorkingDirectory = dataDir;

     

       
236
       
238
       
 
       
        ExecStart = ''

     

       
237
       
237
       
-
       
          ${pkgs.mautrix-signal}/bin/mautrix-signal \

     

       
239
       
239
       
+
       
          ${cfg.package}/bin/mautrix-signal \

     

       
238
       
240
       
 
       
          --config='${settingsFile}' \

     

       
239
       
241
       
 
       
          --registration='${registrationFile}'

     

       
240
       
242
       
 
       
        '';

     

···

       
18
       
18
       
 
       
    services.mautrix-telegram = {

     

       
19
       
19
       
 
       
      enable = lib.mkEnableOption "Mautrix-Telegram, a Matrix-Telegram hybrid puppeting/relaybot bridge";

     

       
20
       
20
       
 
       


     

       
21
       
21
       
+
       
      package = lib.mkPackageOption pkgs "mautrix-telegram" { };

     

       
22
       
22
       
+
       


     

       
21
       
23
       
 
       
      settings = lib.mkOption rec {

     

       
22
       
24
       
 
       
        apply = lib.recursiveUpdate default;

     

       
23
       
25
       
 
       
        inherit (settingsFormat) type;

     
···

       
201
       
203
       
 
       


     

       
202
       
204
       
 
       
          # generate the appservice's registration file if absent

     

       
203
       
205
       
 
       
          if [ ! -f '${registrationFile}' ]; then

     

       
204
       
204
       
-
       
            ${pkgs.mautrix-telegram}/bin/mautrix-telegram \

     

       
206
       
206
       
+
       
            ${cfg.package}/bin/mautrix-telegram \

     

       
205
       
207
       
 
       
              --generate-registration \

     

       
206
       
208
       
 
       
              --config='${settingsFile}' \

     

       
207
       
209
       
 
       
              --registration='${registrationFile}'

     
···

       
220
       
222
       
 
       


     

       
221
       
223
       
 
       
          umask $old_umask

     

       
222
       
224
       
 
       
        ''

     

       
223
       
223
       
-
       
        + lib.optionalString (pkgs.mautrix-telegram ? alembic) ''

     

       
225
       
225
       
+
       
        + lib.optionalString (cfg.package ? alembic) ''

     

       
224
       
226
       
 
       
          # run automatic database init and migration scripts

     

       
225
       
225
       
-
       
          ${pkgs.mautrix-telegram.alembic}/bin/alembic -x config='${settingsFile}' upgrade head

     

       
227
       
227
       
+
       
          ${cfg.package.alembic}/bin/alembic -x config='${settingsFile}' upgrade head

     

       
226
       
228
       
 
       
        '';

     

       
227
       
229
       
 
       


     

       
228
       
230
       
 
       
      serviceConfig = {

     
···

       
238
       
240
       
 
       
        ProtectControlGroups = true;

     

       
239
       
241
       
 
       


     

       
240
       
242
       
 
       
        PrivateTmp = true;

     

       
241
       
241
       
-
       
        WorkingDirectory = pkgs.mautrix-telegram; # necessary for the database migration scripts to be found

     

       
243
       
243
       
+
       
        WorkingDirectory = cfg.package; # necessary for the database migration scripts to be found

     

       
242
       
244
       
 
       
        StateDirectory = baseNameOf dataDir;

     

       
243
       
245
       
 
       
        UMask = "0027";

     

       
244
       
246
       
 
       
        EnvironmentFile = cfg.environmentFile;

     

       
245
       
247
       
 
       


     

       
246
       
248
       
 
       
        ExecStart = ''

     

       
247
       
247
       
-
       
          ${pkgs.mautrix-telegram}/bin/mautrix-telegram \

     

       
249
       
249
       
+
       
          ${cfg.package}/bin/mautrix-telegram \

     

       
248
       
250
       
 
       
            --config='${settingsFile}'

     

       
249
       
251
       
 
       
        '';

     

       
250
       
252
       
 
       
      };

     

···

       
51
       
51
       
 
       
  options.services.mautrix-whatsapp = {

     

       
52
       
52
       
 
       
    enable = lib.mkEnableOption "mautrix-whatsapp, a puppeting/relaybot bridge between Matrix and WhatsApp";

     

       
53
       
53
       
 
       


     

       
54
       
54
       
+
       
    package = lib.mkPackageOption pkgs "mautrix-whatsapp" { };

     

       
55
       
55
       
+
       


     

       
54
       
56
       
 
       
    settings = lib.mkOption {

     

       
55
       
57
       
 
       
      type = settingsFormat.type;

     

       
56
       
58
       
 
       
      default = defaultConfig;

     
···

       
168
       
170
       
 
       


     

       
169
       
171
       
 
       
        # generate the appservice's registration file if absent

     

       
170
       
172
       
 
       
        if [ ! -f '${registrationFile}' ]; then

     

       
171
       
171
       
-
       
          ${pkgs.mautrix-whatsapp}/bin/mautrix-whatsapp \

     

       
173
       
173
       
+
       
          ${cfg.package}/bin/mautrix-whatsapp \

     

       
172
       
174
       
 
       
            --generate-registration \

     

       
173
       
175
       
 
       
            --config='${settingsFile}' \

     

       
174
       
176
       
 
       
            --registration='${registrationFile}'

     
···

       
196
       
198
       
 
       
        StateDirectory = baseNameOf dataDir;

     

       
197
       
199
       
 
       
        WorkingDirectory = dataDir;

     

       
198
       
200
       
 
       
        ExecStart = ''

     

       
199
       
199
       
-
       
          ${pkgs.mautrix-whatsapp}/bin/mautrix-whatsapp \

     

       
201
       
201
       
+
       
          ${cfg.package}/bin/mautrix-whatsapp \

     

       
200
       
202
       
 
       
          --config='${settingsFile}' \

     

       
201
       
203
       
 
       
          --registration='${registrationFile}'

     

       
202
       
204
       
 
       
        '';

     

···

       
206
       
206
       
 
       
        assertion = cfg.cache.lru.schedule == null || cfg.cache.maxSize != null;

     

       
207
       
207
       
 
       
        message = "You must specify config.ncps.cache.lru.schedule when config.ncps.cache.maxSize is set";

     

       
208
       
208
       
 
       
      }

     

       
209
       
209
       
-
       


     

       
210
       
210
       
-
       
      {

     

       
211
       
211
       
-
       
        assertion = cfg.cache.secretKeyPath == null || (builtins.pathExists cfg.cache.secretKeyPath);

     

       
212
       
212
       
-
       
        message = "config.ncps.cache.secresecretKeyPath=${cfg.cache.secretKeyPath} must exist but does not";

     

       
213
       
213
       
-
       
      }

     

       
214
       
209
       
 
       
    ];

     

       
215
       
210
       
 
       


     

       
216
       
211
       
 
       
    users.users.ncps = {

     
···

       
245
       
240
       
 
       
    systemd.services.ncps = {

     

       
246
       
241
       
 
       
      description = "ncps binary cache proxy service";

     

       
247
       
242
       
 
       


     

       
248
       
248
       
-
       
      after = [ "network.target" ];

     

       
243
       
243
       
+
       
      after = [ "network-online.target" ];

     

       
244
       
244
       
+
       
      wants = [ "network-online.target" ];

     

       
249
       
245
       
 
       
      wantedBy = [ "multi-user.target" ];

     

       
250
       
246
       
 
       


     

       
251
       
247
       
 
       
      preStart = ''

     

···

       
10
       
10
       
 
       
  tk,

     

       
11
       
11
       
 
       
  fftw,

     

       
12
       
12
       
 
       
  portaudio,

     

       
13
       
13
       
+
       
  portmidi,

     

       
13
       
14
       
 
       
}:

     

       
14
       
15
       
 
       


     

       
15
       
16
       
 
       
stdenv.mkDerivation rec {

     

       
16
       
17
       
 
       
  pname = "puredata";

     

       
17
       
17
       
-
       
  version = "0.54-1";

     

       
18
       
18
       
+
       
  version = "0.55-2";

     

       
18
       
19
       
 
       


     

       
19
       
20
       
 
       
  src = fetchurl {

     

       
20
       
21
       
 
       
    url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz";

     

       
21
       
21
       
-
       
    hash = "sha256-hcPUvTYgtAHntdWEeHoFIIKylMTE7us1g9dwnZP9BMI=";

     

       
22
       
22
       
+
       
    hash = "sha256-EIKX+NHdGQ346LtKSsNIeSrM9wT5ogUtk8uoybi7Wls=";

     

       
22
       
23
       
 
       
  };

     

       
23
       
24
       
 
       


     

       
24
       
25
       
 
       
  patches = [

     
···

       
41
       
42
       
 
       
      alsa-lib

     

       
42
       
43
       
 
       
    ]

     

       
43
       
44
       
 
       
    ++ lib.optionals stdenv.hostPlatform.isDarwin [

     

       
45
       
45
       
+
       
      portmidi

     

       
44
       
46
       
 
       
      portaudio

     

       
45
       
47
       
 
       
    ];

     

       
46
       
48
       
 
       


     

       
47
       
49
       
 
       
  configureFlags =

     

       
48
       
50
       
 
       
    [

     

       
49
       
49
       
-
       
      "--enable-universal"

     

       
50
       
51
       
 
       
      "--enable-fftw"

     

       
51
       
52
       
 
       
      "--enable-jack"

     

       
52
       
53
       
 
       
    ]

     
···

       
55
       
56
       
 
       
    ]

     

       
56
       
57
       
 
       
    ++ lib.optionals stdenv.hostPlatform.isDarwin [

     

       
57
       
58
       
 
       
      "--enable-portaudio"

     

       
59
       
59
       
+
       
      "--enable-portmidi"

     

       
58
       
60
       
 
       
      "--without-local-portaudio"

     

       
61
       
61
       
+
       
      "--without-local-portmidi"

     

       
59
       
62
       
 
       
      "--disable-jack-framework"

     

       
60
       
63
       
 
       
      "--with-wish=${tk}/bin/wish8.6"

     

       
61
       
64
       
 
       
    ];

     

···

       
2
       
2
       
 
       
  lib,

     

       
3
       
3
       
 
       
  stdenv,

     

       
4
       
4
       
 
       
  fetchFromGitLab,

     

       
5
       
5
       
+
       
  fetchpatch,

     

       
5
       
6
       
 
       
  fftw,

     

       
6
       
7
       
 
       
  liblo,

     

       
7
       
8
       
 
       
  libsndfile,

     
···

       
22
       
23
       
 
       
    rev = "v${version}_release";

     

       
23
       
24
       
 
       
    hash = "sha256-/pMHmwly5Dar7w/ZawvR3cWQHw385GQv/Wsl1E2w5p4=";

     

       
24
       
25
       
 
       
  };

     

       
26
       
26
       
+
       


     

       
27
       
27
       
+
       
  patches = [

     

       
28
       
28
       
+
       
    # Fixes build with recent liblo, see https://gitlab.com/then-try-this/samplebrain/-/merge_requests/16

     

       
29
       
29
       
+
       
    (fetchpatch {

     

       
30
       
30
       
+
       
      url = "https://gitlab.com/then-try-this/samplebrain/-/commit/032fd7c03931d1ca2d5c3d5e29901569aa2b2a86.patch";

     

       
31
       
31
       
+
       
      hash = "sha256-aaZJh/vx8fOqrJTuFzQ9+1mXvDQQXLy1k/2SwkMkVk4=";

     

       
32
       
32
       
+
       
    })

     

       
33
       
33
       
+
       
  ];

     

       
25
       
34
       
 
       


     

       
26
       
35
       
 
       
  nativeBuildInputs = [

     

       
27
       
36
       
 
       
    qmake

     

···

       
28
       
28
       
 
       


     

       
29
       
29
       
 
       
stdenv.mkDerivation rec {

     

       
30
       
30
       
 
       
  pname = "tiled";

     

       
31
       
31
       
-
       
  version = "1.11.2";

     

       
31
       
31
       
+
       
  version = "1.11.90";

     

       
32
       
32
       
 
       


     

       
33
       
33
       
 
       
  src = fetchFromGitHub {

     

       
34
       
34
       
 
       
    owner = "mapeditor";

     

       
35
       
35
       
 
       
    repo = pname;

     

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

     

       
37
       
37
       
-
       
    sha256 = "sha256-9oUKn51MQcsStgIJrp9XW5YAIpAUcO0kzfGnYA3gz/E=";

     

       
37
       
37
       
+
       
    sha256 = "sha256-gGsozdFEE5c315DF+EsIY9wGv50wwrOBycejTkVwEHA=";

     

       
38
       
38
       
 
       
  };

     

       
39
       
39
       
 
       


     

       
40
       
40
       
 
       
  nativeBuildInputs = [

     

···

       
152
       
152
       
 
       
  # Set to `!privacySupport` or `false`.

     

       
153
       
153
       
 
       


     

       
154
       
154
       
 
       
  crashreporterSupport ?

     

       
155
       
155
       
-
       
    !privacySupport && !stdenv.hostPlatform.isRiscV && !stdenv.hostPlatform.isMusl,

     

       
155
       
155
       
+
       
    !privacySupport

     

       
156
       
156
       
+
       
    && !stdenv.hostPlatform.isLoongArch64

     

       
157
       
157
       
+
       
    && !stdenv.hostPlatform.isRiscV

     

       
158
       
158
       
+
       
    && !stdenv.hostPlatform.isMusl,

     

       
156
       
159
       
 
       
  curl,

     

       
157
       
160
       
 
       
  geolocationSupport ? !privacySupport,

     

       
158
       
161
       
 
       
  webrtcSupport ? !privacySupport,

     

···

       
21
       
21
       
 
       


     

       
22
       
22
       
 
       
mkDerivation rec {

     

       
23
       
23
       
 
       
  pname = "anilibria-winmaclinux";

     

       
24
       
24
       
-
       
  version = "2.2.26";

     

       
24
       
24
       
+
       
  version = "2.2.27";

     

       
25
       
25
       
 
       


     

       
26
       
26
       
 
       
  src = fetchFromGitHub {

     

       
27
       
27
       
 
       
    owner = "anilibria";

     

       
28
       
28
       
 
       
    repo = "anilibria-winmaclinux";

     

       
29
       
29
       
 
       
    rev = version;

     

       
30
       
30
       
-
       
    hash = "sha256-F+5R1nSmZuHKUe9bAEVwOru07SVs8tIQlbDC6Ip+zy4=";

     

       
30
       
30
       
+
       
    hash = "sha256-wu4kJCs1Bo6yVGLJuzXSCtv2nXhzlwX6jDTa0gTwPsw=";

     

       
31
       
31
       
 
       
  };

     

       
32
       
32
       
 
       


     

       
33
       
33
       
 
       
  sourceRoot = "${src.name}/src";

     

···

       
7
       
7
       
 
       
}:

     

       
8
       
8
       
 
       
buildLua (finalAttrs: {

     

       
9
       
9
       
 
       
  pname = "modernz";

     

       
10
       
10
       
-
       
  version = "0.2.7";

     

       
10
       
10
       
+
       
  version = "0.2.8";

     

       
11
       
11
       
 
       


     

       
12
       
12
       
 
       
  scriptPath = "modernz.lua";

     

       
13
       
13
       
 
       
  src = fetchFromGitHub {

     

       
14
       
14
       
 
       
    owner = "Samillion";

     

       
15
       
15
       
 
       
    repo = "ModernZ";

     

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

     

       
17
       
17
       
-
       
    hash = "sha256-BMxwQa+G8FiTl3qpoFxz1czZH1UweTYPwN9tDluQFBo=";

     

       
17
       
17
       
+
       
    hash = "sha256-pQttcfCaw9K8BD/T2CZdRAb9QEFobyeUj/KmNStgzEg=";

     

       
18
       
18
       
 
       
  };

     

       
19
       
19
       
 
       


     

       
20
       
20
       
 
       
  postInstall = ''

     

···

       
74
       
74
       
 
       
  buildType = "release";

     

       
75
       
75
       
 
       
  # Use maintainers/scripts/update.nix to update the version and all related hashes or

     

       
76
       
76
       
 
       
  # change the hashes in extpack.nix and guest-additions/default.nix as well manually.

     

       
77
       
77
       
-
       
  virtualboxVersion = "7.1.6";

     

       
78
       
78
       
-
       
  virtualboxSubVersion = "a";

     

       
79
       
79
       
-
       
  virtualboxSha256 = "5a7b13066ec71990af0cc00a5eea9c7ec3c71ca5ed99bb549c85494ce2ea395d";

     

       
77
       
77
       
+
       
  virtualboxVersion = "7.1.8";

     

       
78
       
78
       
+
       
  virtualboxSubVersion = "";

     

       
79
       
79
       
+
       
  virtualboxSha256 = "3f7132c55ac6c5f50585bfaa115d29e30b47ccf535cb0a12ff50214ddae2f63d";

     

       
80
       
80
       
 
       


     

       
81
       
81
       
 
       
  kvmPatchVersion = "20250207";

     

       
82
       
82
       
 
       
  kvmPatchHash = "sha256-GzRLIXhzWL1NLvaGKcWVBCdvay1IxgJUE4koLX1ze7Y=";

     
···

       
249
       
249
       
 
       
    ++ optional enableKvm (

     

       
250
       
250
       
 
       
      let

     

       
251
       
251
       
 
       
        patchVboxVersion =

     

       
252
       
252
       
-
       
          # There is no updated patch for 7.0.22 yet, but the older one still applies.

     

       
253
       
253
       
-
       
          if finalAttrs.virtualboxVersion == "7.0.22" then "7.0.20" else finalAttrs.virtualboxVersion;

     

       
252
       
252
       
+
       
          # There is no updated patch for 7.1.8 yet, but the older one still applies.

     

       
253
       
253
       
+
       
          if finalAttrs.virtualboxVersion == "7.1.8" then "7.1.6" else finalAttrs.virtualboxVersion;

     

       
254
       
254
       
 
       
      in

     

       
255
       
255
       
 
       
      fetchpatch {

     

       
256
       
256
       
 
       
        name = "virtualbox-${finalAttrs.virtualboxVersion}-kvm-dev-${finalAttrs.kvmPatchVersion}.patch";

     

···

       
4
       
4
       
 
       
  virtualbox,

     

       
5
       
5
       
 
       
}:

     

       
6
       
6
       
 
       
let

     

       
7
       
7
       
-
       
  virtualboxExtPackVersion = "7.1.6";

     

       
7
       
7
       
+
       
  virtualboxExtPackVersion = "7.1.8";

     

       
8
       
8
       
 
       
in

     

       
9
       
9
       
 
       
fetchurl rec {

     

       
10
       
10
       
 
       
  name = "Oracle_VirtualBox_Extension_Pack-${virtualboxExtPackVersion}.vbox-extpack";

     
···

       
14
       
14
       
 
       
    # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.

     

       
15
       
15
       
 
       
    # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS

     

       
16
       
16
       
 
       
    let

     

       
17
       
17
       
-
       
      value = "c13e47d3fb2c849019accb03353c7d04ffb9c264920075972ed2e2befe3cdd8b";

     

       
17
       
17
       
+
       
      value = "912586a3a1e9285f9df264f7999e6fffc0b8a42f2e013dd898a86f7ed3975d37";

     

       
18
       
18
       
 
       
    in

     

       
19
       
19
       
 
       
    assert (builtins.stringLength value) == 64;

     

       
20
       
20
       
 
       
    value;

     

···

       
5
       
5
       
 
       
}:

     

       
6
       
6
       
 
       
fetchurl {

     

       
7
       
7
       
 
       
  url = "http://download.virtualbox.org/virtualbox/${virtualboxVersion}/VBoxGuestAdditions_${virtualboxVersion}.iso";

     

       
8
       
8
       
-
       
  sha256 = "dbbda1645bc05c9260adfe9efc4949cb590ec5ec02680aff936375670cffcafc";

     

       
8
       
8
       
+
       
  sha256 = "0001ed19cc389f04723c9b911338559b9b74bea0d24edf794d8d2ce5b5cb14e0";

     

       
9
       
9
       
 
       
  meta = {

     

       
10
       
10
       
 
       
    description = "Guest additions ISO for VirtualBox";

     

       
11
       
11
       
 
       
    longDescription = ''

     

···

       
12
       
12
       
 
       
  libX11,

     

       
13
       
13
       
 
       
}:

     

       
14
       
14
       
 
       
let

     

       
15
       
15
       
-
       
  virtualboxVersion = "7.1.6";

     

       
16
       
16
       
-
       
  virtualboxSubVersion = "a";

     

       
17
       
17
       
-
       
  virtualboxSha256 = "5a7b13066ec71990af0cc00a5eea9c7ec3c71ca5ed99bb549c85494ce2ea395d";

     

       
15
       
15
       
+
       
  virtualboxVersion = "7.1.8";

     

       
16
       
16
       
+
       
  virtualboxSubVersion = "";

     

       
17
       
17
       
+
       
  virtualboxSha256 = "3f7132c55ac6c5f50585bfaa115d29e30b47ccf535cb0a12ff50214ddae2f63d";

     

       
18
       
18
       
 
       


     

       
19
       
19
       
 
       
  virtualBoxNixGuestAdditionsBuilder = callPackage ./builder.nix {

     

       
20
       
20
       
 
       
    inherit virtualboxVersion virtualboxSubVersion virtualboxSha256;

     

···

       
2
       
2
       
 
       
  lib,

     

       
3
       
3
       
 
       
  stdenv,

     

       
4
       
4
       
 
       
  fetchFromGitHub,

     

       
5
       
5
       
+
       
  fetchpatch,

     

       
5
       
6
       
 
       
  telegram-desktop,

     

       
6
       
7
       
 
       
  withWebkit ? true,

     

       
7
       
8
       
 
       
}:

     
···

       
20
       
21
       
 
       
      hash = "sha256-RHybrvm5p8BUt5StT/NuR76f2y1CCICirTMjdeRLtkY=";

     

       
21
       
22
       
 
       
      fetchSubmodules = true;

     

       
22
       
23
       
 
       
    };

     

       
24
       
24
       
+
       


     

       
25
       
25
       
+
       
    patches = [

     

       
26
       
26
       
+
       
      (fetchpatch {

     

       
27
       
27
       
+
       
        # https://github.com/desktop-app/lib_base/pull/268

     

       
28
       
28
       
+
       
        url = "https://github.com/desktop-app/lib_base/commit/c952da37294b958e896b27528e7834f0892faa0a.patch";

     

       
29
       
29
       
+
       
        extraPrefix = "Telegram/lib_base/";

     

       
30
       
30
       
+
       
        stripLen = 1;

     

       
31
       
31
       
+
       
        hash = "sha256-xiq8WLAiSZwpvdyK5JbRAdQ9us93+9oMmeMBqVb1TbI=";

     

       
32
       
32
       
+
       
      })

     

       
33
       
33
       
+
       
    ];

     

       
23
       
34
       
 
       


     

       
24
       
35
       
 
       
    cmakeFlags = (old.cmakeFlags or [ ]) ++ [

     

       
25
       
36
       
 
       
      (lib.cmakeBool "DESKTOP_APP_DISABLE_AUTOUPDATE" true)

     

···

       
71
       
71
       
 
       
    src = fetchFromGitHub {

     

       
72
       
72
       
 
       
      owner = "AOMediaCodec";

     

       
73
       
73
       
 
       
      repo = "libavif";

     

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

     

       
74
       
74
       
+
       
      tag = "v${version}";

     

       
75
       
75
       
 
       
      hash = "sha256-mUi0DU99XV3FzUZ8/9uJZU+W3fc6Bk6+y6Z78IRZ9Qs=";

     

       
76
       
76
       
 
       
    };

     

       
77
       
77
       
+
       


     

       
78
       
78
       
+
       
    patches = [ ];

     

       
79
       
79
       
+
       
    doCheck = false;

     

       
77
       
80
       
 
       
  };

     

       
78
       
81
       
 
       
in

     

       
79
       
82
       
 
       
stdenv.mkDerivation {

     

···

       
1
       
1
       
-
       
diff --git a/src/arma3-unix-launcher/main.cpp b/src/arma3-unix-launcher/main.cpp

     

       
2
       
2
       
-
       
index 10f6ed9..c706734 100644

     

       
3
       
3
       
-
       
--- a/src/arma3-unix-launcher/main.cpp

     

       
4
       
4
       
-
       
+++ b/src/arma3-unix-launcher/main.cpp

     

       
5
       
5
       
-
       
@@ -216,3 +216,3 @@ int main(int argc, char *argv[])

     

       
6
       
6
       
-
       


     

       
7
       
7
       
-
       
-        MainWindow w(std::move(client), config_file, parser.get<bool>("--disable-steam-integration"));

     

       
8
       
8
       
-
       
+        MainWindow w(std::move(client), config_file, !parser.get<bool>("--disable-steam-integration"));

     

       
9
       
9
       
-
       
         w.show();

     

       
10
       
10
       
-
       
diff --git a/src/dayz-linux-launcher/main.cpp b/src/dayz-linux-launcher/main.cpp

     

       
11
       
11
       
-
       
index f30bf8a..e0cef66 100644

     

       
12
       
12
       
-
       
--- a/src/dayz-linux-launcher/main.cpp

     

       
13
       
13
       
-
       
+++ b/src/dayz-linux-launcher/main.cpp

     

       
14
       
14
       
-
       
@@ -216,3 +216,3 @@ int main(int argc, char *argv[])

     

       
15
       
15
       
-
       


     

       
16
       
16
       
-
       
-        MainWindow w(std::move(client), config_file, parser.get<bool>("--disable-steam-integration"));

     

       
17
       
17
       
-
       
+        MainWindow w(std::move(client), config_file, !parser.get<bool>("--disable-steam-integration"));

     

       
18
       
18
       
-
       
         w.show();

     

···

       
1
       
1
       
 
       
diff --git a/cmake/external_dependencies.cmake b/cmake/external_dependencies.cmake

     

       
2
       
2
       
-
       
index 2eb6ec5..9f1d67e 100644

     

       
2
       
2
       
+
       
index 76648b2..145e978 100644

     

       
3
       
3
       
 
       
--- a/cmake/external_dependencies.cmake

     

       
4
       
4
       
 
       
+++ b/cmake/external_dependencies.cmake

     

       
5
       
5
       
-
       
@@ -4,7 +4,7 @@ include(FetchContent)

     

       
6
       
6
       
-
       
 

     

       
5
       
5
       
+
       
@@ -3,7 +3,7 @@ include(FetchContent)

     

       
6
       
6
       
+
       


     

       
7
       
7
       
 
       
 function(setup_library SOURCE_TO_TEST)

     

       
8
       
8
       
 
       
     set(boolArgs HEADER_ONLY)

     

       
9
       
9
       
 
       
-    set(oneValueArgs NAME CXX_FLAGS GIT_REPOSITORY GIT_TAG TEST_DEFINITIONS TEST_LINK_LIBS)

     

       
10
       
10
       
 
       
+    set(oneValueArgs NAME CXX_FLAGS URL GIT_TAG TEST_DEFINITIONS TEST_LINK_LIBS)

     

       
11
       
11
       
 
       
     set(multiValueArgs WHEN)

     

       
12
       
12
       
 
       
     cmake_parse_arguments(LIB_SETUP "${boolArgs}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})

     

       
13
       
13
       
-
       
 

     

       
14
       
14
       
-
       
@@ -27,12 +27,11 @@ function(setup_library SOURCE_TO_TEST)

     

       
13
       
13
       
+
       


     

       
14
       
14
       
+
       
@@ -26,12 +26,11 @@ function(setup_library SOURCE_TO_TEST)

     

       
15
       
15
       
 
       
     endif()

     

       
16
       
16
       
-
       
 

     

       
16
       
16
       
+
       


     

       
17
       
17
       
 
       
     FetchContent_Declare(${LIB_SETUP_NAME}

     

       
18
       
18
       
 
       
-                         GIT_REPOSITORY ${LIB_SETUP_GIT_REPOSITORY}

     

       
19
       
19
       
 
       
-                         GIT_TAG ${LIB_SETUP_GIT_TAG})

     
···

       
26
       
26
       
 
       
         FetchContent_Populate(${LIB_SETUP_NAME})

     

       
27
       
27
       
 
       
         set(SRCDIR "${LIB_SETUP_NAME}_SOURCE_DIR")

     

       
28
       
28
       
 
       
         set(BINDIR "${LIB_SETUP_NAME}_BINARY_DIR")

     

       
29
       
29
       
-
       
@@ -51,8 +50,7 @@ function(setup_argparse)

     

       
29
       
29
       
+
       
@@ -50,8 +49,7 @@ function(setup_argparse)

     

       
30
       
30
       
 
       
             }")

     

       
31
       
31
       
 
       
     setup_library("${CHECK_SOURCE}"

     

       
32
       
32
       
 
       
                   NAME argparse

     
···

       
36
       
36
       
 
       
                   HEADER_ONLY

     

       
37
       
37
       
 
       
                   )

     

       
38
       
38
       
 
       
     if (NOT TARGET argparse::argparse)

     

       
39
       
39
       
-
       
@@ -64,7 +62,7 @@ function(setup_curlpp)

     

       
39
       
39
       
+
       
@@ -63,7 +61,7 @@ function(setup_curlpp)

     

       
40
       
40
       
 
       
     set(CHECK_SOURCE "#error unimplemented}")

     

       
41
       
41
       
 
       
     setup_library("${CHECK_SOURCE}"

     

       
42
       
42
       
 
       
                   NAME curlpp

     
···

       
63
       
63
       
 
       
+                  URL @fmt_src@

     

       
64
       
64
       
 
       
                   TEST_LINK_LIBS fmt

     

       
65
       
65
       
 
       
                   )

     

       
66
       
66
       
-
       
 

     

       
66
       
66
       
+
       


     

       
67
       
67
       
 
       
@@ -126,7 +123,7 @@ function(setup_nlohmann_json)

     

       
68
       
68
       
 
       
         add_library(nlohmann_json INTERFACE)

     

       
69
       
69
       
 
       
     else()

     
···

       
84
       
84
       
 
       
                   )

     

       
85
       
85
       
 
       
     get_target_property(TARGET_TYPE pugixml TYPE)

     

       
86
       
86
       
 
       
@@ -188,8 +184,7 @@ function(setup_spdlog)

     

       
87
       
87
       
-
       
 

     

       
87
       
87
       
+
       


     

       
88
       
88
       
 
       
     setup_library("${CHECK_SOURCE}"

     

       
89
       
89
       
 
       
                   NAME spdlog

     

       
90
       
90
       
 
       
-                  GIT_REPOSITORY https://github.com/gabime/spdlog.git

     
···

       
94
       
94
       
 
       
                   TEST_LINK_LIBS ${FMT_TARGET_NAME}

     

       
95
       
95
       
 
       
                   CXX_FLAGS "-Wno-attributes -Wno-reorder -Wno-redundant-move"

     

       
96
       
96
       
 
       
@@ -198,8 +193,7 @@ endfunction()

     

       
97
       
97
       
-
       
 

     

       
97
       
97
       
+
       


     

       
98
       
98
       
 
       
 function(setup_steamworkssdk)

     

       
99
       
99
       
 
       
     FetchContent_Declare(steamworkssdk

     

       
100
       
100
       
 
       
-        URL https://github.com/julianxhokaxhiu/SteamworksSDKCI/releases/download/1.53/SteamworksSDK-v1.53.0_x64.zip

     

···

       
11
       
11
       
 
       
  nlohmann_json,

     

       
12
       
12
       
 
       
  qt5,

     

       
13
       
13
       
 
       
  spdlog,

     

       
14
       
14
       
+
       
  steam-run,

     

       
14
       
15
       
 
       
  replaceVars,

     

       
15
       
16
       
 
       
  buildDayZLauncher ? false,

     

       
16
       
17
       
 
       
}:

     

       
17
       
18
       
 
       
stdenv.mkDerivation (finalAttrs: {

     

       
18
       
19
       
 
       
  pname = "arma3-unix-launcher";

     

       
19
       
19
       
-
       
  version = "413-unstable-2025-02-10";

     

       
20
       
20
       
+
       
  version = "420";

     

       
20
       
21
       
 
       


     

       
21
       
22
       
 
       
  src = fetchFromGitHub {

     

       
22
       
23
       
 
       
    owner = "muttleyxd";

     

       
23
       
24
       
 
       
    repo = "arma3-unix-launcher";

     

       
24
       
24
       
-
       
    rev = "7d4bcb166da3bb64ef10af421619d0b00136ebd5";

     

       
25
       
25
       
-
       
    hash = "sha256-so7fjxESUAkQfO4hO5aQTzU5lHpeJlOOfEGp0Pb89sQ=";

     

       
25
       
25
       
+
       
    tag = "commit-${finalAttrs.version}";

     

       
26
       
26
       
+
       
    hash = "sha256-QY3zDtfZt2ifF69Jzp0Ls1SpDCliKdkwLaGFXneT79o=";

     

       
26
       
27
       
 
       
  };

     

       
27
       
28
       
 
       


     

       
28
       
29
       
 
       
  patches = [

     
···

       
52
       
53
       
 
       
      doctest_src = null;

     

       
53
       
54
       
 
       
      trompeloeil_src = null;

     

       
54
       
55
       
 
       
    })

     

       
55
       
55
       
-
       
    # game won't launch with steam integration anyways, disable it

     

       
56
       
56
       
-
       
    ./disable_steam_integration.patch

     

       
56
       
56
       
+
       


     

       
57
       
57
       
+
       
    # use steam-run when running the game directly

     

       
58
       
58
       
+
       
    (replaceVars ./steam-run.patch {

     

       
59
       
59
       
+
       
      steamRun = lib.getExe steam-run;

     

       
60
       
60
       
+
       
    })

     

       
57
       
61
       
 
       
  ];

     

       
58
       
62
       
 
       


     

       
59
       
63
       
 
       
  nativeBuildInputs = [

     

···

       
1
       
1
       
+
       
diff --git a/src/arma3-unix-launcher-library/arma3client.cpp b/src/arma3-unix-launcher-library/arma3client.cpp

     

       
2
       
2
       
+
       
index dbb17d0..ee8853c 100644

     

       
3
       
3
       
+
       
--- a/src/arma3-unix-launcher-library/arma3client.cpp

     

       
4
       
4
       
+
       
+++ b/src/arma3-unix-launcher-library/arma3client.cpp

     

       
5
       
5
       
+
       
@@ -63,7 +63,7 @@ namespace

     

       
6
       
6
       
+
       
                       disable_esync);

     

       
7
       
7
       
+
       
         if (!is_proton)

     

       
8
       
8
       
+
       
         {

     

       
9
       
9
       
+
       
-            StdUtils::StartBackgroundProcess(fmt::format("env {} {} {}", user_environment_variables, executable_path, arguments),

     

       
10
       
10
       
+
       
+            StdUtils::StartBackgroundProcess(fmt::format("@steamRun@ env {} {} {}", user_environment_variables, executable_path, arguments),

     

       
11
       
11
       
+
       
                                              arma_path.string());

     

       
12
       
12
       
+
       
             return;

     

       
13
       
13
       
+
       
         }

     

       
14
       
14
       
+
       
@@ -83,7 +83,7 @@ namespace

     

       
15
       
15
       
+
       


     

       
16
       
16
       
+
       
             auto const environment = fmt::format(R"env({} SteamGameId={} LD_PRELOAD={} STEAM_COMPAT_DATA_PATH="{}")env",

     

       
17
       
17
       
+
       
                                                  get_esync_prefix(disable_esync), arma3_id, ld_preload_path, steam_compat_data_path.string());

     

       
18
       
18
       
+
       
-            auto const command = fmt::format(R"command(env {} {} {} {} {} "{}" {})command", environment, user_environment_variables,

     

       
19
       
19
       
+
       
+            auto const command = fmt::format(R"command(@steamRun@ env {} {} {} {} {} "{}" {})command", environment, user_environment_variables,

     

       
20
       
20
       
+
       
                                              optional_steam_runtime(steam_utils), compatibility_tool.first,

     

       
21
       
21
       
+
       
                                              get_verb(compatibility_tool.second), executable_path.string(), arguments);

     

       
22
       
22
       
+
       
             spdlog::info("Running Arma:\n{}\n", command);

     

       
23
       
23
       
+
       
diff --git a/src/dayz-linux-launcher-library/dayzclient.cpp b/src/dayz-linux-launcher-library/dayzclient.cpp

     

       
24
       
24
       
+
       
index 5fc9027..d2b9e92 100644

     

       
25
       
25
       
+
       
--- a/src/dayz-linux-launcher-library/dayzclient.cpp

     

       
26
       
26
       
+
       
+++ b/src/dayz-linux-launcher-library/dayzclient.cpp

     

       
27
       
27
       
+
       
@@ -76,7 +76,7 @@ namespace

     

       
28
       
28
       
+
       


     

       
29
       
29
       
+
       
             auto const environment = fmt::format(R"env({} SteamGameId={} LD_PRELOAD={} STEAM_COMPAT_DATA_PATH="{}")env",

     

       
30
       
30
       
+
       
                                                  get_esync_prefix(disable_esync), dayz_id, ld_preload_path, steam_compat_data_path.string());

     

       
31
       
31
       
+
       
-            auto const command = fmt::format(R"command(env {} {} {} {} {} "{}" {})command", environment, user_environment_variables,

     

       
32
       
32
       
+
       
+            auto const command = fmt::format(R"command(@steamRun@ env {} {} {} {} {} "{}" {})command", environment, user_environment_variables,

     

       
33
       
33
       
+
       
                                              optional_steam_runtime(steam_utils), compatibility_tool.first,

     

       
34
       
34
       
+
       
                                              get_verb(compatibility_tool.second), executable_path.string(), arguments);

     

       
35
       
35
       
+
       
             spdlog::info("Running DayZ:\n{}\n", command);

     

···

       
2
       
2
       
 
       
  lib,

     

       
3
       
3
       
 
       
  buildGoModule,

     

       
4
       
4
       
 
       
  fetchFromGitHub,

     

       
5
       
5
       
+
       
  terraform,

     

       
5
       
6
       
 
       
}:

     

       
6
       
7
       
 
       


     

       
7
       
7
       
-
       
buildGoModule rec {

     

       
8
       
8
       
+
       
buildGoModule (finalAttrs: {

     

       
8
       
9
       
 
       
  pname = "atmos";

     

       
9
       
9
       
-
       
  version = "1.95.0";

     

       
10
       
10
       
+
       
  version = "1.171.0";

     

       
10
       
11
       
 
       


     

       
11
       
12
       
 
       
  src = fetchFromGitHub {

     

       
12
       
13
       
 
       
    owner = "cloudposse";

     

       
13
       
13
       
-
       
    repo = pname;

     

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

     

       
15
       
15
       
-
       
    sha256 = "sha256-shhkaPYU1N3Q7eu8CyZXYrR11kxb+r9II4lpfRWTOas=";

     

       
14
       
14
       
+
       
    repo = "atmos";

     

       
15
       
15
       
+
       
    tag = "v${finalAttrs.version}";

     

       
16
       
16
       
+
       
    hash = "sha256-4A/sSJhF9syK1Z3HhBy8fXzdXBfAoofwQ+WLYeH1cvw=";

     

       
16
       
17
       
 
       
  };

     

       
17
       
18
       
 
       


     

       
18
       
18
       
-
       
  vendorHash = "sha256-4pUx8qzptzuGeIrT7m67iidMSUNbDSGV8p+KkHqX3lo=";

     

       
19
       
19
       
+
       
  vendorHash = "sha256-JN6S1ncElUnZ9XEKEsgfYKXWZQpxogf9imopLeXX3ao=";

     

       
19
       
20
       
 
       


     

       
20
       
21
       
 
       
  ldflags = [

     

       
21
       
22
       
 
       
    "-s"

     

       
22
       
23
       
 
       
    "-w"

     

       
23
       
23
       
-
       
    "-X github.com/cloudposse/atmos/cmd.Version=v${version}"

     

       
24
       
24
       
+
       
    "-X github.com/cloudposse/atmos/cmd.Version=v${finalAttrs.version}"

     

       
24
       
25
       
 
       
  ];

     

       
25
       
26
       
 
       


     

       
27
       
27
       
+
       
  nativeCheckInputs = [ terraform ];

     

       
28
       
28
       
+
       


     

       
26
       
29
       
 
       
  preCheck = ''

     

       
27
       
30
       
 
       
    # Remove tests that depend on a network connection.

     

       
28
       
31
       
 
       
    rm -f \

     
···

       
31
       
34
       
 
       
      pkg/describe/describe_affected_test.go

     

       
32
       
35
       
 
       
  '';

     

       
33
       
36
       
 
       


     

       
34
       
34
       
-
       
  doCheck = true;

     

       
37
       
37
       
+
       
  # depend on a network connection.

     

       
38
       
38
       
+
       
  doCheck = false;

     

       
35
       
39
       
 
       


     

       
36
       
36
       
-
       
  doInstallCheck = true;

     

       
40
       
40
       
+
       
  # depend on a network connection.

     

       
41
       
41
       
+
       
  doInstallCheck = false;

     

       
42
       
42
       
+
       


     

       
37
       
43
       
 
       
  installCheckPhase = ''

     

       
38
       
44
       
 
       
    runHook preInstallCheck

     

       
39
       
39
       
-
       
    $out/bin/atmos version | grep "v${version}"

     

       
45
       
45
       
+
       


     

       
46
       
46
       
+
       
    $out/bin/atmos version | grep "v${finalAttrs.version}"

     

       
47
       
47
       
+
       


     

       
40
       
48
       
 
       
    runHook postInstallCheck

     

       
41
       
49
       
 
       
  '';

     

       
42
       
50
       
 
       


     

       
43
       
43
       
-
       
  meta = with lib; {

     

       
51
       
51
       
+
       
  meta = {

     

       
44
       
52
       
 
       
    homepage = "https://atmos.tools";

     

       
45
       
45
       
-
       
    changelog = "https://github.com/cloudposse/atmos/releases/tag/v${version}";

     

       
53
       
53
       
+
       
    changelog = "https://github.com/cloudposse/atmos/releases/tag/v${finalAttrs.version}";

     

       
46
       
54
       
 
       
    description = "Universal Tool for DevOps and Cloud Automation (works with terraform, helm, helmfile, etc)";

     

       
47
       
55
       
 
       
    mainProgram = "atmos";

     

       
48
       
48
       
-
       
    license = licenses.asl20;

     

       
49
       
49
       
-
       
    teams = [ teams.cloudposse ];

     

       
56
       
56
       
+
       
    license = lib.licenses.asl20;

     

       
57
       
57
       
+
       
    teams = [ lib.teams.cloudposse ];

     

       
50
       
58
       
 
       
  };

     

       
51
       
51
       
-
       
}

     

       
59
       
59
       
+
       
})

     

···

       
2
       
2
       
 
       
  stdenv,

     

       
3
       
3
       
 
       
  lib,

     

       
4
       
4
       
 
       
  fetchFromGitHub,

     

       
5
       
5
       
+
       
  cmake,

     

       
5
       
6
       
 
       
}:

     

       
6
       
7
       
 
       


     

       
7
       
7
       
-
       
stdenv.mkDerivation rec {

     

       
8
       
8
       
+
       
stdenv.mkDerivation (finalAttrs: {

     

       
8
       
9
       
 
       
  pname = "backward";

     

       
9
       
10
       
 
       
  version = "1.6";

     

       
10
       
11
       
 
       


     

       
11
       
12
       
 
       
  src = fetchFromGitHub {

     

       
12
       
13
       
 
       
    owner = "bombela";

     

       
13
       
14
       
 
       
    repo = "backward-cpp";

     

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

     

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

     

       
15
       
16
       
 
       
    sha256 = "sha256-2k5PjwFxgA/2XPqJrPHxgSInM61FBEcieppBx+MAUKw=";

     

       
16
       
17
       
 
       
  };

     

       
17
       
18
       
 
       


     

       
18
       
18
       
-
       
  installPhase = ''

     

       
19
       
19
       
-
       
    runHook preInstall

     

       
20
       
20
       
-
       


     

       
21
       
21
       
-
       
    mkdir -p $out/include

     

       
22
       
22
       
-
       
    cp backward.hpp $out/include

     

       
23
       
23
       
-
       


     

       
24
       
24
       
-
       
    runHook postInstall

     

       
25
       
25
       
-
       
  '';

     

       
19
       
19
       
+
       
  nativeBuildInputs = [

     

       
20
       
20
       
+
       
    cmake

     

       
21
       
21
       
+
       
  ];

     

       
26
       
22
       
 
       


     

       
27
       
27
       
-
       
  meta = with lib; {

     

       
23
       
23
       
+
       
  meta = {

     

       
28
       
24
       
 
       
    description = "Beautiful stack trace pretty printer for C++";

     

       
29
       
25
       
 
       
    homepage = "https://github.com/bombela/backward-cpp";

     

       
30
       
30
       
-
       
    license = licenses.mit;

     

       
31
       
31
       
-
       
    platforms = platforms.all;

     

       
32
       
32
       
-
       
    maintainers = [ ];

     

       
26
       
26
       
+
       
    license = lib.licenses.mit;

     

       
27
       
27
       
+
       
    platforms = lib.platforms.all;

     

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

     

       
33
       
29
       
 
       
  };

     

       
34
       
34
       
-
       
}

     

       
30
       
30
       
+
       
})

     

···

       
1
       
1
       
 
       
{

     

       
2
       
2
       
+
       
  lib,

     

       
3
       
3
       
+
       
  stdenv,

     

       
4
       
4
       
+
       
  fetchurl,

     

       
2
       
5
       
 
       
  autoPatchelfHook,

     

       
6
       
6
       
+
       
  wrapGAppsHook3,

     

       
3
       
7
       
 
       
  cairo,

     

       
4
       
8
       
 
       
  e2fsprogs,

     

       
5
       
5
       
-
       
  fetchurl,

     

       
6
       
9
       
 
       
  gmp,

     

       
7
       
10
       
 
       
  gtk3,

     

       
8
       
11
       
 
       
  libGL,

     

       
9
       
12
       
 
       
  libX11,

     

       
10
       
10
       
-
       
  lib,

     

       
11
       
11
       
-
       
  stdenv,

     

       
12
       
13
       
 
       
  libgcrypt,

     

       
13
       
13
       
-
       
  wrapGAppsHook3,

     

       
14
       
14
       
 
       
}:

     

       
15
       
15
       
 
       


     

       
16
       
16
       
-
       
stdenv.mkDerivation {

     

       
16
       
16
       
+
       
stdenv.mkDerivation (finalAttrs: {

     

       
17
       
17
       
 
       
  pname = "banana-accounting";

     

       
18
       
18
       
-
       
  version = "10.0.12";

     

       
18
       
18
       
+
       
  version = "10.1.24";

     

       
19
       
19
       
 
       


     

       
20
       
20
       
 
       
  srcs = fetchurl {

     

       
21
       
21
       
-
       
    url = "https://web.archive.org/web/20220821013214/https://www.banana.ch/accounting/files/bananaplus/exe/bananaplus.tgz";

     

       
22
       
22
       
-
       
    hash = "sha256-Xs7K/Z6qM1fKKfYMkwAGznNR0Kt/gY7qTr8ZOriIdYw=";

     

       
21
       
21
       
+
       
    url = "https://web.archive.org/web/20250416013207/https://www.banana.ch/accounting/files/bananaplus/exe/bananaplus.tgz";

     

       
22
       
22
       
+
       
    hash = "sha256-5GewPGOCyeS6faL8aMUZ/JDUUn2PGuur0ws/7nlNX6M=";

     

       
23
       
23
       
 
       
  };

     

       
24
       
24
       
 
       


     

       
25
       
25
       
 
       
  sourceRoot = ".";

     

       
26
       
26
       
 
       


     

       
27
       
27
       
-
       
  dontConfigure = true;

     

       
28
       
28
       
-
       
  dontBuild = true;

     

       
27
       
27
       
+
       
  nativeBuildInputs = [

     

       
28
       
28
       
+
       
    autoPatchelfHook

     

       
29
       
29
       
+
       
    wrapGAppsHook3

     

       
30
       
30
       
+
       
  ];

     

       
29
       
31
       
 
       


     

       
30
       
32
       
 
       
  buildInputs = [

     

       
31
       
33
       
 
       
    cairo

     
···

       
38
       
40
       
 
       
    libgcrypt

     

       
39
       
41
       
 
       
  ];

     

       
40
       
42
       
 
       


     

       
41
       
41
       
-
       
  nativeBuildInputs = [

     

       
42
       
42
       
-
       
    autoPatchelfHook

     

       
43
       
43
       
-
       
    wrapGAppsHook3

     

       
44
       
44
       
-
       
  ];

     

       
43
       
43
       
+
       
  dontConfigure = true;

     

       
44
       
44
       
+
       


     

       
45
       
45
       
+
       
  dontBuild = true;

     

       
45
       
46
       
 
       


     

       
46
       
47
       
 
       
  installPhase = ''

     

       
47
       
48
       
 
       
    runHook preInstall

     

       
48
       
48
       
-
       
    mkdir -p $out/bin

     

       
49
       
49
       
-
       
    mv ./* $out

     

       
50
       
50
       
-
       
    ln -s $out/usr/bin/bananaplus $out/bin/

     

       
49
       
49
       
+
       


     

       
50
       
50
       
+
       
    mkdir -p $out/opt $out/bin $out/share

     

       
51
       
51
       
+
       
    cp -r . $out/opt/banana-accounting

     

       
52
       
52
       
+
       
    ln -s $out/opt/banana-accounting/usr/bin/bananaplus $out/bin/bananaplus

     

       
53
       
53
       
+
       
    ln -s $out/opt/banana-accounting/usr/share/applications $out/share/applications

     

       
54
       
54
       
+
       
    ln -s $out/opt/banana-accounting/usr/share/icons $out/share/icons

     

       
55
       
55
       
+
       


     

       
51
       
56
       
 
       
    runHook postInstall

     

       
52
       
57
       
 
       
  '';

     

       
53
       
58
       
 
       


     

       
54
       
54
       
-
       
  meta = with lib; {

     

       
59
       
59
       
+
       
  meta = {

     

       
55
       
60
       
 
       
    description = "Accounting Software for small companies, associations and individuals";

     

       
56
       
56
       
-
       
    homepage = "https://www.banana.ch/";

     

       
57
       
57
       
-
       
    license = licenses.unfree;

     

       
61
       
61
       
+
       
    homepage = "https://www.banana.ch";

     

       
62
       
62
       
+
       
    license = lib.licenses.unfree;

     

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

     

       
59
       
59
       
-
       
    maintainers = with maintainers; [ jacg ];

     

       
64
       
64
       
+
       
    maintainers = with lib.maintainers; [ jacg ];

     

       
60
       
65
       
 
       
    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];

     

       
61
       
66
       
 
       
  };

     

       
62
       
62
       
-
       
}

     

       
67
       
67
       
+
       
})

     

···

       
8
       
8
       
 
       


     

       
9
       
9
       
 
       
python3Packages.buildPythonApplication rec {

     

       
10
       
10
       
 
       
  pname = "barman";

     

       
11
       
11
       
-
       
  version = "3.11.1";

     

       
11
       
11
       
+
       
  version = "3.13.2";

     

       
12
       
12
       
 
       
  pyproject = true;

     

       
13
       
13
       
 
       


     

       
14
       
14
       
 
       
  src = fetchFromGitHub {

     

       
15
       
15
       
 
       
    owner = "EnterpriseDB";

     

       
16
       
16
       
 
       
    repo = "barman";

     

       
17
       
17
       
 
       
    tag = "release/${version}";

     

       
18
       
18
       
-
       
    hash = "sha256-X39XOv8HJdSjMjMMnmB7Gxjseg5k/LuKICTxapcHVsU=";

     

       
18
       
18
       
+
       
    hash = "sha256-CfzDO4u6JL4cLHvs7f1oQqQPc+j1lKng4J9wIBswIpA=";

     

       
19
       
19
       
 
       
  };

     

       
20
       
20
       
 
       


     

       
21
       
21
       
 
       
  patches = [ ./unwrap-subprocess.patch ];

     
···

       
44
       
44
       
 
       
    mock

     

       
45
       
45
       
 
       
    pytestCheckHook

     

       
46
       
46
       
 
       
    versionCheckHook

     

       
47
       
47
       
+
       
    zstandard

     

       
48
       
48
       
+
       
    lz4

     

       
47
       
49
       
 
       
  ];

     

       
48
       
50
       
 
       


     

       
49
       
51
       
 
       
  disabledTests =

     
···

       
57
       
59
       
 
       
      "test_get_file_mode"

     

       
58
       
60
       
 
       
    ];

     

       
59
       
61
       
 
       


     

       
60
       
60
       
-
       
  meta = with lib; {

     

       
62
       
62
       
+
       
  meta = {

     

       
61
       
63
       
 
       
    description = "Backup and Recovery Manager for PostgreSQL";

     

       
62
       
64
       
 
       
    homepage = "https://www.pgbarman.org/";

     

       
63
       
65
       
 
       
    changelog = "https://github.com/EnterpriseDB/barman/blob/release/${version}/NEWS";

     

       
64
       
66
       
 
       
    mainProgram = "barman";

     

       
65
       
65
       
-
       
    license = licenses.gpl3Plus;

     

       
66
       
66
       
-
       
    maintainers = with maintainers; [ freezeboy ];

     

       
67
       
67
       
-
       
    platforms = platforms.unix;

     

       
67
       
67
       
+
       
    license = lib.licenses.gpl3Plus;

     

       
68
       
68
       
+
       
    maintainers = with lib.maintainers; [ freezeboy ];

     

       
69
       
69
       
+
       
    platforms = lib.platforms.unix;

     

       
68
       
70
       
 
       
  };

     

       
69
       
71
       
 
       
}

     

···

       
34
       
34
       
 
       
in

     

       
35
       
35
       
 
       
buildNpmPackage' rec {

     

       
36
       
36
       
 
       
  pname = "bitwarden-desktop";

     

       
37
       
37
       
-
       
  version = "2025.2.0";

     

       
37
       
37
       
+
       
  version = "2025.3.1";

     

       
38
       
38
       
 
       


     

       
39
       
39
       
 
       
  src = fetchFromGitHub {

     

       
40
       
40
       
 
       
    owner = "bitwarden";

     

       
41
       
41
       
 
       
    repo = "clients";

     

       
42
       
42
       
 
       
    rev = "desktop-v${version}";

     

       
43
       
43
       
-
       
    hash = "sha256-+RMeo+Kyum1WNm7citUe9Uk5yOtfhMPPlQRtnYL3Pj8=";

     

       
43
       
43
       
+
       
    hash = "sha256-nwm9ENTB1V+koUA3M8XR8DegmPHwYoszYlWbcxA6aXY=";

     

       
44
       
44
       
 
       
  };

     

       
45
       
45
       
 
       


     

       
46
       
46
       
 
       
  patches = [

     
···

       
76
       
76
       
 
       
    "--ignore-scripts"

     

       
77
       
77
       
 
       
  ];

     

       
78
       
78
       
 
       
  npmWorkspace = "apps/desktop";

     

       
79
       
79
       
-
       
  npmDepsHash = "sha256-fYZJA6qV3mqxO2g+yxD0MWWQc9QYmdWJ7O7Vf88Qpbs=";

     

       
79
       
79
       
+
       
  npmDepsHash = "sha256-PjlTGR+e8uDe9KKEvW7cq/wYHRBO16Cf3oHh37YcNFc=";

     

       
80
       
80
       
 
       


     

       
81
       
81
       
 
       
  cargoDeps = rustPlatform.fetchCargoVendor {

     

       
82
       
82
       
 
       
    inherit

     
···

       
86
       
86
       
 
       
      cargoRoot

     

       
87
       
87
       
 
       
      patches

     

       
88
       
88
       
 
       
      ;

     

       
89
       
89
       
-
       
    hash = "sha256-OldVFMI+rcGAbpDg7pHu/Lqbw5I6/+oXULteQ9mXiFc=";

     

       
89
       
89
       
+
       
    hash = "sha256-zIzgVvtTUIPKeOG/v9/7ugIIAVhoMjQ8QJ0Cbj9uZsQ=";

     

       
90
       
90
       
 
       
  };

     

       
91
       
91
       
 
       
  cargoRoot = "apps/desktop/desktop_native";

     

       
92
       
92
       
 
       


     
···

       
222
       
222
       
 
       
  passthru = {

     

       
223
       
223
       
 
       
    updateScript = nix-update-script {

     

       
224
       
224
       
 
       
      extraArgs = [

     

       
225
       
225
       
-
       
        "--commit"

     

       
226
       
225
       
 
       
        "--version=stable"

     

       
227
       
226
       
 
       
        "--version-regex=^desktop-v(.*)$"

     

       
228
       
227
       
 
       
      ];

     

···

       
7
       
7
       
 
       
  meson,

     

       
8
       
8
       
 
       
  ninja,

     

       
9
       
9
       
 
       
  python3,

     

       
10
       
10
       
+
       
  runCommand,

     

       
10
       
11
       
 
       
  stdenv,

     

       
11
       
12
       
 
       
  testers,

     

       
13
       
13
       
+
       
  wrapGAppsNoGuiHook,

     

       
12
       
14
       
 
       
  xvfb-run,

     

       
13
       
15
       
 
       
}:

     

       
14
       
16
       
 
       
stdenv.mkDerivation (finalAttrs: {

     
···

       
30
       
32
       
 
       
  nativeBuildInputs = [

     

       
31
       
33
       
 
       
    meson

     

       
32
       
34
       
 
       
    ninja

     

       
35
       
35
       
+
       
    wrapGAppsNoGuiHook

     

       
33
       
36
       
 
       
  ];

     

       
34
       
37
       
 
       


     

       
35
       
38
       
 
       
  buildInputs = [

     
···

       
64
       
67
       
 
       
    runHook postCheck

     

       
65
       
68
       
 
       
  '';

     

       
66
       
69
       
 
       


     

       
67
       
67
       
-
       
  passthru.tests.version = testers.testVersion {

     

       
68
       
68
       
-
       
    package = finalAttrs.finalPackage;

     

       
70
       
70
       
+
       
  passthru.tests = {

     

       
71
       
71
       
+
       
    version = testers.testVersion {

     

       
72
       
72
       
+
       
      package = finalAttrs.finalPackage;

     

       
73
       
73
       
+
       
    };

     

       
74
       
74
       
+
       
    # regression test that `blueprint-compiler` can be used in a standalone

     

       
75
       
75
       
+
       
    # context outside of nix builds, and doesn't rely on the setup hooks of

     

       
76
       
76
       
+
       
    # its propagated inputs for basic functionality.

     

       
77
       
77
       
+
       
    # see https://github.com/NixOS/nixpkgs/pull/400415

     

       
78
       
78
       
+
       
    standalone = runCommand "blueprint-compiler-test-standalone" { } ''

     

       
79
       
79
       
+
       
      ${lib.getExe finalAttrs.finalPackage} --help && touch $out

     

       
80
       
80
       
+
       
    '';

     

       
69
       
81
       
 
       
  };

     

       
70
       
82
       
 
       


     

       
71
       
83
       
 
       
  meta = with lib; {

     

···

       
15
       
15
       
 
       
  pkg-config,

     

       
16
       
16
       
 
       
  readline,

     

       
17
       
17
       
 
       
  sbc,

     

       
18
       
18
       
+
       
  python3,

     

       
18
       
19
       
 
       
}:

     

       
19
       
20
       
 
       


     

       
20
       
21
       
 
       
stdenv.mkDerivation (finalAttrs: {

     

       
21
       
22
       
 
       
  pname = "bluez-alsa";

     

       
22
       
22
       
-
       
  version = "4.1.1";

     

       
23
       
23
       
+
       
  version = "4.3.1";

     

       
23
       
24
       
 
       


     

       
24
       
25
       
 
       
  src = fetchFromGitHub {

     

       
25
       
26
       
 
       
    owner = "Arkq";

     

       
26
       
27
       
 
       
    repo = "bluez-alsa";

     

       
27
       
27
       
-
       
    rev = "v${finalAttrs.version}";

     

       
28
       
28
       
-
       
    hash = "sha256-oGaYiSkOhqfjUl+mHTs3gqFcxli3cgkRtT6tbjy3ht0=";

     

       
28
       
28
       
+
       
    tag = "v${finalAttrs.version}";

     

       
29
       
29
       
+
       
    hash = "sha256-Vebxyku7xl/ReU025iThEbvfHsi4kCbvFqlBGDWrHxc=";

     

       
29
       
30
       
 
       
  };

     

       
30
       
31
       
 
       


     

       
32
       
32
       
+
       
  postPatch = ''

     

       
33
       
33
       
+
       
    patchShebangs src/dbus-codegen.py

     

       
34
       
34
       
+
       
  '';

     

       
35
       
35
       
+
       


     

       
31
       
36
       
 
       
  nativeBuildInputs = [

     

       
32
       
37
       
 
       
    autoreconfHook

     

       
33
       
38
       
 
       
    pkg-config

     

       
39
       
39
       
+
       
    python3

     

       
34
       
40
       
 
       
  ];

     

       
35
       
41
       
 
       


     

       
36
       
42
       
 
       
  buildInputs =

     

···

       
2
       
2
       
 
       
  lib,

     

       
3
       
3
       
 
       
  rustPlatform,

     

       
4
       
4
       
 
       
  fetchFromGitHub,

     

       
5
       
5
       
-
       
  fetchpatch,

     

       
6
       
5
       
 
       
  pkg-config,

     

       
7
       
6
       
 
       
  bzip2,

     

       
8
       
7
       
 
       
  openssl,

     
···

       
11
       
10
       
 
       


     

       
12
       
11
       
 
       
rustPlatform.buildRustPackage rec {

     

       
13
       
12
       
 
       
  pname = "boa";

     

       
14
       
14
       
-
       
  version = "0.17.3";

     

       
13
       
13
       
+
       
  version = "0.20";

     

       
15
       
14
       
 
       


     

       
16
       
15
       
 
       
  src = fetchFromGitHub {

     

       
17
       
16
       
 
       
    owner = "boa-dev";

     

       
18
       
17
       
 
       
    repo = "boa";

     

       
19
       
18
       
 
       
    rev = "v${version}";

     

       
20
       
20
       
-
       
    hash = "sha256-ROzdOanfHNPwHXA0SzU2fpuBonbDbgDqH+ZgOjwK/tg=";

     

       
19
       
19
       
+
       
    hash = "sha256-foCIzzFoEpcE6i0QrSbiob3YHIOeTpjwpAMtcPGL8Vg=";

     

       
21
       
20
       
 
       
    fetchSubmodules = true;

     

       
22
       
21
       
 
       
  };

     

       
23
       
22
       
 
       


     

       
24
       
24
       
-
       
  patches = [

     

       
25
       
25
       
-
       
    (fetchpatch {

     

       
26
       
26
       
-
       
      name = "fix-rust-1.71-lints.patch";

     

       
27
       
27
       
-
       
      url = "https://github.com/boa-dev/boa/commit/93d05bda6864aa6ee67682d84bd4fc2108093ef5.patch";

     

       
28
       
28
       
-
       
      hash = "sha256-hMp4/UBN5moGBSqf8BJV2nBwgV3cry9uC2fJmdT5hkQ=";

     

       
29
       
29
       
-
       
    })

     

       
30
       
30
       
-
       
  ];

     

       
31
       
31
       
-
       


     

       
32
       
23
       
 
       
  useFetchCargoVendor = true;

     

       
33
       
33
       
-
       
  cargoHash = "sha256-1/92dyuEV+Xib0znEAgQOOmbsyjK/f2lYsXuPahLuw4=";

     

       
24
       
24
       
+
       
  cargoHash = "sha256-PphgRSVCj724eYAC04Orpz/klYuAhphiQ3v5TRChs+w=";

     

       
34
       
25
       
 
       


     

       
35
       
26
       
 
       
  cargoBuildFlags = [

     

       
36
       
27
       
 
       
    "--package"

     

···

       
1
       
1
       
-
       
From 047681f1425c7cd68b77fdd729ea4664f73126b8 Mon Sep 17 00:00:00 2001

     

       
2
       
2
       
-
       
From: wxt <3264117476@qq.com>

     

       
3
       
3
       
-
       
Date: Mon, 23 Sep 2024 15:11:09 +0800

     

       
4
       
4
       
-
       
Subject: [PATCH] update time

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
---

     

       
7
       
7
       
-
       
 Cargo.lock | 87 +++++++++++++++++++++++++++++++++++-------------------

     

       
8
       
8
       
-
       
 1 file changed, 56 insertions(+), 31 deletions(-)

     

       
9
       
9
       
-
       


     

       
10
       
10
       
-
       
diff --git a/Cargo.lock b/Cargo.lock

     

       
11
       
11
       
-
       
index be4fbeb..42f29b8 100644

     

       
12
       
12
       
-
       
--- a/Cargo.lock

     

       
13
       
13
       
-
       
+++ b/Cargo.lock

     

       
14
       
14
       
-
       
@@ -265,7 +265,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"

     

       
15
       
15
       
-
       
 dependencies = [

     

       
16
       
16
       
-
       
  "proc-macro2",

     

       
17
       
17
       
-
       
  "quote",

     

       
18
       
18
       
-
       
- "syn 2.0.16",

     

       
19
       
19
       
-
       
+ "syn 2.0.77",

     

       
20
       
20
       
-
       
 ]

     

       
21
       
21
       
-
       
 

     

       
22
       
22
       
-
       
 [[package]]

     

       
23
       
23
       
-
       
@@ -282,7 +282,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"

     

       
24
       
24
       
-
       
 dependencies = [

     

       
25
       
25
       
-
       
  "proc-macro2",

     

       
26
       
26
       
-
       
  "quote",

     

       
27
       
27
       
-
       
- "syn 2.0.16",

     

       
28
       
28
       
-
       
+ "syn 2.0.77",

     

       
29
       
29
       
-
       
 ]

     

       
30
       
30
       
-
       
 

     

       
31
       
31
       
-
       
 [[package]]

     

       
32
       
32
       
-
       
@@ -467,7 +467,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192"

     

       
33
       
33
       
-
       
 dependencies = [

     

       
34
       
34
       
-
       
  "proc-macro2",

     

       
35
       
35
       
-
       
  "quote",

     

       
36
       
36
       
-
       
- "syn 2.0.16",

     

       
37
       
37
       
-
       
+ "syn 2.0.77",

     

       
38
       
38
       
-
       
 ]

     

       
39
       
39
       
-
       
 

     

       
40
       
40
       
-
       
 [[package]]

     

       
41
       
41
       
-
       
@@ -809,6 +809,15 @@ dependencies = [

     

       
42
       
42
       
-
       
  "serde",

     

       
43
       
43
       
-
       
 ]

     

       
44
       
44
       
-
       
 

     

       
45
       
45
       
-
       
+[[package]]

     

       
46
       
46
       
-
       
+name = "deranged"

     

       
47
       
47
       
-
       
+version = "0.3.11"

     

       
48
       
48
       
-
       
+source = "registry+https://github.com/rust-lang/crates.io-index"

     

       
49
       
49
       
-
       
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"

     

       
50
       
50
       
-
       
+dependencies = [

     

       
51
       
51
       
-
       
+ "powerfmt",

     

       
52
       
52
       
-
       
+]

     

       
53
       
53
       
-
       
+

     

       
54
       
54
       
-
       
 [[package]]

     

       
55
       
55
       
-
       
 name = "derivative"

     

       
56
       
56
       
-
       
 version = "2.2.0"

     

       
57
       
57
       
-
       
@@ -1007,7 +1016,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745"

     

       
58
       
58
       
-
       
 dependencies = [

     

       
59
       
59
       
-
       
  "proc-macro2",

     

       
60
       
60
       
-
       
  "quote",

     

       
61
       
61
       
-
       
- "syn 2.0.16",

     

       
62
       
62
       
-
       
+ "syn 2.0.77",

     

       
63
       
63
       
-
       
 ]

     

       
64
       
64
       
-
       
 

     

       
65
       
65
       
-
       
 [[package]]

     

       
66
       
66
       
-
       
@@ -1259,7 +1268,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"

     

       
67
       
67
       
-
       
 dependencies = [

     

       
68
       
68
       
-
       
  "proc-macro2",

     

       
69
       
69
       
-
       
  "quote",

     

       
70
       
70
       
-
       
- "syn 2.0.16",

     

       
71
       
71
       
-
       
+ "syn 2.0.77",

     

       
72
       
72
       
-
       
 ]

     

       
73
       
73
       
-
       
 

     

       
74
       
74
       
-
       
 [[package]]

     

       
75
       
75
       
-
       
@@ -2002,6 +2011,12 @@ dependencies = [

     

       
76
       
76
       
-
       
  "winapi",

     

       
77
       
77
       
-
       
 ]

     

       
78
       
78
       
-
       
 

     

       
79
       
79
       
-
       
+[[package]]

     

       
80
       
80
       
-
       
+name = "num-conv"

     

       
81
       
81
       
-
       
+version = "0.1.0"

     

       
82
       
82
       
-
       
+source = "registry+https://github.com/rust-lang/crates.io-index"

     

       
83
       
83
       
-
       
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"

     

       
84
       
84
       
-
       
+

     

       
85
       
85
       
-
       
 [[package]]

     

       
86
       
86
       
-
       
 name = "num-integer"

     

       
87
       
87
       
-
       
 version = "0.1.45"

     

       
88
       
88
       
-
       
@@ -2156,7 +2171,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"

     

       
89
       
89
       
-
       
 dependencies = [

     

       
90
       
90
       
-
       
  "proc-macro2",

     

       
91
       
91
       
-
       
  "quote",

     

       
92
       
92
       
-
       
- "syn 2.0.16",

     

       
93
       
93
       
-
       
+ "syn 2.0.77",

     

       
94
       
94
       
-
       
 ]

     

       
95
       
95
       
-
       
 

     

       
96
       
96
       
-
       
 [[package]]

     

       
97
       
97
       
-
       
@@ -2308,7 +2323,7 @@ dependencies = [

     

       
98
       
98
       
-
       
  "pest_meta",

     

       
99
       
99
       
-
       
  "proc-macro2",

     

       
100
       
100
       
-
       
  "quote",

     

       
101
       
101
       
-
       
- "syn 2.0.16",

     

       
102
       
102
       
-
       
+ "syn 2.0.77",

     

       
103
       
103
       
-
       
 ]

     

       
104
       
104
       
-
       
 

     

       
105
       
105
       
-
       
 [[package]]

     

       
106
       
106
       
-
       
@@ -2339,7 +2354,7 @@ checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07"

     

       
107
       
107
       
-
       
 dependencies = [

     

       
108
       
108
       
-
       
  "proc-macro2",

     

       
109
       
109
       
-
       
  "quote",

     

       
110
       
110
       
-
       
- "syn 2.0.16",

     

       
111
       
111
       
-
       
+ "syn 2.0.77",

     

       
112
       
112
       
-
       
 ]

     

       
113
       
113
       
-
       
 

     

       
114
       
114
       
-
       
 [[package]]

     

       
115
       
115
       
-
       
@@ -2389,6 +2404,12 @@ dependencies = [

     

       
116
       
116
       
-
       
  "windows-sys 0.48.0",

     

       
117
       
117
       
-
       
 ]

     

       
118
       
118
       
-
       
 

     

       
119
       
119
       
-
       
+[[package]]

     

       
120
       
120
       
-
       
+name = "powerfmt"

     

       
121
       
121
       
-
       
+version = "0.2.0"

     

       
122
       
122
       
-
       
+source = "registry+https://github.com/rust-lang/crates.io-index"

     

       
123
       
123
       
-
       
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"

     

       
124
       
124
       
-
       
+

     

       
125
       
125
       
-
       
 [[package]]

     

       
126
       
126
       
-
       
 name = "ppv-lite86"

     

       
127
       
127
       
-
       
 version = "0.2.17"

     

       
128
       
128
       
-
       
@@ -2407,9 +2428,9 @@ dependencies = [

     

       
129
       
129
       
-
       
 

     

       
130
       
130
       
-
       
 [[package]]

     

       
131
       
131
       
-
       
 name = "proc-macro2"

     

       
132
       
132
       
-
       
-version = "1.0.57"

     

       
133
       
133
       
-
       
+version = "1.0.86"

     

       
134
       
134
       
-
       
 source = "registry+https://github.com/rust-lang/crates.io-index"

     

       
135
       
135
       
-
       
-checksum = "c4ec6d5fe0b140acb27c9a0444118cf55bfbb4e0b259739429abb4521dd67c16"

     

       
136
       
136
       
-
       
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"

     

       
137
       
137
       
-
       
 dependencies = [

     

       
138
       
138
       
-
       
  "unicode-ident",

     

       
139
       
139
       
-
       
 ]

     

       
140
       
140
       
-
       
@@ -2425,9 +2446,9 @@ dependencies = [

     

       
141
       
141
       
-
       
 

     

       
142
       
142
       
-
       
 [[package]]

     

       
143
       
143
       
-
       
 name = "quote"

     

       
144
       
144
       
-
       
-version = "1.0.27"

     

       
145
       
145
       
-
       
+version = "1.0.37"

     

       
146
       
146
       
-
       
 source = "registry+https://github.com/rust-lang/crates.io-index"

     

       
147
       
147
       
-
       
-checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500"

     

       
148
       
148
       
-
       
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"

     

       
149
       
149
       
-
       
 dependencies = [

     

       
150
       
150
       
-
       
  "proc-macro2",

     

       
151
       
151
       
-
       
 ]

     

       
152
       
152
       
-
       
@@ -2711,22 +2732,22 @@ dependencies = [

     

       
153
       
153
       
-
       
 

     

       
154
       
154
       
-
       
 [[package]]

     

       
155
       
155
       
-
       
 name = "serde"

     

       
156
       
156
       
-
       
-version = "1.0.163"

     

       
157
       
157
       
-
       
+version = "1.0.210"

     

       
158
       
158
       
-
       
 source = "registry+https://github.com/rust-lang/crates.io-index"

     

       
159
       
159
       
-
       
-checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"

     

       
160
       
160
       
-
       
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"

     

       
161
       
161
       
-
       
 dependencies = [

     

       
162
       
162
       
-
       
  "serde_derive",

     

       
163
       
163
       
-
       
 ]

     

       
164
       
164
       
-
       
 

     

       
165
       
165
       
-
       
 [[package]]

     

       
166
       
166
       
-
       
 name = "serde_derive"

     

       
167
       
167
       
-
       
-version = "1.0.163"

     

       
168
       
168
       
-
       
+version = "1.0.210"

     

       
169
       
169
       
-
       
 source = "registry+https://github.com/rust-lang/crates.io-index"

     

       
170
       
170
       
-
       
-checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"

     

       
171
       
171
       
-
       
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"

     

       
172
       
172
       
-
       
 dependencies = [

     

       
173
       
173
       
-
       
  "proc-macro2",

     

       
174
       
174
       
-
       
  "quote",

     

       
175
       
175
       
-
       
- "syn 2.0.16",

     

       
176
       
176
       
-
       
+ "syn 2.0.77",

     

       
177
       
177
       
-
       
 ]

     

       
178
       
178
       
-
       
 

     

       
179
       
179
       
-
       
 [[package]]

     

       
180
       
180
       
-
       
@@ -2748,7 +2769,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"

     

       
181
       
181
       
-
       
 dependencies = [

     

       
182
       
182
       
-
       
  "proc-macro2",

     

       
183
       
183
       
-
       
  "quote",

     

       
184
       
184
       
-
       
- "syn 2.0.16",

     

       
185
       
185
       
-
       
+ "syn 2.0.77",

     

       
186
       
186
       
-
       
 ]

     

       
187
       
187
       
-
       
 

     

       
188
       
188
       
-
       
 [[package]]

     

       
189
       
189
       
-
       
@@ -2981,9 +3002,9 @@ dependencies = [

     

       
190
       
190
       
-
       
 

     

       
191
       
191
       
-
       
 [[package]]

     

       
192
       
192
       
-
       
 name = "syn"

     

       
193
       
193
       
-
       
-version = "2.0.16"

     

       
194
       
194
       
-
       
+version = "2.0.77"

     

       
195
       
195
       
-
       
 source = "registry+https://github.com/rust-lang/crates.io-index"

     

       
196
       
196
       
-
       
-checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01"

     

       
197
       
197
       
-
       
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"

     

       
198
       
198
       
-
       
 dependencies = [

     

       
199
       
199
       
-
       
  "proc-macro2",

     

       
200
       
200
       
-
       
  "quote",

     

       
201
       
201
       
-
       
@@ -3035,7 +3056,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"

     

       
202
       
202
       
-
       
 dependencies = [

     

       
203
       
203
       
-
       
  "proc-macro2",

     

       
204
       
204
       
-
       
  "quote",

     

       
205
       
205
       
-
       
- "syn 2.0.16",

     

       
206
       
206
       
-
       
+ "syn 2.0.77",

     

       
207
       
207
       
-
       
 ]

     

       
208
       
208
       
-
       
 

     

       
209
       
209
       
-
       
 [[package]]

     

       
210
       
210
       
-
       
@@ -3061,11 +3082,14 @@ dependencies = [

     

       
211
       
211
       
-
       
 

     

       
212
       
212
       
-
       
 [[package]]

     

       
213
       
213
       
-
       
 name = "time"

     

       
214
       
214
       
-
       
-version = "0.3.21"

     

       
215
       
215
       
-
       
+version = "0.3.36"

     

       
216
       
216
       
-
       
 source = "registry+https://github.com/rust-lang/crates.io-index"

     

       
217
       
217
       
-
       
-checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc"

     

       
218
       
218
       
-
       
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"

     

       
219
       
219
       
-
       
 dependencies = [

     

       
220
       
220
       
-
       
+ "deranged",

     

       
221
       
221
       
-
       
  "itoa",

     

       
222
       
222
       
-
       
+ "num-conv",

     

       
223
       
223
       
-
       
+ "powerfmt",

     

       
224
       
224
       
-
       
  "serde",

     

       
225
       
225
       
-
       
  "time-core",

     

       
226
       
226
       
-
       
  "time-macros",

     

       
227
       
227
       
-
       
@@ -3073,16 +3097,17 @@ dependencies = [

     

       
228
       
228
       
-
       
 

     

       
229
       
229
       
-
       
 [[package]]

     

       
230
       
230
       
-
       
 name = "time-core"

     

       
231
       
231
       
-
       
-version = "0.1.1"

     

       
232
       
232
       
-
       
+version = "0.1.2"

     

       
233
       
233
       
-
       
 source = "registry+https://github.com/rust-lang/crates.io-index"

     

       
234
       
234
       
-
       
-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"

     

       
235
       
235
       
-
       
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"

     

       
236
       
236
       
-
       
 

     

       
237
       
237
       
-
       
 [[package]]

     

       
238
       
238
       
-
       
 name = "time-macros"

     

       
239
       
239
       
-
       
-version = "0.2.9"

     

       
240
       
240
       
-
       
+version = "0.2.18"

     

       
241
       
241
       
-
       
 source = "registry+https://github.com/rust-lang/crates.io-index"

     

       
242
       
242
       
-
       
-checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b"

     

       
243
       
243
       
-
       
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"

     

       
244
       
244
       
-
       
 dependencies = [

     

       
245
       
245
       
-
       
+ "num-conv",

     

       
246
       
246
       
-
       
  "time-core",

     

       
247
       
247
       
-
       
 ]

     

       
248
       
248
       
-
       
 

     

       
249
       
249
       
-
       
@@ -3153,7 +3178,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"

     

       
250
       
250
       
-
       
 dependencies = [

     

       
251
       
251
       
-
       
  "proc-macro2",

     

       
252
       
252
       
-
       
  "quote",

     

       
253
       
253
       
-
       
- "syn 2.0.16",

     

       
254
       
254
       
-
       
+ "syn 2.0.77",

     

       
255
       
255
       
-
       
 ]

     

       
256
       
256
       
-
       
 

     

       
257
       
257
       
-
       
 [[package]]

     

       
258
       
258
       
-
       
@@ -3260,7 +3285,7 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"

     

       
259
       
259
       
-
       
 dependencies = [

     

       
260
       
260
       
-
       
  "proc-macro2",

     

       
261
       
261
       
-
       
  "quote",

     

       
262
       
262
       
-
       
- "syn 2.0.16",

     

       
263
       
263
       
-
       
+ "syn 2.0.77",

     

       
264
       
264
       
-
       
 ]

     

       
265
       
265
       
-
       
 

     

       
266
       
266
       
-
       
 [[package]]

     

       
267
       
267
       
-
       
@@ -3443,7 +3468,7 @@ dependencies = [

     

       
268
       
268
       
-
       
  "once_cell",

     

       
269
       
269
       
-
       
  "proc-macro2",

     

       
270
       
270
       
-
       
  "quote",

     

       
271
       
271
       
-
       
- "syn 2.0.16",

     

       
272
       
272
       
-
       
+ "syn 2.0.77",

     

       
273
       
273
       
-
       
  "wasm-bindgen-shared",

     

       
274
       
274
       
-
       
 ]

     

       
275
       
275
       
-
       
 

     

       
276
       
276
       
-
       
@@ -3477,7 +3502,7 @@ checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8"

     

       
277
       
277
       
-
       
 dependencies = [

     

       
278
       
278
       
-
       
  "proc-macro2",

     

       
279
       
279
       
-
       
  "quote",

     

       
280
       
280
       
-
       
- "syn 2.0.16",

     

       
281
       
281
       
-
       
+ "syn 2.0.77",

     

       
282
       
282
       
-
       
  "wasm-bindgen-backend",

     

       
283
       
283
       
-
       
  "wasm-bindgen-shared",

     

       
284
       
284
       
-
       
 ]

     

       
285
       
285
       
-
       
-- 

     

       
286
       
286
       
-
       
2.46.0

     

       
287
       
287
       
-