b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge master into haskell-updates

Browse source
This commit is contained in:
github-actions[bot] 2023-06-01 00:16:25 +00:00 committed by GitHub
parent 138d6b4463 a11f65c777
commit e886abb2c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
271 changed files with 3237 additions and 2870 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/PULL_REQUEST_TEMPLATE.md vendored
View file

@ -22,7 +22,7 @@ For new packages please briefly describe the package or provide a link to its ho
- made sure NixOS tests are [linked](https://nixos.org/manual/nixpkgs/unstable/#ssec-nixos-tests-linking) to the relevant packages
- [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"`. Note: all changes have to be committed, also see [nixpkgs-review usage](https://github.com/Mic92/nixpkgs-review#usage)
- [ ] Tested basic functionality of all binary files (usually in `./result/bin/`)
- [23.05 Release Notes (or backporting 22.11 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2305-release-notes)
- [23.11 Release Notes (or backporting 23.05 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2305-release-notes)
- [ ] (Package updates) Added a release notes entry if the change is major or breaking
- [ ] (Module updates) Added a release notes entry if the change is significant
- [ ] (Module addition) Added a release notes entry if adding a new NixOS module

16
CONTRIBUTING.md
View file

@ -106,17 +106,17 @@ git push origin feature --force-with-lease
Follow these steps to backport a change into a release branch in compliance with the [commit policy](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches).
You can add a label such as `backport release-22.11` to a PR, so that merging it will
You can add a label such as `backport release-23.05` to a PR, so that merging it will
automatically create a backport (via [a GitHub Action](.github/workflows/backport.yml)).
This also works for PR's that have already been merged, and might take a couple of minutes to trigger.
This also works for pull requests that have already been merged, and might take a couple of minutes to trigger.
You can also create the backport manually:
1. Take note of the commits in which the change was introduced into `master` branch.
2. Check out the target _release branch_, e.g. `release-22.11`. Do not use a _channel branch_ like `nixos-22.11` or `nixpkgs-22.11-darwin`.
2. Check out the target _release branch_, e.g. `release-23.05`. Do not use a _channel branch_ like `nixos-23.05` or `nixpkgs-23.05-darwin`.
3. Create a branch for your change, e.g. `git checkout -b backport`.
4. When the reason to backport is not obvious from the original commit message, use `git cherry-pick -xe <original commit>` and add a reason. Otherwise use `git cherry-pick -x <original commit>`. That's fine for minor version updates that only include security and bug fixes, commits that fixes an otherwise broken package or similar. Please also 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.
5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-22.11`) as the target branch of the pull request, and link to the pull request in which the original change was committed to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[22.11]`.
5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-23.05`) as the target branch of the pull request, and link to the pull request in which the original change was committed to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[23.05]`.
6. When the backport pull request is merged and you have the necessary privileges you can also replace the label `9.needs: port to stable` with `8.has: port to stable` on the original pull request. This way maintainers can keep track of missing backports easier.
## Criteria for Backporting changes
@ -128,7 +128,7 @@ Anything that does not cause user or downstream dependency regressions can be ba
- Services which require a client to be up-to-date regardless. (E.g. `spotify`, `steam`, or `discord`)
- Security critical applications (E.g. `firefox`)
## Generating 23.05 Release Notes
## Generating 23.11 Release Notes
<!--
note: title unchanged even though we don't need regeneration because extant
PRs will link here. definitely change the title for 23.11 though.
@ -136,10 +136,10 @@ PRs will link here. definitely change the title for 23.11 though.
Documentation in nixpkgs is transitioning to a markdown-centric workflow. In the past release notes required a translation step to convert from markdown to a compatible docbook document, but this is no longer necessary.
Steps for updating 23.05 Release notes:
Steps for updating 23.11 Release notes:
1. Edit `nixos/doc/manual/release-notes/rl-2305.section.md` with the desired changes
2. Commit changes to `rl-2305.section.md`.
1. Edit `nixos/doc/manual/release-notes/rl-2311.section.md` with the desired changes
2. Commit changes to `rl-2311.section.md`.
## Reviewing contributions

4
README.md
View file

@ -51,9 +51,9 @@ Nixpkgs and NixOS are built and tested by our continuous integration
system, [Hydra](https://hydra.nixos.org/).
* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
* [Continuous package builds for the NixOS 22.11 release](https://hydra.nixos.org/jobset/nixos/release-22.11)
* [Continuous package builds for the NixOS 23.05 release](https://hydra.nixos.org/jobset/nixos/release-23.05)
* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
* [Tests for the NixOS 22.11 release](https://hydra.nixos.org/job/nixos/release-22.11/tested#tabs-constituents)
* [Tests for the NixOS 23.05 release](https://hydra.nixos.org/job/nixos/release-23.05/tested#tabs-constituents)
Artifacts successfully built with Hydra are published to cache at
https://cache.nixos.org/. When successful build and test criteria are

6
lib/attrsets.nix
View file

@ -123,7 +123,11 @@ rec {
{ x = "a"; y = "b"; }
=> { x = "a"; xa = "a"; y = "b"; yb = "b"; }
*/
concatMapAttrs = f: flip pipe [ (mapAttrs f) attrValues (foldl' mergeAttrs { }) ];
concatMapAttrs = f: v:
foldl' mergeAttrs { }
(attrValues
(mapAttrs f v)
);
/* Update or set specific paths of an attribute set.

1
maintainers/team-list.nix
View file

@ -292,6 +292,7 @@ with lib.maintainers; {
members = [
imincik
sikmir
nh2
];
scope = "Maintain geospatial packages.";
shortName = "Geospatial";

28
nixos/doc/manual/installation/upgrading.chapter.md
View file

@ -6,7 +6,7 @@ expressions and associated binaries. The NixOS channels are updated
automatically from NixOS's Git repository after certain tests have
passed and all packages have been built. These channels are:
- *Stable channels*, such as [`nixos-22.11`](https://nixos.org/channels/nixos-22.11).
- *Stable channels*, such as [`nixos-23.05`](https://channels.nixos.org/nixos-23.05).
These only get conservative bug fixes and package upgrades. For
instance, a channel update may cause the Linux kernel on your system
to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), but not
@ -14,13 +14,13 @@ passed and all packages have been built. These channels are:
Stable channels are generally maintained until the next stable
branch is created.
- The *unstable channel*, [`nixos-unstable`](https://nixos.org/channels/nixos-unstable).
- The *unstable channel*, [`nixos-unstable`](https://channels.nixos.org/nixos-unstable).
This corresponds to NixOS's main development branch, and may thus see
radical changes between channel updates. It's not recommended for
production systems.
- *Small channels*, such as [`nixos-22.11-small`](https://nixos.org/channels/nixos-22.11-small)
or [`nixos-unstable-small`](https://nixos.org/channels/nixos-unstable-small).
- *Small channels*, such as [`nixos-23.05-small`](https://channels.nixos.org/nixos-23.05-small)
or [`nixos-unstable-small`](https://channels.nixos.org/nixos-unstable-small).
These are identical to the stable and unstable channels described above,
except that they contain fewer binary packages. This means they get updated
faster than the regular channels (for instance, when a critical security patch
@ -28,7 +28,7 @@ passed and all packages have been built. These channels are:
built from source than usual. They're mostly intended for server environments
and as such contain few GUI applications.
To see what channels are available, go to <https://nixos.org/channels>.
To see what channels are available, go to <https://channels.nixos.org>.
(Note that the URIs of the various channels redirect to a directory that
contains the channel's latest version and includes ISO images and
VirtualBox appliances.) Please note that during the release process,
@ -38,38 +38,38 @@ newest supported stable release.
When you first install NixOS, you're automatically subscribed to the
NixOS channel that corresponds to your installation source. For
instance, if you installed from a 22.11 ISO, you will be subscribed to
the `nixos-22.11` channel. To see which NixOS channel you're subscribed
instance, if you installed from a 23.05 ISO, you will be subscribed to
the `nixos-23.05` channel. To see which NixOS channel you're subscribed
to, run the following as root:
```ShellSession
# nix-channel --list | grep nixos
nixos https://nixos.org/channels/nixos-unstable
nixos https://channels.nixos.org/nixos-unstable
```
To switch to a different NixOS channel, do
```ShellSession
# nix-channel --add https://nixos.org/channels/channel-name nixos
# nix-channel --add https://channels.nixos.org/channel-name nixos
```
(Be sure to include the `nixos` parameter at the end.) For instance, to
use the NixOS 22.11 stable channel:
use the NixOS 23.05 stable channel:
```ShellSession
# nix-channel --add https://nixos.org/channels/nixos-22.11 nixos
# nix-channel --add https://channels.nixos.org/nixos-23.05 nixos
```
If you have a server, you may want to use the "small" channel instead:
```ShellSession
# nix-channel --add https://nixos.org/channels/nixos-22.11-small nixos
# nix-channel --add https://channels.nixos.org/nixos-23.05-small nixos
```
And if you want to live on the bleeding edge:
```ShellSession
# nix-channel --add https://nixos.org/channels/nixos-unstable nixos
# nix-channel --add https://channels.nixos.org/nixos-unstable nixos
```
You can then upgrade NixOS to the latest version in your chosen channel
@ -114,5 +114,5 @@ the new generation contains a different kernel, initrd or kernel
modules. You can also specify a channel explicitly, e.g.
```nix
system.autoUpgrade.channel = https://nixos.org/channels/nixos-22.11;
system.autoUpgrade.channel = "https://channels.nixos.org/nixos-23.05";
```

64
nixos/doc/manual/release-notes/rl-2305.section.md
View file

@ -12,34 +12,35 @@ To upgrade to the latest release, follow the [upgrade chapter](https://nixos.org
In addition to numerous new and updated packages, this release has the following highlights:
- The default Linux kernel has been updated from 5.15 to 6.1, all kernels version supported on <kernel.org> are also available.
- The default [Nix](https://github.com/NixOS/nix) version was updated from 2.11 to 2.13. In particular, this includes a [small language alteration](https://github.com/NixOS/nix/issues/8259) in the way floats are represented in `builtins.toJSON`. See the release notes for [2.13](https://nixos.org/manual/nix/stable/release-notes/rl-2.13.html) and [2.14](https://nixos.org/manual/nix/unstable/release-notes/rl-2.14.html) for more information.
- systemd has been updated from v252 to v253, see [release notes](https://github.com/systemd/systemd/blob/main/NEWS#L21-L677) for more info.
- Updating with `nixos-rebuild boot` and `reboot` is recommended, since in some rare cases the `switch` into the new generation on a live system might fail due to missing mount units.
- The default [Linux Kernel](https://kernel.org/) was updated from version 5.15 to 6.1, see [Kernelnewbies](https://kernelnewbies.org/Linux_6.1) for what has changed. All currently shown Kernels shown on [kernel.org](https://kernel.org/) are available.
- The glibc has been updated from 2.35 to 2.37
- [systemd](https://systemd.io) has been updated from v252 to v253, see [the release notes](https://github.com/systemd/systemd/blob/main/NEWS#L21-L677) for more information on the changes.
- Updating with `nixos-rebuild boot` and rebooting is recommended, since in some rare cases the `nixos-rebuild switch` into the new generation on a live system might fail due to missing mount units.
- GNOME has been updated to version 44. Please see the [release notes](https://release.gnome.org/44/) for details.
- [glibc](https://www.gnu.org/software/libc/) has been updated from version 2.35 to 2.37, see [the release notes](https://sourceware.org/glibc/wiki/Release/2.37) for what was changed.
- KDE Plasma has been updated to v5.27, see [the release notes](https://kde.org/announcements/plasma/5/5.27.0/) for what is changed.
- [libxcrypt](https://github.com/besser82/libxcrypt), the library providing the `crypt(3)` password hashing function, is now built without support for algorithms not flagged [`strong`](https://github.com/besser82/libxcrypt/blob/v4.4.33/lib/hashes.conf#L48). This affects the availability of password hashing algorithms used for system login (`login(1)`, `passwd(1)`), but also Apache2 Basic-Auth, Samba, OpenLDAP, Dovecot, and [many other packages](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/NixOS/nixpkgs%24+libxcrypt&patternType=standard&sm=1&groupBy=path).
- Cinnamon has been updated to 5.6, see [the pull request](https://github.com/NixOS/nixpkgs/pull/201328#issue-1449910204) for what is changed.
- `libxcrypt`, the library providing the `crypt(3)` password hashing function, is now built without support for algorithms not flagged [`strong`](https://github.com/besser82/libxcrypt/blob/v4.4.33/lib/hashes.conf#L48). This affects the availability of password hashing algorithms used for system login (`login(1)`, `passwd(1)`), but also Apache2 Basic-Auth, Samba, OpenLDAP, Dovecot, and [many other packages](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/NixOS/nixpkgs%24+libxcrypt&patternType=standard&sm=1&groupBy=path).
- NixOS now defaults to using [nsncd](https://github.com/twosigma/nsncd), a non-caching reimplementation of nscd in Rust, as its NSS lookup dispatcher. This replaces the buggy and deprecated nscd implementation provided through glibc. When you find problems, you can switch back by setting
- NixOS now defaults to using [nsncd](https://github.com/twosigma/nsncd), a non-caching reimplementation of nscd in Rust, as its NSS lookup dispatcher. This replaces the buggy and deprecated nscd implementation provided through glibc. When you find problems, you can switch back by disabling it:
```nix
services.nscd.enableNsncd = false;
```
but please open an issue in nixpkgs, so your problem can be addressed.
- Python implements [PEP 668](https://peps.python.org/pep-0668/), providing better feedback to users that try to run `pip install` for system-wide or user home installations.
- The internal option `boot.bootspec.enable` is now enabled by default because [RFC 0125](https://github.com/NixOS/rfcs/pull/125) was merged. This means you will have a bootspec document called `boot.json` generated for each system and specialisation in the top-level. This is useful to enable advanced boot use cases in NixOS, such as Secure Boot.
- There have been two changes to `nixos-rebuild`:
- Two changes to `nixos-rebuild` are important to highlight as well.
- Support for an extra `--specialisation` option was added that can be used to change specialisation for `switch` and `test` commands.
- The `--target-host` and `--build-host` options no longer treat the `localhost` value specially – to build on/deploy to a local machine, omit the relevant flag.
- The `--target-host` and `--build-host` options no longer treat the `localhost` value specially – to build on resp. deploy to a local machine, omit the relevant flag.
- `boot.bootspec.enable` (internal option) is now enabled by default because [RFC 0125](https://github.com/NixOS/rfcs/pull/125) was merged. This means you will have a bootspec document called `boot.json` generated for each system and specialisation in the top-level. This is useful to enable advanced boot use cases in NixOS, such as Secure Boot.
- [Python](https://www.python.org) implements [PEP 668](https://peps.python.org/pep-0668/), providing better feedback to users that try to run `pip install` for system-wide or user home installations.
- [Cinnamon](https://github.com/linuxmint/Cinnamon) has been updated to version 5.6, see [the pull request](https://github.com/NixOS/nixpkgs/pull/201328#issue-1449910204) for what was changed.
- [GNOME](https://www.gnome.org) has been updated to version 44, see the [the release notes](https://release.gnome.org/44/) for details.
- [KDE Plasma](https://kde.org/de/plasma-desktop/) has been updated to version 5.27, see [the release notes](https://kde.org/announcements/plasma/5/5.27.0/) for what was changed.
## New Services {#sec-release-23.05-new-services}
@ -167,7 +168,7 @@ In addition to numerous new and updated packages, this release has the following
- [woodpecker](https://woodpecker-ci.org/), a simple CI engine with great extensibility. Available as [services.woodpecker-server](#opt-services.woodpecker-server.enable) and [services.woodpecker-agents](#opt-services.woodpecker-agents.agents._name_.enable).
- [wstunnel](https://github.com/erebe/wstunnel), a proxy tunnelling arbitrary TCP or UDP traffic through a WebSocket connection. Instances may be configured via [services.wstunnel](options.html#opt-services.wstunnel.enable).
- [wstunnel](https://github.com/erebe/wstunnel), a proxy tunnelling arbitrary TCP or UDP traffic through a WebSocket connection. Available as [services.wstunnel](options.html#opt-services.wstunnel.enable).
## Backward Incompatibilities {#sec-release-23.05-incompatibilities}
@ -276,6 +277,10 @@ In addition to numerous new and updated packages, this release has the following
- The EC2 image module previously detected and activated swap-formatted instance store devices and partitions in stage-1 (initramfs). This behaviour has been removed. Users relying on this should provide their own implementation.
- `gitlab` has been upgraded from major version 15 to major version 16 and requires at least PostgreSQL 13.6. Check the [upgrade guide](#module-services-postgres-upgrading) in the NixOS manual on how to upgrade your PostgreSQL installation.
- `gitlab` 16 deprecates the use of external container registries, in our case `pkgs.docker-distribution`. Module users who have [`services.gitlab.registry.enable`](#opt-services.gitlab.registry.enable) set to `true` are advised to back up their state and switch to gitlab's fork by setting [`services.gitlab.registry.package`](#opt-services.gitlab.registry.package) to `pkgs.gitlab-container-registry`.
- `fail2ban` has been updated to 1.0.2, which has a few breaking changes compared to 0.11.2 ([changelog for 1.0.1](https://github.com/fail2ban/fail2ban/blob/1.0.1/ChangeLog), [changelog for 1.0.2](https://github.com/fail2ban/fail2ban/blob/1.0.2/ChangeLog))
- `albert` has been updated from 0.17.6 to 0.20.13, and 0.18.0 changed the config format and many plugins ([changelog for 0.18.0](https://github.com/albertlauncher/albert/blob/v0.18.0/CHANGELOG.md))
@ -306,12 +311,10 @@ In addition to numerous new and updated packages, this release has the following
- Please note that an upgrade from v24 (or older) to v26 directly is not possible. Please upgrade to `nextcloud25` (or earlier) first. Nextcloud prohibits skipping major versions while upgrading. You can upgrade by declaring [`services.nextcloud.package = pkgs.nextcloud25;`](options.html#opt-services.nextcloud.package).
- It's recommended to use the latest version available (i.e. v26) and to specify that using `services.nextcloud.package`.
- .NET 5.0 and .NET 3.1 were removed due to being end-of-life, use a newer, supported .NET version - https://dotnet.microsoft.com/en-us/platform/support/policy/dotnet-core
- .NET 5.0 and .NET 3.1 were removed due to being end-of-life, use a newer, supported .NET version. Visit the [Support Policy](https://dotnet.microsoft.com/en-us/platform/support/policy/dotnet-core) for more information.
- The iputils package, which is installed by default, no longer provides the
`ninfod`, `rarpd` and `rdisc` tools. See
[upstream's release notes](https://github.com/iputils/iputils/releases/tag/20221126)
for more details and available replacements.
`ninfod`, `rarpd` and `rdisc` tools. See [upstream's release notes](https://github.com/iputils/iputils/releases/tag/20221126) for more details and available replacements.
- The ppp plugin `rp-pppoe.so` has been renamed to `pppoe.so` in ppp 2.4.9. Starting from ppp 2.5.0, there is no longer an alias for backwards compatibility. Configurations that use this plugin must be updated accordingly from `plugin rp-pppoe.so` to `plugin pppoe.so`. See [upstream change](https://github.com/ppp-project/ppp/commit/610a7bd76eb1f99f22317541b35001b1e24877ed).
@ -323,7 +326,7 @@ In addition to numerous new and updated packages, this release has the following
- In `services.fail2ban`, `bantime-increment.<name>` options now default to `null` (except `bantime-increment.enable`) and are used to set the corresponding option in `jail.local` only if not `null`. Also, enforce that `bantime-increment.formula` and `bantime-increment.multipliers` are not both specified.
- The default Asterisk package was changed to v20 from v19. Asterisk versions 16 and 19 have been dropped due to being EOL. You may need to update /var/lib/asterisk to match the template files in `${asterisk-20}/var/lib/asterisk`.
- The default `asterisk` package was changed to v20 from v19. Asterisk versions 16 and 19 have been dropped due to being EOL. You may need to update /var/lib/asterisk to match the template files in `${asterisk-20}/var/lib/asterisk`.
- conntrack helper autodetection has been removed from kernels 6.0 and up upstream, and an assertion was added to ensure things don't silently stop working. Migrate your configuration to assign helpers explicitly or use an older LTS kernel branch as a temporary workaround.
@ -341,7 +344,7 @@ In addition to numerous new and updated packages, this release has the following
- The `qlandkartegt` and `garmindev` packages were removed due to being unmaintained and insecure.
- `go-ethereum` package has been updated to v1.11.5 and the `puppeth` command is no longer available as of v1.11.0.
- The `go-ethereum` package has been updated to v1.11.5 and the `puppeth` command is no longer available as of v1.11.0.
- The `pnpm` package has be updated to from version 7.29.1 to version 8.1.1 and Node.js 14 support has been discontinued (though, there are workarounds if Node.js 14 is still required)
- Migration instructions: ["Before updating pnpm to v8 in your CI, regenerate your pnpm-lock.yaml. To upgrade your lockfile, run pnpm install and commit the changes. Existing dependencies will not be updated; however, due to configuration changes in pnpm v8, some missing peer dependencies may be added to the lockfile and some packages may get deduplicated. You can commit the new lockfile even before upgrading Node.js in the CI, as pnpm v7 already supports the new lockfile format."](https://github.com/pnpm/pnpm/releases/tag/v8.0.0)
@ -350,13 +353,19 @@ In addition to numerous new and updated packages, this release has the following
- The `pict-rs` package was updated from an 0.3 alpha release to 0.3 stable, and related environment variables now require two underscores instead of one.
- The `shattered-pixel-dungeon` game was updated from 1.1.2 to 2.0.2.
- The location of game data has changed. To migrate it, run `mv ~/.shatteredpixel ~/.local/share/.shatteredpixel`
- The update will delete all your in-progress games.
- `espanso` has been updated to major version 2. Therefore, migration steps may need to be performed. See [the official migration instructions](https://espanso.org/docs/migration/overview/) for how to perform these migrations. Further, `espanso-wayland` can now be used for Wayland support.
- Only `k3s` version 1.26 is included. Users of the `k3s_1_24` or `k3s_1_25` packages should upgrade to use the `1.26` version of the package.
## Other Notable Changes {#sec-release-23.05-notable-changes}
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
- A few openssh options have been moved from extraConfig to the new freeform option `settings` and renamed as follows:
- To follow [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) a few options of `openssh` have been moved from `extraConfig` to the new freeform option `settings` and renamed, e.g.:
- `services.openssh.forwardX11` to `services.openssh.settings.X11Forwarding`
- `services.openssh.kbdInteractiveAuthentication` -> `services.openssh.settings.KbdInteractiveAuthentication`
- `services.openssh.passwordAuthentication` to `services.openssh.settings.PasswordAuthentication`
@ -464,10 +473,7 @@ In addition to numerous new and updated packages, this release has the following
- The module `services.headscale` was refactored to be compliant with [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md). To be precise, this means that the following things have changed:
- Most settings have been migrated below [services.headscale.settings](#opt-services.headscale.settings) which is a freeform attribute-set that
will be converted into headscale's YAML config format. This means that the configuration from
[headscale's example configuration](https://github.com/juanfont/headscale/blob/main/config-example.yaml)
can be directly written as attribute-set in Nix within this option.
- Most settings have been migrated below [services.headscale.settings](#opt-services.headscale.settings) which is a freeform attribute-set that will be converted into headscale's YAML config format. This means that the configuration from [headscale's example configuration](https://github.com/juanfont/headscale/blob/main/config-example.yaml) can be directly written as attribute-set in Nix within this option.
- `services.kubo` now unmounts `ipfsMountDir` and `ipnsMountDir` even if it is killed unexpectedly when `autoMount` is enabled.
@ -543,6 +549,8 @@ In addition to numerous new and updated packages, this release has the following
- Booting from a volume managed by the Stratis storage management daemon is now supported. Use `fileSystems.<name>.stratis.poolUuid` to configure the pool containing the fs.
- Only `k3s` version 1.26 is included. Users of the `k3s_1_24` or `k3s_1_25` packages should upgrade to use the version 1.26 of the package.
## Nixpkgs internals {#sec-release-23.05-nixpkgs-internals}
- `buildDunePackage` now defaults to `strictDeps = true` which means that any library should go into `buildInputs` or `checkInputs`. Any executable that is run on the building machine should go into `nativeBuildInputs` or `nativeCheckInputs` respectively. Example of executables are `ocaml`, `findlib` and `menhir`. PPXs are libraries which are built by dune and should therefore not go into `nativeBuildInputs`.

2
nixos/doc/manual/release-notes/rl-2311.section.md
View file

@ -8,6 +8,8 @@
- Create the first release note entry in this section!
- [acme-dns](https://github.com/joohoi/acme-dns), a limited DNS server to handle ACME DNS challenges easily and securely. Available as [services.acme-dns](#opt-services.acme-dns.enable).
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
- [river](https://github.com/riverwm/river), A dynamic tiling wayland compositor. Available as [programs.river](#opt-programs.river.enable).

1
nixos/modules/module-list.nix
View file

@ -808,6 +808,7 @@
./services/network-filesystems/xtreemfs.nix
./services/network-filesystems/yandex-disk.nix
./services/networking/3proxy.nix
./services/networking/acme-dns.nix
./services/networking/adguardhome.nix
./services/networking/alice-lg.nix
./services/networking/amuled.nix

12
nixos/modules/services/misc/docker-registry.nix
View file

@ -49,6 +49,14 @@ in {
options.services.dockerRegistry = {
enable = mkEnableOption (lib.mdDoc "Docker Registry");
package = mkOption {
type = types.package;
description = mdDoc "Which Docker registry package to use.";
default = pkgs.docker-distribution;
defaultText = literalExpression "pkgs.docker-distribution";
example = literalExpression "pkgs.gitlab-container-registry";
};
listenAddress = mkOption {
description = lib.mdDoc "Docker registry host or ip to bind to.";
default = "127.0.0.1";
@ -117,7 +125,7 @@ in {
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
script = ''
${pkgs.docker-distribution}/bin/registry serve ${configFile}
${cfg.package}/bin/registry serve ${configFile}
'';
serviceConfig = {
@ -136,7 +144,7 @@ in {
serviceConfig.Type = "oneshot";
script = ''
${pkgs.docker-distribution}/bin/registry garbage-collect ${configFile}
${cfg.package}/bin/registry garbage-collect ${configFile}
/run/current-system/systemd/bin/systemctl restart docker-registry.service
'';

41
nixos/modules/services/misc/gitlab.nix
View file

@ -9,12 +9,10 @@ let
toml = pkgs.formats.toml {};
yaml = pkgs.formats.yaml {};
ruby = cfg.packages.gitlab.ruby;
postgresqlPackage = if config.services.postgresql.enable then
config.services.postgresql.package
else
pkgs.postgresql_12;
pkgs.postgresql_13;
gitlabSocket = "${cfg.statePath}/tmp/sockets/gitlab.socket";
gitalySocket = "${cfg.statePath}/tmp/sockets/gitaly.socket";
@ -47,9 +45,6 @@ let
[git]
bin_path = "${pkgs.git}/bin/git"
[gitaly-ruby]
dir = "${cfg.packages.gitaly.ruby}"
[gitlab-shell]
dir = "${cfg.packages.gitlab-shell}"
@ -89,6 +84,9 @@ let
};
};
# Redis configuration file
resqueYml = pkgs.writeText "resque.yml" (builtins.toJSON redisConfig);
gitlabConfig = {
# These are the default settings from config/gitlab.example.yml
production = flip recursiveUpdate cfg.extraConfig {
@ -172,7 +170,6 @@ let
SCHEMA = "${cfg.statePath}/db/structure.sql";
GITLAB_UPLOADS_PATH = "${cfg.statePath}/uploads";
GITLAB_LOG_PATH = "${cfg.statePath}/log";
GITLAB_REDIS_CONFIG_FILE = pkgs.writeText "redis.yml" (builtins.toJSON redisConfig);
prometheus_multiproc_dir = "/run/gitlab";
RAILS_ENV = "production";
MALLOC_ARENA_MAX = "2";
@ -556,6 +553,20 @@ in {
default = false;
description = lib.mdDoc "Enable GitLab container registry.";
};
package = mkOption {
type = types.package;
default =
if versionAtLeast config.system.stateVersion "23.11"
then pkgs.gitlab-container-registry
else pkgs.docker-distribution;
defaultText = literalExpression "pkgs.docker-distribution";
description = lib.mdDoc ''
Container registry package to use.
External container registries such as `pkgs.docker-distribution` are not supported
anymore since GitLab 16.0.0.
'';
};
host = mkOption {
type = types.str;
default = config.services.gitlab.host;
@ -1070,6 +1081,13 @@ in {
};
config = mkIf cfg.enable {
warnings = [
(mkIf
(cfg.registry.enable && versionAtLeast (getVersion cfg.packages.gitlab) "16.0.0" && cfg.registry.package == pkgs.docker-distribution)
''Support for container registries other than gitlab-container-registry has ended since GitLab 16.0.0 and is scheduled for removal in a future release.
Please back up your data and migrate to the gitlab-container-registry package.''
)
];
assertions = [
{
@ -1101,8 +1119,8 @@ in {
message = "services.gitlab.secrets.jwsFile must be set!";
}
{
assertion = versionAtLeast postgresqlPackage.version "12.0.0";
message = "PostgreSQL >=12 is required to run GitLab 14. Follow the instructions in the manual section for upgrading PostgreSQL here: https://nixos.org/manual/nixos/stable/index.html#module-services-postgres-upgrading";
assertion = versionAtLeast postgresqlPackage.version "13.6.0";
message = "PostgreSQL >=13.6 is required to run GitLab 16. Follow the instructions in the manual section for upgrading PostgreSQL here: https://nixos.org/manual/nixos/stable/index.html#module-services-postgres-upgrading";
}
];
@ -1213,6 +1231,7 @@ in {
services.dockerRegistry = optionalAttrs cfg.registry.enable {
enable = true;
enableDelete = true; # This must be true, otherwise GitLab won't manage it correctly
package = cfg.package;
extraConfig = {
auth.token = {
realm = "http${optionalString (cfg.https == true) "s"}://${cfg.host}/jwt/auth";
@ -1315,6 +1334,7 @@ in {
cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db
ln -sf ${extraGitlabRb} ${cfg.statePath}/config/initializers/extra-gitlab.rb
ln -sf ${cableYml} ${cfg.statePath}/config/cable.yml
ln -sf ${resqueYml} ${cfg.statePath}/config/resque.yml
${cfg.packages.gitlab-shell}/bin/install
@ -1462,10 +1482,7 @@ in {
partOf = [ "gitlab.target" ];
path = with pkgs; [
openssh
procps # See https://gitlab.com/gitlab-org/gitaly/issues/1562
git
cfg.packages.gitaly.rubyEnv
cfg.packages.gitaly.rubyEnv.wrappedRuby
gzip
bzip2
];

154
nixos/modules/services/networking/acme-dns.nix Normal file
View file

@ -0,0 +1,154 @@
{ lib
, config
, pkgs
, ...
}:
let
cfg = config.services.acme-dns;
format = pkgs.formats.toml { };
inherit (lib)
literalExpression
mdDoc
mkEnableOption
mkOption
mkPackageOptionMD
types
;
domain = "acme-dns.example.com";
in
{
options.services.acme-dns = {
enable = mkEnableOption (mdDoc "acme-dns");
package = mkPackageOptionMD pkgs "acme-dns" { };
settings = mkOption {
description = mdDoc ''
Free-form settings written directly to the `acme-dns.cfg` file.
Refer to <https://github.com/joohoi/acme-dns/blob/master/README.md#configuration> for supported values.
'';
default = { };
type = types.submodule {
freeformType = format.type;
options = {
general = {
listen = mkOption {
type = types.str;
description = mdDoc "IP+port combination to bind and serve the DNS server on.";
default = "[::]:53";
example = "127.0.0.1:53";
};
protocol = mkOption {
type = types.enum [ "both" "both4" "both6" "udp" "udp4" "udp6" "tcp" "tcp4" "tcp6" ];
description = mdDoc "Protocols to serve DNS responses on.";
default = "both";
};
domain = mkOption {
type = types.str;
description = mdDoc "Domain name to serve the requests off of.";
example = domain;
};
nsname = mkOption {
type = types.str;
description = mdDoc "Zone name server.";
example = domain;
};
nsadmin = mkOption {
type = types.str;
description = mdDoc "Zone admin email address for `SOA`.";
example = "admin.example.com";
};
records = mkOption {
type = types.listOf types.str;
description = mdDoc "Predefined DNS records served in addition to the `_acme-challenge` TXT records.";
example = literalExpression ''
[
# replace with your acme-dns server's public IPv4
"${domain}. A 198.51.100.1"
# replace with your acme-dns server's public IPv6
"${domain}. AAAA 2001:db8::1"
# ${domain} should resolve any *.${domain} records
"${domain}. NS ${domain}."
]
'';
};
};
database = {
engine = mkOption {
type = types.enum [ "sqlite3" "postgres" ];
description = mdDoc "Database engine to use.";
default = "sqlite3";
};
connection = mkOption {
type = types.str;
description = mdDoc "Database connection string.";
example = "postgres://user:password@localhost/acmedns";
default = "/var/lib/acme-dns/acme-dns.db";
};
};
api = {
ip = mkOption {
type = types.str;
description = mdDoc "IP to bind the HTTP API on.";
default = "[::]";
example = "127.0.0.1";
};
port = mkOption {
type = types.port;
description = mdDoc "Listen port for the HTTP API.";
default = 8080;
# acme-dns expects this value to be a string
apply = toString;
};
disable_registration = mkOption {
type = types.bool;
description = mdDoc "Whether to disable the HTTP registration endpoint.";
default = false;
example = true;
};
tls = mkOption {
type = types.enum [ "letsencrypt" "letsencryptstaging" "cert" "none" ];
description = mdDoc "TLS backend to use.";
default = "none";
};
};
logconfig = {
loglevel = mkOption {
type = types.enum [ "error" "warning" "info" "debug" ];
description = mdDoc "Level to log on.";
default = "info";
};
};
};
};
};
};
config = lib.mkIf cfg.enable {
systemd.packages = [ cfg.package ];
systemd.services.acme-dns = {
wantedBy = [ "multi-user.target" ];
serviceConfig = {
ExecStart = [ "" "${lib.getExe cfg.package} -c ${format.generate "acme-dns.toml" cfg.settings}" ];
StateDirectory = "acme-dns";
WorkingDirectory = "%S/acme-dns";
DynamicUser = true;
};
};
};
}

20
nixos/modules/services/networking/ssh/sshd.nix
View file

@ -570,14 +570,26 @@ in
assertions = [{ assertion = if cfg.settings.X11Forwarding then cfgc.setXAuthLocation else true;
message = "cannot enable X11 forwarding without setting xauth location";}
{ assertion = lib.lists.unique (map (x: lib.strings.toLower x) (attrNames cfg.settings))
== (map (x: lib.strings.toLower x) (attrNames cfg.settings));
message = "Duplicate sshd config key; does your capitalization match the option's?"; } ]
(let
duplicates =
# Filter out the groups with more than 1 element
lib.filter (l: lib.length l > 1) (
# Grab the groups, we don't care about the group identifiers
lib.attrValues (
# Group the settings that are the same in lower case
lib.groupBy lib.strings.toLower (attrNames cfg.settings)
)
);
formattedDuplicates = lib.concatMapStringsSep ", " (dupl: "(${lib.concatStringsSep ", " dupl})") duplicates;
in
{
assertion = lib.length duplicates == 0;
message = ''Duplicate sshd config key; does your capitalization match the option's? Duplicate keys: ${formattedDuplicates}'';
})]
++ forEach cfg.listenAddresses ({ addr, ... }: {
assertion = addr != null;
message = "addr must be specified in each listenAddresses entry";
});
};
}

50
nixos/tests/acme-dns.nix Normal file
View file

@ -0,0 +1,50 @@
import ./make-test-python.nix ({ ... }: {
name = "acme-dns";
nodes.machine = { pkgs, ... }: {
services.acme-dns = {
enable = true;
settings = {
general = rec {
domain = "acme-dns.home.arpa";
nsname = domain;
nsadmin = "admin.home.arpa";
records = [
"${domain}. A 127.0.0.1"
"${domain}. AAAA ::1"
"${domain}. NS ${domain}."
];
};
logconfig.loglevel = "debug";
};
};
environment.systemPackages = with pkgs; [ curl bind ];
};
testScript = ''
import json
machine.wait_for_unit("acme-dns.service")
machine.wait_for_open_port(53) # dns
machine.wait_for_open_port(8080) # http api
result = machine.succeed("curl --fail -X POST http://localhost:8080/register")
print(result)
registration = json.loads(result)
machine.succeed(f'dig -t TXT @localhost {registration["fulldomain"]} | grep "SOA" | grep "admin.home.arpa"')
# acme-dns exspects a TXT value string length of exactly 43 chars
txt = "___dummy_validation_token_for_txt_record___"
machine.succeed(
"curl --fail -X POST http://localhost:8080/update "
+ f' -H "X-Api-User: {registration["username"]}"'
+ f' -H "X-Api-Key: {registration["password"]}"'
+ f' -d \'{{"subdomain":"{registration["subdomain"]}", "txt":"{txt}"}}\'''
)
assert txt in machine.succeed(f'dig -t TXT +short @localhost {registration["fulldomain"]}')
'';
})

1
nixos/tests/all-tests.nix
View file

@ -95,6 +95,7 @@ in {
_3proxy = runTest ./3proxy.nix;
aaaaxy = runTest ./aaaaxy.nix;
acme = runTest ./acme.nix;
acme-dns = handleTest ./acme-dns.nix {};
adguardhome = runTest ./adguardhome.nix;
aesmd = runTestOn ["x86_64-linux"] ./aesmd.nix;
agate = runTest ./web-servers/agate.nix;

4
nixos/tests/gitlab.nix
View file

@ -19,13 +19,13 @@ let
aliceUsername = "alice";
aliceUserId = "2";
alicePassword = "R5twyCgU0uXC71wT9BBTCqLs6HFZ7h3L";
aliceProjectId = "2";
aliceProjectId = "1";
aliceProjectName = "test-alice";
bobUsername = "bob";
bobUserId = "3";
bobPassword = "XwkkBbl2SiIwabQzgcoaTbhsotijEEtF";
bobProjectId = "3";
bobProjectId = "2";
in {
name = "gitlab";
meta.maintainers = with lib.maintainers; [ globin yayayayaka ];

12
nixos/tests/nginx-http3.nix
View file

@ -76,19 +76,19 @@ in
server.wait_for_open_port(443)
# Check http connections
client.succeed("curl --verbose --http3 https://acme.test | grep 'Hello World!'")
client.succeed("curl --verbose --http3-only https://acme.test | grep 'Hello World!'")
# Check downloadings
client.succeed("curl --verbose --http3 https://acme.test/example.txt --output /tmp/example.txt")
client.succeed("curl --verbose --http3-only https://acme.test/example.txt --output /tmp/example.txt")
client.succeed("cat /tmp/example.txt | grep 'Check http3 protocol.'")
# Check header reading
client.succeed("curl --verbose --http3 --head https://acme.test | grep 'content-type'")
client.succeed("curl --verbose --http3 --head https://acme.test | grep 'HTTP/3 200'")
client.succeed("curl --verbose --http3 --head https://acme.test/error | grep 'HTTP/3 404'")
client.succeed("curl --verbose --http3-only --head https://acme.test | grep 'content-type'")
client.succeed("curl --verbose --http3-only --head https://acme.test | grep 'HTTP/3 200'")
client.succeed("curl --verbose --http3-only --head https://acme.test/error | grep 'HTTP/3 404'")
# Check change User-Agent
client.succeed("curl --verbose --http3 --user-agent 'Curl test 3.0' https://acme.test")
client.succeed("curl --verbose --http3-only --user-agent 'Curl test 3.0' https://acme.test")
server.succeed("cat /var/log/nginx/access.log | grep 'Curl test 3.0'")
server.shutdown()

6
pkgs/applications/audio/reaper/default.nix
View file

@ -25,13 +25,13 @@ let
in
stdenv.mkDerivation rec {
pname = "reaper";
version = "6.79";
version = "6.80";
src = fetchurl {
url = url_for_platform version stdenv.hostPlatform.qemuArch;
hash = {
x86_64-linux = "sha256-Bpsc09y5R/zyVXiDAqRF6n09qKOrBTLjk84z+noeko0=";
aarch64-linux = "sha256-jbyXXeVtFmt7xoIWd4YKFu4AUM6W9LzeIiGoGyaO2lU=";
x86_64-linux = "sha256-By97OxGC9YO7yEHzSjDAZHCtVaub1wNwWMOn4F+Qzpg=";
aarch64-linux = "sha256-11DiFfqULIi4tespho+yOH+Qy4s+lithCt19kb4RfhI=";
}.${stdenv.hostPlatform.system};
};

4
pkgs/applications/blockchains/besu/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "besu";
version = "23.1.2";
version = "23.4.0";
src = fetchurl {
url = "https://hyperledger.jfrog.io/artifactory/${pname}-binaries/${pname}/${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-PTpwmjqrmToIAbQSpHGddOMZ+ULdwT+w8ws8SlTRJTg=";
sha256 = "sha256-ghaVsyVcn2RvTVJ+N0IZyWQW9JgjFSDy7sK+vtxT9aA=";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/applications/blockchains/ledger-live-desktop/default.nix
View file

@ -2,11 +2,11 @@
let
pname = "ledger-live-desktop";
version = "2.58.0";
version = "2.60.0";
src = fetchurl {
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
hash = "sha256-y9D+RKAB/woYmnu8X0armsVaxu0CWbqZpRiEFcN7rYM=";
hash = "sha256-dR6F6elUxZW3EuH71d5P9SOSDq5f5lAsYnrfWrsj2KA=";
};
appimageContents = appimageTools.extractType2 {

4
pkgs/applications/editors/android-studio/default.nix
View file

@ -10,8 +10,8 @@ let
inherit tiling_wm;
};
stableVersion = {
version = "2022.2.1.19"; # "Android Studio Flamingo (2022.2.1) Patch 1"
sha256Hash = "sha256-bAtPlJI3RwqQX6xpEi7S8T2IDc/39MONU3iFpfi8v3A=";
version = "2022.2.1.20"; # "Android Studio Flamingo (2022.2.1) Patch 2"
sha256Hash = "sha256-X+ZuH4cHKfQtfvOF0kLk+QjQ5AR3pTEparczHEUk+uY=";
};
betaVersion = {
version = "2022.3.1.12"; # "Android Studio Giraffe (2022.3.1) Beta 1"

8
pkgs/applications/editors/emacs/elisp-packages/manual-packages/mind-wave/default.nix
View file

@ -47,14 +47,14 @@
# ];
melpaBuild rec {
pname = "mind-wave";
version = "20230322.1348"; # 13:48 UTC
version = "20230523.0332"; # 03:32 UTC
src = pkgs.fetchFromGitHub {
owner = "manateelazycat";
repo = "mind-wave";
rev = "2d94f553a394ce73bcb91490b81e0fc042baa8d3";
sha256 = "sha256-6tmcPYAEch5bX5hEHMiQGDNYEMUOvnxF1Vq0VVpBsYo=";
rev = "5109162b74872091c5090a28389bef8f7020274c";
sha256 = "sha256-ZyXrpb0GLWSGnMsVIGL9qALSBCeIWNF0UwkCFgCKnu8=";
};
commit = "2d94f553a394ce73bcb91490b81e0fc042baa8d3";
commit = "5109162b74872091c5090a28389bef8f7020274c";
# elisp dependencies
packageRequires = [
pkgs.emacsPackages.markdown-mode

4
pkgs/applications/editors/emacs/generic.nix
View file

@ -89,11 +89,11 @@
, withMotif ? false
, withNS ? stdenv.isDarwin && !(variant == "macport" || noGui)
, withPgtk ? false
, withSQLite3 ? false
, withSQLite3 ? lib.versionAtLeast version "29"
, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd
, withToolkitScrollBars ? true
, withTreeSitter ? lib.versionAtLeast version "29"
, withWebP ? false
, withWebP ? lib.versionAtLeast version "29"
, withX ? !(stdenv.isDarwin || noGui || withPgtk)
, withXinput2 ? withX && lib.versionAtLeast version "29"
, withXwidgets ? false

4
pkgs/applications/editors/vim/common.nix
View file

@ -1,12 +1,12 @@
{ lib, fetchFromGitHub }:
rec {
version = "9.0.1441";
version = "9.0.1562";
src = fetchFromGitHub {
owner = "vim";
repo = "vim";
rev = "v${version}";
hash = "sha256-tGWOIXx4gNMg0CB4ytUrj9bQLXw+4pl2lfgGR81+EJk=";
hash = "sha256-+QKh3CxSjwcJ+Rj9RHYHRKSZixkfA1ZCAPDIyV/Npt8=";
};
enableParallelBuilding = true;

554
pkgs/applications/editors/vim/plugins/generated.nix
View file

File diff suppressed because it is too large Load diff

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

@ -126,12 +126,12 @@
};
c = buildGrammar {
language = "c";
version = "0.0.0+rev=a015709";
version = "0.0.0+rev=0906255";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-c";
rev = "a015709e7d1bb4f823a2fc53175e0cbee96c1c3e";
hash = "sha256-q+jXkhhk46NoKAxVj7fWiUZ2iosW1bRJ0A244Cf4zCA=";
rev = "0906255f8de1d319b8ec682ac8c43e7d2524b4fa";
hash = "sha256-p6k04hWIWawwd99+5OMohr9G2X1HLYJ0VClVsVADalE=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-c";
};
@ -223,6 +223,17 @@
};
meta.homepage = "https://github.com/addcninblue/tree-sitter-cooklang";
};
corn = buildGrammar {
language = "corn";
version = "0.0.0+rev=6a6b0f4";
src = fetchFromGitHub {
owner = "jakestanger";
repo = "tree-sitter-corn";
rev = "6a6b0f4b1d564392c1b6a8ebcc27d94185f72ede";
hash = "sha256-7sBdw8AsRvWo8iSALt9slO0HLVoLTPrU7Tt46mMPLoc=";
};
meta.homepage = "https://github.com/jakestanger/tree-sitter-corn";
};
cpon = buildGrammar {
language = "cpon";
version = "0.0.0+rev=f4b3cbc";
@ -236,12 +247,12 @@
};
cpp = buildGrammar {
language = "cpp";
version = "0.0.0+rev=70aed2e";
version = "0.0.0+rev=4c917d5";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-cpp";
rev = "70aed2e9e83eb7320ab7c454d3084300bf587037";
hash = "sha256-3gTLqz1H/7A8+2NiZmR/jBPt4Rh/Wvlcxt/aD7w8T8A=";
rev = "4c917d560572dc2b3704b041715b2729fa199963";
hash = "sha256-pBlhhUV1lN7wIP1E0vfzAcGGlGDnByp7pdKJzvn4/ts=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp";
};
@ -258,12 +269,12 @@
};
cuda = buildGrammar {
language = "cuda";
version = "0.0.0+rev=9c20a31";
version = "0.0.0+rev=867c97e";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-cuda";
rev = "9c20a3120c405db9efda9349cd005c29f2aace3c";
hash = "sha256-LOCC9Si6RFlxK3TQrApYjAquuhYFp2empRnZMwVSO30=";
rev = "867c97ed7769e56bff99f7122cf63effadb812cc";
hash = "sha256-eSWY1z4kRD07YYeDTxGmiuI8FFClFsOfyaCDRtkEX1M=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda";
};
@ -579,12 +590,12 @@
};
gitcommit = buildGrammar {
language = "gitcommit";
version = "0.0.0+rev=9d8c81e";
version = "0.0.0+rev=5e3263c";
src = fetchFromGitHub {
owner = "gbprod";
repo = "tree-sitter-gitcommit";
rev = "9d8c81e8e64b3b4f4c36de1425c5fc841097d7f4";
hash = "sha256-L3v+dQZhwC+kBOHf3YVbZjuCU+idbUDByEdUBmeGAlo=";
rev = "5e3263c856d2de7ecbcfb646352c8e29dc2b83e6";
hash = "sha256-Hzck3DfxzWz30ma52CbzC/Wyiqx2BlKoaqtiYgPKl/o=";
};
meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit";
};
@ -601,12 +612,12 @@
};
gleam = buildGrammar {
language = "gleam";
version = "0.0.0+rev=ae79782";
version = "0.0.0+rev=2d5d6b0";
src = fetchFromGitHub {
owner = "gleam-lang";
repo = "tree-sitter-gleam";
rev = "ae79782c00656945db69641378e688cdb78d52c1";
hash = "sha256-8zxNOQnYvCHdkeyQwBGKL8fkRRinB3GUogPuw2X5n4I=";
rev = "2d5d6b001ba12bf1c7ac94679d69ac2bed3151dc";
hash = "sha256-9NHjBGvWLxenbD4dDBdWOOT7fVDIvyigilyd/SDtQtE=";
};
meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam";
};
@ -623,23 +634,23 @@
};
glsl = buildGrammar {
language = "glsl";
version = "0.0.0+rev=190c86e";
version = "0.0.0+rev=29dcda3";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-glsl";
rev = "190c86e633e6a6dfdb8a96f8b8460e347ff93f1c";
hash = "sha256-cwSidS+gzQKrvnmDihay0OfatTsBpEo/HEUIcRng5yk=";
rev = "29dcda3e8299b91df24cafd24bba43cdd3ca2456";
hash = "sha256-oBb+Mkyoz74+VrMSCK0z8UtP6O/Cfwo0V/IlF9b9Gk4=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl";
};
go = buildGrammar {
language = "go";
version = "0.0.0+rev=64457ea";
version = "0.0.0+rev=7cccc30";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-go";
rev = "64457ea6b73ef5422ed1687178d4545c3e91334a";
hash = "sha256-38pkqR9iEIEf9r3IHJPIYgKfWBlb9aQWi1kij04Vo5k=";
rev = "7cccc30535a40da07092626031120ae6b36202d7";
hash = "sha256-b9735WP4EyU7gGNuKwwt6orIqXWMy4iQDthMKU52pQE=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-go";
};
@ -766,12 +777,12 @@
};
hlsl = buildGrammar {
language = "hlsl";
version = "0.0.0+rev=cd7a53e";
version = "0.0.0+rev=e7e2670";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-hlsl";
rev = "cd7a53e9f82a2612cae0115692f964e9d0c416e2";
hash = "sha256-fx+9mpZkMxzuLjGOmT5wZZW2oUHfhLYOlTsL7N5QlEk=";
rev = "e7e2670872c2f1a6556eeedd0b80778b5653e187";
hash = "sha256-i7tloMXu/0PU5eozP1zyZr4lB+jRWTJ/udgENmq+cmY=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl";
};
@ -1244,12 +1255,12 @@
};
ocamllex = buildGrammar {
language = "ocamllex";
version = "0.0.0+rev=ac1d595";
version = "0.0.0+rev=6211855";
src = fetchFromGitHub {
owner = "atom-ocaml";
repo = "tree-sitter-ocamllex";
rev = "ac1d5957e719d49bd6acd27439b79843e4daf8ed";
hash = "sha256-XRxAnl+9F6AYPyd6BGNQOo+KjRs2el78ziyo7NeD1IE=";
rev = "62118551bd9501b8253598b835cb4bef04b31e3d";
hash = "sha256-oHniBpZj325U93vt4lgHPLqLxZj9YyKMwBdVQV59tZ8=";
};
generate = true;
meta.homepage = "https://github.com/atom-ocaml/tree-sitter-ocamllex";
@ -1311,12 +1322,12 @@
};
php = buildGrammar {
language = "php";
version = "0.0.0+rev=ff6a35b";
version = "0.0.0+rev=a17c0ca";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-php";
rev = "ff6a35badb0fe373575196bd728a8a53e9be70bd";
hash = "sha256-mjpomE8jFusmBjXkFFCnliQ2oKhGYK5DRuIO8GPfb+c=";
rev = "a17c0caaf133f7bb37b3531dadcfd0879bea23f1";
hash = "sha256-gXJYJ5tkhjh6KgdLfaKcg5EkaiZmY4hAe2MkW68z98M=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
};
@ -1597,12 +1608,12 @@
};
scala = buildGrammar {
language = "scala";
version = "0.0.0+rev=17a19b0";
version = "0.0.0+rev=e7f7d01";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-scala";
rev = "17a19b0f0505eec059b82e1b2fd8928f5f6f0b02";
hash = "sha256-YvFjzxBQQmL0+Lw8olMiomu6sDiqdTTPuiygHwB3Kww=";
rev = "e7f7d016308e47bfb387581206b77c8c48947fdc";
hash = "sha256-oC8txJr5efT48jzRErPTfK9k10jNibogeoiHjT4RDm0=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
};
@ -1718,12 +1729,12 @@
};
supercollider = buildGrammar {
language = "supercollider";
version = "0.0.0+rev=90c6d9f";
version = "0.0.0+rev=3b35bd0";
src = fetchFromGitHub {
owner = "madskjeldgaard";
repo = "tree-sitter-supercollider";
rev = "90c6d9f777d2b8c4ce497c48b5f270a44bcf3ea0";
hash = "sha256-YF+JFLcRHrWIRky2aI5s294+G6jSyVUgt/1bnZkYGLw=";
rev = "3b35bd0fded4423c8fb30e9585c7bacbcd0e8095";
hash = "sha256-mWTOZ3u9VGjEhjDeYJGd8aVxjVG9kJgKX/wHMZSsaEU=";
};
meta.homepage = "https://github.com/madskjeldgaard/tree-sitter-supercollider";
};

14
pkgs/applications/editors/vim/plugins/overrides.nix
View file

@ -746,6 +746,18 @@ self: super: {
vimCommandCheck = "MinimapToggle";
});
minsnip-nvim = buildVimPluginFrom2Nix {
pname = "minsnip.nvim";
version = "2022-01-04";
src = fetchFromGitHub {
owner = "jose-elias-alvarez";
repo = "minsnip.nvim";
rev = "6ae2f3247b3a2acde540ccef2e843fdfcdfebcee";
sha256 = "1db5az5civ2bnqg7v3g937mn150ys52258c3glpvdvyyasxb4iih";
};
meta.homepage = "https://github.com/jose-elias-alvarez/minsnip.nvim/";
};
ncm2 = super.ncm2.overrideAttrs (old: {
dependencies = with self; [ nvim-yarp ];
});
@ -900,7 +912,7 @@ self: super: {
pname = "sg-nvim-rust";
inherit (old) version src;
cargoHash = "sha256-gnQNQlW/c1vzyR+HbYn7rpxZ1C6WXFcqpylIOTUMZ6g=";
cargoHash = "sha256-9iXKVlhoyyRXCP4Bx9rCHljETdE9UD9PNWqPYDurQnI=";
nativeBuildInputs = [ pkg-config ];

4
pkgs/applications/editors/vim/plugins/vim-plugin-names
View file

@ -436,7 +436,6 @@ https://github.com/chikamichi/mediawiki.vim/,HEAD,
https://github.com/savq/melange-nvim/,,
https://github.com/echasnovski/mini.nvim/,,
https://github.com/wfxr/minimap.vim/,,
https://github.com/jose-elias-alvarez/minsnip.nvim/,,
https://github.com/jghauser/mkdir.nvim/,main,
https://github.com/SidOfc/mkdx/,,
https://github.com/tomasr/molokai/,,
@ -818,6 +817,7 @@ https://github.com/nordtheme/vim/,,nord-vim
https://github.com/dracula/vim/,,dracula-vim
https://github.com/embark-theme/vim/,,embark-vim
https://github.com/catppuccin/vim/,HEAD,catppuccin-vim
https://github.com/inkarkat/vim-AdvancedSorters/,,vim-advanced-sorters
https://github.com/Konfekt/vim-CtrlXA/,,
https://github.com/konfekt/vim-DetectSpellLang/,,
https://github.com/dpelle/vim-LanguageTool/,,
@ -997,6 +997,7 @@ https://github.com/artur-shaik/vim-javacomplete2/,,
https://github.com/pangloss/vim-javascript/,,
https://github.com/jelera/vim-javascript-syntax/,,
https://github.com/lepture/vim-jinja/,,
https://github.com/seirl/vim-jinja-languages/,HEAD,
https://github.com/maksimr/vim-jsbeautify/,,
https://github.com/heavenshell/vim-jsdoc/,,
https://github.com/elzr/vim-json/,,
@ -1039,6 +1040,7 @@ https://github.com/samoshkin/vim-mergetool/,,
https://github.com/idanarye/vim-merginal/,,
https://github.com/david-a-wheeler/vim-metamath/,,
https://github.com/xolox/vim-misc/,,
https://github.com/delroth/vim-molokai-delroth/,HEAD,
https://github.com/crusoexia/vim-monokai/,,
https://github.com/phanviet/vim-monokai-pro/,,
https://github.com/patstockwell/vim-monokai-tasty/,HEAD,

2
pkgs/applications/editors/vscode/extensions/vscodeEnv.nix
View file

@ -19,7 +19,7 @@
, keybindings ? {}
, createKeybindingsIfDoesNotExists ? true
, user-data-dir ? ''"''${TMP}''${name}"/vscode-data-dir''
# if file exists will use it and import the extensions in it into this dervation else will use empty extensions list
# if file exists will use it and import the extensions in it into this derivation else will use empty extensions list
# this file will be created/updated by vscodeExts2nix when vscode exists
, mutableExtensionsFile
}:

14
pkgs/applications/emulators/yuzu/sources.nix
View file

@ -1,19 +1,19 @@
# Generated by ./update.sh - do not update manually!
# Last updated: 2023-05-18
# Last updated: 2023-05-30
{
compatList = {
rev = "5f812033d64da3b70973463b8b160b7fa8aff61d";
rev = "a6be5914e4e5891aafdd5dd55e84649b893cbeac";
hash = "sha256:1hdsza3wf9a0yvj6h55gsl7xqvhafvbz1i8paz9kg7l49b0gnlh1";
};
mainline = {
version = "1437";
hash = "sha256:1yhr4kh4dq78cx2r655xrzb1mr7s85vcmwy731rng8q7v6w8j76p";
version = "1452";
hash = "sha256:1dmk0asrhvkd3cnng4bw294shcy9j3dd4kcsycam2vdvr08v5yb8";
};
ea = {
version = "3596";
distHash = "sha256:0wi0rk7i7xdh52sawr52pkzhq2k63alk1xan1pkwgy5ybcqymr78";
fullHash = "sha256:1x374y17hniada2hbs04295crb0wxxvl9lmy3h9cwwbx1jjax8y8";
version = "3621";
distHash = "sha256:0p8rxpwn9f269008skj7dy6qinpax93jhp33769akrprbh7f22if";
fullHash = "sha256:1ph8frqifk42ypa0fw604k1z4kjisl35cai830cg4zhvd0vv7rn5";
};
}

4
pkgs/applications/misc/klayout/default.nix
View file

@ -5,13 +5,13 @@
mkDerivation rec {
pname = "klayout";
version = "0.28.7";
version = "0.28.8";
src = fetchFromGitHub {
owner = "KLayout";
repo = "klayout";
rev = "v${version}";
hash = "sha256-CA6PNoQtg59Mo7dKIgSVeC4owVuAirJ3mFds1J9IQtI=";
hash = "sha256-xM9bAy+HurJor6v2eVPN9gvUxDkyjKRO8kv4zzv9u7o=";
};
postPatch = ''

29
pkgs/applications/misc/otpclient/default.nix
View file

@ -20,21 +20,40 @@
stdenv.mkDerivation rec {
pname = "otpclient";
version = "3.1.6";
version = "3.1.7";
src = fetchFromGitHub {
owner = "paolostivanin";
repo = pname;
rev = "v${version}";
sha256 = "sha256-v7TvdS0IlfB4oKdaEh7Z3AFJDV1bOMiX5vVD7VhIMCE=";
rev = "refs/tags/v${version}";
hash = "sha256-TklVOUkdhWDG9GqHl0Sz9fah+Xp/M8xgSuDB1q4mljM=";
};
buildInputs = [ gtk3 jansson libgcrypt libzip libpng libcotp zbar protobuf protobufc libsecret qrencode libuuid ];
nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ];
nativeBuildInputs = [
cmake
pkg-config
wrapGAppsHook
];
buildInputs = [
gtk3
jansson
libcotp
libgcrypt
libpng
libsecret
libuuid
libzip
protobuf
protobufc
qrencode
zbar
];
meta = with lib; {
description = "Highly secure and easy to use OTP client written in C/GTK that supports both TOTP and HOTP";
homepage = "https://github.com/paolostivanin/OTPClient";
changelog = "https://github.com/paolostivanin/OTPClient/releases/tag/v${version}";
license = licenses.gpl3Only;
maintainers = with maintainers; [ alexbakker ];
platforms = platforms.linux;

4
pkgs/applications/misc/slweb/default.nix
View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "slweb";
version = "0.5.5";
version = "0.5.6";
src = fetchFromSourcehut {
owner = "~strahinja";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Hk3L++J8JiCRXitNHi9uWb7aYN8lMG3GjfpmNyIpoKU=";
sha256 = "sha256-2jvHgFPnI/Uoa5s+MF3BLTA2I3WXYrsEi+XyImxx6BA=";
};
nativeBuildInputs = [ redo-apenwarr ];

4
pkgs/applications/misc/spicetify-cli/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "spicetify-cli";
version = "2.18.1";
version = "2.19.0";
src = fetchFromGitHub {
owner = "spicetify";
repo = pname;
rev = "v${version}";
sha256 = "sha256-BZuvuvbFCZ6VaztlZhlUZhJ7vf4W49mVHiORhH8oH2Y=";
sha256 = "sha256-ax1e4M+BReVjudcmR1fatMzH/zTNCPG4BWoSNJPQFts=";
};
vendorHash = "sha256-g0SuXDzYjg0mGzeDuB2tQnVnDmTiL5vw0r9QWSgIs3Q=";

4
pkgs/applications/misc/tellico/default.nix
View file

@ -24,14 +24,14 @@
mkDerivation rec {
pname = "tellico";
version = "3.4.6";
version = "3.5";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "office";
repo = pname;
rev = "v${version}";
hash = "sha256-aHA4DYuxh4vzXL82HRGMPfqS0DGqq/FLMEuhsr4eLko=";
hash = "sha256-uMq/iqPAbjR85wkgqUS1pk2BL/eatNFpyKcagjN5rJ4=";
};
postPatch = ''

6
pkgs/applications/networking/avalanchego/default.nix
View file

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "avalanchego";
version = "1.10.1";
version = "1.10.2";
src = fetchFromGitHub {
owner = "ava-labs";
repo = pname;
rev = "v${version}";
hash = "sha256-KGHghhHALMoFuO7i4wq9B2HA2WTA80WSOR5Odpo1Ing=";
hash = "sha256-rQ7WGsDCGR2yrMpNTP3yxnRFEGkCpkFIknxuARYd7TM=";
};
vendorHash = "sha256-+YzC7xjrRI0e8/cOcJM3AZS5hI82H1qFxnfUGMgqXhs=";
vendorHash = "sha256-v8+ASwvXhUT9cz78aWDyWpgHOSoecLCLFMGfjTtRlJQ=";
# go mod vendor has a bug, see: https://github.com/golang/go/issues/57529
proxyVendor = true;

20
pkgs/applications/networking/browsers/chromium/upstream-info.json
View file

@ -1,21 +1,21 @@
{
"stable": {
"version": "113.0.5672.126",
"sha256": "14rdvidabbh0abp932m747iribvpfcha8hhxh9spck9hjkaprvqd",
"sha256bin64": "1w8b41ij6xl8byh1977skxwwq0nivpfn8wb3gv12xvm7sw24jqka",
"version": "114.0.5735.90",
"sha256": "1n16fp0zf38n7i8zb86ilx8g62xjnahf7q0c3zwj6n8pnqh8c6h7",
"sha256bin64": "1dgz21ycc41nxz8y5fqz73ll96vvlrf8vxfn65vy654jw7dsdpw6",
"deps": {
"gn": {
"version": "2023-03-18",
"version": "2023-04-19",
"url": "https://gn.googlesource.com/gn",
"rev": "41fef642de70ecdcaaa26be96d56a0398f95abd4",
"sha256": "12w4g2dl58283allclpi1c4i6ih9v2xvdb9hpbmfda12v8lizmlq"
"rev": "5a004f9427a050c6c393c07ddb85cba8ff3849fa",
"sha256": "01xrh9m9m6x8lz0vxwdw2mrhrvnw93zpg09hwdhqakj06agf4jjk"
}
},
"chromedriver": {
"version": "113.0.5672.63",
"sha256_linux": "09x1p7wk5am3ri7ahsdlg4nas22xcwmxzwa5d6fs6hjygghm2q8j",
"sha256_darwin": "1hbd7mk7lifhk72p0hppj9vz1rnfzklg3pdmfa4ixsbgachvxii6",
"sha256_darwin_aarch64": "1c4gyr86b463fq0k31ajsp2npad871nqpacpxr26imd5zzirmsgf"
"version": "114.0.5735.90",
"sha256_linux": "0i3g79c4vdi5mys295lpzmmh0pgxhh14mjmz9amhq5rrn7w7wy57",
"sha256_darwin": "0l0nzx64vrr2wggwdyrcv0xbv79avr431cppprl4dg62b39wkgba",
"sha256_darwin_aarch64": "0z549y1w855ljia5w8sf9w6398pnn89y28pg26ygqad888b3msql"
}
},
"beta": {

34
pkgs/applications/networking/cluster/terraform-providers/providers.json
View file

@ -37,13 +37,13 @@
"vendorHash": "sha256-5m2ZZ/tuLz8zTt8B1TiokDZeQ9qJYeaVEhqMU04zV2s="
},
"akamai": {
"hash": "sha256-P/5tLtcPqhf48DqqMKKNCOrvT+I60N9rC1W/4RdFXqY=",
"hash": "sha256-IbftoN1fnnl6Z4SkW2DsPvlaNTSLc+oskJBnAM2afpg=",
"homepage": "https://registry.terraform.io/providers/akamai/akamai",
"owner": "akamai",
"repo": "terraform-provider-akamai",
"rev": "v3.6.0",
"rev": "v4.0.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-nwl8GvS/hc07xSzM+wEwOAkT9oQcAuguHaEcM1nWjwg="
"vendorHash": "sha256-Z7HlUJ5VuQ7rBhoprmvS6HwNZ53iUoBnfXzKTV43bzE="
},
"alicloud": {
"hash": "sha256-mwYwZObU2WadA1X3EiCVh5T1iHYfPzluEHSUZtrMz98=",
@ -218,13 +218,13 @@
"vendorHash": "sha256-qIgr+ynaNSfNx1iW5RJrNHvEnlr46dBzIi+5IXYn+3Q="
},
"cloudflare": {
"hash": "sha256-vVVwWZAkTzEQ+toZOblEoq1Xg4zC4zZD4Eoi1ocU6Rc=",
"hash": "sha256-IzxNaYobiQcvXFW+Gd7XQUoo3uI4KI2jdfd9JAMw5Cw=",
"homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare",
"owner": "cloudflare",
"repo": "terraform-provider-cloudflare",
"rev": "v4.6.0",
"rev": "v4.7.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-NuvPhARQucbVEmO6iLWPZDe9VF/xROCbmC7jM7srUmE="
"vendorHash": "sha256-jAdeCVr1hWVPwWFbxiaVP1aF8LeJFi2ua2vM9r65mKI="
},
"cloudfoundry": {
"hash": "sha256-SFA0rG80BWaJHwvAWEugdVd3nR+YGflyYONOuoS++P8=",
@ -437,22 +437,22 @@
"vendorHash": "sha256-KD9X7EOH1btgLtssuz1FFOGtmfNao8HBcKJDty1wtpY="
},
"google": {
"hash": "sha256-lsI1hR9bhzFuepDDNKV761DXbdPJHOvm4OeHg4eVlgU=",
"hash": "sha256-fOgHJ7fTuMYTEO0GfYkuNRumA++geAx4UiVFMjVq3c8=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google",
"rev": "v4.66.0",
"rev": "v4.67.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-O7lg3O54PedUEwWL34H49SvSBXuGH1l5joqEXgkew5Q="
},
"google-beta": {
"hash": "sha256-iSHTFT+AbTOn+DoaMnkw3oiU4IDMEZOsj0S5TPX8800=",
"hash": "sha256-keX6FMqAaWJS8qZ1TjHye94hJ532voVp6atwDuy3u5g=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
"rev": "v4.66.0",
"rev": "v4.67.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-O7lg3O54PedUEwWL34H49SvSBXuGH1l5joqEXgkew5Q="
},
@ -764,11 +764,11 @@
"vendorHash": null
},
"newrelic": {
"hash": "sha256-GTjrbA1IX2OxHDdxyTprWH/ctvjlXJUvqdxqcvDA1ug=",
"hash": "sha256-Dz+aVO6RpGcgo9LCPHFdYCiJ3ja+ftJFii5wWQm0/jc=",
"homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
"owner": "newrelic",
"repo": "terraform-provider-newrelic",
"rev": "v3.23.0",
"rev": "v3.24.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-WjiTfHs+MEc06aNstblGKvd3cTj49JF1fvm+tuR2WH8="
},
@ -882,11 +882,11 @@
"vendorHash": null
},
"pagerduty": {
"hash": "sha256-78DCzzGya9BKzzY4DXG/H+JidqPHObKmxlDCgG08cb8=",
"hash": "sha256-nQy0LYiYoj+d8LaCRJflMwBA9obBD4XUG0oP/9nq/jY=",
"homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
"owner": "PagerDuty",
"repo": "terraform-provider-pagerduty",
"rev": "v2.14.6",
"rev": "v2.15.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@ -1026,13 +1026,13 @@
"vendorHash": null
},
"snowflake": {
"hash": "sha256-2eS56WAEVz1nYiYmfthharyX9giEQ/8kufAwyHCG6PM=",
"hash": "sha256-uHcmAcH2LSypfUFPhB6WmDJL00Oq6andSYSI37s/gJM=",
"homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake",
"owner": "Snowflake-Labs",
"repo": "terraform-provider-snowflake",
"rev": "v0.64.0",
"rev": "v0.65.0",
"spdx": "MIT",
"vendorHash": "sha256-lJUkSd3v8VVoOI9ywiUh7wEPyvhF9Ip2v9kJ43hCwsI="
"vendorHash": "sha256-ZNkZ2GMSBZHz+L626VqT7pTeb8fSYkaCi84O5ggd1FM="
},
"sops": {
"hash": "sha256-D1Yzs8hDimMP9y8ZRbizEhic3vGtLcZjOVSuSMUAqPk=",

6
pkgs/applications/networking/dnscontrol/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "dnscontrol";
version = "4.0.1";
version = "4.1.0";
src = fetchFromGitHub {
owner = "StackExchange";
repo = pname;
rev = "v${version}";
sha256 = "sha256-1JSFhuH/YdWFckFxaky11R8eXl2xzYe5VCk0XGXwCp8=";
sha256 = "sha256-v7ED66CQ1DHfsrOXFJDlH80xL/U9ROn7fpGxPOm2WY4=";
};
vendorHash = "sha256-oO/EMaVkcc054C6VOPjh6r4UhHifq2rQKtrYSg5frFQ=";
vendorHash = "sha256-4tYtqsi8b7jfd3rxr7HY6XXRVROne6mN0hLVkPZdmCs=";
subPackages = [ "." ];

4
pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
View file

@ -2,13 +2,13 @@
(if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec {
pname = "signalbackup-tools";
version = "20230528-1";
version = "20230531";
src = fetchFromGitHub {
owner = "bepaald";
repo = pname;
rev = version;
hash = "sha256-kb7Cu/dQ3hpT3dZxE5f/rIAyYVYroLPEAnRc6ci7Yk8=";
hash = "sha256-VK2/LaWO/zXMqSpeEjUM/PBd4MG76HaXY6kENwADN1k=";
};
postPatch = ''

4
pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
View file

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "teams-for-linux";
version = "1.0.93";
version = "1.1.1";
src = fetchFromGitHub {
owner = "IsmaelMartinez";
repo = pname;
rev = "v${version}";
sha256 = "sha256-mWLjGednrKnEIvrL2iHQP3xoCb6SxptzbE40aJ5wH1U=";
sha256 = "sha256-Yeq74thHzFt4+KDf7cwgyVbTIeXF9/zb81bEAINJbEU=";
};
offlineCache = fetchYarnDeps {

6
pkgs/applications/networking/juju/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "juju";
version = "3.1.2";
version = "3.2.0";
src = fetchFromGitHub {
owner = "juju";
repo = "juju";
rev = "juju-${version}";
sha256 = "sha256-nleWdgIYmIltZKjjFl6axQd2fkL8UIXZRbATU96cdQ0=";
sha256 = "sha256-wm6yWxGFQBlNtFfL1PnUuljy6ODOboiyND4cqPjl1nM=";
};
vendorHash = "sha256-b6C1FbVXHeJqG9Vh8dqqZ+94T42oRM9kVbDmLuOiPvA=";
vendorHash = "sha256-ll0qm0noD1Zox8uOlp2Rr/sFFzQlJlpss4Ot3LQn/g4=";
# Disable tests because it attempts to use a mongodb instance
doCheck = false;

29
pkgs/applications/networking/p2p/pyrosimple/default.nix
View file

@ -6,6 +6,8 @@
, testers
, fetchPypi
, buildPythonPackage
, pythonRelaxDepsHook
, poetry-core
, bencode-py
, apscheduler
, jinja2
@ -24,14 +26,27 @@
}:
let
pname = "pyrosimple";
version = "2.7.0";
pname = "pyrosimple";
version = "2.8.0";
in buildPythonPackage {
inherit pname version;
src = fetchPypi {
inherit pname version;
hash = "sha256-SMqzvTbWFHwnbMQ+6K0m1v+PybceQK5EHEuN8FB6SaU=";
hash = "sha256-K0QjEcGzROlSWuUHWqUbcOdKccrHex2SlwPAmsmIbaQ=";
};
format = "pyproject";
nativeBuildInputs = [
poetry-core
pythonRelaxDepsHook
];
pythonRelaxDeps = [
"python-daemon"
];
propagatedBuildInputs = [
bencode-py
apscheduler
@ -48,9 +63,6 @@ let
tomli-w
] ++ lib.optional withInotify inotify;
in buildPythonPackage {
inherit pname version src propagatedBuildInputs;
passthru = {
updateScript = nix-update-script { };
tests = testers.testVersion {
@ -59,14 +71,13 @@ in buildPythonPackage {
};
};
meta = let inherit (lib) licenses platforms maintainers;
in {
meta = with lib; {
homepage = "https://kannibalox.github.io/pyrosimple/";
description = "A rTorrent client and Python 3 fork of the pyrocore tools";
license = licenses.gpl3Plus;
changelog = "https://github.com/kannibalox/pyrosimple/blob/v${version}/CHANGELOG.md";
platforms = platforms.all;
maintainers = builtins.attrValues { inherit (maintainers) ne9z; };
maintainers = with maintainers; [ ne9z vamega ];
};
}

2
pkgs/applications/networking/p2p/transmission/default.nix
View file

@ -142,7 +142,7 @@ in stdenv.mkDerivation {
'';
homepage = "http://www.transmissionbt.com/";
license = lib.licenses.gpl2Plus; # parts are under MIT
maintainers = with lib.maintainers; [ astsmtl vcunat ];
maintainers = with lib.maintainers; [ astsmtl ];
platforms = lib.platforms.unix;
};

4
pkgs/applications/science/biology/igv/default.nix
View file

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "igv";
version = "2.16.0";
version = "2.16.1";
src = fetchzip {
url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip";
sha256 = "sha256-pfFUtPgHzTWMm3sh4un8SwSYF8HM30HbAQznxlu4Irw=";
sha256 = "sha256-/3ielakIRdm9/iGBKSk+fTyzYRnsMTdCdsKghnziVwA=";
};
installPhase = ''

40
pkgs/applications/science/electronics/gerbv/default.nix
View file

@ -1,31 +1,55 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, gettext, libtool, automake, autoconf, cairo, gtk2-x11, autoreconfHook }:
{ lib
, stdenv
, autoconf
, automake
, autoreconfHook
, cairo
, fetchFromGitHub
, gettext
, gtk2-x11
, libtool
, pkg-config
}:
stdenv.mkDerivation rec {
pname = "gerbv";
version = "2.9.6";
version = "2.9.7";
src = fetchFromGitHub {
owner = "gerbv";
repo = pname;
rev = "v${version}";
hash = "sha256-HNhrnXOBlzfO/roWzTsg0RcJPb0c7RuJepankB5zNts=";
rev = "refs/tags/v${version}";
hash = "sha256-KxKNMWhWwmlIpueDOSWAWADEHFha8axywPJ6rRz0jIg=";
};
postPatch = ''
sed -i '/AC_INIT/s/m4_esyscmd.*/${version}])/' configure.ac
'';
nativeBuildInputs = [ autoreconfHook pkg-config automake autoconf ];
buildInputs = [ gettext libtool cairo gtk2-x11 ];
nativeBuildInputs = [
autoconf
automake
autoreconfHook
pkg-config
];
configureFlags = ["--disable-update-desktop-database"];
buildInputs = [
cairo
gettext
gtk2-x11
libtool
];
configureFlags = [
"--disable-update-desktop-database"
];
meta = with lib; {
description = "A Gerber (RS-274X) viewer";
homepage = "https://gerbv.github.io/";
changelog = "https://github.com/gerbv/gerbv/releases/tag/v${version}";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ mog ];
platforms = platforms.unix;
license = licenses.gpl2;
};
}

6
pkgs/applications/science/logic/alt-ergo/default.nix
View file

@ -2,7 +2,7 @@
let
pname = "alt-ergo";
version = "2.4.2";
version = "2.4.3";
configureScript = "ocaml unix.cma configure.ml";
@ -10,7 +10,7 @@ let
owner = "OCamlPro";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-8pJ/1UAbheQaLFs5Uubmmf5D0oFJiPxF6e2WTZgRyAc=";
hash = "sha256-2XARGr8rLiPMOM0rBBoRv5tZvKYtkLkJctGqLYkMe7Q=";
};
in
@ -20,7 +20,7 @@ let alt-ergo-lib = ocamlPackages.buildDunePackage rec {
configureFlags = [ pname ];
nativeBuildInputs = [ which ];
buildInputs = with ocamlPackages; [ dune-configurator ];
propagatedBuildInputs = with ocamlPackages; [ num ocplib-simplex seq stdlib-shims zarith ];
propagatedBuildInputs = with ocamlPackages; [ dune-build-info num ocplib-simplex seq stdlib-shims zarith ];
preBuild = ''
substituteInPlace src/lib/util/version.ml --replace 'version="dev"' 'version="${version}"'
'';

4
pkgs/applications/terminal-emulators/xterm/default.nix
View file

@ -4,14 +4,14 @@
stdenv.mkDerivation rec {
pname = "xterm";
version = "379";
version = "380";
src = fetchurl {
urls = [
"ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz"
"https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz"
];
hash = "sha256-p93ydO6EuX+xKDZ1AJ1Tyi0CoP/VzlpRGNr8NiPrsxA=";
hash = "sha256-DB3B+oAPpktcWNFt25BecAsnylOKZb6MA7K6V2EQbDg=";
};
strictDeps = true;

50
pkgs/applications/version-management/gitlab/Remove-geo-from-database.yml.patch → pkgs/applications/version-management/gitlab/Remove-unsupported-database-names.patch
View file

@ -1,20 +1,21 @@
From 7d833508e3bc4c737834e9edf1c429d36f67a38c Mon Sep 17 00:00:00 2001
From: "M. A" <mak@nyantec.com>
Date: Sat, 25 Jun 2022 13:34:42 +0000
Subject: [PATCH] Remove geo from database.yml
From 310245bad66048624e199000a1c7eb9d68ce2b5c Mon Sep 17 00:00:00 2001
From: Yaya <mak@nyantec.com>
Date: Tue, 23 May 2023 13:49:18 +0000
Subject: [PATCH] Remove unsupported database names
The only supported ones are main, ci, main_clusterwide.
---
config/database.yml.postgresql | 28 ----------------------------
1 file changed, 28 deletions(-)
config/database.yml.postgresql | 35 ----------------------------------
1 file changed, 35 deletions(-)
diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql
index c1b1247b5b08..a81437d1e1b5 100644
index b210b9c412bc..900612080416 100644
--- a/config/database.yml.postgresql
+++ b/config/database.yml.postgresql
@@ -26,13 +26,6 @@ production:
# username: git
# password: "secure password"
# host: localhost
username: git
password: "secure password"
host: localhost
- geo:
- adapter: postgresql
- encoding: unicode
@ -26,9 +27,9 @@ index c1b1247b5b08..a81437d1e1b5 100644
#
# Development specific
@@ -57,13 +50,6 @@ development:
# host: localhost
# variables:
# statement_timeout: 15s
host: localhost
variables:
statement_timeout: 15s
- geo:
- adapter: postgresql
- encoding: unicode
@ -40,9 +41,9 @@ index c1b1247b5b08..a81437d1e1b5 100644
#
# Staging specific
@@ -84,13 +70,6 @@ staging:
# username: git
# password: "secure password"
# host: localhost
username: git
password: "secure password"
host: localhost
- geo:
- adapter: postgresql
- encoding: unicode
@ -53,10 +54,10 @@ index c1b1247b5b08..a81437d1e1b5 100644
# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".
@@ -117,10 +96,3 @@ test: &test
# prepared_statements: false
# variables:
# statement_timeout: 15s
@@ -117,17 +96,3 @@ test: &test
prepared_statements: false
variables:
statement_timeout: 15s
- geo:
- adapter: postgresql
- encoding: unicode
@ -64,6 +65,13 @@ index c1b1247b5b08..a81437d1e1b5 100644
- username: postgres
- password:
- host: localhost
- embedding:
- adapter: postgresql
- encoding: unicode
- database: gitlabhq_embedding_test
- username: postgres
- password:
- host: localhost
--
2.36.0
2.38.4

16
pkgs/applications/version-management/gitlab/data.json
View file

@ -1,14 +1,14 @@
{
"version": "15.11.6",
"repo_hash": "sha256-qpYVYzxtMgWLXhMn+0TvDqRJOnerfc9OEU1Gs6Ys/Bc=",
"yarn_hash": "02ipm7agjy3c75df76c00k3qq5gpw3d876f6x91xnwizswsv9agb",
"version": "16.0.1",
"repo_hash": "sha256-TApZSavGA361Pue0u21Der6CUABhp/hwewUe9YExLAs=",
"yarn_hash": "0yy04jnfvn5dgciqd105xiwg7chjwp3w6iqbjpylak9h82ci6wlh",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v15.11.6-ee",
"rev": "v16.0.1-ee",
"passthru": {
"GITALY_SERVER_VERSION": "15.11.6",
"GITLAB_PAGES_VERSION": "15.11.6",
"GITLAB_SHELL_VERSION": "14.18.0",
"GITLAB_WORKHORSE_VERSION": "15.11.6"
"GITALY_SERVER_VERSION": "16.0.1",
"GITLAB_PAGES_VERSION": "16.0.1",
"GITLAB_SHELL_VERSION": "14.20.0",
"GITLAB_WORKHORSE_VERSION": "16.0.1"
}
}

4
pkgs/applications/version-management/gitlab/default.nix
View file

@ -70,10 +70,10 @@ let
./remove-hardcoded-locations.patch
# Gitlab edited the default database config since [1] and the
# installer complains about valid keywords only being "main" and "ci".
# installer now complains about valid keywords only being "main", "ci" and "embedded".
#
# [1]: https://gitlab.com/gitlab-org/gitlab/-/commit/99c0fac52b10cd9df62bbe785db799352a2d9028
./Remove-geo-from-database.yml.patch
./Remove-unsupported-database-names.patch
];
# One of the patches uses this variable - if it's unset, execution
# of rake tasks fails.

43
pkgs/applications/version-management/gitlab/gitaly/Gemfile
View file

@ -1,43 +0,0 @@
source 'https://rubygems.org'
gem 'rugged', '~> 1.5.1'
gem 'gitlab-markup', '~> 1.8.0'
gem 'activesupport', '~> 6.1.7.2'
gem 'grpc', '~> 1.42.0' # keep in lock-step with grpc-tools in ../tools/protogem
gem 'sentry-raven', '~> 3.1', require: false
gem 'rbtrace', require: false
# The Gitaly Gem contains the Protobuf and gRPC definitions required by the
# Ruby sidecar.
gem 'gitaly', '~> 15.5.0'
# Labkit provides observability functionality
gem 'gitlab-labkit', '~> 0.31', '>= 0.31.1'
# Detects the open source license the repository includes
# This version needs to be in sync with GitLab CE/EE
gem 'licensee', '~> 9.15'
gem 'google-protobuf', '~> 3.22.3'
gem 'nokogiri', '~> 1.14'
# Rails is currently blocked on the upgrade to the new major version for Redis,
# so we don't upgrade either until the issue is resolved. This is an indirect
# dependency and can thus be removed when the version constraint is gone.
gem 'redis', '~> 4.8.0'
group :development, :test do
gem 'rubocop', '~> 1.38', require: false
gem 'rspec', '~> 3.12.0', require: false
gem 'rspec-parameterized', require: false
gem 'factory_bot', require: false
gem 'pry', '~> 0.13.1', require: false
end
# Gems required in omnibus-gitlab pipeline
group :development, :test, :omnibus do
# Using a fork until https://github.com/pivotal/LicenseFinder/pull/816 is
# resolved. For details, check discussion in
# https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74881
gem 'gitlab-license_finder', require: false
end

207
pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
View file

@ -1,207 +0,0 @@
GEM
remote: https://rubygems.org/
specs:
actionpack (6.1.7.2)
actionview (= 6.1.7.2)
activesupport (= 6.1.7.2)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionview (6.1.7.2)
activesupport (= 6.1.7.2)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activesupport (6.1.7.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
ast (2.4.2)
binding_of_caller (1.0.0)
debug_inspector (>= 0.0.1)
builder (3.2.4)
coderay (1.1.2)
concurrent-ruby (1.2.0)
crass (1.0.6)
debug_inspector (1.1.0)
diff-lcs (1.3)
dotenv (2.7.6)
erubi (1.12.0)
factory_bot (6.2.1)
activesupport (>= 5.0.0)
faraday (1.0.1)
multipart-post (>= 1.2, < 3)
ffi (1.15.5)
gitaly (15.5.0)
grpc (~> 1.0)
gitlab-labkit (0.31.1)
actionpack (>= 5.0.0, < 8.0.0)
activesupport (>= 5.0.0, < 8.0.0)
grpc (>= 1.37)
jaeger-client (~> 1.1.0)
opentracing (~> 0.4)
pg_query (~> 2.1)
redis (> 3.0.0, < 6.0.0)
gitlab-license_finder (6.14.2.1)
bundler
rubyzip (>= 1, < 3)
thor (~> 1.0)
tomlrb (>= 1.3, < 2.1)
with_env (= 1.1.0)
xml-simple (~> 1.1.5)
gitlab-markup (1.8.1)
google-protobuf (3.22.3)
googleapis-common-protos-types (1.4.0)
google-protobuf (~> 3.14)
grpc (1.42.0)
google-protobuf (~> 3.18)
googleapis-common-protos-types (~> 1.0)
i18n (1.12.0)
concurrent-ruby (~> 1.0)
jaeger-client (1.1.0)
opentracing (~> 0.3)
thrift
json (2.6.3)
licensee (9.15.2)
dotenv (~> 2.0)
octokit (~> 4.20)
reverse_markdown (~> 1.0)
rugged (>= 0.24, < 2.0)
thor (>= 0.19, < 2.0)
loofah (2.19.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
method_source (1.0.0)
mini_portile2 (2.8.1)
minitest (5.17.0)
msgpack (1.3.3)
multipart-post (2.1.1)
nokogiri (1.14.1)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
octokit (4.20.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
opentracing (0.5.0)
optimist (3.0.1)
parallel (1.22.1)
parser (3.2.0.0)
ast (~> 2.4.1)
pg_query (2.2.1)
google-protobuf (>= 3.19.2)
proc_to_ast (0.1.0)
coderay
parser
unparser
pry (0.13.1)
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (4.0.7)
racc (1.6.2)
rack (2.2.6.3)
rack-test (2.0.2)
rack (>= 1.3)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.5.0)
loofah (~> 2.19, >= 2.19.1)
rainbow (3.1.1)
rbtrace (0.4.14)
ffi (>= 1.0.6)
msgpack (>= 0.4.3)
optimist (>= 3.0.0)
redis (4.8.0)
regexp_parser (2.6.2)
reverse_markdown (1.4.0)
nokogiri
rexml (3.2.5)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
rspec-mocks (~> 3.12.0)
rspec-core (3.12.0)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-parameterized (1.0.0)
rspec-parameterized-core (< 2)
rspec-parameterized-table_syntax (< 2)
rspec-parameterized-core (1.0.0)
parser
proc_to_ast
rspec (>= 2.13, < 4)
unparser
rspec-parameterized-table_syntax (1.0.0)
binding_of_caller
rspec-parameterized-core (< 2)
rspec-support (3.12.0)
rubocop (1.44.0)
json (~> 2.3)
parallel (~> 1.10)
parser (>= 3.2.0.0)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.24.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.24.1)
parser (>= 3.1.1.0)
ruby-progressbar (1.11.0)
rubyzip (2.3.2)
rugged (1.5.1)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
sentry-raven (3.1.2)
faraday (>= 1.0)
thor (1.1.0)
thrift (0.18.1)
tomlrb (2.0.1)
tzinfo (2.0.5)
concurrent-ruby (~> 1.0)
unicode-display_width (2.4.2)
unparser (0.6.7)
diff-lcs (~> 1.3)
parser (>= 3.2.0)
with_env (1.1.0)
xml-simple (1.1.9)
rexml
zeitwerk (2.6.6)
PLATFORMS
ruby
DEPENDENCIES
activesupport (~> 6.1.7.2)
factory_bot
gitaly (~> 15.5.0)
gitlab-labkit (~> 0.31, >= 0.31.1)
gitlab-license_finder
gitlab-markup (~> 1.8.0)
google-protobuf (~> 3.22.3)
grpc (~> 1.42.0)
licensee (~> 9.15)
nokogiri (~> 1.14)
pry (~> 0.13.1)
rbtrace
redis (~> 4.8.0)
rspec (~> 3.12.0)
rspec-parameterized
rubocop (~> 1.38)
rugged (~> 1.5.1)
sentry-raven (~> 3.1)
BUNDLED WITH
2.4.11

41
pkgs/applications/version-management/gitlab/gitaly/default.nix
View file

@ -1,17 +1,19 @@
{ lib, fetchFromGitLab, fetchFromGitHub, buildGoModule, ruby
, bundlerEnv, pkg-config
{ lib
, fetchFromGitLab
, fetchFromGitHub
, buildGoModule
, pkg-config
# libgit2 + dependencies
, libgit2, openssl, zlib, pcre, http-parser }:
, libgit2
, http-parser
, openssl
, pcre
, zlib
}:
let
rubyEnv = bundlerEnv rec {
name = "gitaly-env";
inherit ruby;
copyGemFiles = true;
gemdir = ./.;
};
version = "15.11.6";
version = "16.0.1";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@ -22,17 +24,17 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-n56Jqgu64+pN4bcH/Sh8/+4StpTEY529a4yVozqtK5Y=";
sha256 = "sha256-2OlCjwcJ0RydbKI15X4wZ20XVclC44McNig95UndDGg=";
};
vendorSha256 = "sha256-gJelagGPogeCdJtRpj4RaYlqzZRhtU0EIhmj1aK4ZOk=";
vendorSha256 = "sha256-KBhTI70eReZGSd7RxwGXcUGa0wDo7q5tU9fUhrLeFO0=";
ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ];
tags = [ "static,system_libgit2" ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ];
buildInputs = [ libgit2 openssl zlib pcre http-parser ];
doCheck = false;
};
@ -46,10 +48,6 @@ in
buildGoModule ({
pname = "gitaly";
passthru = {
inherit rubyEnv;
};
subPackages = [ "cmd/gitaly" "cmd/gitaly-backup" ];
preConfigure = ''
@ -57,12 +55,7 @@ buildGoModule ({
cp -r ${auxBins}/bin/* _build/bin
'';
postInstall = ''
mkdir -p $ruby
cp -rv $src/ruby/{bin,lib} $ruby
'';
outputs = [ "out" "ruby" ];
outputs = [ "out" ];
meta = with lib; {
homepage = "https://gitlab.com/gitlab-org/gitaly";

827
pkgs/applications/version-management/gitlab/gitaly/gemset.nix
View file

@ -1,827 +0,0 @@
{
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0c2y6sqpan68lrx78pvhbxb2917m75s808r6cg1kyygwvg31niza";
type = "gem";
};
version = "6.1.7.2";
};
actionview = {
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10g5gk8h4mfhvgqylzbf591fqf5p78ca35cb97p9bclpv9jfy0za";
type = "gem";
};
version = "6.1.7.2";
};
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "14pjq2k761qaywaznpqq8ziivjk2ks1ma2cjwdflkxqgndxjmsr2";
type = "gem";
};
version = "6.1.7.2";
};
addressable = {
dependencies = ["public_suffix"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp";
type = "gem";
};
version = "2.8.0";
};
ast = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y";
type = "gem";
};
version = "2.4.2";
};
binding_of_caller = {
dependencies = ["debug_inspector"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "078n2dkpgsivcf0pr50981w95nfc2bsrp3wpf9wnxz1qsp8jbb9s";
type = "gem";
};
version = "1.0.0";
};
builder = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr";
type = "gem";
};
version = "3.2.4";
};
coderay = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y";
type = "gem";
};
version = "1.1.2";
};
concurrent-ruby = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qnsflsbjj38im8xq35g0vihlz96h09wjn2dad5g543l3vvrkrx5";
type = "gem";
};
version = "1.2.0";
};
crass = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pfl5c0pyqaparxaqxi6s4gfl21bdldwiawrc0aknyvflli60lfw";
type = "gem";
};
version = "1.0.6";
};
debug_inspector = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01l678ng12rby6660pmwagmyg8nccvjfgs3487xna7ay378a59ga";
type = "gem";
};
version = "1.1.0";
};
diff-lcs = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza";
type = "gem";
};
version = "1.3";
};
dotenv = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0iym172c5337sm1x2ykc2i3f961vj3wdclbyg1x6sxs3irgfsl94";
type = "gem";
};
version = "2.7.6";
};
erubi = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7";
type = "gem";
};
version = "1.12.0";
};
factory_bot = {
dependencies = ["activesupport"];
groups = ["development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pfk942d6qwhw151hxaz7n4knk6whyxqvvywdx2cdw9yhykyaqzq";
type = "gem";
};
version = "6.2.1";
};
faraday = {
dependencies = ["multipart-post"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0wwks9652xwgjm7yszcq5xr960pjypc07ivwzbjzpvy9zh2fw6iq";
type = "gem";
};
version = "1.0.1";
};
ffi = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg";
type = "gem";
};
version = "1.15.5";
};
gitaly = {
dependencies = ["grpc"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hpgljz05rhik15z081ghxw9pw83vz78p12wjdgxj3qz1a4x8pfq";
type = "gem";
};
version = "15.5.0";
};
gitlab-labkit = {
dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yxz433p9gg8avl94wnb68fm89zaq02r179dkirx5db614vkjfiy";
type = "gem";
};
version = "0.31.1";
};
gitlab-license_finder = {
dependencies = ["rubyzip" "thor" "tomlrb" "with_env" "xml-simple"];
groups = ["development" "omnibus" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0fzrv96kbzyqnsdj762x7n0y006rsgsi8k23nad4xsa43d065i71";
type = "gem";
};
version = "6.14.2.1";
};
gitlab-markup = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0yvh8vv9kgd06hc8c1pl2hq56w56vr0n7dr5mz19fx4p2v89y7xb";
type = "gem";
};
version = "1.8.1";
};
google-protobuf = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xcg53yz44cqhcpb85w3ay80kvnniy0v441c9p08wb6zzia2mnq9";
type = "gem";
};
version = "3.22.3";
};
googleapis-common-protos-types = {
dependencies = ["google-protobuf"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04sy3c91nlw2sv53xf2h2yf0cc09bdcvj2qbjsxwzxpbqgfrf255";
type = "gem";
};
version = "1.4.0";
};
grpc = {
dependencies = ["google-protobuf" "googleapis-common-protos-types"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0jjq2ing7px4zvdrg9xcq5a9qsciq6g3v14n95a3d9n6cyg69lmk";
type = "gem";
};
version = "1.42.0";
};
i18n = {
dependencies = ["concurrent-ruby"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi";
type = "gem";
};
version = "1.12.0";
};
jaeger-client = {
dependencies = ["opentracing" "thrift"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1a2qlkc1hkr5hkj2574l1a63sm04bdx98gfhh9m8vvp6psdrnpnb";
type = "gem";
};
version = "1.1.0";
};
json = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6";
type = "gem";
};
version = "2.6.3";
};
licensee = {
dependencies = ["dotenv" "octokit" "reverse_markdown" "rugged" "thor"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1v9x94h19b20wc551vs9a0yvk44w2y3g9ng07fflk26s8jsmjsab";
type = "gem";
};
version = "9.15.2";
};
loofah = {
dependencies = ["crass" "nokogiri"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08qhzck271anrx9y6qa6mh8hwwdzsgwld8q0000rcd7yvvpnjr3c";
type = "gem";
};
version = "2.19.1";
};
method_source = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp";
type = "gem";
};
version = "1.0.0";
};
mini_portile2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp";
type = "gem";
};
version = "2.8.1";
};
minitest = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1kjy67qajw4rnkbjs5jyk7kc3lyhz5613fwj1i8f6ppdk4zampy0";
type = "gem";
};
version = "5.17.0";
};
msgpack = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1lva6bkvb4mfa0m3bqn4lm4s4gi81c40jvdcsrxr6vng49q9daih";
type = "gem";
};
version = "1.3.3";
};
multipart-post = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj";
type = "gem";
};
version = "2.1.1";
};
nokogiri = {
dependencies = ["mini_portile2" "racc"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qr6psd9qgv83pklpw7cpmshkcasnv8d777ksmvwsacwfvvkmnxj";
type = "gem";
};
version = "1.14.1";
};
octokit = {
dependencies = ["faraday" "sawyer"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fl517ld5vj0llyshp3f9kb7xyl9iqy28cbz3k999fkbwcxzhlyq";
type = "gem";
};
version = "4.20.0";
};
opentracing = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "11lj1d8vq0hkb5hjz8q4lm82cddrggpbb33dhqfn7rxhwsmxgdfy";
type = "gem";
};
version = "0.5.0";
};
optimist = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vg2chy1cfmdj6c1gryl8zvjhhmb3plwgyh1jfnpq4fnfqv7asrk";
type = "gem";
};
version = "3.0.1";
};
parallel = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb";
type = "gem";
};
version = "1.22.1";
};
parser = {
dependencies = ["ast"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zk8mdyr0322r11d63rcp5jhz4lakxilhvyvdv0ql5dw4lb83623";
type = "gem";
};
version = "3.2.0.0";
};
pg_query = {
dependencies = ["google-protobuf"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1slcbzzqdv6104l5h8ql6kj43zmnm16g2dav8bc8dasfpwmrg1k0";
type = "gem";
};
version = "2.2.1";
};
proc_to_ast = {
dependencies = ["coderay" "parser" "unparser"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "14c65w48bbzp5lh1cngqd1y25kqvfnq1iy49hlzshl12dsk3z9wj";
type = "gem";
};
version = "0.1.0";
};
pry = {
dependencies = ["coderay" "method_source"];
groups = ["development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0iyw4q4an2wmk8v5rn2ghfy2jaz9vmw2nk8415nnpx2s866934qk";
type = "gem";
};
version = "0.13.1";
};
public_suffix = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb";
type = "gem";
};
version = "4.0.7";
};
racc = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq";
type = "gem";
};
version = "1.6.2";
};
rack = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17wg99w29hpiq9p4cmm8c6kdg4lcw0ll2c36qw7y50gy1cs4h5j2";
type = "gem";
};
version = "2.2.6.3";
};
rack-test = {
dependencies = ["rack"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rjl709krgf499dhjdapg580l2qaj9d91pwzk8ck8fpnazlx1bdd";
type = "gem";
};
version = "2.0.2";
};
rails-dom-testing = {
dependencies = ["activesupport" "nokogiri"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i";
type = "gem";
};
version = "2.0.3";
};
rails-html-sanitizer = {
dependencies = ["loofah"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ygav4xyq943qqyhjmi3mzirn180j565mc9h5j4css59x1sn0cmz";
type = "gem";
};
version = "1.5.0";
};
rainbow = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503";
type = "gem";
};
version = "3.1.1";
};
rbtrace = {
dependencies = ["ffi" "msgpack" "optimist"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0s8prj0klfgpmpfcpdzbf149qrrsdxgnb6w6kkqc9gyars4vyaqn";
type = "gem";
};
version = "0.4.14";
};
redis = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0i4a8hxxcxci3n8hhlm9a8wa7a9m58r6sjvh4749v7362i8cy010";
type = "gem";
};
version = "4.8.0";
};
regexp_parser = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zjg29w5zvar7by1kqck3zilbdzm5iz3jp5d1zn3970krskfazh2";
type = "gem";
};
version = "2.6.2";
};
reverse_markdown = {
dependencies = ["nokogiri"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0w786j869fjhjf72waj0hc9i4ghi45b78a2am27kij4sa2hmsc53";
type = "gem";
};
version = "1.4.0";
};
rexml = {
groups = ["default" "development" "omnibus" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
type = "gem";
};
version = "3.2.5";
};
rspec = {
dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
groups = ["development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c";
type = "gem";
};
version = "3.12.0";
};
rspec-core = {
dependencies = ["rspec-support"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ibb81slc35q5yp276sixp3yrvj9q92wlmi1glbnwlk6g49z8rn4";
type = "gem";
};
version = "3.12.0";
};
rspec-expectations = {
dependencies = ["diff-lcs" "rspec-support"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03ba3lfdsj9zl00v1yvwgcx87lbadf87livlfa5kgqssn9qdnll6";
type = "gem";
};
version = "3.12.2";
};
rspec-mocks = {
dependencies = ["diff-lcs" "rspec-support"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sq2cc9pm5gq411y7iwfvzbmgv3g91lyf7y7cqn1lr3yf1v122nc";
type = "gem";
};
version = "3.12.3";
};
rspec-parameterized = {
dependencies = ["rspec-parameterized-core" "rspec-parameterized-table_syntax"];
groups = ["development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "11mk52x34j957rqccxfqlsqjzg26dz04ipd1v4yx5yraqx1v01ww";
type = "gem";
};
version = "1.0.0";
};
rspec-parameterized-core = {
dependencies = ["parser" "proc_to_ast" "rspec" "unparser"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hfc2q7g8f5s6kdh1chwlalvz3fvj57vlfpn18b23677hm4ljyr8";
type = "gem";
};
version = "1.0.0";
};
rspec-parameterized-table_syntax = {
dependencies = ["binding_of_caller" "rspec-parameterized-core"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "134q0hki279np9dv7mgr85wspdrvhpj9lpvxr9kx6pcwzwg9bpyp";
type = "gem";
};
version = "1.0.0";
};
rspec-support = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12y52zwwb3xr7h91dy9k3ndmyyhr3mjcayk0nnarnrzz8yr48kfx";
type = "gem";
};
version = "3.12.0";
};
rubocop = {
dependencies = ["json" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
groups = ["development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0a2j57r6pvngqlzkmww031gs5isax3nsr9n7cbfpqnh34ljh2lk1";
type = "gem";
};
version = "1.44.0";
};
rubocop-ast = {
dependencies = ["parser"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pdzabz95hv3z5sfbkfqa8bdybsfl13gv7rjb32v3ss8klq99lbd";
type = "gem";
};
version = "1.24.1";
};
ruby-progressbar = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc";
type = "gem";
};
version = "1.11.0";
};
rubyzip = {
groups = ["default" "development" "omnibus" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz";
type = "gem";
};
version = "2.3.2";
};
rugged = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0wnfgxx59nq2wpvi8ll7bqw9x99x5hps6i38xdjrwbb5a3896d58";
type = "gem";
};
version = "1.5.1";
};
sawyer = {
dependencies = ["addressable" "faraday"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz";
type = "gem";
};
version = "0.8.2";
};
sentry-raven = {
dependencies = ["faraday"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0jin9x4f43lplglhr9smv2wxsjgmph2ygqlci4s0v0aq5493ng8h";
type = "gem";
};
version = "3.1.2";
};
thor = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna";
type = "gem";
};
version = "1.1.0";
};
thrift = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1r3k8x3vfaa6wnz8mhpn10938bzmfj489zc18q73xpsb469v0nv9";
type = "gem";
};
version = "0.18.1";
};
tomlrb = {
groups = ["default" "development" "omnibus" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0a83cb5xpyzlr651d46rk5xgq37s46hs9nfqy9baawzs31hm9k2g";
type = "gem";
};
version = "2.0.1";
};
tzinfo = {
dependencies = ["concurrent-ruby"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5";
type = "gem";
};
version = "2.0.5";
};
unicode-display_width = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gi82k102q7bkmfi7ggn9ciypn897ylln1jk9q67kjhr39fj043a";
type = "gem";
};
version = "2.4.2";
};
unparser = {
dependencies = ["diff-lcs" "parser"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1j6ym6cn43ry4lvcal7cv0n9g9awny7kcrn1crp7cwx2vwzffhmf";
type = "gem";
};
version = "0.6.7";
};
with_env = {
groups = ["default" "development" "omnibus" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1r5ns064mbb99hf1dyxsk9183hznc5i7mn3bi86zka6dlvqf9csh";
type = "gem";
};
version = "1.1.0";
};
xml-simple = {
dependencies = ["rexml"];
groups = ["default" "development" "omnibus" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pb9plyl71mdbjr4kllfy53qx6g68ryxblmnq9dilvy837jk24fj";
type = "gem";
};
version = "1.1.9";
};
zeitwerk = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09pqhdi6q4sqv0p1gnjpbcy4az0yv8hrpykjngdgh9qiqd87nfdv";
type = "gem";
};
version = "2.6.6";
};
}

4
pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gitlab-pages";
version = "15.11.6";
version = "16.0.1";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${version}";
sha256 = "sha256-Dl/NCsZCi5S9BKjtQzRg3mj8lzvIa4FMCqprLKXKlHw=";
sha256 = "sha256-RbsPWc3Dc/rMLnSID0dZmHMg3+uK91kI+DXBYPSy81w=";
};
vendorHash = "sha256-s3HHoz9URACuVVhePQQFviTqlQU7vCLOjTJPBlus1Vo=";

6
pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
View file

@ -2,19 +2,19 @@
buildGoModule rec {
pname = "gitlab-shell";
version = "14.18.0";
version = "14.20.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
sha256 = "sha256-dMxWnv+YfoDy9rhuCx+JIxFyjHejttkkqkQ4owdI/4g=";
sha256 = "sha256-5rjrBt0AihSHMYOD6JbXGvvFaUbtYnMHX2Z4K+Svno0=";
};
buildInputs = [ ruby libkrb5 ];
patches = [ ./remove-hardcoded-locations.patch ];
vendorSha256 = "sha256-zqZMZvYteOWTgDnlX8H1i8e/QTbAoTPD6ZNsHsCcLdM=";
vendorSha256 = "sha256-kKbTbOCuAGIbnFXTOZyoVRM5PIackbmND6PrryVvLTM=";
postInstall = ''
cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin

4
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View file

@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "15.11.6";
version = "16.0.1";
src = fetchFromGitLab {
owner = data.owner;
@ -16,7 +16,7 @@ buildGoModule rec {
sourceRoot = "source/workhorse";
vendorSha256 = "sha256-/snYfip1f0TCVoPk80thanYpbYsGjEd+CAcxIt289As=";
vendorSha256 = "sha256-B9YZkqAMYvTnnWx2tYEF0VZ/+9LZaWS5euQ9ZX2m49E=";
buildInputs = [ git ];
ldflags = [ "-X main.Version=${version}" ];
doCheck = false;

10
pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
View file

@ -31,10 +31,10 @@ index da1a15302da..c846db93e5c 100644
## Webpack settings
# If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 99335321f28..9d9d1c48af4 100644
index d096174fca3a..02d0f689c523 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -185,7 +185,7 @@
@@ -206,7 +206,7 @@
Settings.gitlab['user_home'] ||= begin
Etc.getpwnam(Settings.gitlab['user']).dir
rescue ArgumentError # no user configured
@ -43,13 +43,13 @@ index 99335321f28..9d9d1c48af4 100644
end
Settings.gitlab['time_zone'] ||= nil
Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil?
@@ -794,7 +794,7 @@
@@ -959,7 +959,7 @@
# Git
#
Settings['git'] ||= Settingslogic.new({})
Settings['git'] ||= {}
-Settings.git['bin_path'] ||= '/usr/bin/git'
+Settings.git['bin_path'] ||= 'git'
# Important: keep the satellites.path setting until GitLab 9.0 at
# least. This setting is fed to 'rm -rf' in
diff --git a/config/puma.rb.example b/config/puma.rb.example

52
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
View file

@ -2,7 +2,7 @@
source 'https://rubygems.org'
if ENV['BUNDLER_CHECKSUM_VERIFICATION_OPT_IN'] # this verification is still experimental
if ENV.fetch('BUNDLER_CHECKSUM_VERIFICATION_OPT_IN', 'false') != 'false' # this verification is still experimental
$LOAD_PATH.unshift(File.expand_path("vendor/gems/bundler-checksum/lib", __dir__))
require 'bundler-checksum'
BundlerChecksum.patch!
@ -17,9 +17,7 @@ gem 'rails', '~> 6.1.7.2'
gem 'bootsnap', '~> 1.16.0', require: false
# Pin openssl to match the version bundled with our supported Rubies.
# See https://stdgems.org/openssl/#gem-version.
gem 'openssl', '3.0.2'
gem 'openssl', '~> 3.0'
gem 'ipaddr', '~> 1.2.5'
# Responders respond_to and respond_with
@ -27,10 +25,12 @@ gem 'responders', '~> 3.0'
gem 'sprockets', '~> 3.7.0'
gem 'view_component', '~> 2.74.1'
gem 'view_component', '~> 2.82.0'
# Supported DBs
gem 'pg', '~> 1.4.6'
gem 'pg', '~> 1.5.3'
gem 'neighbor', '~> 0.2.3'
gem 'rugged', '~> 1.5'
gem 'grape-path-helpers', '~> 1.7.1'
@ -46,14 +46,13 @@ gem 'devise', '~> 4.8.1'
gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable'
gem 'bcrypt', '~> 3.1', '>= 3.1.14'
gem 'doorkeeper', '~> 5.6', '>= 5.6.6'
gem 'doorkeeper-openid_connect', '~> 1.8', '>= 1.8.5'
gem 'doorkeeper-openid_connect', '~> 1.8', '>= 1.8.6'
gem 'rexml', '~> 3.2.5'
gem 'ruby-saml', '~> 1.13.0'
gem 'omniauth', '~> 2.1.0'
gem 'omniauth-auth0', '~> 3.1'
gem 'omniauth-azure-activedirectory-v2', '~> 2.0'
gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem README.md
gem 'omniauth-cas3', '~> 1.1.4', path: 'vendor/gems/omniauth-cas3' # See vendor/gems/omniauth-cas3/README.md
gem 'omniauth-dingtalk-oauth2', '~> 1.0'
gem 'omniauth-alicloud', '~> 2.0.1'
gem 'omniauth-facebook', '~> 4.0.0'
@ -61,7 +60,7 @@ gem 'omniauth-github', '2.0.1'
gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md
gem 'omniauth-google-oauth2', '~> 1.1'
gem 'omniauth-oauth2-generic', '~> 0.2.2'
gem 'omniauth-saml', '~> 2.0.0'
gem 'omniauth-saml', '~> 2.1.0'
gem 'omniauth-twitter', '~> 1.4'
gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md
gem 'omniauth_openid_connect', '~> 0.6.1'
@ -86,7 +85,6 @@ gem 'invisible_captcha', '~> 2.0.0'
gem 'devise-two-factor', '~> 4.0.2'
gem 'rqrcode-rails3', '~> 0.1.7'
gem 'attr_encrypted', '~> 3.2.4', path: 'vendor/gems/attr_encrypted'
gem 'u2f', '~> 0.2.1'
# GitLab Pages
gem 'validates_hostname', '~> 1.0.11'
@ -174,9 +172,9 @@ gem 'seed-fu', '~> 2.3.7'
gem 'elasticsearch-model', '~> 7.2'
gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation'
gem 'elasticsearch-api', '7.13.3'
gem 'aws-sdk-core', '~> 3.171.0'
gem 'aws-sdk-core', '~> 3.172.0'
gem 'aws-sdk-cloudformation', '~> 1'
gem 'aws-sdk-s3', '~> 1.121.0'
gem 'aws-sdk-s3', '~> 1.122.0'
gem 'faraday_middleware-aws-sigv4', '~>0.3.0'
gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections
@ -207,7 +205,7 @@ gem 'diffy', '~> 3.4'
gem 'diff_match_patch', '~> 0.1.0'
# Application server
gem 'rack', '~> 2.2.6', '>= 2.2.6.4'
gem 'rack', '~> 2.2.7'
# https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually
gem 'rack-timeout', '~> 0.6.3', require: 'rack/timeout/base'
@ -241,9 +239,6 @@ gem 'rainbow', '~> 3.0'
# Progress bar
gem 'ruby-progressbar', '~> 1.10'
# GitLab settings
gem 'settingslogic', '~> 2.0.9'
# Linear-time regex library for untrusted regular expressions
gem 're2', '~> 1.6.0'
@ -289,13 +284,14 @@ gem 'kubeclient', '~> 4.11.0'
# AI
gem 'ruby-openai', '~> 3.7'
gem 'circuitbox', '2.0.0'
# Sanitize user input
gem 'sanitize', '~> 6.0'
gem 'babosa', '~> 1.0.4'
# Sanitizes SVG input
gem 'loofah', '~> 2.20.0'
gem 'loofah', '~> 2.21.0'
# Working with license
# Detects the open source license the repository includes
@ -344,7 +340,7 @@ gem 'pg_query', '~> 2.2', '>= 2.2.1'
gem 'premailer-rails', '~> 1.10.3'
gem 'gitlab-labkit', '~> 0.31.1'
gem 'gitlab-labkit', '~> 0.32.0'
gem 'thrift', '>= 0.16.0'
# I18n
@ -367,20 +363,20 @@ gem 'snowplow-tracker', '~> 0.8.0'
# Metrics
gem 'webrick', '~> 1.8.1', require: false
gem 'prometheus-client-mmap', '~> 0.19', require: 'prometheus/client'
gem 'prometheus-client-mmap', '~> 0.23', require: 'prometheus/client'
gem 'warning', '~> 1.3.0'
group :development do
gem 'lefthook', '~> 1.3.10', require: false
gem 'lefthook', '~> 1.3.13', require: false
gem 'rubocop'
gem 'solargraph', '~> 0.47.2', require: false
gem 'letter_opener_web', '~> 2.0.0'
gem 'lookbook', '~> 1.5', '>= 1.5.3'
gem 'lookbook', '~> 2.0', '>= 2.0.1'
# Better errors handler
gem 'better_errors', '~> 2.9.1'
gem 'better_errors', '~> 2.10.0'
gem 'sprite-factory', '~> 1.7'
@ -435,7 +431,7 @@ group :development, :test do
end
group :development, :test, :danger do
gem 'gitlab-dangerfiles', '~> 3.9.0', require: false
gem 'gitlab-dangerfiles', '~> 3.10.0', require: false
end
group :development, :test, :coverage do
@ -459,7 +455,8 @@ group :test do
gem 'capybara', '~> 3.39'
gem 'capybara-screenshot', '~> 1.0.26'
gem 'selenium-webdriver', '~> 3.142', '>= 3.142.7'
# 4.9.1 drops Ruby 2.7 support. We can upgrade further after we drop Ruby 2.7 support.
gem 'selenium-webdriver', '= 4.9.0'
gem 'graphlyte', '~> 1.0.0'
@ -484,7 +481,7 @@ gem 'gitlab-mail_room', '~> 0.0.23', require: 'mail_room'
gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text'
gem 'stackprof', '~> 0.2.23', require: false
gem 'stackprof', '~> 0.2.25', require: false
gem 'rbtrace', '~> 0.4', require: false
gem 'memory_profiler', '~> 1.0', require: false
gem 'activerecord-explain-analyze', '~> 0.1', require: false
@ -512,7 +509,7 @@ gem 'spamcheck', '~> 1.3.0'
gem 'gitaly', '~> 15.9.0-rc3'
# KAS GRPC protocol definitions
gem 'kas-grpc', '~> 0.0.2'
gem 'kas-grpc', '~> 0.1.0'
gem 'grpc', '~> 1.42.0'
@ -589,6 +586,9 @@ gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite'
# Work with RPM packages
gem 'arr-pm', '~> 0.0.12'
# Remote Development
gem 'devfile', '~> 0.0.17.pre.alpha1'
# Apple plist parsing
gem 'CFPropertyList', '~> 3.0.0'
gem 'app_store_connect'

118
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
View file

@ -61,14 +61,6 @@ PATH
omniauth (~> 2.0)
omniauth-oauth2 (~> 1.4)
PATH
remote: vendor/gems/omniauth-cas3
specs:
omniauth-cas3 (1.1.4)
addressable (~> 2.3)
nokogiri (~> 1.7, >= 1.7.1)
omniauth (~> 2.0)
PATH
remote: vendor/gems/omniauth-gitlab
specs:
@ -207,19 +199,19 @@ GEM
awesome_print (1.9.2)
awrence (1.2.1)
aws-eventstream (1.2.0)
aws-partitions (1.733.0)
aws-partitions (1.761.0)
aws-sdk-cloudformation (1.41.0)
aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1)
aws-sdk-core (3.171.0)
aws-sdk-core (3.172.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.63.0)
aws-sdk-kms (1.64.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.121.0)
aws-sdk-s3 (1.122.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
@ -256,10 +248,10 @@ GEM
memory_profiler (~> 1)
benchmark-perf (0.6.0)
benchmark-trend (0.4.0)
better_errors (2.9.1)
coderay (>= 1.0.0)
better_errors (2.10.0)
erubi (>= 1.0.0)
rack (>= 0.9.0)
rouge (>= 1.0.0)
bindata (2.4.11)
binding_of_caller (1.0.0)
debug_inspector (>= 0.0.1)
@ -303,8 +295,8 @@ GEM
mixlib-shellout (>= 2.0, < 4.0)
tomlrb (~> 1.2)
chef-utils (16.10.17)
childprocess (3.0.0)
chunky_png (1.3.5)
circuitbox (2.0.0)
citrus (3.0.2)
claide (1.1.0)
claide-plugins (0.9.2)
@ -375,6 +367,7 @@ GEM
thor (>= 0.19, < 2)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
devfile (0.0.17.pre.alpha1)
device_detector (1.0.0)
devise (4.8.1)
bcrypt (~> 3.0)
@ -400,7 +393,7 @@ GEM
unf (>= 0.0.5, < 1.0.0)
doorkeeper (5.6.6)
railties (>= 5)
doorkeeper-openid_connect (1.8.5)
doorkeeper-openid_connect (1.8.6)
doorkeeper (>= 5.5, < 5.7)
jwt (>= 2.5)
dotenv (2.7.6)
@ -595,7 +588,7 @@ GEM
terminal-table (>= 1.5.1)
gitlab-chronic (0.10.5)
numerizer (~> 0.2)
gitlab-dangerfiles (3.9.0)
gitlab-dangerfiles (3.10.0)
danger (>= 8.4.5)
danger-gitlab (>= 8.0.0)
rake
@ -609,7 +602,7 @@ GEM
fog-json (~> 1.2.0)
mime-types
ms_rest_azure (~> 0.12.0)
gitlab-labkit (0.31.1)
gitlab-labkit (0.32.0)
actionpack (>= 5.0.0, < 8.0.0)
activesupport (>= 5.0.0, < 8.0.0)
grpc (>= 1.37)
@ -617,7 +610,7 @@ GEM
opentracing (~> 0.4)
pg_query (~> 2.1)
redis (> 3.0.0, < 6.0.0)
gitlab-license (2.2.1)
gitlab-license (2.2.2)
gitlab-mail_room (0.0.23)
jwt (>= 2.0)
net-imap (>= 0.2.1)
@ -870,7 +863,7 @@ GEM
activerecord
kaminari-core (= 1.2.2)
kaminari-core (1.2.2)
kas-grpc (0.0.2)
kas-grpc (0.1.0)
grpc (~> 1.0)
knapsack (1.21.1)
rake
@ -885,7 +878,7 @@ GEM
rest-client (~> 2.0)
launchy (2.5.0)
addressable (~> 2.7)
lefthook (1.3.10)
lefthook (1.3.13)
letter_opener (1.7.0)
launchy (~> 2.2)
letter_opener_web (2.0.0)
@ -920,20 +913,19 @@ GEM
activesupport (>= 4)
railties (>= 4)
request_store (~> 1.0)
loofah (2.20.0)
loofah (2.21.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lookbook (1.5.3)
actioncable
lookbook (2.0.1)
activemodel
css_parser
htmlbeautifier (~> 1.3)
htmlentities (~> 4.3.4)
listen (~> 3.0)
marcel (~> 1.0)
railties (>= 5.0)
redcarpet (~> 3.5)
rouge (>= 3.26, < 5.0)
view_component (> 2.0, < 4)
view_component (>= 2.0)
yard (~> 0.9.25)
zeitwerk (~> 2.5)
lru_redux (1.1.0)
@ -984,6 +976,8 @@ GEM
mustermann-grape (1.0.1)
mustermann (>= 1.0.0)
nap (1.1.0)
neighbor (0.2.3)
activerecord (>= 5.2)
nenv (0.3.0)
net-http-persistent (4.0.1)
connection_pool (~> 2.2)
@ -1073,9 +1067,9 @@ GEM
omniauth-oauth2-generic (0.2.8)
omniauth-oauth2 (~> 1.0)
rake
omniauth-saml (2.0.0)
omniauth-saml (2.1.0)
omniauth (~> 2.0)
ruby-saml (~> 1.9)
ruby-saml (~> 1.12)
omniauth-twitter (1.4.0)
omniauth-oauth (~> 1.1)
rack
@ -1093,7 +1087,7 @@ GEM
validate_email
validate_url
webfinger (>= 1.0.1)
openssl (3.0.2)
openssl (3.1.0)
openssl-signature_algorithm (1.3.0)
openssl (> 2.0)
opentracing (0.5.0)
@ -1133,7 +1127,7 @@ GEM
tty-color (~> 0.5)
peek (1.1.0)
railties (>= 4.0.0)
pg (1.4.6)
pg (1.5.3)
pg_query (2.2.1)
google-protobuf (>= 3.19.2)
plist (3.6.0)
@ -1151,7 +1145,8 @@ GEM
coderay
parser
unparser
prometheus-client-mmap (0.19.1)
prometheus-client-mmap (0.23.1)
rb_sys (~> 0.9)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
@ -1173,7 +1168,7 @@ GEM
pyu-ruby-sasl (0.0.3.3)
raabro (1.4.0)
racc (1.6.2)
rack (2.2.6.4)
rack (2.2.7)
rack-accept (0.4.5)
rack (>= 0.4)
rack-attack (6.6.1)
@ -1231,6 +1226,7 @@ GEM
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rb_sys (0.9.75)
rbtrace (0.4.14)
ffi (>= 1.0.6)
msgpack (>= 0.4.3)
@ -1399,9 +1395,10 @@ GEM
seed-fu (2.3.7)
activerecord (>= 3.1)
activesupport (>= 3.1)
selenium-webdriver (3.142.7)
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
selenium-webdriver (4.9.0)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
semver_dialects (1.2.1)
pastel (~> 0.8.0)
thor (~> 1.2.0)
@ -1417,7 +1414,6 @@ GEM
sentry-ruby (~> 5.8.0)
sidekiq (>= 3.0)
set (1.0.1)
settingslogic (2.0.9)
sexp_processor (4.16.1)
shellany (0.0.1)
shoulda-matchers (5.1.0)
@ -1486,7 +1482,7 @@ GEM
mini_portile2 (~> 2.8.0)
ssh_data (1.3.0)
ssrf_filter (1.0.8)
stackprof (0.2.23)
stackprof (0.2.25)
state_machines (0.5.0)
state_machines-activemodel (0.8.0)
activemodel (>= 5.1)
@ -1573,7 +1569,6 @@ GEM
ethon (>= 0.9.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
u2f (0.2.1)
uber (0.1.0)
undercover (0.4.5)
imagen (>= 0.1.8)
@ -1605,8 +1600,8 @@ GEM
activesupport (>= 3.0)
version_gem (1.1.0)
version_sorter (2.3.0)
view_component (2.74.1)
activesupport (>= 5.0.0, < 8.0)
view_component (2.82.0)
activesupport (>= 5.2.0, < 8.0)
concurrent-ruby (~> 1.0)
method_source (~> 1.0)
virtus (2.0.0)
@ -1634,6 +1629,7 @@ GEM
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webrick (1.8.1)
websocket (1.2.9)
websocket-driver (0.7.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
@ -1676,8 +1672,8 @@ DEPENDENCIES
autoprefixer-rails (= 10.2.5.1)
awesome_print
aws-sdk-cloudformation (~> 1)
aws-sdk-core (~> 3.171.0)
aws-sdk-s3 (~> 1.121.0)
aws-sdk-core (~> 3.172.0)
aws-sdk-s3 (~> 1.122.0)
axe-core-rspec
babosa (~> 1.0.4)
base32 (~> 0.3.0)
@ -1685,7 +1681,7 @@ DEPENDENCIES
bcrypt (~> 3.1, >= 3.1.14)
benchmark-ips (~> 2.11.0)
benchmark-memory (~> 0.1)
better_errors (~> 2.9.1)
better_errors (~> 2.10.0)
bootsnap (~> 1.16.0)
browser (~> 5.3.1)
bullet (~> 7.0.2)
@ -1695,6 +1691,7 @@ DEPENDENCIES
capybara-screenshot (~> 1.0.26)
carrierwave (~> 1.3)
charlock_holmes (~> 0.7.7)
circuitbox (= 2.0.0)
cloud_profiler_agent (~> 0.0.0)!
commonmarker (~> 0.23.6)
concurrent-ruby (~> 1.1)
@ -1708,6 +1705,7 @@ DEPENDENCIES
declarative_policy (~> 1.1.0)
deprecation_toolkit (~> 1.5.1)
derailed_benchmarks
devfile (~> 0.0.17.pre.alpha1)
device_detector
devise (~> 4.8.1)
devise-pbkdf2-encryptable (~> 0.0.0)!
@ -1716,7 +1714,7 @@ DEPENDENCIES
diffy (~> 3.4)
discordrb-webhooks (~> 3.4)
doorkeeper (~> 5.6, >= 5.6.6)
doorkeeper-openid_connect (~> 1.8, >= 1.8.5)
doorkeeper-openid_connect (~> 1.8, >= 1.8.6)
duo_api (~> 1.3)
ed25519 (~> 1.3.0)
elasticsearch-api (= 7.13.3)
@ -1745,10 +1743,10 @@ DEPENDENCIES
gettext_i18n_rails_js (~> 1.3)
gitaly (~> 15.9.0.pre.rc3)
gitlab-chronic (~> 0.10.5)
gitlab-dangerfiles (~> 3.9.0)
gitlab-dangerfiles (~> 3.10.0)
gitlab-experiment (~> 0.7.1)
gitlab-fog-azure-rm (~> 1.7.0)
gitlab-labkit (~> 0.31.1)
gitlab-labkit (~> 0.32.0)
gitlab-license (~> 2.2.1)
gitlab-mail_room (~> 0.0.23)
gitlab-markup (~> 1.9.0)
@ -1804,19 +1802,19 @@ DEPENDENCIES
json_schemer (~> 0.2.18)
jwt (~> 2.5)
kaminari (~> 1.2.2)
kas-grpc (~> 0.0.2)
kas-grpc (~> 0.1.0)
knapsack (~> 1.21.1)
kramdown (~> 2.3.1)
kubeclient (~> 4.11.0)
lefthook (~> 1.3.10)
lefthook (~> 1.3.13)
letter_opener_web (~> 2.0.0)
license_finder (~> 7.0)
licensee (~> 9.15)
listen (~> 3.7)
lockbox (~> 1.1.1)
lograge (~> 0.5)
loofah (~> 2.20.0)
lookbook (~> 1.5, >= 1.5.3)
loofah (~> 2.21.0)
lookbook (~> 2.0, >= 2.0.1)
lru_redux
mail (= 2.8.1)
mail-smtp_pool (~> 0.1.0)!
@ -1826,6 +1824,7 @@ DEPENDENCIES
mini_magick (~> 4.10.1)
minitest (~> 5.11.0)
multi_json (~> 1.14.1)
neighbor (~> 0.2.3)
net-ldap (~> 0.17.1)
net-ntp
net-protocol (~> 0.1.3)
@ -1841,7 +1840,6 @@ DEPENDENCIES
omniauth-auth0 (~> 3.1)
omniauth-azure-activedirectory-v2 (~> 2.0)
omniauth-azure-oauth2 (~> 0.0.9)!
omniauth-cas3 (~> 1.1.4)!
omniauth-dingtalk-oauth2 (~> 1.0)
omniauth-facebook (~> 4.0.0)
omniauth-github (= 2.0.1)
@ -1849,28 +1847,28 @@ DEPENDENCIES
omniauth-google-oauth2 (~> 1.1)
omniauth-oauth2-generic (~> 0.2.2)
omniauth-salesforce (~> 1.0.5)!
omniauth-saml (~> 2.0.0)
omniauth-saml (~> 2.1.0)
omniauth-twitter (~> 1.4)
omniauth_crowd (~> 2.4.0)!
omniauth_openid_connect (~> 0.6.1)
openid_connect (= 1.3.0)
openssl (= 3.0.2)
openssl (~> 3.0)
org-ruby (~> 0.9.12)
pact (~> 1.63)
parallel (~> 1.19)
parslet (~> 1.8)
peek (~> 1.1)
pg (~> 1.4.6)
pg (~> 1.5.3)
pg_query (~> 2.2, >= 2.2.1)
png_quantizator (~> 0.2.1)
premailer-rails (~> 1.10.3)
prometheus-client-mmap (~> 0.19)
prometheus-client-mmap (~> 0.23)
pry-byebug
pry-rails (~> 0.3.9)
pry-shell (~> 0.6.1)
puma (~> 5.6.5)
puma_worker_killer (~> 0.3.1)
rack (~> 2.2.6, >= 2.2.6.4)
rack (~> 2.2.7)
rack-attack (~> 6.6.1)
rack-cors (~> 1.1.1)
rack-oauth2 (~> 1.21.3)
@ -1912,13 +1910,12 @@ DEPENDENCIES
sassc-rails (~> 2.1.0)
sd_notify (~> 0.1.0)
seed-fu (~> 2.3.7)
selenium-webdriver (~> 3.142, >= 3.142.7)
selenium-webdriver (= 4.9.0)
semver_dialects (~> 1.2.1)
sentry-rails (~> 5.8.0)
sentry-raven (~> 3.1)
sentry-ruby (~> 5.8.0)
sentry-sidekiq (~> 5.8.0)
settingslogic (~> 2.0.9)
shoulda-matchers (~> 5.1.0)
sidekiq (~> 6.5.7)
sidekiq-cron (~> 1.8.0)
@ -1936,7 +1933,7 @@ DEPENDENCIES
sprite-factory (~> 1.7)
sprockets (~> 3.7.0)
ssh_data (~> 1.3)
stackprof (~> 0.2.23)
stackprof (~> 0.2.25)
state_machines-activerecord (~> 0.8.0)
sys-filesystem (~> 1.4.3)
tanuki_emoji (~> 0.6)
@ -1949,14 +1946,13 @@ DEPENDENCIES
toml-rb (~> 2.2.0)
truncato (~> 0.7.12)
typhoeus (~> 1.4.0)
u2f (~> 0.2.1)
undercover (~> 0.4.4)
unf (~> 0.1.4)
unleash (~> 3.2.2)
valid_email (~> 0.1)
validates_hostname (~> 1.0.11)
version_sorter (~> 2.3)
view_component (~> 2.74.1)
view_component (~> 2.82.0)
vmstat (~> 2.3.0)
warning (~> 1.3.0)
webauthn (~> 3.0)

182
pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
View file

@ -379,10 +379,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lmva6m4jjc1vl4mb45ar6jhwzbaw5mb80yc6s2wi729ijlqqhad";
sha256 = "1whf6ppvdibfpsr660ajncig3hyc6q9dvnx645ajrjfz3r7487i9";
type = "gem";
};
version = "1.733.0";
version = "1.761.0";
};
aws-sdk-cloudformation = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
@ -401,10 +401,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0732vv8zi67z25fss1sdvqx0vv1ap3w6hz1avxzwznkjp002vj39";
sha256 = "06scfn1qjfqvgr05ddrcbihlnfi7bffk8r0m5z536w4mm1s3gh6x";
type = "gem";
};
version = "3.171.0";
version = "3.172.0";
};
aws-sdk-kms = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
@ -412,10 +412,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0v87zi28dfmrv7bv91yfldccnpd63n295siirbz7wqv1rajn8n02";
sha256 = "1bcm0c9f7xy5qj5f0z3gddqslhb2vzrj9smc39pgqyq4jmn5kpj0";
type = "gem";
};
version = "1.63.0";
version = "1.64.0";
};
aws-sdk-s3 = {
dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
@ -423,10 +423,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1s5v3799pi7ik53gv7dl02am5pngv6x4azzwx9my09nll4q3lfk8";
sha256 = "01cryf8kfkmlsxb327szcwcagsp7lss5gmk6zxlgap65lv8bc7rx";
type = "gem";
};
version = "1.121.0";
version = "1.122.0";
};
aws-sigv4 = {
dependencies = ["aws-eventstream"];
@ -606,15 +606,15 @@ src:
version = "0.4.0";
};
better_errors = {
dependencies = ["coderay" "erubi" "rack"];
dependencies = ["erubi" "rack" "rouge"];
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "11220lfzhsyf5fcril3qd689kgg46qlpiiaj00hc9mh4mcbc3vrr";
sha256 = "0fhi891k7c4l967bacahq2jhnxswfmbpmbsg1yapczwpm1ynmaz3";
type = "gem";
};
version = "2.9.1";
version = "2.10.0";
};
bindata = {
groups = ["default"];
@ -810,16 +810,6 @@ src:
};
version = "16.10.17";
};
childprocess = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ic028k8xgm2dds9mqnvwwx3ibaz32j8455zxr9f4bcnviyahya5";
type = "gem";
};
version = "3.0.0";
};
chunky_png = {
groups = ["default"];
platforms = [];
@ -830,6 +820,16 @@ src:
};
version = "1.3.5";
};
circuitbox = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "056snhim934xysz630ysfbfdxa64vin5y24h2ha1wvj9fqg9qvj9";
type = "gem";
};
version = "2.0.0";
};
citrus = {
groups = ["default"];
platforms = [];
@ -1158,6 +1158,16 @@ src:
};
version = "0.0.4";
};
devfile = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0v34ivsfpc4d291j89jyg2jz970h94jbz01hdm2jwcmq798yfm98";
type = "gem";
};
version = "0.0.17.pre.alpha1";
};
device_detector = {
groups = ["default"];
platforms = [];
@ -1290,10 +1300,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xi70vfh121an0gjpi388kqdvkaqqycy7kj8r51jhh25g5l5gvnl";
sha256 = "00z0n4ix21nvqk74hhz5ab811366pdjx99cn2i26yiwpwr1nbi4d";
type = "gem";
};
version = "1.8.5";
version = "1.8.6";
};
dotenv = {
groups = ["default"];
@ -2157,10 +2167,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13npl2yqcapsxwzm3b84537sa5s1cplcvba43nlwdcb1d22skfip";
sha256 = "0ha0n6wkw8xm42v4wx9815ivpwjydp88jv9laq19qljj3w2zwk6z";
type = "gem";
};
version = "3.9.0";
version = "3.10.0";
};
gitlab-experiment = {
dependencies = ["activesupport" "request_store"];
@ -2190,20 +2200,20 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yxz433p9gg8avl94wnb68fm89zaq02r179dkirx5db614vkjfiy";
sha256 = "0vl64blqz850d5vahwpwyrsvw4iarn578p8bzmcw11imqpnk62pk";
type = "gem";
};
version = "0.31.1";
version = "0.32.0";
};
gitlab-license = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0c1dy32ai104nh7npxbzjdfpr2yhx2xdrd81zs5dz1r8ifzgdz1r";
sha256 = "07pdi9zcifiw8vjv5zz5jdv2gmaq3rkyxfdkn0j3a0cdh9iwgjrc";
type = "gem";
};
version = "2.2.1";
version = "2.2.2";
};
gitlab-mail_room = {
dependencies = ["jwt" "net-imap" "oauth2"];
@ -3217,10 +3227,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05lsvxb6mpx5h3zmp3pgs3cp52r1kb3a8yr9j7s3ksajb58zf7qi";
sha256 = "1nhdllr7zi19b73q0flbc0lhqb5mn0jrw4bqdang7wfxgfdwf6dj";
type = "gem";
};
version = "0.0.2";
version = "0.1.0";
};
knapsack = {
dependencies = ["rake"];
@ -3282,10 +3292,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1csrkaaqxczq2gc9rmi1524l06wc9bxmivjy9vnlwj5hi4v5ikb8";
sha256 = "0wnz60wh2yb7s5g7an64cw2brl9vvw960xnq4gs3q6drlgmbjl8g";
type = "gem";
};
version = "1.3.10";
version = "1.3.13";
};
letter_opener = {
dependencies = ["launchy"];
@ -3400,21 +3410,21 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mi4ia13fisc97fzd8xcd9wkjdki7zfbmdn1xkdzplicir68gyp8";
sha256 = "0nq23yca06rq8qxxymh4nfbx484k2yll54y780b4ilyvmcipyh7c";
type = "gem";
};
version = "2.20.0";
version = "2.21.0";
};
lookbook = {
dependencies = ["actioncable" "activemodel" "css_parser" "htmlbeautifier" "htmlentities" "listen" "railties" "redcarpet" "rouge" "view_component" "yard" "zeitwerk"];
dependencies = ["activemodel" "css_parser" "htmlbeautifier" "htmlentities" "marcel" "railties" "redcarpet" "rouge" "view_component" "yard" "zeitwerk"];
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0f4b0bp7y7bw57lfynd5d5kgdn0dqkxl2masyk6hvpl5mxsz83sa";
sha256 = "0jpwfdf6wk77ri85ksmsbxvfb4jpba3bx84j0zg10a4rijf7450g";
type = "gem";
};
version = "1.5.3";
version = "2.0.1";
};
lru_redux = {
groups = ["default"];
@ -3749,6 +3759,17 @@ src:
};
version = "1.1.0";
};
neighbor = {
dependencies = ["activerecord"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1r9k34xz7x7fpd18bix0cd5bk2wv6mj8z67f8fr7l30d2717m23h";
type = "gem";
};
version = "0.2.3";
};
nenv = {
groups = ["default" "test"];
platforms = [];
@ -4046,16 +4067,6 @@ src:
};
version = "0.0.10";
};
omniauth-cas3 = {
dependencies = ["addressable" "nokogiri" "omniauth"];
groups = ["default"];
platforms = [];
source = {
path = "${src}/vendor/gems/omniauth-cas3";
type = "path";
};
version = "1.1.4";
};
omniauth-dingtalk-oauth2 = {
dependencies = ["omniauth-oauth2"];
groups = ["default"];
@ -4159,10 +4170,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1is4vnikwmd148gpyv3sm57k4cmdx4il5rm2cng6mqhdcgb4yn82";
sha256 = "01k9rkg97npcgm8r4x3ja8y20hsg4zy0dcjpzafx148q4yxbg74n";
type = "gem";
};
version = "2.0.0";
version = "2.1.0";
};
omniauth-twitter = {
dependencies = ["omniauth-oauth" "rack"];
@ -4222,10 +4233,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0mcg47zz4w902cq6c8cdj62npawgwq68sfh7n7aqy7vm3pgvls9h";
sha256 = "0c649921vg2l939z5cc3jwd8p1v49099pdhxfk7sb9qqx5wi5873";
type = "gem";
};
version = "3.0.2";
version = "3.1.0";
};
openssl-signature_algorithm = {
dependencies = ["openssl"];
@ -4380,10 +4391,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "07m6lxljabw9kyww5k5lgsxsznsm1v5l14r1la09gqka9b5kv3yr";
sha256 = "1zcvxmfa8hxkhpp59fhxyxy1arp70f11zi1jh9c7bsdfspifb7kb";
type = "gem";
};
version = "1.4.6";
version = "1.5.3";
};
pg_query = {
dependencies = ["google-protobuf"];
@ -4461,14 +4472,15 @@ src:
version = "0.1.0";
};
prometheus-client-mmap = {
dependencies = ["rb_sys"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zcw8yx7c2mmmcl3kq7nswansshcpxzqjbxf61xqfydbmhd5z2vi";
sha256 = "0h4w0947zwwg6kbdnvg4vbmrsc8yf5ijb37sg758apks44imym28";
type = "gem";
};
version = "0.19.1";
version = "0.23.1";
};
pry = {
dependencies = ["coderay" "method_source"];
@ -4581,10 +4593,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qgwkcb8kxns8d5187cxjaxf18b7dmg9gh6cr9c1125m0bj2pnfk";
sha256 = "16w217k9z02c4hqizym8dkj6bqmmzx4qdvqpnskgzf174a5pwdxk";
type = "gem";
};
version = "2.2.6.4";
version = "2.2.7";
};
rack-accept = {
dependencies = ["rack"];
@ -4780,6 +4792,16 @@ src:
};
version = "0.10.1";
};
rb_sys = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zx8v677r2gs050z4cdiflp14kp6nx5z285ynj2ach0w0z7jfm23";
type = "gem";
};
version = "0.9.75";
};
rbtrace = {
dependencies = ["ffi" "msgpack" "optimist"];
groups = ["default"];
@ -5526,15 +5548,15 @@ src:
version = "2.3.7";
};
selenium-webdriver = {
dependencies = ["childprocess" "rubyzip"];
dependencies = ["rexml" "rubyzip" "websocket"];
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0adcvp86dinaqq3nhf8p3m0rl2g6q0a4h52k0i7kdnsg1qz9k86y";
sha256 = "1kxnv3ywssagv2q453hasrrrvsv68d5f3ccm33pyacdji88w8pqg";
type = "gem";
};
version = "3.142.7";
version = "4.9.0";
};
semver_dialects = {
dependencies = ["pastel" "thor" "tty-command"];
@ -5601,16 +5623,6 @@ src:
};
version = "1.0.1";
};
settingslogic = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ria5zcrk1nf0b9yia15mdpzw0dqr6wjpbj8dsdbbps81lfsj9ar";
type = "gem";
};
version = "2.0.9";
};
sexp_processor = {
groups = ["default"];
platforms = [];
@ -5910,10 +5922,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02r3a3ny27ljj19bzmxscw2vlmk7sw1p4ppbl2i69g17khi0p4sw";
sha256 = "0bhdgfb0pmw9mav1kw9fn0ka012sa0i3h5ppvqssw5xq48nhxnr8";
type = "gem";
};
version = "0.2.23";
version = "0.2.25";
};
state_machines = {
groups = ["default"];
@ -6357,16 +6369,6 @@ src:
};
version = "2.0.6";
};
u2f = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lsm1hvwcaa9sq13ab1l1zjk0fgcy951ay11v2acx0h6q1iv21vr";
type = "gem";
};
version = "0.2.1";
};
uber = {
groups = ["default"];
platforms = [];
@ -6541,10 +6543,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1h4jhcp4h98lj5f7bn54313na25p9mhal0fw8d8a8m8lq6llgg8b";
sha256 = "1bwvpkv1iqa8g5cmmllx8fx0nprapzrzfvf1m15rr3wxw5hrbdn8";
type = "gem";
};
version = "2.74.1";
version = "2.82.0";
};
virtus = {
dependencies = ["axiom-types" "coercible" "descendants_tracker"];
@ -6631,6 +6633,16 @@ src:
};
version = "1.8.1";
};
websocket = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dib6p55sl606qb4vpwrvj5wh881kk4aqn2zpfapf8ckx7g14jw8";
type = "gem";
};
version = "1.2.9";
};
websocket-driver = {
dependencies = ["websocket-extensions"];
groups = ["default" "test"];

11
pkgs/applications/version-management/gitlab/update.py
View file

@ -225,16 +225,7 @@ def update_gitaly():
"""Update gitaly"""
logger.info("Updating gitaly")
data = _get_data_json()
gitaly_server_version = data["passthru"]["GITALY_SERVER_VERSION"]
repo = GitLabRepo(repo="gitaly")
gitaly_dir = pathlib.Path(__file__).parent / "gitaly"
for fn in ["Gemfile.lock", "Gemfile"]:
with open(gitaly_dir / fn, "w") as f:
f.write(repo.get_file(f"ruby/{fn}", f"v{gitaly_server_version}"))
subprocess.check_output(["bundle", "lock"], cwd=gitaly_dir)
subprocess.check_output(["bundix"], cwd=gitaly_dir)
gitaly_server_version = data['passthru']['GITALY_SERVER_VERSION']
_call_nix_update("gitaly", gitaly_server_version)

4
pkgs/applications/window-managers/cage/default.nix
View file

@ -29,6 +29,10 @@ stdenv.mkDerivation rec {
systemd libGL libX11
];
# https://github.com/cage-kiosk/cage/issues/231
# cage will segfault on start with `-m last` without this
CFLAGS = "-O0";
mesonFlags = [ "-Dxwayland=${lib.boolToString (xwayland != null)}" ];
postFixup = lib.optionalString (xwayland != null) ''

2
pkgs/build-support/remove-references-to/remove-references-to.sh
View file

@ -32,6 +32,6 @@ done
for region in "${regions[@]}"; do
for hook in "${fixupHooks[@]}"; do
eval "$hook" "$i"
eval "$hook" "$region"
done
done

2
pkgs/data/fonts/iosevka/bin.nix
View file

@ -11,7 +11,7 @@ let
(builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
in stdenv.mkDerivation rec {
pname = "${name}-bin";
version = "23.0.0";
version = "24.1.0";
src = fetchurl {
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";

184
pkgs/data/fonts/iosevka/variants.nix
View file

@ -1,95 +1,95 @@
# This file was autogenerated. DO NOT EDIT!
{
iosevka = "01ps5j77h2s1s5mas5vka62c9svhc788a54l9phklyb0g4yzarlh";
iosevka-aile = "0q37layqr3457v62lzbx25g1hr3k8szr1ykhbxdkk1ic2q74q1v6";
iosevka-curly = "1sbs8c0ar4a049qdl55s5v5awf2hifzag6nzaz1r1khzrvdgc9zq";
iosevka-curly-slab = "0a13zc3jkskpxg7s1w74dygla5j3z11rys7wn5k80gi9kj1qvkrr";
iosevka-etoile = "11lka6l13p5ng4zh6rcdscaw4l3wiyw7cnkipp4j3vs1xsvn3gnv";
iosevka-slab = "17hnh2bvf2ikkcnschdbhg7pgi7a0ym9qsnsbjpiyzf606y9258l";
iosevka-ss01 = "0f77i6221s6l8bf21hjygc09r337phmalff1yvb4wmg94444l9zb";
iosevka-ss02 = "15lskgdb866ir760xh6mr11j8wpy19aqmf9plxxk5c593lc520dm";
iosevka-ss03 = "1aj1i4ym9fdpnjrzjqcbwxgkhwf38swhpn23gpnryhpwmyhwpfsq";
iosevka-ss04 = "1plyk72fhq54gg5ha8wwdrbwzymlblr2j10m6ckghhfvq2kq9zvm";
iosevka-ss05 = "1qlc5zpg6i7baf88s0jix1b2sq10kf2xrj9ja4i44p9pps2s7ym0";
iosevka-ss06 = "13j11qdzcqdiqxaz2b4sq52vkff61q3v4sb8bcdw7g0fsh529izd";
iosevka-ss07 = "17l9slmf5dm2wrslgcdc3d3jx7iwzplc8vbfpph7gmp8gvl57h2q";
iosevka-ss08 = "1zdcxayk5bxcfjgp4n2kc6c5w4xvdc4y4f11923b00fink74cavb";
iosevka-ss09 = "06byqvlrw40z3zh7lknrsjrz1dflgxca5ppa441691i9nmip6ivi";
iosevka-ss10 = "0fmrkfrdhcbrcrc2nrpl2cynp2l8fy9p0xmza927bghz97yvz7gv";
iosevka-ss11 = "033qliz9dlfg4cbgr2fv9xc1jscn52r2s198hjhlzip40q6qv4wn";
iosevka-ss12 = "0avv4p9nca65lm97237y09am663ry54y3lq2b7b5pcapqcy4lis0";
iosevka-ss13 = "0kcjb5jfzfk2r1f32s522fpz5pfmaf497miip37d5ia9cs1r7gcd";
iosevka-ss14 = "1j735gzbq12xlxxak0kv9bsls7wsmcy3ry1zqfhqy7ca157nnvbf";
iosevka-ss15 = "0kf9l05hivrjiw0dj3k4py4d351pxj4app72wz9k93m2l3sy1asj";
iosevka-ss16 = "0a66nmfq6nlidj3l589xgqka6vn7wbwhbhfi70wdycmvzzckda3f";
iosevka-ss17 = "183l3cn9rwnadc9jwha174q47f2j6622md1zm2hxlszd5p9kp55k";
iosevka-ss18 = "0c1nw9d0gcaa1n0ih6fda6q4kkr8g770f253mfhdfj9rpcd4vna3";
sgr-iosevka = "1dlglnmicm99rjmrk4amx1s6lvfj2z6w08h1zig7z83yw082fhwd";
sgr-iosevka-aile = "0q8hg8pfdhakxbv03c16ywlzlbvi9c3yc2k8w573d1fzd64xx5pi";
sgr-iosevka-curly = "12qyy41fvf15vbi42hrc9gz143fb8k2mfrsn60l6gwqcjx5vvac3";
sgr-iosevka-curly-slab = "1y95b4xh2zxwcahq55548bay9zk3ci52x1p4dsl52px312hb5c4g";
sgr-iosevka-etoile = "0vdazfxzqpb6k0zfvifrwihl9argidwkwz5xbszjzvwph9fncwss";
sgr-iosevka-fixed = "0mlxdjcp4a306wi2l97z3yim6wd28xmrgrbr5hh8659zmpl76idl";
sgr-iosevka-fixed-curly = "0plxbry5fdrmhn6hcwsy975c9288i76hmdg5g17fhqaqfv564wvb";
sgr-iosevka-fixed-curly-slab = "045hal14gpfkhpziabw9m1g26llrgnbxknkd8d39v2v77d9h5dlg";
sgr-iosevka-fixed-slab = "1whrj3rkmyprp4k6xqdy16cw3vdnjafj9cmz5xyi8ybfinj2056c";
sgr-iosevka-fixed-ss01 = "1cm6h0ih98dpryj1xfy9c0qwn3li2qp2a4pjkwrij8jlb9yyy5bd";
sgr-iosevka-fixed-ss02 = "0qx0sr8bjc79d516qz11v3cpg120yb03zpbfpyv93r2h16i1k1g6";
sgr-iosevka-fixed-ss03 = "0kvzgxf8j8rcbp2l1ma64kzybgkvjylb88sbwd023ani0n1f6cbw";
sgr-iosevka-fixed-ss04 = "1p3dcpwwjf75vlz6hjdzrwih3zchzpq6swwwwdh870y5f4wa5apy";
sgr-iosevka-fixed-ss05 = "1my8z8085prpsy93n6bnjfslpd23lngh1iaiba1az78cd1lz65cg";
sgr-iosevka-fixed-ss06 = "0fqxim4rav68ag06l76x4g0f2235svj8c178nffviz9zffdlk411";
sgr-iosevka-fixed-ss07 = "037xsrg6vcqz9mw8sfcmbw43lzjvfhdbavqsf29kw9xn34nq1bwd";
sgr-iosevka-fixed-ss08 = "06jhjisd9wphc3sgp2ai42klfbclnaya5bl3b2dkd8qzadws5w90";
sgr-iosevka-fixed-ss09 = "1k7wz9rgb7y3ni0yvzfsynni3z7bcwb2rbr1bshx6pj04ifwss31";
sgr-iosevka-fixed-ss10 = "1vx0120xyq0qdzykvffymmkfbdpa4qh6i42n41mbz5r7ga94cgsy";
sgr-iosevka-fixed-ss11 = "1c0b9w8n2k97f2pc1n9sz2h371256f1yhi9xb065y7cza8av7dxd";
sgr-iosevka-fixed-ss12 = "13yvnilwhm1g9h85m928ibpkkv2rj9ma6hbws9xxpykirx9310c1";
sgr-iosevka-fixed-ss13 = "06gzs2hkzisfn00rc8l0brj2j47yarlq9misarrxmv27fk0qpjk3";
sgr-iosevka-fixed-ss14 = "0pxhzvlyk18s63c6z8iqm5w2casbhx22g41b65chqw8sg6bvaxmf";
sgr-iosevka-fixed-ss15 = "1glg7gzh9kgk58mdnc1p3ynqcynv5r8mwkqgaa9bjmm8bz3fzb02";
sgr-iosevka-fixed-ss16 = "02pb9h18ljmyrnkv959mfnd47wzrhp017m3q60f04v11nwxrgmk2";
sgr-iosevka-fixed-ss17 = "01m0rw46jb5a2wik08yv5lb77c3d9z4ii16hyn3dmmn6g8zd7pij";
sgr-iosevka-fixed-ss18 = "1pfp0z7madsqp53mn0fqyy5gzw74vcn3xhxh0cikll2kc6f7hpfd";
sgr-iosevka-slab = "13g829fapi5kxl3v52fqs9h6q0qgbb4b5737r3fsfwjfhgll77jh";
sgr-iosevka-ss01 = "1cppwpkrzg9mk790sq0i1hd5nxm8i8ga8pm7xbbjp3zggn7mgam4";
sgr-iosevka-ss02 = "1il8m3i5p0mbmbnjn68ilbfz1w7cah0q0zhyzf4pn001kk6bdz3d";
sgr-iosevka-ss03 = "0ca37wdygw2vgl024ds564646f09xmblbhwv1xwnvqbycl8vj86l";
sgr-iosevka-ss04 = "1bqmwf3k5wf2iy5ylmfikqd0akk9b26r890c05pbiy2xv8hq51xw";
sgr-iosevka-ss05 = "0rf048x9h3b9nl1n87d66m6fvbw2dlc2shq3h87ipnra7v4iqrbc";
sgr-iosevka-ss06 = "0bcj47j2y91qjyk0h8whb0hrwsappsp16prvldf20cp44qmrk0n0";
sgr-iosevka-ss07 = "08ikzyi6zq82vq5b228jlfkac345qpr6pzwvmxgk46pm40y7slzs";
sgr-iosevka-ss08 = "0z197i1c5z6q45xpc94q47pqsmkzrjgrcpkxj7z9h6vpn241rcbj";
sgr-iosevka-ss09 = "1xbidm26r51q629lridd2gl79lcmg9v6f6v67y064mn89iwpp0dc";
sgr-iosevka-ss10 = "0nczij6kmshh73pw19rjwms73inm84dmxv7r7gwzfyfk3lbbcj9a";
sgr-iosevka-ss11 = "09jng5m8a10c1p8vabjm3bqmfmjw21pbghx5ck9w4bma84cbijvq";
sgr-iosevka-ss12 = "0p629lbkg6ixwzq12vpnryjsdpcvv8cqxan8avy3xg0p62pxw018";
sgr-iosevka-ss13 = "1i0l6qhsb21ix7yaa0y2m396i86r5811xdjsfw2r8g1yp8g3h4kw";
sgr-iosevka-ss14 = "04y4rq6v0dr2ydd9x4arcn911vv7f72slv2r0035aq0b0n02q401";
sgr-iosevka-ss15 = "0fwnxmhc2mijfzhfs9dra1npfpywdg77nmq6sw2mav6bwj29hbyb";
sgr-iosevka-ss16 = "01x3qb0s9dilsf3hzvybfrdl4fclx7j63y8jdnmrpnr6pvqx98gk";
sgr-iosevka-ss17 = "18wfpvsyyvw3lq7v8r63gzkbqda7p9f164iryf7alpamdcm16jr3";
sgr-iosevka-ss18 = "0mzy21qwmzz0kcncnabzx699b68qs4ycyprl2bn3yg06pclpvhcs";
sgr-iosevka-term = "1k5n3k3x0y607q0vd70plms3jnv8x3svrwn9wgvlijrwa11n41mf";
sgr-iosevka-term-curly = "0rj7h5miiri26q1kgj9m2h75ix9q3jq4m2js98wszn2inn94aggv";
sgr-iosevka-term-curly-slab = "18rq47yf9wmlx5d327himmr64kslpxzkj8wjwk91ps83bi4gjm3z";
sgr-iosevka-term-slab = "03asydj05vchzvphl82v74ydzvagplf2484r0mjgmdd5h02qp53r";
sgr-iosevka-term-ss01 = "1jznjiljznr6jm1b9kfal5ri0cm949b4bhsvadgha4qk0f0r8him";
sgr-iosevka-term-ss02 = "1pam3w1x2i0rxhdi4f6cd49b1vpg94qzzv1fqpdshfaws4qyn226";
sgr-iosevka-term-ss03 = "1rrdja2dpbwg127pnz92qq50d91nvzikmf810db3dbmkv1qrqz54";
sgr-iosevka-term-ss04 = "0wgyyri1darx1yij8s16qziwqjgl8kaby888s8vgaj586wr1kjbx";
sgr-iosevka-term-ss05 = "0yhg0nrxsknkf7nyxdvz58vjin2r4z253786x86ilqssijwgsddf";
sgr-iosevka-term-ss06 = "158zydfnjkzpkaslhjdq6ci5xgbhjvvi8wns3z0lw123rwd8g5k9";
sgr-iosevka-term-ss07 = "1hggj50b26gamm4gvcpk8cqb4ppr5k0996vd1jj6s736i96q526a";
sgr-iosevka-term-ss08 = "16ka95n7m3385pdq5v21s42138vgihn31vn604w34w1qak9waxr6";
sgr-iosevka-term-ss09 = "0s85afqk168qmgl6a6czbk9amzryajig2vznqqa4gh871ikjd9cp";
sgr-iosevka-term-ss10 = "1771952mj36r34zadawcvw74rfnjz82l4rz6gj5wiv76pv363idj";
sgr-iosevka-term-ss11 = "1brwab2y13acirsnb0nc3pmbx5fs1rbn8sqz36vwgd0yg7ixskr3";
sgr-iosevka-term-ss12 = "08v1gcl5smf1gqhqij7qbcz504x19bs1f8wmh5xks1xv7xpajs26";
sgr-iosevka-term-ss13 = "0pqyvjaz89pgbnxfd6n7lspb8n0y5gr0rd1g5k8i9j57ilhsdcb2";
sgr-iosevka-term-ss14 = "09h6l6gwn7rlwldgjyznjzq0wz31lkw1bnirsamh9nbicsmcgdxs";
sgr-iosevka-term-ss15 = "0sj28ynxwri9sspqfjm5vj9v14lz0nqsip9a7wakyxxrqr7qnz97";
sgr-iosevka-term-ss16 = "09h7r28nmc881ms17dz557m8blpj6jmvf42s3pjbzwc50d6fykn2";
sgr-iosevka-term-ss17 = "0nkksb99g6ciqr46cyk8xmlij7srbx8fxs4i0fng1qkm6jhfnpky";
sgr-iosevka-term-ss18 = "0spd16nn9lbcxyv091xkgj9c7i6hgqf4qg6bplhmf6dhxhj6kchj";
iosevka = "03jwgk8gd1n2rihwjgwk6zkly77pw2w9gyacs8rl0nx3v5yf1fzb";
iosevka-aile = "0s7dfqm731xzlqgb5vbycks8mycxd27bapxs9hd2dqa07ixk8sl5";
iosevka-curly = "1x2r3zhk3b69c462nj3b5fa890719rzffhl1b3pdl4bsldskdl7z";
iosevka-curly-slab = "1v81vqjyknr2iyzzznmr18vnzhlv94ca0mz84ki9gq977kvz6cav";
iosevka-etoile = "1xcyyfkrxl6a555jh6j7jlxp276qlcgmxjik86dch881ya7pz8c0";
iosevka-slab = "0xl16zr4lf9m5a6ni4zydns8pc9nql9fq0bkvjf716s49s24gpyb";
iosevka-ss01 = "122avzcwnhi25w99mvvpfxmd9y3acipc469lksvhysl0a8cbnk7q";
iosevka-ss02 = "0p6vak2lgkj51mfqhdfk3rv20fdch8a29kqis1rmrr75fnbh2r75";
iosevka-ss03 = "0zx04d82fnz9msb065y2avjvjz0fy881mafqfvc9qkl7ifzn27m7";
iosevka-ss04 = "1y78yjamdsldw0p5j9955mcxzpxsgmqqki65kmpg5p1ygng2489r";
iosevka-ss05 = "02ksvn933piqjcxbss7w60lh968vnyvxv36hn1fd67vqjdg4fi5x";
iosevka-ss06 = "03xn8m2qwf1hx37rjbh0wfwzhfsyzjdyarq09kqmqiba1ik0mfk3";
iosevka-ss07 = "0653xp8xkylvjlgzdk4drh31s3l7vr2l8yll1lbzc91mip6j4q0c";
iosevka-ss08 = "1v4z6c9qqnalbllkns7qvzcygpymzd62lh35g2b93x8mxj0gdrcv";
iosevka-ss09 = "05wc0pvrxw5ghws0g1ldaq29jm116shmfjxhk98nc2lxp3j6bbrd";
iosevka-ss10 = "1hrccz2rlwxcp5m4z14jm9q4ix90z0sqinayi3xjh8yns59r049s";
iosevka-ss11 = "1l66xyam4vgly46vavvvax54radi0r1bhgqgwp5x2r1m98l5da7i";
iosevka-ss12 = "013igxaqb8jfg4b1ssz2jlkyvvf60b4kn08f9z6mlh2hkcv11wwy";
iosevka-ss13 = "1y1w1r3ddyyvngs3x4gjk68w4shbrcka951i5qkf5236hn5hqixm";
iosevka-ss14 = "1gpz4fk19nd28akgsl75jqkz3jmgra1njgjrb9wx35schzbgj6rf";
iosevka-ss15 = "1dapsqa28pqnv3bg9j3qba8qid0kla333xbj5v7zga635qz2gnkw";
iosevka-ss16 = "0cdai2lf38dbn978zpmhbc5qza9s92zyrrph63zhd9dbp0l8ljiv";
iosevka-ss17 = "0js37r1r8swpxcfhwf7w6n5r3azhsrfviw1q6z45pcz1v5l9igph";
iosevka-ss18 = "1cvyi5xiqxns2apkzr806wpfdfkss0nxkwp6di2lzbxfh93q5jvc";
sgr-iosevka = "0020i3p6328kq29vvhmmlic06760s3gffi6pa4yz04dwxfjah3k9";
sgr-iosevka-aile = "1fzlgz102fhygnv4gyfkiz8wr5c6cf49m94d7gifswx6skj1jl2l";
sgr-iosevka-curly = "1lbdfszj2a620dlak2ffrrfzp419bfknaiw0njk98wflfb3sjncp";
sgr-iosevka-curly-slab = "1hfg19aq0az9qgwh4dckf0n6mr7dm8fd2jxsqxjklhhdfa3s1cbm";
sgr-iosevka-etoile = "0ml9y2aiwwp64dl2na7rmcylzzlmr6al4habh07pn4ijjmxd2zz2";
sgr-iosevka-fixed = "1c29nmbckmjqkk574cgs6hr9mdkfidp35d61gpvpxg64nsv6cvmv";
sgr-iosevka-fixed-curly = "0jj8i57hl7q9bz9lk5mki4ifh2w2pd2n1fs6mqk29znas3mf0djf";
sgr-iosevka-fixed-curly-slab = "15gl43yhch9rny5ibz56m55r48a0qrbm7an3in4pzp34l6wjk8mq";
sgr-iosevka-fixed-slab = "1wrw39c5yg2i1lsnz5msdql4srn0xr6lkincjkg6zgbqb22ah4lq";
sgr-iosevka-fixed-ss01 = "0vq1kmfd6hydkmfidc28b1dchnwlwvmfh2nnrz88f3fc2hhb02ck";
sgr-iosevka-fixed-ss02 = "0m36lb668qgc6jaaxizrnzm8wl4jbri6qfk107lkjz3vas0v7k4y";
sgr-iosevka-fixed-ss03 = "05srwzs7a5mmm9g2b67m712fsw8dgf6m7mxywc1mp9m3fhjyqxwk";
sgr-iosevka-fixed-ss04 = "1q4rz9q52p3zhshn8djl69b16q544x7ky8nrpdladiah9dyrimr5";
sgr-iosevka-fixed-ss05 = "0w5qvl2vwijvwz5wvvwaixwqlgn2dfm5x7x6p5c00nwmcrlxghn0";
sgr-iosevka-fixed-ss06 = "0jyyj35xz8wcrxr822f2rcq6imkc8v9d14zn4q8a3srh06d6n3mq";
sgr-iosevka-fixed-ss07 = "09pikb09c863sq5hmcy4zk8449js2lxj02jph2p5fvsvzqbqwda0";
sgr-iosevka-fixed-ss08 = "1s7n327a6lsfb845jz4zyl56dpyf6h13sn9jm65h3qhfxadcfgpp";
sgr-iosevka-fixed-ss09 = "1rxisww2xsa6fxh6qd4n7rxwa04rlk1rz5x8jqsh9ajrlx31dxmg";
sgr-iosevka-fixed-ss10 = "0xfj5c8wkw8429aj49jidwaqf53qgqms3wfqws87plshaz94r3rs";
sgr-iosevka-fixed-ss11 = "01zsrgxmlly1hylfpq7sd07mk1anm9si69f0p9akidaffp7ki0bz";
sgr-iosevka-fixed-ss12 = "1j53kbnxq3hki5hwa3y794kb7m89kg7wv5a7ml6h08dvqlqivi13";
sgr-iosevka-fixed-ss13 = "04yvah2nns6lk8w71jyhfnnks3bc3frkpa11a79sw46wwmn2hnr4";
sgr-iosevka-fixed-ss14 = "1k85xm5rrwj15iyvh4492q8ls6aqvq00xbmg1l27q6599369abjy";
sgr-iosevka-fixed-ss15 = "0r1ka2a3b9kdzrdkic5h22wrf2kwwhdvz29xniymlrnqgy6rq5im";
sgr-iosevka-fixed-ss16 = "0cls0rxc22xz11rirga4ijd1rn4l3am32agjhl11lm6z4h7rjl06";
sgr-iosevka-fixed-ss17 = "1sm61q99jm6bykwm03z32cskgzwpcnn1f5x12clgyw6m6m7nccm9";
sgr-iosevka-fixed-ss18 = "18fihrmsclbfy3vsaw6bmv0bvrjph6ik5p3k15jl9hh6i9qnhpyd";
sgr-iosevka-slab = "0a0a4zm2prdnzkiir1zm2clvvwcpn1l89s9crvv2qi5ll55h35pq";
sgr-iosevka-ss01 = "0fw9ic1zl7sd4gf1b73704n6frmagg6v4r6lc6j195ni4px6n4wx";
sgr-iosevka-ss02 = "1icsr5d177r7dlry80ya5522rp4kr7vy5ad35w0p11566qq9f0r6";
sgr-iosevka-ss03 = "0sxzmzwg6ryr6jfhvviqgzlhizfwcrl6fhmm3mmr2g0lyrc2shna";
sgr-iosevka-ss04 = "13b4y73s39hqm4bxk6nx439w1rd33n2q2d8zplwgsy8zpznf2v04";
sgr-iosevka-ss05 = "0slkzah2icshqcf8izviyid3qm9qdvnmaf65a1l0fhzamx3fsf03";
sgr-iosevka-ss06 = "04i88ky5139wbn4d1vglq8xl51srii12lx0329pggfrpi7xxpd8q";
sgr-iosevka-ss07 = "0a34k93n3cckgvirqxj6qg7qg4mqr3cm19zbwj8h6mnsndrndkhz";
sgr-iosevka-ss08 = "06qhv6dfs4y8601kkcqp2zg6pk61v2zfpnpxwwsbviaf45zjp74r";
sgr-iosevka-ss09 = "1g89ygl86iljzgs1h15p484a8m6af9n1s5rbami8cry35sx4sqmg";
sgr-iosevka-ss10 = "0bwx7ic6jidq3d8dkinzygjvd1z5b1zi7x926a6fvc6hm0jd1nak";
sgr-iosevka-ss11 = "0jx4k1kb0j09a18d43vhfwap5cr1g0z7afwmhnbj78q4g19jx04c";
sgr-iosevka-ss12 = "0qkp2ds57c03w0j41a4vykk0zxn26sqy4r03mzbm61j33zpp4c2v";
sgr-iosevka-ss13 = "0v9a3cz3m2yh7yk7q3r7rx1g4q3a8098fn8hbswz4sr7gw0niyps";
sgr-iosevka-ss14 = "0zd0bkzvgvj89dm6yr7bjzi7fc62k6i03zx5mqna3npyxzrxmnn0";
sgr-iosevka-ss15 = "0ambby6s312q9b86src5l2fq4g13cx98hjllviya9r0rp76nabdx";
sgr-iosevka-ss16 = "0qcpfflxzvzqm5dfx0939lqj74nf3ssxg8kprds0hxlaq076wv90";
sgr-iosevka-ss17 = "0f6d5gnwcpall09wn4djifg6vwv7884xc9ylklrnn8w7f6y66sj8";
sgr-iosevka-ss18 = "0fmmyi3iqmsfmnx18jls6fs72y8878qd3ma0afh698p06kpbnqvn";
sgr-iosevka-term = "1bwz17kigznwr917gs0kwc5q69d0485kgbinqbdjad4a9ig4dwl3";
sgr-iosevka-term-curly = "0zzg4cm6xzhvnnn3bc97pd303nzgf9r2qi450kcb2rpybnb7j4wl";
sgr-iosevka-term-curly-slab = "1nipn2vj6m5fz63f1jwimxjrc27bsk04f3km0lymvsabpfhr3afx";
sgr-iosevka-term-slab = "0f0qpz98skkc1app981ijf9ggqr3im969n53dsqw4n9vprkpg4s9";
sgr-iosevka-term-ss01 = "0aj94rmv5mw344vnxji0cqbzwfbigjdgj3gsbx141vdcb4mmx3i4";
sgr-iosevka-term-ss02 = "0l1m102c8kwa35anhvaig4fpw9c4y1b84qlja1griakvz48i34dw";
sgr-iosevka-term-ss03 = "1sgmmgqq1ij6lfyvlfn31dgmh0wxy4x6758sj7fybjs65gl5lrnk";
sgr-iosevka-term-ss04 = "0lq0vmfsp9zlmg8v97rqjyf6pk1i35q8ljzbn6f6pdhgl83004w9";
sgr-iosevka-term-ss05 = "01mkdp2a6qxksxn3isg0j50a3vys0syw3vmn6af7mpis46zgjpj6";
sgr-iosevka-term-ss06 = "0dfwvnlbmyjbvd116fhzwkyyn6jxlgrhcz01m3rhgs42gsczjhmj";
sgr-iosevka-term-ss07 = "0k6653cc4ldhyrzx6gam06hyssy516shswp4qmgqhcl08wx5fpbk";
sgr-iosevka-term-ss08 = "12faci0m988wrwa0i7lf84scpjakmfqs0m0jbbqb488l413h5l7h";
sgr-iosevka-term-ss09 = "05ivmp2yfjjzqwqlh5d3pin8y24hmm17fkw5q1synv7d67p6pfqy";
sgr-iosevka-term-ss10 = "0piiqscfxpa19v947xzqz2x1bbscin3fr9wllrkhfd22ianjaagd";
sgr-iosevka-term-ss11 = "0mpbv8lxbv967nmnb0csbkf9pj9zb1lawsxagmnw098fj6kc3305";
sgr-iosevka-term-ss12 = "1fzm2rslayd3k72fnh2j4zx86r0dh2d82r1h6k0v3wkvyi6fx9nb";
sgr-iosevka-term-ss13 = "0w37h547ys5xmiayphj1ihm1kwwvpvw7v4ypdmp5vdy7grih986q";
sgr-iosevka-term-ss14 = "0f0diws4q86190h8mlvrzww34zb7za7glvaqy252pfw6p2xyp784";
sgr-iosevka-term-ss15 = "11kv4hz2zsjgyakkrw77gljrvpb53p8q7xw0m75h5plbcz661gn2";
sgr-iosevka-term-ss16 = "1mxnhvbgrxnpvgj6bjk4g7xakw0f8iqwpnjbyswv1ykklm75rmz4";
sgr-iosevka-term-ss17 = "033dhx0rbkh8nlckqgjxffjcp91anjwc2n566f231asyry6jqr3m";
sgr-iosevka-term-ss18 = "160zd6aygzjz4hfgljg0996iifxqabmfkjd51935x3vg52ays8fa";
}

4
pkgs/desktops/gnome/apps/gnome-boxes/default.nix
View file

@ -48,11 +48,11 @@
stdenv.mkDerivation rec {
pname = "gnome-boxes";
version = "44.1";
version = "44.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "OJcGDWlvf6LZEudywnYdvlNDOrXxnr+kvE6Jc4X6ulM=";
sha256 = "ndOJwUnQwPpXRW7DY9UaiCVflFVY+530KJTOeO+F34k=";
};
patches = [

4
pkgs/desktops/gnome/core/eog/default.nix
View file

@ -31,13 +31,13 @@
stdenv.mkDerivation rec {
pname = "eog";
version = "44.1";
version = "44.2";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "sha256-4slj8jL+WhCR3MGL7CWnMOkbAq9uRmYB76VeUAzXTKs=";
sha256 = "sha256-Ro9Tn2tn7kYYgXDyREgMwxHdHv5Hhv4VVL/+JqZccsQ=";
};
patches = [

4
pkgs/desktops/gnome/core/gnome-control-center/default.nix
View file

@ -65,11 +65,11 @@
stdenv.mkDerivation rec {
pname = "gnome-control-center";
version = "44.1";
version = "44.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "sha256-er02UBjihnne9gpezTBJ2w+4XebaSaltrdIfuo2wAuc=";
sha256 = "sha256-BiPX0hz+lw0u80QgYjVFpZRbmJLmQfmgEc7Owhr9oQw=";
};
patches = [

4
pkgs/desktops/gnome/core/sushi/default.nix
View file

@ -23,11 +23,11 @@
stdenv.mkDerivation rec {
pname = "sushi";
version = "43.0";
version = "44.2";
src = fetchurl {
url = "mirror://gnome/sources/sushi/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "V4SFJhSasceE+5L7yTTDUU/lIqumSdXZ/t7H4bFHUns=";
sha256 = "bAAv4K6hkCe6RIta7JTVzXU8l1L5lu4DMVJChzjqQ+k=";
};
nativeBuildInputs = [

8
pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix
View file

@ -19,9 +19,9 @@
mkXfceDerivation {
category = "apps";
pname = "xfce4-screensaver";
version = "4.18.1";
version = "4.18.2";
sha256 = "sha256-d72m2dW8jvM/EjgNSVaKsP5Ip7ioguB61/hy2cWw+dw=";
sha256 = "sha256-j5K5i+hl/miyHste73akZL62K6YTxXmN8mmFK9BCecs=";
buildInputs = [
dbus-glib
@ -44,8 +44,8 @@ mkXfceDerivation {
makeFlags = [ "DBUS_SESSION_SERVICE_DIR=$(out)/etc" ];
meta = {
meta = with lib; {
description = "Screensaver for Xfce";
maintainers = with lib.maintainers; [ symphorien ];
maintainers = with maintainers; [ symphorien ] ++ teams.xfce.members;
};
}

33
pkgs/desktops/xfce/core/xfce4-power-manager/default.nix
View file

@ -1,21 +1,30 @@
{ lib, mkXfceDerivation, automakeAddFlags, exo, gtk3, libnotify
, libxfce4ui, libxfce4util, upower, xfconf, xfce4-panel }:
{ lib
, mkXfceDerivation
, gtk3
, libnotify
, libxfce4ui
, libxfce4util
, upower
, xfconf
, xfce4-panel
}:
mkXfceDerivation {
category = "xfce";
pname = "xfce4-power-manager";
version = "4.18.1";
version = "4.18.2";
sha256 = "sha256-H9tu94ZQLLQhXIDtIWL3qZJo/ux2xC2Y9m7uwwey8M8=";
sha256 = "sha256-1+DP5CACzzj96FyRTeCdVEFORnpzFT49d9Uk1iijbFs=";
nativeBuildInputs = [ automakeAddFlags exo ];
buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util upower xfconf xfce4-panel ];
postPatch = ''
substituteInPlace configure.ac.in --replace gio-2.0 gio-unix-2.0
automakeAddFlags src/Makefile.am xfce4_power_manager_CFLAGS GIO_CFLAGS
automakeAddFlags settings/Makefile.am xfce4_power_manager_settings_CFLAGS GIO_CFLAGS
'';
buildInputs = [
gtk3
libnotify
libxfce4ui
libxfce4util
upower
xfconf
xfce4-panel
];
meta = with lib; {
description = "A power manager for the Xfce Desktop Environment";

8
pkgs/development/compilers/gcc/common/pre-configure.nix
View file

@ -77,8 +77,12 @@ in lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
# - If GCC allowed implicit declaration of symbols, it would not fail during
# compilation even if the configure scripts did not check header presence.
#
+ lib.optionalString (hostPlatform.isDarwin) ''
export ac_cv_func_aligned_alloc=no
+ lib.optionalString (buildPlatform.isDarwin) ''
export build_configargs=ac_cv_func_aligned_alloc=no
'' + lib.optionalString (hostPlatform.isDarwin) ''
export host_configargs=ac_cv_func_aligned_alloc=no
'' + lib.optionalString (targetPlatform.isDarwin) ''
export target_configargs=ac_cv_func_aligned_alloc=no
''
# In order to properly install libgccjit on macOS Catalina, strip(1)

2
pkgs/development/coq-modules/corn/default.nix
View file

@ -5,7 +5,7 @@ mkCoqDerivation rec {
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = "8.6"; out = "8.8.1"; }
{ case = (range "8.11" "8.16"); out = "8.16.0"; }
{ case = (range "8.11" "8.17"); out = "8.16.0"; }
{ case = (range "8.7" "8.15"); out = "8.13.0"; }
] null;
release = {

6
pkgs/development/coq-modules/math-classes/default.nix
View file

@ -4,10 +4,14 @@ mkCoqDerivation {
pname = "math-classes";
inherit version;
defaultVersion = if lib.versions.range "8.6" "8.16" coq.coq-version then "8.15.0" else null;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.12" "8.17"; out = "8.17.0"; }
{ case = range "8.6" "8.16"; out = "8.15.0"; }
] null;
release."8.12.0".sha256 = "14nd6a08zncrl5yg2gzk0xf4iinwq4hxnsgm4fyv07ydbkxfb425";
release."8.13.0".sha256 = "1ln7ziivfbxzbdvlhbvyg3v30jgblncmwcsam6gg3d1zz6r7cbby";
release."8.15.0".sha256 = "10w1hm537k6jx8a8vghq1yx12rsa0sjk2ipv3scgir71ln30hllw";
release."8.17.0".sha256 = "sha256-WklL8pgYTd0l4TGt7h7tWj1qcFcXvoPn25+XKF1pIKA=";
propagatedBuildInputs = [ bignums ];

4
pkgs/development/interpreters/erlang/24.nix
View file

@ -1,6 +1,6 @@
{ mkDerivation }:
mkDerivation {
version = "24.3.4.11";
sha256 = "sha256-1A73UOCPJnCRCAXTEPc3VTHsDJIWQjlPJXkuwQBV0r4=";
version = "24.3.4.12";
sha256 = "sha256-XrQvpIHCxXbcaP9cvX1nwl9LumZeVzlgRJwq2Dj0VoY=";
}

4
pkgs/development/interpreters/erlang/25.nix
View file

@ -1,6 +1,6 @@
{ mkDerivation }:
mkDerivation {
version = "25.3.2";
sha256 = "cuFeHwyAyS8R7rXcJJxzE7LTZGgDr4x3qMZx63PIowM=";
version = "25.3.2.1";
sha256 = "4PDK18/tekJHgNGECG5hv/HvwvteR+FeN6hlpB9FC9o=";
}

2
pkgs/development/interpreters/ruby/dev.nix
View file

@ -1,5 +1,5 @@
/* An environment for development that bundles ruby, bundler and bundix
together. This avoids version conflicts where each is using a diferent
together. This avoids version conflicts where each is using a different
version of each-other.
*/
{ buildEnv, ruby, bundler, bundix }:

55
pkgs/development/libraries/accountsservice/Disable-methods-that-change-files-in-etc.patch
View file

@ -10,10 +10,10 @@ Only if environment variable NIXOS_USERS_PURE is set.
2 files changed, 45 insertions(+)
diff --git a/src/daemon.c b/src/daemon.c
index e62e124..87459b2 100644
index 861430f..aefaf2d 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -931,6 +931,11 @@ daemon_create_user (AccountsAccounts *accounts,
@@ -1378,6 +1378,11 @@ daemon_create_user (AccountsAccounts *accounts,
const gchar *real_name,
gint account_type)
{
@ -22,10 +22,10 @@ index e62e124..87459b2 100644
+ return;
+ }
+
Daemon *daemon = (Daemon*)accounts;
Daemon *daemon = (Daemon *) accounts;
CreateUserData *data;
@@ -1138,6 +1143,11 @@ daemon_delete_user (AccountsAccounts *accounts,
@@ -1581,6 +1586,11 @@ daemon_delete_user (AccountsAccounts *accounts,
gint64 uid,
gboolean remove_files)
{
@ -34,14 +34,14 @@ index e62e124..87459b2 100644
+ return;
+ }
+
Daemon *daemon = (Daemon*)accounts;
Daemon *daemon = (Daemon *) accounts;
DeleteUserData *data;
diff --git a/src/user.c b/src/user.c
index 0fb1a17..dbdebaf 100644
index 28170db..df947a1 100644
--- a/src/user.c
+++ b/src/user.c
@@ -904,6 +904,11 @@ user_set_real_name (AccountsUser *auser,
@@ -1216,6 +1216,11 @@ user_set_real_name (AccountsUser *auser,
GDBusMethodInvocation *context,
const gchar *real_name)
{
@ -50,10 +50,10 @@ index 0fb1a17..dbdebaf 100644
+ return;
+ }
+
User *user = (User*)auser;
User *user = (User *) auser;
int uid;
const gchar *action_id;
@@ -981,6 +986,11 @@ user_set_user_name (AccountsUser *auser,
@@ -1293,6 +1298,11 @@ user_set_user_name (AccountsUser *auser,
GDBusMethodInvocation *context,
const gchar *user_name)
{
@ -62,10 +62,10 @@ index 0fb1a17..dbdebaf 100644
+ return;
+ }
+
User *user = (User*)auser;
User *user = (User *) auser;
daemon_local_check_auth (user->daemon,
user,
@@ -1263,6 +1273,11 @@ user_set_home_directory (AccountsUser *auser,
@@ -1945,6 +1955,11 @@ user_set_home_directory (AccountsUser *auser,
GDBusMethodInvocation *context,
const gchar *home_dir)
{
@ -74,10 +74,10 @@ index 0fb1a17..dbdebaf 100644
+ return;
+ }
+
User *user = (User*)auser;
User *user = (User *) auser;
daemon_local_check_auth (user->daemon,
user,
@@ -1322,6 +1337,11 @@ user_set_shell (AccountsUser *auser,
@@ -2000,6 +2015,11 @@ user_set_shell (AccountsUser *auser,
GDBusMethodInvocation *context,
const gchar *shell)
{
@ -86,10 +86,10 @@ index 0fb1a17..dbdebaf 100644
+ return;
+ }
+
User *user = (User*)auser;
User *user = (User *) auser;
daemon_local_check_auth (user->daemon,
user,
@@ -1602,6 +1622,11 @@ user_set_locked (AccountsUser *auser,
@@ -2249,6 +2269,11 @@ user_set_locked (AccountsUser *auser,
GDBusMethodInvocation *context,
gboolean locked)
{
@ -98,10 +98,10 @@ index 0fb1a17..dbdebaf 100644
+ return;
+ }
+
User *user = (User*)auser;
User *user = (User *) auser;
daemon_local_check_auth (user->daemon,
user,
@@ -1814,6 +1839,11 @@ user_set_password_mode (AccountsUser *auser,
@@ -2457,6 +2482,11 @@ user_set_password_mode (AccountsUser *auser,
GDBusMethodInvocation *context,
gint mode)
{
@ -110,10 +110,10 @@ index 0fb1a17..dbdebaf 100644
+ return;
+ }
+
User *user = (User*)auser;
User *user = (User *) auser;
const gchar *action_id;
@@ -1905,6 +1935,11 @@ user_set_password (AccountsUser *auser,
gint uid;
@@ -2550,6 +2580,11 @@ user_set_password (AccountsUser *auser,
const gchar *password,
const gchar *hint)
{
@ -122,9 +122,6 @@ index 0fb1a17..dbdebaf 100644
+ return;
+ }
+
User *user = (User*)auser;
User *user = (User *) auser;
gchar **data;
--
2.9.3
const gchar *action_id;

8
pkgs/development/libraries/accountsservice/default.nix
View file

@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "accountsservice";
version = "22.08.8";
version = "23.13.9";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz";
sha256 = "kJmXp2kZ/n3BOKmgHOpwvWItWpMtvJ+xMBARMCOno5E=";
sha256 = "rdpM3q4k+gmS598///nv+nCQvjrCM6Pt/fadWpybkk8=";
};
patches = [
@ -46,6 +46,10 @@ stdenv.mkDerivation rec {
# Do not ignore third-party (e.g Pantheon) extensions not matching FHS path scheme.
# Fixes https://github.com/NixOS/nixpkgs/issues/72396
./drop-prefix-check-extensions.patch
# Detect DM type from config file.
# `readlink display-manager.service` won't return any of the candidates.
./get-dm-type-from-config.patch
];
nativeBuildInputs = [

7
pkgs/development/libraries/accountsservice/drop-prefix-check-extensions.patch
View file

@ -1,8 +1,8 @@
diff --git a/src/extensions.c b/src/extensions.c
index 038dcb2..830465d 100644
index 354f476..8d020a6 100644
--- a/src/extensions.c
+++ b/src/extensions.c
@@ -121,16 +121,7 @@ daemon_read_extension_directory (GHashTable *ifaces,
@@ -122,15 +122,7 @@ daemon_read_extension_directory (GHashTable *ifaces,
continue;
}
@ -10,8 +10,7 @@ index 038dcb2..830465d 100644
- const gchar * const prefix = "../../dbus-1/interfaces/";
- if (g_str_has_prefix (symlink, prefix) && g_str_equal (symlink + strlen (prefix), name)) {
- daemon_read_extension_file (ifaces, filename);
- }
- else {
- } else {
- g_warning ("Found accounts service vendor extension symlink %s, but it must be exactly "
- "equal to '../../dbus-1/interfaces/%s' for forwards-compatibility reasons.",
- filename, name);

66
pkgs/development/libraries/accountsservice/fix-paths.patch
View file

@ -1,8 +1,8 @@
diff --git a/src/daemon.c b/src/daemon.c
index c8b6320..2b74949 100644
index aa9d050..861430f 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -1102,7 +1102,7 @@ daemon_create_user_authorized_cb (Daemon *daemon,
@@ -1319,7 +1319,7 @@ daemon_create_user_authorized_cb (Daemon *daemon,
sys_log (context, "create user '%s'", cd->user_name);
@ -11,7 +11,7 @@ index c8b6320..2b74949 100644
argv[1] = "-m";
argv[2] = "-c";
argv[3] = cd->real_name;
@@ -1335,7 +1335,7 @@ daemon_delete_user_authorized_cb (Daemon *daemon,
@@ -1552,7 +1552,7 @@ daemon_delete_user_authorized_cb (Daemon *daemon,
}
free (resolved_homedir);
@ -21,10 +21,10 @@ index c8b6320..2b74949 100644
argv[1] = "-f";
argv[2] = "-r";
diff --git a/src/user.c b/src/user.c
index 189b2c5..5358c02 100644
index 917d427..28170db 100644
--- a/src/user.c
+++ b/src/user.c
@@ -1145,7 +1145,7 @@ user_change_real_name_authorized_cb (Daemon *daemon,
@@ -1193,7 +1193,7 @@ user_change_real_name_authorized_cb (Daemon *daemon,
new_gecos = g_strdup (name);
}
@ -33,7 +33,7 @@ index 189b2c5..5358c02 100644
argv[1] = "-c";
argv[2] = new_gecos;
argv[3] = "--";
@@ -1218,7 +1218,7 @@ user_change_user_name_authorized_cb (Daemon *daemon,
@@ -1267,7 +1267,7 @@ user_change_user_name_authorized_cb (Daemon *daemon,
accounts_user_get_uid (ACCOUNTS_USER (user)),
name);
@ -42,7 +42,25 @@ index 189b2c5..5358c02 100644
argv[1] = "-l";
argv[2] = name;
argv[3] = "--";
@@ -1627,7 +1627,7 @@ user_change_home_dir_authorized_cb (Daemon *daemon,
@@ -1718,7 +1718,7 @@ user_set_password_expiration_policy_authorized_cb (Daemon *daemon
accounts_user_get_uid (ACCOUNTS_USER (user)));
g_object_freeze_notify (G_OBJECT (user));
- argv[0] = "/usr/bin/chage";
+ argv[0] = "@shadow@/bin/chage";
argv[1] = "-m";
argv[2] = pwd_expiration->min_days_between_changes;
argv[3] = "-M";
@@ -1806,7 +1806,7 @@ user_set_user_expiration_policy_authorized_cb (Daemon *daemon,
} else {
expiration_time = g_strdup ("-1");
}
- argv[0] = "/usr/bin/chage";
+ argv[0] = "@shadow@/bin/chage";
argv[1] = "-E";
argv[2] = expiration_time;
argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
@@ -1919,7 +1919,7 @@ user_change_home_dir_authorized_cb (Daemon *daemon,
accounts_user_get_uid (ACCOUNTS_USER (user)),
home_dir);
@ -51,7 +69,7 @@ index 189b2c5..5358c02 100644
argv[1] = "-m";
argv[2] = "-d";
argv[3] = home_dir;
@@ -1683,7 +1683,7 @@ user_change_shell_authorized_cb (Daemon *daemon,
@@ -1977,7 +1977,7 @@ user_change_shell_authorized_cb (Daemon *daemon,
accounts_user_get_uid (ACCOUNTS_USER (user)),
shell);
@ -60,7 +78,7 @@ index 189b2c5..5358c02 100644
argv[1] = "-s";
argv[2] = shell;
argv[3] = "--";
@@ -1824,7 +1824,7 @@ user_change_icon_file_authorized_cb (Daemon *daemon,
@@ -2120,7 +2120,7 @@ user_change_icon_file_authorized_cb (Daemon *daemon,
return;
}
@ -69,7 +87,7 @@ index 189b2c5..5358c02 100644
argv[1] = filename;
argv[2] = NULL;
@@ -1904,7 +1904,7 @@ user_change_locked_authorized_cb (Daemon *daemon,
@@ -2201,7 +2201,7 @@ user_change_locked_authorized_cb (Daemon *daemon,
locked ? "locking" : "unlocking",
accounts_user_get_user_name (ACCOUNTS_USER (user)),
accounts_user_get_uid (ACCOUNTS_USER (user)));
@ -78,7 +96,7 @@ index 189b2c5..5358c02 100644
argv[1] = locked ? "-L" : "-U";
argv[2] = "--";
argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
@@ -2026,7 +2026,7 @@ user_change_account_type_authorized_cb (Daemon *daemon,
@@ -2328,7 +2328,7 @@ user_change_account_type_authorized_cb (Daemon *daemon,
g_free (groups);
@ -87,16 +105,16 @@ index 189b2c5..5358c02 100644
argv[1] = "-G";
argv[2] = str->str;
argv[3] = "--";
@@ -2093,7 +2093,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon,
@@ -2396,7 +2396,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon,
if (mode == PASSWORD_MODE_SET_AT_LOGIN ||
mode == PASSWORD_MODE_NONE) {
- argv[0] = "/usr/bin/passwd";
+ argv[0] = "/run/wrappers/bin/passwd";
argv[1] = "-d";
argv[2] = "--";
argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
@@ -2105,7 +2105,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon,
@@ -2408,7 +2408,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon,
}
if (mode == PASSWORD_MODE_SET_AT_LOGIN) {
@ -105,21 +123,21 @@ index 189b2c5..5358c02 100644
argv[1] = "-d";
argv[2] = "0";
argv[3] = "--";
@@ -2126,7 +2126,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon,
@@ -2428,7 +2428,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon,
*/
accounts_user_set_locked (ACCOUNTS_USER (user), FALSE);
}
else if (accounts_user_get_locked (ACCOUNTS_USER (user))) {
} else if (accounts_user_get_locked (ACCOUNTS_USER (user))) {
- argv[0] = "/usr/sbin/usermod";
+ argv[0] = "@shadow@/bin/usermod";
argv[1] = "-U";
argv[2] = "--";
argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
@@ -2203,7 +2203,7 @@ user_change_password_authorized_cb (Daemon *daemon,
@@ -2505,7 +2505,7 @@ user_change_password_authorized_cb (Daemon *daemon,
g_object_freeze_notify (G_OBJECT (user));
g_autoptr (GError) error = NULL;
g_autoptr (GSubprocess) process = NULL;
- const char *argv[] = { "/usr/sbin/chpasswd", "-e", NULL };
+ const char *argv[] = { "@shadow@/bin/chpasswd", "-e", NULL };
- argv[0] = "/usr/sbin/usermod";
+ argv[0] = "@shadow@/bin/usermod";
argv[1] = "-p";
argv[2] = strings[0];
argv[3] = "--";
sys_log (context,
"set password and hint of user '%s' (%" G_GUINT64_FORMAT ")",

15
pkgs/development/libraries/accountsservice/get-dm-type-from-config.patch Normal file
View file

@ -0,0 +1,15 @@
diff --git a/src/daemon.c b/src/daemon.c
index aefaf2d..7c004d0 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -193,9 +193,9 @@ get_current_system_dm_type (void)
basename = g_file_get_basename (file);
g_object_unref (file);
- if (g_strcmp0 (basename, "lightdm.service") == 0)
+ if (g_file_test (PATH_LIGHTDM_CONF, G_FILE_TEST_EXISTS))
return DISPLAY_MANAGER_TYPE_LIGHTDM;
- else if (g_strcmp0 (basename, "gdm.service") == 0)
+ else if (g_file_test (PATH_GDM_CUSTOM, G_FILE_TEST_EXISTS))
return DISPLAY_MANAGER_TYPE_GDM;
}

2
pkgs/development/libraries/accountsservice/no-create-dirs.patch
View file

@ -2,7 +2,7 @@ diff --git a/meson_post_install.py b/meson_post_install.py
index d8c3dd1..620f714 100644
--- a/meson_post_install.py
+++ b/meson_post_install.py
@@ -9,9 +9,9 @@ localstatedir = os.path.normpath(destdir + os.sep + sys.argv[1])
@@ -9,9 +9,9 @@
# FIXME: meson will not track the creation of these directories
# https://github.com/mesonbuild/meson/blob/master/mesonbuild/scripts/uninstall.py#L39
dst_dirs = [

4
pkgs/development/libraries/audio/roc-toolkit/default.nix
View file

@ -21,7 +21,7 @@
stdenv.mkDerivation rec {
pname = "roc-toolkit";
version = "0.2.3";
version = "0.2.4";
outputs = [ "out" "dev" ];
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
owner = "roc-streaming";
repo = "roc-toolkit";
rev = "v${version}";
hash = "sha256-wwcc2r1hrM9zryMJp+DOifSh0g6T/gdZJMpVdhqhjR8=";
hash = "sha256-x4+/MIFKcos9xWhvSNWdsUQA2oLiyYS0MJE60HY/3hQ=";
};
nativeBuildInputs = [

3
pkgs/development/libraries/audiofile/default.nix
View file

@ -28,9 +28,6 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "man" ];
# fix build with gcc9
NIX_CFLAGS_LINK = lib.optional (stdenv.system == "i686-linux") "-lgcc";
# Even when statically linking, libstdc++.la is put in dependency_libs here,
# and hence libstdc++.so passed to the linker, just pass -lstdc++ and let the
# compiler do what it does best. (libaudiofile.la is a generated file, so we

6
pkgs/development/libraries/dav1d/default.nix
View file

@ -10,15 +10,17 @@ assert useVulkan -> withExamples;
stdenv.mkDerivation rec {
pname = "dav1d";
version = "1.1.0";
version = "1.2.0";
src = fetchFromGitHub {
owner = "videolan";
repo = pname;
rev = version;
hash = "sha256-1k6TsaXI9nwrBXTj3hncblkQuN/bvDudWDCsx4E4iwY=";
hash = "sha256-Y9wqa6lIs0eKT+q+95gjzfHIc3pglXzLNaDjsWy1gok=";
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [ meson ninja nasm pkg-config ];
# TODO: doxygen (currently only HTML and not build by default).
buildInputs = [ xxHash ]

4
pkgs/development/libraries/directx-headers/default.nix
View file

@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja }:
stdenv.mkDerivation rec {
pname = "directx-headers";
version = "1.610.0";
version = "1.610.2";
src = fetchFromGitHub {
owner = "microsoft";
repo = "DirectX-Headers";
rev = "v${version}";
hash = "sha256-lPYXAMFSyU3FopWdE6dDRWD6sVKcjxDVsTbgej/T2sk=";
hash = "sha256-se+/TgqKdatTnBlHcBC1K4aOGGfPEW+E1efpP34+xc0=";
};
nativeBuildInputs = [ meson ninja ];

7
pkgs/development/libraries/ffmpeg/4.nix
View file

@ -1,4 +1,11 @@
import ./generic.nix rec {
version = "4.4.3";
sha256 = "sha256-zZDzG1hD+0AHqElzeGR6OVm+H5wqtdktloSPmEUzT/c=";
extraPatches = [
{
name = "libsvtav1-1.5.0-compat-compressed_ten_bit_format.patch";
url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/031f1561cd286596cdb374da32f8aa816ce3b135";
hash = "sha256-mSnmAkoNikDpxcN+A/hpB7mUbbtcMvm4tG6gZFuroe8=";
}
];
}

17
pkgs/development/libraries/ffmpeg/5.nix
View file

@ -1,4 +1,21 @@
import ./generic.nix rec {
version = "5.1.3";
sha256 = "sha256-twfJvANLQGO7TiyHPMPqApfHLFUlOGZTTIIGEnjyvuE=";
extraPatches = [
{
name = "libsvtav1-1.5.0-compat-compressed_ten_bit_format.patch";
url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/031f1561cd286596cdb374da32f8aa816ce3b135";
hash = "sha256-mSnmAkoNikDpxcN+A/hpB7mUbbtcMvm4tG6gZFuroe8=";
}
{
name = "libsvtav1-1.5.0-compat-vbv_bufsize.patch";
url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/1c6fd7d756afe0f8b7df14dbf7a95df275f8f5ee";
hash = "sha256-v9Viyo12QfZpbcVqd1aHgLl/DgSkdE9F1kr6afTGPik=";
}
{
name = "libsvtav1-1.5.0-compat-maximum_buffer_size_ms-conditional.patch";
url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/96748ac54f998ba6fe22802799c16b4eba8d4ccc";
hash = "sha256-Z5HSe7YpryYGHD3BYXejAhqR4EPnmfTGyccxNvU3AaU=";
}
];
}

4
pkgs/development/libraries/fribidi/default.nix
View file

@ -10,14 +10,14 @@
stdenv.mkDerivation rec {
pname = "fribidi";
version = "1.0.12";
version = "1.0.13";
outputs = [ "out" "dev" "devdoc" ];
# NOTE: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application.
src = fetchurl {
url = "https://github.com/fribidi/fribidi/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-DNIz+X/IxnuzrCfOhEDe9dP/rPUWdluRwsxlRJgpNJU=";
sha256 = "sha256-f6FsgMgb1iL3sZjTE1baE5zDGKY/x3YSF69BMJA/VKI=";
};
postPatch = ''

4
pkgs/development/libraries/gnu-efi/default.nix
View file

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "gnu-efi";
version = "3.0.15";
version = "3.0.17";
src = fetchurl {
url = "mirror://sourceforge/gnu-efi/${pname}-${version}.tar.bz2";
sha256 = "sha256-kxole5xcG6Zf9Rnxg3PEOKJoJfLbeGaxY+ltGxaPIOo=";
sha256 = "sha256-eAfpAzSTQ6ehQuu5NHA6KHIjXolojPWGwDKwoQh7yvQ=";
};
buildInputs = [ pciutils ];

13
pkgs/development/libraries/gstreamer/bad/default.nix
View file

@ -23,7 +23,6 @@
, lcms2
, libnice
, webrtc-audio-processing
, webrtc-audio-processing_1
, lilv
, lv2
, serd
@ -90,6 +89,7 @@
, vo-aacenc
, libfreeaptx
, zxing-cpp
, usrsctp
, VideoToolbox
, AudioToolbox
, AVFoundation
@ -108,13 +108,13 @@
stdenv.mkDerivation rec {
pname = "gst-plugins-bad";
version = "1.22.2";
version = "1.22.3";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-PY+vHONALIU1zjqMThpslg5LVlXb2mtVlD25rHkCLQ8=";
hash = "sha256-4XmP7i2GEn8GN0gcYH+YMpO/D9garXClx7RyBa82Idg=";
};
patches = [
@ -165,6 +165,7 @@ stdenv.mkDerivation rec {
libde265
libdvdnav
libdvdread
libnice
qrencode
libsndfile
libusb1
@ -193,6 +194,7 @@ stdenv.mkDerivation rec {
vo-aacenc
libfreeaptx
zxing-cpp
usrsctp
] ++ lib.optionals enableZbar [
zbar
] ++ lib.optionals faacSupport [
@ -222,7 +224,6 @@ stdenv.mkDerivation rec {
flite
libdrm
libgudev
libnice
sbc
spandsp
@ -276,7 +277,6 @@ stdenv.mkDerivation rec {
"-Dmusepack=disabled"
"-Dopenni2=disabled" # not packaged in nixpkgs as of writing
"-Dopensles=disabled" # not packaged in nixpkgs as of writing
"-Dsctp=disabled" # required `usrsctp` library not packaged in nixpkgs as of writing
"-Dsvthevcenc=disabled" # required `SvtHevcEnc` library not packaged in nixpkgs as of writing
"-Dteletext=disabled" # required `zvbi` library not packaged in nixpkgs as of writing
"-Dtinyalsa=disabled" # not packaged in nixpkgs as of writing
@ -311,7 +311,6 @@ stdenv.mkDerivation rec {
"-Duvch264=disabled" # requires gudev
"-Dv4l2codecs=disabled" # requires gudev
"-Dladspa=disabled" # requires lrdf
"-Dwebrtc=disabled" # requires libnice, which as of writing doesn't work on Darwin in nixpkgs
"-Dwildmidi=disabled" # see dependencies above
] ++ lib.optionals (!stdenv.isLinux || !stdenv.isx86_64) [
"-Dqsv=disabled" # Linux (and Windows) x86 only
@ -361,6 +360,6 @@ stdenv.mkDerivation rec {
'';
license = if enableGplPlugins then licenses.gpl2Plus else licenses.lgpl2Plus;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ matthewbauer ];
maintainers = with maintainers; [ matthewbauer lilyinstarlight ];
};
}

6
pkgs/development/libraries/gstreamer/base/default.nix
View file

@ -45,7 +45,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gst-plugins-base";
version = "1.22.2";
version = "1.22.3";
outputs = [ "out" "dev" ];
@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
inherit (finalAttrs) pname version;
in fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-62USDE7nm3oVPDwZctXAFYwhUYd8xR7Hclu6V0lnnUk=";
hash = "sha256-HFliiaDUIHOAIz66jDapMsTRrOuhmTKTfZtXwkzvifM=";
};
strictDeps = true;
@ -168,6 +168,6 @@ stdenv.mkDerivation (finalAttrs: {
"gstreamer-video-1.0"
];
platforms = platforms.unix;
maintainers = with maintainers; [ matthewbauer ];
maintainers = with maintainers; [ matthewbauer lilyinstarlight ];
};
})

6
pkgs/development/libraries/gstreamer/core/default.nix
View file

@ -24,7 +24,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gstreamer";
version = "1.22.2";
version = "1.22.3";
outputs = [
"bin"
@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
inherit (finalAttrs) pname version;
in fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-sq/nNgOSHGCLpIlp27fXQ3dnRL/l2AWeziQRN7f4jiE=";
hash = "sha256-n/6rlQU/n2mV6zs9oiXojyHBKc1g2gAtP3ldtw1tWXQ=";
};
depsBuildBuild = [
@ -120,6 +120,6 @@ stdenv.mkDerivation (finalAttrs: {
"gstreamer-controller-1.0"
];
platforms = platforms.unix;
maintainers = with maintainers; [ ttuegel matthewbauer ];
maintainers = with maintainers; [ ttuegel matthewbauer lilyinstarlight ];
};
})

2
pkgs/development/libraries/gstreamer/default.nix
View file

@ -48,5 +48,5 @@
ipu6-camera-hal = ipu6ep-camera-hal;
};
# note: gst-python is in ./python/default.nix - called under pythonPackages
# note: gst-python is in ../../python-modules/gst-python - called under python3Packages
}

5
pkgs/development/libraries/gstreamer/devtools/default.nix
View file

@ -17,11 +17,11 @@
stdenv.mkDerivation rec {
pname = "gst-devtools";
version = "1.22.2";
version = "1.22.3";
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-62JybT4nqHgjaaJP1jZKiIXtJGKzu9qwkd/8gTnuBtg=";
hash = "sha256-RGrJxC1QLL/ZCBc3zBuFOzwfUNt3ynzNAa6hD2h1UME=";
};
outputs = [
@ -65,5 +65,6 @@ stdenv.mkDerivation rec {
homepage = "https://gstreamer.freedesktop.org";
license = licenses.lgpl2Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ lilyinstarlight ];
};
}

5
pkgs/development/libraries/gstreamer/ges/default.nix
View file

@ -18,7 +18,7 @@
stdenv.mkDerivation rec {
pname = "gst-editing-services";
version = "1.22.2";
version = "1.22.3";
outputs = [
"out"
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-RTsUZPw4V94mmnyw69lmr+Ahcdl772cqC4oKbUPgzr8=";
hash = "sha256-FaW85iUJseEl6FoJ7EHzIcD1SSZLUETACV/PstXAzqI=";
};
nativeBuildInputs = [
@ -69,5 +69,6 @@ stdenv.mkDerivation rec {
homepage = "https://gstreamer.freedesktop.org";
license = licenses.lgpl2Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ lilyinstarlight ];
};
}

6
pkgs/development/libraries/gstreamer/good/default.nix
View file

@ -52,13 +52,13 @@ assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch64);
stdenv.mkDerivation rec {
pname = "gst-plugins-good";
version = "1.22.2";
version = "1.22.3";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-fIzFlCXysjL2DKfRPlbt1hXaT3Eec90Bp8/6Rua8DN0=";
hash = "sha256-r4EVSzou8/TS/ro5XyVpb+6m/RPsYsktPHqXNHBxAnM=";
};
strictDeps = true;
@ -190,6 +190,6 @@ stdenv.mkDerivation rec {
'';
license = licenses.lgpl2Plus;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ matthewbauer ];
maintainers = with maintainers; [ matthewbauer lilyinstarlight ];
};
}

Some files were not shown because too many files have changed in this diff Show more