nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 23:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #306080: staging-next 2024-04-22

Browse Source
This commit is contained in:
Vladimír Čunát 2024-05-03 17:36:08 +02:00
commit e96601ecf0
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1410 changed files with 16874 additions and 8119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.git-blame-ignore-revs
View File

@ -105,3 +105,6 @@ fb0e5be84331188a69b3edd31679ca6576edb75a
# {pkgs/development/cuda-modules,pkgs/test/cuda,pkgs/top-level/cuda-packages.nix}: reformat all CUDA files with nixfmt-rfc-style 2023-03-01
802a1b4d3338f24cbc4efd704616654456d75a94
# postgresql: move packages.nix to ext/default.nix
719034f6f6749d624faa28dff259309fc0e3e730

2
doc/README.md
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

2
doc/build-helpers/special/fhs-environments.section.md
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.

32
doc/languages-frameworks/gnome.section.md
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://gitlab.gnome.org/GNOME/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` 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
# ...
];

2
nixos/doc/manual/release-notes/rl-2405.section.md
View File

@ -505,6 +505,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- `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.
## Other Notable Changes {#sec-release-24.05-notable-changes}
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

2
nixos/modules/services/databases/postgresql.nix
View File

@ -37,7 +37,7 @@ let
# package = pkgs.postgresql_<major>;
# };
# works.
base = if cfg.enableJIT then cfg.package.withJIT else cfg.package;
base = if cfg.enableJIT then cfg.package.withJIT else cfg.package.withoutJIT;
in
if cfg.extraPlugins == []
then base

14
nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix
View File

@ -16,7 +16,21 @@
###### implementation
config = lib.mkIf config.services.gnome.gnome-remote-desktop.enable {
services.pipewire.enable = true;
services.dbus.packages = [ pkgs.gnome.gnome-remote-desktop ];
environment.systemPackages = [ pkgs.gnome.gnome-remote-desktop ];
systemd.packages = [ pkgs.gnome.gnome-remote-desktop ];
systemd.tmpfiles.packages = [ pkgs.gnome.gnome-remote-desktop ];
# TODO: if possible, switch to using provided g-r-d sysusers.d
users = {
users.gnome-remote-desktop = {
isSystemUser = true;
group = "gnome-remote-desktop";
home = "/var/lib/gnome-remote-desktop";
};
groups.gnome-remote-desktop = { };
};
};
}

1
nixos/modules/services/x11/desktop-managers/cinnamon.nix
View File

@ -157,6 +157,7 @@ in
# packages
nemo-with-extensions
gnome-online-accounts-gtk
cinnamon-control-center
cinnamon-settings-daemon
libgnomekbd

4
nixos/modules/services/x11/desktop-managers/gnome.nix
View File

@ -343,10 +343,6 @@ in
services.avahi.enable = mkDefault true;
xdg.portal.extraPortals = [
pkgs.gnome.gnome-shell
];
services.geoclue2.enable = mkDefault true;
services.geoclue2.enableDemoAgent = false; # GNOME has its own geoclue agent

2
nixos/tests/installed-tests/gnome-photos.nix
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

15
nixos/tests/postgresql-jit.nix
View File

@ -1,6 +1,7 @@
{ system ? builtins.currentSystem
, config ? {}
, pkgs ? import ../.. { inherit system config; }
, package ? null
}:
with import ../lib/testing-python.nix { inherit system pkgs; };
@ -9,14 +10,17 @@ let
inherit (pkgs) lib;
packages = builtins.attrNames (import ../../pkgs/servers/sql/postgresql pkgs);
mkJitTest = packageName: makeTest {
name = "${packageName}";
mkJitTestFromName = name:
mkJitTest pkgs.${name};
mkJitTest = package: makeTest {
name = package.name;
meta.maintainers = with lib.maintainers; [ ma27 ];
nodes.machine = { pkgs, lib, ... }: {
services.postgresql = {
inherit package;
enable = true;
enableJIT = true;
package = pkgs.${packageName};
initialScript = pkgs.writeText "init.sql" ''
create table demo (id int);
insert into demo (id) select generate_series(1, 5);
@ -45,4 +49,7 @@ let
'';
};
in
lib.genAttrs packages mkJitTest
if package == null then
lib.genAttrs packages mkJitTestFromName
else
mkJitTest package

198
nixos/tests/postgresql-wal-receiver.nix
View File

@ -1,6 +1,7 @@
{ system ? builtins.currentSystem,
config ? {},
pkgs ? import ../.. { inherit system config; }
pkgs ? import ../.. { inherit system config; },
package ? null
}:
with import ../lib/testing-python.nix { inherit system pkgs; };
@ -9,111 +10,110 @@ let
lib = pkgs.lib;
# Makes a test for a PostgreSQL package, given by name and looked up from `pkgs`.
makePostgresqlWalReceiverTest = postgresqlPackage:
makeTestAttribute = name:
{
name = postgresqlPackage;
value =
let
pkg = pkgs."${postgresqlPackage}";
postgresqlDataDir = "/var/lib/postgresql/${pkg.psqlSchema}";
replicationUser = "wal_receiver_user";
replicationSlot = "wal_receiver_slot";
replicationConn = "postgresql://${replicationUser}@localhost";
baseBackupDir = "/tmp/pg_basebackup";
walBackupDir = "/tmp/pg_wal";
atLeast12 = lib.versionAtLeast pkg.version "12.0";
inherit name;
value = makePostgresqlWalReceiverTest pkgs."${name}";
};
recoveryFile = if atLeast12
then pkgs.writeTextDir "recovery.signal" ""
else pkgs.writeTextDir "recovery.conf" "restore_command = 'cp ${walBackupDir}/%f %p'";
makePostgresqlWalReceiverTest = pkg:
let
postgresqlDataDir = "/var/lib/postgresql/${pkg.psqlSchema}";
replicationUser = "wal_receiver_user";
replicationSlot = "wal_receiver_slot";
replicationConn = "postgresql://${replicationUser}@localhost";
baseBackupDir = "/tmp/pg_basebackup";
walBackupDir = "/tmp/pg_wal";
in makeTest {
name = "postgresql-wal-receiver-${postgresqlPackage}";
meta.maintainers = with lib.maintainers; [ pacien ];
recoveryFile = pkgs.writeTextDir "recovery.signal" "";
nodes.machine = { ... }: {
services.postgresql = {
package = pkg;
enable = true;
settings = lib.mkMerge [
{
wal_level = "archive"; # alias for replica on pg >= 9.6
max_wal_senders = 10;
max_replication_slots = 10;
}
(lib.mkIf atLeast12 {
restore_command = "cp ${walBackupDir}/%f %p";
recovery_end_command = "touch recovery.done";
})
];
authentication = ''
host replication ${replicationUser} all trust
'';
initialScript = pkgs.writeText "init.sql" ''
create user ${replicationUser} replication;
select * from pg_create_physical_replication_slot('${replicationSlot}');
'';
in makeTest {
name = "postgresql-wal-receiver-${pkg.name}";
meta.maintainers = with lib.maintainers; [ pacien ];
nodes.machine = { ... }: {
services.postgresql = {
package = pkg;
enable = true;
settings = {
max_replication_slots = 10;
max_wal_senders = 10;
recovery_end_command = "touch recovery.done";
restore_command = "cp ${walBackupDir}/%f %p";
wal_level = "archive"; # alias for replica on pg >= 9.6
};
services.postgresqlWalReceiver.receivers.main = {
postgresqlPackage = pkg;
connection = replicationConn;
slot = replicationSlot;
directory = walBackupDir;
};
# This is only to speedup test, it isn't time racing. Service is set to autorestart always,
# default 60sec is fine for real system, but is too much for a test
systemd.services.postgresql-wal-receiver-main.serviceConfig.RestartSec = lib.mkForce 5;
authentication = ''
host replication ${replicationUser} all trust
'';
initialScript = pkgs.writeText "init.sql" ''
create user ${replicationUser} replication;
select * from pg_create_physical_replication_slot('${replicationSlot}');
'';
};
testScript = ''
# make an initial base backup
machine.wait_for_unit("postgresql")
machine.wait_for_unit("postgresql-wal-receiver-main")
# WAL receiver healthchecks PG every 5 seconds, so let's be sure they have connected each other
# required only for 9.4
machine.sleep(5)
machine.succeed(
"${pkg}/bin/pg_basebackup --dbname=${replicationConn} --pgdata=${baseBackupDir}"
)
# create a dummy table with 100 records
machine.succeed(
"sudo -u postgres psql --command='create table dummy as select * from generate_series(1, 100) as val;'"
)
# stop postgres and destroy data
machine.systemctl("stop postgresql")
machine.systemctl("stop postgresql-wal-receiver-main")
machine.succeed("rm -r ${postgresqlDataDir}/{base,global,pg_*}")
# restore the base backup
machine.succeed(
"cp -r ${baseBackupDir}/* ${postgresqlDataDir} && chown postgres:postgres -R ${postgresqlDataDir}"
)
# prepare WAL and recovery
machine.succeed("chmod a+rX -R ${walBackupDir}")
machine.execute(
"for part in ${walBackupDir}/*.partial; do mv $part ''${part%%.*}; done"
) # make use of partial segments too
machine.succeed(
"cp ${recoveryFile}/* ${postgresqlDataDir}/ && chmod 666 ${postgresqlDataDir}/recovery*"
)
# replay WAL
machine.systemctl("start postgresql")
machine.wait_for_file("${postgresqlDataDir}/recovery.done")
machine.systemctl("restart postgresql")
machine.wait_for_unit("postgresql")
# check that our records have been restored
machine.succeed(
"test $(sudo -u postgres psql --pset='pager=off' --tuples-only --command='select count(distinct val) from dummy;') -eq 100"
)
'';
services.postgresqlWalReceiver.receivers.main = {
postgresqlPackage = pkg;
connection = replicationConn;
slot = replicationSlot;
directory = walBackupDir;
};
# This is only to speedup test, it isn't time racing. Service is set to autorestart always,
# default 60sec is fine for real system, but is too much for a test
systemd.services.postgresql-wal-receiver-main.serviceConfig.RestartSec = lib.mkForce 5;
};
testScript = ''
# make an initial base backup
machine.wait_for_unit("postgresql")
machine.wait_for_unit("postgresql-wal-receiver-main")
# WAL receiver healthchecks PG every 5 seconds, so let's be sure they have connected each other
# required only for 9.4
machine.sleep(5)
machine.succeed(
"${pkg}/bin/pg_basebackup --dbname=${replicationConn} --pgdata=${baseBackupDir}"
)
# create a dummy table with 100 records
machine.succeed(
"sudo -u postgres psql --command='create table dummy as select * from generate_series(1, 100) as val;'"
)
# stop postgres and destroy data
machine.systemctl("stop postgresql")
machine.systemctl("stop postgresql-wal-receiver-main")
machine.succeed("rm -r ${postgresqlDataDir}/{base,global,pg_*}")
# restore the base backup
machine.succeed(
"cp -r ${baseBackupDir}/* ${postgresqlDataDir} && chown postgres:postgres -R ${postgresqlDataDir}"
)
# prepare WAL and recovery
machine.succeed("chmod a+rX -R ${walBackupDir}")
machine.execute(
"for part in ${walBackupDir}/*.partial; do mv $part ''${part%%.*}; done"
) # make use of partial segments too
machine.succeed(
"cp ${recoveryFile}/* ${postgresqlDataDir}/ && chmod 666 ${postgresqlDataDir}/recovery*"
)
# replay WAL
machine.systemctl("start postgresql")
machine.wait_for_file("${postgresqlDataDir}/recovery.done")
machine.systemctl("restart postgresql")
machine.wait_for_unit("postgresql")
# check that our records have been restored
machine.succeed(
"test $(sudo -u postgres psql --pset='pager=off' --tuples-only --command='select count(distinct val) from dummy;') -eq 100"
)
'';
};
# Maps the generic function over all attributes of PostgreSQL packages
in builtins.listToAttrs (map makePostgresqlWalReceiverTest (builtins.attrNames (import ../../pkgs/servers/sql/postgresql pkgs)))
in
if package == null then
# all-tests.nix: Maps the generic function over all attributes of PostgreSQL packages
builtins.listToAttrs (map makeTestAttribute (builtins.attrNames (import ../../pkgs/servers/sql/postgresql pkgs)))
else
# Called directly from <package>.tests
makePostgresqlWalReceiverTest package

4
pkgs/applications/accessibility/dasher/default.nix
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

4
pkgs/applications/accessibility/mousetweaks/default.nix
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

4
pkgs/applications/accessibility/squeekboard/default.nix
View File

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

4
pkgs/applications/audio/ario/default.nix
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 = [

4
pkgs/applications/audio/audacity/default.nix
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
];

4
pkgs/applications/audio/audio-recorder/default.nix
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

4
pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
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

4
pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix
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

4
pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
View File

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

4
pkgs/applications/audio/buzztrax/default.nix
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
];

4
pkgs/applications/audio/deadbeef/default.nix
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;

4
pkgs/applications/audio/denemo/default.nix
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

4
pkgs/applications/audio/easyabc/default.nix
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

4
pkgs/applications/audio/easytag/default.nix
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

4
pkgs/applications/audio/exaile/default.nix
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

4
pkgs/applications/audio/gmpc/default.nix
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

4
pkgs/applications/audio/goodvibes/default.nix
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
];

4
pkgs/applications/audio/gpodder/default.nix
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
];

4
pkgs/applications/audio/gspeech/default.nix
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

4
pkgs/applications/audio/gst123/default.nix
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 = [

4
pkgs/applications/audio/guitarix/default.nix
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 = [

4
pkgs/applications/audio/hivelytracker/default.nix
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 = [

4
pkgs/applications/audio/hushboard/default.nix
View File

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

4
pkgs/applications/audio/indicator-sound-switcher/default.nix
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
];

4
pkgs/applications/audio/lingot/default.nix
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 = [

4
pkgs/applications/audio/lollypop/default.nix
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; [

4
pkgs/applications/audio/lyrebird/default.nix
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 ];

6
pkgs/applications/audio/mpdevil/default.nix
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;

5
pkgs/applications/audio/musescore/default.nix
View File

@ -84,11 +84,6 @@ in stdenv'.mkDerivation (finalAttrs: {
"--set-default QT_QPA_PLATFORM xcb"
];
# HACK `propagatedSandboxProfile` does not appear to actually propagate the
# sandbox profile from `qtbase`, see:
# https://github.com/NixOS/nixpkgs/issues/237458
sandboxProfile = toString qtbase.__propagatedSandboxProfile or null;
nativeBuildInputs = [
wrapQtAppsHook
cmake

4
pkgs/applications/audio/muso/default.nix
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 = ''

4
pkgs/applications/audio/paprefs/default.nix
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 = [

4
pkgs/applications/audio/pavucontrol/default.nix
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" ];

4
pkgs/applications/audio/pithos/default.nix
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

4
pkgs/applications/audio/praat/default.nix
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 = [

4
pkgs/applications/audio/pulseeffects-legacy/default.nix
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 = [

4
pkgs/applications/audio/quodlibet/default.nix
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

4
pkgs/applications/audio/radiotray-ng/default.nix
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

4
pkgs/applications/audio/rhythmbox/default.nix
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
];

4
pkgs/applications/audio/sfxr/default.nix
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)" ];

4
pkgs/applications/audio/sonata/default.nix
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 = [

4
pkgs/applications/audio/sound-juicer/default.nix
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 = [

4
pkgs/applications/audio/soundconverter/default.nix
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
];

4
pkgs/applications/audio/spek/default.nix
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 ];

4
pkgs/applications/audio/spotify/linux.nix
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;

4
pkgs/applications/audio/sublime-music/default.nix
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 = ''

4
pkgs/applications/audio/transcribe/default.nix
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; [

4
pkgs/applications/audio/tuner/default.nix
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
];

4
pkgs/applications/audio/vcv-rack/default.nix
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

4
pkgs/applications/audio/vocal/default.nix
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; [

4
pkgs/applications/audio/ymuse/default.nix
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

103
pkgs/applications/audio/zrythm/default.nix
View File

@ -1,12 +1,9 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchFromSourcehut
, fetchpatch
, SDL2
, fetchzip
, alsa-lib
, appstream
, appstream-glib
, bash-completion
, boost
, breeze-icons
@ -16,7 +13,6 @@
, curl
, dbus
, dconf
, faust2lv2
, fftw
, fftwFloat
, flex
@ -27,159 +23,140 @@
, guile
, help2man
, jq
, json-glib
, kissfft
, libadwaita
, libaudec
, libbacktrace
, libcyaml
, libepoxy
, libgtop
, libjack2
, libpanel
, libpulseaudio
, libsamplerate
, libsass
, libsndfile
, libsoundio
, libxml2
, libyaml
, lilv
, lv2
, meson
, ninja
, pandoc
, pcre
, pcre2
, pkg-config
, python3
, reproc
, rtaudio
, rtaudio_6
, rtmidi
, rubberband
, sassc
, serd
, sord
, sox
, soxr
, sratom
, texi2html
, vamp-plugin-sdk
, wrapGAppsHook4
, writeScript
, xdg-utils
, xxHash
, yyjson
, zix
, zstd
}:
let
# As of zrythm-1.0.0-beta.4.5.62, Zrythm needs clap
# https://github.com/falktx/carla/tree/main/source/includes/clap, which is
# only available on Carla unstable as of 2023-02-24.
carla-unstable = carla.overrideAttrs (oldAttrs: rec {
# Error: Dependency carla-host-plugin found: NO found 2.5.6 but need: '>=2.6.0'
# So we need Carla unstable
carla-unstable = carla.overrideAttrs (oldAttrs: {
pname = "carla";
version = "unstable-2023-05-12";
version = "unstable-2024-04-26";
src = fetchFromGitHub {
owner = "falkTX";
repo = pname;
rev = "0175570f1d41285f39efe0ee32234458e0ed941c";
hash = "sha256-yfVzZV8G4AUDM8+yS9finzobpOb1PUEPgBWFhEY4nFQ=";
repo = "carla";
rev = "948991d7b5104280c03960925908e589c77b169a";
hash = "sha256-uGAuKheoMfP9hZXsw29ec+58dJM8wMuowe95QutzKBY=";
};
});
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "zrythm";
version = "1.0.0-beta.4.9.1";
version = "1.0.0-rc.1";
src = fetchFromSourcehut {
owner = "~alextee";
repo = pname;
rev = "v${version}";
hash = "sha256-U3IUqNbHu20uyWfkTsLOOlUZjcUL4QdHilB3srSsebw=";
src = fetchzip {
url = "https://www.zrythm.org/releases/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";
sha256 = "sha256-Ljbw7bjGI6js4OP9KEXCkhC9AMbInSz0nn+pROm4vXw=";
};
passthru.updateScript = writeScript "update-zrythm" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl common-updater-scripts
version="$(curl -s https://www.zrythm.org/releases/ | grep -o -m 1 'href="zrythm-[^"]*\.tar\.xz"' | head -1 | sed 's/href="zrythm-\(.*\)\.tar\.xz"/\1/')"
update-source-version zrythm "$version"
'';
nativeBuildInputs = [
chromaprint
cmake
flex
guile
help2man
jq
libaudec
libxml2
lilv
meson
ninja
pandoc
pkg-config
python3
python3.pkgs.sphinx
sassc
serd
sord
sratom
texi2html
wrapGAppsHook4
];
buildInputs = [
SDL2
alsa-lib
appstream
appstream-glib
bash-completion
boost
breeze-icons
carla-unstable
chromaprint
curl
dbus
dconf
faust2lv2
fftw
fftwFloat
flex
glib
graphviz
gtk4
gtksourceview5
guile
json-glib
kissfft
libadwaita
libbacktrace
libcyaml
libepoxy
libgtop
libjack2
libpanel
libpulseaudio
libsamplerate
libsass
libsndfile
libsoundio
libyaml
lilv
lv2
pcre
pcre2
reproc
rtaudio
rtaudio_6
rtmidi
rubberband
serd
sord
sox
sratom
soxr
vamp-plugin-sdk
xdg-utils
xxHash
yyjson
zix
zstd
];
patches = [
# Fix gcc-13 build failure
(fetchpatch {
name = "gcc-13.patch";
url = "https://gitlab.zrythm.org/zrythm/zrythm/-/commit/cbc2b3715b939718479631841f2d9703fb28e6da.diff";
hash = "sha256-2ZTSaCtSO3yynJVFe5B1AEjWhjRa5YyA26ergAfdL5Y=";
})
];
# Zrythm uses meson to build, but requires cmake for dependency detection.
dontUseCmakeConfigure = true;
@ -197,7 +174,6 @@ stdenv.mkDerivation rec {
"-Dmanpage=true"
"-Drtaudio=enabled"
"-Drtmidi=enabled"
"-Dsdl=enabled"
# "-Duser_manual=true" # needs sphinx-intl
];
@ -220,7 +196,7 @@ stdenv.mkDerivation rec {
preFixup = ''
gappsWrapperArgs+=(
--prefix GSETTINGS_SCHEMA_DIR : "$out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas/"
--prefix GSETTINGS_SCHEMA_DIR : "$out/share/gsettings-schemas/${finalAttrs.pname}-${finalAttrs.version}/glib-2.0/schemas/"
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${breeze-icons}/share"
)
'';
@ -228,8 +204,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://www.zrythm.org";
description = "Automated and intuitive digital audio workstation";
maintainers = with maintainers; [ tshaynik magnetophon yuu ];
platforms = platforms.linux;
maintainers = with maintainers; [ tshaynik magnetophon yuu astavie PowerUser64 ];
platforms = platforms.unix;
broken = stdenv.isDarwin;
license = licenses.agpl3Plus;
};
}
})

4
pkgs/applications/backup/timeshift/wrapper.nix
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 = ''

4
pkgs/applications/display-managers/greetd/gtkgreet.nix
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 = [

4
pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
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 = [

4
pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
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" ];

4
pkgs/applications/display-managers/lightdm-slick-greeter/default.nix
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
];

4
pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix
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 != "") ''

6
pkgs/applications/display-managers/lightdm/gtk-greeter.nix
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 = ''

4
pkgs/applications/editors/apostrophe/default.nix
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

4
pkgs/applications/editors/bluefish/default.nix
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

4
pkgs/applications/editors/bluej/default.nix
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;

4
pkgs/applications/editors/codeblocks/default.nix
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;

4
pkgs/applications/editors/emacs/make-emacs.nix
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

4
pkgs/applications/editors/formiko/default.nix
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
];

4
pkgs/applications/editors/geany/default.nix
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 = [

4
pkgs/applications/editors/gedit/default.nix
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

11
pkgs/applications/editors/gnome-builder/default.nix
View File

@ -5,7 +5,6 @@
, desktop-file-utils
, editorconfig-core-c
, fetchurl
, fetchpatch
, flatpak
, gnome
, libgit2-glib
@ -43,13 +42,13 @@
stdenv.mkDerivation rec {
pname = "gnome-builder";
version = "45.0";
version = "46.1";
outputs = [ "out" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "JC2gJZMpPUVuokEIpFk0cwoeMW2NxbGNnfDoZNt7pZY=";
hash = "sha256-lhaWbVIqLIUCizPAm605cudp6fkK91VNXnGDfb3HiHE=";
};
patches = [
@ -64,12 +63,6 @@ stdenv.mkDerivation rec {
#
# Typelib file for namespace 'Pango', version '1.0' not found (g-irepository-error-quark, 0)
./fix-finding-test-typelibs.patch
(fetchpatch {
name = "redefinition-of-glib_autoptr_clear_GtkStackPage.patch";
url = "https://gitlab.gnome.org/GNOME/gnome-builder/-/commit/7aaaecefc2ea8a37eaeae8b4d726d119d4eb8fa3.patch";
hash = "sha256-sYLqhwCd9GOkUMUZAO2trAGKC3013jgivHrNC4atdn0=";
})
];
nativeBuildInputs = [

8
pkgs/applications/editors/gnome-inform7/default.nix
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

4
pkgs/applications/editors/gnome-latex/default.nix
View File

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

4
pkgs/applications/editors/gobby/default.nix
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";

4
pkgs/applications/editors/greenfoot/default.nix
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;

4
pkgs/applications/editors/l3afpad/default.nix
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; {

4
pkgs/applications/editors/lapce/default.nix
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
];

4
pkgs/applications/editors/lifeograph/default.nix
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 = [

4
pkgs/applications/editors/marker/default.nix
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 = [

4
pkgs/applications/editors/mindforger/default.nix
View File

@ -6,7 +6,7 @@
, qmake
, qtbase
, qtwebengine
, wrapGAppsHook
, wrapGAppsHook3
, wrapQtAppsHook
}:
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
sha256 = "1pghsw8kwvjhg3jpmjs0n892h2l0pm0cs6ymi8b23fwk0kfj67rd";
};
nativeBuildInputs = [ qmake wrapGAppsHook wrapQtAppsHook ];
nativeBuildInputs = [ qmake wrapGAppsHook3 wrapQtAppsHook ];
buildInputs = [ qtbase qtwebengine cmark-gfm ];
doCheck = true;

2
pkgs/applications/editors/neovim/utils.nix
View File

@ -218,7 +218,7 @@ let
];
in
toVimPlugin (runCommand "vimplugin-treesitter-grammar-${name}"
toVimPlugin (runCommand "treesitter-grammar-${name}"
{
meta = {
platforms = lib.platforms.all;

4
pkgs/applications/editors/pinegrow/default.nix
View File

@ -8,7 +8,7 @@
, autoPatchelfHook
, gsettings-desktop-schemas
, gtk3
, wrapGAppsHook
, wrapGAppsHook3
, makeWrapper
, pinegrowVersion ? "7"
}:
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
unzip
autoPatchelfHook
makeWrapper
wrapGAppsHook
wrapGAppsHook3
];
buildInputs = [

4
pkgs/applications/editors/pulsar/default.nix
View File

@ -3,7 +3,7 @@
, git
, git-lfs
, fetchurl
, wrapGAppsHook
, wrapGAppsHook3
, alsa-lib
, at-spi2-atk
, cairo
@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [
wrapGAppsHook
wrapGAppsHook3
copyDesktopItems
asar
];

4
pkgs/applications/editors/sublime/3/common.nix
View File

@ -1,6 +1,6 @@
{ buildVersion, x32sha256, x64sha256, dev ? false }:
{ fetchurl, lib, stdenv, xorg, glib, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook
{ fetchurl, lib, stdenv, xorg, glib, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook3
, pkexecPath ? "/run/wrappers/bin/pkexec"
, openssl, bzip2, bash, unzip, zip
}:
@ -40,7 +40,7 @@ in let
dontStrip = true;
dontPatchELF = true;
buildInputs = [ glib gtk3 ]; # for GSETTINGS_SCHEMAS_PATH
nativeBuildInputs = [ zip unzip makeWrapper wrapGAppsHook ];
nativeBuildInputs = [ zip unzip makeWrapper wrapGAppsHook3 ];
# make exec.py in Default.sublime-package use own bash with an LD_PRELOAD instead of "/bin/bash"
patchPhase = ''

4
pkgs/applications/editors/sublime/4/common.nix
View File

@ -17,7 +17,7 @@
cairo,
pango,
makeWrapper,
wrapGAppsHook,
wrapGAppsHook3,
writeShellScript,
common-updater-scripts,
curl,
@ -80,7 +80,7 @@ let
nativeBuildInputs = [
makeWrapper
wrapGAppsHook
wrapGAppsHook3
];
buildPhase = ''

4
pkgs/applications/editors/texmaker/default.nix
View File

@ -1,4 +1,4 @@
{ lib, mkDerivation, fetchurl, qtbase, qtscript, qtwebengine, qmake, zlib, pkg-config, poppler, wrapGAppsHook }:
{ lib, mkDerivation, fetchurl, qtbase, qtscript, qtwebengine, qmake, zlib, pkg-config, poppler, wrapGAppsHook3 }:
mkDerivation rec {
pname = "texmaker";
@ -10,7 +10,7 @@ mkDerivation rec {
};
buildInputs = [ qtbase qtscript poppler zlib qtwebengine ];
nativeBuildInputs = [ pkg-config poppler qmake wrapGAppsHook ];
nativeBuildInputs = [ pkg-config poppler qmake wrapGAppsHook3 ];
env.NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler";
qmakeFlags = [

4
pkgs/applications/editors/thiefmd/default.nix
View File

@ -5,7 +5,7 @@
, ninja
, vala
, pkg-config
, wrapGAppsHook
, wrapGAppsHook3
, desktop-file-utils
, discount
, glib
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
ninja
vala
pkg-config
wrapGAppsHook
wrapGAppsHook3
desktop-file-utils
];

4
pkgs/applications/editors/tijolo/default.nix
View File

@ -6,7 +6,7 @@
, libgit2
, editorconfig-core-c
, gtksourceview4
, wrapGAppsHook
, wrapGAppsHook3
, desktopToDarwinBundle
}:
crystal.buildCrystalPackage rec {
@ -20,7 +20,7 @@ crystal.buildCrystalPackage rec {
hash = "sha256-3TfXvRVP3lu43qF3RWCHnZ3czTaSl5EzrhuTlpnMfKo=";
};
nativeBuildInputs = [ wrapGAppsHook ]
nativeBuildInputs = [ wrapGAppsHook3 ]
++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ];
buildInputs = [ vte libgit2 gtksourceview4 editorconfig-core-c ];

4
pkgs/applications/editors/vim/full.nix
View File

@ -4,7 +4,7 @@
, libICE
, vimPlugins
, makeWrapper
, wrapGAppsHook
, wrapGAppsHook3
, runtimeShell
# apple frameworks
@ -135,7 +135,7 @@ in stdenv.mkDerivation {
++ lib.optional wrapPythonDrv makeWrapper
++ lib.optional nlsSupport gettext
++ lib.optional perlSupport perl
++ lib.optional (guiSupport == "gtk3") wrapGAppsHook
++ lib.optional (guiSupport == "gtk3") wrapGAppsHook3
;
buildInputs = [

3
pkgs/applications/editors/vim/plugins/build-vim-plugin.nix
View File

@ -13,7 +13,6 @@ rec {
buildVimPlugin =
{ name ? "${attrs.pname}-${attrs.version}"
, namePrefix ? "vimplugin-"
, src
, unpackPhase ? ""
, configurePhase ? ":"
@ -27,7 +26,7 @@ rec {
}@attrs:
let
drv = stdenv.mkDerivation (attrs // {
name = namePrefix + name;
name = lib.warnIf (attrs ? vimprefix) "The 'vimprefix' is now hardcoded in toVimPlugin" name;
inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall;

6
pkgs/applications/editors/vim/plugins/overrides.nix
View File

@ -78,7 +78,7 @@
, # sved dependencies
glib
, gobject-introspection
, wrapGAppsHook
, wrapGAppsHook3
, # sniprun dependencies
bashInteractive
, coreutils
@ -1335,11 +1335,11 @@
sved =
let
# we put the script in its own derivation to benefit the magic of wrapGAppsHook
# we put the script in its own derivation to benefit the magic of wrapGAppsHook3
svedbackend = stdenv.mkDerivation {
name = "svedbackend-${super.sved.name}";
inherit (super.sved) src;
nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];
nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ];
buildInputs = [
glib
(python3.withPackages (ps: with ps; [ pygobject3 pynvim dbus-python ]))

1
pkgs/applications/editors/vim/plugins/vim-utils.nix
View File

@ -415,6 +415,7 @@ rec {
toVimPlugin = drv:
drv.overrideAttrs(oldAttrs: {
name = "vimplugin-${oldAttrs.name}";
# dont move the "doc" folder since vim expects it
forceShare = [ "man" "info" ];

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