mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
Merge 6e7f01b46b into haskell-updates
This commit is contained in:
nixpkgs-ci[bot]
GitHub
commit
6dd4da168b
177 changed files with 2786 additions and 1953 deletions
|
|
@ -62,6 +62,8 @@
|
|||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
- `super-productivity` has been updated. The binary has been renamed from `super-productivity` to `superproductivity`. A symlink from the old name is provided for backward compatibility.
|
||||
|
||||
- Package-URL (PURL, https://github.com/package-url/purl-spec) metadata identifier has been added for `fetchgit`, `fetchpypi` and `fetchFromGithub` fetchers.
|
||||
`mkDerivation` has been adjusted to reuse this information.
|
||||
Package-URLs allow reliably identifying and locating software packages.
|
||||
|
|
|
|||
|
|
@ -846,12 +846,6 @@
|
|||
githubId = 207841739;
|
||||
name = "Savchenko Dmitriy";
|
||||
};
|
||||
aherrmann = {
|
||||
email = "andreash87@gmx.ch";
|
||||
github = "aherrmann";
|
||||
githubId = 732652;
|
||||
name = "Andreas Herrmann";
|
||||
};
|
||||
ahirner = {
|
||||
email = "a.hirner+nixpkgs@gmail.com";
|
||||
github = "ahirner";
|
||||
|
|
@ -5720,6 +5714,12 @@
|
|||
githubId = 6821729;
|
||||
github = "criyle";
|
||||
};
|
||||
crmne = {
|
||||
email = "carmine@paolino.me";
|
||||
github = "crmne";
|
||||
githubId = 106617;
|
||||
name = "Carmine Paolino";
|
||||
};
|
||||
croissong = {
|
||||
email = "jan.moeller0@pm.me";
|
||||
name = "Jan Möller";
|
||||
|
|
@ -8396,12 +8396,6 @@
|
|||
{ fingerprint = "2E51 F618 39D1 FA94 7A73 00C2 34C0 4305 D581 DBFE"; }
|
||||
];
|
||||
};
|
||||
ethercrow = {
|
||||
email = "ethercrow@gmail.com";
|
||||
github = "ethercrow";
|
||||
githubId = 222467;
|
||||
name = "Dmitry Ivanov";
|
||||
};
|
||||
ethindp = {
|
||||
name = "Ethin Probst";
|
||||
email = "harlydavidsen@gmail.com";
|
||||
|
|
@ -16375,6 +16369,12 @@
|
|||
githubId = 80571430;
|
||||
name = "Luminar Leaf";
|
||||
};
|
||||
luna-the-tuna = {
|
||||
email = "contact@luna.fish";
|
||||
github = "luna-the-tuna";
|
||||
githubId = 112084382;
|
||||
name = "Luna Heyman";
|
||||
};
|
||||
luna_1024 = {
|
||||
email = "contact@luna.computer";
|
||||
github = "luna-1024";
|
||||
|
|
@ -17532,12 +17532,6 @@
|
|||
githubId = 9051309;
|
||||
name = "Maximilian Bode";
|
||||
};
|
||||
mboes = {
|
||||
email = "mboes@tweag.net";
|
||||
github = "mboes";
|
||||
githubId = 51356;
|
||||
name = "Mathieu Boespflug";
|
||||
};
|
||||
mBornand = {
|
||||
email = "dev.mbornand@systemb.ch";
|
||||
github = "mBornand";
|
||||
|
|
@ -28252,12 +28246,6 @@
|
|||
githubId = 38566841;
|
||||
name = "Anthony Butt";
|
||||
};
|
||||
toodeluna = {
|
||||
email = "luna@toodeluna.net";
|
||||
github = "toodeluna";
|
||||
githubId = 112084382;
|
||||
name = "Luna Heyman";
|
||||
};
|
||||
toonn = {
|
||||
email = "nixpkgs@toonn.io";
|
||||
matrix = "@toonn:matrix.org";
|
||||
|
|
@ -30542,12 +30530,6 @@
|
|||
githubId = 1742643;
|
||||
name = "Ravi Peters";
|
||||
};
|
||||
ylecornec = {
|
||||
email = "yves.stan.lecornec@tweag.io";
|
||||
github = "ylecornec";
|
||||
githubId = 5978566;
|
||||
name = "Yves-Stan Le Cornec";
|
||||
};
|
||||
ylh = {
|
||||
email = "nixpkgs@ylh.io";
|
||||
github = "ylh";
|
||||
|
|
|
|||
|
|
@ -13,9 +13,9 @@
|
|||
path ? null,
|
||||
max-workers ? null,
|
||||
include-overlays ? false,
|
||||
keep-going ? null,
|
||||
commit ? null,
|
||||
skip-prompt ? null,
|
||||
keep-going ? false,
|
||||
commit ? false,
|
||||
skip-prompt ? false,
|
||||
order ? null,
|
||||
}:
|
||||
|
||||
|
|
@ -206,18 +206,18 @@ let
|
|||
|
||||
to increase the number of jobs in parallel, or
|
||||
|
||||
--argstr keep-going true
|
||||
--arg keep-going true
|
||||
|
||||
to continue running when a single update fails.
|
||||
|
||||
You can also make the updater automatically commit on your behalf from updateScripts
|
||||
that support it by adding
|
||||
|
||||
--argstr commit true
|
||||
--arg commit true
|
||||
|
||||
to skip prompt:
|
||||
To skip the prompt, you can add
|
||||
|
||||
--argstr skip-prompt true
|
||||
--arg skip-prompt true
|
||||
|
||||
By default, the updater will update the packages in arbitrary order. Alternately, you can force a specific order based on the packages’ dependency relations:
|
||||
|
||||
|
|
@ -250,11 +250,15 @@ let
|
|||
# JSON file with data for update.py.
|
||||
packagesJson = pkgs.writeText "packages.json" (builtins.toJSON (map packageData packages));
|
||||
|
||||
# Allow boolean arguments to be provided with either --arg or --argstr.
|
||||
# The ability to use the string "true" will be deprecated.
|
||||
isTrue = arg: arg == true || arg == "true";
|
||||
|
||||
optionalArgs =
|
||||
lib.optional (max-workers != null) "--max-workers=${max-workers}"
|
||||
++ lib.optional (keep-going == "true") "--keep-going"
|
||||
++ lib.optional (commit == "true") "--commit"
|
||||
++ lib.optional (skip-prompt == "true") "--skip-prompt"
|
||||
++ lib.optional (isTrue keep-going) "--keep-going"
|
||||
++ lib.optional (isTrue commit) "--commit"
|
||||
++ lib.optional (isTrue skip-prompt) "--skip-prompt"
|
||||
++ lib.optional (order != null) "--order=${order}";
|
||||
|
||||
args = [ packagesJson ] ++ optionalArgs;
|
||||
|
|
|
|||
|
|
@ -68,11 +68,8 @@ with lib.maintainers;
|
|||
|
||||
bazel = {
|
||||
members = [
|
||||
mboes
|
||||
cbley
|
||||
groodt
|
||||
aherrmann
|
||||
ylecornec
|
||||
boltzmannrain
|
||||
];
|
||||
scope = "Bazel build tool & related tools https://bazel.build/";
|
||||
|
|
|
|||
|
|
@ -561,7 +561,7 @@ in
|
|||
default = { };
|
||||
description = ''
|
||||
Configuration for foo, see
|
||||
<link xlink:href="https://example.com/docs/foo"/>
|
||||
<https://example.com/docs/foo/>
|
||||
for supported settings.
|
||||
'';
|
||||
};
|
||||
|
|
@ -636,7 +636,7 @@ up in the manual.
|
|||
default = { };
|
||||
description = ''
|
||||
Configuration for Foo, see
|
||||
<link xlink:href="https://example.com/docs/foo"/>
|
||||
<https://example.com/docs/foo>
|
||||
for supported values.
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -101,6 +101,9 @@
|
|||
"module-services-mautrix-discord-troubleshooting": [
|
||||
"index.html#module-services-mautrix-discord-troubleshooting"
|
||||
],
|
||||
"module-services-onedrive": [
|
||||
"index.html#module-services-onedrive"
|
||||
],
|
||||
"module-services-tandoor-recipes-migrating-media-option-move": [
|
||||
"index.html#module-services-tandoor-recipes-migrating-media-option-move",
|
||||
"index.html#module-services-tandoor-recipes-migrating-media-option-1"
|
||||
|
|
|
|||
|
|
@ -174,8 +174,6 @@
|
|||
|
||||
- [LogiOps](https://github.com/PixlOne/logiops), an unofficial userspace driver for HID++ Logitech devices. Available as [services.logiops](#opt-services.logiops.enable).
|
||||
|
||||
- [Unpackerr](https://unpackerr.zip), extracts downloads for Radarr, Sonarr, Lidarr, Readarr, and/or a Watch folder. Available as [services.unpackerr](#opt-services.unpackerr.enable).
|
||||
|
||||
## Backward Incompatibilities {#sec-release-26.05-incompatibilities}
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@
|
|||
|
||||
- [FlapAlerted](https://github.com/Kioubit/FlapAlerted), detects BGP flapping events and provides statistics based on BGP update messages. Available as [services.flap-alerted](#opt-services.flap-alerted.enable).
|
||||
|
||||
- [Unpackerr](https://unpackerr.zip), extracts downloads for Radarr, Sonarr, Lidarr, Readarr, and/or a Watch folder. Available as [services.unpackerr](#opt-services.unpackerr.enable).
|
||||
|
||||
## Backward Incompatibilities {#sec-release-26.11-incompatibilities}
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ in
|
|||
Each line in this option should be of the format --option=value.
|
||||
The options in this file take precedence over the options provided
|
||||
through command line arguments.
|
||||
<link xlink:href="https://duplicati.readthedocs.io/en/latest/06-advanced-options/#parameters-file">Duplicati docs: parameters-file</link>
|
||||
[Duplicati docs: parameters-file](https://duplicati.readthedocs.io/en/latest/06-advanced-options/#parameters-file)
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
@ -85,7 +85,7 @@ in
|
|||
Each line in the file option should be of the format --option=value.
|
||||
The options in this file take precedence over the options provided
|
||||
through command line arguments.
|
||||
<link xlink:href="https://duplicati.readthedocs.io/en/latest/06-advanced-options/#parameters-file">Duplicati docs: parameters-file</link>
|
||||
[Duplicati docs: parameters-file](https://duplicati.readthedocs.io/en/latest/06-advanced-options/#parameters-file)
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -27,6 +27,16 @@ let
|
|||
keep-latest-n = 5;
|
||||
keep-booted-system = true;
|
||||
keep-current-system = true;
|
||||
keep-n-per-bucket = [
|
||||
{
|
||||
bucket-window = "1 day";
|
||||
bucket-amount = 7;
|
||||
}
|
||||
{
|
||||
bucket-window = "1 week";
|
||||
bucket-amount = 4;
|
||||
}
|
||||
];
|
||||
};
|
||||
user = {
|
||||
enable = false;
|
||||
|
|
@ -198,6 +208,13 @@ let
|
|||
Whether to keep the last booted system generation. Only useful for system profiles.
|
||||
'';
|
||||
};
|
||||
keep-n-per-bucket = lib.mkOption {
|
||||
type = with lib.types; listOf (submodule keepNPerBucketOptions);
|
||||
default = [ ];
|
||||
description = ''
|
||||
Specify a list of rules having n, bucket-window, and bucket-amount attributes.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
filterOptions = {
|
||||
|
|
@ -218,6 +235,31 @@ let
|
|||
};
|
||||
};
|
||||
};
|
||||
keepNPerBucketOptions = {
|
||||
freeformType = toml.type;
|
||||
options = {
|
||||
n = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
default = 1;
|
||||
description = ''
|
||||
Retain n generations every bucket-window duration for bucket-amount buckets.
|
||||
'';
|
||||
};
|
||||
bucket-window = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
description = ''
|
||||
The duration of the bucket window.
|
||||
'';
|
||||
};
|
||||
bucket-amount = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
default = 1;
|
||||
description = ''
|
||||
The number of buckets to keep.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# toml.generate does not support null values, we need to filter them out first
|
||||
filteredSettings = lib.filterAttrsRecursive (name: value: value != null) cfg.settings;
|
||||
|
|
@ -236,7 +278,6 @@ in
|
|||
{
|
||||
meta.maintainers = pkgs.angrr.meta.maintainers;
|
||||
imports = [
|
||||
(lib.mkRemovedOptionModule [ "services" "angrr" "period" ] configFileMigrationMsg)
|
||||
(lib.mkRemovedOptionModule [ "services" "angrr" "removeRoot" ] configFileMigrationMsg)
|
||||
(lib.mkRemovedOptionModule [ "services" "angrr" "ownedOnly" ] configFileMigrationMsg)
|
||||
];
|
||||
|
|
@ -267,6 +308,15 @@ in
|
|||
Extra command-line arguments pass to angrr.
|
||||
'';
|
||||
};
|
||||
period = lib.mkOption {
|
||||
type = with lib.types; nullOr str;
|
||||
default = null;
|
||||
description = ''
|
||||
If set, it configures {option}`services.angrr.settings` to a preset that
|
||||
monitor .direnv, results, system, and user profiles,
|
||||
retaining GC roots that are younger than the specified period.
|
||||
'';
|
||||
};
|
||||
settings = lib.mkOption {
|
||||
type = lib.types.submodule settingsOptions;
|
||||
example = exampleSettings;
|
||||
|
|
@ -372,6 +422,38 @@ in
|
|||
_angrr_auto_use "$@"
|
||||
'';
|
||||
})
|
||||
|
||||
# When period is set, configure a preset retention policy
|
||||
# Users can still override settings via services.angrr.settings
|
||||
(lib.mkIf (cfg.period != null) {
|
||||
services.angrr.settings = {
|
||||
temporary-root-policies = {
|
||||
direnv = {
|
||||
path-regex = "/\\.direnv/";
|
||||
period = cfg.period;
|
||||
};
|
||||
result = {
|
||||
path-regex = "/result[^/]*$";
|
||||
period = cfg.period;
|
||||
};
|
||||
};
|
||||
profile-policies = {
|
||||
system = {
|
||||
profile-paths = [ "/nix/var/nix/profiles/system" ];
|
||||
keep-since = cfg.period;
|
||||
keep-booted-system = true;
|
||||
keep-current-system = true;
|
||||
};
|
||||
user = {
|
||||
profile-paths = [
|
||||
"~/.local/state/nix/profiles/profile"
|
||||
"/nix/var/nix/profiles/per-user/root/profile"
|
||||
];
|
||||
keep-since = cfg.period;
|
||||
};
|
||||
};
|
||||
};
|
||||
})
|
||||
]
|
||||
);
|
||||
}
|
||||
|
|
|
|||
39
nixos/modules/services/networking/onedrive.md
Normal file
39
nixos/modules/services/networking/onedrive.md
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
# Microsoft OneDrive {#module-services-onedrive}
|
||||
|
||||
Microsoft Onedrive is a popular cloud file-hosting service, used by 85%
|
||||
of Fortune 500 companies. NixOS uses a popular OneDrive client for Linux
|
||||
maintained by github user abraunegg. The Linux client is excellent and
|
||||
allows customization of which files or paths to download, not much
|
||||
unlike the default Windows OneDrive client by Microsoft itself. The
|
||||
client allows syncing with multiple onedrive accounts at the same time,
|
||||
of any type- OneDrive personal, OneDrive business, Office365 and
|
||||
Sharepoint libraries, without any additional charge.
|
||||
|
||||
For more information, guides and documentation, see <https://abraunegg.github.io/>.
|
||||
|
||||
To enable OneDrive support, add the following to your
|
||||
`configuration.nix`: {option}`services.onedrive.enable` = true;
|
||||
|
||||
This installs the `onedrive` package and a service `onedriveLauncher`
|
||||
which will instantiate a `onedrive` service for all your OneDrive
|
||||
accounts. Follow the steps in documentation of the onedrive client to
|
||||
setup your accounts. To use the service with multiple accounts, create a
|
||||
file named `onedrive-launcher` in `~/.config` and add the filename of
|
||||
the config directory, relative to `~/.config`. For example, if you have
|
||||
two OneDrive accounts with configs in `~/.config/onedrive_bob_work` and
|
||||
`~/.config/onedrive_bob_personal`, add the following lines:
|
||||
|
||||
```
|
||||
onedrive_bob_work
|
||||
# Not in use:
|
||||
# onedrive_bob_office365
|
||||
onedrive_bob_personal
|
||||
```
|
||||
|
||||
No such file needs to be created if you are using only a single OneDrive
|
||||
account with config in the default location `~/.config/onedrive`, in the
|
||||
absence of `~/.config/onedrive-launcher`, only a single service is
|
||||
instantiated, with default config path.
|
||||
|
||||
If you wish to use a custom OneDrive package, say from another channel,
|
||||
add the following line: {option}`services.onedrive.package` = pkgs.unstable.onedrive;
|
||||
|
|
@ -23,17 +23,13 @@ let
|
|||
|
||||
in
|
||||
{
|
||||
### Documentation
|
||||
# meta.doc = ./onedrive.xml;
|
||||
|
||||
### Interface
|
||||
meta.doc = ./onedrive.md;
|
||||
|
||||
options.services.onedrive = {
|
||||
enable = lib.mkEnableOption "OneDrive service";
|
||||
|
||||
package = lib.mkPackageOption pkgs "onedrive" { };
|
||||
};
|
||||
### Implementation
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ in
|
|||
settings = mkOption {
|
||||
description = ''
|
||||
Build veilid-server.conf with nix expression.
|
||||
Check <link xlink:href="https://veilid.gitlab.io/developer-book/admin/config.html#configuration-keys">Configuration Keys</link>.
|
||||
Check [Configuration Keys](https://veilid.gitlab.io/developer-book/admin/config.html#configuration-keys).
|
||||
'';
|
||||
type = types.submodule {
|
||||
freeformType = settingsFormat.type;
|
||||
|
|
|
|||
|
|
@ -272,15 +272,15 @@ in
|
|||
Agorakit configuration options to set in the
|
||||
<filename>.env</filename> file.
|
||||
|
||||
Refer to <link xlink:href="https://github.com/agorakit/agorakit"/>
|
||||
Refer to <https://github.com/agorakit/agorakit>
|
||||
for details on supported values.
|
||||
|
||||
Settings containing secret data should be set to an attribute
|
||||
set containing the attribute <literal>_secret</literal> - a
|
||||
set containing the attribute `_secret` - a
|
||||
string pointing to a file containing the value the option
|
||||
should be set to. See the example to get a better picture of
|
||||
this: in the resulting <filename>.env</filename> file, the
|
||||
<literal>OIDC_CLIENT_SECRET</literal> key will be set to the
|
||||
`OIDC_CLIENT_SECRET` key will be set to the
|
||||
contents of the <filename>/run/keys/oidc_secret</filename>
|
||||
file.
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ in
|
|||
|
||||
description = ''
|
||||
Configuration for Hatsu, see
|
||||
<link xlink:href="https://hatsu.cli.rs/admins/environments.html"/>
|
||||
<https://hatsu.cli.rs/admins/environments.html>
|
||||
for supported values.
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -274,15 +274,15 @@ in
|
|||
monica configuration options to set in the
|
||||
<filename>.env</filename> file.
|
||||
|
||||
Refer to <link xlink:href="https://github.com/monicahq/monica"/>
|
||||
Refer to <https://github.com/monicahq/monica>
|
||||
for details on supported values.
|
||||
|
||||
Settings containing secret data should be set to an attribute
|
||||
set containing the attribute <literal>_secret</literal> - a
|
||||
set containing the attribute `_secret` - a
|
||||
string pointing to a file containing the value the option
|
||||
should be set to. See the example to get a better picture of
|
||||
this: in the resulting <filename>.env</filename> file, the
|
||||
<literal>OIDC_CLIENT_SECRET</literal> key will be set to the
|
||||
`OIDC_CLIENT_SECRET` key will be set to the
|
||||
contents of the <filename>/run/keys/oidc_secret</filename>
|
||||
file.
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -75,8 +75,8 @@ in
|
|||
default = [ "httprpc" ];
|
||||
example = literalExpression ''[ "httprpc" "data" "diskspace" "edit" "erasedata" "theme" "trafic" ]'';
|
||||
description = ''
|
||||
List of plugins to enable. See the list of <link xlink:href="https://github.com/Novik/ruTorrent/wiki/Plugins#currently-there-are-the-following-plugins">available plugins</link>. Note: the <literal>unpack</literal> plugin needs the nonfree <literal>unrar</literal> package.
|
||||
You need to either enable one of the <literal>rpc</literal> or <literal>httprpc</literal> plugin or enable the <xref linkend="opt-services.rutorrent.nginx.exposeInsecureRPC2mount"/> option.
|
||||
List of plugins to enable. See the list of [available plugins](https://github.com/Novik/ruTorrent/wiki/Plugins#currently-there-are-the-following-plugins). Note: the `unpack` plugin needs the nonfree `unrar` package.
|
||||
You need to either enable one of the `rpc` or `httprpc` plugin or enable the {option}`services.rutorrent.nginx.exposeInsecureRPC2mount` option.
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
@ -97,7 +97,7 @@ in
|
|||
"pm.max_requests" = 500;
|
||||
};
|
||||
description = ''
|
||||
Options for ruTorrent's PHP pool. See the documentation on <literal>php-fpm.conf</literal> for details on configuration directives.
|
||||
Options for ruTorrent's PHP pool. See the documentation on `php-fpm.conf` for details on configuration directives.
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
@ -107,8 +107,8 @@ in
|
|||
default = false;
|
||||
description = ''
|
||||
Whether to enable nginx virtual host management.
|
||||
Further nginx configuration can be done by adapting <literal>services.nginx.virtualHosts.<name></literal>.
|
||||
See <xref linkend="opt-services.nginx.virtualHosts"/> for further information.
|
||||
Further nginx configuration can be done by adapting `services.nginx.virtualHosts.<name>`.
|
||||
See {option}`services.nginx.virtualHosts` for further information.
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
@ -116,8 +116,8 @@ in
|
|||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
If you do not enable one of the <literal>rpc</literal> or <literal>httprpc</literal> plugins you need to expose an RPC mount through scgi using this option.
|
||||
Warning: This allow to run arbitrary commands, as the rtorrent user, so make sure to use authentification. The simplest way would be to use the <literal>services.nginx.virtualHosts.<name>.basicAuth</literal> option.
|
||||
If you do not enable one of the `rpc` or `httprpc` plugins you need to expose an RPC mount through scgi using this option.
|
||||
Warning: This allow to run arbitrary commands, as the rtorrent user, so make sure to use authentication. The simplest way would be to use the {option}`services.nginx.virtualHosts.<name>.basicAuth` option.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -123,6 +123,15 @@ in
|
|||
nemo-with-extensions
|
||||
xapp
|
||||
];
|
||||
systemd.packages =
|
||||
with pkgs;
|
||||
[
|
||||
cinnamon-session
|
||||
]
|
||||
++ utils.removePackagesByName [
|
||||
xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
|
||||
xdg-user-dirs-gtk
|
||||
] config.environment.cinnamon.excludePackages;
|
||||
services.cinnamon.apps.enable = mkDefault true;
|
||||
services.gnome.evolution-data-server.enable = true;
|
||||
services.gnome.glib-networking.enable = true;
|
||||
|
|
@ -218,6 +227,7 @@ in
|
|||
mint-y-icons
|
||||
xapp # provides some xapp-* icons
|
||||
xapp-symbolic-icons
|
||||
xdg-user-dirs-gtk
|
||||
] config.environment.cinnamon.excludePackages
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ let
|
|||
IFS=:
|
||||
for i in $XDG_CURRENT_DESKTOP; do
|
||||
case $i in
|
||||
KDE|GNOME|Pantheon|Hyprland|niri|X-NIXOS-SYSTEMD-AWARE) echo "1"; exit; ;;
|
||||
KDE|GNOME|Pantheon|Hyprland|niri|X-Cinnamon|X-NIXOS-SYSTEMD-AWARE) echo "1"; exit; ;;
|
||||
*) ;;
|
||||
esac
|
||||
done
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ in
|
|||
machine.succeed("su normal --command 'nix build /run/current-system --out-link /tmp/result-user-auto-gc-root-2'")
|
||||
|
||||
machine.systemctl("start nix-gc.service")
|
||||
# Not auto gc root will be removed
|
||||
# No auto gc root will be removed
|
||||
machine.succeed("readlink /tmp/result-root-auto-gc-root-1")
|
||||
machine.succeed("readlink /tmp/result-root-auto-gc-root-2")
|
||||
machine.succeed("readlink /tmp/result-user-auto-gc-root-1")
|
||||
|
|
|
|||
|
|
@ -51,8 +51,9 @@
|
|||
machine.wait_until_succeeds("${eval "Main.runState"} | grep -q 'true,..2'")
|
||||
|
||||
with subtest("Check if Cinnamon components actually start"):
|
||||
for i in ["csd-media-keys", "xapp-sn-watcher", "nemo-desktop"]:
|
||||
machine.wait_until_succeeds(f"pgrep -f {i}")
|
||||
# https://unix.stackexchange.com/a/74186
|
||||
for i in ["[c]sd-media-keys", "[x]app-sn-watcher", "[n]emo-desktop"]:
|
||||
machine.wait_until_succeeds(f"pgrep -f \"{i}\"")
|
||||
machine.wait_until_succeeds("journalctl -b --grep 'Loaded applet menu@cinnamon.org'")
|
||||
machine.wait_until_succeeds("journalctl -b --grep 'calendar@cinnamon.org: Calendar events supported'")
|
||||
|
||||
|
|
@ -84,6 +85,10 @@
|
|||
machine.wait_until_succeeds("${eval "global.display.focus_window.wm_class"} | grep -i 'gnome-terminal'")
|
||||
machine.sleep(2)
|
||||
|
||||
# Only can be tested after opening the above apps.
|
||||
with subtest("Check if x-d-p actually starts"):
|
||||
machine.wait_until_succeeds("pgrep -xf \"${pkgs.xdg-desktop-portal}/libexec/xdg-desktop-portal\"")
|
||||
|
||||
with subtest("Check if Cinnamon has ever coredumped"):
|
||||
machine.fail("coredumpctl --json=short | grep -E 'cinnamon|nemo'")
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -62,8 +62,9 @@
|
|||
machine.wait_until_succeeds("${eval "Main.runState"} | grep -q 'true,..2'")
|
||||
|
||||
with subtest("Check if Cinnamon components actually start"):
|
||||
for i in ["csd-media-keys", "cinnamon-killer-daemon", "xapp-sn-watcher", "nemo-desktop"]:
|
||||
machine.wait_until_succeeds(f"pgrep -f {i}")
|
||||
# https://unix.stackexchange.com/a/74186
|
||||
for i in ["[c]sd-media-keys", "[c]innamon-killer-daemon", "[x]app-sn-watcher", "[n]emo-desktop"]:
|
||||
machine.wait_until_succeeds(f"pgrep -f \"{i}\"")
|
||||
machine.wait_until_succeeds("journalctl -b --grep 'Loaded applet menu@cinnamon.org'")
|
||||
machine.wait_until_succeeds("journalctl -b --grep 'calendar@cinnamon.org: Calendar events supported'")
|
||||
|
||||
|
|
@ -104,6 +105,10 @@
|
|||
machine.sleep(2)
|
||||
machine.screenshot("cinnamon_virtual_keyboard")
|
||||
|
||||
# Only can be tested after opening the above apps.
|
||||
with subtest("Check if x-d-p actually starts"):
|
||||
machine.wait_until_succeeds("pgrep -xf \"${pkgs.xdg-desktop-portal}/libexec/xdg-desktop-portal\"")
|
||||
|
||||
with subtest("Check if Cinnamon has ever coredumped"):
|
||||
machine.fail("coredumpctl --json=short | grep -E 'cinnamon|nemo'")
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1019,7 +1019,7 @@ Furthermore each update script will be passed the following environment variable
|
|||
> An update script will be usually run from the root of the Nixpkgs repository, but you should not rely on that.
|
||||
> Also note that `update.nix` executes update scripts in parallel by default, so you should avoid running `git commit` or any other commands that cannot handle that.
|
||||
|
||||
While update scripts should not create commits themselves, `update.nix` supports automatically creating commits when running it with `--argstr commit true`.
|
||||
While update scripts should not create commits themselves, `update.nix` supports automatically creating commits when running it with `--arg commit true`.
|
||||
If you need to customize commit message, you can have the update script implement the `commit` feature.
|
||||
|
||||
### Supported features
|
||||
|
|
@ -1046,7 +1046,7 @@ If you need to customize commit message, you can have the update script implemen
|
|||
```
|
||||
:::
|
||||
|
||||
When `update.nix` is run with `--argstr commit true`, it will create a separate commit for each of the objects.
|
||||
When `update.nix` is run with `--arg commit true`, it will create a separate commit for each of the objects.
|
||||
An empty list can be returned when the script did not update any files; for example, when the package is already at the latest version.
|
||||
|
||||
The commit object contains the following values:
|
||||
|
|
|
|||
|
|
@ -16,9 +16,9 @@ let
|
|||
inherit tiling_wm;
|
||||
};
|
||||
stableVersion = {
|
||||
version = "2026.1.1.8"; # "Android Studio Quail 1 | 2026.1.1"
|
||||
sha256Hash = "sha256-DB+kujz6vQfkipDgCl+i6iqCzVhwgz2tpbApDIF9g9M=";
|
||||
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.1.8/android-studio-quail1-linux.tar.gz";
|
||||
version = "2026.1.1.10"; # "Android Studio Quail 1 | 2026.1.1 Patch 2"
|
||||
sha256Hash = "sha256-+9PxFtEsrtck6o2g0s2ufnkRcPefKqESc+oPLSKiJNw=";
|
||||
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.1.10/android-studio-quail1-patch2-linux.tar.gz";
|
||||
};
|
||||
betaVersion = {
|
||||
version = "2026.1.1.7"; # "Android Studio Quail 1 | 2026.1.1 RC 2"
|
||||
|
|
@ -26,9 +26,9 @@ let
|
|||
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.1.7/android-studio-quail1-rc2-linux.tar.gz";
|
||||
};
|
||||
latestVersion = {
|
||||
version = "2026.1.2.7"; # "Android Studio Quail 2 | 2026.1.2 Canary 7"
|
||||
sha256Hash = "sha256-LHszfAtM5ZLNbTZG0isb+aUW3uwp+zav/igHT4HDeEM=";
|
||||
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.2.7/android-studio-quail2-canary7-linux.tar.gz";
|
||||
version = "2026.1.3.1"; # "Android Studio Quail 3 | 2026.1.3 Canary 1"
|
||||
sha256Hash = "sha256-D7aSLkauEVB05/vhWxn7sfK2CoAzsvaxnkFViAuVIsc=";
|
||||
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.3.1/android-studio-quail3-canary1-linux.tar.gz";
|
||||
};
|
||||
in
|
||||
{
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
mkLibretroCore {
|
||||
core = "mame2003";
|
||||
version = "0-unstable-2026-06-05";
|
||||
version = "0-unstable-2026-06-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "mame2003-libretro";
|
||||
rev = "299789ce642b34c2679cfd89d7ecf06b09851bc1";
|
||||
hash = "sha256-FX+onEaaQUdcjAvgsrdW0m408oCSXJEJHQncrN2Uk/Y=";
|
||||
rev = "8f17f5f4cb432c5d2d2771e5a76f8c4eac2d31a6";
|
||||
hash = "sha256-yXII81KiO+53/S2p9H5/81fyCf1qKauQTVjlfNOwu3s=";
|
||||
};
|
||||
|
||||
# Fix build with GCC 14
|
||||
|
|
|
|||
|
|
@ -110,13 +110,13 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"bpg_proxmox": {
|
||||
"hash": "sha256-10cdMZSGJuhUx432/2NazA8T88zclcnbolcU31wfIEM=",
|
||||
"hash": "sha256-F6aSXitmu3FOVpRoFyAVPCZA7dHgRbBySda+uS1BDTY=",
|
||||
"homepage": "https://registry.terraform.io/providers/bpg/proxmox",
|
||||
"owner": "bpg",
|
||||
"repo": "terraform-provider-proxmox",
|
||||
"rev": "v0.109.0",
|
||||
"rev": "v0.110.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-Tx5DjRLZJXm0GjKRaogra7m55Opeu9LVvT25UW5q4D0="
|
||||
"vendorHash": "sha256-X4sWLYi9DKp3ex1XBwv2qiVliytOjs7Asy+rigKF/AE="
|
||||
},
|
||||
"brightbox_brightbox": {
|
||||
"hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=",
|
||||
|
|
@ -733,13 +733,13 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"ibm-cloud_ibm": {
|
||||
"hash": "sha256-bLbm+wbC+2bMor9fYmB6J+iclSOsdP3dIkJiy3Jk6Xg=",
|
||||
"hash": "sha256-b498lI4JF5DktGXS5SqCBlDB0rsqDWTE/5GHmgHX3Y4=",
|
||||
"homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",
|
||||
"owner": "IBM-Cloud",
|
||||
"repo": "terraform-provider-ibm",
|
||||
"rev": "v2.2.2",
|
||||
"rev": "v2.3.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-FFQEmg2hui1KyzP1WWR6Lx9tKi2aEDAHKztubHMaTAQ="
|
||||
"vendorHash": "sha256-0eKD6fIrpOQzD/ILd+6y4GR2EX4UNOioMdSCfu+F5OU="
|
||||
},
|
||||
"icinga_icinga2": {
|
||||
"hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=",
|
||||
|
|
|
|||
|
|
@ -78,6 +78,7 @@ let
|
|||
"-D bundled-gsl=OFF"
|
||||
"-D bundled-json=OFF"
|
||||
"-D warnings-as-errors=OFF" # protobuf 34.x `[[nodiscard]]` workaround https://github.com/mumble-voip/mumble/issues/7102
|
||||
"-D use-timestamps=OFF"
|
||||
]
|
||||
++ (overrides.cmakeFlags or [ ]);
|
||||
|
||||
|
|
@ -152,7 +153,6 @@ let
|
|||
env.NIX_CFLAGS_COMPILE = lib.optionalString speechdSupport "-I${speechd-minimal}/include/speech-dispatcher";
|
||||
|
||||
patches = [
|
||||
./disable-overlay-build.patch
|
||||
./fix-plugin-copy.patch
|
||||
];
|
||||
|
||||
|
|
@ -166,6 +166,7 @@ let
|
|||
--source-dir=$NIX_BUILD_TOP/source/ \
|
||||
--binary-dir=$out \
|
||||
--only-appbundle \
|
||||
--no-overlay \
|
||||
--version "${source.version}"
|
||||
|
||||
mkdir -p $out/Applications $out/bin
|
||||
|
|
@ -217,14 +218,14 @@ let
|
|||
} source;
|
||||
|
||||
source = rec {
|
||||
version = "1.5.857";
|
||||
version = "1.5.901";
|
||||
|
||||
# Needs submodules
|
||||
src = fetchFromGitHub {
|
||||
owner = "mumble-voip";
|
||||
repo = "mumble";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-4ySak2nzT8p48waMgBc9kLrvFB8716e7p0G4trzuh1k=";
|
||||
hash = "sha256-UBJH7EwfWvInuSD6ZALOKeVnWdfh/rmq8GVLG5URjOQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
diff --git a/macx/scripts/osxdist.py b/macx/scripts/osxdist.py
|
||||
index bdc7fcbd2..2114caf37 100755
|
||||
--- a/macx/scripts/osxdist.py
|
||||
+++ b/macx/scripts/osxdist.py
|
||||
@@ -128,7 +128,7 @@ class AppBundle(object):
|
||||
shutil.copy(rsrc, os.path.join(rsrcpath, b))
|
||||
|
||||
# Extras
|
||||
- shutil.copy(os.path.join(options.binary_dir, 'MumbleOverlay.pkg'), os.path.join(rsrcpath, 'MumbleOverlay.pkg'))
|
||||
+ # shutil.copy(os.path.join(options.binary_dir, 'MumbleOverlay.pkg'), os.path.join(rsrcpath, 'MumbleOverlay.pkg'))
|
||||
|
||||
def copy_codecs(self):
|
||||
'''
|
||||
@@ -275,7 +276,7 @@ def package_client():
|
||||
title = 'Mumble %s' % ver
|
||||
|
||||
# Fix overlay installer package
|
||||
- create_overlay_package()
|
||||
+ # create_overlay_package()
|
||||
if options.only_overlay:
|
||||
sys.exit(0)
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/actexec/CMakeLists.txt b/actexec/CMakeLists.txt
|
||||
index 49d8128..e8bfa16 100644
|
||||
index e7c1e38..bfa1a9c 100644
|
||||
--- a/actexec/CMakeLists.txt
|
||||
+++ b/actexec/CMakeLists.txt
|
||||
@@ -40,7 +40,7 @@ endif()
|
||||
@@ -41,7 +41,7 @@ endif()
|
||||
|
||||
setup_target(${PROJECT})
|
||||
|
||||
|
|
@ -11,7 +11,7 @@ index 49d8128..e8bfa16 100644
|
|||
|
||||
target_link_directories(${PROJECT}
|
||||
PRIVATE
|
||||
@@ -75,7 +75,6 @@ target_link_libraries(
|
||||
@@ -76,7 +76,6 @@ target_link_libraries(
|
||||
Qt6::Widgets
|
||||
Qt6::Core5Compat
|
||||
Qt6::Multimedia
|
||||
|
|
@ -20,10 +20,10 @@ index 49d8128..e8bfa16 100644
|
|||
)
|
||||
|
||||
diff --git a/actiona/CMakeLists.txt b/actiona/CMakeLists.txt
|
||||
index d03d650..222b2f9 100644
|
||||
index fe9e49c..922bec2 100644
|
||||
--- a/actiona/CMakeLists.txt
|
||||
+++ b/actiona/CMakeLists.txt
|
||||
@@ -125,7 +125,7 @@ endif()
|
||||
@@ -126,7 +126,7 @@ endif()
|
||||
|
||||
setup_target(${PROJECT})
|
||||
|
||||
|
|
@ -32,7 +32,7 @@ index d03d650..222b2f9 100644
|
|||
|
||||
target_link_directories(${PROJECT}
|
||||
PRIVATE
|
||||
@@ -162,7 +162,6 @@ target_link_libraries(
|
||||
@@ -163,7 +163,6 @@ target_link_libraries(
|
||||
Qt6::Widgets
|
||||
Qt6::Core5Compat
|
||||
Qt6::Multimedia
|
||||
|
|
@ -41,7 +41,7 @@ index d03d650..222b2f9 100644
|
|||
${LIBX11_LIBRARIES}
|
||||
$<$<PLATFORM_ID:Windows>:shlwapi>
|
||||
diff --git a/actions/system/CMakeLists.txt b/actions/system/CMakeLists.txt
|
||||
index a3019b1..6d9430c 100644
|
||||
index cf99ca9..90949db 100644
|
||||
--- a/actions/system/CMakeLists.txt
|
||||
+++ b/actions/system/CMakeLists.txt
|
||||
@@ -67,8 +67,6 @@ set(HEADERS
|
||||
|
|
@ -50,10 +50,10 @@ index a3019b1..6d9430c 100644
|
|||
${HEADERS_PREFIX}/actions/systeminstance.hpp
|
||||
- ${HEADERS_PREFIX}/actions/texttospeechdefinition.hpp
|
||||
- ${HEADERS_PREFIX}/actions/texttospeechinstance.hpp
|
||||
${HEADERS_PREFIX}/code/mediaplaylist.hpp
|
||||
${HEADERS_PREFIX}/code/mediaplayer.hpp
|
||||
${HEADERS_PREFIX}/code/notify.hpp
|
||||
${HEADERS_PREFIX}/code/process.hpp
|
||||
@@ -140,7 +138,6 @@ find_package(Qt6 ${ACT_MINIMUM_QT_VERSION} COMPONENTS
|
||||
@@ -141,7 +139,6 @@ find_package(Qt6 ${ACT_MINIMUM_QT_VERSION} COMPONENTS
|
||||
DBus
|
||||
Multimedia
|
||||
MultimediaWidgets
|
||||
|
|
@ -61,16 +61,16 @@ index a3019b1..6d9430c 100644
|
|||
REQUIRED)
|
||||
|
||||
target_link_directories(${PROJECT}
|
||||
@@ -167,7 +164,6 @@ target_link_libraries(${PROJECT}
|
||||
@@ -168,7 +165,6 @@ target_link_libraries(${PROJECT}
|
||||
Qt6::DBus
|
||||
Qt6::Multimedia
|
||||
Qt6::MultimediaWidgets
|
||||
- Qt6::TextToSpeech
|
||||
${LIBNOTIFY_LIBRARIES}
|
||||
${BLUEZ_LIBRARIES}
|
||||
$<$<PLATFORM_ID:Windows>:Bthprops>
|
||||
$<$<PLATFORM_ID:Windows>:Advapi32>
|
||||
diff --git a/actions/system/src/actionpacksystem.hpp b/actions/system/src/actionpacksystem.hpp
|
||||
index ea045e3..a5af35a 100644
|
||||
index 9214c00..3b13ea1 100644
|
||||
--- a/actions/system/src/actionpacksystem.hpp
|
||||
+++ b/actions/system/src/actionpacksystem.hpp
|
||||
@@ -32,10 +32,6 @@
|
||||
|
|
@ -82,7 +82,7 @@ index ea045e3..a5af35a 100644
|
|||
-#endif
|
||||
-
|
||||
#include "code/system.hpp"
|
||||
#include "code/mediaplaylist.hpp"
|
||||
#include "code/mediaplayer.hpp"
|
||||
#include "code/notify.hpp"
|
||||
@@ -64,9 +60,6 @@ public:
|
||||
addActionDefinition(new Actions::DetachedCommandDefinition(this));
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/actiontools/CMakeLists.txt b/actiontools/CMakeLists.txt
|
||||
index 94c809c4..eb3d7e8c 100644
|
||||
--- a/actiontools/CMakeLists.txt
|
||||
+++ b/actiontools/CMakeLists.txt
|
||||
@@ -292,7 +292,7 @@ target_compile_definitions(${PROJECT} PRIVATE ACTIONTOOLS_LIBRARY)
|
||||
setup_target(${PROJECT})
|
||||
|
||||
find_package(OpenCV REQUIRED core imgproc)
|
||||
-find_package(Qt6 ${ACT_MINIMUM_QT_VERSION} COMPONENTS Widgets Qml REQUIRED)
|
||||
+find_package(Qt6 ${ACT_MINIMUM_QT_VERSION} COMPONENTS Widgets Qml QmlPrivate REQUIRED)
|
||||
|
||||
ExternalProject_Add(external_qtjsapi
|
||||
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtjsapi
|
||||
|
|
@ -18,21 +18,17 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "actiona";
|
||||
version = "3.11.1";
|
||||
version = "3.11.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Jmgr";
|
||||
repo = "actiona";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-sJlzrrpmo2CbzChCtiyxqDtjoN58BN4Ptjm4sH83zAw=";
|
||||
hash = "sha256-PQNbbIErw/fnEyIy80+300g3YC4pEqUB/m9l1dXvORU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Meet Qt 6.10 requirement for explicit find_package of private targets
|
||||
./fix-qt6-10-private-targets.diff
|
||||
]
|
||||
++ lib.optionals (!textToSpeechSupport) [
|
||||
patches = lib.optionals (!textToSpeechSupport) [
|
||||
# Removes TTS support
|
||||
./disable-tts.patch
|
||||
];
|
||||
|
|
|
|||
|
|
@ -7,12 +7,12 @@
|
|||
|
||||
let
|
||||
pname = "altus";
|
||||
version = "5.7.2";
|
||||
version = "5.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
name = "altus-${version}.AppImage";
|
||||
url = "https://github.com/amanharwara/altus/releases/download/${version}/Altus-${version}.AppImage";
|
||||
hash = "sha256-sB4ONFLTNN2Dd3LIVtpXIGTyHDFcXako7nlKxzNEOtA=";
|
||||
hash = "sha256-TA1AhWO8TDKbl7ukG1KzPvHP1AZ0leAENLVQ/W+GsrE=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "amnezia-vpn";
|
||||
version = "4.8.18.0";
|
||||
version = "4.8.19.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
|
|
@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
owner = "amnezia-vpn";
|
||||
repo = "amnezia-client";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-/A1juZzNWjdShdg41M1nfO3pMukMFzyBjQaZvZjYaJs=";
|
||||
hash = "sha256-kftLofCyLA6DDfEXRPyy6Zx0JiQUEzpdYpTlvPihPZg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "angrr";
|
||||
version = "0.2.3";
|
||||
version = "0.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linyinfeng";
|
||||
repo = "angrr";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8UrQ9e+gx7AR6ASNX94P2K3SvNOzvR98U3ub/odqybM=";
|
||||
hash = "sha256-Sj7aaKC7rtIzIz3UiVfmLjr4O7hWXrEC3wkKaPra/3A=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-pVFIsFIdOIgBilBRYtGZdjVOyaERrfiJJT2WT/YoXeQ=";
|
||||
cargoHash = "sha256-LspQncUrWfou41G37L3O1GbeiaoQpAC/RAu3EAPVrRU=";
|
||||
|
||||
buildAndTestSubdir = "angrr";
|
||||
|
||||
|
|
|
|||
|
|
@ -2,18 +2,22 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchgit,
|
||||
fetchpatch,
|
||||
fetchzip,
|
||||
alsa-lib,
|
||||
apple-sdk,
|
||||
aubio,
|
||||
boost,
|
||||
cairomm,
|
||||
cppunit,
|
||||
curl,
|
||||
darwin,
|
||||
dbus,
|
||||
doxygen,
|
||||
ffmpeg,
|
||||
fftw,
|
||||
fftwSinglePrec,
|
||||
fixDarwinDylibNames,
|
||||
flac,
|
||||
fluidsynth,
|
||||
glibc,
|
||||
|
|
@ -21,6 +25,7 @@
|
|||
graphviz,
|
||||
harvid,
|
||||
hidapi,
|
||||
installShellFiles,
|
||||
itstool,
|
||||
kissfft,
|
||||
libarchive,
|
||||
|
|
@ -59,6 +64,8 @@
|
|||
taglib,
|
||||
vamp-plugin-sdk,
|
||||
wafHook,
|
||||
which,
|
||||
writableTmpDirAsHomeHook,
|
||||
xjadeo,
|
||||
libxrandr,
|
||||
libxinerama,
|
||||
|
|
@ -66,12 +73,20 @@
|
|||
optimize ? true, # disable to print Lua DSP script output to stdout
|
||||
videoSupport ? true,
|
||||
}:
|
||||
stdenv.mkDerivation (
|
||||
finalAttrs:
|
||||
let
|
||||
majorVersion = lib.versions.major finalAttrs.version;
|
||||
in
|
||||
{
|
||||
let
|
||||
videoInputs = [
|
||||
harvid
|
||||
xjadeo
|
||||
];
|
||||
|
||||
bundledContent = fetchzip {
|
||||
url = "https://web.archive.org/web/20221026200824/http://stuff.ardour.org/loops/ArdourBundledMedia.zip";
|
||||
hash = "sha256-IbPQWFeyMuvCoghFl1ZwZNNcSvLNsH84rGArXnw+t7A=";
|
||||
# archive does not contain a single folder at the root
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
generic = stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ardour";
|
||||
version = "9.7";
|
||||
|
||||
|
|
@ -83,13 +98,6 @@ stdenv.mkDerivation (
|
|||
hash = "sha256-6gtlnk/oPXWJcN5tcb1r7dXyLpHPTSJwd8VfOjjFnWQ=";
|
||||
};
|
||||
|
||||
bundledContent = fetchzip {
|
||||
url = "https://web.archive.org/web/20221026200824/http://stuff.ardour.org/loops/ArdourBundledMedia.zip";
|
||||
hash = "sha256-IbPQWFeyMuvCoghFl1ZwZNNcSvLNsH84rGArXnw+t7A=";
|
||||
# archive does not contain a single folder at the root
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# AS=as in the environment causes build failure https://tracker.ardour.org/view.php?id=8096
|
||||
./as-flags.patch
|
||||
|
|
@ -100,16 +108,21 @@ stdenv.mkDerivation (
|
|||
# Since they are not, let's generate the file manually.
|
||||
postPatch = ''
|
||||
printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = "${finalAttrs.version}"; const char* date = ""; }\n' > libs/ardour/revision.cc
|
||||
sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript
|
||||
patchShebangs ./tools/
|
||||
substituteInPlace libs/ardour/video_tools_paths.cc \
|
||||
--replace-fail 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${ffmpeg}/bin/ffmpeg");' \
|
||||
--replace-fail 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${ffmpeg}/bin/ffprobe");'
|
||||
--replace-fail 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${lib.getExe ffmpeg}");' \
|
||||
--replace-fail 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${lib.getExe' ffmpeg "ffprobe"}");'
|
||||
''
|
||||
+ lib.optionalString videoSupport ''
|
||||
substituteInPlace libs/ardour/video_tools_paths.cc \
|
||||
--replace-fail 'harvid_exe = "";' 'harvid_exe ="${lib.getExe harvid}";' \
|
||||
--replace-fail 'xjadeo_exe = X_("");' 'xjadeo_exe = X_("${lib.getExe' xjadeo "xjremote"}");'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
doxygen
|
||||
graphviz # for dot
|
||||
installShellFiles
|
||||
itstool
|
||||
makeWrapper
|
||||
perl
|
||||
|
|
@ -119,13 +132,11 @@ stdenv.mkDerivation (
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
aubio
|
||||
boost
|
||||
cairomm
|
||||
cppunit
|
||||
curl
|
||||
dbus
|
||||
ffmpeg
|
||||
fftw
|
||||
fftwSinglePrec
|
||||
|
|
@ -137,10 +148,10 @@ stdenv.mkDerivation (
|
|||
kissfft
|
||||
libarchive
|
||||
libjack2
|
||||
libjpeg
|
||||
liblo
|
||||
libltc
|
||||
libogg
|
||||
libpulseaudio
|
||||
librdf_rasqal
|
||||
libsamplerate
|
||||
libsigcxx
|
||||
|
|
@ -148,7 +159,6 @@ stdenv.mkDerivation (
|
|||
libusb1
|
||||
libuv
|
||||
libwebsockets
|
||||
libxi
|
||||
libxml2
|
||||
libxslt
|
||||
lilv
|
||||
|
|
@ -168,23 +178,14 @@ stdenv.mkDerivation (
|
|||
suil
|
||||
taglib
|
||||
vamp-plugin-sdk
|
||||
libxinerama
|
||||
libjpeg
|
||||
libxrandr
|
||||
]
|
||||
++ lib.optionals videoSupport [
|
||||
harvid
|
||||
xjadeo
|
||||
];
|
||||
++ lib.optionals videoSupport videoInputs;
|
||||
|
||||
wafConfigureFlags = [
|
||||
"--cxx17"
|
||||
"--docs"
|
||||
"--freedesktop"
|
||||
"--no-phone-home"
|
||||
"--ptformat"
|
||||
"--run-tests"
|
||||
"--test"
|
||||
# since we don't have https://github.com/agfline/LibAAF yet,
|
||||
# we need to use some of ardours internal libs, see:
|
||||
# https://discourse.ardour.org/t/ardour-8-2-released/109615/6
|
||||
|
|
@ -192,50 +193,36 @@ stdenv.mkDerivation (
|
|||
# https://discourse.ardour.org/t/ardour-8-2-released/109615/8
|
||||
# "--use-external-libs"
|
||||
]
|
||||
++ lib.optional finalAttrs.doCheck "--test"
|
||||
++ lib.optional optimize "--optimize";
|
||||
|
||||
env = {
|
||||
NIX_CFLAGS_COMPILE = toString [
|
||||
# 'ioprio_set' syscall support:
|
||||
"-D_GNU_SOURCE"
|
||||
# compiler doesn't find headers without these:
|
||||
"-I${lib.getDev serd}/include/serd-0"
|
||||
"-I${lib.getDev sratom}/include/sratom-0"
|
||||
"-I${lib.getDev sord}/include/sord-0"
|
||||
"-I${lib.getInclude serd}/include/serd-0"
|
||||
"-I${lib.getInclude sratom}/include/sratom-0"
|
||||
"-I${lib.getInclude sord}/include/sord-0"
|
||||
];
|
||||
LINKFLAGS = "-lpthread";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
# wscript does not install these for some reason
|
||||
install -vDm 644 "build/gtk2_ardour/ardour.xml" \
|
||||
-t "$out/share/mime/packages"
|
||||
install -vDm 644 "build/gtk2_ardour/ardour${majorVersion}.desktop" \
|
||||
-t "$out/share/applications"
|
||||
for size in 16 22 32 48 256 512; do
|
||||
install -vDm 644 "gtk2_ardour/resources/Ardour-icon_''${size}px.png" \
|
||||
"$out/share/icons/hicolor/''${size}x''${size}/apps/ardour${majorVersion}.png"
|
||||
done
|
||||
install -vDm 644 "ardour.1"* -t "$out/share/man/man1"
|
||||
installManPage ardour.1
|
||||
'';
|
||||
|
||||
# install additional bundled beats, chords and progressions
|
||||
cp -rp "${finalAttrs.bundledContent}"/* "$out/share/ardour${majorVersion}/media"
|
||||
''
|
||||
+ lib.optionalString videoSupport ''
|
||||
# `harvid` and `xjadeo` must be accessible in `PATH` for video to work.
|
||||
wrapProgram "$out/bin/ardour${majorVersion}" \
|
||||
--prefix PATH : "${
|
||||
lib.makeBinPath [
|
||||
harvid
|
||||
xjadeo
|
||||
]
|
||||
}"
|
||||
doCheck = true;
|
||||
|
||||
checkPhase = ''
|
||||
runHook preHook
|
||||
./waf test
|
||||
runHook postHook
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Multi-track hard disk recording software";
|
||||
longDescription = ''
|
||||
Ardour is a digital audio workstation (DAW), You can use it to
|
||||
Ardour is a digital audio workstation (DAW), you can use it to
|
||||
record, edit and mix multi-track audio and midi. Produce your
|
||||
own CDs. Mix video soundtracks. Experiment with new ideas about
|
||||
music and sound.
|
||||
|
|
@ -246,12 +233,148 @@ stdenv.mkDerivation (
|
|||
homepage = "https://ardour.org/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
mainProgram = "ardour9";
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
maintainers = with lib.maintainers; [
|
||||
magnetophon
|
||||
mitchmindtree
|
||||
ryand56
|
||||
];
|
||||
};
|
||||
}
|
||||
)
|
||||
});
|
||||
|
||||
linux = generic.overrideAttrs (
|
||||
finalAttrs:
|
||||
let
|
||||
majorVersion = lib.versions.major finalAttrs.version;
|
||||
in
|
||||
{
|
||||
postPatch = finalAttrs.postPatch + ''
|
||||
sed 's|/usr/include/libintl.h|${lib.getInclude glibc.dev}/include/libintl.h|' -i wscript
|
||||
'';
|
||||
|
||||
buildInputs = generic.buildInputs ++ [
|
||||
alsa-lib
|
||||
dbus
|
||||
libpulseaudio
|
||||
libxi
|
||||
libxinerama
|
||||
libxrandr
|
||||
];
|
||||
|
||||
wafConfigureFlags = finalAttrs.wafConfigureFlags ++ [ "--freedesktop" ];
|
||||
env.NIX_CFLAGS_COMPILE = finalAttrs.env.NIX_CFLAGS_COMPILE + "-D_GNU_SOURCE";
|
||||
|
||||
postInstall =
|
||||
finalAttrs.postInstall
|
||||
+ ''
|
||||
# wscript does not install these for some reason
|
||||
install -vDm 644 "build/gtk2_ardour/ardour.xml" \
|
||||
-t "$out/share/mime/packages"
|
||||
install -vDm 644 "build/gtk2_ardour/ardour${majorVersion}.desktop" \
|
||||
-t "$out/share/applications"
|
||||
for size in 16 22 32 48 256 512; do
|
||||
install -vDm 644 "gtk2_ardour/resources/Ardour-icon_''${size}px.png" \
|
||||
"$out/share/icons/hicolor/''${size}x''${size}/apps/ardour${majorVersion}.png"
|
||||
done
|
||||
|
||||
# install additional bundled beats, chords and progressions
|
||||
cp -rp "${bundledContent}"/* "$out/share/ardour${majorVersion}/media"
|
||||
''
|
||||
+ lib.optionalString videoSupport ''
|
||||
# `harvid` and `xjadeo` must be accessible in `PATH` for video to work.
|
||||
wrapProgram "$out/bin/ardour${majorVersion}" \
|
||||
--prefix PATH : "${lib.makeBinPath videoInputs}"
|
||||
'';
|
||||
}
|
||||
);
|
||||
|
||||
darwin' = generic.overrideAttrs (
|
||||
finalAttrs:
|
||||
let
|
||||
majorVersion = lib.versions.major finalAttrs.version;
|
||||
in
|
||||
{
|
||||
patches = finalAttrs.patches ++ [
|
||||
(fetchpatch {
|
||||
# TODO: Remove with the next release of Ardour
|
||||
url = "https://github.com/Ardour/ardour/commit/bff1ebbca2f50f1a0d2285efcf6e0c8237a07d8f.diff";
|
||||
hash = "sha256-Ye22S2bmRt+c/GrrvgWCDlzUqSwaOdAh5vFuJb/BqV8=";
|
||||
name = "fix-path-to-mo-files.diff";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = finalAttrs.postPatch + ''
|
||||
substituteInPlace wscript \
|
||||
--replace-fail '-DMAC_OS_X_VERSION_MAX_ALLOWED=110000' '-DMAC_OS_X_VERSION_MAX_ALLOWED=140000' \
|
||||
--replace-fail '-mmacosx-version-min=11.0' '-mmacosx-version-min=14'
|
||||
|
||||
substituteInPlace libs/tk/y{d,t}k/wscript \
|
||||
--replace-fail "'-xobjective-c'" "'-xobjective-c', '-DDISABLE_VISIBILITY'"
|
||||
|
||||
substituteInPlace tools/osx_packaging/osx_build \
|
||||
--replace-fail 'WITH_HARRISON_LV2=1' 'WITH_HARRISON_LV2=' \
|
||||
--replace-fail 'WITH_GMSYNTH=1' 'WITH_GMSYNTH=' \
|
||||
--replace-fail 'WITH_HARVID=1' 'WITH_HARVID=' \
|
||||
--replace-fail 'WITH_XJADEO=1' 'WITH_XJADEO=' \
|
||||
--replace-fail '`hostname`' 'localhost' \
|
||||
--replace-fail '`whoami`' 'nixbld' \
|
||||
--replace-fail '../../build' "$PWD/build" \
|
||||
--replace-fail 'echo "Building DMG ..."' 'exit 0'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = finalAttrs.nativeBuildInputs ++ [
|
||||
darwin.DarwinTools
|
||||
fixDarwinDylibNames
|
||||
which
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
buildInputs = finalAttrs.buildInputs ++ [
|
||||
apple-sdk
|
||||
];
|
||||
|
||||
wafBuildTargets = [
|
||||
"build"
|
||||
"i18n"
|
||||
];
|
||||
|
||||
wafConfigureFlags = finalAttrs.wafConfigureFlags ++ [ "--with-backends=coreaudio,jack,dummy" ];
|
||||
|
||||
postBuild = ''
|
||||
# NOTE: The .so files are symlinks to the actual .dylib files.
|
||||
install_name_tool \
|
||||
-change libvamp-sdk.so "${lib.getLib vamp-plugin-sdk}/lib/libvamp-sdk.so" \
|
||||
-change libvamp-hostsdk.so "${lib.getLib vamp-plugin-sdk}/lib/libvamp-hostsdk.so" \
|
||||
"build/gtk2_ardour/ardour-${finalAttrs.version}.0"
|
||||
|
||||
(
|
||||
cd tools/osx_packaging
|
||||
./osx_build --public
|
||||
)
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
# NOTE: The .so files are symlinks to the actual .dylib files.
|
||||
install_name_tool \
|
||||
-change libvamp-sdk.so "${lib.getLib vamp-plugin-sdk}/lib/libvamp-sdk.so" \
|
||||
-change libvamp-hostsdk.so "${lib.getLib vamp-plugin-sdk}/lib/libvamp-hostsdk.so" \
|
||||
"build/libs/audiographer/run-tests"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out"/{Applications,bin}
|
||||
mv "tools/osx_packaging/Ardour/Ardour${majorVersion}.app/" "$out/Applications/"
|
||||
ln -s "$out/Applications/Ardour${majorVersion}.app/Contents/MacOS/Ardour${majorVersion}" \
|
||||
"$out/bin/ardour${majorVersion}"
|
||||
|
||||
# install additional bundled beats, chords and progressions
|
||||
cp -rp "${bundledContent}"/* "$out/Applications/Ardour${majorVersion}.app/Contents/Resources/media"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
}
|
||||
);
|
||||
in
|
||||
if stdenv.hostPlatform.isLinux then linux else darwin'
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "ayatana-webmail";
|
||||
version = "24.5.17";
|
||||
version = "26.6.13";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AyatanaIndicators";
|
||||
repo = "ayatana-webmail";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-k557FWKGq2MXODVxVzOetC5kkwTNYOoLO8msCOabais=";
|
||||
hash = "sha256-AVH4SQ2yoC2SXuKt8MJVGAgB32cTOD7mCVxcBZn/PPM=";
|
||||
};
|
||||
postConfigure = ''
|
||||
# Fix fhs paths
|
||||
|
|
|
|||
10
pkgs/by-name/ba/backrest/inlang-plugins.json
Normal file
10
pkgs/by-name/ba/backrest/inlang-plugins.json
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
{
|
||||
"https://cdn.jsdelivr.net/npm/@inlang/plugin-message-format@4/dist/index.js": {
|
||||
"url": "https://cdn.jsdelivr.net/npm/@inlang/plugin-message-format@4.4.0/dist/index.js",
|
||||
"hash": "sha256-lIZViAHAjrsBgiPFHCBEtsPCP8KowOeJSleIKzT+tso="
|
||||
},
|
||||
"https://cdn.jsdelivr.net/npm/@inlang/plugin-m-function-matcher@2/dist/index.js": {
|
||||
"url": "https://cdn.jsdelivr.net/npm/@inlang/plugin-m-function-matcher@2.2.9/dist/index.js",
|
||||
"hash": "sha256-hYYvYwV5O1a/2a/lNosJbmP7Kuqzi3eZwFFRe+NJnAs="
|
||||
}
|
||||
}
|
||||
|
|
@ -2,47 +2,79 @@
|
|||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
gzip,
|
||||
fetchurl,
|
||||
iana-etc,
|
||||
lib,
|
||||
libredirect,
|
||||
nodejs,
|
||||
pnpm_9,
|
||||
pnpm_11,
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
restic,
|
||||
stdenv,
|
||||
util-linux,
|
||||
makeBinaryWrapper,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
_experimental-update-script-combinators,
|
||||
}:
|
||||
let
|
||||
pnpm = pnpm_11;
|
||||
|
||||
pname = "backrest";
|
||||
version = "1.10.1";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "garethgeorge";
|
||||
repo = "backrest";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8WWs7XEVKAc/XmeL+dsw25azfLjUbHKp2MsB6Be14VE=";
|
||||
hash = "sha256-JcrHQDjoaaK6BONEcn6XKsjhGlth4SaZKqfxa3cD0gY=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
cd "$out"
|
||||
git rev-parse HEAD > $out/COMMIT
|
||||
find "$out" -name .git -print0 | xargs -0 rm -rf
|
||||
'';
|
||||
};
|
||||
|
||||
# we need to pin the inlang plugins to specific versions because
|
||||
# the remote ones are not pinned and we can't fetch them in the sandbox.
|
||||
inlang-plugins = lib.mapAttrs (remote: info: fetchurl { inherit (info) url hash; }) (
|
||||
lib.importJSON ./inlang-plugins.json
|
||||
);
|
||||
|
||||
frontend = stdenv.mkDerivation (finalAttrs: {
|
||||
inherit version;
|
||||
pname = "${pname}-webui";
|
||||
src = "${src}/webui";
|
||||
inherit version src;
|
||||
pname = "backrest-webui";
|
||||
sourceRoot = "${finalAttrs.src.name}/webui";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
pnpmConfigHook
|
||||
pnpm_9
|
||||
pnpm
|
||||
];
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_9;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-9wzPNZxLE0l/AJ8SyE0SkhkBImiibhqJgsG3UrGj3aA=";
|
||||
inherit pnpm;
|
||||
sourceRoot = "${finalAttrs.src.name}/webui";
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-xPZg7kYRlqdO/EfZr+m+IVhDcyYegQ6v8ZAF2EjrKjU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Replace remote inlang plugins with local ones
|
||||
${lib.concatStringsSep "\n" (
|
||||
lib.mapAttrsToList (remote: local: ''
|
||||
substituteInPlace project.inlang/settings.json \
|
||||
--replace-fail "${remote}" "${local}"
|
||||
'') inlang-plugins
|
||||
)}
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
export BACKREST_BUILD_VERSION=${version}
|
||||
|
|
@ -52,14 +84,20 @@ let
|
|||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir $out
|
||||
cp -r dist/* $out
|
||||
mv dist $out
|
||||
runHook postInstall
|
||||
'';
|
||||
});
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname src version;
|
||||
buildGoModule (finalAttrs: {
|
||||
inherit
|
||||
pname
|
||||
src
|
||||
version
|
||||
;
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e \
|
||||
|
|
@ -68,16 +106,26 @@ buildGoModule {
|
|||
internal/resticinstaller/resticinstaller.go
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-cYqK/sddLI38K9bzCpnomcZOYbSRDBOEru4Y26rBLFw=";
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-1PecXGXdSu4FzOKVZ15lTLLPy3VlLiGvGeTUDzqe9sc=";
|
||||
|
||||
subPackages = [ "cmd/backrest" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gzip
|
||||
makeBinaryWrapper
|
||||
];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-X main.version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
ldflags+=" -X main.commit=$(cat COMMIT)"
|
||||
|
||||
mkdir -p ./webui/dist
|
||||
cp -r ${frontend}/* ./webui/dist
|
||||
cp -r ${finalAttrs.passthru.frontend}/* ./webui/dist
|
||||
|
||||
go generate -skip="npm" ./...
|
||||
'';
|
||||
|
|
@ -102,9 +150,9 @@ buildGoModule {
|
|||
in
|
||||
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
|
||||
|
||||
# Use restic from nixpkgs, otherwise download fails in sandbox
|
||||
preCheck = ''
|
||||
# Use restic from nixpkgs, otherwise download fails in sandbox
|
||||
export BACKREST_RESTIC_COMMAND="${restic}/bin/restic"
|
||||
export BACKREST_RESTIC_COMMAND="${lib.getExe restic}"
|
||||
export HOME=$(pwd)
|
||||
''
|
||||
+ lib.optionalString (stdenv.hostPlatform.isDarwin) ''
|
||||
|
|
@ -118,13 +166,34 @@ buildGoModule {
|
|||
--set-default BACKREST_RESTIC_COMMAND "${lib.getExe restic}"
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
versionCheckProgramArg = "-version";
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
passthru = {
|
||||
inherit frontend inlang-plugins;
|
||||
updateScript = _experimental-update-script-combinators.sequence [
|
||||
(nix-update-script {
|
||||
extraArgs = [
|
||||
"--subpackage"
|
||||
"frontend"
|
||||
];
|
||||
})
|
||||
./update-inlang-plugins.sh
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Web UI and orchestrator for restic backup";
|
||||
homepage = "https://github.com/garethgeorge/backrest";
|
||||
changelog = "https://github.com/garethgeorge/backrest/releases/tag/v${version}";
|
||||
changelog = "https://github.com/garethgeorge/backrest/releases/tag/${finalAttrs.src.rev}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ iedame ];
|
||||
maintainers = with lib.maintainers; [
|
||||
iedame
|
||||
alexandru0-dev
|
||||
phanirithvij
|
||||
];
|
||||
mainProgram = "backrest";
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
55
pkgs/by-name/ba/backrest/update-inlang-plugins.sh
Executable file
55
pkgs/by-name/ba/backrest/update-inlang-plugins.sh
Executable file
|
|
@ -0,0 +1,55 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p jq curl common-updater-scripts
|
||||
|
||||
set -exuo pipefail
|
||||
|
||||
SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
|
||||
|
||||
SETTINGS_FILE="$(nix-build -A "backrest.src")/webui/project.inlang/settings.json"
|
||||
|
||||
MODULES=$(cat "$SETTINGS_FILE" | jq -r '.modules[]')
|
||||
|
||||
# Initialize an empty JSON object
|
||||
PLUGINS_JSON="{}"
|
||||
|
||||
for remote_url in $MODULES; do
|
||||
echo "Processing $remote_url..." >&2
|
||||
|
||||
final_url="$remote_url"
|
||||
|
||||
# Matches: https://cdn.jsdelivr.net/npm/((@[^/]+/[^@/]+|[^@/]+)@([^/]+))(/.*)?$
|
||||
# Group 1: Full identifier (e.g. @scope/pkg@1)
|
||||
# Group 2: Package name (e.g. @scope/pkg or pkg)
|
||||
# Group 3: Version/Tag/Alias (e.g. 4 or latest)
|
||||
# Group 4: Sub-path (e.g. /dist/index.js)
|
||||
if [[ $remote_url =~ ^https://cdn.jsdelivr.net/npm/((@[^/]+/[^@/]+|[^@/]+)@([^/]+))(/.*)?$ ]]; then
|
||||
pkg_full="${BASH_REMATCH[1]}"
|
||||
pkg_name="${BASH_REMATCH[2]}"
|
||||
current_ver="${BASH_REMATCH[3]}"
|
||||
path="${BASH_REMATCH[4]}"
|
||||
|
||||
# Construct package.json URL to find the exact version
|
||||
PKG_JSON_URL="https://cdn.jsdelivr.net/npm/$pkg_name@$current_ver/package.json"
|
||||
# echo " Fetching package.json from $PKG_JSON_URL" >&2
|
||||
|
||||
RESOLVED_VERSION=$(curl -s "$PKG_JSON_URL" | jq -r .version || true)
|
||||
|
||||
if [[ -n "$RESOLVED_VERSION" && "$RESOLVED_VERSION" != "null" ]]; then
|
||||
final_url="https://cdn.jsdelivr.net/npm/$pkg_name@$RESOLVED_VERSION$path"
|
||||
echo " Resolved version $RESOLVED_VERSION from package.json" >&2
|
||||
fi
|
||||
fi
|
||||
|
||||
echo " Pinned to $final_url" >&2
|
||||
|
||||
hash=$(nix-prefetch-url "$final_url")
|
||||
sri=$(nix hash convert --hash-algo sha256 --to sri "$hash")
|
||||
|
||||
# Add to JSON object using jq
|
||||
PLUGINS_JSON=$(echo "$PLUGINS_JSON" | jq --arg remote "$remote_url" --arg url "$final_url" --arg hash "$sri" \
|
||||
'. + {($remote): {url: $url, hash: $hash}}')
|
||||
done
|
||||
|
||||
echo "$PLUGINS_JSON" | jq . > "$SCRIPT_DIR/inlang-plugins.json"
|
||||
|
||||
echo "Updated $SCRIPT_DIR/inlang-plugins.json"
|
||||
|
|
@ -11,9 +11,15 @@ stdenv.mkDerivation {
|
|||
version = "${kernel.version}-${bcachefs-tools.version}";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
src = bcachefs-tools.dkms;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/fs/bcachefs/Makefile \
|
||||
--replace-fail '$(objtree)/vmlinux' '${kernel.dev}/vmlinux'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -30,18 +30,18 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bcachefs-tools";
|
||||
version = "1.38.5";
|
||||
version = "1.38.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "koverstreet";
|
||||
repo = "bcachefs-tools";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-EXd+BOTAFUddK/4Vwi7GqRqndi2x4bb5gs7IIkMX6HU=";
|
||||
hash = "sha256-VNY9kURuXky504utCZ0Ye76mDG2TFAdzrgYI2iup/PI=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-6uwvwOVPYtegXTPwz2SEeQPC6OrKoFWZrH4Nx+ZVa5A=";
|
||||
hash = "sha256-rajYbfE98j/YqniUoV66LHh22PwEc6sWWJ/7bgGgGtA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -22,10 +22,10 @@
|
|||
}:
|
||||
mkDerivation {
|
||||
pname = "bruijn";
|
||||
version = "0-unstable-2026-05-02";
|
||||
version = "0-unstable-2026-05-03";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/marvinborner/bruijn/archive/8a88445d1f0d970c88cdb0e1b97a04ba02019a94.tar.gz";
|
||||
sha256 = "12s2sa9zg6sxia36mm0z8fq7f3kd86g96gcwd8xnb8dl49x8qbd5";
|
||||
url = "https://github.com/marvinborner/bruijn/archive/b5cb32a7bb3b44f58f9e909bfd394564be26d50a.tar.gz";
|
||||
sha256 = "1k9sgl4h4da1qr9r1laz72rscxsicr5sjmla8qx7px0g1iajl0dn";
|
||||
};
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
#
|
||||
# from the root of the nixpkgs git repository, run:
|
||||
#
|
||||
# nix-shell maintainers/scripts/update.nix --argstr commit true --argstr package buck2
|
||||
# nix-shell maintainers/scripts/update.nix --arg commit true --argstr package buck2
|
||||
|
||||
let
|
||||
|
||||
|
|
|
|||
|
|
@ -23,13 +23,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "buildbox";
|
||||
version = "1.4.8";
|
||||
version = "1.4.10";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "BuildGrid";
|
||||
repo = "buildbox/buildbox";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-P7CFgK5CkHAf5gddmm0SBGIkC/AAdCO5pkya/XNuby0=";
|
||||
hash = "sha256-WWvaOPOckqyZ1ehEbPLcsP8qET9cq/3PkG0ep37ypn0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,16 +8,18 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "bunbun";
|
||||
version = "1.5.0";
|
||||
version = "1.6.1";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "devraza";
|
||||
repo = "bunbun";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-3f/G0Vx1uXeH3QMDVUAHWi4Pf/B88/4F+4XywVsp3/4=";
|
||||
# There is no 1.6.1 tag on github. This corresponds to the commit of the release.
|
||||
rev = "595857b1cd03b907e97c7eb0effc29fe973821bf";
|
||||
hash = "sha256-TaAlEST6WLPTlYADzAA4i46dr4Bo+fButu65g43EvWo";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-2pgQB2myEnLvrU3ApNL/bwaVcGku+X/TjR6YBqXD7Xg=";
|
||||
cargoHash = "sha256-tL70RQ8YOSHyyTnPjg7IiuCEhb4EF4xIkT8HMMXhc9g";
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cantus";
|
||||
version = "0.6.7";
|
||||
version = "0.6.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CodedNil";
|
||||
repo = "cantus";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-JoxGn3AaILLW2vWwPZ06Dr+JF0Cc1P0X7BeJBNGJBuI=";
|
||||
hash = "sha256-TRqWhoRlinNzLdxODs4bR5IgJR6ELKs4SOOpvtoFNFA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-GIB/QWBjlpkyxeTz15Hf4mr660R++mSf1J+K4JZ+YXY=";
|
||||
cargoHash = "sha256-YUXEgeZn0UXh34RnCaqLhhK0QSPz3Y8XJuR2oMa4rIU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-binstall";
|
||||
version = "1.20.0";
|
||||
version = "1.20.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cargo-bins";
|
||||
repo = "cargo-binstall";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-EnHBXdaER23fvYJ3iW4JqpE1Qap/sQottkqllNA2n18=";
|
||||
hash = "sha256-G6uOBdLpn5Dp91XUL+DY4MY1dqXcs0OxpR4Ls1yTnS8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-p/IfFnFB7vJPVJH2SvnLagXh9zxLgNxEcZILQcIqnVo=";
|
||||
cargoHash = "sha256-x9HHo/y6ikCOY1O5kScTBOY/nzvJ0P8EIIU6eRgzzXI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -14,16 +14,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "tauri";
|
||||
version = "2.11.2";
|
||||
version = "2.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tauri-apps";
|
||||
repo = "tauri";
|
||||
tag = "tauri-cli-v${finalAttrs.version}";
|
||||
hash = "sha256-BH/tQlrmCMAab5LqQ/xl9+A5nCnN8sk6mavvAkajYHM=";
|
||||
hash = "sha256-PPzAN+qWwtcZj6amK/TIz+OZrE3URtptvHe87NpplzA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-QX151ckeSxbZgbFO88zhsvnNnjZffLpR5dDp1Dv1Wlo=";
|
||||
cargoHash = "sha256-r/CzW2tpnjzksmuzL9EBa7dMuIYD4pvZdX2XCnNcOYE=";
|
||||
|
||||
nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -31,13 +31,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cherry-studio";
|
||||
version = "1.9.9";
|
||||
version = "1.9.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CherryHQ";
|
||||
repo = "cherry-studio";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-TFmzQmZlRFTJa7KaHVj370n2YZuwXy8mCRFrKsf0w24=";
|
||||
hash = "sha256-NbjFPHMh8LSqUv3wpXI/hBU9aJFe76l5UyoZ2XqX0hg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
inherit (finalAttrs) pname version src;
|
||||
inherit pnpm;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-wJPiEjIOReB/JCer6pdODnDfQ12zm9vPv79iaiyTp3I=";
|
||||
hash = "sha256-9Vx4WzQjwNxPAkz+FjjqnMQxJviP4e0EhkQBN9Y+ujo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -39,13 +39,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cinnamon-session";
|
||||
version = "6.6.3";
|
||||
version = "6.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "cinnamon-session";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-fmeLywpM4QhgyiX68E+4vosUK2WKGVJ1Cx8pYdOnb+k=";
|
||||
hash = "sha256-rx7+tBXQ9kvnRYNxgF1QXyhk9NamUIjti/6GGrACYU0=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# NOTE: Use the following command to update the package
|
||||
# ```sh
|
||||
# nix-shell maintainers/scripts/update.nix --argstr commit true --arg predicate '(path: pkg: builtins.elem path [["claude-code"] ["vscode-extensions" "anthropic" "claude-code"]])'
|
||||
# nix-shell maintainers/scripts/update.nix --arg commit true --arg predicate '(path: pkg: builtins.elem path [["claude-code"] ["vscode-extensions" "anthropic" "claude-code"]])'
|
||||
# ```
|
||||
{
|
||||
lib,
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cliamp";
|
||||
version = "1.57.0";
|
||||
version = "1.57.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bjarneo";
|
||||
repo = "cliamp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-tfPtc+YgtmuzdWod6EM0MJSoYLxLnQskuNRQbLRp4g8=";
|
||||
hash = "sha256-wRXF2bnl3xFJtuESJX2UVSsPwl4xo6E+k7nIdtzCULo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-A2Ygc1a9e2flZzaNAEXvr8Ui1cE89TxBfUNALmDzIo0=";
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "coturn";
|
||||
version = "4.9.0";
|
||||
version = "4.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coturn";
|
||||
repo = "coturn";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-NSdmz5ZkzgP+kP6iutYX8+l1b4ErgB+kicskTn6OlRE=";
|
||||
hash = "sha256-66bPrw/jUleEOKBBdNDa8qyxxQCiLk5saTnUQfDdTak=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cppcheck";
|
||||
version = "2.21.0";
|
||||
version = "2.21.1";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
|
|
@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
owner = "cppcheck-opensource";
|
||||
repo = "cppcheck";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-y7P25ThLC54IwuMIc4UGt9bz1HoafB0/b2rus28GcGo=";
|
||||
hash = "sha256-kpolGzSk+1lY8EXFciAimhUlv7we3bMbu2/Y0DlO4YU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -67,6 +67,6 @@ stdenv.mkDerivation {
|
|||
homepage = "https://github.com/NickPlayzGITHUB/CrossPatch";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ toodeluna ];
|
||||
maintainers = with lib.maintainers; [ luna-the-tuna ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dblab";
|
||||
version = "0.40.2";
|
||||
version = "0.41.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danvergara";
|
||||
repo = "dblab";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-nEUKRI1pukVDsUvPIubujcy/O1E0t3ESRT0aem5HL78=";
|
||||
hash = "sha256-o2wXVsPYW3E3LV+zij40aHooinm/2YrLDyC3jr6flEc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-T1y0ALF4s3T8ZaTqj2jUdnezVRmpegKnabahiQ3CgzA=";
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ddccontrol-db";
|
||||
version = "20260610";
|
||||
version = "20260611";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddccontrol";
|
||||
repo = "ddccontrol-db";
|
||||
tag = finalAttrs.version;
|
||||
sha256 = "sha256-/3TWnBHPP3SyrsVcxiVkHxPITZDqQPF7HaMIaVnCT4M=";
|
||||
sha256 = "sha256-wK6PuUy+2qeh935Oz26MMjlfB+PmRSPQMIYCnBGfThE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "desync";
|
||||
version = "1.0.0";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "folbricht";
|
||||
repo = "desync";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-aRxWq9gGfglfBixS7xOoj8r29rJRAfGj4ydcSFf/7P0=";
|
||||
hash = "sha256-rdwUoTwN/fG4fsOY4mCcg0bzWMErFaxBe72RtmHohdA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ywID0txn7L6+QkYNvGvO5DTsDQBZLU+pGwNd3q7kLKI=";
|
||||
vendorHash = "sha256-unwaA+WNyaJbNrOFvjXeMI2YbNTpGBrjwBGXhvOfj0M=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
apksigcopier,
|
||||
apksigner,
|
||||
apktool,
|
||||
asar,
|
||||
binutils-unwrapped-all-targets,
|
||||
bzip2,
|
||||
cbfstool,
|
||||
|
|
@ -23,10 +24,10 @@
|
|||
enableBloat ? true,
|
||||
enjarify,
|
||||
fetchurl,
|
||||
ffmpeg,
|
||||
file,
|
||||
findutils,
|
||||
fontforge-fonttools,
|
||||
ffmpeg,
|
||||
fpc,
|
||||
gettext,
|
||||
ghc,
|
||||
|
|
@ -54,6 +55,7 @@
|
|||
oggvideotools,
|
||||
openssh,
|
||||
openssl,
|
||||
p7zip,
|
||||
pdftk,
|
||||
perl,
|
||||
pgpdump,
|
||||
|
|
@ -75,7 +77,6 @@
|
|||
xz,
|
||||
zip,
|
||||
zstd,
|
||||
binwalk,
|
||||
# updater only
|
||||
writeScript,
|
||||
}:
|
||||
|
|
@ -108,12 +109,12 @@ in
|
|||
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "diffoscope";
|
||||
version = "319";
|
||||
version = "321";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
|
||||
hash = "sha256-oIEC3ssdp0p2cE0VunTv6oo5CFuMQyftr4e5kqWmfP4=";
|
||||
hash = "sha256-M/rsyUGlJDpU3o1RMfaN9fNMpOn9Xpz2ydflPUXVhD4=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
|
@ -121,7 +122,11 @@ python.pkgs.buildPythonApplication rec {
|
|||
"man"
|
||||
];
|
||||
|
||||
patches = [ ./ignore_links.patch ];
|
||||
patches = [
|
||||
./ignore_links.patch
|
||||
# Remove flags output from an OCaml test's diff, as it's Debian-specific
|
||||
./remove-flags-from-ocaml-diff.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# When generating manpage, use the installed version
|
||||
|
|
@ -145,18 +150,14 @@ python.pkgs.buildPythonApplication rec {
|
|||
# Still missing these tools:
|
||||
# Android-specific tools:
|
||||
# dexdump
|
||||
# Darwin-specific tools:
|
||||
# Darwin-specific tools (llvm-lipo and llvm-otool don't suffice):
|
||||
# lipo
|
||||
# otool
|
||||
# Other tools:
|
||||
# docx2txt <- makes tests broken:
|
||||
# > FAILED tests/comparators/test_docx.py::test_diff - IndexError: list index out of range
|
||||
# > FAILED tests/comparators/test_docx.py::test_compare_non_existing - AssertionError
|
||||
# docx2txt (needs Debian's package called this, not the python package)
|
||||
# radare2
|
||||
# > FAILED tests/comparators/test_elf_decompiler.py::test_ghidra_diff - IndexError: list index out of range
|
||||
# > FAILED tests/comparators/test_elf_decompiler.py::test_radare2_diff - AssertionError
|
||||
# > FAILED tests/comparators/test_macho_decompiler.py::test_ghidra_diff - assert 0 == 1
|
||||
# > FAILED tests/comparators/test_macho_decompiler.py::test_radare2_diff - AssertionError
|
||||
# > FAILED tests/comparators/test_elf_decompiler.py::test_radare2_diff - KeyError: 'offset'
|
||||
# > FAILED tests/comparators/test_macho_decompiler.py::test_radare2_diff - KeyError: 'offset'
|
||||
#
|
||||
# We filter automatically all packages for the host platform (some dependencies are not supported on Darwin, aarch64, etc.).
|
||||
# Packages which are marked broken for a platform are not automatically filtered to avoid accidentally removing them without noticing it.
|
||||
|
|
@ -197,13 +198,13 @@ python.pkgs.buildPythonApplication rec {
|
|||
]
|
||||
++ (with python.pkgs; [
|
||||
argcomplete
|
||||
python-debian
|
||||
defusedxml
|
||||
jsbeautifier
|
||||
jsondiff
|
||||
libarchive-c
|
||||
progressbar
|
||||
pypdf
|
||||
python-debian
|
||||
python-magic
|
||||
pyxattr
|
||||
rpm
|
||||
|
|
@ -214,6 +215,7 @@ python.pkgs.buildPythonApplication rec {
|
|||
abootimg
|
||||
apksigcopier
|
||||
apksigner
|
||||
asar
|
||||
cbfstool
|
||||
colord
|
||||
enjarify
|
||||
|
|
@ -234,6 +236,7 @@ python.pkgs.buildPythonApplication rec {
|
|||
odt2txt
|
||||
oggvideotools
|
||||
openssh
|
||||
p7zip
|
||||
pdftk
|
||||
perl
|
||||
poppler-utils
|
||||
|
|
@ -245,7 +248,6 @@ python.pkgs.buildPythonApplication rec {
|
|||
ubootTools
|
||||
wabt
|
||||
xmlbeans
|
||||
binwalk
|
||||
]
|
||||
++ (with python.pkgs; [
|
||||
androguard
|
||||
|
|
@ -254,11 +256,10 @@ python.pkgs.buildPythonApplication rec {
|
|||
h5py
|
||||
pdfminer-six
|
||||
r2pipe
|
||||
# docx2txt, nixpkgs packages another project named the same, which does not work
|
||||
])
|
||||
# Causes an eval failure
|
||||
# See https://github.com/NixOS/nixpkgs/issues/463873
|
||||
++ lib.optionals (!stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch64) [
|
||||
++ lib.optionals (!stdenv.hostPlatform.isLinux || !stdenv.hostPlatform.isAarch64) [
|
||||
aapt
|
||||
apktool
|
||||
]
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
From 18cf9ab675691c7173a9b7fafd6d521c3ea75862 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Daniels <mdaniels5757@gmail.com>
|
||||
Date: Sat, 20 Jun 2026 11:42:29 -0400
|
||||
Subject: [PATCH] tests/data/ocaml_expected_diff: remove flags from diff
|
||||
|
||||
This output comes from a Debian-specific OCaml patch, see
|
||||
https://salsa.debian.org/ocaml-team/ocaml/-/blob/archive/debian/5.4.1-1/debian/patches/Print-.cmi-flags-in-objinfo.patch
|
||||
---
|
||||
tests/data/ocaml_expected_diff | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tests/data/ocaml_expected_diff b/tests/data/ocaml_expected_diff
|
||||
index 79631882..a48de841 100644
|
||||
--- a/tests/data/ocaml_expected_diff
|
||||
+++ b/tests/data/ocaml_expected_diff
|
||||
@@ -1,7 +1,6 @@
|
||||
-@@ -1,6 +1,6 @@
|
||||
+@@ -1,5 +1,5 @@
|
||||
-Unit name: Test1
|
||||
+Unit name: Test2
|
||||
- Flags: [ Alerts _ ]
|
||||
Interfaces imported:
|
||||
- 351c2dc2fb4a56dac258b47c26262db6 Test1
|
||||
+ ac02205dc900024a67ede9f394c59d72 Test2
|
||||
--
|
||||
2.54.0
|
||||
|
||||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "dotenvx";
|
||||
version = "1.71.2";
|
||||
version = "1.75.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dotenvx";
|
||||
repo = "dotenvx";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-51mmOF03j+JpyE4fyoqmZdgHtAOPhdEQiUTTATPFujM=";
|
||||
hash = "sha256-pcn4YyFMba8oX0gFrlHHuKucMy+F0FMtM/FaSb6ZWDE=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-3+Dn4XE5BH3QfeHVILLP/3ZESmhbYuzfT6IAIOLCJkQ=";
|
||||
npmDepsHash = "sha256-RucWpXNW1whEyqRtqtaq6NiGz9/Jh5N9N4GUP92/k44=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
description = "Auto formatter for device tree files";
|
||||
homepage = "https://github.com/mskelton/dtsfmt";
|
||||
license = lib.licenses.isc;
|
||||
maintainers = with lib.maintainers; [ toodeluna ];
|
||||
maintainers = with lib.maintainers; [ luna-the-tuna ];
|
||||
mainProgram = "dtsfmt";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "evtx";
|
||||
version = "0.12.1";
|
||||
version = "0.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "omerbenamram";
|
||||
repo = "evtx";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-zmXRUA2+x697AptONn5VUVySp4zz+VHwt8dqd6pJBGI=";
|
||||
hash = "sha256-RNJIYTSV1czMNAs8Aqu9nDt/mvaC6uLRv9ra8vCShNA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-5Jw+zem0XLLvn3tELXk8vTnH2zvUr82qFx9QUYUwXyY=";
|
||||
cargoHash = "sha256-kJkMk4bfmijo7IX1XopibFnouahK8sn1SDQtX9ha898=";
|
||||
|
||||
postPatch = ''
|
||||
# CLI tests will fail in the sandbox
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "2.63.14";
|
||||
version = "2.63.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "filebrowser";
|
||||
repo = "filebrowser";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-9CXHoQWr1RpTwFR8JRR72oQZxHrndTrnxYa6/0Z3Mk0=";
|
||||
hash = "sha256-O2USjwP1g+yDZpz0628YTRN2BUUnmjFvS+0qc6JU294=";
|
||||
};
|
||||
|
||||
frontend = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
|
@ -62,7 +62,7 @@ buildGoModule {
|
|||
pname = "filebrowser";
|
||||
inherit version src;
|
||||
|
||||
vendorHash = "sha256-ofeQkbvBfCpu2g1CLAwUZAZISyAOz+0smEZRx/koj/8=";
|
||||
vendorHash = "sha256-WXbXD75acK4woS7UC0G73pY48aGmp1l0spDc3sGYXMg=";
|
||||
|
||||
excludedPackages = [ "tools" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
sqlite,
|
||||
libjpeg,
|
||||
speex,
|
||||
pcre,
|
||||
pcre2,
|
||||
libuuid,
|
||||
ldns,
|
||||
libedit,
|
||||
|
|
@ -109,12 +109,12 @@ in
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "freeswitch";
|
||||
version = "1.10.12";
|
||||
version = "1.11.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "signalwire";
|
||||
repo = "freeswitch";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-uOO+TpKjJkdjEp4nHzxcHtZOXqXzpkIF3dno1AX17d8=";
|
||||
hash = "sha256-uXn5MLEsGPfRzTQJ/v3Tq1yXVIWZQwNQIyvZulMxSqU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -146,7 +146,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
readline
|
||||
libjpeg
|
||||
sqlite
|
||||
pcre
|
||||
pcre2
|
||||
speex
|
||||
ldns
|
||||
libedit
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gearboy";
|
||||
version = "3.8.6";
|
||||
version = "3.8.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drhelius";
|
||||
repo = "Gearboy";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-HdTypXuIVMl3y83RbjNviAtgl2KwCU+faI6ZcG2P/LY=";
|
||||
hash = "sha256-0HAhYvj1vypDR9OhJDCb5Cyjqwe6s9DDuMUF0rngPtM=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gh-aw";
|
||||
version = "0.68.3";
|
||||
version = "0.79.8";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
|
|
@ -14,10 +14,10 @@ buildGoModule (finalAttrs: {
|
|||
owner = "github";
|
||||
repo = "gh-aw";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-P3psfcuzLJ0W+3iJbPI7lfWiy8CIfZsYyY/4bcLEEjs=";
|
||||
hash = "sha256-n1w235wCvHZs48PWIu3v4qob3SQPt1kMLszHe/7Rcwg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1BMh4mC62usE4pUCU5osHm1a1pBrXsp4YCumvvcAHIY=";
|
||||
vendorHash = "sha256-GgDf2Ly8Vs/FTqk3w5yNYn/X1bWyfUBWhfl8QH2WFVg=";
|
||||
|
||||
subPackages = [ "cmd/gh-aw" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -29,8 +29,8 @@ let
|
|||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
inherit pnpm;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-Qo0DLuZv+2GVLsBfCv/6CC9E/qhSE4HwV4StQL4HX4Y=";
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-FroVRhNzCLtbW9Z0s6xr4l0mIX+hY4KOomZAhPILWlY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -39,6 +39,8 @@ let
|
|||
pnpm
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
buildPhase = ''
|
||||
make frontend
|
||||
'';
|
||||
|
|
@ -49,20 +51,20 @@ let
|
|||
'';
|
||||
});
|
||||
in
|
||||
buildGoModule rec {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gitea";
|
||||
version = "1.26.2";
|
||||
version = "1.26.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "go-gitea";
|
||||
repo = "gitea";
|
||||
tag = "v${gitea.version}";
|
||||
hash = "sha256-S7KV7soOnVQbw+2Ru7+DOL3Q4uWmSSdR6K90yofQlqw=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-xfLhiQMygYKgSMrvmH2V/LIMeaA4ovOeUDT4RUwhvgo=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-7+M1n8RSgB3gZ/2na4RF9kYOf90H0bnsJZMDKpgAy64=";
|
||||
vendorHash = "sha256-VyzfBZnxnubNIdf+xwLav4W4DgapcLLKN1aKrZ9NbDg=";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
|
|
@ -99,8 +101,8 @@ buildGoModule rec {
|
|||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.Version=${version}"
|
||||
"-X 'main.Tags=${lib.concatStringsSep " " tags}'"
|
||||
"-X main.Version=${finalAttrs.version}"
|
||||
"-X 'main.Tags=${lib.concatStringsSep " " finalAttrs.tags}'"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
|
@ -133,6 +135,7 @@ buildGoModule rec {
|
|||
meta = {
|
||||
description = "Git with a cup of tea";
|
||||
homepage = "https://about.gitea.com";
|
||||
changelog = "https://github.com/go-gitea/gitea/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
techknowlogick
|
||||
|
|
@ -140,4 +143,4 @@ buildGoModule rec {
|
|||
];
|
||||
mainProgram = "gitea";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -13,39 +13,57 @@
|
|||
makeWrapper,
|
||||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
pnpm = pnpm_10_29_2;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gitify";
|
||||
version = "6.17.0";
|
||||
version = "6.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gitify-app";
|
||||
repo = "gitify";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-A9LeitceqDGictQbB7OYOI/pggrW9u8A7TUMblK/LHM=";
|
||||
hash = "sha256-zKvI9uwKiKKbHTzM/LIhCzUCcM104UNReRJb51iQonc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
pnpmConfigHook
|
||||
pnpm_10_29_2
|
||||
pnpm
|
||||
copyDesktopItems
|
||||
imagemagick
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_10_29_2;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-0iTvrIe5PVj99ePWt8rn+laikdJ5TaNQ8GZGHyUTTQI=";
|
||||
inherit pnpm;
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-KjRcUVeByCXetX7skJoxt6LU6EZcOG+5U2y3sr3XP7A=";
|
||||
};
|
||||
|
||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace config/electron-builder.js \
|
||||
substituteInPlace electron-builder.js \
|
||||
--replace-fail "'Adam Setch (5KD23H9729)'" "null" \
|
||||
--replace-fail "'scripts/afterSign.js'" "null"
|
||||
|
||||
# With a nixpkgs electron wrapper, app.isPackaged always returns false,
|
||||
# so isDevMode() is always true. This causes the config.ts getter for
|
||||
# indexHtml to return VITE_DEV_SERVER_URL (which is empty) instead of the
|
||||
# packaged file:// URL, resulting in a blank white window.
|
||||
# Patch isDevMode() to false so the file:// path is always used.
|
||||
substituteInPlace src/main/config.ts \
|
||||
--replace-fail "isDevMode()" "false"
|
||||
|
||||
# Disable auto-updater; updates are handled via nixpkgs.
|
||||
substituteInPlace src/main/updater.ts \
|
||||
--replace-fail "if (!this.menubar.app.isPackaged)" "if (true)"
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
|
|
@ -57,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
pnpm build
|
||||
pnpm exec electron-builder \
|
||||
--config config/electron-builder.js \
|
||||
--config electron-builder.js \
|
||||
--dir \
|
||||
-c.electronDist=electron-dist \
|
||||
-c.electronVersion="${electron.version}" \
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "glaze";
|
||||
version = "7.8.0";
|
||||
version = "7.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stephenberry";
|
||||
repo = "glaze";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-E906rvJh6URPvtsLmOjvNKZQtI52ItkoXQvISIQlNXE=";
|
||||
hash = "sha256-T0oYGqmF+0gXT4VESN4h1P/rUfV9BGmpvLWp+6BKiFI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -4,15 +4,15 @@
|
|||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGoModule {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gofu";
|
||||
version = "unstable-2023-04-25";
|
||||
version = "2026.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "majewsky";
|
||||
repo = "gofu";
|
||||
rev = "f308ca92d1631e579fbfe3b3da13c93709dc18a2";
|
||||
hash = "sha256-8c/Z+44gX7diAhXq8sHOqISoGhYdFA7VUYn7eNMCYxY=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-4ssDfWsV1/3iQ7beR+kyqsN+rMe6cxda4OB6f8KkWVY=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
@ -30,4 +30,4 @@ buildGoModule {
|
|||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gogup";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nao1215";
|
||||
repo = "gup";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-tkZt0lv3uy43EijCE+Lvgt2X4p1rB2SkZ4UfkJGYPbY=";
|
||||
hash = "sha256-h7hozN4ggDqEqu2KlQpBEttT7j8JKW+4J4NyM+ftK2M=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lS7C/932cpaVUtXJ3tuZKyqDv4yT2RSG2NfQW5kcQrM=";
|
||||
vendorHash = "sha256-GbeyuZNpT3wqy52sk0B/9wrab906/E4ds06vQ5tHK7c=";
|
||||
doCheck = false;
|
||||
|
||||
ldflags = [
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
diff --git a/src/device/cart.rs b/src/device/cart.rs
|
||||
index 97bf09f..4406fec 100644
|
||||
--- a/src/device/cart.rs
|
||||
+++ b/src/device/cart.rs
|
||||
@@ -21,6 +21,7 @@ const JDT_EEPROM_16K: u16 = 0xc000; /* 16k EEPROM */
|
||||
const EEPROM_BLOCK_SIZE: usize = 8;
|
||||
pub const EEPROM_MAX_SIZE: usize = 0x800;
|
||||
|
||||
+#[allow(warnings)]
|
||||
#[derive(serde::Serialize, serde::Deserialize)]
|
||||
pub enum CicType {
|
||||
CicNus6101,
|
||||
29
pkgs/by-name/go/gopher64/no-git-describe.patch
Normal file
29
pkgs/by-name/go/gopher64/no-git-describe.patch
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
--- a/build.rs
|
||||
+++ b/build.rs
|
||||
@@ -278,26 +278,6 @@
|
||||
.compile("simd");
|
||||
}
|
||||
|
||||
- let mut git_output = std::process::Command::new("git");
|
||||
- git_output.args(["describe", "--dirty"]);
|
||||
-
|
||||
- let git_describe = if let Ok(git_output) = git_output.output()
|
||||
- && git_output.status.success()
|
||||
- {
|
||||
- String::from_utf8(git_output.stdout).unwrap()
|
||||
- } else if let Ok(git_output) = git_output.args(["--always"]).output()
|
||||
- && git_output.status.success()
|
||||
- {
|
||||
- format!(
|
||||
- "v{}-{}",
|
||||
- env!("CARGO_PKG_VERSION"),
|
||||
- String::from_utf8(git_output.stdout).unwrap()
|
||||
- )
|
||||
- } else {
|
||||
- panic!("Failed to get git describe");
|
||||
- };
|
||||
- println!("cargo:rustc-env=GIT_DESCRIBE={git_describe}");
|
||||
-
|
||||
println!("cargo:rerun-if-env-changed=NETPLAY_ID");
|
||||
let netplay_id = std::env::var("NETPLAY_ID").unwrap_or("gopher64".to_string());
|
||||
println!("cargo:rustc-env=NETPLAY_ID={netplay_id}");
|
||||
8
pkgs/by-name/go/gopher64/no-homebrew.patch
Normal file
8
pkgs/by-name/go/gopher64/no-homebrew.patch
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -59,5 +59,4 @@
|
||||
identifier = "io.github.gopher64.gopher64"
|
||||
category = "public.app-category.games"
|
||||
icon = ["data/icon/gopher64_128x128.png","data/icon/gopher64_256x256.png","data/icon/gopher64_512x512.png"]
|
||||
-osx_frameworks = ["/opt/homebrew/opt/molten-vk/lib/libMoltenVK.dylib","/opt/homebrew/opt/freetype/lib/libfreetype.6.dylib","/opt/homebrew/opt/libpng/lib/libpng16.16.dylib"]
|
||||
osx_minimum_system_version = "15.0"
|
||||
14
pkgs/by-name/go/gopher64/no-lto.patch
Normal file
14
pkgs/by-name/go/gopher64/no-lto.patch
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
--- a/build.rs
|
||||
+++ b/build.rs
|
||||
@@ -150,11 +143,6 @@
|
||||
println!("cargo:rustc-link-lib=dylib=freetype");
|
||||
}
|
||||
|
||||
- volk_build.flag("-flto=thin");
|
||||
- rdp_build.flag("-flto=thin");
|
||||
- simd_build.flag("-flto=thin");
|
||||
- retroachievements_build.flag("-flto=thin");
|
||||
-
|
||||
volk_build.compile("volk");
|
||||
rdp_build.compile("parallel-rdp");
|
||||
retroachievements_build.compile("retroachievements");
|
||||
|
|
@ -1,38 +1,46 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
clangStdenv,
|
||||
linkFarm,
|
||||
llvmPackages,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
fetchgit,
|
||||
runCommand,
|
||||
rustPlatform,
|
||||
|
||||
bzip2,
|
||||
libGL,
|
||||
libx11,
|
||||
libxcursor,
|
||||
libxkbcommon,
|
||||
libxi,
|
||||
# nativeBuildInputs
|
||||
cargo-bundle,
|
||||
cctools,
|
||||
gn,
|
||||
ninja,
|
||||
pkg-config,
|
||||
python3,
|
||||
|
||||
# buildInputs
|
||||
fontconfig,
|
||||
moltenvk,
|
||||
sdl3,
|
||||
wayland,
|
||||
sdl3-ttf,
|
||||
zstd,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
# nativeInstallCheckInputs
|
||||
versionCheckHook,
|
||||
}:
|
||||
let
|
||||
stdenv = clangStdenv;
|
||||
in
|
||||
rustPlatform.buildRustPackage.override { inherit stdenv; } (finalAttrs: {
|
||||
pname = "gopher64";
|
||||
version = "1.0.17";
|
||||
version = "1.1.20";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gopher64";
|
||||
repo = "gopher64";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DDFtPISV17jQMECBIqYbbGhZpjYXuNnOq7EiEVtSzgc=";
|
||||
fetchSubmodules = true;
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
cd "$out"
|
||||
git rev-parse HEAD > $out/GIT_REV
|
||||
find "$out" -name .git -print0 | xargs -0 rm -rf
|
||||
'';
|
||||
hash = "sha256-gss0ZGTptk5O67SS+r3i3Caf9I7GQxP0RlHx7GfBihw=";
|
||||
};
|
||||
|
||||
cargoPatches = [
|
||||
|
|
@ -40,61 +48,104 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
# this patch makes it use the SDL3 library provided by nixpkgs
|
||||
./use-sdl3-via-pkg-config.patch
|
||||
|
||||
# make the build script use the @GIT_REV@ string that will be substituted in the logic below
|
||||
./set-git-rev.patch
|
||||
|
||||
# enum CicType is not used, but dead code is treated as an error
|
||||
./allow-unused-type.patch
|
||||
./no-lto.patch
|
||||
./no-git-describe.patch
|
||||
./volk-linking-order.patch
|
||||
./no-homebrew.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# use the file generated in the fetcher to supply the git revision
|
||||
substituteInPlace build.rs \
|
||||
--replace-fail "@GIT_REV@" $(cat GIT_REV)
|
||||
'';
|
||||
cargoHash = "sha256-rmt2b8lk/9ts8v33yguuSFcbFvUX00icg1onmhCbDTQ=";
|
||||
|
||||
cargoHash = "sha256-31kEYwlDA6iYcwPZyQU4gM/VLfPNeYcDKhhBqzNp/QE=";
|
||||
env = {
|
||||
# See pkgs/by-name/ne/neovide/package.nix
|
||||
SKIA_SOURCE_DIR =
|
||||
let
|
||||
repo = fetchFromGitHub {
|
||||
owner = "rust-skia";
|
||||
repo = "skia";
|
||||
# see rust-skia:skia-bindings/Cargo.toml#package.metadata skia
|
||||
tag = "m142-0.89.1";
|
||||
hash = "sha256-J7mBQ124/dODxX6MsuMW1NHizCMATAqdSzwxpP2afgk=";
|
||||
};
|
||||
# The externals for skia are taken from skia/DEPS
|
||||
externals = linkFarm "skia-externals" (
|
||||
lib.mapAttrsToList (name: value: {
|
||||
inherit name;
|
||||
path = fetchgit value;
|
||||
}) (lib.importJSON ./skia-externals.json)
|
||||
);
|
||||
in
|
||||
runCommand "source" { } ''
|
||||
cp -R ${repo} $out
|
||||
chmod -R +w $out
|
||||
ln -s ${externals} $out/third_party/externals
|
||||
'';
|
||||
|
||||
env.ZSTD_SYS_USE_PKG_CONFIG = true;
|
||||
SKIA_GN_COMMAND = lib.getExe gn;
|
||||
SKIA_NINJA_COMMAND = lib.getExe ninja;
|
||||
|
||||
ZSTD_SYS_USE_PKG_CONFIG = true;
|
||||
|
||||
LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib";
|
||||
GIT_DESCRIBE = finalAttrs.version;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
rustPlatform.bindgenHook
|
||||
python3
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
cargo-bundle
|
||||
cctools.libtool
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
bzip2
|
||||
fontconfig
|
||||
sdl3
|
||||
sdl3-ttf
|
||||
zstd
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
moltenvk
|
||||
];
|
||||
|
||||
# these are dlopen-ed during runtime
|
||||
runtimeDependencies = lib.optionalString stdenv.hostPlatform.isLinux [
|
||||
libGL
|
||||
libxkbcommon
|
||||
# no checks
|
||||
doCheck = false;
|
||||
|
||||
# for X11
|
||||
libx11
|
||||
libxcursor
|
||||
libxi
|
||||
installPhase = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
runHook preInstall
|
||||
|
||||
# for wayland
|
||||
wayland
|
||||
];
|
||||
# cargo-bundle expects the binary in target/release
|
||||
release_target="target/${stdenv.hostPlatform.rust.cargoShortTarget}/release"
|
||||
mv $release_target/gopher64 target/release/gopher64
|
||||
|
||||
postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
patchelf $out/bin/gopher64 --add-rpath ${lib.makeLibraryPath finalAttrs.runtimeDependencies}
|
||||
export CARGO_BUNDLE_SKIP_BUILD=true
|
||||
app_path=$(cargo bundle --release | xargs)
|
||||
|
||||
mkdir -p $out/Applications $out/bin
|
||||
mv $app_path $out/Applications/
|
||||
|
||||
ln -s $out/Applications/Gopher64.app/Contents/MacOS/gopher64 $out/bin/gopher64
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
install_name_tool $out/Applications/Gopher64.app/Contents/MacOS/gopher64 \
|
||||
-add_rpath "${lib.makeLibraryPath [ moltenvk ]}"
|
||||
'';
|
||||
|
||||
# Error: Os { code: 1, kind: PermissionDenied, message: "Operation not permitted" }
|
||||
doInstallCheck = !stdenv.hostPlatform.isDarwin;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/gopher64/gopher64/releases/tag/${finalAttrs.src.tag}";
|
||||
description = "N64 emulator written in Rust";
|
||||
homepage = "https://github.com/gopher64/gopher64";
|
||||
description = "N64 emulator";
|
||||
homepage = "https://loganmc10.itch.io/gopher64";
|
||||
downloadPage = "https://github.com/gopher64/gopher64/releases";
|
||||
changelog = "https://github.com/gopher64/gopher64/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
prince213
|
||||
tomasajt
|
||||
];
|
||||
mainProgram = "gopher64";
|
||||
maintainers = with lib.maintainers; [ tomasajt ];
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
diff --git a/build.rs b/build.rs
|
||||
index 0b20db2..d904e63 100644
|
||||
--- a/build.rs
|
||||
+++ b/build.rs
|
||||
@@ -163,13 +163,7 @@ fn main() {
|
||||
simd_build.compile("simd");
|
||||
}
|
||||
|
||||
- let git_output = std::process::Command::new("git")
|
||||
- .args(["rev-parse", "HEAD"])
|
||||
- .output()
|
||||
- .unwrap();
|
||||
-
|
||||
- let git_hash = String::from_utf8(git_output.stdout).unwrap();
|
||||
- println!("cargo:rustc-env=GIT_HASH={}", git_hash);
|
||||
+ println!("cargo:rustc-env=GIT_HASH={}", "@GIT_REV@");
|
||||
|
||||
println!("cargo:rustc-env=N64_STACK_SIZE={}", 8 * 1024 * 1024);
|
||||
}
|
||||
42
pkgs/by-name/go/gopher64/skia-externals.json
Normal file
42
pkgs/by-name/go/gopher64/skia-externals.json
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{
|
||||
"expat": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git",
|
||||
"rev": "8e49998f003d693213b538ef765814c7d21abada",
|
||||
"hash": "sha256-zP2kiB4nyLi0/I8OsRhxKG0qRGPe2ALLQ+HHfqlBJ6Y="
|
||||
},
|
||||
"harfbuzz": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
|
||||
"rev": "08b52ae2e44931eef163dbad71697f911fadc323",
|
||||
"hash": "sha256-sP9FQLUEgTZFlvfYqSZnzZqBMxVotzD0FKKsu3/OdUw="
|
||||
},
|
||||
"icu": {
|
||||
"url": "https://chromium.googlesource.com/chromium/deps/icu.git",
|
||||
"rev": "364118a1d9da24bb5b770ac3d762ac144d6da5a4",
|
||||
"hash": "sha256-frsmwYMiFixEULsE91x5+p98DvkyC0s0fNupqjoRnvg="
|
||||
},
|
||||
"libjpeg-turbo": {
|
||||
"url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git",
|
||||
"rev": "e14cbfaa85529d47f9f55b0f104a579c1061f9ad",
|
||||
"hash": "sha256-Ig+tmprZDvlf/M72/DTar2pbxat9ZElgSqdXdoM0lPs="
|
||||
},
|
||||
"libpng": {
|
||||
"url": "https://skia.googlesource.com/third_party/libpng.git",
|
||||
"rev": "ed217e3e601d8e462f7fd1e04bed43ac42212429",
|
||||
"hash": "sha256-Mo1M8TuVaoSIb7Hy2u6zgjZ1DKgpmgNmGRP6dGg/aTs="
|
||||
},
|
||||
"vulkanmemoryallocator": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator",
|
||||
"rev": "a6bfc237255a6bac1513f7c1ebde6d8aed6b5191",
|
||||
"hash": "sha256-urUebQaPTgCECmm4Espri1HqYGy0ueAqTBu/VSiX/8I="
|
||||
},
|
||||
"wuffs": {
|
||||
"url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
|
||||
"rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8",
|
||||
"hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw="
|
||||
},
|
||||
"zlib": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src/third_party/zlib",
|
||||
"rev": "646b7f569718921d7d4b5b8e22572ff6c76f2596",
|
||||
"hash": "sha256-jNj6SuTZ5/a7crtYhxW3Q/TlfRMNMfYIVxDlr7bYdzQ="
|
||||
}
|
||||
}
|
||||
|
|
@ -1,85 +1,86 @@
|
|||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 81c7e20..6ae0a17 100644
|
||||
--- a/build.rs
|
||||
+++ b/build.rs
|
||||
@@ -63,14 +63,7 @@
|
||||
.include("parallel-rdp/parallel-rdp-standalone/volk")
|
||||
.include("parallel-rdp/parallel-rdp-standalone/vulkan")
|
||||
.include("parallel-rdp/parallel-rdp-standalone/vulkan-headers/include")
|
||||
- .include("parallel-rdp/parallel-rdp-standalone/util")
|
||||
- .include(
|
||||
- std::path::PathBuf::from(std::env::var("DEP_SDL3_OUT_DIR").unwrap()).join("include"),
|
||||
- )
|
||||
- .include(
|
||||
- std::path::PathBuf::from(std::env::var("DEP_SDL3_TTF_OUT_DIR").unwrap())
|
||||
- .join("include"),
|
||||
- );
|
||||
+ .include("parallel-rdp/parallel-rdp-standalone/util");
|
||||
|
||||
let mut retroachievements_build = cc::Build::new();
|
||||
retroachievements_build
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -611,15 +611,6 @@ dependencies = [
|
||||
"error-code",
|
||||
@@ -4782,12 +4782,6 @@
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "cmake"
|
||||
-version = "0.1.54"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0"
|
||||
-dependencies = [
|
||||
- "cc",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "cobs"
|
||||
version = "0.2.3"
|
||||
@@ -3243,12 +3234,6 @@ dependencies = [
|
||||
"windows-sys 0.52.0",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "rpkg-config"
|
||||
-version = "0.1.2"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "5a2d2f3481209a6b42eec2fbb49063fb4e8d35b57023401495d4fe0f85c817f0"
|
||||
-
|
||||
[[package]]
|
||||
name = "rustc-demangle"
|
||||
version = "0.1.24"
|
||||
@@ -3370,21 +3355,13 @@ version = "1.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
|
||||
|
||||
-[[package]]
|
||||
-name = "sdl3-src"
|
||||
-version = "3.2.16"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "c5b5d192485408fa251477ea1dfb4778d864efaec72f730ce3a753deaffb27bb"
|
||||
-
|
||||
[[package]]
|
||||
name = "sdl3-sys"
|
||||
version = "0.5.2+SDL3-3.2.16"
|
||||
name = "rspolib"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f0a31799d7cbd36f2b187c32a56975fbdd371c200a91b01d4ed0faf0012bcf9c"
|
||||
@@ -5002,28 +4996,10 @@
|
||||
]
|
||||
|
||||
[[package]]
|
||||
-name = "sdl3-src"
|
||||
-version = "3.4.8"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "997bff4c8d3d9d1e846d7ad8caa33e6fe18a07ec9dc474e1efbbb20923d87bd9"
|
||||
-
|
||||
-[[package]]
|
||||
name = "sdl3-sys"
|
||||
version = "0.6.5+SDL-3.4.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "51ca7a36c908d1d2b6c259d426a5000fbb70e764dcc430f6a373cc151f614f68"
|
||||
-dependencies = [
|
||||
- "cc",
|
||||
- "cmake",
|
||||
- "rpkg-config",
|
||||
- "sdl3-src",
|
||||
-]
|
||||
-
|
||||
-[[package]]
|
||||
-name = "sdl3-ttf-src"
|
||||
-version = "3.2.3"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "f28923d2ce72ff317d8eb7cec97ddfb8f351c330d7bcbf8c76e91332122c93b3"
|
||||
|
||||
[[package]]
|
||||
name = "sdl3-ttf-sys"
|
||||
@@ -5031,10 +5007,7 @@
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c30da3dcd7e062f19350b47a532f7629c42801b801687535fd31e8ba2adfd71d"
|
||||
dependencies = [
|
||||
- "cmake",
|
||||
- "rpkg-config",
|
||||
- "sdl3-src",
|
||||
+ "pkg-config",
|
||||
"sdl3-sys",
|
||||
- "sdl3-ttf-src",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 82d8e99..8b15aad 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -18,7 +18,7 @@ serde-big-array = "0.5"
|
||||
eframe = { version = "0.31", default-features = false, features = ["wayland", "x11", "glow"] }
|
||||
sha2 = "0.10"
|
||||
ab_glyph = "0.2"
|
||||
-sdl3-sys = { version = "0.5", features = ["build-from-source-static"] }
|
||||
+sdl3-sys = { version = "0.5", features = ["use-pkg-config"] }
|
||||
rfd = { version = "0.15", default-features = false, features = ["xdg-portal", "tokio"] }
|
||||
tokio = {version = "1.45", features = ["rt-multi-thread", "macros"] }
|
||||
@@ -19,8 +19,8 @@
|
||||
slint = { version = "1.16", default-features = false, features = ["compat-1-2", "std", "unstable-winit-030", "backend-winit", "renderer-skia", "accessibility"], optional = true }
|
||||
open = "5.3"
|
||||
sha2 = "0.11"
|
||||
-sdl3-sys = { version = "0.6", features = ["build-from-source-static"] }
|
||||
-sdl3-ttf-sys = { version = "0.6", features = ["build-from-source-static", "no-sdlttf-harfbuzz", "no-sdlttf-plutosvg"] }
|
||||
+sdl3-sys = { version = "0.6" }
|
||||
+sdl3-ttf-sys = { version = "0.6" }
|
||||
rfd = {version = "0.17", optional = true }
|
||||
tokio = {version = "1.46", features = ["rt-multi-thread", "macros", "fs", "process"] }
|
||||
spin_sleep = "1.3"
|
||||
diff --git a/build.rs b/build.rs
|
||||
index f0c6d21..fa28e25 100644
|
||||
--- a/build.rs
|
||||
+++ b/build.rs
|
||||
@@ -52,10 +52,7 @@ fn main() {
|
||||
.include("parallel-rdp/parallel-rdp-standalone/vulkan")
|
||||
.include("parallel-rdp/parallel-rdp-standalone/vulkan-headers/include")
|
||||
.include("parallel-rdp/parallel-rdp-standalone/util")
|
||||
- .include(
|
||||
- std::path::PathBuf::from(std::env::var("DEP_SDL3_OUT_DIR").to_owned().unwrap())
|
||||
- .join("include"),
|
||||
- );
|
||||
+ ;
|
||||
|
||||
let os = std::env::var("CARGO_CFG_TARGET_OS").unwrap();
|
||||
let arch = std::env::var("CARGO_CFG_TARGET_ARCH").unwrap();
|
||||
|
|
|
|||
12
pkgs/by-name/go/gopher64/volk-linking-order.patch
Normal file
12
pkgs/by-name/go/gopher64/volk-linking-order.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
--- a/build.rs
|
||||
+++ b/build.rs
|
||||
@@ -155,8 +155,8 @@
|
||||
simd_build.flag("-flto=thin");
|
||||
retroachievements_build.flag("-flto=thin");
|
||||
|
||||
- volk_build.compile("volk");
|
||||
rdp_build.compile("parallel-rdp");
|
||||
+ volk_build.compile("volk");
|
||||
retroachievements_build.compile("retroachievements");
|
||||
|
||||
let out_path = std::path::PathBuf::from(std::env::var("OUT_DIR").unwrap());
|
||||
91
pkgs/by-name/hy/hyprmoncfg/package.nix
Normal file
91
pkgs/by-name/hy/hyprmoncfg/package.nix
Normal file
|
|
@ -0,0 +1,91 @@
|
|||
{
|
||||
lib,
|
||||
bash,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
hyprland,
|
||||
makeWrapper,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "hyprmoncfg";
|
||||
version = "1.8.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crmne";
|
||||
repo = "hyprmoncfg";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-hu3ekA4wAp83DE2v00B2n5gsZt2iSv0/OWbg5Mwo4gY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-gQbjvdKtO0hCXrs9RnWo1s0YeHf5W9t+8AgS2ELXlPo=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/crmne/hyprmoncfg/internal/buildinfo.Version=${finalAttrs.version}"
|
||||
"-X github.com/crmne/hyprmoncfg/internal/buildinfo.Commit=0000000"
|
||||
"-X github.com/crmne/hyprmoncfg/internal/buildinfo.Date=unknown"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
nativeCheckInputs = [ hyprland ];
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace internal/daemon/daemon_test.go \
|
||||
--replace-fail '#!/bin/bash' '#!${lib.getExe bash}'
|
||||
substituteInPlace internal/apply/apply_test.go \
|
||||
--replace-fail '#!/bin/bash' '#!${lib.getExe bash}' \
|
||||
--replace-fail '#!/usr/bin/env bash' '#!${lib.getExe bash}' \
|
||||
--replace-fail '#!/bin/sh' '#!${lib.getExe bash}'
|
||||
substituteInPlace internal/hypr/client_test.go \
|
||||
--replace-fail '#!/usr/bin/env bash' '#!${lib.getExe bash}'
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
export TMPDIR=/tmp
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 packaging/applications/hyprmoncfg.desktop \
|
||||
$out/share/applications/hyprmoncfg.desktop
|
||||
install -Dm644 packaging/icons/hyprmoncfg.svg \
|
||||
$out/share/icons/hicolor/scalable/apps/hyprmoncfg.svg
|
||||
substituteInPlace packaging/systemd/hyprmoncfgd.service \
|
||||
--replace-fail /usr/bin/hyprmoncfgd $out/bin/hyprmoncfgd
|
||||
install -Dm644 packaging/systemd/hyprmoncfgd.service \
|
||||
$out/share/systemd/user/hyprmoncfgd.service
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/hyprmoncfg \
|
||||
--prefix PATH : ${lib.makeBinPath [ hyprland ]}
|
||||
wrapProgram $out/bin/hyprmoncfgd \
|
||||
--prefix PATH : ${lib.makeBinPath [ hyprland ]}
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Terminal-first monitor configurator and auto-switching daemon for Hyprland";
|
||||
homepage = "https://github.com/crmne/hyprmoncfg";
|
||||
changelog = "https://github.com/crmne/hyprmoncfg/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ crmne ];
|
||||
mainProgram = "hyprmoncfg";
|
||||
platforms = hyprland.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -12,17 +12,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "icm";
|
||||
version = "0.10.50";
|
||||
version = "0.10.53";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rtk-ai";
|
||||
repo = "icm";
|
||||
tag = "icm-v${finalAttrs.version}";
|
||||
hash = "sha256-zaKpKMVH2vzUk0ryWupE4ByqqcmAdJwAe5ybb2TNlvM=";
|
||||
hash = "sha256-fx7RPt32Vuy0j+Ab9VtqXoJ/+Ql5h4ORNPYwARlll0U=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-5NcmFaRqDla2ei694fJiqNr5n4V3A/ai3/9fzBHNa3s=";
|
||||
cargoHash = "sha256-5xlgEjQWPQEtLDzP403lFIEa2dvdsX6HujWMmCiFnD8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "intel-compute-runtime";
|
||||
version = "26.18.38308.1";
|
||||
version = "26.22.38646.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "compute-runtime";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-539TqwzPhclEpyxrwRB0DBLCAgM8JojdshvhNp0jeKU=";
|
||||
hash = "sha256-YjCRbYsq44U+pwdTnyA5lffJtSHVK2u3R2XRRNb6l9c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ stdenv.mkDerivation {
|
|||
homepage = "http://0pointer.de/lennart/projects/keyfuzz/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ mboes ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
src = fetchurl {
|
||||
|
|
|
|||
|
|
@ -2,34 +2,47 @@
|
|||
lib,
|
||||
rustPlatform,
|
||||
fetchCrate,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "killport";
|
||||
version = "1.1.0";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-7bENyg/KR4oI//jvG6bw+3UX3j9ITAXCMTpc+65VBZ8=";
|
||||
hash = "sha256-I8GsTSCbWRItQ4Hzens2KlsHZNM/boipT392xYL4wmg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+PhaRVpsM/6GOnGkGDROoOGasrZsagK1LqBZTo9IbSI=";
|
||||
cargoHash = "sha256-NOgt2WdS5JqTlCOI6qTOyBkTs/0qoA4qXoOHuZdRKvM=";
|
||||
|
||||
nativeBuildInputs = [ rustPlatform.bindgenHook ];
|
||||
|
||||
checkFlags = [
|
||||
# assertion failed: re.is_match(data)
|
||||
# assertion failed: re.is_match(data) or blocked by sandbox
|
||||
"--skip=test_mode_option"
|
||||
"--skip=test_signal_handling"
|
||||
"--skip=test_signal_sig"
|
||||
"--skip=test_mode_short_flag"
|
||||
"--skip=test_mode_process_finds_process"
|
||||
"--skip=test_kill_udp_process"
|
||||
"--skip=test_mode_auto_finds_process"
|
||||
"--skip=test_kill_tcp_ipv4_process"
|
||||
"--skip=test_dry_run_with_signal"
|
||||
"--skip=test_combined_flags"
|
||||
"--skip=test_dry_run_does_not_kill"
|
||||
"--skip=test_dry_run_option"
|
||||
"--skip=test_basic_kill_process"
|
||||
"--skip=test_unix_process_kill_"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = {
|
||||
description = "Command-line tool to easily kill processes running on a specified port";
|
||||
homepage = "https://github.com/jkfran/killport";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ tbutter ];
|
||||
mainProgram = "killport";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "kimai";
|
||||
version = "2.59.0";
|
||||
version = "2.60.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kimai";
|
||||
repo = "kimai";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-tOybMpMe8pc2PAPUd5JGwqx6Qo6ZjeDX9UvP6i6BPDM=";
|
||||
hash = "sha256-TdeoFbgLXbLsBeMK8YUKimRyx+nJ4QMigY9YxicmPDA=";
|
||||
};
|
||||
|
||||
php = php.buildEnv {
|
||||
|
|
@ -38,7 +38,7 @@ php.buildComposerProject2 (finalAttrs: {
|
|||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rhuj+7RsS9vngfKeUZiKIYHed0+5QN1JDrDc4YCJYDk=";
|
||||
vendorHash = "sha256-0byb0lsi9nU1qKksU6BeBB/JCXoHSaliLyErz6Z14QQ=";
|
||||
|
||||
composerNoPlugins = false;
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "konsave";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit (finalAttrs) version;
|
||||
pname = "Konsave";
|
||||
hash = "sha256-tWarqT2jFgCuSsa2NwMHRaR3/wj0khiRHidvRNMwM8M=";
|
||||
pname = "konsave";
|
||||
hash = "sha256-Qe+RZIsgbqvFqWhUkfACbYvHtXQcp6yK+XrvqgXnlTc=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
python3,
|
||||
}:
|
||||
let
|
||||
chromium_version = "140.0.7324.1";
|
||||
chromium_version = "151.0.7891.2";
|
||||
|
||||
hsts_list = fetchurl {
|
||||
url = "https://raw.github.com/chromium/chromium/${chromium_version}/net/http/transport_security_state_static.json";
|
||||
hash = "sha256-XV3yZA3Ai4It7S/y4V0h+UtKm8SXm6x1hlITD7jGY9I=";
|
||||
hash = "sha256-YuiotSk0Lf3IHz/UjgCmU/brdB1lszob6DN4DXyjiWU=";
|
||||
};
|
||||
|
||||
in
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "librepcb";
|
||||
version = "2.0.0";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "librepcb";
|
||||
repo = "librepcb";
|
||||
rev = version;
|
||||
hash = "sha256-8hMPrpqwGNYXUTJGL/CMSP+Sjv5F6ZTkJHqauuOxwTw=";
|
||||
hash = "sha256-UcX4r2TxinL2S3tPIiYRsPpYmKzdAx3Al0irkbXf5/g=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -38,13 +38,13 @@ stdenv.mkDerivation rec {
|
|||
cargoDeps1 = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
cargoRoot = "libs/librepcb/rust-core";
|
||||
hash = "sha256-1td3WjxbDq2lX7c0trpYRhO82ChNAG/ZABBRsekYtq4=";
|
||||
hash = "sha256-1wHk8ynP3VnkypwY/C7nikfMSF0qU0L+CbBKoVxjlEc=";
|
||||
};
|
||||
|
||||
cargoDeps2 = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
cargoRoot = "libs/slint";
|
||||
hash = "sha256-DYcKoaOXYFvAi5VyWdhli73s7qrypeXmzGJNhVzcWtY=";
|
||||
hash = "sha256-UX/7a0hzFBmPZKufcDKcICrXEM+rKcvqEq2pg1riBxo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
|
|||
[source.crates-io]
|
||||
replace-with = "vendored-sources"
|
||||
[source.vendored-sources]
|
||||
directory = "${cargoDeps1}"
|
||||
directory = "${cargoDeps1}/source-registry-0"
|
||||
EOF
|
||||
|
||||
# Set up cargo config for the second Rust library
|
||||
|
|
@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
|
|||
[source.crates-io]
|
||||
replace-with = "vendored-sources"
|
||||
[source.vendored-sources]
|
||||
directory = "${cargoDeps2}"
|
||||
directory = "${cargoDeps2}/source-registry-0"
|
||||
EOF
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ buildGoModule rec {
|
|||
fi
|
||||
'';
|
||||
|
||||
# Usage: nix-shell maintainers/scripts/update.nix --argstr package lightning-terminal --argstr commit true
|
||||
# Usage: nix-shell maintainers/scripts/update.nix --argstr package lightning-terminal --arg commit true
|
||||
passthru.updateScript = _experimental-update-script-combinators.sequence [
|
||||
(gitUpdater {
|
||||
rev-prefix = "v";
|
||||
|
|
|
|||
|
|
@ -7,12 +7,12 @@
|
|||
let
|
||||
pname = "lmstudio";
|
||||
|
||||
version_aarch64-linux = "0.4.15-2";
|
||||
hash_aarch64-linux = "sha256-HnxdikjdUPoQkHMGLHC7TJylj5ad5UWnFMkyjj/8haU=";
|
||||
version_aarch64-darwin = "0.4.15-2";
|
||||
hash_aarch64-darwin = "sha256-Spe/d34X4V8LAheaLFQ68NvDo09FrshDrV0RLO+24sU=";
|
||||
version_x86_64-linux = "0.4.15-2";
|
||||
hash_x86_64-linux = "sha256-M7doFWVEyzcDJF4M+h4WKR+Q45yn3FZc2vZbzjYWBPE=";
|
||||
version_aarch64-linux = "0.4.16-2";
|
||||
hash_aarch64-linux = "sha256-shn3W+il66OX8VDj7+hYFgL/N8GZ1APB2MH84uoCHOM=";
|
||||
version_aarch64-darwin = "0.4.16-2";
|
||||
hash_aarch64-darwin = "sha256-Gj8mMrNNDXNDyFj2p3emic2xms4tWSoVS2XXLsEeEC4=";
|
||||
version_x86_64-linux = "0.4.16-2";
|
||||
hash_x86_64-linux = "sha256-faLtj/9M59KRdEMHHgTCPLG4Gl5C7hkdAgmaS/O5rOk=";
|
||||
|
||||
meta = {
|
||||
description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";
|
||||
|
|
|
|||
|
|
@ -58,13 +58,14 @@ stdenv.mkDerivation rec {
|
|||
cp -R usr/local/include/fuse{,.h} $out/include
|
||||
'';
|
||||
|
||||
passthru.warning = meta.description;
|
||||
|
||||
meta = {
|
||||
homepage = "https://osxfuse.github.io";
|
||||
description = "Build time stubs for FUSE on macOS";
|
||||
longDescription = ''
|
||||
macFUSE is required for this package to work on macOS. To install macFUSE,
|
||||
use the installer from the <link xlink:href="https://osxfuse.github.io/">
|
||||
project website</link>.
|
||||
use the installer from the [project website](https://osxfuse.github.io/).
|
||||
'';
|
||||
platforms = lib.platforms.darwin;
|
||||
maintainers = with lib.maintainers; [ midchildan ];
|
||||
|
|
@ -76,10 +77,4 @@ stdenv.mkDerivation rec {
|
|||
lgpl2Plus # libfuse
|
||||
];
|
||||
};
|
||||
|
||||
passthru.warning = ''
|
||||
macFUSE is required for this package to work on macOS. To install macFUSE,
|
||||
use the installer from the <link xlink:href="https://osxfuse.github.io/">
|
||||
project website</link>.
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "mcp-server-fetch";
|
||||
version = "2026.6.3";
|
||||
version = "2026.6.16";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "mcp-server-git";
|
||||
version = "2026.6.3";
|
||||
version = "2026.6.16";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "modelcontextprotocol";
|
||||
repo = "servers";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-C5wE5ChDI1w4fh5LC1gV9WFuKMVfwvSnS18Fi2s+t+s=";
|
||||
hash = "sha256-n8l4E6S4d19GQnKWO1y2De1SuHa/R8UGlb/GMR4dbMw=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src/git/";
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "mcp-server-time";
|
||||
version = "2026.6.3";
|
||||
version = "2026.6.16";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "modelcontextprotocol";
|
||||
repo = "servers";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-C5wE5ChDI1w4fh5LC1gV9WFuKMVfwvSnS18Fi2s+t+s=";
|
||||
hash = "sha256-n8l4E6S4d19GQnKWO1y2De1SuHa/R8UGlb/GMR4dbMw=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src/time/";
|
||||
|
|
|
|||
|
|
@ -7,16 +7,18 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mdns-scanner";
|
||||
version = "0.27.1";
|
||||
version = "0.27.2";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CramBL";
|
||||
repo = "mdns-scanner";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-90+VBCxb4bbmGCpBLmqzhUJ0/9GAH8Fnju61kq7sx+A=";
|
||||
hash = "sha256-oqU7lpDD2umCBAcPYKjo+5kdsCu3gjBiP5MPNvH2fhs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-LTL5nlT75Y/cALKVLVBWlMZZn9DewZfCbTAO1QsAfXI=";
|
||||
cargoHash = "sha256-TqTN9qXnfvP067kh+bfdXlU1lKaZistIvq1qJsgmJ8o=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
pkg-config,
|
||||
curl,
|
||||
glib,
|
||||
fuse,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
|
|
@ -37,8 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
buildInputs = [
|
||||
curl
|
||||
glib
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ fuse ];
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -42,31 +42,38 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "memento";
|
||||
version = "1.7.0";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ripose-jp";
|
||||
repo = "Memento";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6ipzorykt9GoGTHTTLCyDf7vXx9mT5AITKA9pyQ3GwI=";
|
||||
hash = "sha256-Mg6Gxy8FwqNjE9m4uOQnEY95PZJSQllDBU2KnS8UOHE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail $'\tQml\n' $'\tQml\n\tQmlPrivate\n'
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "SYSTEM_QCORO" true)
|
||||
(lib.cmakeBool "SYSTEM_MOCR" true)
|
||||
(lib.cmakeBool "MEMENTO_SYSTEM_QCORO" true)
|
||||
(lib.cmakeBool "MEMENTO_SYSTEM_MOCR" true)
|
||||
]
|
||||
++ lib.optionals withOcr [
|
||||
(lib.cmakeBool "OCR_SUPPORT" true)
|
||||
(lib.cmakeBool "MEMENTO_OCR_SUPPORT" true)
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
makeWrapper
|
||||
qt6Packages.qttools
|
||||
qt6Packages.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qt6Packages.qtbase
|
||||
qt6Packages.qtdeclarative
|
||||
qt6Packages.qtsvg
|
||||
qt6Packages.qtwayland
|
||||
sqlite
|
||||
|
|
|
|||
|
|
@ -1,21 +1,21 @@
|
|||
{
|
||||
"version": "3.216.0",
|
||||
"version": "3.219.0",
|
||||
"assets": {
|
||||
"x86_64-linux": {
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.216.0/mirrord_linux_x86_64",
|
||||
"hash": "sha256-w4x1G12uifLTQzf9KWUgUYeu+4SQTI51HToI/cgB4ew="
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.219.0/mirrord_linux_x86_64",
|
||||
"hash": "sha256-zqVPuAsgsYAFuB+5lfUOl8MaiAVc3iLbhnmiPVCQ9po="
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.216.0/mirrord_linux_aarch64",
|
||||
"hash": "sha256-GLwDMlCV7izckP5roJGsVROK3+PSkwDH/Vbu4j9X1sk="
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.219.0/mirrord_linux_aarch64",
|
||||
"hash": "sha256-xeiPf9hEKU75VgPeS2fiIx8WEC0DQwadMaA8Yp/shpU="
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.216.0/mirrord_mac_universal",
|
||||
"hash": "sha256-LCHPpdVWyBtmrcP+2bFqwaqhtH+nsXf2R3SeXJMFtVg="
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.219.0/mirrord_mac_universal",
|
||||
"hash": "sha256-v0idU5+NmFcSxdwGKUT+09BsNuzJKv0tuj4uaqMzqU4="
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.216.0/mirrord_mac_universal",
|
||||
"hash": "sha256-LCHPpdVWyBtmrcP+2bFqwaqhtH+nsXf2R3SeXJMFtVg="
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.219.0/mirrord_mac_universal",
|
||||
"hash": "sha256-v0idU5+NmFcSxdwGKUT+09BsNuzJKv0tuj4uaqMzqU4="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue