commit cfd87655c8c9d6dfef423f3a1be51a3ad92a3368 · pyrox.dev/nixpkgs

+15

maintainers/maintainer-list.nix

···

       8666
       8666
        
           githubId = 621759;

     

       8667
       8667
        
           name = "Lassulus";

     

       8668
       8668
        
         };

     

       8669
       8669
       +
         laurent-f1z1 = {

     

       8670
       8670
       +
           email = "laurent.nixpkgs@fainsin.bzh";

     

       8671
       8671
       +
           github = "Laurent2916";

     

       8672
       8672
       +
           githubId = 21087104;

     

       8673
       8673
       +
           name = "Laurent Fainsin";

     

       8674
       8674
       +
         };

     

       8669
       8675
        
         layus = {

     

       8670
       8676
        
           email = "layus.on@gmail.com";

     

       8671
       8677
        
           github = "layus";

     
···

       14461
       14467
        
           github = "SlothOfAnarchy";

     

       14462
       14468
        
           githubId = 12828415;

     

       14463
       14469
        
           name = "Michel Weitbrecht";

     

       14470
       14470
       +
         };

     

       14471
       14471
       +
         slwst = {

     

       14472
       14472
       +
           email = "email@slw.st";

     

       14473
       14473
       +
           github = "slwst";

     

       14474
       14474
       +
           githubId = 11047377;

     

       14475
       14475
       +
           name = "slwst";

     

       14476
       14476
       +
           keys = [{

     

       14477
       14477
       +
             fingerprint = "6CEB 4A2F E6DC C345 1B2B  4733 AD52 C5FB 3EFE CC7A";

     

       14478
       14478
       +
           }];

     

       14464
       14479
        
         };

     

       14465
       14480
        
         smakarov = {

     

       14466
       14481
        
           email = "setser200018@gmail.com";

maintainers/team-list.nix

···

       149
       149
        
           enableFeatureFreezePing = true;

     

       150
       150
        
         };

     

       151
       151
        
       

     

       152
       152
       +
         cuda = {

     

       153
       153
       +
           members = [

     

       154
       154
       +
             SomeoneSerge

     

       155
       155
       +
           ];

     

       156
       156
       +
           scope = "Maintain CUDA-enabled packages";

     

       157
       157
       +
           shortName = "Cuda";

     

       158
       158
       +
           githubTeams = [ "cuda-maintainers" ];

     

       159
       159
       +
         };

     

       160
       160
       +
       

     

       152
       161
        
         darwin = {

     

       153
       162
        
           members = [

     

       154
       163
        
             toonn

+15 -9

nixos/modules/services/monitoring/grafana-agent.nix

···

       13
       13
        
         options.services.grafana-agent = {

     

       14
       14
        
           enable = mkEnableOption (lib.mdDoc "grafana-agent");

     

       15
       15
        
       

     

       16
       16
       -
           package = mkOption {

     

       17
       17
       -
             type = types.package;

     

       18
       18
       -
             default = pkgs.grafana-agent;

     

       19
       19
       -
             defaultText = lib.literalExpression "pkgs.grafana-agent";

     

       20
       20
       -
             description = lib.mdDoc "The grafana-agent package to use.";

     

       21
       21
       -
           };

     

       16
       16
       +
           package = mkPackageOptionMD pkgs "grafana-agent" { };

     

       22
       17
        
       

     

       23
       18
        
           credentials = mkOption {

     

       24
       19
        
             description = lib.mdDoc ''

     
···

       37
       32
        
             };

     

       38
       33
        
           };

     

       39
       34
        
       

     

       35
       35
       +
           extraFlags = mkOption {

     

       36
       36
       +
             type = with types; listOf str;

     

       37
       37
       +
             default = [ ];

     

       38
       38
       +
             example = [ "-enable-features=integrations-next" "-disable-reporting" ];

     

       39
       39
       +
             description = lib.mdDoc ''

     

       40
       40
       +
               Extra command-line flags passed to {command}`grafana-agent`.

     

       41
       41
       +
       

     

       42
       42
       +
               See <https://grafana.com/docs/agent/latest/static/configuration/flags/>

     

       43
       43
       +
             '';

     

       44
       44
       +
           };

     

       45
       45
       +
       

     

       40
       46
        
           settings = mkOption {

     

       41
       47
        
             description = lib.mdDoc ''

     

       42
       42
       -
               Configuration for `grafana-agent`.

     

       48
       48
       +
               Configuration for {command}`grafana-agent`.

     

       43
       49
        
       

     

       44
       44
       -
               See https://grafana.com/docs/agent/latest/configuration/

     

       50
       50
       +
               See <https://grafana.com/docs/agent/latest/configuration/>

     

       45
       51
        
             '';

     

       46
       52
        
       

     

       47
       53
        
             type = types.submodule {

     
···

       140
       146
        
               # We can't use Environment=HOSTNAME=%H, as it doesn't include the domain part.

     

       141
       147
        
               export HOSTNAME=$(< /proc/sys/kernel/hostname)

     

       142
       148
        
       

     

       143
       143
       -
               exec ${lib.getExe cfg.package} -config.expand-env -config.file ${configFile}

     

       149
       149
       +
               exec ${lib.getExe cfg.package} -config.expand-env -config.file ${configFile} ${escapeShellArgs cfg.extraFlags}

     

       144
       150
        
             '';

     

       145
       151
        
             serviceConfig = {

     

       146
       152
        
               Restart = "always";

nixos/modules/system/boot/stage-1-init.sh

···

       410
       410
        
               n=$((n + 1))

     

       411
       411
        
           done

     

       412
       412
        
       

     

       413
       413
       +
           # For bind mounts, busybox has a tendency to ignore options, which can be a

     

       414
       414
       +
           # security issue (e.g. "nosuid"). Remounting the partition seems to fix the

     

       415
       415
       +
           # issue.

     

       416
       416
       +
           mount "/mnt-root$mountPoint" -o "remount,$optionsPrefixed"

     

       417
       417
       +
       

     

       413
       418
        
           [ "$mountPoint" == "/" ] &&

     

       414
       419
        
               [ -f "/mnt-root/etc/NIXOS_LUSTRATE" ] &&

     

       415
       420
        
               lustrateRoot "/mnt-root"

+19 -8

nixos/modules/virtualisation/qemu-vm.nix

···

       272
       272
        
         suggestedRootDevice = {

     

       273
       273
        
           "efi_bootloading_with_default_fs" = "${cfg.bootLoaderDevice}2";

     

       274
       274
        
           "legacy_bootloading_with_default_fs" = "${cfg.bootLoaderDevice}1";

     

       275
       275
       -
           "direct_boot_with_default_fs" = cfg.bootLoaderDevice;

     

       275
       275
       +
           "direct_boot_with_default_fs" = lookupDriveDeviceName "root" cfg.qemu.drives;

     

       276
       276
        
           # This will enforce a NixOS module type checking error

     

       277
       277
        
           # to ask explicitly the user to set a rootDevice.

     

       278
       278
        
           # As it will look like `rootDevice = lib.mkDefault null;` after

     
···

       344
       344
        
       

     

       345
       345
        
           virtualisation.bootLoaderDevice =

     

       346
       346
        
             mkOption {

     

       347
       347
       -
               type = types.path;

     

       348
       348
       -
               default = lookupDriveDeviceName "root" cfg.qemu.drives;

     

       349
       349
       -
               defaultText = literalExpression ''lookupDriveDeviceName "root" cfg.qemu.drives'';

     

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

     

       348
       348
       +
               default = if cfg.useBootLoader then lookupDriveDeviceName "root" cfg.qemu.drives else null;

     

       349
       349
       +
               defaultText = literalExpression ''if cfg.useBootLoader then lookupDriveDeviceName "root" cfg.qemu.drives else null;'';

     

       350
       350
        
               example = "/dev/vda";

     

       351
       351
        
               description =

     

       352
       352
        
                 lib.mdDoc ''

     

       353
       353
        
                   The disk to be used for the boot filesystem.

     

       354
       354
       -
                   By default, it is the same disk as the root filesystem.

     

       354
       354
       +
                   By default, it is the same disk as the root filesystem if you use a bootloader, otherwise it's null.

     

       355
       355
        
                 '';

     

       356
       356
        
               };

     

       357
       357
        
       

     
···

       862
       862
        
                       Invalid virtualisation.forwardPorts.<entry ${toString i}>.guest.address:

     

       863
       863
        
                         The address must be in the default VLAN (10.0.2.0/24).

     

       864
       864
        
                     '';

     

       865
       865
       +
                   }

     

       866
       866
       +
                 { assertion = cfg.useBootLoader -> cfg.diskImage != null;

     

       867
       867
       +
                   message =

     

       868
       868
       +
                     ''

     

       869
       869
       +
                       Currently, bootloaders cannot be used with a tmpfs disk image.

     

       870
       870
       +
                       It would require some rework in the boot configuration mechanism

     

       871
       871
       +
                       to detect the proper boot partition in UEFI scenarios for example.

     

       872
       872
       +
       

     

       873
       873
       +
                       If you are interested into this feature, please open an issue or open a pull request.

     

       874
       874
       +
                     '';

     

       865
       875
        
                 }

     

       866
       876
        
               ]));

     

       867
       877
        
       

     
···

       889
       899
        
           # legacy and UEFI. In order to avoid this, we have to put "nodev" to force UEFI-only installs.

     

       890
       900
        
           # Otherwise, we set the proper bootloader device for this.

     

       891
       901
        
           # FIXME: make a sense of this mess wrt to multiple ESP present in the system, probably use boot.efiSysMountpoint?

     

       892
       892
       -
           boot.loader.grub.device = mkVMOverride (if cfg.useEFIBoot then "nodev" else cfg.bootLoaderDevice);

     

       902
       902
       +
           boot.loader.grub.enable = cfg.useBootLoader;

     

       903
       903
       +
           boot.loader.grub.device = mkIf cfg.useBootLoader (mkVMOverride (if cfg.useEFIBoot then "nodev" else cfg.bootLoaderDevice));

     

       893
       904
        
           boot.loader.grub.gfxmodeBios = with cfg.resolution; "${toString x}x${toString y}";

     

       894
       905
        
           virtualisation.rootDevice = mkDefault suggestedRootDevice;

     

       895
       906
        
       

     
···

       897
       908
        
       

     

       898
       909
        
           boot.loader.supportsInitrdSecrets = mkIf (!cfg.useBootLoader) (mkVMOverride false);

     

       899
       910
        
       

     

       900
       900
       -
           boot.initrd.extraUtilsCommands = lib.mkIf (cfg.useDefaultFilesystems && !config.boot.initrd.systemd.enable)

     

       911
       911
       +
           boot.initrd.extraUtilsCommands = lib.mkIf (cfg.useDefaultFilesystems && !config.boot.initrd.systemd.enable && cfg.diskImage != null)

     

       901
       912
        
             ''

     

       902
       913
        
               # We need mke2fs in the initrd.

     

       903
       914
        
               copy_bin_and_libs ${pkgs.e2fsprogs}/bin/mke2fs

     

       904
       915
        
             '';

     

       905
       916
        
       

     

       906
       906
       -
           boot.initrd.postDeviceCommands = lib.mkIf (cfg.useDefaultFilesystems && !config.boot.initrd.systemd.enable)

     

       917
       917
       +
           boot.initrd.postDeviceCommands = lib.mkIf (cfg.useDefaultFilesystems && !config.boot.initrd.systemd.enable && cfg.diskImage != null)

     

       907
       918
        
             ''

     

       908
       919
        
               # If the disk image appears to be empty, run mke2fs to

     

       909
       920
        
               # initialise.

nixos/tests/all-tests.nix

···

       206
       206
        
         dovecot = handleTest ./dovecot.nix {};

     

       207
       207
        
         drbd = handleTest ./drbd.nix {};

     

       208
       208
        
         earlyoom = handleTestOn ["x86_64-linux"] ./earlyoom.nix {};

     

       209
       209
       +
         early-mount-options = handleTest ./early-mount-options.nix {};

     

       209
       210
        
         ec2-config = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-config or {};

     

       210
       211
        
         ec2-nixops = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-nixops or {};

     

       211
       212
        
         ecryptfs = handleTest ./ecryptfs.nix {};

+19

nixos/tests/early-mount-options.nix

···

       1
       1
       +
       # Test for https://github.com/NixOS/nixpkgs/pull/193469

     

       2
       2
       +
       import ./make-test-python.nix {

     

       3
       3
       +
         name = "early-mount-options";

     

       4
       4
       +
       

     

       5
       5
       +
         nodes.machine = {

     

       6
       6
       +
           virtualisation.fileSystems."/var" = {

     

       7
       7
       +
             options = [ "bind" "nosuid" "nodev" "noexec" ];

     

       8
       8
       +
             device = "/var";

     

       9
       9
       +
           };

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         testScript = ''

     

       13
       13
       +
           machine.wait_for_unit("multi-user.target")

     

       14
       14
       +
       

     

       15
       15
       +
           var_mount_info = machine.succeed("findmnt /var -n -o OPTIONS")

     

       16
       16
       +
           options = var_mount_info.strip().split(",")

     

       17
       17
       +
           assert "nosuid" in options and "nodev" in options and "noexec" in options

     

       18
       18
       +
         '';

     

       19
       19
       +
       }

+47

pkgs/applications/editors/openvi/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , fetchpatch

     

       5
       5
       +
       , ncurses

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       stdenv.mkDerivation rec {

     

       9
       9
       +
         pname = "openvi";

     

       10
       10
       +
         version = "7.3.22";

     

       11
       11
       +
       

     

       12
       12
       +
         src = fetchFromGitHub {

     

       13
       13
       +
           owner = "johnsonjh";

     

       14
       14
       +
           repo = "OpenVi";

     

       15
       15
       +
           rev = version;

     

       16
       16
       +
           hash = "sha256-yXYiH2FCT7ffRPmb28V54+KO1RLs8L9KHk3remkMWmA=";

     

       17
       17
       +
         };

     

       18
       18
       +
       

     

       19
       19
       +
         patches = [

     

       20
       20
       +
           # do not attempt to install to /var/tmp/vi.recover

     

       21
       21
       +
           (fetchpatch {

     

       22
       22
       +
             url = "https://github.com/johnsonjh/OpenVi/commit/5205f0234369963c443e83ca5028ca63feaaac91.patch";

     

       23
       23
       +
             hash = "sha256-hoKzQLnpdRbc48wffWbzFtivr20VqEPs4WRPXuDa/88=";

     

       24
       24
       +
           })

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       27
       27
       +
         buildInputs = [ ncurses ];

     

       28
       28
       +
       

     

       29
       29
       +
         makeFlags = [

     

       30
       30
       +
           "PREFIX=$(out)"

     

       31
       31
       +
           # command -p will yield command not found error

     

       32
       32
       +
           "PAWK=awk"

     

       33
       33
       +
           # silently fail the chown command

     

       34
       34
       +
           "IUSGR=$(USER)"

     

       35
       35
       +
         ];

     

       36
       36
       +
       

     

       37
       37
       +
         enableParallelBuilding = true;

     

       38
       38
       +
       

     

       39
       39
       +
         meta = with lib; {

     

       40
       40
       +
           homepage = "https://github.com/johnsonjh/OpenVi";

     

       41
       41
       +
           description = "Portable OpenBSD vi for UNIX systems";

     

       42
       42
       +
           license = licenses.bsd3;

     

       43
       43
       +
           platforms = platforms.unix;

     

       44
       44
       +
           maintainers = with maintainers; [ aleksana ];

     

       45
       45
       +
           mainProgram = "ovi";

     

       46
       46
       +
         };

     

       47
       47
       +
       }

+2 -1

pkgs/applications/editors/tiled/default.nix

···

       10
       10
        
       , qttools

     

       11
       11
        
       , qtsvg

     

       12
       12
        
       , zlib

     

       13
       13
       +
       , zstd

     

       13
       14
        
       , libGL

     

       14
       15
        
       }:

     

       15
       16
        
       

     
···

       29
       30
        
         };

     

       30
       31
        
       

     

       31
       32
        
         nativeBuildInputs = [ pkg-config qbs wrapQtAppsHook ];

     

       32
       32
       -
         buildInputs = [ qtEnv zlib libGL ];

     

       33
       33
       +
         buildInputs = [ qtEnv zlib zstd libGL ];

     

       33
       34
        
       

     

       34
       35
        
         outputs = [ "out" "dev" ];

     

       35
       36

+228 -216

pkgs/applications/editors/vim/plugins/generated.nix

···

       29
       29
        
       

     

       30
       30
        
         ChatGPT-nvim = buildVimPluginFrom2Nix {

     

       31
       31
        
           pname = "ChatGPT.nvim";

     

       32
       32
       -
           version = "2023-04-30";

     

       32
       32
       +
           version = "2023-05-04";

     

       33
       33
        
           src = fetchFromGitHub {

     

       34
       34
        
             owner = "jackMort";

     

       35
       35
        
             repo = "ChatGPT.nvim";

     

       36
       36
       -
             rev = "cd060d2dd9abb72e24d7921cdbcf3f57cc720105";

     

       37
       37
       -
             sha256 = "1cafzv4rl9njbjdjkza41p9x70rqjkl4by16r2xj66hfsyalnsfb";

     

       36
       36
       +
             rev = "be6d89615216339e8bee47f52290ae204372c248";

     

       37
       37
       +
             sha256 = "0q67vm5g44fdhpl1pn050fgzx9d6xpy78f1lrb30w5z569hzg1ys";

     

       38
       38
        
           };

     

       39
       39
        
           meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/";

     

       40
       40
        
         };

     
···

       173
       173
        
       

     

       174
       174
        
         LazyVim = buildVimPluginFrom2Nix {

     

       175
       175
        
           pname = "LazyVim";

     

       176
       176
       -
           version = "2023-04-28";

     

       176
       176
       +
           version = "2023-05-04";

     

       177
       177
        
           src = fetchFromGitHub {

     

       178
       178
        
             owner = "LazyVim";

     

       179
       179
        
             repo = "LazyVim";

     

       180
       180
       -
             rev = "c42ebc216a380b4ed17be313f1b5245797b7531c";

     

       181
       181
       -
             sha256 = "0pm09qq7gpjsrij0xj2rkz6pirsdkpz2xq9gr6f1kdmvvzgi0cxq";

     

       180
       180
       +
             rev = "25d37a2cdd6202f1d767595454a7f84f77bbd83e";

     

       181
       181
       +
             sha256 = "04c66zbnx2xfgfzik56lyk0pzsn1bnkgrylw86j1wv1aa3nn19nr";

     

       182
       182
        
           };

     

       183
       183
        
           meta.homepage = "https://github.com/LazyVim/LazyVim/";

     

       184
       184
        
         };

     

       185
       185
        
       

     

       186
       186
        
         LeaderF = buildVimPluginFrom2Nix {

     

       187
       187
        
           pname = "LeaderF";

     

       188
       188
       -
           version = "2023-03-24";

     

       188
       188
       +
           version = "2023-05-02";

     

       189
       189
        
           src = fetchFromGitHub {

     

       190
       190
        
             owner = "Yggdroot";

     

       191
       191
        
             repo = "LeaderF";

     

       192
       192
       -
             rev = "45911fd6b436976ae9e83eb0a1968d3b8e72276b";

     

       193
       193
       -
             sha256 = "09rp8xc3w7kzpcvkxjjcd9535slj2v2grl2jw5s00n4qlkvrd6p2";

     

       192
       192
       +
             rev = "4f1fc63ef0ed1f923f306631edd680ea294cc400";

     

       193
       193
       +
             sha256 = "1aid9g8djcjxdpikv1d9kpvav2pm53829yh21wb181rfkfls6nrp";

     

       194
       194
        
           };

     

       195
       195
        
           meta.homepage = "https://github.com/Yggdroot/LeaderF/";

     

       196
       196
        
         };

     
···

       305
       305
        
       

     

       306
       306
        
         SchemaStore-nvim = buildVimPluginFrom2Nix {

     

       307
       307
        
           pname = "SchemaStore.nvim";

     

       308
       308
       -
           version = "2023-05-01";

     

       308
       308
       +
           version = "2023-05-04";

     

       309
       309
        
           src = fetchFromGitHub {

     

       310
       310
        
             owner = "b0o";

     

       311
       311
        
             repo = "SchemaStore.nvim";

     

       312
       312
       -
             rev = "aac9313a2c78b602f23fa59fc799768b35926e8a";

     

       313
       313
       -
             sha256 = "02jdl4q3811y044nij8vkkb6fa7kgsi22jvs1fqj38zjqvqbmzhv";

     

       312
       312
       +
             rev = "b8e6c7d966857e8ff14d9b6a23eec9214d99db32";

     

       313
       313
       +
             sha256 = "100wjp9dl3dvyq82nvs8vnif2w6f64wgxl3ifxqpgy8ckwql765k";

     

       314
       314
        
           };

     

       315
       315
        
           meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";

     

       316
       316
        
         };

     
···

       486
       486
        
       

     

       487
       487
        
         aerial-nvim = buildVimPluginFrom2Nix {

     

       488
       488
        
           pname = "aerial.nvim";

     

       489
       489
       -
           version = "2023-04-27";

     

       489
       489
       +
           version = "2023-05-04";

     

       490
       490
        
           src = fetchFromGitHub {

     

       491
       491
        
             owner = "stevearc";

     

       492
       492
        
             repo = "aerial.nvim";

     

       493
       493
       -
             rev = "07039ea63b562caf9017a223d14eebfa1fc085c1";

     

       494
       494
       -
             sha256 = "0bl6d9g96lfayzn7rv334b5xq54zcai7zbxjwjjlvd60wygxn34l";

     

       493
       493
       +
             rev = "d8f2699f7ae0e5eb62424d7b2ad80ce30179ee92";

     

       494
       494
       +
             sha256 = "1ir8yqj1zjbby4rn3cygf8rlxyk0arcrdd2jbxhpcj07ijzv037l";

     

       495
       495
        
             fetchSubmodules = true;

     

       496
       496
        
           };

     

       497
       497
        
           meta.homepage = "https://github.com/stevearc/aerial.nvim/";

     
···

       859
       859
        
       

     

       860
       860
        
         barbar-nvim = buildVimPluginFrom2Nix {

     

       861
       861
        
           pname = "barbar.nvim";

     

       862
       862
       -
           version = "2023-04-30";

     

       862
       862
       +
           version = "2023-05-02";

     

       863
       863
        
           src = fetchFromGitHub {

     

       864
       864
        
             owner = "romgrk";

     

       865
       865
        
             repo = "barbar.nvim";

     

       866
       866
       -
             rev = "3921d775d5db0c9bd42fe4026f68f762e2480475";

     

       867
       867
       -
             sha256 = "083yhwfj2cci3wazda5qn69m4sbm41p7p6xq0xaq84c5m6v17lmb";

     

       866
       866
       +
             rev = "de37647f05a5b556b6426b78c4608bbd40a8089f";

     

       867
       867
       +
             sha256 = "0c8bf8ikz6vpy3284cb820f88gh97fgiyhnw7nb4cw86hhxkviv7";

     

       868
       868
        
           };

     

       869
       869
        
           meta.homepage = "https://github.com/romgrk/barbar.nvim/";

     

       870
       870
        
         };

     
···

       931
       931
        
       

     

       932
       932
        
         better-escape-nvim = buildVimPluginFrom2Nix {

     

       933
       933
        
           pname = "better-escape.nvim";

     

       934
       934
       -
           version = "2023-02-25";

     

       934
       934
       +
           version = "2023-05-02";

     

       935
       935
        
           src = fetchFromGitHub {

     

       936
       936
        
             owner = "max397574";

     

       937
       937
        
             repo = "better-escape.nvim";

     

       938
       938
       -
             rev = "426d29708064d5b1bfbb040424651c92af1f3f64";

     

       939
       939
       -
             sha256 = "12vpiznrnj1kw47bp8q3d6pgnb1j84mqvp1svarmqzbsg621gd0r";

     

       938
       938
       +
             rev = "7031dc734add47bb71c010e0551829fa5799375f";

     

       939
       939
       +
             sha256 = "0pabbcx5b5varpd9xc9lrl767fv1591h0r4zk28zb31finx5i48k";

     

       940
       940
        
           };

     

       941
       941
        
           meta.homepage = "https://github.com/max397574/better-escape.nvim/";

     

       942
       942
        
         };

     
···

       1039
       1039
        
       

     

       1040
       1040
        
         bufexplorer = buildVimPluginFrom2Nix {

     

       1041
       1041
        
           pname = "bufexplorer";

     

       1042
       1042
       -
           version = "2023-01-07";

     

       1042
       1042
       +
           version = "2023-05-02";

     

       1043
       1043
        
           src = fetchFromGitHub {

     

       1044
       1044
        
             owner = "jlanzarotta";

     

       1045
       1045
        
             repo = "bufexplorer";

     

       1046
       1046
       -
             rev = "5a830d5d2d7417bf02339ec279c90e98dde822f8";

     

       1047
       1047
       -
             sha256 = "1vcfz4ngk5jsh66l74na9r0z2d3y6annb518kv0lgv76z99g5vy8";

     

       1046
       1046
       +
             rev = "20f0440948653b5482d555a35a432135ba46a26d";

     

       1047
       1047
       +
             sha256 = "0bh3p4zqw75nky0c1ff5wjavzqv0px9ypy62ddriayb8p55nmdn0";

     

       1048
       1048
        
           };

     

       1049
       1049
        
           meta.homepage = "https://github.com/jlanzarotta/bufexplorer/";

     

       1050
       1050
        
         };

     
···

       1063
       1063
        
       

     

       1064
       1064
        
         bufferline-nvim = buildVimPluginFrom2Nix {

     

       1065
       1065
        
           pname = "bufferline.nvim";

     

       1066
       1066
       -
           version = "2023-05-01";

     

       1066
       1066
       +
           version = "2023-05-03";

     

       1067
       1067
        
           src = fetchFromGitHub {

     

       1068
       1068
        
             owner = "akinsho";

     

       1069
       1069
        
             repo = "bufferline.nvim";

     

       1070
       1070
       -
             rev = "9f55bff3561e4c0ac5168487c64cb30d0ab75408";

     

       1071
       1071
       -
             sha256 = "03lvk0l5402zfxqviipma9s8f8hrzg0pdkcrc3lc5q6iklk20hmf";

     

       1070
       1070
       +
             rev = "41660189da6951d14436147dff30ed7f0d12ed01";

     

       1071
       1071
       +
             sha256 = "0bz4m6ain9kvpb85hr5d2y6m63inggnfkv5cfny6s2cd5a7py8ia";

     

       1072
       1072
        
           };

     

       1073
       1073
        
           meta.homepage = "https://github.com/akinsho/bufferline.nvim/";

     

       1074
       1074
        
         };

     
···

       1663
       1663
        
       

     

       1664
       1664
        
         cmp-tabnine = buildVimPluginFrom2Nix {

     

       1665
       1665
        
           pname = "cmp-tabnine";

     

       1666
       1666
       -
           version = "2023-04-29";

     

       1666
       1666
       +
           version = "2023-05-04";

     

       1667
       1667
        
           src = fetchFromGitHub {

     

       1668
       1668
        
             owner = "tzachar";

     

       1669
       1669
        
             repo = "cmp-tabnine";

     

       1670
       1670
       -
             rev = "7fa0459b0cc0498375c5a1e14fb8d21d130bb198";

     

       1671
       1671
       -
             sha256 = "0xgc1vzr0hhbab6b5rhgrv3c656x1yi86cmz008jij144w6awcgf";

     

       1670
       1670
       +
             rev = "b713b724bc622167c5eb8d98651a1ca607d52e61";

     

       1671
       1671
       +
             sha256 = "0libfagkzzqmzrvyhx692hx2bcsqwpz3bdj04jyfwll7bwslzx6r";

     

       1672
       1672
        
           };

     

       1673
       1673
        
           meta.homepage = "https://github.com/tzachar/cmp-tabnine/";

     

       1674
       1674
        
         };

     
···

       1939
       1939
        
       

     

       1940
       1940
        
         comment-nvim = buildVimPluginFrom2Nix {

     

       1941
       1941
        
           pname = "comment.nvim";

     

       1942
       1942
       -
           version = "2023-04-28";

     

       1942
       1942
       +
           version = "2023-05-03";

     

       1943
       1943
        
           src = fetchFromGitHub {

     

       1944
       1944
        
             owner = "numtostr";

     

       1945
       1945
        
             repo = "comment.nvim";

     

       1946
       1946
       -
             rev = "38d3b7eb553872d8866f14a0dd4fe84126068fce";

     

       1947
       1947
       -
             sha256 = "1d1a2c864y24lnr8h1xsg9krrk9604vy5mawjccn2fzq9g5vg6z5";

     

       1946
       1946
       +
             rev = "e1fe53117aab24c378d5e6deaad786789c360123";

     

       1947
       1947
       +
             sha256 = "13ypypkb63j8spg9av9i7n0yp0g4d1hwrym0f9659r0kxmzy9h88";

     

       1948
       1948
        
           };

     

       1949
       1949
        
           meta.homepage = "https://github.com/numtostr/comment.nvim/";

     

       1950
       1950
        
         };

     
···

       2143
       2143
        
       

     

       2144
       2144
        
         copilot-lua = buildVimPluginFrom2Nix {

     

       2145
       2145
        
           pname = "copilot.lua";

     

       2146
       2146
       -
           version = "2023-04-29";

     

       2146
       2146
       +
           version = "2023-05-04";

     

       2147
       2147
        
           src = fetchFromGitHub {

     

       2148
       2148
        
             owner = "zbirenbaum";

     

       2149
       2149
        
             repo = "copilot.lua";

     

       2150
       2150
       -
             rev = "19c1c945553918d683a001e697faad933c41bb5d";

     

       2151
       2151
       -
             sha256 = "040885dckmrdi3ym2dz255cisvgka0ykglql54sc17lrfihmiiq9";

     

       2150
       2150
       +
             rev = "21d8ef6ce4ac931ebfa3fc3c0afb65bb05db9fc3";

     

       2151
       2151
       +
             sha256 = "1k4s6ai31zwwmjzs0x6xa9v19k8kkhv7669my1n24wlnivsnr2sh";

     

       2152
       2152
        
           };

     

       2153
       2153
        
           meta.homepage = "https://github.com/zbirenbaum/copilot.lua/";

     

       2154
       2154
        
         };

     
···

       2239
       2239
        
       

     

       2240
       2240
        
         crates-nvim = buildVimPluginFrom2Nix {

     

       2241
       2241
        
           pname = "crates.nvim";

     

       2242
       2242
       -
           version = "2023-04-23";

     

       2242
       2242
       +
           version = "2023-05-04";

     

       2243
       2243
        
           src = fetchFromGitHub {

     

       2244
       2244
        
             owner = "saecki";

     

       2245
       2245
        
             repo = "crates.nvim";

     

       2246
       2246
       -
             rev = "5a529df8fe3504ccf1ca9526e196f48b2f723c72";

     

       2247
       2247
       -
             sha256 = "0xffp0igr3rs2czzbkx5nr19wza1kyqsk7xf963baqsw0zj6wh7v";

     

       2246
       2246
       +
             rev = "bb5ce73e9c41865e22329da118d91a565089e4d7";

     

       2247
       2247
       +
             sha256 = "1qz8f4mcvjsh3qyf9jj0zlrs1pnm5jrnjbz70kzv1j0zf689ypds";

     

       2248
       2248
        
           };

     

       2249
       2249
        
           meta.homepage = "https://github.com/saecki/crates.nvim/";

     

       2250
       2250
        
         };

     
···

       2275
       2275
        
       

     

       2276
       2276
        
         csv-vim = buildVimPluginFrom2Nix {

     

       2277
       2277
        
           pname = "csv.vim";

     

       2278
       2278
       -
           version = "2023-02-20";

     

       2278
       2278
       +
           version = "2023-05-04";

     

       2279
       2279
        
           src = fetchFromGitHub {

     

       2280
       2280
        
             owner = "chrisbra";

     

       2281
       2281
        
             repo = "csv.vim";

     

       2282
       2282
       -
             rev = "0f6900bf1d0f2ccdbe59ed246db4a82e5cc16e78";

     

       2283
       2283
       -
             sha256 = "0yi9r665xsvp2043mwc58wljfnsp38pzab7j14mb0fcs787r0kq4";

     

       2282
       2282
       +
             rev = "15ff93edf5b26c466affbb356e0696b7d6a3b499";

     

       2283
       2283
       +
             sha256 = "0mjvy0lbcd3j5dnfq2575m29pbs8w3asdwmknhnk6by6aih3mdsj";

     

       2284
       2284
        
           };

     

       2285
       2285
        
           meta.homepage = "https://github.com/chrisbra/csv.vim/";

     

       2286
       2286
        
         };

     
···

       2347
       2347
        
       

     

       2348
       2348
        
         dashboard-nvim = buildVimPluginFrom2Nix {

     

       2349
       2349
        
           pname = "dashboard-nvim";

     

       2350
       2350
       -
           version = "2023-04-27";

     

       2350
       2350
       +
           version = "2023-05-03";

     

       2351
       2351
        
           src = fetchFromGitHub {

     

       2352
       2352
        
             owner = "nvimdev";

     

       2353
       2353
        
             repo = "dashboard-nvim";

     

       2354
       2354
       -
             rev = "be2420c29fd4b96d095b631c5a9cbd7fd4bd5aa3";

     

       2355
       2355
       -
             sha256 = "09afhn9g2x6i1wns4r5czbghav3hl9bxzvaj94a8j9jhvifq2b0v";

     

       2354
       2354
       +
             rev = "0af0ad181db271ef8d5a332f4cfcec9118340497";

     

       2355
       2355
       +
             sha256 = "0fvfgzs9i6ggy213c3whd91pk7k2lis9j23ah3b0jnr69h0gwqv6";

     

       2356
       2356
        
           };

     

       2357
       2357
        
           meta.homepage = "https://github.com/nvimdev/dashboard-nvim/";

     

       2358
       2358
        
         };

     
···

       2443
       2443
        
       

     

       2444
       2444
        
         deol-nvim = buildVimPluginFrom2Nix {

     

       2445
       2445
        
           pname = "deol.nvim";

     

       2446
       2446
       -
           version = "2023-04-30";

     

       2446
       2446
       +
           version = "2023-05-04";

     

       2447
       2447
        
           src = fetchFromGitHub {

     

       2448
       2448
        
             owner = "Shougo";

     

       2449
       2449
        
             repo = "deol.nvim";

     

       2450
       2450
       -
             rev = "b23b7c7dc2b38fc2528927adb7bbcb0552ec7c7a";

     

       2451
       2451
       -
             sha256 = "1xlsz4g39vs8nmg4asbb9b56n0df0hq2nc2ywsgcqj68slay8lny";

     

       2450
       2450
       +
             rev = "2f4cf55846774c70996b009adb030b109d90d4af";

     

       2451
       2451
       +
             sha256 = "1gx3742v9hcfa9zwmsfba2pwjssys6n7jbs99n50z04lrndjnnk4";

     

       2452
       2452
        
           };

     

       2453
       2453
        
           meta.homepage = "https://github.com/Shougo/deol.nvim/";

     

       2454
       2454
        
         };

     
···

       2793
       2793
        
       

     

       2794
       2794
        
         dressing-nvim = buildVimPluginFrom2Nix {

     

       2795
       2795
        
           pname = "dressing.nvim";

     

       2796
       2796
       -
           version = "2023-04-22";

     

       2796
       2796
       +
           version = "2023-05-03";

     

       2797
       2797
        
           src = fetchFromGitHub {

     

       2798
       2798
        
             owner = "stevearc";

     

       2799
       2799
        
             repo = "dressing.nvim";

     

       2800
       2800
       -
             rev = "f5d7fa1fa5ce6bcebc8f07922f39b1eda4d01e37";

     

       2801
       2801
       -
             sha256 = "15n2pzv9iydn36067bc08xqzz7dwnxyrnz25v1afcfg5ph7vl5g0";

     

       2800
       2800
       +
             rev = "540d6e7115fb32b5035ddaf0c1a26cbffb855dac";

     

       2801
       2801
       +
             sha256 = "05zfhcybv5s5a08hbiflmp28pc5mqadsgkd3ich9sdj63f28lks8";

     

       2802
       2802
        
           };

     

       2803
       2803
        
           meta.homepage = "https://github.com/stevearc/dressing.nvim/";

     

       2804
       2804
        
         };

     
···

       2854
       2854
        
       

     

       2855
       2855
        
         elixir-tools-nvim = buildVimPluginFrom2Nix {

     

       2856
       2856
        
           pname = "elixir-tools.nvim";

     

       2857
       2857
       -
           version = "2023-05-01";

     

       2857
       2857
       +
           version = "2023-05-04";

     

       2858
       2858
        
           src = fetchFromGitHub {

     

       2859
       2859
        
             owner = "elixir-tools";

     

       2860
       2860
        
             repo = "elixir-tools.nvim";

     

       2861
       2861
       -
             rev = "2890da8be0ab1af2de3ce3b2bdb99e843c5d561c";

     

       2862
       2862
       -
             sha256 = "1c69jr2w6cr7sz1964amp9p5ffdgajnv75ymhpqqf5jz3rdyn53n";

     

       2861
       2861
       +
             rev = "53946c8d1d9f7ab8f5dff8834960fb547db2bf9b";

     

       2862
       2862
       +
             sha256 = "11k5c37aqydy0bzc917mpc43l8sf0klvy7scihldc3x3xpnswc1x";

     

       2863
       2863
        
           };

     

       2864
       2864
        
           meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/";

     

       2865
       2865
        
         };

     
···

       3144
       3144
        
       

     

       3145
       3145
        
         flutter-tools-nvim = buildVimPluginFrom2Nix {

     

       3146
       3146
        
           pname = "flutter-tools.nvim";

     

       3147
       3147
       -
           version = "2023-04-28";

     

       3147
       3147
       +
           version = "2023-05-04";

     

       3148
       3148
        
           src = fetchFromGitHub {

     

       3149
       3149
        
             owner = "akinsho";

     

       3150
       3150
        
             repo = "flutter-tools.nvim";

     

       3151
       3151
       -
             rev = "97f9bdea0374c3553a3a11b8e4d2b21f11855463";

     

       3152
       3152
       -
             sha256 = "0awkwf82rc755bdv2qpd8sfk6ciwss73q98xirwpzhfdikisdm5n";

     

       3151
       3151
       +
             rev = "627fadf8200bacb0b55db29d9bbab305a1b43c65";

     

       3152
       3152
       +
             sha256 = "1sf3ps1rm6acihc6mcf503gljbp6j767vw90i4zkxzvpp2fm4lpp";

     

       3153
       3153
        
           };

     

       3154
       3154
        
           meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/";

     

       3155
       3155
        
         };

     
···

       3180
       3180
        
       

     

       3181
       3181
        
         friendly-snippets = buildVimPluginFrom2Nix {

     

       3182
       3182
        
           pname = "friendly-snippets";

     

       3183
       3183
       -
           version = "2023-05-01";

     

       3183
       3183
       +
           version = "2023-05-04";

     

       3184
       3184
        
           src = fetchFromGitHub {

     

       3185
       3185
        
             owner = "rafamadriz";

     

       3186
       3186
        
             repo = "friendly-snippets";

     

       3187
       3187
       -
             rev = "2308366ad625f61284e51d249ede4f795394b186";

     

       3188
       3188
       -
             sha256 = "1vvlqc8a2v2891zfjvw3knmrvxszx1zzyh1jkyszz4ii8h3f746m";

     

       3187
       3187
       +
             rev = "10f741908e56ce47cf6b3440e3f04b4fdc0da2f2";

     

       3188
       3188
       +
             sha256 = "0zq2q844nqr2jlikxrjvd478zbpgsr50m3jpdnbkzrdlf658y3ln";

     

       3189
       3189
        
           };

     

       3190
       3190
        
           meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";

     

       3191
       3191
        
         };

     
···

       3707
       3707
        
       

     

       3708
       3708
        
         haskell-tools-nvim = buildNeovimPluginFrom2Nix {

     

       3709
       3709
        
           pname = "haskell-tools.nvim";

     

       3710
       3710
       -
           version = "2023-04-23";

     

       3710
       3710
       +
           version = "2023-05-04";

     

       3711
       3711
        
           src = fetchFromGitHub {

     

       3712
       3712
        
             owner = "MrcJkb";

     

       3713
       3713
        
             repo = "haskell-tools.nvim";

     

       3714
       3714
       -
             rev = "1a2f39087306ff14c2d668a2b19335362bcd27af";

     

       3715
       3715
       -
             sha256 = "16ffw6r2g8yxfydlkb4wz0bmvipawi3nxl4maasxagcjj41wfaxl";

     

       3714
       3714
       +
             rev = "55c2af43c1624acb3029e12d6c0a2287447dd875";

     

       3715
       3715
       +
             sha256 = "1sajin39y13kf1w8mgsmnmjl29bc6x35dkclvbzk3vzvkbhd2bv7";

     

       3716
       3716
        
           };

     

       3717
       3717
        
           meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";

     

       3718
       3718
        
         };

     
···

       3814
       3814
        
       

     

       3815
       3815
        
         hoon-vim = buildVimPluginFrom2Nix {

     

       3816
       3816
        
           pname = "hoon.vim";

     

       3817
       3817
       -
           version = "2022-03-22";

     

       3817
       3817
       +
           version = "2023-05-04";

     

       3818
       3818
        
           src = fetchFromGitHub {

     

       3819
       3819
        
             owner = "urbit";

     

       3820
       3820
        
             repo = "hoon.vim";

     

       3821
       3821
       -
             rev = "233d48ab2621877d8899b7a75b70f379ce36a066";

     

       3822
       3822
       -
             sha256 = "0bq8vd6dnf39y3686snaywp8krmjghfsxnnm0k1cyv20g1mf54s5";

     

       3821
       3821
       +
             rev = "dd7d8e3926ad3eab94d363604f652d799ae55b93";

     

       3822
       3822
       +
             sha256 = "1bm7h1hvc2y3nq6si1l4ac2m7aribz4ixpdxnnll8zvd0dz23a0i";

     

       3823
       3823
        
           };

     

       3824
       3824
        
           meta.homepage = "https://github.com/urbit/hoon.vim/";

     

       3825
       3825
        
         };

     
···

       4199
       4199
        
       

     

       4200
       4200
        
         kanagawa-nvim = buildVimPluginFrom2Nix {

     

       4201
       4201
        
           pname = "kanagawa.nvim";

     

       4202
       4202
       -
           version = "2023-04-30";

     

       4202
       4202
       +
           version = "2023-05-03";

     

       4203
       4203
        
           src = fetchFromGitHub {

     

       4204
       4204
        
             owner = "rebelot";

     

       4205
       4205
        
             repo = "kanagawa.nvim";

     

       4206
       4206
       -
             rev = "12f07c5d68ba6b09b53ab528de6df68e55b4cd9a";

     

       4207
       4207
       -
             sha256 = "0v7wm2nkqwblasjw72f6k68j6v21w66vf9adzqhs8w5p96y27pl2";

     

       4206
       4206
       +
             rev = "c261d50794db8de0607de1c01a1f4c088d9f1906";

     

       4207
       4207
       +
             sha256 = "1rh2p2hkn1gsqbxca2yv8rlajmgddg24asmjbmlfiwgd9xh6mn8f";

     

       4208
       4208
        
           };

     

       4209
       4209
        
           meta.homepage = "https://github.com/rebelot/kanagawa.nvim/";

     

       4210
       4210
        
         };

     
···

       4221
       4221
        
           meta.homepage = "https://github.com/anuvyklack/keymap-layer.nvim/";

     

       4222
       4222
        
         };

     

       4223
       4223
        
       

     

       4224
       4224
       +
         kmonad-vim = buildVimPluginFrom2Nix {

     

       4225
       4225
       +
           pname = "kmonad-vim";

     

       4226
       4226
       +
           version = "2022-03-20";

     

       4227
       4227
       +
           src = fetchFromGitHub {

     

       4228
       4228
       +
             owner = "kmonad";

     

       4229
       4229
       +
             repo = "kmonad-vim";

     

       4230
       4230
       +
             rev = "37978445197ab00edeb5b731e9ca90c2b141723f";

     

       4231
       4231
       +
             sha256 = "13p3i0b8azkmhafyv8hc4hav1pmgqg52xzvk2a3gp3ppqqx9bwpc";

     

       4232
       4232
       +
           };

     

       4233
       4233
       +
           meta.homepage = "https://github.com/kmonad/kmonad-vim/";

     

       4234
       4234
       +
         };

     

       4235
       4235
       +
       

     

       4224
       4236
        
         kommentary = buildVimPluginFrom2Nix {

     

       4225
       4237
        
           pname = "kommentary";

     

       4226
       4238
        
           version = "2023-01-06";

     
···

       4295
       4307
        
       

     

       4296
       4308
        
         lazy-nvim = buildVimPluginFrom2Nix {

     

       4297
       4309
        
           pname = "lazy.nvim";

     

       4298
       4298
       -
           version = "2023-04-28";

     

       4310
       4310
       +
           version = "2023-05-02";

     

       4299
       4311
        
           src = fetchFromGitHub {

     

       4300
       4312
        
             owner = "folke";

     

       4301
       4313
        
             repo = "lazy.nvim";

     

       4302
       4302
       -
             rev = "bb5cc9ef3bbb17541929b745f74551c900188099";

     

       4303
       4303
       -
             sha256 = "0pvnshf64s405fh7igb5091gq414fyylq2kzw86d2hsbrdqn3x46";

     

       4314
       4314
       +
             rev = "ceb413678dfcf3d5455208959185e3db1f7892c7";

     

       4315
       4315
       +
             sha256 = "0ydzivwa9vczqiwp7n0yxnxi3fixxns761swrar9z7vj427fvxkw";

     

       4304
       4316
        
           };

     

       4305
       4317
        
           meta.homepage = "https://github.com/folke/lazy.nvim/";

     

       4306
       4318
        
         };

     
···

       4367
       4379
        
       

     

       4368
       4380
        
         legendary-nvim = buildVimPluginFrom2Nix {

     

       4369
       4381
        
           pname = "legendary.nvim";

     

       4370
       4370
       -
           version = "2023-04-20";

     

       4382
       4382
       +
           version = "2023-05-04";

     

       4371
       4383
        
           src = fetchFromGitHub {

     

       4372
       4384
        
             owner = "mrjones2014";

     

       4373
       4385
        
             repo = "legendary.nvim";

     

       4374
       4374
       -
             rev = "4fc7d11d03df874ecd7a8cfa6055d7a4ce2cff87";

     

       4375
       4375
       -
             sha256 = "0y4wgla8w2b8yc7bynchaiq1vcv9i9yvvzgia1zdfky7ph47r1jk";

     

       4386
       4386
       +
             rev = "42e32d51b685f16fe6b56367b308dbdd9c01dbd0";

     

       4387
       4387
       +
             sha256 = "1mc5lkw1alijl936iwahrawl0j4k8s4y10zb0inb8svdbjwd9wsd";

     

       4376
       4388
        
           };

     

       4377
       4389
        
           meta.homepage = "https://github.com/mrjones2014/legendary.nvim/";

     

       4378
       4390
        
         };

     
···

       4727
       4739
        
       

     

       4728
       4740
        
         lsp_lines-nvim = buildVimPluginFrom2Nix {

     

       4729
       4741
        
           pname = "lsp_lines.nvim";

     

       4730
       4730
       -
           version = "2023-04-09";

     

       4742
       4742
       +
           version = "2023-05-03";

     

       4731
       4743
        
           src = fetchgit {

     

       4732
       4744
        
             url = "https://git.sr.ht/~whynothugo/lsp_lines.nvim";

     

       4733
       4733
       -
             rev = "d9c8a71b8b6e6bfa2b5cf015f59450472dbf06fe";

     

       4734
       4734
       -
             sha256 = "0l7q1x8bkfnzhfing5gsbsa2cgkrjx02w018rhhldcix2l5ih9p0";

     

       4745
       4745
       +
             rev = "512d8c79637e7aeb889240c2e0ca8ae327940737";

     

       4746
       4746
       +
             sha256 = "0j0wzb3g04f6i1mp8m9f1rzl71d2h1738ardw5swvr9p9x04m22p";

     

       4735
       4747
        
           };

     

       4736
       4748
        
           meta.homepage = "https://git.sr.ht/~whynothugo/lsp_lines.nvim";

     

       4737
       4749
        
         };

     

       4738
       4750
        
       

     

       4739
       4751
        
         lsp_signature-nvim = buildVimPluginFrom2Nix {

     

       4740
       4752
        
           pname = "lsp_signature.nvim";

     

       4741
       4741
       -
           version = "2023-04-27";

     

       4753
       4753
       +
           version = "2023-05-03";

     

       4742
       4754
        
           src = fetchFromGitHub {

     

       4743
       4755
        
             owner = "ray-x";

     

       4744
       4756
        
             repo = "lsp_signature.nvim";

     

       4745
       4745
       -
             rev = "9616a1adde75a108495dd97ec8bb46f908d552e7";

     

       4746
       4746
       -
             sha256 = "0miv96jg6sbih9clivsmxl5qdma8hqjpmq7zxdk4x4pzmzj2sb7i";

     

       4757
       4757
       +
             rev = "7a26ebaa7e36aa2aefa6c1994b2b866c96de32e6";

     

       4758
       4758
       +
             sha256 = "0f7fjb947hcr946l93p0bh1n649qn6s4d4lzf0xzgj73dsq0j8z4";

     

       4747
       4759
        
           };

     

       4748
       4760
        
           meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";

     

       4749
       4761
        
         };

     
···

       4762
       4774
        
       

     

       4763
       4775
        
         lspkind-nvim = buildVimPluginFrom2Nix {

     

       4764
       4776
        
           pname = "lspkind-nvim";

     

       4765
       4765
       -
           version = "2022-09-22";

     

       4777
       4777
       +
           version = "2023-05-04";

     

       4766
       4778
        
           src = fetchFromGitHub {

     

       4767
       4779
        
             owner = "onsails";

     

       4768
       4780
        
             repo = "lspkind.nvim";

     

       4769
       4769
       -
             rev = "c68b3a003483cf382428a43035079f78474cd11e";

     

       4770
       4770
       -
             sha256 = "0qrfqajpbkb757vbcjz1g7v5rihsyhg1f1jxrbwg08dbxpw101av";

     

       4781
       4781
       +
             rev = "cec39a0651679931ce2e503123c633b0aeae5fc6";

     

       4782
       4782
       +
             sha256 = "1bmqnylimx08xw08w06xhjbh2bdf40qk23vwm78cl8qscrljqi8y";

     

       4771
       4783
        
           };

     

       4772
       4784
        
           meta.homepage = "https://github.com/onsails/lspkind.nvim/";

     

       4773
       4785
        
         };

     
···

       4810
       4822
        
       

     

       4811
       4823
        
         lualine-nvim = buildVimPluginFrom2Nix {

     

       4812
       4824
        
           pname = "lualine.nvim";

     

       4813
       4813
       -
           version = "2023-04-09";

     

       4825
       4825
       +
           version = "2023-05-04";

     

       4814
       4826
        
           src = fetchFromGitHub {

     

       4815
       4827
        
             owner = "nvim-lualine";

     

       4816
       4828
        
             repo = "lualine.nvim";

     

       4817
       4817
       -
             rev = "84ffb80e452d95e2c46fa29a98ea11a240f7843e";

     

       4818
       4818
       -
             sha256 = "1gm1s31vmg0zj018yi2czabsylnvxkzx3icy5vf6pvs907gm5gxv";

     

       4829
       4829
       +
             rev = "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9";

     

       4830
       4830
       +
             sha256 = "1nh8yrcfq654qwj2zpkqsd62cz4p6mii998lxhs6mf1a8bqw9lcn";

     

       4819
       4831
        
           };

     

       4820
       4832
        
           meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/";

     

       4821
       4833
        
         };

     
···

       4919
       4931
        
       

     

       4920
       4932
        
         mason-lspconfig-nvim = buildVimPluginFrom2Nix {

     

       4921
       4933
        
           pname = "mason-lspconfig.nvim";

     

       4922
       4922
       -
           version = "2023-04-28";

     

       4934
       4934
       +
           version = "2023-05-02";

     

       4923
       4935
        
           src = fetchFromGitHub {

     

       4924
       4936
        
             owner = "williamboman";

     

       4925
       4937
        
             repo = "mason-lspconfig.nvim";

     

       4926
       4926
       -
             rev = "43f2ddf0b5f544d9bb20e24b8ff76b79f2a07ab0";

     

       4927
       4927
       -
             sha256 = "09g8hlracxiplb61wbxmg5z3f4sclaaayh5pddkjrmnwl5mfki54";

     

       4938
       4938
       +
             rev = "cec0e6dd534ade486b5eeb59ebcfa8d51c3e8c5e";

     

       4939
       4939
       +
             sha256 = "0gv5bhc7jpsaxg7rgj52kvsnxrkqpww63zychrxc8mafbc3jfnn0";

     

       4928
       4940
        
           };

     

       4929
       4941
        
           meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/";

     

       4930
       4942
        
         };

     
···

       5015
       5027
        
       

     

       5016
       5028
        
         mini-nvim = buildVimPluginFrom2Nix {

     

       5017
       5029
        
           pname = "mini.nvim";

     

       5018
       5018
       -
           version = "2023-04-30";

     

       5030
       5030
       +
           version = "2023-05-04";

     

       5019
       5031
        
           src = fetchFromGitHub {

     

       5020
       5032
        
             owner = "echasnovski";

     

       5021
       5033
        
             repo = "mini.nvim";

     

       5022
       5022
       -
             rev = "88a6b58b4775b78e5028fb18f4bdc3090bb52923";

     

       5023
       5023
       -
             sha256 = "1rn2bcv0rhqwm21aaa813w9b2dkv3g0r58f3y4vc2hy0b8yxq1lh";

     

       5034
       5034
       +
             rev = "37837ffe6b8be7ce0d8d23adb3f413a56e712543";

     

       5035
       5035
       +
             sha256 = "0fmb5l9vgh4x1yq18qrway4sdvw27kfmfsi7b8wwkd7gc766643i";

     

       5024
       5036
        
           };

     

       5025
       5037
        
           meta.homepage = "https://github.com/echasnovski/mini.nvim/";

     

       5026
       5038
        
         };

     
···

       5375
       5387
        
       

     

       5376
       5388
        
         neoconf-nvim = buildVimPluginFrom2Nix {

     

       5377
       5389
        
           pname = "neoconf.nvim";

     

       5378
       5378
       -
           version = "2023-04-27";

     

       5390
       5390
       +
           version = "2023-05-03";

     

       5379
       5391
        
           src = fetchFromGitHub {

     

       5380
       5392
        
             owner = "folke";

     

       5381
       5393
        
             repo = "neoconf.nvim";

     

       5382
       5382
       -
             rev = "ccc79c8096b0171c770a59a05d69a22f49d6d6c9";

     

       5383
       5383
       -
             sha256 = "0is0wxx8315a8qx63zf97646pva4n50qbfmg54bz327hf8bqnfaf";

     

       5394
       5394
       +
             rev = "321f4ff65cbec0e67e54f1a03354b8e6367c8230";

     

       5395
       5395
       +
             sha256 = "0sm52j2cd664b3c9cfzin0wmdq9j31ij1sqxjndmymg1a3ip9gzk";

     

       5384
       5396
        
           };

     

       5385
       5397
        
           meta.homepage = "https://github.com/folke/neoconf.nvim/";

     

       5386
       5398
        
         };

     
···

       5399
       5411
        
       

     

       5400
       5412
        
         neodev-nvim = buildVimPluginFrom2Nix {

     

       5401
       5413
        
           pname = "neodev.nvim";

     

       5402
       5402
       -
           version = "2023-04-29";

     

       5414
       5414
       +
           version = "2023-05-03";

     

       5403
       5415
        
           src = fetchFromGitHub {

     

       5404
       5416
        
             owner = "folke";

     

       5405
       5417
        
             repo = "neodev.nvim";

     

       5406
       5406
       -
             rev = "7e3f718f43de41053f77b1e8de6de2b759fc4023";

     

       5407
       5407
       -
             sha256 = "17f5bvjac682gcp9f3i4sg4n6nwlhjax8n63krjfkxw37rbzhxp6";

     

       5418
       5418
       +
             rev = "ab4c68129b5fefe5c6bb6d7e92283d3f8bdf8566";

     

       5419
       5419
       +
             sha256 = "1b784p5cysrji8hvafs3kkrf1fpqrb08ji720q23rc60yyvqz0bp";

     

       5408
       5420
        
           };

     

       5409
       5421
        
           meta.homepage = "https://github.com/folke/neodev.nvim/";

     

       5410
       5422
        
         };

     
···

       5423
       5435
        
       

     

       5424
       5436
        
         neogen = buildVimPluginFrom2Nix {

     

       5425
       5437
        
           pname = "neogen";

     

       5426
       5426
       -
           version = "2023-03-27";

     

       5438
       5438
       +
           version = "2023-05-03";

     

       5427
       5439
        
           src = fetchFromGitHub {

     

       5428
       5440
        
             owner = "danymat";

     

       5429
       5441
        
             repo = "neogen";

     

       5430
       5430
       -
             rev = "9c17225aac94bdbf93baf16e1b2d2c6dcffb0901";

     

       5431
       5431
       -
             sha256 = "1plc0kb0pdyciwd4kwgcqqiqn4k0gzlp4p8s1578x1bjlf1cpwwk";

     

       5442
       5442
       +
             rev = "c0fd3dc9e7cc91181ea5a345c4b01c865626c81e";

     

       5443
       5443
       +
             sha256 = "03ga3mhhhad4nlqx5r6afj2rmxy4j830cmvspvqamkkf0m7xn9ag";

     

       5432
       5444
        
           };

     

       5433
       5445
        
           meta.homepage = "https://github.com/danymat/neogen/";

     

       5434
       5446
        
         };

     

       5435
       5447
        
       

     

       5436
       5448
        
         neogit = buildVimPluginFrom2Nix {

     

       5437
       5449
        
           pname = "neogit";

     

       5438
       5438
       -
           version = "2023-04-13";

     

       5450
       5450
       +
           version = "2023-05-03";

     

       5439
       5451
        
           src = fetchFromGitHub {

     

       5440
       5452
        
             owner = "TimUntersberger";

     

       5441
       5453
        
             repo = "neogit";

     

       5442
       5442
       -
             rev = "69a6ca7c41b023ebf9cad70778e227b3209b40c4";

     

       5443
       5443
       -
             sha256 = "1r5dii9510hb4qd63g32hrrrn8m3dmhwlp8l2ilig2vzcpics6mq";

     

       5454
       5454
       +
             rev = "d7c66e5e8752e0cc76336a78c4432648cf3102e1";

     

       5455
       5455
       +
             sha256 = "0h5q4i8q2nz4a4lwr9gkrllqmn2dz4b14yazdyvq2ljjaqziv03q";

     

       5444
       5456
        
           };

     

       5445
       5457
        
           meta.homepage = "https://github.com/TimUntersberger/neogit/";

     

       5446
       5458
        
         };

     
···

       5495
       5507
        
       

     

       5496
       5508
        
         neorg = buildVimPluginFrom2Nix {

     

       5497
       5509
        
           pname = "neorg";

     

       5498
       5498
       -
           version = "2023-05-01";

     

       5510
       5510
       +
           version = "2023-05-04";

     

       5499
       5511
        
           src = fetchFromGitHub {

     

       5500
       5512
        
             owner = "nvim-neorg";

     

       5501
       5513
        
             repo = "neorg";

     

       5502
       5502
       -
             rev = "ecfb426fcd9e8cd606645d05553b3e835288fab3";

     

       5503
       5503
       -
             sha256 = "066d5i1yc39jmzv70bdiqb6gf7fpq49xj6k765v9hpv86z7fshmh";

     

       5514
       5514
       +
             rev = "6aa9fd303c807ed1ca3fb15cdeab1e322d02fd31";

     

       5515
       5515
       +
             sha256 = "1xlaq1fv1a511gm1s1j04jirfsq7i6p2rxnjf1dlfr45qscfw15v";

     

       5504
       5516
        
           };

     

       5505
       5517
        
           meta.homepage = "https://github.com/nvim-neorg/neorg/";

     

       5506
       5518
        
         };

     
···

       5555
       5567
        
       

     

       5556
       5568
        
         neotest = buildVimPluginFrom2Nix {

     

       5557
       5569
        
           pname = "neotest";

     

       5558
       5558
       -
           version = "2023-04-27";

     

       5570
       5570
       +
           version = "2023-05-02";

     

       5559
       5571
        
           src = fetchFromGitHub {

     

       5560
       5572
        
             owner = "nvim-neotest";

     

       5561
       5573
        
             repo = "neotest";

     

       5562
       5562
       -
             rev = "972a7dc9dfe860649edaf89e08c514a98d3a2a09";

     

       5563
       5563
       -
             sha256 = "12yj02k9yjflq4p10wwb354mxc773vdibmiyf503xp56q48c3rbp";

     

       5574
       5574
       +
             rev = "32beac0c0736aeb7fcb7eb6cd93307bb5eeee30a";

     

       5575
       5575
       +
             sha256 = "15rhzz4kw34ncavwa26kxq4l05xi98dcjsri3lj5w9q5nidxphxd";

     

       5564
       5576
        
           };

     

       5565
       5577
        
           meta.homepage = "https://github.com/nvim-neotest/neotest/";

     

       5566
       5578
        
         };

     
···

       5927
       5939
        
       

     

       5928
       5940
        
         nlsp-settings-nvim = buildVimPluginFrom2Nix {

     

       5929
       5941
        
           pname = "nlsp-settings.nvim";

     

       5930
       5930
       -
           version = "2023-05-01";

     

       5942
       5942
       +
           version = "2023-05-04";

     

       5931
       5943
        
           src = fetchFromGitHub {

     

       5932
       5944
        
             owner = "tamago324";

     

       5933
       5945
        
             repo = "nlsp-settings.nvim";

     

       5934
       5934
       -
             rev = "9443ee10595ee8e0a481f949e827f156b8c63b9f";

     

       5935
       5935
       -
             sha256 = "0r7nmrlrp9lfg8z69i3ngna9kfwyszlp6f4d33pzn9v1if14mcp9";

     

       5946
       5946
       +
             rev = "91bec1718f9ee1e8de61303c274d1c5fe1d31572";

     

       5947
       5947
       +
             sha256 = "1prc20fsn1zcj8xjck3960zwj3d07dx96850x891dz5hw9v9g3rs";

     

       5936
       5948
        
           };

     

       5937
       5949
        
           meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";

     

       5938
       5950
        
         };

     
···

       5975
       5987
        
       

     

       5976
       5988
        
         noice-nvim = buildVimPluginFrom2Nix {

     

       5977
       5989
        
           pname = "noice.nvim";

     

       5978
       5978
       -
           version = "2023-04-22";

     

       5990
       5990
       +
           version = "2023-05-04";

     

       5979
       5991
        
           src = fetchFromGitHub {

     

       5980
       5992
        
             owner = "folke";

     

       5981
       5993
        
             repo = "noice.nvim";

     

       5982
       5982
       -
             rev = "0f12ed399e79aa49f283aa954468b92be65e03ed";

     

       5983
       5983
       -
             sha256 = "196lc9y6bfxivsfkck739dkr66arf3jgqgyaha34nc7mk9s0395g";

     

       5994
       5994
       +
             rev = "6a7649413ef61123c333f422ee95840c04ece161";

     

       5995
       5995
       +
             sha256 = "05gfgwlvxmr9zy6dw862pdddpdhxww8d76gpj6yn017vcfpy9nia";

     

       5984
       5996
        
           };

     

       5985
       5997
        
           meta.homepage = "https://github.com/folke/noice.nvim/";

     

       5986
       5998
        
         };

     
···

       6167
       6179
        
       

     

       6168
       6180
        
         nvim-cmp = buildNeovimPluginFrom2Nix {

     

       6169
       6181
        
           pname = "nvim-cmp";

     

       6170
       6170
       -
           version = "2023-05-01";

     

       6182
       6182
       +
           version = "2023-05-04";

     

       6171
       6183
        
           src = fetchFromGitHub {

     

       6172
       6184
        
             owner = "hrsh7th";

     

       6173
       6185
        
             repo = "nvim-cmp";

     

       6174
       6174
       -
             rev = "c3f7c54f6efed83b5657b1cf2e2a9bb7c121c6b4";

     

       6175
       6175
       -
             sha256 = "10d1va35izy4cxbpsyh5h2p5jqxwlwpb5pafhb8fw72rqf02lda7";

     

       6186
       6186
       +
             rev = "0f47dcaf7e39d64cd067e090e6f2eda6326e7366";

     

       6187
       6187
       +
             sha256 = "0gjs3cji176wszq5nk0dr1xvw7k3wlbl98zxnn645b325fwfpwcr";

     

       6176
       6188
        
           };

     

       6177
       6189
        
           meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";

     

       6178
       6190
        
         };

     
···

       6251
       6263
        
       

     

       6252
       6264
        
         nvim-config-local = buildVimPluginFrom2Nix {

     

       6253
       6265
        
           pname = "nvim-config-local";

     

       6254
       6254
       -
           version = "2022-03-26";

     

       6266
       6266
       +
           version = "2023-05-03";

     

       6255
       6267
        
           src = fetchFromGitHub {

     

       6256
       6268
        
             owner = "klen";

     

       6257
       6269
        
             repo = "nvim-config-local";

     

       6258
       6258
       -
             rev = "af59d6344e555917209f7304709bbff7cea9b5cc";

     

       6259
       6259
       -
             sha256 = "1wg6g4rqpj12sjj0g1qxqgcpkzr7x82lk90lf6qczim97r3lj9hy";

     

       6270
       6270
       +
             rev = "55b9f8520a39b45fbfc9526c39765c7c9ed2c166";

     

       6271
       6271
       +
             sha256 = "062dvy8fdpg3zgh70hqsk0n29mz0izfll9g6hs34ssg6gkn2b3vf";

     

       6260
       6272
        
           };

     

       6261
       6273
        
           meta.homepage = "https://github.com/klen/nvim-config-local/";

     

       6262
       6274
        
         };

     
···

       6311
       6323
        
       

     

       6312
       6324
        
         nvim-dap-ui = buildVimPluginFrom2Nix {

     

       6313
       6325
        
           pname = "nvim-dap-ui";

     

       6314
       6314
       -
           version = "2023-04-09";

     

       6326
       6326
       +
           version = "2023-05-02";

     

       6315
       6327
        
           src = fetchFromGitHub {

     

       6316
       6328
        
             owner = "rcarriga";

     

       6317
       6329
        
             repo = "nvim-dap-ui";

     

       6318
       6318
       -
             rev = "286f682f366fbc652b38dff893569374e9433dd3";

     

       6319
       6319
       -
             sha256 = "1kd54ivihbm847iqxpbjz227zzwmca40lxmc4qaacbcm8afbs24i";

     

       6330
       6330
       +
             rev = "749bfe12d1447703899fa823c1c075fbe2d42c24";

     

       6331
       6331
       +
             sha256 = "1yrd8v91miyni5pka2x6vryfmgpsx73hpdx3inzvs2hkm5kaydpi";

     

       6320
       6332
        
           };

     

       6321
       6333
        
           meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";

     

       6322
       6334
        
         };

     
···

       6407
       6419
        
       

     

       6408
       6420
        
         nvim-highlite = buildVimPluginFrom2Nix {

     

       6409
       6421
        
           pname = "nvim-highlite";

     

       6410
       6410
       -
           version = "2023-05-01";

     

       6422
       6422
       +
           version = "2023-05-04";

     

       6411
       6423
        
           src = fetchFromGitHub {

     

       6412
       6424
        
             owner = "Iron-E";

     

       6413
       6425
        
             repo = "nvim-highlite";

     

       6414
       6414
       -
             rev = "ab5f7c3bf32401f1d6c90b31db309daf6d004ebf";

     

       6415
       6415
       -
             sha256 = "0yf5pzgskia5rxc3hx479rs4qwi2c2dqajvib80119jbf7av11j6";

     

       6426
       6426
       +
             rev = "624fddaf856add7a4a9a40b33fad3bb3818f4fc8";

     

       6427
       6427
       +
             sha256 = "1r65wcpbdqi05mpa9382bawv32l2r0s8avr9in5q07sl66wd59v8";

     

       6416
       6428
        
           };

     

       6417
       6429
        
           meta.homepage = "https://github.com/Iron-E/nvim-highlite/";

     

       6418
       6430
        
         };

     
···

       6527
       6539
        
       

     

       6528
       6540
        
         nvim-lspconfig = buildVimPluginFrom2Nix {

     

       6529
       6541
        
           pname = "nvim-lspconfig";

     

       6530
       6530
       -
           version = "2023-05-01";

     

       6542
       6542
       +
           version = "2023-05-03";

     

       6531
       6543
        
           src = fetchFromGitHub {

     

       6532
       6544
        
             owner = "neovim";

     

       6533
       6545
        
             repo = "nvim-lspconfig";

     

       6534
       6534
       -
             rev = "5f7a8311dd6e67de74c12fa9ac2f1aa75f72b19e";

     

       6535
       6535
       -
             sha256 = "1m00hlixyisv2ccvsnnv0rir5y4219m8y6xns673j6hsg5jsnjsg";

     

       6546
       6546
       +
             rev = "3bd4ca412982afa6f88bb7ef890660cee51c3e58";

     

       6547
       6547
       +
             sha256 = "1rnzqr5wnk0zfi85dnrqccqs7jrg8ibd9bqzj4qqsqz40l6bli1s";

     

       6536
       6548
        
           };

     

       6537
       6549
        
           meta.homepage = "https://github.com/neovim/nvim-lspconfig/";

     

       6538
       6550
        
         };

     
···

       6575
       6587
        
       

     

       6576
       6588
        
         nvim-metals = buildVimPluginFrom2Nix {

     

       6577
       6589
        
           pname = "nvim-metals";

     

       6578
       6578
       -
           version = "2023-04-26";

     

       6590
       6590
       +
           version = "2023-05-02";

     

       6579
       6591
        
           src = fetchFromGitHub {

     

       6580
       6592
        
             owner = "scalameta";

     

       6581
       6593
        
             repo = "nvim-metals";

     

       6582
       6582
       -
             rev = "26968e2768ffd59f7dcc26693c534ca91a80c928";

     

       6583
       6583
       -
             sha256 = "0vgpkcdxicfrnbr38kxlqlhy6fqb3rm36rn89ywhnfk9qakn0l0a";

     

       6594
       6594
       +
             rev = "facb97d53843cdeb6f5483744a3e6060304b01b4";

     

       6595
       6595
       +
             sha256 = "0j2rc7vbq3957sqajf619agg7v2b2scdyn23qmicpzsmxsd298ij";

     

       6584
       6596
        
           };

     

       6585
       6597
        
           meta.homepage = "https://github.com/scalameta/nvim-metals/";

     

       6586
       6598
        
         };

     
···

       6803
       6815
        
       

     

       6804
       6816
        
         nvim-tree-lua = buildVimPluginFrom2Nix {

     

       6805
       6817
        
           pname = "nvim-tree.lua";

     

       6806
       6806
       -
           version = "2023-04-30";

     

       6818
       6818
       +
           version = "2023-05-03";

     

       6807
       6819
        
           src = fetchFromGitHub {

     

       6808
       6820
        
             owner = "nvim-tree";

     

       6809
       6821
        
             repo = "nvim-tree.lua";

     

       6810
       6810
       -
             rev = "0df384b6c0fa62ff1333634d56ee4df0be5d34e1";

     

       6811
       6811
       -
             sha256 = "1iqw7hwdjs5fdcpjmizi16pxpgak5zf73p78v0sdwyx8z4pd82vn";

     

       6822
       6822
       +
             rev = "53295de04d265fba695ec5a21912bdf36647dbad";

     

       6823
       6823
       +
             sha256 = "09i9x7d54ph6v30ih13cbmy0sicavsbzl22c0sp8srwphv4m8hpj";

     

       6812
       6824
        
           };

     

       6813
       6825
        
           meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";

     

       6814
       6826
        
         };

     

       6815
       6827
        
       

     

       6816
       6828
        
         nvim-treesitter = buildVimPluginFrom2Nix {

     

       6817
       6829
        
           pname = "nvim-treesitter";

     

       6818
       6818
       -
           version = "2023-05-01";

     

       6830
       6830
       +
           version = "2023-05-04";

     

       6819
       6831
        
           src = fetchFromGitHub {

     

       6820
       6832
        
             owner = "nvim-treesitter";

     

       6821
       6833
        
             repo = "nvim-treesitter";

     

       6822
       6822
       -
             rev = "b4d2640eab4b1f6373e1ded84ab9f6db0c02c756";

     

       6823
       6823
       -
             sha256 = "0ha614qcnklqcnayy0fxw901mk9njcwqrf5hcpd7dvbwx60iqz54";

     

       6834
       6834
       +
             rev = "54741de02c18fae1b33d2b0da36f5ef946712073";

     

       6835
       6835
       +
             sha256 = "0l6m3sf03yxjf1y77w0nx5jnd9vfahz03yrgfzpnvjbd8y3vn70y";

     

       6824
       6836
        
           };

     

       6825
       6837
        
           meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";

     

       6826
       6838
        
         };

     

       6827
       6839
        
       

     

       6828
       6840
        
         nvim-treesitter-context = buildVimPluginFrom2Nix {

     

       6829
       6841
        
           pname = "nvim-treesitter-context";

     

       6830
       6830
       -
           version = "2023-05-01";

     

       6842
       6842
       +
           version = "2023-05-04";

     

       6831
       6843
        
           src = fetchFromGitHub {

     

       6832
       6844
        
             owner = "nvim-treesitter";

     

       6833
       6845
        
             repo = "nvim-treesitter-context";

     

       6834
       6834
       -
             rev = "e1dc868e61766499746b5b7b22671efc1f33181e";

     

       6835
       6835
       -
             sha256 = "1y8rhx9315pnj43925ljjyxykpdg126zzqzhd2dprikhn9clh3w9";

     

       6846
       6846
       +
             rev = "0226dd639712141235d5c9eefde47365d15d0535";

     

       6847
       6847
       +
             sha256 = "1j9bd6k5pnprwpfw1wkppa0bfn9wqc31hgpj4bvivl1k25vmagwm";

     

       6836
       6848
        
           };

     

       6837
       6849
        
           meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/";

     

       6838
       6850
        
         };

     
···

       6875
       6887
        
       

     

       6876
       6888
        
         nvim-treesitter-textobjects = buildVimPluginFrom2Nix {

     

       6877
       6889
        
           pname = "nvim-treesitter-textobjects";

     

       6878
       6878
       -
           version = "2023-04-29";

     

       6890
       6890
       +
           version = "2023-05-04";

     

       6879
       6891
        
           src = fetchFromGitHub {

     

       6880
       6892
        
             owner = "nvim-treesitter";

     

       6881
       6893
        
             repo = "nvim-treesitter-textobjects";

     

       6882
       6882
       -
             rev = "85a6f9d1af8b731f09f4031e1f9478d4b40d13ab";

     

       6883
       6883
       -
             sha256 = "1dgqvj5j24r3058vxqykj9j7dhf6pjnch7bccxdnc4an4x0hmwiz";

     

       6894
       6894
       +
             rev = "5632f926833493bf44de3d0c214169a062b068df";

     

       6895
       6895
       +
             sha256 = "1p4zxhbhsdxxigrhp1lbrk43414w8bz61x2rk4vw253ky3j5bfbq";

     

       6884
       6896
        
           };

     

       6885
       6897
        
           meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";

     

       6886
       6898
        
         };

     
···

       7042
       7054
        
       

     

       7043
       7055
        
         oil-nvim = buildVimPluginFrom2Nix {

     

       7044
       7056
        
           pname = "oil.nvim";

     

       7045
       7045
       -
           version = "2023-04-29";

     

       7057
       7057
       +
           version = "2023-05-03";

     

       7046
       7058
        
           src = fetchFromGitHub {

     

       7047
       7059
        
             owner = "stevearc";

     

       7048
       7060
        
             repo = "oil.nvim";

     

       7049
       7049
       -
             rev = "82c706822bb13a8ea7a21e0e3dccc83eaf40bfbc";

     

       7050
       7050
       -
             sha256 = "0qkp0axsbq7wwdqr20zqmgvc8k2zi3rfrspi5d0c5qq5yih518b5";

     

       7061
       7061
       +
             rev = "37cb6be6f6f98c4616ca382ad955c709dc38f39d";

     

       7062
       7062
       +
             sha256 = "1gni86ghw68mf332438naqsgpiwl07g4qral2mhkcga94kjaw1sg";

     

       7051
       7063
        
             fetchSubmodules = true;

     

       7052
       7064
        
           };

     

       7053
       7065
        
           meta.homepage = "https://github.com/stevearc/oil.nvim/";

     
···

       7091
       7103
        
       

     

       7092
       7104
        
         onedark-vim = buildVimPluginFrom2Nix {

     

       7093
       7105
        
           pname = "onedark.vim";

     

       7094
       7094
       -
           version = "2022-10-10";

     

       7106
       7106
       +
           version = "2023-05-02";

     

       7095
       7107
        
           src = fetchFromGitHub {

     

       7096
       7108
        
             owner = "joshdick";

     

       7097
       7109
        
             repo = "onedark.vim";

     

       7098
       7098
       -
             rev = "b6b5ffe31a195a3077338d7a506b905e4a51590f";

     

       7099
       7099
       -
             sha256 = "0mw0z6z33xrxs5yp5d2jm8wvrlicj084gmw858sbx9d9ph4sdyj3";

     

       7110
       7110
       +
             rev = "4e983447f0442dba1629cdaeddfd137793d71d28";

     

       7111
       7111
       +
             sha256 = "1vg5zfzyl9c93w9i3d4i22px558warma9gnpafgklrxkwq1hxq0h";

     

       7100
       7112
        
           };

     

       7101
       7113
        
           meta.homepage = "https://github.com/joshdick/onedark.vim/";

     

       7102
       7114
        
         };

     

       7103
       7115
        
       

     

       7104
       7116
        
         onedarkpro-nvim = buildVimPluginFrom2Nix {

     

       7105
       7117
        
           pname = "onedarkpro.nvim";

     

       7106
       7106
       -
           version = "2023-04-22";

     

       7118
       7118
       +
           version = "2023-05-04";

     

       7107
       7119
        
           src = fetchFromGitHub {

     

       7108
       7120
        
             owner = "olimorris";

     

       7109
       7121
        
             repo = "onedarkpro.nvim";

     

       7110
       7110
       -
             rev = "0147f69893496b3df605d64acdf4b66f03b0654e";

     

       7111
       7111
       -
             sha256 = "11xxjw1x5dn32g42v61kxyr2g4j0nci4skla4bp4lkdywi6ag1cp";

     

       7122
       7122
       +
             rev = "d9d6cd9ba5b4e9d15ea2e9730ccf569f7fd0ffaa";

     

       7123
       7123
       +
             sha256 = "0lpsdcic1nllbx2q6dgg6s8sw5is3j52ckyxii8prcy3rqg20f00";

     

       7112
       7124
        
           };

     

       7113
       7125
        
           meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";

     

       7114
       7126
        
         };

     
···

       7175
       7187
        
       

     

       7176
       7188
        
         orgmode = buildVimPluginFrom2Nix {

     

       7177
       7189
        
           pname = "orgmode";

     

       7178
       7178
       -
           version = "2023-05-01";

     

       7190
       7190
       +
           version = "2023-05-04";

     

       7179
       7191
        
           src = fetchFromGitHub {

     

       7180
       7192
        
             owner = "nvim-orgmode";

     

       7181
       7193
        
             repo = "orgmode";

     

       7182
       7182
       -
             rev = "4647d20e33bf14c70fd44e1a4ee071ce1351d139";

     

       7183
       7183
       -
             sha256 = "1rrqbkqk837plkizzxp83w4agqikccgp6582ijwxhnc526qlz7nm";

     

       7194
       7194
       +
             rev = "07d412eb15155c8391945a5bbbfd1caa996888bc";

     

       7195
       7195
       +
             sha256 = "118q7in4s18hh71gwfyd1b8nxn6ac4rzc97zbxncn85hnpl9rfsb";

     

       7184
       7196
        
           };

     

       7185
       7197
        
           meta.homepage = "https://github.com/nvim-orgmode/orgmode/";

     

       7186
       7198
        
         };

     
···

       7693
       7705
        
       

     

       7694
       7706
        
         rest-nvim = buildNeovimPluginFrom2Nix {

     

       7695
       7707
        
           pname = "rest.nvim";

     

       7696
       7696
       -
           version = "2023-04-27";

     

       7708
       7708
       +
           version = "2023-05-04";

     

       7697
       7709
        
           src = fetchFromGitHub {

     

       7698
       7710
        
             owner = "rest-nvim";

     

       7699
       7711
        
             repo = "rest.nvim";

     

       7700
       7700
       -
             rev = "4ca39f739919c43b620c6fc9e314fdee136bdd54";

     

       7701
       7701
       -
             sha256 = "1jwr0gbz0rrp8gfc05l3m9x6y108n88ara4ckc01a75sr5k3nk5d";

     

       7712
       7712
       +
             rev = "3bb920f28faf15f7dbd78e3ebef69fb5655327dc";

     

       7713
       7713
       +
             sha256 = "0czhzhv45y79iwm2yyc9afjzsl88y28y71jqnvwkxp2ycyk87hz6";

     

       7702
       7714
        
           };

     

       7703
       7715
        
           meta.homepage = "https://github.com/rest-nvim/rest.nvim/";

     

       7704
       7716
        
         };

     
···

       7933
       7945
        
       

     

       7934
       7946
        
         seoul256-vim = buildVimPluginFrom2Nix {

     

       7935
       7947
        
           pname = "seoul256.vim";

     

       7936
       7936
       -
           version = "2023-01-05";

     

       7948
       7948
       +
           version = "2023-05-03";

     

       7937
       7949
        
           src = fetchFromGitHub {

     

       7938
       7950
        
             owner = "junegunn";

     

       7939
       7951
        
             repo = "seoul256.vim";

     

       7940
       7940
       -
             rev = "8f81a2f9f7ced9f8edea7f8a06caf5eaa9d9a217";

     

       7941
       7941
       -
             sha256 = "0vjdmiapz4mx9c2hg39hs45k9zwj5zk8cl757dfwbj6y5fqkznv6";

     

       7952
       7952
       +
             rev = "b21c9e63f7c2d543db8b34a393a0b42ec7e9b891";

     

       7953
       7953
       +
             sha256 = "0bj3c0869b8wvx9rskp3hhw85a0abysgkm4zzmacrxhkcslnayiw";

     

       7942
       7954
        
           };

     

       7943
       7955
        
           meta.homepage = "https://github.com/junegunn/seoul256.vim/";

     

       7944
       7956
        
         };

     
···

       8018
       8030
        
       

     

       8019
       8031
        
         smart-splits-nvim = buildVimPluginFrom2Nix {

     

       8020
       8032
        
           pname = "smart-splits.nvim";

     

       8021
       8021
       -
           version = "2023-04-30";

     

       8033
       8033
       +
           version = "2023-05-02";

     

       8022
       8034
        
           src = fetchFromGitHub {

     

       8023
       8035
        
             owner = "mrjones2014";

     

       8024
       8036
        
             repo = "smart-splits.nvim";

     

       8025
       8025
       -
             rev = "c9ed0ebe308bf157fe7c2f10ab6d9dbef5b2be94";

     

       8026
       8026
       -
             sha256 = "1b06w8gn76qhnirgrhkn18hi1vb6ylws2pg4nakr8ga7bj6djm38";

     

       8037
       8037
       +
             rev = "a2668b59bf3f9b87d47b42e7e8d08200ff0ab3b5";

     

       8038
       8038
       +
             sha256 = "0lgm0vp42q6sz4ncv0mrss39c0sidb085plkww9k62n1pdwd8kwv";

     

       8027
       8039
        
           };

     

       8028
       8040
        
           meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";

     

       8029
       8041
        
         };

     
···

       8319
       8331
        
       

     

       8320
       8332
        
         statuscol-nvim = buildVimPluginFrom2Nix {

     

       8321
       8333
        
           pname = "statuscol.nvim";

     

       8322
       8322
       -
           version = "2023-04-23";

     

       8334
       8334
       +
           version = "2023-05-02";

     

       8323
       8335
        
           src = fetchFromGitHub {

     

       8324
       8336
        
             owner = "luukvbaal";

     

       8325
       8337
        
             repo = "statuscol.nvim";

     

       8326
       8326
       -
             rev = "b115b5d7a4ea5d4b152d61d89457cc874e08a7d1";

     

       8327
       8327
       -
             sha256 = "026j7m8la14pfz9xqmw13gr1x8c9yx9ykqq4wa8x7cyf3a1s8z13";

     

       8338
       8338
       +
             rev = "7ee8d982331019fec3a90ec87b98d6b4405cacbe";

     

       8339
       8339
       +
             sha256 = "1khw24f5a9ssnya2l2kg6d16bn7mw1ny1w9r985w7fga9j46w0zv";

     

       8328
       8340
        
           };

     

       8329
       8341
        
           meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/";

     

       8330
       8342
        
         };

     
···

       9164
       9176
        
       

     

       9165
       9177
        
         tokyonight-nvim = buildVimPluginFrom2Nix {

     

       9166
       9178
        
           pname = "tokyonight.nvim";

     

       9167
       9167
       -
           version = "2023-04-28";

     

       9179
       9179
       +
           version = "2023-05-03";

     

       9168
       9180
        
           src = fetchFromGitHub {

     

       9169
       9181
        
             owner = "folke";

     

       9170
       9182
        
             repo = "tokyonight.nvim";

     

       9171
       9171
       -
             rev = "c5df636ce62a8aab7565f35da143cfd672526302";

     

       9172
       9172
       -
             sha256 = "1pfhrkn4r5r4pnr7jfc6cv29ijjvyacs7zpyarhi6fzkvnwz4pdw";

     

       9183
       9183
       +
             rev = "f2ed28707a0ad49047d9b733395ea205ea09f517";

     

       9184
       9184
       +
             sha256 = "0815fywkzjdf28lc3cc9dly2kz8hanbid8zb9rzw41lbwbmkmmwz";

     

       9173
       9185
        
           };

     

       9174
       9186
        
           meta.homepage = "https://github.com/folke/tokyonight.nvim/";

     

       9175
       9187
        
         };

     
···

       9200
       9212
        
       

     

       9201
       9213
        
         treesj = buildVimPluginFrom2Nix {

     

       9202
       9214
        
           pname = "treesj";

     

       9203
       9203
       -
           version = "2023-04-24";

     

       9215
       9215
       +
           version = "2023-05-03";

     

       9204
       9216
        
           src = fetchFromGitHub {

     

       9205
       9217
        
             owner = "Wansmer";

     

       9206
       9218
        
             repo = "treesj";

     

       9207
       9207
       -
             rev = "cba4aca075e4a9687cfd34b40328cac06126bc07";

     

       9208
       9208
       -
             sha256 = "0dz4a8jnq5ii0h8amlc5gcx08qqgnj7y2l6hb89iihqibvcny0ma";

     

       9219
       9219
       +
             rev = "f487c9117c79b118ab792ffdd12125626c63b281";

     

       9220
       9220
       +
             sha256 = "06nd1r7biba3fqpy04014rvcwaqsbhhxawv4mchyi357b602jb8w";

     

       9209
       9221
        
           };

     

       9210
       9222
        
           meta.homepage = "https://github.com/Wansmer/treesj/";

     

       9211
       9223
        
         };

     
···

       9356
       9368
        
       

     

       9357
       9369
        
         unison = buildVimPluginFrom2Nix {

     

       9358
       9370
        
           pname = "unison";

     

       9359
       9359
       -
           version = "2023-05-01";

     

       9371
       9371
       +
           version = "2023-05-04";

     

       9360
       9372
        
           src = fetchFromGitHub {

     

       9361
       9373
        
             owner = "unisonweb";

     

       9362
       9374
        
             repo = "unison";

     

       9363
       9363
       -
             rev = "7e6936ed62620080322ca254dfb60aabb9bc6774";

     

       9364
       9364
       -
             sha256 = "1bz41fcp7ry8wpl38q9q03kc2mwc2cnqy3m28fvyzcplpary0x2d";

     

       9375
       9375
       +
             rev = "bb80d37d39c48d4870c0574657cf0337ec733d33";

     

       9376
       9376
       +
             sha256 = "1pn4qyn26ai6vr9i992kp5jn6858pz7n64m1zmj6bpc635g4rrbr";

     

       9365
       9377
        
           };

     

       9366
       9378
        
           meta.homepage = "https://github.com/unisonweb/unison/";

     

       9367
       9379
        
         };

     
···

       9452
       9464
        
       

     

       9453
       9465
        
         vifm-vim = buildVimPluginFrom2Nix {

     

       9454
       9466
        
           pname = "vifm.vim";

     

       9455
       9455
       -
           version = "2023-04-04";

     

       9467
       9467
       +
           version = "2023-05-04";

     

       9456
       9468
        
           src = fetchFromGitHub {

     

       9457
       9469
        
             owner = "vifm";

     

       9458
       9470
        
             repo = "vifm.vim";

     

       9459
       9459
       -
             rev = "a8130c37d144b51d84bee19f0532abcd3583383f";

     

       9460
       9460
       -
             sha256 = "17afzlz508ry5cc52w2dgs480pm8qbr9skr56k944jcrh430rz4y";

     

       9471
       9471
       +
             rev = "07fec88cc592d131e028cb70242c8b216ecde149";

     

       9472
       9472
       +
             sha256 = "0abmwq4sqfq3b3qmn49czj6avd5m5h0h3n6gdna5bj7vs19dbg8f";

     

       9461
       9473
        
           };

     

       9462
       9474
        
           meta.homepage = "https://github.com/vifm/vifm.vim/";

     

       9463
       9475
        
         };

     
···

       10916
       10928
        
       

     

       10917
       10929
        
         vim-flog = buildVimPluginFrom2Nix {

     

       10918
       10930
        
           pname = "vim-flog";

     

       10919
       10919
       -
           version = "2023-04-14";

     

       10931
       10931
       +
           version = "2023-05-02";

     

       10920
       10932
        
           src = fetchFromGitHub {

     

       10921
       10933
        
             owner = "rbong";

     

       10922
       10934
        
             repo = "vim-flog";

     

       10923
       10923
       -
             rev = "79d12ed0384d2934c27daee8f5f49b8390c56014";

     

       10924
       10924
       -
             sha256 = "0q084z6lbhd84qgl7zz6xkfzy8x5raw3lm5gix93wdi0kzczchpn";

     

       10935
       10935
       +
             rev = "21dd4d655339560d0f4b876852ef0cc8ff16b7f1";

     

       10936
       10936
       +
             sha256 = "01c3y9gkx4gmr5b6bxcdf0g45bd6w7ka0dm74jflfw75gg9c69rf";

     

       10925
       10937
        
           };

     

       10926
       10938
        
           meta.homepage = "https://github.com/rbong/vim-flog/";

     

       10927
       10939
        
         };

     
···

       11854
       11866
        
       

     

       11855
       11867
        
         vim-lsp = buildVimPluginFrom2Nix {

     

       11856
       11868
        
           pname = "vim-lsp";

     

       11857
       11857
       -
           version = "2023-04-27";

     

       11869
       11869
       +
           version = "2023-05-04";

     

       11858
       11870
        
           src = fetchFromGitHub {

     

       11859
       11871
        
             owner = "prabirshrestha";

     

       11860
       11872
        
             repo = "vim-lsp";

     

       11861
       11861
       -
             rev = "507565f281a739c7aa1d3852d96baaaf4ee93882";

     

       11862
       11862
       -
             sha256 = "0d8gpb3nw5p5wilg70gf3vbr6xgjq4h4v82fmnyyjysxx2hc5vkf";

     

       11873
       11873
       +
             rev = "6017a30e8ac75774be8cdae7bd996efbc9c1598b";

     

       11874
       11874
       +
             sha256 = "1p4a081x4vfy3rli5n4a4mmnykq0lpx38qhkkgbnc7fvw92x2468";

     

       11863
       11875
        
           };

     

       11864
       11876
        
           meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";

     

       11865
       11877
        
         };

     
···

       12395
       12407
        
       

     

       12396
       12408
        
         vim-oscyank = buildVimPluginFrom2Nix {

     

       12397
       12409
        
           pname = "vim-oscyank";

     

       12398
       12398
       -
           version = "2023-04-19";

     

       12410
       12410
       +
           version = "2023-05-02";

     

       12399
       12411
        
           src = fetchFromGitHub {

     

       12400
       12412
        
             owner = "ojroques";

     

       12401
       12413
        
             repo = "vim-oscyank";

     

       12402
       12402
       -
             rev = "7fa8b04562d4ba2c23e67e7038256ecabc8fc376";

     

       12403
       12403
       -
             sha256 = "0cbpjffjk8ydwb9kv1sblggrs5j2hdk7l57xy7k0r7rwd5kmwj5k";

     

       12414
       12414
       +
             rev = "ce025bd8237a6228beabb04b66d29566b2453f7b";

     

       12415
       12415
       +
             sha256 = "1grlz5dn35mqn9gqkvs3qg9qd9wvwiib7ln459pll0nkfycbf20g";

     

       12404
       12416
        
           };

     

       12405
       12417
        
           meta.homepage = "https://github.com/ojroques/vim-oscyank/";

     

       12406
       12418
        
         };

     
···

       13488
       13500
        
       

     

       13489
       13501
        
         vim-test = buildVimPluginFrom2Nix {

     

       13490
       13502
        
           pname = "vim-test";

     

       13491
       13491
       -
           version = "2023-04-24";

     

       13503
       13503
       +
           version = "2023-05-02";

     

       13492
       13504
        
           src = fetchFromGitHub {

     

       13493
       13505
        
             owner = "vim-test";

     

       13494
       13506
        
             repo = "vim-test";

     

       13495
       13495
       -
             rev = "5af7aa2a07c70f730b03c893821366961b108cf2";

     

       13496
       13496
       -
             sha256 = "0pgbq148pfizjklg4276n9rniklqqhhlg48p73i2capgkm50hnjd";

     

       13507
       13507
       +
             rev = "c19be85a9b3d8b86f37533bfeb82cbe189cd895e";

     

       13508
       13508
       +
             sha256 = "16216q8d0dd10i84sh5v5p6bmvfbw86sh7zd7k0fwbaa6yfbpk2v";

     

       13497
       13509
        
           };

     

       13498
       13510
        
           meta.homepage = "https://github.com/vim-test/vim-test/";

     

       13499
       13511
        
         };

     
···

       14208
       14220
        
       

     

       14209
       14221
        
         vimspector = buildVimPluginFrom2Nix {

     

       14210
       14222
        
           pname = "vimspector";

     

       14211
       14211
       -
           version = "2023-05-01";

     

       14223
       14223
       +
           version = "2023-05-02";

     

       14212
       14224
        
           src = fetchFromGitHub {

     

       14213
       14225
        
             owner = "puremourning";

     

       14214
       14226
        
             repo = "vimspector";

     

       14215
       14215
       -
             rev = "6cb63b9329685b750b9b689a942c47b9012c8bbc";

     

       14216
       14216
       -
             sha256 = "1y9vs7gyv8810d8frm11izbcvasj777rw448mmzag2agksyv17yf";

     

       14227
       14227
       +
             rev = "e69222931721673d48fa9177325b1740e93e6ac7";

     

       14228
       14228
       +
             sha256 = "090kcz3jzz1yk52hv8l4l80aszs2cs782f07ca6l40v33ng4pgkk";

     

       14217
       14229
        
             fetchSubmodules = true;

     

       14218
       14230
        
           };

     

       14219
       14231
        
           meta.homepage = "https://github.com/puremourning/vimspector/";

     
···

       14221
       14233
        
       

     

       14222
       14234
        
         vimtex = buildVimPluginFrom2Nix {

     

       14223
       14235
        
           pname = "vimtex";

     

       14224
       14224
       -
           version = "2023-05-01";

     

       14236
       14236
       +
           version = "2023-05-03";

     

       14225
       14237
        
           src = fetchFromGitHub {

     

       14226
       14238
        
             owner = "lervag";

     

       14227
       14239
        
             repo = "vimtex";

     

       14228
       14228
       -
             rev = "871ac461e9314598b5b26c3a1a9f5e36c17dff14";

     

       14229
       14229
       -
             sha256 = "1n1qyg5v4r8j816y5abqclhmsyny0k3arwlz23rlvdidwq5d1zn8";

     

       14240
       14240
       +
             rev = "18255a2370812696138cb415a5b02925d33ef569";

     

       14241
       14241
       +
             sha256 = "1m9c499n34xlr6vjrb6zqgwj6g1j39xxdwl9c4f6biamraxix365";

     

       14230
       14242
        
           };

     

       14231
       14243
        
           meta.homepage = "https://github.com/lervag/vimtex/";

     

       14232
       14244
        
         };

     
···

       14341
       14353
        
       

     

       14342
       14354
        
         which-key-nvim = buildVimPluginFrom2Nix {

     

       14343
       14355
        
           pname = "which-key.nvim";

     

       14344
       14344
       -
           version = "2023-04-27";

     

       14356
       14356
       +
           version = "2023-05-04";

     

       14345
       14357
        
           src = fetchFromGitHub {

     

       14346
       14358
        
             owner = "folke";

     

       14347
       14359
        
             repo = "which-key.nvim";

     

       14348
       14348
       -
             rev = "4acffc92953a90a790603bfdab7c92319ab167b1";

     

       14349
       14349
       -
             sha256 = "1msiqpxsnmdxgxcxhlpgjaz9fyg2jy4lbvfv0p8b265vlnym4ymy";

     

       14360
       14360
       +
             rev = "af8f26bfbb61b5f722c9fbc72b296dc9db0bcfdc";

     

       14361
       14361
       +
             sha256 = "196g7rf2d0jvi7gj2l37rggn81pfd7d8wz0b967yqffjsl4jk0ay";

     

       14350
       14362
        
           };

     

       14351
       14363
        
           meta.homepage = "https://github.com/folke/which-key.nvim/";

     

       14352
       14364
        
         };

     
···

       14582
       14594
        
       

     

       14583
       14595
        
         zig-vim = buildVimPluginFrom2Nix {

     

       14584
       14596
        
           pname = "zig.vim";

     

       14585
       14585
       -
           version = "2023-02-15";

     

       14597
       14597
       +
           version = "2023-05-03";

     

       14586
       14598
        
           src = fetchFromGitHub {

     

       14587
       14599
        
             owner = "ziglang";

     

       14588
       14600
        
             repo = "zig.vim";

     

       14589
       14589
       -
             rev = "a0d9adedafeb1a33a0159d16ddcdf194b7cea881";

     

       14590
       14590
       -
             sha256 = "0qcjwms102cpdbjamda3cbdwbqdk4zj5zrvr9dlj2lmwkdjqqfdz";

     

       14601
       14601
       +
             rev = "a9633f5f5905e448049933bfcdaab632447c4394";

     

       14602
       14602
       +
             sha256 = "1bi82sdq7x46f6z9xv24x3ahhsg7bxcm2wabjfw5wmlpp6m13csa";

     

       14591
       14603
        
           };

     

       14592
       14604
        
           meta.homepage = "https://github.com/ziglang/zig.vim/";

     

       14593
       14605
        
         };

     
···

       14630
       14642
        
       

     

       14631
       14643
        
         catppuccin-nvim = buildVimPluginFrom2Nix {

     

       14632
       14644
        
           pname = "catppuccin-nvim";

     

       14633
       14633
       -
           version = "2023-04-30";

     

       14645
       14645
       +
           version = "2023-05-03";

     

       14634
       14646
        
           src = fetchFromGitHub {

     

       14635
       14647
        
             owner = "catppuccin";

     

       14636
       14648
        
             repo = "nvim";

     

       14637
       14637
       -
             rev = "94d10b558e679447064fe72ddf764b6fea3f0c85";

     

       14638
       14638
       -
             sha256 = "0pklfhfhwnwgnjdkv80gwc3wjcd2q7hsjs7wwjsbn5j6bv1f3x5s";

     

       14649
       14649
       +
             rev = "a7e279d6e019f35dd042670f00748b602fff5568";

     

       14650
       14650
       +
             sha256 = "024w2z0j54sz6mq3xx0fwnaz36d635s4y45fp22rbvg7idr4cnn8";

     

       14639
       14651
        
           };

     

       14640
       14652
        
           meta.homepage = "https://github.com/catppuccin/nvim/";

     

       14641
       14653
        
         };

     
···

       14702
       14714
        
       

     

       14703
       14715
        
         lspsaga-nvim-original = buildVimPluginFrom2Nix {

     

       14704
       14716
        
           pname = "lspsaga-nvim-original";

     

       14705
       14705
       -
           version = "2023-04-28";

     

       14717
       14717
       +
           version = "2023-05-03";

     

       14706
       14718
        
           src = fetchFromGitHub {

     

       14707
       14719
        
             owner = "nvimdev";

     

       14708
       14720
        
             repo = "lspsaga.nvim";

     

       14709
       14709
       -
             rev = "349b3d412d4d277a7b2971352319a463952623c4";

     

       14710
       14710
       -
             sha256 = "0y507651aqznknzw5fw0v7mwp6bcxz03cqgzmyrkb5qvbhpzdsj4";

     

       14721
       14721
       +
             rev = "f65d03cad9f3ab6c2c83ac0fbe2cda50731eb79b";

     

       14722
       14722
       +
             sha256 = "09aspcjvf6a8rv2yl7mzxs0p8xrnyw2gx8438sdmhis41hq770s0";

     

       14711
       14723
        
           };

     

       14712
       14724
        
           meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/";

     

       14713
       14725
        
         };

     
···

       14726
       14738
        
       

     

       14727
       14739
        
         nord-vim = buildVimPluginFrom2Nix {

     

       14728
       14740
        
           pname = "nord-vim";

     

       14729
       14729
       -
           version = "2023-04-10";

     

       14741
       14741
       +
           version = "2023-05-03";

     

       14730
       14742
        
           src = fetchFromGitHub {

     

       14731
       14743
        
             owner = "nordtheme";

     

       14732
       14744
        
             repo = "vim";

     

       14733
       14733
       -
             rev = "f725ac643afce04021c9abcbb57711fcb9fa71e9";

     

       14734
       14734
       -
             sha256 = "0pbgcpqfzwari78v5yypidcy5rlxdsklg77fkjgzxgkjikmbil8s";

     

       14745
       14745
       +
             rev = "f13f5dfbb784deddbc1d8195f34dfd9ec73e2295";

     

       14746
       14746
       +
             sha256 = "1f3k8hxf21fij776xw830f71wvl6v5qmv5h806l773c9sx2dp1rz";

     

       14735
       14747
        
           };

     

       14736
       14748
        
           meta.homepage = "https://github.com/nordtheme/vim/";

     

       14737
       14749
        
         };

+21 -21

pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix

···

       115
       115
        
         };

     

       116
       116
        
         blueprint = buildGrammar {

     

       117
       117
        
           language = "blueprint";

     

       118
       118
       -
           version = "0.0.0+rev=6ef91ca";

     

       118
       118
       +
           version = "0.0.0+rev=7f1a5df";

     

       119
       119
        
           src = fetchFromGitLab {

     

       120
       120
        
             owner = "gabmus";

     

       121
       121
        
             repo = "tree-sitter-blueprint";

     

       122
       122
       -
             rev = "6ef91ca8270f0112b9c6d27ecb9966c741a5d103";

     

       123
       123
       -
             hash = "sha256-E7SWUWQFlFWXfmdqNXt2eKkvFusnBUILHerQEFj2JTg=";

     

       122
       122
       +
             rev = "7f1a5df44861291d6951b6b2146a9fef4c226e14";

     

       123
       123
       +
             hash = "sha256-ihbcrDRMA+jGs7ZmDU1j9PwTEYY6SyMhC0vgmh1Om6Y=";

     

       124
       124
        
           };

     

       125
       125
        
           meta.homepage = "https://gitlab.com/gabmus/tree-sitter-blueprint.git";

     

       126
       126
        
         };

     
···

       137
       137
        
         };

     

       138
       138
        
         c_sharp = buildGrammar {

     

       139
       139
        
           language = "c_sharp";

     

       140
       140
       -
           version = "0.0.0+rev=0dd182a";

     

       140
       140
       +
           version = "0.0.0+rev=2340fd6";

     

       141
       141
        
           src = fetchFromGitHub {

     

       142
       142
        
             owner = "tree-sitter";

     

       143
       143
        
             repo = "tree-sitter-c-sharp";

     

       144
       144
       -
             rev = "0dd182a14a519a70dc60c3727fdc2fdb65c030ae";

     

       145
       145
       -
             hash = "sha256-yIZUsEJvQkxD4gNp4jQRGtEeSTLeSdgFdJs03nvt9ko=";

     

       144
       144
       +
             rev = "2340fd6b57b06ccbf24c2c6dafb15905fdccfb1f";

     

       145
       145
       +
             hash = "sha256-9acxVw5EWr/NwO5ERwy3V976NMY65vDQp60jIoDfO7k=";

     

       146
       146
        
           };

     

       147
       147
        
           meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp";

     

       148
       148
        
         };

     
···

       292
       292
        
         };

     

       293
       293
        
         dart = buildGrammar {

     

       294
       294
        
           language = "dart";

     

       295
       295
       -
           version = "0.0.0+rev=53485a8";

     

       295
       295
       +
           version = "0.0.0+rev=3abbd3a";

     

       296
       296
        
           src = fetchFromGitHub {

     

       297
       297
        
             owner = "UserNobody14";

     

       298
       298
        
             repo = "tree-sitter-dart";

     

       299
       299
       -
             rev = "53485a8f301254e19c518aa20c80f1bcf7cf5c62";

     

       300
       300
       -
             hash = "sha256-1IcvFcxIkcrOuq6bypD08PeYw6J/pL/MbYPt+dKHQbc=";

     

       299
       299
       +
             rev = "3abbd3a486a1e356acfdf0367dbf3680f8a0024d";

     

       300
       300
       +
             hash = "sha256-+rIUp5mlO0yw/Bj+yxbgKQZlP+QdNf484CsuikZatLw=";

     

       301
       301
        
           };

     

       302
       302
        
           meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart";

     

       303
       303
        
         };

     
···

       336
       336
        
         };

     

       337
       337
        
         dockerfile = buildGrammar {

     

       338
       338
        
           language = "dockerfile";

     

       339
       339
       -
           version = "0.0.0+rev=8ee3a0f";

     

       339
       339
       +
           version = "0.0.0+rev=fd30df6";

     

       340
       340
        
           src = fetchFromGitHub {

     

       341
       341
        
             owner = "camdencheek";

     

       342
       342
        
             repo = "tree-sitter-dockerfile";

     

       343
       343
       -
             rev = "8ee3a0f7587b2bd8c45c8cb7d28bd414604aec62";

     

       344
       344
       -
             hash = "sha256-I73T3NuN/K9+R3itIJrNVjlyVr/432UT3HEf6LND+0c=";

     

       343
       343
       +
             rev = "fd30df68c4178964ed012ef7f745055db76f8ebf";

     

       344
       344
       +
             hash = "sha256-k5KQ0GfTveXadgQk0xay2QY7uCvFYneQ/0AKwZqAG48=";

     

       345
       345
        
           };

     

       346
       346
        
           meta.homepage = "https://github.com/camdencheek/tree-sitter-dockerfile";

     

       347
       347
        
         };

     
···

       722
       722
        
         };

     

       723
       723
        
         haskell = buildGrammar {

     

       724
       724
        
           language = "haskell";

     

       725
       725
       -
           version = "0.0.0+rev=3241b68";

     

       725
       725
       +
           version = "0.0.0+rev=684638e";

     

       726
       726
        
           src = fetchFromGitHub {

     

       727
       727
        
             owner = "tree-sitter";

     

       728
       728
        
             repo = "tree-sitter-haskell";

     

       729
       729
       -
             rev = "3241b683cc1eaa466afb83b9a5592ab39caaa2fa";

     

       730
       730
       -
             hash = "sha256-kGUBAXskVPRQHMwffYLRGO6uD9PNFWZeXkXsmp0yfKA=";

     

       729
       729
       +
             rev = "684638edce563245e4dc6263940aeffa2a0205c2";

     

       730
       730
       +
             hash = "sha256-ewMSd1DpaZEkbjHzUNX3D1CbhNjP47StyyvjU+oVaMM=";

     

       731
       731
        
           };

     

       732
       732
        
           meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell";

     

       733
       733
        
         };

     
···

       997
       997
        
         };

     

       998
       998
        
         llvm = buildGrammar {

     

       999
       999
        
           language = "llvm";

     

       1000
       1000
       -
           version = "0.0.0+rev=e9948ed";

     

       1000
       1000
       +
           version = "0.0.0+rev=d47c95d";

     

       1001
       1001
        
           src = fetchFromGitHub {

     

       1002
       1002
        
             owner = "benwilliamgraham";

     

       1003
       1003
        
             repo = "tree-sitter-llvm";

     

       1004
       1004
       -
             rev = "e9948edc41e9e5869af99dddb2b5ff5cc5581af6";

     

       1005
       1005
       -
             hash = "sha256-M7smrjU+7L9a2kpz0wM+G+YQGTQaqsVL/Q+OCKlPpzQ=";

     

       1004
       1004
       +
             rev = "d47c95d78ef0e7495a74d214dd6fcddf6e402dfc";

     

       1005
       1005
       +
             hash = "sha256-CK7f0qSAsec2cuQElXLFRQ5uiQLGCyEpNIKTIDwbBrU=";

     

       1006
       1006
        
           };

     

       1007
       1007
        
           meta.homepage = "https://github.com/benwilliamgraham/tree-sitter-llvm";

     

       1008
       1008
        
         };

     

       1009
       1009
        
         lua = buildGrammar {

     

       1010
       1010
        
           language = "lua";

     

       1011
       1011
       -
           version = "0.0.0+rev=0fc8996";

     

       1011
       1011
       +
           version = "0.0.0+rev=4e94980";

     

       1012
       1012
        
           src = fetchFromGitHub {

     

       1013
       1013
        
             owner = "MunifTanjim";

     

       1014
       1014
        
             repo = "tree-sitter-lua";

     

       1015
       1015
       -
             rev = "0fc89962b7ff5c7d676b8592c1cbce1ceaa806fd";

     

       1016
       1016
       -
             hash = "sha256-MbNP1/NKdSkUTydmK819o8vMKUZFan1yE7d227xMsh4=";

     

       1015
       1015
       +
             rev = "4e94980e52f81f713d09be104ba32bf050000031";

     

       1016
       1016
       +
             hash = "sha256-Arv627RIv0d/plfBPq5QVks737PUy3sq2kuLwLr++uM=";

     

       1017
       1017
        
           };

     

       1018
       1018
        
           meta.homepage = "https://github.com/MunifTanjim/tree-sitter-lua";

     

       1019
       1019
        
         };

pkgs/applications/editors/vim/plugins/vim-plugin-names

···

       353
       353
        
       https://github.com/JuliaEditorSupport/julia-vim/,,

     

       354
       354
        
       https://github.com/rebelot/kanagawa.nvim/,,

     

       355
       355
        
       https://github.com/anuvyklack/keymap-layer.nvim/,HEAD,

     

       356
       356
       +
       https://github.com/kmonad/kmonad-vim/,,

     

       356
       357
        
       https://github.com/b3nj5m1n/kommentary/,,

     

       357
       358
        
       https://github.com/udalov/kotlin-vim/,,

     

       358
       359
        
       https://github.com/qnighy/lalrpop.vim/,,

+3 -3

pkgs/applications/networking/browsers/mullvad-browser/default.nix

···

       76
       76
        
             ++ lib.optionals mediaSupport [ ffmpeg ]

     

       77
       77
        
         );

     

       78
       78
        
       

     

       79
       79
       -
         tag = "mullvad-browser-102.9.0esr-12.0-2-build1";

     

       80
       80
       -
         version = "12.0.4";

     

       79
       79
       +
         tag = "mullvad-browser-102.10.0esr-12.0-2-build2";

     

       80
       80
       +
         version = "12.0.5";

     

       81
       81
        
         lang = "ALL";

     

       82
       82
        
       

     

       83
       83
        
         srcs = {

     

       84
       84
        
           x86_64-linux = fetchurl {

     

       85
       85
        
             url = "https://github.com/mullvad/mullvad-browser/releases/download/${tag}/mullvad-browser-linux64-${version}_${lang}.tar.xz";

     

       86
       86
       -
             hash = "sha256-q4dTKNQkcqaRwiF25iVOQSvwVLA3tJRlQ4DzC3tuG5A=";

     

       86
       86
       +
             hash = "sha256-Ezs2pjJNGOinMIskBDwpj70eKSkfcV6ZCKb60I5J23w=";

     

       87
       87
        
           };

     

       88
       88
        
         };

     

       89
       89

+2 -2

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

···

       7
       7
        
       

     

       8
       8
        
       buildGoModule rec {

     

       9
       9
        
         pname = "arkade";

     

       10
       10
       -
         version = "0.9.13";

     

       10
       10
       +
         version = "0.9.16";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "alexellis";

     

       14
       14
        
           repo = "arkade";

     

       15
       15
        
           rev = version;

     

       16
       16
       -
           sha256 = "sha256-j7fqLkVRAH4EN90IQ/9y/uKfFsdXXTW6R/WFRhuKPGQ=";

     

       16
       16
       +
           sha256 = "sha256-HbwajFTCjiNtAMawI7uBZhIBGyVHUQQjsOrtuxuYmeM=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         CGO_ENABLED = 0;

+2 -2

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

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "pachyderm";

     

       5
       5
       -
         version = "2.5.4";

     

       5
       5
       +
         version = "2.5.5";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "pachyderm";

     

       9
       9
        
           repo = "pachyderm";

     

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

     

       11
       11
       -
           hash = "sha256-VYHSExQDIyK86kCz3gzIR+Q5iYrhkAPx56vST73vPOo=";

     

       11
       11
       +
           hash = "sha256-RaMOn5Cb98wKI9w0+kVUCMiySKGuudXHsi+EXFIm3Zc=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorHash = "sha256-XmIPifozTYd1rV2wm0dU0GPvg/+HFoSLGHB6DDrkzVc=";

+16 -1

pkgs/applications/networking/instant-messengers/discord/default.nix

···

       4
       4
        
           stable = "0.0.26";

     

       5
       5
        
           ptb = "0.0.42";

     

       6
       6
        
           canary = "0.0.151";

     

       7
       7
       +
           development = "0.0.216";

     

       7
       8
        
         } else {

     

       8
       9
        
           stable = "0.0.273";

     

       9
       10
        
           ptb = "0.0.59";

     

       10
       11
        
           canary = "0.0.283";

     

       12
       12
       +
           development = "0.0.8778";

     

       11
       13
        
         };

     

       12
       14
        
         version = versions.${branch};

     

       13
       15
        
         srcs = rec {

     
···

       24
       26
        
               url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";

     

       25
       27
        
               sha256 = "sha256-ZN+lEGtSajgYsyMoGRmyTZCpUGVmb9LKgVv89NA4m7U=";

     

       26
       28
        
             };

     

       29
       29
       +
             development = fetchurl {

     

       30
       30
       +
               url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";

     

       31
       31
       +
               sha256 = "sha256-lQnIQC7Wek7OYDzZvLIJfb8I4oATD8pSB+mjQMPyqYQ=";

     

       32
       32
       +
             };

     

       27
       33
        
           };

     

       28
       34
        
           x86_64-darwin = {

     

       29
       35
        
             stable = fetchurl {

     
···

       38
       44
        
               url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";

     

       39
       45
        
               sha256 = "0mqpk1szp46mih95x42ld32rrspc6jx1j7qdaxf01whzb3d4pi9l";

     

       40
       46
        
             };

     

       47
       47
       +
             development = fetchurl {

     

       48
       48
       +
               url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";

     

       49
       49
       +
               sha256 = "sha256-K4rlShYhmsjT2QHjb6+IbCXJFK+9REIx/gW68bcVSVc=";

     

       50
       50
       +
             };

     

       41
       51
        
           };

     

       42
       52
        
           aarch64-darwin = x86_64-darwin;

     

       43
       53
        
         };

     
···

       49
       59
        
           downloadPage = "https://discordapp.com/download";

     

       50
       60
        
           sourceProvenance = with sourceTypes; [ binaryNativeCode ];

     

       51
       61
        
           license = licenses.unfree;

     

       52
       52
       -
           maintainers = with maintainers; [ MP2E artturin infinidoge ];

     

       62
       62
       +
           maintainers = with maintainers; [ MP2E artturin infinidoge jopejoe1 ];

     

       53
       63
        
           platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];

     

       54
       64
        
         };

     

       55
       65
        
         package =

     
···

       82
       92
        
                 pname = "discord-canary";

     

       83
       93
        
                 binaryName = if stdenv.isLinux then "DiscordCanary" else desktopName;

     

       84
       94
        
                 desktopName = "Discord Canary";

     

       95
       95
       +
               };

     

       96
       96
       +
               development = rec {

     

       97
       97
       +
                 pname = "discord-development";

     

       98
       98
       +
                 binaryName = if stdenv.isLinux then "DiscordDevelopment" else desktopName;

     

       99
       99
       +
                 desktopName = "Discord Development";

     

       85
       100
        
               };

     

       86
       101
        
             }

     

       87
       102
        
         );

+2 -2

pkgs/applications/version-management/git-machete/default.nix

···

       12
       12
        
       

     

       13
       13
        
       buildPythonApplication rec {

     

       14
       14
        
         pname = "git-machete";

     

       15
       15
       -
         version = "3.17.1";

     

       15
       15
       +
         version = "3.17.3";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "virtuslab";

     

       19
       19
        
           repo = pname;

     

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

     

       21
       21
       -
           hash = "sha256-UpByKN2L0g42ProwHNRxPw6ggxyDVTUZfWRF+TpUVKc=";

     

       21
       21
       +
           hash = "sha256-XBgYLrbxHE5czcEzYhX4ORQFtyKHcDw3VmZVx2TtycI=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [ installShellFiles ];

+6 -6

pkgs/applications/version-management/gitlab/data.json

···

       1
       1
        
       {

     

       2
       2
       -
         "version": "15.11.1",

     

       3
       3
       -
         "repo_hash": "sha256-xhwWn/+GSAKYy5YcjgIUPJUvhBquvCWu6eFg5ZiNM7s=",

     

       2
       2
       +
         "version": "15.11.2",

     

       3
       3
       +
         "repo_hash": "sha256-4wdbe/DkZdfmOuKHlmBEKQYYduIaB1SD5ZYICHqADeE=",

     

       4
       4
        
         "yarn_hash": "02ipm7agjy3c75df76c00k3qq5gpw3d876f6x91xnwizswsv9agb",

     

       5
       5
        
         "owner": "gitlab-org",

     

       6
       6
        
         "repo": "gitlab",

     

       7
       7
       -
         "rev": "v15.11.1-ee",

     

       7
       7
       +
         "rev": "v15.11.2-ee",

     

       8
       8
        
         "passthru": {

     

       9
       9
       -
           "GITALY_SERVER_VERSION": "15.11.1",

     

       10
       10
       -
           "GITLAB_PAGES_VERSION": "15.11.1",

     

       9
       9
       +
           "GITALY_SERVER_VERSION": "15.11.2",

     

       10
       10
       +
           "GITLAB_PAGES_VERSION": "15.11.2",

     

       11
       11
        
           "GITLAB_SHELL_VERSION": "14.18.0",

     

       12
       12
       -
           "GITLAB_WORKHORSE_VERSION": "15.11.1"

     

       12
       12
       +
           "GITLAB_WORKHORSE_VERSION": "15.11.2"

     

       13
       13
        
         }

     

       14
       14
        
       }

+2 -2

pkgs/applications/version-management/gitlab/gitaly/default.nix

···

       11
       11
        
           gemdir = ./.;

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         version = "15.11.1";

     

       14
       14
       +
         version = "15.11.2";

     

       15
       15
        
         package_version = "v${lib.versions.major version}";

     

       16
       16
        
         gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";

     

       17
       17
        
       

     
···

       22
       22
        
             owner = "gitlab-org";

     

       23
       23
        
             repo = "gitaly";

     

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

     

       25
       25
       -
             sha256 = "sha256-D12R9liFsrH0XwGSLkmhCbWMbPXrp0kzus4t4Kuw4cg=";

     

       25
       25
       +
             sha256 = "sha256-yX93YHHajXqAQq93mM/bRCQciDfJ0GR3kLSO4MQsWPY=";

     

       26
       26
        
           };

     

       27
       27
        
       

     

       28
       28
        
           vendorSha256 = "sha256-gJelagGPogeCdJtRpj4RaYlqzZRhtU0EIhmj1aK4ZOk=";

+2 -2

pkgs/applications/version-management/gitlab/gitlab-pages/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "gitlab-pages";

     

       5
       5
       -
         version = "15.11.1";

     

       5
       5
       +
         version = "15.11.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitLab {

     

       8
       8
        
           owner = "gitlab-org";

     

       9
       9
        
           repo = "gitlab-pages";

     

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

     

       11
       11
       -
           sha256 = "sha256-BPChY2t0ygH73XZYDWDb0EVPqrniMxzg3JWgcmsAesA=";

     

       11
       11
       +
           sha256 = "sha256-c5brpl9OEW4N8vmphdCRYl5TGkMN3FmXmINPpyEajUs=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorHash = "sha256-s3HHoz9URACuVVhePQQFviTqlQU7vCLOjTJPBlus1Vo=";

+1 -1

pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix

···

       5
       5
        
       buildGoModule rec {

     

       6
       6
        
         pname = "gitlab-workhorse";

     

       7
       7
        
       

     

       8
       8
       -
         version = "15.11.1";

     

       8
       8
       +
         version = "15.11.2";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitLab {

     

       11
       11
        
           owner = data.owner;

+10 -1

pkgs/applications/virtualization/OVMF/default.nix

···

       3
       3
        
       , secureBoot ? false

     

       4
       4
        
       , httpSupport ? false

     

       5
       5
        
       , tpmSupport ? false

     

       6
       6
       +
       , tlsSupport ? false

     

       7
       7
       +
       , debug ? false

     

       8
       8
       +
       , sourceDebug ? debug

     

       6
       9
        
       }:

     

       7
       10
        
       

     

       8
       11
        
       assert csmSupport -> seabios != null;

     
···

       41
       44
        
         hardeningDisable = [ "format" "stackprotector" "pic" "fortify" ];

     

       42
       45
        
       

     

       43
       46
        
         buildFlags =

     

       44
       44
       -
           lib.optionals secureBoot [ "-D SECURE_BOOT_ENABLE=TRUE" ]

     

       47
       47
       +
           # IPv6 has no reason to be disabled.

     

       48
       48
       +
           [ "-D NETWORK_IP6_ENABLE=TRUE" ]

     

       49
       49
       +
           ++ lib.optionals debug [ "-D DEBUG_ON_SERIAL_PORT=TRUE" ]

     

       50
       50
       +
           ++ lib.optionals sourceDebug [ "-D SOURCE_DEBUG_ENABLE=TRUE" ]

     

       51
       51
       +
           ++ lib.optionals secureBoot [ "-D SECURE_BOOT_ENABLE=TRUE" ]

     

       45
       52
        
           ++ lib.optionals csmSupport [ "-D CSM_ENABLE" "-D FD_SIZE_2MB" ]

     

       46
       53
        
           ++ lib.optionals httpSupport [ "-D NETWORK_HTTP_ENABLE=TRUE" "-D NETWORK_HTTP_BOOT_ENABLE=TRUE" ]

     

       54
       54
       +
           ++ lib.optionals tlsSupport [ "-D NETWORK_TLS_ENABLE=TRUE" ]

     

       47
       55
        
           ++ lib.optionals tpmSupport [ "-D TPM_ENABLE" "-D TPM2_ENABLE" "-D TPM2_CONFIG_ENABLE"];

     

       48
       56
        
       

     

       57
       57
       +
         buildConfig = if debug then "DEBUG" else "RELEASE";

     

       49
       58
        
         env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Qunused-arguments";

     

       50
       59
        
       

     

       51
       60
        
         env.PYTHON_COMMAND = "python3";

+2 -2

pkgs/data/icons/numix-icon-theme-circle/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenvNoCC.mkDerivation rec {

     

       4
       4
        
         pname = "numix-icon-theme-circle";

     

       5
       5
       -
         version = "23.04.20";

     

       5
       5
       +
         version = "23.04.28";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "numixproject";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-pc5GwxU4KP6PktPvuCYVzJORVmMvC8GdBPr7QSN2cM0=";

     

       11
       11
       +
           sha256 = "sha256-GxTxywN5+CL/+21xhfCvbxJeGnDNjYrQ7iUd2/eq+QU=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ gtk3 ];

+63

pkgs/data/themes/adi1090x-plymouth-themes/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         stdenv,

     

       3
       3
       +
         fetchurl,

     

       4
       4
       +
         lib,

     

       5
       5
       +
         unzip,

     

       6
       6
       +
         # To select only certain themes, pass `selected_themes` as a list of strings.

     

       7
       7
       +
         # reference ./shas.nix for available themes

     

       8
       8
       +
         selected_themes ? [],

     

       9
       9
       +
       }: let

     

       10
       10
       +
         version = "2020-12-28";

     

       11
       11
       +
         # this file is generated via ./update.sh

     

       12
       12
       +
         # borrowed from pkgs/data/fonts/nerdfonts

     

       13
       13
       +
         themeShas = import ./shas.nix;

     

       14
       14
       +
         knownThemes = builtins.attrNames themeShas;

     

       15
       15
       +
         selectedThemes =

     

       16
       16
       +
           if (selected_themes == [])

     

       17
       17
       +
           then knownThemes

     

       18
       18
       +
           else let

     

       19
       19
       +
             unknown = lib.subtractLists knownThemes selected_themes;

     

       20
       20
       +
           in

     

       21
       21
       +
             if (unknown != [])

     

       22
       22
       +
             then throw "Unknown theme(s): ${lib.concatStringsSep " " unknown}"

     

       23
       23
       +
             else selected_themes;

     

       24
       24
       +
         srcs = lib.lists.forEach selectedThemes (

     

       25
       25
       +
           name: (fetchurl {

     

       26
       26
       +
             url = themeShas.${name}.url;

     

       27
       27
       +
             sha256 = themeShas.${name}.sha;

     

       28
       28
       +
           })

     

       29
       29
       +
         );

     

       30
       30
       +
       in

     

       31
       31
       +
         stdenv.mkDerivation {

     

       32
       32
       +
           pname = "adi1090x-plymouth-themes";

     

       33
       33
       +
           inherit version srcs;

     

       34
       34
       +
       

     

       35
       35
       +
           nativeBuildInputs = [

     

       36
       36
       +
             unzip

     

       37
       37
       +
           ];

     

       38
       38
       +
       

     

       39
       39
       +
           sourceRoot = ".";

     

       40
       40
       +
           unpackCmd = "tar xzf $curSrc";

     

       41
       41
       +
       

     

       42
       42
       +
           installPhase = ''

     

       43
       43
       +
             mkdir -p $out/share/plymouth/themes

     

       44
       44
       +
             for theme in ${toString selectedThemes}; do

     

       45
       45
       +
               mv $theme $out/share/plymouth/themes/$theme

     

       46
       46
       +
             done

     

       47
       47
       +
             find $out/share/plymouth/themes/ -name \*.plymouth -exec sed -i "s@\/usr\/@$out\/@" {} \;

     

       48
       48
       +
           '';

     

       49
       49
       +
       

     

       50
       50
       +
           meta = with lib; {

     

       51
       51
       +
             description = "Plymouth boot themes from adi1090x";

     

       52
       52
       +
             longDescription = ''

     

       53
       53
       +
               A variety of plymouth boot screens by adi1090x.  Using the default value

     

       54
       54
       +
               of `selected_themes` will install all themes (~524M).  Consider overriding

     

       55
       55
       +
               this with a list of the string names of each theme to install.  Check

     

       56
       56
       +
               ./shas.nix for available themes.

     

       57
       57
       +
             '';

     

       58
       58
       +
             homepage = "https://github.com/adi1090x/plymouth-themes";

     

       59
       59
       +
             license = licenses.gpl3;

     

       60
       60
       +
             platforms = platforms.linux;

     

       61
       61
       +
             maintainers = with maintainers; [slwst];

     

       62
       62
       +
           };

     

       63
       63
       +
         }

+322

pkgs/data/themes/adi1090x-plymouth-themes/shas.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         "abstract_ring" = {

     

       3
       3
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/abstract_ring.tar.gz";

     

       4
       4
       +
           sha = "133gifr4571b14ci44jmm49j91yhq785yx4b3h6yvx0188liibr2";

     

       5
       5
       +
         };

     

       6
       6
       +
         "abstract_ring_alt" = {

     

       7
       7
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/abstract_ring_alt.tar.gz";

     

       8
       8
       +
           sha = "157yg2y4vfwjfly2paq2xn1p6h2wrbvvzwy4lbpbhlmhyhrymjvj";

     

       9
       9
       +
         };

     

       10
       10
       +
         "alienware" = {

     

       11
       11
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/alienware.tar.gz";

     

       12
       12
       +
           sha = "1i3i0gj927drbgivcx3fqj6fqdwm2gqy0wrwfkdqdjyqzq1286a5";

     

       13
       13
       +
         };

     

       14
       14
       +
         "angular" = {

     

       15
       15
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/angular.tar.gz";

     

       16
       16
       +
           sha = "06n3ix7k8zpraqc75wy4fnk1bzcyhfajjxjq9kyy470wgsjrw6p4";

     

       17
       17
       +
         };

     

       18
       18
       +
         "angular_alt" = {

     

       19
       19
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/angular_alt.tar.gz";

     

       20
       20
       +
           sha = "1l1iy9p0k4a8mcdps30avscjp6wfv20m9zy376r18y7xwcz19qbj";

     

       21
       21
       +
         };

     

       22
       22
       +
         "black_hud" = {

     

       23
       23
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/black_hud.tar.gz";

     

       24
       24
       +
           sha = "13y32zxcshnfyjxs0r7f1sz010sr6brsaap90im2cb4rlvp0ajsz";

     

       25
       25
       +
         };

     

       26
       26
       +
         "blockchain" = {

     

       27
       27
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/blockchain.tar.gz";

     

       28
       28
       +
           sha = "1f60nvrk506bqw47g90wzbvn3bp5h1gbi0ll5f3bd6wj77qfk05i";

     

       29
       29
       +
         };

     

       30
       30
       +
         "circle" = {

     

       31
       31
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circle.tar.gz";

     

       32
       32
       +
           sha = "04085lkh4i5diszpr1w5xnhnngp8ba1ckalcjj5s8hm8lk6wd4nc";

     

       33
       33
       +
         };

     

       34
       34
       +
         "circle_alt" = {

     

       35
       35
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circle_alt.tar.gz";

     

       36
       36
       +
           sha = "0awbjrd31fv2cb0q7n58h5iji29di8n550bmpz5qdg6xn55baqqx";

     

       37
       37
       +
         };

     

       38
       38
       +
         "circle_flow" = {

     

       39
       39
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circle_flow.tar.gz";

     

       40
       40
       +
           sha = "0ffxgjmx5la55dn3nyqgxi8fyd1ci4wckmvfaa6s1kyd7xsk8785";

     

       41
       41
       +
         };

     

       42
       42
       +
         "circle_hud" = {

     

       43
       43
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circle_hud.tar.gz";

     

       44
       44
       +
           sha = "0sd28d0ac7wvkwmbrnvg42bccz6y4iyl2wp1pg7awwjxvag0azlf";

     

       45
       45
       +
         };

     

       46
       46
       +
         "circuit" = {

     

       47
       47
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circuit.tar.gz";

     

       48
       48
       +
           sha = "1jzlr6c47n3zs0f1cafgjy92sks5060d1gs0774kxc0c96bysypg";

     

       49
       49
       +
         };

     

       50
       50
       +
         "colorful" = {

     

       51
       51
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/colorful.tar.gz";

     

       52
       52
       +
           sha = "18lbyffvhdav5cjh0xnidf09amryf5dcj5rizl9z7ghxpz2z57pr";

     

       53
       53
       +
         };

     

       54
       54
       +
         "colorful_loop" = {

     

       55
       55
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/colorful_loop.tar.gz";

     

       56
       56
       +
           sha = "0qcn19gxl9w2q0w7lihi8wnlwlh8h3k0ddbp3ww9wcw1q0wsy1vi";

     

       57
       57
       +
         };

     

       58
       58
       +
         "colorful_sliced" = {

     

       59
       59
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/colorful_sliced.tar.gz";

     

       60
       60
       +
           sha = "0d9lafg76w2y77ywj1f1p5n1ci2q9jnfqfd16akf6f28h0iz1f9r";

     

       61
       61
       +
         };

     

       62
       62
       +
         "connect" = {

     

       63
       63
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/connect.tar.gz";

     

       64
       64
       +
           sha = "1a0z59l391xv795d8mhcwa816wlmzyl75pwiizvvra2a0i8g6wz0";

     

       65
       65
       +
         };

     

       66
       66
       +
         "cross_hud" = {

     

       67
       67
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/cross_hud.tar.gz";

     

       68
       68
       +
           sha = "188wj6hkvryawmw4r3bwcsvqxx52h10jb4ddq3jx7sh2rz1kpvwa";

     

       69
       69
       +
         };

     

       70
       70
       +
         "cubes" = {

     

       71
       71
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/cubes.tar.gz";

     

       72
       72
       +
           sha = "0bydagjwfkvbhgr7sv903a7pjkrmrdz6vh22i4qjx5rhzw2wvvsk";

     

       73
       73
       +
         };

     

       74
       74
       +
         "cuts" = {

     

       75
       75
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/cuts.tar.gz";

     

       76
       76
       +
           sha = "0znz82zzgyqkfprvzhkzv974amcnxqdg38ajsm4d7wlagc52zs0d";

     

       77
       77
       +
         };

     

       78
       78
       +
         "cuts_alt" = {

     

       79
       79
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/cuts_alt.tar.gz";

     

       80
       80
       +
           sha = "1bgs4v5kkh96m1xh29wjmdxinfsxh4g7lg9fk1nqj87igdg7wwss";

     

       81
       81
       +
         };

     

       82
       82
       +
         "cyanide" = {

     

       83
       83
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/cyanide.tar.gz";

     

       84
       84
       +
           sha = "04aklg9il310iv7zjpan6z4ha7gvh1b0yzgwi91679vm38cg0593";

     

       85
       85
       +
         };

     

       86
       86
       +
         "cybernetic" = {

     

       87
       87
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/cybernetic.tar.gz";

     

       88
       88
       +
           sha = "0ad75fcra24bjzs4pqn89l19wb4rcjph63j71lv60m0rz75vgjfb";

     

       89
       89
       +
         };

     

       90
       90
       +
         "dark_planet" = {

     

       91
       91
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/dark_planet.tar.gz";

     

       92
       92
       +
           sha = "03i2knrfi56f8lbc8hs8rqa4jg432nsmjn74wibb04ppmvm8f47j";

     

       93
       93
       +
         };

     

       94
       94
       +
         "darth_vader" = {

     

       95
       95
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/darth_vader.tar.gz";

     

       96
       96
       +
           sha = "0mlxy17l1hjf3nq390wc26n4x3c45n5hmks75zkzjz3l5ac1fah6";

     

       97
       97
       +
         };

     

       98
       98
       +
         "deus_ex" = {

     

       99
       99
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/deus_ex.tar.gz";

     

       100
       100
       +
           sha = "1mllj0xj9g1nn01vcq0xsfcwd0qnmk1s3vj5d03f9qp513k8qzdl";

     

       101
       101
       +
         };

     

       102
       102
       +
         "dna" = {

     

       103
       103
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/dna.tar.gz";

     

       104
       104
       +
           sha = "0xcf4vxd99w3d44bhrdk1yqsfcakix6cd7hdpjsgccgs1jd02hi1";

     

       105
       105
       +
         };

     

       106
       106
       +
         "double" = {

     

       107
       107
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/double.tar.gz";

     

       108
       108
       +
           sha = "07gxkzqrp0cfisdkq0wqfiai37m2yr2fhcpdpazmzkkxnm4qf25y";

     

       109
       109
       +
         };

     

       110
       110
       +
         "dragon" = {

     

       111
       111
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/dragon.tar.gz";

     

       112
       112
       +
           sha = "0ypr1vyl6zilfzncymlh2s1ivxr7n88kfaygmz2y83l332asjs66";

     

       113
       113
       +
         };

     

       114
       114
       +
         "flame" = {

     

       115
       115
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/flame.tar.gz";

     

       116
       116
       +
           sha = "0kvly5rgp47a4lby3blb1dird9xwy9y9c8a0wg17qfvz3zr69r0g";

     

       117
       117
       +
         };

     

       118
       118
       +
         "glitch" = {

     

       119
       119
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/glitch.tar.gz";

     

       120
       120
       +
           sha = "0s0kmrw01wj9i7qd7zbwvmfbbh7r3jfkc4522jv44m4rl6r4h84c";

     

       121
       121
       +
         };

     

       122
       122
       +
         "glowing" = {

     

       123
       123
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/glowing.tar.gz";

     

       124
       124
       +
           sha = "19nkbk2cw6j763idz5z7l71lx529xcgyx1dcd9qd356x9ifdw206";

     

       125
       125
       +
         };

     

       126
       126
       +
         "green_blocks" = {

     

       127
       127
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/green_blocks.tar.gz";

     

       128
       128
       +
           sha = "0x8pgsyfbchy7z6d4rijsk2nml6fl1xwba0f0h3lw9i6359k7j3j";

     

       129
       129
       +
         };

     

       130
       130
       +
         "green_loader" = {

     

       131
       131
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/green_loader.tar.gz";

     

       132
       132
       +
           sha = "00rdpy1gbc4ikxx487w3k27z622z2rjcsi0d18i23s5p3xqd1l3a";

     

       133
       133
       +
         };

     

       134
       134
       +
         "hexagon" = {

     

       135
       135
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon.tar.gz";

     

       136
       136
       +
           sha = "0yk47hs5qfv09q5df4x6j82ivrxfxh1bxsw8p8x7hcmlb08dh6g6";

     

       137
       137
       +
         };

     

       138
       138
       +
         "hexagon_2" = {

     

       139
       139
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_2.tar.gz";

     

       140
       140
       +
           sha = "175im23q769s2if3xi8j669r0b5y0dagz8rsbvq7kghznzw4abc2";

     

       141
       141
       +
         };

     

       142
       142
       +
         "hexagon_alt" = {

     

       143
       143
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_alt.tar.gz";

     

       144
       144
       +
           sha = "1ayhw1gzrb98hf7f77b6ka5wi19ymp3mljhhgm5lx8w8pwawsxnb";

     

       145
       145
       +
         };

     

       146
       146
       +
         "hexagon_dots" = {

     

       147
       147
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_dots.tar.gz";

     

       148
       148
       +
           sha = "0pdw9ih9fsxvv394yc5vfj7nlq7mca9w05y0s631gnsdzgqxsyd6";

     

       149
       149
       +
         };

     

       150
       150
       +
         "hexagon_dots_alt" = {

     

       151
       151
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_dots_alt.tar.gz";

     

       152
       152
       +
           sha = "0aff3bgpva41b4jk4mp0fxdvli286x4pk3q9ysvps7z7srw4fvvn";

     

       153
       153
       +
         };

     

       154
       154
       +
         "hexagon_hud" = {

     

       155
       155
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_hud.tar.gz";

     

       156
       156
       +
           sha = "0wpmsffdp59dy2g5ggprgr7l50rf131c7v8pbgpir230lpn10xzi";

     

       157
       157
       +
         };

     

       158
       158
       +
         "hexagon_red" = {

     

       159
       159
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_red.tar.gz";

     

       160
       160
       +
           sha = "0fgmma5j6fnjykpwplji4rm57d07l9shfpay079gz1nhbhnq3rkl";

     

       161
       161
       +
         };

     

       162
       162
       +
         "hexa_retro" = {

     

       163
       163
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hexa_retro.tar.gz";

     

       164
       164
       +
           sha = "1cbyhqhv2ysx9w8cpbfidrm0w70wssp4fld0q1g01fgcbg93b7mf";

     

       165
       165
       +
         };

     

       166
       166
       +
         "hud" = {

     

       167
       167
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hud.tar.gz";

     

       168
       168
       +
           sha = "0s01p1n75ckwa69iy5v2z2cg85ipzgx356n4yvdyi1jh9pnl22k9";

     

       169
       169
       +
         };

     

       170
       170
       +
         "hud_2" = {

     

       171
       171
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hud_2.tar.gz";

     

       172
       172
       +
           sha = "1bvkl5f0fwi7xzy23pj3p7c98fbz2zk8abz7frxr0pp0xj3ql87i";

     

       173
       173
       +
         };

     

       174
       174
       +
         "hud_3" = {

     

       175
       175
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hud_3.tar.gz";

     

       176
       176
       +
           sha = "1n5qqkp0qb4mlpp7g20hpvazgwxw4gjb2p0ys0q2bglb3amzc2xr";

     

       177
       177
       +
         };

     

       178
       178
       +
         "hud_space" = {

     

       179
       179
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hud_space.tar.gz";

     

       180
       180
       +
           sha = "0dhajnica048smn5wpwc13ij0n9g6c10a0qxgi4rwiczr7p9vajj";

     

       181
       181
       +
         };

     

       182
       182
       +
         "ibm" = {

     

       183
       183
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/ibm.tar.gz";

     

       184
       184
       +
           sha = "0xri6x716ma3y7d59yn9vm7skw5y53kn6s2ivfrvlfsac9n1zj4m";

     

       185
       185
       +
         };

     

       186
       186
       +
         "infinite_seal" = {

     

       187
       187
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/infinite_seal.tar.gz";

     

       188
       188
       +
           sha = "0r9plydfdc35s2is1zi3pbx3s0bs5hqkim3laiav8fv3rzq0f3lq";

     

       189
       189
       +
         };

     

       190
       190
       +
         "ironman" = {

     

       191
       191
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/ironman.tar.gz";

     

       192
       192
       +
           sha = "0af6qfdqj0n5qgsxg6nnrs2k8xas6cd18jw96mrwfcckpfz091cm";

     

       193
       193
       +
         };

     

       194
       194
       +
         "liquid" = {

     

       195
       195
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/liquid.tar.gz";

     

       196
       196
       +
           sha = "0ghavh6nj68kwcgvrnwbabkzn44zq0m2ic1b2cl278d2vffzqv87";

     

       197
       197
       +
         };

     

       198
       198
       +
         "loader" = {

     

       199
       199
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/loader.tar.gz";

     

       200
       200
       +
           sha = "1zlba3mra45ii0gahlw8v1vq1j7nbfjq62pcjn43vb40zcc1j873";

     

       201
       201
       +
         };

     

       202
       202
       +
         "loader_2" = {

     

       203
       203
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/loader_2.tar.gz";

     

       204
       204
       +
           sha = "1yw4n9bw483pl7m3ks2ajgfldslgyc4gb1kw61fszfp5x4l3k4rg";

     

       205
       205
       +
         };

     

       206
       206
       +
         "loader_alt" = {

     

       207
       207
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/loader_alt.tar.gz";

     

       208
       208
       +
           sha = "1pi97pfhg13wq5s8hai4fd31s6bcfq09r969fl216yxksj8h69wj";

     

       209
       209
       +
         };

     

       210
       210
       +
         "lone" = {

     

       211
       211
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/lone.tar.gz";

     

       212
       212
       +
           sha = "0413mxr8lqlznbps5c4qgbhm0zpz8dlkbdj67r9gvzi9v020qjgl";

     

       213
       213
       +
         };

     

       214
       214
       +
         "metal_ball" = {

     

       215
       215
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/metal_ball.tar.gz";

     

       216
       216
       +
           sha = "129q23q992fxfi976px5r68sf8wqbac3zby4yjh97s48zm83rzb5";

     

       217
       217
       +
         };

     

       218
       218
       +
         "motion" = {

     

       219
       219
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/motion.tar.gz";

     

       220
       220
       +
           sha = "0g84ac8ps69ihic2z7gr4nlwib9ra86il2fdl7rl7w5nc8xzhx1y";

     

       221
       221
       +
         };

     

       222
       222
       +
         "optimus" = {

     

       223
       223
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/optimus.tar.gz";

     

       224
       224
       +
           sha = "1l4bmbiqqypwqvyhcd561nnxhrq5zif8pmkyk2hdwscbq6rlbc7r";

     

       225
       225
       +
         };

     

       226
       226
       +
         "owl" = {

     

       227
       227
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/owl.tar.gz";

     

       228
       228
       +
           sha = "03gqqcvp4320qy1d3az1k2a8rj97alk8qzgkz6xg4akz9ccd731y";

     

       229
       229
       +
         };

     

       230
       230
       +
         "pie" = {

     

       231
       231
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/pie.tar.gz";

     

       232
       232
       +
           sha = "1j479l428gq1b2g0g2ybkf81jzad69n59kphm0ns5gfv6khx10ga";

     

       233
       233
       +
         };

     

       234
       234
       +
         "pixels" = {

     

       235
       235
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/pixels.tar.gz";

     

       236
       236
       +
           sha = "13rfdd9v7h0k2wbwr428h2w8dv5vhhbw03wvirlmafsbhmgjz5xs";

     

       237
       237
       +
         };

     

       238
       238
       +
         "polaroid" = {

     

       239
       239
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/polaroid.tar.gz";

     

       240
       240
       +
           sha = "096iz34hpmicixrdrqaxmx8m83vggm90xqz4zyy5vkpcy3vl60mf";

     

       241
       241
       +
         };

     

       242
       242
       +
         "red_loader" = {

     

       243
       243
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/red_loader.tar.gz";

     

       244
       244
       +
           sha = "0n2jmfy558rma6knraskb7rgccvnayxh7csl0jaarx2xl9zxzzay";

     

       245
       245
       +
         };

     

       246
       246
       +
         "rings" = {

     

       247
       247
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/rings.tar.gz";

     

       248
       248
       +
           sha = "1g9p2cdn1w7dmy2z017xdkv6rm50gdb5qqd8a0y0662fzph5adg0";

     

       249
       249
       +
         };

     

       250
       250
       +
         "rings_2" = {

     

       251
       251
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/rings_2.tar.gz";

     

       252
       252
       +
           sha = "07v4mq1lpw9vfzg0rfxmkyfhyhz3nv5zab5kf10bjjgpjq8c9fi3";

     

       253
       253
       +
         };

     

       254
       254
       +
         "rog" = {

     

       255
       255
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/rog.tar.gz";

     

       256
       256
       +
           sha = "13lcrsdk1v1xn7fxn54xbk1jkh55kmsf813q1v7x8a2l8p9pl0hp";

     

       257
       257
       +
         };

     

       258
       258
       +
         "rog_2" = {

     

       259
       259
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/rog_2.tar.gz";

     

       260
       260
       +
           sha = "0cgc1y1jrb689h9wd7jf3wvf9r996k4ik965v4wclmp9wra5gflk";

     

       261
       261
       +
         };

     

       262
       262
       +
         "seal" = {

     

       263
       263
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/seal.tar.gz";

     

       264
       264
       +
           sha = "0ip23x69ljdj1bwxlhvz3fbg3ia47m2aw6d122v2rqhwqasmy40n";

     

       265
       265
       +
         };

     

       266
       266
       +
         "seal_2" = {

     

       267
       267
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/seal_2.tar.gz";

     

       268
       268
       +
           sha = "1fc91n6ys2fl8xbzdj0ywck87xnyn1gp4jvjk307w49jmkpdzs15";

     

       269
       269
       +
         };

     

       270
       270
       +
         "seal_3" = {

     

       271
       271
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/seal_3.tar.gz";

     

       272
       272
       +
           sha = "1l2jlxhhaf5whbvbdf31ypcasalx4fsd4yn90xybmjq7b27bz5b2";

     

       273
       273
       +
         };

     

       274
       274
       +
         "sliced" = {

     

       275
       275
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/sliced.tar.gz";

     

       276
       276
       +
           sha = "0363lwq3rwdcz3fg47f6kch150vxspvpjdqzg87aahli30kkjfdi";

     

       277
       277
       +
         };

     

       278
       278
       +
         "sphere" = {

     

       279
       279
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/sphere.tar.gz";

     

       280
       280
       +
           sha = "1zjlwign7f2zd70qkg25adbbmq8ndm9b44gc4pa0ls64i6yfd6fz";

     

       281
       281
       +
         };

     

       282
       282
       +
         "spin" = {

     

       283
       283
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/spin.tar.gz";

     

       284
       284
       +
           sha = "0hwjc4i69zmzw7cpmsrhmx00w5k5y46m317m1imw2ycmhm0jicm5";

     

       285
       285
       +
         };

     

       286
       286
       +
         "spinner_alt" = {

     

       287
       287
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/spinner_alt.tar.gz";

     

       288
       288
       +
           sha = "1ifs9xxd1cxvgjcnqjfw2zxkcapssv10hvchjrlf9nl60ayyp4m4";

     

       289
       289
       +
         };

     

       290
       290
       +
         "splash" = {

     

       291
       291
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/splash.tar.gz";

     

       292
       292
       +
           sha = "12l8hwzmi68mjqgl384wf1fscvnzwp4a3vmlsb2zcbfwhrs5q717";

     

       293
       293
       +
         };

     

       294
       294
       +
         "square" = {

     

       295
       295
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/square.tar.gz";

     

       296
       296
       +
           sha = "1mpyrivchsj2gr8flwj0g45vb792fvjjb5jmkn9xz1glrxxs7zww";

     

       297
       297
       +
         };

     

       298
       298
       +
         "square_hud" = {

     

       299
       299
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/square_hud.tar.gz";

     

       300
       300
       +
           sha = "1lvv00r5rg8yjwibfqncka1s0p59fnpklhz3v6ifbs7ynlyp0kag";

     

       301
       301
       +
         };

     

       302
       302
       +
         "target" = {

     

       303
       303
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/target.tar.gz";

     

       304
       304
       +
           sha = "1ipsd3rjclmwzg2l4bxpj0mgfl5bwxs1ihf498660zhm0bqqpgpr";

     

       305
       305
       +
         };

     

       306
       306
       +
         "target_2" = {

     

       307
       307
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/target_2.tar.gz";

     

       308
       308
       +
           sha = "16lipy5c0pyyb1idwj1zchfr8g0cy6qr46c87b8g1kv2g96n5cn6";

     

       309
       309
       +
         };

     

       310
       310
       +
         "tech_a" = {

     

       311
       311
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/tech_a.tar.gz";

     

       312
       312
       +
           sha = "0fn8aib05kmjxnp7j2bmgrs3avaj6bn06kxz55bw8fdg8ihxnxg0";

     

       313
       313
       +
         };

     

       314
       314
       +
         "tech_b" = {

     

       315
       315
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/tech_b.tar.gz";

     

       316
       316
       +
           sha = "03i8jcvql76mhcq0dqaj2wygfza72fc7c22vfcyp38cx1lm6ilbv";

     

       317
       317
       +
         };

     

       318
       318
       +
         "unrap" = {

     

       319
       319
       +
           url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/unrap.tar.gz";

     

       320
       320
       +
           sha = "08gqwb11539kz5178ga6f96jv82xmyyzv44q6d05ajcw3pxk5j4c";

     

       321
       321
       +
         };

     

       322
       322
       +
       }

+34

pkgs/data/themes/adi1090x-plymouth-themes/update.sh

···

       1
       1
       +
       #!/usr/bin/env nix-shell

     

       2
       2
       +
       #! nix-shell -i bash --keep GITHUB_TOKEN -p nix-prefetch jq

     

       3
       3
       +
       

     

       4
       4
       +
       set -eo pipefail

     

       5
       5
       +
       

     

       6
       6
       +
       curl_args=( '--silent' )

     

       7
       7
       +
       

     

       8
       8
       +
       # optionally takes a GITHUB_TOKEN to overcome api rate limiting.

     

       9
       9
       +
       if [ -n "$GITHUB_TOKEN" ]; then curl_args+=( --header "authorization: Bearer ${GITHUB_TOKEN}" ); fi

     

       10
       10
       +
       

     

       11
       11
       +
       # get last master ref

     

       12
       12
       +
       curl_args+=( --url https://api.github.com/repos/adi1090x/files/commits/master )

     

       13
       13
       +
       last_ref=$(curl "${curl_args[@]}" | jq -r '.sha' )

     

       14
       14
       +
       

     

       15
       15
       +
       unset curl_args[-1]

     

       16
       16
       +
       curl_args+=( https://api.github.com/repos/adi1090x/files/git/trees/$last_ref\?recursive=1 )

     

       17
       17
       +
       

     

       18
       18
       +
       theme_archives=$(curl "${curl_args[@]}" \

     

       19
       19
       +
         | jq '.tree | map(select(.path| test("^plymouth-themes/themes/pack_.*tar.gz$"))| .path)')

     

       20
       20
       +
       

     

       21
       21
       +
       dirname="$(dirname "$0")"

     

       22
       22
       +
       

     

       23
       23
       +
       printf '{\n' > "$dirname/shas.nix"

     

       24
       24
       +
       

     

       25
       25
       +
       repo_url="https://github.com/adi1090x/files/raw/$last_ref"

     

       26
       26
       +
       

     

       27
       27
       +
       while

     

       28
       28
       +
         read -r file_path

     

       29
       29
       +
       do

     

       30
       30
       +
           name=$(basename $file_path)

     

       31
       31
       +
           printf '  "%s" = {\n    url = "%s";\n    sha = "%s";\n  };\n' "${name%%.*}" "$repo_url/$file_path" "$(nix-prefetch-url "$repo_url/$file_path")" >>"$dirname/shas.nix"

     

       32
       32
       +
       done < <(jq -r '.[]' <<<"$theme_archives")

     

       33
       33
       +
       

     

       34
       34
       +
       printf '}\n' >> "$dirname/shas.nix"

pkgs/desktops/deepin/go-package/dde-daemon/default.nix

···

       67
       67
        
           substituteInPlace inputdevices/layout_list.go \

     

       68
       68
        
             --replace "/usr/share/X11/xkb" "${xkeyboard_config}/share/X11/xkb"

     

       69
       69
        
       

     

       70
       70
       +
           substituteInPlace system/uadp/crypto.go \

     

       71
       71
       +
             --replace "/usr/share/uadp" "/var/lib/dde-daemon/uadp"

     

       72
       72
       +
       

     

       70
       73
        
           substituteInPlace appearance/background/{background.go,custom_wallpapers.go} accounts/user.go bin/dde-system-daemon/wallpaper.go \

     

       71
       74
        
            --replace "/usr/share/wallpapers" "/run/current-system/sw/share/wallpapers"

     

       72
       75

pkgs/development/compilers/cudatoolkit/common.nix

···

       335
       335
        
           homepage = "https://developer.nvidia.com/cuda-toolkit";

     

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

     

       337
       337
        
           license = licenses.unfree;

     

       338
       338
       +
           maintainers = teams.cuda.members;

     

       338
       339
        
         };

     

       339
       340
        
       }

     

       340
       341

pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix

···

       60
       60
        
         meta = {

     

       61
       61
        
           description = attrs.name;

     

       62
       62
        
           license = lib.licenses.unfree;

     

       63
       63
       +
           maintainers = lib.teams.cuda.members;

     

       63
       64
        
           platforms = lib.optionals (lib.hasAttr arch attrs) [ "x86_64-linux" ];

     

       64
       65
        
         };

     

       65
       66
        
       }

+1 -1

pkgs/development/compilers/edk2/default.nix

···

       116
       116
        
       

     

       117
       117
        
             buildPhase = ''

     

       118
       118
        
               runHook preBuild

     

       119
       119
       -
               build -a ${targetArch} -b RELEASE -t ${buildType} -p ${projectDscPath} -n $NIX_BUILD_CORES $buildFlags

     

       119
       119
       +
               build -a ${targetArch} -b ${attrs.buildConfig or "RELEASE"} -t ${buildType} -p ${projectDscPath} -n $NIX_BUILD_CORES $buildFlags

     

       120
       120
        
               runHook postBuild

     

       121
       121
        
             '';

     

       122
       122

+2 -2

pkgs/development/compilers/flix/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenvNoCC.mkDerivation rec {

     

       4
       4
        
         pname = "flix";

     

       5
       5
       -
         version = "0.35.0";

     

       5
       5
       +
         version = "0.36.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar";

     

       9
       9
       -
           sha256 = "sha256-liPOAQfdAYc2JlUb+BXQ5KhTOYexC1vBCIuO0nT2jhk=";

     

       9
       9
       +
           sha256 = "sha256-HAhNNg8f+uC2QKYqkugJIyH7VakNA631S2/UE2vG+5M=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         dontUnpack = true;

pkgs/development/compilers/ligo/default.nix

···

       10
       10
        
       , mustache-go

     

       11
       11
        
       , yaml2json

     

       12
       12
        
       , tezos-rust-libs

     

       13
       13
       +
       , darwin

     

       13
       14
        
       }:

     

       14
       15
        
       

     

       15
       16
        
       ocamlPackages.buildDunePackage rec {

     
···

       110
       111
        
           pure-splitmix

     

       111
       112
        
           zarith_stubs_js

     

       112
       113
        
           simple-diff

     

       114
       114
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       115
       115
       +
           darwin.apple_sdk.frameworks.Security

     

       113
       116
        
         ];

     

       114
       117
        
       

     

       115
       118
        
         preBuild = ''

-2

pkgs/development/compilers/llvm/15/compiler-rt/default.nix

···

       95
       95
        
           substituteInPlace cmake/builtin-config-ix.cmake \

     

       96
       96
        
             --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)'

     

       97
       97
        
         '' + lib.optionalString stdenv.isDarwin ''

     

       98
       98
       -
           substituteInPlace cmake/builtin-config-ix.cmake \

     

       99
       99
       -
             --replace 'set(ARM64 arm64 arm64e)' 'set(ARM64)'

     

       100
       98
        
           substituteInPlace cmake/config-ix.cmake \

     

       101
       99
        
             --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'

     

       102
       100
        
         '' + lib.optionalString (useLLVM) ''

+12 -8

pkgs/development/compilers/swift/compiler/default.nix

···

       99
       99
        
           # "clang-builtin-headers"

     

       100
       100
        
           "stdlib"

     

       101
       101
        
           "sdk-overlay"

     

       102
       102
       -
           "parser-lib"

     

       103
       102
        
           "static-mirror-lib"

     

       104
       103
        
           "editor-integration"

     

       105
       104
        
           # "tools"

     
···

       257
       256
        
           ${copySource "llvm-project"}

     

       258
       257
        
           ${copySource "swift"}

     

       259
       258
        
           ${copySource "swift-experimental-string-processing"}

     

       259
       259
       +
           ${copySource "swift-syntax"}

     

       260
       260
        
           ${lib.optionalString

     

       261
       261
        
             (!stdenv.isDarwin)

     

       262
       262
        
             (copySource "swift-corelibs-libdispatch")}

     
···

       276
       276
        
             -e 's|/bin/cp|${coreutils}/bin/cp|g' \

     

       277
       277
        
             -e 's|/usr/bin/file|${file}/bin/file|g'

     

       278
       278
        
       

     

       279
       279
       +
           patch -p1 -d swift -i ${./patches/swift-cmake-3.25-compat.patch}

     

       279
       280
        
           patch -p1 -d swift -i ${./patches/swift-wrap.patch}

     

       280
       281
        
           patch -p1 -d swift -i ${./patches/swift-nix-resource-root.patch}

     

       282
       282
       +
           patch -p1 -d swift -i ${./patches/swift-linux-fix-libc-paths.patch}

     

       281
       283
        
           patch -p1 -d swift -i ${./patches/swift-linux-fix-linking.patch}

     

       284
       284
       +
           patch -p1 -d swift -i ${./patches/swift-darwin-libcxx-flags.patch}

     

       285
       285
       +
           patch -p1 -d swift -i ${./patches/swift-darwin-link-cxxabi.patch}

     

       282
       286
        
           patch -p1 -d swift -i ${substituteAll {

     

       283
       287
        
             src = ./patches/swift-darwin-plistbuddy-workaround.patch;

     

       284
       288
        
             inherit swiftArch;

     
···

       287
       291
        
             src = ./patches/swift-prevent-sdk-dirs-warning.patch;

     

       288
       292
        
             inherit (builtins) storeDir;

     

       289
       293
        
           }}

     

       290
       290
       -
           substituteInPlace swift/cmake/modules/SwiftConfigureSDK.cmake \

     

       291
       291
       -
             --replace '/usr/include' "${stdenv.cc.libc_dev}/include"

     

       292
       294
        
       

     

       293
       295
        
           # This patch needs to know the lib output location, so must be substituted

     

       294
       296
        
           # in the same derivation as the compiler.

     
···

       321
       323
        
           ''}

     

       322
       324
        
       

     

       323
       325
        
           # Remove tests for cross compilation, which we don't currently support.

     

       324
       324
       -
           rm swift/test/Interop/Cxx/class/constructors-copy-irgen.swift

     

       325
       325
       -
           rm swift/test/Interop/Cxx/class/constructors-irgen.swift

     

       326
       326
       +
           rm swift/test/Interop/Cxx/class/constructors-copy-irgen-*.swift

     

       327
       327
       +
           rm swift/test/Interop/Cxx/class/constructors-irgen-*.swift

     

       326
       328
        
       

     

       327
       329
        
           # TODO: consider fixing and re-adding. This test fails due to a non-standard "install_prefix".

     

       328
       330
        
           rm swift/validation-test/Python/build_swift.swift

     
···

       342
       344
        
           rm swift/test/Serialization/restrict-swiftmodule-to-revision.swift

     

       343
       345
        
       

     

       344
       346
        
           # This test was flaky in ofborg, see #186476

     

       345
       345
       -
           rm swift/test/AutoDiff/compiler_crashers_fixed/sr14290-missing-debug-scopes-in-pullback-trampoline.swift

     

       347
       347
       +
           rm swift/test/AutoDiff/compiler_crashers_fixed/issue-56649-missing-debug-scopes-in-pullback-trampoline.swift

     

       346
       348
        
       

     

       347
       349
        
           patchShebangs .

     

       348
       350
        
       

     
···

       446
       448
        
             -DSWIFT_PATH_TO_CMARK_SOURCE=$SWIFT_SOURCE_ROOT/swift-cmark

     

       447
       449
        
             -DSWIFT_PATH_TO_CMARK_BUILD=$SWIFT_BUILD_ROOT/swift-cmark

     

       448
       450
        
             -DSWIFT_PATH_TO_LIBDISPATCH_SOURCE=$SWIFT_SOURCE_ROOT/swift-corelibs-libdispatch

     

       449
       449
       -
             -DEXPERIMENTAL_STRING_PROCESSING_SOURCE_DIR=$SWIFT_SOURCE_ROOT/swift-experimental-string-processing

     

       451
       451
       +
             -DSWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE=$SWIFT_SOURCE_ROOT/swift-syntax

     

       452
       452
       +
             -DSWIFT_PATH_TO_STRING_PROCESSING_SOURCE=$SWIFT_SOURCE_ROOT/swift-experimental-string-processing

     

       450
       453
        
             -DSWIFT_INSTALL_COMPONENTS=${lib.concatStringsSep ";" swiftInstallComponents}

     

       451
       454
        
             -DSWIFT_STDLIB_ENABLE_OBJC_INTEROP=${if stdenv.isDarwin then "ON" else "OFF"}

     

       452
       455
        
           "

     
···

       501
       504
        
           cmakeFlags="

     

       502
       505
        
             -GNinja

     

       503
       506
        
             -DCMAKE_Swift_COMPILER=$SWIFT_BUILD_ROOT/swift/bin/swiftc

     

       507
       507
       +
             -DSWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE=$SWIFT_SOURCE_ROOT/swift-syntax

     

       504
       508
        
       

     

       505
       509
        
             -DTOOLCHAIN_DIR=/var/empty

     

       506
       510
        
             -DSWIFT_NATIVE_LLVM_TOOLS_PATH=${stdenv.cc}/bin

     
···

       579
       583
        
           # Undo the clang and swift wrapping we did for the build.

     

       580
       584
        
           # (This happened via patches to cmake files.)

     

       581
       585
        
           cd $SWIFT_BUILD_ROOT

     

       582
       582
       -
           mv llvm/bin/clang-14{-unwrapped,}

     

       586
       586
       +
           mv llvm/bin/clang-15{-unwrapped,}

     

       583
       587
        
           mv swift/bin/swift-frontend{-unwrapped,}

     

       584
       588
        
       

     

       585
       589
        
           mkdir $out $lib

+1509

pkgs/development/compilers/swift/compiler/patches/swift-cmake-3.25-compat.patch

···

       1
       1
       +
       Upstream PR: https://github.com/apple/swift/pull/65534

     

       2
       2
       +
       

     

       3
       3
       +
       commit 112681f7f5927588569b225d926ca9f5f9ec98b3

     

       4
       4
       +
       Author: Stéphan Kochen <git@stephank.nl>

     

       5
       5
       +
       Date:   Sat Apr 29 20:34:40 2023 +0200

     

       6
       6
       +
       

     

       7
       7
       +
           build: fix accidental cmake expansions

     

       8
       8
       +
           

     

       9
       9
       +
           As of CMake 3.25, there are now global variables `LINUX=1`, `ANDROID=1`,

     

       10
       10
       +
           etc. These conflict with expressions that used these names as unquoted

     

       11
       11
       +
           strings in positions where CMake accepts 'variable|string', for example:

     

       12
       12
       +
           

     

       13
       13
       +
           - `if(sdk STREQUAL LINUX)` would fail, because `LINUX` is now defined and

     

       14
       14
       +
             expands to 1, where it would previously coerce to a string.

     

       15
       15
       +
           

     

       16
       16
       +
           - `if(${sdk} STREQUAL "LINUX")` would fail if `sdk=LINUX`, because the

     

       17
       17
       +
             left-hand side expands twice.

     

       18
       18
       +
           

     

       19
       19
       +
           In this patch, I looked for a number of patterns to fix up, sometimes a

     

       20
       20
       +
           little defensively:

     

       21
       21
       +
           

     

       22
       22
       +
           - Quoted right-hand side of `STREQUAL` where I was confident it was

     

       23
       23
       +
             intended to be a string literal.

     

       24
       24
       +
           

     

       25
       25
       +
           - Removed manual variable expansion on left-hand side of `STREQUAL`,

     

       26
       26
       +
             `MATCHES` and `IN_LIST` where I was confident it was unintended.

     

       27
       27
       +
           

     

       28
       28
       +
           Fixes #65028.

     

       29
       29
       +
       

     

       30
       30
       +
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       31
       31
       +
       index eaab71fbaf0..45aa5d65dd3 100644

     

       32
       32
       +
       --- a/CMakeLists.txt

     

       33
       33
       +
       +++ b/CMakeLists.txt

     

       34
       34
       +
       @@ -119,7 +119,7 @@ else()

     

       35
       35
       +
          if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64|amd64")

     

       36
       36
       +
            set(SWIFT_HOST_VARIANT_ARCH_default "x86_64")

     

       37
       37
       +
          elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|ARM64|arm64")

     

       38
       38
       +
       -    if(SWIFT_HOST_VARIANT_SDK_default STREQUAL OSX)

     

       39
       39
       +
       +    if(SWIFT_HOST_VARIANT_SDK_default STREQUAL "OSX")

     

       40
       40
       +
              set(SWIFT_HOST_VARIANT_ARCH_default "arm64")

     

       41
       41
       +
            else()

     

       42
       42
       +
              set(SWIFT_HOST_VARIANT_ARCH_default "aarch64")

     

       43
       43
       +
       @@ -336,7 +336,7 @@ set(SWIFT_STDLIB_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING

     

       44
       44
       +
        #   - MultiThreadedDebug (/MTd)

     

       45
       45
       +
        #   - MultiThreadedDLL (/MD)

     

       46
       46
       +
        #   - MultiThreadedDebugDLL (/MDd)

     

       47
       47
       +
       -if(CMAKE_BUILD_TYPE STREQUAL Debug)

     

       48
       48
       +
       +if(CMAKE_BUILD_TYPE STREQUAL "Debug")

     

       49
       49
       +
          set(SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY_default MultiThreadedDebugDLL)

     

       50
       50
       +
        else()

     

       51
       51
       +
          set(SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY_default MultiThreadedDLL)

     

       52
       52
       +
       @@ -598,7 +598,7 @@ if(SWIFT_BUILT_STANDALONE)

     

       53
       53
       +
          project(Swift C CXX ASM)

     

       54
       54
       +
        endif()

     

       55
       55
       +
        

     

       56
       56
       +
       -if(MSVC OR "${CMAKE_SIMULATE_ID}" STREQUAL MSVC)

     

       57
       57
       +
       +if(MSVC OR "${CMAKE_SIMULATE_ID}" STREQUAL "MSVC")

     

       58
       58
       +
          include(ClangClCompileRules)

     

       59
       59
       +
        elseif(UNIX)

     

       60
       60
       +
          include(UnixCompileRules)

     

       61
       61
       +
       @@ -627,7 +627,7 @@ if(SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY AND "${SWIFT_CONCURRENCY_GLOBAL_EXECUTO

     

       62
       62
       +
        endif()

     

       63
       63
       +
        

     

       64
       64
       +
        set(SWIFT_BUILD_HOST_DISPATCH FALSE)

     

       65
       65
       +
       -if(SWIFT_ENABLE_DISPATCH AND NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)

     

       66
       66
       +
       +if(SWIFT_ENABLE_DISPATCH AND NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")

     

       67
       67
       +
          # Only build libdispatch for the host if the host tools are being built and

     

       68
       68
       +
          # specifically if these two libraries that depend on it are built.

     

       69
       69
       +
          if(SWIFT_INCLUDE_TOOLS AND SWIFT_BUILD_SOURCEKIT)

     

       70
       70
       +
       @@ -801,11 +801,11 @@ endif()

     

       71
       71
       +
        # build environment.

     

       72
       72
       +
        if(LLVM_USE_LINKER)

     

       73
       73
       +
          set(SWIFT_USE_LINKER_default "${LLVM_USE_LINKER}")

     

       74
       74
       +
       -elseif(${SWIFT_HOST_VARIANT_SDK} STREQUAL ANDROID)

     

       75
       75
       +
       +elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID")

     

       76
       76
       +
          set(SWIFT_USE_LINKER_default "lld")

     

       77
       77
       +
       -elseif(CMAKE_SYSTEM_NAME STREQUAL Windows AND NOT CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)

     

       78
       78
       +
       +elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")

     

       79
       79
       +
          set(SWIFT_USE_LINKER_default "lld")

     

       80
       80
       +
       -elseif(CMAKE_SYSTEM_NAME STREQUAL Darwin)

     

       81
       81
       +
       +elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")

     

       82
       82
       +
          set(SWIFT_USE_LINKER_default "")

     

       83
       83
       +
        else()

     

       84
       84
       +
          set(SWIFT_USE_LINKER_default "gold")

     

       85
       85
       +
       diff --git a/SwiftCompilerSources/CMakeLists.txt b/SwiftCompilerSources/CMakeLists.txt

     

       86
       86
       +
       index 225e72663a1..d14e0ccecac 100644

     

       87
       87
       +
       --- a/SwiftCompilerSources/CMakeLists.txt

     

       88
       88
       +
       +++ b/SwiftCompilerSources/CMakeLists.txt

     

       89
       89
       +
       @@ -80,7 +80,7 @@ function(add_swift_compiler_modules_library name)

     

       90
       90
       +
            list(APPEND swift_compile_options "-Xfrontend" "-disable-implicit-string-processing-module-import")

     

       91
       91
       +
          endif()

     

       92
       92
       +
        

     

       93
       93
       +
       -  if(CMAKE_BUILD_TYPE STREQUAL Debug)

     

       94
       94
       +
       +  if(CMAKE_BUILD_TYPE STREQUAL "Debug")

     

       95
       95
       +
            list(APPEND swift_compile_options "-g")

     

       96
       96
       +
          else()

     

       97
       97
       +
            list(APPEND swift_compile_options "-O" "-cross-module-optimization")

     

       98
       98
       +
       @@ -98,7 +98,7 @@ function(add_swift_compiler_modules_library name)

     

       99
       99
       +
            set(deployment_version "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_DEPLOYMENT_VERSION}")

     

       100
       100
       +
            set(sdk_path "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_ARCH_${SWIFT_HOST_VARIANT_ARCH}_PATH}")

     

       101
       101
       +
            set(sdk_option "-sdk" "${sdk_path}")

     

       102
       102
       +
       -    if(${BOOTSTRAPPING_MODE} STREQUAL "CROSSCOMPILE-WITH-HOSTLIBS")

     

       103
       103
       +
       +    if(BOOTSTRAPPING_MODE STREQUAL "CROSSCOMPILE-WITH-HOSTLIBS")

     

       104
       104
       +
              # Let the cross-compiled compile don't pick up the compiled stdlib by providing

     

       105
       105
       +
              # an (almost) empty resource dir.

     

       106
       106
       +
              # The compiler will instead pick up the stdlib from the SDK.

     

       107
       107
       +
       @@ -117,7 +117,7 @@ function(add_swift_compiler_modules_library name)

     

       108
       108
       +
                message(ERROR "libc++ not found in the toolchain.")

     

       109
       109
       +
              endif()

     

       110
       110
       +
            endif()

     

       111
       111
       +
       -  elseif(${BOOTSTRAPPING_MODE} STREQUAL "CROSSCOMPILE")

     

       112
       112
       +
       +  elseif(BOOTSTRAPPING_MODE STREQUAL "CROSSCOMPILE")

     

       113
       113
       +
            set(sdk_option "-sdk" "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_ARCH_${SWIFT_HOST_VARIANT_ARCH}_PATH}")

     

       114
       114
       +
            get_filename_component(swift_exec_bin_dir ${ALS_SWIFT_EXEC} DIRECTORY)

     

       115
       115
       +
            set(sdk_option ${sdk_option} "-resource-dir" "${swift_exec_bin_dir}/../lib/swift")

     

       116
       116
       +
       @@ -253,13 +253,13 @@ else()

     

       117
       117
       +
          add_dependencies(importedHeaderDependencies swift-ast-generated-headers)

     

       118
       118
       +
          target_include_directories(importedHeaderDependencies PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../include/swift")

     

       119
       119
       +
        

     

       120
       120
       +
       -  if(${BOOTSTRAPPING_MODE} MATCHES "HOSTTOOLS|CROSSCOMPILE")

     

       121
       121
       +
       +  if(BOOTSTRAPPING_MODE MATCHES "HOSTTOOLS|CROSSCOMPILE")

     

       122
       122
       +
        

     

       123
       123
       +
            if (NOT SWIFT_EXEC_FOR_SWIFT_MODULES)

     

       124
       124
       +
              message(FATAL_ERROR "Need a swift toolchain building swift compiler sources")

     

       125
       125
       +
            endif()

     

       126
       126
       +
        

     

       127
       127
       +
       -    if(${BOOTSTRAPPING_MODE} STREQUAL "HOSTTOOLS")

     

       128
       128
       +
       +    if(BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS")

     

       129
       129
       +
              if(NOT SWIFT_EXEC_FOR_SWIFT_MODULES STREQUAL CMAKE_Swift_COMPILER)

     

       130
       130
       +
                message(FATAL_ERROR "The Swift compiler (${CMAKE_Swift_COMPILER}) differs from the Swift compiler in SWIFT_NATIVE_SWIFT_TOOLS_PATH (${SWIFT_NATIVE_SWIFT_TOOLS_PATH}/swiftc).")

     

       131
       131
       +
              endif()

     

       132
       132
       +
       @@ -275,11 +275,11 @@ else()

     

       133
       133
       +
            add_swift_compiler_modules_library(swiftCompilerModules

     

       134
       134
       +
              SWIFT_EXEC "${SWIFT_EXEC_FOR_SWIFT_MODULES}")

     

       135
       135
       +
        

     

       136
       136
       +
       -  elseif(${BOOTSTRAPPING_MODE} MATCHES "BOOTSTRAPPING.*")

     

       137
       137
       +
       +  elseif(BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*")

     

       138
       138
       +
        

     

       139
       139
       +
            set(b0_deps swift-frontend-bootstrapping0 symlink-headers-bootstrapping0)

     

       140
       140
       +
            set(b1_deps swift-frontend-bootstrapping1 symlink-headers-bootstrapping1)

     

       141
       141
       +
       -    if(${BOOTSTRAPPING_MODE} STREQUAL "BOOTSTRAPPING")

     

       142
       142
       +
       +    if(BOOTSTRAPPING_MODE STREQUAL "BOOTSTRAPPING")

     

       143
       143
       +
              list(APPEND b0_deps swiftCore-bootstrapping0)

     

       144
       144
       +
              list(APPEND b1_deps swiftCore-bootstrapping1)

     

       145
       145
       +
              if(CMAKE_BUILD_TYPE STREQUAL "Debug")

     

       146
       146
       +
       @@ -290,7 +290,7 @@ else()

     

       147
       147
       +
                list(APPEND b0_deps swiftDarwin-bootstrapping0)

     

       148
       148
       +
                list(APPEND b1_deps swiftDarwin-bootstrapping1)

     

       149
       149
       +
              endif()

     

       150
       150
       +
       -      if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_LIBSTDCXX_PLATFORMS)

     

       151
       151
       +
       +      if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_LIBSTDCXX_PLATFORMS)

     

       152
       152
       +
                list(APPEND b0_deps copy-libstdcxx-modulemap-bootstrapping0 copy-libstdcxx-header-bootstrapping0)

     

       153
       153
       +
                list(APPEND b1_deps copy-libstdcxx-modulemap-bootstrapping1 copy-libstdcxx-header-bootstrapping1)

     

       154
       154
       +
              endif()

     

       155
       155
       +
       diff --git a/benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake b/benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake

     

       156
       156
       +
       index dd989efe618..3ed37754214 100644

     

       157
       157
       +
       --- a/benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake

     

       158
       158
       +
       +++ b/benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake

     

       159
       159
       +
       @@ -21,7 +21,7 @@ macro(configure_build)

     

       160
       160
       +
            # thus allowing the --host-cc build-script argument to work here.

     

       161
       161
       +
            get_filename_component(c_compiler ${CMAKE_C_COMPILER} NAME)

     

       162
       162
       +
        

     

       163
       163
       +
       -    if(${c_compiler} STREQUAL "clang")

     

       164
       164
       +
       +    if(c_compiler STREQUAL "clang")

     

       165
       165
       +
              set(CLANG_EXEC ${CMAKE_C_COMPILER})

     

       166
       166
       +
            else()

     

       167
       167
       +
              if(NOT SWIFT_DARWIN_XCRUN_TOOLCHAIN)

     

       168
       168
       +
       @@ -713,7 +713,7 @@ function(swift_benchmark_compile)

     

       169
       169
       +
        

     

       170
       170
       +
          if(NOT SWIFT_BENCHMARK_BUILT_STANDALONE)

     

       171
       171
       +
            set(stdlib_dependencies "swift-frontend" "swiftCore-${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}")

     

       172
       172
       +
       -    if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       173
       173
       +
       +    if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       174
       174
       +
              list(APPEND stdlib_dependencies "swiftDarwin-${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}")

     

       175
       175
       +
            endif()

     

       176
       176
       +
            foreach(stdlib_dependency ${UNIVERSAL_LIBRARY_NAMES_${SWIFT_BENCHMARK_COMPILE_PLATFORM}})

     

       177
       177
       +
       diff --git a/cmake/modules/AddSwift.cmake b/cmake/modules/AddSwift.cmake

     

       178
       178
       +
       index 58c7eb1bd4f..96c4fe804f9 100644

     

       179
       179
       +
       --- a/cmake/modules/AddSwift.cmake

     

       180
       180
       +
       +++ b/cmake/modules/AddSwift.cmake

     

       181
       181
       +
       @@ -63,16 +63,16 @@ function(_set_target_prefix_and_suffix target kind sdk)

     

       182
       182
       +
          precondition(kind MESSAGE "kind is required")

     

       183
       183
       +
          precondition(sdk MESSAGE "sdk is required")

     

       184
       184
       +
        

     

       185
       185
       +
       -  if(${sdk} STREQUAL ANDROID)

     

       186
       186
       +
       -    if(${kind} STREQUAL STATIC)

     

       187
       187
       +
       +  if(sdk STREQUAL "ANDROID")

     

       188
       188
       +
       +    if(kind STREQUAL "STATIC")

     

       189
       189
       +
              set_target_properties(${target} PROPERTIES PREFIX "lib" SUFFIX ".a")

     

       190
       190
       +
       -    elseif(${kind} STREQUAL SHARED)

     

       191
       191
       +
       +    elseif(kind STREQUAL "SHARED")

     

       192
       192
       +
              set_target_properties(${target} PROPERTIES PREFIX "lib" SUFFIX ".so")

     

       193
       193
       +
            endif()

     

       194
       194
       +
       -  elseif(${sdk} STREQUAL WINDOWS)

     

       195
       195
       +
       -    if(${kind} STREQUAL STATIC)

     

       196
       196
       +
       +  elseif(sdk STREQUAL "WINDOWS")

     

       197
       197
       +
       +    if(kind STREQUAL "STATIC")

     

       198
       198
       +
              set_target_properties(${target} PROPERTIES PREFIX "" SUFFIX ".lib")

     

       199
       199
       +
       -    elseif(${kind} STREQUAL SHARED)

     

       200
       200
       +
       +    elseif(kind STREQUAL "SHARED")

     

       201
       201
       +
              set_target_properties(${target} PROPERTIES PREFIX "" SUFFIX ".dll")

     

       202
       202
       +
            endif()

     

       203
       203
       +
          endif()

     

       204
       204
       +
       @@ -115,7 +115,7 @@ function(_add_host_variant_c_compile_link_flags name)

     

       205
       205
       +
            set(DEPLOYMENT_VERSION "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_DEPLOYMENT_VERSION}")

     

       206
       206
       +
          endif()

     

       207
       207
       +
        

     

       208
       208
       +
       -  if(SWIFT_HOST_VARIANT_SDK STREQUAL ANDROID)

     

       209
       209
       +
       +  if(SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID")

     

       210
       210
       +
            set(DEPLOYMENT_VERSION ${SWIFT_ANDROID_API_LEVEL})

     

       211
       211
       +
          endif()

     

       212
       212
       +
        

     

       213
       213
       +
       @@ -151,7 +151,7 @@ function(_add_host_variant_c_compile_link_flags name)

     

       214
       214
       +
            target_compile_options(${name} PRIVATE $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:--sysroot=${_sysroot}>)

     

       215
       215
       +
          endif()

     

       216
       216
       +
        

     

       217
       217
       +
       -  if(SWIFT_HOST_VARIANT_SDK STREQUAL ANDROID)

     

       218
       218
       +
       +  if(SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID")

     

       219
       219
       +
            # Make sure the Android NDK lld is used.

     

       220
       220
       +
            swift_android_tools_path(${SWIFT_HOST_VARIANT_ARCH} tools_path)

     

       221
       221
       +
            target_compile_options(${name} PRIVATE $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:-B${tools_path}>)

     

       222
       222
       +
       @@ -223,7 +223,7 @@ function(_add_host_variant_c_compile_flags target)

     

       223
       223
       +
            endif()

     

       224
       224
       +
          endif()

     

       225
       225
       +
        

     

       226
       226
       +
       -  if(SWIFT_HOST_VARIANT_SDK STREQUAL WINDOWS)

     

       227
       227
       +
       +  if(SWIFT_HOST_VARIANT_SDK STREQUAL "WINDOWS")

     

       228
       228
       +
            # MSVC/clang-cl don't support -fno-pic or -fms-compatibility-version.

     

       229
       229
       +
            if(NOT SWIFT_COMPILER_IS_MSVC_LIKE)

     

       230
       230
       +
              target_compile_options(${target} PRIVATE

     

       231
       231
       +
       @@ -276,14 +276,14 @@ function(_add_host_variant_c_compile_flags target)

     

       232
       232
       +
            # NOTE(compnerd) workaround LLVM invoking `add_definitions(-D_DEBUG)` which

     

       233
       233
       +
            # causes failures for the runtime library when cross-compiling due to

     

       234
       234
       +
            # undefined symbols from the standard library.

     

       235
       235
       +
       -    if(NOT CMAKE_BUILD_TYPE STREQUAL Debug)

     

       236
       236
       +
       +    if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")

     

       237
       237
       +
              target_compile_options(${target} PRIVATE

     

       238
       238
       +
                $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:-U_DEBUG>)

     

       239
       239
       +
            endif()

     

       240
       240
       +
          endif()

     

       241
       241
       +
        

     

       242
       242
       +
       -  if(SWIFT_HOST_VARIANT_SDK STREQUAL ANDROID)

     

       243
       243
       +
       -    if(SWIFT_HOST_VARIANT_ARCH STREQUAL x86_64)

     

       244
       244
       +
       +  if(SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID")

     

       245
       245
       +
       +    if(SWIFT_HOST_VARIANT_ARCH STREQUAL "x86_64")

     

       246
       246
       +
              # NOTE(compnerd) Android NDK 21 or lower will generate library calls to

     

       247
       247
       +
              # `__sync_val_compare_and_swap_16` rather than lowering to the CPU's

     

       248
       248
       +
              # `cmpxchg16b` instruction as the `cx16` feature is disabled due to a bug

     

       249
       249
       +
       @@ -317,15 +317,15 @@ function(_add_host_variant_c_compile_flags target)

     

       250
       250
       +
              $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:-fprofile-instr-generate -fcoverage-mapping>)

     

       251
       251
       +
          endif()

     

       252
       252
       +
        

     

       253
       253
       +
       -  if((SWIFT_HOST_VARIANT_ARCH STREQUAL armv7 OR

     

       254
       254
       +
       -      SWIFT_HOST_VARIANT_ARCH STREQUAL aarch64) AND

     

       255
       255
       +
       -     (SWIFT_HOST_VARIANT_SDK STREQUAL LINUX OR

     

       256
       256
       +
       -      SWIFT_HOST_VARIANT_SDK STREQUAL ANDROID))

     

       257
       257
       +
       +  if((SWIFT_HOST_VARIANT_ARCH STREQUAL "armv7" OR

     

       258
       258
       +
       +      SWIFT_HOST_VARIANT_ARCH STREQUAL "aarch64") AND

     

       259
       259
       +
       +     (SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX" OR

     

       260
       260
       +
       +      SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID"))

     

       261
       261
       +
            target_compile_options(${target} PRIVATE $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:-funwind-tables>)

     

       262
       262
       +
          endif()

     

       263
       263
       +
        

     

       264
       264
       +
          if(SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX")

     

       265
       265
       +
       -    if(SWIFT_HOST_VARIANT_ARCH STREQUAL x86_64)

     

       266
       266
       +
       +    if(SWIFT_HOST_VARIANT_ARCH STREQUAL "x86_64")

     

       267
       267
       +
              # this is the minimum architecture that supports 16 byte CAS, which is

     

       268
       268
       +
              # necessary to avoid a dependency to libatomic

     

       269
       269
       +
              target_compile_options(${target} PRIVATE $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:-march=core2>)

     

       270
       270
       +
       @@ -336,7 +336,7 @@ function(_add_host_variant_c_compile_flags target)

     

       271
       271
       +
          # llvm/llvm-project@66395c9, which can cause incompatibilities with the Swift

     

       272
       272
       +
          # frontend if not built the same way.

     

       273
       273
       +
          if("${SWIFT_HOST_VARIANT_ARCH}" MATCHES "armv6|armv7|i686" AND

     

       274
       274
       +
       -     NOT (SWIFT_HOST_VARIANT_SDK STREQUAL ANDROID AND SWIFT_ANDROID_API_LEVEL LESS 24))

     

       275
       275
       +
       +     NOT (SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID" AND SWIFT_ANDROID_API_LEVEL LESS 24))

     

       276
       276
       +
            target_compile_definitions(${target} PRIVATE

     

       277
       277
       +
              $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:_LARGEFILE_SOURCE _FILE_OFFSET_BITS=64>)

     

       278
       278
       +
          endif()

     

       279
       279
       +
       @@ -345,19 +345,19 @@ endfunction()

     

       280
       280
       +
        function(_add_host_variant_link_flags target)

     

       281
       281
       +
          _add_host_variant_c_compile_link_flags(${target})

     

       282
       282
       +
        

     

       283
       283
       +
       -  if(SWIFT_HOST_VARIANT_SDK STREQUAL LINUX)

     

       284
       284
       +
       +  if(SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX")

     

       285
       285
       +
            target_link_libraries(${target} PRIVATE

     

       286
       286
       +
              pthread

     

       287
       287
       +
              dl)

     

       288
       288
       +
            if("${SWIFT_HOST_VARIANT_ARCH}" MATCHES "armv5|armv6|armv7|i686")

     

       289
       289
       +
              target_link_libraries(${target} PRIVATE atomic)

     

       290
       290
       +
            endif()

     

       291
       291
       +
       -  elseif(SWIFT_HOST_VARIANT_SDK STREQUAL FREEBSD)

     

       292
       292
       +
       +  elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "FREEBSD")

     

       293
       293
       +
            target_link_libraries(${target} PRIVATE

     

       294
       294
       +
              pthread)

     

       295
       295
       +
       -  elseif(SWIFT_HOST_VARIANT_SDK STREQUAL CYGWIN)

     

       296
       296
       +
       +  elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "CYGWIN")

     

       297
       297
       +
            # No extra libraries required.

     

       298
       298
       +
       -  elseif(SWIFT_HOST_VARIANT_SDK STREQUAL WINDOWS)

     

       299
       299
       +
       +  elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "WINDOWS")

     

       300
       300
       +
            # We don't need to add -nostdlib using MSVC or clang-cl, as MSVC and

     

       301
       301
       +
            # clang-cl rely on auto-linking entirely.

     

       302
       302
       +
            if(NOT SWIFT_COMPILER_IS_MSVC_LIKE)

     

       303
       303
       +
       @@ -375,12 +375,12 @@ function(_add_host_variant_link_flags target)

     

       304
       304
       +
            # the Windows SDK on case sensitive file systems.

     

       305
       305
       +
            target_link_directories(${target} PRIVATE

     

       306
       306
       +
              ${CMAKE_BINARY_DIR}/winsdk_lib_${SWIFT_HOST_VARIANT_ARCH}_symlinks)

     

       307
       307
       +
       -  elseif(SWIFT_HOST_VARIANT_SDK STREQUAL HAIKU)

     

       308
       308
       +
       +  elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "HAIKU")

     

       309
       309
       +
            target_link_libraries(${target} PRIVATE

     

       310
       310
       +
              bsd)

     

       311
       311
       +
            target_link_options(${target} PRIVATE

     

       312
       312
       +
              "SHELL:-Xlinker -Bsymbolic")

     

       313
       313
       +
       -  elseif(SWIFT_HOST_VARIANT_SDK STREQUAL ANDROID)

     

       314
       314
       +
       +  elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID")

     

       315
       315
       +
            target_link_libraries(${target} PRIVATE

     

       316
       316
       +
              dl

     

       317
       317
       +
              log

     

       318
       318
       +
       @@ -422,7 +422,7 @@ function(_add_host_variant_link_flags target)

     

       319
       319
       +
          #

     

       320
       320
       +
          # TODO: Evaluate/enable -f{function,data}-sections --gc-sections for bfd,

     

       321
       321
       +
          # gold, and lld.

     

       322
       322
       +
       -  if(NOT CMAKE_BUILD_TYPE STREQUAL Debug AND CMAKE_SYSTEM_NAME MATCHES Darwin)

     

       323
       323
       +
       +  if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug" AND CMAKE_SYSTEM_NAME MATCHES Darwin)

     

       324
       324
       +
            if (NOT SWIFT_DISABLE_DEAD_STRIPPING)

     

       325
       325
       +
              # See rdar://48283130: This gives 6MB+ size reductions for swift and

     

       326
       326
       +
              # SourceKitService, and much larger size reductions for sil-opt etc.

     

       327
       327
       +
       @@ -446,7 +446,7 @@ function(_add_swift_runtime_link_flags target relpath_to_lib_dir bootstrapping)

     

       328
       328
       +
          # RPATH where Swift runtime can be found.

     

       329
       329
       +
          set(swift_runtime_rpath)

     

       330
       330
       +
        

     

       331
       331
       +
       -  if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       332
       332
       +
       +  if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       333
       333
       +
        

     

       334
       334
       +
            set(sdk_dir "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_ARCH_${SWIFT_HOST_VARIANT_ARCH}_PATH}/usr/lib/swift")

     

       335
       335
       +
        

     

       336
       336
       +
       @@ -529,7 +529,7 @@ function(_add_swift_runtime_link_flags target relpath_to_lib_dir bootstrapping)

     

       337
       337
       +
        

     

       338
       338
       +
          elseif(SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD")

     

       339
       339
       +
            set(swiftrt "swiftImageRegistrationObject${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_OBJECT_FORMAT}-${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}-${SWIFT_HOST_VARIANT_ARCH}")

     

       340
       340
       +
       -    if(${ASRLF_BOOTSTRAPPING_MODE} MATCHES "HOSTTOOLS|CROSSCOMPILE")

     

       341
       341
       +
       +    if(ASRLF_BOOTSTRAPPING_MODE MATCHES "HOSTTOOLS|CROSSCOMPILE")

     

       342
       342
       +
              # At build time and run time, link against the swift libraries in the

     

       343
       343
       +
              # installed host toolchain.

     

       344
       344
       +
              get_filename_component(swift_bin_dir ${SWIFT_EXEC_FOR_SWIFT_MODULES} DIRECTORY)

     

       345
       345
       +
       @@ -575,7 +575,7 @@ function(_add_swift_runtime_link_flags target relpath_to_lib_dir bootstrapping)

     

       346
       346
       +
            # able to fall back to the SDK directory for libswiftCore et al.

     

       347
       347
       +
            if (BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*")

     

       348
       348
       +
              if (NOT "${bootstrapping}" STREQUAL "1")

     

       349
       349
       +
       -        if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       350
       350
       +
       +        if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       351
       351
       +
                  target_link_directories(${target} PRIVATE "${sdk_dir}")

     

       352
       352
       +
        

     

       353
       353
       +
                  # Include the abi stable system stdlib in our rpath.

     

       354
       354
       +
       @@ -706,10 +706,10 @@ function(add_swift_host_library name)

     

       355
       355
       +
          if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       356
       356
       +
            set_target_properties(${name} PROPERTIES

     

       357
       357
       +
              INSTALL_NAME_DIR "@rpath")

     

       358
       358
       +
       -  elseif(SWIFT_HOST_VARIANT_SDK STREQUAL LINUX)

     

       359
       359
       +
       +  elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX")

     

       360
       360
       +
            set_target_properties(${name} PROPERTIES

     

       361
       361
       +
              INSTALL_RPATH "$ORIGIN")

     

       362
       362
       +
       -  elseif(SWIFT_HOST_VARIANT_SDK STREQUAL CYGWIN)

     

       363
       363
       +
       +  elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "CYGWIN")

     

       364
       364
       +
            set_target_properties(${name} PROPERTIES

     

       365
       365
       +
              INSTALL_RPATH "$ORIGIN:/usr/lib/swift/cygwin")

     

       366
       366
       +
          elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID")

     

       367
       367
       +
       @@ -731,18 +731,18 @@ function(add_swift_host_library name)

     

       368
       368
       +
          endif()

     

       369
       369
       +
        

     

       370
       370
       +
          # Set compilation and link flags.

     

       371
       371
       +
       -  if(SWIFT_HOST_VARIANT_SDK STREQUAL WINDOWS)

     

       372
       372
       +
       +  if(SWIFT_HOST_VARIANT_SDK STREQUAL "WINDOWS")

     

       373
       373
       +
            swift_windows_include_for_arch(${SWIFT_HOST_VARIANT_ARCH}

     

       374
       374
       +
              ${SWIFT_HOST_VARIANT_ARCH}_INCLUDE)

     

       375
       375
       +
            target_include_directories(${name} SYSTEM PRIVATE

     

       376
       376
       +
              ${${SWIFT_HOST_VARIANT_ARCH}_INCLUDE})

     

       377
       377
       +
        

     

       378
       378
       +
       -    if(libkind STREQUAL SHARED)

     

       379
       379
       +
       +    if(libkind STREQUAL "SHARED")

     

       380
       380
       +
              target_compile_definitions(${name} PRIVATE

     

       381
       381
       +
                _WINDLL)

     

       382
       382
       +
            endif()

     

       383
       383
       +
        

     

       384
       384
       +
       -    if(NOT ${CMAKE_C_COMPILER_ID} STREQUAL MSVC)

     

       385
       385
       +
       +    if(NOT CMAKE_C_COMPILER_ID STREQUAL "MSVC")

     

       386
       386
       +
              swift_windows_get_sdk_vfs_overlay(ASHL_VFS_OVERLAY)

     

       387
       387
       +
              # Both clang and clang-cl on Windows set CMAKE_C_SIMULATE_ID to MSVC.

     

       388
       388
       +
              # We are using CMAKE_C_COMPILER_FRONTEND_VARIANT to detect the correct

     

       389
       389
       +
       @@ -770,7 +770,7 @@ function(add_swift_host_library name)

     

       390
       390
       +
        

     

       391
       391
       +
          set_target_properties(${name} PROPERTIES LINKER_LANGUAGE CXX)

     

       392
       392
       +
        

     

       393
       393
       +
       -  if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       394
       394
       +
       +  if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       395
       395
       +
            target_link_options(${name} PRIVATE

     

       396
       396
       +
              "LINKER:-compatibility_version,1")

     

       397
       397
       +
            if(SWIFT_COMPILER_VERSION)

     

       398
       398
       +
       @@ -856,7 +856,7 @@ function(add_swift_host_tool executable)

     

       399
       399
       +
            add_dependencies(${executable} ${LLVM_COMMON_DEPENDS})

     

       400
       400
       +
          endif()

     

       401
       401
       +
        

     

       402
       402
       +
       -  if(NOT ${ASHT_BOOTSTRAPPING} STREQUAL "")

     

       403
       403
       +
       +  if(NOT "${ASHT_BOOTSTRAPPING}" STREQUAL "")

     

       404
       404
       +
            # Strip the "-bootstrapping<n>" suffix from the target name to get the base

     

       405
       405
       +
            # executable name.

     

       406
       406
       +
            string(REGEX REPLACE "-bootstrapping.*" "" executable_filename ${executable})

     

       407
       407
       +
       @@ -891,7 +891,7 @@ function(add_swift_host_tool executable)

     

       408
       408
       +
            BINARY_DIR ${out_bin_dir}

     

       409
       409
       +
            LIBRARY_DIR ${out_lib_dir})

     

       410
       410
       +
        

     

       411
       411
       +
       -  if(SWIFT_HOST_VARIANT_SDK STREQUAL WINDOWS)

     

       412
       412
       +
       +  if(SWIFT_HOST_VARIANT_SDK STREQUAL "WINDOWS")

     

       413
       413
       +
            swift_windows_include_for_arch(${SWIFT_HOST_VARIANT_ARCH}

     

       414
       414
       +
              ${SWIFT_HOST_VARIANT_ARCH}_INCLUDE)

     

       415
       415
       +
            target_include_directories(${executable} SYSTEM PRIVATE

     

       416
       416
       +
       @@ -913,8 +913,8 @@ function(add_swift_host_tool executable)

     

       417
       417
       +
        

     

       418
       418
       +
          if(SWIFT_SWIFT_PARSER)

     

       419
       419
       +
            set(extra_relative_rpath "")

     

       420
       420
       +
       -    if(NOT ${ASHT_BOOTSTRAPPING} STREQUAL "")

     

       421
       421
       +
       -      if (${executable} MATCHES "-bootstrapping")

     

       422
       422
       +
       +    if(NOT "${ASHT_BOOTSTRAPPING}" STREQUAL "")

     

       423
       423
       +
       +      if(executable MATCHES "-bootstrapping")

     

       424
       424
       +
                set(extra_relative_rpath "../")

     

       425
       425
       +
              endif()

     

       426
       426
       +
            endif()

     

       427
       427
       +
       @@ -938,7 +938,7 @@ function(add_swift_host_tool executable)

     

       428
       428
       +
            target_link_options(${executable} PRIVATE "${lto_codegen_only_link_options}")

     

       429
       429
       +
          endif()

     

       430
       430
       +
        

     

       431
       431
       +
       -  if(NOT ${ASHT_SWIFT_COMPONENT} STREQUAL "no_component")

     

       432
       432
       +
       +  if(NOT ASHT_SWIFT_COMPONENT STREQUAL "no_component")

     

       433
       433
       +
            add_dependencies(${ASHT_SWIFT_COMPONENT} ${executable})

     

       434
       434
       +
            swift_install_in_component(TARGETS ${executable}

     

       435
       435
       +
                                       RUNTIME

     

       436
       436
       +
       diff --git a/cmake/modules/Libdispatch.cmake b/cmake/modules/Libdispatch.cmake

     

       437
       437
       +
       index f0ea3577a2b..3fb0ecdce89 100644

     

       438
       438
       +
       --- a/cmake/modules/Libdispatch.cmake

     

       439
       439
       +
       +++ b/cmake/modules/Libdispatch.cmake

     

       440
       440
       +
       @@ -1,13 +1,13 @@

     

       441
       441
       +
        include(ExternalProject)

     

       442
       442
       +
        

     

       443
       443
       +
       -if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)

     

       444
       444
       +
       -  if(CMAKE_C_COMPILER_ID STREQUAL Clang AND

     

       445
       445
       +
       +if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")

     

       446
       446
       +
       +  if(CMAKE_C_COMPILER_ID STREQUAL "Clang" AND

     

       447
       447
       +
            CMAKE_C_COMPILER_VERSION VERSION_GREATER 3.8

     

       448
       448
       +
            OR LLVM_USE_SANITIZER)

     

       449
       449
       +
            set(SWIFT_LIBDISPATCH_C_COMPILER ${CMAKE_C_COMPILER})

     

       450
       450
       +
            set(SWIFT_LIBDISPATCH_CXX_COMPILER ${CMAKE_CXX_COMPILER})

     

       451
       451
       +
       -  elseif(${CMAKE_SYSTEM_NAME} STREQUAL ${CMAKE_HOST_SYSTEM_NAME})

     

       452
       452
       +
       -    if(CMAKE_SYSTEM_NAME STREQUAL Windows)

     

       453
       453
       +
       +  elseif(CMAKE_SYSTEM_NAME STREQUAL CMAKE_HOST_SYSTEM_NAME)

     

       454
       454
       +
       +    if(CMAKE_SYSTEM_NAME STREQUAL "Windows")

     

       455
       455
       +
              if(CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR AND

     

       456
       456
       +
                TARGET clang)

     

       457
       457
       +
                set(SWIFT_LIBDISPATCH_C_COMPILER

     

       458
       458
       +
       @@ -29,7 +29,7 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)

     

       459
       459
       +
            message(SEND_ERROR "libdispatch requires a newer clang compiler (${CMAKE_C_COMPILER_VERSION} < 3.9)")

     

       460
       460
       +
          endif()

     

       461
       461
       +
        

     

       462
       462
       +
       -  if(SWIFT_HOST_VARIANT_SDK STREQUAL WINDOWS)

     

       463
       463
       +
       +  if(SWIFT_HOST_VARIANT_SDK STREQUAL "WINDOWS")

     

       464
       464
       +
            set(LIBDISPATCH_RUNTIME_DIR bin)

     

       465
       465
       +
          else()

     

       466
       466
       +
            set(LIBDISPATCH_RUNTIME_DIR lib)

     

       467
       467
       +
       @@ -40,7 +40,7 @@ set(DISPATCH_SDKS)

     

       468
       468
       +
        

     

       469
       469
       +
        # Build the host libdispatch if needed.

     

       470
       470
       +
        if(SWIFT_BUILD_HOST_DISPATCH)

     

       471
       471
       +
       -  if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)

     

       472
       472
       +
       +  if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")

     

       473
       473
       +
            if(NOT "${SWIFT_HOST_VARIANT_SDK}" IN_LIST SWIFT_SDKS)

     

       474
       474
       +
              list(APPEND DISPATCH_SDKS "${SWIFT_HOST_VARIANT_SDK}")

     

       475
       475
       +
            endif()

     

       476
       476
       +
       @@ -52,20 +52,20 @@ foreach(sdk ${SWIFT_SDKS})

     

       477
       477
       +
          # Darwin targets have libdispatch available, do not build it.

     

       478
       478
       +
          # Wasm/WASI doesn't support libdispatch yet.

     

       479
       479
       +
          # See https://github.com/apple/swift/issues/54533 for more details.

     

       480
       480
       +
       -  if(NOT "${sdk}" IN_LIST SWIFT_DARWIN_PLATFORMS AND NOT "${sdk}" STREQUAL WASI)

     

       481
       481
       +
       +  if(NOT "${sdk}" IN_LIST SWIFT_DARWIN_PLATFORMS AND NOT "${sdk}" STREQUAL "WASI")

     

       482
       482
       +
            list(APPEND DISPATCH_SDKS "${sdk}")

     

       483
       483
       +
          endif()

     

       484
       484
       +
        endforeach()

     

       485
       485
       +
        

     

       486
       486
       +
        foreach(sdk ${DISPATCH_SDKS})

     

       487
       487
       +
          set(ARCHS ${SWIFT_SDK_${sdk}_ARCHITECTURES})

     

       488
       488
       +
       -  if(${sdk} STREQUAL "${SWIFT_HOST_VARIANT_SDK}")

     

       489
       489
       +
       +  if(sdk STREQUAL "${SWIFT_HOST_VARIANT_SDK}")

     

       490
       490
       +
            if(NOT "${SWIFT_HOST_VARIANT_ARCH}" IN_LIST ARCHS)

     

       491
       491
       +
              list(APPEND ARCHS "${SWIFT_HOST_VARIANT_ARCH}")

     

       492
       492
       +
            endif()

     

       493
       493
       +
          endif()

     

       494
       494
       +
          

     

       495
       495
       +
       -  if(sdk STREQUAL ANDROID)

     

       496
       496
       +
       +  if(sdk STREQUAL "ANDROID")

     

       497
       497
       +
            set(SWIFT_LIBDISPATCH_COMPILER_CMAKE_ARGS)

     

       498
       498
       +
          else()

     

       499
       499
       +
            set(SWIFT_LIBDISPATCH_COMPILER_CMAKE_ARGS -DCMAKE_C_COMPILER=${SWIFT_LIBDISPATCH_C_COMPILER};-DCMAKE_CXX_COMPILER=${SWIFT_LIBDISPATCH_CXX_COMPILER})

     

       500
       500
       +
       diff --git a/cmake/modules/SwiftComponents.cmake b/cmake/modules/SwiftComponents.cmake

     

       501
       501
       +
       index 6816b75e8a4..2ec225140dc 100644

     

       502
       502
       +
       --- a/cmake/modules/SwiftComponents.cmake

     

       503
       503
       +
       +++ b/cmake/modules/SwiftComponents.cmake

     

       504
       504
       +
       @@ -82,7 +82,7 @@ list(REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "clang-builtin-headers-in-clang-resou

     

       505
       505
       +
        # This conflicts with LLVM itself when doing unified builds.

     

       506
       506
       +
        list(REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "llvm-toolchain-dev-tools")

     

       507
       507
       +
        # The sourcekit install variants are currently mutually exclusive.

     

       508
       508
       +
       -if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

     

       509
       509
       +
       +if(CMAKE_SYSTEM_NAME MATCHES "Darwin")

     

       510
       510
       +
          list(REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "sourcekit-inproc")

     

       511
       511
       +
        else()

     

       512
       512
       +
          list(REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "sourcekit-xpc-service")

     

       513
       513
       +
       diff --git a/cmake/modules/SwiftConfigureSDK.cmake b/cmake/modules/SwiftConfigureSDK.cmake

     

       514
       514
       +
       index d4cb352d658..5dd258cdd24 100644

     

       515
       515
       +
       --- a/cmake/modules/SwiftConfigureSDK.cmake

     

       516
       516
       +
       +++ b/cmake/modules/SwiftConfigureSDK.cmake

     

       517
       517
       +
       @@ -232,7 +232,7 @@ macro(configure_sdk_darwin

     

       518
       518
       +
            SWIFT_SDK_${prefix}_MODULE_ARCHITECTURES)     # result

     

       519
       519
       +
        

     

       520
       520
       +
          # Determine whether this is a simulator SDK.

     

       521
       521
       +
       -  if ( ${xcrun_name} MATCHES "simulator" )

     

       522
       522
       +
       +  if(xcrun_name MATCHES "simulator")

     

       523
       523
       +
            set(SWIFT_SDK_${prefix}_IS_SIMULATOR TRUE)

     

       524
       524
       +
          else()

     

       525
       525
       +
            set(SWIFT_SDK_${prefix}_IS_SIMULATOR FALSE)

     

       526
       526
       +
       @@ -378,11 +378,11 @@ macro(configure_sdk_unix name architectures)

     

       527
       527
       +
                  message(FATAL_ERROR "unknown arch for ${prefix}: ${arch}")

     

       528
       528
       +
                endif()

     

       529
       529
       +
              elseif("${prefix}" STREQUAL "FREEBSD")

     

       530
       530
       +
       -        if(NOT arch STREQUAL x86_64)

     

       531
       531
       +
       +        if(NOT arch STREQUAL "x86_64")

     

       532
       532
       +
                  message(FATAL_ERROR "unsupported arch for FreeBSD: ${arch}")

     

       533
       533
       +
                endif()

     

       534
       534
       +
        

     

       535
       535
       +
       -        if(NOT CMAKE_HOST_SYSTEM_NAME STREQUAL FreeBSD)

     

       536
       536
       +
       +        if(NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD")

     

       537
       537
       +
                  message(WARNING "CMAKE_SYSTEM_VERSION will not match target")

     

       538
       538
       +
                endif()

     

       539
       539
       +
        

     

       540
       540
       +
       @@ -391,7 +391,7 @@ macro(configure_sdk_unix name architectures)

     

       541
       541
       +
        

     

       542
       542
       +
                set(SWIFT_SDK_FREEBSD_ARCH_x86_64_TRIPLE "x86_64-unknown-freebsd${freebsd_system_version}")

     

       543
       543
       +
              elseif("${prefix}" STREQUAL "OPENBSD")

     

       544
       544
       +
       -        if(NOT arch STREQUAL amd64)

     

       545
       545
       +
       +        if(NOT arch STREQUAL "amd64")

     

       546
       546
       +
                  message(FATAL_ERROR "unsupported arch for OpenBSD: ${arch}")

     

       547
       547
       +
                endif()

     

       548
       548
       +
        

     

       549
       549
       +
       @@ -404,17 +404,17 @@ macro(configure_sdk_unix name architectures)

     

       550
       550
       +
                  set(SWIFT_SDK_OPENBSD_ARCH_${arch}_PATH "${CMAKE_SYSROOT}${SWIFT_SDK_OPENBSD_ARCH_${arch}_PATH}" CACHE INTERNAL "sysroot path" FORCE)

     

       551
       551
       +
                endif()

     

       552
       552
       +
              elseif("${prefix}" STREQUAL "CYGWIN")

     

       553
       553
       +
       -        if(NOT arch STREQUAL x86_64)

     

       554
       554
       +
       +        if(NOT arch STREQUAL "x86_64")

     

       555
       555
       +
                  message(FATAL_ERROR "unsupported arch for cygwin: ${arch}")

     

       556
       556
       +
                endif()

     

       557
       557
       +
                set(SWIFT_SDK_CYGWIN_ARCH_x86_64_TRIPLE "x86_64-unknown-windows-cygnus")

     

       558
       558
       +
              elseif("${prefix}" STREQUAL "HAIKU")

     

       559
       559
       +
       -        if(NOT arch STREQUAL x86_64)

     

       560
       560
       +
       +        if(NOT arch STREQUAL "x86_64")

     

       561
       561
       +
                  message(FATAL_ERROR "unsupported arch for Haiku: ${arch}")

     

       562
       562
       +
                endif()

     

       563
       563
       +
                set(SWIFT_SDK_HAIKU_ARCH_x86_64_TRIPLE "x86_64-unknown-haiku")

     

       564
       564
       +
              elseif("${prefix}" STREQUAL "WASI")

     

       565
       565
       +
       -        if(NOT arch STREQUAL wasm32)

     

       566
       566
       +
       +        if(NOT arch STREQUAL "wasm32")

     

       567
       567
       +
                  message(FATAL_ERROR "unsupported arch for WebAssembly: ${arch}")

     

       568
       568
       +
                endif()

     

       569
       569
       +
                set(SWIFT_SDK_WASI_ARCH_wasm32_PATH "${SWIFT_WASI_SYSROOT_PATH}")

     

       570
       570
       +
       @@ -459,7 +459,7 @@ macro(configure_sdk_windows name environment architectures)

     

       571
       571
       +
          get_threading_package(${prefix} "win32" SWIFT_SDK_${prefix}_THREADING_PACKAGE)

     

       572
       572
       +
        

     

       573
       573
       +
          foreach(arch ${architectures})

     

       574
       574
       +
       -    if(arch STREQUAL armv7)

     

       575
       575
       +
       +    if(arch STREQUAL "armv7")

     

       576
       576
       +
              set(SWIFT_SDK_${prefix}_ARCH_${arch}_TRIPLE

     

       577
       577
       +
                  "thumbv7-unknown-windows-${environment}")

     

       578
       578
       +
            else()

     

       579
       579
       +
       diff --git a/cmake/modules/SwiftWindowsSupport.cmake b/cmake/modules/SwiftWindowsSupport.cmake

     

       580
       580
       +
       index 6216b82c12b..a3432476658 100644

     

       581
       581
       +
       --- a/cmake/modules/SwiftWindowsSupport.cmake

     

       582
       582
       +
       +++ b/cmake/modules/SwiftWindowsSupport.cmake

     

       583
       583
       +
       @@ -2,13 +2,13 @@

     

       584
       584
       +
        include(SwiftUtils)

     

       585
       585
       +
        

     

       586
       586
       +
        function(swift_windows_arch_spelling arch var)

     

       587
       587
       +
       -  if(${arch} STREQUAL i686)

     

       588
       588
       +
       +  if(arch STREQUAL "i686")

     

       589
       589
       +
            set(${var} x86 PARENT_SCOPE)

     

       590
       590
       +
       -  elseif(${arch} STREQUAL x86_64)

     

       591
       591
       +
       +  elseif(arch STREQUAL "x86_64")

     

       592
       592
       +
            set(${var} x64 PARENT_SCOPE)

     

       593
       593
       +
       -  elseif(${arch} STREQUAL armv7)

     

       594
       594
       +
       +  elseif(arch STREQUAL "armv7")

     

       595
       595
       +
            set(${var} arm PARENT_SCOPE)

     

       596
       596
       +
       -  elseif(${arch} STREQUAL aarch64)

     

       597
       597
       +
       +  elseif(arch STREQUAL "aarch64")

     

       598
       598
       +
            set(${var} arm64 PARENT_SCOPE)

     

       599
       599
       +
          else()

     

       600
       600
       +
            message(FATAL_ERROR "do not know MSVC spelling for ARCH: `${arch}`")

     

       601
       601
       +
       @@ -33,7 +33,7 @@ function(swift_windows_lib_for_arch arch var)

     

       602
       602
       +
          # a directory called "Lib" rather than VS2017 which normalizes the layout and

     

       603
       603
       +
          # places them in a directory named "lib".

     

       604
       604
       +
          if(IS_DIRECTORY "${VCToolsInstallDir}/Lib")

     

       605
       605
       +
       -    if(${ARCH} STREQUAL x86)

     

       606
       606
       +
       +    if(ARCH STREQUAL "x86")

     

       607
       607
       +
              list(APPEND paths "${VCToolsInstallDir}/Lib/")

     

       608
       608
       +
            else()

     

       609
       609
       +
              list(APPEND paths "${VCToolsInstallDir}/Lib/${ARCH}")

     

       610
       610
       +
       diff --git a/include/swift/AST/CMakeLists.txt b/include/swift/AST/CMakeLists.txt

     

       611
       611
       +
       index 869d96ba13b..050695f65c6 100644

     

       612
       612
       +
       --- a/include/swift/AST/CMakeLists.txt

     

       613
       613
       +
       +++ b/include/swift/AST/CMakeLists.txt

     

       614
       614
       +
       @@ -1,4 +1,4 @@

     

       615
       615
       +
       -if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)

     

       616
       616
       +
       +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")

     

       617
       617
       +
          set(SWIFT_GYB_FLAGS --line-directive "^\"#line %(line)d \\\"%(file)s\\\"^\"")

     

       618
       618
       +
        else()

     

       619
       619
       +
          set(SWIFT_GYB_FLAGS --line-directive "\'#line" "%(line)d" "\"%(file)s\"\'")

     

       620
       620
       +
       diff --git a/lib/AST/CMakeLists.txt b/lib/AST/CMakeLists.txt

     

       621
       621
       +
       index a0011d8a68c..13363dea4aa 100644

     

       622
       622
       +
       --- a/lib/AST/CMakeLists.txt

     

       623
       623
       +
       +++ b/lib/AST/CMakeLists.txt

     

       624
       624
       +
       @@ -125,7 +125,7 @@ add_swift_host_library(swiftAST STATIC

     

       625
       625
       +
          )

     

       626
       626
       +
        

     

       627
       627
       +
        if(SWIFT_FORCE_OPTIMIZED_TYPECHECKER)

     

       628
       628
       +
       -  if(CMAKE_CXX_COMPILER_ID STREQUAL MSVC OR CMAKE_CXX_SIMULATE_ID STREQUAL MSVC)

     

       629
       629
       +
       +  if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" OR CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC")

     

       630
       630
       +
            target_compile_options(swiftAST PRIVATE /O2 /Ob2)

     

       631
       631
       +
          else()

     

       632
       632
       +
            target_compile_options(swiftAST PRIVATE -O3)

     

       633
       633
       +
       diff --git a/lib/Migrator/CMakeLists.txt b/lib/Migrator/CMakeLists.txt

     

       634
       634
       +
       index 1dfd089d21a..228baa470ed 100644

     

       635
       635
       +
       --- a/lib/Migrator/CMakeLists.txt

     

       636
       636
       +
       +++ b/lib/Migrator/CMakeLists.txt

     

       637
       637
       +
       @@ -23,7 +23,7 @@ set(outputs)

     

       638
       638
       +
        foreach(input ${datafiles})

     

       639
       639
       +
          set(source "${CMAKE_CURRENT_SOURCE_DIR}/${input}")

     

       640
       640
       +
          set(dest "${output_dir}/${input}")

     

       641
       641
       +
       -  if(CMAKE_SYSTEM_NAME STREQUAL Windows)

     

       642
       642
       +
       +  if(CMAKE_SYSTEM_NAME STREQUAL "Windows")

     

       643
       643
       +
            set(CMAKE_SYMLINK_COMMAND copy)

     

       644
       644
       +
          else()

     

       645
       645
       +
            set(CMAKE_SYMLINK_COMMAND create_symlink)

     

       646
       646
       +
       diff --git a/lib/Parse/CMakeLists.txt b/lib/Parse/CMakeLists.txt

     

       647
       647
       +
       index b46a4b217c3..b8550c96b2a 100644

     

       648
       648
       +
       --- a/lib/Parse/CMakeLists.txt

     

       649
       649
       +
       +++ b/lib/Parse/CMakeLists.txt

     

       650
       650
       +
       @@ -1,6 +1,6 @@

     

       651
       651
       +
        

     

       652
       652
       +
        

     

       653
       653
       +
       -if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)

     

       654
       654
       +
       +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")

     

       655
       655
       +
          set(SWIFT_GYB_FLAGS --line-directive "^\"#line %(line)d \\\"%(file)s\\\"^\"")

     

       656
       656
       +
        else()

     

       657
       657
       +
          set(SWIFT_GYB_FLAGS --line-directive "\'#line" "%(line)d" "\"%(file)s\"\'")

     

       658
       658
       +
       diff --git a/lib/Sema/CMakeLists.txt b/lib/Sema/CMakeLists.txt

     

       659
       659
       +
       index c0e3608d07a..bf70a33782d 100644

     

       660
       660
       +
       --- a/lib/Sema/CMakeLists.txt

     

       661
       661
       +
       +++ b/lib/Sema/CMakeLists.txt

     

       662
       662
       +
       @@ -74,7 +74,7 @@ add_swift_host_library(swiftSema STATIC

     

       663
       663
       +
          TypeChecker.cpp

     

       664
       664
       +
          IDETypeCheckingRequests.cpp)

     

       665
       665
       +
        if(SWIFT_FORCE_OPTIMIZED_TYPECHECKER)

     

       666
       666
       +
       -  if(CMAKE_CXX_COMPILER_ID STREQUAL MSVC OR CMAKE_CXX_SIMULATE_ID STREQUAL MSVC)

     

       667
       667
       +
       +  if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" OR CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC")

     

       668
       668
       +
            target_compile_options(swiftSema PRIVATE /O2 /Ob2)

     

       669
       669
       +
          else()

     

       670
       670
       +
            target_compile_options(swiftSema PRIVATE -O3)

     

       671
       671
       +
       diff --git a/lib/SwiftRemoteMirror/CMakeLists.txt b/lib/SwiftRemoteMirror/CMakeLists.txt

     

       672
       672
       +
       index f774297e51c..da2248de9f7 100644

     

       673
       673
       +
       --- a/lib/SwiftRemoteMirror/CMakeLists.txt

     

       674
       674
       +
       +++ b/lib/SwiftRemoteMirror/CMakeLists.txt

     

       675
       675
       +
       @@ -3,6 +3,6 @@ add_swift_host_library(swiftRemoteMirror STATIC

     

       676
       676
       +
        target_link_libraries(swiftRemoteMirror PRIVATE

     

       677
       677
       +
          swiftDemangling)

     

       678
       678
       +
        

     

       679
       679
       +
       -if(CMAKE_SYSTEM_NAME STREQUAL Windows)

     

       680
       680
       +
       +if(CMAKE_SYSTEM_NAME STREQUAL "Windows")

     

       681
       681
       +
          target_compile_definitions(swiftRemoteMirror PRIVATE _LIB)

     

       682
       682
       +
        endif()

     

       683
       683
       +
       diff --git a/stdlib/cmake/modules/AddSwiftStdlib.cmake b/stdlib/cmake/modules/AddSwiftStdlib.cmake

     

       684
       684
       +
       index 25a79d145fb..781d6fd33cf 100644

     

       685
       685
       +
       --- a/stdlib/cmake/modules/AddSwiftStdlib.cmake

     

       686
       686
       +
       +++ b/stdlib/cmake/modules/AddSwiftStdlib.cmake

     

       687
       687
       +
       @@ -249,7 +249,7 @@ function(_add_target_variant_c_compile_flags)

     

       688
       688
       +
            # NOTE(compnerd) workaround LLVM invoking `add_definitions(-D_DEBUG)` which

     

       689
       689
       +
            # causes failures for the runtime library when cross-compiling due to

     

       690
       690
       +
            # undefined symbols from the standard library.

     

       691
       691
       +
       -    if(NOT CMAKE_BUILD_TYPE STREQUAL Debug)

     

       692
       692
       +
       +    if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")

     

       693
       693
       +
              list(APPEND result "-U_DEBUG")

     

       694
       694
       +
            endif()

     

       695
       695
       +
          endif()

     

       696
       696
       +
       @@ -258,7 +258,7 @@ function(_add_target_variant_c_compile_flags)

     

       697
       697
       +
          # uses a spin lock for this, so to get reasonable behavior we have to

     

       698
       698
       +
          # implement it ourselves using _InterlockedCompareExchange128.

     

       699
       699
       +
          # clang-cl requires us to enable the `cx16` feature to use this intrinsic.

     

       700
       700
       +
       -  if(CFLAGS_ARCH STREQUAL x86_64)

     

       701
       701
       +
       +  if(CFLAGS_ARCH STREQUAL "x86_64")

     

       702
       702
       +
            if(SWIFT_COMPILER_IS_MSVC_LIKE)

     

       703
       703
       +
              list(APPEND result /clang:-mcx16)

     

       704
       704
       +
            else()

     

       705
       705
       +
       @@ -287,7 +287,7 @@ function(_add_target_variant_c_compile_flags)

     

       706
       706
       +
          endif()

     

       707
       707
       +
        

     

       708
       708
       +
          if("${CFLAGS_SDK}" STREQUAL "LINUX")

     

       709
       709
       +
       -    if(${CFLAGS_ARCH} STREQUAL x86_64)

     

       710
       710
       +
       +    if("${CFLAGS_ARCH}" STREQUAL "x86_64")

     

       711
       711
       +
              # this is the minimum architecture that supports 16 byte CAS, which is necessary to avoid a dependency to libatomic

     

       712
       712
       +
              list(APPEND result "-march=core2")

     

       713
       713
       +
            endif()

     

       714
       714
       +
       @@ -493,7 +493,7 @@ function(_add_target_variant_link_flags)

     

       715
       715
       +
            else()

     

       716
       716
       +
              set(linker "${SWIFT_USE_LINKER}")

     

       717
       717
       +
            endif()

     

       718
       718
       +
       -    if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)

     

       719
       719
       +
       +    if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")

     

       720
       720
       +
              list(APPEND result "-fuse-ld=${linker}.exe")

     

       721
       721
       +
            else()

     

       722
       722
       +
              list(APPEND result "-fuse-ld=${linker}")

     

       723
       723
       +
       @@ -506,8 +506,8 @@ function(_add_target_variant_link_flags)

     

       724
       724
       +
          #

     

       725
       725
       +
          # TODO: Evaluate/enable -f{function,data}-sections --gc-sections for bfd,

     

       726
       726
       +
          # gold, and lld.

     

       727
       727
       +
       -  if(NOT CMAKE_BUILD_TYPE STREQUAL Debug)

     

       728
       728
       +
       -    if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

     

       729
       729
       +
       +  if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")

     

       730
       730
       +
       +    if(CMAKE_SYSTEM_NAME MATCHES "Darwin")

     

       731
       731
       +
              # See rdar://48283130: This gives 6MB+ size reductions for swift and

     

       732
       732
       +
              # SourceKitService, and much larger size reductions for sil-opt etc.

     

       733
       733
       +
              list(APPEND result "-Wl,-dead_strip")

     

       734
       734
       +
       @@ -969,7 +969,7 @@ function(add_swift_target_library_single target name)

     

       735
       735
       +
          endif()

     

       736
       736
       +
        

     

       737
       737
       +
          set(INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS ${SWIFTLIB_INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS})

     

       738
       738
       +
       -  if(${libkind} STREQUAL "SHARED")

     

       739
       739
       +
       +  if(libkind STREQUAL "SHARED")

     

       740
       740
       +
            list(APPEND INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS

     

       741
       741
       +
                 ${SWIFTLIB_INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS_SHARED_ONLY})

     

       742
       742
       +
          endif()

     

       743
       743
       +
       @@ -991,7 +991,7 @@ function(add_swift_target_library_single target name)

     

       744
       744
       +
              # target_sources(${target}

     

       745
       745
       +
              #                PRIVATE

     

       746
       746
       +
              #                  $<TARGET_OBJECTS:swiftImageRegistrationObject${SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_OBJECT_FORMAT}-${SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_LIB_SUBDIR}-${SWIFTLIB_SINGLE_ARCHITECTURE}>)

     

       747
       747
       +
       -      if(SWIFTLIB_SINGLE_SDK STREQUAL WINDOWS)

     

       748
       748
       +
       +      if(SWIFTLIB_SINGLE_SDK STREQUAL "WINDOWS")

     

       749
       749
       +
                set(extension .obj)

     

       750
       750
       +
              else()

     

       751
       751
       +
                set(extension .o)

     

       752
       752
       +
       @@ -1059,8 +1059,8 @@ function(add_swift_target_library_single target name)

     

       753
       753
       +
          set_target_properties("${target}" PROPERTIES

     

       754
       754
       +
            LIBRARY_OUTPUT_DIRECTORY ${swiftlib_prefix}/${output_sub_dir}

     

       755
       755
       +
            ARCHIVE_OUTPUT_DIRECTORY ${swiftlib_prefix}/${output_sub_dir})

     

       756
       756
       +
       -  if(SWIFTLIB_SINGLE_SDK STREQUAL WINDOWS AND SWIFTLIB_SINGLE_IS_STDLIB_CORE

     

       757
       757
       +
       -      AND libkind STREQUAL SHARED)

     

       758
       758
       +
       +  if(SWIFTLIB_SINGLE_SDK STREQUAL "WINDOWS" AND SWIFTLIB_SINGLE_IS_STDLIB_CORE

     

       759
       759
       +
       +      AND libkind STREQUAL "SHARED")

     

       760
       760
       +
            add_custom_command(TARGET ${target} POST_BUILD

     

       761
       761
       +
              COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${target}> ${swiftlib_prefix}/${output_sub_dir})

     

       762
       762
       +
          endif()

     

       763
       763
       +
       @@ -1264,8 +1264,8 @@ function(add_swift_target_library_single target name)

     

       764
       764
       +
            MACCATALYST_BUILD_FLAVOR "${SWIFTLIB_SINGLE_MACCATALYST_BUILD_FLAVOR}"

     

       765
       765
       +
            )

     

       766
       766
       +
        

     

       767
       767
       +
       -  if(SWIFTLIB_SINGLE_SDK STREQUAL WINDOWS)

     

       768
       768
       +
       -    if(libkind STREQUAL SHARED)

     

       769
       769
       +
       +  if(SWIFTLIB_SINGLE_SDK STREQUAL "WINDOWS")

     

       770
       770
       +
       +    if(libkind STREQUAL "SHARED")

     

       771
       771
       +
              list(APPEND c_compile_flags -D_WINDLL)

     

       772
       772
       +
            endif()

     

       773
       773
       +
          endif()

     

       774
       774
       +
       @@ -1324,13 +1324,13 @@ function(add_swift_target_library_single target name)

     

       775
       775
       +
          endif()

     

       776
       776
       +
        

     

       777
       777
       +
          # Set compilation and link flags.

     

       778
       778
       +
       -  if(SWIFTLIB_SINGLE_SDK STREQUAL WINDOWS)

     

       779
       779
       +
       +  if(SWIFTLIB_SINGLE_SDK STREQUAL "WINDOWS")

     

       780
       780
       +
            swift_windows_include_for_arch(${SWIFTLIB_SINGLE_ARCHITECTURE}

     

       781
       781
       +
              ${SWIFTLIB_SINGLE_ARCHITECTURE}_INCLUDE)

     

       782
       782
       +
            target_include_directories(${target} SYSTEM PRIVATE

     

       783
       783
       +
              ${${SWIFTLIB_SINGLE_ARCHITECTURE}_INCLUDE})

     

       784
       784
       +
        

     

       785
       785
       +
       -    if(NOT ${CMAKE_C_COMPILER_ID} STREQUAL MSVC)

     

       786
       786
       +
       +    if(NOT CMAKE_C_COMPILER_ID STREQUAL "MSVC")

     

       787
       787
       +
              swift_windows_get_sdk_vfs_overlay(SWIFTLIB_SINGLE_VFS_OVERLAY)

     

       788
       788
       +
              target_compile_options(${target} PRIVATE

     

       789
       789
       +
                "SHELL:-Xclang -ivfsoverlay -Xclang ${SWIFTLIB_SINGLE_VFS_OVERLAY}")

     

       790
       790
       +
       @@ -1347,7 +1347,7 @@ function(add_swift_target_library_single target name)

     

       791
       791
       +
            ${c_compile_flags})

     

       792
       792
       +
          target_link_options(${target} PRIVATE

     

       793
       793
       +
            ${link_flags})

     

       794
       794
       +
       -  if(${SWIFTLIB_SINGLE_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       795
       795
       +
       +  if(SWIFTLIB_SINGLE_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       796
       796
       +
            target_link_options(${target} PRIVATE

     

       797
       797
       +
              "LINKER:-compatibility_version,1")

     

       798
       798
       +
            if(SWIFT_COMPILER_VERSION)

     

       799
       799
       +
       @@ -1380,7 +1380,7 @@ function(add_swift_target_library_single target name)

     

       800
       800
       +
            list(APPEND swiftlib_link_flags_all "-Xlinker -no_warn_inits")

     

       801
       801
       +
          endif()

     

       802
       802
       +
        

     

       803
       803
       +
       -  if(${SWIFTLIB_SINGLE_SDK} IN_LIST SWIFT_APPLE_PLATFORMS)

     

       804
       804
       +
       +  if(SWIFTLIB_SINGLE_SDK IN_LIST SWIFT_APPLE_PLATFORMS)

     

       805
       805
       +
            # In the past, we relied on unsetting globally

     

       806
       806
       +
            # CMAKE_OSX_ARCHITECTURES to ensure that CMake

     

       807
       807
       +
            # would not add the -arch flag. This is no longer

     

       808
       808
       +
       @@ -1403,7 +1403,7 @@ function(add_swift_target_library_single target name)

     

       809
       809
       +
          # doing so will result in incorrect symbol resolution and linkage.  We created

     

       810
       810
       +
          # import library targets when the library was added.  Use that to adjust the

     

       811
       811
       +
          # link libraries.

     

       812
       812
       +
       -  if(SWIFTLIB_SINGLE_SDK STREQUAL WINDOWS AND NOT CMAKE_SYSTEM_NAME STREQUAL Windows)

     

       813
       813
       +
       +  if(SWIFTLIB_SINGLE_SDK STREQUAL "WINDOWS" AND NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")

     

       814
       814
       +
            foreach(library_list LINK_LIBRARIES PRIVATE_LINK_LIBRARIES)

     

       815
       815
       +
              set(import_libraries)

     

       816
       816
       +
              foreach(library ${SWIFTLIB_SINGLE_${library_list}})

     

       817
       817
       +
       @@ -1415,7 +1415,7 @@ function(add_swift_target_library_single target name)

     

       818
       818
       +
                set(import_library ${library})

     

       819
       819
       +
                if(TARGET ${library})

     

       820
       820
       +
                  get_target_property(type ${library} TYPE)

     

       821
       821
       +
       -          if(${type} STREQUAL "SHARED_LIBRARY")

     

       822
       822
       +
       +          if(type STREQUAL "SHARED_LIBRARY")

     

       823
       823
       +
                    set(import_library ${library}_IMPLIB)

     

       824
       824
       +
                  endif()

     

       825
       825
       +
                endif()

     

       826
       826
       +
       @@ -1744,7 +1744,7 @@ function(add_swift_target_library name)

     

       827
       827
       +
            list(APPEND SWIFTLIB_SWIFT_MODULE_DEPENDS Core)

     

       828
       828
       +
        

     

       829
       829
       +
            # swiftSwiftOnoneSupport does not depend on itself, obviously.

     

       830
       830
       +
       -    if(NOT ${name} STREQUAL swiftSwiftOnoneSupport)

     

       831
       831
       +
       +    if(NOT name STREQUAL "swiftSwiftOnoneSupport")

     

       832
       832
       +
              # All Swift code depends on the SwiftOnoneSupport in non-optimized mode,

     

       833
       833
       +
              # except for the standard library itself.

     

       834
       834
       +
              is_build_type_optimized("${SWIFT_STDLIB_BUILD_TYPE}" optimized)

     

       835
       835
       +
       @@ -1851,7 +1851,7 @@ function(add_swift_target_library name)

     

       836
       836
       +
        

     

       837
       837
       +
            # Collect architecture agnostic SDK module dependencies

     

       838
       838
       +
            set(swiftlib_module_depends_flattened ${SWIFTLIB_SWIFT_MODULE_DEPENDS})

     

       839
       839
       +
       -    if(${sdk} STREQUAL OSX)

     

       840
       840
       +
       +    if(sdk STREQUAL "OSX")

     

       841
       841
       +
               if(DEFINED maccatalyst_build_flavor AND NOT maccatalyst_build_flavor STREQUAL "macos-like")

     

       842
       842
       +
                  list(APPEND swiftlib_module_depends_flattened

     

       843
       843
       +
                    ${SWIFTLIB_SWIFT_MODULE_DEPENDS_MACCATALYST})

     

       844
       844
       +
       @@ -1863,70 +1863,70 @@ function(add_swift_target_library name)

     

       845
       845
       +
                endif()

     

       846
       846
       +
              list(APPEND swiftlib_module_depends_flattened

     

       847
       847
       +
                   ${SWIFTLIB_SWIFT_MODULE_DEPENDS_OSX})

     

       848
       848
       +
       -    elseif(${sdk} STREQUAL IOS OR ${sdk} STREQUAL IOS_SIMULATOR)

     

       849
       849
       +
       +    elseif(sdk STREQUAL "IOS" OR sdk STREQUAL "IOS_SIMULATOR")

     

       850
       850
       +
              list(APPEND swiftlib_module_depends_flattened

     

       851
       851
       +
                   ${SWIFTLIB_SWIFT_MODULE_DEPENDS_IOS})

     

       852
       852
       +
       -    elseif(${sdk} STREQUAL TVOS OR ${sdk} STREQUAL TVOS_SIMULATOR)

     

       853
       853
       +
       +    elseif(sdk STREQUAL "TVOS" OR sdk STREQUAL "TVOS_SIMULATOR")

     

       854
       854
       +
              list(APPEND swiftlib_module_depends_flattened

     

       855
       855
       +
                   ${SWIFTLIB_SWIFT_MODULE_DEPENDS_TVOS})

     

       856
       856
       +
       -    elseif(${sdk} STREQUAL WATCHOS OR ${sdk} STREQUAL WATCHOS_SIMULATOR)

     

       857
       857
       +
       +    elseif(sdk STREQUAL "WATCHOS" OR sdk STREQUAL "WATCHOS_SIMULATOR")

     

       858
       858
       +
              list(APPEND swiftlib_module_depends_flattened

     

       859
       859
       +
                   ${SWIFTLIB_SWIFT_MODULE_DEPENDS_WATCHOS})

     

       860
       860
       +
       -    elseif(${sdk} STREQUAL FREESTANDING)

     

       861
       861
       +
       +    elseif(sdk STREQUAL "FREESTANDING")

     

       862
       862
       +
              list(APPEND swiftlib_module_depends_flattened

     

       863
       863
       +
                   ${SWIFTLIB_SWIFT_MODULE_DEPENDS_FREESTANDING})

     

       864
       864
       +
       -    elseif(${sdk} STREQUAL FREEBSD)

     

       865
       865
       +
       +    elseif(sdk STREQUAL "FREEBSD")

     

       866
       866
       +
              list(APPEND swiftlib_module_depends_flattened

     

       867
       867
       +
                   ${SWIFTLIB_SWIFT_MODULE_DEPENDS_FREEBSD})

     

       868
       868
       +
       -    elseif(${sdk} STREQUAL OPENBSD)

     

       869
       869
       +
       +    elseif(sdk STREQUAL "OPENBSD")

     

       870
       870
       +
              list(APPEND swiftlib_module_depends_flattened

     

       871
       871
       +
                   ${SWIFTLIB_SWIFT_MODULE_DEPENDS_OPENBSD})

     

       872
       872
       +
       -    elseif(${sdk} STREQUAL LINUX OR ${sdk} STREQUAL ANDROID)

     

       873
       873
       +
       +    elseif(sdk STREQUAL "LINUX" OR sdk STREQUAL "ANDROID")

     

       874
       874
       +
              list(APPEND swiftlib_module_depends_flattened

     

       875
       875
       +
                   ${SWIFTLIB_SWIFT_MODULE_DEPENDS_LINUX})

     

       876
       876
       +
       -    elseif(${sdk} STREQUAL CYGWIN)

     

       877
       877
       +
       +    elseif(sdk STREQUAL "CYGWIN")

     

       878
       878
       +
              list(APPEND swiftlib_module_depends_flattened

     

       879
       879
       +
                   ${SWIFTLIB_SWIFT_MODULE_DEPENDS_CYGWIN})

     

       880
       880
       +
       -    elseif(${sdk} STREQUAL HAIKU)

     

       881
       881
       +
       +    elseif(sdk STREQUAL "HAIKU")

     

       882
       882
       +
              list(APPEND swiftlib_module_depends_flattened

     

       883
       883
       +
                   ${SWIFTLIB_SWIFT_MODULE_DEPENDS_HAIKU})

     

       884
       884
       +
       -    elseif(${sdk} STREQUAL WASI)

     

       885
       885
       +
       +    elseif(sdk STREQUAL "WASI")

     

       886
       886
       +
              list(APPEND swiftlib_module_depends_flattened

     

       887
       887
       +
                   ${SWIFTLIB_SWIFT_MODULE_DEPENDS_WASI})

     

       888
       888
       +
       -    elseif(${sdk} STREQUAL WINDOWS)

     

       889
       889
       +
       +    elseif(sdk STREQUAL "WINDOWS")

     

       890
       890
       +
              list(APPEND swiftlib_module_depends_flattened

     

       891
       891
       +
                   ${SWIFTLIB_SWIFT_MODULE_DEPENDS_WINDOWS})

     

       892
       892
       +
            endif()

     

       893
       893
       +
        

     

       894
       894
       +
            # Collect architecture agnostic SDK framework dependencies

     

       895
       895
       +
            set(swiftlib_framework_depends_flattened ${SWIFTLIB_FRAMEWORK_DEPENDS})

     

       896
       896
       +
       -    if(${sdk} STREQUAL OSX)

     

       897
       897
       +
       +    if(sdk STREQUAL "OSX")

     

       898
       898
       +
              list(APPEND swiftlib_framework_depends_flattened

     

       899
       899
       +
                   ${SWIFTLIB_FRAMEWORK_DEPENDS_OSX})

     

       900
       900
       +
       -    elseif(${sdk} STREQUAL IOS OR ${sdk} STREQUAL IOS_SIMULATOR OR

     

       901
       901
       +
       -           ${sdk} STREQUAL TVOS OR ${sdk} STREQUAL TVOS_SIMULATOR)

     

       902
       902
       +
       +    elseif(sdk STREQUAL "IOS" OR sdk STREQUAL "IOS_SIMULATOR" OR

     

       903
       903
       +
       +           sdk STREQUAL "TVOS" OR sdk STREQUAL "TVOS_SIMULATOR")

     

       904
       904
       +
              list(APPEND swiftlib_framework_depends_flattened

     

       905
       905
       +
                   ${SWIFTLIB_FRAMEWORK_DEPENDS_IOS_TVOS})

     

       906
       906
       +
            endif()

     

       907
       907
       +
        

     

       908
       908
       +
            # Collect architecture agnostic swift compiler flags

     

       909
       909
       +
            set(swiftlib_swift_compile_flags_all ${SWIFTLIB_SWIFT_COMPILE_FLAGS})

     

       910
       910
       +
       -    if(${sdk} STREQUAL OSX)

     

       911
       911
       +
       +    if(sdk STREQUAL "OSX")

     

       912
       912
       +
              list(APPEND swiftlib_swift_compile_flags_all

     

       913
       913
       +
                   ${SWIFTLIB_SWIFT_COMPILE_FLAGS_OSX})

     

       914
       914
       +
       -    elseif(${sdk} STREQUAL IOS OR ${sdk} STREQUAL IOS_SIMULATOR)

     

       915
       915
       +
       +    elseif(sdk STREQUAL "IOS" OR sdk STREQUAL "IOS_SIMULATOR")

     

       916
       916
       +
              list(APPEND swiftlib_swift_compile_flags_all

     

       917
       917
       +
                   ${SWIFTLIB_SWIFT_COMPILE_FLAGS_IOS})

     

       918
       918
       +
       -    elseif(${sdk} STREQUAL TVOS OR ${sdk} STREQUAL TVOS_SIMULATOR)

     

       919
       919
       +
       +    elseif(sdk STREQUAL "TVOS" OR sdk STREQUAL "TVOS_SIMULATOR")

     

       920
       920
       +
              list(APPEND swiftlib_swift_compile_flags_all

     

       921
       921
       +
                   ${SWIFTLIB_SWIFT_COMPILE_FLAGS_TVOS})

     

       922
       922
       +
       -    elseif(${sdk} STREQUAL WATCHOS OR ${sdk} STREQUAL WATCHOS_SIMULATOR)

     

       923
       923
       +
       +    elseif(sdk STREQUAL "WATCHOS" OR sdk STREQUAL "WATCHOS_SIMULATOR")

     

       924
       924
       +
              list(APPEND swiftlib_swift_compile_flags_all

     

       925
       925
       +
                   ${SWIFTLIB_SWIFT_COMPILE_FLAGS_WATCHOS})

     

       926
       926
       +
       -    elseif(${sdk} STREQUAL LINUX)

     

       927
       927
       +
       +    elseif(sdk STREQUAL "LINUX")

     

       928
       928
       +
              list(APPEND swiftlib_swift_compile_flags_all

     

       929
       929
       +
                   ${SWIFTLIB_SWIFT_COMPILE_FLAGS_LINUX})

     

       930
       930
       +
       -    elseif(${sdk} STREQUAL WINDOWS)

     

       931
       931
       +
       +    elseif(sdk STREQUAL "WINDOWS")

     

       932
       932
       +
              # FIXME: https://github.com/apple/swift/issues/44614

     

       933
       933
       +
              # static and shared are not mutually exclusive; however since we do a

     

       934
       934
       +
              # single build of the sources, this doesn't work for building both

     

       935
       935
       +
       @@ -1945,7 +1945,7 @@ function(add_swift_target_library name)

     

       936
       936
       +
        

     

       937
       937
       +
            # Collect architecture agnostic SDK linker flags

     

       938
       938
       +
            set(swiftlib_link_flags_all ${SWIFTLIB_LINK_FLAGS})

     

       939
       939
       +
       -    if(${sdk} STREQUAL IOS_SIMULATOR AND ${name} STREQUAL swiftMediaPlayer)

     

       940
       940
       +
       +    if(sdk STREQUAL "IOS_SIMULATOR" AND name STREQUAL "swiftMediaPlayer")

     

       941
       941
       +
              # message("DISABLING AUTOLINK FOR swiftMediaPlayer")

     

       942
       942
       +
              list(APPEND swiftlib_link_flags_all "-Xlinker" "-ignore_auto_link")

     

       943
       943
       +
            endif()

     

       944
       944
       +
       @@ -1959,8 +1959,8 @@ function(add_swift_target_library name)

     

       945
       945
       +
            # back to supported targets and libraries only.  This is needed for ELF

     

       946
       946
       +
            # targets only; however, RemoteMirror needs to build with undefined

     

       947
       947
       +
            # symbols.

     

       948
       948
       +
       -    if(${SWIFT_SDK_${sdk}_OBJECT_FORMAT} STREQUAL ELF AND

     

       949
       949
       +
       -       NOT ${name} STREQUAL swiftRemoteMirror)

     

       950
       950
       +
       +    if(SWIFT_SDK_${sdk}_OBJECT_FORMAT STREQUAL "ELF" AND

     

       951
       951
       +
       +       NOT name STREQUAL "swiftRemoteMirror")

     

       952
       952
       +
              list(APPEND swiftlib_link_flags_all "-Wl,-z,defs")

     

       953
       953
       +
            endif()

     

       954
       954
       +
            # Setting back linker flags which are not supported when making Android build on macOS cross-compile host.

     

       955
       955
       +
       @@ -2067,22 +2067,22 @@ function(add_swift_target_library name)

     

       956
       956
       +
              set(swiftlib_link_flags_all ${SWIFTLIB_LINK_FLAGS})

     

       957
       957
       +
        

     

       958
       958
       +
              # Collect architecture agnostic c compiler flags

     

       959
       959
       +
       -      if(${sdk} STREQUAL OSX)

     

       960
       960
       +
       +      if(sdk STREQUAL "OSX")

     

       961
       961
       +
                list(APPEND swiftlib_c_compile_flags_all

     

       962
       962
       +
                     ${SWIFTLIB_C_COMPILE_FLAGS_OSX})

     

       963
       963
       +
       -      elseif(${sdk} STREQUAL IOS OR ${sdk} STREQUAL IOS_SIMULATOR)

     

       964
       964
       +
       +      elseif(sdk STREQUAL "IOS" OR sdk STREQUAL "IOS_SIMULATOR")

     

       965
       965
       +
                list(APPEND swiftlib_c_compile_flags_all

     

       966
       966
       +
                     ${SWIFTLIB_C_COMPILE_FLAGS_IOS})

     

       967
       967
       +
       -      elseif(${sdk} STREQUAL TVOS OR ${sdk} STREQUAL TVOS_SIMULATOR)

     

       968
       968
       +
       +      elseif(sdk STREQUAL "TVOS" OR sdk STREQUAL "TVOS_SIMULATOR")

     

       969
       969
       +
                list(APPEND swiftlib_c_compile_flags_all

     

       970
       970
       +
                     ${SWIFTLIB_C_COMPILE_FLAGS_TVOS})

     

       971
       971
       +
       -      elseif(${sdk} STREQUAL WATCHOS OR ${sdk} STREQUAL WATCHOS_SIMULATOR)

     

       972
       972
       +
       +      elseif(sdk STREQUAL "WATCHOS" OR sdk STREQUAL "WATCHOS_SIMULATOR")

     

       973
       973
       +
                list(APPEND swiftlib_c_compile_flags_all

     

       974
       974
       +
                     ${SWIFTLIB_C_COMPILE_FLAGS_WATCHOS})

     

       975
       975
       +
       -      elseif(${sdk} STREQUAL LINUX)

     

       976
       976
       +
       +      elseif(sdk STREQUAL "LINUX")

     

       977
       977
       +
                list(APPEND swiftlib_c_compile_flags_all

     

       978
       978
       +
                     ${SWIFTLIB_C_COMPILE_FLAGS_LINUX})

     

       979
       979
       +
       -      elseif(${sdk} STREQUAL WINDOWS)

     

       980
       980
       +
       +      elseif(sdk STREQUAL "WINDOWS")

     

       981
       981
       +
                list(APPEND swiftlib_c_compile_flags_all

     

       982
       982
       +
                     ${SWIFTLIB_C_COMPILE_FLAGS_WINDOWS})

     

       983
       983
       +
              endif()

     

       984
       984
       +
       @@ -2124,7 +2124,7 @@ function(add_swift_target_library name)

     

       985
       985
       +
              endif()

     

       986
       986
       +
        

     

       987
       987
       +
              # Setting back linker flags which are not supported when making Android build on macOS cross-compile host.

     

       988
       988
       +
       -      if(SWIFTLIB_SHARED AND ${sdk} STREQUAL ANDROID)

     

       989
       989
       +
       +      if(SWIFTLIB_SHARED AND sdk STREQUAL "ANDROID")

     

       990
       990
       +
                list(APPEND swiftlib_link_flags_all "-shared")

     

       991
       991
       +
                # TODO: Instead of `lib${name}.so` find variable or target property which already have this value.

     

       992
       992
       +
                list(APPEND swiftlib_link_flags_all "-Wl,-soname,lib${name}.so")

     

       993
       993
       +
       @@ -2181,7 +2181,7 @@ function(add_swift_target_library name)

     

       994
       994
       +
              add_dependencies(${VARIANT_NAME} clang)

     

       995
       995
       +
            endif()

     

       996
       996
       +
        

     

       997
       997
       +
       -      if(sdk STREQUAL WINDOWS)

     

       998
       998
       +
       +      if(sdk STREQUAL "WINDOWS")

     

       999
       999
       +
                if(SWIFT_COMPILER_IS_MSVC_LIKE)

     

       1000
       1000
       +
                  if (SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY MATCHES MultiThreadedDebugDLL)

     

       1001
       1001
       +
                    target_compile_options(${VARIANT_NAME} PRIVATE /MDd /D_DLL /D_DEBUG)

     

       1002
       1002
       +
       @@ -2326,7 +2326,7 @@ function(add_swift_target_library name)

     

       1003
       1003
       +
                set(optional_arg "OPTIONAL")

     

       1004
       1004
       +
              endif()

     

       1005
       1005
       +
        

     

       1006
       1006
       +
       -      if(sdk STREQUAL WINDOWS AND CMAKE_SYSTEM_NAME STREQUAL Windows)

     

       1007
       1007
       +
       +      if(sdk STREQUAL "WINDOWS" AND CMAKE_SYSTEM_NAME STREQUAL "Windows")

     

       1008
       1008
       +
                add_dependencies(${SWIFTLIB_INSTALL_IN_COMPONENT} ${name}-windows-${SWIFT_PRIMARY_VARIANT_ARCH})

     

       1009
       1009
       +
                swift_install_in_component(TARGETS ${name}-windows-${SWIFT_PRIMARY_VARIANT_ARCH}

     

       1010
       1010
       +
                                           RUNTIME

     

       1011
       1011
       +
       @@ -2357,7 +2357,7 @@ function(add_swift_target_library name)

     

       1012
       1012
       +
                                           PERMISSIONS ${file_permissions}

     

       1013
       1013
       +
                                           "${optional_arg}")

     

       1014
       1014
       +
              endif()

     

       1015
       1015
       +
       -      if(sdk STREQUAL WINDOWS)

     

       1016
       1016
       +
       +      if(sdk STREQUAL "WINDOWS")

     

       1017
       1017
       +
                foreach(arch ${SWIFT_SDK_WINDOWS_ARCHITECTURES})

     

       1018
       1018
       +
                  if(TARGET ${name}-windows-${arch}_IMPLIB)

     

       1019
       1019
       +
                    get_target_property(import_library ${name}-windows-${arch}_IMPLIB IMPORTED_LOCATION)

     

       1020
       1020
       +
       @@ -2558,13 +2558,13 @@ function(_add_swift_target_executable_single name)

     

       1021
       1021
       +
                ${SWIFTEXE_SINGLE_DEPENDS})

     

       1022
       1022
       +
          llvm_update_compile_flags("${name}")

     

       1023
       1023
       +
        

     

       1024
       1024
       +
       -  if(SWIFTEXE_SINGLE_SDK STREQUAL WINDOWS)

     

       1025
       1025
       +
       +  if(SWIFTEXE_SINGLE_SDK STREQUAL "WINDOWS")

     

       1026
       1026
       +
            swift_windows_include_for_arch(${SWIFTEXE_SINGLE_ARCHITECTURE}

     

       1027
       1027
       +
              ${SWIFTEXE_SINGLE_ARCHITECTURE}_INCLUDE)

     

       1028
       1028
       +
            target_include_directories(${name} SYSTEM PRIVATE

     

       1029
       1029
       +
              ${${SWIFTEXE_SINGLE_ARCHITECTURE}_INCLUDE})

     

       1030
       1030
       +
        

     

       1031
       1031
       +
       -    if(NOT ${CMAKE_C_COMPILER_ID} STREQUAL MSVC)

     

       1032
       1032
       +
       +    if(NOT CMAKE_C_COMPILER_ID STREQUAL "MSVC")

     

       1033
       1033
       +
              # MSVC doesn't support -Xclang. We don't need to manually specify

     

       1034
       1034
       +
              # the dependent libraries as `cl` does so.

     

       1035
       1035
       +
              target_compile_options(${name} PRIVATE

     

       1036
       1036
       +
       @@ -2584,7 +2584,7 @@ function(_add_swift_target_executable_single name)

     

       1037
       1037
       +
          if (SWIFT_PARALLEL_LINK_JOBS)

     

       1038
       1038
       +
            set_property(TARGET ${name} PROPERTY JOB_POOL_LINK swift_link_job_pool)

     

       1039
       1039
       +
          endif()

     

       1040
       1040
       +
       -  if(${SWIFTEXE_SINGLE_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       1041
       1041
       +
       +  if(SWIFTEXE_SINGLE_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       1042
       1042
       +
            set_target_properties(${name} PROPERTIES

     

       1043
       1043
       +
              BUILD_WITH_INSTALL_RPATH YES

     

       1044
       1044
       +
              INSTALL_RPATH "@executable_path/../lib/swift/${SWIFT_SDK_${SWIFTEXE_SINGLE_SDK}_LIB_SUBDIR}")

     

       1045
       1045
       +
       @@ -2596,7 +2596,7 @@ function(_add_swift_target_executable_single name)

     

       1046
       1046
       +
          # NOTE(compnerd) use the C linker language to invoke `clang` rather than

     

       1047
       1047
       +
          # `clang++` as we explicitly link against the C++ runtime.  We were previously

     

       1048
       1048
       +
          # actually passing `-nostdlib++` to avoid the C++ runtime linkage.

     

       1049
       1049
       +
       -  if(${SWIFTEXE_SINGLE_SDK} STREQUAL ANDROID)

     

       1050
       1050
       +
       +  if(SWIFTEXE_SINGLE_SDK STREQUAL "ANDROID")

     

       1051
       1051
       +
            set_property(TARGET "${name}" PROPERTY

     

       1052
       1052
       +
              LINKER_LANGUAGE "C")

     

       1053
       1053
       +
          else()

     

       1054
       1054
       +
       @@ -2666,7 +2666,7 @@ function(add_swift_target_executable name)

     

       1055
       1055
       +
                  EXCLUDE_FROM_ALL TRUE)

     

       1056
       1056
       +
              endif()

     

       1057
       1057
       +
        

     

       1058
       1058
       +
       -      if(${sdk} IN_LIST SWIFT_APPLE_PLATFORMS)

     

       1059
       1059
       +
       +      if(sdk IN_LIST SWIFT_APPLE_PLATFORMS)

     

       1060
       1060
       +
                # In the past, we relied on unsetting globally

     

       1061
       1061
       +
                # CMAKE_OSX_ARCHITECTURES to ensure that CMake would

     

       1062
       1062
       +
                # not add the -arch flag

     

       1063
       1063
       +
       diff --git a/stdlib/cmake/modules/SwiftSource.cmake b/stdlib/cmake/modules/SwiftSource.cmake

     

       1064
       1064
       +
       index d5d57dfd18a..39c2e07860f 100644

     

       1065
       1065
       +
       --- a/stdlib/cmake/modules/SwiftSource.cmake

     

       1066
       1066
       +
       +++ b/stdlib/cmake/modules/SwiftSource.cmake

     

       1067
       1067
       +
       @@ -730,7 +730,7 @@ function(_compile_swift_files

     

       1068
       1068
       +
        

     

       1069
       1069
       +
          set(line_directive_tool "${SWIFT_SOURCE_DIR}/utils/line-directive")

     

       1070
       1070
       +
        

     

       1071
       1071
       +
       -  if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)

     

       1072
       1072
       +
       +  if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")

     

       1073
       1073
       +
            set(HOST_EXECUTABLE_SUFFIX .exe)

     

       1074
       1074
       +
          endif()

     

       1075
       1075
       +
          if(SWIFT_BUILD_RUNTIME_WITH_HOST_COMPILER)

     

       1076
       1076
       +
       @@ -748,7 +748,7 @@ function(_compile_swift_files

     

       1077
       1077
       +
                "${SWIFT_NATIVE_SWIFT_TOOLS_PATH}/swiftc${HOST_EXECUTABLE_SUFFIX}"

     

       1078
       1078
       +
                "${SWIFTFILE_BOOTSTRAPPING}")

     

       1079
       1079
       +
        

     

       1080
       1080
       +
       -    if(NOT ${SWIFTFILE_BOOTSTRAPPING} STREQUAL "")

     

       1081
       1081
       +
       +    if(NOT "${SWIFTFILE_BOOTSTRAPPING}" STREQUAL "")

     

       1082
       1082
       +
              set(target_suffix "-bootstrapping${SWIFTFILE_BOOTSTRAPPING}")

     

       1083
       1083
       +
            endif()

     

       1084
       1084
       +
        

     

       1085
       1085
       +
       @@ -786,7 +786,7 @@ function(_compile_swift_files

     

       1086
       1086
       +
              # When building the stdlib with bootstrapping, the compiler needs

     

       1087
       1087
       +
              # to pick up the stdlib from the previous bootstrapping stage, because the

     

       1088
       1088
       +
              # stdlib in the current stage is not built yet.

     

       1089
       1089
       +
       -      if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_APPLE_PLATFORMS)

     

       1090
       1090
       +
       +      if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_APPLE_PLATFORMS)

     

       1091
       1091
       +
                set(set_environment_args "${CMAKE_COMMAND}" "-E" "env" "DYLD_LIBRARY_PATH=${bs_lib_dir}")

     

       1092
       1092
       +
              elseif(SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD")

     

       1093
       1093
       +
                set(set_environment_args "${CMAKE_COMMAND}" "-E" "env" "LD_LIBRARY_PATH=${bs_lib_dir}")

     

       1094
       1094
       +
       diff --git a/stdlib/public/Concurrency/CMakeLists.txt b/stdlib/public/Concurrency/CMakeLists.txt

     

       1095
       1095
       +
       index ff614adce76..76e0694a731 100644

     

       1096
       1096
       +
       --- a/stdlib/public/Concurrency/CMakeLists.txt

     

       1097
       1097
       +
       +++ b/stdlib/public/Concurrency/CMakeLists.txt

     

       1098
       1098
       +
       @@ -26,14 +26,14 @@ set(SWIFT_RUNTIME_CONCURRENCY_C_FLAGS)

     

       1099
       1099
       +
        set(SWIFT_RUNTIME_CONCURRENCY_SWIFT_FLAGS)

     

       1100
       1100
       +
        

     

       1101
       1101
       +
        set(swift_concurrency_private_link_libraries)

     

       1102
       1102
       +
       -if(CMAKE_SYSTEM_NAME STREQUAL Windows)

     

       1103
       1103
       +
       +if(CMAKE_SYSTEM_NAME STREQUAL "Windows")

     

       1104
       1104
       +
          list(APPEND swift_concurrency_private_link_libraries Synchronization)

     

       1105
       1105
       +
        endif()

     

       1106
       1106
       +
        

     

       1107
       1107
       +
        set(swift_concurrency_incorporate_object_libraries_so swiftThreading)

     

       1108
       1108
       +
        

     

       1109
       1109
       +
        if("${SWIFT_CONCURRENCY_GLOBAL_EXECUTOR}" STREQUAL "dispatch")

     

       1110
       1110
       +
       -  if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)

     

       1111
       1111
       +
       +  if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")

     

       1112
       1112
       +
            include_directories(AFTER

     

       1113
       1113
       +
                                  ${SWIFT_PATH_TO_LIBDISPATCH_SOURCE})

     

       1114
       1114
       +
        

     

       1115
       1115
       +
       @@ -61,7 +61,7 @@ endif()

     

       1116
       1116
       +
        

     

       1117
       1117
       +
        # Don't emit extended frame info on platforms other than darwin, system

     

       1118
       1118
       +
        # backtracer and system debugger are unlikely to support it.

     

       1119
       1119
       +
       -if(CMAKE_SYSTEM_NAME STREQUAL Darwin)

     

       1120
       1120
       +
       +if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")

     

       1121
       1121
       +
          list(APPEND SWIFT_RUNTIME_CONCURRENCY_C_FLAGS

     

       1122
       1122
       +
            "-fswift-async-fp=${swift_concurrency_async_fp_mode}")

     

       1123
       1123
       +
          list(APPEND SWIFT_RUNTIME_CONCURRENCY_SWIFT_FLAGS

     

       1124
       1124
       +
       diff --git a/stdlib/public/Cxx/std/CMakeLists.txt b/stdlib/public/Cxx/std/CMakeLists.txt

     

       1125
       1125
       +
       index f24d08b6b62..b805b2ed6cb 100644

     

       1126
       1126
       +
       --- a/stdlib/public/Cxx/std/CMakeLists.txt

     

       1127
       1127
       +
       +++ b/stdlib/public/Cxx/std/CMakeLists.txt

     

       1128
       1128
       +
       @@ -1,6 +1,6 @@

     

       1129
       1129
       +
        set(libstdcxx_modulemap_target_list)

     

       1130
       1130
       +
        foreach(sdk ${SWIFT_SDKS})

     

       1131
       1131
       +
       -  if(NOT ${sdk} IN_LIST SWIFT_LIBSTDCXX_PLATFORMS)

     

       1132
       1132
       +
       +  if(NOT sdk IN_LIST SWIFT_LIBSTDCXX_PLATFORMS)

     

       1133
       1133
       +
            continue()

     

       1134
       1134
       +
          endif()

     

       1135
       1135
       +
        

     

       1136
       1136
       +
       @@ -86,7 +86,7 @@ foreach(sdk ${SWIFT_SDKS})

     

       1137
       1137
       +
                  COMPONENT sdk-overlay)

     

       1138
       1138
       +
            endif()

     

       1139
       1139
       +
        

     

       1140
       1140
       +
       -    if(${BOOTSTRAPPING_MODE} MATCHES "BOOTSTRAPPING.*")

     

       1141
       1141
       +
       +    if(BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*")

     

       1142
       1142
       +
              foreach(bootstrapping "0" "1")

     

       1143
       1143
       +
                get_bootstrapping_path(bootstrapping_dir ${module_dir} ${bootstrapping})

     

       1144
       1144
       +
                set(libstdcxx_modulemap_out_bootstrapping "${bootstrapping_dir}/libstdcxx.modulemap")

     

       1145
       1145
       +
       diff --git a/stdlib/public/Platform/CMakeLists.txt b/stdlib/public/Platform/CMakeLists.txt

     

       1146
       1146
       +
       index 9063931bd20..757a89eb760 100644

     

       1147
       1147
       +
       --- a/stdlib/public/Platform/CMakeLists.txt

     

       1148
       1148
       +
       +++ b/stdlib/public/Platform/CMakeLists.txt

     

       1149
       1149
       +
       @@ -42,8 +42,8 @@ set(swiftDarwin_common_options

     

       1150
       1150
       +
              DEPENDS ${darwin_depends})

     

       1151
       1151
       +
        

     

       1152
       1152
       +
        

     

       1153
       1153
       +
       -if(${BOOTSTRAPPING_MODE} STREQUAL "BOOTSTRAPPING" AND

     

       1154
       1154
       +
       -   ${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       1155
       1155
       +
       +if(BOOTSTRAPPING_MODE STREQUAL "BOOTSTRAPPING" AND

     

       1156
       1156
       +
       +   SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       1157
       1157
       +
        

     

       1158
       1158
       +
          set(swiftDarwin_common_bootstrapping_options

     

       1159
       1159
       +
              ${swiftDarwin_common_options}

     

       1160
       1160
       +
       @@ -179,7 +179,7 @@ foreach(sdk ${SWIFT_SDKS})

     

       1161
       1161
       +
            # with its own native sysroot, create a native modulemap without a sysroot

     

       1162
       1162
       +
            # prefix. This is the one we'll install instead.

     

       1163
       1163
       +
            if(NOT "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_ARCH_${arch}_PATH}" STREQUAL "/" AND

     

       1164
       1164
       +
       -       NOT (${sdk} STREQUAL ANDROID AND NOT "${SWIFT_ANDROID_NATIVE_SYSROOT}" STREQUAL ""))

     

       1165
       1165
       +
       +       NOT (sdk STREQUAL "ANDROID" AND NOT "${SWIFT_ANDROID_NATIVE_SYSROOT}" STREQUAL ""))

     

       1166
       1166
       +
              set(glibc_sysroot_relative_modulemap_out "${module_dir}/sysroot-relative-modulemaps/glibc.modulemap")

     

       1167
       1167
       +
        

     

       1168
       1168
       +
              handle_gyb_source_single(glibc_modulemap_native_target

     

       1169
       1169
       +
       diff --git a/stdlib/public/SwiftOnoneSupport/CMakeLists.txt b/stdlib/public/SwiftOnoneSupport/CMakeLists.txt

     

       1170
       1170
       +
       index 50efa52b7e1..cf6f09bcf69 100644

     

       1171
       1171
       +
       --- a/stdlib/public/SwiftOnoneSupport/CMakeLists.txt

     

       1172
       1172
       +
       +++ b/stdlib/public/SwiftOnoneSupport/CMakeLists.txt

     

       1173
       1173
       +
       @@ -10,7 +10,7 @@ set(swiftOnoneSupport_common_options

     

       1174
       1174
       +
          SWIFT_COMPILE_FLAGS "-parse-stdlib" "-Xllvm" "-sil-inline-generics=false" "-Xfrontend" "-validate-tbd-against-ir=none" "-Xfrontend" "-check-onone-completeness" "-Xfrontend" "-disable-access-control" "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}" "${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}"

     

       1175
       1175
       +
          LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}")

     

       1176
       1176
       +
        

     

       1177
       1177
       +
       -if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND ${BOOTSTRAPPING_MODE} STREQUAL "BOOTSTRAPPING")

     

       1178
       1178
       +
       +if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND BOOTSTRAPPING_MODE STREQUAL "BOOTSTRAPPING")

     

       1179
       1179
       +
        

     

       1180
       1180
       +
          set(swiftOnoneSupport_common_bootstrapping_options

     

       1181
       1181
       +
            SHARED

     

       1182
       1182
       +
       diff --git a/stdlib/public/SwiftShims/swift/shims/CMakeLists.txt b/stdlib/public/SwiftShims/swift/shims/CMakeLists.txt

     

       1183
       1183
       +
       index c54b2cf84b2..f925940d8a2 100644

     

       1184
       1184
       +
       --- a/stdlib/public/SwiftShims/swift/shims/CMakeLists.txt

     

       1185
       1185
       +
       +++ b/stdlib/public/SwiftShims/swift/shims/CMakeLists.txt

     

       1186
       1186
       +
       @@ -152,7 +152,7 @@ if(NOT SWIFT_BUILT_STANDALONE)

     

       1187
       1187
       +
          endforeach()

     

       1188
       1188
       +
        endif()

     

       1189
       1189
       +
        

     

       1190
       1190
       +
       -if(${BOOTSTRAPPING_MODE} MATCHES "BOOTSTRAPPING.*")

     

       1191
       1191
       +
       +if(BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*")

     

       1192
       1192
       +
          foreach(bootstrapping "0" "1")

     

       1193
       1193
       +
            get_bootstrapping_path(outdir ${SWIFTLIB_DIR} ${bootstrapping})

     

       1194
       1194
       +
            set(target_name "symlink-headers-bootstrapping${bootstrapping}")

     

       1195
       1195
       +
       diff --git a/stdlib/public/core/CMakeLists.txt b/stdlib/public/core/CMakeLists.txt

     

       1196
       1196
       +
       index c2217c9f294..be0d826b29d 100644

     

       1197
       1197
       +
       --- a/stdlib/public/core/CMakeLists.txt

     

       1198
       1198
       +
       +++ b/stdlib/public/core/CMakeLists.txt

     

       1199
       1199
       +
       @@ -251,18 +251,18 @@ set(swift_core_framework_depends)

     

       1200
       1200
       +
        set(swift_core_private_link_libraries)

     

       1201
       1201
       +
        set(swift_stdlib_compile_flags "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}")

     

       1202
       1202
       +
        

     

       1203
       1203
       +
       -if(SWIFT_PRIMARY_VARIANT_SDK STREQUAL CYGWIN)

     

       1204
       1204
       +
       +if(SWIFT_PRIMARY_VARIANT_SDK STREQUAL "CYGWIN")

     

       1205
       1205
       +
          # TODO(compnerd) cache this variable to permit re-configuration

     

       1206
       1206
       +
          execute_process(COMMAND "cygpath" "-u" "$ENV{SYSTEMROOT}" OUTPUT_VARIABLE ENV_SYSTEMROOT)

     

       1207
       1207
       +
          list(APPEND swift_core_private_link_libraries "${ENV_SYSTEMROOT}/system32/psapi.dll")

     

       1208
       1208
       +
       -elseif(SWIFT_PRIMARY_VARIANT_SDK STREQUAL FREEBSD)

     

       1209
       1209
       +
       +elseif(SWIFT_PRIMARY_VARIANT_SDK STREQUAL "FREEBSD")

     

       1210
       1210
       +
          find_library(EXECINFO_LIBRARY execinfo)

     

       1211
       1211
       +
          list(APPEND swift_core_private_link_libraries ${EXECINFO_LIBRARY})

     

       1212
       1212
       +
       -elseif(SWIFT_PRIMARY_VARIANT_SDK STREQUAL LINUX)

     

       1213
       1213
       +
       +elseif(SWIFT_PRIMARY_VARIANT_SDK STREQUAL "LINUX")

     

       1214
       1214
       +
          if(SWIFT_BUILD_STATIC_STDLIB)

     

       1215
       1215
       +
            list(APPEND swift_core_private_link_libraries)

     

       1216
       1216
       +
          endif()

     

       1217
       1217
       +
       -elseif(SWIFT_PRIMARY_VARIANT_SDK STREQUAL WINDOWS)

     

       1218
       1218
       +
       +elseif(SWIFT_PRIMARY_VARIANT_SDK STREQUAL "WINDOWS")

     

       1219
       1219
       +
          list(APPEND swift_core_private_link_libraries shell32;DbgHelp;Synchronization)

     

       1220
       1220
       +
        endif()

     

       1221
       1221
       +
        

     

       1222
       1222
       +
       @@ -331,7 +331,7 @@ set(swiftCore_common_options

     

       1223
       1223
       +
        set(swiftCore_common_dependencies

     

       1224
       1224
       +
            copy_shim_headers "${SWIFTLIB_DIR}/shims" ${GROUP_INFO_JSON_FILE})

     

       1225
       1225
       +
        

     

       1226
       1226
       +
       -if(${BOOTSTRAPPING_MODE} STREQUAL "BOOTSTRAPPING")

     

       1227
       1227
       +
       +if(BOOTSTRAPPING_MODE STREQUAL "BOOTSTRAPPING")

     

       1228
       1228
       +
        

     

       1229
       1229
       +
          set(b0_deps symlink-headers-bootstrapping0)

     

       1230
       1230
       +
          set(b1_deps symlink-headers-bootstrapping1)

     

       1231
       1231
       +
       diff --git a/stdlib/public/runtime/CMakeLists.txt b/stdlib/public/runtime/CMakeLists.txt

     

       1232
       1232
       +
       index e46c37d626b..db503543b6b 100644

     

       1233
       1233
       +
       --- a/stdlib/public/runtime/CMakeLists.txt

     

       1234
       1234
       +
       +++ b/stdlib/public/runtime/CMakeLists.txt

     

       1235
       1235
       +
       @@ -163,7 +163,7 @@ foreach(sdk ${SWIFT_SDKS})

     

       1236
       1236
       +
              # set(swiftrtObject "$<TARGET_OBJECTS:swiftImageRegistrationObject${SWIFT_SDK_${sdk}_OBJECT_FORMAT}-${arch_suffix}>")

     

       1237
       1237
       +
              set(swiftrtObject ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/swiftImageRegistrationObject${SWIFT_SDK_${sdk}_OBJECT_FORMAT}-${arch_suffix}.dir/SwiftRT-${SWIFT_SDK_${sdk}_OBJECT_FORMAT}.cpp${CMAKE_C_OUTPUT_EXTENSION})

     

       1238
       1238
       +
        

     

       1239
       1239
       +
       -      if(sdk STREQUAL WINDOWS)

     

       1240
       1240
       +
       +      if(sdk STREQUAL "WINDOWS")

     

       1241
       1241
       +
                set(extension .obj)

     

       1242
       1242
       +
              else()

     

       1243
       1243
       +
                set(extension .o)

     

       1244
       1244
       +
       @@ -209,12 +209,12 @@ foreach(sdk ${SWIFT_SDKS})

     

       1245
       1245
       +
        

     

       1246
       1246
       +
            # Generate the static-stdlib-args.lnk file used by -static-stdlib option for

     

       1247
       1247
       +
            # 'GenericUnix' (eg linux)

     

       1248
       1248
       +
       -    if(${SWIFT_SDK_${sdk}_OBJECT_FORMAT} STREQUAL ELF)

     

       1249
       1249
       +
       +    if(SWIFT_SDK_${sdk}_OBJECT_FORMAT STREQUAL "ELF")

     

       1250
       1250
       +
              string(TOLOWER "${sdk}" lowercase_sdk)

     

       1251
       1251
       +
              set(libpthread -lpthread)

     

       1252
       1252
       +
              set(concurrency_libs)

     

       1253
       1253
       +
              set(android_libraries)

     

       1254
       1254
       +
       -      if(${sdk} STREQUAL ANDROID)

     

       1255
       1255
       +
       +      if(sdk STREQUAL "ANDROID")

     

       1256
       1256
       +
                set(android_libraries -llog)

     

       1257
       1257
       +
                set(libpthread)

     

       1258
       1258
       +
              elseif(SWIFT_CONCURRENCY_USES_DISPATCH)

     

       1259
       1259
       +
       diff --git a/stdlib/toolchain/legacy_layouts/CMakeLists.txt b/stdlib/toolchain/legacy_layouts/CMakeLists.txt

     

       1260
       1260
       +
       index ad18c6b1b32..96da3906821 100644

     

       1261
       1261
       +
       --- a/stdlib/toolchain/legacy_layouts/CMakeLists.txt

     

       1262
       1262
       +
       +++ b/stdlib/toolchain/legacy_layouts/CMakeLists.txt

     

       1263
       1263
       +
       @@ -55,7 +55,7 @@ foreach(sdk ${SWIFT_SDKS})

     

       1264
       1264
       +
          endforeach()

     

       1265
       1265
       +
        endforeach()

     

       1266
       1266
       +
        

     

       1267
       1267
       +
       -if(${BOOTSTRAPPING_MODE} MATCHES "BOOTSTRAPPING.*")

     

       1268
       1268
       +
       +if(BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*")

     

       1269
       1269
       +
          # The resource dir for bootstrapping0 may be used explicitly

     

       1270
       1270
       +
          # to cross compile for other architectures, so we would need

     

       1271
       1271
       +
          # to have all the legacy layouts in there

     

       1272
       1272
       +
       diff --git a/tools/SourceKit/CMakeLists.txt b/tools/SourceKit/CMakeLists.txt

     

       1273
       1273
       +
       index f87720f9c80..6c0c0800bc4 100644

     

       1274
       1274
       +
       --- a/tools/SourceKit/CMakeLists.txt

     

       1275
       1275
       +
       +++ b/tools/SourceKit/CMakeLists.txt

     

       1276
       1276
       +
       @@ -82,7 +82,7 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")

     

       1277
       1277
       +
          # Add deployment target to C/C++ compiler and linker flags.

     

       1278
       1278
       +
          # FIXME: CMAKE_OSX_DEPLOYMENT_TARGET falls over when used for iOS versions.

     

       1279
       1279
       +
          if (XCODE)

     

       1280
       1280
       +
       -    if (${SOURCEKIT_DEPLOYMENT_OS} MATCHES "^macosx")

     

       1281
       1281
       +
       +    if (SOURCEKIT_DEPLOYMENT_OS MATCHES "^macosx")

     

       1282
       1282
       +
              set(CMAKE_XCODE_ATTRIBUTE_MACOSX_DEPLOYMENT_TARGET ${SOURCEKIT_DEPLOYMENT_TARGET})

     

       1283
       1283
       +
            else()

     

       1284
       1284
       +
              set(CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET ${SOURCEKIT_DEPLOYMENT_TARGET})

     

       1285
       1285
       +
       @@ -101,7 +101,7 @@ if(NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")

     

       1286
       1286
       +
        endif()

     

       1287
       1287
       +
        

     

       1288
       1288
       +
        if(SWIFT_BUILD_HOST_DISPATCH)

     

       1289
       1289
       +
       -  if(SWIFT_HOST_VARIANT_SDK STREQUAL WINDOWS)

     

       1290
       1290
       +
       +  if(SWIFT_HOST_VARIANT_SDK STREQUAL "WINDOWS")

     

       1291
       1291
       +
            set(SOURCEKIT_RUNTIME_DIR bin)

     

       1292
       1292
       +
          else()

     

       1293
       1293
       +
            set(SOURCEKIT_RUNTIME_DIR lib)

     

       1294
       1294
       +
       @@ -114,7 +114,7 @@ if(SWIFT_BUILD_HOST_DISPATCH)

     

       1295
       1295
       +
              DESTINATION ${SOURCEKIT_RUNTIME_DIR}

     

       1296
       1296
       +
              COMPONENT sourcekit-inproc)

     

       1297
       1297
       +
          endif()

     

       1298
       1298
       +
       -  if(SWIFT_HOST_VARIANT_SDK STREQUAL WINDOWS)

     

       1299
       1299
       +
       +  if(SWIFT_HOST_VARIANT_SDK STREQUAL "WINDOWS")

     

       1300
       1300
       +
            swift_install_in_component(FILES

     

       1301
       1301
       +
              $<TARGET_LINKER_FILE:dispatch>

     

       1302
       1302
       +
              $<TARGET_LINKER_FILE:BlocksRuntime>

     

       1303
       1303
       +
       diff --git a/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake b/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake

     

       1304
       1304
       +
       index 14d9a99a13a..bc26b263848 100644

     

       1305
       1305
       +
       --- a/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake

     

       1306
       1306
       +
       +++ b/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake

     

       1307
       1307
       +
       @@ -8,7 +8,7 @@ function(add_sourcekit_default_compiler_flags target)

     

       1308
       1308
       +
          _add_host_variant_link_flags(${target})

     

       1309
       1309
       +
        

     

       1310
       1310
       +
          # Set compilation and link flags.

     

       1311
       1311
       +
       -  if(${SWIFT_HOST_VARIANT_SDK} STREQUAL WINDOWS)

     

       1312
       1312
       +
       +  if(SWIFT_HOST_VARIANT_SDK STREQUAL "WINDOWS")

     

       1313
       1313
       +
            swift_windows_include_for_arch(${SWIFT_HOST_VARIANT_ARCH}

     

       1314
       1314
       +
              ${SWIFT_HOST_VARIANT_ARCH}_INCLUDE)

     

       1315
       1315
       +
            target_include_directories(${target} SYSTEM PRIVATE

     

       1316
       1316
       +
       @@ -30,7 +30,7 @@ function(add_sourcekit_swift_runtime_link_flags target path HAS_SWIFT_MODULES)

     

       1317
       1317
       +
            endif()

     

       1318
       1318
       +
          endif()

     

       1319
       1319
       +
        

     

       1320
       1320
       +
       -  if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       1321
       1321
       +
       +  if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       1322
       1322
       +
        

     

       1323
       1323
       +
            # Lists of rpaths that we are going to add to our executables.

     

       1324
       1324
       +
            #

     

       1325
       1325
       +
       @@ -118,7 +118,7 @@ function(add_sourcekit_swift_runtime_link_flags target path HAS_SWIFT_MODULES)

     

       1326
       1326
       +
        

     

       1327
       1327
       +
          elseif(SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD" AND HAS_SWIFT_MODULES AND ASKD_BOOTSTRAPPING_MODE)

     

       1328
       1328
       +
            set(swiftrt "swiftImageRegistrationObject${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_OBJECT_FORMAT}-${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}-${SWIFT_HOST_VARIANT_ARCH}")

     

       1329
       1329
       +
       -    if(${ASKD_BOOTSTRAPPING_MODE} MATCHES "HOSTTOOLS|CROSSCOMPILE")

     

       1330
       1330
       +
       +    if(ASKD_BOOTSTRAPPING_MODE MATCHES "HOSTTOOLS|CROSSCOMPILE")

     

       1331
       1331
       +
              # At build time and run time, link against the swift libraries in the

     

       1332
       1332
       +
              # installed host toolchain.

     

       1333
       1333
       +
              get_filename_component(swift_bin_dir ${SWIFT_EXEC_FOR_SWIFT_MODULES} DIRECTORY)

     

       1334
       1334
       +
       @@ -163,7 +163,7 @@ function(add_sourcekit_swift_runtime_link_flags target path HAS_SWIFT_MODULES)

     

       1335
       1335
       +
            # able to fall back to the SDK directory for libswiftCore et al.

     

       1336
       1336
       +
            if (BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*")

     

       1337
       1337
       +
              if (NOT "${bootstrapping}" STREQUAL "1")

     

       1338
       1338
       +
       -        if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       1339
       1339
       +
       +        if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       1340
       1340
       +
                  target_link_directories(${target} PRIVATE "${sdk_dir}")

     

       1341
       1341
       +
        

     

       1342
       1342
       +
                  # Include the abi stable system stdlib in our rpath.

     

       1343
       1343
       +
       diff --git a/tools/SourceKit/lib/Support/CMakeLists.txt b/tools/SourceKit/lib/Support/CMakeLists.txt

     

       1344
       1344
       +
       index c4e2cbcd31e..a47b2347a12 100644

     

       1345
       1345
       +
       --- a/tools/SourceKit/lib/Support/CMakeLists.txt

     

       1346
       1346
       +
       +++ b/tools/SourceKit/lib/Support/CMakeLists.txt

     

       1347
       1347
       +
       @@ -9,7 +9,7 @@ target_link_libraries(SourceKitSupport PRIVATE

     

       1348
       1348
       +
          swiftBasic

     

       1349
       1349
       +
          clangBasic

     

       1350
       1350
       +
          clangRewrite)

     

       1351
       1351
       +
       -if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)

     

       1352
       1352
       +
       +if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")

     

       1353
       1353
       +
          target_link_libraries(SourceKitSupport INTERFACE

     

       1354
       1354
       +
            dispatch

     

       1355
       1355
       +
            BlocksRuntime)

     

       1356
       1356
       +
       diff --git a/tools/SourceKit/tools/complete-test/CMakeLists.txt b/tools/SourceKit/tools/complete-test/CMakeLists.txt

     

       1357
       1357
       +
       index ec3437650a0..d1b3fe3b36a 100644

     

       1358
       1358
       +
       --- a/tools/SourceKit/tools/complete-test/CMakeLists.txt

     

       1359
       1359
       +
       +++ b/tools/SourceKit/tools/complete-test/CMakeLists.txt

     

       1360
       1360
       +
       @@ -7,13 +7,13 @@ if(SWIFT_SOURCEKIT_USE_INPROC_LIBRARY)

     

       1361
       1361
       +
        else()

     

       1362
       1362
       +
          target_link_libraries(complete-test PRIVATE sourcekitd)

     

       1363
       1363
       +
        endif()

     

       1364
       1364
       +
       -if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)

     

       1365
       1365
       +
       +if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")

     

       1366
       1366
       +
          target_link_libraries(complete-test PRIVATE

     

       1367
       1367
       +
            dispatch

     

       1368
       1368
       +
            BlocksRuntime)

     

       1369
       1369
       +
        endif()

     

       1370
       1370
       +
        

     

       1371
       1371
       +
       -if(CMAKE_SYSTEM_NAME STREQUAL Darwin)

     

       1372
       1372
       +
       +if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")

     

       1373
       1373
       +
          set_target_properties(complete-test PROPERTIES

     

       1374
       1374
       +
            INSTALL_RPATH "@executable_path/../lib")

     

       1375
       1375
       +
          target_link_options(complete-test PRIVATE

     

       1376
       1376
       +
       diff --git a/tools/SourceKit/tools/sourcekitd-repl/CMakeLists.txt b/tools/SourceKit/tools/sourcekitd-repl/CMakeLists.txt

     

       1377
       1377
       +
       index d4a3a77df2a..f537ad74544 100644

     

       1378
       1378
       +
       --- a/tools/SourceKit/tools/sourcekitd-repl/CMakeLists.txt

     

       1379
       1379
       +
       +++ b/tools/SourceKit/tools/sourcekitd-repl/CMakeLists.txt

     

       1380
       1380
       +
       @@ -7,7 +7,7 @@ if(SWIFT_SOURCEKIT_USE_INPROC_LIBRARY)

     

       1381
       1381
       +
        else()

     

       1382
       1382
       +
          target_link_libraries(sourcekitd-repl PRIVATE sourcekitd)

     

       1383
       1383
       +
        endif()

     

       1384
       1384
       +
       -if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)

     

       1385
       1385
       +
       +if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")

     

       1386
       1386
       +
          target_link_libraries(sourcekitd-repl PRIVATE

     

       1387
       1387
       +
            dispatch

     

       1388
       1388
       +
            BlocksRuntime)

     

       1389
       1389
       +
       @@ -15,7 +15,7 @@ endif()

     

       1390
       1390
       +
        target_link_libraries(sourcekitd-repl PRIVATE

     

       1391
       1391
       +
          libedit)

     

       1392
       1392
       +
        

     

       1393
       1393
       +
       -if(CMAKE_SYSTEM_NAME STREQUAL Darwin)

     

       1394
       1394
       +
       +if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")

     

       1395
       1395
       +
          set_target_properties(sourcekitd-repl PROPERTIES

     

       1396
       1396
       +
            INSTALL_RPATH "@executable_path/../lib")

     

       1397
       1397
       +
          target_link_options(sourcekitd-repl PRIVATE

     

       1398
       1398
       +
       diff --git a/tools/SourceKit/tools/sourcekitd-test/CMakeLists.txt b/tools/SourceKit/tools/sourcekitd-test/CMakeLists.txt

     

       1399
       1399
       +
       index 91c28f371c4..e5f7aa5c9fb 100644

     

       1400
       1400
       +
       --- a/tools/SourceKit/tools/sourcekitd-test/CMakeLists.txt

     

       1401
       1401
       +
       +++ b/tools/SourceKit/tools/sourcekitd-test/CMakeLists.txt

     

       1402
       1402
       +
       @@ -17,7 +17,7 @@ if(SWIFT_SOURCEKIT_USE_INPROC_LIBRARY)

     

       1403
       1403
       +
        else()

     

       1404
       1404
       +
          target_link_libraries(sourcekitd-test PRIVATE sourcekitd)

     

       1405
       1405
       +
        endif()

     

       1406
       1406
       +
       -if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)

     

       1407
       1407
       +
       +if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")

     

       1408
       1408
       +
          target_link_libraries(sourcekitd-test PRIVATE

     

       1409
       1409
       +
            dispatch

     

       1410
       1410
       +
            BlocksRuntime)

     

       1411
       1411
       +
       @@ -25,7 +25,7 @@ endif()

     

       1412
       1412
       +
        

     

       1413
       1413
       +
        add_dependencies(sourcekitd-test sourcekitdTestOptionsTableGen)

     

       1414
       1414
       +
        

     

       1415
       1415
       +
       -if(CMAKE_SYSTEM_NAME STREQUAL Darwin)

     

       1416
       1416
       +
       +if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")

     

       1417
       1417
       +
          set_target_properties(sourcekitd-test PROPERTIES

     

       1418
       1418
       +
            INSTALL_RPATH "@executable_path/../lib")

     

       1419
       1419
       +
          target_link_options(sourcekitd-test PRIVATE

     

       1420
       1420
       +
       diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt

     

       1421
       1421
       +
       index 4521356ffc6..ab6dad7b273 100644

     

       1422
       1422
       +
       --- a/tools/driver/CMakeLists.txt

     

       1423
       1423
       +
       +++ b/tools/driver/CMakeLists.txt

     

       1424
       1424
       +
       @@ -10,7 +10,7 @@ function(add_swift_parser_link_libraries target)

     

       1425
       1425
       +
          endif()

     

       1426
       1426
       +
        endfunction()

     

       1427
       1427
       +
        

     

       1428
       1428
       +
       -if(${BOOTSTRAPPING_MODE} MATCHES "BOOTSTRAPPING.*")

     

       1429
       1429
       +
       +if(BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*")

     

       1430
       1430
       +
        

     

       1431
       1431
       +
          # Bootstrapping - level 0

     

       1432
       1432
       +
          # For more information on how bootstrapping works, see docs/SwiftInTheCompiler.md

     

       1433
       1433
       +
       diff --git a/tools/libSwiftScan/CMakeLists.txt b/tools/libSwiftScan/CMakeLists.txt

     

       1434
       1434
       +
       index f11c2a99758..93beb4629b0 100644

     

       1435
       1435
       +
       --- a/tools/libSwiftScan/CMakeLists.txt

     

       1436
       1436
       +
       +++ b/tools/libSwiftScan/CMakeLists.txt

     

       1437
       1437
       +
       @@ -8,7 +8,7 @@ add_swift_host_library(libSwiftScan SHARED

     

       1438
       1438
       +
          libSwiftScan.cpp

     

       1439
       1439
       +
          c-include-check.c)

     

       1440
       1440
       +
        

     

       1441
       1441
       +
       -if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       1442
       1442
       +
       +if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       1443
       1443
       +
          # Workaround for a linker crash related to autolinking: rdar://77839981

     

       1444
       1444
       +
          set_property(TARGET libSwiftScan APPEND_STRING PROPERTY

     

       1445
       1445
       +
                       LINK_FLAGS " -lobjc ")

     

       1446
       1446
       +
       diff --git a/unittests/Basic/CMakeLists.txt b/unittests/Basic/CMakeLists.txt

     

       1447
       1447
       +
       index 547751e6cac..10b413ce732 100644

     

       1448
       1448
       +
       --- a/unittests/Basic/CMakeLists.txt

     

       1449
       1449
       +
       +++ b/unittests/Basic/CMakeLists.txt

     

       1450
       1450
       +
       @@ -49,6 +49,6 @@ target_link_libraries(SwiftBasicTests

     

       1451
       1451
       +
          LLVMTestingSupport

     

       1452
       1452
       +
          )

     

       1453
       1453
       +
        

     

       1454
       1454
       +
       -if(SWIFT_HOST_VARIANT STREQUAL windows)

     

       1455
       1455
       +
       +if(SWIFT_HOST_VARIANT STREQUAL "windows")

     

       1456
       1456
       +
          target_link_libraries(SwiftBasicTests PRIVATE Synchronization)

     

       1457
       1457
       +
        endif()

     

       1458
       1458
       +
       diff --git a/unittests/Threading/CMakeLists.txt b/unittests/Threading/CMakeLists.txt

     

       1459
       1459
       +
       index 5e0f27c089d..239630d038c 100644

     

       1460
       1460
       +
       --- a/unittests/Threading/CMakeLists.txt

     

       1461
       1461
       +
       +++ b/unittests/Threading/CMakeLists.txt

     

       1462
       1462
       +
       @@ -14,7 +14,7 @@ if(("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}") AND

     

       1463
       1463
       +
            swiftCore${SWIFT_PRIMARY_VARIANT_SUFFIX}

     

       1464
       1464
       +
            )

     

       1465
       1465
       +
        

     

       1466
       1466
       +
       -  if(SWIFT_HOST_VARIANT STREQUAL windows)

     

       1467
       1467
       +
       +  if(SWIFT_HOST_VARIANT STREQUAL "windows")

     

       1468
       1468
       +
            target_link_libraries(SwiftThreadingTests PRIVATE Synchronization)

     

       1469
       1469
       +
          endif()

     

       1470
       1470
       +
        endif()

     

       1471
       1471
       +
       diff --git a/unittests/runtime/CMakeLists.txt b/unittests/runtime/CMakeLists.txt

     

       1472
       1472
       +
       index 79df463c0ed..cef40263785 100644

     

       1473
       1473
       +
       --- a/unittests/runtime/CMakeLists.txt

     

       1474
       1474
       +
       +++ b/unittests/runtime/CMakeLists.txt

     

       1475
       1475
       +
       @@ -63,7 +63,7 @@ if(("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}") AND

     

       1476
       1476
       +
            list(APPEND PLATFORM_TARGET_LINK_LIBRARIES

     

       1477
       1477
       +
              ${EXECINFO_LIBRARY}

     

       1478
       1478
       +
              )

     

       1479
       1479
       +
       -  elseif(SWIFT_HOST_VARIANT STREQUAL windows)

     

       1480
       1480
       +
       +  elseif(SWIFT_HOST_VARIANT STREQUAL "windows")

     

       1481
       1481
       +
            list(APPEND PLATFORM_TARGET_LINK_LIBRARIES DbgHelp;Synchronization)

     

       1482
       1482
       +
          endif()

     

       1483
       1483
       +
        

     

       1484
       1484
       +
       diff --git a/unittests/runtime/LongTests/CMakeLists.txt b/unittests/runtime/LongTests/CMakeLists.txt

     

       1485
       1485
       +
       index 592e532f8cf..37b5e00714e 100644

     

       1486
       1486
       +
       --- a/unittests/runtime/LongTests/CMakeLists.txt

     

       1487
       1487
       +
       +++ b/unittests/runtime/LongTests/CMakeLists.txt

     

       1488
       1488
       +
       @@ -30,7 +30,7 @@ if(("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}") AND

     

       1489
       1489
       +
            list(APPEND PLATFORM_TARGET_LINK_LIBRARIES

     

       1490
       1490
       +
              ${EXECINFO_LIBRARY}

     

       1491
       1491
       +
              )

     

       1492
       1492
       +
       -  elseif(SWIFT_HOST_VARIANT STREQUAL windows)

     

       1493
       1493
       +
       +  elseif(SWIFT_HOST_VARIANT STREQUAL "windows")

     

       1494
       1494
       +
            list(APPEND PLATFORM_TARGET_LINK_LIBRARIES DbgHelp;Synchronization)

     

       1495
       1495
       +
          endif()

     

       1496
       1496
       +
        

     

       1497
       1497
       +
       diff --git a/utils/api_checker/CMakeLists.txt b/utils/api_checker/CMakeLists.txt

     

       1498
       1498
       +
       index e664a73ddd9..fea720f6095 100644

     

       1499
       1499
       +
       --- a/utils/api_checker/CMakeLists.txt

     

       1500
       1500
       +
       +++ b/utils/api_checker/CMakeLists.txt

     

       1501
       1501
       +
       @@ -16,7 +16,7 @@ set(SWIFTLIB_DIR "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib/swift")

     

       1502
       1502
       +
        set(dest "${SWIFTLIB_DIR}/${framework}")

     

       1503
       1503
       +
        set(source "${CMAKE_CURRENT_SOURCE_DIR}/${framework}")

     

       1504
       1504
       +
        

     

       1505
       1505
       +
       -if(CMAKE_SYSTEM_NAME STREQUAL Windows)

     

       1506
       1506
       +
       +if(CMAKE_SYSTEM_NAME STREQUAL "Windows")

     

       1507
       1507
       +
            set(CMAKE_SYMLINK_COMMAND copy)

     

       1508
       1508
       +
        else()

     

       1509
       1509
       +
            set(CMAKE_SYMLINK_COMMAND create_symlink)

+63

pkgs/development/compilers/swift/compiler/patches/swift-darwin-libcxx-flags.patch

···

       1
       1
       +
       On Darwin, the SDK is a directory of stubs, and libc++ lives separately. We

     

       2
       2
       +
       need to patch the CMake files in several places to make the build for C++

     

       3
       3
       +
       interop succeed. The required flags can be read from cc-wrapper support files.

     

       4
       4
       +
       

     

       5
       5
       +
       --- a/SwiftCompilerSources/CMakeLists.txt

     

       6
       6
       +
       +++ b/SwiftCompilerSources/CMakeLists.txt

     

       7
       7
       +
       @@ -105,18 +105,11 @@ function(add_swift_compiler_modules_library name)

     

       8
       8
       +
              get_filename_component(swift_exec_bin_dir ${ALS_SWIFT_EXEC} DIRECTORY)

     

       9
       9
       +
              set(sdk_option ${sdk_option} "-resource-dir" "${swift_exec_bin_dir}/../bootstrapping0/lib/swift")

     

       10
       10
       +
            endif()

     

       11
       11
       +
       -    if(NOT EXISTS "${sdk_path}/usr/include/c++")

     

       12
       12
       +
       -      # Darwin SDKs in Xcode 12 or older do not include libc++, which prevents clang from finding libc++ when invoked

     

       13
       13
       +
       -      # from ClangImporter. This results in build errors. To workaround this, let's explicitly pass the path to libc++

     

       14
       14
       +
       -      # to clang.

     

       15
       15
       +
       -      message(WARNING "Building with an outdated Darwin SDK: libc++ missing from the ${SWIFT_HOST_VARIANT_SDK} SDK. Will use libc++ from the toolchain.")

     

       16
       16
       +
       -      get_filename_component(absolute_libcxx_path "${CMAKE_C_COMPILER}/../../include/c++/v1" REALPATH)

     

       17
       17
       +
       -      if (EXISTS "${absolute_libcxx_path}")

     

       18
       18
       +
       -        set(sdk_option ${sdk_option} "-Xcc" "-isystem" "-Xcc" "${absolute_libcxx_path}")

     

       19
       19
       +
       -      else()

     

       20
       20
       +
       -        message(ERROR "libc++ not found in the toolchain.")

     

       21
       21
       +
       -      endif()

     

       22
       22
       +
       -    endif()

     

       23
       23
       +
       +    file(READ "$ENV{NIX_CC}/nix-support/libcxx-cxxflags" nix_libcxx_cxxflags)

     

       24
       24
       +
       +    separate_arguments(nix_libcxx_cxxflags)

     

       25
       25
       +
       +    foreach(nix_libcxx_cxxflag ${nix_libcxx_cxxflags})

     

       26
       26
       +
       +      set(sdk_option ${sdk_option} "-Xcc" "${nix_libcxx_cxxflag}")

     

       27
       27
       +
       +    endforeach()

     

       28
       28
       +
          elseif(BOOTSTRAPPING_MODE STREQUAL "CROSSCOMPILE")

     

       29
       29
       +
            set(sdk_option "-sdk" "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_ARCH_${SWIFT_HOST_VARIANT_ARCH}_PATH}")

     

       30
       30
       +
            get_filename_component(swift_exec_bin_dir ${ALS_SWIFT_EXEC} DIRECTORY)

     

       31
       31
       +
       --- a/cmake/modules/SwiftConfigureSDK.cmake

     

       32
       32
       +
       +++ b/cmake/modules/SwiftConfigureSDK.cmake

     

       33
       33
       +
       @@ -270,6 +270,18 @@ macro(configure_sdk_darwin

     

       34
       34
       +
          # Add this to the list of known SDKs.

     

       35
       35
       +
          list(APPEND SWIFT_CONFIGURED_SDKS "${prefix}")

     

       36
       36
       +
        

     

       37
       37
       +
       +  set(cxx_overlay_opt "")

     

       38
       38
       +
       +  if("${prefix}" STREQUAL "OSX")

     

       39
       39
       +
       +    file(READ "$ENV{NIX_CC}/nix-support/libcxx-cxxflags" nix_libcxx_cxxflags)

     

       40
       40
       +
       +    separate_arguments(nix_libcxx_cxxflags)

     

       41
       41
       +
       +    foreach(nix_libcxx_cxxflag ${nix_libcxx_cxxflags})

     

       42
       42
       +
       +      set(cxx_overlay_opt ${cxx_overlay_opt} "-Xcc" "${nix_libcxx_cxxflag}")

     

       43
       43
       +
       +    endforeach()

     

       44
       44
       +
       +  endif()

     

       45
       45
       +
       +  set(SWIFT_SDK_${prefix}_CXX_OVERLAY_SWIFT_COMPILE_FLAGS

     

       46
       46
       +
       +      ${cxx_overlay_opt}

     

       47
       47
       +
       +    CACHE STRING "Extra flags for compiling the C++ overlay")

     

       48
       48
       +
       +

     

       49
       49
       +
          _report_sdk("${prefix}")

     

       50
       50
       +
        endmacro()

     

       51
       51
       +
        

     

       52
       52
       +
       --- a/stdlib/public/Cxx/std/CMakeLists.txt

     

       53
       53
       +
       +++ b/stdlib/public/Cxx/std/CMakeLists.txt

     

       54
       54
       +
       @@ -145,6 +145,9 @@ add_swift_target_library(swiftstd STATIC NO_LINK_NAME IS_STDLIB

     

       55
       55
       +
            SWIFT_COMPILE_FLAGS_LINUX

     

       56
       56
       +
            ${SWIFT_SDK_LINUX_CXX_OVERLAY_SWIFT_COMPILE_FLAGS}

     

       57
       57
       +
        

     

       58
       58
       +
       +    SWIFT_COMPILE_FLAGS_OSX

     

       59
       59
       +
       +    ${SWIFT_SDK_OSX_CXX_OVERLAY_SWIFT_COMPILE_FLAGS}

     

       60
       60
       +
       +

     

       61
       61
       +
            LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"

     

       62
       62
       +
            TARGET_SDKS ALL_APPLE_PLATFORMS LINUX

     

       63
       63
       +
            INSTALL_IN_COMPONENT compiler

+14

pkgs/development/compilers/swift/compiler/patches/swift-darwin-link-cxxabi.patch

···

       1
       1
       +
       This patches the stdlib backdeploy static lib to have its users link c++abi.

     

       2
       2
       +
       Without this, later steps that try to link this fail looking for global

     

       3
       3
       +
       new/delete operators (__Znwm/__ZdlPv).

     

       4
       4
       +
       

     

       5
       5
       +
       --- a/stdlib/toolchain/Compatibility56/Overrides.cpp

     

       6
       6
       +
       +++ b/stdlib/toolchain/Compatibility56/Overrides.cpp

     

       7
       7
       +
       @@ -23,6 +23,7 @@

     

       8
       8
       +
        using namespace swift;

     

       9
       9
       +
        

     

       10
       10
       +
        __asm__ (".linker_option \"-lc++\"");

     

       11
       11
       +
       +__asm__ (".linker_option \"-lc++abi\"");

     

       12
       12
       +
        

     

       13
       13
       +
        #define OVERRIDE(name, ret, attrs, ccAttrs, namespace, typedArgs, namedArgs) \

     

       14
       14
       +
          Override_ ## name name;

+48

pkgs/development/compilers/swift/compiler/patches/swift-linux-fix-libc-paths.patch

···

       1
       1
       +
       This code injects an LLVM modulemap for glibc and libstdc++ by overriding

     

       2
       2
       +
       specific VFS paths. In order to do that, it needs to know the actual locations

     

       3
       3
       +
       of glibc and libstdc++, but it only searches `-sysroot` and fails. Here we

     

       4
       4
       +
       patch it to also consider `-idirafter` and `-isystem` as added by cc-wrapper.

     

       5
       5
       +
       

     

       6
       6
       +
       --- a/lib/ClangImporter/ClangIncludePaths.cpp

     

       7
       7
       +
       +++ b/lib/ClangImporter/ClangIncludePaths.cpp

     

       8
       8
       +
       @@ -120,6 +120,7 @@ static clang::driver::Driver createClangDriver(const ASTContext &ctx) {

     

       9
       9
       +
        /// \return a path without dots (`../`, './').

     

       10
       10
       +
        static llvm::Optional<Path>

     

       11
       11
       +
        findFirstIncludeDir(const llvm::opt::InputArgList &args,

     

       12
       12
       +
       +                    const llvm::opt::ArgList &DriverArgs,

     

       13
       13
       +
                            const ArrayRef<const char *> expectedFileNames) {

     

       14
       14
       +
          // C++ stdlib paths are added as `-internal-isystem`.

     

       15
       15
       +
          std::vector<std::string> includeDirs =

     

       16
       16
       +
       @@ -128,6 +129,14 @@ findFirstIncludeDir(const llvm::opt::InputArgList &args,

     

       17
       17
       +
          llvm::append_range(includeDirs,

     

       18
       18
       +
                             args.getAllArgValues(

     

       19
       19
       +
                                 clang::driver::options::OPT_internal_externc_isystem));

     

       20
       20
       +
       +  // Nix adds the C stdlib include path using `-idirafter`.

     

       21
       21
       +
       +  llvm::append_range(includeDirs,

     

       22
       22
       +
       +                     DriverArgs.getAllArgValues(

     

       23
       23
       +
       +                         clang::driver::options::OPT_idirafter));

     

       24
       24
       +
       +  // Nix adds the C++ stdlib include path using `-isystem`.

     

       25
       25
       +
       +  llvm::append_range(includeDirs,

     

       26
       26
       +
       +                     DriverArgs.getAllArgValues(

     

       27
       27
       +
       +                         clang::driver::options::OPT_isystem));

     

       28
       28
       +
        

     

       29
       29
       +
          for (const auto &includeDir : includeDirs) {

     

       30
       30
       +
            Path dir(includeDir);

     

       31
       31
       +
       @@ -193,7 +202,7 @@ getGlibcFileMapping(ASTContext &ctx) {

     

       32
       32
       +
          // Ideally we would check that all of the headers referenced from the

     

       33
       33
       +
          // modulemap are present.

     

       34
       34
       +
          Path glibcDir;

     

       35
       35
       +
       -  if (auto dir = findFirstIncludeDir(parsedIncludeArgs,

     

       36
       36
       +
       +  if (auto dir = findFirstIncludeDir(parsedIncludeArgs, clangDriverArgs,

     

       37
       37
       +
                                             {"inttypes.h", "unistd.h", "stdint.h"})) {

     

       38
       38
       +
            glibcDir = dir.value();

     

       39
       39
       +
          } else {

     

       40
       40
       +
       @@ -251,7 +260,7 @@ getLibStdCxxFileMapping(ASTContext &ctx) {

     

       41
       41
       +
          auto parsedStdlibArgs = parseClangDriverArgs(clangDriver, stdlibArgStrings);

     

       42
       42
       +
        

     

       43
       43
       +
          Path cxxStdlibDir;

     

       44
       44
       +
       -  if (auto dir = findFirstIncludeDir(parsedStdlibArgs,

     

       45
       45
       +
       +  if (auto dir = findFirstIncludeDir(parsedStdlibArgs, clangDriverArgs,

     

       46
       46
       +
                                             {"cstdlib", "string", "vector"})) {

     

       47
       47
       +
            cxxStdlibDir = dir.value();

     

       48
       48
       +
          } else {

+5 -5

pkgs/development/compilers/swift/compiler/patches/swift-nix-resource-root.patch

···

       7
       7
        
       

     

       8
       8
        
       --- a/lib/ClangImporter/ClangImporter.cpp

     

       9
       9
        
       +++ b/lib/ClangImporter/ClangImporter.cpp

     

       10
       10
       -
       @@ -68,6 +68,7 @@

     

       10
       10
       +
       @@ -73,6 +73,7 @@

     

       11
       11
        
        #include "llvm/Support/FileSystem.h"

     

       12
       12
        
        #include "llvm/Support/Memory.h"

     

       13
       13
        
        #include "llvm/Support/Path.h"

     

       14
       14
        
       +#include "llvm/Support/Process.h"

     

       15
       15
       +
        #include "llvm/Support/VirtualFileSystem.h"

     

       15
       16
        
        #include "llvm/Support/YAMLParser.h"

     

       16
       16
       -
        #include "llvm/Support/YAMLTraits.h"

     

       17
       17
        
        #include <algorithm>

     

       18
       18
       -
       @@ -809,6 +810,17 @@ importer::addCommonInvocationArguments(

     

       18
       18
       +
       @@ -786,6 +787,17 @@ importer::addCommonInvocationArguments(

     

       19
       19
        
        

     

       20
       20
        
          const std::string &overrideResourceDir = importerOpts.OverrideResourceDir;

     

       21
       21
        
          if (overrideResourceDir.empty()) {

     
···

       33
       33
        
            llvm::SmallString<128> resourceDir(searchPathOpts.RuntimeResourcePath);

     

       34
       34
        
        

     

       35
       35
        
            // Adjust the path to refer to our copy of the Clang resource directory

     

       36
       36
       -
       @@ -824,6 +836,7 @@ importer::addCommonInvocationArguments(

     

       36
       36
       +
       @@ -801,6 +813,7 @@ importer::addCommonInvocationArguments(

     

       37
       37
        
            // Set the Clang resource directory to the path we computed.

     

       38
       38
        
            invocationArgStrs.push_back("-resource-dir");

     

       39
       39
        
            invocationArgStrs.push_back(std::string(resourceDir.str()));

     
···

       43
       43
        
            invocationArgStrs.push_back(overrideResourceDir);

     

       44
       44
        
       --- a/lib/Driver/ToolChains.cpp

     

       45
       45
        
       +++ b/lib/Driver/ToolChains.cpp

     

       46
       46
       -
       @@ -1372,10 +1372,20 @@ void ToolChain::getClangLibraryPath(const ArgList &Args,

     

       46
       46
       +
       @@ -1393,10 +1393,20 @@ void ToolChain::getClangLibraryPath(const ArgList &Args,

     

       47
       47
        
                                            SmallString<128> &LibPath) const {

     

       48
       48
        
          const llvm::Triple &T = getTriple();

     

       49
       49

+9 -8

pkgs/development/compilers/swift/default.nix

···

       2
       2
        
       , pkgs

     

       3
       3
        
       , newScope

     

       4
       4
        
       , darwin

     

       5
       5
       -
       , llvmPackages_latest

     

       5
       5
       +
       , llvmPackages_15

     

       6
       6
        
       , overrideCC

     

       7
       7
        
       }:

     

       8
       8
        
       

     
···

       15
       15
        
           # Re-export this so we can rely on the minimum Swift SDK elsewhere.

     

       16
       16
        
           apple_sdk = pkgs.darwin.apple_sdk_11_0;

     

       17
       17
        
       

     

       18
       18
       -
           # Our current Clang on Darwin is v11, but we need at least v12. The

     

       19
       19
       -
           # following applies the newer Clang with the same libc overrides as

     

       20
       20
       -
           # `apple_sdk.stdenv`.

     

       18
       18
       +
           # Swift builds its own Clang for internal use. We wrap that clang with a

     

       19
       19
       +
           # cc-wrapper derived from the clang configured below. Because cc-wrapper

     

       20
       20
       +
           # applies a specific resource-root, the two versions are best matched, or

     

       21
       21
       +
           # we'll often run into compilation errors.

     

       21
       22
        
           #

     

       22
       22
       -
           # If 'latest' becomes an issue, recommend replacing it with v14, which is

     

       23
       23
       -
           # currently closest to the official Swift builds.

     

       23
       23
       +
           # The following selects the correct Clang version, matching the version

     

       24
       24
       +
           # used in Swift, and applies the same libc overrides as `apple_sdk.stdenv`.

     

       24
       25
        
           clang = if pkgs.stdenv.isDarwin

     

       25
       26
        
             then

     

       26
       26
       -
               llvmPackages_latest.clang.override rec {

     

       27
       27
       +
               llvmPackages_15.clang.override rec {

     

       27
       28
        
                 libc = apple_sdk.Libsystem;

     

       28
       29
        
                 bintools = pkgs.bintools.override { inherit libc; };

     

       29
       30
        
               }

     

       30
       31
        
             else

     

       31
       31
       -
               llvmPackages_latest.clang;

     

       32
       32
       +
               llvmPackages_15.clang;

     

       32
       33
        
       

     

       33
       34
        
           # Overrides that create a useful environment for swift packages, allowing

     

       34
       35
        
           # packaging with `swiftPackages.callPackage`. These are similar to

pkgs/development/compilers/swift/sourcekit-lsp/default.nix

···

       6
       6
        
       , swiftpm2nix

     

       7
       7
        
       , Foundation

     

       8
       8
        
       , XCTest

     

       9
       9
       +
       , pkg-config

     

       9
       10
        
       , sqlite

     

       10
       11
        
       , ncurses

     

       11
       12
        
       , CryptoKit

     
···

       31
       32
        
         buildInputs = [

     

       32
       33
        
           Foundation

     

       33
       34
        
           XCTest

     

       35
       35
       +
           pkg-config

     

       34
       36
        
           sqlite

     

       35
       37
        
           ncursesInput

     

       36
       38
        
         ]

+8 -7

pkgs/development/compilers/swift/sourcekit-lsp/generated/default.nix

···

       2
       2
        
       {

     

       3
       3
        
         workspaceStateFile = ./workspace-state.json;

     

       4
       4
        
         hashes = {

     

       5
       5
       -
           "indexstore-db" = "05d7l3fgcvbw8plaky3pgjm03x20a63z9r14njxg5qm2zcp5m6jx";

     

       5
       5
       +
           "indexstore-db" = "0lf96m82s8f6lv67wbcnm9ii01fgw4bsr4vn2xp07ydfj1iqy8il";

     

       6
       6
        
           "swift-argument-parser" = "1jph9w7lk9nr20fsv2c8p4hisx3dda817fh7pybd0r0j1jwa9nmw";

     

       7
       7
        
           "swift-collections" = "1k6sjx5rqmp3gklny77b480hyzy6gkhpi23r0s8ljfbrcwawgnan";

     

       8
       8
       -
           "swift-crypto" = "020b8q4ss2k7a65r5dgh59z40i6sn7ij1allxkh8c8a9d0jzn313";

     

       9
       9
       -
           "swift-driver" = "1lcb5wqragc74nd0fjnk47lyph9hs0i9cps1mplvp2i91yzjqk05";

     

       10
       10
       -
           "swift-llbuild" = "07zbp2dyfqd1bnyg7snpr9brn40jf22ivly5v10mql3hrg76a18h";

     

       11
       11
       -
           "swift-package-manager" = "0a3vahdkj35n0dkinwcgybgfb9dnq2lq1nknn874r38xbj3mhlff";

     

       8
       8
       +
           "swift-crypto" = "0kllp7j0hd8k67l9b9zr2c3ddc5bvshldchzivhcz3q31qvq9ag8";

     

       9
       9
       +
           "swift-driver" = "0cbvddj54k3sbw0vzlmzhccs7h43hi5kq6i3n2i0mysz3bf0c6zg";

     

       10
       10
       +
           "swift-llbuild" = "106vnssh6pgy5s9dnq1hi1c9v2wkfydqgncg5dy7c9n23iisjy3s";

     

       11
       11
       +
           "swift-package-manager" = "1d1ngh7da42dm0rwkw7jzxa63a1rpc88wimm85w2j59cm446pk9k";

     

       12
       12
       +
           "swift-syntax" = "05394mzznmcrw246lyzsjsn1fmilj98jgkjyyxr2ynhnbgzp2jl2";

     

       12
       13
        
           "swift-system" = "0402hkx2q2dv27gccnn8ma79ngvwiwzkhcv4zlcdldmy6cgi0px7";

     

       13
       13
       -
           "swift-tools-support-core" = "134f9x44jnzdy8cwi6hs372dwbyqvr4qmsjzjy25wzpyv6m9rhrz";

     

       14
       14
       -
           "Yams" = "1893y13sis2aimi1a5kgkczbf06z4yig054xb565yg2xm13srb45";

     

       14
       14
       +
           "swift-tools-support-core" = "1qvblyiazv58qwyxgyk2dh5ymbab3y70vm2q81qs6rmv43hs8ciz";

     

       15
       15
       +
           "Yams" = "0b4lprxl4f6yqq0djnp394mxgmsxm2pljr7fh4f6ihdhnpwfsfvl";

     

       15
       16
        
         };

     

       16
       17
        
       }

+32 -15

pkgs/development/compilers/swift/sourcekit-lsp/generated/workspace-state.json

···

       12
       12
        
               },

     

       13
       13
        
               "state": {

     

       14
       14
        
                 "checkoutState": {

     

       15
       15
       -
                   "branch": "release/5.7",

     

       16
       16
       -
                   "revision": "9305648b0a8700434fa2e55eeacf7c7f4402a0d5"

     

       15
       15
       +
                   "branch": "release/5.8",

     

       16
       16
       +
                   "revision": "6caa12ab3bb6245eee4e09dce7677e64720c6545"

     

       17
       17
        
                 },

     

       18
       18
        
                 "name": "sourceControlCheckout"

     

       19
       19
        
               },

     
···

       63
       63
        
               },

     

       64
       64
        
               "state": {

     

       65
       65
        
                 "checkoutState": {

     

       66
       66
       -
                   "revision": "ddb07e896a2a8af79512543b1c7eb9797f8898a5",

     

       67
       67
       -
                   "version": "1.1.7"

     

       66
       66
       +
                   "revision": "75ec60b8b4cc0f085c3ac414f3dca5625fa3588e",

     

       67
       67
       +
                   "version": "2.2.4"

     

       68
       68
        
                 },

     

       69
       69
        
                 "name": "sourceControlCheckout"

     

       70
       70
        
               },

     
···

       80
       80
        
               },

     

       81
       81
        
               "state": {

     

       82
       82
        
                 "checkoutState": {

     

       83
       83
       -
                   "branch": "release/5.7",

     

       84
       84
       -
                   "revision": "82b274af66cfbb8f3131677676517b34d01e30fd"

     

       83
       83
       +
                   "branch": "release/5.8",

     

       84
       84
       +
                   "revision": "7cfe0c0b6e6297efe88a3ce34e6138ee7eda969e"

     

       85
       85
        
                 },

     

       86
       86
        
                 "name": "sourceControlCheckout"

     

       87
       87
        
               },

     
···

       97
       97
        
               },

     

       98
       98
        
               "state": {

     

       99
       99
        
                 "checkoutState": {

     

       100
       100
       -
                   "branch": "release/5.7",

     

       101
       101
       -
                   "revision": "564424db5fdb62dcb5d863bdf7212500ef03a87b"

     

       100
       100
       +
                   "branch": "release/5.8",

     

       101
       101
       +
                   "revision": "dccfc2e127a34b89a849407594cf2d604b598ba9"

     

       102
       102
        
                 },

     

       103
       103
        
                 "name": "sourceControlCheckout"

     

       104
       104
        
               },

     
···

       114
       114
        
               },

     

       115
       115
        
               "state": {

     

       116
       116
        
                 "checkoutState": {

     

       117
       117
       -
                   "branch": "release/5.7",

     

       118
       118
       -
                   "revision": "c6e40adbfc78acc60ca464ae482b56442f9f34f4"

     

       117
       117
       +
                   "branch": "release/5.8",

     

       118
       118
       +
                   "revision": "6651d98a4ce3c6faa82768256ca286412bf4a04d"

     

       119
       119
        
                 },

     

       120
       120
        
                 "name": "sourceControlCheckout"

     

       121
       121
        
               },

     
···

       124
       124
        
             {

     

       125
       125
        
               "basedOn": null,

     

       126
       126
        
               "packageRef": {

     

       127
       127
       +
                 "identity": "swift-syntax",

     

       128
       128
       +
                 "kind": "remoteSourceControl",

     

       129
       129
       +
                 "location": "https://github.com/apple/swift-syntax.git",

     

       130
       130
       +
                 "name": "SwiftSyntax"

     

       131
       131
       +
               },

     

       132
       132
       +
               "state": {

     

       133
       133
       +
                 "checkoutState": {

     

       134
       134
       +
                   "branch": "release/5.8",

     

       135
       135
       +
                   "revision": "cd793adf5680e138bf2bcbaacc292490175d0dcd"

     

       136
       136
       +
                 },

     

       137
       137
       +
                 "name": "sourceControlCheckout"

     

       138
       138
       +
               },

     

       139
       139
       +
               "subpath": "swift-syntax"

     

       140
       140
       +
             },

     

       141
       141
       +
             {

     

       142
       142
       +
               "basedOn": null,

     

       143
       143
       +
               "packageRef": {

     

       127
       144
        
                 "identity": "swift-system",

     

       128
       145
        
                 "kind": "remoteSourceControl",

     

       129
       146
        
                 "location": "https://github.com/apple/swift-system.git",

     
···

       148
       165
        
               },

     

       149
       166
        
               "state": {

     

       150
       167
        
                 "checkoutState": {

     

       151
       151
       -
                   "branch": "release/5.7",

     

       152
       152
       -
                   "revision": "286b48b1d73388e1d49b2bb33aabf995838104e3"

     

       168
       168
       +
                   "branch": "release/5.8",

     

       169
       169
       +
                   "revision": "ac4871e01ef338cb95b5d28328cab0ec1dfae935"

     

       153
       170
        
                 },

     

       154
       171
        
                 "name": "sourceControlCheckout"

     

       155
       172
        
               },

     
···

       165
       182
        
               },

     

       166
       183
        
               "state": {

     

       167
       184
        
                 "checkoutState": {

     

       168
       168
       -
                   "revision": "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa",

     

       169
       169
       -
                   "version": "4.0.6"

     

       185
       185
       +
                   "revision": "f47ba4838c30dbd59998a4e4c87ab620ff959e8a",

     

       186
       186
       +
                   "version": "5.0.5"

     

       170
       187
        
                 },

     

       171
       188
        
                 "name": "sourceControlCheckout"

     

       172
       189
        
               },

     
···

       174
       191
        
             }

     

       175
       192
        
           ]

     

       176
       193
        
         },

     

       177
       177
       -
         "version": 5

     

       194
       194
       +
         "version": 6

     

       178
       195
        
       }

+14 -13

pkgs/development/compilers/swift/sources.nix

···

       5
       5
        
         # These packages are all part of the Swift toolchain, and have a single

     

       6
       6
        
         # upstream version that should match. We also list the hashes here so a basic

     

       7
       7
        
         # version upgrade touches only this file.

     

       8
       8
       -
         version = "5.7.3";

     

       8
       8
       +
         version = "5.8";

     

       9
       9
        
         hashes = {

     

       10
       10
       -
           llvm-project = "sha256-IDtLPe0sXamnmovbFVKvmDMnci4u/A0urAPjWTYwJCo=";

     

       11
       11
       -
           sourcekit-lsp = "sha256-BT6+VCBSupKOg2mXo6HlkvNRc8pVZU772Mj3LKFamsU=";

     

       12
       12
       -
           swift = "sha256-essP2eIp1sLuROqk0OKGBPfJnvnyAW0moMk0cX1IVQQ=";

     

       13
       13
       -
           swift-cmark = "sha256-f0BoTs4HYdx/aJ9HIGCWMalhl8PvClWD6R4QK3qSgAw=";

     

       14
       14
       -
           swift-corelibs-foundation = "sha256-g78zKSq/b/pVFAD2k2SoMpzJQIpkxMvZOaSz5JPaQmA=";

     

       15
       15
       -
           swift-corelibs-libdispatch = "sha256-1qbXiC1k9+T+L6liqXKg6EZXqem6KEEx8OctuL4Kb2o=";

     

       16
       16
       -
           swift-corelibs-xctest = "sha256-qLUO9/3tkJWorDMEHgHd8VC3ovLLq/UWXJWMtb6CMN0=";

     

       17
       17
       -
           swift-docc = "sha256-WlXJMAnrlVPCM+iCIhG0Gyho76BsC2yVBEpX3m/WiIQ=";

     

       18
       18
       -
           swift-docc-render-artifact = "sha256-ttdurN/K7OX+I4577jG3YGeRs+GLUTc7BiiEZGmFD+s=";

     

       19
       19
       -
           swift-driver = "sha256-BUwsvw8pirvprUFfliLQMMHr6SHTSgeaJYc9lTEvi9E=";

     

       20
       20
       -
           swift-experimental-string-processing = "sha256-W0cQBkdR3A0hrV75Wwm0YULUDVg1bjT0O5w5VGBYDJs=";

     

       21
       21
       -
           swift-package-manager = "sha256-zlFYh1wdjUwOsnbagKnAtqXl3vKPcRtnA7YMORtUeyg=";

     

       10
       10
       +
           llvm-project = "sha256-0xwSAwwkzFgYO3mY1rHqV8TCeH2NpM7m3VUkCDqjcdE=";

     

       11
       11
       +
           sourcekit-lsp = "sha256-XDGq64LbpgBrRy3IvZNgsoLUePXECK5p10vQ8cUKeGE=";

     

       12
       12
       +
           swift = "sha256-EY2IImBCVLiUutvDQjNUiInwCNxZsCu1mZzYSjNd4+A=";

     

       13
       13
       +
           swift-cmark = "sha256-6xkO9kN6eXMAigjk+KyIgVhTyC50BxmkZmD4+9z6nz8=";

     

       14
       14
       +
           swift-corelibs-foundation = "sha256-yRjjxJRy1eTM9VG7/Fn60UMghPavsaoueH0V8cjaIyM=";

     

       15
       15
       +
           swift-corelibs-libdispatch = "sha256-XOAWuaGqWJtxhGIPXYT3PIvk5OK0rkY4g1IOybJUlm4=";

     

       16
       16
       +
           swift-corelibs-xctest = "sha256-uwxQhKUQ1xp5ao6kfkdlYOvMr6yAb5IaBIdOfoyf+n8=";

     

       17
       17
       +
           swift-docc = "sha256-k1ygYDZwF4Jo7iOkHxc/3NzfgN+8XNCks5aizxBgPjM=";

     

       18
       18
       +
           swift-docc-render-artifact = "sha256-vdSyICXOjlNSjZXzPRxa/5305pg6PG4xww9GYEV9m10=";

     

       19
       19
       +
           swift-driver = "sha256-7xsG3Bpf+wqisCMaPEuEg8CjGYO/0r8BX3pMUmRrezE=";

     

       20
       20
       +
           swift-experimental-string-processing = "sha256-ioXG6pQKjlAc2oF38Z7TGighyZN8w2ZAAtFUq83Ow6Q=";

     

       21
       21
       +
           swift-package-manager = "sha256-xd6ZpeXfMoHyVrJxz6XcDLPKBvc2nl1lgWXuLrJdq+E=";

     

       22
       22
       +
           swift-syntax = "sha256-gkpx/1sWWi9y917OJ1GSNFYXrJb6e2qI4JlV+38laRQ=";

     

       22
       23
        
         };

     

       23
       24
        
       

     

       24
       25
        
         # Create fetch derivations.

pkgs/development/compilers/swift/swift-docc/default.nix

···

       28
       28
        
       

     

       29
       29
        
         configurePhase = generated.configure;

     

       30
       30
        
       

     

       31
       31
       +
         # We only install the docc binary, so don't need the other products.

     

       32
       32
       +
         # This works around a failure building generate-symbol-graph:

     

       33
       33
       +
         #  Sources/generate-symbol-graph/main.swift:13:18: error: module 'SwiftDocC' was not compiled for testing

     

       34
       34
       +
         # TODO: Figure out the cause. It doesn't seem to happen outside Nixpkgs.

     

       35
       35
       +
         swiftpmFlags = "--product docc";

     

       36
       36
       +
       

     

       31
       37
        
         # TODO: Tests depend on indexstore-db being provided by an existing Swift

     

       32
       38
        
         # toolchain. (ie. looks for `../lib/libIndexStore.so` relative to swiftc.

     

       33
       39
        
         #doCheck = true;

+6 -7

pkgs/development/compilers/swift/swift-docc/generated/default.nix

···

       2
       2
        
       {

     

       3
       3
        
         workspaceStateFile = ./workspace-state.json;

     

       4
       4
        
         hashes = {

     

       5
       5
       -
           "swift-argument-parser" = "070gip241dgn3d0nxgwxva4vp6kbnf11g01q5yaq6kmflcmz58f2";

     

       6
       6
       -
           "swift-cmark" = "0xfchdgls3070z16in8ks69y8fpiajmyk7lmp5h7ym7164isa6bb";

     

       7
       7
       -
           "swift-crypto" = "0h054rq14jyg94aiymmp37vqz60a13dlczp5g09pln724j4ypv92";

     

       5
       5
       +
           "swift-argument-parser" = "1jph9w7lk9nr20fsv2c8p4hisx3dda817fh7pybd0r0j1jwa9nmw";

     

       6
       6
       +
           "swift-cmark" = "1qswlh6j9mlfq8qj7xfqspla7w7rrzvplgcs4mgllgi012yfgwnp";

     

       7
       7
       +
           "swift-crypto" = "020b8q4ss2k7a65r5dgh59z40i6sn7ij1allxkh8c8a9d0jzn313";

     

       8
       8
        
           "swift-docc-plugin" = "11d6nhi139yzk1lxxrixsbgyj1bnvmh40wj30y725q83nqq49ljh";

     

       9
       9
       -
           "swift-docc-symbolkit" = "14hb2wc09hisf2r2yny17z28z0m58cf4lnqaczad2x2hk4s1iayi";

     

       10
       10
       -
           "swift-lmdb" = "1m5y6x2vs1wflcv2c57rx87gh12sy0hkwy5iy9inxmda2mcs8qcb";

     

       11
       11
       -
           "swift-markdown" = "09270bfrwlp904cma29hsbhr1p25v8kwgvhcfi7lg2av7aaknd97";

     

       9
       9
       +
           "swift-docc-symbolkit" = "14w37wzbx1mygfwm4iv0ypj120n1axhk627rg5a7v8j0ln511r7s";

     

       10
       10
       +
           "swift-lmdb" = "0azmc24mnxn4pbda8w8v7hy3h0gqqm4br43pnr7lc4sfj3dcv43m";

     

       11
       11
       +
           "swift-markdown" = "1l4ydc0xyv88gnyc33p61qavdh8cv98c548n1icphrfd6i78yygw";

     

       12
       12
        
           "swift-nio" = "04bvay94b34ynmlvgyl9a7f431l3cf8k2zr483spv8mvyh1hxiqn";

     

       13
       13
       -
           "swift-nio-ssl" = "1ak4aldilmz0pnfgbwq1x4alr38nfyvx2pz7p2vi2plf82da80g5";

     

       14
       13
        
         };

     

       15
       14
        
       }

+13 -30

pkgs/development/compilers/swift/swift-docc/generated/workspace-state.json

···

       12
       12
        
               },

     

       13
       13
        
               "state": {

     

       14
       14
        
                 "checkoutState": {

     

       15
       15
       -
                   "revision": "d2930e8fcf9c33162b9fcc1d522bc975e2d4179b",

     

       16
       16
       -
                   "version": "1.0.1"

     

       15
       15
       +
                   "revision": "e394bf350e38cb100b6bc4172834770ede1b7232",

     

       16
       16
       +
                   "version": "1.0.3"

     

       17
       17
        
                 },

     

       18
       18
        
                 "name": "sourceControlCheckout"

     

       19
       19
        
               },

     
···

       29
       29
        
               },

     

       30
       30
        
               "state": {

     

       31
       31
        
                 "checkoutState": {

     

       32
       32
       -
                   "branch": "release/5.7-gfm",

     

       33
       33
       -
                   "revision": "792c1c3326327515ce9bf64c44196b7f4daab9a6"

     

       32
       32
       +
                   "branch": "gfm",

     

       33
       33
       +
                   "revision": "eb9a6a357b6816c68f4b194eaa5b67f3cd1fa5c3"

     

       34
       34
        
                 },

     

       35
       35
        
                 "name": "sourceControlCheckout"

     

       36
       36
        
               },

     
···

       46
       46
        
               },

     

       47
       47
        
               "state": {

     

       48
       48
        
                 "checkoutState": {

     

       49
       49
       -
                   "revision": "9680b7251cd2be22caaed8f1468bd9e8915a62fb",

     

       50
       50
       -
                   "version": "1.1.2"

     

       49
       49
       +
                   "revision": "ddb07e896a2a8af79512543b1c7eb9797f8898a5",

     

       50
       50
       +
                   "version": "1.1.7"

     

       51
       51
        
                 },

     

       52
       52
        
                 "name": "sourceControlCheckout"

     

       53
       53
        
               },

     
···

       80
       80
        
               },

     

       81
       81
        
               "state": {

     

       82
       82
        
                 "checkoutState": {

     

       83
       83
       -
                   "branch": "release/5.7",

     

       84
       84
       -
                   "revision": "8682202025906dce29a8b04f9263f40ba87b89d8"

     

       83
       83
       +
                   "branch": "main",

     

       84
       84
       +
                   "revision": "b45d1f2ed151d057b54504d653e0da5552844e34"

     

       85
       85
        
                 },

     

       86
       86
        
                 "name": "sourceControlCheckout"

     

       87
       87
        
               },

     
···

       97
       97
        
               },

     

       98
       98
        
               "state": {

     

       99
       99
        
                 "checkoutState": {

     

       100
       100
       -
                   "branch": "release/5.7",

     

       101
       101
       -
                   "revision": "6ea45a7ebf6d8f72bd299dfcc3299e284bbb92ee"

     

       100
       100
       +
                   "branch": "main",

     

       101
       101
       +
                   "revision": "584941b1236b15bad74d8163785d389c028b1ad8"

     

       102
       102
        
                 },

     

       103
       103
        
                 "name": "sourceControlCheckout"

     

       104
       104
        
               },

     
···

       114
       114
        
               },

     

       115
       115
        
               "state": {

     

       116
       116
        
                 "checkoutState": {

     

       117
       117
       -
                   "branch": "release/5.7",

     

       118
       118
       -
                   "revision": "d6cd065a7e4b6c3fad615dcd39890e095a2f63a2"

     

       117
       117
       +
                   "branch": "main",

     

       118
       118
       +
                   "revision": "d491147940587dbadfb3472354f4d0c6e063e061"

     

       119
       119
        
                 },

     

       120
       120
        
                 "name": "sourceControlCheckout"

     

       121
       121
        
               },

     
···

       137
       137
        
                 "name": "sourceControlCheckout"

     

       138
       138
        
               },

     

       139
       139
        
               "subpath": "swift-nio"

     

       140
       140
       -
             },

     

       141
       141
       -
             {

     

       142
       142
       -
               "basedOn": null,

     

       143
       143
       -
               "packageRef": {

     

       144
       144
       -
                 "identity": "swift-nio-ssl",

     

       145
       145
       -
                 "kind": "remoteSourceControl",

     

       146
       146
       -
                 "location": "https://github.com/apple/swift-nio-ssl.git",

     

       147
       147
       -
                 "name": "swift-nio-ssl"

     

       148
       148
       -
               },

     

       149
       149
       -
               "state": {

     

       150
       150
       -
                 "checkoutState": {

     

       151
       151
       -
                   "revision": "2e74773972bd6254c41ceeda827f229bccbf1c0f",

     

       152
       152
       -
                   "version": "2.15.0"

     

       153
       153
       -
                 },

     

       154
       154
       -
                 "name": "sourceControlCheckout"

     

       155
       155
       -
               },

     

       156
       156
       -
               "subpath": "swift-nio-ssl"

     

       157
       140
        
             }

     

       158
       141
        
           ]

     

       159
       142
        
         },

     

       160
       160
       -
         "version": 5

     

       143
       143
       +
         "version": 6

     

       161
       144
        
       }

+4 -4

pkgs/development/compilers/swift/swift-driver/generated/default.nix

···

       2
       2
        
       {

     

       3
       3
        
         workspaceStateFile = ./workspace-state.json;

     

       4
       4
        
         hashes = {

     

       5
       5
       -
           "swift-argument-parser" = "11did5snqj8chcbdbiyx84mpif940ls2pr1iikwivvfp63i248hm";

     

       6
       6
       -
           "swift-llbuild" = "07zbp2dyfqd1bnyg7snpr9brn40jf22ivly5v10mql3hrg76a18h";

     

       5
       5
       +
           "swift-argument-parser" = "1jph9w7lk9nr20fsv2c8p4hisx3dda817fh7pybd0r0j1jwa9nmw";

     

       6
       6
       +
           "swift-llbuild" = "106vnssh6pgy5s9dnq1hi1c9v2wkfydqgncg5dy7c9n23iisjy3s";

     

       7
       7
        
           "swift-system" = "0402hkx2q2dv27gccnn8ma79ngvwiwzkhcv4zlcdldmy6cgi0px7";

     

       8
       8
       -
           "swift-tools-support-core" = "134f9x44jnzdy8cwi6hs372dwbyqvr4qmsjzjy25wzpyv6m9rhrz";

     

       9
       9
       -
           "Yams" = "1893y13sis2aimi1a5kgkczbf06z4yig054xb565yg2xm13srb45";

     

       8
       8
       +
           "swift-tools-support-core" = "1qvblyiazv58qwyxgyk2dh5ymbab3y70vm2q81qs6rmv43hs8ciz";

     

       9
       9
       +
           "Yams" = "11abhcfkmqm3cmh7vp7rqzvxd1zj02j2866a2pp6v9m89456xb76";

     

       10
       10
        
         };

     

       11
       11
        
       }

+9 -9

pkgs/development/compilers/swift/swift-driver/generated/workspace-state.json

···

       12
       12
        
               },

     

       13
       13
        
               "state": {

     

       14
       14
        
                 "checkoutState": {

     

       15
       15
       -
                   "revision": "e1465042f195f374b94f915ba8ca49de24300a0d",

     

       16
       16
       -
                   "version": "1.0.2"

     

       15
       15
       +
                   "revision": "e394bf350e38cb100b6bc4172834770ede1b7232",

     

       16
       16
       +
                   "version": "1.0.3"

     

       17
       17
        
                 },

     

       18
       18
        
                 "name": "sourceControlCheckout"

     

       19
       19
        
               },

     
···

       29
       29
        
               },

     

       30
       30
        
               "state": {

     

       31
       31
        
                 "checkoutState": {

     

       32
       32
       -
                   "branch": "release/5.7",

     

       33
       33
       -
                   "revision": "564424db5fdb62dcb5d863bdf7212500ef03a87b"

     

       32
       32
       +
                   "branch": "release/5.8",

     

       33
       33
       +
                   "revision": "dccfc2e127a34b89a849407594cf2d604b598ba9"

     

       34
       34
        
                 },

     

       35
       35
        
                 "name": "sourceControlCheckout"

     

       36
       36
        
               },

     
···

       63
       63
        
               },

     

       64
       64
        
               "state": {

     

       65
       65
        
                 "checkoutState": {

     

       66
       66
       -
                   "branch": "release/5.7",

     

       67
       67
       -
                   "revision": "286b48b1d73388e1d49b2bb33aabf995838104e3"

     

       66
       66
       +
                   "branch": "release/5.8",

     

       67
       67
       +
                   "revision": "ac4871e01ef338cb95b5d28328cab0ec1dfae935"

     

       68
       68
        
                 },

     

       69
       69
        
                 "name": "sourceControlCheckout"

     

       70
       70
        
               },

     
···

       80
       80
        
               },

     

       81
       81
        
               "state": {

     

       82
       82
        
                 "checkoutState": {

     

       83
       83
       -
                   "revision": "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa",

     

       84
       84
       -
                   "version": "4.0.6"

     

       83
       83
       +
                   "revision": "01835dc202670b5bb90d07f3eae41867e9ed29f6",

     

       84
       84
       +
                   "version": "5.0.1"

     

       85
       85
        
                 },

     

       86
       86
        
                 "name": "sourceControlCheckout"

     

       87
       87
        
               },

     
···

       89
       89
        
             }

     

       90
       90
        
           ]

     

       91
       91
        
         },

     

       92
       92
       -
         "version": 5

     

       92
       92
       +
         "version": 6

     

       93
       93
        
       }

+5 -5

pkgs/development/compilers/swift/swift-driver/patches/linux-fix-linking.patch

···

       1
       1
        
       --- a/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift

     

       2
       2
        
       +++ b/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift

     

       3
       3
       -
       @@ -9,6 +9,7 @@

     

       4
       4
       -
        // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

     

       3
       3
       +
       @@ -10,6 +10,7 @@

     

       5
       4
        
        //

     

       6
       5
        
        //===----------------------------------------------------------------------===//

     

       6
       6
       +
        

     

       7
       7
        
       +import Foundation

     

       8
       8
       -
        import TSCBasic

     

       9
       8
        
        import SwiftOptions

     

       10
       9
        
        

     

       11
       11
       -
       @@ -116,7 +117,20 @@ extension GenericUnixToolchain {

     

       10
       10
       +
        import func TSCBasic.lookupExecutablePath

     

       11
       11
       +
       @@ -120,7 +121,20 @@ extension GenericUnixToolchain {

     

       12
       12
        
              // just using `clang` and avoid a dependency on the C++ runtime.

     

       13
       13
        
              let clangTool: Tool =

     

       14
       14
        
                parsedOptions.hasArgument(.enableExperimentalCxxInterop) ? .clangxx : .clang

     
···

       30
       30
        
              if let toolsDirPath = parsedOptions.getLastArgument(.toolsDirectory) {

     

       31
       31
        
                // FIXME: What if this isn't an absolute path?

     

       32
       32
        
                let toolsDir = try AbsolutePath(validating: toolsDirPath.asSingle)

     

       33
       33
       -
       @@ -132,6 +146,7 @@ extension GenericUnixToolchain {

     

       33
       33
       +
       @@ -136,6 +150,7 @@ extension GenericUnixToolchain {

     

       34
       34
        
                commandLine.appendFlag("-B")

     

       35
       35
        
                commandLine.appendPath(toolsDir)

     

       36
       36
        
              }

+4 -4

pkgs/development/compilers/swift/swift-driver/patches/nix-resource-root.patch

···

       4
       4
        
       

     

       5
       5
        
       --- a/Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift

     

       6
       6
        
       +++ b/Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift

     

       7
       7
       -
       @@ -9,6 +9,7 @@

     

       8
       8
       -
        // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

     

       7
       7
       +
       @@ -10,6 +10,7 @@

     

       9
       8
        
        //

     

       10
       9
        
        //===----------------------------------------------------------------------===//

     

       10
       10
       +
        

     

       11
       11
        
       +import Foundation

     

       12
       12
       -
        import TSCBasic

     

       13
       12
        
        import SwiftOptions

     

       14
       13
        
        

     

       15
       15
       -
       @@ -24,6 +25,13 @@ extension Toolchain {

     

       14
       14
       +
        import protocol TSCBasic.FileSystem

     

       15
       15
       +
       @@ -26,6 +27,13 @@ extension Toolchain {

     

       16
       16
        
            for targetInfo: FrontendTargetInfo,

     

       17
       17
        
            parsedOptions: inout ParsedOptions

     

       18
       18
        
          ) throws -> VirtualPath {

-3

pkgs/development/compilers/swift/swiftpm/cmake-glue.nix

···

       57
       57
        
         '';

     

       58
       58
        
       

     

       59
       59
        
         Yams = ''

     

       60
       60
       -
           add_library(CYaml SHARED IMPORTED)

     

       61
       61
       -
           set_property(TARGET CYaml PROPERTY IMPORTED_LOCATION "@out@/lib/libCYaml@sharedLibExt@")

     

       62
       62
       -
       

     

       63
       60
        
           add_library(Yams SHARED IMPORTED)

     

       64
       61
        
           set_property(TARGET Yams PROPERTY IMPORTED_LOCATION "@out@/lib/swift/@swiftOs@/libYams@sharedLibExt@")

     

       65
       62
        
         '';

+39 -10

pkgs/development/compilers/swift/swiftpm/default.nix

···

       8
       8
        
       , swiftpm2nix

     

       9
       9
        
       , Foundation

     

       10
       10
        
       , XCTest

     

       11
       11
       +
       , pkg-config

     

       11
       12
        
       , sqlite

     

       12
       13
        
       , ncurses

     

       13
       14
        
       , substituteAll

     
···

       38
       39
        
           propagatedBuildInputs = [ Foundation ];

     

       39
       40
        
           patches = [

     

       40
       41
        
             ./patches/cmake-disable-rpath.patch

     

       42
       42
       +
             ./patches/cmake-fix-quoting.patch

     

       41
       43
        
             ./patches/disable-index-store.patch

     

       42
       44
        
             ./patches/disable-sandbox.patch

     

       45
       45
       +
             ./patches/disable-xctest.patch

     

       43
       46
        
             ./patches/fix-clang-cxx.patch

     

       44
       44
       -
             (substituteAll {

     

       45
       45
       -
               src = ./patches/disable-xctest.patch;

     

       46
       46
       -
               inherit (builtins) storeDir;

     

       47
       47
       -
             })

     

       47
       47
       +
             ./patches/nix-pkgconfig-vars.patch

     

       48
       48
        
             (substituteAll {

     

       49
       49
        
               src = ./patches/fix-stdlib-path.patch;

     

       50
       50
        
               inherit (builtins) storeDir;

     
···

       60
       60
        
               --replace \

     

       61
       61
        
                 'librariesPath = applicationPath.parentDirectory' \

     

       62
       62
        
                 "librariesPath = AbsolutePath(\"$out\")"

     

       63
       63
       +
       

     

       64
       64
       +
             # Fix case-sensitivity issues.

     

       65
       65
       +
             # Upstream PR: https://github.com/apple/swift-package-manager/pull/6500

     

       66
       66
       +
             substituteInPlace Sources/CMakeLists.txt \

     

       67
       67
       +
               --replace \

     

       68
       68
       +
                 'packageCollectionsSigning' \

     

       69
       69
       +
                 'PackageCollectionsSigning'

     

       70
       70
       +
             substituteInPlace Sources/PackageCollectionsSigning/CMakeLists.txt \

     

       71
       71
       +
               --replace \

     

       72
       72
       +
                 'SubjectPublickeyInfo' \

     

       73
       73
       +
                 'SubjectPublicKeyInfo'

     

       74
       74
       +
             substituteInPlace Sources/PackageCollections/CMakeLists.txt \

     

       75
       75
       +
               --replace \

     

       76
       76
       +
                 'FilepackageCollectionsSourcesStorage' \

     

       77
       77
       +
                 'FilePackageCollectionsSourcesStorage'

     

       63
       78
        
           '';

     

       64
       79
        
         };

     

       65
       80
        
       

     
···

       67
       82
        
         runtimeDeps = [ git ]

     

       68
       83
        
           ++ lib.optionals stdenv.isDarwin [

     

       69
       84
        
             xcbuild.xcrun

     

       70
       70
       -
             # vtool is used to determine a minimum deployment target. This is part of

     

       71
       71
       -
             # cctools, but adding that as a build input puts an unwrapped linker in

     

       72
       72
       -
             # PATH, and breaks builds. This small derivation exposes just vtool.

     

       73
       73
       -
             (runCommandLocal "vtool" { } ''

     

       85
       85
       +
             # These tools are part of cctools, but adding that as a build input puts

     

       86
       86
       +
             # an unwrapped linker in PATH, and breaks builds. This small derivation

     

       87
       87
       +
             # exposes just the tools we need:

     

       88
       88
       +
             # - vtool is used to determine a minimum deployment target.

     

       89
       89
       +
             # - libtool is used to build static libraries.

     

       90
       90
       +
             (runCommandLocal "swiftpm-cctools" { } ''

     

       74
       91
        
               mkdir -p $out/bin

     

       75
       92
        
               ln -s ${cctools}/bin/vtool $out/bin/vtool

     

       93
       93
       +
               ln -s ${cctools}/bin/libtool $out/bin/libtool

     

       76
       94
        
             '')

     

       77
       95
        
           ];

     

       78
       96
        
       

     
···

       282
       300
        
             swift-tools-support-core

     

       283
       301
        
           ];

     

       284
       302
        
       

     

       303
       303
       +
           postPatch = ''

     

       304
       304
       +
             # Tries to link against CYaml, but that's private.

     

       305
       305
       +
             substituteInPlace Sources/SwiftDriver/CMakeLists.txt \

     

       306
       306
       +
               --replace CYaml ""

     

       307
       307
       +
           '';

     

       308
       308
       +
       

     

       285
       309
        
           postInstall = cmakeGlue.SwiftDriver + ''

     

       286
       310
        
             # Swift modules are not installed.

     

       287
       311
        
             mkdir -p $out/${swiftModuleSubdir}

     
···

       294
       318
        
           src = generated.sources.swift-crypto;

     

       295
       319
        
       

     

       296
       320
        
           postPatch = ''

     

       321
       321
       +
             # Fix use of hardcoded tool paths on Darwin.

     

       297
       322
        
             substituteInPlace CMakeLists.txt \

     

       298
       323
        
               --replace /usr/bin/ar $NIX_CC/bin/ar

     

       324
       324
       +
             substituteInPlace CMakeLists.txt \

     

       325
       325
       +
               --replace /usr/bin/ranlib $NIX_CC/bin/ranlib

     

       299
       326
        
           '';

     

       300
       327
        
       

     

       301
       328
        
           postInstall = cmakeGlue.SwiftCrypto + ''

     
···

       313
       340
        
       

     

       314
       341
        
           buildInputs = [

     

       315
       342
        
             llbuild

     

       343
       343
       +
             sqlite

     

       316
       344
        
             swift-argument-parser

     

       317
       345
        
             swift-collections

     

       318
       346
        
             swift-crypto

     
···

       342
       370
        
         ];

     

       343
       371
        
         buildInputs = [

     

       344
       372
        
           ncursesInput

     

       373
       373
       +
           pkg-config

     

       345
       374
        
           sqlite

     

       346
       375
        
           XCTest

     

       347
       376
        
         ]

     
···

       385
       414
        
       

     

       386
       415
        
           mkdir -p $out/bin $out/lib/swift

     

       387
       416
        
       

     

       388
       388
       -
           cp $binPath/swift-package $out/bin/

     

       417
       417
       +
           cp $binPath/swift-package-manager $out/bin/swift-package

     

       389
       418
        
           wrapProgram $out/bin/swift-package \

     

       390
       419
        
             --prefix PATH : ${lib.makeBinPath runtimeDeps}

     

       391
       391
       -
           for tool in swift-build swift-test swift-run swift-package-collection; do

     

       420
       420
       +
           for tool in swift-build swift-test swift-run swift-package-collection swift-experimental-destination; do

     

       392
       421
        
             ln -s $out/bin/swift-package $out/bin/$tool

     

       393
       422
        
           done

     

       394
       423

+5 -5

pkgs/development/compilers/swift/swiftpm/generated/default.nix

···

       4
       4
        
         hashes = {

     

       5
       5
        
           "swift-argument-parser" = "1jph9w7lk9nr20fsv2c8p4hisx3dda817fh7pybd0r0j1jwa9nmw";

     

       6
       6
        
           "swift-collections" = "1k6sjx5rqmp3gklny77b480hyzy6gkhpi23r0s8ljfbrcwawgnan";

     

       7
       7
       -
           "swift-crypto" = "020b8q4ss2k7a65r5dgh59z40i6sn7ij1allxkh8c8a9d0jzn313";

     

       8
       8
       -
           "swift-driver" = "1lcb5wqragc74nd0fjnk47lyph9hs0i9cps1mplvp2i91yzjqk05";

     

       9
       9
       -
           "swift-llbuild" = "07zbp2dyfqd1bnyg7snpr9brn40jf22ivly5v10mql3hrg76a18h";

     

       7
       7
       +
           "swift-crypto" = "0kllp7j0hd8k67l9b9zr2c3ddc5bvshldchzivhcz3q31qvq9ag8";

     

       8
       8
       +
           "swift-driver" = "0cbvddj54k3sbw0vzlmzhccs7h43hi5kq6i3n2i0mysz3bf0c6zg";

     

       9
       9
       +
           "swift-llbuild" = "106vnssh6pgy5s9dnq1hi1c9v2wkfydqgncg5dy7c9n23iisjy3s";

     

       10
       10
        
           "swift-system" = "0402hkx2q2dv27gccnn8ma79ngvwiwzkhcv4zlcdldmy6cgi0px7";

     

       11
       11
       -
           "swift-tools-support-core" = "134f9x44jnzdy8cwi6hs372dwbyqvr4qmsjzjy25wzpyv6m9rhrz";

     

       12
       12
       -
           "Yams" = "1893y13sis2aimi1a5kgkczbf06z4yig054xb565yg2xm13srb45";

     

       11
       11
       +
           "swift-tools-support-core" = "1qvblyiazv58qwyxgyk2dh5ymbab3y70vm2q81qs6rmv43hs8ciz";

     

       12
       12
       +
           "Yams" = "0b4lprxl4f6yqq0djnp394mxgmsxm2pljr7fh4f6ihdhnpwfsfvl";

     

       13
       13
        
         };

     

       14
       14
        
       }

+11 -11

pkgs/development/compilers/swift/swiftpm/generated/workspace-state.json

···

       46
       46
        
               },

     

       47
       47
        
               "state": {

     

       48
       48
        
                 "checkoutState": {

     

       49
       49
       -
                   "revision": "ddb07e896a2a8af79512543b1c7eb9797f8898a5",

     

       50
       50
       -
                   "version": "1.1.7"

     

       49
       49
       +
                   "revision": "75ec60b8b4cc0f085c3ac414f3dca5625fa3588e",

     

       50
       50
       +
                   "version": "2.2.4"

     

       51
       51
        
                 },

     

       52
       52
        
                 "name": "sourceControlCheckout"

     

       53
       53
        
               },

     
···

       63
       63
        
               },

     

       64
       64
        
               "state": {

     

       65
       65
        
                 "checkoutState": {

     

       66
       66
       -
                   "branch": "release/5.7",

     

       67
       67
       -
                   "revision": "82b274af66cfbb8f3131677676517b34d01e30fd"

     

       66
       66
       +
                   "branch": "release/5.8",

     

       67
       67
       +
                   "revision": "7cfe0c0b6e6297efe88a3ce34e6138ee7eda969e"

     

       68
       68
        
                 },

     

       69
       69
        
                 "name": "sourceControlCheckout"

     

       70
       70
        
               },

     
···

       80
       80
        
               },

     

       81
       81
        
               "state": {

     

       82
       82
        
                 "checkoutState": {

     

       83
       83
       -
                   "branch": "release/5.7",

     

       84
       84
       -
                   "revision": "564424db5fdb62dcb5d863bdf7212500ef03a87b"

     

       83
       83
       +
                   "branch": "release/5.8",

     

       84
       84
       +
                   "revision": "dccfc2e127a34b89a849407594cf2d604b598ba9"

     

       85
       85
        
                 },

     

       86
       86
        
                 "name": "sourceControlCheckout"

     

       87
       87
        
               },

     
···

       114
       114
        
               },

     

       115
       115
        
               "state": {

     

       116
       116
        
                 "checkoutState": {

     

       117
       117
       -
                   "branch": "release/5.7",

     

       118
       118
       -
                   "revision": "286b48b1d73388e1d49b2bb33aabf995838104e3"

     

       117
       117
       +
                   "branch": "release/5.8",

     

       118
       118
       +
                   "revision": "ac4871e01ef338cb95b5d28328cab0ec1dfae935"

     

       119
       119
        
                 },

     

       120
       120
        
                 "name": "sourceControlCheckout"

     

       121
       121
        
               },

     
···

       131
       131
        
               },

     

       132
       132
        
               "state": {

     

       133
       133
        
                 "checkoutState": {

     

       134
       134
       -
                   "revision": "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa",

     

       135
       135
       -
                   "version": "4.0.6"

     

       134
       134
       +
                   "revision": "f47ba4838c30dbd59998a4e4c87ab620ff959e8a",

     

       135
       135
       +
                   "version": "5.0.5"

     

       136
       136
        
                 },

     

       137
       137
        
                 "name": "sourceControlCheckout"

     

       138
       138
        
               },

     
···

       140
       140
        
             }

     

       141
       141
        
           ]

     

       142
       142
        
         },

     

       143
       143
       -
         "version": 5

     

       143
       143
       +
         "version": 6

     

       144
       144
        
       }

+12

pkgs/development/compilers/swift/swiftpm/patches/cmake-fix-quoting.patch

···

       1
       1
       +
       --- a/Sources/PackageCollectionsSigning/CMakeLists.txt

     

       2
       2
       +
       +++ b/Sources/PackageCollectionsSigning/CMakeLists.txt

     

       3
       3
       +
       @@ -43,6 +43,7 @@ target_link_libraries(PackageCollectionsSigning PUBLIC

     

       4
       4
       +
          PackageCollectionsModel

     

       5
       5
       +
          TSCBasic)

     

       6
       6
       +
        target_link_libraries(PackageCollectionsSigning PRIVATE

     

       7
       7
       +
       -  PackageCollectionsSigningLibc

     

       8
       8
       +
       -  $<$<PLATFORM_ID:Darwin>:SHELL:-Xlinker -framework -Xlinker Security>)

     

       9
       9
       +
       +  PackageCollectionsSigningLibc)

     

       10
       10
       +
       +target_link_options(PackageCollectionsSigning PRIVATE

     

       11
       11
       +
       +  "$<$<PLATFORM_ID:Darwin>:SHELL:-Xlinker -framework -Xlinker Security>")

     

       12
       12
       +

+4 -4

pkgs/development/compilers/swift/swiftpm/patches/disable-sandbox.patch

···

       2
       2
        
       

     

       3
       3
        
       --- a/Sources/Basics/Sandbox.swift

     

       4
       4
        
       +++ b/Sources/Basics/Sandbox.swift

     

       5
       5
       -
       @@ -30,12 +30,14 @@ public enum Sandbox {

     

       5
       5
       +
       @@ -33,12 +33,14 @@ public enum Sandbox {

     

       6
       6
        
                readOnlyDirectories: [AbsolutePath] = []

     

       7
       7
       -
            ) -> [String] {

     

       7
       7
       +
            ) throws -> [String] {

     

       8
       8
        
                #if os(macOS)

     

       9
       9
        
       +        let env = ProcessInfo.processInfo.environment

     

       10
       10
        
       +        if env["NIX_BUILD_TOP"] == nil || env["IN_NIX_SHELL"] != nil {

     

       11
       11
       -
                let profile = macOSSandboxProfile(strictness: strictness, writableDirectories: writableDirectories, readOnlyDirectories: readOnlyDirectories)

     

       11
       11
       +
                let profile = try macOSSandboxProfile(strictness: strictness, writableDirectories: writableDirectories, readOnlyDirectories: readOnlyDirectories)

     

       12
       12
        
                return ["/usr/bin/sandbox-exec", "-p", profile] + command

     

       13
       13
        
       -        #else

     

       14
       14
        
       +        }

     
···

       17
       17
        
                return command

     

       18
       18
        
       -        #endif

     

       19
       19
        
            }

     

       20
       20
       -
       

     

       20
       20
       +
        

     

       21
       21
        
            /// Basic strictness level of a sandbox applied to a command line.

+9 -20

pkgs/development/compilers/swift/swiftpm/patches/disable-xctest.patch

···

       1
       1
        
       XCTest is not fully open-source, only the Swift library parts. We don't have a

     

       2
       2
        
       command-line runner available, so disable support.

     

       3
       3
        
       

     

       4
       4
       -
       --- a/Sources/Commands/TestingSupport.swift

     

       5
       5
       -
       +++ b/Sources/Commands/TestingSupport.swift

     

       6
       6
       -
       @@ -60,7 +60,7 @@ enum TestingSupport {

     

       4
       4
       +
       --- a/Sources/Commands/Utilities/TestingSupport.swift

     

       5
       5
       +
       +++ b/Sources/Commands/Utilities/TestingSupport.swift

     

       6
       6
       +
       @@ -72,7 +72,7 @@ enum TestingSupport {

     

       7
       7
        
            /// - Returns: Array of TestSuite

     

       8
       8
       -
            static func getTestSuites(fromTestAt path: AbsolutePath, swiftTool: SwiftTool, swiftOptions: SwiftToolOptions) throws -> [TestSuite] {

     

       8
       8
       +
            static func getTestSuites(fromTestAt path: AbsolutePath, swiftTool: SwiftTool, enableCodeCoverage: Bool, sanitizers: [Sanitizer]) throws -> [TestSuite] {

     

       9
       9
        
                // Run the correct tool.

     

       10
       10
        
       -        #if os(macOS)

     

       11
       11
        
       +        #if false

     

       12
       12
        
                let data: String = try withTemporaryFile { tempFile in

     

       13
       13
       -
                    let args = [try TestingSupport.xctestHelperPath(swiftTool: swiftTool).pathString, path.pathString, tempFile.path.pathString]

     

       14
       14
       -
                    var env = try TestingSupport.constructTestEnvironment(toolchain: try swiftTool.getToolchain(), options: swiftOptions, buildParameters: swiftTool.buildParametersForTest())

     

       13
       13
       +
                    let args = [try Self.xctestHelperPath(swiftTool: swiftTool).pathString, path.pathString, tempFile.path.pathString]

     

       14
       14
       +
                    var env = try Self.constructTestEnvironment(

     

       15
       15
        
       --- a/Sources/swiftpm-xctest-helper/main.swift

     

       16
       16
        
       +++ b/Sources/swiftpm-xctest-helper/main.swift

     

       17
       17
       -
       @@ -9,8 +9,11 @@

     

       18
       18
       -
        */

     

       17
       17
       +
       @@ -11,8 +11,11 @@

     

       18
       18
       +
        //===----------------------------------------------------------------------===//

     

       19
       19
        
        

     

       20
       20
        
        #if os(macOS)

     

       21
       21
        
       -import XCTest

     
···

       27
       27
        
        

     

       28
       28
        
        /// A helper tool to get list of tests from a XCTest Bundle on macOS.

     

       29
       29
        
        ///

     

       30
       30
       -
       @@ -132,6 +135,7 @@ do {

     

       30
       30
       +
       @@ -134,6 +137,7 @@ do {

     

       31
       31
        
            exit(1)

     

       32
       32
        
        }

     

       33
       33
        
        

     
···

       35
       35
        
        #else

     

       36
       36
        
        

     

       37
       37
        
        #if os(Windows)

     

       38
       38
       -
       --- a/Sources/PackageModel/Destination.swift

     

       39
       39
       -
       +++ b/Sources/PackageModel/Destination.swift

     

       40
       40
       -
       @@ -174,7 +174,7 @@ public struct Destination: Encodable, Equatable {

     

       41
       41
       -
                    arguments: ["/usr/bin/xcrun", "--sdk", "macosx", "--show-sdk-platform-path"],

     

       42
       42
       -
                    environment: environment).spm_chomp()

     

       43
       43
       -
       

     

       44
       44
       -
       -        if let platformPath = platformPath, !platformPath.isEmpty {

     

       45
       45
       -
       +        if let platformPath = platformPath, !platformPath.isEmpty && !platformPath.starts(with: "@storeDir@") {

     

       46
       46
       -
                    // For XCTest framework.

     

       47
       47
       -
                    let fwk = AbsolutePath(platformPath).appending(

     

       48
       48
       -
                        components: "Developer", "Library", "Frameworks")

+24 -24

pkgs/development/compilers/swift/swiftpm/patches/fix-clang-cxx.patch

···

       2
       2
        
       doesn't pick up the arguments that enable C++ compilation in this case. Patch

     

       3
       3
        
       swiftpm to properly invoke clang++.

     

       4
       4
        
       

     

       5
       5
       +
       --- a/Sources/Build/BuildPlan.swift

     

       6
       6
       +
       +++ b/Sources/Build/BuildPlan.swift

     

       7
       7
       +
       @@ -2089,7 +2089,7 @@ public class BuildPlan: SPMBuildCore.BuildPlan {

     

       8
       8
       +
                for target in dependencies.staticTargets {

     

       9
       9
       +
                    if case let target as ClangTarget = target.underlyingTarget, target.isCXX {

     

       10
       10
       +
                        if buildParameters.hostTriple.isDarwin() {

     

       11
       11
       +
       -                    buildProduct.additionalFlags += ["-lc++"]

     

       12
       12
       +
       +                    buildProduct.additionalFlags += ["-lc++", "-lc++abi"]

     

       13
       13
       +
                        } else if buildParameters.hostTriple.isWindows() {

     

       14
       14
       +
                            // Don't link any C++ library.

     

       15
       15
       +
                        } else {

     

       5
       16
        
       --- a/Sources/Build/LLBuildManifestBuilder.swift

     

       6
       17
        
       +++ b/Sources/Build/LLBuildManifestBuilder.swift

     

       7
       7
       -
       @@ -782,7 +782,7 @@ extension LLBuildManifestBuilder {

     

       18
       18
       +
       @@ -786,7 +786,7 @@ extension LLBuildManifestBuilder {

     

       8
       19
        
        

     

       9
       20
        
                    args += ["-c", path.source.pathString, "-o", path.object.pathString]

     

       10
       21
        
        

     
···

       13
       24
        
                    args.insert(clangCompiler, at: 0)

     

       14
       25
        
        

     

       15
       26
        
                    let objectFileNode: Node = .file(path.object)

     

       16
       16
       -
       --- a/Sources/PackageModel/Destination.swift

     

       17
       17
       -
       +++ b/Sources/PackageModel/Destination.swift

     

       18
       18
       -
       @@ -153,7 +153,7 @@ public struct Destination: Encodable, Equatable {

     

       19
       19
       -
        

     

       20
       20
       -
                var extraCPPFlags: [String] = []

     

       21
       21
       -
        #if os(macOS)

     

       22
       22
       -
       -        extraCPPFlags += ["-lc++"]

     

       23
       23
       -
       +        extraCPPFlags += ["-lc++", "-lc++abi"]

     

       24
       24
       -
        #elseif os(Windows)

     

       25
       25
       -
                extraCPPFlags += []

     

       26
       26
       -
        #else

     

       27
       27
        
       --- a/Sources/PackageModel/Toolchain.swift

     

       28
       28
        
       +++ b/Sources/PackageModel/Toolchain.swift

     

       29
       29
       -
       @@ -20,7 +20,7 @@ public protocol Toolchain {

     

       30
       30
       -
            var macosSwiftStdlib: AbsolutePath { get }

     

       29
       29
       +
       @@ -23,7 +23,7 @@ public protocol Toolchain {

     

       30
       30
       +
            var macosSwiftStdlib: AbsolutePath { get throws }

     

       31
       31
        
        

     

       32
       32
        
            /// Path of the `clang` compiler.

     

       33
       33
        
       -    func getClangCompiler() throws -> AbsolutePath

     
···

       46
       46
        
        

     

       47
       47
        
            private let environment: EnvironmentVariables

     

       48
       48
        
        

     

       49
       49
       -
       @@ -150,29 +150,31 @@ public final class UserToolchain: Toolchain {

     

       49
       49
       +
       @@ -196,29 +196,31 @@ public final class UserToolchain: Toolchain {

     

       50
       50
        
            }

     

       51
       51
        
        

     

       52
       52
        
            /// Returns the path to clang compiler tool.

     
···

       70
       70
        
                // Then, check the toolchain.

     

       71
       71
        
       +        let tool = isCXX ? "clang++" : "clang";

     

       72
       72
        
                do {

     

       73
       73
       -
       -            if let toolPath = try? UserToolchain.getTool("clang", binDir: self.destination.binDir) {

     

       73
       73
       +
       -            if let toolPath = try? UserToolchain.getTool("clang", binDir: self.destination.toolchainBinDir) {

     

       74
       74
        
       -                self._clangCompiler = toolPath

     

       75
       75
        
       +            if let toolPath = try? UserToolchain.getTool(tool, binDir: self.destination.binDir) {

     

       76
       76
        
       +                self._clangCompiler[isCXX] = toolPath

     
···

       88
       88
        
        

     

       89
       89
        
       --- a/Sources/SPMBuildCore/BuildParameters.swift

     

       90
       90
        
       +++ b/Sources/SPMBuildCore/BuildParameters.swift

     

       91
       91
       -
       @@ -342,7 +342,7 @@ private struct _Toolchain: Encodable {

     

       91
       91
       +
       @@ -394,7 +394,7 @@ private struct _Toolchain: Encodable {

     

       92
       92
        
            public func encode(to encoder: Encoder) throws {

     

       93
       93
        
                var container = encoder.container(keyedBy: CodingKeys.self)

     

       94
       94
        
                try container.encode(toolchain.swiftCompilerPath, forKey: .swiftCompiler)

     

       95
       95
        
       -        try container.encode(toolchain.getClangCompiler(), forKey: .clangCompiler)

     

       96
       96
        
       +        try container.encode(toolchain.getClangCompiler(isCXX: false), forKey: .clangCompiler)

     

       97
       97
        
        

     

       98
       98
       -
                try container.encode(toolchain.extraCCFlags, forKey: .extraCCFlags)

     

       99
       99
       -
                try container.encode(toolchain.extraCPPFlags, forKey: .extraCPPFlags)

     

       98
       98
       +
                try container.encode(toolchain.extraFlags.cCompilerFlags, forKey: .extraCCFlags)

     

       99
       99
       +
                // Maintaining `extraCPPFlags` key for compatibility with older encoding.

     

       100
       100
        
       --- a/Sources/XCBuildSupport/XcodeBuildSystem.swift

     

       101
       101
        
       +++ b/Sources/XCBuildSupport/XcodeBuildSystem.swift

     

       102
       102
       -
       @@ -172,7 +172,7 @@ public final class XcodeBuildSystem: SPMBuildCore.BuildSystem {

     

       102
       102
       +
       @@ -182,7 +182,7 @@ public final class XcodeBuildSystem: SPMBuildCore.BuildSystem {

     

       103
       103
        
                // Generate a table of any overriding build settings.

     

       104
       104
        
                var settings: [String: String] = [:]

     

       105
       105
        
                // An error with determining the override should not be fatal here.

     
···

       107
       107
        
       +        settings["CC"] = try? buildParameters.toolchain.getClangCompiler(isCXX: false).pathString

     

       108
       108
        
                // Always specify the path of the effective Swift compiler, which was determined in the same way as for the native build system.

     

       109
       109
        
                settings["SWIFT_EXEC"] = buildParameters.toolchain.swiftCompilerPath.pathString

     

       110
       110
       -
                settings["LIBRARY_SEARCH_PATHS"] = "$(inherited) \(buildParameters.toolchain.toolchainLibDir.pathString)"

     

       110
       110
       +
                settings["LIBRARY_SEARCH_PATHS"] = "$(inherited) \(try buildParameters.toolchain.toolchainLibDir.pathString)"

     

       111
       111
        
       --- a/Tests/BuildTests/MockBuildTestHelper.swift

     

       112
       112
        
       +++ b/Tests/BuildTests/MockBuildTestHelper.swift

     

       113
       113
       -
       @@ -15,7 +15,7 @@ struct MockToolchain: PackageModel.Toolchain {

     

       113
       113
       +
       @@ -23,7 +23,7 @@ struct MockToolchain: PackageModel.Toolchain {

     

       114
       114
        
            #else

     

       115
       115
       -
            let extraCPPFlags: [String] = ["-lstdc++"]

     

       115
       115
       +
            let extraFlags = BuildFlags(cxxCompilerFlags: ["-lstdc++"])

     

       116
       116
        
            #endif

     

       117
       117
        
       -    func getClangCompiler() throws -> AbsolutePath {

     

       118
       118
        
       +    func getClangCompiler(isCXX: Bool) throws -> AbsolutePath {

     

       119
       119
       -
                return AbsolutePath("/fake/path/to/clang")

     

       119
       119
       +
                return AbsolutePath(path: "/fake/path/to/clang")

     

       120
       120
        
            }

     

       121
       121

+15 -13

pkgs/development/compilers/swift/swiftpm/patches/fix-stdlib-path.patch

···

       4
       4
        
       

     

       5
       5
        
       --- a/Sources/PackageModel/Toolchain.swift

     

       6
       6
        
       +++ b/Sources/PackageModel/Toolchain.swift

     

       7
       7
       -
       @@ -43,10 +43,16 @@ extension Toolchain {

     

       8
       8
       -
            }

     

       7
       7
       +
       @@ -53,12 +53,18 @@ extension Toolchain {

     

       9
       8
        
        

     

       10
       10
       -
            public var macosSwiftStdlib: AbsolutePath { 

     

       11
       11
       -
       +        if swiftCompilerPath.pathString.starts(with: "@storeDir@") {

     

       12
       12
       -
       +            return AbsolutePath("@swiftLib@/lib/swift/macosx")

     

       13
       13
       -
       +        }

     

       14
       14
       -
                return AbsolutePath("../../lib/swift/macosx", relativeTo: resolveSymlinks(swiftCompilerPath))

     

       9
       9
       +
            public var macosSwiftStdlib: AbsolutePath {

     

       10
       10
       +
                get throws {

     

       11
       11
       +
       +            if swiftCompilerPath.pathString.starts(with: "@storeDir@") {

     

       12
       12
       +
       +                return AbsolutePath("@swiftLib@/lib/swift/macosx")

     

       13
       13
       +
       +            }

     

       14
       14
       +
                    return try AbsolutePath(validating: "../../lib/swift/macosx", relativeTo: resolveSymlinks(swiftCompilerPath))

     

       15
       15
       +
                }

     

       15
       16
        
            }

     

       16
       17
        
        

     

       17
       18
        
            public var toolchainLibDir: AbsolutePath {

     

       18
       18
       -
       +        if swiftCompilerPath.pathString.starts(with: "@storeDir@") {

     

       19
       19
       -
       +            return AbsolutePath("@swiftLib@/lib")

     

       20
       20
       -
       +        }

     

       21
       21
       -
                // FIXME: Not sure if it's better to base this off of Swift compiler or our own binary.

     

       22
       22
       -
                return AbsolutePath("../../lib", relativeTo: resolveSymlinks(swiftCompilerPath))

     

       23
       23
       -
            }

     

       19
       19
       +
                get throws {

     

       20
       20
       +
       +            if swiftCompilerPath.pathString.starts(with: "@storeDir@") {

     

       21
       21
       +
       +                return AbsolutePath("@swiftLib@/lib")

     

       22
       22
       +
       +            }

     

       23
       23
       +
                    // FIXME: Not sure if it's better to base this off of Swift compiler or our own binary.

     

       24
       24
       +
                    return try AbsolutePath(validating: "../../lib", relativeTo: resolveSymlinks(swiftCompilerPath))

     

       25
       25
       +
                }

+28

pkgs/development/compilers/swift/swiftpm/patches/nix-pkgconfig-vars.patch

···

       1
       1
       +
       Swift parses .pc files manually, but this means it bypasses our pkg-config

     

       2
       2
       +
       wrapper. That wrapper normally takes care of introducing the correct

     

       3
       3
       +
       PKG_CONFIG_PATH for cross compiling.

     

       4
       4
       +
       

     

       5
       5
       +
       --- a/Sources/PackageLoading/PkgConfig.swift

     

       6
       6
       +
       +++ b/Sources/PackageLoading/PkgConfig.swift

     

       7
       7
       +
       @@ -123,14 +123,17 @@ public struct PkgConfig {

     

       8
       8
       +
        

     

       9
       9
       +
            private static var envSearchPaths: [AbsolutePath] {

     

       10
       10
       +
                get throws {

     

       11
       11
       +
       -            if let configPath = ProcessEnv.vars["PKG_CONFIG_PATH"] {

     

       12
       12
       +
       +            var result: [AbsolutePath] = []

     

       13
       13
       +
       +            for envVar in ["PKG_CONFIG_PATH", "PKG_CONFIG_PATH_FOR_TARGET"] {

     

       14
       14
       +
       +            if let configPath = ProcessEnv.vars[envVar] {

     

       15
       15
       +
                        #if os(Windows)

     

       16
       16
       +
       -                return try configPath.split(separator: ";").map({ try AbsolutePath(validating: String($0)) })

     

       17
       17
       +
       +                result += try configPath.split(separator: ";").map({ try AbsolutePath(validating: String($0)) })

     

       18
       18
       +
                        #else

     

       19
       19
       +
       -                return try configPath.split(separator: ":").map({ try AbsolutePath(validating: String($0)) })

     

       20
       20
       +
       +                result += try configPath.split(separator: ":").map({ try AbsolutePath(validating: String($0)) })

     

       21
       21
       +
                        #endif

     

       22
       22
       +
                    }

     

       23
       23
       +
       -            return []

     

       24
       24
       +
       +            }

     

       25
       25
       +
       +            return result

     

       26
       26
       +
                }

     

       27
       27
       +
            }

     

       28
       28
       +
        }

+1 -1

pkgs/development/compilers/swift/wrapper/wrapper.sh

···

       105
       105
        
       

     

       106
       106
        
       for p in "${params[@]}"; do

     

       107
       107
        
           case "$p" in

     

       108
       108
       -
               -enable-cxx-interop)

     

       108
       108
       +
               -enable-cxx-interop | -enable-experimental-cxx-interop)

     

       109
       109
        
                   isCxx=1 ;;

     

       110
       110
        
           esac

     

       111
       111
        
       done

pkgs/development/interpreters/evcxr/default.nix

···

       20
       20
        
         buildInputs = lib.optionals stdenv.isDarwin

     

       21
       21
        
           [ libiconv CoreServices Security ];

     

       22
       22
        
       

     

       23
       23
       +
         # test broken with rust 1.69:

     

       24
       24
       +
         # * https://github.com/evcxr/evcxr/issues/294

     

       25
       25
       +
         # * https://github.com/NixOS/nixpkgs/issues/229524

     

       26
       26
       +
         checkFlags = [

     

       27
       27
       +
           "--skip=check_for_errors"

     

       28
       28
       +
         ];

     

       29
       29
       +
       

     

       23
       30
        
         postInstall = let

     

       24
       31
        
           wrap = exe: ''

     

       25
       32
        
             wrapProgram $out/bin/${exe} \

+2 -2

pkgs/development/libraries/codec2/default.nix

···

       9
       9
        
       

     

       10
       10
        
       stdenv.mkDerivation rec {

     

       11
       11
        
         pname = "codec2";

     

       12
       12
       -
         version = "1.0.5";

     

       12
       12
       +
         version = "1.1.0";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "drowe67";

     

       16
       16
        
           repo = "codec2";

     

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

     

       18
       18
       -
           hash = "sha256-Q5p6NicwmHBR7drX8Tdgf6Mruqssg9qzMC9sG9DlMbQ=";

     

       18
       18
       +
           hash = "sha256-7E/Iqan3DVFl9pwsY6pwWM64ug1cjN6DH+u7XzraA78=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [ cmake ];

+2 -2

pkgs/development/libraries/kddockwidgets/default.nix

···

       8
       8
        
       

     

       9
       9
        
       mkDerivation rec {

     

       10
       10
        
         pname = "KDDockWidgets";

     

       11
       11
       -
         version = "1.6.0";

     

       11
       11
       +
         version = "1.7.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "KDAB";

     

       15
       15
        
           repo = pname;

     

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

     

       17
       17
       -
           sha256 = "sha256-rAv0P7tRcgCTB/ZM93wKF8oRZc7KqPyoDcnRn5Rel/k=";

     

       17
       17
       +
           sha256 = "sha256-k5Hn9kxq1+tH5kV/ZeD4xzQLDgcY4ACC+guP7YJD4C8=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [ cmake ];

+6 -22

pkgs/development/libraries/libbladeRF/default.nix

···

       1
       1
        
       { stdenv, lib, fetchFromGitHub, fetchpatch, pkg-config, cmake, git, doxygen, help2man, ncurses, tecla

     

       2
       2
        
       , libusb1, udev }:

     

       3
       3
       -
       let

     

       4
       4
       -
         # fetch submodule

     

       5
       5
       -
         noos = fetchFromGitHub {

     

       6
       6
       -
           owner = "analogdevicesinc";

     

       7
       7
       -
           repo = "no-OS";

     

       8
       8
       -
           rev = "0bba46e6f6f75785a65d425ece37d0a04daf6157";

     

       9
       9
       -
           sha256 = "0is79dhsyp9xmlnfdr1i5s1c22ipjafk9d35jpn5dynpvj86m99c";

     

       10
       10
       -
         };

     

       11
       11
       -
       in stdenv.mkDerivation rec {

     

       3
       3
       +
       

     

       4
       4
       +
       stdenv.mkDerivation rec {

     

       12
       5
        
         pname = "libbladeRF";

     

       13
       13
       -
         version = "2.4.1";

     

       6
       6
       +
         version = "2.5.0";

     

       14
       7
        
       

     

       15
       8
        
         src = fetchFromGitHub {

     

       16
       9
        
           owner = "Nuand";

     

       17
       10
        
           repo = "bladeRF";

     

       18
       11
        
           rev = "libbladeRF_v${version}";

     

       19
       19
       -
           sha256 = "05axh51lrzxpz2qfswnjwxpfk3mlsv2wc88dd12gfr1karn5jwz9";

     

       12
       12
       +
           sha256 = "sha256-H40w5YKp6M3QLrsPhILEnJiWutCYLtbgC4a63sV397Q=";

     

       13
       13
       +
           fetchSubmodules = true;

     

       20
       14
        
         };

     

       21
       15
        
       

     

       22
       16
        
         nativeBuildInputs = [ cmake pkg-config git doxygen help2man ];

     
···

       24
       18
        
         buildInputs = [ tecla libusb1 ]

     

       25
       19
        
           ++ lib.optionals stdenv.isLinux [ udev ]

     

       26
       20
        
           ++ lib.optionals stdenv.isDarwin [ ncurses ];

     

       27
       27
       -
       

     

       28
       28
       -
       

     

       29
       29
       -
         postUnpack = ''

     

       30
       30
       -
           cp -r ${noos}/* source/thirdparty/analogdevicesinc/no-OS/

     

       31
       31
       -
         '';

     

       32
       21
        
       

     

       33
       22
        
         # Fixup shebang

     

       34
       23
        
         prePatch = "patchShebangs host/utilities/bladeRF-cli/src/cmd/doc/generate.bash";

     
···

       46
       35
        
           "-DBLADERF_GROUP=bladerf"

     

       47
       36
        
         ];

     

       48
       37
        
       

     

       49
       49
       -
         env.NIX_CFLAGS_COMPILE = toString [

     

       50
       50
       -
           # Needed with GCC 12

     

       51
       51
       -
           "-Wno-error=array-bounds"

     

       52
       52
       -
         ];

     

       53
       53
       -
       

     

       54
       38
        
         hardeningDisable = [ "fortify" ];

     

       55
       39
        
       

     

       56
       40
        
         meta = with lib; {

     

       57
       41
        
           homepage = "https://nuand.com/libbladeRF-doc";

     

       58
       42
        
           description = "Supporting library of the BladeRF SDR opensource hardware";

     

       59
       43
        
           license = licenses.lgpl21;

     

       60
       60
       -
           maintainers = with maintainers; [ ];

     

       44
       44
       +
           maintainers = with maintainers; [ markuskowa ];

     

       61
       45
        
           platforms = platforms.unix;

     

       62
       46
        
         };

     

       63
       47
        
       }

+2 -2

pkgs/development/libraries/liblxi/default.nix

···

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         pname = "liblxi";

     

       8
       8
       -
         version = "1.18";

     

       8
       8
       +
         version = "1.19";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "lxi-tools";

     

       12
       12
        
           repo = "liblxi";

     

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

     

       14
       14
       -
           sha256 = "sha256-2tZWIN58J6zNHG3dahNfg5eNiS8ykWFQyRSyikuzdjE=";

     

       14
       14
       +
           sha256 = "sha256-TdIUPAXBogGT9OQrX4wkSmPFjR9McdS9gnQ7c24U4qs=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = [ meson ninja cmake pkg-config rpcsvc-proto ];

+2 -2

pkgs/development/libraries/pupnp/default.nix

···

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
         pname = "libupnp";

     

       9
       9
       -
         version = "1.14.16";

     

       9
       9
       +
         version = "1.14.17";

     

       10
       10
        
       

     

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

     

       12
       12
        
       

     
···

       14
       14
        
           owner = "pupnp";

     

       15
       15
        
           repo = "pupnp";

     

       16
       16
        
           rev = "release-${version}";

     

       17
       17
       -
           sha256 = "sha256-JsissTWnF8GuHSWeCmWOusDYV32Xu0LDRqZCm7yz6YY=";

     

       17
       17
       +
           sha256 = "sha256-vb540oqDn6Y+oD0LriOJckYYkI/zcHkEVc8mL/+9bps=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [

+11 -4

pkgs/development/libraries/rapidcheck/default.nix

···

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

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , cmake

     

       5
       5
       +
       , unstableGitUpdater

     

       6
       6
       +
       }:

     

       2
       7
        
       

     

       3
       8
        
       stdenv.mkDerivation rec {

     

       4
       9
        
         pname = "rapidcheck";

     

       5
       5
       -
         version = "unstable-2020-12-19";

     

       10
       10
       +
         version = "unstable-2023-04-16";

     

       6
       11
        
       

     

       7
       12
        
         src = fetchFromGitHub {

     

       8
       13
        
           owner = "emil-e";

     

       9
       14
        
           repo  = "rapidcheck";

     

       10
       10
       -
           rev   = "b78f89288c7e086d06e2a1e10b605d8375517a8a";

     

       11
       11
       -
           sha256 = "0fj11gbhkaxbsgix2im7vdfvr26l75b8djk462sfw8xrwrfkjbdz";

     

       15
       15
       +
           rev   = "a5724ea5b0b00147109b0605c377f1e54c353ba2";

     

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

     

       12
       17
        
         };

     

       13
       18
        
       

     

       14
       19
        
         nativeBuildInputs = [ cmake ];

     
···

       20
       25
        
           rm $out/extras/CMakeLists.txt

     

       21
       26
        
           rm $out/extras/**/CMakeLists.txt

     

       22
       27
        
         '';

     

       28
       28
       +
       

     

       29
       29
       +
         passthru.updateScript = unstableGitUpdater { };

     

       23
       30
        
       

     

       24
       31
        
         meta = with lib; {

     

       25
       32
        
           description = "A C++ framework for property based testing inspired by QuickCheck";

+2 -1

pkgs/development/libraries/tezos-rust-libs/default.nix

···

       1
       1
       -
       { lib, fetchFromGitLab, stdenv, llvmPackages_12, cargo }:

     

       1
       1
       +
       { lib, fetchFromGitLab, stdenv, llvmPackages_12, cargo, libiconv }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         version = "1.5";

     
···

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [ llvmPackages_12.llvm cargo ];

     

       14
       14
        
         propagatedBuildDeps = [ llvmPackages_12.libllvm ];

     

       15
       15
       +
         buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];

     

       15
       16
        
       

     

       16
       17
        
         buildPhase = ''

     

       17
       18
        
           runHook preBuild

+14

pkgs/development/ocaml-modules/hacl-star/aligned-alloc.patch

···

       1
       1
       +
       diff --git a/hacl-star-raw/karamel/include/krml/internal/target.h b/hacl-star-raw/karamel/include/krml/internal/target.h

     

       2
       2
       +
       index 695873a..c0aed18 100644

     

       3
       3
       +
       --- a/hacl-star-raw/karamel/include/krml/internal/target.h

     

       4
       4
       +
       +++ b/hacl-star-raw/karamel/include/krml/internal/target.h

     

       5
       5
       +
       @@ -82,6 +82,9 @@

     

       6
       6
       +
        #  endif

     

       7
       7
       +
        #  if (defined(_MSC_VER) || (defined(__MINGW32__) && defined(__MINGW64_VERSION_MAJOR)))

     

       8
       8
       +
        #    define KRML_ALIGNED_MALLOC(X, Y) _aligned_malloc(Y, X)

     

       9
       9
       +
       +#  elif defined(__APPLE__)

     

       10
       10
       +
       +#    include <mm_malloc.h>

     

       11
       11
       +
       +#    define KRML_ALIGNED_MALLOC(X, Y) _mm_malloc(Y, X)

     

       12
       12
       +
        #  else

     

       13
       13
       +
        #    define KRML_ALIGNED_MALLOC(X, Y) aligned_alloc(X, Y)

     

       14
       14
       +
        #  endif

pkgs/development/ocaml-modules/hacl-star/raw.nix

···

       20
       20
        
           stripRoot = false;

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
       +
         patches = [

     

       24
       24
       +
           ./aligned-alloc.patch

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       23
       27
        
         minimalOCamlVersion = "4.08";

     

       24
       28
        
       

     

       25
       29
        
         # strictoverflow is disabled because it breaks aarch64-darwin

+2 -2

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

···

       21
       21
        
       

     

       22
       22
        
       buildPythonPackage rec {

     

       23
       23
        
         pname = "fastapi";

     

       24
       24
       -
         version = "0.92.0";

     

       24
       24
       +
         version = "0.95.1";

     

       25
       25
        
         format = "pyproject";

     

       26
       26
        
       

     

       27
       27
        
         disabled = pythonOlder "3.7";

     
···

       30
       30
        
           owner = "tiangolo";

     

       31
       31
        
           repo = pname;

     

       32
       32
        
           rev = "refs/tags/${version}";

     

       33
       33
       -
           hash = "sha256-4USWfYvPxR+LzPELRTDg0Jl4K5yBnumYKfXT84FWctg=";

     

       33
       33
       +
           hash = "sha256-y6mP2w2d2oabM9bLtWRO/AdRA46LNhVrMB/0qxGxH7I=";

     

       34
       34
        
         };

     

       35
       35
        
       

     

       36
       36
        
         nativeBuildInputs = [

+5 -5

pkgs/development/python-modules/huggingface-hub/default.nix

···

       3
       3
        
       , buildPythonPackage

     

       4
       4
        
       , pythonOlder

     

       5
       5
        
       , filelock

     

       6
       6
       +
       , fsspec

     

       6
       7
        
       , importlib-metadata

     

       7
       8
        
       , packaging

     

       8
       9
        
       , pyyaml

     

       9
       10
        
       , requests

     

       10
       10
       -
       , ruamel-yaml

     

       11
       11
        
       , tqdm

     

       12
       12
        
       , typing-extensions

     

       13
       13
        
       }:

     

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "huggingface-hub";

     

       17
       17
       -
         version = "0.12.1";

     

       17
       17
       +
         version = "0.14.1";

     

       18
       18
        
         format = "setuptools";

     

       19
       19
        
       

     

       20
       20
        
         disabled = pythonOlder "3.7";

     
···

       23
       23
        
           owner = "huggingface";

     

       24
       24
        
           repo = "huggingface_hub";

     

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

     

       26
       26
       -
           hash = "sha256-uw64JnXx790S4snLjANU0aLI3r7AMPec+IQentTZOdU=";

     

       26
       26
       +
           hash = "sha256-+BtXi+O+Ef4p4b+8FJCrZFsxX22ZYOPXylexFtsldnA=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         propagatedBuildInputs = [

     

       30
       30
        
           filelock

     

       31
       31
       +
           fsspec

     

       31
       32
        
           packaging

     

       32
       33
        
           pyyaml

     

       33
       34
        
           requests

     

       34
       34
       -
           ruamel-yaml

     

       35
       35
        
           tqdm

     

       36
       36
        
           typing-extensions

     

       37
       37
        
         ] ++ lib.optionals (pythonOlder "3.8") [

     
···

       50
       50
        
           homepage = "https://github.com/huggingface/huggingface_hub";

     

       51
       51
        
           changelog = "https://github.com/huggingface/huggingface_hub/releases/tag/v${version}";

     

       52
       52
        
           license = licenses.asl20;

     

       53
       53
       -
           maintainers = with maintainers; [ ];

     

       53
       53
       +
           maintainers = with maintainers; [ kira-bruneau ];

     

       54
       54
        
         };

     

       55
       55
        
       }

+2 -2

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

···

       22
       22
        
       

     

       23
       23
        
       buildPythonPackage rec {

     

       24
       24
        
         pname = "starlette";

     

       25
       25
       -
         version = "0.25.0";

     

       25
       25
       +
         version = "0.26.1";

     

       26
       26
        
         format = "pyproject";

     

       27
       27
        
       

     

       28
       28
        
         disabled = pythonOlder "3.7";

     
···

       31
       31
        
           owner = "encode";

     

       32
       32
        
           repo = pname;

     

       33
       33
        
           rev = "refs/tags/${version}";

     

       34
       34
       -
           hash = "sha256-s0ADo/+lcH8Y31hf1iSLbfTsV3fZtlCuZf7BS0uQc9Y=";

     

       34
       34
       +
           hash = "sha256-/zYqYmmCcOLU8Di9b4BzDLFtB5wYEEF1bYN6u2rb8Lg=";

     

       35
       35
        
         };

     

       36
       36
        
       

     

       37
       37
        
         nativeBuildInputs = [

+6 -2

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

···

       25
       25
        
       

     

       26
       26
        
       buildPythonPackage rec {

     

       27
       27
        
         pname = "web3";

     

       28
       28
       -
         version = "5.31.1";

     

       28
       28
       +
         version = "6.3.0";

     

       29
       29
        
         format = "setuptools";

     

       30
       30
        
       

     

       31
       31
        
         disabled = pythonOlder "3.7";

     
···

       34
       34
        
           owner = "ethereum";

     

       35
       35
        
           repo = "web3.py";

     

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

     

       37
       37
       -
           hash = "sha256-YsAbPI9Y6z+snKZ9NsA0YSpB38n+ra4+Ei6COYFe8v4=";

     

       37
       37
       +
           hash = "sha256-p3Dpmb0BST1nbh42q/eK/DjQqoIPHvNr2KllRpTgFFw=";

     

       38
       38
        
         };

     

       39
       39
        
       

     

       40
       40
        
         nativeBuildInputs = [

     
···

       71
       71
        
         #];

     

       72
       72
        
       

     

       73
       73
        
         doCheck = false;

     

       74
       74
       +
       

     

       75
       75
       +
         postPatch = ''

     

       76
       76
       +
           substituteInPlace setup.py --replace "types-protobuf==3.19.13" "types-protobuf"

     

       77
       77
       +
         '';

     

       74
       78
        
       

     

       75
       79
        
         pythonImportsCheck = [

     

       76
       80
        
           "web3"

+30

pkgs/development/tools/continuous-integration/codeberg-pages/default.nix

···

       1
       1
       +
       { lib, fetchFromGitea, buildGoModule }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildGoModule rec {

     

       4
       4
       +
         pname = "codeberg-pages";

     

       5
       5
       +
         version = "4.6.2";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitea {

     

       8
       8
       +
           domain = "codeberg.org";

     

       9
       9
       +
           owner = "Codeberg";

     

       10
       10
       +
           repo = "pages-server";

     

       11
       11
       +
           rev = "ce241fa40adee2b12f8e225db98e09a45bc2acbb";

     

       12
       12
       +
           sha256 = "sha256-mL2Xs7eyldoZK4zrX6WFlFtwdLN0iVyl1Qh8X6b2u9c=";

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         vendorSha256 = "sha256-R/LuZkA2xHmu7SO3BVyK1C6n9U+pYn50kNkyLltn2ng=";

     

       16
       16
       +
       

     

       17
       17
       +
         patches = [ ./disable_httptest.patch ];

     

       18
       18
       +
       

     

       19
       19
       +
         ldflags = [ "-s" "-w" ];

     

       20
       20
       +
       

     

       21
       21
       +
         tags = [ "sqlite" "sqlite_unlock_notify" "netgo" ];

     

       22
       22
       +
       

     

       23
       23
       +
         meta = with lib; {

     

       24
       24
       +
           mainProgram = "codeberg-pages";

     

       25
       25
       +
           maintainers = with maintainers; [ laurent-f1z1 ];

     

       26
       26
       +
           license = licenses.eupl12;

     

       27
       27
       +
           homepage = "https://codeberg.org/Codeberg/pages-server";

     

       28
       28
       +
           description = "Static websites hosting from Gitea repositories";

     

       29
       29
       +
         };

     

       30
       30
       +
       }

+55

pkgs/development/tools/continuous-integration/codeberg-pages/disable_httptest.patch

···

       1
       1
       +
       diff --git a/server/handler/handler_test.go b/server/handler/handler_test.go

     

       2
       2
       +
       deleted file mode 100644

     

       3
       3
       +
       index 626564a..0000000

     

       4
       4
       +
       --- a/server/handler/handler_test.go

     

       5
       5
       +
       +++ /dev/null

     

       6
       6
       +
       @@ -1,49 +0,0 @@

     

       7
       7
       +
       -package handler

     

       8
       8
       +
       -

     

       9
       9
       +
       -import (

     

       10
       10
       +
       -	"net/http/httptest"

     

       11
       11
       +
       -	"testing"

     

       12
       12
       +
       -	"time"

     

       13
       13
       +
       -

     

       14
       14
       +
       -	"codeberg.org/codeberg/pages/server/cache"

     

       15
       15
       +
       -	"codeberg.org/codeberg/pages/server/gitea"

     

       16
       16
       +
       -	"github.com/rs/zerolog/log"

     

       17
       17
       +
       -)

     

       18
       18
       +
       -

     

       19
       19
       +
       -func TestHandlerPerformance(t *testing.T) {

     

       20
       20
       +
       -	giteaClient, _ := gitea.NewClient("https://codeberg.org", "", cache.NewKeyValueCache(), false, false)

     

       21
       21
       +
       -	testHandler := Handler(

     

       22
       22
       +
       -		"codeberg.page", "raw.codeberg.org",

     

       23
       23
       +
       -		giteaClient,

     

       24
       24
       +
       -		"https://docs.codeberg.org/pages/raw-content/",

     

       25
       25
       +
       -		[]string{"/.well-known/acme-challenge/"},

     

       26
       26
       +
       -		[]string{"raw.codeberg.org", "fonts.codeberg.org", "design.codeberg.org"},

     

       27
       27
       +
       -		cache.NewKeyValueCache(),

     

       28
       28
       +
       -		cache.NewKeyValueCache(),

     

       29
       29
       +
       -	)

     

       30
       30
       +
       -

     

       31
       31
       +
       -	testCase := func(uri string, status int) {

     

       32
       32
       +
       -		t.Run(uri, func(t *testing.T) {

     

       33
       33
       +
       -			req := httptest.NewRequest("GET", uri, nil)

     

       34
       34
       +
       -			w := httptest.NewRecorder()

     

       35
       35
       +
       -

     

       36
       36
       +
       -			log.Printf("Start: %v\n", time.Now())

     

       37
       37
       +
       -			start := time.Now()

     

       38
       38
       +
       -			testHandler(w, req)

     

       39
       39
       +
       -			end := time.Now()

     

       40
       40
       +
       -			log.Printf("Done: %v\n", time.Now())

     

       41
       41
       +
       -

     

       42
       42
       +
       -			resp := w.Result()

     

       43
       43
       +
       -

     

       44
       44
       +
       -			if resp.StatusCode != status {

     

       45
       45
       +
       -				t.Errorf("request failed with status code %d", resp.StatusCode)

     

       46
       46
       +
       -			} else {

     

       47
       47
       +
       -				t.Logf("request took %d milliseconds", end.Sub(start).Milliseconds())

     

       48
       48
       +
       -			}

     

       49
       49
       +
       -		})

     

       50
       50
       +
       -	}

     

       51
       51
       +
       -

     

       52
       52
       +
       -	testCase("https://mondstern.codeberg.page/", 404) // TODO: expect 200

     

       53
       53
       +
       -	testCase("https://codeberg.page/", 404)           // TODO: expect 200

     

       54
       54
       +
       -	testCase("https://example.momar.xyz/", 424)

     

       55
       55
       +
       -}

+3 -3

pkgs/development/tools/rust/cargo-udeps/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "cargo-udeps";

     

       5
       5
       -
         version = "0.1.36";

     

       5
       5
       +
         version = "0.1.38";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "est31";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-7sfUA1YQrYlgnzr+uTXcEwWMN/rUkwIzNvzN8YQ6HOo=";

     

       11
       11
       +
           sha256 = "sha256-UQ6JrzL9yGllhPYN7Dod6UYqu2FJLjInmpE6IUmjZno=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoHash = "sha256-Q5sLn9JrspnxMPi8zoP3i/G92PP1zPVCKlQXdTiSXJM=";

     

       14
       14
       +
         cargoHash = "sha256-jzBOdMtv47wDOOcPg0B5BYQtYSnDnOnms0SDrW2lFbs=";

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ pkg-config ];

     

       17
       17

+1 -1

pkgs/development/tools/swiftpm2nix/support.nix

···

       6
       6
        
       

     

       7
       7
        
         # Derive a pin file from workspace state.

     

       8
       8
        
         mkPinFile = workspaceState:

     

       9
       9
       -
           assert workspaceState.version == 5;

     

       9
       9
       +
           assert workspaceState.version >= 5 && workspaceState.version <= 6;

     

       10
       10
        
           json.generate "Package.resolved" {

     

       11
       11
        
             version = 1;

     

       12
       12
        
             object.pins = map (dep: {

+2 -1

pkgs/development/tools/swiftpm2nix/swiftpm2nix.sh

···

       12
       12
        
         exit 1

     

       13
       13
        
       fi

     

       14
       14
        
       

     

       15
       15
       -
       if [[ "$(jq .version $stateFile)" != "5" ]]; then

     

       15
       15
       +
       stateVersion="$(jq .version $stateFile)"

     

       16
       16
       +
       if [[ $stateVersion -lt 5 || $stateVersion -gt 6 ]]; then

     

       16
       17
        
         echo >&2 "Unsupported $stateFile version"

     

       17
       18
        
         exit 1

     

       18
       19
        
       fi

+4 -4

pkgs/servers/chatgpt-retrieval-plugin/default.nix

···

       9
       9
        
       python3Packages.buildPythonApplication {

     

       10
       10
        
         pname = "chatgpt-retrieval-plugin";

     

       11
       11
        
         version = "unstable-2023-03-28";

     

       12
       12
       +
         format = "pyproject";

     

       12
       13
        
       

     

       13
       14
        
         src = fetchFromGitHub {

     

       14
       15
        
           owner = "openai";

     
···

       17
       18
        
           hash = "sha256-fCNGzK5Uji6wGDTEwAf4FF/i+RC7ny3v4AsvQwIbehY=";

     

       18
       19
        
         };

     

       19
       20
        
       

     

       20
       20
       -
         format = "pyproject";

     

       21
       21
       -
       

     

       22
       21
        
         postPatch = ''

     

       23
       22
        
           substituteInPlace pyproject.toml \

     

       23
       23
       +
             --replace 'fastapi = "^0.92.0"' 'fastapi = ">=0.92.0"' \

     

       24
       24
        
             --replace 'python-dotenv = "^0.21.1"' 'python-dotenv = "*"' \

     

       25
       25
        
             --replace 'python-multipart = "^0.0.6"' 'python-multipart = "^0.0.5"' \

     

       26
       26
       -
             --replace 'tiktoken = "^0.2.0"' 'tiktoken = "^0.3.0"' \

     

       27
       26
        
             --replace 'redis = "4.5.1"' 'redis = "^4.5.1"' \

     

       27
       27
       +
             --replace 'tiktoken = "^0.2.0"' 'tiktoken = "^0.3.0"' \

     

       28
       28
        
             --replace 'packages = [{include = "server"}]' 'packages = [{include = "server"}, {include = "models"}, {include = "datastore"}, {include = "services"}]'

     

       29
       29
        
       

     

       30
       30
        
           substituteInPlace server/main.py \

     
···

       64
       64
        
       

     

       65
       65
        
         meta = with lib; {

     

       66
       66
        
           homepage = "https://github.com/openai/chatgpt-retrieval-plugin";

     

       67
       67
       -
           description = "The ChatGPT Retrieval Plugin lets you easily search and find personal or work documents by asking questions in everyday language. ";

     

       67
       67
       +
           description = "Tool to search and find personal or work documents by asking questions in everyday language";

     

       68
       68
        
           license = licenses.mit;

     

       69
       69
        
           maintainers = with maintainers; [ happysalada ];

     

       70
       70
        
         };

+3 -3

pkgs/servers/dns/doh-proxy-rust/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "doh-proxy-rust";

     

       5
       5
       -
         version = "0.9.8";

     

       5
       5
       +
         version = "0.9.9";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchCrate {

     

       8
       8
        
           inherit version;

     

       9
       9
        
           crateName = "doh-proxy";

     

       10
       10
       -
           sha256 = "sha256-+Z2eneEK6nhcJEKRa1VIolCTZ8to2mMQ8Ik7WEH+1w0=";

     

       10
       10
       +
           sha256 = "sha256-KvEayC+aY8aC5fSVIV9urNwLJcIfDMaAU+XdlGSmYRI=";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         cargoHash = "sha256-nlKzVQeLg3/nBIkD7QoBUWC93m9BiJrybf13Y/ns9gA=";

     

       13
       13
       +
         cargoHash = "sha256-eoC90ht9cbMLkPN3S4jxZipbFoZDTU7pIr6GRagGlJE=";

     

       14
       14
        
       

     

       15
       15
        
         buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ];

     

       16
       16

+3 -3

pkgs/tools/graphics/shotgun/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "shotgun";

     

       5
       5
       -
         version = "2.3.1";

     

       5
       5
       +
         version = "2.4.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "neXromancers";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-hu8UYia2tu6I6Ii9aZ6vfpbrcDz4yeEDkljGFa5s6VY=";

     

       11
       11
       +
           sha256 = "sha256-fcb+eZXzpuEPFSZexbgDpoBX85gsiIqPlcPXruNGenk=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoSha256 = "sha256-UOchXeBX+sDuLhwWQRVFCj9loJUyr4IltiAKsQoh5/c=";

     

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

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ pkg-config ];

     

       17
       17

+8 -8

pkgs/tools/misc/btdu/default.nix

···

       9
       9
        
       }:

     

       10
       10
        
       

     

       11
       11
        
       let

     

       12
       12
       -
           _d_ae_ver              = "0.0.3228";

     

       13
       13
       -
           _d_btrfs_ver           = "0.0.13";

     

       14
       14
       -
           _d_ncurses_ver         = "0.0.149";

     

       12
       12
       +
           _d_ae_ver              = "0.0.3236";

     

       13
       13
       +
           _d_btrfs_ver           = "0.0.18";

     

       14
       14
       +
           _d_ncurses_ver         = "1.0.0";

     

       15
       15
        
           _d_emsi_containers_ver = "0.9.0";

     

       16
       16
        
       in

     

       17
       17
        
       stdenv.mkDerivation rec {

     

       18
       18
        
           pname = "btdu";

     

       19
       19
       -
           version = "0.5.0";

     

       19
       19
       +
           version = "0.5.1";

     

       20
       20
        
       

     

       21
       21
        
           srcs = [

     

       22
       22
        
             (fetchurl {

     

       23
       23
        
               url = "https://github.com/CyberShadow/${pname}/archive/v${version}.tar.gz";

     

       24
       24
       -
               sha256 = "90ba4d8997575993e9d39a503779fb32b37bb62b8d9386776e95743bfc859606";

     

       24
       24
       +
               sha256 = "566269f365811f6db53280fc5476a7fcf34791396ee4e090c150af4280b35ba5";

     

       25
       25
        
             })

     

       26
       26
        
             (fetchurl {

     

       27
       27
        
               url = "https://github.com/CyberShadow/ae/archive/v${_d_ae_ver}.tar.gz";

     

       28
       28
       -
               sha256 = "6b3da61d9f7f1a7343dbe5691a16482cabcd78532b7c09ed9d63eb1934f1b9d8";

     

       28
       28
       +
               sha256 = "5ea3f0d9d2d13012ce6a1ee1b52d9fdff9dfb1d5cc7ee5d1b04cab1947ed4d36";

     

       29
       29
        
             })

     

       30
       30
        
             (fetchurl {

     

       31
       31
        
               url = "https://github.com/CyberShadow/d-btrfs/archive/v${_d_btrfs_ver}.tar.gz";

     

       32
       32
       -
               sha256 = "05a59cd64000ce2af9bd0578ef5118ab4d10de0ec50410ba0d4e463f01cfaa4e";

     

       32
       32
       +
               sha256 = "32af4891d93c7898b0596eefb8297b88d3ed5c14c84a5951943b7b54c7599dbd";

     

       33
       33
        
             })

     

       34
       34
        
             (fetchurl {

     

       35
       35
        
               url = "https://github.com/D-Programming-Deimos/ncurses/archive/v${_d_ncurses_ver}.tar.gz";

     

       36
       36
       -
               sha256 = "2c8497f5dd93f9d3a05ca7ed57c4fcaee1e988fd25a24de106917ddf72f34646";

     

       36
       36
       +
               sha256 = "b5db677b75ebef7a1365ca4ef768f7344a2bc8d07ec223a2ada162f185d0d9c6";

     

       37
       37
        
             })

     

       38
       38
        
             (fetchurl {

     

       39
       39
        
               url = "https://github.com/dlang-community/containers/archive/v${_d_emsi_containers_ver}.tar.gz";

+5 -4

pkgs/tools/misc/clipboard-jh/default.nix

···

       12
       12
        
       

     

       13
       13
        
       stdenv.mkDerivation rec {

     

       14
       14
        
         pname = "clipboard-jh";

     

       15
       15
       -
         version = "0.6.0";

     

       15
       15
       +
         version = "0.7.0";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "Slackadays";

     

       19
       19
        
           repo = "clipboard";

     

       20
       20
        
           rev = version;

     

       21
       21
       -
           hash = "sha256-o3yCWAy7hlFKAFW3tVRG+hL0SRWlNY4hvnhUoDK8GkI=";

     

       21
       21
       +
           hash = "sha256-+1GgIa0kIOliI0ACiU9zQe24R6488xWEZ7n9nuxv3dY";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         postPatch = ''

     
···

       30
       30
        
           pkg-config

     

       31
       31
        
         ];

     

       32
       32
        
       

     

       33
       33
       -
         buildInputs = [

     

       33
       33
       +
         buildInputs = lib.optionals stdenv.isLinux [

     

       34
       34
        
           libffi

     

       35
       35
        
           wayland-protocols

     

       36
       36
        
           wayland

     
···

       50
       50
        
           homepage = "https://github.com/Slackadays/clipboard";

     

       51
       51
        
           license = licenses.gpl3Only;

     

       52
       52
        
           maintainers = with maintainers; [ dit7ya ];

     

       53
       53
       -
           mainProgram = "clipboard";

     

       53
       53
       +
           platforms = platforms.all;

     

       54
       54
       +
           mainProgram = "cb";

     

       54
       55
        
         };

     

       55
       56
        
       }

+3 -3

pkgs/tools/networking/clash-meta/default.nix

···

       4
       4
        
       }:

     

       5
       5
        
       buildGoModule rec {

     

       6
       6
        
         pname = "clash-meta";

     

       7
       7
       -
         version = "1.14.3";

     

       7
       7
       +
         version = "1.14.4";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "MetaCubeX";

     
···

       14
       14
        
           postFetch = ''

     

       15
       15
        
             rm -f $out/.github/workflows/{Delete,delete}.yml

     

       16
       16
        
           '';

     

       17
       17
       -
           hash = "sha256-HITuxnzzyHBJ3PlXHYR0M1r3x70AtwzAp1hQ6pX16Bo=";

     

       17
       17
       +
           hash = "sha256-HEJQaNFKcmR7KtXsYs2h1KpRZJfQljYjMUBMdqg7gRU=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         vendorHash = "sha256-D6b0U04wwDUzeIu3//E10YehohTzvyHWtK5Yzf3xrAI=";

     

       20
       20
       +
         vendorHash = "sha256-jvl4dAP0EOl9p/3LPNLUqzg8H/mP7AKaI+lJ6ROo/1k=";

     

       21
       21
        
       

     

       22
       22
        
         # Do not build testing suit

     

       23
       23
        
         excludedPackages = [ "./test" ];

+3 -3

pkgs/tools/security/fulcio/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "fulcio";

     

       5
       5
       -
         version = "1.2.0";

     

       5
       5
       +
         version = "1.3.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "sigstore";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-sDxbBIE0NgOcEMTnQNXe93RvIDBn0IjH2D15GxwVJqU=";

     

       11
       11
       +
           sha256 = "sha256-d9PTio6BYJ+WmHH53NRFBI1BG/aOM+BauV398FKaQg0=";

     

       12
       12
        
           # populate values that require us to use git. By doing this in postFetch we

     

       13
       13
        
           # can delete .git afterwards and maintain better reproducibility of the src.

     

       14
       14
        
           leaveDotGit = true;

     
···

       20
       20
        
             find "$out" -name .git -print0 | xargs -0 rm -rf

     

       21
       21
        
           '';

     

       22
       22
        
         };

     

       23
       23
       -
         vendorHash = "sha256-71YnLPgM3gkGzCgoiUIpknv9bFfxnZPHvf+5gAF1Knk=";

     

       23
       23
       +
         vendorHash = "sha256-RnCQ0KKT1azPZGPwbtRBLxNMng2mnYVT7xBI3Cxm9Q0=";

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [ installShellFiles ];

     

       26
       26

+3 -3

pkgs/tools/security/pomerium-cli/default.nix

···

       8
       8
        
       in

     

       9
       9
        
       buildGoModule rec {

     

       10
       10
        
         pname = "pomerium-cli";

     

       11
       11
       -
         version = "0.21.0";

     

       11
       11
       +
         version = "0.22.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "pomerium";

     

       15
       15
        
           repo = "cli";

     

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

     

       17
       17
       -
           sha256 = "sha256-0JMMa85gMTZA0JtxpONVMakbsapAoCXdiL3+Whv5Pp0=";

     

       17
       17
       +
           sha256 = "sha256-0vRLjmzW/U/Kssu4VQO6mFqVH4UovmTGEEfxeWI8Nqo=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         vendorHash = "sha256-eATNBUQNspDdksF06VHIzwzEJfaFBlJt9OtONxH49s4=";

     

       20
       20
       +
         vendorHash = "sha256-dnfJnndYXR6LQKDruLSsDav4DtyaGu5/rNnk69oMhPU=";

     

       21
       21
        
       

     

       22
       22
        
         subPackages = [

     

       23
       23
        
           "cmd/pomerium-cli"

+17 -3

pkgs/top-level/all-packages.nix

···

       6493
       6493
        
           inherit (darwin.apple_sdk.frameworks) Security;

     

       6494
       6494
        
         };

     

       6495
       6495
        
       

     

       6496
       6496
       +
         codeberg-pages = callPackage ../development/tools/continuous-integration/codeberg-pages { };

     

       6497
       6497
       +
       

     

       6496
       6498
        
         codebraid = callPackage ../tools/misc/codebraid { };

     

       6497
       6499
        
       

     

       6498
       6500
        
         codemov = callPackage ../tools/misc/codemov { };

     
···

       13942
       13944
        
         clipnotify = callPackage ../tools/misc/clipnotify { };

     

       13943
       13945
        
       

     

       13944
       13946
        
         clipboard-jh = callPackage ../tools/misc/clipboard-jh {

     

       13945
       13945
       -
           stdenv = if stdenv.isDarwin then llvmPackages_15.stdenv else stdenv;

     

       13947
       13947
       +
           stdenv = if stdenv.isDarwin then llvmPackages_16.stdenv else stdenv;

     

       13946
       13948
        
         };

     

       13947
       13949
        
       

     

       13948
       13950
        
         clipbuzz = callPackage ../tools/misc/clipbuzz { };

     
···

       27657
       27659
        
       

     

       27658
       27660
        
         adementary-theme = callPackage ../data/themes/adementary { };

     

       27659
       27661
        
       

     

       27662
       27662
       +
         adi1090x-plymouth-themes = callPackage ../data/themes/adi1090x-plymouth-themes { };

     

       27663
       27663
       +
       

     

       27660
       27664
        
         adwaita-qt = libsForQt5.callPackage ../data/themes/adwaita-qt { };

     

       27661
       27665
        
       

     

       27662
       27666
        
         adwaita-qt6 = qt6Packages.callPackage ../data/themes/adwaita-qt {

     
···

       32957
       32961
        
         opentabletdriver = callPackage ../tools/X11/opentabletdriver { };

     

       32958
       32962
        
       

     

       32959
       32963
        
         opentx = libsForQt5.callPackage ../applications/misc/opentx { };

     

       32964
       32964
       +
       

     

       32965
       32965
       +
         openvi = darwin.apple_sdk_11_0.callPackage ../applications/editors/openvi { };

     

       32960
       32966
        
       

     

       32961
       32967
        
         opera = callPackage ../applications/networking/browsers/opera { };

     

       32962
       32968
        
       

     
···

       39814
       39820
        
       

     

       39815
       39821
        
         mpvc = callPackage ../applications/misc/mpvc { };

     

       39816
       39822
        
       

     

       39823
       39823
       +
         # Overriding does not work when using callPackage on discord using import instead. (https://github.com/NixOS/nixpkgs/pull/179906)

     

       39817
       39824
        
         discord = import ../applications/networking/instant-messengers/discord {

     

       39818
       39825
        
           inherit lib stdenv;

     

       39819
       39826
        
           inherit (pkgs) callPackage fetchurl;

     

       39820
       39827
        
           branch = "stable";

     

       39821
       39828
        
         };

     

       39822
       39829
        
       

     

       39823
       39823
       -
         discordo = callPackage ../applications/networking/discordo/default.nix { };

     

       39824
       39824
       -
       

     

       39825
       39830
        
         discord-ptb = import ../applications/networking/instant-messengers/discord {

     

       39826
       39831
        
           inherit lib stdenv;

     

       39827
       39832
        
           inherit (pkgs) callPackage fetchurl;

     
···

       39833
       39838
        
           inherit (pkgs) callPackage fetchurl;

     

       39834
       39839
        
           branch = "canary";

     

       39835
       39840
        
         };

     

       39841
       39841
       +
       

     

       39842
       39842
       +
         discord-development = import ../applications/networking/instant-messengers/discord {

     

       39843
       39843
       +
           inherit lib stdenv;

     

       39844
       39844
       +
           inherit (pkgs) callPackage fetchurl;

     

       39845
       39845
       +
           branch = "development";

     

       39846
       39846
       +
         };

     

       39847
       39847
       +
       

     

       39848
       39848
       +
       

     

       39849
       39849
       +
         discordo = callPackage ../applications/networking/discordo/default.nix { };

     

       39836
       39850
        
       

     

       39837
       39851
        
         golden-cheetah = libsForQt5.callPackage ../applications/misc/golden-cheetah { };

     

       39838
       39852