Merge master into haskell-updates
This commit is contained in:
commit
86f1e61de6
5
doc/hooks/desktop-file-utils.section.md
Normal file
5
doc/hooks/desktop-file-utils.section.md
Normal file
@ -0,0 +1,5 @@
|
||||
# desktop-file-utils {#desktop-file-utils}
|
||||
|
||||
This setup hook removes the MIME cache (located at `$out/share/applications/mimeinfo.cache`) in the `preFixupPhase`.
|
||||
|
||||
This hook is necessary because `mimeinfo.cache` can be created when a package uses `desktop-file-utils`, resulting in collisions if multiple packages are installed that contain this file (as in [#48295](https://github.com/NixOS/nixpkgs/issues/48295)).
|
@ -12,6 +12,7 @@ bmake.section.md
|
||||
breakpoint.section.md
|
||||
cernlib.section.md
|
||||
cmake.section.md
|
||||
desktop-file-utils.section.md
|
||||
gdk-pixbuf.section.md
|
||||
ghc.section.md
|
||||
gnome.section.md
|
||||
|
@ -670,7 +670,7 @@ lib.mapAttrs mkLicense ({
|
||||
# Intel's license, seems free
|
||||
iasl = {
|
||||
spdxId = "Intel-ACPI";
|
||||
fullName = "iASL";
|
||||
fullName = "Intel ACPI Software License Agreement";
|
||||
url = "https://old.calculate-linux.org/packages/licenses/iASL";
|
||||
};
|
||||
|
||||
@ -889,7 +889,7 @@ lib.mapAttrs mkLicense ({
|
||||
spdxId = "MIT";
|
||||
fullName = "MIT License";
|
||||
};
|
||||
# https://spdx.org/licenses/MIT-feh.html
|
||||
|
||||
mit-feh = {
|
||||
spdxId = "MIT-feh";
|
||||
fullName = "feh License";
|
||||
@ -1097,7 +1097,7 @@ lib.mapAttrs mkLicense ({
|
||||
};
|
||||
|
||||
purdueBsd = {
|
||||
fullName = " Purdue BSD-Style License"; # also know as lsof license
|
||||
fullName = "Purdue BSD-Style License"; # also known as lsof license
|
||||
url = "https://enterprise.dejacode.com/licenses/public/purdue-bsd";
|
||||
};
|
||||
|
||||
|
@ -8832,6 +8832,13 @@
|
||||
name = "Luna Perego";
|
||||
keys = [ { fingerprint = "09E4 B981 9B93 5B0C 0B91 1274 0578 7332 9217 08FF"; } ];
|
||||
};
|
||||
hustlerone = {
|
||||
email = "nine-ball@tutanota.com";
|
||||
matrix = "@hustlerone:matrix.org";
|
||||
github = "hustlerone";
|
||||
name = "Hustler One";
|
||||
githubId = 167621692;
|
||||
};
|
||||
huyngo = {
|
||||
email = "huyngo@disroot.org";
|
||||
github = "Huy-Ngo";
|
||||
@ -11192,7 +11199,7 @@
|
||||
name = "kintrix";
|
||||
};
|
||||
kinzoku = {
|
||||
email = "kinzokudev4869@gmail.com";
|
||||
email = "kinzoku@the-nebula.xyz";
|
||||
github = "kinzoku-dev";
|
||||
githubId = 140647311;
|
||||
name = "Ayman Hamza";
|
||||
@ -17701,6 +17708,12 @@
|
||||
githubId = 145816;
|
||||
name = "David McKay";
|
||||
};
|
||||
rayhem = {
|
||||
email = "glosser1@gmail.com";
|
||||
github = "rayhem";
|
||||
githubId = 49202382;
|
||||
name = "Connor Glosser";
|
||||
};
|
||||
raylas = {
|
||||
email = "r@raymond.sh";
|
||||
github = "raylas";
|
||||
|
@ -432,6 +432,8 @@
|
||||
- `zx` was updated to v8, which introduces several breaking changes.
|
||||
See the [v8 changelog](https://github.com/google/zx/releases/tag/8.0.0) for more information.
|
||||
|
||||
- `feishin` removed support for Navidrome `< v0.53.2` due to an API change; more information in the [v0.10.0 release notes](https://github.com/jeffvli/feishin/releases/tag/v0.10.0).
|
||||
|
||||
- The `dnscrypt-wrapper` module was removed since the project has been effectively unmaintained since 2018; moreover the NixOS module had to rely on an abandoned version of dnscrypt-proxy v1 for the rotation of keys.
|
||||
To wrap a resolver with DNSCrypt you can instead use `dnsdist`. See options `services.dnsdist.dnscrypt.*`
|
||||
|
||||
@ -457,6 +459,8 @@
|
||||
|
||||
- `programs.vim.defaultEditor` now only works if `programs.vim.enable` is enabled.
|
||||
|
||||
- `services.mautrix-meta` was updated to [0.4](https://github.com/mautrix/meta/releases/tag/v0.4.0). This release makes significant changes to the settings format. If you have custom settings you should migrate them to the new format. Unfortunately upstream provides little guidance for how to do this, but [the auto-migration code](https://github.com/mautrix/meta/blob/f5440b05aac125b4c95b1af85635a717cbc6dd0e/cmd/mautrix-meta/legacymigrate.go#L23) may serve as a useful reference. The NixOS module should warn you if you still have any old settings configured.
|
||||
|
||||
- The `indi-full` package no longer contains non-free drivers.
|
||||
To get the old collection of drivers use `indi-full-nonfree` or create your own collection of drivers by overriding indi-with-drivers.
|
||||
E.g.: `pkgs.indi-with-drivers.override {extraDrivers = with pkgs.indi-3rdparty; [indi-gphoto];}`
|
||||
|
@ -1,8 +1,9 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
options.hardware.usbStorage.manageStartStop = lib.mkOption {
|
||||
options.hardware.usbStorage.manageShutdown = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
default = false;
|
||||
description = ''
|
||||
Enable this option to gracefully spin-down external storage during shutdown.
|
||||
If you suspect improper head parking after poweroff, install `smartmontools` and check
|
||||
@ -10,9 +11,11 @@
|
||||
'';
|
||||
};
|
||||
|
||||
config = lib.mkIf config.hardware.usbStorage.manageStartStop {
|
||||
config = lib.mkIf config.hardware.usbStorage.manageShutdown {
|
||||
services.udev.extraRules = ''
|
||||
ACTION=="add|change", SUBSYSTEM=="scsi_disk", DRIVERS=="usb-storage", ATTR{manage_system_start_stop}="1"
|
||||
ACTION=="add|change", SUBSYSTEM=="scsi_disk", DRIVERS=="usb-storage|uas", ATTR{manage_shutdown}="1"
|
||||
'';
|
||||
};
|
||||
|
||||
imports = [(lib.mkRenamedOptionModule [ "hardware" "usbStorage" "manageStartStop" ] [ "hardware" "usbStorage" "manageShutdown" ])];
|
||||
}
|
||||
|
@ -69,11 +69,6 @@ in {
|
||||
appservice = {
|
||||
id = "";
|
||||
|
||||
database = {
|
||||
type = "sqlite3-fk-wal";
|
||||
uri = "file:${fullDataDir config}/mautrix-meta.db?_txlock=immediate";
|
||||
};
|
||||
|
||||
bot = {
|
||||
username = "";
|
||||
};
|
||||
@ -83,11 +78,15 @@ in {
|
||||
address = "http://${config.settings.appservice.hostname}:${toString config.settings.appservice.port}";
|
||||
};
|
||||
|
||||
meta = {
|
||||
mode = "";
|
||||
bridge = {
|
||||
permissions = {};
|
||||
};
|
||||
|
||||
database = {
|
||||
type = "sqlite3-fk-wal";
|
||||
uri = "file:${fullDataDir config}/mautrix-meta.db?_txlock=immediate";
|
||||
};
|
||||
|
||||
bridge = {
|
||||
# Enable encryption by default to make the bridge more secure
|
||||
encryption = {
|
||||
allow = true;
|
||||
@ -106,6 +105,11 @@ in {
|
||||
delete_outdated_inbound = true;
|
||||
};
|
||||
|
||||
# TODO: This effectively disables encryption. But this is the value provided when a <0.4 config is migrated. Changing it will corrupt the database.
|
||||
# https://github.com/mautrix/meta/blob/f5440b05aac125b4c95b1af85635a717cbc6dd0e/cmd/mautrix-meta/legacymigrate.go#L24
|
||||
# If you wish to encrypt the local database you should set this to an environment variable substitution and reset the bridge or somehow migrate the DB.
|
||||
pickle_key = "mautrix.bridge.e2ee";
|
||||
|
||||
verification_levels = {
|
||||
receive = "cross-signed-tofu";
|
||||
send = "cross-signed-tofu";
|
||||
@ -113,9 +117,6 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
permissions = {};
|
||||
};
|
||||
|
||||
logging = {
|
||||
min_level = "info";
|
||||
writers = lib.singleton {
|
||||
@ -124,6 +125,10 @@ in {
|
||||
time_format = " ";
|
||||
};
|
||||
};
|
||||
|
||||
network = {
|
||||
mode = "";
|
||||
};
|
||||
};
|
||||
defaultText = ''
|
||||
{
|
||||
@ -261,7 +266,7 @@ in {
|
||||
description = ''
|
||||
Configuration of multiple `mautrix-meta` instances.
|
||||
`services.mautrix-meta.instances.facebook` and `services.mautrix-meta.instances.instagram`
|
||||
come preconfigured with meta.mode, appservice.id, bot username, display name and avatar.
|
||||
come preconfigured with network.mode, appservice.id, bot username, display name and avatar.
|
||||
'';
|
||||
|
||||
example = ''
|
||||
@ -283,7 +288,7 @@ in {
|
||||
messenger = {
|
||||
enable = true;
|
||||
settings = {
|
||||
meta.mode = "messenger";
|
||||
network.mode = "messenger";
|
||||
homeserver.domain = "example.com";
|
||||
appservice = {
|
||||
id = "messenger";
|
||||
@ -313,9 +318,9 @@ in {
|
||||
'';
|
||||
}
|
||||
{
|
||||
assertion = builtins.elem cfg.settings.meta.mode [ "facebook" "facebook-tor" "messenger" "instagram" ];
|
||||
assertion = builtins.elem cfg.settings.network.mode [ "facebook" "facebook-tor" "messenger" "instagram" ];
|
||||
message = ''
|
||||
The option `services.mautrix-meta.instances.${name}.settings.meta.mode` has to be set
|
||||
The option `services.mautrix-meta.instances.${name}.settings.network.mode` has to be set
|
||||
to one of: facebook, facebook-tor, messenger, instagram.
|
||||
This configures the mode of the bridge.
|
||||
'';
|
||||
@ -338,6 +343,24 @@ in {
|
||||
The option `services.mautrix-meta.instances.${name}.settings.appservice.bot.username` has to be set.
|
||||
'';
|
||||
}
|
||||
{
|
||||
assertion = !(cfg.settings ? bridge.disable_xma);
|
||||
message = ''
|
||||
The option `bridge.disable_xma` has been moved to `network.disable_xma_always`. Please [migrate your configuration](https://github.com/mautrix/meta/releases/tag/v0.4.0). You may wish to use [the auto-migration code](https://github.com/mautrix/meta/blob/f5440b05aac125b4c95b1af85635a717cbc6dd0e/cmd/mautrix-meta/legacymigrate.go#L23) for reference.
|
||||
'';
|
||||
}
|
||||
{
|
||||
assertion = !(cfg.settings ? bridge.displayname_template);
|
||||
message = ''
|
||||
The option `bridge.displayname_template` has been moved to `network.displayname_template`. Please [migrate your configuration](https://github.com/mautrix/meta/releases/tag/v0.4.0). You may wish to use [the auto-migration code](https://github.com/mautrix/meta/blob/f5440b05aac125b4c95b1af85635a717cbc6dd0e/cmd/mautrix-meta/legacymigrate.go#L23) for reference.
|
||||
'';
|
||||
}
|
||||
{
|
||||
assertion = !(cfg.settings ? meta);
|
||||
message = ''
|
||||
The options in `meta` have been moved to `network`. Please [migrate your configuration](https://github.com/mautrix/meta/releases/tag/v0.4.0). You may wish to use [the auto-migration code](https://github.com/mautrix/meta/blob/f5440b05aac125b4c95b1af85635a717cbc6dd0e/cmd/mautrix-meta/legacymigrate.go#L23) for reference.
|
||||
'';
|
||||
}
|
||||
]) enabledInstances));
|
||||
|
||||
users.users = lib.mapAttrs' (name: cfg: lib.nameValuePair "mautrix-meta-${name}" {
|
||||
@ -518,11 +541,7 @@ in {
|
||||
in {
|
||||
instagram = {
|
||||
settings = {
|
||||
meta.mode = mkDefault "instagram";
|
||||
|
||||
bridge = {
|
||||
username_template = mkDefault "instagram_{{.}}";
|
||||
};
|
||||
network.mode = mkDefault "instagram";
|
||||
|
||||
appservice = {
|
||||
id = mkDefault "instagram";
|
||||
@ -532,16 +551,13 @@ in {
|
||||
displayname = mkDefault "Instagram bridge bot";
|
||||
avatar = mkDefault "mxc://maunium.net/JxjlbZUlCPULEeHZSwleUXQv";
|
||||
};
|
||||
username_template = mkDefault "instagram_{{.}}";
|
||||
};
|
||||
};
|
||||
};
|
||||
facebook = {
|
||||
settings = {
|
||||
meta.mode = mkDefault "facebook";
|
||||
|
||||
bridge = {
|
||||
username_template = mkDefault "facebook_{{.}}";
|
||||
};
|
||||
network.mode = mkDefault "facebook";
|
||||
|
||||
appservice = {
|
||||
id = mkDefault "facebook";
|
||||
@ -551,6 +567,7 @@ in {
|
||||
displayname = mkDefault "Facebook bridge bot";
|
||||
avatar = mkDefault "mxc://maunium.net/ygtkteZsXnGJLJHRchUwYWak";
|
||||
};
|
||||
username_template = mkDefault "facebook_{{.}}";
|
||||
};
|
||||
};
|
||||
};
|
||||
@ -558,5 +575,5 @@ in {
|
||||
}
|
||||
];
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ rutherther ];
|
||||
meta.maintainers = with lib.maintainers; [ ];
|
||||
}
|
||||
|
@ -177,6 +177,18 @@ in
|
||||
SCRUTINY_WEB_DATABASE_LOCATION = "/var/lib/scrutiny/scrutiny.db";
|
||||
SCRUTINY_WEB_SRC_FRONTEND_PATH = "${cfg.package}/share/scrutiny";
|
||||
};
|
||||
postStart = ''
|
||||
for i in $(seq 300); do
|
||||
if "${lib.getExe pkgs.curl}" --fail --silent --head "http://${cfg.settings.web.listen.host}:${toString cfg.settings.web.listen.port}" >/dev/null; then
|
||||
echo "Scrutiny is ready (port is open)"
|
||||
exit 0
|
||||
fi
|
||||
echo "Waiting for Scrutiny to open port..."
|
||||
sleep 0.2
|
||||
done
|
||||
echo "Timeout waiting for Scrutiny to open port" >&2
|
||||
exit 1
|
||||
'';
|
||||
serviceConfig = {
|
||||
DynamicUser = true;
|
||||
ExecStart = "${getExe cfg.package} start --config ${settingsFormat.generate "scrutiny.yaml" cfg.settings}";
|
||||
|
@ -201,11 +201,11 @@ in {
|
||||
--syncmode ${cfg.syncmode} \
|
||||
${optionalString (cfg.permissioned)
|
||||
"--permissioned"} \
|
||||
--mine --minerthreads 1 \
|
||||
--mine --miner.threads 1 \
|
||||
${optionalString (cfg.rpc.enable)
|
||||
"--rpc --rpcaddr ${cfg.rpc.address} --rpcport ${toString cfg.rpc.port} --rpcapi ${cfg.rpc.api}"} \
|
||||
${optionalString (cfg.ws.enable)
|
||||
"--ws --wsaddr ${cfg.ws.address} --wsport ${toString cfg.ws.port} --wsapi ${cfg.ws.api} --wsorigins ${cfg.ws.origins}"} \
|
||||
"--ws --ws.addr ${cfg.ws.address} --ws.port ${toString cfg.ws.port} --ws.api ${cfg.ws.api} --ws.origins ${cfg.ws.origins}"} \
|
||||
--emitcheckpoints \
|
||||
--datadir ${dataDir} \
|
||||
--port ${toString cfg.port}'';
|
||||
|
@ -896,7 +896,7 @@ in
|
||||
typesHashMaxSize = mkOption {
|
||||
type = types.ints.positive;
|
||||
default = if cfg.defaultMimeTypes == "${pkgs.mailcap}/etc/nginx/mime.types" then 2688 else 1024;
|
||||
defaultText = literalExpression ''if cfg.defaultMimeTypes == "''${pkgs.mailcap}/etc/nginx/mime.types" then 2688 else 1024'';
|
||||
defaultText = literalExpression ''if config.services.nginx.defaultMimeTypes == "''${pkgs.mailcap}/etc/nginx/mime.types" then 2688 else 1024'';
|
||||
description = ''
|
||||
Sets the maximum size of the types hash tables (`types_hash_max_size`).
|
||||
It is recommended that the minimum size possible size is used.
|
||||
@ -1071,7 +1071,7 @@ in
|
||||
'';
|
||||
};
|
||||
"memcached" = {
|
||||
servers."unix:/run//memcached/memcached.sock" = {};
|
||||
servers."unix:/run/memcached/memcached.sock" = {};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
@ -1,27 +1,85 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.boot.initrd.unl0kr;
|
||||
settingsFormat = pkgs.formats.ini { };
|
||||
in
|
||||
{
|
||||
options.boot.initrd.unl0kr = {
|
||||
enable = lib.mkEnableOption "unl0kr in initrd" // {
|
||||
description = ''Whether to enable the unl0kr on-screen keyboard in initrd to unlock LUKS.'';
|
||||
};
|
||||
|
||||
allowVendorDrivers = lib.mkEnableOption "load optional drivers" // {
|
||||
description = ''Whether to load additional drivers for certain vendors (I.E: Wacom, Intel, etc.)'';
|
||||
};
|
||||
|
||||
settings = lib.mkOption {
|
||||
description = ''
|
||||
Whether to enable the unl0kr on-screen keyboard in initrd to unlock LUKS.
|
||||
Configuration for `unl0kr`.
|
||||
|
||||
See `unl0kr.conf(5)` for supported values.
|
||||
|
||||
Alternatively, visit `https://gitlab.com/postmarketOS/buffybox/-/blob/unl0kr-2.0.0/unl0kr.conf`
|
||||
'';
|
||||
|
||||
example = lib.literalExpression ''
|
||||
{
|
||||
general.animations = true;
|
||||
theme = {
|
||||
default = "pmos-dark";
|
||||
alternate = "pmos-light";
|
||||
};
|
||||
}
|
||||
'';
|
||||
default = { };
|
||||
type = lib.types.submodule { freeformType = settingsFormat.type; };
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
meta.maintainers = [];
|
||||
meta.maintainers = with lib.maintainers; [ hustlerone ];
|
||||
assertions = [
|
||||
{
|
||||
assertion = cfg.enable -> config.boot.initrd.systemd.enable;
|
||||
message = "boot.initrd.unl0kr is only supported with boot.initrd.systemd.";
|
||||
}
|
||||
{
|
||||
assertion = !config.boot.plymouth.enable;
|
||||
message = "unl0kr will not work if plymouth is enabled.";
|
||||
}
|
||||
{
|
||||
assertion = !config.hardware.amdgpu.initrd.enable;
|
||||
message = "unl0kr has issues with video drivers that are loaded on stage 1.";
|
||||
}
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules =
|
||||
lib.optionals cfg.enable [
|
||||
"hid-multitouch"
|
||||
"hid-generic"
|
||||
"usbhid"
|
||||
|
||||
"i2c-designware-core"
|
||||
"i2c-designware-platform"
|
||||
"i2c-hid-acpi"
|
||||
|
||||
"usbtouchscreen"
|
||||
"evdev"
|
||||
]
|
||||
++ lib.optionals cfg.allowVendorDrivers [
|
||||
"intel_lpss_pci"
|
||||
"elo"
|
||||
"wacom"
|
||||
];
|
||||
|
||||
boot.initrd.systemd = {
|
||||
contents."/etc/unl0kr.conf".source = settingsFormat.generate "unl0kr.conf" cfg.settings;
|
||||
storePaths = with pkgs; [
|
||||
"${pkgs.gnugrep}/bin/grep"
|
||||
libinput
|
||||
@ -42,9 +100,7 @@ in
|
||||
"systemd-vconsole-setup.service"
|
||||
"udev.service"
|
||||
];
|
||||
before = [
|
||||
"shutdown.target"
|
||||
];
|
||||
before = [ "shutdown.target" ];
|
||||
script = ''
|
||||
# This script acts as a Password Agent: https://systemd.io/PASSWORD_AGENTS/
|
||||
|
||||
@ -56,7 +112,7 @@ in
|
||||
do
|
||||
for file in `ls $DIR/ask.*`; do
|
||||
socket="$(cat "$file" | ${pkgs.gnugrep}/bin/grep "Socket=" | cut -d= -f2)"
|
||||
${pkgs.unl0kr}/bin/unl0kr | ${config.boot.initrd.systemd.package}/lib/systemd/systemd-reply-password 1 "$socket"
|
||||
${pkgs.unl0kr}/bin/unl0kr -v -C "/etc/unl0kr.conf" | ${config.boot.initrd.systemd.package}/lib/systemd/systemd-reply-password 1 "$socket"
|
||||
done
|
||||
done
|
||||
'';
|
||||
|
@ -64,7 +64,10 @@ in
|
||||
networking.firewall.allowedTCPPorts = [ 443 ];
|
||||
networking.firewall.allowedUDPPorts = [ 443 ];
|
||||
services.dnsdist.dnscrypt.enable = true;
|
||||
services.dnsdist.dnscrypt.providerKey = "${./dnscrypt-wrapper/secret.key}";
|
||||
services.dnsdist.dnscrypt.providerKey = pkgs.runCommand "dnscrypt-secret.key" {} ''
|
||||
echo 'R70+xqm7AaDsPtDgpSjSG7KHvEqVf6u6PZ+E3cGPbOwUQdg6/
|
||||
RIIpK6pHkINhrv7nxwIG5c7b/m5NJVT3A1AXQ==' | base64 -id > "$out"
|
||||
'';
|
||||
}
|
||||
];
|
||||
|
||||
|
@ -82,8 +82,9 @@ with pkgs.lib;
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
|
||||
with subtest("BTRFS filesystems are mounted correctly"):
|
||||
machine.succeed("grep -E '/dev/vda / btrfs rw,relatime,space_cache=v2,subvolid=[0-9]+,subvol=/root 0 0' /proc/mounts")
|
||||
machine.succeed("grep -E '/dev/vda /home btrfs rw,relatime,space_cache=v2,subvolid=[0-9]+,subvol=/home 0 0' /proc/mounts")
|
||||
print("output of \"grep -E '/dev/vda' /proc/mounts\":\n" + machine.execute("grep -E '/dev/vda' /proc/mounts")[1])
|
||||
machine.succeed("grep -E '/dev/vda / btrfs rw,.*subvolid=[0-9]+,subvol=/root 0 0' /proc/mounts")
|
||||
machine.succeed("grep -E '/dev/vda /home btrfs rw,.*subvolid=[0-9]+,subvol=/home 0 0' /proc/mounts")
|
||||
'';
|
||||
};
|
||||
|
||||
|
@ -18,14 +18,14 @@ with pkgs; {
|
||||
|
||||
testScript = { nodes, ... }:
|
||||
let
|
||||
sqlSU = "${nodes.master.config.services.postgresql.superUser}";
|
||||
sqlSU = "${nodes.master.services.postgresql.superUser}";
|
||||
pgProve = "${pkgs.perlPackages.TAPParserSourceHandlerpgTAP}";
|
||||
in
|
||||
''
|
||||
start_all()
|
||||
master.wait_for_unit("postgresql")
|
||||
master.succeed(
|
||||
"${pkgs.gnused}/bin/sed -e '12 i CREATE EXTENSION pgcrypto;\\nCREATE EXTENSION pgtap;\\nSET search_path TO tap,public;' ${pgjwt.src}/test.sql > /tmp/test.sql"
|
||||
"${pkgs.gnused}/bin/sed -e '12 i SET search_path TO tap,public;' ${pgjwt.src}/test.sql > /tmp/test.sql"
|
||||
)
|
||||
master.succeed(
|
||||
"${pkgs.sudo}/bin/sudo -u ${sqlSU} PGOPTIONS=--search_path=tap,public ${pgProve}/bin/pg_prove -d postgres -v -f /tmp/test.sql"
|
||||
|
@ -62,6 +62,7 @@ in
|
||||
"0x0000000000000000000000000000000000000000000000000000000000000000";
|
||||
eip155Block = 1;
|
||||
eip158Block = 1;
|
||||
homesteadBlock = 1;
|
||||
isQuorum = true;
|
||||
istanbul = {
|
||||
epoch = 30000;
|
||||
|
@ -52,6 +52,7 @@ in
|
||||
server.succeed("scp ${sshOpts} /tmp/tmate.conf client:/tmp/tmate.conf")
|
||||
|
||||
client.wait_for_file("/tmp/tmate.conf")
|
||||
client.wait_until_tty_matches("1", "login:")
|
||||
client.send_chars("root\n")
|
||||
client.sleep(2)
|
||||
client.send_chars("tmate -f /tmp/tmate.conf\n")
|
||||
@ -62,7 +63,8 @@ in
|
||||
client.wait_for_file("/tmp/ssh_command")
|
||||
ssh_cmd = client.succeed("cat /tmp/ssh_command")
|
||||
|
||||
client2.succeed("mkdir -p ~/.ssh; ssh-keyscan -p 2223 server > ~/.ssh/known_hosts")
|
||||
client2.succeed("mkdir -p ~/.ssh; ssh-keyscan -4 -p 2223 server > ~/.ssh/known_hosts")
|
||||
client2.wait_until_tty_matches("1", "login:")
|
||||
client2.send_chars("root\n")
|
||||
client2.sleep(2)
|
||||
client2.send_chars(ssh_cmd.strip() + "\n")
|
||||
|
@ -8,6 +8,8 @@ let
|
||||
maintainers = [ oddlama rnhmjoj ];
|
||||
};
|
||||
|
||||
naughtyPassphrase = ''!,./;'[]\-=<>?:"{}|_+@$%^&*()`~ # ceci n'est pas un commentaire'';
|
||||
|
||||
runConnectionTest = name: extraConfig: runTest {
|
||||
name = "wpa_supplicant-${name}";
|
||||
inherit meta;
|
||||
@ -28,7 +30,7 @@ let
|
||||
ssid = "nixos-test-sae";
|
||||
authentication = {
|
||||
mode = "wpa3-sae";
|
||||
saePasswords = [ { password = "reproducibility"; } ];
|
||||
saePasswords = [ { password = naughtyPassphrase; } ];
|
||||
};
|
||||
bssid = "02:00:00:00:00:00";
|
||||
};
|
||||
@ -37,8 +39,8 @@ let
|
||||
authentication = {
|
||||
mode = "wpa3-sae-transition";
|
||||
saeAddToMacAllow = true;
|
||||
saePasswordsFile = pkgs.writeText "password" "reproducibility";
|
||||
wpaPasswordFile = pkgs.writeText "password" "reproducibility";
|
||||
saePasswordsFile = pkgs.writeText "password" naughtyPassphrase;
|
||||
wpaPasswordFile = pkgs.writeText "password" naughtyPassphrase;
|
||||
};
|
||||
bssid = "02:00:00:00:00:01";
|
||||
};
|
||||
@ -46,7 +48,7 @@ let
|
||||
ssid = "nixos-test-wpa2";
|
||||
authentication = {
|
||||
mode = "wpa2-sha256";
|
||||
wpaPassword = "reproducibility";
|
||||
wpaPassword = naughtyPassphrase;
|
||||
};
|
||||
bssid = "02:00:00:00:00:02";
|
||||
};
|
||||
@ -66,7 +68,7 @@ let
|
||||
|
||||
# secrets
|
||||
secretsFile = pkgs.writeText "wpa-secrets" ''
|
||||
psk_nixos_test=reproducibility
|
||||
psk_nixos_test=${naughtyPassphrase}
|
||||
'';
|
||||
}
|
||||
extraConfig
|
||||
|
@ -20,8 +20,8 @@ import ./make-test-python.nix (
|
||||
let cfg = config.services.zammad; in
|
||||
{
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
Restart = "always";
|
||||
Type = "oneshot";
|
||||
Restart = "on-failure";
|
||||
|
||||
User = "zammad";
|
||||
Group = "zammad";
|
||||
|
@ -11,7 +11,7 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.4.0";
|
||||
version = "2.4.1";
|
||||
pname = "jacktrip";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
repo = "jacktrip";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-sTCzmQ/dq12ZmkbarVX1jpSODlBf9OuSB1XwKUnfV64=";
|
||||
hash = "sha256-KxpoY7g5oKN2j8rOcFcJf/29xTELxhBn5KBvKB5kL8M=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
@ -6,12 +6,12 @@
|
||||
|
||||
python3.pkgs.buildPythonPackage rec {
|
||||
pname = "ledfx";
|
||||
version = "2.0.100";
|
||||
version = "2.0.104";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-IRwzm0ODeT+umLvIjNURdTE9igpJ03r+ArjNN3y//z0=";
|
||||
hash = "sha256-Hs21Okf0gt8eHTuGMW8L2ioW+hv7QDFOP4oJDQfRba0=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "praat";
|
||||
version = "6.4.20";
|
||||
version = "6.4.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "praat";
|
||||
repo = "praat";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-qal7eIKht0XkRDEsAfNkNDwmDYrr/cLQV4pMMWE+kFk=";
|
||||
hash = "sha256-2OeipesVdonv1XACbt9o99M9bxzxE0WQzCU2KWJmuzQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "waylyrics";
|
||||
version = "0.3.15";
|
||||
version = "0.3.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "waylyrics";
|
||||
repo = "waylyrics";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-iW3NIPdnMoardC95kgU/jgzHy7qu/7wpJrkMdJE/r9U=";
|
||||
hash = "sha256-/hwx4fe1yjfsLYxsQkUMXrqWhAgp/VJ74N1eSiXuJ54=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-3nPLi7/F8AG5pqHHPHzLCbXKZFeV/Z+LR3nK2BbrlEE=";
|
||||
cargoHash = "sha256-Os7djeTDChNWXWbmDuJWJnf7E+U/V14Jg4cLOMAKhu4=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook4 ];
|
||||
buildInputs = [ openssl dbus ];
|
||||
|
2020
pkgs/applications/blockchains/polkadot/Cargo.lock
generated
2020
pkgs/applications/blockchains/polkadot/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -17,13 +17,13 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "polkadot";
|
||||
version = "stable2407-2";
|
||||
version = "stable2409";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paritytech";
|
||||
repo = "polkadot-sdk";
|
||||
rev = "polkadot-${version}";
|
||||
hash = "sha256-4WOoFjihzErc6lIgiWvLg6fqDOxs1A+A0ERvu/D8btw=";
|
||||
hash = "sha256-QNjk2lb04VLYpwbE7hmUVaujijX9nkZxVdseTS1G85E=";
|
||||
|
||||
# the build process of polkadot requires a .git folder in order to determine
|
||||
# the git commit hash that is being built and add it to the version string.
|
||||
|
@ -9,16 +9,16 @@ let
|
||||
inherit tiling_wm;
|
||||
};
|
||||
stableVersion = {
|
||||
version = "2024.1.2.13"; # "Android Studio Koala Feature Drop | 2024.1.2 Patch 1"
|
||||
sha256Hash = "sha256-aIxlXCMPKYZ6Eq44LMJuxnBr9/ML1Nl/LxXI+WDLG5s=";
|
||||
version = "2024.2.1.9"; # "Android Studio Ladybug | 2024.2.1"
|
||||
sha256Hash = "sha256-18ppVeAvxx6kNBOjSKcZjbEMNt8khKmohMq3JErX7pY=";
|
||||
};
|
||||
betaVersion = {
|
||||
version = "2024.2.1.8"; # "Android Studio Ladybug | 2024.2.1 RC 1"
|
||||
sha256Hash = "sha256-Kb/1+g9rIuU/pAO1ue5h0+BU7OCE09QqV9XFoiJxBL4=";
|
||||
};
|
||||
latestVersion = {
|
||||
version = "2024.2.2.4"; # "Android Studio Ladybug Feature Drop | 2024.2.2 Canary 4"
|
||||
sha256Hash = "sha256-Rw+smKU2F11ZpK6lWb3VyLGTKt3qWFoUqnfcs5OXBcU=";
|
||||
version = "2024.2.2.5"; # "Android Studio Ladybug Feature Drop | 2024.2.2 Canary 5"
|
||||
sha256Hash = "sha256-LlGjk0dSHVI5u/b942S5iu4RHv1D4KWg2Ge1TL47pvg=";
|
||||
};
|
||||
in {
|
||||
# Attributes are named by their corresponding release channels
|
||||
|
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qemacs";
|
||||
version = "5.4.1c";
|
||||
version = "6.1.1b";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qemacs";
|
||||
repo = "qemacs";
|
||||
rev = "216b3ff8b77ff138aec22045522d5601b7390e58";
|
||||
hash = "sha256-ngVaZZdr/Ym9YswLqzUtDytC0K7L9mKgORopLghGH3k=";
|
||||
rev = "06b3d373bbcc52b51ccb438bf3cab38a49492ff0";
|
||||
hash = "sha256-Z4BbA8W3bYdw+cHgI24r55OP1Olr3GwKLlfRxjy45i8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -1,17 +1,18 @@
|
||||
{ lib, buildPythonApplication, fetchFromGitHub
|
||||
, gdk-pixbuf, glib, gobject-introspection, gtk3, gtksourceview, pango, webkitgtk
|
||||
, pygobject3, pyyaml
|
||||
, pygobject3, pyyaml, setuptools
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "rednotebook";
|
||||
version = "2.34";
|
||||
version = "2.35";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jendrikseipp";
|
||||
repo = "rednotebook";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-2Z9zYfMAJPcKN5eakooIv4lQ140yjgQuUVlaWcsEu28=";
|
||||
sha256 = "sha256-sGwdZZ3YGm3sXJoxnYwj6HQcYMnC1pEzba3N9KLfRHM=";
|
||||
};
|
||||
|
||||
# We have not packaged tests.
|
||||
@ -19,6 +20,8 @@ buildPythonApplication rec {
|
||||
|
||||
nativeBuildInputs = [ gobject-introspection ];
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
gdk-pixbuf glib gtk3 gtksourceview pango webkitgtk
|
||||
pygobject3 pyyaml
|
||||
@ -30,6 +33,8 @@ buildPythonApplication rec {
|
||||
"--suffix XDG_DATA_DIRS : $XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "rednotebook" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://rednotebook.sourceforge.io/";
|
||||
changelog = "https://github.com/jendrikseipp/rednotebook/blob/v${version}/CHANGELOG.md";
|
||||
|
@ -9,8 +9,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "jupyter";
|
||||
publisher = "ms-toolsai";
|
||||
version = "2024.9.0";
|
||||
hash = "sha256-44L7K8JGpmKmH3aoNCalse8QRKJ/2wvA76gs0Z18zpc=";
|
||||
version = "2024.9.1";
|
||||
hash = "sha256-7ZNTIymw0LiM5TmDOxrwcyJGhxjdYuvaC4+Tb+YSASs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
name = "tinymist";
|
||||
publisher = "myriad-dreamin";
|
||||
inherit (tinymist) version;
|
||||
hash = "sha256-XkpoSf2UO3OoEMMpXBMkY1peQPR/4QoQ4LrY81IsHT0=";
|
||||
hash = "sha256-PcCZkY1+ks9J5JaDJLVgiJuXgRxIvUZHI00gatjeVbA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -15,10 +15,10 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "libretro-atari800",
|
||||
"rev": "39380a6e028589e850ecdfd2a5a19307b475d667",
|
||||
"hash": "sha256-Rw6eTaKHZaCEgvnIqctaKCYQ+W8cHLtckLK8U5Ugck4="
|
||||
"rev": "683a37f25e34af6cb22ee4c4f9acf9db53d49662",
|
||||
"hash": "sha256-B7EwI0ii8hqkcg314hWi06OI7E5unufkKSak53pqrAY="
|
||||
},
|
||||
"version": "unstable-2024-09-24"
|
||||
"version": "unstable-2024-10-01"
|
||||
},
|
||||
"beetle-gba": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -55,10 +55,10 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "beetle-pce-libretro",
|
||||
"rev": "e6c21fdf7d1aeae411f08272121213fa4de96bbc",
|
||||
"hash": "sha256-ZeBoLTsr1A+IPQJ+oIGNADrgKySDHczXY6uriLmeHV4="
|
||||
"rev": "68a9f57622f7c3b8581eb2cfba6133774d122563",
|
||||
"hash": "sha256-tlepLBcuB4H/MvZdXSDT/zupwhRznHsvEt0lgMqq1dE="
|
||||
},
|
||||
"version": "unstable-2024-09-27"
|
||||
"version": "unstable-2024-10-01"
|
||||
},
|
||||
"beetle-pce-fast": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -95,20 +95,20 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "beetle-saturn-libretro",
|
||||
"rev": "7a8f808a1d447fcb8fa9547d9f163eb3600d3086",
|
||||
"hash": "sha256-Yp1HuhbsQGicrFeIbnJP6Rd6hVK4BRclUnPKZlYC7pM="
|
||||
"rev": "3c12611c8cc13adaf2b82ca0a2e4862ebfd06753",
|
||||
"hash": "sha256-9GyFloo+7mBA6C2p791P1+g0GfuFEKB2+3QSCz9gXmc="
|
||||
},
|
||||
"version": "unstable-2024-05-19"
|
||||
"version": "unstable-2024-10-01"
|
||||
},
|
||||
"beetle-supafaust": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "supafaust",
|
||||
"rev": "6b639c98372d1c9bac885c55d772c812d2a9d525",
|
||||
"hash": "sha256-EVXwjrxooZm1JqG4HswUe8zwN81Rm7SPB5Fr4WfpTnc="
|
||||
"rev": "e25f66765938d33f9ad5850e8d6cd597e55b7299",
|
||||
"hash": "sha256-ZgOXHhEHt54J2B1q6uA8v6uOK53g7idJlgoC4guTGow="
|
||||
},
|
||||
"version": "unstable-2023-06-19"
|
||||
"version": "unstable-2024-10-01"
|
||||
},
|
||||
"beetle-supergrafx": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -155,10 +155,10 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "bluemsx-libretro",
|
||||
"rev": "824690b5ac997ec9694e8db1595186459bb3b652",
|
||||
"hash": "sha256-8UgVUTKGjSt2HwVgE6a/cs1npsOR8j9TxWBH/RA9VNk="
|
||||
"rev": "7a4a21d1e90a9135f678587cd8aea3f023798edd",
|
||||
"hash": "sha256-emwyVbZHJU2ujHeiqD1mthKFvnP4bXdUDLAv+DFMMN4="
|
||||
},
|
||||
"version": "unstable-2024-08-08"
|
||||
"version": "unstable-2024-10-01"
|
||||
},
|
||||
"bsnes": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -246,10 +246,10 @@
|
||||
"src": {
|
||||
"owner": "schellingb",
|
||||
"repo": "dosbox-pure",
|
||||
"rev": "ea7b947a8ed156a1ce2ce49329a5686c69f80075",
|
||||
"hash": "sha256-aqNyYG7H+YBLhQlnkfBfmX3PkBF8GeYXc+KHkvkxlRo="
|
||||
"rev": "9b4147fd14332a7354c9b76fa72653bda2d919e9",
|
||||
"hash": "sha256-lzRBzBMIQ3X+VAHK8pl/HYELecTkdFlWJI7C1csmZ7I="
|
||||
},
|
||||
"version": "unstable-2024-09-16"
|
||||
"version": "unstable-2024-09-28"
|
||||
},
|
||||
"easyrpg": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -287,10 +287,10 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "fbneo",
|
||||
"rev": "3d69bc5519c4382b3d5da2763ae42e3b6a3d019e",
|
||||
"hash": "sha256-Tf5nLy9G9h/qBrwdBFO3OUYl3n81NPw4slEeCfLzMjI="
|
||||
"rev": "d72f49f4a45dbfc5a855956d1a75ce2d0601c1c5",
|
||||
"hash": "sha256-+T+HQo6IfY8+oE/mOg54Vn9NhasGYNCLXksFdSDT/xE="
|
||||
},
|
||||
"version": "unstable-2024-09-26"
|
||||
"version": "unstable-2024-10-03"
|
||||
},
|
||||
"fceumm": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -307,11 +307,11 @@
|
||||
"src": {
|
||||
"owner": "flyinghead",
|
||||
"repo": "flycast",
|
||||
"rev": "343021a8c507f4723b3f56a3bb817206912fcb36",
|
||||
"hash": "sha256-DMbhCHW2VHEle0oihaz1GEPOGDCXxfdZoL8MdPZT4d0=",
|
||||
"rev": "d689c50e21bf956913ac607933cd4082eaedc06b",
|
||||
"hash": "sha256-XIe1JrKVY4ba5WnKrVofWNpJU5pcwUyDd14ZzaGcf+k=",
|
||||
"fetchSubmodules": true
|
||||
},
|
||||
"version": "unstable-2024-09-27"
|
||||
"version": "unstable-2024-10-05"
|
||||
},
|
||||
"fmsx": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -348,10 +348,10 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "gambatte-libretro",
|
||||
"rev": "e9a1941276e932813dc742796ffd1d0939c5d1d5",
|
||||
"hash": "sha256-4FFYocOa2fuBT8UFKM87Fn5E6pjkfe4tUVDtpEchtJo="
|
||||
"rev": "3eeb65e9bcf4b2a7ca24c5cebdfa7e342177ef0f",
|
||||
"hash": "sha256-tNGMR6GIyXen9+Ktg3IvYTcPidc+5Z8TpBQu1YgmqlY="
|
||||
},
|
||||
"version": "unstable-2024-09-27"
|
||||
"version": "unstable-2024-10-04"
|
||||
},
|
||||
"genesis-plus-gx": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -368,10 +368,10 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "gpsp",
|
||||
"rev": "f2837be54aa680c4ec0c7be0669cdcd65582cc66",
|
||||
"hash": "sha256-Kfw4KYNH/K3y6Iy/eYu/OlInibv9JLQvOSDh429G2zg="
|
||||
"rev": "01ca530d0797021fb519a49c18f5df15c5093605",
|
||||
"hash": "sha256-4ka3finPgtAJx3SWXG9L6+t+Dbn++pRQJJi9EG7jV3s="
|
||||
},
|
||||
"version": "unstable-2024-08-24"
|
||||
"version": "unstable-2024-10-01"
|
||||
},
|
||||
"gw": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -398,21 +398,21 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "hatari",
|
||||
"rev": "c10a21dbe99277b06ccf7de10eceb74f5d57e921",
|
||||
"hash": "sha256-R5N7EUVUKJ1GXQtnlCCE33DlDsxMzpPp6pYUHJJ/5Ig="
|
||||
"rev": "153887d70df7c91e192192fa7ca34f90e000a7c5",
|
||||
"hash": "sha256-s1VNAIuO0N4mrInb74sRcSTBMwwHwtYw9JnCKNVPNpU="
|
||||
},
|
||||
"version": "unstable-2024-06-28"
|
||||
"version": "unstable-2024-10-01"
|
||||
},
|
||||
"mame": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "mame",
|
||||
"rev": "231b5e6d621ed93168ad19eed6c0e3390d4e81ff",
|
||||
"hash": "sha256-UD1kNQ6KXEa60ZA+65XXqgihLu/XJxTLvbM4Wt9y2vs=",
|
||||
"rev": "6a3d1606e41aaedc94e6b00d68e682a95ac36bec",
|
||||
"hash": "sha256-Fcd906E1I52fDnBWehrdtk6NfYA1yhmHIQ7xZCcbtEU=",
|
||||
"fetchSubmodules": true
|
||||
},
|
||||
"version": "unstable-2024-09-27"
|
||||
"version": "unstable-2024-10-04"
|
||||
},
|
||||
"mame2000": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -439,10 +439,10 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "mame2003-plus-libretro",
|
||||
"rev": "9221b2f66dbc7a08b22a7365e2431e027e382322",
|
||||
"hash": "sha256-mm4g1JX98yW/6Us1k5DwaYQQbhmfiBSxxXFvwgvB5yE="
|
||||
"rev": "63d5c26b5824189e7244116a64bc0b272415718e",
|
||||
"hash": "sha256-iBZjx8Oj4nR6PDFud42x5y8EIV7YHzdzlgRKbq/QOTI="
|
||||
},
|
||||
"version": "unstable-2024-09-26"
|
||||
"version": "unstable-2024-10-05"
|
||||
},
|
||||
"mame2010": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -631,21 +631,21 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "pcsx_rearmed",
|
||||
"rev": "237887e817e23800997466632deb8ba63797a4cb",
|
||||
"hash": "sha256-AhyCkQzgppCnwcX+qpKcSEJ58hosJwL9wwn80HOHpvg="
|
||||
"rev": "778896e3888aaaea996e81f0e641cb35b4b74694",
|
||||
"hash": "sha256-ULRtrWo4EO59RLZHZ5wOHl+vxLcMpnMPj1kszlGk3TQ="
|
||||
},
|
||||
"version": "unstable-2024-09-03"
|
||||
"version": "unstable-2024-10-06"
|
||||
},
|
||||
"picodrive": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "picodrive",
|
||||
"rev": "6508730c524420e05626b0b06dbc603e02d3af64",
|
||||
"hash": "sha256-iL6eKG2O6ePYo6NK0VsTVLaRKgwuapXotvSOy7KipgI=",
|
||||
"rev": "eb94de7ce26e2e70ab8c7805000f346c1c218bd0",
|
||||
"hash": "sha256-XK66u+8CDo1HVlVhwu3U6Ckn0LcLeTuD3CDC6hboP5Y=",
|
||||
"fetchSubmodules": true
|
||||
},
|
||||
"version": "unstable-2024-09-06"
|
||||
"version": "unstable-2024-10-01"
|
||||
},
|
||||
"play": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -663,11 +663,11 @@
|
||||
"src": {
|
||||
"owner": "hrydgard",
|
||||
"repo": "ppsspp",
|
||||
"rev": "64ce72e81df48f78db5d5b192bd68eca218bd0a1",
|
||||
"hash": "sha256-DRodUtFcHt+t8GAHI+3+WDltbUzkWZ/ahunOPELabTI=",
|
||||
"rev": "16d97aa810521da5e7a00145cdd5be80a27b4a35",
|
||||
"hash": "sha256-oYSypeyUsmprPZqSMGwBZtetCgoKA/GbfMBU+obvwxg=",
|
||||
"fetchSubmodules": true
|
||||
},
|
||||
"version": "unstable-2024-09-28"
|
||||
"version": "unstable-2024-10-03"
|
||||
},
|
||||
"prboom": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -754,10 +754,10 @@
|
||||
"src": {
|
||||
"owner": "snes9xgit",
|
||||
"repo": "snes9x",
|
||||
"rev": "72e4946410bff2a09ff327599f014e9f6e855c54",
|
||||
"hash": "sha256-srPtEMIjsaFdmOkymGhb6vMuY5EBnTVhzJnpsCE/fMQ="
|
||||
"rev": "08403d47d1c81370aacd8f65b3146bbd69d2c89c",
|
||||
"hash": "sha256-9u+olvp2OI+zWsLxWAo9P4Dr4bFeTXESU1RUo9sLNfU="
|
||||
},
|
||||
"version": "unstable-2024-09-27"
|
||||
"version": "unstable-2024-10-03"
|
||||
},
|
||||
"snes9x2002": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -794,10 +794,10 @@
|
||||
"src": {
|
||||
"owner": "stella-emu",
|
||||
"repo": "stella",
|
||||
"rev": "cb61f676ec78cd3f76cbd233bfd91575abde13be",
|
||||
"hash": "sha256-t+QBWIE5+rEzdv4bbk6MqIQh3XsUgviX69RKe/zMb4Q="
|
||||
"rev": "d69e47421cb5319ab0947dd005b2f1ddbd81f442",
|
||||
"hash": "sha256-c7A1gFvYkxxwuwrntw/w8FYD24l5m1Uip+44Pe664lE="
|
||||
},
|
||||
"version": "unstable-2024-09-26"
|
||||
"version": "unstable-2024-10-04"
|
||||
},
|
||||
"stella2014": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
@ -834,10 +834,10 @@
|
||||
"src": {
|
||||
"owner": "libretro",
|
||||
"repo": "ThePowderToy",
|
||||
"rev": "f644498193c4c8be689d8a1d2a70e37e4eff4243",
|
||||
"hash": "sha256-aPUqrrrH2Ia56A3Kx6ClMcZO9nbHGJIcEQ6nFyIMamo="
|
||||
"rev": "5d9c749780063b87bd62ddb025dee4241f196f26",
|
||||
"hash": "sha256-BYeQ2WZgyvjDH5+akrVP5TlLq6Go3NKXB7zeR9oaaJ8="
|
||||
},
|
||||
"version": "unstable-2023-01-17"
|
||||
"version": "unstable-2024-10-01"
|
||||
},
|
||||
"tic80": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
|
@ -69,9 +69,9 @@ in rec {
|
||||
|
||||
unstable = fetchurl rec {
|
||||
# NOTE: Don't forget to change the hash for staging as well.
|
||||
version = "9.18";
|
||||
version = "9.19";
|
||||
url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz";
|
||||
hash = "sha256-ZSb1IRwIVFO8tkKUbrLOjR1CqKSmgWi/Kg1z8yYS3Rw=";
|
||||
hash = "sha256-LBOgw/MfJaVNQV2GeFoa1G74oHrpc7a2mTRaRSBqwBU=";
|
||||
inherit (stable) patches;
|
||||
|
||||
## see http://wiki.winehq.org/Gecko
|
||||
@ -117,7 +117,7 @@ in rec {
|
||||
staging = fetchFromGitLab rec {
|
||||
# https://gitlab.winehq.org/wine/wine-staging
|
||||
inherit (unstable) version;
|
||||
hash = "sha256-m3tuwb6OFcgZ/NATixIH1j3YgrzsREJNpnVbevN/9FY=";
|
||||
hash = "sha256-TKW8y8kPsI0af/nEr3rU9nH49I77u+/6CHE64JgdkOU=";
|
||||
domain = "gitlab.winehq.org";
|
||||
owner = "wine";
|
||||
repo = "wine-staging";
|
||||
|
@ -21,8 +21,8 @@
|
||||
"sha256": "01dgvlvwbhwz7822gp6z5xn6w3k51q09i6qzns2i4ixmjh45wscs"
|
||||
},
|
||||
"diet-ng": {
|
||||
"version": "1.8.1",
|
||||
"sha256": "0kh8haw712xkd3f07s5x5g12nmmkv0y1lk2cqh66298fc5mgj4sv"
|
||||
"version": "1.8.2",
|
||||
"sha256": "0hwm8dsyw7xb9d540ks314vzxibn4ri7b4m2gagqbpmzspvd2slv"
|
||||
},
|
||||
"dportals": {
|
||||
"version": "0.1.0",
|
||||
@ -37,12 +37,12 @@
|
||||
"sha256": "0p5vmkw29ksh5wdxz1ijms1wblq288pv15vnbl93z7q2vgnq995w"
|
||||
},
|
||||
"eventcore": {
|
||||
"version": "0.9.30",
|
||||
"sha256": "1n8wdcjhas0y99pf9fvwwsydkmy9g7gvfjhlwpjh158c7pfjwlaq"
|
||||
"version": "0.9.34",
|
||||
"sha256": "0znrcmxdr65gk8bwrknhm530kicznia4xb09h5jv42sxnv3cjkjw"
|
||||
},
|
||||
"facetrack-d": {
|
||||
"version": "0.7.8",
|
||||
"sha256": "1414wvh0kn1rps5r16ir92sqfj8a7na1gd71ds81jkq8arkm17j0"
|
||||
"version": "0.8.0",
|
||||
"sha256": "0p04yd50sgjb9n9gdp2yjgvlm8kkld2gl5ivz36npjnchj8k5a8i"
|
||||
},
|
||||
"fghj": {
|
||||
"version": "1.0.2",
|
||||
@ -65,24 +65,16 @@
|
||||
"sha256": "0dl7n4myxp1s3b32v2s975k76gs90wr2nw6ac5jq9hsgzhp1ix0h"
|
||||
},
|
||||
"inmath": {
|
||||
"version": "1.0.6",
|
||||
"sha256": "0kzk55ilbnl6qypjk60zwd5ibys5n47128hbbr0mbc7bpj9ppfg4"
|
||||
"version": "1.3.0",
|
||||
"sha256": "1bmfsnlpm3lb085cs29h63l4fmfr0xr9iyfd0wrg5i87difshpw6"
|
||||
},
|
||||
"inochi2d": {
|
||||
"version": "0.8.4",
|
||||
"sha256": "1bj0c6i9kcw1vfm6lf8lyxpf1lhhslg3f182jycdmzms15i3jb3y"
|
||||
"version": "0.8.6",
|
||||
"sha256": "0xhidp1y91cidh3g1cc5v7psb5kfy17ars7k7cplnywhjlcqqk70"
|
||||
},
|
||||
"kra-d": {
|
||||
"version": "0.5.5",
|
||||
"sha256": "0dffmf084ykz19y084v936r3f74613d0jifj0wb3xibfcq9mwxqz"
|
||||
},
|
||||
"libasync": {
|
||||
"version": "0.8.6",
|
||||
"sha256": "0hhk5asfdccby8ky77a25qn7dfmfdmwyzkrg3zk064bicmgdwlnj"
|
||||
},
|
||||
"memutils": {
|
||||
"version": "1.0.10",
|
||||
"sha256": "0hm31birbw59sw1bi9syjhbcdgwwwyyx6r9jg7ar9i6a74cjr52c"
|
||||
"version": "0.5.6",
|
||||
"sha256": "1lp3mf39qfxn6cayznc4nkk24smnd2m5sg8skl9pnd4x85is6zdr"
|
||||
},
|
||||
"mir-algorithm": {
|
||||
"version": "3.22.1",
|
||||
@ -100,9 +92,13 @@
|
||||
"version": "2.2.19",
|
||||
"sha256": "0ad9ahvyrv5h38aqwn3zvlrva3ikfq28dfhpg2lwwgm31ymzvqpb"
|
||||
},
|
||||
"numem": {
|
||||
"version": "0.11.3",
|
||||
"sha256": "00rm3cg5i714ncww8yxsbzf1y1bf6r8d0yx6i38ac2x7090arvjm"
|
||||
},
|
||||
"openssl": {
|
||||
"version": "3.3.3",
|
||||
"sha256": "1fwhd5fkvgbqf3y8gwmrnd42kzi4k3mibpxijw5j82jxgfp1rzsf"
|
||||
"version": "3.3.4",
|
||||
"sha256": "17s71yfyhb9jyym2nldj23ikazwbbrmh6ply33mg888rd6dxnhyy"
|
||||
},
|
||||
"openssl-static": {
|
||||
"version": "1.0.5+3.0.8",
|
||||
@ -133,8 +129,8 @@
|
||||
"sha256": "12mfm49bjnh2pvm51dzna625kzgwznm9kcv6qhazc4il9j0224wd"
|
||||
},
|
||||
"vibe-core": {
|
||||
"version": "2.8.4",
|
||||
"sha256": "1pik6vympgwxpyxb75g1f8409cd6hw952gbflqvwaj18shz6dwjm"
|
||||
"version": "2.9.3",
|
||||
"sha256": "032q1gkm7l6blj5y3yiwk205m12svp4bv8k743crkd8d1xhlrrvi"
|
||||
},
|
||||
"vibe-d": {
|
||||
"version": "0.9.8",
|
||||
|
@ -22,13 +22,13 @@ in
|
||||
inochi-creator = mkGeneric rec {
|
||||
pname = "inochi-creator";
|
||||
appname = "Inochi Creator";
|
||||
version = "0.8.5";
|
||||
version = "0.8.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Inochi2D";
|
||||
repo = "inochi-creator";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qrSHyvFE55xRbcA79lngOHJOdv54rNlUTHlxT9jjPEY=";
|
||||
hash = "sha256-9d3j5ZL6rGOjN1GUpCIfbjby0mNMvOK7BJbHYgwLY2k=";
|
||||
};
|
||||
|
||||
dubLock = ./creator-dub-lock.json;
|
||||
@ -54,15 +54,21 @@ in
|
||||
inochi-session = mkGeneric rec {
|
||||
pname = "inochi-session";
|
||||
appname = "Inochi Session";
|
||||
version = "0.8.4";
|
||||
version = "0.8.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Inochi2D";
|
||||
repo = "inochi-session";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BRA5qODHhyHBeZYT5MQwcFmr/zVokfO5SrbcbQa6w7w=";
|
||||
hash = "sha256-FcgzTCpD+L50MsPP90kfL6h6DEUtiYkUV1xKww1pQfg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Dynamically load Lua to get around the linker error on aarch64-linux.
|
||||
# https://github.com/Inochi2D/inochi-session/pull/60
|
||||
./session-dynamic-lua.patch
|
||||
];
|
||||
|
||||
dubLock = ./session-dub-lock.json;
|
||||
|
||||
preFixup = ''
|
||||
@ -72,8 +78,8 @@ in
|
||||
dontStrip = true; # symbol lookup error: undefined symbol: , version
|
||||
|
||||
meta = {
|
||||
# darwin has slightly different build steps, aarch fails to build because of some lua related error
|
||||
broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64;
|
||||
# darwin has slightly different build steps
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
changelog = "https://github.com/Inochi2D/inochi-session/releases/tag/${src.rev}";
|
||||
description = "An application that allows streaming with Inochi2D puppets";
|
||||
};
|
||||
|
@ -14,6 +14,7 @@
|
||||
freetype,
|
||||
SDL2,
|
||||
zenity,
|
||||
luajit_2_1,
|
||||
libGL,
|
||||
|
||||
builderArgs,
|
||||
@ -99,7 +100,7 @@ buildDubPackage (
|
||||
. gentl.sh
|
||||
|
||||
# Use the fake git to generate version info
|
||||
dub build --skip-registry=all --compiler=ldc2 --build=release --config=meta
|
||||
dub build --skip-registry=all --compiler=ldc2 --build=release --config=update-version
|
||||
'';
|
||||
|
||||
# Use the "barebones" configuration so that we don't include the mascot and icon files in out build
|
||||
@ -128,7 +129,12 @@ buildDubPackage (
|
||||
# Add support for `open file` dialog
|
||||
makeWrapper $out/share/${pname}/${pname} $out/bin/${pname} \
|
||||
--prefix PATH : ${lib.makeBinPath [ zenity ]} \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]}
|
||||
--prefix LD_LIBRARY_PATH : ${
|
||||
lib.makeLibraryPath [
|
||||
libGL
|
||||
luajit_2_1
|
||||
]
|
||||
}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
@ -21,8 +21,8 @@
|
||||
"sha256": "01dgvlvwbhwz7822gp6z5xn6w3k51q09i6qzns2i4ixmjh45wscs"
|
||||
},
|
||||
"diet-ng": {
|
||||
"version": "1.8.1",
|
||||
"sha256": "0kh8haw712xkd3f07s5x5g12nmmkv0y1lk2cqh66298fc5mgj4sv"
|
||||
"version": "1.8.2",
|
||||
"sha256": "0hwm8dsyw7xb9d540ks314vzxibn4ri7b4m2gagqbpmzspvd2slv"
|
||||
},
|
||||
"dportals": {
|
||||
"version": "0.1.0",
|
||||
@ -33,12 +33,12 @@
|
||||
"sha256": "0p9g4h5qanbg6281x1068mdl5p7zvqig4zmmi72a2cay6dxnbvxb"
|
||||
},
|
||||
"eventcore": {
|
||||
"version": "0.9.30",
|
||||
"sha256": "1n8wdcjhas0y99pf9fvwwsydkmy9g7gvfjhlwpjh158c7pfjwlaq"
|
||||
"version": "0.9.34",
|
||||
"sha256": "0znrcmxdr65gk8bwrknhm530kicznia4xb09h5jv42sxnv3cjkjw"
|
||||
},
|
||||
"facetrack-d": {
|
||||
"version": "0.7.8",
|
||||
"sha256": "1414wvh0kn1rps5r16ir92sqfj8a7na1gd71ds81jkq8arkm17j0"
|
||||
"version": "0.8.0",
|
||||
"sha256": "0p04yd50sgjb9n9gdp2yjgvlm8kkld2gl5ivz36npjnchj8k5a8i"
|
||||
},
|
||||
"fghj": {
|
||||
"version": "1.0.2",
|
||||
@ -61,29 +61,21 @@
|
||||
"sha256": "0dl7n4myxp1s3b32v2s975k76gs90wr2nw6ac5jq9hsgzhp1ix0h"
|
||||
},
|
||||
"inmath": {
|
||||
"version": "1.0.6",
|
||||
"sha256": "0kzk55ilbnl6qypjk60zwd5ibys5n47128hbbr0mbc7bpj9ppfg4"
|
||||
"version": "1.3.0",
|
||||
"sha256": "1bmfsnlpm3lb085cs29h63l4fmfr0xr9iyfd0wrg5i87difshpw6"
|
||||
},
|
||||
"inochi2d": {
|
||||
"version": "0.8.4",
|
||||
"sha256": "1bj0c6i9kcw1vfm6lf8lyxpf1lhhslg3f182jycdmzms15i3jb3y"
|
||||
"version": "0.8.6",
|
||||
"sha256": "0xhidp1y91cidh3g1cc5v7psb5kfy17ars7k7cplnywhjlcqqk70"
|
||||
},
|
||||
"inui": {
|
||||
"version": "1.2.1",
|
||||
"sha256": "0pygf8jxnbvib5f23qxf6k24wz8mh6fc0zhrkp83gq33k02ab5cx"
|
||||
},
|
||||
"libasync": {
|
||||
"version": "0.8.6",
|
||||
"sha256": "0hhk5asfdccby8ky77a25qn7dfmfdmwyzkrg3zk064bicmgdwlnj"
|
||||
"version": "1.2.2",
|
||||
"sha256": "1gh7ngva2ijz5gx9hrqn9rzzx5vvpf6l12r98wklzxwb9v5hmj69"
|
||||
},
|
||||
"lumars": {
|
||||
"version": "1.6.1",
|
||||
"sha256": "1vzdghqwv2gb41rp75456g43yfsndbl0dy6bnn4x6azwwny22br9"
|
||||
},
|
||||
"memutils": {
|
||||
"version": "1.0.10",
|
||||
"sha256": "0hm31birbw59sw1bi9syjhbcdgwwwyyx6r9jg7ar9i6a74cjr52c"
|
||||
},
|
||||
"mir-algorithm": {
|
||||
"version": "3.22.1",
|
||||
"sha256": "1bvvf3dm26x1h10pg1s4kyhxiyrmd96kk2lmchyady39crpjj5cf"
|
||||
@ -96,9 +88,13 @@
|
||||
"version": "1.0.1",
|
||||
"sha256": "0adyjpcgd65z44iydnrrrpjwbvmrm08a3pkcriqi7npqylfysqn6"
|
||||
},
|
||||
"numem": {
|
||||
"version": "0.11.3",
|
||||
"sha256": "00rm3cg5i714ncww8yxsbzf1y1bf6r8d0yx6i38ac2x7090arvjm"
|
||||
},
|
||||
"openssl": {
|
||||
"version": "3.3.3",
|
||||
"sha256": "1fwhd5fkvgbqf3y8gwmrnd42kzi4k3mibpxijw5j82jxgfp1rzsf"
|
||||
"version": "3.3.4",
|
||||
"sha256": "17s71yfyhb9jyym2nldj23ikazwbbrmh6ply33mg888rd6dxnhyy"
|
||||
},
|
||||
"openssl-static": {
|
||||
"version": "1.0.5+3.0.8",
|
||||
@ -125,8 +121,8 @@
|
||||
"sha256": "12mfm49bjnh2pvm51dzna625kzgwznm9kcv6qhazc4il9j0224wd"
|
||||
},
|
||||
"vibe-core": {
|
||||
"version": "2.8.4",
|
||||
"sha256": "1pik6vympgwxpyxb75g1f8409cd6hw952gbflqvwaj18shz6dwjm"
|
||||
"version": "2.9.3",
|
||||
"sha256": "032q1gkm7l6blj5y3yiwk205m12svp4bv8k743crkd8d1xhlrrvi"
|
||||
},
|
||||
"vibe-d": {
|
||||
"version": "0.9.8",
|
||||
|
98
pkgs/applications/misc/inochi2d/session-dynamic-lua.patch
Normal file
98
pkgs/applications/misc/inochi2d/session-dynamic-lua.patch
Normal file
@ -0,0 +1,98 @@
|
||||
diff --git a/dub.sdl b/dub.sdl
|
||||
index 50c0da1..87936a4 100644
|
||||
--- a/dub.sdl
|
||||
+++ b/dub.sdl
|
||||
@@ -32,6 +32,9 @@ configuration "barebones" {
|
||||
targetType "executable"
|
||||
|
||||
dependency "dportals" version="~>0.1.0"
|
||||
+
|
||||
+ subConfiguration "lumars" "lua51-dynamic"
|
||||
+ versions "LUA_51"
|
||||
}
|
||||
|
||||
|
||||
@@ -51,6 +54,9 @@ configuration "linux-full" {
|
||||
versions "InBranding"
|
||||
|
||||
dependency "dportals" version="~>0.1.0"
|
||||
+
|
||||
+ subConfiguration "lumars" "lua51-dynamic"
|
||||
+ versions "LUA_51"
|
||||
}
|
||||
|
||||
configuration "osx-full" {
|
||||
@@ -84,6 +90,9 @@ configuration "linux-nightly" {
|
||||
versions "InNightly"
|
||||
|
||||
dependency "dportals" version="~>0.1.0"
|
||||
+
|
||||
+ subConfiguration "lumars" "lua51-dynamic"
|
||||
+ versions "LUA_51"
|
||||
}
|
||||
|
||||
// macOS nightly build
|
||||
diff --git a/source/session/plugins/package.d b/source/session/plugins/package.d
|
||||
index 965c64f..7cfbb0b 100644
|
||||
--- a/source/session/plugins/package.d
|
||||
+++ b/source/session/plugins/package.d
|
||||
@@ -14,9 +14,9 @@ import lumars;
|
||||
import session.log;
|
||||
import std.file;
|
||||
import std.path;
|
||||
+import std.exception;
|
||||
|
||||
private {
|
||||
- bool couldLoadLua = true;
|
||||
LuaState* state;
|
||||
LuaTable apiTable;
|
||||
|
||||
@@ -34,13 +34,17 @@ Plugin[] insPlugins;
|
||||
Initializes Lua support
|
||||
*/
|
||||
void insLuaInit() {
|
||||
- // LuaSupport support = loadLua();
|
||||
-
|
||||
- // if (support == LuaSupport.noLibrary || support == LuaSupport.badLibrary) {
|
||||
- // couldLoadLua = false;
|
||||
- // insLogWarn("Could not load Lua support...");
|
||||
- // } else insLogInfo("Lua support initialized.");
|
||||
- insLogInfo("Lua support initialized. (Statically linked for now)");
|
||||
+ version(linux){
|
||||
+ LuaSupport support = loadLua("libluajit-5.1.so.2");
|
||||
+ if(support == LuaSupport.noLibrary){
|
||||
+ support = loadLua();
|
||||
+ }
|
||||
+ enforce(support != LuaSupport.noLibrary, "Could not find Lua support...!");
|
||||
+ enforce(support != LuaSupport.badLibrary, "Bad Lua library found!");
|
||||
+ insLogInfo("Lua support initialized.");
|
||||
+ } else {
|
||||
+ insLogInfo("Lua support initialized. (Statically linked)");
|
||||
+ }
|
||||
|
||||
// Create Lua state
|
||||
state = new LuaState(luaL_newstate());
|
||||
@@ -56,6 +60,9 @@ void insLuaInit() {
|
||||
void insLuaUnload() {
|
||||
lua_close(state.handle());
|
||||
destroy(state);
|
||||
+ version(linux){
|
||||
+ unloadLua();
|
||||
+ }
|
||||
}
|
||||
|
||||
void insSavePluginState() {
|
||||
@@ -111,13 +118,6 @@ void insEnumeratePlugins() {
|
||||
insSavePluginState();
|
||||
}
|
||||
|
||||
-/**
|
||||
- Gets whether Lua support is loaded.
|
||||
-*/
|
||||
-bool insHasLua() {
|
||||
- return couldLoadLua;
|
||||
-}
|
||||
-
|
||||
/**
|
||||
Gets string of value
|
||||
*/
|
@ -5,13 +5,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "klayout";
|
||||
version = "0.29.6";
|
||||
version = "0.29.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KLayout";
|
||||
repo = "klayout";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gbbes8CPh+Z9wCeQaAaObZjQvBTMe06z8oR12i6e12M=";
|
||||
hash = "sha256-4GjCV/Z9al7Hrj7Ik/EvmLy5jPCsU/3Ti9HwOjzPKYc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config";
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "process-compose";
|
||||
version = "1.27.0";
|
||||
version = "1.34.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "F1bonacc1";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-v8tcnndAP4+1cRWW2LmAsmSIvALdeESuuv2QmRQhq/s=";
|
||||
hash = "sha256-Ymd3X6qvdYENbjb2F0ajjb1j0tuy835W6YWCeuvLoXc=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
@ -1,95 +0,0 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, installShellFiles
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, freetype
|
||||
, gumbo
|
||||
, harfbuzz
|
||||
, jbig2dec
|
||||
, mujs
|
||||
, mupdf
|
||||
, openjpeg
|
||||
, qt3d
|
||||
, qtbase
|
||||
, qmake
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sioyek";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ahrm";
|
||||
repo = "sioyek";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-GFZaTXJhoBB+rSe7Qk6H6FZJVXr3nO9XgM+LAbS4te4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fixed compatibility with mupdf-0.23.0
|
||||
# https://github.com/ahrm/sioyek/issues/804
|
||||
(fetchurl {
|
||||
url = "https://git.alpinelinux.org/aports/plain/community/sioyek/mupdf-0.23.0.patch?id=86e913eccf19b97a16f25d9b6cdf0f50232f1226";
|
||||
hash = "sha256-sEqhpk7/h6g/fIhbu5LgpKKnbnIFLInrTP1k+/GhrXE=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gumbo
|
||||
harfbuzz
|
||||
jbig2dec
|
||||
mujs
|
||||
mupdf
|
||||
openjpeg
|
||||
qt3d
|
||||
qtbase
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ freetype ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
qmake
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
qmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "CONFIG+=non_portable" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pdf_viewer_build_config.pro \
|
||||
--replace "-lmupdf-threads" "-lgumbo -lharfbuzz -lfreetype -ljbig2dec -ljpeg -lopenjp2" \
|
||||
--replace "-lmupdf-third" ""
|
||||
substituteInPlace pdf_viewer/main.cpp \
|
||||
--replace "/usr/share/sioyek" "$out/share" \
|
||||
--replace "/etc/sioyek" "$out/etc"
|
||||
'';
|
||||
|
||||
postInstall = if stdenv.hostPlatform.isDarwin then ''
|
||||
cp -r pdf_viewer/shaders sioyek.app/Contents/MacOS/shaders
|
||||
cp pdf_viewer/prefs.config sioyek.app/Contents/MacOS/
|
||||
cp pdf_viewer/prefs_user.config sioyek.app/Contents/MacOS/
|
||||
cp pdf_viewer/keys.config sioyek.app/Contents/MacOS/
|
||||
cp pdf_viewer/keys_user.config sioyek.app/Contents/MacOS/
|
||||
cp tutorial.pdf sioyek.app/Contents/MacOS/
|
||||
|
||||
mkdir -p $out/Applications $out/bin
|
||||
cp -r sioyek.app $out/Applications
|
||||
ln -s $out/Applications/sioyek.app/Contents/MacOS/sioyek $out/bin/sioyek
|
||||
'' else ''
|
||||
install -Dm644 tutorial.pdf $out/share/tutorial.pdf
|
||||
cp -r pdf_viewer/shaders $out/share/
|
||||
install -Dm644 -t $out/etc/ pdf_viewer/{keys,prefs}.config
|
||||
installManPage resources/sioyek.1
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://sioyek.info/";
|
||||
description = "PDF viewer designed for research papers and technical books";
|
||||
mainProgram = "sioyek";
|
||||
changelog = "https://github.com/ahrm/sioyek/releases/tag/v${finalAttrs.version}";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ podocarp ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
})
|
@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "typioca";
|
||||
version = "3.0.0";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bloznelis";
|
||||
repo = "typioca";
|
||||
rev = version;
|
||||
hash = "sha256-pYHEi1J8i8AeRM62TNrklivcmiv4Kq0a5Z7Fn1RB/Jk=";
|
||||
hash = "sha256-fViYwewzhJUJjMupCYk1UsnnPAhByYZqYkuKD6MJNnE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4T5xbCvzYn1bOKz0WCCiFojoQztOQ66SH4+WDI3Sn5g=";
|
||||
vendorHash = "sha256-fUkajuviQuQuVgzWAxsInd+c+eNQArKNjiNsi7mCNWU=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
@ -1,63 +1,85 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, cmake
|
||||
, pkg-config
|
||||
, fribidi
|
||||
, harfbuzz
|
||||
, libwebp
|
||||
, mpg123
|
||||
, SDL2
|
||||
, the-foundation
|
||||
, AppKit
|
||||
, zip
|
||||
, enableTUI ? false, ncurses, sealcurses
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
cmake,
|
||||
pkg-config,
|
||||
fribidi,
|
||||
harfbuzz,
|
||||
libogg,
|
||||
libwebp,
|
||||
mpg123,
|
||||
opusfile,
|
||||
SDL2,
|
||||
the-foundation,
|
||||
AppKit,
|
||||
zip,
|
||||
enableTUI ? false,
|
||||
ncurses,
|
||||
sealcurses,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lagrange";
|
||||
version = "1.17.6";
|
||||
version = "1.18.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skyjake";
|
||||
repo = "lagrange";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZF2HMfEI0LpvJrnB9MN8sQQDyBl/mRsI7pt6lfN4wdU=";
|
||||
hash = "sha256-iIUWF93RZheW4uf3zgs1jqDjQnn0nFH7GOMaLBR0w0o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config zip ];
|
||||
|
||||
buildInputs = [ the-foundation ]
|
||||
++ lib.optionals (!enableTUI) [ fribidi harfbuzz libwebp mpg123 SDL2 ]
|
||||
++ lib.optionals enableTUI [ ncurses sealcurses ]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin AppKit;
|
||||
|
||||
cmakeFlags = lib.optionals enableTUI [
|
||||
"-DENABLE_TUI=YES"
|
||||
"-DENABLE_MPG123=NO"
|
||||
"-DENABLE_WEBP=NO"
|
||||
"-DENABLE_FRIBIDI=NO"
|
||||
"-DENABLE_HARFBUZZ=NO"
|
||||
"-DENABLE_POPUP_MENUS=NO"
|
||||
"-DENABLE_IDLE_SLEEP=NO"
|
||||
"-DCMAKE_INSTALL_DATADIR=${placeholder "out"}/share"
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
zip
|
||||
];
|
||||
|
||||
installPhase = lib.optionalString (stdenv.hostPlatform.isDarwin && !enableTUI) ''
|
||||
buildInputs =
|
||||
[
|
||||
the-foundation
|
||||
fribidi
|
||||
harfbuzz
|
||||
libogg
|
||||
libwebp
|
||||
mpg123
|
||||
opusfile
|
||||
SDL2
|
||||
]
|
||||
++ lib.optionals enableTUI [
|
||||
ncurses
|
||||
sealcurses
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin AppKit;
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "ENABLE_TUI" enableTUI)
|
||||
(lib.cmakeFeature "CMAKE_INSTALL_DATAROOTDIR" "${placeholder "out"}/share")
|
||||
];
|
||||
|
||||
installPhase =
|
||||
lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
mkdir -p $out/Applications
|
||||
mv Lagrange.app $out/Applications
|
||||
''
|
||||
+ lib.optionalString (stdenv.hostPlatform.isDarwin && enableTUI) ''
|
||||
# https://github.com/skyjake/lagrange/issues/610
|
||||
make install
|
||||
install -d $out/share/lagrange
|
||||
ln -s $out/Applications/Lagrange.app/Contents/Resources/resources.lgr $out/share/lagrange/resources.lgr
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Beautiful Gemini Client";
|
||||
homepage = "https://gmi.skyjake.fi/lagrange/";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
platforms = platforms.unix;
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [ sikmir ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "glooctl";
|
||||
version = "1.17.10";
|
||||
version = "1.17.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solo-io";
|
||||
repo = "gloo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-p917jiPvWjLRoH2y81TvILc9WYZ6n1y1UQy8hIO93jM=";
|
||||
hash = "sha256-7KkaQYTsamUapWKPB0JIoEnOs/SvrCbBgQqvQg9VQ9o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rAObw4J0ATle1gq5Z1MsrGy/iqQDHjnMPAEIPBgtY3g=";
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "helmsman";
|
||||
version = "3.17.0";
|
||||
version = "3.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Praqma";
|
||||
repo = "helmsman";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mXc3CVKh4pFAZVppvk5TTg6s6dOA2Gv+ROLNV37DAl4=";
|
||||
sha256 = "sha256-u/Fj3A81hH7i1yTg+kcqCPrwEkj0cyhZvNzRYURDoZU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-zn8q3HpyQWNsksYbqJcgnjOxaBVUr3dIYHk+FAalNxA=";
|
||||
vendorHash = "sha256-3eIMMKMvRzOSMvufETR9H1PnPDeEc+su8UuvbQJZ7kI=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubevela";
|
||||
version = "1.9.12";
|
||||
version = "1.9.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubevela";
|
||||
repo = "kubevela";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AltyaV4tFW/3nOzEgWwlIqFXVaEtcpN5IxdFScZ7Nes=";
|
||||
hash = "sha256-b9N7vEY6AjJmOWySyssW7nrlZ+iFhOzVFmVQGfk/ilw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Ethbor1nZRYuemBL03QdnExNJtdOJ4w76sjLrBDW9Aw=";
|
||||
vendorHash = "sha256-WE5jE58pCXUvIKo+NAQUNrNzxLkUDIuJp2yBqE+8Ors=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kyverno";
|
||||
version = "1.12.5";
|
||||
version = "1.12.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyverno";
|
||||
repo = "kyverno";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-j6/x0fITP6FbI7LvaaB+Dwg9ewFjZ/eqjG0TzQeDsmI=";
|
||||
hash = "sha256-FwVB1okxhWTzWlZljGEEH9KuSsJl9GmwnX7bn4iDx/M=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@ -18,7 +18,7 @@ buildGoModule rec {
|
||||
"-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-sSsLs3EedStYlMYKFXIMdNHtrG8ijyu9+2MCYjjzZR4=";
|
||||
vendorHash = "sha256-Zv393gchMaJzdHFp6U0PDlsk+yIg2t5X3nsgK48TW5A=";
|
||||
|
||||
subPackages = [ "cmd/cli/kubectl-kyverno" ];
|
||||
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nova";
|
||||
version = "3.10.1";
|
||||
version = "3.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FairwindsOps";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-V7cUXzXvixONqL71f8hpJbGS+PyJgz+8LSwOlmXm+Po=";
|
||||
hash = "sha256-RpYlUYGqOtF9R1Fr+Smu7XMWN+Y+P3RnagjBRNnA8/8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xhpE+KDEf36kAw1HVm3WhiOwyWkFxkD5S+3mx0Sytv4=";
|
||||
vendorHash = "sha256-v3ld3bHpVWNJgQ6K5iS7q8QV4ft4RE42wKi+f4++yqY=";
|
||||
|
||||
ldflags = [ "-X main.version=${version}" "-s" "-w" ];
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
let
|
||||
versions =
|
||||
if stdenv.hostPlatform.isLinux then {
|
||||
stable = "0.0.67";
|
||||
stable = "0.0.70";
|
||||
ptb = "0.0.105";
|
||||
canary = "0.0.492";
|
||||
development = "0.0.28";
|
||||
@ -17,7 +17,7 @@ let
|
||||
x86_64-linux = {
|
||||
stable = fetchurl {
|
||||
url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
|
||||
hash = "sha256-L8COdPP4SFRO+1mipjn4tjLR+xShcJbT/72yhNHdSWg=";
|
||||
hash = "sha256-Ujlewrhbqal97hCG6+Iu+OqntWZJ/oY6ZHeL+HmoU38=";
|
||||
};
|
||||
ptb = fetchurl {
|
||||
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
|
||||
|
@ -1,15 +0,0 @@
|
||||
diff --git a/config/application.rb b/config/application.rb
|
||||
index d85a17491..90ea5e387 100644
|
||||
--- a/config/application.rb
|
||||
+++ b/config/application.rb
|
||||
@@ -3,6 +3,7 @@
|
||||
require_relative 'boot'
|
||||
|
||||
require 'rails/all'
|
||||
+require 'nulldb'
|
||||
require_relative '../lib/zammad/safe_mode'
|
||||
|
||||
# DO NOT REMOVE THIS LINE - see issue #2037
|
||||
diff --git a/db/schema.rb b/db/schema.rb
|
||||
new file mode 100644
|
||||
index 000000000..e69de29bb
|
@ -23,21 +23,20 @@
|
||||
|
||||
let
|
||||
pname = "zammad";
|
||||
version = "6.2.0";
|
||||
version = "6.3.1";
|
||||
|
||||
src = applyPatches {
|
||||
|
||||
src = fetchFromGitHub (lib.importJSON ./source.json);
|
||||
|
||||
patches = [
|
||||
./0001-nulldb.patch
|
||||
./fix-sendmail-location.diff
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e "s|ruby '3.1.[0-9]\+'|ruby '${ruby.version}'|" Gemfile
|
||||
sed -i -e "s|ruby 3.1.[0-9]\+p[0-9]\+|ruby ${ruby.version}|" Gemfile.lock
|
||||
sed -i -e "s|3.1.[0-9]\+|${ruby.version}|" .ruby-version
|
||||
sed -i -e "s|ruby '3.2.[0-9]\+'|ruby '${ruby.version}'|" Gemfile
|
||||
sed -i -e "s|ruby 3.2.[0-9]\+p[0-9]\+|ruby ${ruby.version}|" Gemfile.lock
|
||||
sed -i -e "s|3.2.[0-9]\+|${ruby.version}|" .ruby-version
|
||||
${jq}/bin/jq '. += {name: "Zammad", version: "${version}"}' package.json | ${moreutils}/bin/sponge package.json
|
||||
'';
|
||||
};
|
||||
@ -65,7 +64,6 @@ let
|
||||
groups = [
|
||||
"assets"
|
||||
"unicorn" # server
|
||||
"nulldb"
|
||||
"test"
|
||||
"mysql"
|
||||
"puma"
|
||||
@ -100,9 +98,11 @@ let
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/yarn.lock";
|
||||
hash = "sha256-u72ZTpcUvFa1gaWi4lzTQa+JsI85jU4n8r1JhqFnCj4=";
|
||||
hash = "sha256-3DuTirYd6lAQd5PRbdOa/6QaMknIqNMTVnxEESF0N/c=";
|
||||
};
|
||||
|
||||
packageResolutions.minimatch = "9.0.3";
|
||||
|
||||
yarnPreBuild = ''
|
||||
mkdir -p deps/Zammad
|
||||
cp -r ${src}/.eslint-plugin-zammad deps/Zammad/.eslint-plugin-zammad
|
||||
@ -126,6 +126,7 @@ stdenv.mkDerivation {
|
||||
|
||||
nativeBuildInputs = [
|
||||
redis
|
||||
postgresql
|
||||
];
|
||||
|
||||
RAILS_ENV = "production";
|
||||
@ -140,10 +141,17 @@ stdenv.mkDerivation {
|
||||
REDIS_PID=$!
|
||||
popd
|
||||
|
||||
rake DATABASE_URL="nulldb://user:pass@127.0.0.1/dbname" assets:precompile
|
||||
mkdir postgres-work
|
||||
initdb -D postgres-work --encoding=utf8
|
||||
pg_ctl start -D postgres-work -o "-k $PWD/postgres-work -h '''"
|
||||
createuser -h $PWD/postgres-work zammad -R -S
|
||||
createdb -h $PWD/postgres-work --encoding=utf8 --owner=zammad zammad
|
||||
|
||||
rake DATABASE_URL="postgresql:///zammad?host=$PWD/postgres-work" assets:precompile
|
||||
|
||||
kill $REDIS_PID
|
||||
rm -r redis-work
|
||||
pg_ctl stop -D postgres-work -m immediate
|
||||
rm -r redis-work postgres-work
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,7 @@
|
||||
{
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"generate-graphql-api": "RAILS_ENV=development bundle exec rails generate zammad:graphql_introspection > app/graphql/graphql_introspection.json && npx graphql-codegen -c .graphql_code_generator.yml",
|
||||
"generate-graphql-api": "RAILS_ENV=development bundle exec rails generate zammad:graphql_introspection > app/graphql/graphql_introspection.json && npx graphql-codegen -c .graphql_code_generator.js",
|
||||
"generate-setting-types": "RAILS_ENV=development bundle exec rails generate zammad:setting_types",
|
||||
"dev": "RAILS_ENV=development forego start -f Procfile.dev",
|
||||
"dev:https": "VITE_RUBY_HOST=0.0.0.0 VITE_RUBY_HTTPS=true RAILS_ENV=development forego start -f Procfile.dev-https",
|
||||
@ -14,134 +14,133 @@
|
||||
"test:ct": "CY_OPEN=true yarn --cwd ./.cypress cypress open --component --project ../ --config-file .cypress/cypress.config.mjs",
|
||||
"test:ci:ct": "CI=true yarn --cwd ./.cypress cypress run --component --project ../ --config-file .cypress/cypress.config.mjs --browser electron",
|
||||
"cypress:snapshots": "sh .cypress/visual-regression/snapshots.sh",
|
||||
"cypress:install": "yarn --cwd ./.cypress install",
|
||||
"story": "histoire dev",
|
||||
"story:build": "HISTOIRE_BUILD=1 histoire build"
|
||||
"cypress:install": "yarn --cwd ./.cypress install"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
"node": ">=18.12.0"
|
||||
},
|
||||
"packageManager": "yarn@1.22.21",
|
||||
"packageManager": "yarn@1.22.22",
|
||||
"devDependencies": {
|
||||
"@faker-js/faker": "^8.3.1",
|
||||
"@graphql-codegen/cli": "^5.0.0",
|
||||
"@graphql-codegen/introspection": "^4.0.0",
|
||||
"@faker-js/faker": "^8.4.1",
|
||||
"@graphql-codegen/cli": "^5.0.2",
|
||||
"@graphql-codegen/introspection": "^4.0.3",
|
||||
"@graphql-codegen/near-operation-file-preset": "^3.0.0",
|
||||
"@graphql-codegen/typescript": "^4.0.1",
|
||||
"@graphql-codegen/typescript-operations": "^4.0.1",
|
||||
"@graphql-codegen/typescript-vue-apollo": "^4.1.0",
|
||||
"@histoire/plugin-vue": "^0.17.5",
|
||||
"@graphql-codegen/typescript": "^4.0.6",
|
||||
"@graphql-codegen/typescript-operations": "^4.2.0",
|
||||
"@graphql-codegen/typescript-vue-apollo": "^4.1.1",
|
||||
"@pinia/testing": "^0.1.3",
|
||||
"@testing-library/jest-dom": "^6.1.4",
|
||||
"@testing-library/user-event": "^14.5.1",
|
||||
"@testing-library/vue": "^7.0.0",
|
||||
"@types/lodash-es": "^4.17.11",
|
||||
"@types/rails__actioncable": "^6.1.9",
|
||||
"@testing-library/jest-dom": "^6.4.2",
|
||||
"@testing-library/user-event": "^14.5.2",
|
||||
"@testing-library/vue": "^8.0.3",
|
||||
"@types/lodash-es": "^4.17.12",
|
||||
"@types/rails__actioncable": "^6.1.10",
|
||||
"@types/sinonjs__fake-timers": "^8.1.5",
|
||||
"@types/ua-parser-js": "^0.7.39",
|
||||
"@types/uuid": "^9.0.7",
|
||||
"@typescript-eslint/eslint-plugin": "^6.10.0",
|
||||
"@typescript-eslint/parser": "^6.10.0",
|
||||
"@vitejs/plugin-vue": "^4.5.0",
|
||||
"@vue/eslint-config-prettier": "^8.0.0",
|
||||
"@vue/eslint-config-typescript": "^12.0.0",
|
||||
"@vue/test-utils": "^2.4.2",
|
||||
"autoprefixer": "^10.4.16",
|
||||
"eslint": "^8.54.0",
|
||||
"@types/uuid": "^9.0.8",
|
||||
"@typescript-eslint/eslint-plugin": "^7.3.1",
|
||||
"@typescript-eslint/parser": "^7.3.1",
|
||||
"@vitejs/plugin-vue": "^5.0.4",
|
||||
"@vue/eslint-config-prettier": "^9.0.0",
|
||||
"@vue/eslint-config-typescript": "^13.0.0",
|
||||
"@vue/test-utils": "^2.4.5",
|
||||
"autoprefixer": "^10.4.18",
|
||||
"eslint": "^8.57.0",
|
||||
"eslint-config-airbnb-base": "^15.0.0",
|
||||
"eslint-config-prettier": "^9.0.0",
|
||||
"eslint-config-prettier": "^9.1.0",
|
||||
"eslint-import-resolver-alias": "^1.1.2",
|
||||
"eslint-import-resolver-typescript": "^3.6.1",
|
||||
"eslint-plugin-import": "^2.29.0",
|
||||
"eslint-plugin-prettier": "^5.0.1",
|
||||
"eslint-plugin-import": "^2.29.1",
|
||||
"eslint-plugin-prettier": "^5.1.3",
|
||||
"eslint-plugin-prettier-vue": "^5.0.0",
|
||||
"eslint-plugin-security": "^1.7.1",
|
||||
"eslint-plugin-sonarjs": "^0.23.0",
|
||||
"eslint-plugin-vue": "^9.18.1",
|
||||
"eslint-plugin-security": "^2.1.1",
|
||||
"eslint-plugin-sonarjs": "^0.24.0",
|
||||
"eslint-plugin-vue": "^9.23.0",
|
||||
"eslint-plugin-zammad": "file:.eslint-plugin-zammad",
|
||||
"histoire": "^0.17.5",
|
||||
"jsdom": "^22.1.0",
|
||||
"jsdom": "^24.0.0",
|
||||
"minimatch": "^9.0.3",
|
||||
"mock-apollo-client": "^1.2.1",
|
||||
"postcss": "^8.4.31",
|
||||
"postcss-html": "^1.5.0",
|
||||
"prettier": "3.1.0",
|
||||
"prettier-plugin-tailwindcss": "^0.5.7",
|
||||
"regenerator-runtime": "^0.14.0",
|
||||
"sass": "^1.69.5",
|
||||
"stylelint": "^15.11.0",
|
||||
"postcss": "^8.4.36",
|
||||
"postcss-html": "^1.6.0",
|
||||
"prettier": "3.2.5",
|
||||
"prettier-plugin-tailwindcss": "^0.5.12",
|
||||
"regenerator-runtime": "^0.14.1",
|
||||
"sass": "^1.72.0",
|
||||
"stylelint": "^16.2.1",
|
||||
"stylelint-config-prettier": "^9.0.5",
|
||||
"stylelint-config-recommended-vue": "^1.5.0",
|
||||
"stylelint-config-standard": "^34.0.0",
|
||||
"stylelint-config-standard-scss": "^11.1.0",
|
||||
"stylelint-prettier": "^4.0.2",
|
||||
"stylelint-scss": "^5.3.1",
|
||||
"stylelint-config-standard": "^36.0.0",
|
||||
"stylelint-config-standard-scss": "^13.0.0",
|
||||
"stylelint-prettier": "^5.0.0",
|
||||
"stylelint-scss": "^6.2.1",
|
||||
"svg-baker": "^1.7.0",
|
||||
"svgo": "^3.0.4",
|
||||
"tailwindcss": "^3.3.5",
|
||||
"svgo": "^3.2.0",
|
||||
"tailwindcss": "^3.4.1",
|
||||
"tailwindcss-unimportant": "^2.1.1",
|
||||
"timezone-mock": "^1.3.6",
|
||||
"type-fest": "^4.8.1",
|
||||
"typescript": "^5.2.2",
|
||||
"vite": "^4.5.0",
|
||||
"vite-plugin-pwa": "^0.17.0",
|
||||
"vite-plugin-ruby": "^3.2.2",
|
||||
"vitest": "^0.34.6",
|
||||
"type-fest": "^4.12.0",
|
||||
"typescript": "^5.4.2",
|
||||
"vite": "^5.2.6",
|
||||
"vite-plugin-pwa": "^0.19.7",
|
||||
"vite-plugin-ruby": "^5.0.0",
|
||||
"vitest": "^1.4.0",
|
||||
"vitest-axe": "^0.1.0",
|
||||
"vue-tsc": "^1.8.22"
|
||||
"vue-tsc": "^2.0.6"
|
||||
},
|
||||
"dependencies": {
|
||||
"@apollo/client": "^3.8.7",
|
||||
"@formkit/core": "^1.2.2",
|
||||
"@formkit/dev": "^1.2.2",
|
||||
"@formkit/i18n": "^1.2.2",
|
||||
"@formkit/inputs": "^1.2.2",
|
||||
"@formkit/rules": "^1.2.2",
|
||||
"@formkit/tailwindcss": "^1.2.2",
|
||||
"@formkit/themes": "^1.2.2",
|
||||
"@formkit/utils": "^1.2.2",
|
||||
"@formkit/validation": "^1.2.2",
|
||||
"@formkit/vue": "^1.2.2",
|
||||
"@apollo/client": "^3.9.9",
|
||||
"@formkit/core": "^1.6.0",
|
||||
"@formkit/dev": "^1.6.0",
|
||||
"@formkit/i18n": "^1.6.0",
|
||||
"@formkit/inputs": "^1.6.0",
|
||||
"@formkit/rules": "^1.6.0",
|
||||
"@formkit/tailwindcss": "^1.6.0",
|
||||
"@formkit/themes": "^1.6.0",
|
||||
"@formkit/utils": "^1.6.0",
|
||||
"@formkit/validation": "^1.6.0",
|
||||
"@formkit/vue": "^1.6.0",
|
||||
"@github/webauthn-json": "^2.1.1",
|
||||
"@rails/actioncable": "^7.0.8",
|
||||
"@sinonjs/fake-timers": "^11.2.2",
|
||||
"@tiptap/core": "^2.1.12",
|
||||
"@tiptap/extension-blockquote": "^2.1.12",
|
||||
"@tiptap/extension-character-count": "^2.1.12",
|
||||
"@tiptap/extension-hard-break": "^2.1.12",
|
||||
"@tiptap/extension-image": "^2.1.12",
|
||||
"@tiptap/extension-link": "^2.1.12",
|
||||
"@tiptap/extension-list-item": "^2.1.12",
|
||||
"@tiptap/extension-mention": "^2.1.12",
|
||||
"@tiptap/extension-ordered-list": "^2.1.12",
|
||||
"@tiptap/extension-paragraph": "^2.1.12",
|
||||
"@tiptap/extension-strike": "^2.1.12",
|
||||
"@tiptap/extension-underline": "^2.1.12",
|
||||
"@tiptap/pm": "^2.1.12",
|
||||
"@tiptap/starter-kit": "^2.1.12",
|
||||
"@tiptap/suggestion": "^2.1.12",
|
||||
"@tiptap/vue-3": "^2.1.12",
|
||||
"@vue/apollo-composable": "^4.0.0-beta.11",
|
||||
"@vueuse/core": "^10.6.1",
|
||||
"@vueuse/router": "^10.6.1",
|
||||
"@vueuse/shared": "^10.6.1",
|
||||
"async-mutex": "^0.4.0",
|
||||
"@tiptap/core": "^2.2.4",
|
||||
"@tiptap/extension-blockquote": "^2.2.4",
|
||||
"@tiptap/extension-character-count": "^2.2.4",
|
||||
"@tiptap/extension-hard-break": "^2.2.4",
|
||||
"@tiptap/extension-image": "^2.2.4",
|
||||
"@tiptap/extension-link": "^2.2.4",
|
||||
"@tiptap/extension-list-item": "^2.2.4",
|
||||
"@tiptap/extension-mention": "^2.2.4",
|
||||
"@tiptap/extension-ordered-list": "^2.2.4",
|
||||
"@tiptap/extension-paragraph": "^2.2.4",
|
||||
"@tiptap/extension-strike": "^2.2.4",
|
||||
"@tiptap/extension-underline": "^2.2.4",
|
||||
"@tiptap/pm": "^2.2.4",
|
||||
"@tiptap/starter-kit": "^2.2.4",
|
||||
"@tiptap/suggestion": "^2.2.4",
|
||||
"@tiptap/vue-3": "^2.2.4",
|
||||
"@vue/apollo-composable": "^4.0.2",
|
||||
"@vueuse/core": "^10.9.0",
|
||||
"@vueuse/router": "^10.9.0",
|
||||
"@vueuse/shared": "^10.9.0",
|
||||
"async-mutex": "^0.5.0",
|
||||
"daisyui": "^4.7.3",
|
||||
"flatpickr": "^4.6.13",
|
||||
"graphql": "^16.8.1",
|
||||
"graphql-ruby-client": "^1.11.10",
|
||||
"graphql-ruby-client": "^1.13.3",
|
||||
"graphql-tag": "^2.12.6",
|
||||
"linkify-string": "^4.1.2",
|
||||
"linkifyjs": "^4.1.2",
|
||||
"linkify-string": "^4.1.3",
|
||||
"linkifyjs": "^4.1.3",
|
||||
"lodash-es": "^4.17.21",
|
||||
"loglevel": "^1.8.1",
|
||||
"loglevel": "^1.9.1",
|
||||
"mitt": "^3.0.1",
|
||||
"pinia": "^2.1.7",
|
||||
"tippy.js": "^6.3.7",
|
||||
"tiptap-text-direction": "^0.3.0",
|
||||
"tiptap-text-direction": "^0.3.1",
|
||||
"ua-parser-js": "^1.0.37",
|
||||
"uuid": "^9.0.1",
|
||||
"vue": "^3.3.8",
|
||||
"vue": "^3.4.21",
|
||||
"vue-advanced-cropper": "^2.8.8",
|
||||
"vue-easy-lightbox": "1.16.0",
|
||||
"vue-router": "^4.2.5",
|
||||
"vue-easy-lightbox": "1.19.0",
|
||||
"vue-router": "^4.3.0",
|
||||
"vue3-draggable-resizable": "^1.6.5",
|
||||
"vuedraggable": "^4.1.0",
|
||||
"workbox-core": "^7.0.0",
|
||||
@ -150,9 +149,13 @@
|
||||
},
|
||||
"resolutions": {
|
||||
"loader-utils": "^3.2.1",
|
||||
"postcss": "^8.4.31",
|
||||
"stylelint-config-recommended": "^13.0.0"
|
||||
"postcss": "^8.4.36",
|
||||
"stylelint-config-recommended": "^14.0.0",
|
||||
"prosemirror-model": "1.19.4",
|
||||
"prosemirror-state": "1.4.3",
|
||||
"prosemirror-transform": "1.8.0",
|
||||
"prosemirror-view": "1.33.3"
|
||||
},
|
||||
"name": "Zammad",
|
||||
"version": "6.2.0"
|
||||
"version": "6.3.1"
|
||||
}
|
||||
|
@ -1,8 +1,8 @@
|
||||
{
|
||||
"owner": "zammad",
|
||||
"repo": "zammad",
|
||||
"rev": "6c358ca90cf7f7581aede5c45d10ac3f2e25bc52",
|
||||
"hash": "sha256-kZss5A5tgKnsANt34kk5J+824ghJoVIWXFNlb+ZkZ2Y=",
|
||||
"rev": "27f4405b9af46d74c01f07efae2309bba2066af1",
|
||||
"hash": "sha256-p9TZ7Pxnav9RcQWfHPKWOo+ZJ1RQ58ZAMzzMhaITEb0=",
|
||||
"fetchSubmodules": true
|
||||
}
|
||||
|
||||
|
@ -18,23 +18,15 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "remmina";
|
||||
version = "1.4.35";
|
||||
version = "1.4.36";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "Remmina";
|
||||
repo = "Remmina";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-0z2fcBnChCBYPxyFm/xpAW0jHaUGA92NQgjt+lWFUnM=";
|
||||
hash = "sha256-u+ysAFi7I7nXIiAw7VCmHbqgtRoZgkPnRfy/Mnl1b2g=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
name = "add-a-conditional-check-for-darwin-and-NetBSD.patch";
|
||||
url = "https://gitlab.com/Remmina/Remmina/-/commit/3b681398c823e070c7f780166b9d9fc2158e66c1.diff";
|
||||
hash = "sha256-Ovdrsl9bftXiuXV+sqvDP9VGuXQZzC5VKOmkYmBXhNA=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook3 ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];
|
||||
|
||||
|
@ -5,18 +5,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "storj-uplink";
|
||||
version = "1.113.4";
|
||||
version = "1.114.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "storj";
|
||||
repo = "storj";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-nf2fNnkY6Z0T5dfSRUmqYpstV5yP+dJiZqB/AF3NR94=";
|
||||
hash = "sha256-V7Vl2sViRl6olhCdJF4xtR7iyJCqJCrm39/Aq1T9GFQ=";
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/uplink" ];
|
||||
|
||||
vendorHash = "sha256-NnFCs64xUoFFHFQs/3YtdJkUurd3TxNieZJ96VqnJaU=";
|
||||
vendorHash = "sha256-+eqT3VNqw3fOLwfCKPacIEcoXjuzPaY1EAZI95rgLDs=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
@ -20,11 +20,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zotero";
|
||||
version = "7.0.3";
|
||||
version = "7.0.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
|
||||
hash = "sha256-W5/j5ohrx/X0qlOiWWtB/FEF9aZCnbbAA3pcL8R6yy0=";
|
||||
hash = "sha256-ERL+zKjNOz+j/Q5dyTXVczLnwaTl/SzgSaKVkA9uyJ4=";
|
||||
};
|
||||
|
||||
dontPatchELF = true;
|
||||
|
@ -8,11 +8,11 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "quisk";
|
||||
version = "4.2.38";
|
||||
version = "4.2.39";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-IF7I+NgnqwU6c5R4caZslt7DJneI3fYk4KXl10dIsEw=";
|
||||
hash = "sha256-LE7VPKzpDycUNHpdmO43GqlHnF/gwr6H7LWq8DpcXdk=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
let
|
||||
pname = "jbrowse";
|
||||
version = "2.15.1";
|
||||
version = "2.15.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/GMOD/jbrowse-components/releases/download/v${version}/jbrowse-desktop-v${version}-linux.AppImage";
|
||||
sha256 = "sha256-/dpHUrigO0wnWay0jIkg6eG75ynrVXd7zcIAss6DhSs=";
|
||||
sha256 = "sha256-ojIvC93dx9BSnUw7zBpDMBD0xPCMG4GUH1e5ZRGd9pk=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cryptoverif";
|
||||
version = "2.10";
|
||||
version = "2.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://prosecco.gforge.inria.fr/personal/bblanche/cryptoverif/cryptoverif${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-Gg7PYMB5cYWk9+xuxxcFY9L9vynHX2xYyMDo/0DauPM=";
|
||||
hash = "sha256-duc7t0Qpr1Z2FZEoufdQ7kcBlLbXHO+r9ivEgUxqK9s=";
|
||||
};
|
||||
|
||||
/* Fix up the frontend to load the 'default' cryptoverif library
|
||||
|
@ -172,20 +172,9 @@ buildPythonApplication rec {
|
||||
|
||||
# skip failing tests due to darwin sandbox
|
||||
preCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
# can be re-enabled with the next kitty release, see https://github.com/kovidgoyal/kitty/pull/7939
|
||||
substituteInPlace kitty_tests/file_transmission.py \
|
||||
--replace test_file_get dont_test_file_get \
|
||||
--replace test_path_mapping_receive dont_test_path_mapping_receive \
|
||||
--replace test_transfer_send dont_test_transfer_send
|
||||
substituteInPlace kitty_tests/shell_integration.py \
|
||||
--replace test_fish_integration dont_test_fish_integration
|
||||
substituteInPlace kitty_tests/shell_integration.py \
|
||||
--replace test_bash_integration dont_test_bash_integration
|
||||
substituteInPlace kitty_tests/open_actions.py \
|
||||
--replace test_parsing_of_open_actions dont_test_parsing_of_open_actions
|
||||
substituteInPlace kitty_tests/ssh.py \
|
||||
--replace test_ssh_connection_data dont_test_ssh_connection_data
|
||||
substituteInPlace kitty_tests/fonts.py \
|
||||
--replace 'class Rendering(BaseTest)' 'class Rendering'
|
||||
# theme collection test starts an http server
|
||||
rm tools/themes/collection_test.go
|
||||
# passwd_test tries to exec /usr/bin/dscl
|
||||
|
@ -1,21 +1,30 @@
|
||||
{ lib, buildPythonApplication, fetchFromGitHub, pyxdg, pytest, pytest-mock }:
|
||||
{ lib, buildPythonApplication, fetchFromGitHub, pyxdg, pytestCheckHook, pytest-cov-stub, pytest-mock, setuptools }:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "pass-git-helper";
|
||||
version = "2.0.0";
|
||||
version = "3.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "languitar";
|
||||
repo = "pass-git-helper";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-IpMaCG6kPNrWtcl10Lh7A3PyIF4Mk0t2wLYON+zMLsE=";
|
||||
sha256 = "sha256-DLH3l4wYfBlrc49swLgyHeZXebJ5JSzU7cHjD7Hmw0g=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyxdg ];
|
||||
nativeCheckInputs = [ pytest pytest-mock ];
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ pyxdg ];
|
||||
|
||||
env.HOME = "$TMPDIR";
|
||||
|
||||
pythonImportsCheck = [ "passgithelper" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-cov-stub
|
||||
pytest-mock
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/languitar/pass-git-helper";
|
||||
|
@ -8,6 +8,7 @@
|
||||
alsa-lib,
|
||||
asio,
|
||||
curl,
|
||||
libremidi,
|
||||
nlohmann_json,
|
||||
obs-studio,
|
||||
opencv,
|
||||
@ -16,12 +17,17 @@
|
||||
stdenv,
|
||||
tesseract,
|
||||
websocketpp,
|
||||
xorg,
|
||||
|
||||
httplib,
|
||||
libremidi,
|
||||
libXScrnSaver,
|
||||
}:
|
||||
|
||||
let
|
||||
httplib-src = fetchFromGitHub {
|
||||
owner = "yhirose";
|
||||
repo = "cpp-httplib";
|
||||
rev = "v0.17.3";
|
||||
hash = "sha256-yvaPIbRqJGkiob3Nrv3H1ieFAC5b+h1tTncJWTy4dmk=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "advanced-scene-switcher";
|
||||
version = "1.27.2";
|
||||
@ -50,13 +56,13 @@ stdenv.mkDerivation rec {
|
||||
qtbase
|
||||
tesseract
|
||||
websocketpp
|
||||
xorg.libXScrnSaver
|
||||
libXScrnSaver
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
postUnpack = ''
|
||||
cp -r ${httplib.src}/* $sourceRoot/deps/cpp-httplib
|
||||
cp -r ${httplib-src}/* $sourceRoot/deps/cpp-httplib
|
||||
cp -r ${libremidi.src}/* $sourceRoot/deps/libremidi
|
||||
chmod -R +w $sourceRoot/deps/cpp-httplib
|
||||
chmod -R +w $sourceRoot/deps/libremidi
|
||||
|
@ -1,62 +0,0 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, runCommand
|
||||
, shaka-packager
|
||||
}:
|
||||
|
||||
let
|
||||
sources = {
|
||||
"x86_64-linux" = {
|
||||
filename = "packager-linux-x64";
|
||||
hash = "sha256-MoMX6PEtvPmloXJwRpnC2lHlT+tozsV4dmbCqweyyI0=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
filename = "packager-linux-arm64";
|
||||
hash = "sha256-6+7SfnwVRsqFwI7/1F7yqVtkJVIoOFUmhoGU3P6gdQ0=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
filename = "packager-osx-x64";
|
||||
hash = "sha256-fFBtOp/Zb37LP7TWAEB0yp0xM88cMT9QS59EwW4MrAY=";
|
||||
};
|
||||
};
|
||||
|
||||
source = sources."${stdenv.hostPlatform.system}"
|
||||
or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "shaka-packager";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/shaka-project/shaka-packager/releases/download/v${finalAttrs.version}/${source.filename}";
|
||||
inherit (source) hash;
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
sourceRoot = ".";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -m755 -D $src $out/bin/packager
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
simple = runCommand "${finalAttrs.pname}-test" { } ''
|
||||
${shaka-packager}/bin/packager -version | grep ${finalAttrs.version} > $out
|
||||
'';
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Media packaging framework for VOD and Live DASH and HLS applications";
|
||||
homepage = "https://shaka-project.github.io/shaka-packager/html/";
|
||||
license = lib.licenses.bsd3;
|
||||
mainProgram = "packager";
|
||||
maintainers = [ ];
|
||||
platforms = builtins.attrNames sources;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
})
|
@ -15,13 +15,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cri-o";
|
||||
version = "1.31.0";
|
||||
version = "1.31.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cri-o";
|
||||
repo = "cri-o";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pY8FRxexf/WG+aGkKZc4EtqO9uxAV7D6EFWirgSEye8=";
|
||||
hash = "sha256-0IPQsCLiL0Q15pq89qToMfw6mDwmMZroNBkTCfgqx6s=";
|
||||
};
|
||||
vendorHash = null;
|
||||
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nixpacks";
|
||||
version = "1.28.1";
|
||||
version = "1.29.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "railwayapp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0gy9fm18Tc1ALZEV+XZN8kwK725PpIK2OTKKMatvtVQ=";
|
||||
sha256 = "sha256-th5nNOU4GBw82Bq+Ybv/JtFY5d/aimgm0vkBgnMScdQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-r7jVcDja3BZyZoN2JxDymyv+rOv3wWaGo+yC4GwnZ50=";
|
||||
cargoHash = "sha256-6x6NSy9f74Snlqsk0zPiTPXoML3zzcQUEyNLV8P+ggk=";
|
||||
|
||||
# skip test due FHS dependency
|
||||
doCheck = false;
|
||||
|
35
pkgs/by-name/ag/agebox/package.nix
Normal file
35
pkgs/by-name/ag/agebox/package.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{
|
||||
lib,
|
||||
# Required based on 'go' directive in go.mod,
|
||||
# remove when Go in nixpkgs defaults to 1.23 or later.
|
||||
buildGo123Module,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGo123Module rec {
|
||||
pname = "agebox";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "slok";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RtFa7k+tw0hyf7bYm51aIxptaD4uOH6/3WDjeoWEEKA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-57YbYDvRYOzQATEFpAuGzQzOYNY8n5LUrcu8jhjSiNI=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-X main.Version=${version}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/slok/agebox";
|
||||
changelog = "https://github.com/slok/agebox/releases/tag/v${version}";
|
||||
description = "Age based repository file encryption gitops tool";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ lesuisse ];
|
||||
mainProgram = "agebox";
|
||||
};
|
||||
}
|
@ -17,14 +17,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "alpaca";
|
||||
version = "2.0.5";
|
||||
version = "2.0.6";
|
||||
pyproject = false; # Built with meson
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Jeffser";
|
||||
repo = "Alpaca";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-BLLcU2GESyHGFJJicE42V3nMFf/YfnYsXcAOPIHuCAg=";
|
||||
hash = "sha256-4c6pisd3o7mycivHd1QZ2N7s8pYzrQXiZMbVvl5ciPA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -5,11 +5,11 @@
|
||||
|
||||
let
|
||||
pname = "arduino-ide";
|
||||
version = "2.3.2";
|
||||
version = "2.3.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/arduino/arduino-ide/releases/download/${version}/arduino-ide_${version}_Linux_64bit.AppImage";
|
||||
hash = "sha256-M7JKfld6DRk4hxih5MufAhW9kJ+ePDrBhE+oXFc8dYw=";
|
||||
hash = "sha256-VJGO3X1PUKE0OLr5PKH5uTE3rX0SlyrD6vdYdFdzHxk=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
|
@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "buf";
|
||||
version = "1.42.0";
|
||||
version = "1.44.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bufbuild";
|
||||
repo = "buf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-T4cEl2aT6F/IamCd1FxomYxqGpbcbXzPtEu0AJUyJJU=";
|
||||
hash = "sha256-I0Y9gsNqCFLR2Bkt55HyER6wznTNoZW5345zUmuOFXQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-apF3FpVlwonm76d0Ue7TMPDIRW0BNkZXWMLgh1+mmvo=";
|
||||
vendorHash = "sha256-4ykve9X//ckYPDkq76i0ojOiyzjrPJ/J2z7mA5giWKE=";
|
||||
|
||||
patches = [
|
||||
# Skip a test that requires networking to be available to work.
|
||||
@ -40,6 +40,10 @@ buildGoModule rec {
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
# For WebAssembly runtime tests
|
||||
GOOS=wasip1 GOARCH=wasm go build -o $GOPATH/bin/buf-plugin-suffix.wasm \
|
||||
./private/bufpkg/bufcheck/internal/cmd/buf-plugin-suffix
|
||||
|
||||
# The tests need access to some of the built utilities
|
||||
export PATH="$PATH:$GOPATH/bin"
|
||||
'';
|
@ -58,6 +58,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
postInstall =
|
||||
lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
mkdir -p "$out/bin"
|
||||
ln -sf "$out/Applications/Cinny.app/Contents/MacOS/Cinny" "$out/bin/cinny"
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
|
@ -6,18 +6,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "containerlab";
|
||||
version = "0.57.3";
|
||||
version = "0.57.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "srl-labs";
|
||||
repo = "containerlab";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-OSisVSfbOKBA1INrhj8DaWnHOEsLPwazp6NSXwAG3PU=";
|
||||
hash = "sha256-mMxC+Oe+O89PU3dgAbJvcHJ9ZQs1vmfF3B8w27JBPv4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
vendorHash = "sha256-mI5w7hUfQZPWv5JPbBodHxonLxtZfnHRw2K7Nl6sDOE=";
|
||||
vendorHash = "sha256-L/6t5vHhUog684YEOg9WYvAKCtad1MmDmasqtdwSyio=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
870
pkgs/by-name/co/cosmic-bg/Cargo.lock
generated
870
pkgs/by-name/co/cosmic-bg/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -11,21 +11,22 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cosmic-bg";
|
||||
version = "1.0.0-alpha.1";
|
||||
version = "1.0.0-alpha.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = pname;
|
||||
rev = "epoch-${version}";
|
||||
hash = "sha256-imGSOPS/ay3EycyrrQcIePDXNEYRk7NTAV+EtUPtEdg=";
|
||||
hash = "sha256-lAFAZBo5FnXgJV3MrZhaYmBxqtH1E7+Huj53ho/hPik=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA=";
|
||||
"cosmic-config-0.1.0" = "sha256-5J9tjpEcZJrUtW7barwXTOTNXNr33TLwYjApKkwDSvc=";
|
||||
"smithay-client-toolkit-0.18.0" = "sha256-2WbDKlSGiyVmi7blNBr2Aih9FfF2dq/bny57hoA4BrE=";
|
||||
"clipboard_macos-0.1.0" = "sha256-cG5vnkiyDlQnbEfV2sPbmBYKv1hd3pjJrymfZb8ziKk=";
|
||||
"cosmic-config-0.1.0" = "sha256-mdRRfXLyDBYQIPmbuXgXGoOKUlyw6CiSmOUBz1b3vJY=";
|
||||
"smithay-clipboard-0.8.0" = "sha256-4InFXm0ahrqFrtNLeqIuE3yeOpxKZJZx+Bc0yQDtv34=";
|
||||
};
|
||||
};
|
||||
|
||||
|
49
pkgs/by-name/co/cosmic-greeter/Cargo.lock
generated
49
pkgs/by-name/co/cosmic-greeter/Cargo.lock
generated
@ -699,6 +699,7 @@ dependencies = [
|
||||
"iana-time-zone",
|
||||
"js-sys",
|
||||
"num-traits",
|
||||
"pure-rust-locales",
|
||||
"wasm-bindgen",
|
||||
"windows-targets 0.52.6",
|
||||
]
|
||||
@ -944,7 +945,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "cosmic-config"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#f655710d55911d81e96ca58b5c9e814e75cba7b5"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c9f8f485373e02ef849c83d3bbdf0fdd2bf4a24c"
|
||||
dependencies = [
|
||||
"atomicwrites",
|
||||
"calloop 0.14.0",
|
||||
@ -964,7 +965,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "cosmic-config-derive"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#f655710d55911d81e96ca58b5c9e814e75cba7b5"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c9f8f485373e02ef849c83d3bbdf0fdd2bf4a24c"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
@ -993,6 +994,7 @@ dependencies = [
|
||||
"cosmic-comp-config",
|
||||
"cosmic-config",
|
||||
"cosmic-dbus-networkmanager",
|
||||
"cosmic-greeter-config",
|
||||
"cosmic-greeter-daemon",
|
||||
"env_logger",
|
||||
"freedesktop_entry_parser",
|
||||
@ -1017,6 +1019,15 @@ dependencies = [
|
||||
"zbus 4.4.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cosmic-greeter-config"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"cosmic-config",
|
||||
"log",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cosmic-greeter-daemon"
|
||||
version = "0.1.0"
|
||||
@ -1075,7 +1086,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "cosmic-theme"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#f655710d55911d81e96ca58b5c9e814e75cba7b5"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c9f8f485373e02ef849c83d3bbdf0fdd2bf4a24c"
|
||||
dependencies = [
|
||||
"almost",
|
||||
"cosmic-config",
|
||||
@ -2345,7 +2356,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced"
|
||||
version = "0.12.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#f655710d55911d81e96ca58b5c9e814e75cba7b5"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c9f8f485373e02ef849c83d3bbdf0fdd2bf4a24c"
|
||||
dependencies = [
|
||||
"dnd",
|
||||
"iced_accessibility",
|
||||
@ -2363,7 +2374,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced_accessibility"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#f655710d55911d81e96ca58b5c9e814e75cba7b5"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c9f8f485373e02ef849c83d3bbdf0fdd2bf4a24c"
|
||||
dependencies = [
|
||||
"accesskit",
|
||||
"accesskit_unix",
|
||||
@ -2372,7 +2383,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced_core"
|
||||
version = "0.12.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#f655710d55911d81e96ca58b5c9e814e75cba7b5"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c9f8f485373e02ef849c83d3bbdf0fdd2bf4a24c"
|
||||
dependencies = [
|
||||
"bitflags 2.6.0",
|
||||
"dnd",
|
||||
@ -2394,7 +2405,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced_futures"
|
||||
version = "0.12.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#f655710d55911d81e96ca58b5c9e814e75cba7b5"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c9f8f485373e02ef849c83d3bbdf0fdd2bf4a24c"
|
||||
dependencies = [
|
||||
"futures",
|
||||
"iced_core",
|
||||
@ -2407,7 +2418,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced_graphics"
|
||||
version = "0.12.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#f655710d55911d81e96ca58b5c9e814e75cba7b5"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c9f8f485373e02ef849c83d3bbdf0fdd2bf4a24c"
|
||||
dependencies = [
|
||||
"bitflags 2.6.0",
|
||||
"bytemuck",
|
||||
@ -2431,7 +2442,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced_renderer"
|
||||
version = "0.12.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#f655710d55911d81e96ca58b5c9e814e75cba7b5"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c9f8f485373e02ef849c83d3bbdf0fdd2bf4a24c"
|
||||
dependencies = [
|
||||
"iced_graphics",
|
||||
"iced_tiny_skia",
|
||||
@ -2443,7 +2454,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced_runtime"
|
||||
version = "0.12.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#f655710d55911d81e96ca58b5c9e814e75cba7b5"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c9f8f485373e02ef849c83d3bbdf0fdd2bf4a24c"
|
||||
dependencies = [
|
||||
"dnd",
|
||||
"iced_accessibility",
|
||||
@ -2457,7 +2468,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced_sctk"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#f655710d55911d81e96ca58b5c9e814e75cba7b5"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c9f8f485373e02ef849c83d3bbdf0fdd2bf4a24c"
|
||||
dependencies = [
|
||||
"enum-repr",
|
||||
"float-cmp",
|
||||
@ -2483,7 +2494,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced_style"
|
||||
version = "0.12.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#f655710d55911d81e96ca58b5c9e814e75cba7b5"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c9f8f485373e02ef849c83d3bbdf0fdd2bf4a24c"
|
||||
dependencies = [
|
||||
"iced_core",
|
||||
"once_cell",
|
||||
@ -2493,7 +2504,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced_tiny_skia"
|
||||
version = "0.12.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#f655710d55911d81e96ca58b5c9e814e75cba7b5"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c9f8f485373e02ef849c83d3bbdf0fdd2bf4a24c"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"cosmic-text",
|
||||
@ -2510,7 +2521,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced_wgpu"
|
||||
version = "0.12.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#f655710d55911d81e96ca58b5c9e814e75cba7b5"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c9f8f485373e02ef849c83d3bbdf0fdd2bf4a24c"
|
||||
dependencies = [
|
||||
"as-raw-xcb-connection",
|
||||
"bitflags 2.6.0",
|
||||
@ -2539,7 +2550,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "iced_widget"
|
||||
version = "0.12.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#f655710d55911d81e96ca58b5c9e814e75cba7b5"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c9f8f485373e02ef849c83d3bbdf0fdd2bf4a24c"
|
||||
dependencies = [
|
||||
"dnd",
|
||||
"iced_renderer",
|
||||
@ -2823,7 +2834,7 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
|
||||
[[package]]
|
||||
name = "libcosmic"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#f655710d55911d81e96ca58b5c9e814e75cba7b5"
|
||||
source = "git+https://github.com/pop-os/libcosmic#c9f8f485373e02ef849c83d3bbdf0fdd2bf4a24c"
|
||||
dependencies = [
|
||||
"apply",
|
||||
"ashpd 0.9.1",
|
||||
@ -3752,6 +3763,12 @@ version = "1.0.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58"
|
||||
|
||||
[[package]]
|
||||
name = "pure-rust-locales"
|
||||
version = "0.8.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1190fd18ae6ce9e137184f207593877e70f39b015040156b1e05081cdfe3733a"
|
||||
|
||||
[[package]]
|
||||
name = "pwd"
|
||||
version = "1.4.0"
|
||||
|
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, rust
|
||||
, rustPlatform
|
||||
, cmake
|
||||
, coreutils
|
||||
@ -16,13 +15,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cosmic-greeter";
|
||||
version = "1.0.0-alpha.1";
|
||||
version = "1.0.0-alpha.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-greeter";
|
||||
rev = "epoch-${version}";
|
||||
hash = "sha256-dc+VV7eIEUKoio/bQieXcDVZCepf4HtQrIKRslym31Y=";
|
||||
hash = "sha256-5BSsiGgL369/PePS0FmuE42tktK2bpgJziYuUEnZ2jY=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
@ -34,7 +33,7 @@ rustPlatform.buildRustPackage rec {
|
||||
"cosmic-bg-config-0.1.0" = "sha256-keKTWghlKehLQA9J9SQjAvGCaZY/7xWWteDtmLoThD0=";
|
||||
"cosmic-client-toolkit-0.1.0" = "sha256-1XtyEvednEMN4MApxTQid4eed19dEN5ZBDt/XRjuda0=";
|
||||
"cosmic-comp-config-0.1.0" = "sha256-5+AY6p31XV+y+rrIU6YCg37oa4ygFPjYb+Osml1O29Q=";
|
||||
"cosmic-config-0.1.0" = "sha256-qvpgX+JpnO3Kt+sYD+q1+avNzJ6IXlYkRQqKGqIZ/ik=";
|
||||
"cosmic-config-0.1.0" = "sha256-vkYq91Zvz8RNdXm5z26Rc3XaHtD2/PuUYfYJkORKdgE=";
|
||||
"cosmic-dbus-networkmanager-0.1.0" = "sha256-Bz/bzXCm60AF0inpZJDF4iNZIX3FssImORrE5nZpkyQ=";
|
||||
"cosmic-text-0.12.1" = "sha256-x0XTxzbmtE2d4XCG/Nuq3DzBpz15BbnjRRlirfNJEiU=";
|
||||
"d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4=";
|
||||
|
@ -5,19 +5,18 @@
|
||||
rustPlatform,
|
||||
just,
|
||||
dbus,
|
||||
rust,
|
||||
stdenv,
|
||||
xdg-desktop-portal-cosmic,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cosmic-session";
|
||||
version = "1.0.0-alpha.1";
|
||||
version = "1.0.0-alpha.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-session";
|
||||
rev = "epoch-${version}";
|
||||
hash = "sha256-5zfEBNsMxtKPJZcGYZth/SoXrsg0gpug15VR5fPbvt0=";
|
||||
hash = "sha256-rkzcu5lXKVQ5RfilcKQjTzeKZv+FpqrtARZgGGlYKK4=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
1054
pkgs/by-name/co/cosmic-store/Cargo.lock
generated
1054
pkgs/by-name/co/cosmic-store/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -5,13 +5,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cosmic-store";
|
||||
version = "1.0.0-alpha.1";
|
||||
version = "1.0.0-alpha.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-store";
|
||||
rev = "epoch-${version}";
|
||||
hash = "sha256-RuqWO2/sqMMd9xMRClAy7cwv7iCTEC15TZ7JLBZ2zwM=";
|
||||
hash = "sha256-mq94ZMVOdXAPR52ID5x8nppJ9mNoTOPBfn7Eouj3T1U=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@ -22,11 +22,11 @@ rustPlatform.buildRustPackage rec {
|
||||
"appstream-0.2.2" = "sha256-OWeNXxvqU8s0ksdY9v5bZeNfDYgMBVd1DhEAjjZxEmo=";
|
||||
"atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA=";
|
||||
"clipboard_macos-0.1.0" = "sha256-cG5vnkiyDlQnbEfV2sPbmBYKv1hd3pjJrymfZb8ziKk=";
|
||||
"cosmic-config-0.1.0" = "sha256-d2R5xytwf0BIbllG6elc/nn7nmiC3+VI1g3EiW8WEHA=";
|
||||
"cosmic-text-0.12.0" = "sha256-VUUCcW5XnkmCB8cQ5t2xT70wVD5WKXEOPNgNd2xod2A=";
|
||||
"cosmic-config-0.1.0" = "sha256-gXrMEoAN+7nYAEcs4w6wROhQTjMCxkGn+muJutktLyk=";
|
||||
"cosmic-text-0.12.1" = "sha256-u2Tw+XhpIKeFg8Wgru/sjGw6GUZ2m50ZDmRBJ1IM66w=";
|
||||
"d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4=";
|
||||
"glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg=";
|
||||
"smithay-clipboard-0.8.0" = "sha256-pBQZ+UXo9hZ907mfpcZk+a+8pKrIWdczVvPkjT3TS8U=";
|
||||
"smithay-clipboard-0.8.0" = "sha256-4InFXm0ahrqFrtNLeqIuE3yeOpxKZJZx+Bc0yQDtv34=";
|
||||
"softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg=";
|
||||
"taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI=";
|
||||
"winit-0.29.10" = "sha256-ScTII2AzK3SC8MVeASZ9jhVWsEaGrSQ2BnApTxgfxK4=";
|
||||
|
1541
pkgs/by-name/co/cosmic-term/Cargo.lock
generated
1541
pkgs/by-name/co/cosmic-term/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -18,37 +18,40 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cosmic-term";
|
||||
version = "1.0.0-alpha.1";
|
||||
version = "1.0.0-alpha.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-term";
|
||||
rev = "epoch-${version}";
|
||||
hash = "sha256-dY4QGQXJFL+yjCYRGCg3NfMLMjlEBSEmxHn68PvhCAQ=";
|
||||
hash = "sha256-rMaHWtT5bhjdji3dAnfyCm7lMXDWjIBVh4ZUwApZphU=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"accesskit-0.12.2" = "sha256-1UwgRyUe0PQrZrpS7574oNLi13fg5HpgILtZGW6JNtQ=";
|
||||
"alacritty_terminal-0.24.1-dev" = "sha256-aVB1CNOLjNh6AtvdbomODNrk00Md8yz8QzldzvDo1LI=";
|
||||
"atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA=";
|
||||
"clipboard_macos-0.1.0" = "sha256-cG5vnkiyDlQnbEfV2sPbmBYKv1hd3pjJrymfZb8ziKk=";
|
||||
"cosmic-config-0.1.0" = "sha256-DgMh0gqWUmXjBhBySR0CMnv/8O3XbS2BwomU9eNt+4o=";
|
||||
"cosmic-files-0.1.0" = "sha256-QDkHhU0zE0szFwGuVuSYrXd7AUdTU1rYxlAsaHr2YvQ=";
|
||||
"cosmic-text-0.12.1" = "sha256-x0XTxzbmtE2d4XCG/Nuq3DzBpz15BbnjRRlirfNJEiU=";
|
||||
"cosmic-config-0.1.0" = "sha256-gXrMEoAN+7nYAEcs4w6wROhQTjMCxkGn+muJutktLyk=";
|
||||
"cosmic-files-0.1.0" = "sha256-rBR6IPpMgOltyaRPPZ5V8tYH/xtQphgrPWci/kvlgEg=";
|
||||
"cosmic-text-0.12.1" = "sha256-u2Tw+XhpIKeFg8Wgru/sjGw6GUZ2m50ZDmRBJ1IM66w=";
|
||||
"d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4=";
|
||||
"filetime-0.2.24" = "sha256-lU7dPotdnmyleS2B75SmDab7qJfEzmJnHPF18CN/Y98=";
|
||||
"fs_extra-1.3.0" = "sha256-ftg5oanoqhipPnbUsqnA4aZcyHqn9XsINJdrStIPLoE=";
|
||||
"glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg=";
|
||||
"libc-0.2.154" = "sha256-/pkmpCxzRTjBiLFKauqUqGTBTxNUQX4zwPWYpDsjwVQ=";
|
||||
"smithay-clipboard-0.8.0" = "sha256-4InFXm0ahrqFrtNLeqIuE3yeOpxKZJZx+Bc0yQDtv34=";
|
||||
"softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg=";
|
||||
"taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI=";
|
||||
"trash-5.1.1" = "sha256-So8rQ8gLF5o79Az396/CQY/veNo4ticxYpYZPfMJyjQ=";
|
||||
"winit-0.29.10" = "sha256-ScTII2AzK3SC8MVeASZ9jhVWsEaGrSQ2BnApTxgfxK4=";
|
||||
};
|
||||
};
|
||||
|
||||
# COSMIC applications now uses vergen for the About page
|
||||
# Update the COMMIT_DATE to match when the commit was made
|
||||
env.VERGEN_GIT_COMMIT_DATE = "2024-08-03";
|
||||
env.VERGEN_GIT_COMMIT_DATE = "2024-09-24";
|
||||
env.VERGEN_GIT_SHA = src.rev;
|
||||
|
||||
postPatch = ''
|
||||
|
@ -12,13 +12,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cosmic-workspaces-epoch";
|
||||
version = "1.0.0-alpha.1";
|
||||
version = "1.0.0-alpha.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = pname;
|
||||
repo = "cosmic-workspaces-epoch";
|
||||
rev = "epoch-${version}";
|
||||
hash = "sha256-z3xQ6Vgqkm8hYLo2550NbFRkTMRQ0F9zn85iobnykH4=";
|
||||
hash = "sha256-z3xQ6Vgqkm8hYLo2550NbFRkTMRQ0F9zn85iobnykH5=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
@ -1,19 +1,31 @@
|
||||
{ lib, stdenv, fetchFromGitHub, ruby, gnugrep, diffutils, git, darcs }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
ruby,
|
||||
gnugrep,
|
||||
diffutils,
|
||||
git,
|
||||
darcs,
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "darcs-to-git";
|
||||
version = "2015-06-04";
|
||||
version = "0-unstable-2024-02-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "purcell";
|
||||
repo = "darcs-to-git";
|
||||
rev = "e5fee32495908fe0f7d700644c7b37347b7a0a5b";
|
||||
sha256 = "sha256-UQI3av+0zj1SNwEonwuk5n2RjZN3+tSJFJuFCjrorFM=";
|
||||
rev = "2a31a95726658fef1b48e1f0010928fc2a69d5bf";
|
||||
hash = "sha256-ep36lAYUnO3kX0ff3PxrBHog5CIGsJaERiNN5DmmAQI=";
|
||||
};
|
||||
|
||||
patchPhase = let
|
||||
patchPhase =
|
||||
let
|
||||
matchExecution = ''(\<(output_of|system|run)\([^"%]*("|%w\()|^[^"`]*`)'';
|
||||
in ''
|
||||
in
|
||||
''
|
||||
sed -r -i \
|
||||
-e '1s|^#!.*|#!${ruby}/bin/ruby|' \
|
||||
-e 's!${matchExecution}git\>!\1${git}/bin/git!' \
|
||||
@ -28,6 +40,8 @@ stdenv.mkDerivation {
|
||||
install -vD darcs-to-git "$out/bin/darcs-to-git"
|
||||
'';
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkPhase = ''
|
51
pkgs/by-name/di/dinit/package.nix
Normal file
51
pkgs/by-name/di/dinit/package.nix
Normal file
@ -0,0 +1,51 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
m4,
|
||||
installShellFiles,
|
||||
util-linux,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dinit";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "davmac314";
|
||||
repo = "dinit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ApB0pEFSyawNASF/rqRmhT4FLofZzYmNdNmG2FGpnnk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/shutdown.cc \
|
||||
--replace-fail '"/bin/umount"' '"${util-linux}/bin/umount"' \
|
||||
--replace-fail '"/sbin/swapoff"' '"${util-linux}/bin/swapoff"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
m4
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--prefix=${placeholder "out"}"
|
||||
"--sbindir=${placeholder "out"}/bin"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd dinitctl \
|
||||
--bash contrib/shell-completion/bash/dinitctl \
|
||||
--fish contrib/shell-completion/fish/dinitctl.fish \
|
||||
--zsh contrib/shell-completion/zsh/_dinit
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A service manager / supervision system, which can (on Linux) also function as a system manager and init";
|
||||
homepage = "https://davmac.org/projects/dinit";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ aanderse ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
@ -1,7 +1,7 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
let
|
||||
pname = "e1s";
|
||||
version = "1.0.39";
|
||||
version = "1.0.41";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
@ -10,7 +10,7 @@ buildGoModule {
|
||||
owner = "keidarcy";
|
||||
repo = "e1s";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-kfG9Nkt5L2YokTLPzPuIAmjCHlZvr3FqZiYLr8bU+K4=";
|
||||
hash = "sha256-JYda+CoTa8HAZ0B0kcr4s9u+4dlhthFLpjGaZqAFuhU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-u6h/sqI0Rqs3ZmVXtMNVuL3h9Cj15+mM+QnIaylzlHI=";
|
||||
@ -18,7 +18,7 @@ buildGoModule {
|
||||
meta = with lib; {
|
||||
description = "Easily Manage AWS ECS Resources in Terminal 🐱";
|
||||
homepage = "https://github.com/keidarcy/e1s";
|
||||
changelog = "https://github.com/derailed/e1s/releases/tag/v${version}";
|
||||
changelog = "https://github.com/keidarcy/e1s/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
mainProgram = "e1s";
|
||||
maintainers = with maintainers; [ zelkourban ];
|
||||
|
@ -1,53 +1,55 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, itstool
|
||||
, libxml2
|
||||
, meson
|
||||
, ninja
|
||||
, perl
|
||||
, python3
|
||||
, pkgconf
|
||||
, wrapGAppsHook3
|
||||
, at-spi2-core
|
||||
, dbus
|
||||
, elfutils
|
||||
, libepoxy
|
||||
, gexiv2
|
||||
, glib
|
||||
, gobject-introspection
|
||||
, gst-plugins-base
|
||||
, gstreamer
|
||||
, gtk3
|
||||
, lcms2
|
||||
, libdatrie
|
||||
, libgphoto2
|
||||
, libgudev
|
||||
, libpeas
|
||||
, libraw
|
||||
, libselinux
|
||||
, libsepol
|
||||
, libthai
|
||||
, libunwind
|
||||
, libxkbcommon
|
||||
, orc
|
||||
, pcre
|
||||
, pcre2
|
||||
, udev
|
||||
, util-linux
|
||||
, xorg
|
||||
, zstd
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
fetchpatch,
|
||||
itstool,
|
||||
libxml2,
|
||||
meson,
|
||||
ninja,
|
||||
perl,
|
||||
python3,
|
||||
pkgconf,
|
||||
wrapGAppsHook3,
|
||||
at-spi2-core,
|
||||
dbus,
|
||||
elfutils,
|
||||
libepoxy,
|
||||
gexiv2,
|
||||
glib,
|
||||
gobject-introspection,
|
||||
gst_all_1,
|
||||
gtk3,
|
||||
lcms2,
|
||||
libdatrie,
|
||||
libgphoto2,
|
||||
libgudev,
|
||||
libpeas,
|
||||
libraw,
|
||||
libselinux,
|
||||
libsepol,
|
||||
lerc,
|
||||
libthai,
|
||||
libunwind,
|
||||
libxkbcommon,
|
||||
orc,
|
||||
pcre,
|
||||
pcre2,
|
||||
udev,
|
||||
util-linux,
|
||||
xorg,
|
||||
zstd,
|
||||
cmake,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "entangle";
|
||||
version = "3.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "entangle";
|
||||
repo = "entangle";
|
||||
rev = "v${version}";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
sha256 = "hz2WSDOjriQSavFlDT+35x1X5MeInq80ZrSP1WR/td0=";
|
||||
};
|
||||
|
||||
@ -71,17 +73,20 @@ stdenv.mkDerivation rec {
|
||||
pkgconf
|
||||
wrapGAppsHook3
|
||||
gobject-introspection
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
buildInputs =
|
||||
[
|
||||
at-spi2-core
|
||||
dbus
|
||||
libepoxy
|
||||
elfutils
|
||||
gexiv2
|
||||
glib
|
||||
gst-plugins-base
|
||||
gstreamer
|
||||
lerc
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gstreamer
|
||||
gtk3
|
||||
lcms2
|
||||
libdatrie
|
||||
@ -100,7 +105,8 @@ stdenv.mkDerivation rec {
|
||||
udev
|
||||
util-linux
|
||||
zstd
|
||||
] ++ (with xorg; [
|
||||
]
|
||||
++ (with xorg; [
|
||||
libXdmcp
|
||||
libXtst
|
||||
]);
|
||||
@ -120,7 +126,7 @@ stdenv.mkDerivation rec {
|
||||
--replace "Exec=entangle" "Exec=$out/bin/entangle"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Tethered camera control and capture";
|
||||
longDescription = ''
|
||||
Entangle uses GTK and libgphoto2 to provide a graphical interface
|
||||
@ -130,9 +136,9 @@ stdenv.mkDerivation rec {
|
||||
This app can also serve as a camera app for mobile devices.
|
||||
'';
|
||||
homepage = "https://gitlab.com/entangle/entangle";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ ShamrockLee ];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ ShamrockLee ];
|
||||
mainProgram = "entangle";
|
||||
};
|
||||
}
|
||||
})
|
@ -6,14 +6,14 @@
|
||||
}:
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "exo";
|
||||
version = "0-unstable-2024-10-03";
|
||||
version = "0-unstable-2024-10-06";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exo-explore";
|
||||
repo = "exo";
|
||||
rev = "2b9dec20eb25f8708455e13eabc744d653b7a286";
|
||||
hash = "sha256-Iz65bs/ntTrxcifrPemAlK8zVjbwQfXsnUlcE1r4E/A=";
|
||||
rev = "7b2a523fd1e5f1281d89bc1f664a29dc2003b787";
|
||||
hash = "sha256-o4tNbU9oa7WsAQ6eiTHqQVhliXbG/Y8d7PeH2TTWgGk=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [ setuptools ];
|
||||
@ -34,11 +34,11 @@ python3Packages.buildPythonApplication {
|
||||
jinja2
|
||||
netifaces
|
||||
numpy
|
||||
nvidia-ml-py
|
||||
pillow
|
||||
prometheus-client
|
||||
protobuf
|
||||
psutil
|
||||
pynvml
|
||||
requests
|
||||
rich
|
||||
safetensors
|
||||
|
@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fabric-ai";
|
||||
version = "1.4.26";
|
||||
version = "1.4.46";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danielmiessler";
|
||||
repo = "fabric";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KoGulBnQDLpRWB+Bogu+bvXDJ98ImyzTZrvoEaVh5BQ=";
|
||||
hash = "sha256-c25qnRgr7g8dIcHuRyqCmzGBqNR2wxvgjt7E6x8VsZA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-uWq+S6J/RInAaQOO0T3LkpQ89mHq0Wj+wXw+Tioxy70=";
|
||||
vendorHash = "sha256-ef5fn3D0DcvluLIlwfZFGS/6bZgkduQhRXvjCrghBL8=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
@ -47,13 +47,13 @@ let
|
||||
in
|
||||
stdenv'.mkDerivation (finalAttrs: {
|
||||
pname = "fastfetch";
|
||||
version = "2.26.1";
|
||||
version = "2.27.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastfetch-cli";
|
||||
repo = "fastfetch";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-0TRhMK45mfCft56R07lUbnxjfQrIAXONy4f6ykpc5X8=";
|
||||
hash = "sha256-N/C6vGNebOFQ5RRpHD2hTqvHbX5mwICqIeFsdSCjaR4=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
@ -11,13 +11,13 @@
|
||||
}:
|
||||
let
|
||||
pname = "feishin";
|
||||
version = "0.9.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jeffvli";
|
||||
repo = "feishin";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3gQ39GhYPme0kGAtM5DsG9RYwf23OAdkp3uVt7c1SQU=";
|
||||
hash = "sha256-YdtGhGcG5qVoVa1534NQIbI02gy0pzR9U1PU2lL1u/A=";
|
||||
};
|
||||
|
||||
electron = electron_31;
|
||||
@ -26,7 +26,7 @@ buildNpmPackage {
|
||||
inherit pname version;
|
||||
|
||||
inherit src;
|
||||
npmDepsHash = "sha256-u+zbPB6u9EYVr9oHnLlKC0AyCLn4nq4TFVPSs2oWsbo=";
|
||||
npmDepsHash = "sha256-3fY0NCswRTnpDDsr1fDK9YZm8TUKCIMJ1+yw38dj0M8=";
|
||||
|
||||
npmFlags = [ "--legacy-peer-deps" ];
|
||||
makeCacheWritable = true;
|
||||
@ -60,7 +60,7 @@ buildNpmPackage {
|
||||
inherit version;
|
||||
|
||||
src = "${src}/release/app";
|
||||
npmDepsHash = "sha256-3qUmXRiAloGgLAErR16+BGEUT0ZwHHhCxMDQRCENQB4=";
|
||||
npmDepsHash = "sha256-YkLT69QU7WMGRe95rfZ8TmnfIdWwtpWaqGY+wU48veQ=";
|
||||
|
||||
npmFlags = [ "--ignore-scripts" ];
|
||||
dontNpmBuild = true;
|
||||
|
@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "files-cli";
|
||||
version = "2.13.141";
|
||||
version = "2.13.148";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "files-cli";
|
||||
owner = "files-com";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UVD2zWas4QZD3W6Xro7tiGJDdbive60dYPDY1UTnl08=";
|
||||
hash = "sha256-r3pYDBE1YaKuFdxxpDVcMGfX5vOLt4xh3eY0fgLIGk0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4HkIwyRqvbk7qIzCjZNTzF7wDNupNaDpOiqqdlx9UIo=";
|
||||
vendorHash = "sha256-/w1uo3SmCUjKp1FcB2NfhrFCLh5zCP+6uf03uwb+SvU=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ lib
|
||||
, flutter322
|
||||
, flutter324
|
||||
, mpv-unwrapped
|
||||
, xdg-user-dirs
|
||||
, patchelf
|
||||
@ -8,16 +8,16 @@
|
||||
, makeDesktopItem
|
||||
}:
|
||||
let
|
||||
version = "0.9.9-beta";
|
||||
version = "0.9.11-beta";
|
||||
in
|
||||
flutter322.buildFlutterApplication {
|
||||
flutter324.buildFlutterApplication {
|
||||
inherit version;
|
||||
pname = "finamp";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jmshrv";
|
||||
repo = "finamp";
|
||||
rev = version;
|
||||
hash = "sha256-cCXDvsXgA/B274pQzyQRzmzz0QvqcFMLQrUjDU/B08Y=";
|
||||
hash = "sha256-ruHjLM68c/k+Q64eeoezj5gmmniLBAOt3PEmmaO81xo=";
|
||||
};
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
||||
|
@ -30,15 +30,25 @@
|
||||
"source": "hosted",
|
||||
"version": "0.11.3"
|
||||
},
|
||||
"app_set_id": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "app_set_id",
|
||||
"sha256": "455b04bc03fd9b1b66a50bbca74278d973ac4e6f2c03d5dd4707bb071613a7e5",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.2.0"
|
||||
},
|
||||
"archive": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "archive",
|
||||
"sha256": "6bd38d335f0954f5fad9c79e614604fbf03a0e5b975923dd001b6ea965ef5b4b",
|
||||
"sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.6.0"
|
||||
"version": "3.6.1"
|
||||
},
|
||||
"args": {
|
||||
"dependency": "transitive",
|
||||
@ -64,21 +74,21 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "audio_service",
|
||||
"sha256": "4547c312a94f9cb2c48b60823fb190767cbd63454a83c73049384d5d3cba4650",
|
||||
"sha256": "9dd5ba7e77567b290c35908b1950d61485b4dfdd3a0ac398e98cfeec04651b75",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.18.13"
|
||||
"version": "0.18.15"
|
||||
},
|
||||
"audio_service_mpris": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "audio_service_mpris",
|
||||
"sha256": "a8d1583f9143d17b2facc994a99bd1ea257cec43adcb8d7349458555c62b570f",
|
||||
"sha256": "b16db3584a4b2464c0bfd575c1a21765723d257931222f8adfcb0511f940d352",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.1.3"
|
||||
"version": "0.1.5"
|
||||
},
|
||||
"audio_service_platform_interface": {
|
||||
"dependency": "direct main",
|
||||
@ -94,21 +104,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "audio_service_web",
|
||||
"sha256": "9d7d5ae5f98a5727f2580fad73062f2484f400eef6cef42919413268e62a363e",
|
||||
"sha256": "4cdc2127cd4562b957fb49227dc58e3303fafb09bde2573bc8241b938cf759d9",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.1.2"
|
||||
"version": "0.1.3"
|
||||
},
|
||||
"audio_session": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "audio_session",
|
||||
"sha256": "a49af9981eec5d7cd73b37bacb6ee73f8143a6a9f9bd5b6021e6c346b9b6cf4e",
|
||||
"sha256": "343e83bc7809fbda2591a49e525d6b63213ade10c76f15813be9aed6657b3261",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.1.19"
|
||||
"version": "0.1.21"
|
||||
},
|
||||
"auto_size_text": {
|
||||
"dependency": "direct main",
|
||||
@ -124,11 +134,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "background_downloader",
|
||||
"sha256": "9504093db43da6095c44dd14fc816f3ee8961633ace12340f5d3c4fbfd346e2d",
|
||||
"sha256": "6a945db1a1c7727a4bc9c1d7c882cfb1a819f873b77e01d5e5dd6a3fb231cb28",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "8.5.2"
|
||||
"version": "8.5.5"
|
||||
},
|
||||
"balanced_text": {
|
||||
"dependency": "direct main",
|
||||
@ -141,6 +151,26 @@
|
||||
"source": "git",
|
||||
"version": "0.0.3"
|
||||
},
|
||||
"battery_plus": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "battery_plus",
|
||||
"sha256": "ccc1322fee1153a0f89e663e0eac2f64d659da506454cf24dcad75eb08ae138b",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.0.2"
|
||||
},
|
||||
"battery_plus_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "battery_plus_platform_interface",
|
||||
"sha256": "e8342c0f32de4b1dfd0223114b6785e48e579bfc398da9471c9179b907fa4910",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.0.1"
|
||||
},
|
||||
"boolean_selector": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@ -205,21 +235,21 @@
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "build_runner",
|
||||
"sha256": "1414d6d733a85d8ad2f1dfcb3ea7945759e35a123cb99ccfac75d0758f75edfa",
|
||||
"sha256": "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.4.10"
|
||||
"version": "2.4.11"
|
||||
},
|
||||
"build_runner_core": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "build_runner_core",
|
||||
"sha256": "4ae8ffe5ac758da294ecf1802f2aff01558d8b1b00616aa7538ea9a8a5d50799",
|
||||
"sha256": "e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "7.3.0"
|
||||
"version": "7.3.1"
|
||||
},
|
||||
"built_collection": {
|
||||
"dependency": "transitive",
|
||||
@ -265,21 +295,21 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "chopper",
|
||||
"sha256": "779a7bc5c7af2e45bd35c49698f2b6fabc23ac053b622294369bbb079eeb8920",
|
||||
"sha256": "6b2f5681f2bdca65a1fe2372922e797303fa058b6ead765afa88e40e0fd61071",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "8.0.0"
|
||||
"version": "8.0.2"
|
||||
},
|
||||
"chopper_generator": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "chopper_generator",
|
||||
"sha256": "f7f4913d14bbec24b5cc3c5270f47a3a218bd1c764d7ed3eb0bf4574913208f3",
|
||||
"sha256": "7d25ad17062a9b671020f96082ed5f8ee85e18137beb74aca4620137ae6ea523",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "8.0.0"
|
||||
"version": "8.0.2"
|
||||
},
|
||||
"ci": {
|
||||
"dependency": "transitive",
|
||||
@ -375,21 +405,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "cross_file",
|
||||
"sha256": "55d7b444feb71301ef6b8838dbc1ae02e63dd48c8773f3810ff53bb1e2945b32",
|
||||
"sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.3.4+1"
|
||||
"version": "0.3.4+2"
|
||||
},
|
||||
"crypto": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "crypto",
|
||||
"sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab",
|
||||
"sha256": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.0.3"
|
||||
"version": "3.0.5"
|
||||
},
|
||||
"custom_lint": {
|
||||
"dependency": "direct dev",
|
||||
@ -455,21 +485,21 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "device_info_plus",
|
||||
"sha256": "eead12d1a1ed83d8283ab4c2f3fca23ac4082f29f25f29dff0f758f57d06ec91",
|
||||
"sha256": "a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "10.1.0"
|
||||
"version": "10.1.2"
|
||||
},
|
||||
"device_info_plus_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "device_info_plus_platform_interface",
|
||||
"sha256": "d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64",
|
||||
"sha256": "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "7.0.0"
|
||||
"version": "7.0.1"
|
||||
},
|
||||
"equatable": {
|
||||
"dependency": "transitive",
|
||||
@ -505,11 +535,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "ffi",
|
||||
"sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21",
|
||||
"sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.1.2"
|
||||
"version": "2.1.3"
|
||||
},
|
||||
"file": {
|
||||
"dependency": "transitive",
|
||||
@ -525,11 +555,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "file_picker",
|
||||
"sha256": "29c90806ac5f5fb896547720b73b17ee9aed9bba540dc5d91fe29f8c5745b10a",
|
||||
"sha256": "825aec673606875c33cd8d3c4083f1a3c3999015a84178b317b7ef396b7384f3",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "8.0.3"
|
||||
"version": "8.0.7"
|
||||
},
|
||||
"file_sizes": {
|
||||
"dependency": "direct main",
|
||||
@ -581,21 +611,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "flutter_gen_core",
|
||||
"sha256": "b9894396b2a790cc2d6eb3ed86e5e113aaed993765b21d4b981c9da4476e0f52",
|
||||
"sha256": "638d518897f1aefc55a24278968027591d50223a6943b6ae9aa576fe1494d99d",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "5.5.0+1"
|
||||
"version": "5.7.0"
|
||||
},
|
||||
"flutter_gen_runner": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "flutter_gen_runner",
|
||||
"sha256": "b4c4c54e4dd89022f5e405fe96f16781be2dfbeabe8a70ccdf73b7af1302c655",
|
||||
"sha256": "7f2f02d95e3ec96cf70a1c515700c0dd3ea905af003303a55d6fb081240e6b8a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "5.5.0+1"
|
||||
"version": "5.7.0"
|
||||
},
|
||||
"flutter_launcher_icons": {
|
||||
"dependency": "direct dev",
|
||||
@ -627,11 +657,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "flutter_plugin_android_lifecycle",
|
||||
"sha256": "8cf40eebf5dec866a6d1956ad7b4f7016e6c0cc69847ab946833b7d43743809f",
|
||||
"sha256": "9ee02950848f61c4129af3d6ec84a1cfc0e47931abc746b03e7a3bc3e8ff6eda",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.0.19"
|
||||
"version": "2.0.22"
|
||||
},
|
||||
"flutter_riverpod": {
|
||||
"dependency": "direct main",
|
||||
@ -677,11 +707,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "flutter_tabler_icons",
|
||||
"sha256": "5c27597ed7e3a7f8ae5a3d6aa2c27223fdd3da165c08a4879083c394acfa3678",
|
||||
"sha256": "08581b2d87e41c86e3acb7cf48482f1a1775e4ed37febc02ca1b99a221836580",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.29.0"
|
||||
"version": "1.40.0"
|
||||
},
|
||||
"flutter_test": {
|
||||
"dependency": "direct dev",
|
||||
@ -693,11 +723,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "flutter_to_airplay",
|
||||
"sha256": "9ed02327954d2bdb28d529198bedb1b6ab993be08125fdff46af2c5e5f245983",
|
||||
"sha256": "702408986b652dfaef5ad68c6f3c3008941ae8d8ef5db526792239c8d490a16d",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.0.4"
|
||||
"version": "2.0.5"
|
||||
},
|
||||
"flutter_vibrate": {
|
||||
"dependency": "direct main",
|
||||
@ -715,15 +745,25 @@
|
||||
"source": "sdk",
|
||||
"version": "0.0.0"
|
||||
},
|
||||
"focus_on_it": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "focus_on_it",
|
||||
"sha256": "bd75489d7cb3cbde483126316a753e1a442a35c01a2278ae9bf54a4d86b89f02",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.0.1"
|
||||
},
|
||||
"freezed_annotation": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "freezed_annotation",
|
||||
"sha256": "c3fd9336eb55a38cc1bbd79ab17573113a8deccd0ecbbf926cca3c62803b5c2d",
|
||||
"sha256": "c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.4.1"
|
||||
"version": "2.4.4"
|
||||
},
|
||||
"frontend_server_client": {
|
||||
"dependency": "transitive",
|
||||
@ -759,11 +799,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "graphs",
|
||||
"sha256": "aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19",
|
||||
"sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.3.1"
|
||||
"version": "2.3.2"
|
||||
},
|
||||
"hashcodes": {
|
||||
"dependency": "transitive",
|
||||
@ -819,11 +859,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "http",
|
||||
"sha256": "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938",
|
||||
"sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.2.1"
|
||||
"version": "1.2.2"
|
||||
},
|
||||
"http_multi_server": {
|
||||
"dependency": "transitive",
|
||||
@ -960,21 +1000,21 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "just_audio",
|
||||
"sha256": "5abfab1d199e01ab5beffa61b3e782350df5dad036cb8c83b79fa45fc656614e",
|
||||
"sha256": "d8e8aaf417d33e345299c17f6457f72bd4ba0c549dc34607abb5183a354edc4d",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.9.38"
|
||||
"version": "0.9.40"
|
||||
},
|
||||
"just_audio_media_kit": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "just_audio_media_kit",
|
||||
"sha256": "bbecbd43959c230d9f9610df0e0165855e711b4c960ce730c08f31107cc3bd26",
|
||||
"sha256": "7f57d317fafa04cb3e70b924e8f632ffb7eca7a97a369e1e44738ed89fbd5da1",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.0.4"
|
||||
"version": "2.0.5"
|
||||
},
|
||||
"just_audio_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
@ -990,31 +1030,31 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "just_audio_web",
|
||||
"sha256": "0edb481ad4aa1ff38f8c40f1a3576013c3420bf6669b686fe661627d49bc606c",
|
||||
"sha256": "b163878529d9b028c53a6972fcd58cae2405bcd11cbfcea620b6fb9f151429d6",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.4.11"
|
||||
"version": "0.4.12"
|
||||
},
|
||||
"leak_tracker": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "leak_tracker",
|
||||
"sha256": "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a",
|
||||
"sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "10.0.4"
|
||||
"version": "10.0.5"
|
||||
},
|
||||
"leak_tracker_flutter_testing": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "leak_tracker_flutter_testing",
|
||||
"sha256": "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8",
|
||||
"sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.0.3"
|
||||
"version": "3.0.5"
|
||||
},
|
||||
"leak_tracker_testing": {
|
||||
"dependency": "transitive",
|
||||
@ -1080,21 +1120,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "material_color_utilities",
|
||||
"sha256": "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a",
|
||||
"sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.8.0"
|
||||
"version": "0.11.1"
|
||||
},
|
||||
"media_kit": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "media_kit",
|
||||
"sha256": "3289062540e3b8b9746e5c50d95bd78a9289826b7227e253dff806d002b9e67a",
|
||||
"sha256": "1f1deee148533d75129a6f38251ff8388e33ee05fc2d20a6a80e57d6051b7b62",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.1.10+1"
|
||||
"version": "1.1.11"
|
||||
},
|
||||
"media_kit_libs_linux": {
|
||||
"dependency": "direct main",
|
||||
@ -1121,21 +1161,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "meta",
|
||||
"sha256": "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136",
|
||||
"sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.12.0"
|
||||
"version": "1.15.0"
|
||||
},
|
||||
"mime": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "mime",
|
||||
"sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2",
|
||||
"sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.0.5"
|
||||
"version": "1.0.6"
|
||||
},
|
||||
"mini_music_visualizer": {
|
||||
"dependency": "direct main",
|
||||
@ -1151,11 +1191,11 @@
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "msix",
|
||||
"sha256": "519b183d15dc9f9c594f247e2d2339d855cf0eaacc30e19b128e14f3ecc62047",
|
||||
"sha256": "c50d6bd1aafe0d071a3c1e5a5ccb056404502935cb0a549e3178c4aae16caf33",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.16.7"
|
||||
"version": "3.16.8"
|
||||
},
|
||||
"nested": {
|
||||
"dependency": "transitive",
|
||||
@ -1171,11 +1211,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "octo_image",
|
||||
"sha256": "45b40f99622f11901238e18d48f5f12ea36426d8eced9f4cbf58479c7aa2430d",
|
||||
"sha256": "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.0.0"
|
||||
"version": "2.1.0"
|
||||
},
|
||||
"package_config": {
|
||||
"dependency": "transitive",
|
||||
@ -1191,21 +1231,21 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "package_info_plus",
|
||||
"sha256": "b93d8b4d624b4ea19b0a5a208b2d6eff06004bc3ce74c06040b120eeadd00ce0",
|
||||
"sha256": "a75164ade98cb7d24cfd0a13c6408927c6b217fa60dee5a7ff5c116a58f28918",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "8.0.0"
|
||||
"version": "8.0.2"
|
||||
},
|
||||
"package_info_plus_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "package_info_plus_platform_interface",
|
||||
"sha256": "f49918f3433a3146047372f9d4f1f847511f2acd5cd030e1f44fe5a50036b70e",
|
||||
"sha256": "ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.0.0"
|
||||
"version": "3.0.1"
|
||||
},
|
||||
"palette_generator": {
|
||||
"dependency": "direct main",
|
||||
@ -1242,21 +1282,21 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "path_provider",
|
||||
"sha256": "c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161",
|
||||
"sha256": "fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.1.3"
|
||||
"version": "2.1.4"
|
||||
},
|
||||
"path_provider_android": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "path_provider_android",
|
||||
"sha256": "a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d",
|
||||
"sha256": "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.2.4"
|
||||
"version": "2.2.10"
|
||||
},
|
||||
"path_provider_foundation": {
|
||||
"dependency": "transitive",
|
||||
@ -1292,11 +1332,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "path_provider_windows",
|
||||
"sha256": "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170",
|
||||
"sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.2.1"
|
||||
"version": "2.3.0"
|
||||
},
|
||||
"permission_handler": {
|
||||
"dependency": "direct main",
|
||||
@ -1312,41 +1352,41 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "permission_handler_android",
|
||||
"sha256": "8bb852cd759488893805c3161d0b2b5db55db52f773dbb014420b304055ba2c5",
|
||||
"sha256": "76e4ab092c1b240d31177bb64d2b0bea43f43d0e23541ec866151b9f7b2490fa",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "12.0.6"
|
||||
"version": "12.0.12"
|
||||
},
|
||||
"permission_handler_apple": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "permission_handler_apple",
|
||||
"sha256": "e9ad66020b89ff1b63908f247c2c6f931c6e62699b756ef8b3c4569350cd8662",
|
||||
"sha256": "e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "9.4.4"
|
||||
"version": "9.4.5"
|
||||
},
|
||||
"permission_handler_html": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "permission_handler_html",
|
||||
"sha256": "54bf176b90f6eddd4ece307e2c06cf977fb3973719c35a93b85cc7093eb6070d",
|
||||
"sha256": "af26edbbb1f2674af65a8f4b56e1a6f526156bc273d0e65dd8075fab51c78851",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.1.1"
|
||||
"version": "0.1.3+2"
|
||||
},
|
||||
"permission_handler_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "permission_handler_platform_interface",
|
||||
"sha256": "48d4fcf201a1dad93ee869ab0d4101d084f49136ec82a8a06ed9cfeacab9fd20",
|
||||
"sha256": "e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.2.1"
|
||||
"version": "4.2.3"
|
||||
},
|
||||
"permission_handler_windows": {
|
||||
"dependency": "transitive",
|
||||
@ -1372,11 +1412,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "platform",
|
||||
"sha256": "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec",
|
||||
"sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.1.4"
|
||||
"version": "3.1.5"
|
||||
},
|
||||
"plugin_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
@ -1422,31 +1462,31 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "pubspec_parse",
|
||||
"sha256": "c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367",
|
||||
"sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.2.3"
|
||||
"version": "1.3.0"
|
||||
},
|
||||
"puppeteer": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "puppeteer",
|
||||
"sha256": "c45c51b4ad8d70acdffeb1cfb9d16b60a7eaab7bfef314dd5b02c3607269b556",
|
||||
"sha256": "871140cbcc1bcbc6d8e4c2c6ca8fdeed5fae66dfef1efc4c271160a96e0823f9",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.11.0"
|
||||
"version": "3.14.0"
|
||||
},
|
||||
"qs_dart": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "qs_dart",
|
||||
"sha256": "5f1827ccdfa061582c121e7a8fe4a83319fa455bcd1fd6e46ff5b17b57aed680",
|
||||
"sha256": "8dddeaf1d32fe407e253840b2c25c9ab5bf347d2761d82cb4ce010096565c9ff",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.2.0"
|
||||
"version": "1.2.3"
|
||||
},
|
||||
"recursive_regex": {
|
||||
"dependency": "transitive",
|
||||
@ -1582,11 +1622,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "shelf_static",
|
||||
"sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e",
|
||||
"sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.1.2"
|
||||
"version": "1.1.3"
|
||||
},
|
||||
"shelf_web_socket": {
|
||||
"dependency": "transitive",
|
||||
@ -1769,11 +1809,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "test_api",
|
||||
"sha256": "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f",
|
||||
"sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.7.0"
|
||||
"version": "0.7.2"
|
||||
},
|
||||
"time": {
|
||||
"dependency": "transitive",
|
||||
@ -1815,6 +1855,16 @@
|
||||
"source": "hosted",
|
||||
"version": "1.3.2"
|
||||
},
|
||||
"universal_io": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "universal_io",
|
||||
"sha256": "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.2.2"
|
||||
},
|
||||
"universal_platform": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@ -1825,6 +1875,16 @@
|
||||
"source": "hosted",
|
||||
"version": "1.1.0"
|
||||
},
|
||||
"upower": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "upower",
|
||||
"sha256": "cf042403154751180affa1d15614db7fa50234bc2373cd21c3db666c38543ebf",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.7.0"
|
||||
},
|
||||
"uri_parser": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@ -1839,41 +1899,41 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "url_launcher",
|
||||
"sha256": "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.2.6"
|
||||
},
|
||||
"url_launcher_android": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "url_launcher_android",
|
||||
"sha256": "17cd5e205ea615e2c6ea7a77323a11712dffa0720a8a90540db57a01347f9ad9",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.3.2"
|
||||
},
|
||||
"url_launcher_ios": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "url_launcher_ios",
|
||||
"sha256": "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89",
|
||||
"sha256": "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.3.0"
|
||||
},
|
||||
"url_launcher_android": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "url_launcher_android",
|
||||
"sha256": "f0c73347dfcfa5b3db8bc06e1502668265d39c08f310c29bff4e28eea9699f79",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.3.9"
|
||||
},
|
||||
"url_launcher_ios": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "url_launcher_ios",
|
||||
"sha256": "e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.3.1"
|
||||
},
|
||||
"url_launcher_linux": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "url_launcher_linux",
|
||||
"sha256": "ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811",
|
||||
"sha256": "e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.1.1"
|
||||
"version": "3.2.0"
|
||||
},
|
||||
"url_launcher_macos": {
|
||||
"dependency": "transitive",
|
||||
@ -1899,21 +1959,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "url_launcher_web",
|
||||
"sha256": "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a",
|
||||
"sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.3.1"
|
||||
"version": "2.3.3"
|
||||
},
|
||||
"url_launcher_windows": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "url_launcher_windows",
|
||||
"sha256": "ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7",
|
||||
"sha256": "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.1.1"
|
||||
"version": "3.1.2"
|
||||
},
|
||||
"uuid": {
|
||||
"dependency": "direct main",
|
||||
@ -1965,15 +2025,45 @@
|
||||
"source": "hosted",
|
||||
"version": "2.1.4"
|
||||
},
|
||||
"visibility_detector": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "visibility_detector",
|
||||
"sha256": "dd5cc11e13494f432d15939c3aa8ae76844c42b723398643ce9addb88a5ed420",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.4.0+2"
|
||||
},
|
||||
"vm_service": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "vm_service",
|
||||
"sha256": "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec",
|
||||
"sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "14.2.1"
|
||||
"version": "14.2.5"
|
||||
},
|
||||
"wakelock_plus": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "wakelock_plus",
|
||||
"sha256": "bf4ee6f17a2fa373ed3753ad0e602b7603f8c75af006d5b9bdade263928c0484",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.2.8"
|
||||
},
|
||||
"wakelock_plus_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "wakelock_plus_platform_interface",
|
||||
"sha256": "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.2.1"
|
||||
},
|
||||
"watcher": {
|
||||
"dependency": "transitive",
|
||||
@ -2019,21 +2109,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "win32",
|
||||
"sha256": "a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4",
|
||||
"sha256": "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "5.5.1"
|
||||
"version": "5.5.4"
|
||||
},
|
||||
"win32_registry": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "win32_registry",
|
||||
"sha256": "10589e0d7f4e053f2c61023a31c9ce01146656a70b7b7f0828c0b46d7da2a9bb",
|
||||
"sha256": "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.1.3"
|
||||
"version": "1.1.4"
|
||||
},
|
||||
"window_manager": {
|
||||
"dependency": "direct main",
|
||||
@ -2088,6 +2178,6 @@
|
||||
},
|
||||
"sdks": {
|
||||
"dart": ">=3.4.0 <4.0.0",
|
||||
"flutter": ">=3.19.0"
|
||||
"flutter": ">=3.22.0"
|
||||
}
|
||||
}
|
||||
|
@ -1,31 +1,36 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
, xcbuild
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
python3,
|
||||
xcbuild,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "firebase-tools";
|
||||
version = "13.18.0";
|
||||
|
||||
let
|
||||
version = "13.20.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "firebase";
|
||||
repo = "firebase-tools";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Tis5bF1rVuvjSuMeoa5ayyuZXdwolkNL3Ct+IWeYOKc=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-FIflfCSTXm7J2WectS175vc0ccztWa4tE2E2kcbhwJg=";
|
||||
};
|
||||
in
|
||||
buildNpmPackage {
|
||||
pname = "firebase-tools";
|
||||
inherit version src;
|
||||
|
||||
npmDepsHash = "sha256-mQYetHLbxr3Jegz01BfFVdzcLuz46zcNVqXjjxdKM/E=";
|
||||
npmDepsHash = "sha256-qEerq6rFBN6HmzDS4xQJorzmzapBV/WhzCwG3rHU458=";
|
||||
|
||||
postPatch = ''
|
||||
ln -s npm-shrinkwrap.json package-lock.json
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
nativeBuildInputs =
|
||||
[
|
||||
python3
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
xcbuild
|
||||
];
|
||||
|
||||
@ -39,6 +44,6 @@ buildNpmPackage rec {
|
||||
homepage = "https://github.com/firebase/firebase-tools";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "firebase";
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ momeemt ];
|
||||
};
|
||||
}
|
@ -1,20 +1,21 @@
|
||||
{ buildDotnetModule
|
||||
, darwin
|
||||
, dotnetCorePackages
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, git
|
||||
, glibc
|
||||
, glibcLocales
|
||||
, lib
|
||||
, nixosTests
|
||||
, stdenv
|
||||
, which
|
||||
, buildPackages
|
||||
, runtimeShell
|
||||
{
|
||||
buildDotnetModule,
|
||||
darwin,
|
||||
dotnetCorePackages,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
git,
|
||||
glibc,
|
||||
glibcLocales,
|
||||
lib,
|
||||
nixosTests,
|
||||
stdenv,
|
||||
which,
|
||||
buildPackages,
|
||||
runtimeShell,
|
||||
# List of Node.js runtimes the package should support
|
||||
, nodeRuntimes ? [ "node20" ]
|
||||
, nodejs_20
|
||||
nodeRuntimes ? [ "node20" ],
|
||||
nodejs_20,
|
||||
}:
|
||||
|
||||
# Node.js runtimes supported by upstream
|
||||
@ -22,13 +23,13 @@ assert builtins.all (x: builtins.elem x [ "node20" ]) nodeRuntimes;
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "github-runner";
|
||||
version = "2.319.1";
|
||||
version = "2.320.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "actions";
|
||||
repo = "runner";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cXOYW4py2RRJVUKrQBGf6LHNyc1sJ/bMR4hJxtDv3PU=";
|
||||
hash = "sha256-mVi/Z89R2nbxQAyEkpbcaU3Pc3wK6989QojHew9ad4g=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C $out rev-parse --short HEAD > $out/.git-revision
|
||||
@ -79,25 +80,24 @@ buildDotnetModule rec {
|
||||
url = "https://github.com/actions/runner/commit/5ff0ce1.patch";
|
||||
hash = "sha256-2Vg3cKZK3cE/OcPDZkdN2Ro2WgvduYTTwvNGxwCfXas=";
|
||||
})
|
||||
] ++ lib.optionals (nodeRuntimes == [ "node20" ]) [
|
||||
# If the package is built without Node 16, make Node 20 the default internal version
|
||||
# https://github.com/actions/runner/pull/2844
|
||||
(fetchpatch {
|
||||
name = "internal-node-20.patch";
|
||||
url = "https://github.com/actions/runner/commit/acdc6ed.patch";
|
||||
hash = "sha256-3/6yhhJPr9OMWBFc5/NU/DRtn76aTYvjsjQo2u9ZqnU=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
postPatch =
|
||||
''
|
||||
# Ignore changes to src/Runner.Sdk/BuildConstants.cs
|
||||
substituteInPlace src/dir.proj \
|
||||
--replace 'git update-index --assume-unchanged ./Runner.Sdk/BuildConstants.cs' \
|
||||
'true'
|
||||
''
|
||||
+ lib.optionalString (nodeRuntimes == [ "node20" ]) ''
|
||||
substituteInPlace src/Runner.Common/Util/NodeUtil.cs \
|
||||
--replace-fail '_defaultNodeVersion = "node16"' '_defaultNodeVersion = "node20"'
|
||||
'';
|
||||
|
||||
DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = isNull glibcLocales;
|
||||
LOCALE_ARCHIVE = lib.optionalString (!DOTNET_SYSTEM_GLOBALIZATION_INVARIANT) "${glibcLocales}/lib/locale/locale-archive";
|
||||
LOCALE_ARCHIVE = lib.optionalString (
|
||||
!DOTNET_SYSTEM_GLOBALIZATION_INVARIANT
|
||||
) "${glibcLocales}/lib/locale/locale-archive";
|
||||
|
||||
postConfigure = ''
|
||||
# Generate src/Runner.Sdk/BuildConstants.cs
|
||||
@ -110,10 +110,12 @@ buildDotnetModule rec {
|
||||
src/dir.proj
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
nativeBuildInputs =
|
||||
[
|
||||
which
|
||||
git
|
||||
] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
|
||||
darwin.autoSignDarwinBinariesHook
|
||||
];
|
||||
|
||||
@ -122,7 +124,9 @@ buildDotnetModule rec {
|
||||
dotnet-sdk = dotnetCorePackages.sdk_6_0;
|
||||
dotnet-runtime = dotnetCorePackages.runtime_6_0;
|
||||
|
||||
dotnetFlags = [ "-p:PackageRuntime=${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}" ];
|
||||
dotnetFlags = [
|
||||
"-p:PackageRuntime=${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}"
|
||||
];
|
||||
|
||||
# As given here: https://github.com/actions/runner/blob/0befa62/src/dir.proj#L33-L41
|
||||
projectFile = [
|
||||
@ -209,13 +213,16 @@ buildDotnetModule rec {
|
||||
|
||||
testProjectFile = [ "src/Test/Test.csproj" ];
|
||||
|
||||
preCheck = ''
|
||||
preCheck =
|
||||
''
|
||||
mkdir -p _layout/externals
|
||||
'' + lib.optionalString (lib.elem "node20" nodeRuntimes) ''
|
||||
''
|
||||
+ lib.optionalString (lib.elem "node20" nodeRuntimes) ''
|
||||
ln -s ${nodejs_20} _layout/externals/node20
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
postInstall =
|
||||
''
|
||||
mkdir -p $out/bin
|
||||
|
||||
install -m755 src/Misc/layoutbin/runsvc.sh $out/lib/github-runner
|
||||
@ -230,12 +237,14 @@ buildDotnetModule rec {
|
||||
|
||||
substituteInPlace $out/lib/github-runner/config.sh \
|
||||
--replace './bin/Runner.Listener' "$out/bin/Runner.Listener"
|
||||
'' + lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
substituteInPlace $out/lib/github-runner/config.sh \
|
||||
--replace 'command -v ldd' 'command -v ${glibc.bin}/bin/ldd' \
|
||||
--replace 'ldd ./bin' '${glibc.bin}/bin/ldd ${dotnet-runtime}/shared/Microsoft.NETCore.App/${dotnet-runtime.version}/' \
|
||||
--replace '/sbin/ldconfig' '${glibc.bin}/bin/ldconfig'
|
||||
'' + ''
|
||||
''
|
||||
+ ''
|
||||
# Remove uneeded copy for run-helper template
|
||||
substituteInPlace $out/lib/github-runner/run.sh --replace 'cp -f "$DIR"/run-helper.sh.template "$DIR"/run-helper.sh' ' '
|
||||
substituteInPlace $out/lib/github-runner/run-helper.sh --replace '"$DIR"/bin/' '"$DIR"/'
|
||||
@ -249,21 +258,25 @@ buildDotnetModule rec {
|
||||
# externals/node$version. As opposed to the official releases, we don't
|
||||
# link the Alpine Node flavors.
|
||||
mkdir -p $out/lib/externals
|
||||
'' + lib.optionalString (lib.elem "node20" nodeRuntimes) ''
|
||||
''
|
||||
+ lib.optionalString (lib.elem "node20" nodeRuntimes) ''
|
||||
ln -s ${nodejs_20} $out/lib/externals/node20
|
||||
'' + ''
|
||||
''
|
||||
+ ''
|
||||
# Install Nodejs scripts called from workflows
|
||||
install -D src/Misc/layoutbin/hashFiles/index.js $out/lib/github-runner/hashFiles/index.js
|
||||
mkdir -p $out/lib/github-runner/checkScripts
|
||||
install src/Misc/layoutbin/checkScripts/* $out/lib/github-runner/checkScripts/
|
||||
'' + lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
# Wrap explicitly to, e.g., prevent extra entries for LD_LIBRARY_PATH
|
||||
makeWrapperArgs=()
|
||||
|
||||
# We don't wrap with libicu
|
||||
substituteInPlace $out/lib/github-runner/config.sh \
|
||||
--replace '$LDCONFIG_COMMAND -NXv ''${libpath//:/ }' 'echo libicu'
|
||||
'' + ''
|
||||
''
|
||||
+ ''
|
||||
# XXX: Using the corresponding Nix argument does not work as expected:
|
||||
# https://github.com/NixOS/nixpkgs/issues/218449
|
||||
# Common wrapper args for `executables`
|
||||
@ -318,8 +331,18 @@ buildDotnetModule rec {
|
||||
description = "Self-hosted runner for GitHub Actions";
|
||||
homepage = "https://github.com/actions/runner";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ veehaitch kfollesdal aanderse zimbatm ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
maintainers = with maintainers; [
|
||||
veehaitch
|
||||
kfollesdal
|
||||
aanderse
|
||||
zimbatm
|
||||
];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
"x86_64-darwin"
|
||||
"aarch64-darwin"
|
||||
];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/libgnucash/app-utils/gnc-quotes.cpp 2023-09-23 07:04:21.000000000 +0900
|
||||
+++ b/libgnucash/app-utils/gnc-quotes.cpp 2023-09-25 11:58:46.482696433 +0900
|
||||
@@ -125,7 +125,6 @@
|
||||
@@ -129,7 +129,6 @@
|
||||
|
||||
class GncFQQuoteSource final : public GncQuoteSource
|
||||
{
|
||||
@ -8,12 +8,12 @@
|
||||
std::string c_fq_wrapper;
|
||||
std::string m_version;
|
||||
StrVec m_sources;
|
||||
@@ -148,13 +147,12 @@
|
||||
@@ -152,13 +151,12 @@
|
||||
static const std::string empty_string{};
|
||||
|
||||
GncFQQuoteSource::GncFQQuoteSource() :
|
||||
-c_cmd{bp::search_path("perl")},
|
||||
m_version{}, m_sources{}, m_api_key{}
|
||||
m_version{}, m_sources{}, m_env{boost::this_process::environment()}
|
||||
{
|
||||
char *bindir = gnc_path_get_bindir();
|
||||
c_fq_wrapper = std::string(bindir) + "/finance-quote-wrapper";
|
||||
@ -23,7 +23,7 @@
|
||||
auto [rv, sources, errors] = run_cmd(args, empty_string);
|
||||
if (rv)
|
||||
{
|
||||
@@ -200,7 +198,7 @@
|
||||
@@ -192,7 +190,7 @@
|
||||
QuoteResult
|
||||
GncFQQuoteSource::get_quotes(const std::string& json_str) const
|
||||
{
|
||||
@ -32,19 +32,10 @@
|
||||
return run_cmd(args, json_str);
|
||||
}
|
||||
|
||||
@@ -218,7 +216,7 @@
|
||||
@@ -209,7 +207,7 @@
|
||||
|
||||
auto input_buf = bp::buffer (json_string);
|
||||
bp::child process;
|
||||
if (m_api_key.empty())
|
||||
- process = bp::child(c_cmd, args,
|
||||
+ process = bp::child(c_fq_wrapper, args,
|
||||
bp::std_out > out_buf,
|
||||
bp::std_err > err_buf,
|
||||
bp::std_in < input_buf,
|
||||
@@ -227,7 +225,7 @@
|
||||
#endif
|
||||
svc);
|
||||
else
|
||||
- process = bp::child(c_cmd, args,
|
||||
+ process = bp::child(c_fq_wrapper, args,
|
||||
bp::std_out > out_buf,
|
||||
|
@ -1,11 +0,0 @@
|
||||
--- a/libgnucash/engine/test/CMakeLists.txt 2024-02-23 09:05:19.000000000 +0900
|
||||
+++ b/libgnucash/engine/test/CMakeLists.txt 2024-05-08 22:08:04.572060359 +0900
|
||||
@@ -57,7 +57,6 @@
|
||||
|
||||
add_engine_test(test-account-object test-account-object.cpp)
|
||||
add_engine_test(test-group-vs-book test-group-vs-book.cpp)
|
||||
-add_engine_test(test-lots test-lots.cpp)
|
||||
add_engine_test(test-querynew test-querynew.c)
|
||||
add_engine_test(test-query test-query.cpp)
|
||||
add_engine_test(test-split-vs-account test-split-vs-account.cpp)
|
||||
|
@ -2,6 +2,7 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, fetchpatch2
|
||||
, aqbanking
|
||||
, boost
|
||||
, cmake
|
||||
@ -27,12 +28,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnucash";
|
||||
version = "5.8";
|
||||
version = "5.9";
|
||||
|
||||
# raw source code doesn't work out of box; fetchFromGitHub not usable
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Gnucash/gnucash/releases/download/${version}/gnucash-${version}.tar.bz2";
|
||||
hash = "sha256-osgj+3ALnUWYaS7IE5SVm944jY7xke/k6iwCQmu1JZM=";
|
||||
hash = "sha256-W+LlNk/DZGT8Msdo4qtGCmMPdNtq631EJm49q5giL9A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -75,9 +76,12 @@ stdenv.mkDerivation rec {
|
||||
./0003-remove-valgrind.patch
|
||||
# this patch makes gnucash exec the Finance::Quote wrapper directly
|
||||
./0004-exec-fq-wrapper.patch
|
||||
# this patch disables a flaky test
|
||||
# see https://bugs.gnucash.org/show_bug.cgi?id=799289
|
||||
./0005-disable-test-lots.patch
|
||||
# this patch fixes gnucah-cli -Q dump, remove on next release
|
||||
(fetchpatch2 {
|
||||
name = "0005-fix-quote-report.patch";
|
||||
url = "https://github.com/Gnucash/gnucash/commit/711554ecd5505004aee4808519d9d8e4e4ed7c9a.patch?full_index=1";
|
||||
hash = "sha256-uRaUdSJu2LnYVp/3DqrK0rTnCpr7oZRtrgTPbKAHThk=";
|
||||
})
|
||||
];
|
||||
|
||||
# this needs to be an environment variable and not a cmake flag to suppress
|
||||
@ -101,7 +105,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "Gnucash";
|
||||
repo = "gnucash-docs";
|
||||
rev = version;
|
||||
hash = "sha256-3b1Nue3eEefDi4WI+o3ATfrsQ+H/I+QwTr4Nuc9J7Zg=";
|
||||
hash = "sha256-uXpIAsucVUaAlqYTKfrfBg04Kb5Mza67l0ZU6fxkSUY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -1,16 +1,18 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
buildGoModule {
|
||||
buildGoModule rec {
|
||||
pname = "gokey";
|
||||
version = "0.1.2-unstable-2023-11-16";
|
||||
version = "0.1.3";
|
||||
|
||||
patches = [ ./version.patch ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "gokey";
|
||||
rev = "26fcef24d123e0eaf7b92224e6880f529f94aa9f";
|
||||
hash = "sha256-nt4fO8NKYfRkpoC1z8zDrEZC7+fo6sU/ZOHCMHIAT58=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-pvtRSWq/vXlyUShb61aiDlis9AiQnrA2PWycr1Zw0og=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZDCoRE2oP8ANsu7jfLm3BMLzXdsq1dhsEigvwWgKk54=";
|
||||
vendorHash = "sha256-qlP2tI6QQMjxP59zaXgx4mX9IWSrOKWmme717wDaUEc=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/cloudflare/gokey";
|
||||
|
15
pkgs/by-name/go/gokey/version.patch
Normal file
15
pkgs/by-name/go/gokey/version.patch
Normal file
@ -0,0 +1,15 @@
|
||||
diff --git a/go.mod b/go.mod
|
||||
index 50b6806..f23b2ec 100644
|
||||
--- a/go.mod
|
||||
+++ b/go.mod
|
||||
@@ -1,8 +1,9 @@
|
||||
module github.com/cloudflare/gokey
|
||||
|
||||
-go 1.13
|
||||
+go 1.17
|
||||
|
||||
require (
|
||||
golang.org/x/crypto v0.17.0
|
||||
golang.org/x/term v0.15.0
|
||||
+ golang.org/x/sys v0.15.0
|
||||
)
|
36
pkgs/by-name/ht/httplib/package.nix
Normal file
36
pkgs/by-name/ht/httplib/package.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{
|
||||
lib,
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
openssl,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "httplib";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yhirose";
|
||||
repo = "cpp-httplib";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-cR1yRqZ6hZeGtMhiW003zcN0d/f/v1gMMNiL0hA1r6I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/yhirose/cpp-httplib";
|
||||
description = "C++ header-only HTTP/HTTPS server and client library";
|
||||
changelog = "https://github.com/yhirose/cpp-httplib/releases/tag/${finalAttrs.src.rev}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
AndersonTorres
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user