···

       
121
       
121
       
 
       
              "uclibc"

     

       
122
       
122
       
 
       
            else if final.isAndroid then

     

       
123
       
123
       
 
       
              "bionic"

     

       
124
       
124
       
-
       
            else if final.isLLVMLibc then

     

       
125
       
125
       
-
       
              "llvm"

     

       
126
       
124
       
 
       
            else if

     

       
127
       
125
       
 
       
              final.isLinux # default

     

       
128
       
126
       
 
       
            then

     
···

       
248
       
246
       
 
       
          # don't support dynamic linking, but don't get the `staticMarker`.

     

       
249
       
247
       
 
       
          # `pkgsStatic` sets `isStatic=true`, so `pkgsStatic.hostPlatform` always

     

       
250
       
248
       
 
       
          # has the `staticMarker`.

     

       
251
       
251
       
-
       
          isStatic = final.isWasi || final.isRedox || final.isLLVMLibc;

     

       
249
       
249
       
+
       
          isStatic = final.isWasi || final.isRedox;

     

       
252
       
250
       
 
       


     

       
253
       
251
       
 
       
          # Just a guess, based on `system`

     

       
254
       
252
       
 
       
          inherit

     

···

       
386
       
386
       
 
       
        uclibceabi

     

       
387
       
387
       
 
       
        uclibceabihf

     

       
388
       
388
       
 
       
      ];

     

       
389
       
389
       
-
       
    isLLVMLibc = [ { abi = abis.llvm; } ];

     

       
390
       
389
       
 
       


     

       
391
       
390
       
 
       
    isEfi = [

     

       
392
       
391
       
 
       
      {

     

···

       
740
       
740
       
 
       
    };

     

       
741
       
741
       
 
       
    uclibc = { };

     

       
742
       
742
       
 
       


     

       
743
       
743
       
-
       
    # LLVM libc

     

       
744
       
744
       
-
       
    llvm = { };

     

       
745
       
745
       
-
       


     

       
746
       
743
       
 
       
    unknown = { };

     

       
747
       
744
       
 
       
  };

     

       
748
       
745
       
 
       


     

···

       
8
       
8
       
 
       
}:

     

       
9
       
9
       
 
       


     

       
10
       
10
       
 
       
{

     

       
11
       
11
       
-
       
  imports = [ ../../../modules/virtualisation/cloudstack-config.nix ];

     

       
11
       
11
       
+
       
  imports = [

     

       
12
       
12
       
+
       


     

       
13
       
13
       
+
       
    ../../../modules/virtualisation/cloudstack-config.nix

     

       
14
       
14
       
+
       
    ../../../modules/image/file-options.nix

     

       
15
       
15
       
+
       
  ];

     

       
12
       
16
       
 
       


     

       
17
       
17
       
+
       
  system.nixos.tags = [ "cloudstack" ];

     

       
18
       
18
       
+
       
  image.extension = "qcow2";

     

       
19
       
19
       
+
       
  system.build.image = config.system.build.cloudstackImage;

     

       
13
       
20
       
 
       
  system.build.cloudstackImage = import ../../../lib/make-disk-image.nix {

     

       
14
       
21
       
 
       
    inherit lib config pkgs;

     

       
22
       
22
       
+
       
    inherit (config.virtualisation) diskSize;

     

       
23
       
23
       
+
       
    baseName = config.image.baseName;

     

       
15
       
24
       
 
       
    format = "qcow2";

     

       
16
       
25
       
 
       
    configFile = pkgs.writeText "configuration.nix" ''

     

       
17
       
26
       
 
       
      {

     

···

       
11
       
11
       
 
       
  imageModules = {

     

       
12
       
12
       
 
       
    amazon = ../../maintainers/scripts/ec2/amazon-image.nix;

     

       
13
       
13
       
 
       
    azure = ../virtualisation/azure-image.nix;

     

       
14
       
14
       
+
       
    cloudstack = ../../maintainers/scripts/cloudstack/cloudstack-image.nix;

     

       
14
       
15
       
 
       
    digital-ocean = ../virtualisation/digital-ocean-image.nix;

     

       
15
       
16
       
 
       
    google-compute = ../virtualisation/google-compute-image.nix;

     

       
16
       
17
       
 
       
    hyperv = ../virtualisation/hyperv-image.nix;

     

···

       
185
       
185
       
 
       
  config = {

     

       
186
       
186
       
 
       
    hardware.enableAllHardware = true;

     

       
187
       
187
       
 
       


     

       
188
       
188
       
-
       
    fileSystems = {

     

       
188
       
188
       
+
       
    fileSystems = lib.mkImageMediaOverride {

     

       
189
       
189
       
 
       
      "/boot/firmware" = {

     

       
190
       
190
       
 
       
        device = "/dev/disk/by-label/${config.sdImage.firmwarePartitionName}";

     

       
191
       
191
       
 
       
        fsType = "vfat";

     

···

       
286
       
286
       
 
       
      in

     

       
287
       
287
       
 
       
      {

     

       
288
       
288
       
 
       
        sudo = {

     

       
289
       
289
       
-
       
          source = "${cfg.package.out}/bin/sudo";

     

       
289
       
289
       
+
       
          source = "${lib.getExe cfg.package}";

     

       
290
       
290
       
 
       
          inherit

     

       
291
       
291
       
 
       
            owner

     

       
292
       
292
       
 
       
            group

     

···

       
113
       
113
       
 
       
      '';

     

       
114
       
114
       
 
       
    };

     

       
115
       
115
       
 
       


     

       
116
       
116
       
-
       
    fileSystems = {

     

       
116
       
116
       
+
       
    fileSystems = lib.mkImageMediaOverride {

     

       
117
       
117
       
 
       
      "/" = {

     

       
118
       
118
       
 
       
        device = "/dev/disk/by-label/${cfg.label}";

     

       
119
       
119
       
 
       
        inherit (cfg) label;

     

···

       
8
       
8
       
 
       
  ];

     

       
9
       
9
       
 
       


     

       
10
       
10
       
 
       
  config = {

     

       
11
       
11
       
-
       
    fileSystems."/" = {

     

       
11
       
11
       
+
       
    fileSystems."/" = lib.mkImageMediaOverride {

     

       
12
       
12
       
 
       
      device = "/dev/disk/by-label/nixos";

     

       
13
       
13
       
 
       
      autoResize = true;

     

       
14
       
14
       
+
       
      fsType = "ext4";

     

       
14
       
15
       
 
       
    };

     

       
15
       
16
       
 
       


     

       
16
       
17
       
 
       
    boot.growPartition = true;

     

···

       
39
       
39
       
 
       
    in

     

       
40
       
40
       
 
       
    mkMerge [

     

       
41
       
41
       
 
       
      {

     

       
42
       
42
       
-
       
        fileSystems."/" = lib.mkDefault {

     

       
42
       
42
       
+
       
        fileSystems."/" = lib.mkImageMediaOverride {

     

       
43
       
43
       
 
       
          device = "/dev/disk/by-label/nixos";

     

       
44
       
44
       
 
       
          autoResize = true;

     

       
45
       
45
       
 
       
          fsType = "ext4";

     

···

       
37
       
37
       
 
       
    boot.loader.systemd-boot.enable = lib.mkDefault cfg.efiSupport;

     

       
38
       
38
       
 
       
    boot.growPartition = lib.mkDefault true;

     

       
39
       
39
       
 
       


     

       
40
       
40
       
-
       
    fileSystems = {

     

       
40
       
40
       
+
       
    fileSystems = lib.mkImageMediaOverride {

     

       
41
       
41
       
 
       
      "/" = {

     

       
42
       
42
       
 
       
        device = "/dev/disk/by-label/nixos";

     

       
43
       
43
       
 
       
        autoResize = true;

     

···

       
21
       
21
       
 
       
    ../profiles/qemu-guest.nix

     

       
22
       
22
       
 
       
  ];

     

       
23
       
23
       
 
       


     

       
24
       
24
       
-
       
  fileSystems."/" = {

     

       
24
       
24
       
+
       
  fileSystems."/" = lib.mkImageMediaOverride {

     

       
25
       
25
       
 
       
    fsType = "ext4";

     

       
26
       
26
       
 
       
    device = "/dev/disk/by-label/nixos";

     

       
27
       
27
       
 
       
    autoResize = true;

     

···

       
73
       
73
       
 
       
      inherit config lib pkgs;

     

       
74
       
74
       
 
       
    };

     

       
75
       
75
       
 
       


     

       
76
       
76
       
-
       
    fileSystems."/" = {

     

       
77
       
77
       
-
       
      device = "/dev/disk/by-label/nixos";

     

       
78
       
78
       
-
       
      autoResize = true;

     

       
79
       
79
       
-
       
      fsType = "ext4";

     

       
80
       
80
       
-
       
    };

     

       
76
       
76
       
+
       
    fileSystems = lib.mkImageMediaOverride {

     

       
77
       
77
       
+
       
      "/" = {

     

       
78
       
78
       
+
       
        device = "/dev/disk/by-label/nixos";

     

       
79
       
79
       
+
       
        autoResize = true;

     

       
80
       
80
       
+
       
        fsType = "ext4";

     

       
81
       
81
       
+
       
      };

     

       
81
       
82
       
 
       


     

       
82
       
82
       
-
       
    fileSystems."/boot" = {

     

       
83
       
83
       
-
       
      device = "/dev/disk/by-label/ESP";

     

       
84
       
84
       
-
       
      fsType = "vfat";

     

       
83
       
83
       
+
       
      "/boot" = {

     

       
84
       
84
       
+
       
        device = "/dev/disk/by-label/ESP";

     

       
85
       
85
       
+
       
        fsType = "vfat";

     

       
86
       
86
       
+
       
      };

     

       
85
       
87
       
 
       
    };

     

       
86
       
88
       
 
       


     

       
87
       
89
       
 
       
    boot.growPartition = true;

     

···

       
12
       
12
       
 
       
  ];

     

       
13
       
13
       
 
       


     

       
14
       
14
       
 
       
  config = {

     

       
15
       
15
       
-
       
    fileSystems."/" = {

     

       
15
       
15
       
+
       
    fileSystems."/" = lib.mkImageMediaOverride {

     

       
16
       
16
       
 
       
      device = "/dev/disk/by-label/nixos";

     

       
17
       
17
       
 
       
      fsType = "ext4";

     

       
18
       
18
       
 
       
      autoResize = true;

     

···

       
1
       
1
       
 
       
{

     

       
2
       
2
       
-
       
  config,

     

       
3
       
2
       
 
       
  lib,

     

       
4
       
3
       
 
       
  pkgs,

     

       
5
       
4
       
 
       
  ...

     

       
6
       
5
       
 
       
}:

     

       
7
       
7
       
-
       
with lib;

     

       
8
       
6
       
 
       
{

     

       
9
       
7
       
 
       
  imports = [ ../profiles/qemu-guest.nix ];

     

       
10
       
8
       
 
       


     
···

       
12
       
10
       
 
       
    enable = true;

     

       
13
       
11
       
 
       


     

       
14
       
12
       
 
       
    settings.PermitRootLogin = "prohibit-password";

     

       
15
       
15
       
-
       
    settings.PasswordAuthentication = mkDefault false;

     

       
13
       
13
       
+
       
    settings.PasswordAuthentication = lib.mkDefault false;

     

       
16
       
14
       
 
       
  };

     

       
17
       
15
       
 
       


     

       
18
       
16
       
 
       
  networking = {

     
···

       
34
       
32
       
 
       
    sysstat

     

       
35
       
33
       
 
       
  ];

     

       
36
       
34
       
 
       


     

       
37
       
37
       
-
       
  fileSystems."/" = {

     

       
35
       
35
       
+
       
  fileSystems."/" = lib.mkImageMediaOverride {

     

       
38
       
36
       
 
       
    fsType = "ext4";

     

       
39
       
37
       
 
       
    device = "/dev/sda";

     

       
40
       
38
       
 
       
    autoResize = true;

     

       
41
       
39
       
 
       
  };

     

       
42
       
40
       
 
       


     

       
43
       
43
       
-
       
  swapDevices = mkDefault [ { device = "/dev/sdb"; } ];

     

       
41
       
41
       
+
       
  swapDevices = lib.mkDefault [ { device = "/dev/sdb"; } ];

     

       
44
       
42
       
 
       


     

       
45
       
43
       
 
       
  # Enable LISH and Linode Booting w/ GRUB

     

       
46
       
44
       
 
       
  boot = {

     

···

       
30
       
30
       
 
       


     

       
31
       
31
       
 
       
  boot.growPartition = true;

     

       
32
       
32
       
 
       


     

       
33
       
33
       
-
       
  fileSystems."/" = {

     

       
34
       
34
       
-
       
    device = "/dev/disk/by-label/nixos";

     

       
35
       
35
       
-
       
    fsType = "ext4";

     

       
36
       
36
       
-
       
    autoResize = true;

     

       
37
       
37
       
-
       
  };

     

       
33
       
33
       
+
       
  fileSystems = lib.mkImageMediaOverride {

     

       
34
       
34
       
+
       
    "/" = {

     

       
35
       
35
       
+
       
      device = "/dev/disk/by-label/nixos";

     

       
36
       
36
       
+
       
      fsType = "ext4";

     

       
37
       
37
       
+
       
      autoResize = true;

     

       
38
       
38
       
+
       
    };

     

       
38
       
39
       
 
       


     

       
39
       
39
       
-
       
  fileSystems."/boot" = lib.mkIf cfg.efi {

     

       
40
       
40
       
-
       
    device = "/dev/disk/by-label/ESP";

     

       
41
       
41
       
-
       
    fsType = "vfat";

     

       
40
       
40
       
+
       
    "/boot" = lib.mkIf cfg.efi {

     

       
41
       
41
       
+
       
      device = "/dev/disk/by-label/ESP";

     

       
42
       
42
       
+
       
      fsType = "vfat";

     

       
43
       
43
       
+
       
    };

     

       
42
       
44
       
 
       
  };

     

       
43
       
45
       
 
       


     

       
44
       
46
       
 
       
  boot.loader.efi.canTouchEfiVariables = false;

     

···

       
33
       
33
       
 
       
  ];

     

       
34
       
34
       
 
       


     

       
35
       
35
       
 
       
  config = {

     

       
36
       
36
       
-
       
    fileSystems."/" = mkIf (!cfg.zfs.enable) {

     

       
37
       
37
       
-
       
      device = "/dev/disk/by-label/nixos";

     

       
38
       
38
       
-
       
      fsType = "ext4";

     

       
39
       
39
       
-
       
      autoResize = true;

     

       
40
       
40
       
-
       
    };

     

       
36
       
36
       
+
       
    fileSystems."/" = mkIf (!cfg.zfs.enable) (

     

       
37
       
37
       
+
       
      lib.mkImageMediaOverride {

     

       
38
       
38
       
+
       
        device = "/dev/disk/by-label/nixos";

     

       
39
       
39
       
+
       
        fsType = "ext4";

     

       
40
       
40
       
+
       
        autoResize = true;

     

       
41
       
41
       
+
       
      }

     

       
42
       
42
       
+
       
    );

     

       
41
       
43
       
 
       


     

       
42
       
42
       
-
       
    fileSystems."/boot" = mkIf (cfg.efi || cfg.zfs.enable) {

     

       
43
       
43
       
-
       
      # The ZFS image uses a partition labeled ESP whether or not we're

     

       
44
       
44
       
-
       
      # booting with EFI.

     

       
45
       
45
       
-
       
      device = "/dev/disk/by-label/ESP";

     

       
46
       
46
       
-
       
      fsType = "vfat";

     

       
47
       
47
       
-
       
    };

     

       
44
       
44
       
+
       
    fileSystems."/boot" = mkIf (cfg.efi || cfg.zfs.enable) (

     

       
45
       
45
       
+
       
      lib.mkImageMediaOverride {

     

       
46
       
46
       
+
       
        # The ZFS image uses a partition labeled ESP whether or not we're

     

       
47
       
47
       
+
       
        # booting with EFI.

     

       
48
       
48
       
+
       
        device = "/dev/disk/by-label/ESP";

     

       
49
       
49
       
+
       
        fsType = "vfat";

     

       
50
       
50
       
+
       
      }

     

       
51
       
51
       
+
       
    );

     

       
48
       
52
       
 
       


     

       
49
       
53
       
 
       
    boot.growPartition = true;

     

       
50
       
54
       
 
       
    boot.kernelParams = [ "console=tty1" ];

     

···

       
70
       
70
       
 
       
          _: value: ((value.mount or null) != null)

     

       
71
       
71
       
 
       
        ) config.openstack.zfs.datasets;

     

       
72
       
72
       
 
       
      in

     

       
73
       
73
       
-
       
      lib.mapAttrs' (

     

       
74
       
74
       
-
       
        dataset: opts:

     

       
75
       
75
       
-
       
        lib.nameValuePair opts.mount {

     

       
76
       
76
       
-
       
          device = dataset;

     

       
77
       
77
       
-
       
          fsType = "zfs";

     

       
78
       
78
       
-
       
        }

     

       
79
       
79
       
-
       
      ) mountable;

     

       
73
       
73
       
+
       
      lib.mkImageMediaOverride (

     

       
74
       
74
       
+
       
        lib.mapAttrs' (

     

       
75
       
75
       
+
       
          dataset: opts:

     

       
76
       
76
       
+
       
          lib.nameValuePair opts.mount {

     

       
77
       
77
       
+
       
            device = dataset;

     

       
78
       
78
       
+
       
            fsType = "zfs";

     

       
79
       
79
       
+
       
          }

     

       
80
       
80
       
+
       
        ) mountable

     

       
81
       
81
       
+
       
      );

     

       
80
       
82
       
 
       
  };

     

       
81
       
83
       
 
       
}

     

···

       
306
       
306
       
 
       
          ''

     

       
307
       
307
       
 
       
            ${vma}/bin/vma create "${config.image.baseName}.vma" \

     

       
308
       
308
       
 
       
              -c ${

     

       
309
       
309
       
-
       
                cfgFile "qemu-server.conf" (cfg.qemuConf // cfg.qemuExtraConf)

     

       
309
       
309
       
+
       
                cfgFile "qemu-server.conf" (

     

       
310
       
310
       
+
       
                  (builtins.removeAttrs cfg.qemuConf [ "diskSize" ])

     

       
311
       
311
       
+
       
                  // {

     

       
312
       
312
       
+
       
                    inherit (config.virtualisation) diskSize;

     

       
313
       
313
       
+
       
                  }

     

       
314
       
314
       
+
       
                  // cfg.qemuExtraConf

     

       
315
       
315
       
+
       
                )

     

       
310
       
316
       
 
       
              }/qemu-server.conf drive-virtio0=$diskImage

     

       
311
       
317
       
 
       
            rm $diskImage

     

       
312
       
318
       
 
       
            ${pkgs.zstd}/bin/zstd "${config.image.baseName}.vma"

     
···

       
346
       
352
       
 
       
        ];

     

       
347
       
353
       
 
       
      };

     

       
348
       
354
       
 
       


     

       
349
       
349
       
-
       
      fileSystems."/" = {

     

       
350
       
350
       
-
       
        device = "/dev/disk/by-label/nixos";

     

       
351
       
351
       
-
       
        autoResize = true;

     

       
352
       
352
       
-
       
        fsType = "ext4";

     

       
353
       
353
       
-
       
      };

     

       
354
       
354
       
-
       
      fileSystems."/boot" = lib.mkIf hasBootPartition {

     

       
355
       
355
       
-
       
        device = "/dev/disk/by-label/ESP";

     

       
356
       
356
       
-
       
        fsType = "vfat";

     

       
355
       
355
       
+
       
      fileSystems = lib.mkImageMediaOverride {

     

       
356
       
356
       
+
       
        "/" = {

     

       
357
       
357
       
+
       
          device = "/dev/disk/by-label/nixos";

     

       
358
       
358
       
+
       
          autoResize = true;

     

       
359
       
359
       
+
       
          fsType = "ext4";

     

       
360
       
360
       
+
       
        };

     

       
361
       
361
       
+
       
        "/boot" = lib.mkIf hasBootPartition {

     

       
362
       
362
       
+
       
          device = "/dev/disk/by-label/ESP";

     

       
363
       
363
       
+
       
          fsType = "vfat";

     

       
364
       
364
       
+
       
        };

     

       
357
       
365
       
 
       
      };

     

       
358
       
366
       
 
       


     

       
359
       
367
       
 
       
      networking = mkIf cfg.cloudInit.enable {

     

···

       
275
       
275
       
 
       
    };

     

       
276
       
276
       
 
       


     

       
277
       
277
       
 
       
    fileSystems =

     

       
278
       
278
       
-
       
      {

     

       
278
       
278
       
+
       
      lib.mkImageMediaOverride {

     

       
279
       
279
       
 
       
        "/" = {

     

       
280
       
280
       
 
       
          device = "/dev/disk/by-label/nixos";

     

       
281
       
281
       
 
       
          autoResize = true;

     

···

       
83
       
83
       
 
       
      inherit config lib pkgs;

     

       
84
       
84
       
 
       
    };

     

       
85
       
85
       
 
       


     

       
86
       
86
       
-
       
    fileSystems."/" = {

     

       
87
       
87
       
-
       
      device = "/dev/disk/by-label/nixos";

     

       
88
       
88
       
-
       
      autoResize = true;

     

       
89
       
89
       
-
       
      fsType = "ext4";

     

       
90
       
90
       
-
       
    };

     

       
86
       
86
       
+
       
    fileSystems = lib.mkImageMediaOverride {

     

       
87
       
87
       
+
       
      "/" = {

     

       
88
       
88
       
+
       
        device = "/dev/disk/by-label/nixos";

     

       
89
       
89
       
+
       
        autoResize = true;

     

       
90
       
90
       
+
       
        fsType = "ext4";

     

       
91
       
91
       
+
       
      };

     

       
91
       
92
       
 
       


     

       
92
       
92
       
-
       
    fileSystems."/boot" = {

     

       
93
       
93
       
-
       
      device = "/dev/disk/by-label/ESP";

     

       
94
       
94
       
-
       
      fsType = "vfat";

     

       
93
       
93
       
+
       
      "/boot" = {

     

       
94
       
94
       
+
       
        device = "/dev/disk/by-label/ESP";

     

       
95
       
95
       
+
       
        fsType = "vfat";

     

       
96
       
96
       
+
       
      };

     

       
95
       
97
       
 
       
    };

     

       
96
       
98
       
 
       


     

       
97
       
99
       
 
       
    boot.growPartition = true;

     

···

       
32
       
32
       
 
       
  taglib,

     

       
33
       
33
       
 
       
  util-linux,

     

       
34
       
34
       
 
       
  wrapQtAppsHook,

     

       
35
       
35
       
+
       
  sparsehash,

     

       
36
       
36
       
+
       
  rapidjson,

     

       
35
       
37
       
 
       
}:

     

       
36
       
38
       
 
       


     

       
37
       
39
       
 
       
let

     
···

       
40
       
42
       
 
       
in

     

       
41
       
43
       
 
       
stdenv.mkDerivation rec {

     

       
42
       
44
       
 
       
  pname = "strawberry";

     

       
43
       
43
       
-
       
  version = "1.2.7";

     

       
45
       
45
       
+
       
  version = "1.2.10";

     

       
44
       
46
       
 
       


     

       
45
       
47
       
 
       
  src = fetchFromGitHub {

     

       
46
       
48
       
 
       
    owner = "jonaski";

     

       
47
       
49
       
 
       
    repo = pname;

     

       
48
       
50
       
 
       
    rev = version;

     

       
49
       
49
       
-
       
    hash = "sha256-EJE6GDyXYMjJUQeTRgmjd0HX3hf4ajSRGsv/2s2oItc=";

     

       
51
       
51
       
+
       
    hash = "sha256-ByZHyHkMlU571QSu1bbYZC7aEX4Jc8N3j05WbXRQaBY=";

     

       
50
       
52
       
 
       
  };

     

       
51
       
53
       
 
       


     

       
52
       
54
       
 
       
  # the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead

     
···

       
73
       
75
       
 
       
      qtbase

     

       
74
       
76
       
 
       
      sqlite

     

       
75
       
77
       
 
       
      taglib

     

       
78
       
78
       
+
       
      sparsehash

     

       
79
       
79
       
+
       
      rapidjson

     

       
76
       
80
       
 
       
    ]

     

       
77
       
81
       
 
       
    ++ optionals stdenv.hostPlatform.isLinux [

     

       
78
       
82
       
 
       
      libgpod

     

···

       
1
       
1
       
+
       
{

     

       
2
       
2
       
+
       
  lib,

     

       
3
       
3
       
+
       
  stdenv,

     

       
4
       
4
       
+
       
  fetchFromGitLab,

     

       
5
       
5
       
+
       
  meson,

     

       
6
       
6
       
+
       
  ninja,

     

       
7
       
7
       
+
       
  pkg-config,

     

       
8
       
8
       
+
       
  kdePackages,

     

       
9
       
9
       
+
       
  qt6,

     

       
10
       
10
       
+
       
  dfl-ipc,

     

       
11
       
11
       
+
       
  dfl-utils,

     

       
12
       
12
       
+
       
  dfl-applications,

     

       
13
       
13
       
+
       
  dfl-login1,

     

       
14
       
14
       
+
       
  mpvSupport ? true,

     

       
15
       
15
       
+
       
  mpv,

     

       
16
       
16
       
+
       
}:

     

       
17
       
17
       
+
       


     

       
18
       
18
       
+
       
stdenv.mkDerivation (finalAttrs: {

     

       
19
       
19
       
+
       
  pname = "qtgreet";

     

       
20
       
20
       
+
       
  version = "2.0.3.95";

     

       
21
       
21
       
+
       


     

       
22
       
22
       
+
       
  src = fetchFromGitLab {

     

       
23
       
23
       
+
       
    owner = "marcusbritanicus";

     

       
24
       
24
       
+
       
    repo = "QtGreet";

     

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

     

       
26
       
26
       
+
       
    hash = "sha256-5csKvBiffW+yHuNyFqxOE5bcsTWlyoLwFxuPH0WlFAE=";

     

       
27
       
27
       
+
       
  };

     

       
28
       
28
       
+
       


     

       
29
       
29
       
+
       
  nativeBuildInputs = [

     

       
30
       
30
       
+
       
    meson

     

       
31
       
31
       
+
       
    ninja

     

       
32
       
32
       
+
       
    pkg-config

     

       
33
       
33
       
+
       
    qt6.wrapQtAppsHook

     

       
34
       
34
       
+
       
  ];

     

       
35
       
35
       
+
       


     

       
36
       
36
       
+
       
  buildInputs = [

     

       
37
       
37
       
+
       
    kdePackages.wayqt

     

       
38
       
38
       
+
       
    qt6.qtbase

     

       
39
       
39
       
+
       
    dfl-ipc

     

       
40
       
40
       
+
       
    dfl-utils

     

       
41
       
41
       
+
       
    dfl-applications

     

       
42
       
42
       
+
       
    dfl-login1

     

       
43
       
43
       
+
       
  ] ++ lib.optionals mpvSupport [ mpv ];

     

       
44
       
44
       
+
       


     

       
45
       
45
       
+
       
  mesonFlags = [

     

       
46
       
46
       
+
       
    (lib.mesonOption "dynpath" "${placeholder "out"}/var/lib/qtgreet")

     

       
47
       
47
       
+
       
  ];

     

       
48
       
48
       
+
       


     

       
49
       
49
       
+
       
  meta = {

     

       
50
       
50
       
+
       
    description = "Qt based greeter for greetd, to be run under wayfire or similar wlr-based compositors";

     

       
51
       
51
       
+
       
    homepage = "https://gitlab.com/marcusbritanicus/QtGreet";

     

       
52
       
52
       
+
       
    changelog = "https://gitlab.com/marcusbritanicus/QtGreet/-/blob/${finalAttrs.src.rev}/Changelog";

     

       
53
       
53
       
+
       
    license = lib.licenses.gpl3Only;

     

       
54
       
54
       
+
       
    maintainers = with lib.maintainers; [ arthsmn ];

     

       
55
       
55
       
+
       
    mainProgram = "qtgreet";

     

       
56
       
56
       
+
       
    platforms = lib.platforms.linux;

     

       
57
       
57
       
+
       
  };

     

       
58
       
58
       
+
       
})

     

···

       
6
       
6
       
 
       
}:

     

       
7
       
7
       
 
       
vimUtils.buildVimPlugin {

     

       
8
       
8
       
 
       
  pname = "sonarlint.nvim";

     

       
9
       
9
       
-
       
  version = "0-unstable-2025-04-18";

     

       
9
       
9
       
+
       
  version = "0-unstable-2025-04-24";

     

       
10
       
10
       
 
       


     

       
11
       
11
       
 
       
  src = fetchFromGitLab {

     

       
12
       
12
       
 
       
    owner = "schrieveslaach";

     

       
13
       
13
       
 
       
    repo = "sonarlint.nvim";

     

       
14
       
14
       
-
       
    rev = "0b78f1db800f9ba76f81de773ba09ce2222bdcc2";

     

       
15
       
15
       
-
       
    hash = "sha256-EUwuIFFe4tmw8u6RqEvOLL0Yi8J5cLBQx7ICxnmkT4k=";

     

       
14
       
14
       
+
       
    rev = "89d3d3b0dd239dbbdf4c1d728e41759d5378f049";

     

       
15
       
15
       
+
       
    hash = "sha256-EOAdSvugcDEDuBuFv/HL35HXWvB/V97UtOJqdRuU7ak=";

     

       
16
       
16
       
 
       
  };

     

       
17
       
17
       
 
       


     

       
18
       
18
       
 
       
  passthru.updateScript = nix-update-script {

     

···

       
6
       
6
       
 
       
}:

     

       
7
       
7
       
 
       
mkLibretroCore {

     

       
8
       
8
       
 
       
  core = "vice-${type}";

     

       
9
       
9
       
-
       
  version = "0-unstable-2025-03-28";

     

       
9
       
9
       
+
       
  version = "0-unstable-2025-04-22";

     

       
10
       
10
       
 
       


     

       
11
       
11
       
 
       
  src = fetchFromGitHub {

     

       
12
       
12
       
 
       
    owner = "libretro";

     

       
13
       
13
       
 
       
    repo = "vice-libretro";

     

       
14
       
14
       
-
       
    rev = "9b201cdd612bfb12c8d86696656b79eaf25924ab";

     

       
15
       
15
       
-
       
    hash = "sha256-YilHxQLZC8MVnZ9EekCqtU8rgOB/0FH2vKFdn6l3i5Q=";

     

       
14
       
14
       
+
       
    rev = "e5b036f0be19f7a70fde75cc0e8b1b43476adc13";

     

       
15
       
15
       
+
       
    hash = "sha256-GzvsXPZcBfGvA0g7zLR3R7w5CEIw2slL3EyQdcDjqCc=";

     

       
16
       
16
       
 
       
  };

     

       
17
       
17
       
 
       


     

       
18
       
18
       
 
       
  makefile = "Makefile";

     

···

       
398
       
398
       
 
       
    ]

     

       
399
       
399
       
 
       
    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ]

     

       
400
       
400
       
 
       
    ++ lib.optionals stdenv.hostPlatform.isDarwin [ rsync ]

     

       
401
       
401
       
+
       
    ++ lib.optionals stdenv.hostPlatform.isx86 [ nasm ]

     

       
401
       
402
       
 
       
    ++ lib.optionals crashreporterSupport [

     

       
402
       
403
       
 
       
      dump_syms

     

       
403
       
404
       
 
       
      patchelf

     
···

       
573
       
574
       
 
       
      libGL

     

       
574
       
575
       
 
       
      libGLU

     

       
575
       
576
       
 
       
      libstartup_notification

     

       
576
       
576
       
-
       
      nasm

     

       
577
       
577
       
 
       
      perl

     

       
578
       
578
       
 
       
      zip

     

       
579
       
579
       
 
       
    ]

     

···

       
22
       
22
       
 
       


     

       
23
       
23
       
 
       
buildPythonApplication rec {

     

       
24
       
24
       
 
       
  pname = "protonvpn-gui";

     

       
25
       
25
       
-
       
  version = "4.9.5";

     

       
25
       
25
       
+
       
  version = "4.9.6";

     

       
26
       
26
       
 
       
  pyproject = true;

     

       
27
       
27
       
 
       


     

       
28
       
28
       
 
       
  src = fetchFromGitHub {

     

       
29
       
29
       
 
       
    owner = "ProtonVPN";

     

       
30
       
30
       
 
       
    repo = "proton-vpn-gtk-app";

     

       
31
       
31
       
-
       
    tag = "v${version}";

     

       
32
       
32
       
-
       
    hash = "sha256-mXRTXr7u049pgPRK5gwaGfQUmUl4vlKca4lRH06HZj8=";

     

       
31
       
31
       
+
       
    tag = "${version}";

     

       
32
       
32
       
+
       
    hash = "sha256-Undf3qSClcRa1e9f6B/1hLPIjc2KPG745AXxYHQA0nE=";

     

       
33
       
33
       
 
       
  };

     

       
34
       
34
       
 
       


     

       
35
       
35
       
 
       
  nativeBuildInputs = [

     

···

       
1
       
1
       
 
       
# Generated by ./update.sh - do not update manually!

     

       
2
       
2
       
 
       
{

     

       
3
       
3
       
-
       
  version = "1.16.3-3";

     

       
4
       
4
       
-
       
  arm64-hash = "sha256-tZlTNK3kBvIjYARQO7YSj/dbQ0iCuPeWM7+XYFYg8/M=";

     

       
5
       
5
       
-
       
  x86_64-hash = "sha256-o3QP3gfotqRisN6tCch6JFlf8jNVbv6XB8xAnQpYQqA=";

     

       
3
       
3
       
+
       
  version = "1.16.4-1";

     

       
4
       
4
       
+
       
  arm64-hash = "sha256-x+sVupWT8CrEPSTOJFW1DYuc3tuVepHXjRF7+8NdTbw=";

     

       
5
       
5
       
+
       
  x86_64-hash = "sha256-zMw8NfeLNMBbJZqoZeNy9j65otJ8iWnq79PLqzlR+6I=";

     

       
6
       
6
       
 
       
}

     

···

       
1
       
1
       
+
       
{

     

       
2
       
2
       
+
       
  lib,

     

       
3
       
3
       
+
       
  stdenv,

     

       
4
       
4
       
+
       
  fetchFromGitLab,

     

       
5
       
5
       
+
       
  meson,

     

       
6
       
6
       
+
       
  ninja,

     

       
7
       
7
       
+
       
  pkg-config,

     

       
8
       
8
       
+
       
  qt6,

     

       
9
       
9
       
+
       
  dfl-ipc,

     

       
10
       
10
       
+
       
}:

     

       
11
       
11
       
+
       


     

       
12
       
12
       
+
       
stdenv.mkDerivation (finalAttrs: {

     

       
13
       
13
       
+
       
  pname = "dfl-applications";

     

       
14
       
14
       
+
       
  version = "0.3.0";

     

       
15
       
15
       
+
       


     

       
16
       
16
       
+
       
  src = fetchFromGitLab {

     

       
17
       
17
       
+
       
    owner = "desktop-frameworks";

     

       
18
       
18
       
+
       
    repo = "applications";

     

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

     

       
20
       
20
       
+
       
    hash = "sha256-VDkJkrkhjWi61YD7qNQSF9/ctXtvVf+nh/zUVxAAE4Q=";

     

       
21
       
21
       
+
       
  };

     

       
22
       
22
       
+
       


     

       
23
       
23
       
+
       
  nativeBuildInputs = [

     

       
24
       
24
       
+
       
    meson

     

       
25
       
25
       
+
       
    ninja

     

       
26
       
26
       
+
       
    pkg-config

     

       
27
       
27
       
+
       
  ];

     

       
28
       
28
       
+
       


     

       
29
       
29
       
+
       
  buildInputs = [

     

       
30
       
30
       
+
       
    qt6.qtbase

     

       
31
       
31
       
+
       
    dfl-ipc

     

       
32
       
32
       
+
       
  ];

     

       
33
       
33
       
+
       


     

       
34
       
34
       
+
       
  dontWrapQtApps = true;

     

       
35
       
35
       
+
       


     

       
36
       
36
       
+
       
  outputs = [

     

       
37
       
37
       
+
       
    "out"

     

       
38
       
38
       
+
       
    "dev"

     

       
39
       
39
       
+
       
  ];

     

       
40
       
40
       
+
       


     

       
41
       
41
       
+
       
  meta = {

     

       
42
       
42
       
+
       
    description = "Library provides a thin wrapper around QApplication, QGuiApplication and QCoreApplication";

     

       
43
       
43
       
+
       
    homepage = "https://gitlab.com/desktop-frameworks/applications";

     

       
44
       
44
       
+
       
    changelog = "https://gitlab.com/desktop-frameworks/applications/-/blob/${finalAttrs.src.rev}/ChangeLog";

     

       
45
       
45
       
+
       
    license = lib.licenses.gpl3Only;

     

       
46
       
46
       
+
       
    maintainers = with lib.maintainers; [ arthsmn ];

     

       
47
       
47
       
+
       
    platforms = lib.platforms.linux;

     

       
48
       
48
       
+
       
  };

     

       
49
       
49
       
+
       
})

     

···

       
1
       
1
       
+
       
{

     

       
2
       
2
       
+
       
  lib,

     

       
3
       
3
       
+
       
  stdenv,

     

       
4
       
4
       
+
       
  fetchFromGitLab,

     

       
5
       
5
       
+
       
  meson,

     

       
6
       
6
       
+
       
  ninja,

     

       
7
       
7
       
+
       
  qt6,

     

       
8
       
8
       
+
       
}:

     

       
9
       
9
       
+
       


     

       
10
       
10
       
+
       
stdenv.mkDerivation (finalAttrs: {

     

       
11
       
11
       
+
       
  pname = "dfl-ipc";

     

       
12
       
12
       
+
       
  version = "0.3.0";

     

       
13
       
13
       
+
       


     

       
14
       
14
       
+
       
  src = fetchFromGitLab {

     

       
15
       
15
       
+
       
    owner = "desktop-frameworks";

     

       
16
       
16
       
+
       
    repo = "ipc";

     

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

     

       
18
       
18
       
+
       
    hash = "sha256-GjQg7Fq7fWal1vh/jR5qqm+qs+D/McCoQfktOvO86eA=";

     

       
19
       
19
       
+
       
  };

     

       
20
       
20
       
+
       


     

       
21
       
21
       
+
       
  nativeBuildInputs = [

     

       
22
       
22
       
+
       
    meson

     

       
23
       
23
       
+
       
    ninja

     

       
24
       
24
       
+
       
  ];

     

       
25
       
25
       
+
       


     

       
26
       
26
       
+
       
  buildInputs = [

     

       
27
       
27
       
+
       
    qt6.qtbase

     

       
28
       
28
       
+
       
  ];

     

       
29
       
29
       
+
       


     

       
30
       
30
       
+
       
  dontWrapQtApps = true;

     

       
31
       
31
       
+
       


     

       
32
       
32
       
+
       
  outputs = [

     

       
33
       
33
       
+
       
    "out"

     

       
34
       
34
       
+
       
    "dev"

     

       
35
       
35
       
+
       
  ];

     

       
36
       
36
       
+
       


     

       
37
       
37
       
+
       
  meta = {

     

       
38
       
38
       
+
       
    description = "A very simple set of IPC classes for inter-process communication";

     

       
39
       
39
       
+
       
    homepage = "https://gitlab.com/desktop-frameworks/ipc";

     

       
40
       
40
       
+
       
    changelog = "https://gitlab.com/desktop-frameworks/ipc/-/blob/${finalAttrs.src.rev}/ChangeLog";

     

       
41
       
41
       
+
       
    license = lib.licenses.gpl3Only;

     

       
42
       
42
       
+
       
    maintainers = with lib.maintainers; [ arthsmn ];

     

       
43
       
43
       
+
       
    platforms = lib.platforms.linux;

     

       
44
       
44
       
+
       
  };

     

       
45
       
45
       
+
       
})

     

···

       
1
       
1
       
+
       
{

     

       
2
       
2
       
+
       
  lib,

     

       
3
       
3
       
+
       
  stdenv,

     

       
4
       
4
       
+
       
  fetchFromGitLab,

     

       
5
       
5
       
+
       
  meson,

     

       
6
       
6
       
+
       
  ninja,

     

       
7
       
7
       
+
       
  pkg-config,

     

       
8
       
8
       
+
       
  qt6,

     

       
9
       
9
       
+
       
  systemd,

     

       
10
       
10
       
+
       
}:

     

       
11
       
11
       
+
       


     

       
12
       
12
       
+
       
stdenv.mkDerivation (finalAttrs: {

     

       
13
       
13
       
+
       
  pname = "dfl-login1";

     

       
14
       
14
       
+
       
  version = "0.3.0";

     

       
15
       
15
       
+
       


     

       
16
       
16
       
+
       
  src = fetchFromGitLab {

     

       
17
       
17
       
+
       
    owner = "desktop-frameworks";

     

       
18
       
18
       
+
       
    repo = "login1";

     

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

     

       
20
       
20
       
+
       
    hash = "sha256-Aw2yg5KH618/lG+BQU8JZhQ/8qr6L3vWiEgUNu7aGYY=";

     

       
21
       
21
       
+
       
  };

     

       
22
       
22
       
+
       


     

       
23
       
23
       
+
       
  nativeBuildInputs = [

     

       
24
       
24
       
+
       
    meson

     

       
25
       
25
       
+
       
    ninja

     

       
26
       
26
       
+
       
    pkg-config

     

       
27
       
27
       
+
       
  ];

     

       
28
       
28
       
+
       


     

       
29
       
29
       
+
       
  buildInputs = [

     

       
30
       
30
       
+
       
    qt6.qtbase

     

       
31
       
31
       
+
       
    systemd

     

       
32
       
32
       
+
       
  ];

     

       
33
       
33
       
+
       


     

       
34
       
34
       
+
       
  dontWrapQtApps = true;

     

       
35
       
35
       
+
       


     

       
36
       
36
       
+
       
  outputs = [

     

       
37
       
37
       
+
       
    "out"

     

       
38
       
38
       
+
       
    "dev"

     

       
39
       
39
       
+
       
  ];

     

       
40
       
40
       
+
       


     

       
41
       
41
       
+
       
  meta = {

     

       
42
       
42
       
+
       
    description = "Implementation of systemd/elogind for DFL";

     

       
43
       
43
       
+
       
    homepage = "https://gitlab.com/desktop-frameworks/login1";

     

       
44
       
44
       
+
       
    changelog = "https://gitlab.com/desktop-frameworks/login1/-/blob/${finalAttrs.src.rev}/ChangeLog";

     

       
45
       
45
       
+
       
    license = lib.licenses.gpl3Only;

     

       
46
       
46
       
+
       
    maintainers = with lib.maintainers; [ arthsmn ];

     

       
47
       
47
       
+
       
    platforms = lib.platforms.linux;

     

       
48
       
48
       
+
       
  };

     

       
49
       
49
       
+
       
})

     

···

       
1
       
1
       
+
       
{

     

       
2
       
2
       
+
       
  lib,

     

       
3
       
3
       
+
       
  stdenv,

     

       
4
       
4
       
+
       
  fetchFromGitLab,

     

       
5
       
5
       
+
       
  meson,

     

       
6
       
6
       
+
       
  ninja,

     

       
7
       
7
       
+
       
  qt6,

     

       
8
       
8
       
+
       
}:

     

       
9
       
9
       
+
       


     

       
10
       
10
       
+
       
stdenv.mkDerivation (finalAttrs: {

     

       
11
       
11
       
+
       
  pname = "dfl-utils";

     

       
12
       
12
       
+
       
  version = "0.3.0";

     

       
13
       
13
       
+
       


     

       
14
       
14
       
+
       
  src = fetchFromGitLab {

     

       
15
       
15
       
+
       
    owner = "desktop-frameworks";

     

       
16
       
16
       
+
       
    repo = "utils";

     

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

     

       
18
       
18
       
+
       
    hash = "sha256-XiOLVx9X2i+IWORde05P2cFulQRU/EQErbyr5fgZDY4=";

     

       
19
       
19
       
+
       
  };

     

       
20
       
20
       
+
       


     

       
21
       
21
       
+
       
  nativeBuildInputs = [

     

       
22
       
22
       
+
       
    meson

     

       
23
       
23
       
+
       
    ninja

     

       
24
       
24
       
+
       
  ];

     

       
25
       
25
       
+
       


     

       
26
       
26
       
+
       
  buildInputs = [

     

       
27
       
27
       
+
       
    qt6.qtbase

     

       
28
       
28
       
+
       
  ];

     

       
29
       
29
       
+
       


     

       
30
       
30
       
+
       
  dontWrapQtApps = true;

     

       
31
       
31
       
+
       


     

       
32
       
32
       
+
       
  outputs = [

     

       
33
       
33
       
+
       
    "out"

     

       
34
       
34
       
+
       
    "dev"

     

       
35
       
35
       
+
       
  ];

     

       
36
       
36
       
+
       


     

       
37
       
37
       
+
       
  meta = {

     

       
38
       
38
       
+
       
    description = "Some utilities for DFL";

     

       
39
       
39
       
+
       
    homepage = "https://gitlab.com/desktop-frameworks/utils";

     

       
40
       
40
       
+
       
    changelog = "https://gitlab.com/desktop-frameworks/utils/-/blob/${finalAttrs.src.rev}/ChangeLog";

     

       
41
       
41
       
+
       
    license = lib.licenses.gpl3Only;

     

       
42
       
42
       
+
       
    maintainers = with lib.maintainers; [ arthsmn ];

     

       
43
       
43
       
+
       
    platforms = lib.platforms.linux;

     

       
44
       
44
       
+
       
  };

     

       
45
       
45
       
+
       
})

     

···

       
2
       
2
       
 
       
  lib,

     

       
3
       
3
       
 
       
  stdenv,

     

       
4
       
4
       
 
       
  fetchFromGitHub,

     

       
5
       
5
       
+
       
  makeWrapper,

     

       
5
       
6
       
 
       
  jdk8,

     

       
7
       
7
       
+
       
  coreutils,

     

       
6
       
8
       
 
       
  which,

     

       
7
       
7
       
-
       
  makeWrapper,

     

       
9
       
9
       
+
       
  gnumake,

     

       
10
       
10
       
+
       
  versionCheckHook,

     

       
8
       
11
       
 
       
}:

     

       
9
       
12
       
 
       


     

       
10
       
10
       
-
       
stdenv.mkDerivation rec {

     

       
13
       
13
       
+
       
stdenv.mkDerivation (finalAttrs: {

     

       
11
       
14
       
 
       
  pname = "drip";

     

       
12
       
15
       
 
       
  version = "0.2.4";

     

       
13
       
16
       
 
       


     

       
14
       
17
       
 
       
  src = fetchFromGitHub {

     

       
15
       
18
       
 
       
    repo = "drip";

     

       
16
       
19
       
 
       
    owner = "ninjudd";

     

       
17
       
17
       
-
       
    rev = version;

     

       
18
       
18
       
-
       
    sha256 = "1zl62wdwfak6z725asq5lcqb506la1aavj7ag78lvp155wyh8aq1";

     

       
20
       
20
       
+
       
    tag = finalAttrs.version;

     

       
21
       
21
       
+
       
    hash = "sha256-ASsEPS8l3E3ReerIrVRQ1ICyMKMFa1XE+WYqxxsXhv4=";

     

       
19
       
22
       
 
       
  };

     

       
20
       
23
       
 
       


     

       
21
       
24
       
 
       
  nativeBuildInputs = [ makeWrapper ];

     

       
22
       
25
       
 
       


     

       
23
       
26
       
 
       
  buildInputs = [ jdk8 ];

     

       
27
       
27
       
+
       


     

       
28
       
28
       
+
       
  patches = [ ./wait.patch ];

     

       
24
       
29
       
 
       


     

       
25
       
30
       
 
       
  postPatch = ''

     

       
26
       
31
       
 
       
    patchShebangs .

     
···

       
31
       
36
       
 
       
    mkdir $out

     

       
32
       
37
       
 
       
    cp ./* $out -r

     

       
33
       
38
       
 
       
    wrapProgram $out/bin/drip \

     

       
34
       
34
       
-
       
      --prefix PATH : "${which}/bin"

     

       
35
       
35
       
-
       
    $out/bin/drip version

     

       
39
       
39
       
+
       
      --prefix PATH : ${

     

       
40
       
40
       
+
       
        lib.makeBinPath [

     

       
41
       
41
       
+
       
          coreutils

     

       
42
       
42
       
+
       
          which

     

       
43
       
43
       
+
       
          gnumake

     

       
44
       
44
       
+
       
          jdk8

     

       
45
       
45
       
+
       
        ]

     

       
46
       
46
       
+
       
      }

     

       
36
       
47
       
 
       
    runHook postInstall

     

       
37
       
48
       
 
       
  '';

     

       
38
       
49
       
 
       


     

       
39
       
39
       
-
       
  meta = with lib; {

     

       
50
       
50
       
+
       
  doInstallCheck = true;

     

       
51
       
51
       
+
       
  nativeInstallCheckInputs = [ versionCheckHook ];

     

       
52
       
52
       
+
       
  versionCheckProgramArg = "version";

     

       
53
       
53
       
+
       


     

       
54
       
54
       
+
       
  meta = {

     

       
40
       
55
       
 
       
    description = "Launcher for the Java Virtual Machine intended to be a drop-in replacement for the java command, only faster";

     

       
41
       
41
       
-
       
    license = licenses.epl10;

     

       
56
       
56
       
+
       
    license = lib.licenses.epl10;

     

       
42
       
57
       
 
       
    homepage = "https://github.com/ninjudd/drip";

     

       
43
       
43
       
-
       
    platforms = platforms.linux;

     

       
44
       
44
       
-
       
    maintainers = [ maintainers.rybern ];

     

       
58
       
58
       
+
       
    platforms = lib.platforms.linux;

     

       
59
       
59
       
+
       
    maintainers = with lib.maintainers; [

     

       
60
       
60
       
+
       
      rybern

     

       
61
       
61
       
+
       
      awwpotato

     

       
62
       
62
       
+
       
    ];

     

       
45
       
63
       
 
       
  };

     

       
46
       
46
       
-
       
}

     

       
64
       
64
       
+
       
})

     

···

       
1
       
1
       
+
       
diff --git a/src/drip_daemon.c b/src/drip_daemon.c

     

       
2
       
2
       
+
       
index cbfd4d9..79fdaf4 100644

     

       
3
       
3
       
+
       
--- a/src/drip_daemon.c

     

       
4
       
4
       
+
       
+++ b/src/drip_daemon.c

     

       
5
       
5
       
+
       
@@ -5,6 +5,7 @@

     

       
6
       
6
       
+
       
 #include <stdio.h>

     

       
7
       
7
       
+
       
 #include <unistd.h>

     

       
8
       
8
       
+
       
 #include <sys/stat.h>

     

       
9
       
9
       
+
       
+#include <sys/wait.h>

     

       
10
       
10
       
+
       


     

       
11
       
11
       
+
       
 static char* jvm_dir;

     

···

       
7
       
7
       
 
       


     

       
8
       
8
       
 
       
rustPlatform.buildRustPackage rec {

     

       
9
       
9
       
 
       
  pname = "flirt";

     

       
10
       
10
       
-
       
  version = "0.3";

     

       
10
       
10
       
+
       
  version = "0.4";

     

       
11
       
11
       
 
       


     

       
12
       
12
       
 
       
  src = fetchFromSourcehut {

     

       
13
       
13
       
 
       
    owner = "~hadronized";

     

       
14
       
14
       
 
       
    repo = "flirt";

     

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

     

       
16
       
16
       
-
       
    hash = "sha256-xhNo85xwcVI4qliHU4/uNEvS7rW5avKOv8fMfRrvqD0=";

     

       
16
       
16
       
+
       
    hash = "sha256-wH6WLLUqUj5YrrudNbGkzZ4i15xRPDBE3UKwyhkQSxg=";

     

       
17
       
17
       
 
       
  };

     

       
18
       
18
       
 
       


     

       
19
       
19
       
 
       
  useFetchCargoVendor = true;

     

       
20
       
20
       
-
       
  cargoHash = "sha256-Nu4sOjwF/MlsoCmgUEGEqMIW+aSD9PuiFBQMnfQRL8Q=";

     

       
20
       
20
       
+
       
  cargoHash = "sha256-m1aLJFa6C5X9HwNweezoUcFnpG09AuYf9ooet8GUGFE=";

     

       
21
       
21
       
 
       


     

       
22
       
22
       
 
       
  passthru.updateScript = nix-update-script { };

     

       
23
       
23
       
 
       


     

···

       
11
       
11
       
 
       


     

       
12
       
12
       
 
       
buildGoModule (finalAttrs: {

     

       
13
       
13
       
 
       
  pname = "hugo";

     

       
14
       
14
       
-
       
  version = "0.146.4";

     

       
14
       
14
       
+
       
  version = "0.146.7";

     

       
15
       
15
       
 
       


     

       
16
       
16
       
 
       
  src = fetchFromGitHub {

     

       
17
       
17
       
 
       
    owner = "gohugoio";

     

       
18
       
18
       
 
       
    repo = "hugo";

     

       
19
       
19
       
 
       
    tag = "v${finalAttrs.version}";

     

       
20
       
20
       
-
       
    hash = "sha256-acOHFKNtzGV6CAhdBBBWAyS9Iuf3rq4XaIUnf2m6UWE=";

     

       
20
       
20
       
+
       
    hash = "sha256-I2SJh984uBwJRCMOiHxM1OKBwzbMgxoycovy4U4l6HM=";

     

       
21
       
21
       
 
       
  };

     

       
22
       
22
       
 
       


     

       
23
       
23
       
-
       
  vendorHash = "sha256-LSNy65sIuq/zK3swdUvxGwbo/3ulq+JP5ur7M7aTdAs=";

     

       
23
       
23
       
+
       
  vendorHash = "sha256-Ey0vN5/TbLb7p2M5zOHytl0PLCC658njoR8xZaFJyfo=";

     

       
24
       
24
       
 
       


     

       
25
       
25
       
 
       
  checkFlags =

     

       
26
       
26
       
 
       
    let

     

···

       
8
       
8
       
 
       
  bison,

     

       
9
       
9
       
 
       
  flex,

     

       
10
       
10
       
 
       
  intel-compute-runtime,

     

       
11
       
11
       
-
       
  llvmPackages_14,

     

       
11
       
11
       
+
       
  llvmPackages_15,

     

       
12
       
12
       
 
       
  opencl-clang,

     

       
13
       
13
       
 
       
  python3,

     

       
14
       
14
       
 
       
  spirv-tools,

     
···

       
26
       
26
       
 
       
    hash = "sha256-dSK+kNEZoF4bBx24S0No9aZLZiHK0U9TR1jRyEBL+2U=";

     

       
27
       
27
       
 
       
  };

     

       
28
       
28
       
 
       


     

       
29
       
29
       
-
       
  inherit (llvmPackages_14) lld llvm;

     

       
30
       
30
       
-
       
  inherit (if buildWithPatches then opencl-clang else llvmPackages_14) clang libclang;

     

       
29
       
29
       
+
       
  inherit (llvmPackages_15) lld llvm;

     

       
30
       
30
       
+
       
  inherit (if buildWithPatches then opencl-clang else llvmPackages_15) clang libclang;

     

       
31
       
31
       
 
       
  spirv-llvm-translator' = spirv-llvm-translator.override { inherit llvm; };

     

       
32
       
32
       
 
       


     

       
33
       
33
       
 
       
  # Handholding the braindead build script

     
···

       
42
       
42
       
 
       
in

     

       
43
       
43
       
 
       
stdenv.mkDerivation rec {

     

       
44
       
44
       
 
       
  pname = "intel-graphics-compiler";

     

       
45
       
45
       
-
       
  version = "2.8.3";

     

       
45
       
45
       
+
       
  version = "2.10.8";

     

       
46
       
46
       
 
       


     

       
47
       
47
       
 
       
  src = fetchFromGitHub {

     

       
48
       
48
       
 
       
    owner = "intel";

     

       
49
       
49
       
 
       
    repo = "intel-graphics-compiler";

     

       
50
       
50
       
 
       
    tag = "v${version}";

     

       
51
       
51
       
-
       
    hash = "sha256-1YzvzVmMW5s4keQfa7r6xfyVg7RWSdKNgBtdTN6SADg=";

     

       
51
       
51
       
+
       
    hash = "sha256-BFEl2LiaGRZXnQtOTEY/86ymKuQO3QN4HPbwHsdSZMs=";

     

       
52
       
52
       
 
       
  };

     

       
53
       
53
       
 
       


     

       
54
       
54
       
 
       
  postPatch = ''

     

···

       
10
       
10
       
 
       


     

       
11
       
11
       
 
       
buildGoModule rec {

     

       
12
       
12
       
 
       
  pname = "mongodb-atlas-cli";

     

       
13
       
13
       
-
       
  version = "1.42.0";

     

       
13
       
13
       
+
       
  version = "1.42.1";

     

       
14
       
14
       
 
       


     

       
15
       
15
       
-
       
  vendorHash = "sha256-5kCaQ4bBRiGjRh65Tx3g5SlwAb+/S8o+z/2x8IqSXDM=";

     

       
15
       
15
       
+
       
  vendorHash = "sha256-BYeNYL4W1ufv9pCSDVNL8p69DGgQM+noaDtfwZFBeTk=";

     

       
16
       
16
       
 
       


     

       
17
       
17
       
 
       
  src = fetchFromGitHub {

     

       
18
       
18
       
 
       
    owner = "mongodb";

     

       
19
       
19
       
 
       
    repo = "mongodb-atlas-cli";

     

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

     

       
21
       
21
       
-
       
    sha256 = "sha256-7umwluhPNhY/AGmVhxITLeoAGJPglRP+1PuXOM6TmBA=";

     

       
21
       
21
       
+
       
    sha256 = "sha256-8fkdocpySd+cXwp2txec+fNQAdXlJlLhTpLQnyRMtZ0=";

     

       
22
       
22
       
 
       
  };

     

       
23
       
23
       
 
       


     

       
24
       
24
       
 
       
  nativeBuildInputs = [ installShellFiles ];

     

···

       
130
       
130
       
 
       


     

       
131
       
131
       
 
       
    ${lib.optionalString stdenv.hostPlatform.isDarwin ''

     

       
132
       
132
       
 
       
      mkdir -p $out/{Applications,bin}

     

       
133
       
133
       
-
       
      mv "build/mac/MQTT Explorer.app" $out/Applications

     

       
133
       
133
       
+
       
      mv build/mac*/MQTT\ Explorer.app $out/Applications

     

       
134
       
134
       
 
       


     

       
135
       
135
       
 
       
      makeWrapper "$out/Applications/MQTT Explorer.app/Contents/MacOS/MQTT Explorer" \

     

       
136
       
136
       
 
       
        $out/bin/mqtt-explorer

     

···

       
19
       
19
       
 
       
}:

     

       
20
       
20
       
 
       


     

       
21
       
21
       
 
       
stdenv.mkDerivation rec {

     

       
22
       
22
       
-
       
  version = "2025-04-13";

     

       
22
       
22
       
+
       
  version = "2025-04-19";

     

       
23
       
23
       
 
       
  pname = "oh-my-zsh";

     

       
24
       
24
       
 
       


     

       
25
       
25
       
 
       
  src = fetchFromGitHub {

     

       
26
       
26
       
 
       
    owner = "ohmyzsh";

     

       
27
       
27
       
 
       
    repo = "ohmyzsh";

     

       
28
       
28
       
-
       
    rev = "a84a0332a822a78ddf3f66d0e1ed3990d4badd12";

     

       
29
       
29
       
-
       
    sha256 = "sha256-oBSs8DuPI7DgKaSSbuK5FgFwmGIVAp2B+YI9Hr1/mRw=";

     

       
28
       
28
       
+
       
    rev = "de1ca65dcaebd19f5ca6626616bb79b529362458";

     

       
29
       
29
       
+
       
    sha256 = "sha256-ag/hVeCvrGHYSchdeTQKOtqFvmtn12vJZJM+EIpyYpE=";

     

       
30
       
30
       
 
       
  };

     

       
31
       
31
       
 
       


     

       
32
       
32
       
 
       
  strictDeps = true;

     

···

       
229
       
229
       
 
       


     

       
230
       
230
       
 
       
  __darwinAllowLocalNetworking = true;

     

       
231
       
231
       
 
       


     

       
232
       
232
       
+
       
  # required for github.com/ollama/ollama/detect's tests

     

       
233
       
233
       
+
       
  sandboxProfile = lib.optionalString stdenv.hostPlatform.isDarwin ''

     

       
234
       
234
       
+
       
    (allow file-read* (subpath "/System/Library/Extensions"))

     

       
235
       
235
       
+
       
    (allow iokit-open (iokit-user-client-class "AGXDeviceUserClient"))

     

       
236
       
236
       
+
       
  '';

     

       
237
       
237
       
+
       


     

       
232
       
238
       
 
       
  passthru = {

     

       
233
       
239
       
 
       
    tests =

     

       
234
       
240
       
 
       
      {

     
···

       
261
       
267
       
 
       
      dit7ya

     

       
262
       
268
       
 
       
      elohmeier

     

       
263
       
269
       
 
       
      prusnak

     

       
264
       
264
       
-
       
      roydubnium

     

       
265
       
270
       
 
       
    ];

     

       
266
       
271
       
 
       
  };

     

       
267
       
272
       
 
       
})

     

···

       
5
       
5
       
 
       
  fetchFromGitHub,

     

       
6
       
6
       
 
       
  cmake,

     

       
7
       
7
       
 
       
  git,

     

       
8
       
8
       
-
       
  llvmPackages_14,

     

       
8
       
8
       
+
       
  llvmPackages_15,

     

       
9
       
9
       
 
       
  spirv-llvm-translator,

     

       
10
       
10
       
 
       
  buildWithPatches ? true,

     

       
11
       
11
       
 
       
}:

     
···

       
23
       
23
       
 
       
        '';

     

       
24
       
24
       
 
       
    });

     

       
25
       
25
       
 
       


     

       
26
       
26
       
-
       
  llvmPkgs = llvmPackages_14;

     

       
26
       
26
       
+
       
  llvmPkgs = llvmPackages_15;

     

       
27
       
27
       
 
       
  inherit (llvmPkgs) llvm;

     

       
28
       
28
       
 
       
  spirv-llvm-translator' = spirv-llvm-translator.override { inherit llvm; };

     

       
29
       
29
       
 
       
  libclang = if buildWithPatches then passthru.libclang else llvmPkgs.libclang;

     
···

       
46
       
46
       
 
       
      postPatch = ''

     

       
47
       
47
       
 
       
        for filename in patches/clang/*.patch; do

     

       
48
       
48
       
 
       
          substituteInPlace "$filename" \

     

       
49
       
49
       
-
       
            --replace "a/clang/" "a/" \

     

       
50
       
50
       
-
       
            --replace "b/clang/" "b/"

     

       
49
       
49
       
+
       
            --replace-fail "a/clang/" "a/" \

     

       
50
       
50
       
+
       
            --replace-fail "b/clang/" "b/"

     

       
51
       
51
       
 
       
        done

     

       
52
       
52
       
 
       
      '';

     

       
53
       
53
       
 
       


     
···

       
58
       
58
       
 
       
    };

     

       
59
       
59
       
 
       
  };

     

       
60
       
60
       
 
       


     

       
61
       
61
       
-
       
  version = "14.0.0-unstable-2024-07-09";

     

       
61
       
61
       
+
       
  version = "15.0.1";

     

       
62
       
62
       
 
       
  src = applyPatches {

     

       
63
       
63
       
 
       
    src = fetchFromGitHub {

     

       
64
       
64
       
 
       
      owner = "intel";

     

       
65
       
65
       
 
       
      repo = "opencl-clang";

     

       
66
       
66
       
-
       
      # https://github.com/intel/opencl-clang/compare/ocl-open-140

     

       
67
       
67
       
-
       
      rev = "470cf0018e1ef6fc92eda1356f5f31f7da452abc";

     

       
68
       
68
       
-
       
      hash = "sha256-Ja+vJ317HI3Nh45kcAMhyLVTIqyy6pE5KAsKs4ou9J8=";

     

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

     

       
67
       
67
       
+
       
      hash = "sha256-mUqxe3lZQdhz/CRE1+NU2q5g2Taxlh7nzPwUHOB6I0c=";

     

       
69
       
68
       
 
       
    };

     

       
70
       
69
       
 
       


     

       
71
       
70
       
 
       
    patches = [

     
···

       
78
       
77
       
 
       
      ''

     

       
79
       
78
       
 
       
        # fix not be able to find clang from PATH

     

       
80
       
79
       
 
       
        substituteInPlace cl_headers/CMakeLists.txt \

     

       
81
       
81
       
-
       
          --replace " NO_DEFAULT_PATH" ""

     

       
80
       
80
       
+
       
          --replace-fail " NO_DEFAULT_PATH" ""

     

       
82
       
81
       
 
       
      ''

     

       
83
       
82
       
 
       
      + lib.optionalString stdenv.hostPlatform.isDarwin ''

     

       
84
       
83
       
 
       
        # Uses linker flags that are not supported on Darwin.

     

       
85
       
84
       
 
       
        sed -i -e '/SET_LINUX_EXPORTS_FILE/d' CMakeLists.txt

     

       
86
       
85
       
 
       
        substituteInPlace CMakeLists.txt \

     

       
87
       
87
       
-
       
          --replace '-Wl,--no-undefined' ""

     

       
86
       
86
       
+
       
          --replace-fail '-Wl,--no-undefined' ""

     

       
88
       
87
       
 
       
      '';

     

       
89
       
88
       
 
       
  };

     

       
90
       
89
       
 
       
in

     

···

       
1
       
1
       
-
       
{

     

       
2
       
2
       
-
       
  lib,

     

       
3
       
3
       
-
       
  stdenv,

     

       
4
       
4
       
-
       
  fetchFromGitHub,

     

       
5
       
5
       
-
       
  rustPlatform,

     

       
6
       
6
       
-
       
  python3,

     

       
7
       
7
       
-
       
}:

     

       
8
       
8
       
-
       


     

       
9
       
9
       
-
       
rustPlatform.buildRustPackage rec {

     

       
10
       
10
       
-
       
  pname = "proton-vpn-local-agent";

     

       
11
       
11
       
-
       
  version = "1.4.4";

     

       
12
       
12
       
-
       
  useFetchCargoVendor = true;

     

       
13
       
13
       
-
       
  cargoHash = "sha256-i/qJwN8693MRaWTcvGGcWMCqclyOOIb/wlqiUilOhzQ=";

     

       
14
       
14
       
-
       


     

       
15
       
15
       
-
       
  src = fetchFromGitHub {

     

       
16
       
16
       
-
       
    owner = "ProtonVPN";

     

       
17
       
17
       
-
       
    repo = "python-proton-vpn-local-agent";

     

       
18
       
18
       
-
       
    rev = version;

     

       
19
       
19
       
-
       
    hash = "sha256-9dyyLZZEOB2080KxN0ffdkRhyvEY8xKE/7b2mA7JL+o=";

     

       
20
       
20
       
-
       
  };

     

       
21
       
21
       
-
       


     

       
22
       
22
       
-
       
  sourceRoot = "${src.name}/python-proton-vpn-local-agent";

     

       
23
       
23
       
-
       


     

       
24
       
24
       
-
       
  installPhase = ''

     

       
25
       
25
       
-
       
    # manually install the python binding

     

       
26
       
26
       
-
       
    mkdir -p $out/${python3.sitePackages}/proton/vpn/

     

       
27
       
27
       
-
       
    cp ./target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/libpython_proton_vpn_local_agent.so $out/${python3.sitePackages}/proton/vpn/local_agent.so

     

       
28
       
28
       
-
       
  '';

     

       
29
       
29
       
-
       


     

       
30
       
30
       
-
       
  meta = {

     

       
31
       
31
       
-
       
    description = "Proton VPN local agent written in Rust with Python bindings";

     

       
32
       
32
       
-
       
    homepage = "https://github.com/ProtonVPN/python-proton-vpn-local-agent";

     

       
33
       
33
       
-
       
    license = lib.licenses.gpl3Only;

     

       
34
       
34
       
-
       
    platforms = lib.platforms.linux;

     

       
35
       
35
       
-
       
    maintainers = with lib.maintainers; [ sebtm ];

     

       
36
       
36
       
-
       
  };

     

       
37
       
37
       
-
       
}

     

···

       
1
       
1
       
+
       
From 600e4604169464c64cbf548e7629e483ad2aad1e Mon Sep 17 00:00:00 2001

     

       
2
       
2
       
+
       
From: Megamouse <studienricky89@googlemail.com>

     

       
3
       
3
       
+
       
Date: Mon, 7 Apr 2025 20:49:15 +0200

     

       
4
       
4
       
+
       
Subject: [PATCH] Fix compilation with newer Qt

     

       
5
       
5
       
+
       


     

       
6
       
6
       
+
       
---

     

       
7
       
7
       
+
       
 rpcs3/rpcs3qt/game_list_base.cpp         | 2 +-

     

       
8
       
8
       
+
       
 rpcs3/rpcs3qt/game_list_frame.cpp        | 4 ++--

     

       
9
       
9
       
+
       
 rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp | 4 ++--

     

       
10
       
10
       
+
       
 3 files changed, 5 insertions(+), 5 deletions(-)

     

       
11
       
11
       
+
       


     

       
12
       
12
       
+
       
diff --git a/rpcs3/rpcs3qt/game_list_base.cpp b/rpcs3/rpcs3qt/game_list_base.cpp

     

       
13
       
13
       
+
       
index 72b45d33bfbb..21640906ee7e 100644

     

       
14
       
14
       
+
       
--- a/rpcs3/rpcs3qt/game_list_base.cpp

     

       
15
       
15
       
+
       
+++ b/rpcs3/rpcs3qt/game_list_base.cpp

     

       
16
       
16
       
+
       
@@ -25,7 +25,7 @@ void game_list_base::repaint_icons(std::vector<game_info>& game_data, const QCol

     

       
17
       
17
       
+
       
 	for (game_info& game : game_data)

     

       
18
       
18
       
+
       
 	{

     

       
19
       
19
       
+
       
 		game->pxmap = placeholder;

     

       
20
       
20
       
+
       
-	

     

       
21
       
21
       
+
       
+

     

       
22
       
22
       
+
       
 		if (movie_item_base* item = game->item)

     

       
23
       
23
       
+
       
 		{

     

       
24
       
24
       
+
       
 			item->set_icon_load_func([this, game, device_pixel_ratio, cancel = item->icon_loading_aborted()](int)

     

       
25
       
25
       
+
       
diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp

     

       
26
       
26
       
+
       
index a294d69cc68e..439913760053 100644

     

       
27
       
27
       
+
       
--- a/rpcs3/rpcs3qt/game_list_frame.cpp

     

       
28
       
28
       
+
       
+++ b/rpcs3/rpcs3qt/game_list_frame.cpp

     

       
29
       
29
       
+
       
@@ -2363,7 +2363,7 @@ void game_list_frame::BatchActionBySerials(progress_dialog* pdlg, const std::set

     

       
30
       
30
       
+
       
 

     

       
31
       
31
       
+
       
 		connect(future_watcher, &QFutureWatcher<void>::finished, this, [=, this]()

     

       
32
       
32
       
+
       
 		{

     

       
33
       
33
       
+
       
-			pdlg->setLabelText(progressLabel.arg(*index).arg(serials_size));

     

       
34
       
34
       
+
       
+			pdlg->setLabelText(progressLabel.arg(index->load()).arg(serials_size));

     

       
35
       
35
       
+
       
 			pdlg->setCancelButtonText(tr("OK"));

     

       
36
       
36
       
+
       
 			QApplication::beep();

     

       
37
       
37
       
+
       
 

     

       
38
       
38
       
+
       
@@ -2396,7 +2396,7 @@ void game_list_frame::BatchActionBySerials(progress_dialog* pdlg, const std::set

     

       
39
       
39
       
+
       
 			return;

     

       
40
       
40
       
+
       
 		}

     

       
41
       
41
       
+
       
 

     

       
42
       
42
       
+
       
-		pdlg->setLabelText(progressLabel.arg(*index).arg(serials_size));

     

       
43
       
43
       
+
       
+		pdlg->setLabelText(progressLabel.arg(index->load()).arg(serials_size));

     

       
44
       
44
       
+
       
 		pdlg->setCancelButtonText(tr("OK"));

     

       
45
       
45
       
+
       
 		connect(pdlg, &progress_dialog::canceled, this, [pdlg](){ pdlg->deleteLater(); });

     

       
46
       
46
       
+
       
 		QApplication::beep();

     

       
47
       
47
       
+
       
diff --git a/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp b/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp

     

       
48
       
48
       
+
       
index 45fbe6f59e7d..4b9bc5dd6e4f 100644

     

       
49
       
49
       
+
       
--- a/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp

     

       
50
       
50
       
+
       
+++ b/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp

     

       
51
       
51
       
+
       
@@ -362,7 +362,7 @@ void ps_move_tracker_dialog::update_saturation_threshold(bool update_slider)

     

       
52
       
52
       
+
       
 }

     

       
53
       
53
       
+
       
 void ps_move_tracker_dialog::update_min_radius(bool update_slider)

     

       
54
       
54
       
+
       
 {

     

       
55
       
55
       
+
       
-	ui->minRadiusGb->setTitle(tr("Min Radius: %0 %").arg(g_cfg_move.min_radius));

     

       
56
       
56
       
+
       
+	ui->minRadiusGb->setTitle(tr("Min Radius: %0 %").arg(g_cfg_move.min_radius.get()));

     

       
57
       
57
       
+
       
 

     

       
58
       
58
       
+
       
 	if (update_slider)

     

       
59
       
59
       
+
       
 	{

     

       
60
       
60
       
+
       
@@ -372,7 +372,7 @@ void ps_move_tracker_dialog::update_min_radius(bool update_slider)

     

       
61
       
61
       
+
       
 

     

       
62
       
62
       
+
       
 void ps_move_tracker_dialog::update_max_radius(bool update_slider)

     

       
63
       
63
       
+
       
 {

     

       
64
       
64
       
+
       
-	ui->maxRadiusGb->setTitle(tr("Max Radius: %0 %").arg(g_cfg_move.max_radius));

     

       
65
       
65
       
+
       
+	ui->maxRadiusGb->setTitle(tr("Max Radius: %0 %").arg(g_cfg_move.max_radius.get()));

     

       
66
       
66
       
+
       
 

     

       
67
       
67
       
+
       
 	if (update_slider)

     

       
68
       
68
       
+
       
 	{