commit 455127ad5e31ebf396f1fa861af121bb4ca49f9e · pyrox.dev/nixpkgs

+1 -1

lib/generators.nix

···

       422
        
             (if v then "True" else "False")

     

       423
        
           else if isFunction v then

     

       424
        
             abort "generators.toDhall: cannot convert a function to Dhall"

     

       425
       -
           else if isNull v then

     

       426
        
             abort "generators.toDhall: cannot convert a null to Dhall"

     

       427
        
           else

     

       428
        
             builtins.toJSON v;

···

       422
        
             (if v then "True" else "False")

     

       423
        
           else if isFunction v then

     

       424
        
             abort "generators.toDhall: cannot convert a function to Dhall"

     

       425
       +
           else if v == null then

     

       426
        
             abort "generators.toDhall: cannot convert a null to Dhall"

     

       427
        
           else

     

       428
        
             builtins.toJSON v;

+1 -1

maintainers/scripts/haskell/dependencies.nix

···

       3
        
         pkgs = import ../../.. {};

     

       4
        
         inherit (pkgs) lib;

     

       5
        
         getDeps = _: pkg: {

     

       6
       -
           deps = builtins.filter (x: !isNull x) (map (x: x.pname or null) (pkg.propagatedBuildInputs or []));

     

       7
        
           broken = (pkg.meta.hydraPlatforms or [null]) == [];

     

       8
        
         };

     

       9
        
       in

···

       3
        
         pkgs = import ../../.. {};

     

       4
        
         inherit (pkgs) lib;

     

       5
        
         getDeps = _: pkg: {

     

       6
       +
           deps = builtins.filter (x: x != null) (map (x: x.pname or null) (pkg.propagatedBuildInputs or []));

     

       7
        
           broken = (pkg.meta.hydraPlatforms or [null]) == [];

     

       8
        
         };

     

       9
        
       in

-1

nixos/lib/test-driver/test_driver/driver.py

···

       179
        
                   start_command=cmd,

     

       180
        
                   name=name,

     

       181
        
                   keep_vm_state=args.get("keep_vm_state", False),

     

       182
       -
                   allow_reboot=args.get("allow_reboot", False),

     

       183
        
               )

     

       184
        
       

     

       185
        
           def serial_stdout_on(self) -> None:

···

       179
        
                   start_command=cmd,

     

       180
        
                   name=name,

     

       181
        
                   keep_vm_state=args.get("keep_vm_state", False),

     

       0
        
       
     

       182
        
               )

     

       183
        
       

     

       184
        
           def serial_stdout_on(self) -> None:

+17 -11

nixos/lib/test-driver/test_driver/machine.py

···

       144
        
               self,

     

       145
        
               monitor_socket_path: Path,

     

       146
        
               shell_socket_path: Path,

     

       147
       -
               allow_reboot: bool = False,  # TODO: unused, legacy?

     

       148
        
           ) -> str:

     

       149
        
               display_opts = ""

     

       150
        
               display_available = any(x in os.environ for x in ["DISPLAY", "WAYLAND_DISPLAY"])

     
···

       152
        
                   display_opts += " -nographic"

     

       153
        
       

     

       154
        
               # qemu options

     

       155
       -
               qemu_opts = ""

     

       156
       -
               qemu_opts += (

     

       157
       -
                   ""

     

       158
       -
                   if allow_reboot

     

       159
       -
                   else " -no-reboot"

     

       160
        
                   " -device virtio-serial"

     

       161
        
                   " -device virtconsole,chardev=shell"

     

       162
        
                   " -device virtio-rng-pci"

     

       163
        
                   " -serial stdio"

     

       164
        
               )

     

       0
        
       
     

       0
        
       
     

       165
        
               # TODO: qemu script already catpures this env variable, legacy?

     

       166
        
               qemu_opts += " " + os.environ.get("QEMU_OPTS", "")

     

       167
        
       

     
···

       195
        
               shared_dir: Path,

     

       196
        
               monitor_socket_path: Path,

     

       197
        
               shell_socket_path: Path,

     

       0
        
       
     

       198
        
           ) -> subprocess.Popen:

     

       199
        
               return subprocess.Popen(

     

       200
       -
                   self.cmd(monitor_socket_path, shell_socket_path),

     

       201
        
                   stdin=subprocess.PIPE,

     

       202
        
                   stdout=subprocess.PIPE,

     

       203
        
                   stderr=subprocess.STDOUT,

     
···

       312
        
       

     

       313
        
           start_command: StartCommand

     

       314
        
           keep_vm_state: bool

     

       315
       -
           allow_reboot: bool

     

       316
        
       

     

       317
        
           process: Optional[subprocess.Popen]

     

       318
        
           pid: Optional[int]

     
···

       337
        
               start_command: StartCommand,

     

       338
        
               name: str = "machine",

     

       339
        
               keep_vm_state: bool = False,

     

       340
       -
               allow_reboot: bool = False,

     

       341
        
               callbacks: Optional[List[Callable]] = None,

     

       342
        
           ) -> None:

     

       343
        
               self.out_dir = out_dir

     

       344
        
               self.tmp_dir = tmp_dir

     

       345
        
               self.keep_vm_state = keep_vm_state

     

       346
       -
               self.allow_reboot = allow_reboot

     

       347
        
               self.name = name

     

       348
        
               self.start_command = start_command

     

       349
        
               self.callbacks = callbacks if callbacks is not None else []

     
···

       874
        
               self.process.stdin.write(chars.encode())

     

       875
        
               self.process.stdin.flush()

     

       876
        
       

     

       877
       -
           def start(self) -> None:

     

       878
        
               if self.booted:

     

       879
        
                   return

     

       880
        
       

     
···

       898
        
                   self.shared_dir,

     

       899
        
                   self.monitor_path,

     

       900
        
                   self.shell_path,

     

       0
        
       
     

       901
        
               )

     

       902
        
               self.monitor, _ = monitor_socket.accept()

     

       903
        
               self.shell, _ = shell_socket.accept()

     
···

       945
        
               self.log("forced crash")

     

       946
        
               self.send_monitor_command("quit")

     

       947
        
               self.wait_for_shutdown()

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       948
        
       

     

       949
        
           def wait_for_x(self) -> None:

     

       950
        
               """Wait until it is possible to connect to the X server.  Note that

···

       144
        
               self,

     

       145
        
               monitor_socket_path: Path,

     

       146
        
               shell_socket_path: Path,

     

       147
       +
               allow_reboot: bool = False,

     

       148
        
           ) -> str:

     

       149
        
               display_opts = ""

     

       150
        
               display_available = any(x in os.environ for x in ["DISPLAY", "WAYLAND_DISPLAY"])

     
···

       152
        
                   display_opts += " -nographic"

     

       153
        
       

     

       154
        
               # qemu options

     

       155
       +
               qemu_opts = (

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       156
        
                   " -device virtio-serial"

     

       157
        
                   " -device virtconsole,chardev=shell"

     

       158
        
                   " -device virtio-rng-pci"

     

       159
        
                   " -serial stdio"

     

       160
        
               )

     

       161
       +
               if not allow_reboot:

     

       162
       +
                   qemu_opts += " -no-reboot"

     

       163
        
               # TODO: qemu script already catpures this env variable, legacy?

     

       164
        
               qemu_opts += " " + os.environ.get("QEMU_OPTS", "")

     

       165
        
       

     
···

       193
        
               shared_dir: Path,

     

       194
        
               monitor_socket_path: Path,

     

       195
        
               shell_socket_path: Path,

     

       196
       +
               allow_reboot: bool,

     

       197
        
           ) -> subprocess.Popen:

     

       198
        
               return subprocess.Popen(

     

       199
       +
                   self.cmd(monitor_socket_path, shell_socket_path, allow_reboot),

     

       200
        
                   stdin=subprocess.PIPE,

     

       201
        
                   stdout=subprocess.PIPE,

     

       202
        
                   stderr=subprocess.STDOUT,

     
···

       311
        
       

     

       312
        
           start_command: StartCommand

     

       313
        
           keep_vm_state: bool

     

       0
        
       
     

       314
        
       

     

       315
        
           process: Optional[subprocess.Popen]

     

       316
        
           pid: Optional[int]

     
···

       335
        
               start_command: StartCommand,

     

       336
        
               name: str = "machine",

     

       337
        
               keep_vm_state: bool = False,

     

       0
        
       
     

       338
        
               callbacks: Optional[List[Callable]] = None,

     

       339
        
           ) -> None:

     

       340
        
               self.out_dir = out_dir

     

       341
        
               self.tmp_dir = tmp_dir

     

       342
        
               self.keep_vm_state = keep_vm_state

     

       0
        
       
     

       343
        
               self.name = name

     

       344
        
               self.start_command = start_command

     

       345
        
               self.callbacks = callbacks if callbacks is not None else []

     
···

       870
        
               self.process.stdin.write(chars.encode())

     

       871
        
               self.process.stdin.flush()

     

       872
        
       

     

       873
       +
           def start(self, allow_reboot: bool = False) -> None:

     

       874
        
               if self.booted:

     

       875
        
                   return

     

       876
        
       

     
···

       894
        
                   self.shared_dir,

     

       895
        
                   self.monitor_path,

     

       896
        
                   self.shell_path,

     

       897
       +
                   allow_reboot,

     

       898
        
               )

     

       899
        
               self.monitor, _ = monitor_socket.accept()

     

       900
        
               self.shell, _ = shell_socket.accept()

     
···

       942
        
               self.log("forced crash")

     

       943
        
               self.send_monitor_command("quit")

     

       944
        
               self.wait_for_shutdown()

     

       945
       +
       

     

       946
       +
           def reboot(self) -> None:

     

       947
       +
               """Press Ctrl+Alt+Delete in the guest.

     

       948
       +
       

     

       949
       +
               Prepares the machine to be reconnected which is useful if the

     

       950
       +
               machine was started with `allow_reboot = True`

     

       951
       +
               """

     

       952
       +
               self.send_key(f"ctrl-alt-delete")

     

       953
       +
               self.connected = False

     

       954
        
       

     

       955
        
           def wait_for_x(self) -> None:

     

       956
        
               """Wait until it is possible to connect to the X server.  Note that

+4 -4

nixos/modules/hardware/device-tree.nix

···

       65
        
           };

     

       66
        
         };

     

       67
        
       

     

       68
       -
         filterDTBs = src: if isNull cfg.filter

     

       69
        
           then "${src}/dtbs"

     

       70
        
           else

     

       71
        
             pkgs.runCommand "dtbs-filtered" {} ''

     
···

       93
        
         # Fill in `dtboFile` for each overlay if not set already.

     

       94
        
         # Existence of one of these is guarded by assertion below

     

       95
        
         withDTBOs = xs: flip map xs (o: o // { dtboFile =

     

       96
       -
           if isNull o.dtboFile then

     

       97
       -
             if !isNull o.dtsFile then compileDTS o.name o.dtsFile

     

       98
        
             else compileDTS o.name (pkgs.writeText "dts" o.dtsText)

     

       99
        
           else o.dtboFile; } );

     

       100
        
       

     
···

       181
        
         config = mkIf (cfg.enable) {

     

       182
        
       

     

       183
        
           assertions = let

     

       184
       -
             invalidOverlay = o: isNull o.dtsFile && isNull o.dtsText && isNull o.dtboFile;

     

       185
        
           in lib.singleton {

     

       186
        
             assertion = lib.all (o: !invalidOverlay o) cfg.overlays;

     

       187
        
             message = ''

···

       65
        
           };

     

       66
        
         };

     

       67
        
       

     

       68
       +
         filterDTBs = src: if cfg.filter == null

     

       69
        
           then "${src}/dtbs"

     

       70
        
           else

     

       71
        
             pkgs.runCommand "dtbs-filtered" {} ''

     
···

       93
        
         # Fill in `dtboFile` for each overlay if not set already.

     

       94
        
         # Existence of one of these is guarded by assertion below

     

       95
        
         withDTBOs = xs: flip map xs (o: o // { dtboFile =

     

       96
       +
           if o.dtboFile == null then

     

       97
       +
             if o.dtsFile != null then compileDTS o.name o.dtsFile

     

       98
        
             else compileDTS o.name (pkgs.writeText "dts" o.dtsText)

     

       99
        
           else o.dtboFile; } );

     

       100
        
       

     
···

       181
        
         config = mkIf (cfg.enable) {

     

       182
        
       

     

       183
        
           assertions = let

     

       184
       +
             invalidOverlay = o: (o.dtsFile == null) && (o.dtsText == null) && (o.dtboFile == null);

     

       185
        
           in lib.singleton {

     

       186
        
             assertion = lib.all (o: !invalidOverlay o) cfg.overlays;

     

       187
        
             message = ''

+3 -3

nixos/modules/security/doas.nix

···

       19
        
         ];

     

       20
        
       

     

       21
        
         mkArgs = rule:

     

       22
       -
           if (isNull rule.args) then ""

     

       23
        
           else if (length rule.args == 0) then "args"

     

       24
        
           else "args ${concatStringsSep " " rule.args}";

     

       25
        
       

     
···

       27
        
           let

     

       28
        
             opts = mkOpts rule;

     

       29
        
       

     

       30
       -
             as = optionalString (!isNull rule.runAs) "as ${rule.runAs}";

     

       31
        
       

     

       32
       -
             cmd = optionalString (!isNull rule.cmd) "cmd ${rule.cmd}";

     

       33
        
       

     

       34
        
             args = mkArgs rule;

     

       35
        
           in

···

       19
        
         ];

     

       20
        
       

     

       21
        
         mkArgs = rule:

     

       22
       +
           if (rule.args == null) then ""

     

       23
        
           else if (length rule.args == 0) then "args"

     

       24
        
           else "args ${concatStringsSep " " rule.args}";

     

       25
        
       

     
···

       27
        
           let

     

       28
        
             opts = mkOpts rule;

     

       29
        
       

     

       30
       +
             as = optionalString (rule.runAs != null) "as ${rule.runAs}";

     

       31
        
       

     

       32
       +
             cmd = optionalString (rule.cmd != null) "cmd ${rule.cmd}";

     

       33
        
       

     

       34
        
             args = mkArgs rule;

     

       35
        
           in

+2 -2

nixos/modules/security/pam.nix

···

       793
        
           };

     

       794
        
         }));

     

       795
        
       

     

       796
       -
         motd = if isNull config.users.motdFile

     

       797
        
                then pkgs.writeText "motd" config.users.motd

     

       798
        
                else config.users.motdFile;

     

       799
        
       

     
···

       1233
        
         config = {

     

       1234
        
           assertions = [

     

       1235
        
             {

     

       1236
       -
               assertion = isNull config.users.motd || isNull config.users.motdFile;

     

       1237
        
               message = ''

     

       1238
        
                 Only one of users.motd and users.motdFile can be set.

     

       1239
        
               '';

···

       793
        
           };

     

       794
        
         }));

     

       795
        
       

     

       796
       +
         motd = if config.users.motdFile == null

     

       797
        
                then pkgs.writeText "motd" config.users.motd

     

       798
        
                else config.users.motdFile;

     

       799
        
       

     
···

       1233
        
         config = {

     

       1234
        
           assertions = [

     

       1235
        
             {

     

       1236
       +
               assertion = config.users.motd == null || config.users.motdFile == null;

     

       1237
        
               message = ''

     

       1238
        
                 Only one of users.motd and users.motdFile can be set.

     

       1239
        
               '';

+1 -1

nixos/modules/services/cluster/kubernetes/pki.nix

···

       270
        
                 '';

     

       271
        
               })]);

     

       272
        
       

     

       273
       -
             environment.etc.${cfg.etcClusterAdminKubeconfig}.source = mkIf (!isNull cfg.etcClusterAdminKubeconfig)

     

       274
        
               clusterAdminKubeconfig;

     

       275
        
       

     

       276
        
             environment.systemPackages = mkIf (top.kubelet.enable || top.proxy.enable) [

···

       270
        
                 '';

     

       271
        
               })]);

     

       272
        
       

     

       273
       +
             environment.etc.${cfg.etcClusterAdminKubeconfig}.source = mkIf (cfg.etcClusterAdminKubeconfig != null)

     

       274
        
               clusterAdminKubeconfig;

     

       275
        
       

     

       276
        
             environment.systemPackages = mkIf (top.kubelet.enable || top.proxy.enable) [

+2 -2

nixos/modules/services/hardware/undervolt.nix

···

       5
        
         cfg = config.services.undervolt;

     

       6
        
       

     

       7
        
         mkPLimit = limit: window:

     

       8
       -
           if (isNull limit && isNull window) then null

     

       9
       -
           else assert asserts.assertMsg (!isNull limit && !isNull window) "Both power limit and window must be set";

     

       10
        
             "${toString limit} ${toString window}";

     

       11
        
         cliArgs = lib.cli.toGNUCommandLine {} {

     

       12
        
           inherit (cfg)

···

       5
        
         cfg = config.services.undervolt;

     

       6
        
       

     

       7
        
         mkPLimit = limit: window:

     

       8
       +
           if (limit == null && window == null) then null

     

       9
       +
           else assert asserts.assertMsg (limit != null && window != null) "Both power limit and window must be set";

     

       10
        
             "${toString limit} ${toString window}";

     

       11
        
         cliArgs = lib.cli.toGNUCommandLine {} {

     

       12
        
           inherit (cfg)

+1 -1

nixos/modules/services/home-automation/home-assistant.nix

···

       362
        
         config = mkIf cfg.enable {

     

       363
        
           assertions = [

     

       364
        
             {

     

       365
       -
               assertion = cfg.openFirewall -> !isNull cfg.config;

     

       366
        
               message = "openFirewall can only be used with a declarative config";

     

       367
        
             }

     

       368
        
           ];

···

       362
        
         config = mkIf cfg.enable {

     

       363
        
           assertions = [

     

       364
        
             {

     

       365
       +
               assertion = cfg.openFirewall -> cfg.config != null;

     

       366
        
               message = "openFirewall can only be used with a declarative config";

     

       367
        
             }

     

       368
        
           ];

+4 -4

nixos/modules/services/networking/multipath.nix

···

       513
        
               ${indentLines 2 devices}

     

       514
        
               }

     

       515
        
       

     

       516
       -
               ${optionalString (!isNull defaults) ''

     

       517
        
                 defaults {

     

       518
        
                 ${indentLines 2 defaults}

     

       519
        
                 }

     

       520
        
               ''}

     

       521
       -
               ${optionalString (!isNull blacklist) ''

     

       522
        
                 blacklist {

     

       523
        
                 ${indentLines 2 blacklist}

     

       524
        
                 }

     

       525
        
               ''}

     

       526
       -
               ${optionalString (!isNull blacklist_exceptions) ''

     

       527
        
                 blacklist_exceptions {

     

       528
        
                 ${indentLines 2 blacklist_exceptions}

     

       529
        
                 }

     

       530
        
               ''}

     

       531
       -
               ${optionalString (!isNull overrides) ''

     

       532
        
                 overrides {

     

       533
        
                 ${indentLines 2 overrides}

     

       534
        
                 }

···

       513
        
               ${indentLines 2 devices}

     

       514
        
               }

     

       515
        
       

     

       516
       +
               ${optionalString (defaults != null) ''

     

       517
        
                 defaults {

     

       518
        
                 ${indentLines 2 defaults}

     

       519
        
                 }

     

       520
        
               ''}

     

       521
       +
               ${optionalString (blacklist != null) ''

     

       522
        
                 blacklist {

     

       523
        
                 ${indentLines 2 blacklist}

     

       524
        
                 }

     

       525
        
               ''}

     

       526
       +
               ${optionalString (blacklist_exceptions != null) ''

     

       527
        
                 blacklist_exceptions {

     

       528
        
                 ${indentLines 2 blacklist_exceptions}

     

       529
        
                 }

     

       530
        
               ''}

     

       531
       +
               ${optionalString (overrides != null) ''

     

       532
        
                 overrides {

     

       533
        
                 ${indentLines 2 overrides}

     

       534
        
                 }

+3 -3

nixos/modules/services/networking/radicale.nix

···

       9
        
           listToValue = concatMapStringsSep ", " (generators.mkValueStringDefault { });

     

       10
        
         };

     

       11
        
       

     

       12
       -
         pkg = if isNull cfg.package then

     

       13
        
           pkgs.radicale

     

       14
        
         else

     

       15
        
           cfg.package;

     
···

       117
        
             }

     

       118
        
           ];

     

       119
        
       

     

       120
       -
           warnings = optional (isNull cfg.package && versionOlder config.system.stateVersion "17.09") ''

     

       121
        
             The configuration and storage formats of your existing Radicale

     

       122
        
             installation might be incompatible with the newest version.

     

       123
        
             For upgrade instructions see

     

       124
        
             https://radicale.org/2.1.html#documentation/migration-from-1xx-to-2xx.

     

       125
        
             Set services.radicale.package to suppress this warning.

     

       126
       -
           '' ++ optional (isNull cfg.package && versionOlder config.system.stateVersion "20.09") ''

     

       127
        
             The configuration format of your existing Radicale installation might be

     

       128
        
             incompatible with the newest version.  For upgrade instructions see

     

       129
        
             https://github.com/Kozea/Radicale/blob/3.0.6/NEWS.md#upgrade-checklist.

···

       9
        
           listToValue = concatMapStringsSep ", " (generators.mkValueStringDefault { });

     

       10
        
         };

     

       11
        
       

     

       12
       +
         pkg = if cfg.package == null then

     

       13
        
           pkgs.radicale

     

       14
        
         else

     

       15
        
           cfg.package;

     
···

       117
        
             }

     

       118
        
           ];

     

       119
        
       

     

       120
       +
           warnings = optional (cfg.package == null && versionOlder config.system.stateVersion "17.09") ''

     

       121
        
             The configuration and storage formats of your existing Radicale

     

       122
        
             installation might be incompatible with the newest version.

     

       123
        
             For upgrade instructions see

     

       124
        
             https://radicale.org/2.1.html#documentation/migration-from-1xx-to-2xx.

     

       125
        
             Set services.radicale.package to suppress this warning.

     

       126
       +
           '' ++ optional (cfg.package == null && versionOlder config.system.stateVersion "20.09") ''

     

       127
        
             The configuration format of your existing Radicale installation might be

     

       128
        
             incompatible with the newest version.  For upgrade instructions see

     

       129
        
             https://github.com/Kozea/Radicale/blob/3.0.6/NEWS.md#upgrade-checklist.

+1 -1

nixos/modules/services/system/self-deploy.nix

···

       132
        
       

     

       133
        
             requires = lib.mkIf (!(isPathType cfg.repository)) [ "network-online.target" ];

     

       134
        
       

     

       135
       -
             environment.GIT_SSH_COMMAND = lib.mkIf (!(isNull cfg.sshKeyFile))

     

       136
        
               "${pkgs.openssh}/bin/ssh -i ${lib.escapeShellArg cfg.sshKeyFile}";

     

       137
        
       

     

       138
        
             restartIfChanged = false;

···

       132
        
       

     

       133
        
             requires = lib.mkIf (!(isPathType cfg.repository)) [ "network-online.target" ];

     

       134
        
       

     

       135
       +
             environment.GIT_SSH_COMMAND = lib.mkIf (cfg.sshKeyFile != null)

     

       136
        
               "${pkgs.openssh}/bin/ssh -i ${lib.escapeShellArg cfg.sshKeyFile}";

     

       137
        
       

     

       138
        
             restartIfChanged = false;

+1 -1

nixos/modules/services/web-apps/dolibarr.nix

···

       16
        
               if (any (str: k == str) secretKeys) then v

     

       17
        
               else if isString v then "'${v}'"

     

       18
        
               else if isBool v then boolToString v

     

       19
       -
               else if isNull v then "null"

     

       20
        
               else toString v

     

       21
        
             ;

     

       22
        
           in

···

       16
        
               if (any (str: k == str) secretKeys) then v

     

       17
        
               else if isString v then "'${v}'"

     

       18
        
               else if isBool v then boolToString v

     

       19
       +
               else if v == null then "null"

     

       20
        
               else toString v

     

       21
        
             ;

     

       22
        
           in

+5 -6

nixos/modules/services/web-apps/writefreely.nix

···

       10
        
         format = pkgs.formats.ini {

     

       11
        
           mkKeyValue = key: value:

     

       12
        
             let

     

       13
       -
               value' = if builtins.isNull value then

     

       14
       -
                 ""

     

       15
       -
               else if builtins.isBool value then

     

       16
       -
                 if value == true then "true" else "false"

     

       17
       -
               else

     

       18
       -
                 toString value;

     

       19
        
             in "${key} = ${value'}";

     

       20
        
         };

     

       21

···

       10
        
         format = pkgs.formats.ini {

     

       11
        
           mkKeyValue = key: value:

     

       12
        
             let

     

       13
       +
               value' = lib.optionalString (value != null)

     

       14
       +
                 (if builtins.isBool value then

     

       15
       +
                   if value == true then "true" else "false"

     

       16
       +
                 else

     

       17
       +
                   toString value);

     

       0
        
       
     

       18
        
             in "${key} = ${value'}";

     

       19
        
         };

     

       20

+11 -2

nixos/tests/login.nix

···

       13
        
           };

     

       14
        
       

     

       15
        
         testScript = ''

     

       0
        
       
     

       0
        
       
     

       16
        
             machine.wait_for_unit("multi-user.target")

     

       17
        
             machine.wait_until_succeeds("pgrep -f 'agetty.*tty1'")

     

       18
        
             machine.screenshot("postboot")

     
···

       53
        
                 machine.screenshot("getty")

     

       54
        
       

     

       55
        
             with subtest("Check whether ctrl-alt-delete works"):

     

       56
       -
                 machine.send_key("ctrl-alt-delete")

     

       57
       -
                 machine.wait_for_shutdown()

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       58
        
         '';

     

       59
        
       })

···

       13
        
           };

     

       14
        
       

     

       15
        
         testScript = ''

     

       16
       +
             machine.start(allow_reboot = True)

     

       17
       +
       

     

       18
        
             machine.wait_for_unit("multi-user.target")

     

       19
        
             machine.wait_until_succeeds("pgrep -f 'agetty.*tty1'")

     

       20
        
             machine.screenshot("postboot")

     
···

       55
        
                 machine.screenshot("getty")

     

       56
        
       

     

       57
        
             with subtest("Check whether ctrl-alt-delete works"):

     

       58
       +
                 boot_id1 = machine.succeed("cat /proc/sys/kernel/random/boot_id").strip()

     

       59
       +
                 assert boot_id1 != ""

     

       60
       +
       

     

       61
       +
                 machine.reboot()

     

       62
       +
       

     

       63
       +
                 boot_id2 = machine.succeed("cat /proc/sys/kernel/random/boot_id").strip()

     

       64
       +
                 assert boot_id2 != ""

     

       65
       +
       

     

       66
       +
                 assert boot_id1 != boot_id2

     

       67
        
         '';

     

       68
        
       })

+2 -2

pkgs/applications/audio/ardour/default.nix

···

       58
        
       }:

     

       59
        
       stdenv.mkDerivation rec {

     

       60
        
         pname = "ardour";

     

       61
       -
         version = "7.1";

     

       62
        
       

     

       63
        
         # We can't use `fetchFromGitea` here, as attempting to fetch release archives from git.ardour.org

     

       64
        
         # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info.

     

       65
        
         src = fetchgit {

     

       66
        
           url = "git://git.ardour.org/ardour/ardour.git";

     

       67
        
           rev = version;

     

       68
       -
           hash = "sha256-eLF9n71tjdPA+ks0B8UonmPZqRgcZEA7ok79+m9PioU=";

     

       69
        
         };

     

       70
        
       

     

       71
        
         bundledContent = fetchzip {

···

       58
        
       }:

     

       59
        
       stdenv.mkDerivation rec {

     

       60
        
         pname = "ardour";

     

       61
       +
         version = "7.3";

     

       62
        
       

     

       63
        
         # We can't use `fetchFromGitea` here, as attempting to fetch release archives from git.ardour.org

     

       64
        
         # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info.

     

       65
        
         src = fetchgit {

     

       66
        
           url = "git://git.ardour.org/ardour/ardour.git";

     

       67
        
           rev = version;

     

       68
       +
           hash = "sha256-fDZGmKQ6qgENkq8NY/J67Jym+IXoOYs8DT4xyPXLcC4=";

     

       69
        
         };

     

       70
        
       

     

       71
        
         bundledContent = fetchzip {

+1 -1

pkgs/applications/audio/cmus/default.nix

···

       20
        
       , cddbSupport ? true, libcddb ? null

     

       21
        
       , cdioSupport ? true, libcdio ? null, libcdio-paranoia ? null

     

       22
        
       , cueSupport ? true, libcue ? null

     

       23
       -
       , discidSupport ? (!stdenv.isDarwin), libdiscid ? null

     

       24
        
       , ffmpegSupport ? true, ffmpeg ? null

     

       25
        
       , flacSupport ? true, flac ? null

     

       26
        
       , madSupport ? true, libmad ? null

···

       20
        
       , cddbSupport ? true, libcddb ? null

     

       21
        
       , cdioSupport ? true, libcdio ? null, libcdio-paranoia ? null

     

       22
        
       , cueSupport ? true, libcue ? null

     

       23
       +
       , discidSupport ? false, libdiscid ? null

     

       24
        
       , ffmpegSupport ? true, ffmpeg ? null

     

       25
        
       , flacSupport ? true, flac ? null

     

       26
        
       , madSupport ? true, libmad ? null

+7 -7

pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix

···

       73
        
               error = sourceArgs.error or args.error or null;

     

       74
        
               hasSource = lib.hasAttr variant args;

     

       75
        
               pname = builtins.replaceStrings [ "@" ] [ "at" ] ename;

     

       76
       -
               broken = ! isNull error;

     

       77
        
             in

     

       78
        
             if hasSource then

     

       79
        
               lib.nameValuePair ename (

     

       80
        
                 self.callPackage ({ melpaBuild, fetchurl, ... }@pkgargs:

     

       81
        
                 melpaBuild {

     

       82
        
                   inherit pname ename commit;

     

       83
       -
                   version = if isNull version then "" else

     

       84
       -
                     lib.concatStringsSep "." (map toString

     

       85
        
                       # Hack: Melpa archives contains versions with parse errors such as [ 4 4 -4 413 ] which should be 4.4-413

     

       86
        
                       # This filter method is still technically wrong, but it's computationally cheap enough and tapers over the issue

     

       87
       -
                       (builtins.filter (n: n >= 0) version));

     

       88
        
                   # TODO: Broken should not result in src being null (hack to avoid eval errors)

     

       89
       -
                   src = if (isNull sha256 || broken) then null else

     

       90
        
                     lib.getAttr fetcher (fetcherGenerators args sourceArgs);

     

       91
       -
                   recipe = if isNull commit then null else

     

       92
        
                     fetchurl {

     

       93
        
                       name = pname + "-recipe";

     

       94
        
                       url = "https://raw.githubusercontent.com/melpa/melpa/${commit}/recipes/${ename}";

     

       95
        
                       inherit sha256;

     

       96
        
                     };

     

       97
       -
                   packageRequires = lib.optionals (! isNull deps)

     

       98
        
                     (map (dep: pkgargs.${dep} or self.${dep} or null)

     

       99
        
                          deps);

     

       100
        
                   meta = (sourceArgs.meta or {}) // {

···

       73
        
               error = sourceArgs.error or args.error or null;

     

       74
        
               hasSource = lib.hasAttr variant args;

     

       75
        
               pname = builtins.replaceStrings [ "@" ] [ "at" ] ename;

     

       76
       +
               broken = error != null;

     

       77
        
             in

     

       78
        
             if hasSource then

     

       79
        
               lib.nameValuePair ename (

     

       80
        
                 self.callPackage ({ melpaBuild, fetchurl, ... }@pkgargs:

     

       81
        
                 melpaBuild {

     

       82
        
                   inherit pname ename commit;

     

       83
       +
                   version = lib.optionalString (version != null)

     

       84
       +
                     (lib.concatStringsSep "." (map toString

     

       85
        
                       # Hack: Melpa archives contains versions with parse errors such as [ 4 4 -4 413 ] which should be 4.4-413

     

       86
        
                       # This filter method is still technically wrong, but it's computationally cheap enough and tapers over the issue

     

       87
       +
                       (builtins.filter (n: n >= 0) version)));

     

       88
        
                   # TODO: Broken should not result in src being null (hack to avoid eval errors)

     

       89
       +
                   src = if (sha256 == null || broken) then null else

     

       90
        
                     lib.getAttr fetcher (fetcherGenerators args sourceArgs);

     

       91
       +
                   recipe = if commit == null then null else

     

       92
        
                     fetchurl {

     

       93
        
                       name = pname + "-recipe";

     

       94
        
                       url = "https://raw.githubusercontent.com/melpa/melpa/${commit}/recipes/${ename}";

     

       95
        
                       inherit sha256;

     

       96
        
                     };

     

       97
       +
                   packageRequires = lib.optionals (deps != null)

     

       98
        
                     (map (dep: pkgargs.${dep} or self.${dep} or null)

     

       99
        
                          deps);

     

       100
        
                   meta = (sourceArgs.meta or {}) // {

+2 -2

pkgs/applications/editors/okteta/default.nix

···

       4
        
       

     

       5
        
       mkDerivation rec {

     

       6
        
         pname = "okteta";

     

       7
       -
         version = "0.26.9";

     

       8
        
       

     

       9
        
         src = fetchurl {

     

       10
        
           url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz";

     

       11
       -
           sha256 = "sha256-FoVMTU6Ug4IZrjEVpCujhf2lyH3GyYZayQ03dPjQX/s=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];

···

       4
        
       

     

       5
        
       mkDerivation rec {

     

       6
        
         pname = "okteta";

     

       7
       +
         version = "0.26.10";

     

       8
        
       

     

       9
        
         src = fetchurl {

     

       10
        
           url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz";

     

       11
       +
           sha256 = "sha256-KKYU9+DDK0kXperKfgxuysqHsTGRq1NKtAT1Vps8M/o=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];

+8 -4

pkgs/applications/editors/vscode/extensions/default.nix

···

       753
        
               mktplcRef = {

     

       754
        
                 name = "vscode-eslint";

     

       755
        
                 publisher = "dbaeumer";

     

       756
       -
                 version = "2.2.6";

     

       757
       -
                 sha256 = "sha256-1yZeyLrXuubhKzobWcd00F/CdU824uJDTkB6qlHkJlQ=";

     

       758
        
               };

     

       759
        
               meta = with lib; {

     

       760
        
                 changelog = "https://marketplace.visualstudio.com/items/dbaeumer.vscode-eslint/changelog";

     
···

       927
        
               mktplcRef = {

     

       928
        
                 name = "gitlens";

     

       929
        
                 publisher = "eamodio";

     

       930
       -
                 version = "2023.3.1505";

     

       931
       -
                 sha256 = "sha256-USAbI2x6UftNfIEJy2Pbqa/BTYJnUBCNjsdm0Pfrz0o=";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       932
        
               };

     

       933
        
               meta = with lib; {

     

       934
        
                 changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";

···

       753
        
               mktplcRef = {

     

       754
        
                 name = "vscode-eslint";

     

       755
        
                 publisher = "dbaeumer";

     

       756
       +
                 version = "2.4.0";

     

       757
       +
                 sha256 = "sha256-7MUQJkLPOF3oO0kpmfP3bWbS3aT7J0RF7f74LW55BQs=";

     

       758
        
               };

     

       759
        
               meta = with lib; {

     

       760
        
                 changelog = "https://marketplace.visualstudio.com/items/dbaeumer.vscode-eslint/changelog";

     
···

       927
        
               mktplcRef = {

     

       928
        
                 name = "gitlens";

     

       929
        
                 publisher = "eamodio";

     

       930
       +
                 # Stable versions are listed on the GitHub releases page and use a

     

       931
       +
                 # semver scheme, contrary to preview versions which are listed on

     

       932
       +
                 # the VSCode Marketplace and use a calver scheme. We should avoid

     

       933
       +
                 # using preview versions, because they expire after two weeks.

     

       934
       +
                 version = "13.3.2";

     

       935
       +
                 sha256 = "sha256-4o4dmjio/I531szcoeGPVtfrNAyRAPJRrmsNny/PY2w=";

     

       936
        
               };

     

       937
        
               meta = with lib; {

     

       938
        
                 changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";

+7 -84

pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix

···

       2
        
       #  -  <https://github.com/msteen/nixos-vsliveshare/blob/master/pkgs/vsliveshare/default.nix>

     

       3
        
       #  -  <https://github.com/NixOS/nixpkgs/issues/41189>

     

       4
        
       { lib, gccStdenv, vscode-utils

     

       5
       -
       , jq, autoPatchelfHook, bash, makeWrapper

     

       6
       -
       , dotnet-sdk_3, curl, gcc, icu, libkrb5, libsecret, libunwind, libX11, lttng-ust, openssl, util-linux, zlib

     

       7
       -
       , desktop-file-utils, xprop, xsel

     

       8
        
       }:

     

       9
        
       

     

       10
        
       let

     

       11
        
         # https://docs.microsoft.com/en-us/visualstudio/liveshare/reference/linux#install-prerequisites-manually

     

       12
        
         libs = [

     

       13
       -
           # .NET Core

     

       14
       -
           openssl

     

       15
       -
           libkrb5

     

       16
       -
           zlib

     

       17
       -
           icu

     

       18
       -
       

     

       19
        
           # Credential Storage

     

       20
        
           libsecret

     

       21
        
       

     
···

       36
        
         mktplcRef = {

     

       37
        
           name = "vsliveshare";

     

       38
        
           publisher = "ms-vsliveshare";

     

       39
       -
           version = "1.0.5043";

     

       40
       -
           sha256 = "OdFOFvidUV/trySHvF8iELPNVP2kq8+vZQ4q4Nf7SiQ=";

     

       41
        
         };

     

       42
       -
       }).overrideAttrs({ nativeBuildInputs ? [], buildInputs ? [], ... }: {

     

       43
       -
         nativeBuildInputs = nativeBuildInputs ++ [

     

       44
       -
           jq

     

       45
       -
           autoPatchelfHook

     

       46
       -
           makeWrapper

     

       47
       -
         ];

     

       48
        
         buildInputs = buildInputs ++ libs;

     

       49
        
       

     

       50
        
         # Using a patch file won't work, because the file changes too often, causing the patch to fail on most updates.

     

       51
        
         # Rather than patching the calls to functions, we modify the functions to return what we want,

     

       52
        
         # which is less likely to break in the future.

     

       53
        
         postPatch = ''

     

       54
       -
           sed -i \

     

       55
       -
             -e 's/updateExecutablePermissionsAsync() {/& return;/' \

     

       56
       -
             -e 's/isInstallCorrupt(traceSource, manifest) {/& return false;/' \

     

       57
       -
             out/prod/extension-prod.js

     

       58
       -
       

     

       59
       -
           declare ext_unique_id

     

       60
       -
           ext_unique_id="$(basename "$out")"

     

       61
       -
       

     

       62
       -
           # Fix extension attempting to write to 'modifiedInternalSettings.json'.

     

       63
       -
           # Move this write to the tmp directory indexed by the nix store basename.

     

       64
       -
           substituteInPlace out/prod/extension-prod.js \

     

       65
       -
             --replace "path.resolve(constants_1.EXTENSION_ROOT_PATH, './modifiedInternalSettings.json')" \

     

       66
       -
                       "path.join(os.tmpdir(), '$ext_unique_id-modifiedInternalSettings.json')"

     

       67
       -
       

     

       68
       -
           # Fix extension attempting to write to 'vsls-agent.lock'.

     

       69
       -
           # Move this write to the tmp directory indexed by the nix store basename.

     

       70
       -
           substituteInPlace out/prod/extension-prod.js \

     

       71
       -
             --replace "path + '.lock'" \

     

       72
       -
                       "__webpack_require__('path').join(__webpack_require__('os').tmpdir(), '$ext_unique_id-vsls-agent.lock')"

     

       73
       -
       

     

       74
       -
           # Hardcode executable paths

     

       75
       -
           echo '#!/bin/sh' >node_modules/@vsliveshare/vscode-launcher-linux/check-reqs.sh

     

       76
       -
           substituteInPlace node_modules/@vsliveshare/vscode-launcher-linux/install.sh \

     

       77
       -
             --replace desktop-file-install ${desktop-file-utils}/bin/desktop-file-install

     

       78
       -
           substituteInPlace node_modules/@vsliveshare/vscode-launcher-linux/uninstall.sh \

     

       79
       -
             --replace update-desktop-database ${desktop-file-utils}/bin/update-desktop-database

     

       80
       -
           substituteInPlace node_modules/@vsliveshare/vscode-launcher-linux/vsls-launcher \

     

       81
       -
             --replace /bin/bash ${bash}/bin/bash

     

       82
       -
           substituteInPlace out/prod/extension-prod.js \

     

       83
       -
             --replace xprop ${xprop}/bin/xprop \

     

       84
        
             --replace "'xsel'" "'${xsel}/bin/xsel'"

     

       85
       -
         '';

     

       86
       -
       

     

       87
       -
         postInstall = ''

     

       88
       -
           cd $out/share/vscode/extensions/ms-vsliveshare.vsliveshare

     

       89
       -
       

     

       90
       -
           bash -s <<ENDSUBSHELL

     

       91
       -
           shopt -s extglob

     

       92
       -
       

     

       93
       -
           # A workaround to prevent the journal filling up due to diagnostic logging.

     

       94
       -
           # See: https://github.com/MicrosoftDocs/live-share/issues/1272

     

       95
       -
           # See: https://unix.stackexchange.com/questions/481799/how-to-prevent-a-process-from-writing-to-the-systemd-journal

     

       96
       -
           gcc -fPIC -shared -ldl -o dotnet_modules/noop-syslog.so ${./noop-syslog.c}

     

       97
       -
       

     

       98
       -
           # Normally the copying of the right executables is done externally at a later time,

     

       99
       -
           # but we want it done at installation time.

     

       100
       -
           cp dotnet_modules/exes/linux-x64/* dotnet_modules

     

       101
       -
       

     

       102
       -
           # The required executables are already copied over,

     

       103
       -
           # and the other runtimes won't be used and thus are just a waste of space.

     

       104
       -
           rm -r dotnet_modules/exes dotnet_modules/runtimes/!(linux-x64|unix)

     

       105
       -
       

     

       106
       -
           # Not all executables and libraries are executable, so make sure that they are.

     

       107
       -
           jq <package.json '.executables.linux[]' -r | xargs chmod +x

     

       108
       -
       

     

       109
       -
           # Lock the extension downloader.

     

       110
       -
           touch install-linux.Lock externalDeps-linux.Lock

     

       111
       -
           ENDSUBSHELL

     

       112
       -
         '';

     

       113
       -
       

     

       114
       -
         postFixup = ''

     

       115
       -
           # We cannot use `wrapProgram`, because it will generate a relative path,

     

       116
       -
           # which will break when copying over the files.

     

       117
       -
           mv dotnet_modules/vsls-agent{,-wrapped}

     

       118
       -
           makeWrapper $PWD/dotnet_modules/vsls-agent{-wrapped,} \

     

       119
       -
             --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libs}" \

     

       120
       -
             --set LD_PRELOAD $PWD/dotnet_modules/noop-syslog.so \

     

       121
       -
             --set DOTNET_ROOT ${dotnet-sdk_3}

     

       122
        
         '';

     

       123
        
       

     

       124
        
         meta = with lib; {

···

       2
        
       #  -  <https://github.com/msteen/nixos-vsliveshare/blob/master/pkgs/vsliveshare/default.nix>

     

       3
        
       #  -  <https://github.com/NixOS/nixpkgs/issues/41189>

     

       4
        
       { lib, gccStdenv, vscode-utils

     

       5
       +
       , autoPatchelfHook, bash, makeWrapper

     

       6
       +
       , curl, gcc, libsecret, libunwind, libX11, lttng-ust, util-linux

     

       7
       +
       , desktop-file-utils, xsel

     

       8
        
       }:

     

       9
        
       

     

       10
        
       let

     

       11
        
         # https://docs.microsoft.com/en-us/visualstudio/liveshare/reference/linux#install-prerequisites-manually

     

       12
        
         libs = [

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       13
        
           # Credential Storage

     

       14
        
           libsecret

     

       15
        
       

     
···

       30
        
         mktplcRef = {

     

       31
        
           name = "vsliveshare";

     

       32
        
           publisher = "ms-vsliveshare";

     

       33
       +
           version = "1.0.5834";

     

       34
       +
           sha256 = "sha256-+KfivY8W1VtUxhdXuUKI5e1elo6Ert1Tsf4xVXsKB3Y=";

     

       35
        
         };

     

       36
       +
       }).overrideAttrs({ buildInputs ? [], ... }: {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       37
        
         buildInputs = buildInputs ++ libs;

     

       38
        
       

     

       39
        
         # Using a patch file won't work, because the file changes too often, causing the patch to fail on most updates.

     

       40
        
         # Rather than patching the calls to functions, we modify the functions to return what we want,

     

       41
        
         # which is less likely to break in the future.

     

       42
        
         postPatch = ''

     

       43
       +
           substituteInPlace extension.js \

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       44
        
             --replace "'xsel'" "'${xsel}/bin/xsel'"

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       45
        
         '';

     

       46
        
       

     

       47
        
         meta = with lib; {

-1

pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/noop-syslog.c

···

       1
       -
       void syslog(int priority, const char *format, ...) { }

···

       0

+16 -3

pkgs/applications/graphics/shotwell/default.nix

···

       1
       -
       { lib, stdenv

     

       0
        
       
     

       2
        
       , fetchurl

     

       0
        
       
     

       3
        
       , meson

     

       4
        
       , ninja

     

       5
        
       , gtk3

     
···

       31
        
       , gobject-introspection

     

       32
        
       , itstool

     

       33
        
       , libsecret

     

       0
        
       
     

       34
        
       , gsettings-desktop-schemas

     

       35
        
       , python3

     

       36
        
       }:

     
···

       39
        
       

     

       40
        
       stdenv.mkDerivation rec {

     

       41
        
         pname = "shotwell";

     

       42
       -
         version = "0.31.5";

     

       43
        
       

     

       44
        
         src = fetchurl {

     

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

     

       46
       -
           sha256 = "sha256-OwSPxs6ZsjLR4OqbjbB0CDyGyI07bWMTaiz4IXqkXBk=";

     

       47
        
         };

     

       48
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       49
        
         nativeBuildInputs = [

     

       50
        
           meson

     

       51
        
           ninja

     
···

       86
        
           gcr

     

       87
        
           gnome.adwaita-icon-theme

     

       88
        
           libsecret

     

       0
        
       
     

       89
        
         ];

     

       90
        
       

     

       91
        
         postPatch = ''

···

       1
       +
       { lib

     

       2
       +
       , stdenv

     

       3
        
       , fetchurl

     

       4
       +
       , fetchpatch2

     

       5
        
       , meson

     

       6
        
       , ninja

     

       7
        
       , gtk3

     
···

       33
        
       , gobject-introspection

     

       34
        
       , itstool

     

       35
        
       , libsecret

     

       36
       +
       , libportal-gtk3

     

       37
        
       , gsettings-desktop-schemas

     

       38
        
       , python3

     

       39
        
       }:

     
···

       42
        
       

     

       43
        
       stdenv.mkDerivation rec {

     

       44
        
         pname = "shotwell";

     

       45
       +
         version = "0.31.7";

     

       46
        
       

     

       47
        
         src = fetchurl {

     

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

     

       49
       +
           sha256 = "sha256-gPCj2HVS+L3vpeNig77XZ9AFdtqMyWpEo9NKQjXEmeA=";

     

       50
        
         };

     

       51
        
       

     

       52
       +
         patches = [

     

       53
       +
           # Fix build with vala 0.56.4, can be removed on next update

     

       54
       +
           # https://gitlab.gnome.org/GNOME/shotwell/-/merge_requests/69

     

       55
       +
           (fetchpatch2 {

     

       56
       +
             url = "https://gitlab.gnome.org/GNOME/shotwell/-/commit/cd82759231e5ece2fa0dea40397c9051d15fd5c2.patch";

     

       57
       +
             hash = "sha256-Vy2kvUlmPdEEuPB1RTcI5pGYNveeiQ+lId0YVlWo4wU=";

     

       58
       +
           })

     

       59
       +
         ];

     

       60
       +
       

     

       61
        
         nativeBuildInputs = [

     

       62
        
           meson

     

       63
        
           ninja

     
···

       98
        
           gcr

     

       99
        
           gnome.adwaita-icon-theme

     

       100
        
           libsecret

     

       101
       +
           libportal-gtk3

     

       102
        
         ];

     

       103
        
       

     

       104
        
         postPatch = ''

+1 -2

pkgs/applications/misc/qMasterPassword/default.nix

···

       6
        
       , qmake

     

       7
        
       , qtbase

     

       8
        
       , qttools

     

       9
       -
       , qtwayland

     

       10
        
       , openssl

     

       11
        
       , libscrypt

     

       12
        
       , wrapQtAppsHook

     
···

       23
        
           sha256 = "sha256-VQ1ZkXaZ5sUbtWa/GreTr5uXvnZ2Go6owJ2ZBK25zns=";

     

       24
        
         };

     

       25
        
       

     

       26
       -
         buildInputs = [ qtbase qtwayland libX11 libXtst openssl libscrypt ];

     

       27
        
         nativeBuildInputs = [ qmake qttools wrapQtAppsHook ];

     

       28
        
       

     

       29
        
         # Upstream install is mostly defunct. It hardcodes target.path and doesn't

···

       6
        
       , qmake

     

       7
        
       , qtbase

     

       8
        
       , qttools

     

       0
        
       
     

       9
        
       , openssl

     

       10
        
       , libscrypt

     

       11
        
       , wrapQtAppsHook

     
···

       22
        
           sha256 = "sha256-VQ1ZkXaZ5sUbtWa/GreTr5uXvnZ2Go6owJ2ZBK25zns=";

     

       23
        
         };

     

       24
        
       

     

       25
       +
         buildInputs = [ qtbase libX11 libXtst openssl libscrypt ];

     

       26
        
         nativeBuildInputs = [ qmake qttools wrapQtAppsHook ];

     

       27
        
       

     

       28
        
         # Upstream install is mostly defunct. It hardcodes target.path and doesn't

+5 -5

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

···

       20
        
       }:

     

       21
        
       

     

       22
        
       let

     

       23
       -
         version = "3.0.0-571";

     

       24
        
         srcs = {

     

       25
        
           x86_64-linux = fetchurl {

     

       26
       -
             url = "https://dldir1.qq.com/qqfile/qq/QQNT/c005c911/linuxqq_${version}_amd64.deb";

     

       27
       -
             sha256 = "sha256-8KcUhZwgeFzGyrQITWnJUzEPGZOCj0LIHLmRuKqkgmQ=";

     

       28
        
           };

     

       29
        
           aarch64-linux = fetchurl {

     

       30
       -
             url = "https://dldir1.qq.com/qqfile/qq/QQNT/c005c911/linuxqq_${version}_arm64.deb";

     

       31
       -
             sha256 = "sha256-LvE+Pryq4KLu+BFYVrGiTwBdgOrBguPHQd73MMFlfiY=";

     

       32
        
           };

     

       33
        
         };

     

       34
        
         src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

···

       20
        
       }:

     

       21
        
       

     

       22
        
       let

     

       23
       +
         version = "3.1.0-9572";

     

       24
        
         srcs = {

     

       25
        
           x86_64-linux = fetchurl {

     

       26
       +
             url = "https://dldir1.qq.com/qqfile/qq/QQNT/4b2e3220/linuxqq_${version}_amd64.deb";

     

       27
       +
             sha256 = "sha256-xqbyyU4JSlYbAkJ/tqLoVPKfQvxYnMySRx7yV1EtDhM=";

     

       28
        
           };

     

       29
        
           aarch64-linux = fetchurl {

     

       30
       +
             url = "https://dldir1.qq.com/qqfile/qq/QQNT/4b2e3220/linuxqq_${version}_arm64.deb";

     

       31
       +
             sha256 = "sha256-ItZqhV9OmycdfRhlzP2llrzcIZvaiUC/LJiDJ/kNIkE=";

     

       32
        
           };

     

       33
        
         };

     

       34
        
         src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

+1 -1

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

···

       41
        
       

     

       42
        
       let

     

       43
        
         inherit (stdenv.hostPlatform) system;

     

       44
       -
         throwSystem = throw "Unsupported system: ${system}";

     

       45
        
       

     

       46
        
         pname = "slack";

     

       47

···

       41
        
       

     

       42
        
       let

     

       43
        
         inherit (stdenv.hostPlatform) system;

     

       44
       +
         throwSystem = throw "slack does not support system: ${system}";

     

       45
        
       

     

       46
        
         pname = "slack";

     

       47

+1 -1

pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix

···

       220
        
           changelog = "https://github.com/kotatogram/kotatogram-desktop/releases/tag/k{version}";

     

       221
        
           maintainers = with maintainers; [ ilya-fedin ];

     

       222
        
           # never built on aarch64-darwin since first introduction in nixpkgs

     

       223
       -
           broken = (stdenv.isDarwin && stdenv.isAarch64) || (stdenv.isLinux && stdenv.isAarch64);

     

       224
        
         };

     

       225
        
       }

···

       220
        
           changelog = "https://github.com/kotatogram/kotatogram-desktop/releases/tag/k{version}";

     

       221
        
           maintainers = with maintainers; [ ilya-fedin ];

     

       222
        
           # never built on aarch64-darwin since first introduction in nixpkgs

     

       223
       +
           broken = stdenv.isDarwin && stdenv.isAarch64;

     

       224
        
         };

     

       225
        
       }

+2 -2

pkgs/applications/networking/mailreaders/thunderbird/packages.nix

···

       5
        
       

     

       6
        
         thunderbird-102 = (buildMozillaMach rec {

     

       7
        
           pname = "thunderbird";

     

       8
       -
           version = "102.8.0";

     

       9
        
           application = "comm/mail";

     

       10
        
           applicationName = "Mozilla Thunderbird";

     

       11
        
           binaryName = pname;

     

       12
        
           src = fetchurl {

     

       13
        
             url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";

     

       14
       -
             sha512 = "2431eb8799184b261609c96bed3c9368bec9035a831aa5f744fa89e48aedb130385b268dd90f03bbddfec449dc3e5fad1b5f8727fe9e11e1d1f123a81b97ddf8";

     

       15
        
           };

     

       16
        
           extraPatches = [

     

       17
        
             # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.

···

       5
        
       

     

       6
        
         thunderbird-102 = (buildMozillaMach rec {

     

       7
        
           pname = "thunderbird";

     

       8
       +
           version = "102.9.0";

     

       9
        
           application = "comm/mail";

     

       10
        
           applicationName = "Mozilla Thunderbird";

     

       11
        
           binaryName = pname;

     

       12
        
           src = fetchurl {

     

       13
        
             url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";

     

       14
       +
             sha512 = "0de88cef22e7b239804e27705b577dd34a86487512bb2af29804b358d056628c14034a34cbbdded75612bda984fac2c04d116cca8040b9212a7fb0206c07c440";

     

       15
        
           };

     

       16
        
           extraPatches = [

     

       17
        
             # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.

+3 -3

pkgs/applications/science/electronics/horizon-eda/default.nix

···

       13
        
       , librsvg

     

       14
        
       , libspnav

     

       15
        
       , libuuid

     

       16
       -
       , opencascade

     

       17
        
       , pkg-config

     

       18
        
       , podofo

     

       19
        
       , python3

     
···

       44
        
           librsvg

     

       45
        
           libspnav

     

       46
        
           libuuid

     

       47
       -
           opencascade

     

       48
        
           podofo

     

       49
        
           python3

     

       50
        
           sqlite

     
···

       57
        
           wrapGAppsHook

     

       58
        
         ];

     

       59
        
       

     

       60
       -
         CASROOT = opencascade;

     

       61
        
       

     

       62
        
         installFlags = [

     

       63
        
           "INSTALL=${coreutils}/bin/install"

···

       13
        
       , librsvg

     

       14
        
       , libspnav

     

       15
        
       , libuuid

     

       16
       +
       , opencascade-occt

     

       17
        
       , pkg-config

     

       18
        
       , podofo

     

       19
        
       , python3

     
···

       44
        
           librsvg

     

       45
        
           libspnav

     

       46
        
           libuuid

     

       47
       +
           opencascade-occt

     

       48
        
           podofo

     

       49
        
           python3

     

       50
        
           sqlite

     
···

       57
        
           wrapGAppsHook

     

       58
        
         ];

     

       59
        
       

     

       60
       +
         CASROOT = opencascade-occt;

     

       61
        
       

     

       62
        
         installFlags = [

     

       63
        
           "INSTALL=${coreutils}/bin/install"

+2 -2

pkgs/applications/science/geometry/gama/default.nix

···

       1
        
       { stdenv, fetchurl, lib, expat, octave, libxml2, texinfo, zip }:

     

       2
        
       stdenv.mkDerivation rec {

     

       3
        
         pname = "gama";

     

       4
       -
         version = "2.23";

     

       5
        
       

     

       6
        
         src = fetchurl {

     

       7
        
           url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";

     

       8
       -
           sha256 = "sha256-OKVAgmHdhQoS3kCwclE9ljON3H2NVCCvpR2hgwfqnA0=";

     

       9
        
         };

     

       10
        
       

     

       11
        
         buildInputs = [ expat ];

···

       1
        
       { stdenv, fetchurl, lib, expat, octave, libxml2, texinfo, zip }:

     

       2
        
       stdenv.mkDerivation rec {

     

       3
        
         pname = "gama";

     

       4
       +
         version = "2.24";

     

       5
        
       

     

       6
        
         src = fetchurl {

     

       7
        
           url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";

     

       8
       +
           sha256 = "sha256-AIRqBSO71c26TeQwxjfAGIy8YQddF4tq+ZnWztroyRM=";

     

       9
        
         };

     

       10
        
       

     

       11
        
         buildInputs = [ expat ];

+1 -1

pkgs/applications/science/logic/coq/default.nix

···

       70
        
           substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp"

     

       71
        
           substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true"

     

       72
        
         '';

     

       73
       -
         ocamlPackages = if !isNull customOCamlPackages then customOCamlPackages

     

       74
        
           else with versions; switch coq-version [

     

       75
        
             { case = range "8.16" "8.17"; out = ocamlPackages_4_14; }

     

       76
        
             { case = range "8.14" "8.15"; out = ocamlPackages_4_12; }

···

       70
        
           substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp"

     

       71
        
           substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true"

     

       72
        
         '';

     

       73
       +
         ocamlPackages = if customOCamlPackages != null then customOCamlPackages

     

       74
        
           else with versions; switch coq-version [

     

       75
        
             { case = range "8.16" "8.17"; out = ocamlPackages_4_14; }

     

       76
        
             { case = range "8.14" "8.15"; out = ocamlPackages_4_12; }

+3 -3

pkgs/applications/virtualization/singularity/generic.nix

···

       76
        
       

     

       77
        
       let

     

       78
        
         defaultPathOriginal = "/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin";

     

       79
       -
         privileged-un-utils = if ((isNull newuidmapPath) && (isNull newgidmapPath)) then null else

     

       80
        
         (runCommandLocal "privileged-un-utils" { } ''

     

       81
        
           mkdir -p "$out/bin"

     

       82
        
           ln -s ${lib.escapeShellArg newuidmapPath} "$out/bin/newuidmap"

     
···

       212
        
               rm "$file"

     

       213
        
             done

     

       214
        
           ''}

     

       215
       -
           ${lib.optionalString enableSuid (lib.warnIf (isNull starterSuidPath) "${projectName}: Null starterSuidPath when enableSuid produces non-SUID-ed starter-suid and run-time permission denial." ''

     

       216
        
             chmod +x $out/libexec/${projectName}/bin/starter-suid

     

       217
        
           '')}

     

       218
       -
           ${lib.optionalString (enableSuid && !isNull starterSuidPath) ''

     

       219
        
             mv "$out"/libexec/${projectName}/bin/starter-suid{,.orig}

     

       220
        
             ln -s ${lib.escapeShellArg starterSuidPath} "$out/libexec/${projectName}/bin/starter-suid"

     

       221
        
           ''}

···

       76
        
       

     

       77
        
       let

     

       78
        
         defaultPathOriginal = "/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin";

     

       79
       +
         privileged-un-utils = if ((newuidmapPath == null) && (newgidmapPath == null)) then null else

     

       80
        
         (runCommandLocal "privileged-un-utils" { } ''

     

       81
        
           mkdir -p "$out/bin"

     

       82
        
           ln -s ${lib.escapeShellArg newuidmapPath} "$out/bin/newuidmap"

     
···

       212
        
               rm "$file"

     

       213
        
             done

     

       214
        
           ''}

     

       215
       +
           ${lib.optionalString enableSuid (lib.warnIf (starterSuidPath == null) "${projectName}: Null starterSuidPath when enableSuid produces non-SUID-ed starter-suid and run-time permission denial." ''

     

       216
        
             chmod +x $out/libexec/${projectName}/bin/starter-suid

     

       217
        
           '')}

     

       218
       +
           ${lib.optionalString (enableSuid && (starterSuidPath != null)) ''

     

       219
        
             mv "$out"/libexec/${projectName}/bin/starter-suid{,.orig}

     

       220
        
             ln -s ${lib.escapeShellArg starterSuidPath} "$out/libexec/${projectName}/bin/starter-suid"

     

       221
        
           ''}

+5 -5

pkgs/applications/window-managers/picom/picom-next.nix

···

       1
       -
       { pcre, pcre2, picom, lib, fetchFromGitHub }:

     

       2
        
       

     

       3
        
       picom.overrideAttrs (oldAttrs: rec {

     

       4
        
         pname = "picom-next";

     

       5
       -
         version = "unstable-2022-12-23";

     

       6
       -
         buildInputs = [ pcre2 ] ++ lib.remove pcre oldAttrs.buildInputs;

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "yshui";

     

       9
        
           repo = "picom";

     

       10
       -
           rev = "60ac2b64db78363fe04189cc734daea3d721d87e";

     

       11
       -
           sha256 = "09s8kgczks01xbvg3qxqi2rz3lkzgdfyvhrj30mg6n11b6xfgi0d";

     

       12
        
         };

     

       13
        
         meta.maintainers = with lib.maintainers; oldAttrs.meta.maintainers ++ [ GKasparov ];

     

       14
        
       })

···

       1
       +
       { pcre, pcre2, libXinerama, picom, lib, fetchFromGitHub }:

     

       2
        
       

     

       3
        
       picom.overrideAttrs (oldAttrs: rec {

     

       4
        
         pname = "picom-next";

     

       5
       +
         version = "unstable-2023-01-29";

     

       6
       +
         buildInputs = [ pcre2 ] ++ lib.remove libXinerama (lib.remove pcre oldAttrs.buildInputs);

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "yshui";

     

       9
        
           repo = "picom";

     

       10
       +
           rev = "cee12875625465292bc11bf09dc8ab117cae75f4";

     

       11
       +
           sha256 = "sha256-lVwBwOvzn4ro1jInRuNvn1vQuwUHUp4MYrDaFRmW9pc=";

     

       12
        
         };

     

       13
        
         meta.maintainers = with lib.maintainers; oldAttrs.meta.maintainers ++ [ GKasparov ];

     

       14
        
       })

+1 -1

pkgs/build-support/coq/default.nix

···

       52
        
             inherit release releaseRev;

     

       53
        
             location = { inherit domain owner repo; };

     

       54
        
           } // optionalAttrs (args?fetcher) {inherit fetcher;});

     

       55
       -
         fetched = fetch (if !isNull version then version else defaultVersion);

     

       56
        
         display-pkg = n: sep: v:

     

       57
        
           let d = displayVersion.${n} or (if sep == "" then ".." else true); in

     

       58
        
           n + optionalString (v != "" && v != null) (switch d [

···

       52
        
             inherit release releaseRev;

     

       53
        
             location = { inherit domain owner repo; };

     

       54
        
           } // optionalAttrs (args?fetcher) {inherit fetcher;});

     

       55
       +
         fetched = fetch (if version != null then version else defaultVersion);

     

       56
        
         display-pkg = n: sep: v:

     

       57
        
           let d = displayVersion.${n} or (if sep == "" then ".." else true); in

     

       58
        
           n + optionalString (v != "" && v != null) (switch d [

+4 -4

pkgs/build-support/coq/meta-fetch/default.nix

···

       8
        
               fmt = if args?sha256 then "zip" else "tarball";

     

       9
        
               pr  = match "^#(.*)$" rev;

     

       10
        
               url = switch-if [

     

       11
       -
                 { cond = isNull pr && !isNull (match "^github.*" domain);

     

       12
        
                   out = "https://${domain}/${owner}/${repo}/archive/${rev}.${ext}"; }

     

       13
       -
                 { cond = !isNull pr && !isNull (match "^github.*" domain);

     

       14
        
                   out = "https://api.${domain}/repos/${owner}/${repo}/${fmt}/pull/${head pr}/head"; }

     

       15
       -
                 { cond = isNull pr && !isNull (match "^gitlab.*" domain);

     

       16
        
                   out = "https://${domain}/${owner}/${repo}/-/archive/${rev}/${repo}-${rev}.${ext}"; }

     

       17
       -
                 { cond = !isNull (match "(www.)?mpi-sws.org" domain);

     

       18
        
                   out = "https://www.mpi-sws.org/~${owner}/${repo}/download/${repo}-${rev}.${ext}";}

     

       19
        
               ] (throw "meta-fetch: no fetcher found for domain ${domain} on ${rev}");

     

       20
        
               fetch = x: if args?sha256 then fetchzip (x // { inherit sha256; }) else fetchTarball x;

···

       8
        
               fmt = if args?sha256 then "zip" else "tarball";

     

       9
        
               pr  = match "^#(.*)$" rev;

     

       10
        
               url = switch-if [

     

       11
       +
                 { cond = pr == null && (match "^github.*" domain) != null;

     

       12
        
                   out = "https://${domain}/${owner}/${repo}/archive/${rev}.${ext}"; }

     

       13
       +
                 { cond = pr != null && (match "^github.*" domain) != null;

     

       14
        
                   out = "https://api.${domain}/repos/${owner}/${repo}/${fmt}/pull/${head pr}/head"; }

     

       15
       +
                 { cond = pr == null && (match "^gitlab.*" domain) != null;

     

       16
        
                   out = "https://${domain}/${owner}/${repo}/-/archive/${rev}/${repo}-${rev}.${ext}"; }

     

       17
       +
                 { cond = (match "(www.)?mpi-sws.org" domain) != null;

     

       18
        
                   out = "https://www.mpi-sws.org/~${owner}/${repo}/download/${repo}-${rev}.${ext}";}

     

       19
        
               ] (throw "meta-fetch: no fetcher found for domain ${domain} on ${rev}");

     

       20
        
               fetch = x: if args?sha256 then fetchzip (x // { inherit sha256; }) else fetchTarball x;

+1 -1

pkgs/build-support/make-desktopitem/default.nix

···

       89
        
         renderSection = sectionName: attrs:

     

       90
        
           lib.pipe attrs [

     

       91
        
             (lib.mapAttrsToList renderLine)

     

       92
       -
             (builtins.filter (v: !isNull v))

     

       93
        
             (builtins.concatStringsSep "\n")

     

       94
        
             (section: ''

     

       95
        
               [${sectionName}]

···

       89
        
         renderSection = sectionName: attrs:

     

       90
        
           lib.pipe attrs [

     

       91
        
             (lib.mapAttrsToList renderLine)

     

       92
       +
             (builtins.filter (v: v != null))

     

       93
        
             (builtins.concatStringsSep "\n")

     

       94
        
             (section: ''

     

       95
        
               [${sectionName}]

+1 -1

pkgs/data/themes/orchis-theme/default.nix

···

       49
        
           runHook preInstall

     

       50
        
           bash install.sh -d $out/share/themes -t all \

     

       51
        
             ${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks} \

     

       52
       -
             ${lib.optionalString (!isNull border-radius) ("--round " + builtins.toString border-radius + "px")}

     

       53
        
           ${lib.optionalString withWallpapers ''

     

       54
        
             mkdir -p $out/share/backgrounds

     

       55
        
             cp src/wallpaper/{1080p,2k,4k}.jpg $out/share/backgrounds

···

       49
        
           runHook preInstall

     

       50
        
           bash install.sh -d $out/share/themes -t all \

     

       51
        
             ${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks} \

     

       52
       +
             ${lib.optionalString (border-radius != null) ("--round " + builtins.toString border-radius + "px")}

     

       53
        
           ${lib.optionalString withWallpapers ''

     

       54
        
             mkdir -p $out/share/backgrounds

     

       55
        
             cp src/wallpaper/{1080p,2k,4k}.jpg $out/share/backgrounds

+31 -8

pkgs/development/interpreters/dart/default.nix pkgs/development/compilers/dart/default.nix

···

       2
        
       , lib

     

       3
        
       , fetchurl

     

       4
        
       , unzip

     

       5
       -
       , version ? "2.18.0"

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       6
        
       , sources ? let

     

       7
        
           base = "https://storage.googleapis.com/dart-archive/channels";

     

       8
        
           x86_64 = "x64";

     

       9
        
           i686 = "ia32";

     

       10
        
           aarch64 = "arm64";

     

       11
       -
           # Make sure that if the user overrides version parameter they're

     

       12
       -
           # also need to override sources, to avoid mistakes

     

       13
       -
           version = "2.18.0";

     

       14
       -
         in

     

       15
        
         {

     

       16
        
           "${version}-aarch64-darwin" = fetchurl {

     

       17
        
             url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${aarch64}-release.zip";

     
···

       39
        
       assert version != null && version != "";

     

       40
        
       assert sources != null && (builtins.isAttrs sources);

     

       41
        
       

     

       42
       -
       stdenv.mkDerivation {

     

       43
        
         pname = "dart";

     

       44
        
         inherit version;

     

       45
        
       

     
···

       56
        
         '';

     

       57
        
       

     

       58
        
         libPath = lib.makeLibraryPath [ stdenv.cc.cc ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       59
        
       

     

       60
       -
         dontStrip = true;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       61
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       62
        
         meta = with lib; {

     

       63
        
           homepage = "https://www.dartlang.org/";

     

       64
        
           maintainers = with maintainers; [ grburst ];

     
···

       72
        
           sourceProvenance = with sourceTypes; [ binaryNativeCode ];

     

       73
        
           license = licenses.bsd3;

     

       74
        
         };

     

       75
       -
       }

···

       2
        
       , lib

     

       3
        
       , fetchurl

     

       4
        
       , unzip

     

       5
       +
       , runCommand

     

       6
       +
       , darwin

     

       7
       +
       # we need a way to build other dart versions

     

       8
       +
       # than the latest, because flutter might want

     

       9
       +
       # another version

     

       10
       +
       , version ? "2.19.3"

     

       11
        
       , sources ? let

     

       12
        
           base = "https://storage.googleapis.com/dart-archive/channels";

     

       13
        
           x86_64 = "x64";

     

       14
        
           i686 = "ia32";

     

       15
        
           aarch64 = "arm64";

     

       16
       +
       in

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       17
        
         {

     

       18
        
           "${version}-aarch64-darwin" = fetchurl {

     

       19
        
             url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${aarch64}-release.zip";

     
···

       41
        
       assert version != null && version != "";

     

       42
        
       assert sources != null && (builtins.isAttrs sources);

     

       43
        
       

     

       44
       +
       stdenv.mkDerivation (finalAttrs: {

     

       45
        
         pname = "dart";

     

       46
        
         inherit version;

     

       47
        
       

     
···

       58
        
         '';

     

       59
        
       

     

       60
        
         libPath = lib.makeLibraryPath [ stdenv.cc.cc ];

     

       61
       +
         dontStrip = true;

     

       62
       +
         passthru.tests = {

     

       63
       +
           testCreate = runCommand "dart-test-create" { nativeBuildInputs = [ finalAttrs.finalPackage ]; } ''

     

       64
       +
             PROJECTNAME="dart_test_project"

     

       65
       +
             dart create --no-pub $PROJECTNAME

     

       66
        
       

     

       67
       +
             [[ -d $PROJECTNAME ]]

     

       68
       +
             [[ -f $PROJECTNAME/bin/$PROJECTNAME.dart ]]

     

       69
       +
             touch $out

     

       70
       +
           '';

     

       71
       +
       

     

       72
       +
           testCompile = runCommand "dart-test-compile" {

     

       73
       +
             nativeBuildInputs = [ finalAttrs.finalPackage ]

     

       74
       +
               ++ lib.optionals stdenv.isDarwin [ darwin.cctools darwin.sigtool ];

     

       75
       +
           } ''

     

       76
       +
             HELLO_MESSAGE="Hello, world!"

     

       77
       +
             echo "void main() => print('$HELLO_MESSAGE');" > hello.dart

     

       78
       +
             dart compile exe hello.dart

     

       79
       +
             PROGRAM_OUT=$(./hello.exe)

     

       80
        
       

     

       81
       +
             [[ "$PROGRAM_OUT" == "$HELLO_MESSAGE" ]]

     

       82
       +
             touch $out

     

       83
       +
           '';

     

       84
       +
         };

     

       85
        
         meta = with lib; {

     

       86
        
           homepage = "https://www.dartlang.org/";

     

       87
        
           maintainers = with maintainers; [ grburst ];

     
···

       95
        
           sourceProvenance = with sourceTypes; [ binaryNativeCode ];

     

       96
        
           license = licenses.bsd3;

     

       97
        
         };

     

       98
       +
       })

+2 -2

pkgs/development/interpreters/tcl/8.5.nix

···

       2
        
       

     

       3
        
       callPackage ./generic.nix (args // rec {

     

       4
        
         release = "8.5";

     

       5
       -
         version = "${release}.18";

     

       6
        
       

     

       7
        
         # Note: when updating, the hash in pkgs/development/libraries/tk/8.5.nix must also be updated!

     

       8
        
       

     

       9
        
         src = fetchurl {

     

       10
        
           url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz";

     

       11
       -
           sha256 = "1jfkqp2fr0xh6xvaqx134hkfa5kh7agaqbxm6lhjbpvvc1xfaaq3";

     

       12
        
         };

     

       13
        
       })

···

       2
        
       

     

       3
        
       callPackage ./generic.nix (args // rec {

     

       4
        
         release = "8.5";

     

       5
       +
         version = "${release}.19";

     

       6
        
       

     

       7
        
         # Note: when updating, the hash in pkgs/development/libraries/tk/8.5.nix must also be updated!

     

       8
        
       

     

       9
        
         src = fetchurl {

     

       10
        
           url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz";

     

       11
       +
           sha256 = "066vlr9k5f44w9gl9382hlxnryq00d5p6c7w5vq1fgc7v9b49w6k";

     

       12
        
         };

     

       13
        
       })

+3 -3

pkgs/development/libraries/libdiscid/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "libdiscid";

     

       5
       -
         version = "0.6.2";

     

       6
        
       

     

       7
        
         nativeBuildInputs = [ cmake pkg-config ];

     

       8
        
       

     

       9
        
         buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ];

     

       10
        
       

     

       11
        
         src = fetchurl {

     

       12
       -
           url = "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${pname}-${version}.tar.gz";

     

       13
       -
           sha256 = "1f9irlj3dpb5gyfdnb1m4skbjvx4d4hwiz2152f83m0d9jn47r7r";

     

       14
        
         };

     

       15
        
       

     

       16
        
         NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreFoundation -framework IOKit";

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "libdiscid";

     

       5
       +
         version = "0.6.4";

     

       6
        
       

     

       7
        
         nativeBuildInputs = [ cmake pkg-config ];

     

       8
        
       

     

       9
        
         buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ];

     

       10
        
       

     

       11
        
         src = fetchurl {

     

       12
       +
           url = "http://ftp.musicbrainz.org/pub/musicbrainz/${pname}/${pname}-${version}.tar.gz";

     

       13
       +
           sha256 = "sha256-3V6PHJrq1ELiO3SanMkzY3LmLoitcHmitiiVsDkMsoI=";

     

       14
        
         };

     

       15
        
       

     

       16
        
         NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreFoundation -framework IOKit";

+2 -2

pkgs/development/libraries/mpich/default.nix

···

       11
        
       

     

       12
        
       stdenv.mkDerivation  rec {

     

       13
        
         pname = "mpich";

     

       14
       -
         version = "4.1";

     

       15
        
       

     

       16
        
         src = fetchurl {

     

       17
        
           url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz";

     

       18
       -
           sha256 = "sha256-ix7GO8RMfKoq+7RXvFs81KcNvka6unABI9Z8SNxatqA=";

     

       19
        
         };

     

       20
        
       

     

       21
        
         configureFlags = [

···

       11
        
       

     

       12
        
       stdenv.mkDerivation  rec {

     

       13
        
         pname = "mpich";

     

       14
       +
         version = "4.1.1";

     

       15
        
       

     

       16
        
         src = fetchurl {

     

       17
        
           url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz";

     

       18
       +
           sha256 = "sha256-7jBHGzXvh/TIj4caXirTgRzZxN8y/U8ThEMHL/QoTKI=";

     

       19
        
         };

     

       20
        
       

     

       21
        
         configureFlags = [

+1 -1

pkgs/development/libraries/tk/8.5.nix

···

       11
        
       

     

       12
        
         src = fetchurl {

     

       13
        
           url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz";

     

       14
       -
           sha256 = "0an3wqkjzlyyq6l9l3nawz76axsrsppbyylx0zk9lkv7llrala03";

     

       15
        
         };

     

       16
        
       

     

       17
        
         patches = lib.optionals stdenv.isDarwin [

···

       11
        
       

     

       12
        
         src = fetchurl {

     

       13
        
           url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz";

     

       14
       +
           sha256 = "1yhgcalldrjlc5q614rlzg1crgd3b52dhrk1pncdaxvl2vgg2yj0";

     

       15
        
         };

     

       16
        
       

     

       17
        
         patches = lib.optionals stdenv.isDarwin [

+1 -1

pkgs/development/libraries/volk/2.5.0.nix

···

       45
        
         nativeBuildInputs = [

     

       46
        
           cmake

     

       47
        
           python3

     

       48
       -
           python3.pkgs.Mako

     

       49
        
         ];

     

       50
        
       

     

       51
        
         doCheck = true;

···

       45
        
         nativeBuildInputs = [

     

       46
        
           cmake

     

       47
        
           python3

     

       48
       +
           python3.pkgs.mako

     

       49
        
         ];

     

       50
        
       

     

       51
        
         doCheck = true;

+4 -4

pkgs/development/nim-packages/build-nim-package/default.nix

···

       9
        
         depsBuildBuild = [ nim_builder ] ++ depsBuildBuild;

     

       10
        
         nativeBuildInputs = [ nim ] ++ nativeBuildInputs;

     

       11
        
       

     

       12
       -
         configurePhase = if isNull configurePhase then ''

     

       13
        
           runHook preConfigure

     

       14
        
           export NIX_NIM_BUILD_INPUTS=''${pkgsHostTarget[@]} $NIX_NIM_BUILD_INPUTS

     

       15
        
           nim_builder --phase:configure

     
···

       17
        
         '' else

     

       18
        
           configurePhase;

     

       19
        
       

     

       20
       -
         buildPhase = if isNull buildPhase then ''

     

       21
        
           runHook preBuild

     

       22
        
           nim_builder --phase:build

     

       23
        
           runHook postBuild

     

       24
        
         '' else

     

       25
        
           buildPhase;

     

       26
        
       

     

       27
       -
         checkPhase = if isNull checkPhase then ''

     

       28
        
           runHook preCheck

     

       29
        
           nim_builder --phase:check

     

       30
        
           runHook postCheck

     

       31
        
         '' else

     

       32
        
           checkPhase;

     

       33
        
       

     

       34
       -
         installPhase = if isNull installPhase then ''

     

       35
        
           runHook preInstall

     

       36
        
           nim_builder --phase:install

     

       37
        
           runHook postInstall

···

       9
        
         depsBuildBuild = [ nim_builder ] ++ depsBuildBuild;

     

       10
        
         nativeBuildInputs = [ nim ] ++ nativeBuildInputs;

     

       11
        
       

     

       12
       +
         configurePhase = if (configurePhase == null) then ''

     

       13
        
           runHook preConfigure

     

       14
        
           export NIX_NIM_BUILD_INPUTS=''${pkgsHostTarget[@]} $NIX_NIM_BUILD_INPUTS

     

       15
        
           nim_builder --phase:configure

     
···

       17
        
         '' else

     

       18
        
           configurePhase;

     

       19
        
       

     

       20
       +
         buildPhase = if (buildPhase == null) then ''

     

       21
        
           runHook preBuild

     

       22
        
           nim_builder --phase:build

     

       23
        
           runHook postBuild

     

       24
        
         '' else

     

       25
        
           buildPhase;

     

       26
        
       

     

       27
       +
         checkPhase = if (checkPhase == null) then ''

     

       28
        
           runHook preCheck

     

       29
        
           nim_builder --phase:check

     

       30
        
           runHook postCheck

     

       31
        
         '' else

     

       32
        
           checkPhase;

     

       33
        
       

     

       34
       +
         installPhase = if (installPhase == null) then ''

     

       35
        
           runHook preInstall

     

       36
        
           nim_builder --phase:install

     

       37
        
           runHook postInstall

+7 -4

pkgs/development/ocaml-modules/data-encoding/default.nix

···

       14
        
       , ppx_expect

     

       15
        
       }:

     

       16
        
       

     

       17
       -
       buildDunePackage {

     

       18
        
         pname = "data-encoding";

     

       19
       -
         version = "0.5.3";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       20
        
       

     

       21
        
         src = fetchFromGitLab {

     

       22
        
           owner = "nomadic-labs";

     

       23
        
           repo = "data-encoding";

     

       24
       -
           rev = "v0.5.3";

     

       25
       -
           sha256 = "sha256-HMNpjh5x7vU/kXQNRjJtOvShEENoNuxjNNPBJfm+Rhg=";

     

       26
        
         };

     

       27
        
       

     

       28
        
         propagatedBuildInputs = [

···

       14
        
       , ppx_expect

     

       15
        
       }:

     

       16
        
       

     

       17
       +
       buildDunePackage rec {

     

       18
        
         pname = "data-encoding";

     

       19
       +
         version = "0.6";

     

       20
       +
       

     

       21
       +
         duneVersion = "3";

     

       22
       +
         minimalOCamlVersion = "4.10";

     

       23
        
       

     

       24
        
         src = fetchFromGitLab {

     

       25
        
           owner = "nomadic-labs";

     

       26
        
           repo = "data-encoding";

     

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

     

       28
       +
           hash = "sha256-oQEV7lTG+/q1UcPsepPM4yN4qia6tEtRPkTkTVdGXE0=";

     

       29
        
         };

     

       30
        
       

     

       31
        
         propagatedBuildInputs = [

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

···

       4
        
         pname = "lru";

     

       5
        
         version = "0.3.1";

     

       6
        
       

     

       0
        
       
     

       0
        
       
     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://github.com/pqwy/lru/releases/download/v${version}/lru-${version}.tbz";

     

       9
        
           hash = "sha256-bL4j0np9WyRPhpwLiBQNR/cPQTpkYu81wACTJdSyNv0=";

···

       4
        
         pname = "lru";

     

       5
        
         version = "0.3.1";

     

       6
        
       

     

       7
       +
         duneVersion = "3";

     

       8
       +
       

     

       9
        
         src = fetchurl {

     

       10
        
           url = "https://github.com/pqwy/lru/releases/download/v${version}/lru-${version}.tbz";

     

       11
        
           hash = "sha256-bL4j0np9WyRPhpwLiBQNR/cPQTpkYu81wACTJdSyNv0=";

+5 -5

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

···

       1
        
       { lib, buildDunePackage, ocaml, fetchurl, seq, qcheck-alcotest }:

     

       2
        
       

     

       3
        
       buildDunePackage rec {

     

       4
       -
         minimumOCamlVersion = "4.03";

     

       5
        
         pname = "psq";

     

       6
       -
         version = "0.2.0";

     

       7
        
       

     

       8
       -
         useDune2 = true;

     

       9
        
       

     

       10
        
         src = fetchurl {

     

       11
       -
           url = "https://github.com/pqwy/psq/releases/download/v${version}/psq-v${version}.tbz";

     

       12
       -
           sha256 = "1j4lqkq17rskhgcrpgr4n1m1a2b1x35mlxj6f9g05rhpmgvgvknk";

     

       13
        
         };

     

       14
        
       

     

       15
        
         propagatedBuildInputs = [ seq ];

···

       1
        
       { lib, buildDunePackage, ocaml, fetchurl, seq, qcheck-alcotest }:

     

       2
        
       

     

       3
        
       buildDunePackage rec {

     

       4
       +
         minimalOCamlVersion = "4.03";

     

       5
        
         pname = "psq";

     

       6
       +
         version = "0.2.1";

     

       7
        
       

     

       8
       +
         duneVersion = "3";

     

       9
        
       

     

       10
        
         src = fetchurl {

     

       11
       +
           url = "https://github.com/pqwy/psq/releases/download/v${version}/psq-${version}.tbz";

     

       12
       +
           hash = "sha256-QgBfUz6r50sXme4yuJBWVM1moivtSvK9Jmso2EYs00Q=";

     

       13
        
         };

     

       14
        
       

     

       15
        
         propagatedBuildInputs = [ seq ];

+4 -4

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

···

       2
        
       

     

       3
        
       buildDunePackage rec {

     

       4
        
         pname = "terminal_size";

     

       5
       -
         version = "0.1.4";

     

       6
        
       

     

       7
       -
         useDune2 = true;

     

       8
        
       

     

       9
        
         src = fetchurl {

     

       10
       -
           url = "https://github.com/cryptosense/terminal_size/releases/download/v${version}/terminal_size-v${version}.tbz";

     

       11
       -
           sha256 = "fdca1fee7d872c4a8e5ab003d9915b6782b272e2a3661ca877f2d78dd25371a7";

     

       12
        
         };

     

       13
        
       

     

       14
        
         checkInputs = [ alcotest ];

···

       2
        
       

     

       3
        
       buildDunePackage rec {

     

       4
        
         pname = "terminal_size";

     

       5
       +
         version = "0.2.0";

     

       6
        
       

     

       7
       +
         duneVersion = "3";

     

       8
        
       

     

       9
        
         src = fetchurl {

     

       10
       +
           url = "https://github.com/cryptosense/terminal_size/releases/download/v${version}/terminal_size-${version}.tbz";

     

       11
       +
           hash = "sha256-1rYs0oxAcayFypUoCIdFwSTJCU7+rpFyJRRzb5lzsPs=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         checkInputs = [ alcotest ];

+2 -2

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

···

       12
        
       

     

       13
        
       buildPythonPackage rec {

     

       14
        
         pname = "aioesphomeapi";

     

       15
       -
         version = "13.5.0";

     

       16
        
         format = "setuptools";

     

       17
        
       

     

       18
        
         disabled = pythonOlder "3.9";

     
···

       21
        
           owner = "esphome";

     

       22
        
           repo = pname;

     

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

     

       24
       -
           hash = "sha256-e0gkjri3PknwY2Si6vJV8S2LNZI/0EBDC7mliI33aTU=";

     

       25
        
         };

     

       26
        
       

     

       27
        
         propagatedBuildInputs = [

···

       12
        
       

     

       13
        
       buildPythonPackage rec {

     

       14
        
         pname = "aioesphomeapi";

     

       15
       +
         version = "13.5.1";

     

       16
        
         format = "setuptools";

     

       17
        
       

     

       18
        
         disabled = pythonOlder "3.9";

     
···

       21
        
           owner = "esphome";

     

       22
        
           repo = pname;

     

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

     

       24
       +
           hash = "sha256-ifk1psowUGVG7XafipLq5T2+5K5+psDDsX/u/GYDXdU=";

     

       25
        
         };

     

       26
        
       

     

       27
        
         propagatedBuildInputs = [

+2 -2

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

···

       35
        
           cffi

     

       36
        
         ] ++ lib.optionals gurobiSupport ([

     

       37
        
           gurobipy

     

       38
       -
         ] ++ lib.optional (builtins.isNull gurobiHome) gurobi);

     

       39
        
       

     

       40
        
         # Source files have CRLF terminators, which make patch error out when supplied

     

       41
        
         # with diffs made on *nix machines

     
···

       58
        
       

     

       59
        
         # Make MIP use the Gurobi solver, if configured to do so

     

       60
        
         makeWrapperArgs = lib.optional gurobiSupport

     

       61
       -
           "--set GUROBI_HOME ${if builtins.isNull gurobiHome then gurobi.outPath else gurobiHome}";

     

       62
        
       

     

       63
        
         # Tests that rely on Gurobi are activated only when Gurobi support is enabled

     

       64
        
         disabledTests = lib.optional (!gurobiSupport) "gurobi";

···

       35
        
           cffi

     

       36
        
         ] ++ lib.optionals gurobiSupport ([

     

       37
        
           gurobipy

     

       38
       +
         ] ++ lib.optional (gurobiHome == null) gurobi);

     

       39
        
       

     

       40
        
         # Source files have CRLF terminators, which make patch error out when supplied

     

       41
        
         # with diffs made on *nix machines

     
···

       58
        
       

     

       59
        
         # Make MIP use the Gurobi solver, if configured to do so

     

       60
        
         makeWrapperArgs = lib.optional gurobiSupport

     

       61
       +
           "--set GUROBI_HOME ${if gurobiHome == null then gurobi.outPath else gurobiHome}";

     

       62
        
       

     

       63
        
         # Tests that rely on Gurobi are activated only when Gurobi support is enabled

     

       64
        
         disabledTests = lib.optional (!gurobiSupport) "gurobi";

+2 -2

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

···

       9
        
       

     

       10
        
       buildPythonPackage rec {

     

       11
        
         pname = "qtawesome";

     

       12
       -
         version = "1.2.2";

     

       13
        
         format = "setuptools";

     

       14
        
       

     

       15
        
         disabled = pythonOlder "3.7";

     
···

       18
        
           owner = "spyder-ide";

     

       19
        
           repo = pname;

     

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

     

       21
       -
           hash = "sha256-zXwIwYG76aCKPTE8mGiAOK8kQUCzJbqnjJszmIqByaA=";

     

       22
        
         };

     

       23
        
       

     

       24
        
         propagatedBuildInputs = [

···

       9
        
       

     

       10
        
       buildPythonPackage rec {

     

       11
        
         pname = "qtawesome";

     

       12
       +
         version = "1.2.3";

     

       13
        
         format = "setuptools";

     

       14
        
       

     

       15
        
         disabled = pythonOlder "3.7";

     
···

       18
        
           owner = "spyder-ide";

     

       19
        
           repo = pname;

     

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

     

       21
       +
           hash = "sha256-cndmxdo00TLq1Cy66IFwcT5CKBavaFAfknkpLZCYvUQ=";

     

       22
        
         };

     

       23
        
       

     

       24
        
         propagatedBuildInputs = [

+1 -1

pkgs/development/python-modules/tensorflow-probability/default.nix

···

       54
        
           LIBTOOL = lib.optionalString stdenv.isDarwin "${cctools}/bin/libtool";

     

       55
        
       

     

       56
        
           fetchAttrs = {

     

       57
       -
             sha256 = "sha256-pST4R45mWC5j0ngkkRe+hmostaMploW0+BN3WKPt0t0=";

     

       58
        
           };

     

       59
        
       

     

       60
        
           buildAttrs = {

···

       54
        
           LIBTOOL = lib.optionalString stdenv.isDarwin "${cctools}/bin/libtool";

     

       55
        
       

     

       56
        
           fetchAttrs = {

     

       57
       +
             sha256 = "sha256-9i0ExaIeNz7+ddNAoU2ak8JY7lI2aY6eBDiPzJYuJUk=";

     

       58
        
           };

     

       59
        
       

     

       60
        
           buildAttrs = {

+2 -2

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

···

       22
        
       

     

       23
        
       buildPythonPackage rec {

     

       24
        
         pname = "textual";

     

       25
       -
         version = "0.12.1";

     

       26
        
         format = "pyproject";

     

       27
        
       

     

       28
        
         disabled = pythonOlder "3.7";

     
···

       31
        
           owner = "Textualize";

     

       32
        
           repo = pname;

     

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

     

       34
       -
           hash = "sha256-7QyUARXvPgGzXvIdkh9/WO07I8wfMQF23xdrxPjO8e8=";

     

       35
        
         };

     

       36
        
       

     

       37
        
         nativeBuildInputs = [

···

       22
        
       

     

       23
        
       buildPythonPackage rec {

     

       24
        
         pname = "textual";

     

       25
       +
         version = "0.15.1";

     

       26
        
         format = "pyproject";

     

       27
        
       

     

       28
        
         disabled = pythonOlder "3.7";

     
···

       31
        
           owner = "Textualize";

     

       32
        
           repo = pname;

     

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

     

       34
       +
           hash = "sha256-UT+ApD/TTb5cxIdgK+n3B2J3z/nEwVXtuyPHpGCv6Tg=";

     

       35
        
         };

     

       36
        
       

     

       37
        
         nativeBuildInputs = [

+9 -6

pkgs/development/tools/build-managers/bazel/bazel_6/default.nix

···

       24
        
       }:

     

       25
        
       

     

       26
        
       let

     

       27
       -
         version = "6.0.0";

     

       28
        
         sourceRoot = ".";

     

       29
        
       

     

       30
        
         src = fetchurl {

     

       31
        
           url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";

     

       32
       -
           hash = "sha256-e8DFFFwZpW2CoI/OaQjF4aDnXk+/s7bxK03q5/SzjLw=";

     

       33
        
         };

     

       34
        
       

     

       35
       -
         # Update with `eval $(nix-build -A bazel_6.updater)`,

     

       36
       -
         # then add new dependencies from the dict in ./src-deps.json as required.

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       37
        
         srcDeps = lib.attrsets.attrValues srcDepsSet;

     

       38
        
         srcDepsSet =

     

       39
        
           let

     
···

       334
        
           #!${runtimeShell}

     

       335
        
           (cd "${src_for_updater}" &&

     

       336
        
               BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \

     

       337
       -
               "${bazel_self}"/bin/bazel \

     

       338
       -
                   query 'kind(http_archive, //external:all) + kind(http_file, //external:all) + kind(distdir_tar, //external:all) + kind(git_repository, //external:all)' \

     

       339
        
                   --loading_phase_threads=1 \

     

       340
        
                   --output build) \

     

       341
        
           | "${python3}"/bin/python3 "${./update-srcDeps.py}" \

···

       24
        
       }:

     

       25
        
       

     

       26
        
       let

     

       27
       +
         version = "6.1.0";

     

       28
        
         sourceRoot = ".";

     

       29
        
       

     

       30
        
         src = fetchurl {

     

       31
        
           url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";

     

       32
       +
           hash = "sha256-xLhWdVQc9m7ny3FRQJf91sX8DgJSckNhek8gymtPKTI=";

     

       33
        
         };

     

       34
        
       

     

       35
       +
         # Update with

     

       36
       +
         # 1. export BAZEL_SELF=$(nix-build -A bazel_6)

     

       37
       +
         # 2. update version and hash for sources above

     

       38
       +
         # 3. `eval $(nix-build -A bazel_6.updater)`

     

       39
       +
         # 4. add new dependencies from the dict in ./src-deps.json if required by failing build

     

       40
        
         srcDeps = lib.attrsets.attrValues srcDepsSet;

     

       41
        
         srcDepsSet =

     

       42
        
           let

     
···

       337
        
           #!${runtimeShell}

     

       338
        
           (cd "${src_for_updater}" &&

     

       339
        
               BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \

     

       340
       +
               "$BAZEL_SELF"/bin/bazel \

     

       341
       +
                   query 'kind(http_archive, //external:*) + kind(http_file, //external:*) + kind(distdir_tar, //external:*) + kind(git_repository, //external:*)' \

     

       342
        
                   --loading_phase_threads=1 \

     

       343
        
                   --output build) \

     

       344
        
           | "${python3}"/bin/python3 "${./update-srcDeps.py}" \

+3 -3

pkgs/development/tools/build-managers/bazel/bazel_6/no-arc.patch

···

       6
        
        ])

     

       7
        
        

     

       8
        
        DARWIN_XCODE_LOCATOR_COMPILE_COMMAND = """

     

       9
       -
       -  /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -fobjc-arc -framework CoreServices \

     

       10
        
       -      -framework Foundation -arch arm64 -arch x86_64 -Wl,-no_adhoc_codesign -Wl,-no_uuid -o $@ $< && \

     

       11
       -
       +  /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -framework CoreServices \

     

       12
        
       +      -framework Foundation -arch @multiBinPatch@ -Wl,-no_uuid -o $@ $< && \

     

       13
        
          env -i codesign --identifier $@ --force --sign - $@

     

       14
        
        """

     
···

       20
        
       @@ -127,7 +127,6 @@ def run_xcode_locator(repository_ctx, xcode_locator_src_label):

     

       21
        
                "macosx",

     

       22
        
                "clang",

     

       23
       -
                "-mmacosx-version-min=10.9",

     

       24
        
       -        "-fobjc-arc",

     

       25
        
                "-framework",

     

       26
        
                "CoreServices",

···

       6
        
        ])

     

       7
        
        

     

       8
        
        DARWIN_XCODE_LOCATOR_COMPILE_COMMAND = """

     

       9
       +
       -  /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.13 -fobjc-arc -framework CoreServices \

     

       10
        
       -      -framework Foundation -arch arm64 -arch x86_64 -Wl,-no_adhoc_codesign -Wl,-no_uuid -o $@ $< && \

     

       11
       +
       +  /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.13 -framework CoreServices \

     

       12
        
       +      -framework Foundation -arch @multiBinPatch@ -Wl,-no_uuid -o $@ $< && \

     

       13
        
          env -i codesign --identifier $@ --force --sign - $@

     

       14
        
        """

     
···

       20
        
       @@ -127,7 +127,6 @@ def run_xcode_locator(repository_ctx, xcode_locator_src_label):

     

       21
        
                "macosx",

     

       22
        
                "clang",

     

       23
       +
                "-mmacosx-version-min=10.13",

     

       24
        
       -        "-fobjc-arc",

     

       25
        
                "-framework",

     

       26
        
                "CoreServices",

+208 -108

pkgs/development/tools/build-managers/bazel/bazel_6/src-deps.json

···

       88
        
               ]

     

       89
        
           },

     

       90
        
           "android_tools": {

     

       0
        
       
     

       0
        
       
     

       91
        
               "name": "android_tools",

     

       92
       -
               "sha256": "ed5290594244c2eeab41f0104519bcef51e27c699ff4b379fcbd25215270513e",

     

       93
       -
               "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.23.0.tar.gz"

     

       94
        
           },

     

       95
        
           "android_tools_for_testing": {

     

       96
        
               "name": "android_tools_for_testing",

     
···

       1101
        
               ]

     

       1102
        
           },

     

       1103
        
           "remote_coverage_tools": {

     

       0
        
       
     

       0
        
       
     

       1104
        
               "name": "remote_coverage_tools",

     

       1105
       -
               "sha256": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d",

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1106
        
               "urls": [

     

       1107
       -
                   "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip"

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1108
        
               ]

     

       1109
        
           },

     

       1110
        
           "remote_java_tools_darwin": {

     

       1111
        
               "generator_function": "maybe",

     

       1112
        
               "generator_name": "remote_java_tools_darwin",

     

       1113
        
               "name": "remote_java_tools_darwin",

     

       1114
       -
               "sha256": "d15b05d2061382748f779dc566537ea567a46bcba6fa34b56d7cb6e6d668adab",

     

       1115
        
               "urls": [

     

       1116
       -
                   "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_darwin-v10.6.zip",

     

       1117
       -
                   "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.6/java_tools_javac11_darwin-v10.6.zip"

     

       1118
        
               ]

     

       1119
        
           },

     

       1120
        
           "remote_java_tools_darwin_for_testing": {

     
···

       1157
        
               "generator_function": "maybe",

     

       1158
        
               "generator_name": "remote_java_tools_linux",

     

       1159
        
               "name": "remote_java_tools_linux",

     

       1160
       -
               "sha256": "085c0ba53ba764e81d4c195524f3c596085cbf9cdc01dd8e6d2ae677e726af35",

     

       1161
        
               "urls": [

     

       1162
       -
                   "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_linux-v10.6.zip",

     

       1163
       -
                   "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.6/java_tools_javac11_linux-v10.6.zip"

     

       1164
        
               ]

     

       1165
        
           },

     

       1166
        
           "remote_java_tools_linux_for_testing": {

     
···

       1257
        
               "generator_function": "maybe",

     

       1258
        
               "generator_name": "remote_java_tools_windows",

     

       1259
        
               "name": "remote_java_tools_windows",

     

       1260
       -
               "sha256": "873f1e53d1fa9c8e46b717673816cd822bb7acc474a194a18ff849fd8fa6ff00",

     

       1261
        
               "urls": [

     

       1262
       -
                   "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_windows-v10.6.zip",

     

       1263
       -
                   "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.6/java_tools_javac11_windows-v10.6.zip"

     

       1264
        
               ]

     

       1265
        
           },

     

       1266
        
           "remote_java_tools_windows_for_testing": {

     
···

       1286
        
               "generator_function": "maybe",

     

       1287
        
               "generator_name": "remotejdk11_linux",

     

       1288
        
               "name": "remotejdk11_linux",

     

       1289
       -
               "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1",

     

       1290
       -
               "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-linux_x64",

     

       1291
        
               "urls": [

     

       1292
       -
                   "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz"

     

       0
        
       
     

       1293
        
               ]

     

       1294
        
           },

     

       1295
        
           "remotejdk11_linux_aarch64": {

     
···

       1297
        
               "generator_function": "maybe",

     

       1298
        
               "generator_name": "remotejdk11_linux_aarch64",

     

       1299
        
               "name": "remotejdk11_linux_aarch64",

     

       1300
       -
               "sha256": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4",

     

       1301
       -
               "strip_prefix": "zulu11.37.48-ca-jdk11.0.6-linux_aarch64",

     

       1302
        
               "urls": [

     

       1303
       -
                   "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz"

     

       0
        
       
     

       1304
        
               ]

     

       1305
        
           },

     

       1306
        
           "remotejdk11_linux_aarch64_for_testing": {

     
···

       1348
        
               "generator_function": "maybe",

     

       1349
        
               "generator_name": "remotejdk11_linux_ppc64le",

     

       1350
        
               "name": "remotejdk11_linux_ppc64le",

     

       1351
       -
               "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a",

     

       1352
       -
               "strip_prefix": "jdk-11.0.7+10",

     

       1353
        
               "urls": [

     

       1354
       -
                   "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz",

     

       1355
       -
                   "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz"

     

       1356
        
               ]

     

       1357
        
           },

     

       1358
        
           "remotejdk11_linux_ppc64le_for_testing": {

     
···

       1380
        
               "generator_function": "maybe",

     

       1381
        
               "generator_name": "remotejdk11_linux_s390x",

     

       1382
        
               "name": "remotejdk11_linux_s390x",

     

       1383
       -
               "sha256": "d9b72e87a1d3ebc0c9552f72ae5eb150fffc0298a7cb841f1ce7bfc70dcd1059",

     

       1384
       -
               "strip_prefix": "jdk-11.0.7+10",

     

       1385
        
               "urls": [

     

       1386
       -
                   "https://mirror.bazel.build/github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz",

     

       1387
       -
                   "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz"

     

       1388
        
               ]

     

       1389
        
           },

     

       1390
        
           "remotejdk11_linux_s390x_for_testing": {

     
···

       1412
        
               "generator_function": "maybe",

     

       1413
        
               "generator_name": "remotejdk11_macos",

     

       1414
        
               "name": "remotejdk11_macos",

     

       1415
       -
               "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f",

     

       1416
       -
               "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-macosx_x64",

     

       1417
        
               "urls": [

     

       1418
       -
                   "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz"

     

       0
        
       
     

       1419
        
               ]

     

       1420
        
           },

     

       1421
        
           "remotejdk11_macos_aarch64": {

     
···

       1423
        
               "generator_function": "maybe",

     

       1424
        
               "generator_name": "remotejdk11_macos_aarch64",

     

       1425
        
               "name": "remotejdk11_macos_aarch64",

     

       1426
       -
               "sha256": "3dcc636e64ae58b922269c2dc9f20f6f967bee90e3f6847d643c4a566f1e8d8a",

     

       1427
       -
               "strip_prefix": "zulu11.45.27-ca-jdk11.0.10-macosx_aarch64",

     

       1428
        
               "urls": [

     

       1429
       -
                   "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz",

     

       1430
       -
                   "https://cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz"

     

       1431
        
               ]

     

       1432
        
           },

     

       1433
        
           "remotejdk11_macos_aarch64_for_testing": {

     
···

       1475
        
               "generator_function": "maybe",

     

       1476
        
               "generator_name": "remotejdk11_win",

     

       1477
        
               "name": "remotejdk11_win",

     

       1478
       -
               "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18",

     

       1479
       -
               "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-win_x64",

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1480
        
               "urls": [

     

       1481
       -
                   "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip"

     

       1482
        
               ]

     

       1483
        
           },

     

       1484
        
           "remotejdk11_win_arm64_for_testing": {

     
···

       1520
        
                   "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-win_x64.zip"

     

       1521
        
               ]

     

       1522
        
           },

     

       1523
       -
           "remotejdk14_linux": {

     

       1524
       -
               "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",

     

       1525
       -
               "generator_function": "maybe",

     

       1526
       -
               "generator_name": "remotejdk14_linux",

     

       1527
       -
               "name": "remotejdk14_linux",

     

       1528
       -
               "sha256": "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa",

     

       1529
       -
               "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-linux_x64",

     

       1530
       -
               "urls": [

     

       1531
       -
                   "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz"

     

       1532
       -
               ]

     

       1533
       -
           },

     

       1534
       -
           "remotejdk14_macos": {

     

       1535
       -
               "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",

     

       1536
       -
               "generator_function": "maybe",

     

       1537
       -
               "generator_name": "remotejdk14_macos",

     

       1538
       -
               "name": "remotejdk14_macos",

     

       1539
       -
               "sha256": "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd",

     

       1540
       -
               "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-macosx_x64",

     

       1541
       -
               "urls": [

     

       1542
       -
                   "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz"

     

       1543
       -
               ]

     

       1544
       -
           },

     

       1545
       -
           "remotejdk14_win": {

     

       1546
       -
               "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",

     

       1547
       -
               "generator_function": "maybe",

     

       1548
       -
               "generator_name": "remotejdk14_win",

     

       1549
       -
               "name": "remotejdk14_win",

     

       1550
       -
               "sha256": "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284",

     

       1551
       -
               "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-win_x64",

     

       1552
       -
               "urls": [

     

       1553
       -
                   "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip"

     

       1554
       -
               ]

     

       1555
       -
           },

     

       1556
       -
           "remotejdk15_linux": {

     

       1557
       -
               "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",

     

       1558
       -
               "generator_function": "maybe",

     

       1559
       -
               "generator_name": "remotejdk15_linux",

     

       1560
       -
               "name": "remotejdk15_linux",

     

       1561
       -
               "sha256": "0a38f1138c15a4f243b75eb82f8ef40855afcc402e3c2a6de97ce8235011b1ad",

     

       1562
       -
               "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-linux_x64",

     

       1563
       -
               "urls": [

     

       1564
       -
                   "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz",

     

       1565
       -
                   "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz"

     

       1566
       -
               ]

     

       1567
       -
           },

     

       1568
       -
           "remotejdk15_macos": {

     

       1569
       -
               "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",

     

       1570
       -
               "generator_function": "maybe",

     

       1571
       -
               "generator_name": "remotejdk15_macos",

     

       1572
       -
               "name": "remotejdk15_macos",

     

       1573
       -
               "sha256": "f80b2e0512d9d8a92be24497334c974bfecc8c898fc215ce0e76594f00437482",

     

       1574
       -
               "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-macosx_x64",

     

       1575
       -
               "urls": [

     

       1576
       -
                   "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz",

     

       1577
       -
                   "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-macosx_x64.tar.gz"

     

       1578
       -
               ]

     

       1579
       -
           },

     

       1580
       -
           "remotejdk15_macos_aarch64": {

     

       1581
        
               "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",

     

       1582
        
               "generator_function": "maybe",

     

       1583
       -
               "generator_name": "remotejdk15_macos_aarch64",

     

       1584
       -
               "name": "remotejdk15_macos_aarch64",

     

       1585
       -
               "sha256": "2613c3f15eef6b6ecd0fd102da92282b985e4573905dc902f1783d8059c1efc5",

     

       1586
       -
               "strip_prefix": "zulu15.29.15-ca-jdk15.0.2-macosx_aarch64",

     

       1587
        
               "urls": [

     

       1588
       -
                   "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz",

     

       1589
       -
                   "https://cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.tar.gz"

     

       1590
        
               ]

     

       1591
        
           },

     

       1592
       -
           "remotejdk15_win": {

     

       1593
        
               "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",

     

       1594
        
               "generator_function": "maybe",

     

       1595
       -
               "generator_name": "remotejdk15_win",

     

       1596
       -
               "name": "remotejdk15_win",

     

       1597
       -
               "sha256": "f535a530151e6c20de8a3078057e332b08887cb3ba1a4735717357e72765cad6",

     

       1598
       -
               "strip_prefix": "zulu15.27.17-ca-jdk15.0.0-win_x64",

     

       1599
        
               "urls": [

     

       1600
       -
                   "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip",

     

       1601
       -
                   "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip"

     

       1602
        
               ]

     

       1603
        
           },

     

       1604
        
           "remotejdk17_linux_for_testing": {

     
···

       1621
        
                   "https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_x64.tar.gz"

     

       1622
        
               ]

     

       1623
        
           },

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1624
        
           "remotejdk17_macos_aarch64_for_testing": {

     

       1625
        
               "build_file": "@local_jdk//:BUILD.bazel",

     

       1626
        
               "generator_function": "dist_http_archive",

     
···

       1661
        
                   "https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-macosx_x64.tar.gz"

     

       1662
        
               ]

     

       1663
        
           },

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1664
        
           "remotejdk17_win_arm64_for_testing": {

     

       1665
        
               "build_file": "@local_jdk//:BUILD.bazel",

     

       1666
        
               "generator_function": "dist_http_archive",

     
···

       1701
        
                   "https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-win_x64.zip"

     

       1702
        
               ]

     

       1703
        
           },

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1704
        
           "remotejdk18_linux_for_testing": {

     

       1705
        
               "build_file": "@local_jdk//:BUILD.bazel",

     

       1706
        
               "generator_function": "dist_http_archive",

     
···

       1721
        
                   "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-linux_x64.tar.gz"

     

       1722
        
               ]

     

       1723
        
           },

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1724
        
           "remotejdk18_macos_aarch64_for_testing": {

     

       1725
        
               "build_file": "@local_jdk//:BUILD.bazel",

     

       1726
        
               "generator_function": "dist_http_archive",

     
···

       1759
        
               "urls": [

     

       1760
        
                   "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-macosx_x64.tar.gz",

     

       1761
        
                   "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-macosx_x64.tar.gz"

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1762
        
               ]

     

       1763
        
           },

     

       1764
        
           "remotejdk18_win_arm64_for_testing": {

···

       88
        
               ]

     

       89
        
           },

     

       90
        
           "android_tools": {

     

       91
       +
               "generator_function": "maybe",

     

       92
       +
               "generator_name": "android_tools",

     

       93
        
               "name": "android_tools",

     

       94
       +
               "sha256": "1afa4b7e13c82523c8b69e87f8d598c891ec7e2baa41d9e24e08becd723edb4d",

     

       95
       +
               "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.27.0.tar.gz"

     

       96
        
           },

     

       97
        
           "android_tools_for_testing": {

     

       98
        
               "name": "android_tools_for_testing",

     
···

       1103
        
               ]

     

       1104
        
           },

     

       1105
        
           "remote_coverage_tools": {

     

       1106
       +
               "generator_function": "dist_http_archive",

     

       1107
       +
               "generator_name": "remote_coverage_tools",

     

       1108
        
               "name": "remote_coverage_tools",

     

       1109
       +
               "patch_cmds": [

     

       1110
       +
                   "test -f BUILD && chmod u+w BUILD || true",

     

       1111
       +
                   "echo >> BUILD",

     

       1112
       +
                   "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"

     

       1113
       +
               ],

     

       1114
       +
               "patch_cmds_win": [

     

       1115
       +
                   "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"

     

       1116
       +
               ],

     

       1117
       +
               "sha256": "7006375f6756819b7013ca875eab70a541cf7d89142d9c511ed78ea4fefa38af",

     

       1118
        
               "urls": [

     

       1119
       +
                   "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.6.zip"

     

       1120
       +
               ]

     

       1121
       +
           },

     

       1122
       +
           "remote_java_tools": {

     

       1123
       +
               "generator_function": "maybe",

     

       1124
       +
               "generator_name": "remote_java_tools",

     

       1125
       +
               "name": "remote_java_tools",

     

       1126
       +
               "sha256": "5cd59ea6bf938a1efc1e11ea562d37b39c82f76781211b7cd941a2346ea8484d",

     

       1127
       +
               "urls": [

     

       1128
       +
                   "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools-v11.9.zip",

     

       1129
       +
                   "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools-v11.9.zip"

     

       1130
        
               ]

     

       1131
        
           },

     

       1132
        
           "remote_java_tools_darwin": {

     

       1133
        
               "generator_function": "maybe",

     

       1134
        
               "generator_name": "remote_java_tools_darwin",

     

       1135
        
               "name": "remote_java_tools_darwin",

     

       1136
       +
               "sha256": "b9e962c6a836ba1d7573f2473fab3a897c6370d4c2724bde4017b40932ff4fe4",

     

       1137
        
               "urls": [

     

       1138
       +
                   "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_darwin-v11.9.zip",

     

       1139
       +
                   "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_darwin-v11.9.zip"

     

       1140
        
               ]

     

       1141
        
           },

     

       1142
        
           "remote_java_tools_darwin_for_testing": {

     
···

       1179
        
               "generator_function": "maybe",

     

       1180
        
               "generator_name": "remote_java_tools_linux",

     

       1181
        
               "name": "remote_java_tools_linux",

     

       1182
       +
               "sha256": "512582cac5b7ea7974a77b0da4581b21f546c9478f206eedf54687eeac035989",

     

       1183
        
               "urls": [

     

       1184
       +
                   "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_linux-v11.9.zip",

     

       1185
       +
                   "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_linux-v11.9.zip"

     

       1186
        
               ]

     

       1187
        
           },

     

       1188
        
           "remote_java_tools_linux_for_testing": {

     
···

       1279
        
               "generator_function": "maybe",

     

       1280
        
               "generator_name": "remote_java_tools_windows",

     

       1281
        
               "name": "remote_java_tools_windows",

     

       1282
       +
               "sha256": "677ab910046205020fd715489147c2bcfad8a35d9f5d94fdc998d217545bd87a",

     

       1283
        
               "urls": [

     

       1284
       +
                   "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_windows-v11.9.zip",

     

       1285
       +
                   "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_windows-v11.9.zip"

     

       1286
        
               ]

     

       1287
        
           },

     

       1288
        
           "remote_java_tools_windows_for_testing": {

     
···

       1308
        
               "generator_function": "maybe",

     

       1309
        
               "generator_name": "remotejdk11_linux",

     

       1310
        
               "name": "remotejdk11_linux",

     

       1311
       +
               "sha256": "e064b61d93304012351242bf0823c6a2e41d9e28add7ea7f05378b7243d34247",

     

       1312
       +
               "strip_prefix": "zulu11.56.19-ca-jdk11.0.15-linux_x64",

     

       1313
        
               "urls": [

     

       1314
       +
                   "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-linux_x64.tar.gz",

     

       1315
       +
                   "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-linux_x64.tar.gz"

     

       1316
        
               ]

     

       1317
        
           },

     

       1318
        
           "remotejdk11_linux_aarch64": {

     
···

       1320
        
               "generator_function": "maybe",

     

       1321
        
               "generator_name": "remotejdk11_linux_aarch64",

     

       1322
        
               "name": "remotejdk11_linux_aarch64",

     

       1323
       +
               "sha256": "fc7c41a0005180d4ca471c90d01e049469e0614cf774566d4cf383caa29d1a97",

     

       1324
       +
               "strip_prefix": "zulu11.56.19-ca-jdk11.0.15-linux_aarch64",

     

       1325
        
               "urls": [

     

       1326
       +
                   "https://mirror.bazel.build/cdn.azul.com/zulu-embedded/bin/zulu11.56.19-ca-jdk11.0.15-linux_aarch64.tar.gz",

     

       1327
       +
                   "https://cdn.azul.com/zulu-embedded/bin/zulu11.56.19-ca-jdk11.0.15-linux_aarch64.tar.gz"

     

       1328
        
               ]

     

       1329
        
           },

     

       1330
        
           "remotejdk11_linux_aarch64_for_testing": {

     
···

       1372
        
               "generator_function": "maybe",

     

       1373
        
               "generator_name": "remotejdk11_linux_ppc64le",

     

       1374
        
               "name": "remotejdk11_linux_ppc64le",

     

       1375
       +
               "sha256": "a8fba686f6eb8ae1d1a9566821dbd5a85a1108b96ad857fdbac5c1e4649fc56f",

     

       1376
       +
               "strip_prefix": "jdk-11.0.15+10",

     

       1377
        
               "urls": [

     

       1378
       +
                   "https://mirror.bazel.build/github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.15_10.tar.gz",

     

       1379
       +
                   "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.15_10.tar.gz"

     

       1380
        
               ]

     

       1381
        
           },

     

       1382
        
           "remotejdk11_linux_ppc64le_for_testing": {

     
···

       1404
        
               "generator_function": "maybe",

     

       1405
        
               "generator_name": "remotejdk11_linux_s390x",

     

       1406
        
               "name": "remotejdk11_linux_s390x",

     

       1407
       +
               "sha256": "a58fc0361966af0a5d5a31a2d8a208e3c9bb0f54f345596fd80b99ea9a39788b",

     

       1408
       +
               "strip_prefix": "jdk-11.0.15+10",

     

       1409
        
               "urls": [

     

       1410
       +
                   "https://mirror.bazel.build/github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.15_10.tar.gz",

     

       1411
       +
                   "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.15_10.tar.gz"

     

       1412
        
               ]

     

       1413
        
           },

     

       1414
        
           "remotejdk11_linux_s390x_for_testing": {

     
···

       1436
        
               "generator_function": "maybe",

     

       1437
        
               "generator_name": "remotejdk11_macos",

     

       1438
        
               "name": "remotejdk11_macos",

     

       1439
       +
               "sha256": "2614e5c5de8e989d4d81759de4c333aa5b867b17ab9ee78754309ba65c7f6f55",

     

       1440
       +
               "strip_prefix": "zulu11.56.19-ca-jdk11.0.15-macosx_x64",

     

       1441
        
               "urls": [

     

       1442
       +
                   "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_x64.tar.gz",

     

       1443
       +
                   "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_x64.tar.gz"

     

       1444
        
               ]

     

       1445
        
           },

     

       1446
        
           "remotejdk11_macos_aarch64": {

     
···

       1448
        
               "generator_function": "maybe",

     

       1449
        
               "generator_name": "remotejdk11_macos_aarch64",

     

       1450
        
               "name": "remotejdk11_macos_aarch64",

     

       1451
       +
               "sha256": "6bb0d2c6e8a29dcd9c577bbb2986352ba12481a9549ac2c0bcfd00ed60e538d2",

     

       1452
       +
               "strip_prefix": "zulu11.56.19-ca-jdk11.0.15-macosx_aarch64",

     

       1453
        
               "urls": [

     

       1454
       +
                   "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_aarch64.tar.gz",

     

       1455
       +
                   "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-macosx_aarch64.tar.gz"

     

       1456
        
               ]

     

       1457
        
           },

     

       1458
        
           "remotejdk11_macos_aarch64_for_testing": {

     
···

       1500
        
               "generator_function": "maybe",

     

       1501
        
               "generator_name": "remotejdk11_win",

     

       1502
        
               "name": "remotejdk11_win",

     

       1503
       +
               "sha256": "a106c77389a63b6bd963a087d5f01171bd32aa3ee7377ecef87531390dcb9050",

     

       1504
       +
               "strip_prefix": "zulu11.56.19-ca-jdk11.0.15-win_x64",

     

       1505
       +
               "urls": [

     

       1506
       +
                   "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-win_x64.zip",

     

       1507
       +
                   "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-win_x64.zip"

     

       1508
       +
               ]

     

       1509
       +
           },

     

       1510
       +
           "remotejdk11_win_arm64": {

     

       1511
       +
               "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",

     

       1512
       +
               "generator_function": "maybe",

     

       1513
       +
               "generator_name": "remotejdk11_win_arm64",

     

       1514
       +
               "name": "remotejdk11_win_arm64",

     

       1515
       +
               "sha256": "b8a28e6e767d90acf793ea6f5bed0bb595ba0ba5ebdf8b99f395266161e53ec2",

     

       1516
       +
               "strip_prefix": "jdk-11.0.13+8",

     

       1517
        
               "urls": [

     

       1518
       +
                   "https://mirror.bazel.build/aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-windows-aarch64.zip"

     

       1519
        
               ]

     

       1520
        
           },

     

       1521
        
           "remotejdk11_win_arm64_for_testing": {

     
···

       1557
        
                   "https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-win_x64.zip"

     

       1558
        
               ]

     

       1559
        
           },

     

       1560
       +
           "remotejdk17_linux": {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1561
        
               "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",

     

       1562
        
               "generator_function": "maybe",

     

       1563
       +
               "generator_name": "remotejdk17_linux",

     

       1564
       +
               "name": "remotejdk17_linux",

     

       1565
       +
               "sha256": "73d5c4bae20325ca41b606f7eae64669db3aac638c5b3ead4a975055846ad6de",

     

       1566
       +
               "strip_prefix": "zulu17.32.13-ca-jdk17.0.2-linux_x64",

     

       1567
        
               "urls": [

     

       1568
       +
                   "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_x64.tar.gz",

     

       1569
       +
                   "https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_x64.tar.gz"

     

       1570
        
               ]

     

       1571
        
           },

     

       1572
       +
           "remotejdk17_linux_aarch64": {

     

       1573
        
               "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",

     

       1574
        
               "generator_function": "maybe",

     

       1575
       +
               "generator_name": "remotejdk17_linux_aarch64",

     

       1576
       +
               "name": "remotejdk17_linux_aarch64",

     

       1577
       +
               "sha256": "2b8066bbdbc5cff422bb6b6db1b8f8d362b576340cce8492f1255502af632b06",

     

       1578
       +
               "strip_prefix": "zulu17.32.13-ca-jdk17.0.2-linux_aarch64",

     

       1579
        
               "urls": [

     

       1580
       +
                   "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_aarch64.tar.gz",

     

       1581
       +
                   "https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_aarch64.tar.gz"

     

       1582
        
               ]

     

       1583
        
           },

     

       1584
        
           "remotejdk17_linux_for_testing": {

     
···

       1601
        
                   "https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_x64.tar.gz"

     

       1602
        
               ]

     

       1603
        
           },

     

       1604
       +
           "remotejdk17_macos": {

     

       1605
       +
               "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",

     

       1606
       +
               "generator_function": "maybe",

     

       1607
       +
               "generator_name": "remotejdk17_macos",

     

       1608
       +
               "name": "remotejdk17_macos",

     

       1609
       +
               "sha256": "89d04b2d99b05dcb25114178e65f6a1c5ca742e125cab0a63d87e7e42f3fcb80",

     

       1610
       +
               "strip_prefix": "zulu17.32.13-ca-jdk17.0.2-macosx_x64",

     

       1611
       +
               "urls": [

     

       1612
       +
                   "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-macosx_x64.tar.gz",

     

       1613
       +
                   "https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-macosx_x64.tar.gz"

     

       1614
       +
               ]

     

       1615
       +
           },

     

       1616
       +
           "remotejdk17_macos_aarch64": {

     

       1617
       +
               "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",

     

       1618
       +
               "generator_function": "maybe",

     

       1619
       +
               "generator_name": "remotejdk17_macos_aarch64",

     

       1620
       +
               "name": "remotejdk17_macos_aarch64",

     

       1621
       +
               "sha256": "54247dde248ffbcd3c048675504b1c503b81daf2dc0d64a79e353c48d383c977",

     

       1622
       +
               "strip_prefix": "zulu17.32.13-ca-jdk17.0.2-macosx_aarch64",

     

       1623
       +
               "urls": [

     

       1624
       +
                   "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-macosx_aarch64.tar.gz",

     

       1625
       +
                   "https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-macosx_aarch64.tar.gz"

     

       1626
       +
               ]

     

       1627
       +
           },

     

       1628
        
           "remotejdk17_macos_aarch64_for_testing": {

     

       1629
        
               "build_file": "@local_jdk//:BUILD.bazel",

     

       1630
        
               "generator_function": "dist_http_archive",

     
···

       1665
        
                   "https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-macosx_x64.tar.gz"

     

       1666
        
               ]

     

       1667
        
           },

     

       1668
       +
           "remotejdk17_win": {

     

       1669
       +
               "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",

     

       1670
       +
               "generator_function": "maybe",

     

       1671
       +
               "generator_name": "remotejdk17_win",

     

       1672
       +
               "name": "remotejdk17_win",

     

       1673
       +
               "sha256": "e965aa0ea7a0661a3446cf8f10ee00684b851f883b803315289f26b4aa907fdb",

     

       1674
       +
               "strip_prefix": "zulu17.32.13-ca-jdk17.0.2-win_x64",

     

       1675
       +
               "urls": [

     

       1676
       +
                   "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-win_x64.zip",

     

       1677
       +
                   "https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-win_x64.zip"

     

       1678
       +
               ]

     

       1679
       +
           },

     

       1680
       +
           "remotejdk17_win_arm64": {

     

       1681
       +
               "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",

     

       1682
       +
               "generator_function": "maybe",

     

       1683
       +
               "generator_name": "remotejdk17_win_arm64",

     

       1684
       +
               "name": "remotejdk17_win_arm64",

     

       1685
       +
               "sha256": "811d7e7591bac4f081dfb00ba6bd15b6fc5969e1f89f0f327ef75147027c3877",

     

       1686
       +
               "strip_prefix": "zulu17.30.15-ca-jdk17.0.1-win_aarch64",

     

       1687
       +
               "urls": [

     

       1688
       +
                   "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip",

     

       1689
       +
                   "https://cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip"

     

       1690
       +
               ]

     

       1691
       +
           },

     

       1692
        
           "remotejdk17_win_arm64_for_testing": {

     

       1693
        
               "build_file": "@local_jdk//:BUILD.bazel",

     

       1694
        
               "generator_function": "dist_http_archive",

     
···

       1729
        
                   "https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-win_x64.zip"

     

       1730
        
               ]

     

       1731
        
           },

     

       1732
       +
           "remotejdk18_linux": {

     

       1733
       +
               "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",

     

       1734
       +
               "generator_function": "maybe",

     

       1735
       +
               "generator_name": "remotejdk18_linux",

     

       1736
       +
               "name": "remotejdk18_linux",

     

       1737
       +
               "sha256": "959a94ca4097dcaabc7886784cec10dfdf2b0a3bff890ea8943cc09c5fff29cb",

     

       1738
       +
               "strip_prefix": "zulu18.28.13-ca-jdk18.0.0-linux_x64",

     

       1739
       +
               "urls": [

     

       1740
       +
                   "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-linux_x64.tar.gz",

     

       1741
       +
                   "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-linux_x64.tar.gz"

     

       1742
       +
               ]

     

       1743
       +
           },

     

       1744
       +
           "remotejdk18_linux_aarch64": {

     

       1745
       +
               "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",

     

       1746
       +
               "generator_function": "maybe",

     

       1747
       +
               "generator_name": "remotejdk18_linux_aarch64",

     

       1748
       +
               "name": "remotejdk18_linux_aarch64",

     

       1749
       +
               "sha256": "a1d5f78172f32f819d08e9043b0f82fa7af738b37c55c6ca8d6092c61d204d53",

     

       1750
       +
               "strip_prefix": "zulu18.28.13-ca-jdk18.0.0-linux_aarch64",

     

       1751
       +
               "urls": [

     

       1752
       +
                   "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-linux_aarch64.tar.gz",

     

       1753
       +
                   "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-linux_aarch64.tar.gz"

     

       1754
       +
               ]

     

       1755
       +
           },

     

       1756
        
           "remotejdk18_linux_for_testing": {

     

       1757
        
               "build_file": "@local_jdk//:BUILD.bazel",

     

       1758
        
               "generator_function": "dist_http_archive",

     
···

       1773
        
                   "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-linux_x64.tar.gz"

     

       1774
        
               ]

     

       1775
        
           },

     

       1776
       +
           "remotejdk18_macos": {

     

       1777
       +
               "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",

     

       1778
       +
               "generator_function": "maybe",

     

       1779
       +
               "generator_name": "remotejdk18_macos",

     

       1780
       +
               "name": "remotejdk18_macos",

     

       1781
       +
               "sha256": "780a9aa4bda95a6793bf41d13f837c59ef915e9bfd0e0c5fd4c70e4cdaa88541",

     

       1782
       +
               "strip_prefix": "zulu18.28.13-ca-jdk18.0.0-macosx_x64",

     

       1783
       +
               "urls": [

     

       1784
       +
                   "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-macosx_x64.tar.gz",

     

       1785
       +
                   "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-macosx_x64.tar.gz"

     

       1786
       +
               ]

     

       1787
       +
           },

     

       1788
       +
           "remotejdk18_macos_aarch64": {

     

       1789
       +
               "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",

     

       1790
       +
               "generator_function": "maybe",

     

       1791
       +
               "generator_name": "remotejdk18_macos_aarch64",

     

       1792
       +
               "name": "remotejdk18_macos_aarch64",

     

       1793
       +
               "sha256": "9595e001451e201fdf33c1952777968a3ac18fe37273bdeaea5b5ed2c4950432",

     

       1794
       +
               "strip_prefix": "zulu18.28.13-ca-jdk18.0.0-macosx_aarch64",

     

       1795
       +
               "urls": [

     

       1796
       +
                   "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-macosx_aarch64.tar.gz",

     

       1797
       +
                   "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-macosx_aarch64.tar.gz"

     

       1798
       +
               ]

     

       1799
       +
           },

     

       1800
        
           "remotejdk18_macos_aarch64_for_testing": {

     

       1801
        
               "build_file": "@local_jdk//:BUILD.bazel",

     

       1802
        
               "generator_function": "dist_http_archive",

     
···

       1835
        
               "urls": [

     

       1836
        
                   "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-macosx_x64.tar.gz",

     

       1837
        
                   "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-macosx_x64.tar.gz"

     

       1838
       +
               ]

     

       1839
       +
           },

     

       1840
       +
           "remotejdk18_win": {

     

       1841
       +
               "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",

     

       1842
       +
               "generator_function": "maybe",

     

       1843
       +
               "generator_name": "remotejdk18_win",

     

       1844
       +
               "name": "remotejdk18_win",

     

       1845
       +
               "sha256": "6c75498163b047595386fdb909cb6d4e04282c3a81799743c5e1f9316391fe16",

     

       1846
       +
               "strip_prefix": "zulu18.28.13-ca-jdk18.0.0-win_x64",

     

       1847
       +
               "urls": [

     

       1848
       +
                   "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-win_x64.zip",

     

       1849
       +
                   "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-win_x64.zip"

     

       1850
       +
               ]

     

       1851
       +
           },

     

       1852
       +
           "remotejdk18_win_arm64": {

     

       1853
       +
               "build_file": "@bazel_tools//tools/jdk:jdk.BUILD",

     

       1854
       +
               "generator_function": "maybe",

     

       1855
       +
               "generator_name": "remotejdk18_win_arm64",

     

       1856
       +
               "name": "remotejdk18_win_arm64",

     

       1857
       +
               "sha256": "9b52b259516e4140ee56b91f77750667bffbc543e78ad8c39082449d4c377b54",

     

       1858
       +
               "strip_prefix": "zulu18.28.13-ca-jdk18.0.0-win_aarch64",

     

       1859
       +
               "urls": [

     

       1860
       +
                   "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-win_aarch64.zip",

     

       1861
       +
                   "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-win_aarch64.zip"

     

       1862
        
               ]

     

       1863
        
           },

     

       1864
        
           "remotejdk18_win_arm64_for_testing": {

+1 -1

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

···

       4
        
       }:

     

       5
        
       let

     

       6
        
         wafToolsArg = with lib.strings;

     

       7
       -
           optionalString (!isNull withTools) " --tools=\"${concatStringsSep "," withTools}\"";

     

       8
        
       in

     

       9
        
       stdenv.mkDerivation rec {

     

       10
        
         pname = "waf";

···

       4
        
       }:

     

       5
        
       let

     

       6
        
         wafToolsArg = with lib.strings;

     

       7
       +
           optionalString (withTools != null) " --tools=\"${concatStringsSep "," withTools}\"";

     

       8
        
       in

     

       9
        
       stdenv.mkDerivation rec {

     

       10
        
         pname = "waf";

+4 -4

pkgs/development/tools/language-servers/jdt-language-server/default.nix

···

       7
        
       

     

       8
        
       stdenv.mkDerivation rec {

     

       9
        
         pname = "jdt-language-server";

     

       10
       -
         version = "1.19.0";

     

       11
       -
         timestamp = "202301171536";

     

       12
        
       

     

       13
        
         src = fetchurl {

     

       14
        
           url = "https://download.eclipse.org/jdtls/milestones/${version}/jdt-language-server-${version}-${timestamp}.tar.gz";

     

       15
       -
           sha256 = "sha256-9rreuMw2pODzOVX5PBmUZoV5ixUDilQyTsrnyCQ+IHs=";

     

       16
        
         };

     

       17
        
       

     

       18
        
         sourceRoot = ".";

     
···

       30
        
             # The application ships with config directories for linux and mac

     

       31
        
             configDir = if stdenv.isDarwin then "config_mac" else "config_linux";

     

       32
        
           in

     

       33
       -
           ''

     

       34
        
             # Copy jars

     

       35
        
             install -D -t $out/share/java/plugins/ plugins/*.jar

     

       36

···

       7
        
       

     

       8
        
       stdenv.mkDerivation rec {

     

       9
        
         pname = "jdt-language-server";

     

       10
       +
         version = "1.20.0";

     

       11
       +
         timestamp = "202302201605";

     

       12
        
       

     

       13
        
         src = fetchurl {

     

       14
        
           url = "https://download.eclipse.org/jdtls/milestones/${version}/jdt-language-server-${version}-${timestamp}.tar.gz";

     

       15
       +
           sha256 = "sha256-5izNGPZ3jXtJEPWIFzrwZsNi8esxh4PUn7xIWp4TV2U=";

     

       16
        
         };

     

       17
        
       

     

       18
        
         sourceRoot = ".";

     
···

       30
        
             # The application ships with config directories for linux and mac

     

       31
        
             configDir = if stdenv.isDarwin then "config_mac" else "config_linux";

     

       32
        
           in

     

       33
       +
             ''

     

       34
        
             # Copy jars

     

       35
        
             install -D -t $out/share/java/plugins/ plugins/*.jar

     

       36

+9 -9

pkgs/development/tools/misc/opengrok/default.nix

···

       1
       -
       { lib, stdenv, fetchurl, jre, ctags, makeWrapper, coreutils, git, runtimeShell }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "opengrok";

     

       5
       -
         version = "1.0";

     

       6
        
       

     

       7
        
         # binary distribution

     

       8
        
         src = fetchurl {

     

       9
        
           url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz";

     

       10
       -
           sha256 = "0h4rwfh8m41b7ij931gcbmkihri25m48373qf6ig0714s66xwc4i";

     

       11
        
         };

     

       12
        
       

     

       13
        
         nativeBuildInputs = [ makeWrapper ];

     

       14
        
       

     

       15
        
         installPhase = ''

     

       0
        
       
     

       0
        
       
     

       16
        
           mkdir -p $out

     

       17
        
           cp -a * $out/

     

       18
       -
           substituteInPlace $out/bin/OpenGrok --replace "/bin/uname" "${coreutils}/bin/uname"

     

       19
       -
           substituteInPlace $out/bin/Messages --replace "#!/bin/ksh" "#!${runtimeShell}"

     

       20
       -
           wrapProgram $out/bin/OpenGrok \

     

       21
       -
             --prefix PATH : "${lib.makeBinPath [ ctags git ]}" \

     

       22
       -
             --set JAVA_HOME "${jre}" \

     

       23
       -
             --set OPENGROK_TOMCAT_BASE "/var/tomcat"

     

       24
        
         '';

     

       25
        
       

     

       26
        
         meta = with lib; {

···

       1
       +
       { lib, stdenv, fetchurl, jre, makeWrapper }:

     

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "opengrok";

     

       5
       +
         version = "1.8.4";

     

       6
        
       

     

       7
        
         # binary distribution

     

       8
        
         src = fetchurl {

     

       9
        
           url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz";

     

       10
       +
           hash = "sha256-Xy8mTpdHorGGvUGHCDKOA2HaAJY3PBWjf6Pnll4Melk=";

     

       11
        
         };

     

       12
        
       

     

       13
        
         nativeBuildInputs = [ makeWrapper ];

     

       14
        
       

     

       15
        
         installPhase = ''

     

       16
       +
           runHook preInstall

     

       17
       +
       

     

       18
        
           mkdir -p $out

     

       19
        
           cp -a * $out/

     

       20
       +
           makeWrapper ${jre}/bin/java $out/bin/opengrok \

     

       21
       +
             --add-flags "-jar $out/lib/opengrok.jar"

     

       22
       +
       

     

       23
       +
           runHook postInstall

     

       0
        
       
     

       0
        
       
     

       24
        
         '';

     

       25
        
       

     

       26
        
         meta = with lib; {

+1 -1

pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix

···

       50
        
                   {

     

       51
        
                     nativeBuildInputs =

     

       52
        
                       (old.nativeBuildInputs or [ ])

     

       53
       -
                       ++ lib.optionals (!(builtins.isNull buildSystem)) [ buildSystem ]

     

       54
        
                       ++ map (a: self.${a}) extraAttrs;

     

       55
        
                   }

     

       56
        
               )

···

       50
        
                   {

     

       51
        
                     nativeBuildInputs =

     

       52
        
                       (old.nativeBuildInputs or [ ])

     

       53
       +
                       ++ lib.optionals (buildSystem != null) [ buildSystem ]

     

       54
        
                       ++ map (a: self.${a}) extraAttrs;

     

       55
        
                   }

     

       56
        
               )

+17 -13

pkgs/development/tools/protoc-gen-grpc-web/default.nix

···

       1
       -
       { lib, stdenv, fetchFromGitHub, protobuf }:

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       2
        
       

     

       3
       -
       stdenv.mkDerivation rec {

     

       4
        
         pname = "protoc-gen-grpc-web";

     

       5
       -
         version = "1.3.1";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "grpc";

     

       9
        
           repo = "grpc-web";

     

       10
       -
           rev = version;

     

       11
       -
           sha256 = "sha256-NRShN4X9JmCjqPVY/q9oSxSOvv1bP//vM9iOZ6ap5vc=";

     

       12
        
         };

     

       13
        
       

     

       14
        
         sourceRoot = "source/javascript/net/grpc/web/generator";

     

       15
        
       

     

       0
        
       
     

       16
        
         strictDeps = true;

     

       17
        
         nativeBuildInputs = [ protobuf ];

     

       18
        
         buildInputs = [ protobuf ];

     

       19
        
       

     

       20
       -
         makeFlags = [ "PREFIX=$(out)" "STATIC=no" ];

     

       21
       -
       

     

       22
       -
         patches = [

     

       23
       -
           # https://github.com/grpc/grpc-web/pull/1210

     

       24
       -
           ./optional-static.patch

     

       25
        
         ];

     

       26
        
       

     

       27
        
         doCheck = true;

     
···

       33
        
           mkdir -p "$CHECK_TMPDIR"

     

       34
        
       

     

       35
        
           protoc \

     

       36
       -
             --proto_path="${src}/packages/grpc-web/test/protos" \

     

       37
        
             --plugin="./protoc-gen-grpc-web" \

     

       38
        
             --grpc-web_out="import_style=commonjs,mode=grpcwebtext:$CHECK_TMPDIR" \

     

       39
        
             echo.proto

     
···

       46
        
       

     

       47
        
         meta = with lib; {

     

       48
        
           homepage = "https://github.com/grpc/grpc-web";

     

       49
       -
           changelog = "https://github.com/grpc/grpc-web/blob/${version}/CHANGELOG.md";

     

       50
        
           description = "gRPC web support for Google's protocol buffers";

     

       51
        
           license = licenses.asl20;

     

       52
        
           maintainers = with maintainers; [ jk ];

     

       53
        
           platforms = platforms.unix;

     

       54
        
         };

     

       55
       -
       }

···

       1
       +
       { lib

     

       2
       +
       , stdenv

     

       3
       +
       , fetchFromGitHub

     

       4
       +
       , protobuf

     

       5
       +
       , isStatic ? stdenv.hostPlatform.isStatic

     

       6
       +
       }:

     

       7
        
       

     

       8
       +
       stdenv.mkDerivation (finalAttrs: {

     

       9
        
         pname = "protoc-gen-grpc-web";

     

       10
       +
         version = "1.4.2";

     

       11
        
       

     

       12
        
         src = fetchFromGitHub {

     

       13
        
           owner = "grpc";

     

       14
        
           repo = "grpc-web";

     

       15
       +
           rev = finalAttrs.version;

     

       16
       +
           sha256 = "sha256-OetDAZ6zC8r7e82FILpQQnM+JHG9eludwhEuPaklrnw=";

     

       17
        
         };

     

       18
        
       

     

       19
        
         sourceRoot = "source/javascript/net/grpc/web/generator";

     

       20
        
       

     

       21
       +
         enableParallelBuilding = true;

     

       22
        
         strictDeps = true;

     

       23
        
         nativeBuildInputs = [ protobuf ];

     

       24
        
         buildInputs = [ protobuf ];

     

       25
        
       

     

       26
       +
         makeFlags = [

     

       27
       +
           "PREFIX=$(out)"

     

       28
       +
           "STATIC=${if isStatic then "yes" else "no"}"

     

       0
        
       
     

       0
        
       
     

       29
        
         ];

     

       30
        
       

     

       31
        
         doCheck = true;

     
···

       37
        
           mkdir -p "$CHECK_TMPDIR"

     

       38
        
       

     

       39
        
           protoc \

     

       40
       +
             --proto_path="$src/packages/grpc-web/test/protos" \

     

       41
        
             --plugin="./protoc-gen-grpc-web" \

     

       42
        
             --grpc-web_out="import_style=commonjs,mode=grpcwebtext:$CHECK_TMPDIR" \

     

       43
        
             echo.proto

     
···

       50
        
       

     

       51
        
         meta = with lib; {

     

       52
        
           homepage = "https://github.com/grpc/grpc-web";

     

       53
       +
           changelog = "https://github.com/grpc/grpc-web/blob/${finalAttrs.version}/CHANGELOG.md";

     

       54
        
           description = "gRPC web support for Google's protocol buffers";

     

       55
        
           license = licenses.asl20;

     

       56
        
           maintainers = with maintainers; [ jk ];

     

       57
        
           platforms = platforms.unix;

     

       58
        
         };

     

       59
       +
       })

-19

pkgs/development/tools/protoc-gen-grpc-web/optional-static.patch

···

       1
       -
       --- a/Makefile

     

       2
       -
       +++ b/Makefile

     

       3
       -
       @@ -18,12 +18,15 @@ CXXFLAGS += -std=c++11

     

       4
       -
        LDFLAGS += -L/usr/local/lib -lprotoc -lprotobuf -lpthread -ldl

     

       5
       -
        PREFIX ?= /usr/local

     

       6
       -
        MIN_MACOS_VERSION := 10.7 # Supports OS X Lion

     

       7
       -
       +STATIC ?= yes

     

       8
       -
       

     

       9
       -
        UNAME_S := $(shell uname -s)

     

       10
       -
        ifeq ($(UNAME_S),Darwin)

     

       11
       -
          CXXFLAGS += -stdlib=libc++ -mmacosx-version-min=$(MIN_MACOS_VERSION)

     

       12
       -
        else ifeq ($(UNAME_S),Linux)

     

       13
       -
       -  LDFLAGS += -static

     

       14
       -
       +  ifeq ($(STATIC),yes)

     

       15
       -
       +    LDFLAGS += -static

     

       16
       -
       +  endif

     

       17
       -
        endif

     

       18
       -
       

     

       19
       -
        all: protoc-gen-grpc-web

+4 -4

pkgs/development/tools/revive/default.nix

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "revive";

     

       5
       -
         version = "1.2.5";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "mgechev";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "sha256-pWX3dZqZ9UZ/k8c1K0xAgonsxZVrutWJ1PROQusO9vQ=";

     

       12
        
           # populate values that require us to use git. By doing this in postFetch we

     

       13
        
           # can delete .git afterwards and maintain better reproducibility of the src.

     

       14
        
           leaveDotGit = true;

     
···

       18
        
             rm -rf $out/.git

     

       19
        
           '';

     

       20
        
         };

     

       21
       -
         vendorHash = "sha256-IfayKnHCe1HHSi7YPNz8Wlz1TSAiVGs0rxpY9HYG3s8=";

     

       22
        
       

     

       23
        
         ldflags = [

     

       24
        
           "-s"

     
···

       35
        
       

     

       36
        
         # The following tests fail when built by nix:

     

       37
        
         #

     

       38
       -
         # $ nix log /nix/store/build-revive.1.2.5.drv | grep FAIL

     

       39
        
         #

     

       40
        
         # --- FAIL: TestAll (0.01s)

     

       41
        
         # --- FAIL: TestTimeEqual (0.00s)

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "revive";

     

       5
       +
         version = "1.3.0";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "mgechev";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "sha256-J+LAv0cLG+ucvOywLhaL/LObMO4tPUcLEv+dItHcPBI=";

     

       12
        
           # populate values that require us to use git. By doing this in postFetch we

     

       13
        
           # can delete .git afterwards and maintain better reproducibility of the src.

     

       14
        
           leaveDotGit = true;

     
···

       18
        
             rm -rf $out/.git

     

       19
        
           '';

     

       20
        
         };

     

       21
       +
         vendorHash = "sha256-FHm4TjsAYu4VM2WAHdd2xPP3/54YM6ei6cppHWF8LDc=";

     

       22
        
       

     

       23
        
         ldflags = [

     

       24
        
           "-s"

     
···

       35
        
       

     

       36
        
         # The following tests fail when built by nix:

     

       37
        
         #

     

       38
       +
         # $ nix log /nix/store/build-revive.1.3.0.drv | grep FAIL

     

       39
        
         #

     

       40
        
         # --- FAIL: TestAll (0.01s)

     

       41
        
         # --- FAIL: TestTimeEqual (0.00s)

+1 -1

pkgs/games/cataclysm-dda/pkgs/default.nix

···

       16
        
         pkgs' = lib.mapAttrs (_: mods: lib.filterAttrs isAvailable mods) pkgs;

     

       17
        
       

     

       18
        
         isAvailable = _: mod:

     

       19
       -
         if isNull build then

     

       20
        
           true

     

       21
        
         else if build.isTiles then

     

       22
        
           mod.forTiles or false

···

       16
        
         pkgs' = lib.mapAttrs (_: mods: lib.filterAttrs isAvailable mods) pkgs;

     

       17
        
       

     

       18
        
         isAvailable = _: mod:

     

       19
       +
         if (build == null) then

     

       20
        
           true

     

       21
        
         else if build.isTiles then

     

       22
        
           mod.forTiles or false

+1 -1

pkgs/games/curseofwar/default.nix

···

       20
        
           SDL

     

       21
        
         ];

     

       22
        
       

     

       23
       -
         makeFlags = (if isNull SDL then [] else [ "SDL=yes" ]) ++ [

     

       24
        
           "PREFIX=$(out)"

     

       25
        
           # force platform's cc on darwin, otherwise gcc is used

     

       26
        
           "CC=${stdenv.cc.targetPrefix}cc"

···

       20
        
           SDL

     

       21
        
         ];

     

       22
        
       

     

       23
       +
         makeFlags = (lib.optionals (SDL != null) [ "SDL=yes" ]) ++ [

     

       24
        
           "PREFIX=$(out)"

     

       25
        
           # force platform's cc on darwin, otherwise gcc is used

     

       26
        
           "CC=${stdenv.cc.targetPrefix}cc"

+11 -11

pkgs/games/lgames/lbreakouthd/default.nix

···

       1
        
       { lib

     

       2
        
       , stdenv

     

       3
        
       , fetchurl

     

       0
        
       
     

       4
        
       , SDL2

     

       5
        
       , SDL2_image

     

       6
        
       , SDL2_mixer

     

       7
        
       , SDL2_ttf

     

       8
       -
       , directoryListingUpdater

     

       9
        
       }:

     

       10
        
       

     

       11
       -
       stdenv.mkDerivation rec {

     

       12
        
         pname = "lbreakouthd";

     

       13
       -
         version = "1.1";

     

       14
        
       

     

       15
        
         src = fetchurl {

     

       16
       -
           url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz";

     

       17
       -
           hash = "sha256-5hjS0aJ5f8Oe0aSuVgcV10h5OmWsaMHF5B9wYVFrlDY=";

     

       18
        
         };

     

       19
        
       

     

       20
        
         buildInputs = [

     
···

       27
        
         hardeningDisable = [ "format" ];

     

       28
        
       

     

       29
        
         passthru.updateScript = directoryListingUpdater {

     

       30
       -
           inherit pname version;

     

       31
        
           url = "https://lgames.sourceforge.io/LBreakoutHD/";

     

       32
        
           extraRegex = "(?!.*-win(32|64)).*";

     

       33
        
         };

     

       34
        
       

     

       35
       -
         meta = with lib; {

     

       36
       -
           broken = stdenv.isDarwin;

     

       37
        
           homepage = "https://lgames.sourceforge.io/LBreakoutHD/";

     

       38
        
           description = "A widescreen Breakout clone";

     

       39
       -
           license = licenses.gpl2Plus;

     

       40
       -
           maintainers = with maintainers; [ AndersonTorres ];

     

       41
        
           inherit (SDL2.meta) platforms;

     

       0
        
       
     

       42
        
         };

     

       43
       -
       }

···

       1
        
       { lib

     

       2
        
       , stdenv

     

       3
        
       , fetchurl

     

       4
       +
       , directoryListingUpdater

     

       5
        
       , SDL2

     

       6
        
       , SDL2_image

     

       7
        
       , SDL2_mixer

     

       8
        
       , SDL2_ttf

     

       0
        
       
     

       9
        
       }:

     

       10
        
       

     

       11
       +
       stdenv.mkDerivation (self: {

     

       12
        
         pname = "lbreakouthd";

     

       13
       +
         version = "1.1.1";

     

       14
        
       

     

       15
        
         src = fetchurl {

     

       16
       +
           url = "mirror://sourceforge/lgames/lbreakouthd-${self.version}.tar.gz";

     

       17
       +
           hash = "sha256-ljnZpuV9HPPR5bgdbyE8gUtb4m+JppxGm3MV691sw7E=";

     

       18
        
         };

     

       19
        
       

     

       20
        
         buildInputs = [

     
···

       27
        
         hardeningDisable = [ "format" ];

     

       28
        
       

     

       29
        
         passthru.updateScript = directoryListingUpdater {

     

       30
       +
           inherit (self) pname version;

     

       31
        
           url = "https://lgames.sourceforge.io/LBreakoutHD/";

     

       32
        
           extraRegex = "(?!.*-win(32|64)).*";

     

       33
        
         };

     

       34
        
       

     

       35
       +
         meta = {

     

       0
        
       
     

       36
        
           homepage = "https://lgames.sourceforge.io/LBreakoutHD/";

     

       37
        
           description = "A widescreen Breakout clone";

     

       38
       +
           license = lib.licenses.gpl2Plus;

     

       39
       +
           maintainers = with lib.maintainers; [ AndersonTorres ];

     

       40
        
           inherit (SDL2.meta) platforms;

     

       41
       +
           broken = stdenv.isDarwin;

     

       42
        
         };

     

       43
       +
       })

+11 -11

pkgs/games/tetrio-desktop/default.nix

···

       1
        
       { stdenv

     

       2
        
       , lib

     

       3
        
       , fetchurl

     

       0
        
       
     

       4
        
       , autoPatchelfHook

     

       5
        
       , wrapGAppsHook

     

       6
        
       , alsa-lib

     
···

       29
        
         };

     

       30
        
       

     

       31
        
         nativeBuildInputs = [

     

       0
        
       
     

       32
        
           autoPatchelfHook

     

       33
        
           wrapGAppsHook

     

       34
        
         ];

     

       0
        
       
     

       0
        
       
     

       35
        
       

     

       36
        
         buildInputs = [

     

       37
        
           alsa-lib

     
···

       43
        
           nss

     

       44
        
           gtk3

     

       45
        
         ];

     

       46
       -
       

     

       47
       -
         dontWrapGApps = true;

     

       48
        
       

     

       49
        
         libPath = lib.makeLibraryPath [

     

       50
        
           libpulseaudio

     

       51
        
           systemd

     

       52
        
         ];

     

       53
        
       

     

       54
       -
         unpackPhase = ''

     

       55
       -
           mkdir -p $TMP/tetrio-desktop $out/bin

     

       56
       -
           cp $src $TMP/tetrio-desktop.deb

     

       57
       -
           ar vx $TMP/tetrio-desktop.deb

     

       58
       -
           tar --no-overwrite-dir -xvf data.tar.xz -C $TMP/tetrio-desktop/

     

       59
       -
         '';

     

       60
        
       

     

       61
        
         installPhase = ''

     

       62
        
           runHook preInstall

     

       63
        
       

     

       64
       -
           cp -R $TMP/tetrio-desktop/{usr/share,opt} $out/

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       65
        
           ln -s $out/opt/TETR.IO/tetrio-desktop $out/bin/

     

       66
        
       

     

       67
        
           substituteInPlace $out/share/applications/tetrio-desktop.desktop \

     
···

       71
        
         '';

     

       72
        
       

     

       73
        
         postInstall = lib.strings.optionalString withTetrioPlus ''

     

       74
       -
             cp ${tetrio-plus} $out/opt/TETR.IO/resources/app.asar

     

       75
       -
           '';

     

       76
        
       

     

       77
        
         postFixup = ''

     

       78
        
           wrapProgram $out/opt/TETR.IO/tetrio-desktop \

···

       1
        
       { stdenv

     

       2
        
       , lib

     

       3
        
       , fetchurl

     

       4
       +
       , dpkg

     

       5
        
       , autoPatchelfHook

     

       6
        
       , wrapGAppsHook

     

       7
        
       , alsa-lib

     
···

       30
        
         };

     

       31
        
       

     

       32
        
         nativeBuildInputs = [

     

       33
       +
           dpkg

     

       34
        
           autoPatchelfHook

     

       35
        
           wrapGAppsHook

     

       36
        
         ];

     

       37
       +
       

     

       38
       +
         dontWrapGApps = true;

     

       39
        
       

     

       40
        
         buildInputs = [

     

       41
        
           alsa-lib

     
···

       47
        
           nss

     

       48
        
           gtk3

     

       49
        
         ];

     

       0
        
       
     

       0
        
       
     

       50
        
       

     

       51
        
         libPath = lib.makeLibraryPath [

     

       52
        
           libpulseaudio

     

       53
        
           systemd

     

       54
        
         ];

     

       55
        
       

     

       56
       +
         unpackCmd = "dpkg -x $curSrc src";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       57
        
       

     

       58
        
         installPhase = ''

     

       59
        
           runHook preInstall

     

       60
        
       

     

       61
       +
           mkdir $out

     

       62
       +
           cp -r opt/ usr/share/ $out

     

       63
       +
       

     

       64
       +
           mkdir $out/bin

     

       65
        
           ln -s $out/opt/TETR.IO/tetrio-desktop $out/bin/

     

       66
        
       

     

       67
        
           substituteInPlace $out/share/applications/tetrio-desktop.desktop \

     
···

       71
        
         '';

     

       72
        
       

     

       73
        
         postInstall = lib.strings.optionalString withTetrioPlus ''

     

       74
       +
           cp ${tetrio-plus} $out/opt/TETR.IO/resources/app.asar

     

       75
       +
         '';

     

       76
        
       

     

       77
        
         postFixup = ''

     

       78
        
           wrapProgram $out/opt/TETR.IO/tetrio-desktop \

+3 -3

pkgs/games/tetrio-desktop/tetrio-plus.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "tetrio-plus";

     

       5
       -
         version = "0.25.2";

     

       6
        
       

     

       7
        
         src = fetchzip {

     

       8
       -
           url = "https://gitlab.com/UniQMG/tetrio-plus/uploads/5c720489d2bcd35629b4f8a1f36d28b1/tetrio-plus_0.25.2_app.asar.zip";

     

       9
       -
           sha256 = "sha256-8Xc2wftRYIMZ2ee67IJEIGGrAAS02CL0XzDqQ/luYVE=";

     

       10
        
         };

     

       11
        
       

     

       12
        
         installPhase = ''

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "tetrio-plus";

     

       5
       +
         version = "0.25.3";

     

       6
        
       

     

       7
        
         src = fetchzip {

     

       8
       +
           url = "https://gitlab.com/UniQMG/tetrio-plus/uploads/684477053451cd0819e2c84e145966eb/tetrio-plus_0.25.3_app.asar.zip";

     

       9
       +
           sha256 = "sha256-GQgt4GZNeKx/uzmVsuKppW2zg8AAiGqsk2JYJIkqfVE=";

     

       10
        
         };

     

       11
        
       

     

       12
        
         installPhase = ''

+1 -1

pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix

···

       30
        
             include \

     

       31
        
             $out/

     

       32
        
       

     

       33
       -
           install -D ../LICENSE $out/share/doc

     

       34
        
       

     

       35
        
           runHook postInstall

     

       36
        
         '';

···

       30
        
             include \

     

       31
        
             $out/

     

       32
        
       

     

       33
       +
           install -m 0644 -D ../LICENSE $out/share/doc/LICENSE

     

       34
        
       

     

       35
        
           runHook postInstall

     

       36
        
         '';

+2 -5

pkgs/os-specific/linux/mwprocapture/default.nix

···

       12
        
       in

     

       13
        
       stdenv.mkDerivation rec {

     

       14
        
         pname = "mwprocapture";

     

       15
       -
         subVersion = "4236";

     

       16
        
         version = "1.3.0.${subVersion}-${kernel.version}";

     

       17
        
       

     

       18
        
         src = fetchurl {

     

       19
        
           url = "https://www.magewell.com/files/drivers/ProCaptureForLinux_${subVersion}.tar.gz";

     

       20
       -
           sha256 = "1mfgj84km276sq5i8dny1vqp2ycqpvgplrmpbqwnk230d0w3qs74";

     

       21
        
         };

     

       22
        
       

     

       23
        
         nativeBuildInputs = kernel.moduleBuildDependencies;

     
···

       32
        
         makeFlags = [

     

       33
        
           "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

     

       34
        
         ];

     

       35
       -
       

     

       36
       -
         patches = [ ./pci.patch ];

     

       37
        
       

     

       38
        
         env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough";

     

       39
        
       

     
···

       59
        
         '';

     

       60
        
       

     

       61
        
         meta = {

     

       62
       -
           broken = kernel.kernelAtLeast "5.16";

     

       63
        
           homepage = "https://www.magewell.com/";

     

       64
        
           description = "Linux driver for the Magewell Pro Capture family";

     

       65
        
           license = licenses.unfreeRedistributable;

···

       12
        
       in

     

       13
        
       stdenv.mkDerivation rec {

     

       14
        
         pname = "mwprocapture";

     

       15
       +
         subVersion = "4328";

     

       16
        
         version = "1.3.0.${subVersion}-${kernel.version}";

     

       17
        
       

     

       18
        
         src = fetchurl {

     

       19
        
           url = "https://www.magewell.com/files/drivers/ProCaptureForLinux_${subVersion}.tar.gz";

     

       20
       +
           sha256 = "197l86ad52ijmmq5an6891gd1chhkxqiagamcchirrky4c50qs36";

     

       21
        
         };

     

       22
        
       

     

       23
        
         nativeBuildInputs = kernel.moduleBuildDependencies;

     
···

       32
        
         makeFlags = [

     

       33
        
           "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

     

       34
        
         ];

     

       0
        
       
     

       0
        
       
     

       35
        
       

     

       36
        
         env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough";

     

       37
        
       

     
···

       57
        
         '';

     

       58
        
       

     

       59
        
         meta = {

     

       0
        
       
     

       60
        
           homepage = "https://www.magewell.com/";

     

       61
        
           description = "Linux driver for the Magewell Pro Capture family";

     

       62
        
           license = licenses.unfreeRedistributable;

-20

pkgs/os-specific/linux/mwprocapture/pci.patch

···

       1
       -
       diff --git a/src/sources/avstream/capture.c b/src/sources/avstream/capture.c

     

       2
       -
       index f5d256d..a104f62 100644

     

       3
       -
       --- a/src/sources/avstream/capture.c

     

       4
       -
       +++ b/src/sources/avstream/capture.c

     

       5
       -
       @@ -288,12 +288,12 @@ static int xi_cap_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

     

       6
       -
            }

     

       7
       -
        

     

       8
       -
            if ((sizeof(dma_addr_t) > 4) &&

     

       9
       -
       -            !pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {

     

       10
       -
       +            !dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) {

     

       11
       -
                xi_debug(1, "dma 64 OK!\n");

     

       12
       -
            } else {

     

       13
       -
                xi_debug(1, "dma 64 not OK!\n");

     

       14
       -
       -        if ((pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) < 0) &&

     

       15
       -
       -                (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) < 0) {

     

       16
       -
       +        if ((dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) < 0) &&

     

       17
       -
       +                (dma_set_mask(&pdev->dev, DMA_BIT_MASK(32))) < 0) {

     

       18
       -
                    xi_debug(0, "DMA configuration failed\n");

     

       19
       -
                    goto disable_pci;

     

       20
       -
                }

+35 -46

pkgs/servers/http/apache-modules/mod_tile/default.nix

···

       1
       -
       { lib

     

       0
        
       
     

       2
        
       , stdenv

     

       3
       -
       , fetchFromGitHub

     

       4
       -
       , fetchpatch

     

       5
       -
       , autoreconfHook

     

       6
        
       , apacheHttpd

     

       7
        
       , apr

     

       0
        
       
     

       0
        
       
     

       8
        
       , cairo

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       9
        
       , iniparser

     

       0
        
       
     

       10
        
       , mapnik

     

       11
       -
       , boost

     

       12
       -
       , icu

     

       13
       -
       , harfbuzz

     

       14
       -
       , libjpeg

     

       15
       -
       , libtiff

     

       16
       -
       , libwebp

     

       17
       -
       , proj

     

       18
       -
       , sqlite

     

       19
        
       }:

     

       20
        
       

     

       21
        
       stdenv.mkDerivation rec {

     

       22
        
         pname = "mod_tile";

     

       23
       -
         version = "unstable-2017-01-08";

     

       24
        
       

     

       25
        
         src = fetchFromGitHub {

     

       26
        
           owner = "openstreetmap";

     

       27
        
           repo = "mod_tile";

     

       28
       -
           rev = "e25bfdba1c1f2103c69529f1a30b22a14ce311f1";

     

       29
       -
           sha256 = "12c96avka1dfb9wxqmjd57j30w9h8yx4y4w34kyq6xnf6lwnkcxp";

     

       30
        
         };

     

       31
        
       

     

       32
       -
         patches = [

     

       33
       -
           # Pull upstream fix for -fno-common toolchains:

     

       34
       -
           #  https://github.com/openstreetmap/mod_tile/pull/202

     

       35
       -
           (fetchpatch {

     

       36
       -
             name = "fno-common";

     

       37
       -
             url = "https://github.com/openstreetmap/mod_tile/commit/a22065b8ae3c018820a5ca9bf8e2b2bb0a0bfeb4.patch";

     

       38
       -
             sha256 = "1ywfa14xn9aa96vx1adn1ndi29qpflca06x986bx9c5pqk761yz3";

     

       39
       -
           })

     

       40
        
         ];

     

       41
        
       

     

       42
       -
         # test is broken and I couldn't figure out a better way to disable it.

     

       43
       -
         postPatch = ''

     

       44
       -
           echo "int main(){return 0;}" > src/gen_tile_test.cpp

     

       45
       -
         '';

     

       46
       -
       

     

       47
       -
         nativeBuildInputs = [ autoreconfHook ];

     

       48
        
         buildInputs = [

     

       49
        
           apacheHttpd

     

       50
        
           apr

     

       0
        
       
     

       0
        
       
     

       51
        
           cairo

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       52
        
           iniparser

     

       0
        
       
     

       53
        
           mapnik

     

       54
       -
           boost

     

       55
       -
           icu

     

       56
       -
           harfbuzz

     

       57
       -
           libjpeg

     

       58
       -
           libtiff

     

       59
       -
           libwebp

     

       60
       -
           proj

     

       61
       -
           sqlite

     

       62
        
         ];

     

       63
        
       

     

       64
       -
         configureFlags = [

     

       65
       -
           "--with-apxs=${apacheHttpd.dev}/bin/apxs"

     

       66
       -
         ];

     

       67
       -
       

     

       68
       -
         installPhase = ''

     

       69
       -
           mkdir -p $out/modules

     

       70
       -
           make install-mod_tile DESTDIR=$out

     

       71
       -
           mv $out${apacheHttpd}/* $out

     

       72
       -
           rm -rf $out/nix

     

       73
        
         '';

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       74
        
       

     

       75
        
         meta = with lib; {

     

       76
        
           homepage = "https://github.com/openstreetmap/mod_tile";

···

       1
       +
       { fetchFromGitHub

     

       2
       +
       , lib

     

       3
        
       , stdenv

     

       4
       +
       , cmake

     

       5
       +
       , pkg-config

     

       0
        
       
     

       6
        
       , apacheHttpd

     

       7
        
       , apr

     

       8
       +
       , aprutil

     

       9
       +
       , boost

     

       10
        
       , cairo

     

       11
       +
       , curl

     

       12
       +
       , glib

     

       13
       +
       , gtk2

     

       14
       +
       , harfbuzz

     

       15
       +
       , icu

     

       16
        
       , iniparser

     

       17
       +
       , libmemcached

     

       18
        
       , mapnik

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       19
        
       }:

     

       20
        
       

     

       21
        
       stdenv.mkDerivation rec {

     

       22
        
         pname = "mod_tile";

     

       23
       +
         version = "0.6.1+unstable=2023-03-09";

     

       24
        
       

     

       25
        
         src = fetchFromGitHub {

     

       26
        
           owner = "openstreetmap";

     

       27
        
           repo = "mod_tile";

     

       28
       +
           rev = "f521540df1003bb000d7367a59ad612161eab0f0";

     

       29
       +
           sha256 = "sha256-jIqeplAQt4W97PNKm6ZDGPDUc/PEiLM5yEdPeI+H03A=";

     

       30
        
         };

     

       31
        
       

     

       32
       +
         nativeBuildInputs = [

     

       33
       +
           cmake

     

       34
       +
           pkg-config

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       35
        
         ];

     

       36
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       37
        
         buildInputs = [

     

       38
        
           apacheHttpd

     

       39
        
           apr

     

       40
       +
           aprutil

     

       41
       +
           boost

     

       42
        
           cairo

     

       43
       +
           curl

     

       44
       +
           glib

     

       45
       +
           harfbuzz

     

       46
       +
           icu

     

       47
        
           iniparser

     

       48
       +
           libmemcached

     

       49
        
           mapnik

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       50
        
         ];

     

       51
        
       

     

       52
       +
         # the install script wants to install mod_tile.so into apache's modules dir

     

       53
       +
         postPatch = ''

     

       54
       +
           sed -i "s|\''${HTTPD_MODULES_DIR}|$out/modules|" CMakeLists.txt

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       55
        
         '';

     

       56
       +
       

     

       57
       +
         enableParallelBuilding = true;

     

       58
       +
       

     

       59
       +
         # We need to either disable the `render_speedtest` and `download_tile` tests

     

       60
       +
         # or fix the URLs they try to download from

     

       61
       +
         #cmakeFlags = [ "-DENABLE_TESTS=1" ];

     

       62
       +
         #doCheck = true;

     

       63
        
       

     

       64
        
         meta = with lib; {

     

       65
        
           homepage = "https://github.com/openstreetmap/mod_tile";

+2 -2

pkgs/servers/http/lighttpd/default.nix

···

       15
        
       

     

       16
        
       stdenv.mkDerivation rec {

     

       17
        
         pname = "lighttpd";

     

       18
       -
         version = "1.4.68";

     

       19
        
       

     

       20
        
         src = fetchurl {

     

       21
        
           url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz";

     

       22
       -
           sha256 = "sha256-5W83rlK2PhraTXbOeABa/7blbuova9sM4X1tNulYM4Q=";

     

       23
        
         };

     

       24
        
       

     

       25
        
         postPatch = ''

···

       15
        
       

     

       16
        
       stdenv.mkDerivation rec {

     

       17
        
         pname = "lighttpd";

     

       18
       +
         version = "1.4.69";

     

       19
        
       

     

       20
        
         src = fetchurl {

     

       21
        
           url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz";

     

       22
       +
           sha256 = "sha256-FqyNuV5xlim6YZSbmfiib+upRqgdGFIVsoN5u0EWsLQ=";

     

       23
        
         };

     

       24
        
       

     

       25
        
         postPatch = ''

+1 -1

pkgs/servers/nosql/arangodb/default.nix

···

       25
        
           else "core";

     

       26
        
       

     

       27
        
         targetArch =

     

       28
       -
           if isNull targetArchitecture

     

       29
        
           then defaultTargetArchitecture

     

       30
        
           else targetArchitecture;

     

       31
        
       in

···

       25
        
           else "core";

     

       26
        
       

     

       27
        
         targetArch =

     

       28
       +
           if targetArchitecture == null

     

       29
        
           then defaultTargetArchitecture

     

       30
        
           else targetArchitecture;

     

       31
        
       in

+1 -1

pkgs/stdenv/generic/make-derivation.nix

···

       214
        
       

     

       215
        
         checkDependencyList = checkDependencyList' [];

     

       216
        
         checkDependencyList' = positions: name: deps: lib.flip lib.imap1 deps (index: dep:

     

       217
       -
           if lib.isDerivation dep || isNull dep || builtins.typeOf dep == "string" || builtins.typeOf dep == "path" then dep

     

       218
        
           else if lib.isList dep then checkDependencyList' ([index] ++ positions) name dep

     

       219
        
           else throw "Dependency is not of a valid type: ${lib.concatMapStrings (ix: "element ${toString ix} of ") ([index] ++ positions)}${name} for ${attrs.name or attrs.pname}");

     

       220
        
       in if builtins.length erroneousHardeningFlags != 0

···

       214
        
       

     

       215
        
         checkDependencyList = checkDependencyList' [];

     

       216
        
         checkDependencyList' = positions: name: deps: lib.flip lib.imap1 deps (index: dep:

     

       217
       +
           if lib.isDerivation dep || dep == null || builtins.typeOf dep == "string" || builtins.typeOf dep == "path" then dep

     

       218
        
           else if lib.isList dep then checkDependencyList' ([index] ++ positions) name dep

     

       219
        
           else throw "Dependency is not of a valid type: ${lib.concatMapStrings (ix: "element ${toString ix} of ") ([index] ++ positions)}${name} for ${attrs.name or attrs.pname}");

     

       220
        
       in if builtins.length erroneousHardeningFlags != 0

+3 -1

pkgs/tools/admin/azure-cli/default.nix

···

       27
        
           substituteInPlace setup.py \

     

       28
        
             --replace "chardet~=3.0.4" "chardet" \

     

       29
        
             --replace "javaproperties~=0.5.1" "javaproperties" \

     

       30
       -
             --replace "scp~=0.13.2" "scp"

     

       0
        
       
     

       0
        
       
     

       31
        
       

     

       32
        
           # remove namespace hacks

     

       33
        
           # remove urllib3 because it was added as 'urllib3[secure]', which doesn't get handled well

···

       27
        
           substituteInPlace setup.py \

     

       28
        
             --replace "chardet~=3.0.4" "chardet" \

     

       29
        
             --replace "javaproperties~=0.5.1" "javaproperties" \

     

       30
       +
             --replace "scp~=0.13.2" "scp" \

     

       31
       +
             --replace "packaging>=20.9,<22.0" "packaging" \

     

       32
       +
             --replace "fabric~=2.4" "fabric"

     

       33
        
       

     

       34
        
           # remove namespace hacks

     

       35
        
           # remove urllib3 because it was added as 'urllib3[secure]', which doesn't get handled well

+2 -1

pkgs/tools/admin/azure-cli/python-packages.nix

···

       62
        
                 substituteInPlace setup.py \

     

       63
        
                   --replace "requests[socks]~=2.25.1" "requests[socks]~=2.25" \

     

       64
        
                   --replace "cryptography>=3.2,<3.4" "cryptography" \

     

       65
       -
                   --replace "msal-extensions>=0.3.1,<0.4" "msal-extensions"

     

       0
        
       
     

       66
        
               '';

     

       67
        
               nativeCheckInputs = with self; [ pytest ];

     

       68
        
               doCheck = stdenv.isLinux;

···

       62
        
                 substituteInPlace setup.py \

     

       63
        
                   --replace "requests[socks]~=2.25.1" "requests[socks]~=2.25" \

     

       64
        
                   --replace "cryptography>=3.2,<3.4" "cryptography" \

     

       65
       +
                   --replace "msal-extensions>=0.3.1,<0.4" "msal-extensions" \

     

       66
       +
                   --replace "packaging>=20.9,<22.0" "packaging"

     

       67
        
               '';

     

       68
        
               nativeCheckInputs = with self; [ pytest ];

     

       69
        
               doCheck = stdenv.isLinux;

+39

pkgs/tools/compression/orz/default.nix

···

       1
       +
       { lib

     

       2
       +
       , rustPlatform

     

       3
       +
       , fetchFromGitHub

     

       4
       +
       , rust-cbindgen

     

       5
       +
       }:

     

       6
       +
       

     

       7
       +
       rustPlatform.buildRustPackage rec {

     

       8
       +
         pname = "orz";

     

       9
       +
         version = "1.6.2";

     

       10
       +
       

     

       11
       +
         src = fetchFromGitHub {

     

       12
       +
           owner = "richox";

     

       13
       +
           repo = "orz";

     

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

     

       15
       +
           hash = "sha256-Yro+iXlg18Pj/AkU4IjvgA88xctK65yStfTilz+IRs0=";

     

       16
       +
         };

     

       17
       +
       

     

       18
       +
         cargoHash = "sha256-aUsRbIajBP6esjW7Wj7mqIkbYUCbZ2GgxjRXMPTnHYg=";

     

       19
       +
       

     

       20
       +
         outputs = [ "out" "dev" "lib" ];

     

       21
       +
       

     

       22
       +
         nativeBuildInputs = [

     

       23
       +
           rust-cbindgen

     

       24
       +
         ];

     

       25
       +
       

     

       26
       +
         postInstall = ''

     

       27
       +
           cbindgen -o $dev/include/orz.h

     

       28
       +
       

     

       29
       +
           mkdir -p $lib

     

       30
       +
           mv $out/lib "$lib"

     

       31
       +
         '';

     

       32
       +
       

     

       33
       +
         meta = with lib; {

     

       34
       +
           description = "A high performance, general purpose data compressor written in rust";

     

       35
       +
           homepage = "https://github.com/richox/orz";

     

       36
       +
           license = licenses.mit;

     

       37
       +
           maintainers = with maintainers; [ figsoda ];

     

       38
       +
         };

     

       39
       +
       }

+2 -2

pkgs/tools/graphics/dpic/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "dpic";

     

       5
       -
         version = "2021.11.01";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://ece.uwaterloo.ca/~aplevich/dpic/${pname}-${version}.tar.gz";

     

       9
       -
           sha256 = "sha256-TkMc5tG+sPHfjiCxli5bIteJfq5ZG36+HaqZOk/v6oI=";

     

       10
        
         };

     

       11
        
       

     

       12
        
         # The prefix passed to configure is not used.

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "dpic";

     

       5
       +
         version = "2023.02.01";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "https://ece.uwaterloo.ca/~aplevich/dpic/${pname}-${version}.tar.gz";

     

       9
       +
           sha256 = "sha256-0Fn/KMBFUgZsFk+xRv7o4BAblT5G51kZs9z6qZsDGuY=";

     

       10
        
         };

     

       11
        
       

     

       12
        
         # The prefix passed to configure is not used.

+2 -2

pkgs/tools/misc/plfit/default.nix

···

       20
        
       

     

       21
        
         nativeBuildInputs = [

     

       22
        
           cmake

     

       23
       -
         ] ++ lib.optionals (!isNull python) [

     

       24
        
           python

     

       25
        
           swig

     

       26
        
         ];

     

       27
        
       

     

       28
        
         cmakeFlags = [

     

       29
        
           "-DPLFIT_USE_OPENMP=ON"

     

       30
       -
         ] ++ lib.optionals (!isNull python) [

     

       31
        
           "-DPLFIT_COMPILE_PYTHON_MODULE=ON"

     

       32
        
         ];

     

       33

···

       20
        
       

     

       21
        
         nativeBuildInputs = [

     

       22
        
           cmake

     

       23
       +
         ] ++ lib.optionals (python != null) [

     

       24
        
           python

     

       25
        
           swig

     

       26
        
         ];

     

       27
        
       

     

       28
        
         cmakeFlags = [

     

       29
        
           "-DPLFIT_USE_OPENMP=ON"

     

       30
       +
         ] ++ lib.optionals (python != null) [

     

       31
        
           "-DPLFIT_COMPILE_PYTHON_MODULE=ON"

     

       32
        
         ];

     

       33

+2 -2

pkgs/tools/security/sudo/default.nix

···

       14
        
       

     

       15
        
       stdenv.mkDerivation rec {

     

       16
        
         pname = "sudo";

     

       17
       -
         version = "1.9.13";

     

       18
        
       

     

       19
        
         src = fetchurl {

     

       20
        
           url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz";

     

       21
       -
           hash = "sha256-P1VFW0btsKEp2SXcw5ly8S98f7eNDMq2AX7hbIF35DY=";

     

       22
        
         };

     

       23
        
       

     

       24
        
         prePatch = ''

···

       14
        
       

     

       15
        
       stdenv.mkDerivation rec {

     

       16
        
         pname = "sudo";

     

       17
       +
         version = "1.9.13p3";

     

       18
        
       

     

       19
        
         src = fetchurl {

     

       20
        
           url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz";

     

       21
       +
           hash = "sha256-kjNKEruT4MBWsJ9T4lXMt9b2fGNQ4oE82Vk87sp4Vgs=";

     

       22
        
         };

     

       23
        
       

     

       24
        
         prePatch = ''

+1 -1

pkgs/tools/text/gawk/gawkextlib.nix

···

       6
        
       let

     

       7
        
         buildExtension = lib.makeOverridable

     

       8
        
           ({ name, gawkextlib, extraBuildInputs ? [ ], doCheck ? true }:

     

       9
       -
             let is_extension = !isNull gawkextlib;

     

       10
        
             in stdenv.mkDerivation rec {

     

       11
        
               pname = "gawkextlib-${name}";

     

       12
        
               version = "unstable-2019-11-21";

···

       6
        
       let

     

       7
        
         buildExtension = lib.makeOverridable

     

       8
        
           ({ name, gawkextlib, extraBuildInputs ? [ ], doCheck ? true }:

     

       9
       +
             let is_extension = gawkextlib != null;

     

       10
        
             in stdenv.mkDerivation rec {

     

       11
        
               pname = "gawkextlib-${name}";

     

       12
        
               version = "unstable-2019-11-21";

+6 -8

pkgs/top-level/all-packages.nix

···

       2665
        
       

     

       2666
        
         android-backup-extractor = callPackage ../tools/backup/android-backup-extractor { };

     

       2667
        
       

     

       2668
       -
         android-tools = lowPrio (darwin.apple_sdk_11_0.callPackage ../tools/misc/android-tools

     

       2669
       -
           (lib.optionalAttrs (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isLinux) {

     

       2670
       -
             stdenv = gcc10Stdenv;

     

       2671
       -
           }));

     

       2672
        
       

     

       2673
        
         anewer = callPackage ../tools/text/anewer { };

     

       2674
        
       

     
···

       10744
        
         orangefs = callPackage ../tools/filesystems/orangefs {

     

       10745
        
           autoreconfHook = buildPackages.autoreconfHook269;

     

       10746
        
         };

     

       0
        
       
     

       0
        
       
     

       10747
        
       

     

       10748
        
         os-prober = callPackage ../tools/misc/os-prober { };

     

       10749
        
       

     
···

       31104
        
             Carbon AudioToolbox VideoToolbox VideoDecodeAcceleration AVFoundation CoreAudio CoreVideo

     

       31105
        
             CoreMediaIO QuartzCore AppKit CoreWLAN WebKit IOKit GSS MediaPlayer IOSurface Metal MetalKit;

     

       31106
        
       

     

       31107
       -
           # C++20 is required, aarch64 has gcc 9 by default

     

       31108
        
           stdenv = if stdenv.isDarwin

     

       31109
        
             then darwin.apple_sdk_11_0.stdenv

     

       31110
       -
             else if stdenv.isAarch64 then gcc10Stdenv else stdenv;

     

       31111
        
       

     

       31112
        
           # tdesktop has random crashes when jemalloc is built with gcc.

     

       31113
        
           # Apparently, it triggers some bug due to usage of gcc's builtin

     
···

       38532
        
           gtk2 = gtk2-x11;

     

       38533
        
         };

     

       38534
        
       

     

       38535
       -
         qMasterPassword = qt6Packages.callPackage ../applications/misc/qMasterPassword { };

     

       38536
        
       

     

       38537
        
         qmake2cmake = python3Packages.callPackage ../tools/misc/qmake2cmake { };

     

       38538
        
       

     
···

       39160
        
       

     

       39161
        
         spdlog = spdlog_1;

     

       39162
        
       

     

       39163
       -
         dart = callPackage ../development/interpreters/dart { };

     

       39164
        
       

     

       39165
        
         httrack = callPackage ../tools/backup/httrack { };

     

       39166

···

       2665
        
       

     

       2666
        
         android-backup-extractor = callPackage ../tools/backup/android-backup-extractor { };

     

       2667
        
       

     

       2668
       +
         android-tools = lowPrio (darwin.apple_sdk_11_0.callPackage ../tools/misc/android-tools { });

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       2669
        
       

     

       2670
        
         anewer = callPackage ../tools/text/anewer { };

     

       2671
        
       

     
···

       10741
        
         orangefs = callPackage ../tools/filesystems/orangefs {

     

       10742
        
           autoreconfHook = buildPackages.autoreconfHook269;

     

       10743
        
         };

     

       10744
       +
       

     

       10745
       +
         orz = callPackage ../tools/compression/orz { };

     

       10746
        
       

     

       10747
        
         os-prober = callPackage ../tools/misc/os-prober { };

     

       10748
        
       

     
···

       31103
        
             Carbon AudioToolbox VideoToolbox VideoDecodeAcceleration AVFoundation CoreAudio CoreVideo

     

       31104
        
             CoreMediaIO QuartzCore AppKit CoreWLAN WebKit IOKit GSS MediaPlayer IOSurface Metal MetalKit;

     

       31105
        
       

     

       0
        
       
     

       31106
        
           stdenv = if stdenv.isDarwin

     

       31107
        
             then darwin.apple_sdk_11_0.stdenv

     

       31108
       +
             else stdenv;

     

       31109
        
       

     

       31110
        
           # tdesktop has random crashes when jemalloc is built with gcc.

     

       31111
        
           # Apparently, it triggers some bug due to usage of gcc's builtin

     
···

       38530
        
           gtk2 = gtk2-x11;

     

       38531
        
         };

     

       38532
        
       

     

       38533
       +
         qMasterPassword = libsForQt5.callPackage ../applications/misc/qMasterPassword { };

     

       38534
        
       

     

       38535
        
         qmake2cmake = python3Packages.callPackage ../tools/misc/qmake2cmake { };

     

       38536
        
       

     
···

       39158
        
       

     

       39159
        
         spdlog = spdlog_1;

     

       39160
        
       

     

       39161
       +
         dart = callPackage ../development/compilers/dart { };

     

       39162
        
       

     

       39163
        
         httrack = callPackage ../tools/backup/httrack { };

     

       39164

+1 -2

pkgs/top-level/release.nix

···

       130
        
                     jobs.tests.stdenv.hooks.patch-shebangs.x86_64-linux

     

       131
        
                     */

     

       132
        
                   ]

     

       133
       -
                   # FIXME: reintroduce aarch64-darwin after this builds again

     

       134
       -
                   ++ lib.collect lib.isDerivation (removeAttrs jobs.stdenvBootstrapTools [ "aarch64-darwin" ])

     

       135
        
                   ++ lib.optionals supportDarwin.x86_64 [

     

       136
        
                     jobs.stdenv.x86_64-darwin

     

       137
        
                     jobs.cargo.x86_64-darwin

···

       130
        
                     jobs.tests.stdenv.hooks.patch-shebangs.x86_64-linux

     

       131
        
                     */

     

       132
        
                   ]

     

       133
       +
                   ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools

     

       0
        
       
     

       134
        
                   ++ lib.optionals supportDarwin.x86_64 [

     

       135
        
                     jobs.stdenv.x86_64-darwin

     

       136
        
                     jobs.cargo.x86_64-darwin