diff --git a/.mailmap b/.mailmap index d2bf6d0e4769..ba9bcefb55e1 100644 --- a/.mailmap +++ b/.mailmap @@ -12,3 +12,5 @@ Sandro Jäckel superherointj <5861043+superherointj@users.noreply.github.com> Vladimír Čunát Vladimír Čunát +Yifei Sun StepBroBD +Yifei Sun diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ef97f0a36eba..a6d853772963 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -26,7 +26,7 @@ This file contains general contributing information, but individual parts also h This section describes in some detail how changes can be made and proposed with pull requests. -> **Note** +> [!Note] > Be aware that contributing implies licensing those contributions under the terms of [COPYING](./COPYING), an MIT-like license. 0. Set up a local version of Nixpkgs to work with using GitHub and Git @@ -273,7 +273,7 @@ Once a pull request has been merged into `master`, a backport pull request to th ### Automatically backporting changes -> **Note** +> [!Note] > You have to be a [Nixpkgs maintainer](./maintainers) to automatically create a backport pull request. Add the [`backport release-YY.MM` label](https://github.com/NixOS/nixpkgs/labels?q=backport) to the pull request on the `master` branch. @@ -285,16 +285,17 @@ This can be done on both open or already merged pull requests. To manually create a backport pull request, follow [the standard pull request process][pr-create], with these notable differences: - Use `release-YY.MM` for the base branch, both for the local branch and the pull request. - > **Warning** - > Do not use the `nixos-YY.MM` branch, that is a branch pointing to the tested release channel commit + +> [!Warning] +> Do not use the `nixos-YY.MM` branch, that is a branch pointing to the tested release channel commit - Instead of manually making and committing the changes, use [`git cherry-pick -x`](https://git-scm.com/docs/git-cherry-pick) for each commit from the pull request you'd like to backport. Either `git cherry-pick -x ` when the reason for the backport is obvious (such as minor versions, fixes, etc.), otherwise use `git cherry-pick -xe ` to add a reason for the backport to the commit message. Here is [an example](https://github.com/nixos/nixpkgs/commit/5688c39af5a6c5f3d646343443683da880eaefb8) of this. - > **Warning** - > Ensure the commits exists on the master branch. - > In the case of squashed or rebased merges, the commit hash will change and the new commits can be found in the merge message at the bottom of the master pull request. +> [!Warning] +> Ensure the commits exists on the master branch. +> In the case of squashed or rebased merges, the commit hash will change and the new commits can be found in the merge message at the bottom of the master pull request. - In the pull request description, link to the original pull request to `master`. The pull request title should include `[YY.MM]` matching the release you're backporting to. @@ -305,7 +306,7 @@ To manually create a backport pull request, follow [the standard pull request pr ## How to review pull requests [pr-review]: #how-to-review-pull-requests -> **Warning** +> [!Warning] > The following section is a draft, and the policy for reviewing is still being discussed in issues such as [#11166](https://github.com/NixOS/nixpkgs/issues/11166) and [#20836](https://github.com/NixOS/nixpkgs/issues/20836). The Nixpkgs project receives a fairly high number of contributions via GitHub pull requests. Reviewing and approving these is an important task and a way to contribute to the project. @@ -384,7 +385,7 @@ By keeping the `staging-next` branch separate from `staging`, this batching does In order for the `staging` and `staging-next` branches to be up-to-date with the latest commits on `master`, there are regular _automated_ merges from `master` into `staging-next` and `staging`. This is implemented using GitHub workflows [here](.github/workflows/periodic-merge-6h.yml) and [here](.github/workflows/periodic-merge-24h.yml). -> **Note** +> [!Note] > Changes must be sufficiently tested before being merged into any branch. > Hydra builds should not be used as testing platform. diff --git a/doc/README.md b/doc/README.md index 9dee2d30d730..e9f2a53c355d 100644 --- a/doc/README.md +++ b/doc/README.md @@ -48,7 +48,7 @@ It uses the widely compatible [header attributes](https://github.com/jgm/commonm ## Syntax {#sec-contributing-markup} ``` -> **Note** +> [!Note] > NixOS option documentation does not support headings in general. #### Inline Anchors diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cd8feea7c86b..2e701fc44bd3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -17349,13 +17349,12 @@ name = "Stel Abrego"; }; stepbrobd = { - name = "StepBroBD"; - github = "StepBroBD"; + name = "Yifei Sun"; + email = "ysun@hey.com"; + github = "stepbrobd"; githubId = 81826728; - email = "Hi@StepBroBD.com"; - matrix = "@stepbrobd:matrix.org"; keys = [{ - fingerprint = "5D8B FA8B 286A C2EF 6EE4 8598 F742 B72C 8926 1A51"; + fingerprint = "AC7C 52E6 BA2F E8DE 8F0F 5D78 D973 170F 9B86 DB70"; }]; }; stephank = { diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 389aca1123b6..b872142c313c 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -562,6 +562,18 @@ with lib.maintainers; { enableFeatureFreezePing = true; }; + lxc = { + members = [ + aanderse + adamcstephens + jnsgruk + megheaiulian + mkg20001 + ]; + scope = "All things linuxcontainers. LXC, Incus, LXD and related packages."; + shortName = "lxc"; + }; + lxqt = { members = [ romildo diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 4a93cd1fd9c8..674707ec69e7 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1360,6 +1360,7 @@ ./services/web-servers/molly-brown.nix ./services/web-servers/nginx/default.nix ./services/web-servers/nginx/gitweb.nix + ./services/web-servers/nginx/tailscale-auth.nix ./services/web-servers/phpfpm/default.nix ./services/web-servers/pomerium.nix ./services/web-servers/rustus.nix diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix index 039a5f227ac4..393fe83f493f 100644 --- a/nixos/modules/services/backup/borgbackup.nix +++ b/nixos/modules/services/backup/borgbackup.nix @@ -602,53 +602,56 @@ in { }; extraArgs = mkOption { - type = types.str; + type = with types; coercedTo (listOf str) escapeShellArgs str; description = lib.mdDoc '' Additional arguments for all {command}`borg` calls the service has. Handle with care. ''; - default = ""; - example = "--remote-path=/path/to/borg"; + default = [ ]; + example = [ "--remote-path=/path/to/borg" ]; }; extraInitArgs = mkOption { - type = types.str; + type = with types; coercedTo (listOf str) escapeShellArgs str; description = lib.mdDoc '' Additional arguments for {command}`borg init`. Can also be set at runtime using `$extraInitArgs`. ''; - default = ""; - example = "--append-only"; + default = [ ]; + example = [ "--append-only" ]; }; extraCreateArgs = mkOption { - type = types.str; + type = with types; coercedTo (listOf str) escapeShellArgs str; description = lib.mdDoc '' Additional arguments for {command}`borg create`. Can also be set at runtime using `$extraCreateArgs`. ''; - default = ""; - example = "--stats --checkpoint-interval 600"; + default = [ ]; + example = [ + "--stats" + "--checkpoint-interval 600" + ]; }; extraPruneArgs = mkOption { - type = types.str; + type = with types; coercedTo (listOf str) escapeShellArgs str; description = lib.mdDoc '' Additional arguments for {command}`borg prune`. Can also be set at runtime using `$extraPruneArgs`. ''; - default = ""; - example = "--save-space"; + default = [ ]; + example = [ "--save-space" ]; }; extraCompactArgs = mkOption { - type = types.str; + type = with types; coercedTo (listOf str) escapeShellArgs str; description = lib.mdDoc '' Additional arguments for {command}`borg compact`. Can also be set at runtime using `$extraCompactArgs`. ''; - default = ""; - example = "--cleanup-commits"; + default = [ ]; + example = [ "--cleanup-commits" ]; }; }; } diff --git a/nixos/modules/services/logging/vector.nix b/nixos/modules/services/logging/vector.nix index 48f9eeb4ce8f..9ccf8a4fa061 100644 --- a/nixos/modules/services/logging/vector.nix +++ b/nixos/modules/services/logging/vector.nix @@ -51,13 +51,17 @@ in { ExecStart = "${getExe cfg.package} --config ${validateConfig conf}"; DynamicUser = true; - Restart = "no"; + Restart = "always"; StateDirectory = "vector"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; AmbientCapabilities = "CAP_NET_BIND_SERVICE"; # This group is required for accessing journald. SupplementaryGroups = mkIf cfg.journaldAccess "systemd-journal"; }; + unitConfig = { + StartLimitIntervalSec = 10; + StartLimitBurst = 5; + }; }; }; } diff --git a/nixos/modules/services/web-servers/nginx/tailscale-auth.nix b/nixos/modules/services/web-servers/nginx/tailscale-auth.nix new file mode 100644 index 000000000000..a2e4d4a30be5 --- /dev/null +++ b/nixos/modules/services/web-servers/nginx/tailscale-auth.nix @@ -0,0 +1,158 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.nginx.tailscaleAuth; +in +{ + options.services.nginx.tailscaleAuth = { + enable = mkEnableOption (lib.mdDoc "Enable tailscale.nginx-auth, to authenticate nginx users via tailscale."); + + package = lib.mkPackageOptionMD pkgs "tailscale-nginx-auth" {}; + + user = mkOption { + type = types.str; + default = "tailscale-nginx-auth"; + description = lib.mdDoc "User which runs tailscale-nginx-auth"; + }; + + group = mkOption { + type = types.str; + default = "tailscale-nginx-auth"; + description = lib.mdDoc "Group which runs tailscale-nginx-auth"; + }; + + expectedTailnet = mkOption { + default = ""; + type = types.nullOr types.str; + example = "tailnet012345.ts.net"; + description = lib.mdDoc '' + If you want to prevent node sharing from allowing users to access services + across tailnets, declare your expected tailnets domain here. + ''; + }; + + socketPath = mkOption { + default = "/run/tailscale-nginx-auth/tailscale-nginx-auth.sock"; + type = types.path; + description = lib.mdDoc '' + Path of the socket listening to nginx authorization requests. + ''; + }; + + virtualHosts = mkOption { + type = types.listOf types.str; + default = []; + description = lib.mdDoc '' + A list of nginx virtual hosts to put behind tailscale.nginx-auth + ''; + }; + }; + + config = mkIf cfg.enable { + services.tailscale.enable = true; + services.nginx.enable = true; + + users.users.${cfg.user} = { + isSystemUser = true; + inherit (cfg) group; + }; + users.groups.${cfg.group} = { }; + users.users.${config.services.nginx.user}.extraGroups = [ cfg.group ]; + systemd.sockets.tailscale-nginx-auth = { + description = "Tailscale NGINX Authentication socket"; + partOf = [ "tailscale-nginx-auth.service" ]; + wantedBy = [ "sockets.target" ]; + listenStreams = [ cfg.socketPath ]; + socketConfig = { + SocketMode = "0660"; + SocketUser = cfg.user; + SocketGroup = cfg.group; + }; + }; + + + systemd.services.tailscale-nginx-auth = { + description = "Tailscale NGINX Authentication service"; + after = [ "nginx.service" ]; + wants = [ "nginx.service" ]; + requires = [ "tailscale-nginx-auth.socket" ]; + + serviceConfig = { + ExecStart = "${lib.getExe cfg.package}"; + RuntimeDirectory = "tailscale-nginx-auth"; + User = cfg.user; + Group = cfg.group; + + BindPaths = [ "/run/tailscale/tailscaled.sock" ]; + + CapabilityBoundingSet = ""; + DeviceAllow = ""; + LockPersonality = true; + MemoryDenyWriteExecute = true; + PrivateDevices = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + RestrictNamespaces = true; + RestrictAddressFamilies = [ "AF_UNIX" ]; + RestrictRealtime = true; + RestrictSUIDSGID = true; + + SystemCallArchitectures = "native"; + SystemCallErrorNumber = "EPERM"; + SystemCallFilter = [ + "@system-service" + "~@cpu-emulation" "~@debug" "~@keyring" "~@memlock" "~@obsolete" "~@privileged" "~@setuid" + ]; + }; + }; + + services.nginx.virtualHosts = genAttrs + cfg.virtualHosts + (vhost: { + locations."/auth" = { + extraConfig = '' + internal; + + proxy_pass http://unix:${cfg.socketPath}; + proxy_pass_request_body off; + + # Upstream uses $http_host here, but we are using gixy to check nginx configurations + # gixy wants us to use $host: https://github.com/yandex/gixy/blob/master/docs/en/plugins/hostspoofing.md + proxy_set_header Host $host; + proxy_set_header Remote-Addr $remote_addr; + proxy_set_header Remote-Port $remote_port; + proxy_set_header Original-URI $request_uri; + proxy_set_header X-Scheme $scheme; + proxy_set_header X-Auth-Request-Redirect $scheme://$host$request_uri; + ''; + }; + locations."/".extraConfig = '' + auth_request /auth; + auth_request_set $auth_user $upstream_http_tailscale_user; + auth_request_set $auth_name $upstream_http_tailscale_name; + auth_request_set $auth_login $upstream_http_tailscale_login; + auth_request_set $auth_tailnet $upstream_http_tailscale_tailnet; + auth_request_set $auth_profile_picture $upstream_http_tailscale_profile_picture; + + proxy_set_header X-Webauth-User "$auth_user"; + proxy_set_header X-Webauth-Name "$auth_name"; + proxy_set_header X-Webauth-Login "$auth_login"; + proxy_set_header X-Webauth-Tailnet "$auth_tailnet"; + proxy_set_header X-Webauth-Profile-Picture "$auth_profile_picture"; + + ${lib.optionalString (cfg.expectedTailnet != "") ''proxy_set_header Expected-Tailnet "${cfg.expectedTailnet}";''} + ''; + }); + }; + + meta.maintainers = with maintainers; [ phaer ]; + +} diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix index 47a5e462262d..3e48f8873ed4 100644 --- a/nixos/modules/virtualisation/incus.nix +++ b/nixos/modules/virtualisation/incus.nix @@ -5,7 +5,9 @@ let preseedFormat = pkgs.formats.yaml { }; in { - meta.maintainers = [ lib.maintainers.adamcstephens ]; + meta = { + maintainers = lib.teams.lxc.members; + }; options = { virtualisation.incus = { diff --git a/nixos/modules/virtualisation/lxc-container.nix b/nixos/modules/virtualisation/lxc-container.nix index 4db4df02fe8c..8d3a480e6dc8 100644 --- a/nixos/modules/virtualisation/lxc-container.nix +++ b/nixos/modules/virtualisation/lxc-container.nix @@ -1,7 +1,9 @@ { lib, config, pkgs, ... }: { - meta.maintainers = with lib.maintainers; [ adamcstephens ]; + meta = { + maintainers = lib.teams.lxc.members; + }; imports = [ ./lxc-instance-common.nix diff --git a/nixos/modules/virtualisation/lxc.nix b/nixos/modules/virtualisation/lxc.nix index 5bd64a5f9a56..3febb4b4f248 100644 --- a/nixos/modules/virtualisation/lxc.nix +++ b/nixos/modules/virtualisation/lxc.nix @@ -2,21 +2,19 @@ { config, lib, pkgs, ... }: -with lib; - let - cfg = config.virtualisation.lxc; - in { - ###### interface + meta = { + maintainers = lib.teams.lxc.members; + }; options.virtualisation.lxc = { enable = - mkOption { - type = types.bool; + lib.mkOption { + type = lib.types.bool; default = false; description = lib.mdDoc '' @@ -27,8 +25,8 @@ in }; systemConfig = - mkOption { - type = types.lines; + lib.mkOption { + type = lib.types.lines; default = ""; description = lib.mdDoc '' @@ -38,8 +36,8 @@ in }; defaultConfig = - mkOption { - type = types.lines; + lib.mkOption { + type = lib.types.lines; default = ""; description = lib.mdDoc '' @@ -49,8 +47,8 @@ in }; usernetConfig = - mkOption { - type = types.lines; + lib.mkOption { + type = lib.types.lines; default = ""; description = lib.mdDoc '' @@ -62,7 +60,7 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.lxc ]; environment.etc."lxc/lxc.conf".text = cfg.systemConfig; environment.etc."lxc/lxc-usernet".text = cfg.usernetConfig; diff --git a/nixos/modules/virtualisation/lxcfs.nix b/nixos/modules/virtualisation/lxcfs.nix index fb0ba49f7304..b2eaec774a65 100644 --- a/nixos/modules/virtualisation/lxcfs.nix +++ b/nixos/modules/virtualisation/lxcfs.nix @@ -2,18 +2,18 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.virtualisation.lxc.lxcfs; in { - meta.maintainers = [ maintainers.mic92 ]; + meta = { + maintainers = lib.teams.lxc.members; + }; ###### interface options.virtualisation.lxc.lxcfs = { enable = - mkOption { - type = types.bool; + lib.mkOption { + type = lib.types.bool; default = false; description = lib.mdDoc '' This enables LXCFS, a FUSE filesystem for LXC. @@ -27,7 +27,7 @@ in { }; ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.lxcfs = { description = "FUSE filesystem for LXC"; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/virtualisation/lxd-agent.nix b/nixos/modules/virtualisation/lxd-agent.nix index 5bcc86e3bcbe..59dd46b74b40 100644 --- a/nixos/modules/virtualisation/lxd-agent.nix +++ b/nixos/modules/virtualisation/lxd-agent.nix @@ -45,7 +45,9 @@ let chown -R root:root "$PREFIX" ''; in { - meta.maintainers = with lib.maintainers; [ adamcstephens ]; + meta = { + maintainers = lib.teams.lxc.members; + }; options = { virtualisation.lxd.agent.enable = lib.mkEnableOption (lib.mdDoc "Enable LXD agent"); diff --git a/nixos/modules/virtualisation/lxd-virtual-machine.nix b/nixos/modules/virtualisation/lxd-virtual-machine.nix index ba729465ec2f..92434cb9babf 100644 --- a/nixos/modules/virtualisation/lxd-virtual-machine.nix +++ b/nixos/modules/virtualisation/lxd-virtual-machine.nix @@ -6,6 +6,10 @@ let then "ttyS0" else "ttyAMA0"; # aarch64 in { + meta = { + maintainers = lib.teams.lxc.members; + }; + imports = [ ./lxc-instance-common.nix diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix index 6f628c4a6e32..c4c856d9be30 100644 --- a/nixos/modules/virtualisation/lxd.nix +++ b/nixos/modules/virtualisation/lxd.nix @@ -6,12 +6,14 @@ let cfg = config.virtualisation.lxd; preseedFormat = pkgs.formats.yaml {}; in { + meta = { + maintainers = lib.teams.lxc.members; + }; + imports = [ (lib.mkRemovedOptionModule [ "virtualisation" "lxd" "zfsPackage" ] "Override zfs in an overlay instead to override it globally") ]; - ###### interface - options = { virtualisation.lxd = { enable = lib.mkOption { diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index e0572e3bed9c..0322ec9dc551 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -163,7 +163,7 @@ in { btrbk-no-timer = handleTest ./btrbk-no-timer.nix {}; btrbk-section-order = handleTest ./btrbk-section-order.nix {}; budgie = handleTest ./budgie.nix {}; - buildbot = handleTest ./buildbot.nix {}; + buildbot = handleTestOn [ "x86_64-linux" ] ./buildbot.nix {}; buildkite-agents = handleTest ./buildkite-agents.nix {}; c2fmzq = handleTest ./c2fmzq.nix {}; caddy = handleTest ./caddy.nix {}; diff --git a/nixos/tests/incus/container.nix b/nixos/tests/incus/container.nix index 49a22c08aad1..2d3fa49e5bd1 100644 --- a/nixos/tests/incus/container.nix +++ b/nixos/tests/incus/container.nix @@ -14,7 +14,9 @@ in { name = "incus-container"; - meta.maintainers = with lib.maintainers; [ adamcstephens ]; + meta = { + maintainers = lib.teams.lxc.members; + }; nodes.machine = { ... }: { virtualisation = { diff --git a/nixos/tests/incus/preseed.nix b/nixos/tests/incus/preseed.nix index 47b2d0cd6228..a488d71f3c92 100644 --- a/nixos/tests/incus/preseed.nix +++ b/nixos/tests/incus/preseed.nix @@ -3,7 +3,9 @@ import ../make-test-python.nix ({ pkgs, lib, ... } : { name = "incus-preseed"; - meta.maintainers = with lib.maintainers; [ adamcstephens ]; + meta = { + maintainers = lib.teams.lxc.members; + }; nodes.machine = { lib, ... }: { virtualisation = { diff --git a/nixos/tests/incus/socket-activated.nix b/nixos/tests/incus/socket-activated.nix index 4d25b26a15f5..fca536b7054f 100644 --- a/nixos/tests/incus/socket-activated.nix +++ b/nixos/tests/incus/socket-activated.nix @@ -3,7 +3,9 @@ import ../make-test-python.nix ({ pkgs, lib, ... } : { name = "incus-socket-activated"; - meta.maintainers = with lib.maintainers; [ adamcstephens ]; + meta = { + maintainers = lib.teams.lxc.members; + }; nodes.machine = { lib, ... }: { virtualisation = { diff --git a/nixos/tests/incus/virtual-machine.nix b/nixos/tests/incus/virtual-machine.nix index bfa116679d43..be5746ef63e2 100644 --- a/nixos/tests/incus/virtual-machine.nix +++ b/nixos/tests/incus/virtual-machine.nix @@ -19,7 +19,9 @@ in { name = "incus-virtual-machine"; - meta.maintainers = with lib.maintainers; [ adamcstephens ]; + meta = { + maintainers = lib.teams.lxc.members; + }; nodes.machine = {...}: { virtualisation = { diff --git a/nixos/tests/lxd/container.nix b/nixos/tests/lxd/container.nix index 0ebe73d872f2..ef9c3f4bbee7 100644 --- a/nixos/tests/lxd/container.nix +++ b/nixos/tests/lxd/container.nix @@ -18,8 +18,8 @@ let in { name = "lxd-container"; - meta = with pkgs.lib.maintainers; { - maintainers = [ patryk27 adamcstephens ]; + meta = { + maintainers = lib.teams.lxc.members; }; nodes.machine = { lib, ... }: { diff --git a/nixos/tests/lxd/nftables.nix b/nixos/tests/lxd/nftables.nix index d98bd4952906..e6ce4089d719 100644 --- a/nixos/tests/lxd/nftables.nix +++ b/nixos/tests/lxd/nftables.nix @@ -5,11 +5,11 @@ # iptables to nftables requires a full reboot, which is a bit hard inside NixOS # tests. -import ../make-test-python.nix ({ pkgs, ...} : { +import ../make-test-python.nix ({ pkgs, lib, ...} : { name = "lxd-nftables"; - meta = with pkgs.lib.maintainers; { - maintainers = [ patryk27 ]; + meta = { + maintainers = lib.teams.lxc.members; }; nodes.machine = { lib, ... }: { diff --git a/nixos/tests/lxd/preseed.nix b/nixos/tests/lxd/preseed.nix index 7d89b9f56daa..fb80dcf3893e 100644 --- a/nixos/tests/lxd/preseed.nix +++ b/nixos/tests/lxd/preseed.nix @@ -4,7 +4,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... } : name = "lxd-preseed"; meta = { - maintainers = with lib.maintainers; [ adamcstephens ]; + maintainers = lib.teams.lxc.members; }; nodes.machine = { lib, ... }: { diff --git a/nixos/tests/lxd/ui.nix b/nixos/tests/lxd/ui.nix index ff651725ba70..c442f44ab81c 100644 --- a/nixos/tests/lxd/ui.nix +++ b/nixos/tests/lxd/ui.nix @@ -1,8 +1,8 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: { name = "lxd-ui"; - meta = with pkgs.lib.maintainers; { - maintainers = [ jnsgruk ]; + meta = { + maintainers = lib.teams.lxc.members; }; nodes.machine = { lib, ... }: { diff --git a/nixos/tests/lxd/virtual-machine.nix b/nixos/tests/lxd/virtual-machine.nix index 93705e9350c5..2a9dd8fcdbf6 100644 --- a/nixos/tests/lxd/virtual-machine.nix +++ b/nixos/tests/lxd/virtual-machine.nix @@ -18,8 +18,8 @@ let in { name = "lxd-virtual-machine"; - meta = with pkgs.lib.maintainers; { - maintainers = [adamcstephens]; + meta = { + maintainers = lib.teams.lxc.members; }; nodes.machine = {lib, ...}: { diff --git a/pkgs/README.md b/pkgs/README.md index 31a590e43d8d..0649d9415a26 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -470,7 +470,7 @@ Preferred source hash type is sha256. There are several ways to get it. in the package expression, attempt build and extract correct hash from error messages. - > **Warning** + > [!Warning] > You must use one of these four fake hashes and not some arbitrarily-chosen hash. > See [here][secure-hashes] diff --git a/pkgs/applications/audio/airwindows-lv2/default.nix b/pkgs/applications/audio/airwindows-lv2/default.nix index f46f3053a284..5e87c50a3147 100644 --- a/pkgs/applications/audio/airwindows-lv2/default.nix +++ b/pkgs/applications/audio/airwindows-lv2/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "airwindows-lv2"; - version = "22.0"; + version = "26.0"; src = fetchFromSourcehut { owner = "~hannes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-u62wLRrJ45ap981Q8JmMnanc8AWQb1MJHK32PEr10I4="; + sha256 = "sha256-CmNe70ii3WfQ6GGHVqTEyQ2HVubzoeoeN3JsCZSbsPM="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/applications/file-managers/ytree/default.nix b/pkgs/applications/file-managers/ytree/default.nix deleted file mode 100644 index 4ba320919ef3..000000000000 --- a/pkgs/applications/file-managers/ytree/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv -, fetchurl -, ncurses -, readline -}: - -stdenv.mkDerivation rec { - pname = "ytree"; - version = "2.05"; - - src = fetchurl { - url = "https://han.de/~werner/${pname}-${version}.tar.gz"; - sha256 = "sha256-jPixUeSRO1t/epHf/VxzBhBqQkd+xE5x1ix19mq2Glc="; - }; - - buildInputs = [ - ncurses - readline - ]; - - # don't save timestamp, in order to improve reproducibility - postPatch = '' - substituteInPlace Makefile --replace 'gzip' 'gzip -n' - ''; - - installFlags = [ "DESTDIR=${placeholder "out"}" ]; - - preInstall = '' - mkdir -p $out/bin $out/share/man/man1 - ''; - - meta = with lib; { - description = "A curses-based file manager similar to DOS Xtree(TM)"; - homepage = "https://www.han.de/~werner/ytree.html"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; - }; -} -# TODO: X11 support diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix index 131cd28764ec..5c28cd2443e4 100644 --- a/pkgs/applications/misc/houdini/default.nix +++ b/pkgs/applications/misc/houdini/default.nix @@ -71,6 +71,8 @@ buildFHSEnv rec { "bin/hotl" # hda/otl manipulation tool "bin/hython" # hython "bin/hkey" # license administration + "bin/husk" # hydra rendereing tool + "bin/mantra" # mantra renderer "houdini/sbin/sesinetd" ]; in '' @@ -80,7 +82,7 @@ buildFHSEnv rec { mkdir -p $out/$(dirname $executable) echo "#!${stdenv.shell}" >> $out/$executable - echo "$WRAPPER ${unwrapped}/$executable \$@" >> $out/$executable + echo "$WRAPPER ${unwrapped}/$executable \"\$@\"" >> $out/$executable done cd $out @@ -93,6 +95,6 @@ buildFHSEnv rec { ]; runScript = writeScript "${name}-wrapper" '' - exec $@ + exec "$@" ''; } diff --git a/pkgs/applications/misc/houdini/runtime-build.nix b/pkgs/applications/misc/houdini/runtime-build.nix new file mode 100644 index 000000000000..60f27c194964 --- /dev/null +++ b/pkgs/applications/misc/houdini/runtime-build.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, requireFile, bc, version, src, eulaDate }: + +let + license_dir = "~/.config/houdini"; +in +stdenv.mkDerivation rec { + inherit version src; + pname = "houdini-runtime"; + + buildInputs = [ bc ]; + installPhase = '' + patchShebangs houdini.install + mkdir -p $out + ./houdini.install --install-houdini \ + --install-license \ + --no-install-menus \ + --no-install-bin-symlink \ + --auto-install \ + --no-root-check \ + --accept-EULA ${eulaDate} \ + $out + echo "licensingMode = localValidator" >> $out/houdini/Licensing.opt # does not seem to do anything any more. not sure, official docs do not say anything about it + ''; + + dontFixup = true; + + meta = with lib; { + description = "3D animation application software"; + homepage = "https://www.sidefx.com"; + license = licenses.unfree; + platforms = platforms.linux; + hydraPlatforms = [ ]; # requireFile src's should be excluded + maintainers = with maintainers; [ canndrew kwohlfahrt ]; + }; +} diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index 2f218781abb6..e437dd51c885 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -1,40 +1,14 @@ -{ lib, stdenv, requireFile, bc }: +{ lib, stdenv, requireFile, callPackage}: let license_dir = "~/.config/houdini"; in -stdenv.mkDerivation rec { +callPackage ./runtime-build.nix rec { version = "19.5.569"; - pname = "houdini-runtime"; + eulaDate = "2021-10-13"; src = requireFile rec { name = "houdini-${version}-linux_x86_64_gcc9.3.tar.gz"; sha256 = "0c2d6a31c24f5e7229498af6c3a7cdf81242501d7a0792e4c33b53a898d4999e"; - url = meta.homepage; - }; - - buildInputs = [ bc ]; - installPhase = '' - patchShebangs houdini.install - mkdir -p $out - ./houdini.install --install-houdini \ - --install-license \ - --no-install-menus \ - --no-install-bin-symlink \ - --auto-install \ - --no-root-check \ - --accept-EULA 2021-10-13 \ - $out - echo "licensingMode = localValidator" >> $out/houdini/Licensing.opt # does not seem to do anything any more. not sure, official docs do not say anything about it - ''; - - dontFixup = true; - - meta = with lib; { - description = "3D animation application software"; - homepage = "https://www.sidefx.com"; - license = licenses.unfree; - platforms = platforms.linux; - hydraPlatforms = [ ]; # requireFile src's should be excluded - maintainers = with maintainers; [ canndrew kwohlfahrt ]; + url = "https://www.sidefx.com/download/daily-builds/?production=true"; }; } diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 3eff3c3d79f3..89806a0acbc3 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,20 +3,20 @@ }: let pname = "josm"; - version = "18822"; + version = "18906"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - hash = "sha256-pzB12lkcWGJ7sVdcfJZC2MnUowfWdElxny0pSQ5vjlw="; + hash = "sha256-/G3/v7pkRYqxvhYRthmU/20U8cYUkwZ+/VJXvpzeRPE="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - hash = "sha256-MFiWbEU8C6Jvq9wkIKANQeqJh2/yC3y40ANnGEl4IF0="; + hash = "sha256-+CDnAQK4ekFCoWvd8+kQLNqycD7tIQ/D7VAyrDU030A="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; rev = version; - sha256 = "sha256-/zdOaiyuvSwdVZcnw0ghDj2I+YKpFLc12fjZUMtRtVg="; + sha256 = "sha256-RFZGRTDdWP/goH/Ev16nhq1SjxYkfFr3djwSrotK7Fo="; }; }; in diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index 798c15fffde9..a2882e16f93e 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -12,6 +12,7 @@ , pkg-config , vala , wrapGAppsHook4 +, fetchpatch }: stdenv.mkDerivation rec { @@ -41,6 +42,15 @@ stdenv.mkDerivation rec { libgee ]; + + patches = [ + # Fixes the compilation error with new Vala compiler. Remove in the next version. + (fetchpatch { + url = "https://github.com/musicinmybrain/notejot/commit/c6a7cfcb792de63fb51eb174f9f3d4e02f6a2ce1.patch"; + hash = "sha256-dexPKIpUaAu/p0K2WQpElhPNt86CS+jD0dPL5+CTl4I="; + }) + ]; + passthru.updateScript = nix-update-script { }; meta = with lib; { diff --git a/pkgs/applications/networking/browsers/chromium/chromium-120-llvm-16.patch b/pkgs/applications/networking/browsers/chromium/chromium-120-llvm-16.patch new file mode 100644 index 000000000000..99a8c521a08a --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/chromium-120-llvm-16.patch @@ -0,0 +1,43 @@ +diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn +index de1cd6e..bb5700b 100644 +--- a/build/config/compiler/BUILD.gn ++++ b/build/config/compiler/BUILD.gn +@@ -616,24 +616,6 @@ config("compiler") { + } + } + +- # TODO(crbug.com/1488374): This causes binary size growth and potentially +- # other problems. +- # TODO(crbug.com/1491036): This isn't supported by Cronet's mainline llvm version. +- if (default_toolchain != "//build/toolchain/cros:target" && +- !llvm_android_mainline) { +- cflags += [ +- "-mllvm", +- "-split-threshold-for-reg-with-hint=0", +- ] +- if (use_thin_lto && is_a_target_toolchain) { +- if (is_win) { +- ldflags += [ "-mllvm:-split-threshold-for-reg-with-hint=0" ] +- } else { +- ldflags += [ "-Wl,-mllvm,-split-threshold-for-reg-with-hint=0" ] +- } +- } +- } +- + # TODO(crbug.com/1235145): Investigate why/if this should be needed. + if (is_win) { + cflags += [ "/clang:-ffp-contract=off" ] +@@ -800,13 +782,6 @@ config("compiler") { + if (is_apple) { + ldflags += [ "-Wcrl,object_path_lto" ] + } +- if (!is_chromeos) { +- # TODO(https://crbug.com/972449): turn on for ChromeOS when that +- # toolchain has this flag. +- # We only use one version of LLVM within a build so there's no need to +- # upgrade debug info, which can be expensive since it runs the verifier. +- ldflags += [ "-Wl,-mllvm,-disable-auto-upgrade-debug-info" ] +- } + } + + # TODO(https://crbug.com/1211155): investigate why this isn't effective on diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 249c8b45f3f5..a322a171051f 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -246,6 +246,7 @@ let # (we currently package 1.26 in Nixpkgs while Chromium bundles 1.21): # Source: https://bugs.chromium.org/p/angleproject/issues/detail?id=7582#c1 ./patches/angle-wayland-include-protocol.patch + ] ++ lib.optionals (!chromiumVersionAtLeast "120") [ # We need to revert this patch to build M114+ with LLVM 16: (githubPatch { # Reland [clang] Disable autoupgrading debug info in ThinLTO builds @@ -253,6 +254,9 @@ let hash = "sha256-Vryjg8kyn3cxWg3PmSwYRG6zrHOqYWBMSdEMGiaPg6M="; revert = true; }) + ] ++ lib.optionals (chromiumVersionAtLeast "120") [ + # We need to revert this patch to build M120+ with LLVM 16: + ./chromium-120-llvm-16.patch ] ++ lib.optionals (!chromiumVersionAtLeast "119.0.6024.0") [ # Fix build with at-spi2-core ≥ 2.49 # This version is still needed for electron. diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 7c2c75e74974..c1ac2dee602c 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,6 +1,5 @@ { newScope, config, stdenv, fetchurl, makeWrapper , buildPackages -, llvmPackages_16 , ed, gnugrep, coreutils, xdg-utils , glib, gtk3, gtk4, gnome, gsettings-desktop-schemas, gn, fetchgit , libva, pipewire, wayland diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix index f418e997333d..08109434a0b7 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "obs-vkcapture"; - version = "1.4.5"; + version = "1.4.7"; src = fetchFromGitHub { owner = "nowrep"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-C5dMDfCFkUNENA4qQlmGeavKqYpbRHkUz79LVM5aVao="; + hash = "sha256-/EbavDDeFQys9zu3FAgsAeVVbs1Rrv8YR4949XCHc6s="; }; cmakeFlags = lib.optionals stdenv.isi686 [ diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index bd8dbab4cfca..24809f9450b4 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.23.1"; + version = "2.23.3"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - hash = "sha256-g8XaMvKt3tR7a7kq+n4ueDXx9iWuAu02ONb73W23ZGY="; + hash = "sha256-Rp13xK7pRyjHaDclAfL+yzNf4ppOy9S+XFbydj4TDL4="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorHash = "sha256-BeW39XN1CvPCCq4otX+Il2dGGcjGrTMzc4iSXmQZFmw="; + vendorHash = "sha256-iKBMd4e1oVNdKuk08tYPexQqs9JLofhdf4yEP1s97EQ="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/pkgs/desktops/arcan/arcan/default.nix b/pkgs/by-name/ar/arcan/package.nix similarity index 90% rename from pkgs/desktops/arcan/arcan/default.nix rename to pkgs/by-name/ar/arcan/package.nix index 1a46c693b027..ce4fc7256b77 100644 --- a/pkgs/desktops/arcan/arcan/default.nix +++ b/pkgs/by-name/ar/arcan/package.nix @@ -2,8 +2,9 @@ , stdenv , fetchFromGitHub , SDL2 +, callPackage , cmake -, espeak +, espeak-ng , ffmpeg , file , freetype @@ -54,11 +55,15 @@ let allSources = { - letoram-arcan-src = fetchFromGitHub { - owner = "letoram"; - repo = "arcan"; - rev = "85c8564bdbee8468a5716bea64daf1d78937ffbf"; - hash = "sha256-etmj1vpZTjxbmr4UiLBEK57WFJ1NeEnY5WfBYajX3ls="; + letoram-arcan = { + pname = "arcan"; + version = "0.6.2.1-unstable-2023-11-18"; + src = fetchFromGitHub { + owner = "letoram"; + repo = "arcan"; + rev = "0950ee236f96a555729498d0fdf91c16901037f5"; + hash = "sha256-TxadRlidy4KRaQ4HunPO6ISJqm6JwnMRM8y6dX6vqJ4="; + }; }; letoram-openal-src = fetchFromGitHub { owner = "letoram"; @@ -87,10 +92,7 @@ let }; in stdenv.mkDerivation (finalAttrs: { - pname = "arcan"; - version = "0.6.2.1-unstable-2023-10-14"; - - src = allSources.letoram-arcan-src; + inherit (allSources.letoram-arcan) pname version src; nativeBuildInputs = [ cmake @@ -140,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: { xz ] ++ lib.optionals useEspeak [ - espeak + espeak-ng ]; # Emulate external/git/clone.sh @@ -197,6 +199,10 @@ stdenv.mkDerivation (finalAttrs: { "format" ]; + passthru = { + wrapper = callPackage ./wrapper.nix { }; + }; + meta = { homepage = "https://arcan-fe.com/"; description = "Combined Display Server, Multimedia Framework, Game Engine"; diff --git a/pkgs/desktops/arcan/wrapper.nix b/pkgs/by-name/ar/arcan/wrapper.nix similarity index 100% rename from pkgs/desktops/arcan/wrapper.nix rename to pkgs/by-name/ar/arcan/wrapper.nix diff --git a/pkgs/by-name/ar/ark-pixel-font/package.nix b/pkgs/by-name/ar/ark-pixel-font/package.nix new file mode 100644 index 000000000000..f5ffd4f9b2c6 --- /dev/null +++ b/pkgs/by-name/ar/ark-pixel-font/package.nix @@ -0,0 +1,60 @@ +{ lib +, python3Packages +, fetchFromGitHub +, nix-update-script +, ... +}: + +python3Packages.buildPythonPackage rec { + pname = "ark-pixel-font"; + version = "2023.08.15"; + + src = fetchFromGitHub { + owner = "TakWolf"; + repo = pname; + rev = version; + hash = "sha256-Qaa3uuMCPrRG0wo2AGU0v+fonY1c/KuQYTGoyvITcio="; + }; + + format = "other"; + + nativeBuildInputs = with python3Packages; [ + pixel-font-builder + unidata-blocks + character-encoding-utils + pypng + pillow + beautifulsoup4 + jinja2 + gitpython + ]; + + buildPhase = '' + runHook preBuild + + python build.py + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm444 build/outputs/*.bdf -t $out/share/fonts/bdf + install -Dm444 build/outputs/*.otf -t $out/share/fonts/opentype + install -Dm444 build/outputs/*.ttf -t $out/share/fonts/truetype + install -Dm444 build/outputs/*.woff2 -t $out/share/fonts/woff2 + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Open source pan-CJK pixel font"; + homepage = "https://ark-pixel-font.takwolf.com/"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ h7x4 ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/desktops/arcan/cat9/default.nix b/pkgs/by-name/ca/cat9/package.nix similarity index 62% rename from pkgs/desktops/arcan/cat9/default.nix rename to pkgs/by-name/ca/cat9/package.nix index 7bc6005b0c65..dac6f85656dc 100644 --- a/pkgs/desktops/arcan/cat9/default.nix +++ b/pkgs/by-name/ca/cat9/package.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cat9"; - version = "unstable-2023-06-25"; + version = "unstable-2023-11-06"; src = fetchFromGitHub { owner = "letoram"; repo = "cat9"; - rev = "4d8a0c539a5c756acada96fd80e7eb3b9554ac05"; - hash = "sha256-T3RPuldKTzHm0EdfdMOtHv9kcr9oE9YQgdzv/jjPPnc="; + rev = "a807776a85237ab0bdd0a712fb33c176fc295e30"; + hash = "sha256-OlH8FgVBk76Qw+5mnsrryXOL9GbPJWlwUGtYlLuAPxQ="; }; dontConfigure = true; @@ -27,11 +27,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://github.com/letoram/cat9"; description = "A User shell for LASH"; - license = licenses.unlicense; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.all; + license = with lib.licenses; [ unlicense ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/co/cowsql/package.nix b/pkgs/by-name/co/cowsql/package.nix index e4e346f8c39f..c14846d67ca0 100644 --- a/pkgs/by-name/co/cowsql/package.nix +++ b/pkgs/by-name/co/cowsql/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Embeddable, replicated and fault tolerant SQL engine"; homepage = "https://github.com/cowsql/cowsql"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ adamcstephens ]; + maintainers = teams.lxc.members; platforms = platforms.unix; }; }) diff --git a/pkgs/desktops/arcan/durden/default.nix b/pkgs/by-name/du/durden/package.nix similarity index 73% rename from pkgs/desktops/arcan/durden/default.nix rename to pkgs/by-name/du/durden/package.nix index f6677b9823ff..3d72e132964a 100644 --- a/pkgs/desktops/arcan/durden/default.nix +++ b/pkgs/by-name/du/durden/package.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "durden"; - version = "unstable-2023-08-11"; + version = "unstable-2023-10-23"; src = fetchFromGitHub { owner = "letoram"; repo = "durden"; - rev = "728d7fc3292cc162b1cea505c8a71512b2e84925"; - hash = "sha256-UL36JeppnoFDdzdsJMsWKJL58ioz9eOaNEZp/7DGV9w="; + rev = "347dba6da011bbaa70c6edaf82a2d915f4057db3"; + hash = "sha256-iNf7fOzz7mf1CXG5leCenkSTrdCc9/KL8VLw8gUIyKE="; }; dontConfigure = true; @@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://durden.arcan-fe.com/"; description = "Reference Desktop Environment for Arcan"; longDescription = '' @@ -36,8 +36,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { features in Arcan, and as a very competent entry to the advanced-user side of the desktop environment spectrum. ''; - license = licenses.bsd3; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.all; + license = with lib.licenses; [ bsd3 ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/fm/fmtoy/package.nix b/pkgs/by-name/fm/fmtoy/package.nix new file mode 100644 index 000000000000..a3fe819ae759 --- /dev/null +++ b/pkgs/by-name/fm/fmtoy/package.nix @@ -0,0 +1,70 @@ +{ stdenv +, lib +, fetchFromGitHub +, unstableGitUpdater +, alsa-lib +, libfmvoice +, libjack2 +, pkg-config +, zlib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "fmtoy"; + version = "0.0.0-unstable-2023-05-21"; + + src = fetchFromGitHub { + owner = "vampirefrog"; + repo = "fmtoy"; + rev = "2b54180d8edd0de90e2af01bf9ff303bc916e893"; + hash = "sha256-qoMw4P+QEw4Q/wKBvFPh+WxkmOW6qH9FuFFkO2ZRrMc="; + }; + + postPatch = '' + rmdir libfmvoice + cp --no-preserve=all -r ${libfmvoice.src} libfmvoice + + substituteInPlace Makefile \ + --replace 'pkg-config' "$PKG_CONFIG" + ''; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + alsa-lib + libjack2 + zlib + ]; + + enableParallelBuilding = true; + + buildFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "CXX=${stdenv.cc.targetPrefix}c++" + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 fmtoy_jack $out/bin/fmtoy_jack + + runHook postInstall + ''; + + passthru = { + updateScript = unstableGitUpdater { }; + }; + + meta = with lib; { + description = "FM synthesiser based on emulated Yamaha YM chips (OPL, OPM and OPN series)"; + homepage = "https://github.com/vampirefrog/fmtoy"; + license = licenses.gpl3Only; + mainProgram = "fmtoy_jack"; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/by-name/in/incus-unwrapped/package.nix b/pkgs/by-name/in/incus-unwrapped/package.nix index 3beeff04f4fd..907b8ce29197 100644 --- a/pkgs/by-name/in/incus-unwrapped/package.nix +++ b/pkgs/by-name/in/incus-unwrapped/package.nix @@ -95,7 +95,7 @@ buildGoModule rec { homepage = "https://linuxcontainers.org/incus"; changelog = "https://github.com/lxc/incus/releases/tag/incus-${version}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ adamcstephens ]; + maintainers = lib.teams.lxc.members; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/li/libfmvoice/package.nix b/pkgs/by-name/li/libfmvoice/package.nix new file mode 100644 index 000000000000..06284bfd5eaf --- /dev/null +++ b/pkgs/by-name/li/libfmvoice/package.nix @@ -0,0 +1,52 @@ +{ stdenv +, lib +, fetchFromGitHub +, unstableGitUpdater +, zlib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libfmvoice"; + version = "0.0.0-unstable-2023-12-05"; + + src = fetchFromGitHub { + owner = "vampirefrog"; + repo = "libfmvoice"; + rev = "38b1a0c627ef66fcd9c672c215d2b9849163df12"; + hash = "sha256-kXthY9TynIXNX9wmgn13vs4Mrrv/dmEr7zlWiKstjGk="; + }; + + strictDeps = true; + + enableParallelBuilding = true; + + buildInputs = [ + zlib + ]; + + buildFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; + + installPhase = '' + runHook preInstall + + for prog in $(grep 'PROGS=' Makefile | cut -d'=' -f2); do + install -Dm755 $prog $out/bin/$prog + done + + runHook postInstall + ''; + + passthru = { + updateScript = unstableGitUpdater { }; + }; + + meta = with lib; { + description = "C library for loading, saving and converting FM sound chip voice files in various formats"; + homepage = "https://github.com/vampirefrog/libfmvoice"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + }; +}) diff --git a/pkgs/by-name/li/linien-gui/package.nix b/pkgs/by-name/li/linien-gui/package.nix new file mode 100644 index 000000000000..ba6f6d6b5893 --- /dev/null +++ b/pkgs/by-name/li/linien-gui/package.nix @@ -0,0 +1,47 @@ +{ lib +, python3 +, qt5 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "linien-gui"; + pyproject = true; + + inherit (python3.pkgs.linien-common) src version; + + sourceRoot = "source/linien-gui"; + + nativeBuildInputs = with python3.pkgs; [ + setuptools + ] ++ [ + qt5.wrapQtAppsHook + ]; + + # Makes qt-wayland appear in the qt paths injected by the wrapper - helps users + # with `QT_QPA_PLATFORM=wayland` in their environment. + buildInputs = [ + qt5.qtwayland + ]; + + propagatedBuildInputs = with python3.pkgs; [ + appdirs + click + pyqtgraph + pyqt5 + superqt + linien-client + ]; + + dontWrapQtApps = true; + + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; + + meta = with lib; { + description = "Graphical user interface of the Linien spectroscopy lock application"; + homepage = "https://github.com/linien-org/linien/tree/develop/linien-gui"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fsagbuya doronbehar ]; + }; +} diff --git a/pkgs/by-name/lx/lxd-to-incus/package.nix b/pkgs/by-name/lx/lxd-to-incus/package.nix index 1f416df6b2a4..c08dda5a4d86 100644 --- a/pkgs/by-name/lx/lxd-to-incus/package.nix +++ b/pkgs/by-name/lx/lxd-to-incus/package.nix @@ -33,7 +33,7 @@ buildGoModule rec { description = "LXD to Incus migration tool"; homepage = "https://linuxcontainers.org/incus"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ adamcstephens ]; + maintainers = lib.teams.lxc.members; platforms = lib.platforms.linux; }; } diff --git a/pkgs/desktops/arcan/pipeworld/default.nix b/pkgs/by-name/pi/pipeworld/package.nix similarity index 79% rename from pkgs/desktops/arcan/pipeworld/default.nix rename to pkgs/by-name/pi/pipeworld/package.nix index 9474535133fd..52c411d83777 100644 --- a/pkgs/desktops/arcan/pipeworld/default.nix +++ b/pkgs/by-name/pi/pipeworld/package.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation (finalPackages: { pname = "pipeworld"; - version = "unstable-2023-03-02"; + version = "unstable-2023-02-05"; src = fetchFromGitHub { owner = "letoram"; repo = "pipeworld"; - rev = "9ea79f72ad500fe78b9f46e680be87eaac3bfb0e"; - hash = "sha256-/cjse6XXrdLoUB35GLgl871qINOm4SvKPTbfoBceLu0="; + rev = "edc3821404b3a1274b8a50d2fb1c6b523fbd4a1c"; + hash = "sha256-PbKejghMkLZdeQJD9fObw9xhGH24IX72X7pyjapTXJM="; }; dontConfigure = true; @@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation (finalPackages: { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://github.com/letoram/pipeworld"; description = "Dataflow 'spreadsheet' desktop environment"; longDescription = '' @@ -43,8 +43,8 @@ stdenvNoCC.mkDerivation (finalPackages: { application within another desktop as a 'substitute' for your normal terminal emulator. ''; - license = licenses.bsd3; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.all; + license = with lib.licenses; [ bsd3 ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/pl/pls/Cargo.lock b/pkgs/by-name/pl/pls/Cargo.lock new file mode 100644 index 000000000000..42856918831a --- /dev/null +++ b/pkgs/by-name/pl/pls/Cargo.lock @@ -0,0 +1,856 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +dependencies = [ + "memchr", +] + +[[package]] +name = "anstream" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" + +[[package]] +name = "anstyle-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +dependencies = [ + "anstyle", + "windows-sys", +] + +[[package]] +name = "atomic" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +dependencies = [ + "jobserver", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "4.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1640e5cc7fb47dbb8338fd471b105e7ed6c3cb2aeb00c2e067127ffd3764a05d" +dependencies = [ + "clap_builder", + "clap_derive", + "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98c59138d527eeaf9b53f35a77fcc1fad9d883116070c63d5de1c7dc7b00c72b" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", + "terminal_size", +] + +[[package]] +name = "clap_derive" +version = "4.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "colored" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" +dependencies = [ + "is-terminal", + "lazy_static", + "windows-sys", +] + +[[package]] +name = "env_logger" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +dependencies = [ + "log", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "figment" +version = "0.10.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4547e226f4c9ab860571e070a9034192b3175580ecea38da34fcdb53a018c9a5" +dependencies = [ + "atomic", + "parking_lot", + "serde", + "serde_yaml", + "tempfile", + "uncased", + "version_check", +] + +[[package]] +name = "form_urlencoded" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "git2" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" +dependencies = [ + "bitflags 1.3.2", + "libc", + "libgit2-sys", + "log", + "url", +] + +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + +[[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys", +] + +[[package]] +name = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi", + "rustix 0.38.3", + "windows-sys", +] + +[[package]] +name = "itoa" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" + +[[package]] +name = "jobserver" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +dependencies = [ + "libc", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" + +[[package]] +name = "libgit2-sys" +version = "0.15.2+1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa" +dependencies = [ + "cc", + "libc", + "libz-sys", + "pkg-config", +] + +[[package]] +name = "libz-sys" +version = "1.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121f7402cc6ab5821dad08d1b9d11618a9ea4da992343909fecf8e430e86364c" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" + +[[package]] +name = "lock_api" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "num_threads" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +dependencies = [ + "libc", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets", +] + +[[package]] +name = "percent-encoding" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "pls" +version = "0.0.1-beta.2" +dependencies = [ + "clap", + "colored", + "env_logger", + "figment", + "git2", + "home", + "lazy_static", + "log", + "number_prefix", + "regex", + "serde", + "serde_regex", + "terminal_size", + "time", + "unicode-segmentation", + "users", +] + +[[package]] +name = "proc-macro2" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "regex" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89089e897c013b3deb627116ae56a6955a72b8bed395c9526af31c9fe528b484" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa250384981ea14565685dea16a9ccc4d1c541a13f82b9c168572264d1df8c56" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ab07dc67230e4a4718e70fd5c20055a4334b121f1f9db8fe63ef39ce9b8c846" + +[[package]] +name = "rustix" +version = "0.37.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys", +] + +[[package]] +name = "rustix" +version = "0.38.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac5ffa1efe7548069688cd7028f32591853cd7b5b756d41bcffd2353e4fc75b4" +dependencies = [ + "bitflags 2.3.3", + "errno", + "libc", + "linux-raw-sys 0.4.3", + "windows-sys", +] + +[[package]] +name = "ryu" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "serde" +version = "1.0.166" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.166" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_regex" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8136f1a4ea815d7eac4101cfd0b16dc0cb5e1fe1b8609dfd728058656b7badf" +dependencies = [ + "regex", + "serde", +] + +[[package]] +name = "serde_yaml" +version = "0.9.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "452e67b9c20c37fa79df53201dc03839651086ed9bbe92b3ca585ca9fdaa7d85" +dependencies = [ + "indexmap", + "itoa", + "ryu", + "serde", + "unsafe-libyaml", +] + +[[package]] +name = "smallvec" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "2.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +dependencies = [ + "autocfg", + "cfg-if", + "fastrand", + "redox_syscall", + "rustix 0.37.23", + "windows-sys", +] + +[[package]] +name = "terminal_size" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" +dependencies = [ + "rustix 0.37.23", + "windows-sys", +] + +[[package]] +name = "time" +version = "0.3.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" +dependencies = [ + "itoa", + "libc", + "num_threads", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" + +[[package]] +name = "time-macros" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +dependencies = [ + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "uncased" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b9bc53168a4be7402ab86c3aad243a84dd7381d09be0eddc81280c1da95ca68" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-ident" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unsafe-libyaml" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6" + +[[package]] +name = "url" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "users" +version = "0.11.0" +source = "git+https://github.com/dhruvkb/rust-users.git#e6ba8a88e0127f0d17ddd99f80f85d2c1722b227" +dependencies = [ + "libc", +] + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/pkgs/by-name/pl/pls/package.nix b/pkgs/by-name/pl/pls/package.nix new file mode 100644 index 000000000000..cbd46d09e1ab --- /dev/null +++ b/pkgs/by-name/pl/pls/package.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "pls"; + version = "0.0.1-beta.2"; + + src = fetchFromGitHub { + owner = "dhruvkb"; + repo = "pls"; + rev = "v${version}"; + hash = "sha256-yMZygYrLi3V9MA+6vgqG+RHme5jtHMnork8aALbFVXc="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "users-0.11.0" = "sha256-xBds73h68oWjKivEw92jEx0dVh08H2EIlBWnGx9DhyE="; + }; + }; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + meta = { + description = "Prettier and powerful ls"; + homepage = "https://pls-rs.github.io/pls/"; + license = lib.licenses.gpl3Plus; + mainProgram = "pls"; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +} diff --git a/pkgs/by-name/pr/presenterm/package.nix b/pkgs/by-name/pr/presenterm/package.nix index df5342311cd1..47440166c915 100644 --- a/pkgs/by-name/pr/presenterm/package.nix +++ b/pkgs/by-name/pr/presenterm/package.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib +, fetchFromGitHub +, rustPlatform +, libsixel +}: rustPlatform.buildRustPackage rec { pname = "presenterm"; @@ -7,12 +11,18 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "mfontanini"; repo = "presenterm"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-uwLVg/bURz2jLAQZgLujDR2Zewu5pcE9bwEBg/DQ4Iw="; }; + buildInputs = [ + libsixel + ]; + cargoHash = "sha256-tEgXqvSyScO/J/56ykCda3ERrTDQj5jCxlMEDof/fCA="; + buildFeatures = [ "sixel" ]; + # Skip test that currently doesn't work checkFlags = [ "--skip=execute::test::shell_code_execution" ]; diff --git a/pkgs/desktops/arcan/prio/default.nix b/pkgs/by-name/pr/prio/package.nix similarity index 82% rename from pkgs/desktops/arcan/prio/default.nix rename to pkgs/by-name/pr/prio/package.nix index f733b189757b..620e4f9382ce 100644 --- a/pkgs/desktops/arcan/prio/default.nix +++ b/pkgs/by-name/pr/prio/package.nix @@ -27,11 +27,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://github.com/letoram/prio"; description = "Plan9- Rio like Window Manager for Arcan"; - license = licenses.bsd3; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.all; + license = with lib.licenses; [ bsd3 ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/ra/raft-cowsql/package.nix b/pkgs/by-name/ra/raft-cowsql/package.nix index f4e94d8f4106..307c3ea8117e 100644 --- a/pkgs/by-name/ra/raft-cowsql/package.nix +++ b/pkgs/by-name/ra/raft-cowsql/package.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/cowsql/raft"; license = licenses.lgpl3Only; platforms = platforms.linux; - maintainers = with maintainers; [ adamcstephens ]; + maintainers = teams.lxc.members; }; } diff --git a/pkgs/by-name/sy/syntax/package.nix b/pkgs/by-name/sy/syntax/package.nix new file mode 100644 index 000000000000..eceffd5aa0b4 --- /dev/null +++ b/pkgs/by-name/sy/syntax/package.nix @@ -0,0 +1,30 @@ +{ lib +, fetchFromGitHub +, buildNpmPackage +, stdenv +, nix-update-script +}: + +buildNpmPackage rec { + pname = "syntax"; + version = "0.1.27"; + src = fetchFromGitHub { + owner = "DmitrySoshnikov"; + repo = "syntax"; + rev = "v${version}"; + hash = "sha256-5ZbelnZQvJ9k4GbWR+lDEgxXGLt4VsXput9nBV8nUdc="; + }; + + npmDepsHash = "sha256-jZwbRGGg4tek6Jr+V7/SceJlsbIv7jFWQ+qa+fnChTw="; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + homepage = "https://github.com/DmitrySoshnikov/syntax"; + description = "Syntactic analysis toolkit, language-agnostic parser generator"; + license = licenses.mit; + maintainers = with maintainers; [ h7x4 ]; + mainProgram = "syntax-cli"; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/by-name/ta/tailscale-nginx-auth/package.nix b/pkgs/by-name/ta/tailscale-nginx-auth/package.nix new file mode 100644 index 000000000000..58e30462757c --- /dev/null +++ b/pkgs/by-name/ta/tailscale-nginx-auth/package.nix @@ -0,0 +1,43 @@ +{ lib, stdenv, buildGoModule, fetchFromGitHub }: + +let + version = "1.48.2"; +in +buildGoModule { + pname = "tailscale-nginx-auth"; + inherit version; + + src = fetchFromGitHub { + owner = "tailscale"; + repo = "tailscale"; + rev = "v${version}"; + hash = "sha256-5Usi7W4y6JniyxBIfQid1XjDIZRS5oIw+KUMMiFRBwk="; + }; + vendorHash = "sha256-Fr4VZcKrXnT1PZuEG110KBefjcZzRsQRBSvByELKAy4="; + + CGO_ENABLED = 0; + + subPackages = [ "cmd/nginx-auth" ]; + + ldflags = [ + "-w" + "-s" + "-X tailscale.com/version.longStamp=${version}" + "-X tailscale.com/version.shortStamp=${version}" + ]; + + postInstall = lib.optionalString stdenv.isLinux '' + mv $out/bin/nginx-auth $out/bin/tailscale.nginx-auth + sed -i -e "s#/usr/sbin#$out/bin#" ./cmd/nginx-auth/tailscale.nginx-auth.service + install -D -m0444 -t $out/lib/systemd/system ./cmd/nginx-auth/tailscale.nginx-auth.service + install -D -m0444 -t $out/lib/systemd/system ./cmd/nginx-auth/tailscale.nginx-auth.socket + ''; + + meta = with lib; { + homepage = "https://tailscale.com"; + description = "Tool that allows users to use Tailscale Whois authentication with NGINX as a reverse proxy."; + license = licenses.bsd3; + mainProgram = "tailscale.nginx-auth"; + maintainers = with maintainers; [ danderson phaer ]; + }; +} diff --git a/pkgs/by-name/vg/vgm2x/package.nix b/pkgs/by-name/vg/vgm2x/package.nix new file mode 100644 index 000000000000..ff2fa28e7be7 --- /dev/null +++ b/pkgs/by-name/vg/vgm2x/package.nix @@ -0,0 +1,57 @@ +{ stdenv +, lib +, fetchFromGitHub +, unstableGitUpdater +, libfmvoice +, zlib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "vgm2x"; + version = "0.0.0-unstable-2023-08-27"; + + src = fetchFromGitHub { + owner = "vampirefrog"; + repo = "vgm2x"; + rev = "5128055ab2b356e173b53e2afd31202a59505a39"; + hash = "sha256-DwDcSUdfOsDlajYtzg5xM5P9QPOqLp8b0sEpE18kfzA="; + }; + + postPatch = '' + rmdir libfmvoice + cp --no-preserve=all -r ${libfmvoice.src} libfmvoice + ''; + + strictDeps = true; + + enableParallelBuilding = true; + + buildInputs = [ + zlib + ]; + + buildFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 vgm2opm $out/bin/vgm2opm + + runHook postInstall + ''; + + passthru = { + updateScript = unstableGitUpdater { }; + }; + + meta = with lib; { + description = "VGM file extraction tools"; + homepage = "https://github.com/vampirefrog/vgm2x"; + license = licenses.gpl3Only; + mainProgram = "vgm2opm"; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + }; +}) diff --git a/pkgs/desktops/arcan/xarcan/default.nix b/pkgs/by-name/xa/xarcan/package.nix similarity index 85% rename from pkgs/desktops/arcan/xarcan/default.nix rename to pkgs/by-name/xa/xarcan/package.nix index b979b64a06c5..fb43766e7207 100644 --- a/pkgs/desktops/arcan/xarcan/default.nix +++ b/pkgs/by-name/xa/xarcan/package.nix @@ -38,13 +38,13 @@ stdenv.mkDerivation (finalPackages: { pname = "xarcan"; - version = "unstable-2022-06-14"; + version = "unstable-2023-11-03"; src = fetchFromGitHub { owner = "letoram"; repo = "xarcan"; - rev = "02111f4925453c0c545e9193c6a5e22c0d4e98c3"; - hash = "sha256-rp2sNRbv0OZdfyqZfsv/v3TGQY5uyXWqbvlmUDd7iBk="; + rev = "380ea856307f593535dfc8b23799938db69e31b0"; + hash = "sha256-RdizezCbJylQDkOmUdqL0lBTNLsjyvo+lKAjfZXTXf4="; }; nativeBuildInputs = [ @@ -104,7 +104,7 @@ stdenv.mkDerivation (finalPackages: { "--with-xkb-path=${xkeyboard_config}/share/X11/xkb" ]; - meta = with lib; { + meta = { homepage = "https://github.com/letoram/letoram"; description = "Patched Xserver that bridges connections to Arcan"; longDescription = '' @@ -112,8 +112,8 @@ stdenv.mkDerivation (finalPackages: { arcan-shmif to map Xlib/Xcb/X clients to a running arcan instance. It allows running an X session as a window under Arcan. ''; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/yt/ytree/0001-use-prefix-and-gzip-n.diff b/pkgs/by-name/yt/ytree/0001-use-prefix-and-gzip-n.diff new file mode 100644 index 000000000000..7a682ce7e4c6 --- /dev/null +++ b/pkgs/by-name/yt/ytree/0001-use-prefix-and-gzip-n.diff @@ -0,0 +1,39 @@ +diff -Naur ytree-2.06-old/Makefile ytree-2.06-new/Makefile +--- ytree-2.06-old/Makefile 2023-11-26 06:15:34.000000000 -0300 ++++ ytree-2.06-new/Makefile 2023-12-01 12:25:36.641958285 -0300 +@@ -11,13 +11,13 @@ + # ADD_CFLAGS: Add -DVI_KEYS if you want vi-cursor-keys + # + +-DESTDIR = /usr ++PREFIX = /usr + + ADD_CFLAGS = -O # -DVI_KEYS + +-BINDIR = $(DESTDIR)/bin +-MANDIR = $(DESTDIR)/share/man/man1 +-MANESDIR = $(DESTDIR)/share/man/es/man1 ++BINDIR = $(DESTDIR)$(PREFIX)/bin ++MANDIR = $(DESTDIR)$(PREFIX)/share/man/man1 ++MANESDIR = $(DESTDIR)$(PREFIX)/share/man/es/man1 + + + # Uncomment the lines for your system (default is linux) +@@ -224,14 +224,14 @@ + + install: $(MAIN) + install $(MAIN) $(BINDIR) +- gzip -9c ytree.1 > ytree.1.gz ++ gzip -n -9c ytree.1 > ytree.1.gz + if [ -d $(MANDIR) ]; then install -m 0644 ytree.1.gz $(MANDIR)/; fi +- gzip -9c ytree.1.es > ytree.1.es.gz ++ gzip -n -9c ytree.1.es > ytree.1.es.gz + if [ -d $(MANESDIR) ]; then install -m 0644 ytree.1.es.gz $(MANESDIR)/; fi + + clean: + rm -f core *.o *~ *.orig *.bak +- ++ + clobber: clean + rm -f $(MAIN) ytree.1.es.gz ytree.1.gz + diff --git a/pkgs/by-name/yt/ytree/package.nix b/pkgs/by-name/yt/ytree/package.nix new file mode 100644 index 000000000000..6307d39b6629 --- /dev/null +++ b/pkgs/by-name/yt/ytree/package.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchurl +, ncurses +, readline +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ytree"; + version = "2.06"; + + src = fetchurl { + url = "https://han.de/~werner/ytree-${finalAttrs.version}.tar.gz"; + hash = "sha256-QRqI779ZnnytVUC7A7Zt0zyWexRwBnp+CVQcNvnvWeY="; + }; + + patches = [ + # Two fixups (because diff files can't be smaller): + # - Create PREFIX instead of using DESTDIR + # - use gzip without timestamp, to improve reproducibility + ./0001-use-prefix-and-gzip-n.diff + ]; + + buildInputs = [ + ncurses + readline + ]; + + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + + installFlags = [ "PREFIX=${placeholder "out"}" ]; + + preInstall = '' + mkdir -p $out/bin $out/share/man/man1 + ''; + + meta = { + homepage = "https://www.han.de/~werner/ytree.html"; + description = "A curses-based file manager similar to DOS Xtree(TM)"; + license = with lib.licenses; [ gpl2Plus ]; + mainProgram = "ytree"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; + }; +}) +# TODO: X11 support diff --git a/pkgs/desktops/arcan/default.nix b/pkgs/desktops/arcan/default.nix deleted file mode 100644 index 76cc6a2a4a03..000000000000 --- a/pkgs/desktops/arcan/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ config, lib, pkgs }: - -lib.makeScope pkgs.newScope (self: with self; { - # Dependencies - - espeak = pkgs.espeak-ng; - ffmpeg = pkgs.ffmpeg-full; - harfbuzz = pkgs.harfbuzzFull; - - # Arcan - - arcan = callPackage ./arcan { }; - arcan-wrapped = callPackage ./wrapper.nix { }; - xarcan = callPackage ./xarcan { }; - - # Appls - - cat9 = callPackage ./cat9 { }; - cat9-wrapped = callPackage ./wrapper.nix { - name = "cat9-wrapped"; - appls = [ cat9 ]; - }; - - durden = callPackage ./durden { }; - durden-wrapped = callPackage ./wrapper.nix { - name = "durden-wrapped"; - appls = [ durden ]; - }; - - pipeworld = callPackage ./pipeworld { }; - pipeworld-wrapped = callPackage ./wrapper.nix { - name = "pipeworld-wrapped"; - appls = [ pipeworld ]; - }; - - # Warning: prio is deprecated; however it works and is useful for testing - prio = callPackage ./prio { }; - prio-wrapped = callPackage ./wrapper.nix { - name = "prio-wrapped"; - appls = [ prio ]; - }; - - # One Expression to SymlinkJoin Them All - - all-wrapped = callPackage ./wrapper.nix { - name = "all-wrapped"; - appls = [ durden cat9 pipeworld ]; - }; -}) diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index e87328e49b45..7901d24d0f77 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -8,11 +8,11 @@ , curl , bash , debugInfo ? false -}: +} @ inputs: { baseName ? "elixir" , version -, erlangPackage ? erlang +, erlang ? inputs.erlang , minimumOTPVersion , sha256 ? null , rev ? "v${version}" @@ -24,7 +24,7 @@ let inherit (lib) getVersion versionAtLeast optional concatStringsSep; in -assert versionAtLeast (getVersion erlangPackage) minimumOTPVersion; +assert versionAtLeast (getVersion erlang) minimumOTPVersion; stdenv.mkDerivation ({ pname = "${baseName}"; @@ -32,7 +32,7 @@ stdenv.mkDerivation ({ inherit src version debugInfo; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ erlangPackage ]; + buildInputs = [ erlang ]; LANG = "C.UTF-8"; LC_TYPE = "C.UTF-8"; diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index b8201f8ce5c6..60578f79ea57 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { version = "1.19.1"; src = fetchurl { - url = "https://c-ares.haxx.se/download/${pname}-${version}.tar.gz"; + url = "https://c-ares.org/download/${pname}-${version}.tar.gz"; sha256 = "sha256-MhcAOZty7Q4DfQB0xinndB9rLsLdqSlWq+PpZx0+Jo4="; }; diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index 8a8caa556c87..5030a185886d 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "crypto++"; - version = "8.8.0"; + version = "8.9.0"; underscoredVersion = lib.strings.replaceStrings ["."] ["_"] version; src = fetchFromGitHub { owner = "weidai11"; repo = "cryptopp"; rev = "CRYPTOPP_${underscoredVersion}"; - hash = "sha256-hg7g56bIYaXxB28nAmSQ7EP9NEwd1Psf/2GUtbC27oU="; + hash = "sha256-HV+afSFkiXdy840JbHBTR8lLL0GMwsN3QdwaoQmicpQ="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index 1bf86800df89..ff379c1a78b3 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://dqlite.io/"; license = licenses.asl20; - maintainers = with maintainers; [ joko adamcstephens ]; + maintainers = teams.lxc.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/raft-canonical/default.nix b/pkgs/development/libraries/raft-canonical/default.nix index 2e1163e5f59c..e01934b1d731 100644 --- a/pkgs/development/libraries/raft-canonical/default.nix +++ b/pkgs/development/libraries/raft-canonical/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/canonical/raft"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ wucke13 adamcstephens ]; + maintainers = teams.lxc.members; }; } diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index 968cc5181327..400c7297d22b 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rdkafka"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "confluentinc"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "sha256-v/FjnDg22ZNQHmrUsPvjaCs4UQ/RPAxQdg9i8k6ba/4="; + sha256 = "sha256-F67aKmyMmqBVG5sF8ZwqemmfvVi/0bDjaiugKKSipuA="; }; nativeBuildInputs = [ pkg-config python3 which ]; diff --git a/pkgs/development/ocaml-modules/fix/default.nix b/pkgs/development/ocaml-modules/fix/default.nix index c044a03a2574..ed4230fbd01d 100644 --- a/pkgs/development/ocaml-modules/fix/default.nix +++ b/pkgs/development/ocaml-modules/fix/default.nix @@ -2,14 +2,14 @@ buildDunePackage rec { pname = "fix"; - version = "20220121"; + version = "20230505"; src = fetchFromGitLab { domain = "gitlab.inria.fr"; owner = "fpottier"; repo = "fix"; rev = version; - sha256 = "sha256-suWkZDLnXEO/4QCGmNuyLFOV0LJsFOMD13gxOcgu6JQ="; + sha256 = "sha256-Xuw4pEPqAbQjSHrpMCNE7Th0mpbNMSxdEdwvH4hu2SM="; }; minimumOCamlVersion = "4.03"; diff --git a/pkgs/development/ocaml-modules/ocaml-version/default.nix b/pkgs/development/ocaml-modules/ocaml-version/default.nix index bbd85889c84d..16f0242a9bf7 100644 --- a/pkgs/development/ocaml-modules/ocaml-version/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-version/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "ocaml-version"; - version = "3.6.1"; + version = "3.6.2"; src = fetchurl { url = "https://github.com/ocurrent/ocaml-version/releases/download/v${version}/ocaml-version-${version}.tbz"; - hash = "sha256-AKCaXUehJ3V8uET1tUDDbIzI8lZv5aygxhIbR21xnTI="; + hash = "sha256-XJ0xq71ZiR39phQIULXFDLHoj3HntxLI+v2gR0Bp/rI="; }; checkInputs = [ alcotest ]; diff --git a/pkgs/development/python-modules/bdffont/default.nix b/pkgs/development/python-modules/bdffont/default.nix new file mode 100644 index 000000000000..e9e0595f3f15 --- /dev/null +++ b/pkgs/development/python-modules/bdffont/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, nix-update-script +, hatch-vcs +, hatchling +, brotli +, fonttools +}: + +buildPythonPackage rec { + pname = "bdffont"; + version = "0.0.15"; + + disabled = pythonOlder "3.11"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-aXK6zqLFfqLXa/JLmSSW3gtC2+wtutz3/lLdYPZZ/ys="; + }; + + format = "pyproject"; + + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/TakWolf/bdffont"; + description = "A library for manipulating .bdf format fonts"; + platforms = lib.platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ h7x4 ]; + }; +} diff --git a/pkgs/development/python-modules/character-encoding-utils/default.nix b/pkgs/development/python-modules/character-encoding-utils/default.nix new file mode 100644 index 000000000000..dd0e3b60fe1f --- /dev/null +++ b/pkgs/development/python-modules/character-encoding-utils/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, nix-update-script +, hatch-vcs +, hatchling +}: + +buildPythonPackage rec { + pname = "character-encoding-utils"; + version = "0.0.6"; + + disabled = pythonOlder "3.11"; + + src = fetchPypi { + pname = "character_encoding_utils"; + inherit version; + hash = "sha256-ugzWiSpa/xxlraVyVPTSq/uxPg11kOyePgb1cmzX3ug="; + }; + + format = "pyproject"; + + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + + checkInputs = [ pytestCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/TakWolf/character-encoding-utils"; + description = "Some character encoding utils"; + platforms = lib.platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ h7x4 ]; + }; +} diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index 233067fbbce3..fd935fabb0a6 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "2.15.0"; + version = "2.20.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-TgkOE6gOFbrbHsllpAZuNNQm3EqCrWW5WSMKqW8bOuI="; + hash = "sha256-dvgexjzA/1/0p2xgjTWBQeaEKWEv/7XdhtSkyT/DN6I="; }; # The project can build both an optimized cython version and an unoptimized diff --git a/pkgs/development/python-modules/habluetooth/default.nix b/pkgs/development/python-modules/habluetooth/default.nix index 5ed70ed10a85..237379c600fb 100644 --- a/pkgs/development/python-modules/habluetooth/default.nix +++ b/pkgs/development/python-modules/habluetooth/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "habluetooth"; - version = "0.6.1"; + version = "0.9.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "habluetooth"; rev = "refs/tags/v${version}"; - hash = "sha256-Ha+tK3uThYvDcFsNA3JIzSG6IGUsAcls7ArJJpO3ZSQ="; + hash = "sha256-jAv3ygKsd2leHTR6FAIxaq+PtQbjauzyA+wvxTfTe2g="; }; postPatch = '' diff --git a/pkgs/development/python-modules/lcd-i2c/default.nix b/pkgs/development/python-modules/lcd-i2c/default.nix new file mode 100644 index 000000000000..7ba9be221dde --- /dev/null +++ b/pkgs/development/python-modules/lcd-i2c/default.nix @@ -0,0 +1,34 @@ +{ lib +, python3 +, fetchPypi +, buildPythonPackage +, smbus2 +, poetry-core +}: + +buildPythonPackage rec { + pname = "lcd-i2c"; + version = "0.2.3"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-NYBaCXBmuTziT0WYEqrW10HRmRy3jpjH3YWQh5Y/TdQ="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + smbus2 + ]; + + meta = with lib; { + description = "Library for interacting with an I2C LCD screen through Python"; + homepage = "https://pypi.org/project/lcd-i2c/"; + license = licenses.mit; + maintainers = with maintainers; [ oliver-koss ]; + mainProgram = "lcd-i2c"; + }; +} diff --git a/pkgs/development/python-modules/linien-client/default.nix b/pkgs/development/python-modules/linien-client/default.nix new file mode 100644 index 000000000000..0cbd9b2d9adb --- /dev/null +++ b/pkgs/development/python-modules/linien-client/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, linien-common +, setuptools +, fabric +, typing-extensions +, numpy +, scipy +}: + +buildPythonPackage rec { + pname = "linien-client"; + pyproject = true; + + inherit (linien-common) src version; + + sourceRoot = "source/linien-client"; + + preBuild = '' + export HOME=$(mktemp -d) + ''; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ + fabric + typing-extensions + numpy + scipy + linien-common + ]; + + pythonImportsCheck = [ "linien_client" ]; + + meta = with lib; { + description = "Client components of the Linien spectroscopy lock application"; + homepage = "https://github.com/linien-org/linien/tree/develop/linien-client"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fsagbuya doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/linien-common/default.nix b/pkgs/development/python-modules/linien-common/default.nix new file mode 100644 index 000000000000..23d49ba3605f --- /dev/null +++ b/pkgs/development/python-modules/linien-common/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, importlib-metadata +, numpy +, rpyc +, scipy +, appdirs +, callPackage +}: + +buildPythonPackage rec { + pname = "linien-common"; + version = "1.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "linien-org"; + repo = "linien"; + rev = "v${version}"; + hash = "sha256-BMYFi1HsNKWHmYdrnX/mAehke7UxQZlruFmpaAvxWvQ="; + }; + + sourceRoot = "source/linien-common"; + + preBuild = '' + export HOME=$(mktemp -d) + ''; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ + importlib-metadata + numpy + rpyc + scipy + appdirs + ]; + + pythonImportsCheck = [ "linien_common" ]; + + passthru.tests = { + pytest = callPackage ./tests.nix { }; + }; + + meta = with lib; { + description = "Shared components of the Linien spectroscopy lock application"; + homepage = "https://github.com/linien-org/linien/tree/develop/linien-common"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fsagbuya doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/linien-common/tests.nix b/pkgs/development/python-modules/linien-common/tests.nix new file mode 100644 index 000000000000..7237548f2da3 --- /dev/null +++ b/pkgs/development/python-modules/linien-common/tests.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, linien-common +, linien-client +, pytestCheckHook +}: + +buildPythonPackage { + pname = "linien-tests"; + inherit (linien-common) version src; + format = "other"; + pyproject = false; + + dontBuild = true; + dontInstall = true; + + nativeCheckInputs = [ + linien-common + linien-client + pytestCheckHook + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; +} diff --git a/pkgs/development/python-modules/pixel-font-builder/default.nix b/pkgs/development/python-modules/pixel-font-builder/default.nix new file mode 100644 index 000000000000..d541cd00dc5a --- /dev/null +++ b/pkgs/development/python-modules/pixel-font-builder/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, nix-update-script +, hatch-vcs +, hatchling +, bdffont +, brotli +, fonttools +, pypng +}: + +buildPythonPackage rec { + pname = "pixel-font-builder"; + version = "0.0.10"; + + disabled = pythonOlder "3.11"; + + src = fetchPypi { + pname = "pixel_font_builder"; + inherit version; + hash = "sha256-evLsNRSC9sPZfhNc8tYbZ/bIrBxSbLuiGRD3ld7Jkbo="; + }; + + format = "pyproject"; + + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + + nativeCheckInputs = [ + pytestCheckHook + pypng + ]; + + propagatedBuildInputs = [ + bdffont + brotli + fonttools + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/TakWolf/pixel-font-builder"; + description = "A library that helps create pixel style fonts"; + platforms = lib.platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ h7x4 ]; + }; +} diff --git a/pkgs/development/python-modules/pymiele/default.nix b/pkgs/development/python-modules/pymiele/default.nix index 1706c3de2a2a..db951d6d7a99 100644 --- a/pkgs/development/python-modules/pymiele/default.nix +++ b/pkgs/development/python-modules/pymiele/default.nix @@ -4,6 +4,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -19,6 +20,10 @@ buildPythonPackage rec { }; nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ aiohttp async-timeout ]; diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 48ad5bb08e94..f24534af0083 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.7.9"; + version = "0.7.10"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tp2C8UCwd0MX17pA9sX6HXVQmLo/PrYZmC0W51DcYxo="; + hash = "sha256-zC+QqtFRfLCzAQQfZ4zI08NCfCblPxXHjJPGeSjYmgI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/unidata-blocks/default.nix b/pkgs/development/python-modules/unidata-blocks/default.nix new file mode 100644 index 000000000000..cded041c46b8 --- /dev/null +++ b/pkgs/development/python-modules/unidata-blocks/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, nix-update-script +, hatch-vcs +, hatchling +, langcodes +}: + +buildPythonPackage rec { + pname = "unidata-blocks"; + version = "0.0.8"; + + disabled = pythonOlder "3.11"; + + src = fetchPypi { + pname = "unidata_blocks"; + inherit version; + hash = "sha256-Y7OSFuPHgzNc/KtmBWwdVqH7Xy4v4w2UGHBUF9pIuSU="; + }; + + format = "pyproject"; + + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + + propagatedBuildInputs = [ langcodes ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/TakWolf/unidata-blocks"; + description = "A library that helps query unicode blocks by Blocks.txt"; + platforms = lib.platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ h7x4 ]; + }; +} diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 59e761aa44d3..1378b7a1add7 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.1.21"; + version = "3.1.25"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-R0O0C8IElTjAF+0QRWII6V1Zj/9df7pCxSzfKCKZ0OQ="; + hash = "sha256-DNMS22IatzdaqHDDNVnhdAGvXGcgnU6lnaLrhESh2x4="; }; patches = [ diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix index 4195a8453033..aa507496478e 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -32,6 +32,10 @@ , git , openssh , setuptools +, croniter +, importlib-resources +, packaging +, unidiff , pythonRelaxDepsHook , glibcLocales , nixosTests @@ -67,14 +71,14 @@ let package = buildPythonApplication rec { pname = "buildbot"; - version = "3.9.2"; + version = "3.10.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-7QhIMUpzmxbh8qjz0hgqzibLkWADhTV523neo1wpGSA="; + hash = "sha256-Jlppe6LgDQKQgywINkOX9zKWTomzIz28M5scrj3H94Y="; }; propagatedBuildInputs = [ @@ -91,6 +95,10 @@ let pyjwt pyyaml setuptools + croniter + importlib-resources + packaging + unidiff ] # tls ++ twisted.optional-dependencies.tls; diff --git a/pkgs/development/tools/continuous-integration/buildbot/pkg.nix b/pkgs/development/tools/continuous-integration/buildbot/pkg.nix index 2af7289000e2..33a42c01707d 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/pkg.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-HmkJHN81AcQdKrA/XnH3REURCssXnzmoKjcmvinfzFo="; + hash = "sha256-ZGkM2/1/qiVkzpJ7FZNbIEwgCrpxPGyBjREqeqwDD0k="; }; postPatch = '' diff --git a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix index 429c19ecfcee..82c1f364cfc6 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix @@ -8,7 +8,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-fwWzgIf0/+UiKRyiFUKPN4WUbmxQE5sU/ChAOqqLHE4="; + hash = "sha256-ycjmkzKBYdCmJe5Ofjn4q1tg66oVXC2Oaq2qBaZbmwg="; }; # Remove unnecessary circular dependency on buildbot @@ -32,23 +32,15 @@ www-react = buildPythonPackage rec { pname = "buildbot-www-react"; inherit (buildbot-pkg) version; - format = "wheel"; - # fetchpypy returns a 404 for the wheel? - # normal source release doesn't have any assets - src = fetchurl { - url = "https://github.com/buildbot/buildbot/releases/download/v${version}/buildbot_www_react-${version}-py3-none-any.whl"; - hash = "sha256-pEzuMiDhGQtIWQm80lgKIcTjnS7Z8UJhH9plJup5O84="; + src = fetchPypi { + inherit pname version; + hash = "sha256-2fMqgM83ANHx7+MWUF0eALOaliwVkCSumnw+bLZR+tw="; }; - # Remove unneccessary circular dependency on buildbot + # Remove unnecessary circular dependency on buildbot postPatch = '' - pushd dist - unzip buildbot_www_react-${version}-py3-none-any.whl - sed -i "s/Requires-Dist: buildbot//" buildbot_www_react-${version}.dist-info/METADATA - chmod -R u+w buildbot_www_react-${version}-py3-none-any.whl - zip -r buildbot_www_react-${version}-py3-none-any.whl buildbot_www_react-${version}.dist-info - popd + sed -i "s/'buildbot'//" setup.py ''; buildInputs = [ buildbot-pkg ]; @@ -71,7 +63,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-ghCmbUw/Gj23J5X3fDn/FGkVvXUE9QWrPFTRXSsxEZ4="; + hash = "sha256-0VW7tRT9yvVvh9x+2bG3b4q0yqgq9g2OyI0MELPxo4M="; }; buildInputs = [ buildbot-pkg ]; @@ -93,7 +85,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-B+xUsZBQWt4TwiBqukHO6o0R0XbjLxbCxQKLaWW0/Fw="; + hash = "sha256-92CNfBIGciv1mx948ha1YgvFGhx5hJsbn1n/BIXmPT8="; }; buildInputs = [ buildbot-pkg ]; @@ -115,7 +107,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-LFZ3VquRHAHkRcQbw9apOlGlWCK42WT1tPGhW8zSXyo="; + hash = "sha256-hdF1KopG4nqzHWLpTcYGnhEM6tfYc5WjYaz5xadL3ow="; }; buildInputs = [ buildbot-pkg ]; @@ -137,7 +129,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-NGI4T0eVV4MxYpD7+BTKbi3r6USt28lXXInrgSd4ASU="; + hash = "sha256-X1gPrwkHVdOdOpu/rVnAn5aZPbhye27udkfzI3aY+WI="; }; buildInputs = [ buildbot-pkg ]; @@ -159,7 +151,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-BtKA8zuJEyg3q3GnHS4XSGBLBk3IqCR8NOKui2rIn6Q="; + hash = "sha256-OXzgS+duQaDR8+lUzSnR85PIIIe9om/lvP9czRE1Ih0="; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/tools/continuous-integration/buildbot/worker.nix b/pkgs/development/tools/continuous-integration/buildbot/worker.nix index 29d0bcf7fb73..38a0bdb7d453 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/worker.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/worker.nix @@ -27,7 +27,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - hash = "sha256-jI38ZhCcHbjah6lST6YtSZAwaeZPBWsgY3VTUf6s2x8="; + hash = "sha256-aAwrIYJRNbvZEV3kkCWnfyuZAMeyynZkOkxQ0wDatxU="; }; postPatch = '' diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix index 6e1493528e2b..bf845eed8d86 100644 --- a/pkgs/development/tools/electron/binary/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -40,7 +40,7 @@ let ++ optionals (versionAtLeast version "11.0.0") [ "aarch64-darwin" ] ++ optionals (versionOlder version "19.0.0") [ "i686-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - knownVulnerabilities = optional (versionOlder version "25.0.0") "Electron version ${version} is EOL"; + knownVulnerabilities = optional (versionOlder version "26.0.0") "Electron version ${version} is EOL"; }; fetcher = vers: tag: hash: fetchurl { diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index 19725cc8f148..497a321c3f14 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -42,12 +42,16 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { src = null; - patches = base.patches ++ lib.optional (lib.versionOlder info.version "28") + patches = base.patches ++ lib.optional (lib.versionOlder info.version "27") (substituteAll { name = "version.patch"; - src = if lib.versionAtLeast info.version "27" then ./version.patch else ./version-old.patch; + src = ./version.patch; inherit (info) version; }) + + # we remove the web_tests directory in the chromium src FOD to reduce the output size, but this backported patch includes patches on web_tests + ++ lib.optional (lib.versions.major info.version == "26") + ./electron-26-remove-web_tests-patch.patch ; unpackPhase = '' @@ -165,9 +169,7 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { enable_widevine = false; use_perfetto_client_library = false; enable_check_raw_ptr_fields = false; - } // lib.optionalAttrs (lib.versionOlder info.version "26") { - use_gnome_keyring = false; - } // lib.optionalAttrs (lib.versionAtLeast info.version "28") { + } // lib.optionalAttrs (lib.versionAtLeast info.version "27") { override_electron_version = info.version; }; diff --git a/pkgs/development/tools/electron/electron-26-remove-web_tests-patch.patch b/pkgs/development/tools/electron/electron-26-remove-web_tests-patch.patch new file mode 100644 index 000000000000..f3dfce6f4144 --- /dev/null +++ b/pkgs/development/tools/electron/electron-26-remove-web_tests-patch.patch @@ -0,0 +1,73 @@ +diff --git a/electron/patches/chromium/cherry-pick-80106e31c7ea.patch b/electron/patches/chromium/cherry-pick-80106e31c7ea.patch +index 3f8ae7d1b2..af8859a1a5 100644 +--- a/electron/patches/chromium/cherry-pick-80106e31c7ea.patch ++++ b/electron/patches/chromium/cherry-pick-80106e31c7ea.patch +@@ -361,68 +361,3 @@ index 3d562fa22bd84dc438abfe9fa883eff6f5846b1b..c64c7fb1b15f7f523b37671abca2ab50 + auto* resolver = MakeGarbageCollected( + script_state, exception_state.GetContext()); + ScriptPromise promise = resolver->Promise(); +-diff --git a/third_party/blink/web_tests/external/wpt/webusb/usbDevice.https.any.js b/third_party/blink/web_tests/external/wpt/webusb/usbDevice.https.any.js +-index b1b0c133ce160a314ea392514ac5b38e4cac136d..804af2afb9db3a0d5fafbeb26aed64f89badb1b3 100644 +---- a/third_party/blink/web_tests/external/wpt/webusb/usbDevice.https.any.js +-+++ b/third_party/blink/web_tests/external/wpt/webusb/usbDevice.https.any.js +-@@ -1247,3 +1247,60 @@ usb_test((t) => { +- .then(() => promise_rejects_dom(t, 'NotFoundError', device.reset())); +- }); +- }, 'resetDevice rejects when called on a disconnected device'); +-+ +-+usb_test(async (t) => { +-+ const PACKET_COUNT = 4; +-+ const PACKET_LENGTH = 8; +-+ const {device, fakeDevice} = await getFakeDevice(); +-+ await device.open(); +-+ await device.selectConfiguration(2); +-+ await device.claimInterface(0); +-+ await device.selectAlternateInterface(0, 1); +-+ const buffer = new Uint8Array(PACKET_COUNT * PACKET_LENGTH); +-+ const packetLengths = new Array(PACKET_COUNT).fill(PACKET_LENGTH); +-+ packetLengths[0] = PACKET_LENGTH - 1; +-+ await promise_rejects_dom( +-+ t, 'DataError', device.isochronousTransferOut(1, buffer, packetLengths)); +-+}, 'isochronousTransferOut rejects when buffer size exceeds packet lengths'); +-+ +-+usb_test(async (t) => { +-+ const PACKET_COUNT = 4; +-+ const PACKET_LENGTH = 8; +-+ const {device, fakeDevice} = await getFakeDevice(); +-+ await device.open(); +-+ await device.selectConfiguration(2); +-+ await device.claimInterface(0); +-+ await device.selectAlternateInterface(0, 1); +-+ const buffer = new Uint8Array(PACKET_COUNT * PACKET_LENGTH); +-+ const packetLengths = new Array(PACKET_COUNT).fill(PACKET_LENGTH); +-+ packetLengths[0] = PACKET_LENGTH + 1; +-+ await promise_rejects_dom( +-+ t, 'DataError', device.isochronousTransferOut(1, buffer, packetLengths)); +-+}, 'isochronousTransferOut rejects when packet lengths exceed buffer size'); +-+ +-+usb_test(async (t) => { +-+ const PACKET_COUNT = 2; +-+ const PACKET_LENGTH = 8; +-+ const {device, fakeDevice} = await getFakeDevice(); +-+ await device.open(); +-+ await device.selectConfiguration(2); +-+ await device.claimInterface(0); +-+ await device.selectAlternateInterface(0, 1); +-+ const packetLengths = [0xffffffff, 1]; +-+ await promise_rejects_dom( +-+ t, 'DataError', device.isochronousTransferIn(1, packetLengths)); +-+}, 'isochronousTransferIn rejects when packet lengths exceed maximum size'); +-+ +-+usb_test(async (t) => { +-+ const PACKET_COUNT = 2; +-+ const PACKET_LENGTH = 8; +-+ const {device, fakeDevice} = await getFakeDevice(); +-+ await device.open(); +-+ await device.selectConfiguration(2); +-+ await device.claimInterface(0); +-+ await device.selectAlternateInterface(0, 1); +-+ const buffer = new Uint8Array(PACKET_LENGTH * PACKET_COUNT); +-+ const packetLengths = [0xffffffff, 1]; +-+ await promise_rejects_dom( +-+ t, 'DataError', device.isochronousTransferOut(1, buffer, packetLengths)); +-+}, 'isochronousTransferOut rejects when packet lengths exceed maximum size'); diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index a3b470f78d7b..88b446fe4255 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -3,16 +3,16 @@ "deps": { "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-TOsL+5sF65sOCSLx0yamXWC5olYbDUO/Np9HK5sT5DI=", + "hash": "sha256-c3crd1hOiRYQAIEApVmE2gGsfW30rbQrr61Hmdryftk=", "owner": "electron", "repo": "electron", - "rev": "v28.0.0-alpha.3" + "rev": "v28.0.0" }, "src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-5lIe6mjAee6DUOPDvPM43QJ7VKRQ960w7UqxbXPRPIA=", + "hash": "sha256-umUgGlclsdK6EDucwQXqL5/ExXuzAE6SYZcdlV0WHg0=", "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "119.0.6045.21", + "rev": "120.0.6099.56", "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; " }, "src/third_party/clang-format/script": { @@ -23,21 +23,21 @@ }, "src/third_party/libc++/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-6kuGJCCRgOwrV85e2i+UTyzt40u2pTET6cs0/MtI9Hk=", + "hash": "sha256-DVO15xGxatRbUp13EoNslGEZ2QSHn97VbEBHyfMvKfQ=", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git", - "rev": "7cf98622abaf832e2d4784889ebc69d5b6fde4d8" + "rev": "a429c26ae25c26a569ff12390d5f9be70c5e286b" }, "src/third_party/libc++abi/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-iFIXi4kq/LhNhFPJG4UJfO08MCxvthpiZ0WT9jg0lHE=", + "hash": "sha256-QjCPRgFU34wZ8GG/dl+6wi2gflje3fG/x+eokb9W02c=", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git", - "rev": "e8e4eb8f1c413ea4365256b2b83a6093c95d2d86" + "rev": "2ca9f38714b1465b9f55b5fbd0da5e4342811e2b" }, "src/third_party/libunwind/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-ytY/QvFzbqkGbsB+um1Rxo+O5DEOFUxUzRIuKMrC8YE=", + "hash": "sha256-bQHo8CKDpqvJcVv6OzVO7LOGTqL9qHqD4n9TtRK0v5g=", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git", - "rev": "43e5a34c5b7066a7ee15c74f09dc37b4b9b5630e" + "rev": "7686b5d38c69d14932abfb1c1a66ba56c78791ad" }, "src/chrome/test/data/perf/canvas_bench": { "fetcher": "fetchFromGitiles", @@ -59,9 +59,9 @@ }, "src/docs/website": { "fetcher": "fetchFromGitiles", - "hash": "sha256-aYgan6NIIIWDzCplczvU57TZQ6GAluejBoWjfx5FPs4=", + "hash": "sha256-+UawYfW5FAMpv0TbzSR8qITPGUQulLIZ0mUh6ZdnmMI=", "url": "https://chromium.googlesource.com/website.git", - "rev": "98972e05cf600ceefe641ac5d83b661e2792fcb4" + "rev": "07714da3c28b942dc8522affed4487403e971545" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", @@ -71,15 +71,15 @@ }, "src/net/third_party/quiche/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-dziuBpghbxrXXH6on6WxYvfHInSaUWyNrWbYwAJeMuA=", + "hash": "sha256-JXWGEsJrXRXs2BrkWIC8cUBD6uvt8ftb9V5Dy2yLc/w=", "url": "https://quiche.googlesource.com/quiche.git", - "rev": "0c75f987990bfb2fe27eeaa8f3cc78f98f3ef42d" + "rev": "a01a131ca6df63e774809d623f47e8cf28c574cc" }, "src/third_party/angle": { "fetcher": "fetchFromGitiles", - "hash": "sha256-2JvDcfRiwFDjiGWlzwsTq6HP/I6lq+NaI6S57ZrCLGY=", + "hash": "sha256-AMwWqLnRSb4FdOsiMB9Q2znX+FPCrS94FXYAc6dCdLg=", "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "5cff2421ef225d14d3a4253b81073389fc840024" + "rev": "76ead87021b954ab670d0c1e682f4828cb6adf25" }, "src/third_party/angle/third_party/glmark2/src": { "fetcher": "fetchFromGitiles", @@ -95,15 +95,15 @@ }, "src/third_party/angle/third_party/VK-GL-CTS/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-yXo4h4SgMdmHxtT5IeFDzBa5hq/7RZtMRrktaLJkvfs=", + "hash": "sha256-+g1yjF1yETrL1X6Cxu5mhPWXukWygg1dnawU8S9cGkA=", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS", - "rev": "a55b0930e9db612b25cc67701569931200bc2ee0" + "rev": "7d738783bf286e82937e431c295d4682f3767267" }, "src/third_party/anonymous_tokens/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-/AuMmFWKOaYCsd9cHbZBYUqJUHXJ0xxOuIWe/+lEZ1c=", + "hash": "sha256-2B0j9vNF8nMhmedk+ghz4JJJiDKN6jnVfdqsa4zRWeU=", "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git", - "rev": "79562f0175dba82f671046b5bdea0853323445b7" + "rev": "47d423347823088a21b26262ca553eadb8e5b220" }, "src/third_party/content_analysis_sdk/src": { "fetcher": "fetchFromGitiles", @@ -113,15 +113,15 @@ }, "src/third_party/dav1d/libdav1d": { "fetcher": "fetchFromGitiles", - "hash": "sha256-KSo2s3M3S13gY84NlAdnPsjoKfJZy7ipTlWSvUHD9Ak=", + "hash": "sha256-9SrbxiOqXKTFf4qZ4Wqg9aoOMY8zv7NczTqN2+lXwCI=", "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git", - "rev": "f8ae94eca0f53502a2cddd29a263c1edea4822a0" + "rev": "47107e384bd1dc25674acf04d000a8cdc6195234" }, "src/third_party/dawn": { "fetcher": "fetchFromGitiles", - "hash": "sha256-PE1LHtfdL9grVxBKaSVoc/kc6eHLaP7LKJFWxx+BByE=", + "hash": "sha256-onIVQBs8fIAhIEnjbwW8nrwAF5KJ2JjEMSK9b0HAheM=", "url": "https://dawn.googlesource.com/dawn.git", - "rev": "e1f1c0135a5eca328a320d4f14d21b24576eea9b" + "rev": "acee31423468efdb650be9dc9172b30cc2015a4e" }, "src/third_party/dawn/third_party/glfw": { "fetcher": "fetchFromGitiles", @@ -131,9 +131,9 @@ }, "src/third_party/dawn/third_party/dxc": { "fetcher": "fetchFromGitiles", - "hash": "sha256-uCSypev3Jvy6vfzF0AG3w9DIewV7u4w7TNtw1WVVrXM=", + "hash": "sha256-EAfTm0QZcihcU6ufBHE1QsYRggNWNKHjVZXcrUp/T+c=", "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler", - "rev": "6b4b0eb5f2ca9b9039a7dbf7b324a9478fbd6f03" + "rev": "64030a4e01e27c608b6c5f1ab5add43575e086f9" }, "src/third_party/dawn/third_party/dxheaders": { "fetcher": "fetchFromGitiles", @@ -155,9 +155,9 @@ }, "src/third_party/dawn/third_party/webgpu-cts": { "fetcher": "fetchFromGitiles", - "hash": "sha256-+pKnhSC7qQf8P5YL7ei1IPJ0ur89IJAiItnXhw6HKLo=", + "hash": "sha256-DqQIyZU6kYYRoouIiJnJBit8l38wPu08zbJhM2BQbs4=", "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts", - "rev": "be1210e145e89e7a2943947d983f9592495e0f52" + "rev": "2ef3f322027bec1bb5572f5083d478148d355d79" }, "src/third_party/highway/src": { "fetcher": "fetchFromGitiles", @@ -173,9 +173,9 @@ }, "src/third_party/boringssl/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-FBQ7y4N2rCM/Cyd6LBnDUXpSa2O3osUXukECTBjZL6s=", + "hash": "sha256-hxPNJzWS2f4iUsNYwRvxiTL9vRrcZzZT5KpIx3+WuGM=", "url": "https://boringssl.googlesource.com/boringssl.git", - "rev": "d24a38200fef19150eef00cad35b138936c08767" + "rev": "c38dc29860a72540eb2c4fdb8a8bfb27ef94ddf3" }, "src/third_party/breakpad/breakpad": { "fetcher": "fetchFromGitiles", @@ -191,9 +191,9 @@ }, "src/third_party/catapult": { "fetcher": "fetchFromGitiles", - "hash": "sha256-j5NFdjcsv3CaAOrUmNkuxodQyudxqWCNPTd6ovW83sg=", + "hash": "sha256-jueHC5YC+WmGRtGZ8yD6QT2pVj21n1THpIz/vI9M334=", "url": "https://chromium.googlesource.com/catapult.git", - "rev": "4f81c1e295978227d83f1b42ceff40b4f9b5b08c" + "rev": "47efdb4b1428e549c58a6d6c2fa79c4a8ceaf9b4" }, "src/third_party/ced/src": { "fetcher": "fetchFromGitiles", @@ -203,9 +203,9 @@ }, "src/third_party/chromium-variations": { "fetcher": "fetchFromGitiles", - "hash": "sha256-mWnpJb5yV30slOvqc543uqxN1t6TEGP2H3MKl7x6mbw=", + "hash": "sha256-cRFzDmGoyrxwPDVvatGm3EutOXtWqqlI7v7BeX5d43s=", "url": "https://chromium.googlesource.com/chromium-variations.git", - "rev": "990efdd6cf54f2124621d065e2de629856c395e4" + "rev": "cb7fe7e32de8b885ccdd6293444d8e4028b03eca" }, "src/third_party/cld_3/src": { "fetcher": "fetchFromGitiles", @@ -227,9 +227,9 @@ }, "src/third_party/cpuinfo/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-nOSaLZGqmt+8W5Ut9QHDKznh1cekl1jL2ghCM4mgbgc=", + "hash": "sha256-BcSG/1aa/cyT8CCd1Qdsm/yXa5bCrmrtaRxnYjwkspY=", "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git", - "rev": "959002f82d7962a473d8bf301845f2af720e0aa4" + "rev": "76d5e8f5b563daa65340a60fce0e9aec73a936df" }, "src/third_party/crc32c/src": { "fetcher": "fetchFromGitiles", @@ -239,9 +239,9 @@ }, "src/third_party/cros_system_api": { "fetcher": "fetchFromGitiles", - "hash": "sha256-uTeouExil2es07n1a4oVa/r6CUraZ0+iu8Q+A1n4kgA=", + "hash": "sha256-wI4rx+oQ6i8yIB8NBp/O471O4pVJL3l+ez0t8I5oD/w=", "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git", - "rev": "b7b78587c03de1cd478f31f734498430773adeb3" + "rev": "00c21541508ea2c6863f1cda24ef88ef30309ae8" }, "src/third_party/crossbench": { "fetcher": "fetchFromGitiles", @@ -251,15 +251,15 @@ }, "src/third_party/depot_tools": { "fetcher": "fetchFromGitiles", - "hash": "sha256-Zx8VtOMxysriVmcPb9YkdS84WXV6NsSkfnCSV8OBwbc=", + "hash": "sha256-WtosDcMOV9eh0PhTbB5w3x3AYQs3Ui4h3mV0Ib0CBlc=", "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git", - "rev": "90a30a5b5357636fa05bb315c393275be7ca705c" + "rev": "9f3b33a275e7a5b19d8ce4aba7960d2a38858681" }, "src/third_party/devtools-frontend/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-OUmCxucDd8jXbEqqNyt9j0j+9zp2G9s3aaFliFkg45A=", + "hash": "sha256-jLsdRAQF7UxetAIU0bb+KK4cbXRlaQpg2B8T6+ba7uE=", "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "fa727c5e31709a4447a79a2270157b7ba86414c4" + "rev": "099860eb0f995fef1d97ecdbe3c354f0558bec3b" }, "src/third_party/dom_distiller_js/dist": { "fetcher": "fetchFromGitiles", @@ -269,9 +269,9 @@ }, "src/third_party/eigen3/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-a7TnzR57VmIBUqAEKmxncgV/22g3z7b1lEHsYnNZjKo=", + "hash": "sha256-mfS/l+V0If3fmXvA1p5gtyrNCU6IqWYrBbzm4jkXC3I=", "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git", - "rev": "18018ed013029ca3f28f52a62360999b5a659eac" + "rev": "aa6964bf3a34fd607837dd8123bc42465185c4f8" }, "src/third_party/farmhash/src": { "fetcher": "fetchFromGitiles", @@ -281,9 +281,9 @@ }, "src/third_party/ffmpeg": { "fetcher": "fetchFromGitiles", - "hash": "sha256-uRgHTVaCAEaoqY20SmePQbApPmjimgggm5922KKfnbc=", + "hash": "sha256-lomUDmbbYW95BHEuYmm0pVqf++nYEa2XxeW4ag36tgc=", "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git", - "rev": "0ba37733400593b162e5ae9ff26b384cff49c250" + "rev": "e1ca3f06adec15150a171bc38f550058b4bbb23b" }, "src/third_party/flac": { "fetcher": "fetchFromGitiles", @@ -293,9 +293,9 @@ }, "src/third_party/flatbuffers/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-yu+bMwlTqT5I+BbJhemGMvs/Yw9TusNnFsHgERXYb2M=", + "hash": "sha256-LecJwLDG6szZZ/UOCFD+MDqH3NKawn0sdEwgnMt8wMM=", "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git", - "rev": "0343396e49d1c0bf4ca1058130efd9585ecb3c8f" + "rev": "bcb9ef187628fe07514e57756d05e6a6296f7dc5" }, "src/third_party/fontconfig/src": { "fetcher": "fetchFromGitiles", @@ -323,9 +323,9 @@ }, "src/third_party/freetype/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-+n7BwWerzg8bMIgZYBOtCibfNkECijNVJKNk7qOQVhU=", + "hash": "sha256-wyaCNPPL2CTZYY6YUUuGnN3TjHxgKeHAYsw+r88ijMI=", "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git", - "rev": "7b308a29dd105074eea9c8d5953a182d325f74f1" + "rev": "55d0287cfc31115760cb13caa346b407ef0c0ceb" }, "src/third_party/freetype-testing/src": { "fetcher": "fetchFromGitiles", @@ -341,9 +341,9 @@ }, "src/third_party/harfbuzz-ng/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-+fClyD9Rsge9qdGF8WCv8taLTWNL8iManpXZUzDL2LM=", + "hash": "sha256-xCsfgbsWVSiuII5zFspssrqX4NrRuhzufYSq6fdnjKQ=", "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", - "rev": "db700b5670d9475cc8ed4880cc9447b232c5e432" + "rev": "f26fd69d858642d76413b8f4068eaf9b57c40a5f" }, "src/third_party/emoji-segmenter/src": { "fetcher": "fetchFromGitiles", @@ -377,9 +377,9 @@ }, "src/third_party/icu": { "fetcher": "fetchFromGitiles", - "hash": "sha256-6do7X9xUCMe2mFQoffazdC5W9UJdHp424QEThqX6P48=", + "hash": "sha256-9yFRBrHdWcYgrZAaigS8XnxNsqJNklGdFkAAgVdHXFU=", "url": "https://chromium.googlesource.com/chromium/deps/icu.git", - "rev": "985b9a6f70e13f3db741fed121e4dcc3046ad494" + "rev": "a622de35ac311c5ad390a7af80724634e5dc61ed" }, "src/third_party/jsoncpp/source": { "fetcher": "fetchFromGitiles", @@ -401,9 +401,9 @@ }, "src/third_party/fuzztest/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-53SzbbDlzLl1MTeHxBhLpVGMKICd3ka6qfGcru9AVog=", + "hash": "sha256-wuB/lbkVCbisZvVFuLdE8XNDuiLQcI47/Y0EqvOCytc=", "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git", - "rev": "ce460dd7cae252b8505ce0009121bcac17939e3a" + "rev": "b5dbc33890d9586e4f6a213f1bf163ad287e6aa4" }, "src/third_party/libaddressinput/src": { "fetcher": "fetchFromGitiles", @@ -413,15 +413,15 @@ }, "src/third_party/libaom/source/libaom": { "fetcher": "fetchFromGitiles", - "hash": "sha256-76duDNvaq8o7RdswZglifr+gml86fSTdXAEx0nOTybI=", + "hash": "sha256-6oZWYXRTZ1IC5yGvfPI19PwPU9O7mKBsW2wVxBGwU/I=", "url": "https://aomedia.googlesource.com/aom.git", - "rev": "0d59418942412c4176805198f2ab7ff446637c3b" + "rev": "1dbe1c7fae2456f91ccc79fecb919e9ffea0727a" }, "src/third_party/libavif/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-ZAsOy32MHx3YPvEnbBGGT4+iYhFyFPik0+9cLRoVDP4=", + "hash": "sha256-mSIrPqJebYSyLyTJmuLuwNoeJ6YJk3gSgFRLap7kSpA=", "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git", - "rev": "0d4747af5b3f7b150c3838e6148c49a0bf0e0064" + "rev": "466d5e5f8889053115d445637ab8f6e0b3c70ed3" }, "src/third_party/libavifinfo/src": { "fetcher": "fetchFromGitiles", @@ -431,9 +431,9 @@ }, "src/third_party/nearby/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-0tTpC11sFIPq+FPlkGFrDNaAK93isQV/Fd2x1lHmtQ8=", + "hash": "sha256-9PT/tuxjREGsvSnYT2wyaL5sB52CcYPpKVKN0ZGldWU=", "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git", - "rev": "d477a2d174fc0e31f6dd06264ff3f47ff8da5378" + "rev": "629e7ba7c964a62c97f6a882bffaec3c8490bb1e" }, "src/third_party/beto-core/src": { "fetcher": "fetchFromGitiles", @@ -461,9 +461,9 @@ }, "src/third_party/cros-components/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-grvqHNesTNc3pUkM5YH4P+LaeSWXEKBM8Kw/eRMaB4E=", + "hash": "sha256-ZjLMlNDDN08v9SUFAuroPsu/6ADLHZAAFpv+bmaJA2Y=", "url": "https://chromium.googlesource.com/external/google3/cros_components.git", - "rev": "10d2e376519e88221117e38cd901054b0153501c" + "rev": "25159cae8d540780cbeb994692ce4a3ea14cc094" }, "src/third_party/libdrm/src": { "fetcher": "fetchFromGitiles", @@ -485,9 +485,9 @@ }, "src/third_party/libjpeg_turbo": { "fetcher": "fetchFromGitiles", - "hash": "sha256-bcmp8RqQYp4lRI9NfdfYgrAJsDLecJEhgRu9oosB9lQ=", + "hash": "sha256-+t75ZAdOXc7Nd1/8zEQLX+enZb8upqIQuR6qzb9z7Cg=", "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git", - "rev": "30bdb85e302ecfc52593636b2f44af438e05e784" + "rev": "9b894306ec3b28cea46e84c32b56773a98c483da" }, "src/third_party/liblouis/src": { "fetcher": "fetchFromGitiles", @@ -521,9 +521,9 @@ }, "src/third_party/libvpx/source/libvpx": { "fetcher": "fetchFromGitiles", - "hash": "sha256-5x0Sk8/DXaTCIydK79vWZgIx3IHeQbLUxoNyE7E+Sdo=", + "hash": "sha256-UA/pf35eWFArRM+QdN6i6LK0ePWzXEsviHlf3WUgMoM=", "url": "https://chromium.googlesource.com/webm/libvpx.git", - "rev": "38a707faef72eeff89d669c553e7bfe9e08dba8f" + "rev": "424723dc025ce451dab9568239a46b18d0919b4d" }, "src/third_party/libwebm/source": { "fetcher": "fetchFromGitiles", @@ -533,9 +533,9 @@ }, "src/third_party/libwebp/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-79peh0y3eeiW5cVQqVq0mUgDcGZ9BlY+OXkPZylKARY=", + "hash": "sha256-Wa33opOFgcmYtycezDUt2f6PqZBse6xYB5kLuSaw95o=", "url": "https://chromium.googlesource.com/webm/libwebp.git", - "rev": "2af26267cdfcb63a88e5c74a85927a12d6ca1d76" + "rev": "ca332209cb5567c9b249c86788cb2dbf8847e760" }, "src/third_party/libyuv": { "fetcher": "fetchFromGitiles", @@ -581,9 +581,9 @@ }, "src/third_party/openscreen/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-rxNhfd/ujWtLWDjEbx/ZIo9tdILB1gD5q4cwxQ6DPnw=", + "hash": "sha256-TyZ/sZ0gnesWjKUnO2RVM2TTdpVIxsBWueHDgix0/wg=", "url": "https://chromium.googlesource.com/openscreen", - "rev": "934f2462ad01c407a596641dbc611df49e2017b4" + "rev": "971d6055e7b78c474e2e734e55a2991fbb7ab665" }, "src/third_party/openscreen/src/third_party/tinycbor/src": { "fetcher": "fetchFromGitiles", @@ -593,15 +593,15 @@ }, "src/third_party/pdfium": { "fetcher": "fetchFromGitiles", - "hash": "sha256-iVOmMH0h0mbHy9m0vy86SzS5Oeyhgd4CC26LgPws9P4=", + "hash": "sha256-U1cScrfKN0F+cy307RT2iwB6RYKeCNDRnkYxzamezoY=", "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "2e2cfb0399db35fbe2e3ef0be62559fe01837ec5" + "rev": "a3895af47f600e3f9677f31fa39e15bd01c18457" }, "src/third_party/perfetto": { "fetcher": "fetchFromGitiles", - "hash": "sha256-qv1fTy/0xUauutP0PFaCwPvr1qptfeB3iqNjHXPDKyc=", + "hash": "sha256-xLx+dnUysm+HS1esu2hAqBKg/GgTJK4SQu1ZINr2aYc=", "url": "https://android.googlesource.com/platform/external/perfetto.git", - "rev": "a3d4c1de9bcf2a0471ab183c45cf111efd29571e" + "rev": "7ce535ddfc62d30166f35a8ed0f121da5eb0437c" }, "src/third_party/pthreadpool/src": { "fetcher": "fetchFromGitiles", @@ -629,9 +629,9 @@ }, "src/third_party/re2/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-zrVjt229SfVipS05zF5glhd7/D1zpojDyiSnYZpGok4=", + "hash": "sha256-m3bJlSyyhmj/7jvy7ExNX/gol7yeu1mnmyAc8u8Pr8s=", "url": "https://chromium.googlesource.com/external/github.com/google/re2.git", - "rev": "26f7d889e1f7e75e95e65490086538edf9f5275c" + "rev": "3d9bdbd0e208d3274a1cb1275c94d8b7626ddde2" }, "src/third_party/ruy/src": { "fetcher": "fetchFromGitiles", @@ -641,9 +641,9 @@ }, "src/third_party/skia": { "fetcher": "fetchFromGitiles", - "hash": "sha256-qHJujO+LYJ41zmoP2xSYRd9K8vLp4bCztYcMO8MI9Lo=", + "hash": "sha256-CvoJxsBN1Nyh+RPgU+aptZW5WsfGB4hmSlhyma1wO+E=", "url": "https://skia.googlesource.com/skia.git", - "rev": "ab212df482c8fd5b1c1fb302717876d542549624" + "rev": "349c1179c43ef46f2804404952b9460dc007d76a" }, "src/third_party/smhasher/src": { "fetcher": "fetchFromGitiles", @@ -659,15 +659,15 @@ }, "src/third_party/sqlite/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-35rSG+ptFMC62FsprLvAqfXZknKu40Ee6H2qpAcA3wI=", + "hash": "sha256-A3GAYf2hVZqQtEQdbVqP0I0Wh29DPHPf+JhxNLnTQh8=", "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git", - "rev": "b7e480172bb2411f9afedefdcc69a57a12f18b7b" + "rev": "ca75d938c18c99dc33b769fbdac8fc4c71befa33" }, "src/third_party/swiftshader": { "fetcher": "fetchFromGitiles", - "hash": "sha256-r7u2WjgPvoVY9Oj2RVqfI/G6PFh/2gWNDVQ5R2qhtLU=", + "hash": "sha256-Im4sdDo4b96YQIKDcAmqUk8PiJzejZgSDPur3hqPPRk=", "url": "https://swiftshader.googlesource.com/SwiftShader.git", - "rev": "7f4d495c89c200c1945cce5995d348dd41dadb5a" + "rev": "d9ec9befba05a8dfca09c1e88f3f7be0e4b153c6" }, "src/third_party/text-fragments-polyfill/src": { "fetcher": "fetchFromGitiles", @@ -677,75 +677,75 @@ }, "src/third_party/tflite/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-Mpofo5P6WrkA3hN+sjAhHG4GBQ71vEFnuxfdLRf5epw=", + "hash": "sha256-119/isDtopnj6MBRr3bzBvIppXw8M/ejcPx0CmIjXZU=", "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git", - "rev": "edf7215123c67d76199d099779137b974b6e1293" + "rev": "21e56c30e480ac67bed48335a5d122c59a6a6805" }, "src/third_party/vulkan-deps": { "fetcher": "fetchFromGitiles", - "hash": "sha256-uJFrlLEjFJJSR0+eCtx7bpIC0z8NaHuk/uLeaFBLKKw=", + "hash": "sha256-lqCUx70IeHZ7YfE9DXia7dFok/JsFu/HSIv2AGi37YI=", "url": "https://chromium.googlesource.com/vulkan-deps", - "rev": "7413048934e28b97ae00c37c419e576db8add866" + "rev": "2b783ed328d3a46e6a7a21218ced6b4dd1684114" }, "src/third_party/vulkan-deps/glslang/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-CBA9LlD+Ttki3nc693MSmud0feafxi2/PC2YSn3BX2A=", + "hash": "sha256-+Qs+Q3p11y9oUKyWEbuaQ0vx6hppFZSFbFuU0ve6rRo=", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang", - "rev": "b0ed4788858157e271779a7726cccc1149a05407" + "rev": "ebb0a8b28e5ea7a13146a24b3ad87b1966dbdfa3" }, "src/third_party/vulkan-deps/spirv-cross/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-Wgpdjmes05dMeBr7mrv9UvpabdzJ9lTZ38eO/6Ps60E=", + "hash": "sha256-UIk5hihUPjXNzEeO2laS4dUef/rEExxXAZjMcftx+3A=", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross", - "rev": "37fee00a71b5a47247c1cf20256a3f794537c6c0" + "rev": "2de1265fca722929785d9acdec4ab728c47a0254" }, "src/third_party/vulkan-deps/spirv-headers/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-yAzbZHLtx+XP34Umkp0CuP/vn7JrW4VPVgVOFi50KHM=", + "hash": "sha256-JLFVzFNdXqxyKmg3NymIqqZmf2GAb7tYetQ6HJPsUIQ=", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers", - "rev": "79743b899fde5c954897b2694291002626358fac" + "rev": "88bc5e321c2839707df8b1ab534e243e00744177" }, "src/third_party/vulkan-deps/spirv-tools/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-/J1eb6ZYSoYZDE8AR/CeRc5GoQEyIlYiHC+JKvi5I5w=", + "hash": "sha256-+HUDsp0COKlPtKidOVvUk7lN1AiFw01i5ANc3MO+qjs=", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools", - "rev": "1bc0e6f59abc3c9cd75f93baef47e9612a448045" + "rev": "5084f58e5d187b16f84d2af936ff94ea2f46a00c" }, "src/third_party/vulkan-deps/vulkan-headers/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-GAl5xC7PCGsVHHUhLkIuwj2zlTCgyNWaBjk6I0qDkhQ=", + "hash": "sha256-UlaNc1NxTYulrF4Ol0rLysbLwbFR46Evq7WkWncPB8k=", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers", - "rev": "7e691380166fb1cd9b193ac9db896bc23a4ea9ad" + "rev": "f4bfcd885214675a6a0d7d4df07f52b511e6ea16" }, "src/third_party/vulkan-deps/vulkan-loader/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-6iJxI1SwOjN26dyVs6JSYWODZbA25G/M2ZabGLCGRIo=", + "hash": "sha256-GbVr8LmwC6r7a13++5cYJXAq+H4P07quEHpTUV1qfqA=", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader", - "rev": "9e33cfc66f88c863e9a13492b8045ca28118ebbf" + "rev": "7b7d15bc9f1d782e4d6ea34e61fd9a36a7952208" }, "src/third_party/vulkan-deps/vulkan-tools/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-r2VdG1o2JXbtN14nGjeZ+Ru4Cn1Za/eQd3NU2O6CnkA=", + "hash": "sha256-vnrhYM7tcDTcXH4A+2leio5Wc1+b5H+7CQISEI+SPV8=", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools", - "rev": "3a19c1973f0e4732b8f3746593aee2ac425ecb78" + "rev": "f7017f23337b90a2b2ceb65a4e1050e8ad89e065" }, "src/third_party/vulkan-deps/vulkan-utility-libraries/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-Zz8r7zHe3MaEzMIyVx6Walsd5QicQ3MxEAunmgWHZcI=", + "hash": "sha256-buxOdupK/w1sFGGHrEI+On2/mR0q5whvQNKUI8dxJ60=", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries", - "rev": "2169a0849e3df4e2133b728dec67d3b16bd30263" + "rev": "dcfce25b439a2785f2c90b184e1964898070b4f1" }, "src/third_party/vulkan-deps/vulkan-validation-layers/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-AUeSb7/sgTZGg/VEkdvGDnj88gqjE1t6qGY0oTAcYsY=", + "hash": "sha256-LJd7pkcFd8k4npEv8mJy+47xo/5CXMN75ZAtDp+v6FI=", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers", - "rev": "d82e3c2f34dcf3b849fd7ed6d932ff61dcd838c5" + "rev": "281e1c1c6b51bb6b33f88c18ed4da58ac3024311" }, "src/third_party/vulkan_memory_allocator": { "fetcher": "fetchFromGitiles", - "hash": "sha256-FdRPPdLZHj3RX3YzcmF58JJuIqeWQV3TDiiXPEW2lsc=", + "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ=", "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git", - "rev": "e87036508bb156f9986ea959323de1869e328f58" + "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21" }, "src/third_party/wayland/src": { "fetcher": "fetchFromGitiles", @@ -785,15 +785,15 @@ }, "src/third_party/webgpu-cts/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-vkwuibUzHacAh5x/g05cGR+UohZmcATysnnFfldM2zA=", + "hash": "sha256-E39f0wy72TwQ9IM4QquqWxwDiHZOUI8hWkx2QDFcRog=", "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git", - "rev": "609645eb5b272668cbfb120d1aa9549eee86e02d" + "rev": "3dbe4ce12983ccc1ad42e228057c7d8adc17cb78" }, "src/third_party/webrtc": { "fetcher": "fetchFromGitiles", - "hash": "sha256-uRRtsEVMn85RfFgo1qzYnwA1eN6LvXRme+FUntvCuYA=", + "hash": "sha256-lhZ6m00IJ7YEhZ2/nyO70aByVk7RBHUpDsKDVOMoVA8=", "url": "https://webrtc.googlesource.com/src.git", - "rev": "71e3fbf5d750e84d181315a663eb5dbc29a5330c" + "rev": "b0cc68e61205fd11a7256a6e85307ec17ad95790" }, "src/third_party/wuffs/src": { "fetcher": "fetchFromGitiles", @@ -809,9 +809,9 @@ }, "src/third_party/xdg-utils": { "fetcher": "fetchFromGitiles", - "hash": "sha256-t3uV9JkkQQIwmezzSoEdTMLSizZdLQB7eLKTRQGH4kQ=", + "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=", "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git", - "rev": "d80274d5869b17b8c9067a1022e4416ee7ed5e0d" + "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44" }, "src/third_party/xnnpack/src": { "fetcher": "fetchFromGitiles", @@ -833,9 +833,9 @@ }, "src/v8": { "fetcher": "fetchFromGitiles", - "hash": "sha256-qP5gRxEEKV+I3Q6wk0H94OTnKVAieo9SJZGLB9Ti5qw=", + "hash": "sha256-HoatrWRElaZ47jtenPz0PzMh0ixBAwbMzL3vj0sw+HE=", "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "f6ebdead2b58e457b923c8121a9267a5d80f59cf" + "rev": "5eefc590c868d8dfb411e53053c963fe42dcda74" }, "src/third_party/nan": { "fetcher": "fetchFromGitHub", @@ -846,10 +846,10 @@ }, "src/third_party/electron_node": { "fetcher": "fetchFromGitHub", - "hash": "sha256-feGhB6o14/qgSQvhJ5eMD74KqWrlOoTpaGAlCs486IU=", + "hash": "sha256-yvMU6dXRzHP7l6axo3g4svJ1H2edtFvX2MVMm3K1bEc=", "owner": "nodejs", "repo": "node", - "rev": "v18.18.0" + "rev": "v18.18.2" }, "src/third_party/squirrel.mac": { "fetcher": "fetchFromGitHub", @@ -873,38 +873,38 @@ "rev": "78d3966b3c331292ea29ec38661b25df0a245948" } }, - "version": "28.0.0-alpha.3", + "version": "28.0.0", "modules": "119", - "chrome": "119.0.6045.21", - "node": "18.18.0", + "chrome": "120.0.6099.56", + "node": "18.18.2", "chromium": { - "version": "119.0.6045.21", + "version": "120.0.6099.56", "deps": { "gn": { - "version": "2023-09-12", + "version": "2023-10-23", "url": "https://gn.googlesource.com/gn", - "rev": "991530ce394efb58fcd848195469022fa17ae126", - "hash": "sha256-4jWqtsOBh96xbYk1m06G9hj2eQwW6buUXsxWsa5W6/4=" + "rev": "e4702d7409069c4f12d45ea7b7f0890717ca3f4b", + "hash": "sha256-dwluGOfq05swtBM5gg4a6gY3IpFHaKKkD0TV1XW7c7k=" } } }, - "electron_yarn_hash": "1akq5cxcy7fpn4m5qk5kx94vy30z0ybx6ka5qp8an0p33yx9wg8z", - "chromium_npm_hash": "sha256-10OGEsA0BDrkbTeIbdXLYRyKNwVsb/tP2ryBBuhi+m8=" + "electron_yarn_hash": "0n64fi2s97ly7kl0f8922sgavdm6qh24ms3qwf21663a1igdd4jn", + "chromium_npm_hash": "sha256-zexxXAAJDnhMmh7HfBO1V1z1Yds06C3gSpXacsbjUb4=" }, "27": { "deps": { "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-UIOHCvqMXuCCrduDo6tnxc6qJuHw2LX4Kgmiu/geiR8=", + "hash": "sha256-L43N0jGO8fREAAgSlLuwphq+pyI3Ozpan0phqTMCb58=", "owner": "electron", "repo": "electron", - "rev": "v27.0.0" + "rev": "v27.1.3" }, "src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-dT23fhZ9RDY2j7YChaK/hUePkHULTXoXyHNpldmh4Gw=", + "hash": "sha256-3yFHjd3LMXVbF4LX6Bi3yJF0CDVug0cDpGFbP8Ibvk4=", "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "118.0.5993.54", + "rev": "118.0.5993.159", "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; " }, "src/third_party/clang-format/script": { @@ -1011,9 +1011,9 @@ }, "src/third_party/dawn": { "fetcher": "fetchFromGitiles", - "hash": "sha256-iCCvQVwf+MLZR6Zz/ML7H9uQ0FiSSCw1gZZeGC6zRLo=", + "hash": "sha256-7iCJ1h51S/8pxQRMoDtGXzyuP6Dzxnc/1Cu4ALU8NYg=", "url": "https://dawn.googlesource.com/dawn.git", - "rev": "ec2cc40563739fa6e6ff0e12c58ac0fdbe0a132f" + "rev": "deb3b674b26854204c8082ed93926207e42d3cf2" }, "src/third_party/dawn/third_party/glfw": { "fetcher": "fetchFromGitiles", @@ -1269,9 +1269,9 @@ }, "src/third_party/icu": { "fetcher": "fetchFromGitiles", - "hash": "sha256-6do7X9xUCMe2mFQoffazdC5W9UJdHp424QEThqX6P48=", + "hash": "sha256-9yFRBrHdWcYgrZAaigS8XnxNsqJNklGdFkAAgVdHXFU=", "url": "https://chromium.googlesource.com/chromium/deps/icu.git", - "rev": "985b9a6f70e13f3db741fed121e4dcc3046ad494" + "rev": "a622de35ac311c5ad390a7af80724634e5dc61ed" }, "src/third_party/jsoncpp/source": { "fetcher": "fetchFromGitiles", @@ -1311,9 +1311,9 @@ }, "src/third_party/libavif/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-3zNhKl8REWsRlblXIFD7zn7qvrc/pa4wHZI0oEc3pKE=", + "hash": "sha256-KfRRGTS8kBwi9Z9wafpSwL29RU38THG2xBCvNBXtZtg=", "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git", - "rev": "d1c26facaf5a8a97919ceee06814d05d10e25622" + "rev": "b2d36b1c3bfc806694cd4ff0cb188270823fe6d8" }, "src/third_party/libavifinfo/src": { "fetcher": "fetchFromGitiles", @@ -1473,9 +1473,9 @@ }, "src/third_party/openscreen/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-CtCGOoKbbyUGUHfqd7n3uPlv9GEExuYgMTCIaU+ypOA=", + "hash": "sha256-TyZ/sZ0gnesWjKUnO2RVM2TTdpVIxsBWueHDgix0/wg=", "url": "https://chromium.googlesource.com/openscreen", - "rev": "fd0e81e558086c30fa91a4af89361cef8d1327e4" + "rev": "971d6055e7b78c474e2e734e55a2991fbb7ab665" }, "src/third_party/openscreen/src/third_party/tinycbor/src": { "fetcher": "fetchFromGitiles", @@ -1485,9 +1485,9 @@ }, "src/third_party/pdfium": { "fetcher": "fetchFromGitiles", - "hash": "sha256-9qxj8TgFVf64aFTx/DwkUVa41682OSfVnBj9eubMafs=", + "hash": "sha256-u+El2jEnvlcQs5j5TthpKj8s255n2AhJPW+Q/s0Ljm0=", "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "d7470394271b6a6856e28ec905b19a12100f2797" + "rev": "6e55da0c45788fdc22fa3aab7ead414fc42b74c1" }, "src/third_party/perfetto": { "fetcher": "fetchFromGitiles", @@ -1533,9 +1533,9 @@ }, "src/third_party/skia": { "fetcher": "fetchFromGitiles", - "hash": "sha256-6JN+orZM77HNPDQ9VlZws1Zq8GuwDI83eXXauKknOTc=", + "hash": "sha256-Ck15ddYoo8pVLHcwW5P8Ei1sBQf23EGd/ySGOVSWAFQ=", "url": "https://skia.googlesource.com/skia.git", - "rev": "bd56a010b6941116cd1900276bf5201f9a9c73da" + "rev": "b4f0c1163c955e42489f62d842585720cf0df0ea" }, "src/third_party/smhasher/src": { "fetcher": "fetchFromGitiles", @@ -1725,9 +1725,9 @@ }, "src/v8": { "fetcher": "fetchFromGitiles", - "hash": "sha256-+y24A6/c4tl4zu1GcxsiEWvAMMCsat7X0jl2XCmBX6g=", + "hash": "sha256-Fn4HoS7O2J3nGXFyq7r7AheRQzKy80USTQnNnC4rWqM=", "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "6b05d242aae3392bef6b86fbe44428126607b3d0" + "rev": "36e4828ab658b8ad72f80974883c4c94f6e7012c" }, "src/third_party/nan": { "fetcher": "fetchFromGitHub", @@ -1765,12 +1765,12 @@ "rev": "78d3966b3c331292ea29ec38661b25df0a245948" } }, - "version": "27.0.0", + "version": "27.1.3", "modules": "118", - "chrome": "118.0.5993.54", + "chrome": "118.0.5993.159", "node": "18.17.1", "chromium": { - "version": "118.0.5993.54", + "version": "118.0.5993.159", "deps": { "gn": { "version": "2023-08-10", @@ -1780,17 +1780,17 @@ } } }, - "electron_yarn_hash": "039zdwb38982h6qinhipja8abza33ihihb4i5fadpsgh0cl7ldsy", - "chromium_npm_hash": "sha256-5cjqpYB45nw2gop54VP+tL7/0w63nQGfQ4x6a6KS7XQ=" + "chromium_npm_hash": "sha256-5cjqpYB45nw2gop54VP+tL7/0w63nQGfQ4x6a6KS7XQ=", + "electron_yarn_hash": "1rxijv3fspjfan7mmw4cmxcb231ny7gn72yzsdnqs0225alrjac0" }, "26": { "deps": { "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-sEhO5qSm4etyWEurTGSKtJcheG+JJkC78Fhl3c5WBOE=", + "hash": "sha256-jvNttIRouxQAfH4n+0xxj57Bc3LCo36B66SGwEfz0jM=", "owner": "electron", "repo": "electron", - "rev": "v26.4.0" + "rev": "v26.6.2" }, "src": { "fetcher": "fetchFromGitiles", @@ -2609,7 +2609,7 @@ "rev": "78d3966b3c331292ea29ec38661b25df0a245948" } }, - "version": "26.4.0", + "version": "26.6.2", "modules": "116", "chrome": "116.0.5845.228", "node": "18.16.1", @@ -2624,827 +2624,7 @@ } } }, - "electron_yarn_hash": "05wkb1m0yjbai4153y49kwr1v2lj14fg75aqlvmmrhf3bxp9lg5g", - "chromium_npm_hash": "sha256-5cjqpYB45nw2gop54VP+tL7/0w63nQGfQ4x6a6KS7XQ=" - }, - "25": { - "deps": { - "src/electron": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-Yo/ZvOLOPIktV5gzZK80LKVZb3xMXrzGkdQw9u4djoI=", - "owner": "electron", - "repo": "electron", - "rev": "v25.9.1" - }, - "src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-nh8LrBKsfW6K/scG1GPUyp/tYiXOxZkmjtuTyAXC4zI=", - "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "114.0.5735.289", - "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; " - }, - "src/buildtools/clang_format/script": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-IL6ReGM6+urkXfGYe1BBOv+0XgCZv5i3Lib1q9COhig=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git", - "rev": "f97059df7f8b205064625cdb5f97b56668a125ef" - }, - "src/buildtools/third_party/libc++/trunk": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-i/FGU9F7HlGJJuwoFMV4V05pf4pvsqNxrPBN223YjZQ=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git", - "rev": "bff81b702ff4b7f74b1c0ed02a4bcf6c2744a90b" - }, - "src/buildtools/third_party/libc++abi/trunk": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Zka8AHFtHA4AC/Pbzc3pVqz/k2GYZYc8CeP1IXxGBUM=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git", - "rev": "307bd163607c315d46103ebe1d68aab44bf93986" - }, - "src/buildtools/third_party/libunwind/trunk": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-u6FMD83JBBusQuWU7Hx5HREvLIFWUA4iN4If8poaHbE=", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git", - "rev": "2795322d57001de8125cfdf18cef804acff69e35" - }, - "src/chrome/test/data/perf/canvas_bench": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=", - "url": "https://chromium.googlesource.com/chromium/canvas_bench.git", - "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732" - }, - "src/chrome/test/data/perf/frame_rate/content": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=", - "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git", - "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9" - }, - "src/chrome/test/data/xr/webvr_info": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=", - "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git", - "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248" - }, - "src/docs/website": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-0rI5HUWxfNU0mrWJ4ndzL1gnn4E67UVPFpqkEpQjgW0=", - "url": "https://chromium.googlesource.com/website.git", - "rev": "40cfbbdee67c7010ae103011fe5797858e692a79" - }, - "src/media/cdm/api": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=", - "url": "https://chromium.googlesource.com/chromium/cdm.git", - "rev": "fef0b5aa1bd31efb88dfab804bdbe614f3d54f28" - }, - "src/net/third_party/quiche/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-dUSUlZR7svBw35TX/ywZaa1Ko/yTeV/gE+GudhX981E=", - "url": "https://quiche.googlesource.com/quiche.git", - "rev": "02c69dd28eef7ef2618782e8d54d53c14ae64382" - }, - "src/third_party/angle": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-EpR25A5wDGnhK9EI2eSx8OsLtA4YvtDREi6x8ZfIVsM=", - "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "ce590bee825a18785f86d096f2c7be06428ccf88" - }, - "src/third_party/angle/third_party/glmark2/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-L7+zWM0qn8WFhmON7DGvarTsN1YHt1sn5+hazTOZrrk=", - "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", - "rev": "ca8de51fedb70bace5351c6b002eb952c747e889" - }, - "src/third_party/angle/third_party/rapidjson/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=", - "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson", - "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f" - }, - "src/third_party/angle/third_party/VK-GL-CTS/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-XcaAnz36QOg+A5XcyGg0Z9dLFjsDSUa0GzZpEuQYMTg=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS", - "rev": "e3b9db9ad121f46b7943d0152a25d5ee9afaa13c" - }, - "src/third_party/content_analysis_sdk/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-p4N3zAUoM/ApBlYvLsCcH9QLArz7T4+miDGVuTbrZEc=", - "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git", - "rev": "b8744f00646d175057f0be7443c7c72a311b5381" - }, - "src/third_party/dav1d/libdav1d": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-FivzwqCvlY89q2znGvfNks+hje/iUFHcKPb19FyAZhM=", - "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git", - "rev": "d426d1c91075b9c552b12dd052af1cd0368f05a2" - }, - "src/third_party/dawn": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-HoLI1IlG+ThNERz6xr1doIzNhPWNcZabiyPEn15kvoM=", - "url": "https://dawn.googlesource.com/dawn.git", - "rev": "bf86a1c8d463d7b9a556b10a80d17990d413831c" - }, - "src/third_party/dawn/third_party/glfw": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-TwAPRjQxIz3J+zbNxzCp5Tek7MwisxdekMpY5QGsKyg=", - "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", - "rev": "62e175ef9fae75335575964c845a302447c012c7" - }, - "src/third_party/dawn/third_party/webgpu-cts": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-+FRGgJSs7sVEZ6B6PZPxmXvmsKtt/sC/ZAjw+NdOwPQ=", - "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts", - "rev": "c7d833badcd37dc46a999ebeebbbde1368ff15b5" - }, - "src/third_party/highway/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-kNb9UVcFq2BIf9nftUgN8ciFFCzRCou/sLwVf08jf3E=", - "url": "https://chromium.googlesource.com/external/github.com/google/highway.git", - "rev": "8f20644eca693cfb74aa795b0006b6779c370e7a" - }, - "src/third_party/google_benchmark/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-h2ryAQAuHI54Cni88L85e7Np4KATGVTRdDcmUvCNeWc=", - "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git", - "rev": "b177433f3ee2513b1075140c723d73ab8901790f" - }, - "src/third_party/boringssl/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-oeV7oMNpPbQyi5RiRJm/KAVmO7JZ1QRdYoNgFXh7Snc=", - "url": "https://boringssl.googlesource.com/boringssl.git", - "rev": "4b6d950d8921d6dd5365de0797fcc97302b9561b" - }, - "src/third_party/breakpad/breakpad": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-+3Y4jCpcZ/++1Etpu/ZNuJvtTEX/Xn4HNfmx4nzcTtA=", - "url": "https://chromium.googlesource.com/breakpad/breakpad.git", - "rev": "bfde407de559c10d6cef861b3873ff287c24e761" - }, - "src/third_party/cast_core/public/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-pyjxQQYnsASHV2SxwZeIqkZJSpTrqyGg7Uee/GRp9VU=", - "url": "https://chromium.googlesource.com/cast_core/public", - "rev": "e42ef68aa05ac0c163805f60b9b19284f3c2dee3" - }, - "src/third_party/catapult": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-vK7rlGshfzPzaEdAxlP5vQ4USR/fC3BzPCh/rn0aAf4=", - "url": "https://chromium.googlesource.com/catapult.git", - "rev": "cae7ec667dee9f5c012b54ee9ffee94eb7beda14" - }, - "src/third_party/ced/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=", - "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git", - "rev": "ba412eaaacd3186085babcd901679a48863c7dd5" - }, - "src/third_party/cld_3/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=", - "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git", - "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661" - }, - "src/third_party/colorama/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=", - "url": "https://chromium.googlesource.com/external/colorama.git", - "rev": "3de9f013df4b470069d03d250224062e8cf15c49" - }, - "src/third_party/cpuinfo/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-ZXsJVhqyeH/9dN0/1Cq0TCjmzwmsePX9YyuuaI9+puI=", - "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git", - "rev": "beb46ca0319882f262e682dd596880c92830687f" - }, - "src/third_party/crc32c/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-urg0bmnfMfHagLPELp4WrNCz1gBZ6DFOWpDue1KsMtc=", - "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git", - "rev": "fa5ade41ee480003d9c5af6f43567ba22e4e17e6" - }, - "src/third_party/cros_system_api": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-0tnidX0O+jn1xbJMuSPsGPqwZBCKmfjWZY3aQdjM1gE=", - "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git", - "rev": "73d6b816cacd86b886b4cc1e60f12ac1960f1d90" - }, - "src/third_party/crossbench": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-IM81ppJX/ib//P2ESbQXMSL+BiOSVKbdXZdcMsq4xn0=", - "url": "https://chromium.googlesource.com/crossbench.git", - "rev": "cdc33384bfa900dfec28e6cf7b5f22cd7ff2c92f" - }, - "src/third_party/depot_tools": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-7jPow77ejToE55KvQ7/eO0alMdMHcypfSyPceFAbZkw=", - "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git", - "rev": "6e714e6dfe62110c95fafed4bdeb365a69c6a77e" - }, - "src/third_party/devtools-frontend/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-jDE3eGkpcJYE5lt/dpIpKa6me3ZZnfY/9boL/YBnHoc=", - "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "3f60fe50e4790d1154659b9628e811bbcdf1aa4f" - }, - "src/third_party/dom_distiller_js/dist": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=", - "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", - "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d" - }, - "src/third_party/eigen3/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Jf8sFjSMuXeiXm53srR2HahbBXszLOawdYk5H1UrK4c=", - "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git", - "rev": "554fe02ae3f3fbc2fd320c26a522f1e59b2d6342" - }, - "src/third_party/farmhash/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=", - "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git", - "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45" - }, - "src/third_party/ffmpeg": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-UjrZJBtOQiiqxtLb8x24axord3OFvyCcRcgDwiYE/jw=", - "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git", - "rev": "8d21d41d8bec5c0b266ee305d1a708dc5c23b594" - }, - "src/third_party/flac": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=", - "url": "https://chromium.googlesource.com/chromium/deps/flac.git", - "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c" - }, - "src/third_party/flatbuffers/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-OQ8E+i30WRz/lPJmVDiF7+TPo4gZVu2Of9loxz3tswI=", - "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git", - "rev": "a56f9ec50e908362e20254fcef28e62a2f148d91" - }, - "src/third_party/fontconfig/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-0R+FEhtGXFiQWHEPRrJqaBW1JVfCojYI4NPDvYMBhoU=", - "url": "https://chromium.googlesource.com/external/fontconfig.git", - "rev": "06929a556fdc39c8fe12965b69070c8df520a33e" - }, - "src/third_party/fp16/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git", - "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91" - }, - "src/third_party/gemmlowp/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=", - "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git", - "rev": "13d57703abca3005d97b19df1f2db731607a7dc2" - }, - "src/third_party/grpc/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=", - "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git", - "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737" - }, - "src/third_party/freetype/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-qJBw5ocv4+2Xx8bU47QK8sw9Sl636iI+16cbaSNatHU=", - "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git", - "rev": "0a3836c97d5e84d6721ac0fd2839e8ae1b7be8d9" - }, - "src/third_party/freetype-testing/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A=", - "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git", - "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f" - }, - "src/third_party/fxdiv/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git", - "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8" - }, - "src/third_party/harfbuzz-ng/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-WaR7U7PeHIffa+ZG85QG7pii/dLOI4+23xK0/hUf1ok=", - "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", - "rev": "2175f5d050743317c563ec9414e0f83a47f7fbc4" - }, - "src/third_party/emoji-segmenter/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-oT9mAKoKnrsFsBAeTRfPOXM76HRQQabFAlPpfKUGFhs=", - "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git", - "rev": "9ba6d25d0d9313569665d4a9d2b34f0f39f9a50e" - }, - "src/third_party/ots/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=", - "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git", - "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33" - }, - "src/third_party/libgav1/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-DY2BBK+bH1lGZNEl3rMDsPb7Z52YMIQy/3N0achugE0=", - "url": "https://chromium.googlesource.com/codecs/libgav1.git", - "rev": "cd53f7c0d6a1c005e38874d143c8876d375bae70" - }, - "src/third_party/googletest/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-VYRjcM3dDY2FarviXyFMgSkXCqKfWXwtGAj2Msgm7zg=", - "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git", - "rev": "af29db7ec28d6df1c7f0f745186884091e602e07" - }, - "src/third_party/hunspell_dictionaries": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=", - "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git", - "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e" - }, - "src/third_party/icu": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-47Xxb5IFbRmdO3oADjn13fm7aIYFXh2R4YVZIJAy22U=", - "url": "https://chromium.googlesource.com/chromium/deps/icu.git", - "rev": "d8daa943f64cd5dd2a55e9baf2e655ab4bfa5ae9" - }, - "src/third_party/jsoncpp/source": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=", - "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git", - "rev": "42e892d96e47b1f6e29844cc705e148ec4856448" - }, - "src/third_party/leveldatabase/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-TTX2FrmcWsgqrh4uzqMyGnnnG51cVC2ILfdLxD65MLY=", - "url": "https://chromium.googlesource.com/external/leveldb.git", - "rev": "068d5ee1a3ac40dabd00d211d5013af44be55bea" - }, - "src/third_party/libFuzzer/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-HG3KHhKQnr4hdnUK/2QhcxRdNxh38fhU54JKKzqZaio=", - "url": "https://chromium.googlesource.com/chromium/llvm-project/compiler-rt/lib/fuzzer.git", - "rev": "debe7d2d1982e540fbd6bd78604bf001753f9e74" - }, - "src/third_party/centipede/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-yFZOn/Ga+D/b/1TwuOZdO/H4/GuX/HRB18rgYg7+rmE=", - "url": "https://chromium.googlesource.com/external/github.com/google/centipede.git", - "rev": "a5a9071410e6e8134855b88461d0eb2c77d48cdd" - }, - "src/third_party/libaddressinput/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ=", - "url": "https://chromium.googlesource.com/external/libaddressinput.git", - "rev": "e8712e415627f22d0b00ebee8db99547077f39bd" - }, - "src/third_party/libaom/source/libaom": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-j8b0xM7hHNqYIeUQjf+c7LyzcfZVJx64Xqo9gIRtsYU=", - "url": "https://aomedia.googlesource.com/aom.git", - "rev": "5a0903824082f41123e8365b5b99ddb6ced8971c" - }, - "src/third_party/libavif/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-3Oe8ouucu2eHpXov3WchwKQIqjhzuSFfNZ7ChEkQiTE=", - "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git", - "rev": "1af8cea3d1b3a05ecbcb0e39d99a7f0183e6ce13" - }, - "src/third_party/nearby/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-GfxGDSh2qkjIGgXgwH0xWAnjswOmGEVaXlci+tZS53g=", - "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git", - "rev": "37000006c224476104276bf74038d60967593814" - }, - "src/third_party/securemessage/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=", - "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git", - "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84" - }, - "src/third_party/ukey2/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=", - "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git", - "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47" - }, - "src/third_party/cros-components/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-HgBDDfYvxYtHPfWlAs4aFCzDyhdcWnSP9nvCl8/UDfU=", - "url": "https://chromium.googlesource.com/external/google3/cros_components.git", - "rev": "0971e0c09f748dd476089b0e5136fe0b84e0bb4c" - }, - "src/third_party/libdrm/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-ML89TBKDPHOd0YOVBmvLac+tyqgA5khDFK5vq4CCru8=", - "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git", - "rev": "b9ca37b3134861048986b75896c0915cbf2e97f9" - }, - "src/third_party/expat/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-FXTDGAK03jc2wvazhRKqtsFRKZUYS/9HLpZNp4JfZJI=", - "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git", - "rev": "441f98d02deafd9b090aea568282b28f66a50e36" - }, - "src/third_party/libipp/libipp": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=", - "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git", - "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f" - }, - "src/third_party/libjpeg_turbo": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-QnXMR9qqRiYfV1sUJvKVvLQ9A022lYKbsrI9HOU9LCs=", - "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git", - "rev": "aa4075f116e4312537d0d3e9dbd5e31096539f94" - }, - "src/third_party/liblouis/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=", - "url": "https://chromium.googlesource.com/external/liblouis-github.git", - "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376" - }, - "src/third_party/libphonenumber/dist": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo=", - "url": "https://chromium.googlesource.com/external/libphonenumber.git", - "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362" - }, - "src/third_party/libprotobuf-mutator/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614=", - "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git", - "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf" - }, - "src/third_party/libsrtp": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-pfLFh2JGk/g0ZZxBKTaYW9/PBpkCm0rtJeyNePUMTTc=", - "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git", - "rev": "5b7c744eb8310250ccc534f3f86a2015b3887a0a" - }, - "src/third_party/libsync/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=", - "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git", - "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6" - }, - "src/third_party/libvpx/source/libvpx": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-hIXEvCqbeMShGL1hCpJAMPbpuVfFM6Z4z5DPR3kfwb4=", - "url": "https://chromium.googlesource.com/webm/libvpx.git", - "rev": "27171320f5e36f7b18071bfa1d9616863ca1b4e8" - }, - "src/third_party/libwebm/source": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-u/5nkJed0DzdhR5OLL2kIhZhOnrbyzL1Kx37vV/jcEo=", - "url": "https://chromium.googlesource.com/webm/libwebm.git", - "rev": "e4fbea0c9751ae8aa86629b197a28d8276a2b0da" - }, - "src/third_party/libwebp/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-zBMivj2tF5AWC+E/rHHEtxBel0i1YwGGBus+4h3PCYY=", - "url": "https://chromium.googlesource.com/webm/libwebp.git", - "rev": "fd7b5d48464475408d32d2611bdb6947d4246b97" - }, - "src/third_party/libyuv": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-LLmTW05GxoXgNkLRHp3e6gb7glMgJo1moc6lPLVHk6w=", - "url": "https://chromium.googlesource.com/libyuv/libyuv.git", - "rev": "77c2121f7e6b8e694d6e908bbbe9be24214097da" - }, - "src/third_party/lss": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=", - "url": "https://chromium.googlesource.com/linux-syscall-support.git", - "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521" - }, - "src/third_party/material_color_utilities/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Cv1TjvOcswhp60LXblrLwY5jrudqKuDUqs1c//x49YE=", - "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git", - "rev": "bd6537fb1c4aa2164d97f96e78a9c826e360a0ed" - }, - "src/third_party/minigbm/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=", - "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git", - "rev": "3018207f4d89395cc271278fb9a6558b660885f5" - }, - "src/third_party/nasm": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-L+b3X3vsfpY6FSlIK/AHhxhmq2cXd50vND6uT6yn8Qs=", - "url": "https://chromium.googlesource.com/chromium/deps/nasm.git", - "rev": "7fc833e889d1afda72c06220e5bed8fb43b2e5ce" - }, - "src/third_party/neon_2_sse/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-299ZptvdTmCnIuVVBkrpf5ZTxKPwgcGUob81tEI91F0=", - "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git", - "rev": "a15b489e1222b2087007546b4912e21293ea86ff" - }, - "src/third_party/openh264/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-J7Eqe2QevZh1xfap19W8AVCcwfRu7ztknnbKFJUAH1c=", - "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264", - "rev": "09a4f3ec842a8932341b195c5b01e141c8a16eb7" - }, - "src/third_party/openscreen/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-MSJbCxYEJmhUrBUobKBgUhPV5yMhxxtKgU4NE2h9mFs=", - "url": "https://chromium.googlesource.com/openscreen", - "rev": "0964c1e903264ae2c388fc0eda3309c22b46e1a2" - }, - "src/third_party/openscreen/src/third_party/tinycbor/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=", - "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git", - "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7" - }, - "src/third_party/pdfium": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-3FXPYcZZtfwzlkkakKczjoYbDURBA/QDCVdOn+98864=", - "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "9505810f66cc3dde86c30d072de53ca6fc8a45de" - }, - "src/third_party/perfetto": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-AJWzQUYiml374LUZyku0ZTEM+lXAKsjc1YbsLfCfMGo=", - "url": "https://android.googlesource.com/platform/external/perfetto.git", - "rev": "f2da6df2f144e41e1c1428f11e8b388eaf8a2209" - }, - "src/third_party/pthreadpool/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Pfvievhma1rOpbLdSrIX4KaZyRpdvrnjRzzPYl3fDQo=", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git", - "rev": "1787867f6183f056420e532eec640cba25efafea" - }, - "src/third_party/pyelftools": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=", - "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git", - "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae" - }, - "src/third_party/quic_trace/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=", - "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git", - "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc" - }, - "src/third_party/pywebsocket3/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=", - "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git", - "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2" - }, - "src/third_party/re2/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-9dMTr5VuQfteKK/xIqZUqLnGu26ZYlFUfZTZNgzKUN4=", - "url": "https://chromium.googlesource.com/external/github.com/google/re2.git", - "rev": "11073deb73b3d01018308863c0bcdfd0d51d3e70" - }, - "src/third_party/ruy/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Sv2rfq3ghddpcJHn7Z2FTXpwKdzgJOiSGu6HhV6nXIQ=", - "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git", - "rev": "363f252289fb7a1fba1703d99196524698cb884d" - }, - "src/third_party/skia": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-7kD6XLaeriWGXM69rCcqPoAkX0NAFOFhFX/SBm710cA=", - "url": "https://skia.googlesource.com/skia.git", - "rev": "ea1a1635fcf5b1f68b59cd3f8649a0abfab65cfd" - }, - "src/third_party/smhasher/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw=", - "url": "https://chromium.googlesource.com/external/smhasher.git", - "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f" - }, - "src/third_party/snappy/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0=", - "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git", - "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c" - }, - "src/third_party/sqlite/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-MO4fd5ROy8vtUeGYeWaMT6uO/zYUruPCPjHnZT9elcI=", - "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git", - "rev": "f6752b7ed1fe3cc1491c0c47ec5804ee2bd0e59b" - }, - "src/third_party/swiftshader": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-H2A42dNT1DgRknyL3lzHlWbxURskjTqzvqd097w4Tho=", - "url": "https://swiftshader.googlesource.com/SwiftShader.git", - "rev": "23e97b79fb9193bf88e79c16c6a577c680edb2d6" - }, - "src/third_party/text-fragments-polyfill/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=", - "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git", - "rev": "c036420683f672d685e27415de0a5f5e85bdc23f" - }, - "src/third_party/tflite/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-TdBBSPfUCIst1G6BixqcOx9dQiN6f1wmSRS9Gjh4K1U=", - "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git", - "rev": "ab14323eaf8522fa608fe047d99249bc844c47cd" - }, - "src/third_party/vulkan-deps": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-4Mwtu/Qmz0wAm8YCWYq9ogzKLg7nEwgka3+OFI/s+fs=", - "url": "https://chromium.googlesource.com/vulkan-deps", - "rev": "a52479099cf2862650df9dbc12e2e202e345901e" - }, - "src/third_party/vulkan-deps/glslang/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-UOJ4O1zRbW0qxj2oxSKSdvOwZOD907Q0flXxQjYavuQ=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang", - "rev": "9c7fd1a33e5cecbe465e1cd70170167d5e40d398" - }, - "src/third_party/vulkan-deps/spirv-cross/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-UmzXWpjwGgLijP+BumSK1OW+8OrtWjBXgIt4vzI8ZvQ=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross", - "rev": "fc9bee27f445644635e83ef111ef54944bb6e3af" - }, - "src/third_party/vulkan-deps/spirv-headers/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-a7OjEH3WczZa8VFvPGGh/J+8nmtYDf0eSUuxU20XSJI=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers", - "rev": "cfbe4feef20c3c0628712c2792624f0221e378ac" - }, - "src/third_party/vulkan-deps/spirv-tools/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-UfcBkLIDSEgKyEz11Tsf3FIM+R6ZboWmDVKR1xu6q6o=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools", - "rev": "25ad5e19f193429b737433d5f6151062ddbc1680" - }, - "src/third_party/vulkan-deps/vulkan-headers/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-bilEf59jBDgl5WUgOZpRSMkp33C/rssj37rdvHaxRGU=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers", - "rev": "8a397558c4d2a4bf9e64e900c45a7e65664c32b2" - }, - "src/third_party/vulkan-deps/vulkan-loader/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-gLNrvpBDnKOr03e5TKxMUVCQ70fI27x3MSLVjMkw2d8=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader", - "rev": "f035e57c171ce9009f2c47b5488a66c653843501" - }, - "src/third_party/vulkan-deps/vulkan-tools/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-VEBPgOGdrzQoIYU7BTioa6m/OH1TUGXGaF7FH5B/h2M=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools", - "rev": "df10a2759b4b60d59b735882217a749d8e5be660" - }, - "src/third_party/vulkan-deps/vulkan-validation-layers/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-JqLhqdqKX2n0ifLfS7ymOL2kcelUjdmsLKqmkqPwTQU=", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers", - "rev": "3d530f6921f7a9defa297eec25fcef77c9b96282" - }, - "src/third_party/vulkan_memory_allocator": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-rARuPHa/gEAOTM8/Fnob0bU0Jv+UKLiwe3o0UGWYlME=", - "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git", - "rev": "ebe84bec02c041d28f902da0214bf442743fc907" - }, - "src/third_party/wayland/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-fcZtJP/8Ck+9WyPvt3AhogwPae5+gAxdIaEMp7eSr44=", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git", - "rev": "c7473676b8abc682e820546287044cee3bca9147" - }, - "src/third_party/wayland-protocols/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-3QK+ZN6IFUFkDxySSoQwP1J3JnTlD7JPaUk6Tr/d/k4=", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git", - "rev": "4624cfaaf563cd7be5e2e2087c8de6d3a48ea867" - }, - "src/third_party/wayland-protocols/kde": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=", - "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git", - "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e" - }, - "src/third_party/wayland-protocols/gtk": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=", - "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git", - "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0" - }, - "src/third_party/webdriver/pylib": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=", - "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git", - "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04" - }, - "src/third_party/webgl/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-BRF0/WxbwxTby1o+zFHU42s7xYJUmcsgfu4DFX97jRU=", - "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git", - "rev": "d1b65aa5a88f6efd900604dfcda840154e9f16e2" - }, - "src/third_party/webgpu-cts/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-pSwkkIcfrWP6NKNFtHlyq2Z7zYqbKU6V/GXMqH6rYBs=", - "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git", - "rev": "7d2d22292ce5af280c8c5849ed7f0679d7ab70e9" - }, - "src/third_party/webrtc": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-J/XEHY4y9j4bg0+ORkDydVOvtncPLMN/9cy073lpMOM=", - "url": "https://webrtc.googlesource.com/src.git", - "rev": "151be743d4c83671565f9c1eada3f4a0b2e44dea" - }, - "src/third_party/wuffs/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-HP8Vf1C9DuA9H+busf3lFoF9SsYqviLKv0l73CxmNEI=", - "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", - "rev": "fe9d08f2b6e80af691bfb1a718e144c49a1b9eba" - }, - "src/third_party/weston/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-EKl6oIM8Vml9wtSIb9ExFIuuJohbU/rsG3JVS5thaUU=", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git", - "rev": "420cfd00f2de91de74bd9d4d8348e43c582d29f0" - }, - "src/third_party/xdg-utils": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-t3uV9JkkQQIwmezzSoEdTMLSizZdLQB7eLKTRQGH4kQ=", - "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git", - "rev": "d80274d5869b17b8c9067a1022e4416ee7ed5e0d" - }, - "src/third_party/xnnpack/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-vsn3lrog5affus0qxc4TK2Z/tdd/E6hBYeUQRWoDZPQ=", - "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git", - "rev": "b9d4073a6913891ce9cbd8965c8d506075d2a45a" - }, - "src/tools/page_cycler/acid3": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-+7Ynz7k/dWdd4Wo7Rjzvc8GY9gTsjzjG3GdNsuDKszY=", - "url": "https://chromium.googlesource.com/chromium/deps/acid3.git", - "rev": "6be0a66a1ebd7ebc5abc1b2f405a945f6d871521" - }, - "src/v8": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-pmam8TVqtxmfc0V1gy2R1jhW+dF2ybzeKbGZKAbJveY=", - "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "978934af4a291282d994fc184d5dc03a82deb5df" - }, - "src/third_party/nan": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-tur5CExvwuSmwqBwH9o8OZWzDuifRybjEb+4/tm6exk=", - "owner": "nodejs", - "repo": "nan", - "rev": "16fa32231e2ccd89d2804b3f765319128b20c4ac" - }, - "src/third_party/electron_node": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-XBm+WYXQ8DM1HU6NFciGSfkbHDXPbTyg0gScQCbbpQU=", - "owner": "nodejs", - "repo": "node", - "rev": "v18.15.0" - }, - "src/third_party/squirrel.mac": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=", - "owner": "Squirrel", - "repo": "Squirrel.Mac", - "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38" - }, - "src/third_party/squirrel.mac/vendor/ReactiveObjC": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=", - "owner": "ReactiveCocoa", - "repo": "ReactiveObjC", - "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76" - }, - "src/third_party/squirrel.mac/vendor/Mantle": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=", - "owner": "Mantle", - "repo": "Mantle", - "rev": "78d3966b3c331292ea29ec38661b25df0a245948" - } - }, - "version": "25.9.1", - "modules": "116", - "chrome": "114.0.5735.289", - "node": "18.15.0", - "chromium": { - "version": "114.0.5735.289", - "deps": { - "gn": { - "version": "2023-04-19", - "url": "https://gn.googlesource.com/gn", - "rev": "5a004f9427a050c6c393c07ddb85cba8ff3849fa", - "hash": "sha256-U0rinjJAToVh4zCBd/9I3O4McxW88b7Bp6ibmmqCuQc=" - } - } - }, - "chromium_npm_hash": "sha256-WFkyT1V4jNkWUyyHF68yEe50GhdlNZJBXuQvVVGPk6A=", - "electron_yarn_hash": "0fq44b91ha1lbgakwfz16z0g10y66c7m8gvlkg1ci81rzjrj0qpz" + "chromium_npm_hash": "sha256-5cjqpYB45nw2gop54VP+tL7/0w63nQGfQ4x6a6KS7XQ=", + "electron_yarn_hash": "05wkb1m0yjbai4153y49kwr1v2lj14fg75aqlvmmrhf3bxp9lg5g" } } diff --git a/pkgs/development/tools/electron/version-old.patch b/pkgs/development/tools/electron/version-old.patch deleted file mode 100644 index 00562225d767..000000000000 --- a/pkgs/development/tools/electron/version-old.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/electron/BUILD.gn b/electron/BUILD.gn -index c905891eb8..f2cf11fe88 100644 ---- a/electron/BUILD.gn -+++ b/electron/BUILD.gn -@@ -111,8 +111,6 @@ electron_version = exec_script("script/print-version.py", - [], - "trim string", - [ -- ".git/packed-refs", -- ".git/HEAD", - "script/lib/get-version.js", - ]) - -diff --git a/electron/script/lib/get-version.js b/electron/script/lib/get-version.js -index 45a120482b..ddaf8ab60e 100644 ---- a/electron/script/lib/get-version.js -+++ b/electron/script/lib/get-version.js -@@ -1,22 +1 @@ --const { spawnSync } = require('child_process'); --const path = require('path'); -- --module.exports.getElectronVersion = () => { -- // Find the nearest tag to the current HEAD -- // This is equivilant to our old logic of "use a value in package.json" for the following reasons -- // -- // 1. Whenever we updated the package.json we ALSO pushed a tag with the same version -- // 2. Whenever we _reverted_ a bump all we actually did was push a commit that deleted the tag and changed the version number back -- // -- // The only difference in the "git describe" technique is that technically a commit can "change" it's version -- // number if a tag is created / removed retroactively. i.e. the first time a commit is pushed it will be 1.2.3 -- // and after the tag is made rebuilding the same commit will result in it being 1.2.4 -- const output = spawnSync('git', ['describe', '--tags', '--abbrev=0'], { -- cwd: path.resolve(__dirname, '..', '..') -- }); -- if (output.status !== 0) { -- console.error(output.stderr); -- throw new Error('Failed to get current electron version'); -- } -- return output.stdout.toString().trim().replace(/^v/g, ''); --}; -+module.exports.getElectronVersion = () => "@version@"; - diff --git a/pkgs/development/tools/electron/version.patch b/pkgs/development/tools/electron/version.patch index 6edb64a23eaf..00562225d767 100644 --- a/pkgs/development/tools/electron/version.patch +++ b/pkgs/development/tools/electron/version.patch @@ -16,8 +16,8 @@ index 45a120482b..ddaf8ab60e 100644 --- a/electron/script/lib/get-version.js +++ b/electron/script/lib/get-version.js @@ -1,22 +1 @@ --const { spawnSync } = require('node:child_process'); --const path = require('node:path'); +-const { spawnSync } = require('child_process'); +-const path = require('path'); - -module.exports.getElectronVersion = () => { - // Find the nearest tag to the current HEAD diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index e417bc217f8d..8d62f1a51b7a 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "minizinc"; - version = "2.7.6"; + version = "2.8.0"; src = fetchFromGitHub { owner = "MiniZinc"; repo = "libminizinc"; rev = finalAttrs.version; - sha256 = "sha256-1+bFF79lYt5RAx5gfNg7J3iB7ExxNgFUmBIcg6/hfQs="; + sha256 = "sha256-l6q9bRreQXn8jA1SSHS4UYN+SlPVCQGtJ1mRiJ3wFMU="; }; nativeBuildInputs = [ bison cmake flex jq ]; diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 1948b6f8768a..515ad042b2df 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -15,16 +15,16 @@ let in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "5.11.0"; + version = "5.12.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; rev = "refs/tags/v${version}"; - hash = "sha256-bN2LvuB/BD21SL5fG9QNPpR9hUk52U2BJJ6TFMhwDBk="; + hash = "sha256-NYtsfHdpkh+gPUF8moNEf4thQ9DliIALRrzcE2NSHsw="; }; - cargoHash = "sha256-V4hANIkReF7EEtFsBv1hA/Ftre6YQPs69LpG/GR0Egc="; + cargoHash = "sha256-J7T4SF2Ksuq7T2GRA/hUFZnrY2jBWmKD/sTjwS9/Kws="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { # generate the man page postInstall = lib.optionalString (!isCross) '' # TexLab builds man page separately in CI: - # https://github.com/latex-lsp/texlab/blob/v5.11.0/.github/workflows/publish.yml#L117-L121 + # https://github.com/latex-lsp/texlab/blob/v5.12.0/.github/workflows/publish.yml#L117-L121 help2man --no-info "$out/bin/texlab" > texlab.1 installManPage texlab.1 ''; diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 862b7279f7e6..b9d804cf3a71 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.1.127"; + version = "0.1.131"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-ho2dbuejQWU7K4j107fV4Lf5r3grsePifaE+HbRdCys="; + hash = "sha256-q24QQExHsIUkMQBhIdYN9ra6tSPfB21SxXnZzVJIpJk="; }; - vendorHash = "sha256-qo1P2PSiWco3oKqKOCmCuM6QOz6a9ov2d2MpggBU4N8="; + vendorHash = "sha256-UHG0pUJzA3I8uBbll+4fEpwpEvNBxoQYKr8wuupc8NQ="; subPackages = [ "." ]; diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 49f16db002f3..4192de0cfeab 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -6,7 +6,6 @@ , libcap ? null, systemd ? null }: -with lib; stdenv.mkDerivation rec { pname = "lxc"; version = "4.0.12"; @@ -48,10 +47,10 @@ stdenv.mkDerivation rec { "--disable-api-docs" "--with-init-script=none" "--with-distro=nixos" # just to be sure it is "unknown" - ] ++ optional (libapparmor != null) "--enable-apparmor" - ++ optional (libselinux != null) "--enable-selinux" - ++ optional (libseccomp != null) "--enable-seccomp" - ++ optional (libcap != null) "--enable-capabilities" + ] ++ lib.optional (libapparmor != null) "--enable-apparmor" + ++ lib.optional (libselinux != null) "--enable-selinux" + ++ lib.optional (libseccomp != null) "--enable-seccomp" + ++ lib.optional (libcap != null) "--enable-capabilities" ++ [ "--disable-examples" "--enable-python" @@ -90,7 +89,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://linuxcontainers.org/"; description = "Userspace tools for Linux Containers, a lightweight virtualization system"; - license = licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; longDescription = '' LXC is the userspace control package for Linux Containers, a @@ -100,7 +99,7 @@ stdenv.mkDerivation rec { mechanisms to Linux’s existing process management infrastructure. ''; - platforms = platforms.linux; - maintainers = with maintainers; [ ]; + platforms = lib.platforms.linux; + maintainers = lib.teams.lxc.members; }; } diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 96477c5f4426..28777d36e6be 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -2,7 +2,6 @@ , util-linux, makeWrapper , enableDebugBuild ? config.lxcfs.enableDebugBuild or false }: -with lib; stdenv.mkDerivation rec { pname = "lxcfs"; version = "4.0.12"; @@ -48,8 +47,8 @@ stdenv.mkDerivation rec { description = "FUSE filesystem for LXC"; homepage = "https://linuxcontainers.org/lxcfs"; changelog = "https://linuxcontainers.org/lxcfs/news/"; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = with maintainers; [ ]; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = lib.teams.lxc.members; }; } diff --git a/pkgs/servers/home-assistant/custom-components/default.nix b/pkgs/servers/home-assistant/custom-components/default.nix index 15bd721c72e8..9e1800b39cb9 100644 --- a/pkgs/servers/home-assistant/custom-components/default.nix +++ b/pkgs/servers/home-assistant/custom-components/default.nix @@ -2,5 +2,6 @@ }: { + miele = callPackage ./miele {}; prometheus_sensor = callPackage ./prometheus_sensor {}; } diff --git a/pkgs/servers/home-assistant/custom-components/miele/default.nix b/pkgs/servers/home-assistant/custom-components/miele/default.nix new file mode 100644 index 000000000000..71624f674b4d --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/miele/default.nix @@ -0,0 +1,35 @@ +{ + lib, + fetchFromGitHub, + buildHomeAssistantComponent, + flatdict, + pymiele, +}: +buildHomeAssistantComponent rec { + owner = "astrandb"; + domain = "miele"; + version = "0.1.19"; + + src = fetchFromGitHub { + inherit owner; + repo = domain; + rev = "refs/tags/v${version}"; + hash = "sha256-od7DV10/rkIw9eFMsTRw4bMmhQo9BAmw2rCbKKySeIk="; + }; + + propagatedBuildInputs = [ + flatdict + pymiele + ]; + + # Makefile only used for bumping the version + dontBuild = true; + + meta = with lib; { + changelog = "https://github.com/astrandb/miele/releases/tag/v${version}"; + description = "A modern integration for Miele devices in Home Assistant"; + homepage = "https://github.com/astrandb/miele"; + maintainers = with maintainers; [jamiemagee]; + license = licenses.mit; + }; +} diff --git a/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix b/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix index 526730e72228..2bc331cc1874 100644 --- a/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix +++ b/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix @@ -1,12 +1,29 @@ { lib -, python3Packages +, python3 , fetchPypi , nix-update-script , testers , aws-encryption-sdk-cli }: -python3Packages.buildPythonApplication rec { +let + localPython = python3.override { + self = localPython; + packageOverrides = final: prev: { + urllib3 = prev.urllib3.overridePythonAttrs (prev: rec { + pyproject = true; + version = "1.26.18"; + nativeBuildInputs = with final; [ setuptools ]; + src = prev.src.override { + inherit version; + hash = "sha256-+OzBu6VmdBNFfFKauVW/jGe0XbeZ0VkGYmFxnjKFgKA="; + }; + }); + }; + }; +in + +localPython.pkgs.buildPythonApplication rec { pname = "aws-encryption-sdk-cli"; version = "4.1.0"; @@ -15,15 +32,16 @@ python3Packages.buildPythonApplication rec { hash = "sha256-OCbt0OkDVfpzUIogbsKzaPAle2L6l6N3cmZoS2hEaSM="; }; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with localPython.pkgs; [ attrs aws-encryption-sdk base64io + urllib3 ]; doCheck = true; - nativeCheckInputs = with python3Packages; [ + nativeCheckInputs = with localPython.pkgs; [ mock pytest-mock pytestCheckHook diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 13589edd6bdc..29534b092d9f 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -87,7 +87,7 @@ buildGoModule rec { homepage = "https://ubuntu.com/lxd"; changelog = "https://github.com/canonical/lxd/releases/tag/lxd-${version}"; license = licenses.asl20; - maintainers = with maintainers; [ marsam adamcstephens ]; + maintainers = teams.lxc.members; platforms = platforms.linux; }; } diff --git a/pkgs/tools/admin/lxd/ui.nix b/pkgs/tools/admin/lxd/ui.nix index 7e3f1427008e..16fdb4c33175 100644 --- a/pkgs/tools/admin/lxd/ui.nix +++ b/pkgs/tools/admin/lxd/ui.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { description = "Web user interface for LXD."; homepage = "https://github.com/canonical/lxd-ui"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ jnsgruk ]; + maintainers = lib.teams.lxc.members; platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/audio/fmtoy/default.nix b/pkgs/tools/audio/fmtoy/default.nix deleted file mode 100644 index 69a0f570d3bc..000000000000 --- a/pkgs/tools/audio/fmtoy/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, unstableGitUpdater -, dos2unix -, pkg-config -, zlib -, alsa-lib -, libjack2 -}: - -stdenv.mkDerivation rec { - pname = "fmtoy"; - version = "unstable-2022-12-23"; - - src = fetchFromGitHub { - owner = "vampirefrog"; - repo = "fmtoy"; - rev = "78b61b5e9bc0c6874962dc4040456581c9999b36"; - sha256 = "r5zbr6TCxzDiQvDsLQu/QwNfem1K4Ahaji0yIz/2yl0="; - }; - - postPatch = '' - dos2unix Makefile - # Don't hardcode compilers - sed -i -e '/CC=/d' -e '/CXX=/d' Makefile - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - # Remove Linux-only program & its dependencies - sed -i -e '/PROGS/ s/fmtoy_jack//' Makefile - substituteInPlace Makefile \ - --replace '$(shell pkg-config alsa jack --cflags)' "" - ''; - - nativeBuildInputs = [ - dos2unix - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - pkg-config - ]; - - buildInputs = [ - zlib - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib - libjack2 - ]; - - enableParallelBuilding = true; - - installPhase = '' - runHook preInstall - - for prog in $(grep 'PROGS=' Makefile | cut -d= -f2-); do - install -Dm755 $prog $out/bin/$prog - done - - runHook postInstall - ''; - - passthru.updateScript = unstableGitUpdater { - url = "https://github.com/vampirefrog/fmtoy.git"; - }; - - meta = with lib; { - homepage = "https://github.com/vampirefrog/fmtoy"; - description = "Tools for FM voices for Yamaha YM chips (OPL, OPM and OPN series)"; - # Unclear if gpl3Only or gpl3Plus - # https://github.com/vampirefrog/fmtoy/issues/1 - license = licenses.gpl3; - maintainers = with maintainers; [ OPNA2608 ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index fa4cb75d174b..9332b25babfb 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl, cmake, imagemagick }: +{ lib, stdenv, fetchurl, cmake, imagemagick, testers }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "cuneiform"; version = "1.1.0"; @@ -30,10 +30,23 @@ stdenv.mkDerivation { rm cuneiform_src/Kern/hhh/tigerh/h/strings.h ''; + # make the install path match the rpath + postInstall = '' + if [[ -d ''${!outputLib}/lib64 ]]; then + mv ''${!outputLib}/lib64 ''${!outputLib}/lib + ln -s lib ''${!outputLib}/lib64 + fi + ''; + buildInputs = [ imagemagick ]; nativeBuildInputs = [ cmake ]; + passthru.tests = testers.testVersion { + package = finalAttrs.finalPackage; + command = "cuneiform"; + }; + meta = with lib; { description = "Multi-language OCR system"; homepage = "https://launchpad.net/cuneiform-linux"; @@ -42,4 +55,4 @@ stdenv.mkDerivation { maintainers = [ maintainers.raskin ]; mainProgram = "cuneiform"; }; -} +}) diff --git a/pkgs/tools/misc/diffoci/default.nix b/pkgs/tools/misc/diffoci/default.nix index df7cc71140aa..3c7de46e01e8 100644 --- a/pkgs/tools/misc/diffoci/default.nix +++ b/pkgs/tools/misc/diffoci/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "diffoci"; - version = "0.1.2"; + version = "0.1.4"; src = fetchFromGitHub { owner = "reproducible-containers"; repo = "diffoci"; rev = "v${version}"; - hash = "sha256-Rrwwo1OCE2gn6MGt5XVddb8bJtoN7iAtxzr2MxyHcwk="; + hash = "sha256-BTggky5behIxbVxyDZ09uobw0FBopboE9uUBEVgCgR4="; }; - vendorHash = "sha256-18rsa91PiqZv70EK3K6K1l6N2mIpoVpkX29amKCo5cg="; + vendorHash = "sha256-4C35LBxSm6EkcOznQY1hT2vX9bwFfps/q76VqqPKBfI="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/misc/pls/default.nix b/pkgs/tools/misc/pls/default.nix deleted file mode 100644 index c6d6d2e52835..000000000000 --- a/pkgs/tools/misc/pls/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, python3, fetchFromGitHub }: - -python3.pkgs.buildPythonApplication rec { - pname = "pls"; - version = "5.4.0"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "dhruvkb"; - repo = "pls"; - rev = version; - sha256 = "sha256-h93Kz+ETdHfnzypa8JjMvbzA1o/KS1UuTG8/vhEt7Vo="; - }; - - nativeBuildInputs = [ python3.pkgs.poetry-core ]; - - propagatedBuildInputs = with python3.pkgs; [ - pyyaml - requests - rich - ]; - - nativeCheckInputs = with python3.pkgs; [ - freezegun - jsonschema - pytestCheckHook - ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'rich = "^12.5.1"' 'rich = "*"' \ - ''; - - pytestFlagsArray = [ "tests/" "--ignore=tests/e2e" ]; - - pythonImportsCheck = [ "pls" ]; - - meta = with lib; { - homepage = "https://dhruvkb.github.io/pls/"; - description = "Prettier and powerful ls"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ arjan-s ]; - }; -} diff --git a/pkgs/tools/networking/hping/default.nix b/pkgs/tools/networking/hping/default.nix index 33663a44d2a9..11a8cad05b9c 100644 --- a/pkgs/tools/networking/hping/default.nix +++ b/pkgs/tools/networking/hping/default.nix @@ -28,6 +28,13 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.isLinux '' sed -i -e 's|#include |#include |' \ libpcap_stuff.c script.c + '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + substituteInPlace configure --replace 'BYTEORDER=`./byteorder -m`' BYTEORDER=${ + { + littleEndian = "__LITTLE_ENDIAN_BITFIELD"; + bigEndian = "__BIG_ENDIAN_BITFIELD"; + }.${stdenv.hostPlatform.parsed.cpu.significantByte.name}} + substituteInPlace Makefile.in --replace './hping3 -v' "" ''; configureFlags = [ (if withTcl then "TCLSH=${tcl}/bin/tclsh" else "--no-tcl") ]; diff --git a/pkgs/tools/package-management/micromamba/default.nix b/pkgs/tools/package-management/micromamba/default.nix index 182f58ea9da8..5ff23ec7188d 100644 --- a/pkgs/tools/package-management/micromamba/default.nix +++ b/pkgs/tools/package-management/micromamba/default.nix @@ -35,13 +35,13 @@ let in stdenv.mkDerivation rec { pname = "micromamba"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; rev = "micromamba-" + version; - hash = "sha256-/9CzcnPd1D8jSl/pfl54+8/728r+GCqWFXahl47MJ3g="; + hash = "sha256-29SuR4RDW0+yNR1RHlm3I4avy0CjBTGxv1FKxMDZxO0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index 272caf42e90e..92b964ad2c95 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/tools/security/doppler/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.66.3"; + version = "3.66.5"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-zS5nIULnzoOG43nNcVb6MdmKNDcDK75mh3SOMB5BXIY="; + sha256 = "sha256-/kcGfTDthm4gp1M4lSeY1x8Q7EWVX2pZVjF2rAbz+Es="; }; vendorHash = "sha256-FOmaK6S61fkzybpDx6qfi6m4e2IaqBpavaFhEgIvmqw="; diff --git a/pkgs/tools/security/wpscan/Gemfile.lock b/pkgs/tools/security/wpscan/Gemfile.lock index b233f57a5817..186144a3b1a9 100644 --- a/pkgs/tools/security/wpscan/Gemfile.lock +++ b/pkgs/tools/security/wpscan/Gemfile.lock @@ -1,57 +1,57 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.1.7.4) + activesupport (6.1.7.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - addressable (2.8.4) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) - cms_scanner (0.13.8) - ethon (>= 0.14, < 0.16) + cms_scanner (0.13.9) + ethon (>= 0.14, < 0.17) get_process_mem (~> 0.2.5) - nokogiri (>= 1.11.4, < 1.14.0) + nokogiri (>= 1.11.4, < 1.16.0) opt_parse_validator (~> 1.9.5) - public_suffix (~> 4.0.3) - ruby-progressbar (>= 1.10, < 1.12) - sys-proctable (~> 1.2.2) + public_suffix (>= 4.0.3, < 5.1.0) + ruby-progressbar (>= 1.10, < 1.14) + sys-proctable (>= 1.2.2, < 1.4.0) typhoeus (>= 1.3, < 1.5) xmlrpc (~> 0.3) yajl-ruby (~> 1.4.1) concurrent-ruby (1.2.2) - ethon (0.15.0) + ethon (0.16.0) ffi (>= 1.15.0) - ffi (1.15.5) + ffi (1.16.3) get_process_mem (0.2.7) ffi (~> 1.0) i18n (1.14.1) concurrent-ruby (~> 1.0) - mini_portile2 (2.8.2) - minitest (5.18.1) - nokogiri (1.13.10) - mini_portile2 (~> 2.8.0) + mini_portile2 (2.8.5) + minitest (5.20.0) + nokogiri (1.15.5) + mini_portile2 (~> 2.8.2) racc (~> 1.4) opt_parse_validator (1.9.5) activesupport (>= 5.2, < 6.2.0) addressable (>= 2.5, < 2.9) - public_suffix (4.0.7) - racc (1.7.1) - ruby-progressbar (1.11.0) - sys-proctable (1.2.7) + public_suffix (5.0.4) + racc (1.7.3) + ruby-progressbar (1.13.0) + sys-proctable (1.3.0) ffi (~> 1.1) - typhoeus (1.4.0) + typhoeus (1.4.1) ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) webrick (1.8.1) - wpscan (3.8.24) - cms_scanner (~> 0.13.8) - xmlrpc (0.3.2) + wpscan (3.8.25) + cms_scanner (~> 0.13.9) + xmlrpc (0.3.3) webrick yajl-ruby (1.4.3) - zeitwerk (2.6.8) + zeitwerk (2.6.12) PLATFORMS ruby @@ -60,4 +60,4 @@ DEPENDENCIES wpscan BUNDLED WITH - 2.4.13 + 2.4.22 diff --git a/pkgs/tools/security/wpscan/gemset.nix b/pkgs/tools/security/wpscan/gemset.nix index 5cae455dd014..abe19a29bf8f 100644 --- a/pkgs/tools/security/wpscan/gemset.nix +++ b/pkgs/tools/security/wpscan/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s465919p6fcgcsqin8w8hay2m598dvnzks490hbsb0p68sdz69m"; + sha256 = "1nhrdih0rk46i0s6x7nqhbypmj1hf23zl5gfl9xasb6k4r2a1dxk"; type = "gem"; }; - version = "6.1.7.4"; + version = "6.1.7.6"; }; addressable = { dependencies = ["public_suffix"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20"; + sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33"; type = "gem"; }; - version = "2.8.4"; + version = "2.8.5"; }; cms_scanner = { dependencies = ["ethon" "get_process_mem" "nokogiri" "opt_parse_validator" "public_suffix" "ruby-progressbar" "sys-proctable" "typhoeus" "xmlrpc" "yajl-ruby"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15d7djrrkrcwznglgkr4y80jbsbxaf071qhjnn4i1c4n7nszwwfj"; + sha256 = "0p3vdkkd04r31d503z5v0480xlq1fhiw77icbk5s17y6dwfacydy"; type = "gem"; }; - version = "0.13.8"; + version = "0.13.9"; }; concurrent-ruby = { groups = ["default"]; @@ -48,20 +48,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kd7c61f28f810fgxg480j7457nlvqarza9c2ra0zhav0dd80288"; + sha256 = "17ix0mijpsy3y0c6ywrk5ibarmvqzjsirjyprpsy3hwax8fdm85v"; type = "gem"; }; - version = "0.15.0"; + version = "0.16.0"; }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; type = "gem"; }; - version = "1.15.5"; + version = "1.16.3"; }; get_process_mem = { dependencies = ["ffi"]; @@ -90,20 +90,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z7f38iq37h376n9xbl4gajdrnwzq284c9v1py4imw3gri2d5cj6"; + sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs"; type = "gem"; }; - version = "2.8.2"; + version = "2.8.5"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kg9wh7jlc9zsr3hkhpzkbn0ynf4np5ap9m2d8xdrb8shy0y6pmb"; + sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3"; type = "gem"; }; - version = "5.18.1"; + version = "5.20.0"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -111,10 +111,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n79k78c5vdcyl0m3y3l5x9kxl6xf5lgriwi2vd665qmdkr01vnk"; + sha256 = "004ip9x9281fxhpipwi8di1sb1dnabscq9dy1p3cxgdwbniqqi12"; type = "gem"; }; - version = "1.13.10"; + version = "1.15.5"; }; opt_parse_validator = { dependencies = ["activesupport" "addressable"]; @@ -132,30 +132,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb"; + sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m"; type = "gem"; }; - version = "4.0.7"; + version = "5.0.4"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11v3l46mwnlzlc371wr3x6yylpgafgwdf0q7hc7c1lzx6r414r5g"; + sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; type = "gem"; }; - version = "1.7.1"; + version = "1.7.3"; }; ruby-progressbar = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc"; + sha256 = "0cwvyb7j47m7wihpfaq7rc47zwwx9k4v7iqd9s1xch5nm53rrz40"; type = "gem"; }; - version = "1.11.0"; + version = "1.13.0"; }; sys-proctable = { dependencies = ["ffi"]; @@ -163,10 +163,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "121ix0bl19pawhljs17sfgddkd0hgxlhchsz9kxw14ipmskjq9ah"; + sha256 = "0m3fj6j1qpfszqnsvr6wpak0d9vw5ggylaqkalhl3m50kbbimxii"; type = "gem"; }; - version = "1.2.7"; + version = "1.3.0"; }; typhoeus = { dependencies = ["ethon"]; @@ -174,10 +174,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m22yrkmbj81rzhlny81j427qdvz57yk5wbcf3km0nf3bl6qiygz"; + sha256 = "0z7gamf6s83wy0yqms3bi4srirn3fc0lc7n65lqanidxcj1xn5qw"; type = "gem"; }; - version = "1.4.0"; + version = "1.4.1"; }; tzinfo = { dependencies = ["concurrent-ruby"]; @@ -206,10 +206,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qh7x5sjx1i9h8zrp86qz126brxbqx0c3wxc8vn7fpln0y78nw9q"; + sha256 = "1x04asq0aznbm6m79jlsv7mjbhq755759s4bi3qbyrv5rwpy7hji"; type = "gem"; }; - version = "3.8.24"; + version = "3.8.25"; }; xmlrpc = { dependencies = ["webrick"]; @@ -217,10 +217,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xa79ry3976ylap38cr5g6q3m81plm611flqd3dwgnmgbkycb6jp"; + sha256 = "0fwfnccagsjrbvrav5nbk3zracj9zncr7i375nn20jd4cfy4cggc"; type = "gem"; }; - version = "0.3.2"; + version = "0.3.3"; }; yajl-ruby = { groups = ["default"]; @@ -237,9 +237,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ck6bj7wa73dkdh13735jl06k6cfny98glxjkas82aivlmyzqqbk"; + sha256 = "1gir0if4nryl1jhwi28669gjwhxb7gzrm1fcc8xzsch3bnbi47jn"; type = "gem"; }; - version = "2.6.8"; + version = "2.6.12"; }; } diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix index e6b867139165..da2f1a909156 100644 --- a/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/pkgs/tools/virtualization/distrobuilder/default.nix @@ -60,7 +60,7 @@ buildGoModule rec { description = "System container image builder for LXC and LXD"; homepage = "https://github.com/lxc/distrobuilder"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ megheaiulian adamcstephens ]; + maintainers = lib.teams.lxc.members; platforms = lib.platforms.linux; mainProgram = "distrobuilder"; }; diff --git a/pkgs/tools/wayland/swaysome/default.nix b/pkgs/tools/wayland/swaysome/default.nix index 4acf4115a048..308592e450f9 100644 --- a/pkgs/tools/wayland/swaysome/default.nix +++ b/pkgs/tools/wayland/swaysome/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "swaysome"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitLab { owner = "hyask"; repo = pname; rev = version; - sha256 = "sha256-KmGAp0EPnnM+hPRpUGsbt+NU2v5mcPaRUqo0pqUr1L8="; + sha256 = "sha256-U5W/9VL1t1/R4ADPxseBV6CMKx04I4vbp7sFmSqRZXk="; }; - cargoHash = "sha256-9sOR99CaTyMQoGMKP2Cag6YNxmgEqNPE/kiJPziqB9U="; + cargoHash = "sha256-QA3EQsYgjwx8QX50yaxiJyAPDlpYYqiqLiXco1kJmw0="; meta = with lib; { description = "Helper to make sway behave more like awesomewm"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7343be24d115..cfed3bbac467 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -70,6 +70,7 @@ mapAliases ({ angelfish = libsForQt5.kdeGear.angelfish; # Added 2021-10-06 ansible_2_12 = throw "Ansible 2.12 goes end of life in 2023/05 and can't be supported throughout the 23.05 release cycle"; # Added 2023-05-16 antimicroX = antimicrox; # Added 2021-10-31 + arcanPackages = throw "arcanPackages was removed and its sub-attributes were promoted to top-level"; # Added 2023-11-26 ardour_6 = throw "ardour_6 has been removed in favor of newer versions"; # Added 2023-10-13 aseprite-unfree = aseprite; # Added 2023-08-26 asls = throw "asls has been removed: abandoned by upstream"; # Added 2023-03-16 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7a38be3e40a..ca76fb12ba4e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3027,8 +3027,6 @@ with pkgs; xplorer = callPackage ../applications/file-managers/xplorer { }; - ytree = callPackage ../applications/file-managers/ytree { }; - johnny-reborn-engine = callPackage ../applications/misc/johnny-reborn { }; johnny-reborn = callPackage ../applications/misc/johnny-reborn/with-data.nix { }; @@ -12186,8 +12184,6 @@ with pkgs; plowshare = callPackage ../tools/misc/plowshare { }; - pls = callPackage ../tools/misc/pls { }; - pm2 = nodePackages.pm2; pmenu = callPackage ../tools/X11/pmenu { }; @@ -17549,7 +17545,7 @@ with pkgs; clojure = callPackage ../development/interpreters/clojure { # set this to an LTS version of java - jdk = jdk17; + jdk = jdk21; }; clojure-lsp = callPackage ../development/tools/misc/clojure-lsp { }; @@ -18483,9 +18479,10 @@ with pkgs; electron_22 = electron_22-bin; electron_23 = electron_23-bin; electron_24 = electron_24-bin; - electron_25 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_25 then electron-source.electron_25 else electron_25-bin; + electron_25 = electron_25-bin; electron_26 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_26 then electron-source.electron_26 else electron_26-bin; electron_27 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_27 then electron-source.electron_27 else electron_27-bin; + electron_28 = electron-source.electron_28; electron = electron_27; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -27409,6 +27406,8 @@ with pkgs; tailscale = callPackage ../servers/tailscale { }; + tailscale-nginx-auth = callPackage ../by-name/ta/tailscale-nginx-auth/package.nix { }; + tailscale-systray = callPackage ../applications/misc/tailscale-systray { }; tailspin = callPackage ../tools/misc/tailspin { }; @@ -31961,8 +31960,6 @@ with pkgs; firefox_decrypt = python3Packages.callPackage ../tools/security/firefox_decrypt { }; - fmtoy = callPackage ../tools/audio/fmtoy { }; - flac = callPackage ../applications/audio/flac { }; redoflacs = callPackage ../applications/audio/redoflacs { }; @@ -38682,7 +38679,28 @@ with pkgs; ### DESKTOP ENVIRONMENTS - arcanPackages = recurseIntoAttrs (callPackage ../desktops/arcan { }); + arcan-wrapped = arcan.wrapper.override { }; + arcan-all-wrapped = arcan.wrapper.override { + name = "arcan-all-wrapped"; + appls = [ cat9 durden pipeworld ]; + + }; + cat9-wrapped = arcan.wrapper.override { + name = "cat9-wrapped"; + appls = [ cat9 ]; + }; + durden-wrapped = arcan.wrapper.override { + name = "durden-wrapped"; + appls = [ durden ]; + }; + pipeworld-wrapped = arcan.wrapper.override { + name = "pipeworld-wrapped"; + appls = [ pipeworld ]; + }; + prio-wrapped = arcan.wrapper.override { + name = "prio-wrapped"; + appls = [ prio ]; + }; budgie = recurseIntoAttrs (callPackage ../desktops/budgie { }); budgiePlugins = recurseIntoAttrs (callPackage ../desktops/budgie/plugins { }); diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5f8285d98963..c17c171bf40f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1378,6 +1378,8 @@ self: super: with self; { else callPackage ../development/python-modules/bcrypt { }; + bdffont = callPackage ../development/python-modules/bdffont { }; + beaker = callPackage ../development/python-modules/beaker { }; before-after = callPackage ../development/python-modules/before-after { }; @@ -1962,6 +1964,8 @@ self: super: with self; { characteristic = callPackage ../development/python-modules/characteristic { }; + character-encoding-utils = callPackage ../development/python-modules/character-encoding-utils { }; + chardet = callPackage ../development/python-modules/chardet { }; charset-normalizer = callPackage ../development/python-modules/charset-normalizer { }; @@ -6151,6 +6155,8 @@ self: super: with self; { lc7001 = callPackage ../development/python-modules/lc7001 { }; + lcd-i2c = callPackage ../development/python-modules/lcd-i2c { }; + lcgit = callPackage ../development/python-modules/lcgit { }; lcov_cobertura = callPackage ../development/python-modules/lcov_cobertura { }; @@ -6441,6 +6447,10 @@ self: super: with self; { lingua = callPackage ../development/python-modules/lingua { }; + linien-client = callPackage ../development/python-modules/linien-client { }; + + linien-common = callPackage ../development/python-modules/linien-common { }; + linkify-it-py = callPackage ../development/python-modules/linkify-it-py { }; linknlink = callPackage ../development/python-modules/linknlink { }; @@ -9235,6 +9245,8 @@ self: super: with self; { pixelmatch = callPackage ../development/python-modules/pixelmatch { }; + pixel-font-builder = callPackage ../development/python-modules/pixel-font-builder { }; + pixel-ring = callPackage ../development/python-modules/pixel-ring { }; pjsua2 = (toPythonModule (pkgs.pjsip.override { @@ -15413,6 +15425,8 @@ self: super: with self; { unicrypto = callPackage ../development/python-modules/unicrypto { }; + unidata-blocks = callPackage ../development/python-modules/unidata-blocks { }; + unidecode = callPackage ../development/python-modules/unidecode { }; unidic = callPackage ../development/python-modules/unidic { };