Merge branch 'staging-next' into staging

This commit is contained in:
Weijia Wang
2024-04-27 05:44:36 +02:00
1062 changed files with 2714 additions and 2712 deletions

View File

@@ -20,6 +20,13 @@ permissions:
# We need this permission to cancel the workflow run if there's a merge conflict
actions: write
# Create a check-by-name concurrency group based on the pull request number. if
# an event triggers a run on the same PR while a previous run is still in
# progress, the previous run will be canceled and the new one will start.
concurrency:
group: check-by-name-${{ github.event.pull_request.number }}
cancel-in-progress: true
jobs:
check:
# This needs to be x86_64-linux, because we depend on the tooling being pre-built in the GitHub releases

View File

@@ -62,7 +62,7 @@ Allow linking arbitrary place in the text (e.g. individual list items, sentences
They are defined using a hybrid of the link syntax with the attributes syntax known from headings, called [bracketed spans](https://github.com/jgm/commonmark-hs/blob/master/commonmark-extensions/test/bracketed_spans.md):
```markdown
- []{#ssec-gnome-hooks-glib} `glib` setup hook will populate `GSETTINGS_SCHEMAS_PATH` and then `wrapGAppsHook` will prepend it to `XDG_DATA_DIRS`.
- []{#ssec-gnome-hooks-glib} `glib` setup hook will populate `GSETTINGS_SCHEMAS_PATH` and then `wrapGApps*` hook will prepend it to `XDG_DATA_DIRS`.
```
#### Automatic links

View File

@@ -57,4 +57,4 @@ You can create a simple environment using a `shell.nix` like this:
Running `nix-shell` on it would drop you into a shell inside an FHS env where those libraries and binaries are available in FHS-compliant paths. Applications that expect an FHS structure (i.e. proprietary binaries) can run inside this environment without modification.
You can build a wrapper by running your binary in `runScript`, e.g. `./bin/start.sh`. Relative paths work as expected.
Additionally, the FHS builder links all relocated gsettings-schemas (the glib setup-hook moves them to `share/gsettings-schemas/${name}/glib-2.0/schemas`) to their standard FHS location. This means you don't need to wrap binaries with `wrapGAppsHook`.
Additionally, the FHS builder links all relocated gsettings-schemas (the glib setup-hook moves them to `share/gsettings-schemas/${name}/glib-2.0/schemas`) to their standard FHS location. This means you don't need to wrap binaries with `wrapGApps*` hook.

View File

@@ -82,7 +82,7 @@ Previously, a GTK theme needed to be in `XDG_DATA_DIRS`. This is no longer neces
If your application uses [GStreamer](https://gstreamer.freedesktop.org/) or [Grilo](https://wiki.gnome.org/Projects/Grilo), you should set `GST_PLUGIN_SYSTEM_PATH_1_0` and `GRL_PLUGIN_PATH`, respectively.
## Onto `wrapGAppsHook` {#ssec-gnome-hooks}
## Onto `wrapGApps*` hooks {#ssec-gnome-hooks}
Given the requirements above, the package expression would become messy quickly:
@@ -102,27 +102,29 @@ Given the requirements above, the package expression would become messy quickly:
}
```
Fortunately, there is [`wrapGAppsHook`]{#ssec-gnome-hooks-wrapgappshook}. It works in conjunction with other setup hooks that populate environment variables, and it will then wrap all executables in `bin` and `libexec` directories using said variables. For convenience, it also adds `dconf.lib` for a GIO module implementing a GSettings backend using `dconf`, `gtk3` for GSettings schemas, and `librsvg` for GdkPixbuf loader to the closure.
Fortunately, we have a [family of hooks]{#ssec-gnome-hooks-wrapgappshook} that automate this. They work in conjunction with other setup hooks that populate environment variables, and will then wrap all executables in `bin` and `libexec` directories using said variables.
There is also [`wrapGAppsHook4`]{#ssec-gnome-hooks-wrapgappshook4}, which replaces GTK 3 with GTK 4. Instead of `wrapGAppsHook`, this should be used for all GTK4 applications.
- [`wrapGAppsHook3`]{#ssec-gnome-hooks-wrapgappshook3} for GTK 3 apps. For convenience, it also adds `dconf.lib` for a GIO module implementing a GSettings backend using `dconf`, `gtk3` for GSettings schemas, and `librsvg` for GdkPixbuf loader to the closure.
- [`wrapGAppsHook4`]{#ssec-gnome-hooks-wrapgappshook4} for GTK 4 apps. Same as [`wrapGAppsHook3`]{#ssec-gnome-hooks-wrapgappshook3} but replaces `gtk3` with `gtk4`.
- [`wrapGAppsNoGuiHook`]{#ssec-gnome-hooks-wrapgappsnoguihook} for programs without a graphical interface. Same as the above but does not bring `gtk3` and `librsvg` into the closure.
In case you are packaging a program without a graphical interface, you might want to use [`wrapGAppsNoGuiHook`]{#ssec-gnome-hooks-wrapgappsnoguihook}, which runs the same script as `wrapGAppsHook` but does not bring `gtk3` and `librsvg` into the closure.
The hooks do the the following:
- `wrapGAppsHook` itself will add the package’s `share` directory to `XDG_DATA_DIRS`.
- `wrapGApps*` hook itself will add the package’s `share` directory to `XDG_DATA_DIRS`.
- []{#ssec-gnome-hooks-glib} `glib` setup hook will populate `GSETTINGS_SCHEMAS_PATH` and then `wrapGAppsHook` will prepend it to `XDG_DATA_DIRS`.
- []{#ssec-gnome-hooks-glib} `glib` setup hook will populate `GSETTINGS_SCHEMAS_PATH` and then `wrapGApps*` hook will prepend it to `XDG_DATA_DIRS`.
- []{#ssec-gnome-hooks-gdk-pixbuf} `gdk-pixbuf` setup hook will populate `GDK_PIXBUF_MODULE_FILE` with the path to biggest `loaders.cache` file from the dependencies containing [GdkPixbuf loaders](#ssec-gnome-gdk-pixbuf-loaders). This works fine when there are only two packages containing loaders (`gdk-pixbuf` and e.g. `librsvg`) – it will choose the second one, reasonably expecting that it will be bigger since it describes extra loader in addition to the default ones. But when there are more than two loader packages, this logic will break. One possible solution would be constructing a custom cache file for each package containing a program like `services/x11/gdk-pixbuf.nix` NixOS module does. `wrapGAppsHook` copies the `GDK_PIXBUF_MODULE_FILE` environment variable into the produced wrapper.
- []{#ssec-gnome-hooks-gdk-pixbuf} `gdk-pixbuf` setup hook will populate `GDK_PIXBUF_MODULE_FILE` with the path to biggest `loaders.cache` file from the dependencies containing [GdkPixbuf loaders](#ssec-gnome-gdk-pixbuf-loaders). This works fine when there are only two packages containing loaders (`gdk-pixbuf` and e.g. `librsvg`) – it will choose the second one, reasonably expecting that it will be bigger since it describes extra loader in addition to the default ones. But when there are more than two loader packages, this logic will break. One possible solution would be constructing a custom cache file for each package containing a program like `services/x11/gdk-pixbuf.nix` NixOS module does. `wrapGApps*` hook copies the `GDK_PIXBUF_MODULE_FILE` environment variable into the produced wrapper.
- []{#ssec-gnome-hooks-gtk-drop-icon-theme-cache} One of `gtk3`’s setup hooks will remove `icon-theme.cache` files from package’s icon theme directories to avoid conflicts. Icon theme packages should prevent this with `dontDropIconThemeCache = true;`.
- []{#ssec-gnome-hooks-dconf} `dconf.lib` is a dependency of `wrapGAppsHook`, which then also adds it to the `GIO_EXTRA_MODULES` variable.
- []{#ssec-gnome-hooks-dconf} `dconf.lib` is a dependency of `wrapGApps*` hook, which then also adds it to the `GIO_EXTRA_MODULES` variable.
- []{#ssec-gnome-hooks-hicolor-icon-theme} `hicolor-icon-theme`’s setup hook will add icon themes to `XDG_ICON_DIRS`.
- []{#ssec-gnome-hooks-gobject-introspection} `gobject-introspection` setup hook populates `GI_TYPELIB_PATH` variable with `lib/girepository-1.0` directories of dependencies, which is then added to wrapper by `wrapGAppsHook`. It also adds `share` directories of dependencies to `XDG_DATA_DIRS`, which is intended to promote GIR files but it also [pollutes the closures](https://github.com/NixOS/nixpkgs/issues/32790) of packages using `wrapGAppsHook`.
- []{#ssec-gnome-hooks-gobject-introspection} `gobject-introspection` setup hook populates `GI_TYPELIB_PATH` variable with `lib/girepository-1.0` directories of dependencies, which is then added to wrapper by `wrapGApps*` hook. It also adds `share` directories of dependencies to `XDG_DATA_DIRS`, which is intended to promote GIR files but it also [pollutes the closures](https://github.com/NixOS/nixpkgs/issues/32790) of packages using `wrapGApps*` hook.
- []{#ssec-gnome-hooks-gst-grl-plugins} Setup hooks of `gst_all_1.gstreamer` and `grilo` will populate the `GST_PLUGIN_SYSTEM_PATH_1_0` and `GRL_PLUGIN_PATH` variables, respectively, which will then be added to the wrapper by `wrapGAppsHook`.
- []{#ssec-gnome-hooks-gst-grl-plugins} Setup hooks of `gst_all_1.gstreamer` and `grilo` will populate the `GST_PLUGIN_SYSTEM_PATH_1_0` and `GRL_PLUGIN_PATH` variables, respectively, which will then be added to the wrapper by `wrapGApps*` hook.
You can also pass additional arguments to `makeWrapper` using `gappsWrapperArgs` in `preFixup` hook:
@@ -147,15 +149,15 @@ Most GNOME package offer [`updateScript`](#var-passthru-updateScript), it is the
### `GLib-GIO-ERROR **: 06:04:50.903: No GSettings schemas are installed on the system` {#ssec-gnome-common-issues-no-schemas}
There are no schemas available in `XDG_DATA_DIRS`. Temporarily add a random package containing schemas like `gsettings-desktop-schemas` to `buildInputs`. [`glib`](#ssec-gnome-hooks-glib) and [`wrapGAppsHook`](#ssec-gnome-hooks-wrapgappshook) setup hooks will take care of making the schemas available to application and you will see the actual missing schemas with the [next error](#ssec-gnome-common-issues-missing-schema). Or you can try looking through the source code for the actual schemas used.
There are no schemas available in `XDG_DATA_DIRS`. Temporarily add a random package containing schemas like `gsettings-desktop-schemas` to `buildInputs`. [`glib`](#ssec-gnome-hooks-glib) and [`wrapGApps*`](#ssec-gnome-hooks-wrapgappshook) setup hooks will take care of making the schemas available to application and you will see the actual missing schemas with the [next error](#ssec-gnome-common-issues-missing-schema). Or you can try looking through the source code for the actual schemas used.
### `GLib-GIO-ERROR **: 06:04:50.903: Settings schema ‘org.gnome.foo’ is not installed` {#ssec-gnome-common-issues-missing-schema}
Package is missing some GSettings schemas. You can find out the package containing the schema with `nix-locate org.gnome.foo.gschema.xml` and let the hooks handle the wrapping as [above](#ssec-gnome-common-issues-no-schemas).
### When using `wrapGAppsHook` with special derivers you can end up with double wrapped binaries. {#ssec-gnome-common-issues-double-wrapped}
### When using `wrapGApps*` hook with special derivers you can end up with double wrapped binaries. {#ssec-gnome-common-issues-double-wrapped}
This is because derivers like `python.pkgs.buildPythonApplication` or `qt5.mkDerivation` have setup-hooks automatically added that produce wrappers with makeWrapper. The simplest way to workaround that is to disable the `wrapGAppsHook` automatic wrapping with `dontWrapGApps = true;` and pass the arguments it intended to pass to makeWrapper to another.
This is because derivers like `python.pkgs.buildPythonApplication` or `qt5.mkDerivation` have setup-hooks automatically added that produce wrappers with makeWrapper. The simplest way to workaround that is to disable the `wrapGApps*` hook automatic wrapping with `dontWrapGApps = true;` and pass the arguments it intended to pass to makeWrapper to another.
In the case of a Python application it could look like:
@@ -165,7 +167,7 @@ python3.pkgs.buildPythonApplication {
version = "3.32.2";
nativeBuildInputs = [
wrapGAppsHook
wrapGAppsHook3
gobject-introspection
# ...
];
@@ -187,7 +189,7 @@ mkDerivation {
version = "3.47.0";
nativeBuildInputs = [
wrapGAppsHook
wrapGAppsHook3
qmake
# ...
];

View File

@@ -4364,12 +4364,6 @@
githubId = 990767;
name = "Daniel Olsen";
};
danderson = {
email = "dave@natulte.net";
github = "danderson";
githubId = 1918;
name = "David Anderson";
};
daneads = {
email = "me@daneads.com";
github = "daneads";
@@ -6504,16 +6498,6 @@
githubId = 541748;
name = "Felipe Espinoza";
};
federicoschonborn = {
name = "Federico Damián Schonborn";
email = "federicoschonborn@disroot.org";
github = "FedericoSchonborn";
githubId = 62166915;
matrix = "@FedericoDSchonborn:matrix.org";
keys = [
{ fingerprint = "C43F 4052 D289 3B73 33F8 0259 E4F6 F544 DE9E 29E8"; }
];
};
fedx-sudo = {
email = "fedx-sudo@pm.me";
github = "FedX-sudo";
@@ -10404,15 +10388,6 @@
github = "keenanweaver";
githubId = 37268985;
};
keksbg = {
email = "keksbg@riseup.net";
name = "Stella";
github = "keksbg";
githubId = 10682187;
keys = [{
fingerprint = "AB42 1F18 5A19 A160 AD77 9885 3D6D CA5B 6F2C 2A7A";
}];
};
keldu = {
email = "mail@keldu.de";
github = "keldu";
@@ -15393,12 +15368,6 @@
githubId = 72527881;
name = "PassiveLemon";
};
patka = {
email = "patka@patka.dev";
github = "patka-123";
githubId = 69802930;
name = "patka";
};
patricksjackson = {
email = "patrick@jackson.dev";
github = "patricksjackson";
@@ -20326,12 +20295,6 @@
github = "tirimia";
githubId = 11174371;
};
titanous = {
email = "jonathan@titanous.com";
github = "titanous";
githubId = 13026;
name = "Jonathan Rudenberg";
};
tjni = {
email = "43ngvg@masqt.com";
matrix = "@tni:matrix.org";
@@ -20427,12 +20390,6 @@
githubId = 74688871;
name = "Tochukwu Ahanonu";
};
tokudan = {
email = "git@danielfrank.net";
github = "tokudan";
githubId = 692610;
name = "Daniel Frank";
};
tomahna = {
email = "kevin.rauscher@tomahna.fr";
github = "Tomahna";

View File

@@ -98,7 +98,6 @@ with lib.maintainers; {
budgie = {
members = [
bobby285271
federicoschonborn
];
scope = "Maintain Budgie desktop environment";
shortName = "Budgie";

View File

@@ -199,7 +199,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- `k3s`: was updated to version [v1.29](https://github.com/k3s-io/k3s/releases/tag/v1.29.1%2Bk3s2), all previous versions (k3s_1_26, k3s_1_27, k3s_1_28) will be removed. See [changelog and upgrade notes](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.29.md#urgent-upgrade-notes) for more information.
- `himalaya` was updated to `v1.0.0-beta.4`, which introduces breaking changes. Check out the [release note](https://github.com/soywod/himalaya/releases/tag/v1.0.0-beta.4) for details.
- `himalaya` was updated to v1.0.0-beta.4, which introduces breaking changes. Check out the [release note](https://github.com/soywod/himalaya/releases/tag/v1.0.0-beta.4) for details.
- The `power.ups` module now generates `upsd.conf`, `upsd.users` and `upsmon.conf` automatically from a set of new configuration options. This breaks compatibility with existing `power.ups` setups where these files were created manually. Back up these files before upgrading NixOS.
@@ -216,7 +216,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- `unrar` was updated to v7. See [changelog](https://www.rarlab.com/unrar7notes.htm) for more information.
- `git-town` was updated from version `11` to `13`. See the [changelog](https://github.com/git-town/git-town/blob/main/CHANGELOG.md#1300-2024-03-22) for breaking changes.
- `git-town` was updated from version 11 to 13. See the [changelog](https://github.com/git-town/git-town/blob/main/CHANGELOG.md#1300-2024-03-22) for breaking changes.
- `k9s` was updated to v0.31. There have been various breaking changes in the config file format,
check out the changelog of [v0.29](https://github.com/derailed/k9s/releases/tag/v0.29.0),
@@ -263,7 +263,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- `buildGoModule` now throws an error when `vendorHash` is not specified. `vendorSha256`, deprecated in Nixpkgs 23.11, is now ignored and is no longer a `vendorHash` alias.
- `services.invidious.settings.db.user`, the default database username, has changed from `kemal` to `invidious`. Setups involving an externally-provisioned database (i.e. `services.invidious.database.createLocally == false`) should adjust their configuration accordingly. The old `kemal` user will not be removed automatically even when the database is provisioned automatically.(https://github.com/NixOS/nixpkgs/pull/265857)
- `services.invidious.settings.db.user`, the default database username has changed from `kemal` to `invidious`. Setups involving an externally-provisioned database (i.e. `services.invidious.database.createLocally == false`) should adjust their configuration accordingly. The old `kemal` user will not be removed automatically even when the database is provisioned automatically.(https://github.com/NixOS/nixpkgs/pull/265857)
- `writeReferencesToFile` is deprecated in favour of the new trivial build helper `writeClosure`. The latter accepts a list of paths and has an unambiguous name and cleaner implementation.
@@ -301,11 +301,11 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- `gonic` has been updated to v0.16.4. Config now requires `playlists-path` to be set. See the rest of the [v0.16.0 release notes](https://github.com/sentriz/gonic/releases/tag/v0.16.0) for more details.
- The `services.vikunja` systemd service now uses `vikunja` as dynamic user instead of `vikunja-api`. Database users might need to be changed.
- `services.vikunja` systemd service now uses `vikunja` as dynamic user instead of `vikunja-api`. Database users might need to be changed.
- The `services.vikunja.setupNginx` setting has been removed. Users now need to setup the webserver configuration on their own with a proxy pass to the vikunja service.
- `services.vikunja.setupNginx` setting has been removed. Users now need to setup the webserver configuration on their own with a proxy pass to the vikunja service.
- The `woodpecker-*` packages have been updated to v2 which includes [breaking changes](https://woodpecker-ci.org/docs/next/migrations#200).
- `woodpecker-*` packages have been updated to v2 which includes [breaking changes](https://woodpecker-ci.org/docs/next/migrations#200).
- `services.nginx` will no longer advertise HTTP/3 availability automatically. This must now be manually added, preferably to each location block.
Example:
@@ -321,17 +321,17 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
}
```
- The package `optparse-bash` is now dropped due to upstream inactivity. Alternatives available in Nixpkgs include [`argc`](https://github.com/sigoden/argc), [`argbash`](https://github.com/matejak/argbash), [`bashly`](https://github.com/DannyBen/bashly) and [`gum`](https://github.com/charmbracelet/gum), to name a few.
- `optparse-bash` is now dropped due to upstream inactivity. Alternatives available in Nixpkgs include [`argc`](https://github.com/sigoden/argc), [`argbash`](https://github.com/matejak/argbash), [`bashly`](https://github.com/DannyBen/bashly) and [`gum`](https://github.com/charmbracelet/gum), to name a few.
- The `kanata` package has been updated to v1.5.0, which includes [breaking changes](https://github.com/jtroo/kanata/releases/tag/v1.5.0).
- `kanata` package has been updated to v1.5.0, which includes [breaking changes](https://github.com/jtroo/kanata/releases/tag/v1.5.0).
- The `craftos-pc` package has been updated to v2.8, which includes [breaking changes](https://github.com/MCJack123/craftos2/releases/tag/v2.8).
- `craftos-pc` package has been updated to v2.8, which includes [breaking changes](https://github.com/MCJack123/craftos2/releases/tag/v2.8).
- Files are now handled in binary mode; this could break programs with embedded UTF-8 characters.
- The ROM was updated to match ComputerCraft version v1.109.2.
- The bundled Lua was updated to Lua v5.2, which includes breaking changes. See the [Lua manual](https://www.lua.org/manual/5.2/manual.html#8) for more information.
- The WebSocket API [was rewritten](https://github.com/MCJack123/craftos2/issues/337), which introduced breaking changes.
- The `gtest` package has been updated past v1.13.0, which requires C++14 or higher.
- `gtest` package has been updated past v1.13.0, which requires C++14 or higher.
- The latest available version of Nextcloud is v28 (available as `pkgs.nextcloud28`). The installation logic is as follows:
- If [`services.nextcloud.package`](#opt-services.nextcloud.package) is specified explicitly, this package will be installed (**recommended**)
@@ -341,7 +341,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- The vendored third party libraries have been mostly removed from `cudaPackages.nsight_systems`, which we now only ship for `cudaPackages_11_8` and later due to outdated dependencies. Users comfortable with the vendored dependencies may use `overrideAttrs` to amend the `postPatch` phase and the `meta.broken` correspondingly. Alternatively, one could package the deprecated `boost170` locally, as required for `cudaPackages_11_4.nsight_systems`.
- The `cudaPackages` package scope has been updated to `cudaPackages_12`.
- `cudaPackages` package scope has been updated to `cudaPackages_12`.
- The deprecated `cudaPackages.cudatoolkit` has been replaced with a
symlink-based wrapper for the splayed redistributable CUDA packages. The
@@ -349,7 +349,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
like e.g. tensorflow. The original runfile-based `cudatoolkit` is still
available as `cudatoolkit-legacy-runfile`.
- The `halloy` package was updated past 2024.5 which introduced a breaking change by switching the config format from YAML to TOML. See https://github.com/squidowl/halloy/releases/tag/2024.5 for details.
- `halloy` package was updated past 2024.5 which introduced a breaking change by switching the config format from YAML to TOML. See https://github.com/squidowl/halloy/releases/tag/2024.5 for details.
- Ada packages (libraries and tools) have been moved into the `gnatPackages` scope. `gnatPackages` uses the default GNAT compiler, `gnat12Packages` and `gnat13Packages` use the respective matching compiler version.
@@ -369,7 +369,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- `xxd` has been moved from `vim` default output to its own output to reduce closure size. The canonical way to reference it across all platforms is `unixtools.xxd`.
- The `stalwart-mail` package has been updated to v0.5.3, which includes [breaking changes](https://github.com/stalwartlabs/mail-server/blob/v0.5.3/UPGRADING.md).
- `stalwart-mail` package has been updated to v0.5.3, which includes [breaking changes](https://github.com/stalwartlabs/mail-server/blob/v0.5.3/UPGRADING.md).
- `services.zope2` has been removed as `zope2` is unmaintained and was relying on Python2.
@@ -414,7 +414,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
allows to restart multiple services that are ordered before sysinit.target
and respect the ordering between the services.
- The `systemd.oomd` module behavior is changed as:
- `systemd.oomd` module behavior is changed as:
- Raise ManagedOOMMemoryPressureLimit from 50% to 80%. This should make systemd-oomd kill things less often, and fix issues like [this](https://pagure.io/fedora-workstation/issue/358).
Reference: [commit](https://src.fedoraproject.org/rpms/systemd/c/806c95e1c70af18f81d499b24cd7acfa4c36ffd6?branch=806c95e1c70af18f81d499b24cd7acfa4c36ffd6)
@@ -434,7 +434,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- [watchdogd](https://troglobit.com/projects/watchdogd/), a system and process supervisor using watchdog timers. Available as [services.watchdogd](#opt-services.watchdogd.enable).
- The `jdt-language-server` package now uses upstream's provided python wrapper instead of our own custom wrapper. This results in the following breaking and notable changes:
- `jdt-language-server` package now uses upstream's provided python wrapper instead of our own custom wrapper. This results in the following breaking and notable changes:
- The main binary for the package is now named `jdtls` instead of `jdt-language-server`, equivalent to what most editors expect the binary to be named.
@@ -456,21 +456,21 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- Ruby plugin support has been disabled in DFHack. Many of the Ruby plugins have been converted to Lua, and support was removed upstream due to frequent crashes.
- The `livebook` package is now built as a `mix release` instead of an `escript`.
- `livebook` package is now built as a `mix release` instead of an `escript`.
This means that configuration now has to be done using [environment variables](https://hexdocs.pm/livebook/readme.html#environment-variables) instead of command line arguments.
This has the further implication that the `livebook` service configuration has changed:
- The `erlang_node_short_name`, `erlang_node_name`, `port` and `options` configuration parameters are gone, and have been replaced with an `environment` parameter.
- `erlang_node_short_name`, `erlang_node_name`, `port` and `options` configuration parameters are gone, and have been replaced with an `environment` parameter.
Use the appropriate [environment variables](https://hexdocs.pm/livebook/readme.html#environment-variables) inside `environment` to configure the service instead.
- `akkoma` now requires explicitly setting the base URL for uploaded media (`settings."Pleroma.Upload".base_url`), as well as for the media proxy if enabled (`settings."Media"`).
This is recommended to be a separate (sub)domain to the one Akkoma is hosted at.
See [here](https://meta.akkoma.dev/t/akkoma-stable-2024-03-securer-i-barely-know-her/681#explicit-upload-and-media-proxy-domains-5) for more details.
- The `crystal` package has been updated to 1.11.x, which has some breaking changes.
- `crystal` package has been updated to 1.11.x, which has some breaking changes.
Refer to crystal's changelog for more information. ([v1.10](https://github.com/crystal-lang/crystal/blob/master/CHANGELOG.md#1100-2023-10-09), [v1.11](https://github.com/crystal-lang/crystal/blob/master/CHANGELOG.md#1110-2024-01-08))
- The `erlang-ls` package no longer ships the `els_dap` binary as of v0.51.0.
- `erlang-ls` package no longer ships the `els_dap` binary as of v0.51.0.
- `icu` no longer includes `install-sh` and `mkinstalldirs` in the shared folder.
@@ -480,14 +480,14 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- `addDriverRunpath` has been added to facilitate the deprecation of the old `addOpenGLRunpath` setuphook. This change is motivated by the evolution of the setuphook to include all hardware acceleration.
- (TODO awaiting feedback on code-casing package names) Cinnamon has been updated to 6.0. Please beware that the [Wayland session](https://blog.linuxmint.com/?p=4591) is still experimental in this release and could potentially [affect Xorg sessions](https://blog.linuxmint.com/?p=4639). We suggest a reboot when switching between sessions.
- `cinnamon` has been updated to 6.0. Please beware that the [Wayland session](https://blog.linuxmint.com/?p=4591) is still experimental in this release and could potentially [affect Xorg sessions](https://blog.linuxmint.com/?p=4639). We suggest a reboot when switching between sessions.
- (TODO awaiting feedback on code-casing package names) MATE has been updated to 1.28.
- To properly support panel plugins built with Wayland (in-process) support, we are introducing `services.xserver.desktopManager.mate.extraPanelApplets` option, please use that for installing panel applets.
- Similarly, please use `services.xserver.desktopManager.mate.extraCajaExtensions` option for installing Caja extensions.
- To use the Wayland session, enable `services.xserver.desktopManager.mate.enableWaylandSession`. This is opt-in for now as it is in early stage and introduces a new set of Wayfire closure. Due to [known issues with LightDM](https://github.com/canonical/lightdm/issues/63), we suggest using SDDM for display manager.
- The (TODO awaiting feedback on code-casing package names) Budgie module installs gnome-terminal by default (instead of mate-terminal).
- `services.xserver.desktopManager.budgie` installs `gnome.gnome-terminal` by default (instead of `mate.mate-terminal`).
- New `boot.loader.systemd-boot.xbootldrMountPoint` allows setting up a separate [XBOOTLDR partition](https://uapi-group.org/specifications/specs/boot_loader_specification/) to store boot files. Useful on systems with a small EFI System partition that cannot be easily repartitioned.
@@ -496,7 +496,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- `services.postgresql.extraPlugins` changed its type from just a list of packages to also a function that returns such a list.
For example a config line like ``services.postgresql.extraPlugins = with pkgs.postgresql_11.pkgs; [ postgis ];`` is recommended to be changed to ``services.postgresql.extraPlugins = ps: with ps; [ postgis ];``;
- The Matrix homeserver [Synapse](https://element-hq.github.io/synapse/) module now supports configuring UNIX domain socket [listeners](#opt-services.matrix-synapse.settings.listeners) through the `path` option.
- [`matrix-synapse`](https://element-hq.github.io/synapse/) homeserver module now supports configuring UNIX domain socket [`listeners`](#opt-services.matrix-synapse.settings.listeners) through the `path` option.
The default replication worker on the main instance has been migrated away from TCP sockets to UNIX domain sockets.
- `boot.initrd.network.ssh.authorizedKeyFiles` is a new option in the initrd ssh daemon module, for adding authorized keys via list of files.
@@ -507,10 +507,10 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
The `nimPackages` and `nim2Packages` sets have been removed.
See https://nixos.org/manual/nixpkgs/unstable#nim for more information.
- Programs written in [D](https://dlang.org/) using the `dub` build system and package manager can now be built using `buildDubPackage` utilizing lockfiles provided by the new `dub-to-nix` helper program.
- [TODO: reword to place an attribute at the front] Programs written in [D](https://dlang.org/) using the `dub` build system and package manager can now be built using `buildDubPackage` utilizing lockfiles provided by the new `dub-to-nix` helper program.
See the [D section](https://nixos.org/manual/nixpkgs/unstable#dlang) in the manual for more information.
- [Portunus](https://github.com/majewsky/portunus) has been updated to major version 2.
- [`portunus`](https://github.com/majewsky/portunus) has been updated to major version 2.
This version of Portunus supports strong password hashes, but the legacy hash SHA-256 is also still supported to ensure a smooth migration of existing user accounts.
After upgrading, follow the instructions on the [upstream release notes](https://github.com/majewsky/portunus/releases/tag/v2.0.0) to upgrade all user accounts to strong password hashes.
Support for weak password hashes will be removed in NixOS 24.11.
@@ -519,11 +519,11 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- `libass` now uses the native CoreText backend on Darwin, which may fix subtitle rendering issues with `mpv`, `ffmpeg`, etc.
- (TODO awaiting feedback on code-casing package names) [Lilypond](https://lilypond.org/index.html) and [Denemo](https://www.denemo.org) are now compiled with Guile 3.0.
- [`lilypond`](https://lilypond.org/index.html) and [`denemo`](https://www.denemo.org) are now compiled with Guile 3.0.
- (TODO awaiting feedback on code-casing package names) Garage has been updated to v1.x.x. Users should read the [upstream release notes](https://git.deuxfleurs.fr/Deuxfleurs/garage/releases/tag/v1.0.0) and follow the documentation when changing over their `services.garage.package` and performing this manual upgrade.
- `garage` has been updated to v1.x.x. Users should read the [upstream release notes](https://git.deuxfleurs.fr/Deuxfleurs/garage/releases/tag/v1.0.0) and follow the documentation when changing over their `services.garage.package` and performing this manual upgrade.
- The EC2 image module now enables the [Amazon SSM Agent](https://docs.aws.amazon.com/systems-manager/latest/userguide/ssm-agent.html) by default.
- [TODO: reword to place an attribute at the front] The EC2 image module now enables the [Amazon SSM Agent](https://docs.aws.amazon.com/systems-manager/latest/userguide/ssm-agent.html) by default.
- The following options of the Nextcloud module were moved into [`services.nextcloud.settings`](#opt-services.nextcloud.settings) and renamed to match the name from Nextcloud's `config.php`:
- `logLevel` -> [`loglevel`](#opt-services.nextcloud.settings.loglevel),
@@ -535,7 +535,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- `extraTrustedDomains` -> [`trusted_domains`](#opt-services.nextcloud.settings.trusted_domains) and
- `trustedProxies` -> [`trusted_proxies`](#opt-services.nextcloud.settings.trusted_proxies).
- The option [`services.nextcloud.config.dbport`] of the Nextcloud module was removed to match upstream.
- `services.nextcloud.config.dbport` option of the Nextcloud module was removed to match upstream.
The port can be specified in [`services.nextcloud.config.dbhost`](#opt-services.nextcloud.config.dbhost).
- A new abstraction to create both read-only as well as writable overlay file
@@ -543,7 +543,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
[fileSystems.overlay](#opt-fileSystems._name_.overlay.lowerdir). See also the
[NixOS docs](#sec-overlayfs).
- systemd units can now specify the `Upholds=` and `UpheldBy=` unit dependencies via the aptly
- `systemd` units can now specify the `Upholds=` and `UpheldBy=` unit dependencies via the aptly
named `upholds` and `upheldBy` options. These options get systemd to enforce that the
dependencies remain continuosly running for as long as the dependent unit is in a running state.
@@ -556,21 +556,21 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- New options were added to the dnsdist module to enable and configure a DNSCrypt endpoint (see `services.dnsdist.dnscrypt.enable`, etc.).
The module can generate the DNSCrypt provider key pair, certificates and also performs their rotation automatically with no downtime.
- `sonarr` bumped to v4. Consequently existing config database files will be upgraded automatically, but note that some old apparently-working configs [might actually be corrupt and fail to upgrade cleanly](https://forums.sonarr.tv/t/sonarr-v4-released/33089).
- `sonarr` version bumped to from 3.0.10 to 4.0.3. Consequently existing config database files will be upgraded automatically, but note that some old apparently-working configs [might actually be corrupt and fail to upgrade cleanly](https://forums.sonarr.tv/t/sonarr-v4-released/33089).
- The Yama LSM is now enabled by default in the kernel, which prevents ptracing
- [TODO: reword to place an attribute at the front] The Yama LSM is now enabled by default in the kernel, which prevents ptracing
non-child processes. This means you will not be able to attach gdb to an
existing process, but will need to start that process from gdb (so it is a
child). Or you can set `boot.kernel.sysctl."kernel.yama.ptrace_scope"` to 0.
- The netbird module now allows running multiple tunnels in parallel through [`services.netbird.tunnels`](#opt-services.netbird.tunnels).
- `netbird` module now allows running multiple tunnels in parallel through [`services.netbird.tunnels`](#opt-services.netbird.tunnels).
- [Nginx virtual hosts](#opt-services.nginx.virtualHosts) using `forceSSL` or
`globalRedirect` can now have redirect codes other than 301 through `redirectCode`.
- `bacula` now allows to configure `TLS` for encrypted communication.
- `libjxl` 0.9.0 [dropped support for the butteraugli API](https://github.com/libjxl/libjxl/pull/2576). You will no longer be able to set `enableButteraugli` on `libaom`.
- `libjxl` version bumped from 0.8.2 to 0.9.1 [dropped support for the butteraugli API](https://github.com/libjxl/libjxl/pull/2576). You will no longer be able to set `enableButteraugli` on `libaom`.
- `mockgen` package source has changed to the [go.uber.org/mock](https://github.com/uber-go/mock) fork because [the original repository is no longer maintained](https://github.com/golang/mock#gomock).
@@ -580,7 +580,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- [](#opt-boot.kernel.sysctl._net.core.wmem_max_) changed from a string to an integer because of the addition of a custom merge option (taking the highest value defined to avoid conflicts between 2 services trying to set that value), just as [](#opt-boot.kernel.sysctl._net.core.rmem_max_) since 22.11.
- A new top-level package set, `pkgsExtraHardening` is added. This is a set of packages built with stricter hardening flags - those that have not yet received enough testing to be applied universally, those that are more likely to cause build failures or those that have drawbacks to their use (e.g. performance or required hardware features).
- [TODO: reword to place an attribute at the front] A new top-level package set, `pkgsExtraHardening` is added. This is a set of packages built with stricter hardening flags - those that have not yet received enough testing to be applied universally, those that are more likely to cause build failures or those that have drawbacks to their use (e.g. performance or required hardware features).
- `services.zfs.zed.enableMail` now uses the global `sendmail` wrapper defined by an email module
(such as msmtp or Postfix). It no longer requires using a special ZFS build with email support.
@@ -596,7 +596,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- `kavita` has been updated to 0.8.0, requiring a manual forced library scan on all libraries for migration. Refer to upstream's [release notes](https://github.com/Kareadita/Kavita/releases/tag/v0.8.0) for details.
- The `krb5` module has been rewritten and moved to `security.krb5`, moving all options but `security.krb5.enable` and `security.krb5.package` into `security.krb5.settings`.
- `krb5` module has been rewritten and moved to `security.krb5`, moving all options but `security.krb5.enable` and `security.krb5.package` into `security.krb5.settings`.
- `services.soju` now has a wrapper for the `sojuctl` command, pointed at the service config file. It also has the new option `adminSocket.enable`, which creates a unix admin socket at `/run/soju/admin`.
@@ -604,44 +604,44 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- Custom themes and other assets that were previously stored in `custom/public/*` now belong in `custom/public/assets/*`
- New instances of Gitea using MySQL now ignore the `[database].CHARSET` config option and always use the `utf8mb4` charset, existing instances should migrate via the `gitea doctor convert` CLI command.
- The `services.paperless` module no longer uses the previously downloaded NLTK data stored in `/var/cache/paperless/nltk`. This directory can be removed.
- `services.paperless` module no longer uses the previously downloaded NLTK data stored in `/var/cache/paperless/nltk`. This directory can be removed.
- The `services.teeworlds` module now has a wealth of configuration options, including a new `package` option.
- `services.teeworlds` module now has a wealth of configuration options, including a new `package` option.
- The `hardware.pulseaudio` module now sets permission of pulse user home directory to 755 when running in "systemWide" mode. It fixes [issue 114399](https://github.com/NixOS/nixpkgs/issues/114399).
- `hardware.pulseaudio` module now sets permission of pulse user home directory to 755 when running in "systemWide" mode. It fixes [issue 114399](https://github.com/NixOS/nixpkgs/issues/114399).
- The `services.networkmanager.extraConfig` was renamed to `services.networkmanager.settings` and was changed to use the ini type instead of using a multiline string.
- `services.networkmanager.extraConfig` was renamed to `services.networkmanager.settings` and was changed to use the ini type instead of using a multiline string.
- `services.github-runner` module has been removed. To configure a single GitHub Actions Runner refer to `services.github-runners.*`. Note that this will trigger a new runner registration.
- The `services.slskd` has been refactored to include more configuation options in
- `services.slskd` has been refactored to include more configuation options in
the free-form `services.slskd.settings` option, and some defaults (including listen ports)
have been changed to match the upstream defaults. Additionally, disk logging is now
disabled by default, and the log rotation timer has been removed.
The nginx virtualhost option is now of the `vhost-options` type.
- The `btrbk` module now automatically selects and provides required compression
- `services.btrbk` now automatically selects and provides required compression
program depending on the configured `stream_compress` option. Since this
replaces the need for the `extraPackages` option, this option will be
deprecated in future releases.
- The `mpich` package expression now requires `withPm` to be a list, e.g. `"hydra:gforker"` becomes `[ "hydra" "gforker" ]`.
- `mpich` package expression now requires `withPm` to be a list, e.g. `"hydra:gforker"` becomes `[ "hydra" "gforker" ]`.
- When merging systemd unit options (of type `unitOption`),
- `systemd`: when merging unit options (of type `unitOption`),
if at least one definition is a list, all those which aren't are now lifted into a list,
making it possible to accumulate definitions without resorting to `mkForce`,
hence to retain the definitions not anticipating that need.
- YouTrack is bumped to 2023.3. The update is not performed automatically, it requires manual interaction. See the YouTrack section in the manual for details.
- `youtrack` is bumped to 2023.3. The update is not performed automatically, it requires manual interaction. See the YouTrack section in the manual for details.
- QtMultimedia has changed its default backend to `QT_MEDIA_BACKEND=ffmpeg` (previously `gstreamer` on Linux or `darwin` on MacOS).
The previous native backends remain available but are now minimally maintained. Refer to [upstream documentation](https://doc.qt.io/qt-6/qtmultimedia-index.html#ffmpeg-as-the-default-backend) for further details about each platform.
- The `drbd` out-of-tree Linux kernel driver has been added in version `9.2`. With it the DRBD 9.x features can be used instead of the 8.x features provided by the `8.4.11` in-tree driver.
- `drbd` out-of-tree Linux kernel driver has been added in version 9.2.7. With it the DRBD 9.x features can be used instead of the 8.x features provided by the 8.4.11 in-tree driver.
- The oil shell's c++ version is now available as `oils-for-unix`. The python version is still available as `oil`
- [TODO: reword to place an attribute at the front] The oil shell's c++ version is now available as `oils-for-unix`. The python version is still available as `oil`
- `documentation.man.mandoc` now by default uses `MANPATH` to set the directories where mandoc will search for manual pages.
This enables mandoc to find manual pages in Nix profiles. To set the manual search paths via the `mandoc.conf` configuration file like before, use `documentation.man.mandoc.settings.manpath` instead.
- The `grafana-loki` package was updated to 3.0.0 which includes [breaking changes](https://github.com/grafana/loki/releases/tag/v3.0.0)
- `grafana-loki` package was updated to 3.0.0 which includes [breaking changes](https://github.com/grafana/loki/releases/tag/v3.0.0)

View File

@@ -6,7 +6,7 @@ let
cfg = config.services.pixiecore;
in
{
meta.maintainers = with maintainers; [ bbigras danderson ];
meta.maintainers = with maintainers; [ bbigras ];
options = {
services.pixiecore = {

View File

@@ -7,7 +7,7 @@ let
in
{
meta = {
maintainers = with maintainers; [ danderson ];
maintainers = with maintainers; [ ];
};
options = {

View File

@@ -6,7 +6,7 @@ let
cfg = config.services.tailscale;
isNetworkd = config.networking.useNetworkd;
in {
meta.maintainers = with maintainers; [ danderson mbaillie twitchyliquid64 mfrw ];
meta.maintainers = with maintainers; [ mbaillie twitchyliquid64 mfrw ];
options.services.tailscale = {
enable = mkEnableOption "Tailscale client daemon";

View File

@@ -17,7 +17,7 @@ let
in
{
meta.doc = ./castopod.md;
meta.maintainers = with lib.maintainers; [ alexoundos misuzu ];
meta.maintainers = with lib.maintainers; [ alexoundos ];
options.services = {
castopod = {

View File

@@ -27,7 +27,7 @@ let
in
{
meta.doc = ./gotosocial.md;
meta.maintainers = with lib.maintainers; [ misuzu blakesmith ];
meta.maintainers = with lib.maintainers; [ blakesmith ];
options.services.gotosocial = {
enable = lib.mkEnableOption "ActivityPub social network server";

View File

@@ -112,7 +112,12 @@ in
package = lib.mkPackageOption pkgs "incus-lts" { };
lxcPackage = lib.mkPackageOption pkgs "lxc" { };
lxcPackage = lib.mkOption {
type = lib.types.package;
default = config.virtualisation.lxc.package;
defaultText = lib.literalExpression "config.virtualisation.lxc.package";
description = "The lxc package to use.";
};
clientPackage = lib.mkOption {
type = lib.types.package;

View File

@@ -32,6 +32,7 @@ in
{manpage}`lxc.system.conf(5)`.
'';
};
package = lib.mkPackageOption pkgs "lxc" { };
defaultConfig =
lib.mkOption {
@@ -57,19 +58,19 @@ in
###### implementation
config = lib.mkIf cfg.enable {
environment.systemPackages = [ pkgs.lxc ];
environment.systemPackages = [ cfg.package ];
environment.etc."lxc/lxc.conf".text = cfg.systemConfig;
environment.etc."lxc/lxc-usernet".text = cfg.usernetConfig;
environment.etc."lxc/default.conf".text = cfg.defaultConfig;
systemd.tmpfiles.rules = [ "d /var/lib/lxc/rootfs 0755 root root -" ];
security.apparmor.packages = [ pkgs.lxc ];
security.apparmor.packages = [ cfg.package ];
security.apparmor.policies = {
"bin.lxc-start".profile = ''
include ${pkgs.lxc}/etc/apparmor.d/usr.bin.lxc-start
include ${cfg.package}/etc/apparmor.d/usr.bin.lxc-start
'';
"lxc-containers".profile = ''
include ${pkgs.lxc}/etc/apparmor.d/lxc-containers
include ${cfg.package}/etc/apparmor.d/lxc-containers
'';
};
};

View File

@@ -35,10 +35,11 @@ in {
package = lib.mkPackageOption pkgs "lxd-lts" { };
lxcPackage = lib.mkPackageOption pkgs "lxc" {
extraDescription = ''
Required for AppArmor profiles.
'';
lxcPackage = lib.mkOption {
type = lib.types.package;
default = config.virtualisation.lxc.package;
defaultText = lib.literalExpression "config.virtualisation.lxc.package";
description = "The lxc package to use.";
};
zfsSupport = lib.mkOption {

View File

@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
{
name = "castopod";
meta = with lib.maintainers; {
maintainers = [ alexoundos misuzu ];
maintainers = [ alexoundos ];
};
nodes.castopod = { nodes, ... }: {

View File

@@ -141,9 +141,9 @@ let
assert "BEGIN PGP PUBLIC KEY BLOCK" in server.succeed("curl http://localhost:3000/api/v1/signing-key.gpg")
api_version = json.loads(server.succeed("curl http://localhost:3000/api/forgejo/v1/version")).get("version")
assert "development" != api_version and "-gitea-" in api_version, (
assert "development" != api_version and "${pkgs.forgejo.version}+gitea-" in api_version, (
"/api/forgejo/v1/version should not return 'development' "
+ f"but should contain a gitea compatibility version string. Got '{api_version}' instead."
+ f"but should contain a forgejo+gitea compatibility version string. Got '{api_version}' instead."
)
server.succeed(
@@ -152,7 +152,7 @@ let
)
server.succeed(
"su -l forgejo -c 'GITEA_WORK_DIR=/var/lib/forgejo gitea admin user create "
+ "--username test --password totallysafe --email test@localhost'"
+ "--username test --password totallysafe --email test@localhost --must-change-password=false'"
)
api_token = server.succeed(

View File

@@ -13,7 +13,7 @@ makeInstalledTest {
(stdenv.mkDerivation {
name = "desktop-gsettings";
dontUnpack = true;
nativeBuildInputs = [ glib wrapGAppsHook ];
nativeBuildInputs = [ glib wrapGAppsHook3 ];
buildInputs = [ gsettings-desktop-schemas ];
installPhase = ''
runHook preInstall

View File

@@ -1,7 +1,7 @@
{ lib, ... }:
{
name = "gotosocial";
meta.maintainers = with lib.maintainers; [ misuzu blakesmith ];
meta.maintainers = with lib.maintainers; [ blakesmith ];
nodes.machine = { pkgs, ... }: {
environment.systemPackages = [ pkgs.jq ];

View File

@@ -3,7 +3,7 @@
, fetchFromGitLab
, autoreconfHook
, pkg-config
, wrapGAppsHook
, wrapGAppsHook3
, glib
, gtk3
, expat
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [
autoreconfHook
wrapGAppsHook
wrapGAppsHook3
pkg-config
# doc generation
gnome-doc-utils

View File

@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config
, glib, gtk3, gnome, gsettings-desktop-schemas, wrapGAppsHook
, glib, gtk3, gnome, gsettings-desktop-schemas, wrapGAppsHook3
, xorg
}:
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "005fhmvb45sa9mq17dpa23n1xnspiissx5rnpiy7hiqmy3g5rg8f";
};
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
nativeBuildInputs = [ pkg-config wrapGAppsHook3 ];
buildInputs = [
glib gtk3 gsettings-desktop-schemas

View File

@@ -17,7 +17,7 @@
, rustPlatform
, rustc
, feedbackd
, wrapGAppsHook
, wrapGAppsHook3
, fetchpatch
, nixosTests
}:
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
pkg-config
glib
wayland
wrapGAppsHook
wrapGAppsHook3
rustPlatform.cargoSetupHook
cargo
rustc

View File

@@ -13,7 +13,7 @@
, libsoup
, libxml2
, taglib
, wrapGAppsHook
, wrapGAppsHook3
}:
stdenv.mkDerivation rec {
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
pkg-config
gettext
intltool
wrapGAppsHook
wrapGAppsHook3
];
buildInputs = [

View File

@@ -3,7 +3,7 @@
, fetchFromGitHub
, cmake
, makeWrapper
, wrapGAppsHook
, wrapGAppsHook3
, pkg-config
, python3
, gettext
@@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
pkg-config
python3
makeWrapper
wrapGAppsHook
wrapGAppsHook3
] ++ lib.optionals stdenv.isLinux [
linuxHeaders
];

View File

@@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl
, pkg-config, intltool
, glib, dbus, gtk3, libappindicator-gtk3, gst_all_1
, librsvg, wrapGAppsHook
, librsvg, wrapGAppsHook3
, pulseaudioSupport ? true, libpulseaudio }:
stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
# https://bugs.launchpad.net/audio-recorder/+bug/1784622
env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ];
nativeBuildInputs = [ pkg-config intltool wrapGAppsHook3 ];
buildInputs = [
glib dbus gtk3 librsvg libappindicator-gtk3

View File

@@ -2,7 +2,7 @@
, gdk-pixbuf, glib, gtk3, lib, xorg
, libglvnd, libjack2, ffmpeg
, libxkbcommon, xdg-utils, zlib, pulseaudio
, wrapGAppsHook, makeWrapper }:
, wrapGAppsHook3, makeWrapper }:
stdenv.mkDerivation rec {
pname = "bitwig-studio";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-cF8gVPjM0KUcKOW09uFccp4/lzbUmZcBkVOwr/A/8Yw=";
};
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook3 ];
unpackCmd = ''
mkdir -p root

View File

@@ -16,7 +16,7 @@
, makeWrapper
, pipewire
, pulseaudio
, wrapGAppsHook
, wrapGAppsHook3
, xdg-utils
, xorg
, zlib
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-gtQ1mhXk0AqGidZk5TCzSR58pD1JJoELMBmELtqyb4U=";
};
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook3 ];
unpackCmd = ''
mkdir -p root

View File

@@ -19,7 +19,7 @@
, pango
, pipewire
, pulseaudio
, wrapGAppsHook
, wrapGAppsHook3
, xdg-utils
, xorg
, zlib
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-U1Qp7/7kAr1IEcv256I2J/sb5MYxfR20Pi5N8WaVh2U=";
};
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook3 ];
unpackCmd = ''
mkdir -p root

View File

@@ -7,7 +7,7 @@
, itstool
, libtool
, pkg-config
, wrapGAppsHook
, wrapGAppsHook3
, yelp-tools
, clutter-gtk
, gst_all_1
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
itstool
libtool
pkg-config
wrapGAppsHook
wrapGAppsHook3
yelp-tools
];

View File

@@ -50,7 +50,7 @@ stdenv.mkDerivation {
description = "An open-source hosting platform made for podcasters who want to engage and interact with their audience";
homepage = "https://castopod.org";
license = licenses.agpl3Only;
maintainers = with maintainers; [ alexoundos misuzu ];
maintainers = with maintainers; [ alexoundos ];
platforms = platforms.all;
};
}

View File

@@ -8,7 +8,7 @@
, swift-corelibs-libdispatch
# deadbeef can use either gtk2 or gtk3
, gtk2Support ? false, gtk2
, gtk3Support ? true, gtk3, gsettings-desktop-schemas, wrapGAppsHook
, gtk3Support ? true, gtk3, gsettings-desktop-schemas, wrapGAppsHook3
# input plugins
, vorbisSupport ? true, libvorbis
, mp123Support ? true, libmad
@@ -112,7 +112,7 @@ in clangStdenv.mkDerivation {
libtool
pkg-config
] ++ optionals gtk3Support [
wrapGAppsHook
wrapGAppsHook3
];
enableParallelBuilding = true;

View File

@@ -3,7 +3,7 @@
, glib, libxml2, librsvg, libsndfile, aubio
, gtk3, gtksourceview, evince, fluidsynth, rubberband
, autoreconfHook, gtk-doc
, portaudio, portmidi, fftw, wrapGAppsHook }:
, portaudio, portmidi, fftw, wrapGAppsHook3 }:
stdenv.mkDerivation rec {
pname = "denemo";
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoreconfHook
gtk-doc
wrapGAppsHook
wrapGAppsHook3
intltool
gettext
pkg-config

View File

@@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, fetchPypi, substituteAll, python39, fluidsynth, soundfont-fluid, wrapGAppsHook, abcmidi, abcm2ps, ghostscript }:
{ lib, fetchFromGitHub, fetchPypi, substituteAll, python39, fluidsynth, soundfont-fluid, wrapGAppsHook3, abcmidi, abcm2ps, ghostscript }:
let
# requires python39 due to https://stackoverflow.com/a/71902541 https://github.com/jwdj/EasyABC/issues/52
@@ -28,7 +28,7 @@ in python.pkgs.buildPythonApplication {
hash = "sha256-leC3A4HQMeJNeZXArb3YAYr2mddGPcws618NrRh2Q1Y=";
};
nativeBuildInputs = [ wrapGAppsHook ];
nativeBuildInputs = [ wrapGAppsHook3 ];
propagatedBuildInputs = with python.pkgs; [
cx-freeze

View File

@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, glib, libid3tag, id3lib, taglib
, libvorbis, libogg, opusfile, flac, itstool, libxml2, gsettings-desktop-schemas
, gnome, wrapGAppsHook
, gnome, wrapGAppsHook3
}:
let
@@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
NIX_LDFLAGS = "-lid3tag -lz";
nativeBuildInputs = [ pkg-config intltool itstool libxml2 wrapGAppsHook ];
nativeBuildInputs = [ pkg-config intltool itstool libxml2 wrapGAppsHook3 ];
buildInputs = [
gtk3 glib libid3tag id3lib taglib libvorbis libogg opusfile flac
gsettings-desktop-schemas gnome.adwaita-icon-theme

View File

@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub
, gobject-introspection, makeWrapper, wrapGAppsHook
, gobject-introspection, makeWrapper, wrapGAppsHook3
, gtk3, gst_all_1, python3
, gettext, gnome, help2man, keybinder3, libnotify, librsvg, streamripper, udisks, webkitgtk
, iconTheme ? gnome.adwaita-icon-theme
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
gobject-introspection
makeWrapper
wrapGAppsHook
wrapGAppsHook3
] ++ lib.optionals documentationSupport [
help2man
python3.pkgs.sphinx

View File

@@ -16,7 +16,7 @@
, libICE
, sqlite
, hicolor-icon-theme
, wrapGAppsHook
, wrapGAppsHook3
}:
stdenv.mkDerivation rec {
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
sha256 = "0b3bnxf98i5lhjyljvgxgx9xmb6p46cn3a9cccrng14nagri9556";
};
nativeBuildInputs = [ pkg-config libtool intltool gob2 vala wrapGAppsHook ];
nativeBuildInputs = [ pkg-config libtool intltool gob2 vala wrapGAppsHook3 ];
buildInputs = [
glib
gtk2

View File

@@ -10,7 +10,7 @@
, libsoup
, keybinder3
, gst_all_1
, wrapGAppsHook
, wrapGAppsHook3
, appstream-glib
, desktop-file-utils
}:
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
meson
ninja
pkg-config
wrapGAppsHook
wrapGAppsHook3
appstream-glib
desktop-file-utils
];

View File

@@ -8,7 +8,7 @@
, intltool
, python3
, python3Packages
, wrapGAppsHook
, wrapGAppsHook3
, xdg-utils
}:
@@ -34,7 +34,7 @@ python3Packages.buildPythonApplication rec {
nativeBuildInputs = [
intltool
wrapGAppsHook
wrapGAppsHook3
glibcLocales
gobject-introspection
];

View File

@@ -2,7 +2,7 @@
, fetchFromGitHub
, python3
, gtk3
, wrapGAppsHook
, wrapGAppsHook3
, glibcLocales
, gobject-introspection
, gettext
@@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec {
};
nativeBuildInputs = [
wrapGAppsHook
wrapGAppsHook3
gobject-introspection
pango
gdk-pixbuf

View File

@@ -3,7 +3,7 @@
, fetchFromGitHub
, autoreconfHook
, pkg-config
, wrapGAppsHook
, wrapGAppsHook3
, gst_all_1
, gtk3
, ncurses
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
autoreconfHook
pkg-config
wrapGAppsHook
wrapGAppsHook3
];
buildInputs = [

View File

@@ -31,7 +31,7 @@
, sord
, sratom
, wafHook
, wrapGAppsHook
, wrapGAppsHook3
, zita-convolver
, zita-resampler
, optimizationSupport ? false # Enable support for native CPU extensions
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
pkg-config
python3
wafHook
wrapGAppsHook
wrapGAppsHook3
];
buildInputs = [

View File

@@ -6,7 +6,7 @@
, SDL_image
, SDL_ttf
, gtk3
, wrapGAppsHook
, wrapGAppsHook3
}:
stdenv.mkDerivation (finalAttrs: {
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
pkg-config
wrapGAppsHook
wrapGAppsHook3
];
buildInputs = [

View File

@@ -9,7 +9,7 @@
, pycairo
, pygobject3
, six
, wrapGAppsHook
, wrapGAppsHook3
, xlib
}:
@@ -25,7 +25,7 @@ buildPythonApplication {
};
nativeBuildInputs = [
wrapGAppsHook
wrapGAppsHook3
gobject-introspection
];

View File

@@ -5,7 +5,7 @@
, gettext
, gtk3
, gobject-introspection
, intltool, wrapGAppsHook, glib
, intltool, wrapGAppsHook3, glib
, librsvg
, libayatana-appindicator
, libpulseaudio
@@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec {
nativeBuildInputs = [
gettext
intltool
wrapGAppsHook
wrapGAppsHook3
glib
gdk-pixbuf
];

View File

@@ -3,7 +3,7 @@
, fetchurl
, pkg-config
, intltool
, wrapGAppsHook
, wrapGAppsHook3
, gtk3
, alsa-lib
, libpulseaudio
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
pkg-config
intltool
wrapGAppsHook
wrapGAppsHook3
];
buildInputs = [

View File

@@ -18,7 +18,7 @@
, gdk-pixbuf
, glib
, pango
, wrapGAppsHook
, wrapGAppsHook3
, lastFMSupport ? true
, youtubeSupport ? true
}:
@@ -45,7 +45,7 @@ python3.pkgs.buildPythonApplication rec {
meson
ninja
pkg-config
wrapGAppsHook
wrapGAppsHook3
];
buildInputs = with gst_all_1; [

View File

@@ -2,7 +2,7 @@
, lib
, fetchFromGitHub
, makeDesktopItem
, wrapGAppsHook
, wrapGAppsHook3
, gtk3
, gobject-introspection
, sox
@@ -34,7 +34,7 @@ python3Packages.buildPythonApplication rec {
propagatedBuildInputs = with python3Packages; [ toml pygobject3 ];
nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];
nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ];
buildInputs = [ gtk3 sox ];

View File

@@ -15,14 +15,14 @@
stdenv.mkDerivation rec {
pname = "mmlgui";
version = "unstable-2023-11-16";
version = "unstable-2024-04-15";
src = fetchFromGitHub {
owner = "superctr";
repo = "mmlgui";
rev = "627bfc7b67d4d87253517ba71df2d699a8acdd10";
rev = "e49f225ac2b2d46056b2c45a5d31c544227c4968";
fetchSubmodules = true;
hash = "sha256-d/QLRlSfCrrcvzIhwEBKB5chK+XqO/R8xJ5VfagDi4U=";
hash = "sha256-hj2k1BrE8AA2HTBEO03RammlZV2U4KW0gLJmFNiaSvI=";
};
postPatch = ''

View File

@@ -3,7 +3,7 @@
, python3Packages
, gdk-pixbuf, glib, gobject-introspection, gtk3
, libnotify
, wrapGAppsHook }:
, wrapGAppsHook3 }:
python3Packages.buildPythonApplication rec {
pname = "mpdevil";
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
format = "other";
nativeBuildInputs = [
glib.dev gobject-introspection gtk3 pkg-config meson ninja wrapGAppsHook
glib.dev gobject-introspection gtk3 pkg-config meson ninja wrapGAppsHook3
];
buildInputs = [
@@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec {
# Prevent double wrapping.
dontWrapGApps = true;
# Otherwise wrapGAppsHook do not pick up the dependencies correctly.
# Otherwise wrapGAppsHook3 do not pick up the dependencies correctly.
strictDeps = false;
# There aren't any checks.
doCheck = false;

View File

@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform
, pkg-config, wrapGAppsHook, CoreServices
, pkg-config, wrapGAppsHook3, CoreServices
}:
rustPlatform.buildRustPackage rec {
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
hash = "sha256-09DWUER0ZWQuwfE3sjov2GjJNI7coE3D3E5iUy9mlSE=";
};
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
nativeBuildInputs = [ pkg-config wrapGAppsHook3 ];
buildInputs = lib.optional stdenv.isDarwin CoreServices;
preConfigure = ''

View File

@@ -8,7 +8,7 @@
, pulseaudioFull
, glibmm
, gtkmm3
, wrapGAppsHook
, wrapGAppsHook3
}:
stdenv.mkDerivation rec {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
ninja
gettext
pkg-config
wrapGAppsHook
wrapGAppsHook3
];
buildInputs = [

View File

@@ -9,7 +9,7 @@
, libcanberra-gtk3
, json-glib
, gnome
, wrapGAppsHook
, wrapGAppsHook3
}:
stdenv.mkDerivation rec {
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
gnome.adwaita-icon-theme
];
nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ];
nativeBuildInputs = [ pkg-config intltool wrapGAppsHook3 ];
configureFlags = [ "--disable-lynx" ];

View File

@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, appstream-glib
, wrapGAppsHook, pythonPackages, gtk3, gnome, gobject-introspection
, wrapGAppsHook3, pythonPackages, gtk3, gnome, gobject-introspection
, libnotify, libsecret, gst_all_1 }:
pythonPackages.buildPythonApplication rec {
@@ -20,7 +20,7 @@ pythonPackages.buildPythonApplication rec {
patchShebangs meson_post_install.py
'';
nativeBuildInputs = [ meson ninja pkg-config appstream-glib wrapGAppsHook ];
nativeBuildInputs = [ meson ninja pkg-config appstream-glib wrapGAppsHook3 ];
propagatedNativeBuildInputs = [
gobject-introspection

View File

@@ -6,7 +6,7 @@
, libpulseaudio
, pkg-config
, stdenv
, wrapGAppsHook
, wrapGAppsHook3
}:
stdenv.mkDerivation (finalAttrs: {
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
pkg-config
wrapGAppsHook
wrapGAppsHook3
];
buildInputs = [

View File

@@ -7,7 +7,7 @@
, python3
, libxml2
, desktop-file-utils
, wrapGAppsHook
, wrapGAppsHook3
, gst_all_1
, pulseaudio
, gtk3
@@ -62,7 +62,7 @@ in stdenv.mkDerivation rec {
itstool
python3
desktop-file-utils
wrapGAppsHook
wrapGAppsHook3
];
buildInputs = [

View File

@@ -5,7 +5,7 @@
# build time
, gettext
, gobject-introspection
, wrapGAppsHook
, wrapGAppsHook3
# runtime
, adwaita-icon-theme
@@ -62,7 +62,7 @@ python3.pkgs.buildPythonApplication rec {
nativeBuildInputs = [
gettext
gobject-introspection
wrapGAppsHook
wrapGAppsHook3
] ++ (with python3.pkgs; [
sphinx-rtd-theme
sphinxHook

View File

@@ -26,7 +26,7 @@
# Testing
, gtest
# Fixup
, wrapGAppsHook
, wrapGAppsHook3
, makeWrapper
}:
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-/0GlQdSsIPKGrDT9CgxvaH8TpAbqxFduwL2A2+BSrEI=";
};
nativeBuildInputs = [ cmake pkg-config wrapGAppsHook makeWrapper ];
nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 makeWrapper ];
buildInputs = [
curl

View File

@@ -27,7 +27,7 @@
, tdb
, json-glib
, itstool
, wrapGAppsHook
, wrapGAppsHook3
, desktop-file-utils
, gst_all_1
, gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ]
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
vala
glib
itstool
wrapGAppsHook
wrapGAppsHook3
desktop-file-utils
gobject-introspection
];

View File

@@ -6,7 +6,7 @@
, SDL
, gtk3
, gsettings-desktop-schemas
, wrapGAppsHook
, wrapGAppsHook3
}:
stdenv.mkDerivation (finalAttrs: {
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
SDL
gtk3
gsettings-desktop-schemas
wrapGAppsHook
wrapGAppsHook3
];
makeFlags = [ "DESTDIR=$(out)" ];

View File

@@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, wrapGAppsHook, gettext
{ lib, fetchFromGitHub, wrapGAppsHook3, gettext
, python3Packages, gnome, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }:
let
@@ -19,7 +19,7 @@ in buildPythonApplication rec {
nativeBuildInputs = [
gettext
gobject-introspection
wrapGAppsHook
wrapGAppsHook3
];
buildInputs = [

View File

@@ -16,7 +16,7 @@
, libdiscid
, isocodes
, gsettings-desktop-schemas
, wrapGAppsHook
, wrapGAppsHook3
}:
stdenv.mkDerivation rec {
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
pkg-config
itstool
libxml2
wrapGAppsHook
wrapGAppsHook3
];
buildInputs = [

View File

@@ -1,7 +1,7 @@
{ lib, fetchurl
# Optional due to unfree license.
, faacSupport ? false
, glib, python3Packages, gtk3, wrapGAppsHook
, glib, python3Packages, gtk3, wrapGAppsHook3
, gsettings-desktop-schemas, intltool, xvfb-run
, gobject-introspection, gst_all_1, fdk-aac-encoder }:
@@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec {
nativeBuildInputs = [
intltool
wrapGAppsHook
wrapGAppsHook3
gobject-introspection
];

View File

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg, wxGTK32, gtk3, wrapGAppsHook }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg, wxGTK32, gtk3, wrapGAppsHook3 }:
stdenv.mkDerivation rec {
pname = "spek";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-VYt2so2k3Rk3sLSV1Tf1G2pESYiXygrKr9Koop8ChCg=";
};
nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ];
nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook3 ];
buildInputs = [ ffmpeg wxGTK32 gtk3 ];

View File

@@ -1,4 +1,4 @@
{ fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeShellWrapper, wrapGAppsHook, openssl, freetype
{ fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeShellWrapper, wrapGAppsHook3, openssl, freetype
, glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss_latest, libpng, libnotify
, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_4, curlWithGnuTls, zlib, gnome
, at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon
@@ -90,7 +90,7 @@ stdenv.mkDerivation {
hash = "sha512-o4iLcbNqbsxo9YJMy0SXO7Udv4CMhhBcsf53UuqWKFFWY/jKVN+Lb+dB7Jf9+UowpmbrP44w97Oi+dnbfFXYjQ==";
};
nativeBuildInputs = [ wrapGAppsHook makeShellWrapper squashfsTools ];
nativeBuildInputs = [ wrapGAppsHook3 makeShellWrapper squashfsTools ];
dontStrip = true;
dontPatchELF = true;

View File

@@ -4,7 +4,7 @@
, gobject-introspection
, gtk3
, pango
, wrapGAppsHook
, wrapGAppsHook3
, xvfb-run
, chromecastSupport ? false
, serverSupport ? false
@@ -57,7 +57,7 @@ python.pkgs.buildPythonApplication rec {
nativeBuildInputs = [
python.pkgs.flit-core
gobject-introspection
wrapGAppsHook
wrapGAppsHook3
];
postPatch = ''

View File

@@ -45,7 +45,7 @@ in
stdenv.mkDerivation rec {
pname = "touchosc";
version = "1.3.0.202";
version = "1.3.1.204";
suffix = {
aarch64-linux = "linux-arm64";
@@ -56,9 +56,9 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb";
hash = {
aarch64-linux = "sha256-qsjZ/oo2V6mknrMktuTP188hp57oiPxO/iwp3G57JXU=";
armv7l-linux = "sha256-33SnAYumfnZlxKms3fANt9wRJghaQHUstZbKqTxBF3Q=";
x86_64-linux = "sha256-4SE2iw45sLyapYLCd31xT/aZMTmetsjmgfWFf0FrluI=";
aarch64-linux = "sha256-uSXCgwJUEQZDKPAHDT4kKcvkBg9c+T0nrpvYW8jG8Kg=";
armv7l-linux = "sha256-dG5BF8n66YCYCZzc1pLf2qpMLmbv6lfVZYfgry25jQ0=";
x86_64-linux = "sha256-R07kTuwsfe6WhGpHeyZS/HydDUSH6AByx0pJu/i40xE=";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};

View File

@@ -1,7 +1,7 @@
{ stdenv
, fetchzip
, lib
, wrapGAppsHook
, wrapGAppsHook3
, xdg-utils
, which
, alsa-lib
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
which
xdg-utils
wrapGAppsHook
wrapGAppsHook3
];
buildInputs = with gst_all_1; [

View File

@@ -7,7 +7,7 @@
, vala
, glib
, itstool
, wrapGAppsHook
, wrapGAppsHook3
, desktop-file-utils
, libsoup
, json-glib
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
vala
glib
itstool
wrapGAppsHook
wrapGAppsHook3
desktop-file-utils
];

View File

@@ -24,7 +24,7 @@
, rtmidi
, speexdsp
, stdenv
, wrapGAppsHook
, wrapGAppsHook3
, zstd
}:
@@ -183,7 +183,7 @@ stdenv.mkDerivation rec {
libicns
makeWrapper
pkg-config
wrapGAppsHook
wrapGAppsHook3
];
buildInputs = [
alsa-lib

View File

@@ -21,7 +21,7 @@
, gst_all_1
, json-glib
, libgee
, wrapGAppsHook
, wrapGAppsHook3
}:
stdenv.mkDerivation rec {
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
ninja
vala
pkg-config
wrapGAppsHook
wrapGAppsHook3
];
buildInputs = with gst_all_1; [

View File

@@ -1,7 +1,7 @@
{ lib
, fetchFromGitHub
, buildGoModule
, wrapGAppsHook
, wrapGAppsHook3
, pkg-config
, glib
, gobject-introspection
@@ -26,7 +26,7 @@ buildGoModule rec {
nativeBuildInputs = [
pkg-config
wrapGAppsHook
wrapGAppsHook3
glib
gobject-introspection
gdk-pixbuf

View File

@@ -1,6 +1,6 @@
{ stdenvNoCC
, lib
, wrapGAppsHook
, wrapGAppsHook3
, gdk-pixbuf
, librsvg
, xorg
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation {
nativeBuildInputs = [
xorg.lndir
wrapGAppsHook
wrapGAppsHook3
];
installPhase = ''

View File

@@ -25,13 +25,13 @@
mkDerivation rec {
pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-abc";
version = "0.29.1";
version = "0.29.2";
src = fetchFromGitHub {
owner = "bitcoin-ABC";
repo = "bitcoin-abc";
rev = "v${version}";
hash = "sha256-QEuOMl1sbVdB2nRwBO/2adqj/NIQGbwrBqML39fymM0=";
hash = "sha256-og9hMQdDXGdUQN+A+z0064E6svF+qPd9CWtDQsdvNYQ=";
};
nativeBuildInputs = [ pkg-config cmake ];

View File

@@ -8,13 +8,13 @@
stdenv.mkDerivation {
pname = "btcdeb";
version = "0.3.20-unstable-2024-03-26";
version = "0.3.20-unstable-2024-04-09";
src = fetchFromGitHub {
owner = "bitcoin-core";
repo = "btcdeb";
rev = "675b7820f0eec8a76f68ade7ea35974a561d49dd";
hash = "sha256-J9E0edRbFONMut1/ZFaUqgWAtEUifc+pmGypeUQ0m4c=";
rev = "e2c2e7b9fe2ecc0884129b53813a733f93a6e2c7";
hash = "sha256-heV5VByNZ/2doGVtYhGEei4fV4847UPVgOyU0PDDHc8=";
};
nativeBuildInputs = [ pkg-config autoreconfHook ];

View File

@@ -25,15 +25,15 @@
, mesa
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "exodus";
version = "24.13.3";
version = "24.17.5";
src = fetchurl {
name = "exodus-linux-x64-${version}.zip";
url = "https://downloads.exodus.com/releases/${pname}-linux-x64-${version}.zip";
name = "exodus-linux-x64-${finalAttrs.version}.zip";
url = "https://downloads.exodus.com/releases/exodus-linux-x64-${finalAttrs.version}.zip";
curlOptsList = [ "--user-agent" "Mozilla/5.0" ];
sha256 = "sha256-hhPHWo+nQXgluB6qn57wndX1eslLv3lLpdxm+COGMO8=";
hash = "sha256-HlyscqoxGucoQoFgSWN3vEjAnkdAmtBLOhjhWbScPFc=";
};
nativeBuildInputs = [ unzip ];
@@ -104,4 +104,4 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
maintainers = with maintainers; [ mmahut rople380 Crafter ];
};
}
})

View File

@@ -25,11 +25,11 @@ let
in
stdenv.mkDerivation rec {
pname = "wasabiwallet";
version = "2.0.6";
version = "2.0.7.1";
src = fetchurl {
url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz";
sha256 = "sha256-VxtQZFsiUEeCMEWkdnmE9xXFoa7fWfOWC2UxnZZAia0=";
sha256 = "sha256-u/QDdGLdD5+8j3r8pZQwcG3iTToFJEvzzV7Rl4ggvtM=";
};
dontBuild = true;

View File

@@ -1,7 +1,7 @@
{ stdenv
, lib
, fetchFromSourcehut
, wrapGAppsHook
, wrapGAppsHook3
, pkg-config
, cmake
, meson
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
meson
ninja
cmake
wrapGAppsHook
wrapGAppsHook3
];
buildInputs = [

View File

@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, linkFarm, lightdm-enso-os-greeter
, dbus, pcre, libepoxy, xorg, at-spi2-core, libxklavier, libxkbcommon
, gtk3, vala, cmake, libgee, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }:
, gtk3, vala, cmake, libgee, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook3, librsvg }:
stdenv.mkDerivation {
pname = "lightdm-enso-os-greeter";
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
cmake
pkg-config
vala
wrapGAppsHook
wrapGAppsHook3
];
buildInputs = [

View File

@@ -1,4 +1,4 @@
{ lib, stdenv, linkFarm, lightdm-mini-greeter, fetchFromGitHub, autoreconfHook, pkg-config, lightdm, gtk3, glib, gdk-pixbuf, wrapGAppsHook, librsvg }:
{ lib, stdenv, linkFarm, lightdm-mini-greeter, fetchFromGitHub, autoreconfHook, pkg-config, lightdm, gtk3, glib, gdk-pixbuf, wrapGAppsHook3, librsvg }:
stdenv.mkDerivation rec {
pname = "lightdm-mini-greeter";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-Pm7ExfusFIPktX2C4UE07qgOVhcWhVxnaD3QARpmu7Y=";
};
nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ];
nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook3 ];
buildInputs = [ lightdm gtk3 glib gdk-pixbuf librsvg ];
configureFlags = [ "--sysconfdir=/etc" ];

View File

@@ -6,7 +6,7 @@
, vala
, intltool
, autoreconfHook
, wrapGAppsHook
, wrapGAppsHook3
, cinnamon
, lightdm
, gtk3
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
vala
intltool
autoreconfHook
wrapGAppsHook
wrapGAppsHook3
python3
python3.pkgs.wrapPython
];

View File

@@ -1,5 +1,5 @@
{ lib, stdenv, linkFarm, lightdm-tiny-greeter, fetchFromGitHub
, pkg-config, lightdm, gtk3, glib, wrapGAppsHook, config, conf ? config.lightdm-tiny-greeter.conf or "" }:
, pkg-config, lightdm, gtk3, glib, wrapGAppsHook3, config, conf ? config.lightdm-tiny-greeter.conf or "" }:
stdenv.mkDerivation rec {
pname = "lightdm-tiny-greeter";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "08azpj7b5qgac9bgi1xvd6qy6x2nb7iapa0v40ggr3d1fabyhrg6";
};
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
nativeBuildInputs = [ pkg-config wrapGAppsHook3 ];
buildInputs = [ lightdm gtk3 glib ];
postUnpack = lib.optionalString (conf != "") ''

View File

@@ -6,7 +6,7 @@
, pkg-config
, intltool
, linkFarm
, wrapGAppsHook
, wrapGAppsHook3
, gtk3
, xfce4-dev-tools
, at-spi2-core
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
pkg-config
intltool
xfce4-dev-tools
wrapGAppsHook
wrapGAppsHook3
];
buildInputs = [
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
"--localstatedir=/var"
"--sysconfdir=/etc"
"--disable-indicator-services-command"
"--sbindir=${placeholder "out"}/bin" # for wrapGAppsHook to wrap automatically
"--sbindir=${placeholder "out"}/bin" # for wrapGAppsHook3 to wrap automatically
];
preConfigure = ''

View File

@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitLab, meson, ninja
, wrapGAppsHook, pkg-config, desktop-file-utils
, wrapGAppsHook3, pkg-config, desktop-file-utils
, appstream-glib, pythonPackages, glib, gobject-introspection
, gtk3, webkitgtk, glib-networking, gnome, gspell, texliveMedium
, shared-mime-info, libhandy, fira, sassc
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [ meson ninja pkg-config desktop-file-utils
appstream-glib wrapGAppsHook sassc gobject-introspection ];
appstream-glib wrapGAppsHook3 sassc gobject-introspection ];
buildInputs = [ glib pythonEnv gtk3
gnome.adwaita-icon-theme webkitgtk gspell texliveMedium

View File

@@ -1,7 +1,7 @@
{ lib
, stdenv
, fetchurl
, wrapGAppsHook
, wrapGAppsHook3
, pkg-config
, gtk
, libxml2
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-YUPlHGtVedWW86moXg8NhYDJ9Y+ChXWxGYgODKHZQbw=";
};
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
nativeBuildInputs = [ pkg-config wrapGAppsHook3 ];
buildInputs = [
gnome.adwaita-icon-theme
gtk

View File

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, openjdk, glib, dpkg, wrapGAppsHook }:
{ lib, stdenv, fetchurl, openjdk, glib, dpkg, wrapGAppsHook3 }:
stdenv.mkDerivation rec {
pname = "bluej";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-sOT86opMa9ytxJlfURIsD06HiP+j+oz3lQ0DqmLV1wE=";
};
nativeBuildInputs = [ dpkg wrapGAppsHook ];
nativeBuildInputs = [ dpkg wrapGAppsHook3 ];
buildInputs = [ glib ];
dontWrapGApps = true;

View File

@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, file, zip, wxGTK32, gtk3
, contribPlugins ? false, hunspell, gamin, boost, wrapGAppsHook
, contribPlugins ? false, hunspell, gamin, boost, wrapGAppsHook3
}:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1idaksw1vacmm83krxh5zlb12kad3dkz9ixh70glw1gaibib7vhm";
};
nativeBuildInputs = [ pkg-config file zip wrapGAppsHook ];
nativeBuildInputs = [ pkg-config file zip wrapGAppsHook3 ];
buildInputs = [ wxGTK32 gtk3 ]
++ lib.optionals contribPlugins [ hunspell gamin boost ];
enableParallelBuilding = true;

View File

@@ -16,7 +16,7 @@
}:
let
rev = "4d18701bdef13f6bdc0ad58d26896dff0548dbab";
rev = "977d344e2e930f3680990014f84ca94877d6eebf";
python = python3.withPackages (ps: with ps; [
epc
orjson
@@ -28,13 +28,13 @@ let
in
melpaBuild {
pname = "lsp-bridge";
version = "20240423.38";
version = "20240424.1125";
src = fetchFromGitHub {
owner = "manateelazycat";
repo = "lsp-bridge";
inherit rev;
hash = "sha256-6taxbsu5v/mQBwl0CPt/fsTQpclNhi2alp/xIh5omJA=";
hash = "sha256-moG0BaHHN3ySON4aMza43Ub4GKuGV9mGSzC48xoiPl8=";
};
commit = rev;

View File

@@ -58,7 +58,7 @@
, tree-sitter
, texinfo
, webkitgtk
, wrapGAppsHook
, wrapGAppsHook3
# Boolean flags
, withNativeCompilation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform
@@ -212,7 +212,7 @@ mkDerivation (finalAttrs: {
] ++ lib.optionals srcRepo [
autoreconfHook
texinfo
] ++ lib.optional (withPgtk || withX && (withGTK3 || withXwidgets)) wrapGAppsHook;
] ++ lib.optional (withPgtk || withX && (withGTK3 || withXwidgets)) wrapGAppsHook3;
buildInputs = [
gettext

View File

@@ -1,7 +1,7 @@
{ lib
, buildPythonApplication
, fetchFromGitHub
, wrapGAppsHook
, wrapGAppsHook3
, gobject-introspection
, gtk3
, docutils
@@ -24,7 +24,7 @@ buildPythonApplication rec {
};
nativeBuildInputs = [
wrapGAppsHook
wrapGAppsHook3
gobject-introspection
gtk3
];

View File

@@ -8,7 +8,7 @@
, libintl
, hicolor-icon-theme
, python3
, wrapGAppsHook
, wrapGAppsHook3
}:
stdenv.mkDerivation (finalAttrs: {
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
file
hicolor-icon-theme
python3
wrapGAppsHook
wrapGAppsHook3
];
buildInputs = [

View File

@@ -15,7 +15,7 @@
, libpeas
, libxml2
, gsettings-desktop-schemas
, wrapGAppsHook
, wrapGAppsHook3
, gtk-doc
, gobject-introspection
, docbook-xsl-nons
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
python3
python3Packages.wrapPython
vala
wrapGAppsHook
wrapGAppsHook3
gtk-doc
gobject-introspection
docbook-xsl-nons

View File

@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, python3, perl, bison
, texinfo, desktop-file-utils, wrapGAppsHook, docbook2x, docbook-xsl-nons
, texinfo, desktop-file-utils, wrapGAppsHook3, docbook2x, docbook-xsl-nons
, inform7, gettext, libossp_uuid, gtk3, gobject-introspection, vala, gtk-doc
, webkitgtk, gtksourceview3, gspell, libxml2, goocanvas2, libplist, glib
, gst_all_1 }:
@@ -22,7 +22,7 @@ let
pkg-config
docbook2x
docbook-xsl-nons
wrapGAppsHook
wrapGAppsHook3
gobject-introspection
];
buildInputs = [
@@ -49,7 +49,7 @@ let
texinfo
python3
glib
wrapGAppsHook
wrapGAppsHook3
gobject-introspection
];
buildInputs = [
@@ -84,7 +84,7 @@ in stdenv.mkDerivation {
inform7
python3
desktop-file-utils
wrapGAppsHook
wrapGAppsHook3
];
buildInputs = [
gettext

View File

@@ -5,7 +5,7 @@
, gtk-doc
, vala
, gobject-introspection
, wrapGAppsHook
, wrapGAppsHook3
, gsettings-desktop-schemas
, gspell
, libgedit-amtk
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
gtk-doc
vala
gobject-introspection
wrapGAppsHook
wrapGAppsHook3
itstool
gettext
];

View File

@@ -1,5 +1,5 @@
{ avahiSupport ? false # build support for Avahi in libinfinity
, lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, wrapGAppsHook, yelp-tools
, lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, wrapGAppsHook3, yelp-tools
, gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool }:
let
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
sha256 = "06cbc2y4xkw89jaa0ayhgh7fxr5p2nv3jjs8h2xcbbbgwaw08lk0";
};
nativeBuildInputs = [ autoconf automake pkg-config intltool itstool yelp-tools wrapGAppsHook ];
nativeBuildInputs = [ autoconf automake pkg-config intltool itstool yelp-tools wrapGAppsHook3 ];
buildInputs = [ gtkmm3 gsasl gtksourceview3 libxmlxx libinf ];
preConfigure = "./autogen.sh";

View File

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, openjdk, glib, dpkg, wrapGAppsHook }:
{ lib, stdenv, fetchurl, openjdk, glib, dpkg, wrapGAppsHook3 }:
stdenv.mkDerivation rec {
pname = "greenfoot";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
hash = "sha256-wpmgWtx2jTDjt+7p6HcjU/uy1PRmnAHpJ1rOYb+hV+U=";
};
nativeBuildInputs = [ dpkg wrapGAppsHook ];
nativeBuildInputs = [ dpkg wrapGAppsHook3 ];
buildInputs = [ glib ];
dontWrapGApps = true;

View File

@@ -3,7 +3,7 @@
, fetchurl
, extra-cmake-modules
, kdoctools
, wrapGAppsHook
, wrapGAppsHook3
, qtscript
, kconfig
, kcrash
@@ -32,7 +32,7 @@ mkDerivation rec {
nativeBuildInputs = [
extra-cmake-modules
wrapGAppsHook
wrapGAppsHook3
kdoctools
];

View File

@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, intltool, pkg-config, gtk3, fetchFromGitHub
, autoreconfHook, wrapGAppsHook }:
, autoreconfHook, wrapGAppsHook3 }:
stdenv.mkDerivation rec {
version = "unstable-2022-02-14";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-ly2w9jmRlprm/PnyC0LYjrxBVK+J0DLiSpzuTUMZpWA=";
};
nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook intltool ];
nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook3 intltool ];
buildInputs = [ gtk3 ];
meta = with lib; {

View File

@@ -19,7 +19,7 @@
, ApplicationServices
, Carbon
, AppKit
, wrapGAppsHook
, wrapGAppsHook3
, wayland
, gobject-introspection
, xorg
@@ -82,7 +82,7 @@ rustPlatform.buildRustPackage rec {
pkg-config
perl
python3
wrapGAppsHook # FIX: No GSettings schemas are installed on the system
wrapGAppsHook3 # FIX: No GSettings schemas are installed on the system
gobject-introspection
];

View File

@@ -1,4 +1,4 @@
{ stdenv, lib, fetchgit, pkg-config, meson, ninja, wrapGAppsHook
{ stdenv, lib, fetchgit, pkg-config, meson, ninja, wrapGAppsHook3
, enchant, gtkmm3, libchamplain, libgcrypt, shared-mime-info }:
stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
ninja
pkg-config
shared-mime-info # for update-mime-database
wrapGAppsHook
wrapGAppsHook3
];
buildInputs = [

View File

@@ -5,7 +5,7 @@
, meson
, ninja
, pkg-config
, wrapGAppsHook
, wrapGAppsHook3
, gtk3
, gtksourceview
, gtkspell3
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
meson
ninja
pkg-config
wrapGAppsHook
wrapGAppsHook3
];
buildInputs = [

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