Merge staging-next into staging
This commit is contained in:
github-actions[bot]
+1
-1
@@ -89,7 +89,7 @@ let
|
||||
recurseIntoAttrs dontRecurseIntoAttrs cartesianProduct cartesianProductOfSets
|
||||
mapCartesianProduct updateManyAttrsByPath;
|
||||
inherit (self.lists) singleton forEach foldr fold foldl foldl' imap0 imap1
|
||||
concatMap flatten remove findSingle findFirst any all count
|
||||
ifilter0 concatMap flatten remove findSingle findFirst any all count
|
||||
optional optionals toList range replicate partition zipListsWith zipLists
|
||||
reverseList listDfs toposort sort sortOn naturalSort compareLists take
|
||||
drop sublist last init crossLists unique allUnique intersectLists
|
||||
|
||||
+49
-1
@@ -4,7 +4,7 @@
|
||||
{ lib }:
|
||||
let
|
||||
inherit (lib.strings) toInt;
|
||||
inherit (lib.trivial) compare min id warn;
|
||||
inherit (lib.trivial) compare min id warn pipe;
|
||||
inherit (lib.attrsets) mapAttrs;
|
||||
in
|
||||
rec {
|
||||
@@ -333,6 +333,54 @@ rec {
|
||||
*/
|
||||
imap1 = f: list: genList (n: f (n + 1) (elemAt list n)) (length list);
|
||||
|
||||
/**
|
||||
Filter a list for elements that satisfy a predicate function.
|
||||
The predicate function is called with both the index and value for each element.
|
||||
It must return `true`/`false` to include/exclude a given element in the result.
|
||||
This function is strict in the result of the predicate function for each element.
|
||||
This function has O(n) complexity.
|
||||
|
||||
Also see [`builtins.filter`](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-filter) (available as `lib.lists.filter`),
|
||||
which can be used instead when the index isn't needed.
|
||||
|
||||
# Inputs
|
||||
|
||||
`ipred`
|
||||
|
||||
: The predicate function, it takes two arguments:
|
||||
- 1. (int): the index of the element.
|
||||
- 2. (a): the value of the element.
|
||||
|
||||
It must return `true`/`false` to include/exclude a given element from the result.
|
||||
|
||||
`list`
|
||||
|
||||
: The list to filter using the predicate.
|
||||
|
||||
# Type
|
||||
```
|
||||
ifilter0 :: (int -> a -> bool) -> [a] -> [a]
|
||||
```
|
||||
|
||||
# Examples
|
||||
:::{.example}
|
||||
## `lib.lists.ifilter0` usage example
|
||||
|
||||
```nix
|
||||
ifilter0 (i: v: i == 0 || v > 2) [ 1 2 3 ]
|
||||
=> [ 1 3 ]
|
||||
```
|
||||
:::
|
||||
*/
|
||||
ifilter0 =
|
||||
ipred:
|
||||
input:
|
||||
map (idx: elemAt input idx) (
|
||||
filter (idx: ipred idx (elemAt input idx)) (
|
||||
genList (x: x) (length input)
|
||||
)
|
||||
);
|
||||
|
||||
/**
|
||||
Map and concatenate the result.
|
||||
|
||||
|
||||
@@ -63,8 +63,10 @@ let
|
||||
hasAttrByPath
|
||||
hasInfix
|
||||
id
|
||||
ifilter0
|
||||
isStorePath
|
||||
lazyDerivation
|
||||
length
|
||||
lists
|
||||
listToAttrs
|
||||
makeExtensible
|
||||
@@ -651,6 +653,31 @@ runTests {
|
||||
expected = ["b" "c"];
|
||||
};
|
||||
|
||||
testIfilter0Example = {
|
||||
expr = ifilter0 (i: v: i == 0 || v > 2) [ 1 2 3 ];
|
||||
expected = [ 1 3 ];
|
||||
};
|
||||
testIfilter0Empty = {
|
||||
expr = ifilter0 (i: v: abort "shouldn't be evaluated!") [ ];
|
||||
expected = [ ];
|
||||
};
|
||||
testIfilter0IndexOnly = {
|
||||
expr = length (ifilter0 (i: v: mod i 2 == 0) [ (throw "0") (throw "1") (throw "2") (throw "3")]);
|
||||
expected = 2;
|
||||
};
|
||||
testIfilter0All = {
|
||||
expr = ifilter0 (i: v: true) [ 10 11 12 13 14 15 ];
|
||||
expected = [ 10 11 12 13 14 15 ];
|
||||
};
|
||||
testIfilter0First = {
|
||||
expr = ifilter0 (i: v: i == 0) [ 10 11 12 13 14 15 ];
|
||||
expected = [ 10 ];
|
||||
};
|
||||
testIfilter0Last = {
|
||||
expr = ifilter0 (i: v: i == 5) [ 10 11 12 13 14 15 ];
|
||||
expected = [ 15 ];
|
||||
};
|
||||
|
||||
testFold =
|
||||
let
|
||||
f = op: fold: fold op 0 (range 0 100);
|
||||
|
||||
@@ -1448,6 +1448,12 @@
|
||||
githubId = 4194320;
|
||||
name = "Anton Schirg";
|
||||
};
|
||||
anytimetraveler = {
|
||||
email = "simon@simonscode.org";
|
||||
github = "AnyTimeTraveler";
|
||||
githubId = 19378309;
|
||||
name = "Simon Struck";
|
||||
};
|
||||
aorith = {
|
||||
email = "aomanu+nixpkgs@gmail.com";
|
||||
github = "aorith";
|
||||
|
||||
@@ -46,11 +46,13 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi
|
||||
|
||||
- The default dbus implementation has transitioned to dbus-broker from the classic dbus daemon for better performance and reliability. Users can revert to the classic dbus daemon by setting `services.dbus.implementation = "dbus";`. For detailed deviations, refer to [dbus-broker's deviations page](https://github.com/bus1/dbus-broker/wiki/Deviations).
|
||||
|
||||
- GNOME has been updated to v46. Refer to the [release notes](https://release.gnome.org/46/) for more details. Notably this release brings experimental VRR support, default GTK renderer changes and WebDAV support in Online Accounts. This release we have also stopped including the legacy and unsupported Adwaita-Dark theme by default.
|
||||
|
||||
- A new option `virtualisation.containers.cdi` was added. It contains `static` and `dynamic` attributes (corresponding to `/etc/cdi` and `/run/cdi` respectively) to configure the Container Device Interface (CDI).
|
||||
|
||||
- `virtualisation.docker.enableNvidia` and `virtualisation.podman.enableNvidia` options are deprecated. `virtualisation.containers.cdi.dynamic.nvidia.enable` should be used instead. This option will expose GPUs on containers with the `--device` CLI option. This is supported by Docker 25, Podman 3.2.0 and Singularity 4. Any container runtime that supports the CDI specification will take advantage of this feature.
|
||||
|
||||
- A new option `system.etc.overlay.enable` was added. If enabled, `/etc` is
|
||||
- `system.etc.overlay.enable` option was added. If enabled, `/etc` is
|
||||
mounted via an overlayfs instead of being created by a custom perl script.
|
||||
|
||||
- NixOS AMIs are now uploaded regularly to a new AWS Account.
|
||||
@@ -237,7 +239,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
||||
|
||||
- `nvtop` family of packages was reorganized into nested attrset. `nvtop` has been renamed to `nvtopPackages.full`, and all `nvtop-{amd,nvidia,intel,msm}` packages are now named as `nvtopPackages.{amd,nvidia,intel,msm}`
|
||||
|
||||
- `neo4j` has been updated to 5, you may want to read the [release notes for Neo4j 5](https://neo4j.com/release-notes/database/neo4j-5/)
|
||||
- `neo4j` has been updated to version 5, you may want to read the [release notes for Neo4j 5](https://neo4j.com/release-notes/database/neo4j-5/)
|
||||
|
||||
- `services.neo4j.allowUpgrade` was removed and no longer has any effect. Neo4j 5 supports automatic rolling upgrades.
|
||||
|
||||
@@ -251,37 +253,37 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
||||
|
||||
- `services.aria2.rpcSecret` has been replaced with `services.aria2.rpcSecretFile`.
|
||||
This was done so that secrets aren't stored in the world-readable nix store.
|
||||
To migrate, you will have create a file with the same exact string, and change
|
||||
To migrate, you will have to create a file with the same exact string, and change
|
||||
your module options to point to that file. For example, `services.aria2.rpcSecret =
|
||||
"mysecret"` becomes `services.aria2.rpcSecretFile = "/path/to/secret_file"`
|
||||
where the file `secret_file` contains the string `mysecret`.
|
||||
|
||||
- `openssh`, `openssh_hpn` and `openssh_gssapi` are now compiled without support for the DSA signature algorithm as it is being deprecated upstream. Users still relying on DSA keys should consider upgrading
|
||||
to another signature algorithm. It is however possible, for the time being, to restore the DSA keys support using `override` to set `dsaKeysSupport = true`.
|
||||
to another signature algorithm. However, for the time being it is possible to restore DSA key support using `override` to set `dsaKeysSupport = true`.
|
||||
|
||||
- `buildGoModule` now throws error when `vendorHash` is not specified. `vendorSha256`, deprecated in Nixpkgs 23.11, is now ignored and is no longer a `vendorHash` alias.
|
||||
- `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.
|
||||
|
||||
- Invidious has changed its default database username 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.
|
||||
|
||||
- `inetutils` now has a lower priority to avoid shadowing the commonly used `util-linux`. If one wishes to restore the default priority, simply use `lib.setPrio 5 inetutils` or override with `meta.priority = 5`.
|
||||
|
||||
- `paperless`' `services.paperless.extraConfig` setting has been removed and converted to the freeform type and option named `services.paperless.settings`.
|
||||
- `paperless`' `services.paperless.extraConfig` setting has been removed and converted to the free-form type and option named `services.paperless.settings`.
|
||||
|
||||
- `davfs2`' `services.davfs2.extraConfig` setting has been deprecated and converted to the freeform type option named `services.davfs2.settings` according to RFC42.
|
||||
- `davfs2`' `services.davfs2.extraConfig` setting has been deprecated and converted to the free-form type option named `services.davfs2.settings` according to RFC42.
|
||||
|
||||
- `services.homepage-dashboard` now takes it's configuration using native Nix expressions, rather than dumping templated configurations into `/var/lib/homepage-dashboard` where they were previously managed manually. There are now new options which allow the configuration of bookmarks, services, widgets and custom CSS/JS natively in Nix.
|
||||
- `services.homepage-dashboard` now takes its configuration using native Nix expressions, rather than dumping templated configurations into `/var/lib/homepage-dashboard` where they were previously managed manually. There are now new options which allow the configuration of bookmarks, services, widgets and custom CSS/JS natively in Nix.
|
||||
|
||||
- `hare` may now be cross-compiled. For that to work, however, `haredoc` needed to stop being built together with it. Thus, the latter is now its own package with the name of `haredoc`.
|
||||
|
||||
- The legacy and long deprecated systemd target `network-interfaces.target` has been removed. Use `network.target` instead.
|
||||
- `network-interfaces.target` system target was removed as it has been deprecated for a long time. Use `network.target` instead.
|
||||
|
||||
- `azure-cli` now has extension support. For example, to install the `aks-preview` extension, use
|
||||
|
||||
```nix
|
||||
environment.systemPackages = [
|
||||
(azure-cli.withExtensions [ azure-cli.extensions.aks-preview ]);
|
||||
(azure-cli.withExtensions [ azure-cli.extensions.aks-preview ])
|
||||
];
|
||||
```
|
||||
To make the `azure-cli` immutable and prevent clashes in case `azure-cli` is also installed via other package managers, some configuration files were moved into the derivation.
|
||||
@@ -401,7 +403,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
||||
upgrade NetBox by changing `services.netbox.package`. Database migrations
|
||||
will be run automatically.
|
||||
|
||||
- The executable file names for `firefox-devedition`, `firefox-beta`, `firefox-esr` now matches their package names, which is consistent with the `firefox-*-bin` packages. The desktop entries are also updated so that you can have multiple editions of firefox in your app launcher.
|
||||
- `firefox-devedition`, `firefox-beta`, `firefox-esr` executable file names for now match their package names, which is consistent with the `firefox-*-bin` packages. The desktop entries are also updated so that you can have multiple editions of firefox in your app launcher.
|
||||
|
||||
- switch-to-configuration does not directly call systemd-tmpfiles anymore.
|
||||
Instead, the new artificial sysinit-reactivation.target is introduced which
|
||||
@@ -474,14 +476,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.
|
||||
|
||||
- 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) 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.
|
||||
|
||||
- MATE has been updated to 1.28.
|
||||
- (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 Budgie module installs gnome-terminal by default (instead of mate-terminal).
|
||||
- The (TODO awaiting feedback on code-casing package names) Budgie module installs gnome-terminal by default (instead of 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.
|
||||
|
||||
@@ -493,7 +495,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
||||
- 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.
|
||||
The default replication worker on the main instance has been migrated away from TCP sockets to UNIX domain sockets.
|
||||
|
||||
- The initrd ssh daemon module got a new option to add authorized keys via a list of files using `boot.initrd.network.ssh.authorizedKeyFiles`.
|
||||
- `boot.initrd.network.ssh.authorizedKeyFiles` is a new option in the initrd ssh daemon module, for adding authorized keys via list of files.
|
||||
|
||||
- Programs written in [Nim](https://nim-lang.org/) are built with libraries selected by lockfiles.
|
||||
The `nimPackages` and `nim2Packages` sets have been removed.
|
||||
@@ -511,9 +513,9 @@ 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.
|
||||
|
||||
- [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) [Lilypond](https://lilypond.org/index.html) and [Denemo](https://www.denemo.org) are now compiled with Guile 3.0.
|
||||
|
||||
- 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.
|
||||
- (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.
|
||||
|
||||
- The EC2 image module now enables the [Amazon SSM Agent](https://docs.aws.amazon.com/systems-manager/latest/userguide/ssm-agent.html) by default.
|
||||
|
||||
@@ -548,7 +550,7 @@ 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.
|
||||
|
||||
- With a bump to `sonarr` v4, 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` 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).
|
||||
|
||||
- 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
|
||||
@@ -558,15 +560,13 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
||||
- The 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
|
||||
`globalRedirect` can now have redirect codes other than 301 through `redirectCode`.
|
||||
|
||||
- `bacula` now allows to configure `TLS` for encrypted communication.
|
||||
|
||||
`redirectCode`.
|
||||
|
||||
- `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`.
|
||||
|
||||
- The source of the `mockgen` package 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).
|
||||
- `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).
|
||||
|
||||
- `security.pam.enableSSHAgentAuth` was renamed to `security.pam.sshAgentAuth.enable` and an `authorizedKeysFiles`
|
||||
option was added, to control which `authorized_keys` files are trusted. It defaults to the previous behaviour,
|
||||
@@ -583,7 +583,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
||||
|
||||
- `nextcloud-setup.service` no longer changes the group of each file & directory inside `/var/lib/nextcloud/{config,data,store-apps}` if one of these directories has the wrong owner group. This was part of transitioning the group used for `/var/lib/nextcloud`, but isn't necessary anymore.
|
||||
|
||||
- `services.kavita` now uses the freeform option `services.kavita.settings` for the application settings file.
|
||||
- `services.kavita` now uses the free-form option `services.kavita.settings` for the application settings file.
|
||||
The options `services.kavita.ipAdresses` and `services.kavita.port` now exist at `services.kavita.settings.IpAddresses`
|
||||
and `services.kavita.settings.IpAddresses`. The file at `services.kavita.tokenKeyFile` now needs to contain a secret with
|
||||
512+ bits instead of 128+ bits.
|
||||
@@ -594,7 +594,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
||||
|
||||
- `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`.
|
||||
|
||||
- Gitea 1.21 upgrade has several breaking changes, including:
|
||||
- `gitea` upgrade to 1.21 has several breaking changes, including:
|
||||
- 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.
|
||||
|
||||
@@ -606,10 +606,10 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
||||
|
||||
- The `services.networkmanager.extraConfig` was renamed to `services.networkmanager.settings` and was changed to use the ini type instead of using a multiline string.
|
||||
|
||||
- The module `services.github-runner` has been removed. To configure a single GitHub Actions Runner refer to `services.github-runners.*`. Note that this will trigger a new runner registration.
|
||||
- `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
|
||||
the freeform `services.slskd.settings` option, and some defaults (including listen ports)
|
||||
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.
|
||||
|
||||
@@ -26,7 +26,21 @@ with lib;
|
||||
###### implementation
|
||||
config = 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 = { };
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -157,6 +157,7 @@ in
|
||||
|
||||
# packages
|
||||
nemo-with-extensions
|
||||
gnome-online-accounts-gtk
|
||||
cinnamon-control-center
|
||||
cinnamon-settings-daemon
|
||||
libgnomekbd
|
||||
|
||||
@@ -408,10 +408,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
|
||||
|
||||
|
||||
@@ -62,13 +62,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "audacity";
|
||||
version = "3.4.2";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "audacity";
|
||||
repo = "audacity";
|
||||
rev = "Audacity-${version}";
|
||||
hash = "sha256-YlRWCu6kQYdzast7Mf29p4FvpXJHQLG7vqqo/5SNQCQ=";
|
||||
hash = "sha256-vJhCONoEC4Bdd1ZOLLobjNgLb/DT6auuMGk8L9lj6TU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
, miniupnpc
|
||||
, zeromq
|
||||
, zlib
|
||||
, db48
|
||||
, sqlite
|
||||
, qrencode
|
||||
, qtbase ? null
|
||||
@@ -51,7 +50,7 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optionals withGui [ wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [ boost libevent miniupnpc zeromq zlib ]
|
||||
++ lib.optionals withWallet [ db48 sqlite ]
|
||||
++ lib.optionals withWallet [ sqlite ]
|
||||
++ lib.optionals withGui [ qrencode qtbase qttools ];
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -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 = [
|
||||
|
||||
@@ -1,37 +1,35 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, gettext
|
||||
, help2man
|
||||
, pkg-config
|
||||
, texinfo
|
||||
, boehmgc
|
||||
, readline
|
||||
, guiSupport ? false, makeWrapper, tcl, tcllib, tk
|
||||
, miSupport ? true, json_c
|
||||
, nbdSupport ? !stdenv.isDarwin, libnbd
|
||||
, textStylingSupport ? true
|
||||
, textStylingSupport ? true, gettext
|
||||
, dejagnu
|
||||
|
||||
# update script only
|
||||
# update script only
|
||||
, writeScript
|
||||
}:
|
||||
|
||||
let
|
||||
isCross = stdenv.hostPlatform != stdenv.buildPlatform;
|
||||
in stdenv.mkDerivation rec {
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "poke";
|
||||
version = "3.2";
|
||||
version = "4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-dY5VHdU6bM5U7JTY/CH6TWtSon0cJmcgbVmezcdPDZc=";
|
||||
url = "mirror://gnu/poke/poke-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-ArqyLLH6YVOhtqknyLs81Y1QhUPBRIQqbX7nTxmXOnc=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "info" "lib" ]
|
||||
# help2man can't cross compile because it runs `poke --help` to
|
||||
# generate the man page
|
||||
++ lib.optional (!isCross) "man";
|
||||
# help2man can't cross compile because it runs `poke --help` to
|
||||
# generate the man page
|
||||
++ lib.optional (!isCross) "man";
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
@@ -40,53 +38,33 @@ in stdenv.mkDerivation rec {
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
pkg-config
|
||||
texinfo
|
||||
] ++ lib.optionals (!isCross) [
|
||||
help2man
|
||||
] ++ lib.optionals guiSupport [
|
||||
makeWrapper
|
||||
tcl.tclPackageHook
|
||||
];
|
||||
|
||||
buildInputs = [ boehmgc readline ]
|
||||
++ lib.optionals guiSupport [ tcl tcllib tk ]
|
||||
++ lib.optional miSupport json_c
|
||||
++ lib.optional nbdSupport libnbd
|
||||
++ lib.optional textStylingSupport gettext
|
||||
++ lib.optional (!isCross) dejagnu;
|
||||
++ lib.optional nbdSupport libnbd
|
||||
++ lib.optional textStylingSupport gettext
|
||||
++ lib.optional finalAttrs.finalPackage.doCheck dejagnu;
|
||||
|
||||
configureFlags = [
|
||||
# libpoke depends on $datadir/poke, so we specify the datadir in
|
||||
# $lib, and later move anything else it doesn't depend on to $out
|
||||
"--datadir=${placeholder "lib"}/share"
|
||||
] ++ lib.optionals guiSupport [
|
||||
"--enable-gui"
|
||||
"--with-tcl=${tcl}/lib"
|
||||
"--with-tk=${tk}/lib"
|
||||
"--with-tkinclude=${tk.dev}/include"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = !isCross;
|
||||
nativeCheckInputs = lib.optionals (!isCross) [ dejagnu ];
|
||||
doCheck = true;
|
||||
nativeCheckInputs = [ dejagnu ];
|
||||
|
||||
postInstall = ''
|
||||
moveToOutput share/emacs "$out"
|
||||
moveToOutput share/vim "$out"
|
||||
'';
|
||||
|
||||
# Prevent tclPackageHook from auto-wrapping all binaries, we only
|
||||
# need to wrap poke-gui
|
||||
dontWrapTclBinaries = true;
|
||||
|
||||
postFixup = lib.optionalString guiSupport ''
|
||||
wrapProgram "$out/bin/poke-gui" \
|
||||
--prefix TCLLIBPATH ' ' "$TCLLIBPATH"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = writeScript "update-poke" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
@@ -97,18 +75,17 @@ in stdenv.mkDerivation rec {
|
||||
# Expect the text in format of '<a href="...">poke 2.0</a>'
|
||||
new_version="$(curl -s https://www.jemarch.net/poke |
|
||||
pcregrep -o1 '>poke ([0-9.]+)</a>')"
|
||||
update-source-version ${pname} "$new_version"
|
||||
update-source-version poke "$new_version"
|
||||
'';
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Interactive, extensible editor for binary data";
|
||||
homepage = "http://www.jemarch.net/poke";
|
||||
changelog = "https://git.savannah.gnu.org/cgit/poke.git/plain/ChangeLog?h=releases/poke-${version}";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres kira-bruneau ];
|
||||
platforms = platforms.unix;
|
||||
changelog = "https://git.savannah.gnu.org/cgit/poke.git/plain/ChangeLog?h=releases/poke-${finalAttrs.version}";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ AndersonTorres kira-bruneau ];
|
||||
platforms = lib.platforms.unix;
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64;
|
||||
};
|
||||
}
|
||||
|
||||
# TODO: Enable guiSupport by default once it's more than just a stub
|
||||
})
|
||||
|
||||
@@ -2073,6 +2073,22 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
hiukky.flate = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "flate";
|
||||
publisher = "hiukky";
|
||||
version = "0.7.0";
|
||||
hash = "sha256-6ouYQk7mHCJdGrcutM1EXolJAT7/Sp1hi+Bu0983GKw=";
|
||||
};
|
||||
meta = {
|
||||
description = "Colorful dark themes for VS Code";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=hiukky.flate";
|
||||
homepage = "https://github.com/hiukky/flate";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.stunkymonkey ];
|
||||
};
|
||||
};
|
||||
|
||||
hookyqr.beautify = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "beautify";
|
||||
|
||||
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-pylance";
|
||||
publisher = "MS-python";
|
||||
version = "2023.8.50";
|
||||
hash = "sha256-xJU/j5r/Idp/0VorEfciT4SFKRBpMCv9Z0LKO/++1Gk=";
|
||||
version = "2024.4.1";
|
||||
hash = "sha256-huKu6yefGXOay5Az4vksopRt8heoLxvKUrg/J1NlQFo=";
|
||||
};
|
||||
|
||||
buildInputs = [ pyright ];
|
||||
|
||||
@@ -18,11 +18,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "snapshot";
|
||||
version = "45.2";
|
||||
version = "46.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/snapshot/${lib.versions.major finalAttrs.version}/snapshot-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-iQd4F/xzXMjonbUWKPUuqKxmwZTfxqekLgA8TCnE3T4=";
|
||||
hash = "sha256-Ef55oSuzQFHionnajB9FRYfQEaFPwkI35FTGT0S6z00=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -15,11 +15,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tecla";
|
||||
version = "45.0";
|
||||
version = "46.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/tecla/${lib.versions.major finalAttrs.version}/tecla-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-XAK7QBmxz/tWY9phB1A+/4U4Nqh4PdRwXdBKSfetwls=";
|
||||
hash = "sha256-Sggeq4Z6WosJdYmRytdkWSDzI6q8qVRAgpD7b0RZGw8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -20,11 +20,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-usage";
|
||||
version = "45.0";
|
||||
version = "46.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "5nfE/iwBSXqE/x4RV+kTHp+ZmfGnjTUjSvHXfYJ18pQ=";
|
||||
hash = "sha256-GGrajgAYjIn4yrVPNZmO2XpG6rb9shiRAoNhvzhqybI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,88 +0,0 @@
|
||||
diff --git a/src/orca/debug.py b/src/orca/debug.py
|
||||
index b7e11ea60..9ab996765 100644
|
||||
--- a/src/orca/debug.py
|
||||
+++ b/src/orca/debug.py
|
||||
@@ -447,7 +447,7 @@ def traceit(frame, event, arg):
|
||||
return traceit
|
||||
|
||||
def getOpenFDCount(pid):
|
||||
- procs = subprocess.check_output([ 'lsof', '-w', '-Ff', '-p', str(pid)])
|
||||
+ procs = subprocess.check_output([ '@lsof@', '-w', '-Ff', '-p', str(pid)])
|
||||
procs = procs.decode('UTF-8').split('\n')
|
||||
files = list(filter(lambda s: s and s[0] == 'f' and s[1:].isdigit(), procs))
|
||||
|
||||
@@ -465,7 +465,7 @@ def getCmdline(pid):
|
||||
return cmdline
|
||||
|
||||
def pidOf(procName):
|
||||
- openFile = subprocess.Popen(f'pgrep {procName}',
|
||||
+ openFile = subprocess.Popen(f'@pgrep@ {procName}',
|
||||
shell=True,
|
||||
stdout=subprocess.PIPE).stdout
|
||||
pids = openFile.read()
|
||||
diff --git a/src/orca/orca.py b/src/orca/orca.py
|
||||
index d4e89f918..bb3e6cc1d 100644
|
||||
--- a/src/orca/orca.py
|
||||
+++ b/src/orca/orca.py
|
||||
@@ -312,7 +312,7 @@ def updateKeyMap(keyboardEvent):
|
||||
|
||||
def _setXmodmap(xkbmap):
|
||||
"""Set the keyboard map using xkbcomp."""
|
||||
- p = subprocess.Popen(['xkbcomp', '-w0', '-', os.environ['DISPLAY']],
|
||||
+ p = subprocess.Popen(['@xkbcomp@', '-w0', '-', os.environ['DISPLAY']],
|
||||
stdin=subprocess.PIPE, stdout=None, stderr=None)
|
||||
p.communicate(xkbmap)
|
||||
|
||||
@@ -389,7 +389,7 @@ def _storeXmodmap(keyList):
|
||||
"""
|
||||
|
||||
global _originalXmodmap
|
||||
- _originalXmodmap = subprocess.check_output(['xkbcomp', os.environ['DISPLAY'], '-'])
|
||||
+ _originalXmodmap = subprocess.check_output(['@xkbcomp@', os.environ['DISPLAY'], '-'])
|
||||
|
||||
def _restoreXmodmap(keyList=[]):
|
||||
"""Restore the original xmodmap values for the keys in keyList.
|
||||
@@ -404,7 +404,7 @@ def _restoreXmodmap(keyList=[]):
|
||||
|
||||
global _capsLockCleared
|
||||
_capsLockCleared = False
|
||||
- p = subprocess.Popen(['xkbcomp', '-w0', '-', os.environ['DISPLAY']],
|
||||
+ p = subprocess.Popen(['@xkbcomp@', '-w0', '-', os.environ['DISPLAY']],
|
||||
stdin=subprocess.PIPE, stdout=None, stderr=None)
|
||||
p.communicate(_originalXmodmap)
|
||||
|
||||
diff --git a/src/orca/orca_bin.py.in b/src/orca/orca_bin.py.in
|
||||
index 9d64af948..ca9c9e083 100644
|
||||
--- a/src/orca/orca_bin.py.in
|
||||
+++ b/src/orca/orca_bin.py.in
|
||||
@@ -65,7 +65,7 @@ class ListApps(argparse.Action):
|
||||
name = "[DEAD]"
|
||||
|
||||
try:
|
||||
- cmdline = subprocess.getoutput('cat /proc/%s/cmdline' % pid)
|
||||
+ cmdline = subprocess.getoutput('@cat@ /proc/%s/cmdline' % pid)
|
||||
except Exception:
|
||||
cmdline = '(exception encountered)'
|
||||
else:
|
||||
@@ -198,7 +198,7 @@ def inGraphicalDesktop():
|
||||
def otherOrcas():
|
||||
"""Returns the pid of any other instances of Orca owned by this user."""
|
||||
|
||||
- openFile = subprocess.Popen('pgrep -u %s -x orca' % os.getuid(),
|
||||
+ openFile = subprocess.Popen('@pgrep@ -u %s -x orca' % os.getuid(),
|
||||
shell=True,
|
||||
stdout=subprocess.PIPE).stdout
|
||||
pids = openFile.read()
|
||||
diff --git a/src/orca/script_utilities.py b/src/orca/script_utilities.py
|
||||
index ed8b155e4..0436cca42 100644
|
||||
--- a/src/orca/script_utilities.py
|
||||
+++ b/src/orca/script_utilities.py
|
||||
@@ -144,7 +144,7 @@ class Utilities:
|
||||
return ""
|
||||
|
||||
try:
|
||||
- cmdline = subprocess.getoutput(f"cat /proc/{pid}/cmdline")
|
||||
+ cmdline = subprocess.getoutput(f"@cat@ /proc/{pid}/cmdline")
|
||||
except Exception:
|
||||
return ""
|
||||
|
||||
@@ -1,46 +1,68 @@
|
||||
{ lib, stdenv, fetchgit, ant, jdk, makeWrapper, jre, coreutils, which }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchgit
|
||||
, ant
|
||||
, jdk
|
||||
, stripJavaArchivesHook
|
||||
, makeWrapper
|
||||
, jre
|
||||
, coreutils
|
||||
, which
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "projectlibre";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.code.sf.net/p/projectlibre/code";
|
||||
rev = "0c939507cc63e9eaeb855437189cdec79e9386c2"; # version 1.7.0 was not tagged
|
||||
sha256 = "0vy5vgbp45ai957gaby2dj1hvmbxfdlfnwcanwqm9f8q16qipdbq";
|
||||
hash = "sha256-eLUbsQkYuVQxt4px62hzfdUNg2zCL/VOSVEVctfbxW8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ ant jdk ];
|
||||
buildPhase = ''
|
||||
export ANT_OPTS=-Dbuild.sysclasspath=ignore
|
||||
${ant}/bin/ant -f openproj_build/build.xml
|
||||
'';
|
||||
nativeBuildInputs = [
|
||||
ant
|
||||
jdk
|
||||
stripJavaArchivesHook
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
resourcesPath = "openproj_build/resources";
|
||||
desktopItem = "${resourcesPath}/projectlibre.desktop";
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
ant -f openproj_build/build.xml
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/{applications,projectlibre/samples,pixmaps,doc/projectlibre} $out/bin
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/{projectlibre/samples,doc/projectlibre}
|
||||
|
||||
pushd openproj_build
|
||||
cp -R dist/* $out/share/projectlibre
|
||||
cp -R license $out/share/doc/projectlibre
|
||||
cp -R resources/samples/* $out/share/projectlibre/samples
|
||||
install -Dm644 resources/projectlibre.desktop -t $out/share/applications
|
||||
install -Dm644 resources/projectlibre.png -t $out/share/pixmaps
|
||||
install -Dm755 resources/projectlibre -t $out/bin
|
||||
popd
|
||||
|
||||
substituteInPlace $out/bin/projectlibre \
|
||||
--replace-fail "/usr/share/projectlibre" "$out/share/projectlibre"
|
||||
|
||||
substitute $resourcesPath/projectlibre $out/bin/projectlibre \
|
||||
--replace "\"/usr/share/projectlibre\"" "\"$out/share/projectlibre\""
|
||||
chmod +x $out/bin/projectlibre
|
||||
wrapProgram $out/bin/projectlibre \
|
||||
--prefix PATH : "${jre}/bin:${coreutils}/bin:${which}/bin"
|
||||
--prefix PATH : ${lib.makeBinPath [ jre coreutils which ]}
|
||||
|
||||
cp -R openproj_build/dist/* $out/share/projectlibre
|
||||
cp -R openproj_build/license $out/share/doc/projectlibre
|
||||
cp $desktopItem $out/share/applications
|
||||
cp $resourcesPath/projectlibre.png $out/share/pixmaps
|
||||
cp -R $resourcesPath/samples/* $out/share/projectlibre/samples
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.projectlibre.com/";
|
||||
meta = {
|
||||
description = "Project-Management Software similar to MS-Project";
|
||||
homepage = "https://www.projectlibre.com/";
|
||||
license = lib.licenses.cpal10;
|
||||
mainProgram = "projectlibre";
|
||||
maintainers = [ maintainers.Mogria ];
|
||||
license = licenses.cpal10;
|
||||
maintainers = with lib.maintainers; [ Mogria tomasajt ];
|
||||
platforms = jre.meta.platforms;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -6,17 +6,17 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ])
|
||||
if stdenv.isAarch64 then
|
||||
{
|
||||
pname = "brave";
|
||||
version = "1.64.122";
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v1.64.122/brave-browser_1.64.122_arm64.deb";
|
||||
hash = "sha256-PBYiCTy/QaPfxvWAzUnXLEzBELISNSKX0kG/mYTDDEA=";
|
||||
version = "1.65.114";
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v1.65.114/brave-browser_1.65.114_arm64.deb";
|
||||
hash = "sha256-E5IqMmkgnwn1eyKcPQ3SZX4QpGor2W8JH+rmERuUonA=";
|
||||
platform = "aarch64-linux";
|
||||
}
|
||||
else if stdenv.isx86_64 then
|
||||
{
|
||||
pname = "brave";
|
||||
version = "1.64.122";
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v1.64.122/brave-browser_1.64.122_amd64.deb";
|
||||
hash = "sha256-9tSoOn9XGbX/b8n9vD9Hmpi26jzmUVJomoCFdSJoaoU=";
|
||||
version = "1.65.114";
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v1.65.114/brave-browser_1.65.114_amd64.deb";
|
||||
hash = "sha256-Dn6havSLcf6KCxI1hd8Ad4FsLIOYBH2KO2oCJJQHJm8=";
|
||||
platform = "x86_64-linux";
|
||||
}
|
||||
else
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -3,10 +3,10 @@
|
||||
{
|
||||
firefox = buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "125.0.1";
|
||||
version = "125.0.2";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "6f2f336de8b0ec9cb19ba20c909407b7b88c0319ee3b2f1f3429133516b0c45b4c7846f287985a0cdb9f34acc7d5378ed14fb48e26bef113c8ac360501a30c4d";
|
||||
sha512 = "f6d5fff7c5c532d2e41a246d0403bdd746981cfcb7c43f9d3d8ec85a7acc3310a52043d1e18848475cef1b63c24769e81b2b06d68ae007b68016ee51436032f1";
|
||||
};
|
||||
|
||||
extraPatches = [
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hubble";
|
||||
version = "0.13.2";
|
||||
version = "0.13.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cilium";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0SCuQzRwluowF48lzyLxY+0rvTOyDbpkMI7Iwb6GHJo=";
|
||||
sha256 = "sha256-tHkLUoccOUcUjODecy1QyeuDb/aXv67sK8JHJ1IspC8=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -2,14 +2,14 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "velero";
|
||||
version = "1.13.1";
|
||||
version = "1.13.2";
|
||||
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware-tanzu";
|
||||
repo = "velero";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Fz3FqNj2NbqU9CvtdjM8cjkZh5xLCA+AAIF/QgLJ7UA=";
|
||||
sha256 = "sha256-Dqz8UFoGb5uG5f8mrIUIRWJUYH/ZuFavhRy2wie75/Q=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@@ -20,7 +20,7 @@ buildGoModule rec {
|
||||
"-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-Fu4T2VEW5s/KCdgJLk3bf0wIUhKULK6QuNEmL99MUCI=";
|
||||
vendorHash = "sha256-L1QTqw0L/aE4bFlLWg4/mmdHL7Sb5EsT3eL0jZIpBsA=";
|
||||
|
||||
excludedPackages = [ "issue-template-gen" "release-tools" "v1" "velero-restic-restore-helper" ];
|
||||
|
||||
|
||||
@@ -22,11 +22,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution-ews";
|
||||
version = "3.50.3";
|
||||
version = "3.52.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "4vpZQTdq1X4H0mc/hnbDH38rBo1J9o6g+4uv6rtSm+0=";
|
||||
hash = "sha256-TR9OlipFClJnADNQiaOQfZgMB2Z/q9Vmmag06Z2HSrI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -44,11 +44,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution";
|
||||
version = "3.50.4";
|
||||
version = "3.52.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-4PlVyhTfsbLhaC/PoYFqA8EUuBYZmPls+daBpqOEJpg=";
|
||||
hash = "sha256-aNrtER2t42GMpwjss8q0zZO6UC9a6dXnlwc8OhPinek=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,209 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, docbook-xsl-nons
|
||||
, libxslt
|
||||
, pkg-config
|
||||
, alsa-lib
|
||||
, faac
|
||||
, faad2
|
||||
, ffmpeg
|
||||
, fuse3
|
||||
, glib
|
||||
, openh264
|
||||
, openssl
|
||||
, p11-kit
|
||||
, pcre2
|
||||
, pkcs11helper
|
||||
, uriparser
|
||||
, zlib
|
||||
, libX11
|
||||
, libXcursor
|
||||
, libXdamage
|
||||
, libXdmcp
|
||||
, libXext
|
||||
, libXi
|
||||
, libXinerama
|
||||
, libXrandr
|
||||
, libXrender
|
||||
, libXtst
|
||||
, libXv
|
||||
, libxkbcommon
|
||||
, libxkbfile
|
||||
, wayland
|
||||
, wayland-scanner
|
||||
, icu
|
||||
, libunwind
|
||||
, orc
|
||||
, cairo
|
||||
, cjson
|
||||
, libusb1
|
||||
, libpulseaudio
|
||||
, cups
|
||||
, pcsclite
|
||||
, SDL2
|
||||
, SDL2_ttf
|
||||
, SDL2_image
|
||||
, systemd
|
||||
, libjpeg_turbo
|
||||
, libkrb5
|
||||
, libopus
|
||||
, buildServer ? true
|
||||
, nocaps ? false
|
||||
, AudioToolbox
|
||||
, AVFoundation
|
||||
, Carbon
|
||||
, Cocoa
|
||||
, CoreMedia
|
||||
, withUnfree ? false
|
||||
|
||||
# tries to compile and run generate_argument_docbook.c
|
||||
, withManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform
|
||||
|
||||
, buildPackages
|
||||
}:
|
||||
|
||||
let
|
||||
cmFlag = flag: if flag then "ON" else "OFF";
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "freerdp";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreeRDP";
|
||||
repo = "FreeRDP";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-ZOYHhldTdV8DrOHoXS42NXB6JHBJMGRswgTczn1S6BE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
export HOME=$TMP
|
||||
|
||||
# skip NIB file generation on darwin
|
||||
substituteInPlace "client/Mac/CMakeLists.txt" "client/Mac/cli/CMakeLists.txt" \
|
||||
--replace-fail "if (NOT IS_XCODE)" "if (FALSE)"
|
||||
|
||||
substituteInPlace "libfreerdp/freerdp.pc.in" \
|
||||
--replace-fail "Requires:" "Requires: @WINPR_PKG_CONFIG_FILENAME@"
|
||||
'' + lib.optionalString (pcsclite != null) ''
|
||||
substituteInPlace "winpr/libwinpr/smartcard/smartcard_pcsc.c" \
|
||||
--replace-fail "libpcsclite.so" "${lib.getLib pcsclite}/lib/libpcsclite.so"
|
||||
'' + lib.optionalString nocaps ''
|
||||
substituteInPlace "libfreerdp/locale/keyboard_xkbfile.c" \
|
||||
--replace-fail "RDP_SCANCODE_CAPSLOCK" "RDP_SCANCODE_LCONTROL"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
libxslt
|
||||
docbook-xsl-nons
|
||||
pkg-config
|
||||
wayland-scanner
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
cairo
|
||||
cjson
|
||||
cups
|
||||
faad2
|
||||
ffmpeg
|
||||
glib
|
||||
icu
|
||||
libX11
|
||||
libXcursor
|
||||
libXdamage
|
||||
libXdmcp
|
||||
libXext
|
||||
libXi
|
||||
libXinerama
|
||||
libXrandr
|
||||
libXrender
|
||||
libXtst
|
||||
libXv
|
||||
libjpeg_turbo
|
||||
libkrb5
|
||||
libopus
|
||||
libpulseaudio
|
||||
libunwind
|
||||
libusb1
|
||||
libxkbcommon
|
||||
libxkbfile
|
||||
openh264
|
||||
openssl
|
||||
orc
|
||||
pcre2
|
||||
pcsclite
|
||||
pkcs11helper
|
||||
SDL2
|
||||
SDL2_ttf
|
||||
SDL2_image
|
||||
uriparser
|
||||
zlib
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
alsa-lib
|
||||
fuse3
|
||||
systemd
|
||||
wayland
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
AudioToolbox
|
||||
AVFoundation
|
||||
Carbon
|
||||
Cocoa
|
||||
CoreMedia
|
||||
] ++ lib.optionals withUnfree [
|
||||
faac
|
||||
];
|
||||
|
||||
# https://github.com/FreeRDP/FreeRDP/issues/8526#issuecomment-1357134746
|
||||
cmakeFlags = [
|
||||
"-Wno-dev"
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
"-DDOCBOOKXSL_DIR=${docbook-xsl-nons}/xml/xsl/docbook"
|
||||
"-DWAYLAND_SCANNER=${buildPackages.wayland-scanner}/bin/wayland-scanner"
|
||||
] ++ lib.mapAttrsToList (k: v: "-D${k}=${cmFlag v}") {
|
||||
BUILD_TESTING = false; # false is recommended by upstream
|
||||
WITH_CAIRO = (cairo != null);
|
||||
WITH_CUPS = (cups != null);
|
||||
WITH_FAAC = (withUnfree && faac != null);
|
||||
WITH_FAAD2 = (faad2 != null);
|
||||
WITH_FUSE = (stdenv.isLinux && fuse3 != null);
|
||||
WITH_JPEG = (libjpeg_turbo != null);
|
||||
WITH_KRB5 = (libkrb5 != null);
|
||||
WITH_OPENH264 = (openh264 != null);
|
||||
WITH_OPUS = (libopus != null);
|
||||
WITH_OSS = false;
|
||||
WITH_MANPAGES = withManPages;
|
||||
WITH_PCSC = (pcsclite != null);
|
||||
WITH_PULSE = (libpulseaudio != null);
|
||||
WITH_SERVER = buildServer;
|
||||
WITH_WEBVIEW = false; # avoid introducing webkit2gtk-4.0
|
||||
WITH_VAAPI = false; # false is recommended by upstream
|
||||
WITH_X11 = true;
|
||||
};
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [
|
||||
"-DTARGET_OS_IPHONE=0"
|
||||
"-DTARGET_OS_WATCH=0"
|
||||
"-include AudioToolbox/AudioToolbox.h"
|
||||
] ++ lib.optionals stdenv.cc.isClang [
|
||||
"-Wno-error=incompatible-function-pointer-types"
|
||||
]);
|
||||
|
||||
env.NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [
|
||||
"-framework AudioToolbox"
|
||||
]);
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Remote Desktop Protocol Client";
|
||||
longDescription = ''
|
||||
FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP)
|
||||
following the Microsoft Open Specifications.
|
||||
'';
|
||||
homepage = "https://www.freerdp.com/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ peterhoeg lheckemann ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -5,6 +5,7 @@
|
||||
, gettext
|
||||
, gtkmm4
|
||||
, itstool
|
||||
, libadwaita
|
||||
, libsecret
|
||||
, libuuid
|
||||
, libxml2
|
||||
@@ -18,15 +19,16 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnote";
|
||||
version = "45.1";
|
||||
version = "46.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-nuwn+MsKENL9uRSkUei4QYwmDni/BzYHgaeKXkGM+UE=";
|
||||
hash = "sha256-ht9YoVlbIVN0aRq0S/wWE7Sf28p3CEI6PVZY3NOgFe0=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
gtkmm4
|
||||
libadwaita
|
||||
libsecret
|
||||
libuuid
|
||||
libxml2
|
||||
|
||||
@@ -2,27 +2,34 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, openjdk8
|
||||
, ant
|
||||
, jdk8
|
||||
, makeWrapper
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
, strip-nondeterminism
|
||||
, stripJavaArchivesHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "brmodelo";
|
||||
version = "3.31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chcandido";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "09qrhqhv264x8phnf3pnb0cwq75l7xdsj9xkwlvhry81nxz0d5v0";
|
||||
repo = "brmodelo";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-YJcGfrcB+Qw35bMnqVs/tBzMGVj2DmfhRZ0YsSGGGSc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ant makeWrapper copyDesktopItems ];
|
||||
|
||||
buildInputs = [ openjdk8 ];
|
||||
nativeBuildInputs = [
|
||||
ant
|
||||
jdk8
|
||||
makeWrapper
|
||||
copyDesktopItems
|
||||
strip-nondeterminism
|
||||
stripJavaArchivesHook
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Fixes for building with Ant.
|
||||
@@ -30,22 +37,22 @@ stdenv.mkDerivation rec {
|
||||
(fetchpatch {
|
||||
name = "fix-self-closing-element-not-allowed.patch";
|
||||
url = "https://github.com/yuuyins/brModelo/commit/0d712b74fd5d29d67be07480ed196da28a77893b.patch";
|
||||
sha256 = "sha256-yy03arE6xetotzyvpToi9o9crg3KnMRn1J70jDUvSXE=";
|
||||
hash = "sha256-yy03arE6xetotzyvpToi9o9crg3KnMRn1J70jDUvSXE=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-tag-closing.patch";
|
||||
url = "https://github.com/yuuyins/brModelo/commit/e8530ff75f024cf6effe0408ed69985405e9709c.patch";
|
||||
sha256 = "sha256-MNuh/ORbaAkB5qDSlA/nPrXN+tqzz4oOglVyEtSangI=";
|
||||
hash = "sha256-MNuh/ORbaAkB5qDSlA/nPrXN+tqzz4oOglVyEtSangI=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-bad-use-greater-than.patch";
|
||||
url = "https://github.com/yuuyins/brModelo/commit/498a6ef8129daff5a472b318f93c8f7f2897fc7f.patch";
|
||||
sha256 = "sha256-MmAwYUmx38DGRsiSxCWCObtpqxk0ykUQiDSC76bCpFc=";
|
||||
hash = "sha256-MmAwYUmx38DGRsiSxCWCObtpqxk0ykUQiDSC76bCpFc=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-param-errors.patch";
|
||||
url = "https://github.com/yuuyins/brModelo/commit/8a508aaba0bcffe13a3f95cff495230beea36bc4.patch";
|
||||
sha256 = "sha256-qME9gZChSMzu1vs9HaosD+snb+jlOrQLY97meNoA8oU=";
|
||||
hash = "sha256-qME9gZChSMzu1vs9HaosD+snb+jlOrQLY97meNoA8oU=";
|
||||
})
|
||||
|
||||
# Add SVG icons.
|
||||
@@ -53,12 +60,14 @@ stdenv.mkDerivation rec {
|
||||
(fetchpatch {
|
||||
name = "add-brmodelo-logo-icons-svg.patch";
|
||||
url = "https://github.com/yuuyins/brModelo/commit/f260b82b664fad3325bbf3ebd7a15488d496946b.patch";
|
||||
sha256 = "sha256-UhgcWxsHkNFS1GgaRnmlZohjDR8JwHof2cIb3SBetYs=";
|
||||
hash = "sha256-UhgcWxsHkNFS1GgaRnmlZohjDR8JwHof2cIb3SBetYs=";
|
||||
})
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook postBuild
|
||||
ant
|
||||
runHook preBuild
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
@@ -68,15 +77,16 @@ stdenv.mkDerivation rec {
|
||||
genericName = "Entity-relationship diagramming tool";
|
||||
exec = "brmodelo";
|
||||
icon = "brmodelo";
|
||||
comment = meta.description;
|
||||
comment = finalAttrs.meta.description;
|
||||
categories = [ "Development" "Education" "Database" "2DGraphics" "ComputerScience" "DataVisualization" "Engineering" "Java" ];
|
||||
})
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
install -d $out/bin $out/share/doc/${pname} $out/share/java
|
||||
runHook preInstall
|
||||
|
||||
cp -rv ./dist/javadoc $out/share/doc/${pname}/
|
||||
mkdir -p $out/share/doc/brmodelo
|
||||
cp -rv ./dist/javadoc $out/share/doc/brmodelo/
|
||||
|
||||
install -Dm755 ./dist/brModelo.jar -t $out/share/java/
|
||||
# NOTE: The standard Java GUI toolkit has a
|
||||
@@ -85,26 +95,28 @@ stdenv.mkDerivation rec {
|
||||
# in WMs that are not in that list (e.g. XMonad).
|
||||
# Solution/Workaround: set the environment variable
|
||||
# _JAVA_AWT_WM_NONREPARENTING=1.
|
||||
makeWrapper ${openjdk8}/bin/java $out/bin/brmodelo \
|
||||
makeWrapper ${jdk8}/bin/java $out/bin/brmodelo \
|
||||
--prefix _JAVA_AWT_WM_NONREPARENTING : 1 \
|
||||
--prefix _JAVA_OPTIONS : "-Dawt.useSystemAAFontSettings=on" \
|
||||
--add-flags "-jar $out/share/java/brModelo.jar"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
for size in 16 24 32 48 64 128 256; do
|
||||
install -Dm644 ./src/imagens/icone_"$size"x"$size".svg \
|
||||
$out/share/icons/hicolor/"$size"x"$size"/apps/brmodelo.svg
|
||||
done
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
find $out/share/doc/brmodelo/javadoc -name "*.html" -exec strip-nondeterminism --type javadoc {} +
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Entity-relationship diagram tool for making conceptual and logical database models";
|
||||
mainProgram = "brmodelo";
|
||||
homepage = "https://github.com/chcandido/brModelo";
|
||||
license = licenses.gpl3;
|
||||
mainProgram = "brmodelo";
|
||||
maintainers = with maintainers; [ yuu ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "snakemake";
|
||||
version = "8.10.6";
|
||||
version = "8.10.7";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snakemake";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-THp8sqAFZVA5V2k0ruv9qwmPNjSVi2uVx8tla0Y3awE=";
|
||||
hash = "sha256-tRjyv7pTTTDj3LrcIP3OWOX+9FldHV6rtbPdOYr70E4=";
|
||||
# https://github.com/python-versioneer/python-versioneer/issues/217
|
||||
postFetch = ''
|
||||
sed -i "$out"/snakemake/_version.py -e 's#git_refnames = ".*"#git_refnames = " (tag: v${version})"#'
|
||||
|
||||
@@ -18,11 +18,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-console";
|
||||
version = "45.0";
|
||||
version = "46.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "50YhKNLfIySh10gGLEBCnNBQSvCeQHBnsz86nQxZyOE=";
|
||||
hash = "sha256-FhnOcBdzssDJA3GPVHaMGS6lB0UU1VoXdKkslyMdbD4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "git-town";
|
||||
version = "14.0.0";
|
||||
version = "14.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "git-town";
|
||||
repo = "git-town";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GF1nNb/poFDXKwpqYZvQrTZ7CkNgO39KrrDuc94o/tw=";
|
||||
hash = "sha256-BhtKl052P3PGxGXb5lSOIsncJLiNlevzBMEF2kCuFpM=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -5,13 +5,13 @@ in
|
||||
buildKodiAddon rec {
|
||||
pname = "jellyfin";
|
||||
namespace = "plugin.video.jellyfin";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jellyfin";
|
||||
repo = "jellyfin-kodi";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-i9lRPMHniUmKTeNSzgp6dF11uYOcjH3PgJEa+Jasx68=";
|
||||
sha256 = "sha256-yCgsQnzmlmyYAjp1q0J9QxGDRg5JCd23H9xgVozHiGM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -233,6 +233,12 @@ rec {
|
||||
Type: [String]
|
||||
*/
|
||||
excludeShellChecks ? [ ],
|
||||
/*
|
||||
Extra command-line flags to pass to ShellCheck.
|
||||
|
||||
Type: [String]
|
||||
*/
|
||||
extraShellCheckFlags ? [ ],
|
||||
/*
|
||||
Bash options to activate with `set -o` at the start of the script.
|
||||
|
||||
@@ -282,11 +288,11 @@ rec {
|
||||
# but we still want to use writeShellApplication on those platforms
|
||||
let
|
||||
shellcheckSupported = lib.meta.availableOn stdenv.buildPlatform shellcheck-minimal.compiler;
|
||||
excludeOption = lib.optionalString (excludeShellChecks != [ ]) "--exclude '${lib.concatStringsSep "," excludeShellChecks}'";
|
||||
excludeFlags = lib.optionals (excludeShellChecks != [ ]) [ "--exclude" (lib.concatStringsSep "," excludeShellChecks) ];
|
||||
shellcheckCommand = lib.optionalString shellcheckSupported ''
|
||||
# use shellcheck which does not include docs
|
||||
# pandoc takes long to build and documentation isn't needed for just running the cli
|
||||
${lib.getExe shellcheck-minimal} ${excludeOption} "$target"
|
||||
${lib.getExe shellcheck-minimal} ${lib.escapeShellArgs (excludeFlags ++ extraShellCheckFlags)} "$target"
|
||||
'';
|
||||
in
|
||||
if checkPhase == null then ''
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, wayland
|
||||
, libxkbcommon
|
||||
, libGL
|
||||
, stdenv
|
||||
, testers
|
||||
, aphorme
|
||||
, autoPatchelfHook
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "aphorme";
|
||||
version = "0.1.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Iaphetes";
|
||||
repo = "aphorme_launcher";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-p1ZIMMDyQWVzoeyHb3sbeV6XQwbIDoQwJU8ynI8hGUI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-aFoy5KTapx+5aIzvDwMfjxZQ6WKQtvX3h7rNX4LBeN8=";
|
||||
|
||||
# No tests exist
|
||||
doCheck = false;
|
||||
|
||||
buildInputs = [ stdenv.cc.cc.lib ];
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
runtimeDependencies = [
|
||||
wayland
|
||||
libGL
|
||||
libxkbcommon
|
||||
];
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = aphorme;
|
||||
command = "aphorme --version";
|
||||
version = "aphorme ${version}";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A program launcher for window managers, written in Rust";
|
||||
mainProgram = "aphorme";
|
||||
homepage = "https://github.com/Iaphetes/aphorme_launcher";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ anytimetraveler ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -50,6 +50,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
substituteInPlace libmessaging-menu/messaging-menu.pc.in \
|
||||
--replace "\''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@" '@CMAKE_INSTALL_FULL_LIBDIR@' \
|
||||
--replace "\''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@" '@CMAKE_INSTALL_FULL_INCLUDEDIR@'
|
||||
|
||||
# Fix tests with gobject-introspection 1.80 not installing GLib introspection data
|
||||
substituteInPlace tests/CMakeLists.txt \
|
||||
--replace-fail 'GI_TYPELIB_PATH=\"' 'GI_TYPELIB_PATH=\"$GI_TYPELIB_PATH$\{GI_TYPELIB_PATH\:+\:\}'
|
||||
'' + lib.optionalString (!withDocumentation) ''
|
||||
sed -i CMakeLists.txt \
|
||||
'/add_subdirectory(doc)/d'
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, cargo
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, desktop-file-utils
|
||||
, rustPlatform
|
||||
, rustc
|
||||
, wrapGAppsHook4
|
||||
, glib
|
||||
, gtk4
|
||||
, libadwaita
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bustle";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = "bustle";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-/B1rY8epcP0OFv+kVgv4Jx6x/oK3XpNnZcpSGvdIPx0=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit (finalAttrs) src;
|
||||
name = "bustle-${finalAttrs.version}";
|
||||
hash = "sha256-r29Z+6P+yuCpOBUE3vkESd15lcGXs5+ZTBiQ9nW6DJ4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
desktop-file-utils
|
||||
rustPlatform.cargoSetupHook
|
||||
rustc
|
||||
wrapGAppsHook4
|
||||
glib
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk4
|
||||
libadwaita
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Graphical D-Bus message analyser and profiler";
|
||||
homepage = "https://gitlab.gnome.org/World/bustle";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ jtojnar ];
|
||||
mainProgram = "bustle";
|
||||
platforms = platforms.all;
|
||||
};
|
||||
})
|
||||
@@ -13,11 +13,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
name = "dorion";
|
||||
version = "4.1.3";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/SpikeHD/Dorion/releases/download/v${finalAttrs.version }/Dorion_${finalAttrs.version}_amd64.deb";
|
||||
hash = "sha256-O6KXOouutrNla5dkHRQeT0kp8DQO9MLoJrIMuqam/60=";
|
||||
hash = "sha256-QqjRxAx2hDd8atpXuof8AVWtK3o8K77Se2b2CyOBMOw=";
|
||||
};
|
||||
|
||||
unpackCmd = ''
|
||||
|
||||
@@ -1,13 +1,24 @@
|
||||
diff --git a/vendor/glycin/src/dbus.rs b/vendor/glycin/src/dbus.rs
|
||||
index aa5a876..4f37420 100644
|
||||
--- a/vendor/glycin/src/dbus.rs
|
||||
+++ b/vendor/glycin/src/dbus.rs
|
||||
@@ -43,7 +43,7 @@ impl<'a> DecoderProcess<'a> {
|
||||
diff --git a/vendor/glycin/src/sandbox.rs b/vendor/glycin/src/sandbox.rs
|
||||
index 7d00b36..aa70dc7 100644
|
||||
--- a/vendor/glycin/src/sandbox.rs
|
||||
+++ b/vendor/glycin/src/sandbox.rs
|
||||
@@ -165,7 +165,7 @@ impl Sandbox {
|
||||
|
||||
let (bin, args, final_arg) = match sandbox_mechanism {
|
||||
SandboxMechanism::Bwrap => (
|
||||
- "bwrap".into(),
|
||||
+ "@bwrap@".into(),
|
||||
vec![
|
||||
"--unshare-all",
|
||||
"--die-with-parent",
|
||||
args.push(self.command);
|
||||
|
||||
- ("bwrap".into(), args, Some(seccomp_memfd))
|
||||
+ ("@bwrap@".into(), args, Some(seccomp_memfd))
|
||||
}
|
||||
SandboxMechanism::FlatpakSpawn => {
|
||||
let memory_limit = Self::memory_limit();
|
||||
@@ -233,8 +233,8 @@ impl Sandbox {
|
||||
"/",
|
||||
// Make /usr available as read only
|
||||
"--ro-bind",
|
||||
- "/usr",
|
||||
- "/usr",
|
||||
+ "/nix/store",
|
||||
+ "/nix/store",
|
||||
// Make tmpfs dev available
|
||||
"--dev",
|
||||
"/dev",
|
||||
|
||||
@@ -9,20 +9,23 @@
|
||||
, ninja
|
||||
, pkg-config
|
||||
, rustc
|
||||
, rustPlatform
|
||||
, gtk4
|
||||
, cairo
|
||||
, libheif
|
||||
, libxml2
|
||||
, libseccomp
|
||||
, libjxl
|
||||
, gnome
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "glycin-loaders";
|
||||
version = "0.1.2";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/glycin-loaders/${lib.versions.majorMinor finalAttrs.version}/glycin-loaders-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-x2wBklq9BwF0WJzLkWpEpXOrZbHp1JPxVOQnVkMebdc=";
|
||||
hash = "sha256-0PAiRi/1VYVuheqUBHRHC7NrN8n/y8umOgP+XpVDcM8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -40,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
ninja
|
||||
pkg-config
|
||||
rustc
|
||||
rustPlatform.bindgenHook # for libheif-sys
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -47,6 +51,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cairo
|
||||
libheif
|
||||
libxml2 # for librsvg crate
|
||||
libseccomp
|
||||
libjxl
|
||||
];
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, wrapGAppsHook4
|
||||
, glib
|
||||
, glib-networking
|
||||
, gnome-online-accounts
|
||||
, gtk4
|
||||
, libadwaita
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-online-accounts-gtk";
|
||||
version = "3.50.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xapp-project";
|
||||
repo = "gnome-online-accounts-gtk";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-lirL1bsAZfuE669BdPo03M85O5eZzU/D/hfGp+LxvSo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
glib-networking
|
||||
gnome-online-accounts
|
||||
gtk4
|
||||
libadwaita # for goa-backend
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Online accounts configuration utility";
|
||||
homepage = "https://github.com/xapp-project/gnome-online-accounts-gtk";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.cinnamon.members;
|
||||
};
|
||||
})
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "inshellisense";
|
||||
version = "0.0.1-rc.12";
|
||||
version = "0.0.1-rc.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-dDjIKVV1dSCIa2Y2d1AQQAw9Rcflh0AnKlwsQSblIhs=";
|
||||
hash = "sha256-ZsEAE9EDJLREpKjHLbvqAUNM/y9eCH44g3D8NHYHiT4=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-uBsPaUvEiR5oCl8rZvpyNPXSB/Vlcx937lT4WqgekHI=";
|
||||
npmDepsHash = "sha256-p0/GnAdWNM/wjB/w+rXbOrh3Hr/smIW0IVQga7uCKYY=";
|
||||
|
||||
# Needed for dependency `@homebridge/node-pty-prebuilt-multiarch`
|
||||
# On Darwin systems the build fails with,
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jsoncons";
|
||||
version = "0.173.4";
|
||||
version = "0.174.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danielaparker";
|
||||
repo = "jsoncons";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Mf3kvfYAcwNrwbvGyMP6PQmk5e5Mz7b0qCZ6yi95ksk=";
|
||||
hash = "sha256-VL64oWmaLz4zJm8eCF03tcAkeL+j1BRAQJ5/kUA7L90=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/main.js b/main.js
|
||||
index a4b5c8ef..743d63ca 100644
|
||||
--- a/main.js
|
||||
+++ b/main.js
|
||||
@@ -8,7 +8,7 @@ const {
|
||||
nativeTheme,
|
||||
} = require("electron");
|
||||
const path = require("path");
|
||||
-const isDev = require("electron-is-dev");
|
||||
+const isDev = false;
|
||||
const Store = require("electron-store");
|
||||
const store = new Store();
|
||||
const fs = require("fs");
|
||||
@@ -0,0 +1,58 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
|
||||
<mime-type type="application/epub+zip">
|
||||
<glob pattern="*.epub"/>
|
||||
|
||||
<icon name="x-office-document" />
|
||||
</mime-type>
|
||||
<mime-type type="application/pdf">
|
||||
<glob pattern="*.pdf"/>
|
||||
|
||||
<icon name="x-office-document" />
|
||||
</mime-type>
|
||||
<mime-type type="image/vnd.djvu">
|
||||
<glob pattern="*.djvu"/>
|
||||
|
||||
<icon name="x-office-document" />
|
||||
</mime-type>
|
||||
<mime-type type="application/x-mobipocket-ebook">
|
||||
<glob pattern="*.mobi"/>
|
||||
|
||||
<icon name="x-office-document" />
|
||||
</mime-type>
|
||||
<mime-type type="application/vnd.amazon.ebook">
|
||||
<glob pattern="*.azw3"/>
|
||||
|
||||
<icon name="x-office-document" />
|
||||
</mime-type>
|
||||
<mime-type type="application/vnd.amazon.ebook">
|
||||
<glob pattern="*.azw"/>
|
||||
|
||||
<icon name="x-office-document" />
|
||||
</mime-type>
|
||||
<mime-type type="application/x-cbz">
|
||||
<glob pattern="*.cbz"/>
|
||||
|
||||
<icon name="x-office-document" />
|
||||
</mime-type>
|
||||
<mime-type type="application/x-cbr">
|
||||
<glob pattern="*.cbr"/>
|
||||
|
||||
<icon name="x-office-document" />
|
||||
</mime-type>
|
||||
<mime-type type="application/x-cbt">
|
||||
<glob pattern="*.cbt"/>
|
||||
|
||||
<icon name="x-office-document" />
|
||||
</mime-type>
|
||||
<mime-type type="application/x-cb7">
|
||||
<glob pattern="*.cb7"/>
|
||||
|
||||
<icon name="x-office-document" />
|
||||
</mime-type>
|
||||
<mime-type type="application/x-fictionbook+xml">
|
||||
<glob pattern="*.fb2"/>
|
||||
|
||||
<icon name="x-office-document" />
|
||||
</mime-type>
|
||||
</mime-info>
|
||||
@@ -0,0 +1,312 @@
|
||||
{
|
||||
"name": "koodo-reader",
|
||||
"main": "main.js",
|
||||
"version": "1.6.6",
|
||||
"description": "A cross-platform ebook reader",
|
||||
"author": {
|
||||
"name": "App by Troye",
|
||||
"email": "support@960960.xyz"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=18.0.0",
|
||||
"npm": ">=6.0.0"
|
||||
},
|
||||
"repository": "https://github.com/koodo-reader/koodo-reader",
|
||||
"private": false,
|
||||
"resolutions": {
|
||||
"//": "See https://github.com/facebook/create-react-app/issues/11773",
|
||||
"react-error-overlay": "6.0.9"
|
||||
},
|
||||
"dependencies": {
|
||||
"@aws-sdk/client-s3": "^3.485.0",
|
||||
"adm-zip": "^0.5.2",
|
||||
"axios": "^0.19.2",
|
||||
"buffer": "^6.0.3",
|
||||
"copy-text-to-clipboard": "^2.2.0",
|
||||
"dompurify": "^3.0.1",
|
||||
"electron-is-dev": "^1.1.0",
|
||||
"electron-store": "^8.0.1",
|
||||
"font-list": "^1.4.5",
|
||||
"fs-extra": "^9.1.0",
|
||||
"ftp": "^0.3.10",
|
||||
"howler": "^2.2.3",
|
||||
"iconv-lite": "^0.6.3",
|
||||
"qs": "^6.11.2",
|
||||
"react-hot-toast": "^2.1.1",
|
||||
"react-tooltip": "^5.26.3",
|
||||
"ssh2-sftp-client": "^9.1.0",
|
||||
"webdav": "^3.6.2",
|
||||
"wink-lemmatizer": "^3.0.4",
|
||||
"ws": "^8.13.0",
|
||||
"zip-a-folder": "^0.0.12"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/i18next": "^13.0.0",
|
||||
"@types/iconv-lite": "^0.0.1",
|
||||
"@types/node": "^13.13.2",
|
||||
"@types/react": "17.0.2",
|
||||
"@types/react-dom": "17.0.2",
|
||||
"@types/react-i18next": "^8.1.0",
|
||||
"@types/react-lottie": "^1.2.5",
|
||||
"@types/react-redux": "^7.1.7",
|
||||
"@types/react-router-dom": "^5.1.6",
|
||||
"@types/spark-md5": "^3.0.2",
|
||||
"@types/ws": "^8.5.5",
|
||||
"classnames": "^2.2.6",
|
||||
"concurrently": "^5.0.1",
|
||||
"cross-env": "^6.0.3",
|
||||
"electron": "14.1.1",
|
||||
"electron-builder": "^23.6.0",
|
||||
"hard-source-webpack-plugin": "^0.13.1",
|
||||
"html-react-parser": "^0.13.0",
|
||||
"i18next": "^20.2.4",
|
||||
"node-sass": "^9.0.0",
|
||||
"nodemon": "^2.0.6",
|
||||
"rc-color-picker": "^1.2.6",
|
||||
"react": "^17.0.2",
|
||||
"react-device-detect": "^1.12.1",
|
||||
"react-dom": "^17.0.2",
|
||||
"react-dropzone": "^11.3.0",
|
||||
"react-i18next": "^13.2.2",
|
||||
"react-lottie": "^1.2.3",
|
||||
"react-redux": "^7.2.0",
|
||||
"react-router-dom": "^5.2.0",
|
||||
"react-scripts": "^5.0.1",
|
||||
"redux": "^4.0.5",
|
||||
"redux-thunk": "^2.3.0",
|
||||
"sass-loader": "^13.3.2",
|
||||
"source-map-explorer": "^2.5.2",
|
||||
"spark-md5": "^3.0.1",
|
||||
"typescript": "3.8.3",
|
||||
"wait-on": "^7.0.1"
|
||||
},
|
||||
"scripts": {
|
||||
"analyze": "source-map-explorer 'build/static/js/*.js'",
|
||||
"start": "react-scripts start",
|
||||
"build": "react-scripts build",
|
||||
"test": "react-scripts test",
|
||||
"eject": "react-scripts eject",
|
||||
"ele": "electron .",
|
||||
"dev": "concurrently \"cross-env BROWSER=none npm start\" \"wait-on http://127.0.0.1:3000/ && nodemon --watch main.js --exec electron .\"",
|
||||
"release": "electron-builder",
|
||||
"prerelease": "react-scripts build"
|
||||
},
|
||||
"homepage": "./",
|
||||
"build": {
|
||||
"appId": "xyz.960960.koodo",
|
||||
"productName": "Koodo Reader",
|
||||
"copyright": "Copyright (c) 2021-2022 ${author}",
|
||||
"files": [
|
||||
"build/**/*",
|
||||
"node_modules/**/*",
|
||||
"package.json",
|
||||
"main.js",
|
||||
"edge-tts.js"
|
||||
],
|
||||
"directories": {
|
||||
"buildResources": "assets"
|
||||
},
|
||||
"publish": {
|
||||
"provider": "github",
|
||||
"repo": "koodo-reader",
|
||||
"owner": "koodo-reader"
|
||||
},
|
||||
"buildDependenciesFromSource": false,
|
||||
"nodeGypRebuild": false,
|
||||
"fileAssociations": [
|
||||
{
|
||||
"ext": "epub",
|
||||
"icon": "assets/icons/epub",
|
||||
"role": "Viewer",
|
||||
"mimeType": "application/epub+zip"
|
||||
},
|
||||
{
|
||||
"ext": "pdf",
|
||||
"icon": "assets/icons/pdf",
|
||||
"role": "Viewer",
|
||||
"mimeType": "application/pdf"
|
||||
},
|
||||
{
|
||||
"ext": "mobi",
|
||||
"icon": "assets/icons/mobi",
|
||||
"role": "Viewer",
|
||||
"mimeType": "application/x-mobipocket-ebook"
|
||||
},
|
||||
{
|
||||
"ext": "azw3",
|
||||
"icon": "assets/icons/azw3",
|
||||
"role": "Viewer",
|
||||
"mimeType": "application/vnd.amazon.ebook"
|
||||
},
|
||||
{
|
||||
"ext": "azw",
|
||||
"icon": "assets/icons/azw3",
|
||||
"role": "Viewer",
|
||||
"mimeType": "application/vnd.amazon.ebook"
|
||||
},
|
||||
{
|
||||
"ext": "cbz",
|
||||
"icon": "assets/icons/comic",
|
||||
"role": "Viewer",
|
||||
"mimeType": "application/x-cbz"
|
||||
},
|
||||
{
|
||||
"ext": "cbr",
|
||||
"icon": "assets/icons/comic",
|
||||
"role": "Viewer",
|
||||
"mimeType": "application/x-cbr"
|
||||
},
|
||||
{
|
||||
"ext": "cbt",
|
||||
"icon": "assets/icons/comic",
|
||||
"role": "Viewer",
|
||||
"mimeType": "application/x-cbt"
|
||||
},
|
||||
{
|
||||
"ext": "cb7",
|
||||
"icon": "assets/icons/comic",
|
||||
"role": "Viewer",
|
||||
"mimeType": "application/x-cb7"
|
||||
},
|
||||
{
|
||||
"ext": "fb2",
|
||||
"icon": "assets/icons/fb2",
|
||||
"role": "Viewer",
|
||||
"mimeType": "application/x-fictionbook+xml"
|
||||
}
|
||||
],
|
||||
"extends": null,
|
||||
"dmg": {
|
||||
"contents": [
|
||||
{
|
||||
"x": 410,
|
||||
"y": 150,
|
||||
"type": "link",
|
||||
"path": "/Applications"
|
||||
},
|
||||
{
|
||||
"x": 130,
|
||||
"y": 150,
|
||||
"type": "file"
|
||||
}
|
||||
]
|
||||
},
|
||||
"mac": {
|
||||
"target": [
|
||||
{
|
||||
"target": "dmg",
|
||||
"arch": [
|
||||
"x64",
|
||||
"arm64"
|
||||
]
|
||||
}
|
||||
],
|
||||
"icon": "assets/icons/icon.icns",
|
||||
"category": "public.app-category.productivity",
|
||||
"artifactName": "${productName}-${version}-${arch}.${ext}"
|
||||
},
|
||||
"win": {
|
||||
"target": [
|
||||
{
|
||||
"target": "nsis",
|
||||
"arch": [
|
||||
"x64"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target": "zip",
|
||||
"arch": [
|
||||
"x64",
|
||||
"ia32",
|
||||
"arm64"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target": "portable",
|
||||
"arch": [
|
||||
"x64"
|
||||
]
|
||||
}
|
||||
],
|
||||
"icon": "assets/icons/icon.ico",
|
||||
"artifactName": "${productName}-${version}-${arch}-Win.${ext}",
|
||||
"publisherName": "App by Troye"
|
||||
},
|
||||
"linux": {
|
||||
"icon": "assets/icons",
|
||||
"category": "Office",
|
||||
"target": [
|
||||
{
|
||||
"target": "snap",
|
||||
"arch": [
|
||||
"x64"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target": "deb",
|
||||
"arch": [
|
||||
"arm64",
|
||||
"ia32",
|
||||
"x64"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target": "rpm",
|
||||
"arch": [
|
||||
"x64"
|
||||
]
|
||||
},
|
||||
{
|
||||
"target": "AppImage",
|
||||
"arch": [
|
||||
"arm64",
|
||||
"ia32",
|
||||
"x64"
|
||||
]
|
||||
}
|
||||
],
|
||||
"artifactName": "${productName}-${version}-${arch}.${ext}"
|
||||
},
|
||||
"portable": {
|
||||
"artifactName": "${productName}-${version}-Portable.${ext}"
|
||||
},
|
||||
"nsis": {
|
||||
"artifactName": "${productName}-${version}.${ext}",
|
||||
"oneClick": false,
|
||||
"allowToChangeInstallationDirectory": true,
|
||||
"include": "assets/windows/installer.nsh"
|
||||
},
|
||||
"snap": {
|
||||
"publish": [
|
||||
{
|
||||
"provider": "github"
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"eslintConfig": {
|
||||
"extends": "react-app"
|
||||
},
|
||||
"browserslist": {
|
||||
"production": [
|
||||
">0.2%",
|
||||
"not dead",
|
||||
"not op_mini all"
|
||||
],
|
||||
"development": [
|
||||
"last 1 chrome version",
|
||||
"last 1 firefox version",
|
||||
"last 1 safari version"
|
||||
]
|
||||
},
|
||||
"babel": {
|
||||
"presets": [
|
||||
"react-app"
|
||||
],
|
||||
"plugins": [
|
||||
[
|
||||
"react-hot-loader/babel"
|
||||
]
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,130 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
mkYarnPackage,
|
||||
fetchFromGitHub,
|
||||
applyPatches,
|
||||
fetchYarnDeps,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
wrapGAppsHook,
|
||||
electron,
|
||||
}:
|
||||
|
||||
mkYarnPackage rec {
|
||||
pname = "koodo-reader";
|
||||
version = "1.6.6";
|
||||
|
||||
src = applyPatches {
|
||||
src = fetchFromGitHub {
|
||||
owner = "troyeguo";
|
||||
repo = "koodo-reader";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-g2bVm8LFeEIPaWlaxzMI0SrpM+79zQFzJ7Vs5CbWBT4=";
|
||||
};
|
||||
patches = [ ./update-react-i18next.patch ]; # Could be upstreamed
|
||||
};
|
||||
|
||||
# should be copied from `koodo-reader.src`
|
||||
packageJSON = ./package.json;
|
||||
|
||||
patches = [ ./fix-isdev.patch ];
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/yarn.lock";
|
||||
hash = "sha256-VvYkotVb74zR9+/IWiQwOX/6RJf+xukpi7okRovfVzc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
cp -r $node_modules node_modules
|
||||
chmod +w node_modules
|
||||
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
export HOME=$(mktemp -d)
|
||||
yarn --offline build
|
||||
yarn --offline run electron-builder --dir \
|
||||
-c.electronDist=${electron}/libexec/electron \
|
||||
-c.electronVersion=${electron.version}
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 assets/icons/256x256.png $out/share/icons/hicolor/256x256/apps/koodo-reader.png
|
||||
install -Dm644 ${./mime-types.xml} $out/share/mime/packages/koodo-reader.xml
|
||||
|
||||
mkdir -p $out/share/lib/koodo-reader
|
||||
cp -r dist/*-unpacked/{locales,resources{,.pak}} $out/share/lib/koodo-reader
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
makeWrapper ${electron}/bin/electron $out/bin/koodo-reader \
|
||||
--add-flags $out/share/lib/koodo-reader/resources/app.asar \
|
||||
"''${gappsWrapperArgs[@]}" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
|
||||
--inherit-argv0
|
||||
'';
|
||||
|
||||
doDist = false;
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "koodo-reader";
|
||||
desktopName = "Koodo Reader";
|
||||
exec = "koodo-reader %U";
|
||||
icon = "koodo-reader";
|
||||
comment = meta.description;
|
||||
categories = [ "Office" ];
|
||||
mimeTypes = [
|
||||
"application/epub+zip"
|
||||
"application/pdf"
|
||||
"image/vnd.djvu"
|
||||
"application/x-mobipocket-ebook"
|
||||
"application/vnd.amazon.ebook"
|
||||
"application/vnd.amazon.ebook"
|
||||
"application/x-cbz"
|
||||
"application/x-cbr"
|
||||
"application/x-cbt"
|
||||
"application/x-cb7"
|
||||
"application/x-fictionbook+xml"
|
||||
];
|
||||
startupWMClass = "Koodo Reader";
|
||||
terminal = false;
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
broken = stdenv.isDarwin;
|
||||
changelog = "https://github.com/troyeguo/koodo-reader/releases/tag/v${version}";
|
||||
description = "A cross-platform ebook reader";
|
||||
longDescription = ''
|
||||
A modern ebook manager and reader with sync and backup capacities
|
||||
for Windows, macOS, Linux and Web
|
||||
'';
|
||||
homepage = "https://github.com/troyeguo/koodo-reader";
|
||||
license = lib.licenses.agpl3Only;
|
||||
mainProgram = "koodo-reader";
|
||||
maintainers = with lib.maintainers; [ tomasajt ];
|
||||
platforms = electron.meta.platforms;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,58 @@
|
||||
diff --git a/package.json b/package.json
|
||||
index c71b04a1..a4b4b3ef 100644
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -67,7 +67,7 @@
|
||||
"react-device-detect": "^1.12.1",
|
||||
"react-dom": "^17.0.2",
|
||||
"react-dropzone": "^11.3.0",
|
||||
- "react-i18next": "^11.8.15",
|
||||
+ "react-i18next": "^13.2.2",
|
||||
"react-lottie": "^1.2.3",
|
||||
"react-redux": "^7.2.0",
|
||||
"react-router-dom": "^5.2.0",
|
||||
diff --git a/yarn.lock b/yarn.lock
|
||||
index 881db5b2..2df4d362 100644
|
||||
--- a/yarn.lock
|
||||
+++ b/yarn.lock
|
||||
@@ -1828,7 +1828,7 @@
|
||||
resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
|
||||
integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
|
||||
|
||||
-"@babel/runtime@^7.1.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.20.6", "@babel/runtime@^7.20.7", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
|
||||
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.20.6", "@babel/runtime@^7.20.7", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
|
||||
version "7.21.0"
|
||||
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673"
|
||||
integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==
|
||||
@@ -1842,6 +1842,13 @@
|
||||
dependencies:
|
||||
regenerator-runtime "^0.14.0"
|
||||
|
||||
+"@babel/runtime@^7.22.5":
|
||||
+ version "7.23.1"
|
||||
+ resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.1.tgz#72741dc4d413338a91dcb044a86f3c0bc402646d"
|
||||
+ integrity sha512-hC2v6p8ZSI/W0HUzh3V8C5g+NwSKzKPtJwSpTjwl0o297GP9+ZLQSkdvHz46CM3LqyoXxq+5G9komY+eSqSO0g==
|
||||
+ dependencies:
|
||||
+ regenerator-runtime "^0.14.0"
|
||||
+
|
||||
"@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.3.3":
|
||||
version "7.20.7"
|
||||
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
|
||||
@@ -10951,12 +10958,12 @@ react-i18next@*:
|
||||
"@babel/runtime" "^7.20.6"
|
||||
html-parse-stringify "^3.0.1"
|
||||
|
||||
-react-i18next@^11.8.15:
|
||||
- version "11.18.6"
|
||||
- resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.18.6.tgz#e159c2960c718c1314f1e8fcaa282d1c8b167887"
|
||||
- integrity sha512-yHb2F9BiT0lqoQDt8loZ5gWP331GwctHz9tYQ8A2EIEUu+CcEdjBLQWli1USG3RdWQt3W+jqQLg/d4rrQR96LA==
|
||||
+react-i18next@^13.2.2:
|
||||
+ version "13.2.2"
|
||||
+ resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-13.2.2.tgz#b1e78ed66a54f4bc819616f68b98221e1b1a1936"
|
||||
+ integrity sha512-+nFUkbRByFwnrfDcYqvzBuaeZb+nACHx+fAWN/pZMddWOCJH5hoc21+Sa/N/Lqi6ne6/9wC/qRGOoQhJa6IkEQ==
|
||||
dependencies:
|
||||
- "@babel/runtime" "^7.14.5"
|
||||
+ "@babel/runtime" "^7.22.5"
|
||||
html-parse-stringify "^3.0.1"
|
||||
|
||||
react-is@^16.12.0, react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0:
|
||||
@@ -0,0 +1,73 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, gi-docgen
|
||||
, gobject-introspection
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, uhttpmock_1_0
|
||||
, glib
|
||||
, gnome-online-accounts
|
||||
, json-glib
|
||||
, librest_1_0
|
||||
, libsoup_3
|
||||
, gnome
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libmsgraph";
|
||||
version = "0.2.1";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/msgraph/${lib.versions.majorMinor finalAttrs.version}/msgraph-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-4OWeqorj4KSOwKbC/tBHCFanCSSOkhK2odA33leS7Ls=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gi-docgen
|
||||
gobject-introspection
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
uhttpmock_1_0
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
glib
|
||||
gnome-online-accounts
|
||||
json-glib
|
||||
librest_1_0
|
||||
libsoup_3
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
# https://gitlab.gnome.org/GNOME/msgraph/-/merge_requests/9
|
||||
"-Dc_args=-Wno-error=format-security"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
|
||||
moveToOutput "share/doc/msgraph-0" "$devdoc"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
attrPath = "libmsgraph";
|
||||
packageName = "msgraph";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library to access MS Graph API for Office 365";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/msgraph";
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -72,13 +72,13 @@ let
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llama-cpp";
|
||||
version = "2674";
|
||||
version = "2700";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggerganov";
|
||||
repo = "llama.cpp";
|
||||
rev = "refs/tags/b${finalAttrs.version}";
|
||||
hash = "sha256-5Vc9DkXD83X22xRxZ2laCxrAZe2RdsL6FwR2tC/YGU0=";
|
||||
hash = "sha256-gR50T++TE9/tlIjSQDp2FR+wiUSpyA+Fh7Nzg/y3zPE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -15,17 +15,18 @@
|
||||
, lcms2
|
||||
, libadwaita
|
||||
, libgweather
|
||||
, libseccomp
|
||||
, glycin-loaders
|
||||
, gnome
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "loupe";
|
||||
version = "45.3";
|
||||
version = "46.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/loupe/${lib.versions.major finalAttrs.version}/loupe-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-9l8tEgjQhatf+pmN1DyS/pUictTVm1HP7MEevf/KLYY=";
|
||||
hash = "sha256-OhWj+c+PiJp+ZC45AimfeSGKkAHAjFY3TgWRT/71qzA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -51,13 +52,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
lcms2
|
||||
libadwaita
|
||||
libgweather
|
||||
libseccomp
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Replace hash of file we patch in vendored glycin.
|
||||
jq \
|
||||
--arg hash "$(sha256sum vendor/glycin/src/dbus.rs | cut -d' ' -f 1)" \
|
||||
'.files."src/dbus.rs" = $hash' \
|
||||
--arg hash "$(sha256sum vendor/glycin/src/sandbox.rs | cut -d' ' -f 1)" \
|
||||
'.files."src/sandbox.rs" = $hash' \
|
||||
vendor/glycin/.cargo-checksum.json \
|
||||
| sponge vendor/glycin/.cargo-checksum.json
|
||||
'';
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
buildNimPackage (finalAttrs: {
|
||||
pname = "mosdepth";
|
||||
version = "0.3.7";
|
||||
version = "0.3.8";
|
||||
|
||||
requiredNimVersion = 1;
|
||||
|
||||
@@ -10,7 +10,7 @@ buildNimPackage (finalAttrs: {
|
||||
owner = "brentp";
|
||||
repo = "mosdepth";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-VyEZNY/P3BfJ3PCRn7R+37XH4gfc9JEOFB0WmrSxpIc=";
|
||||
sha256 = "sha256-IkCLlIugnOO2LpS79gakURvPR1ZuayFtrOOoPyNKLMQ=";
|
||||
};
|
||||
|
||||
lockFile = ./lock.json;
|
||||
|
||||
@@ -97,6 +97,8 @@ ps.buildPythonApplication rec {
|
||||
disabledTests = [
|
||||
# requires a wayland session (no xclip support)
|
||||
"test_wl_copy"
|
||||
# RuntimeError: Please destroy the QApplication singleton before creating a new QApplication instance
|
||||
"test_get_application"
|
||||
# times out, unknown why
|
||||
"test_update_checker_triggers_checked_signal"
|
||||
# touches network
|
||||
@@ -124,6 +126,9 @@ ps.buildPythonApplication rec {
|
||||
"tests/tests_gui/test_downloader.py"
|
||||
# fails to import, causes pytest to freeze
|
||||
"tests/tests_gui/test_language_manager.py"
|
||||
# RuntimeError("Internal C++ object (PySide6.QtGui.QHideEvent) already deleted.")
|
||||
# AttributeError("'LoadingIndicator' object has no attribute 'timer'")
|
||||
"tests/tests_gui/test_loading_indicator.py"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# requires a display
|
||||
"tests/integration/test_normcap.py"
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
diff --git a/src/orca/debug.py b/src/orca/debug.py
|
||||
index eb939a236..4e4db2e84 100644
|
||||
--- a/src/orca/debug.py
|
||||
+++ b/src/orca/debug.py
|
||||
@@ -522,7 +522,7 @@ def traceit(frame, event, arg):
|
||||
return traceit
|
||||
|
||||
def getOpenFDCount(pid):
|
||||
- procs = subprocess.check_output([ 'lsof', '-w', '-Ff', '-p', str(pid)])
|
||||
+ procs = subprocess.check_output([ '@lsof@', '-w', '-Ff', '-p', str(pid)])
|
||||
procs = procs.decode('UTF-8').split('\n')
|
||||
files = list(filter(lambda s: s and s[0] == 'f' and s[1:].isdigit(), procs))
|
||||
|
||||
@@ -540,7 +540,7 @@ def getCmdline(pid):
|
||||
return cmdline
|
||||
|
||||
def pidOf(procName):
|
||||
- openFile = subprocess.Popen(f'pgrep {procName}',
|
||||
+ openFile = subprocess.Popen(f'@pgrep@ {procName}',
|
||||
shell=True,
|
||||
stdout=subprocess.PIPE).stdout
|
||||
pids = openFile.read()
|
||||
diff --git a/src/orca/orca_bin.py.in b/src/orca/orca_bin.py.in
|
||||
index c6f99de14..2370204f3 100755
|
||||
--- a/src/orca/orca_bin.py.in
|
||||
+++ b/src/orca/orca_bin.py.in
|
||||
@@ -62,7 +62,7 @@ class ListApps(argparse.Action):
|
||||
name = "[DEAD]"
|
||||
|
||||
try:
|
||||
- cmdline = subprocess.getoutput('cat /proc/%s/cmdline' % pid)
|
||||
+ cmdline = subprocess.getoutput('@cat@ /proc/%s/cmdline' % pid)
|
||||
except Exception:
|
||||
cmdline = '(exception encountered)'
|
||||
else:
|
||||
@@ -195,7 +195,7 @@ def inGraphicalDesktop():
|
||||
def otherOrcas():
|
||||
"""Returns the pid of any other instances of Orca owned by this user."""
|
||||
|
||||
- openFile = subprocess.Popen('pgrep -u %s -x orca' % os.getuid(),
|
||||
+ openFile = subprocess.Popen('@pgrep@ -u %s -x orca' % os.getuid(),
|
||||
shell=True,
|
||||
stdout=subprocess.PIPE).stdout
|
||||
pids = openFile.read()
|
||||
diff --git a/src/orca/orca_modifier_manager.py b/src/orca/orca_modifier_manager.py
|
||||
index c45cd4a5b..3f2ec59f0 100644
|
||||
--- a/src/orca/orca_modifier_manager.py
|
||||
+++ b/src/orca/orca_modifier_manager.py
|
||||
@@ -115,7 +115,7 @@ class OrcaModifierManager:
|
||||
debug.printMessage(debug.LEVEL_INFO, msg, True)
|
||||
|
||||
self.unset_orca_modifiers(reason)
|
||||
- self._original_xmodmap = subprocess.check_output(['xkbcomp', os.environ['DISPLAY'], '-'])
|
||||
+ self._original_xmodmap = subprocess.check_output(['@xkbcomp@', os.environ['DISPLAY'], '-'])
|
||||
self._create_orca_xmodmap()
|
||||
|
||||
def update_key_map(self, keyboard_event):
|
||||
@@ -162,7 +162,7 @@ class OrcaModifierManager:
|
||||
return
|
||||
|
||||
self._caps_lock_cleared = False
|
||||
- p = subprocess.Popen(['xkbcomp', '-w0', '-', os.environ['DISPLAY']],
|
||||
+ p = subprocess.Popen(['@xkbcomp@', '-w0', '-', os.environ['DISPLAY']],
|
||||
stdin=subprocess.PIPE, stdout=None, stderr=None)
|
||||
p.communicate(self._original_xmodmap)
|
||||
|
||||
@@ -223,7 +223,7 @@ class OrcaModifierManager:
|
||||
if modified:
|
||||
msg = "ORCA MODIFIER MANAGER: Updating xmodmap"
|
||||
debug.printMessage(debug.LEVEL_INFO, msg, True)
|
||||
- p = subprocess.Popen(['xkbcomp', '-w0', '-', os.environ['DISPLAY']],
|
||||
+ p = subprocess.Popen(['@xkbcomp@', '-w0', '-', os.environ['DISPLAY']],
|
||||
stdin=subprocess.PIPE, stdout=None, stderr=None)
|
||||
p.communicate(bytes('\n'.join(lines), 'UTF-8'))
|
||||
else:
|
||||
@@ -1,24 +1,20 @@
|
||||
{ lib
|
||||
, pkg-config
|
||||
, fetchurl
|
||||
, buildPythonApplication
|
||||
, autoreconfHook
|
||||
, meson
|
||||
, ninja
|
||||
, wrapGAppsHook
|
||||
, gobject-introspection
|
||||
, gettext
|
||||
, yelp-tools
|
||||
, itstool
|
||||
, python
|
||||
, pygobject3
|
||||
, python3
|
||||
, gtk3
|
||||
, gnome
|
||||
, substituteAll
|
||||
, at-spi2-atk
|
||||
, at-spi2-core
|
||||
, pyatspi
|
||||
, dbus
|
||||
, dbus-python
|
||||
, pyxdg
|
||||
, xkbcomp
|
||||
, procps
|
||||
, lsof
|
||||
@@ -27,20 +23,18 @@
|
||||
, speechd
|
||||
, brltty
|
||||
, liblouis
|
||||
, setproctitle
|
||||
, gst_all_1
|
||||
, gst-python
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "orca";
|
||||
version = "45.2";
|
||||
version = "46.1";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "8PLFeaW+7f5WU7x/4kSBxNaqxd0fccHnoghZXzx473Y=";
|
||||
hash = "sha256-z2deNQwYrA+ilDbGVZ0dqXX3///vqAjr5HbY+enRERQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -54,7 +48,8 @@ buildPythonApplication rec {
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
meson
|
||||
ninja
|
||||
wrapGAppsHook
|
||||
pkg-config
|
||||
gettext
|
||||
@@ -63,13 +58,13 @@ buildPythonApplication rec {
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
pythonPath = [
|
||||
pythonPath = with python3.pkgs; [
|
||||
pygobject3
|
||||
pyatspi
|
||||
dbus-python
|
||||
pyxdg
|
||||
brltty
|
||||
liblouis
|
||||
psutil
|
||||
speechd
|
||||
gst-python
|
||||
setproctitle
|
||||
@@ -78,7 +73,7 @@ buildPythonApplication rec {
|
||||
strictDeps = false;
|
||||
|
||||
buildInputs = [
|
||||
python
|
||||
python3
|
||||
gtk3
|
||||
at-spi2-atk
|
||||
at-spi2-core
|
||||
@@ -89,6 +84,12 @@ buildPythonApplication rec {
|
||||
gst_all_1.gst-plugins-good
|
||||
];
|
||||
|
||||
dontWrapGApps = true; # Prevent double wrapping
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
Generated
+1251
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,133 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, appstream
|
||||
, desktop-file-utils
|
||||
, gtk4
|
||||
, glib
|
||||
, pango
|
||||
, atk
|
||||
, gdk-pixbuf
|
||||
, shared-mime-info
|
||||
, itstool
|
||||
, poppler
|
||||
, ghostscriptX
|
||||
, djvulibre
|
||||
, libspectre
|
||||
, libarchive
|
||||
, libsecret
|
||||
, wrapGAppsHook4
|
||||
, librsvg
|
||||
, gobject-introspection
|
||||
, yelp-tools
|
||||
, gsettings-desktop-schemas
|
||||
, dbus
|
||||
, gi-docgen
|
||||
, libgxps
|
||||
, supportXPS ? true # Open XML Paper Specification via libgxps
|
||||
, withLibsecret ? true
|
||||
, libadwaita
|
||||
, exempi
|
||||
, cargo
|
||||
, rustPlatform
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "papers";
|
||||
version = "45.0-unstable-2024-03-27";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME/Incubator";
|
||||
repo = "papers";
|
||||
rev = "4374535f4f5e5cea613b2df7b3dc99e97da27d99";
|
||||
hash = "sha256-wjLRGENJ+TjXV3JPn/lcqv3DonAsJrC0OiLs1DoNHkc=";
|
||||
};
|
||||
|
||||
cargoRoot = "shell-rs";
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
|
||||
outputHashes = {
|
||||
"cairo-rs-0.20.0" = "sha256-aCG9rh/tXqmcCIijuqJZJEgrGdG/IygcdWlvKYzVPhU=";
|
||||
"gdk4-0.9.0" = "sha256-KYisC8nm6KVfowiKXtMoimXzB3UjHarH+2ZLhvW8oMU=";
|
||||
"libadwaita-0.7.0" = "sha256-gfkaj/BIqvWj1UNVAGNNXww4aoJPlqvBwIRGmDiv48E=";
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream
|
||||
desktop-file-utils
|
||||
gobject-introspection
|
||||
gi-docgen
|
||||
itstool
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wrapGAppsHook4
|
||||
yelp-tools
|
||||
cargo
|
||||
rustPlatform.cargoSetupHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
atk
|
||||
dbus # only needed to find the service directory
|
||||
djvulibre
|
||||
exempi
|
||||
gdk-pixbuf
|
||||
ghostscriptX
|
||||
glib
|
||||
gtk4
|
||||
gsettings-desktop-schemas
|
||||
libadwaita
|
||||
libarchive
|
||||
librsvg
|
||||
libspectre
|
||||
pango
|
||||
poppler
|
||||
] ++ lib.optionals withLibsecret [
|
||||
libsecret
|
||||
] ++ lib.optionals supportXPS [
|
||||
libgxps
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dnautilus=false"
|
||||
"-Dps=enabled"
|
||||
] ++ lib.optionals (!withLibsecret) [
|
||||
"-Dkeyring=disabled"
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
|
||||
moveToOutput "share/doc" "$devdoc"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.gnome.org/Apps/papers";
|
||||
description = "GNOME's document viewer";
|
||||
|
||||
longDescription = ''
|
||||
papers is a document viewer for multiple document formats. It
|
||||
currently supports PDF, PostScript, DjVu, and TIFF (not DVI anymore).
|
||||
The goal of papers is to replace the evince document viewer that exist
|
||||
on the GNOME Desktop with a more modern interface.
|
||||
'';
|
||||
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "papers";
|
||||
maintainers = teams.gnome.members;
|
||||
};
|
||||
})
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "promptfoo";
|
||||
version = "0.51.0";
|
||||
version = "0.53.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "promptfoo";
|
||||
repo = "promptfoo";
|
||||
rev = "${version}";
|
||||
hash = "sha256-M9NmSi8gij4nqWCvy9y7wXL76D2vzH2RzibP82XVTh4=";
|
||||
hash = "sha256-ATZn33w58IjSGptxDhW7CdcI++aX8gw3GlOLSdYk2T4=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-bBI87CYDm36MOm2mVMRwnq5n+3RM1AnKFaNX5NZSeaw=";
|
||||
npmDepsHash = "sha256-G7Fl66KPXRuHbdHCwaAqRO31Ff9VrzUWrq+XgGJFjtU=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 0eb70e4..8d81ba0 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -2069,7 +2069,7 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
|
||||
|
||||
[[package]]
|
||||
name = "tplay"
|
||||
-version = "0.4.4"
|
||||
+version = "0.4.5"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"crossbeam-channel",
|
||||
@@ -11,17 +11,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tplay";
|
||||
version = "0.4.5";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxcurzi";
|
||||
repo = "tplay";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qt5I5rel88NWJZ6dYLCp063PfVmGTzkUUKgF3JkhLQk=";
|
||||
hash = "sha256-/3ui0VOxf+kYfb0JQXPVbjAyXPph2LOg2xB0DGmAbwc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-0kHh7Wb9Dp+t2G9/Kz/3K43bQdFCl+q2Vc3W32koc2I=";
|
||||
cargoPatches = [ ./cargo.diff ];
|
||||
cargoHash = "sha256-zRkIEH37pvxHUbnfg25GW1Z7od9XMkRmP2Qvs64uUjg=";
|
||||
checkFlags = [
|
||||
# requires network access
|
||||
"--skip=pipeline::image_pipeline::tests::test_process"
|
||||
@@ -46,6 +45,6 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://github.com/maxcurzi/tplay";
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ demine ];
|
||||
maintainers = with lib.maintainers; [ demine colemickens ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitLab
|
||||
, meson
|
||||
, mesonEmulatorHook
|
||||
, ninja
|
||||
, pkg-config
|
||||
, gobject-introspection
|
||||
, vala
|
||||
, gtk-doc
|
||||
, docbook-xsl-nons
|
||||
, glib
|
||||
, libsoup_3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "uhttpmock";
|
||||
version = "0.10.0";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "pwithnall";
|
||||
repo = "uhttpmock";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-d3IVlPOLOLzlUDuGOLll8pOK5FMsXI/d2wbwPZ6WI34=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
gobject-introspection
|
||||
vala
|
||||
gtk-doc
|
||||
docbook-xsl-nons
|
||||
] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
|
||||
mesonEmulatorHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
glib
|
||||
libsoup_3
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Project for mocking web service APIs which use HTTP or HTTPS";
|
||||
homepage = "https://gitlab.freedesktop.org/pwithnall/uhttpmock/";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "zwave-js-server";
|
||||
version = "1.34.0";
|
||||
version = "1.35.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zwave-js";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-aTUV9FYE4m/f7rGv7BBFNzCVQpSO9vK1QkeofnMnbzM=";
|
||||
hash = "sha256-9TUS8m3Vizs36GVYaDQTRXPO8zLLJUs8RPkArRRCqsw=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-Jne4vzPcNNfHO1LQa609Jdv22Nh3md9KfBXuQoILpbY=";
|
||||
npmDepsHash = "sha256-zTcN04g7EsLFCA+rdqhSQMy06NoMFYCyiUxe9ck2kIE=";
|
||||
|
||||
# For some reason the zwave-js dependency is in devDependencies
|
||||
npmFlags = [ "--include=dev" ];
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-user-docs";
|
||||
version = "45.5";
|
||||
version = "46.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-dBZ/z0KgTZ5dPMEw0nvCA9h7aFzmBqhGdN8k4f9xnlQ=";
|
||||
hash = "sha256-qXKTy+63l+tPTRadcTu2WDvRLDeR4UAoPkNW0v4YCto=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -31,9 +31,6 @@ let
|
||||
document-font-name="Noto Sans 10"
|
||||
monospace-font-name="Hack 10"
|
||||
|
||||
[org.gnome.desktop.peripherals.touchpad:Budgie]
|
||||
tap-to-click=true
|
||||
|
||||
[org.gnome.desktop.wm.preferences:Budgie]
|
||||
titlebar-font="Noto Sans Bold 10"
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
, cjs
|
||||
, evolution-data-server
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, gdk-pixbuf
|
||||
, gettext
|
||||
, libgnomekbd
|
||||
@@ -83,6 +84,13 @@ stdenv.mkDerivation rec {
|
||||
patches = [
|
||||
./use-sane-install-dir.patch
|
||||
./libdir.patch
|
||||
|
||||
# Switch to GNOME Online Accounts GTK
|
||||
(fetchpatch {
|
||||
url = "https://github.com/linuxmint/cinnamon/commit/d22f889c376734f0ca5d904885c2772e790fbadc.patch";
|
||||
includes = [ "files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py" ];
|
||||
hash = "sha256-xutJqxtzk3/BUQGZY/tnBkRyAfZZY7AckaGC6b7Sfn8=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -140,13 +148,6 @@ stdenv.mkDerivation rec {
|
||||
pkg-config
|
||||
];
|
||||
|
||||
# Use locales from cinnamon-translations.
|
||||
# FIXME: Upstream does not respect localedir option from Meson currently.
|
||||
# https://github.com/linuxmint/cinnamon/pull/11244#issuecomment-1305855783
|
||||
postInstall = ''
|
||||
ln -s ${cinnamon-translations}/share/locale $out/share/locale
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
find . -type f -exec sed -i \
|
||||
-e s,/usr/share/cinnamon,$out/share/cinnamon,g \
|
||||
@@ -173,6 +174,18 @@ stdenv.mkDerivation rec {
|
||||
patchShebangs src/data-to-c.pl
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# Use locales from cinnamon-translations.
|
||||
ln -s ${cinnamon-translations}/share/locale $out/share/locale
|
||||
|
||||
# Do not install online accounts module, with a -Donlineaccounts=false c-c-c
|
||||
# this just shows an empty page.
|
||||
rm -f $out/share/cinnamon/cinnamon-settings/modules/cs_online_accounts.py
|
||||
|
||||
# g-o-a-gtk already provides its own desktop item.
|
||||
rm -f $out/share/applications/cinnamon-settings-online-accounts.desktop
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
# https://github.com/NixOS/nixpkgs/issues/101881
|
||||
gappsWrapperArgs+=(
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
, gtk3
|
||||
, libnotify
|
||||
, libxml2
|
||||
, gnome-online-accounts
|
||||
, colord
|
||||
, polkit
|
||||
, libxkbfile
|
||||
@@ -59,7 +58,6 @@ stdenv.mkDerivation rec {
|
||||
colord
|
||||
libgudev
|
||||
libwacom
|
||||
gnome-online-accounts
|
||||
tzdata
|
||||
networkmanager
|
||||
libnma
|
||||
@@ -85,6 +83,8 @@ stdenv.mkDerivation rec {
|
||||
mesonFlags = [
|
||||
# use locales from cinnamon-translations
|
||||
"--localedir=${cinnamon-translations}/share/locale"
|
||||
# https://github.com/linuxmint/cinnamon-control-center/issues/326
|
||||
"-Donlineaccounts=false"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -15,21 +15,22 @@
|
||||
, cpio
|
||||
, glib
|
||||
, gnome
|
||||
, gtk3
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, libhandy
|
||||
, json-glib
|
||||
, libarchive
|
||||
, libportal-gtk3
|
||||
, libportal-gtk4
|
||||
, nautilus
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "file-roller";
|
||||
version = "43.1";
|
||||
version = "44.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/file-roller/${lib.versions.major finalAttrs.version}/file-roller-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "hJlAI5lyk76zRdl5Pbj18Lu0H6oVXG/7SDKPIDlXrQg=";
|
||||
hash = "sha256-JQz1Uc/LEqZwyorflT4GgfHJt27gnZRYsgIDxiYCxIc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -48,11 +49,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [
|
||||
cpio
|
||||
glib
|
||||
gtk3
|
||||
gtk4
|
||||
libadwaita
|
||||
libhandy
|
||||
json-glib
|
||||
libarchive
|
||||
libportal-gtk3
|
||||
libportal-gtk4
|
||||
nautilus
|
||||
];
|
||||
|
||||
|
||||
@@ -22,13 +22,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ghex";
|
||||
version = "45.1";
|
||||
version = "46.0";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/ghex/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "+ysII80WJJ7b6u6DAvm9UAXgFQNos18eR8JmgMrKwvo=";
|
||||
hash = "sha256-ocRvMCDLNYuDIwJds6U5yX2ZSkxG9wH0jtxjV/f7y9E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -44,15 +44,16 @@
|
||||
, vte
|
||||
, glib-networking
|
||||
, qemu-utils
|
||||
, libportal-gtk3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-boxes";
|
||||
version = "45.0";
|
||||
version = "46.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "zGMIDu+hR6hHKrGl/wh7l6J6tyOk7gBe1B6Mndd5jkE=";
|
||||
hash = "sha256-kAwXf2diZANwpmNM+efTzYIH5Jg2eopmemtzGwQRYDY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -114,6 +115,7 @@ stdenv.mkDerivation rec {
|
||||
vte
|
||||
webkitgtk_4_1
|
||||
yajl
|
||||
libportal-gtk3
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
|
||||
@@ -21,11 +21,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-calendar";
|
||||
version = "45.1";
|
||||
version = "46.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "f6hQdUOGWqdDK7UxmDDIcVi1RHygnMpFtgfcZ5bHEAg=";
|
||||
hash = "sha256-mGH/e4q9W3sgaQulXrdULH7FNLVmJp4ptbHoWMFhCJc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -21,11 +21,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-characters";
|
||||
version = "45.0";
|
||||
version = "46.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "P9VPzBTSkbd//xLe7/8A2jg+CmQAr1B9FgX7y0m4x0E=";
|
||||
hash = "sha256-pOjixRC/SCBLmZSk581TeEQkbnTIqYb52+BOIj9dgnw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -25,11 +25,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-clocks";
|
||||
version = "45.0";
|
||||
version = "46.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "/I60/ZUw8eZB3ADuIIbufTVKegCwoNFyLjBdXJqrkbU=";
|
||||
hash = "sha256-6qPFeM3O+XVOZotWJnCbc/NSZxAjX0tyB20v9JpPmcc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
, vala
|
||||
, gettext
|
||||
, itstool
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
, wrapGAppsHook
|
||||
, glib
|
||||
@@ -22,11 +21,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-connections";
|
||||
version = "45.0";
|
||||
version = "46.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-ufq1JbkKPifRE8FvuGjCucR7+BSTENFNuGLqGRLAb7g=";
|
||||
hash = "sha256-+xzqaOeTC73B2yi3zQqaN80xDUtOeHL+gU9QoWqNJdM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -36,7 +35,6 @@ stdenv.mkDerivation rec {
|
||||
vala
|
||||
gettext
|
||||
itstool
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
glib # glib-compile-resources
|
||||
wrapGAppsHook
|
||||
|
||||
@@ -22,11 +22,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-logs";
|
||||
version = "45.beta";
|
||||
version = "45.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-logs/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "nbxJ/7J90jQuji/UmK8ltUENsjkQ/I7/XmiTrHa7jK4=";
|
||||
hash = "sha256-sooG6lyYvRfyhztQfwhbDKDemBATZhH08u6wmGFOzlI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -24,18 +24,19 @@
|
||||
, gjs
|
||||
, libadwaita
|
||||
, geocode-glib_2
|
||||
, tzdata
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-maps";
|
||||
version = "45.5";
|
||||
version = "46.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-maps/${lib.versions.major finalAttrs.version}/gnome-maps-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-HCD14Q3OaEre+ylhUmJmoiTmxGwW+gO5VK/6Czobt0A=";
|
||||
hash = "sha256-XyXul6DC/t+E8M8DkrTvi+GT4/bOJfl1RntvzsBUIa8=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
@@ -80,6 +81,19 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
preCheck = ''
|
||||
# “time.js” included by “timeTest” and “translationsTest” depends on “org.gnome.desktop.interface” schema.
|
||||
export XDG_DATA_DIRS="${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:$XDG_DATA_DIRS"
|
||||
export HOME=$(mktemp -d)
|
||||
export TZDIR=${tzdata}/share/zoneinfo
|
||||
|
||||
# Our gobject-introspection patches make the shared library paths absolute
|
||||
# in the GIR files. When running tests, the library is not yet installed,
|
||||
# though, so we need to replace the absolute path with a local one during build.
|
||||
# We are using a symlink that we will delete before installation.
|
||||
mkdir -p $out/lib/gnome-maps
|
||||
ln -s $PWD/lib/libgnome-maps.so.0 $out/lib/gnome-maps/libgnome-maps.so.0
|
||||
'';
|
||||
|
||||
postCheck = ''
|
||||
rm $out/lib/gnome-maps/libgnome-maps.so.0
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -30,13 +30,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "gnome-music";
|
||||
version = "45.1";
|
||||
version = "46.0";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "lZWc24AkRASNUKGpHELbiyUWWgpoUzvAOJXrNyxN3gs=";
|
||||
hash = "sha256-pFDVzgFokvavL4q3H8fDlDguIse2ILqSpuFc9mvF7F8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -18,21 +18,19 @@
|
||||
, libadwaita
|
||||
, editorconfig-core-c
|
||||
, libxml2
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-text-editor";
|
||||
version = "45.3";
|
||||
version = "46.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-8//LEakt/QS6PDs9DmZ4R9REmiHgEq428H3aBax9OlI=";
|
||||
hash = "sha256-jr+gvqEudfXv6sxyG+O4rmUCewJKqB257KuMMSJXous=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
itstool
|
||||
libxml2 # for xmllint
|
||||
|
||||
@@ -19,11 +19,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-weather";
|
||||
version = "45.0";
|
||||
version = "46.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "MMAClwKIPcjYFg5t4dYRaHfNbCW8lQ1OSQKmq0Z7L6Q=";
|
||||
hash = "sha256-FTgmcFzPZy4U8v5N/Hgvjom3xMvkqv6VpVMvveej1J0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -30,11 +30,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "polari";
|
||||
version = "45.0";
|
||||
version = "46.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "nbfdwJSqhVfxkXfhZMQti+Fn9UckuScTC3YhyCnB1KE=";
|
||||
hash = "sha256-0rFwnjeRiSlPU9TvFfA/i8u76MUvD0FeYvfV8Aw2CjE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -13,11 +13,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "adwaita-icon-theme";
|
||||
version = "45.0";
|
||||
version = "46.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "JEK/sG9ObMlb9uJoL9/5j6Xt3GiHUbnWIVxiPLTkL/E=";
|
||||
hash = "sha256-S8tTm9ddZNo4XW+gjLqp3erOtqyOgrhbpsQRF79bpk4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -18,11 +18,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "baobab";
|
||||
version = "45.0";
|
||||
version = "46.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "p9LPMIpsg57gsL8HT49f1g1iri8GSpSzxhDWVgt1joY=";
|
||||
hash = "sha256-zk3vXILQVnGlAJ9768+FrJhnXZ2BYNKK2RgbJppy43w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -36,11 +36,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "epiphany";
|
||||
version = "45.3";
|
||||
version = "46.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "bDAum91mKQyw4m9ihDzUxDWklVq9u08VHwfcgEldZzA=";
|
||||
hash = "sha256-9DSPLPUcB8DBBtEwFy1NI/LNQGh3Hh3gB7dYyireVmA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -42,13 +42,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evince";
|
||||
version = "45.0";
|
||||
version = "46.0";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0YZH1Cdcvd8NMoF7HQTjBzQqhb6RTsTa0tgIKq+KpKg=";
|
||||
hash = "sha256-r/avaTksBJVr+tl23sXRWDtB1aM06TeZX3w8oHQN4iE=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [
|
||||
|
||||
@@ -50,13 +50,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution-data-server";
|
||||
version = "3.50.4";
|
||||
version = "3.52.1";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-1+3/vgOgu87L7mc5MhS4McexjNiVuExNv+E4d3biV8U=";
|
||||
hash = "sha256-gls9fVRoRApn0R3SojkzlgwHue7MeXuxJYQ8sshwo0g=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -147,10 +147,6 @@ stdenv.mkDerivation rec {
|
||||
--replace "-Wl,--no-undefined" ""
|
||||
substituteInPlace src/services/evolution-alarm-notify/e-alarm-notify.c \
|
||||
--replace "G_OS_WIN32" "__APPLE__"
|
||||
'' + lib.optionalString stdenv.cc.isClang ''
|
||||
# https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/513
|
||||
substituteInPlace src/addressbook/libebook-contacts/e-phone-number-private.cpp \
|
||||
--replace "std::auto_ptr" "std::unique_ptr"
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/src/addressbook/libebook/e-book-client.c b/src/addressbook/libebook/e-book-client.c
|
||||
index bd479d8..bd049b3 100644
|
||||
index 5e65ec8..8ca28c6 100644
|
||||
--- a/src/addressbook/libebook/e-book-client.c
|
||||
+++ b/src/addressbook/libebook/e-book-client.c
|
||||
@@ -1997,7 +1997,18 @@ e_book_client_get_self (ESourceRegistry *registry,
|
||||
@@ -1924,7 +1924,18 @@ e_book_client_get_self (ESourceRegistry *registry,
|
||||
|
||||
*out_client = book_client;
|
||||
|
||||
@@ -22,7 +22,7 @@ index bd479d8..bd049b3 100644
|
||||
uid = g_settings_get_string (settings, SELF_UID_KEY);
|
||||
g_object_unref (settings);
|
||||
|
||||
@@ -2065,7 +2076,18 @@ e_book_client_set_self (EBookClient *client,
|
||||
@@ -1992,7 +2003,18 @@ e_book_client_set_self (EBookClient *client,
|
||||
g_return_val_if_fail (
|
||||
e_contact_get_const (contact, E_CONTACT_UID) != NULL, FALSE);
|
||||
|
||||
@@ -42,7 +42,7 @@ index bd479d8..bd049b3 100644
|
||||
g_settings_set_string (
|
||||
settings, SELF_UID_KEY,
|
||||
e_contact_get_const (contact, E_CONTACT_UID));
|
||||
@@ -2101,8 +2123,18 @@ e_book_client_is_self (EContact *contact)
|
||||
@@ -2028,8 +2050,18 @@ e_book_client_is_self (EContact *contact)
|
||||
* unfortunately the API doesn't allow that.
|
||||
*/
|
||||
g_mutex_lock (&mutex);
|
||||
@@ -128,7 +128,7 @@ index e85a56b..59d3fe2 100644
|
||||
g_object_unref (settings);
|
||||
|
||||
diff --git a/src/addressbook/libedata-book/e-book-meta-backend.c b/src/addressbook/libedata-book/e-book-meta-backend.c
|
||||
index 63e1016..0492756 100644
|
||||
index 5b4debf..77c8d9c 100644
|
||||
--- a/src/addressbook/libedata-book/e-book-meta-backend.c
|
||||
+++ b/src/addressbook/libedata-book/e-book-meta-backend.c
|
||||
@@ -144,7 +144,18 @@ ebmb_is_power_saver_enabled (void)
|
||||
@@ -152,10 +152,10 @@ index 63e1016..0492756 100644
|
||||
if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) {
|
||||
GPowerProfileMonitor *power_monitor;
|
||||
diff --git a/src/calendar/backends/contacts/e-cal-backend-contacts.c b/src/calendar/backends/contacts/e-cal-backend-contacts.c
|
||||
index 42f3457..b4926af 100644
|
||||
index 43bd383..4dce824 100644
|
||||
--- a/src/calendar/backends/contacts/e-cal-backend-contacts.c
|
||||
+++ b/src/calendar/backends/contacts/e-cal-backend-contacts.c
|
||||
@@ -1387,7 +1387,18 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc)
|
||||
@@ -1369,7 +1369,18 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc)
|
||||
(GDestroyNotify) g_free,
|
||||
(GDestroyNotify) contact_record_free);
|
||||
|
||||
@@ -202,10 +202,10 @@ index 2525856..7ecc1a8 100644
|
||||
g_clear_object (&settings);
|
||||
}
|
||||
diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c
|
||||
index ade0a73..d7c3e73 100644
|
||||
index 44ba49c..dfac2a2 100644
|
||||
--- a/src/calendar/libecal/e-reminder-watcher.c
|
||||
+++ b/src/calendar/libecal/e-reminder-watcher.c
|
||||
@@ -2626,8 +2626,33 @@ e_reminder_watcher_init (EReminderWatcher *watcher)
|
||||
@@ -2826,8 +2826,33 @@ e_reminder_watcher_init (EReminderWatcher *watcher)
|
||||
|
||||
watcher->priv = e_reminder_watcher_get_instance_private (watcher);
|
||||
watcher->priv->cancellable = g_cancellable_new ();
|
||||
@@ -242,7 +242,7 @@ index ade0a73..d7c3e73 100644
|
||||
g_signal_connect_object (
|
||||
watcher->priv->desktop_settings,
|
||||
diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.c b/src/calendar/libedata-cal/e-cal-meta-backend.c
|
||||
index 27fa153..3679d72 100644
|
||||
index b9145af..350fcd3 100644
|
||||
--- a/src/calendar/libedata-cal/e-cal-meta-backend.c
|
||||
+++ b/src/calendar/libedata-cal/e-cal-meta-backend.c
|
||||
@@ -156,7 +156,18 @@ ecmb_is_power_saver_enabled (void)
|
||||
@@ -265,7 +265,7 @@ index 27fa153..3679d72 100644
|
||||
|
||||
if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) {
|
||||
GPowerProfileMonitor *power_monitor;
|
||||
@@ -2633,7 +2644,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend,
|
||||
@@ -2632,7 +2643,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend,
|
||||
if (is_declined) {
|
||||
GSettings *settings;
|
||||
|
||||
@@ -288,7 +288,7 @@ index 27fa153..3679d72 100644
|
||||
g_clear_object (&settings);
|
||||
}
|
||||
diff --git a/src/camel/camel-cipher-context.c b/src/camel/camel-cipher-context.c
|
||||
index bef9188..ce92f6c 100644
|
||||
index d5a0823..2ae03f8 100644
|
||||
--- a/src/camel/camel-cipher-context.c
|
||||
+++ b/src/camel/camel-cipher-context.c
|
||||
@@ -1631,7 +1631,18 @@ camel_cipher_can_load_photos (void)
|
||||
@@ -312,7 +312,7 @@ index bef9188..ce92f6c 100644
|
||||
g_clear_object (&settings);
|
||||
|
||||
diff --git a/src/camel/camel-gpg-context.c b/src/camel/camel-gpg-context.c
|
||||
index 4deae76..ebe0a1b 100644
|
||||
index cecd740..9a15180 100644
|
||||
--- a/src/camel/camel-gpg-context.c
|
||||
+++ b/src/camel/camel-gpg-context.c
|
||||
@@ -747,7 +747,18 @@ gpg_ctx_get_executable_name (void)
|
||||
@@ -361,10 +361,10 @@ index e61160c..b6553a4 100644
|
||||
G_CALLBACK (mi_user_headers_settings_changed_cb), NULL);
|
||||
G_UNLOCK (mi_user_headers);
|
||||
diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c
|
||||
index 8518c90..6a655a9 100644
|
||||
index bbf214b..bed39d2 100644
|
||||
--- a/src/camel/providers/imapx/camel-imapx-server.c
|
||||
+++ b/src/camel/providers/imapx/camel-imapx-server.c
|
||||
@@ -5627,7 +5627,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder)
|
||||
@@ -5661,7 +5661,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder)
|
||||
if (do_old_flags_update) {
|
||||
GSettings *eds_settings;
|
||||
|
||||
@@ -433,10 +433,10 @@ index 188f276..939f89b 100644
|
||||
settings, "network-monitor-gio-name",
|
||||
object, "gio-name",
|
||||
diff --git a/src/libedataserver/e-oauth2-service-google.c b/src/libedataserver/e-oauth2-service-google.c
|
||||
index ec08afe..7b31227 100644
|
||||
index 1453410..a3f06b0 100644
|
||||
--- a/src/libedataserver/e-oauth2-service-google.c
|
||||
+++ b/src/libedataserver/e-oauth2-service-google.c
|
||||
@@ -71,7 +71,18 @@ eos_google_read_settings (EOAuth2Service *service,
|
||||
@@ -72,7 +72,18 @@ eos_google_read_settings (EOAuth2Service *service,
|
||||
if (!value) {
|
||||
GSettings *settings;
|
||||
|
||||
@@ -529,10 +529,10 @@ index af59b0b..0c7e75e 100644
|
||||
g_object_unref (settings);
|
||||
|
||||
diff --git a/src/libedataserver/e-source-registry.c b/src/libedataserver/e-source-registry.c
|
||||
index 4a9b398..e7cb404 100644
|
||||
index 1539f8b..77cf123 100644
|
||||
--- a/src/libedataserver/e-source-registry.c
|
||||
+++ b/src/libedataserver/e-source-registry.c
|
||||
@@ -1773,7 +1773,19 @@ e_source_registry_init (ESourceRegistry *registry)
|
||||
@@ -1754,7 +1754,19 @@ e_source_registry_init (ESourceRegistry *registry)
|
||||
|
||||
g_mutex_init (®istry->priv->sources_lock);
|
||||
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
, ninja
|
||||
, pkg-config
|
||||
, glib
|
||||
, json-glib
|
||||
, itstool
|
||||
, xorg
|
||||
, accountsservice
|
||||
@@ -42,13 +43,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gdm";
|
||||
version = "45.0.1";
|
||||
version = "46.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gdm/${lib.versions.major finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "ZXJXjAXjxladbtJp994qrzoDVldlRYbYJDkHu3pv+oU=";
|
||||
hash = "sha256-jWy1IXbspItrvxz+L9rgjZZ3taDyvKYA3uRgTeDdHvw=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
@@ -76,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
accountsservice
|
||||
audit
|
||||
glib
|
||||
json-glib
|
||||
gtk3
|
||||
keyutils
|
||||
libX11
|
||||
@@ -94,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/92
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gdm/-/commit/ccecd9c975d04da80db4cd547b67a1a94fa83292.patch";
|
||||
sha256 = "5hKS9wjjhuSAYwXct5vS0dPbmPRIINJoLC0Zm1naz6Q=";
|
||||
hash = "sha256-5hKS9wjjhuSAYwXct5vS0dPbmPRIINJoLC0Zm1naz6Q=";
|
||||
revert = true;
|
||||
})
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c
|
||||
index 5fbbad68..739718ec 100644
|
||||
index f2d8e155b..54b998826 100644
|
||||
--- a/daemon/gdm-local-display-factory.c
|
||||
+++ b/daemon/gdm-local-display-factory.c
|
||||
@@ -233,9 +233,9 @@ struct GdmDisplayServerConfiguration {
|
||||
@@ -245,9 +245,9 @@ struct GdmDisplayServerConfiguration {
|
||||
const char *session_type;
|
||||
} display_server_configuration[] = {
|
||||
#ifdef ENABLE_WAYLAND_SUPPORT
|
||||
@@ -15,10 +15,10 @@ index 5fbbad68..739718ec 100644
|
||||
};
|
||||
|
||||
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
|
||||
index cc61efc9..4c9d15af 100644
|
||||
index fc5aef6ac..c61e0046b 100644
|
||||
--- a/daemon/gdm-manager.c
|
||||
+++ b/daemon/gdm-manager.c
|
||||
@@ -148,7 +148,7 @@ plymouth_is_running (void)
|
||||
@@ -151,7 +151,7 @@ plymouth_is_running (void)
|
||||
GError *error;
|
||||
|
||||
error = NULL;
|
||||
@@ -27,7 +27,7 @@ index cc61efc9..4c9d15af 100644
|
||||
NULL, NULL, &status, &error);
|
||||
if (! res) {
|
||||
g_debug ("Could not ping plymouth: %s", error->message);
|
||||
@@ -166,7 +166,7 @@ plymouth_prepare_for_transition (void)
|
||||
@@ -169,7 +169,7 @@ plymouth_prepare_for_transition (void)
|
||||
GError *error;
|
||||
|
||||
error = NULL;
|
||||
@@ -36,7 +36,7 @@ index cc61efc9..4c9d15af 100644
|
||||
NULL, NULL, NULL, &error);
|
||||
if (! res) {
|
||||
g_warning ("Could not deactivate plymouth: %s", error->message);
|
||||
@@ -181,7 +181,7 @@ plymouth_quit_with_transition (void)
|
||||
@@ -184,7 +184,7 @@ plymouth_quit_with_transition (void)
|
||||
GError *error;
|
||||
|
||||
error = NULL;
|
||||
@@ -45,7 +45,7 @@ index cc61efc9..4c9d15af 100644
|
||||
if (! res) {
|
||||
g_warning ("Could not quit plymouth: %s", error->message);
|
||||
g_error_free (error);
|
||||
@@ -197,7 +197,7 @@ plymouth_quit_without_transition (void)
|
||||
@@ -200,7 +200,7 @@ plymouth_quit_without_transition (void)
|
||||
GError *error;
|
||||
|
||||
error = NULL;
|
||||
@@ -55,10 +55,10 @@ index cc61efc9..4c9d15af 100644
|
||||
g_warning ("Could not quit plymouth: %s", error->message);
|
||||
g_error_free (error);
|
||||
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
|
||||
index 4b709731..245ac0cf 100644
|
||||
index a4c4b2dcf..67416b204 100644
|
||||
--- a/daemon/gdm-session.c
|
||||
+++ b/daemon/gdm-session.c
|
||||
@@ -2972,16 +2972,16 @@ gdm_session_start_session (GdmSession *self,
|
||||
@@ -3193,16 +3193,16 @@ gdm_session_start_session (GdmSession *self,
|
||||
*/
|
||||
if (run_launcher) {
|
||||
if (is_x11) {
|
||||
@@ -79,7 +79,7 @@ index 4b709731..245ac0cf 100644
|
||||
}
|
||||
}
|
||||
diff --git a/data/gdm.service.in b/data/gdm.service.in
|
||||
index 17e8a8de..afc70977 100644
|
||||
index 17e8a8de8..afc709778 100644
|
||||
--- a/data/gdm.service.in
|
||||
+++ b/data/gdm.service.in
|
||||
@@ -26,7 +26,7 @@ Restart=always
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-backgrounds";
|
||||
version = "45.0";
|
||||
version = "46.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "zuDmiPuuXvenXzNa2i0Qd54I68qURfFYbeMsWptt7i0=";
|
||||
hash = "sha256-Td06xDmkoGeHaAWSG7dfTTyLhaIY1Hwnbd3eiShEPC4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -27,14 +27,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-bluetooth";
|
||||
version = "42.8";
|
||||
version = "46.0";
|
||||
|
||||
# TODO: split out "lib"
|
||||
outputs = [ "out" "dev" "devdoc" "man" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "dsJB6MosmxA1NkU1yiYIT4n8XA4YKVEPiQlYMRX8wts=";
|
||||
hash = "sha256-E/4edfMXrNvfXoDJAp0uBjLWCpzPcqQ64263VFAh++8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, appstream
|
||||
, meson
|
||||
, ninja
|
||||
, vala
|
||||
@@ -24,14 +25,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-calculator";
|
||||
version = "45.0.2";
|
||||
version = "46.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "fcvzI4SJcXHL5Ug+xmTZlOXnVekSrh35EWJPA8kIZ8I=";
|
||||
hash = "sha256-RGlP2mtiM5I/XBCkjQLSz1ck4BGoqFeJB0yVMQHzO/E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
|
||||
@@ -58,6 +58,7 @@ stdenv.mkDerivation rec {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "gnome.${pname}";
|
||||
freeze = true;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
, gtk4
|
||||
, glib
|
||||
, libportal-gtk4
|
||||
, gnome-desktop
|
||||
, gnome-online-accounts
|
||||
, qrencode
|
||||
, wrapGAppsHook4
|
||||
@@ -27,11 +26,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-contacts";
|
||||
version = "45.1";
|
||||
version = "46.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "gj9WCe7NkMQk3T5khXKHvBMh+23+KJJKR0/w6azyG3U=";
|
||||
hash = "sha256-cK606DWhx3+bzH5XotzCN22TvbYXVxYYJXRF9WxjcN8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -54,7 +53,6 @@ stdenv.mkDerivation rec {
|
||||
evolution-data-server-gtk4
|
||||
gsettings-desktop-schemas
|
||||
folks
|
||||
gnome-desktop
|
||||
libadwaita
|
||||
libxml2
|
||||
gnome-online-accounts
|
||||
|
||||
@@ -7,13 +7,14 @@
|
||||
, colord
|
||||
, colord-gtk4
|
||||
, cups
|
||||
, dbus
|
||||
, docbook-xsl-nons
|
||||
, fontconfig
|
||||
, gdk-pixbuf
|
||||
, gettext
|
||||
, glib
|
||||
, glib-networking
|
||||
, gcr
|
||||
, gcr_4
|
||||
, glibc
|
||||
, gnome-bluetooth
|
||||
, gnome-color-manager
|
||||
@@ -37,7 +38,9 @@
|
||||
, librsvg
|
||||
, webp-pixbuf-loader
|
||||
, libsecret
|
||||
, libsoup_3
|
||||
, libwacom
|
||||
, libXi
|
||||
, libxml2
|
||||
, libxslt
|
||||
, meson
|
||||
@@ -69,11 +72,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-control-center";
|
||||
version = "45.3";
|
||||
version = "46.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "sha256-selJxOhsBiTsam7Q3wnJ+uKyKYPB3KYO2GrsjvCyQAQ=";
|
||||
hash = "sha256-gXkkIwGd7aHSoHTB7Pan5u8xcsCcvm9NeZWktd6igxI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -102,12 +105,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
adwaita-icon-theme
|
||||
colord
|
||||
colord-gtk4
|
||||
libepoxy
|
||||
cups
|
||||
fontconfig
|
||||
gdk-pixbuf
|
||||
glib
|
||||
glib-networking
|
||||
gcr
|
||||
gcr_4
|
||||
gnome-bluetooth
|
||||
gnome-desktop
|
||||
gnome-online-accounts
|
||||
@@ -119,6 +122,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
gsound
|
||||
gtk4
|
||||
ibus
|
||||
libepoxy
|
||||
libgtop
|
||||
libgudev
|
||||
libadwaita
|
||||
@@ -128,7 +132,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libpwquality
|
||||
librsvg
|
||||
libsecret
|
||||
libsoup_3
|
||||
libwacom
|
||||
libXi
|
||||
libxml2
|
||||
modemmanager
|
||||
mutter # schemas for the keybindings
|
||||
@@ -146,6 +152,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]);
|
||||
|
||||
nativeCheckInputs = [
|
||||
dbus
|
||||
python3.pkgs.python-dbusmock
|
||||
setxkbmap
|
||||
xvfb-run
|
||||
|
||||
@@ -37,10 +37,10 @@ index f6c84e3d2..cd897f8f5 100644
|
||||
gtk_widget_set_sensitive (self->toolbutton_profile_view, TRUE);
|
||||
else
|
||||
gtk_widget_set_sensitive (self->toolbutton_profile_view, FALSE);
|
||||
diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h
|
||||
diff --git a/panels/system/datetime/tz.h b/panels/system/datetime/tz.h
|
||||
index feef16580..4b88ef7b1 100644
|
||||
--- a/panels/datetime/tz.h
|
||||
+++ b/panels/datetime/tz.h
|
||||
--- a/panels/system/datetime/tz.h
|
||||
+++ b/panels/system/datetime/tz.h
|
||||
@@ -27,11 +27,7 @@
|
||||
|
||||
G_BEGIN_DECLS
|
||||
@@ -67,37 +67,6 @@ index ec5a905a5..689fdbebe 100644
|
||||
|
||||
if (self->is_new_connection) {
|
||||
g_autofree gchar *type_str = NULL;
|
||||
diff --git a/panels/network/net-device-bluetooth.c b/panels/network/net-device-bluetooth.c
|
||||
index 303f4a8af..e5afc4dff 100644
|
||||
--- a/panels/network/net-device-bluetooth.c
|
||||
+++ b/panels/network/net-device-bluetooth.c
|
||||
@@ -80,7 +80,7 @@ nm_device_bluetooth_refresh_ui (NetDeviceBluetooth *self)
|
||||
update_off_switch_from_device_state (self->device_off_switch, state, self);
|
||||
|
||||
/* set up the Options button */
|
||||
- path = g_find_program_in_path ("nm-connection-editor");
|
||||
+ path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor");
|
||||
gtk_widget_set_visible (GTK_WIDGET (self->options_button), state != NM_DEVICE_STATE_UNMANAGED && path != NULL);
|
||||
}
|
||||
|
||||
@@ -131,7 +131,7 @@ options_button_clicked_cb (NetDeviceBluetooth *self)
|
||||
|
||||
connection = net_device_get_find_connection (self->client, self->device);
|
||||
uuid = nm_connection_get_uuid (connection);
|
||||
- cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid);
|
||||
+ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit %s", uuid);
|
||||
g_debug ("Launching '%s'\n", cmdline);
|
||||
if (!g_spawn_command_line_async (cmdline, &error))
|
||||
g_warning ("Failed to launch nm-connection-editor: %s", error->message);
|
||||
@@ -173,7 +173,7 @@ net_device_bluetooth_init (NetDeviceBluetooth *self)
|
||||
|
||||
gtk_widget_init_template (GTK_WIDGET (self));
|
||||
|
||||
- path = g_find_program_in_path ("nm-connection-editor");
|
||||
+ path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor");
|
||||
gtk_widget_set_visible (GTK_WIDGET (self->options_button), path != NULL);
|
||||
}
|
||||
|
||||
diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobile.c
|
||||
index 166670224..36f720d36 100644
|
||||
--- a/panels/network/net-device-mobile.c
|
||||
@@ -133,10 +102,10 @@ index a31a606e3..ed5133d29 100644
|
||||
argv[1] = g_strdup (priv->hostname);
|
||||
|
||||
/* Use SNMP to get printer's informations */
|
||||
diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c
|
||||
diff --git a/panels/system/users/run-passwd.c b/panels/system/users/run-passwd.c
|
||||
index edbc99830..1e1d90141 100644
|
||||
--- a/panels/user-accounts/run-passwd.c
|
||||
+++ b/panels/user-accounts/run-passwd.c
|
||||
--- a/panels/system/users/run-passwd.c
|
||||
+++ b/panels/system/users/run-passwd.c
|
||||
@@ -152,7 +152,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error)
|
||||
gchar **envp;
|
||||
gint my_stdin, my_stdout;
|
||||
@@ -146,10 +115,10 @@ index edbc99830..1e1d90141 100644
|
||||
argv[1] = NULL;
|
||||
|
||||
envp = g_get_environ ();
|
||||
diff --git a/panels/user-accounts/user-utils.c b/panels/user-accounts/user-utils.c
|
||||
diff --git a/panels/system/users/user-utils.c b/panels/system/users/user-utils.c
|
||||
index 5b7bc1f02..13ffe6ca8 100644
|
||||
--- a/panels/user-accounts/user-utils.c
|
||||
+++ b/panels/user-accounts/user-utils.c
|
||||
--- a/panels/system/users/user-utils.c
|
||||
+++ b/panels/system/users/user-utils.c
|
||||
@@ -215,7 +215,7 @@ is_valid_username_async (const gchar *username,
|
||||
* future, so it would be nice to have some official way for this
|
||||
* instead of relying on the current "--login" implementation.
|
||||
|
||||
@@ -27,11 +27,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-disk-utility";
|
||||
version = "45.1";
|
||||
version = "46.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-VA/07JprljAAP/TNYNYk85/nDyWpVZ5TMziWA8hblSk=";
|
||||
hash = "sha256-RkZJFIxtZ3HxrC6/5DpOUZIFsRwtkUoJ8qABgh0GlX0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -18,11 +18,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-font-viewer";
|
||||
version = "45.0";
|
||||
version = "46.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "l8traN2mDeCrMDg4NYbx5LwdpaSPRAJb1rvnTqBcKwg=";
|
||||
hash = "sha256-WS9AHkhdAswETUh7tcjgTJYdpoViFnaKWfH/mL0tU3w=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@@ -16,14 +16,11 @@
|
||||
, geocode-glib_2
|
||||
, glib
|
||||
, gnome-desktop
|
||||
, gnome-online-accounts
|
||||
, gtk3
|
||||
, gtk4
|
||||
, libgweather
|
||||
, json-glib
|
||||
, krb5
|
||||
, libpwquality
|
||||
, librest_1_0
|
||||
, libsecret
|
||||
, networkmanager
|
||||
, pango
|
||||
@@ -39,11 +36,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-initial-setup";
|
||||
version = "45.4.1";
|
||||
version = "46.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "Nj4JqjMI5/QHTgZiU6AYKzIqtgN2dD3heLu0AOVLqO4=";
|
||||
hash = "sha256-+O6dzqfjXnNeqjvI0QQdBrtk6/HhBG5ejkjx+0QVGEc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -72,9 +69,7 @@ stdenv.mkDerivation rec {
|
||||
geocode-glib_2
|
||||
glib
|
||||
gnome-desktop
|
||||
gnome-online-accounts
|
||||
gsettings-desktop-schemas
|
||||
gtk3
|
||||
gtk4
|
||||
json-glib
|
||||
krb5
|
||||
@@ -82,7 +77,6 @@ stdenv.mkDerivation rec {
|
||||
libadwaita
|
||||
libnma-gtk4
|
||||
libpwquality
|
||||
librest_1_0
|
||||
libsecret
|
||||
networkmanager
|
||||
pango
|
||||
|
||||
@@ -24,13 +24,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-keyring";
|
||||
version = "42.1";
|
||||
version = "46.1";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-keyring/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "x/TQQMx2prf+Z+CO+RBpEcPIDUD8iMv8jiaEpMlG4+Y=";
|
||||
hash = "sha256-sdOukTL/L4s/JaGQeQiSlo49Cs+VKkh+QPZEqFUM4/Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -60,6 +60,9 @@ stdenv.mkDerivation rec {
|
||||
configureFlags = [
|
||||
"--with-pkcs11-config=${placeholder "out"}/etc/pkcs11/" # installation directories
|
||||
"--with-pkcs11-modules=${placeholder "out"}/lib/pkcs11/"
|
||||
# gnome-keyring doesn't build with ssh-agent by default anymore, we need to
|
||||
# switch to using gcr https://github.com/NixOS/nixpkgs/issues/140824
|
||||
"--enable-ssh-agent"
|
||||
];
|
||||
|
||||
# Tends to fail non-deterministically.
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{ lib, stdenv
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, cairo
|
||||
, meson
|
||||
@@ -16,22 +17,24 @@
|
||||
, systemd
|
||||
, libsecret
|
||||
, libnotify
|
||||
, libopus
|
||||
, libxkbcommon
|
||||
, gdk-pixbuf
|
||||
, freerdp
|
||||
, freerdp3
|
||||
, fdk_aac
|
||||
, tpm2-tss
|
||||
, fuse3
|
||||
, gnome
|
||||
, polkit
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-remote-desktop";
|
||||
version = "45.1";
|
||||
version = "46.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-3NnBisIwZpVjH88AqIZFw443DroFxp3zn1QCBNTq/Y0=";
|
||||
hash = "sha256-fGKkKB/fqVIhEK/7910JlzA18q3H+kV3UR1zMYa+to8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -45,7 +48,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
cairo
|
||||
freerdp
|
||||
freerdp3
|
||||
fdk_aac
|
||||
tpm2-tss
|
||||
fuse3
|
||||
@@ -56,15 +59,23 @@ stdenv.mkDerivation rec {
|
||||
libdrm
|
||||
nv-codec-headers-11
|
||||
libnotify
|
||||
libopus
|
||||
libsecret
|
||||
libxkbcommon
|
||||
pipewire
|
||||
systemd
|
||||
polkit # For polkit-gobject
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dconf_dir=/etc/gnome-remote-desktop"
|
||||
"-Dsystemd_user_unit_dir=${placeholder "out"}/lib/systemd/user"
|
||||
"-Dsystemd_system_unit_dir=${placeholder "out"}/lib/systemd/system"
|
||||
"-Dsystemd_sysusers_dir=${placeholder "out"}/lib/sysusers.d"
|
||||
"-Dsystemd_tmpfiles_dir=${placeholder "out"}/lib/tmpfiles.d"
|
||||
"-Dtests=false" # Too deep of a rabbit hole.
|
||||
# TODO: investigate who should be fixed here.
|
||||
"-Dc_args=-I${freerdp3}/include/winpr3"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -30,13 +30,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-session";
|
||||
# Also bump ./ctl.nix when bumping major version.
|
||||
version = "45.0";
|
||||
version = "46.0";
|
||||
|
||||
outputs = [ "out" "sessions" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-session/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "cG0v/KysOFU6PAGFeT9aK0qslAu154nZU8mAgWO+8vE=";
|
||||
hash = "sha256-xuFiSvYJC8ThoZH+Imir+nqN4HgxynpX8hfmeb97mlQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -76,11 +76,6 @@ stdenv.mkDerivation rec {
|
||||
libepoxy
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dsystemd=true"
|
||||
"-Dsystemd_session=default"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson_post_install.py # patchShebangs requires executable file
|
||||
patchShebangs meson_post_install.py
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user