Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
df58a72054
7
.github/CODEOWNERS
vendored
7
.github/CODEOWNERS
vendored
@ -13,7 +13,6 @@
|
||||
|
||||
# GitHub actions
|
||||
/.github/workflows @NixOS/Security @Mic92 @zowoq
|
||||
/.github/workflows/merge-staging @FRidh
|
||||
|
||||
# EditorConfig
|
||||
/.editorconfig @Mic92 @zowoq
|
||||
@ -125,10 +124,8 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @raitobezarius @ma27
|
||||
/pkgs/common-updater/scripts/update-source-version @jtojnar
|
||||
|
||||
# Python-related code and docs
|
||||
/maintainers/scripts/update-python-libraries @FRidh
|
||||
/pkgs/development/interpreters/python @FRidh
|
||||
/doc/languages-frameworks/python.section.md @FRidh @mweinelt
|
||||
/pkgs/development/interpreters/python/hooks @FRidh @jonringer
|
||||
/doc/languages-frameworks/python.section.md @mweinelt
|
||||
/pkgs/development/interpreters/python/hooks @jonringer
|
||||
|
||||
# Haskell
|
||||
/doc/languages-frameworks/haskell.section.md @sternenseemann @maralorn @ncfavier
|
||||
|
||||
@ -878,7 +878,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/pytoolz/toolz";
|
||||
description = "List processing tools and functional utilities";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ fridh ];
|
||||
};
|
||||
}
|
||||
```
|
||||
@ -1013,7 +1012,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/ContinuumIO/datashape";
|
||||
description = "A data description language";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [ fridh ];
|
||||
};
|
||||
}
|
||||
```
|
||||
@ -1134,7 +1132,6 @@ buildPythonPackage rec {
|
||||
description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms";
|
||||
homepage = "http://hgomersall.github.com/pyFFTW";
|
||||
license = with lib.licenses; [ bsd2 bsd3 ];
|
||||
maintainers = with lib.maintainers; [ fridh ];
|
||||
};
|
||||
}
|
||||
```
|
||||
@ -1494,7 +1491,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/pytoolz/toolz/";
|
||||
description = "List processing tools and functional utilities";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ fridh ];
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
@ -1168,6 +1168,11 @@ in mkLicense lset) ({
|
||||
# channel and NixOS images.
|
||||
};
|
||||
|
||||
unicode-30 = {
|
||||
spdxId = "Unicode-3.0";
|
||||
fullName = "Unicode License v3";
|
||||
};
|
||||
|
||||
unicode-dfs-2015 = {
|
||||
spdxId = "Unicode-DFS-2015";
|
||||
fullName = "Unicode License Agreement - Data Files and Software (2015)";
|
||||
|
||||
@ -1791,11 +1791,6 @@
|
||||
fingerprint = "409D 201E 9450 8732 A49E D0FC 6BDA F874 0068 08DF";
|
||||
}];
|
||||
};
|
||||
ashvith-shetty = {
|
||||
github = "Ashvith10";
|
||||
githubId = 113123021;
|
||||
name = "Ashvith Shetty";
|
||||
};
|
||||
asininemonkey = {
|
||||
email = "nixpkgs@asininemonkey.com";
|
||||
github = "asininemonkey";
|
||||
@ -3551,12 +3546,6 @@
|
||||
githubId = 1118859;
|
||||
name = "Scott Worley";
|
||||
};
|
||||
ChlorideCull = {
|
||||
email = "nixrelated@chcl.se";
|
||||
github = "ChlorideCull";
|
||||
githubId = 4977063;
|
||||
name = "Sebastian Johansson";
|
||||
};
|
||||
choochootrain = {
|
||||
email = "hurshal@imap.cc";
|
||||
github = "choochootrain";
|
||||
@ -7359,12 +7348,6 @@
|
||||
githubId = 104317939;
|
||||
name = "gilice";
|
||||
};
|
||||
gilligan = {
|
||||
email = "tobias.pflug@gmail.com";
|
||||
github = "gilligan";
|
||||
githubId = 27668;
|
||||
name = "Tobias Pflug";
|
||||
};
|
||||
gin66 = {
|
||||
email = "jochen@kiemes.de";
|
||||
github = "gin66";
|
||||
@ -14633,12 +14616,6 @@
|
||||
githubId = 126072875;
|
||||
name = "nova madeline";
|
||||
};
|
||||
novenary = {
|
||||
email = "streetwalkermc@gmail.com";
|
||||
github = "9ary";
|
||||
githubId = 1155030;
|
||||
name = "novenary";
|
||||
};
|
||||
novoxd = {
|
||||
email = "radnovox@gmail.com";
|
||||
github = "novoxd";
|
||||
@ -16330,6 +16307,12 @@
|
||||
githubId = 5636;
|
||||
name = "Steve Purcell";
|
||||
};
|
||||
purrpurrn = {
|
||||
email = "scrcpynovideoaudiocodecraw+nixpkgs@gmail.com";
|
||||
github = "purrpurrn";
|
||||
githubId = 142632643;
|
||||
name = "purrpurrn";
|
||||
};
|
||||
putchar = {
|
||||
email = "slim.cadoux@gmail.com";
|
||||
matrix = "@putch4r:matrix.org";
|
||||
|
||||
@ -826,7 +826,6 @@ with lib.maintainers; {
|
||||
|
||||
python = {
|
||||
members = [
|
||||
fridh
|
||||
hexa
|
||||
jonringer
|
||||
tjni
|
||||
|
||||
@ -35,7 +35,7 @@ in
|
||||
{
|
||||
services.httpd.virtualHosts =
|
||||
{ "blog.example.org" = (commonConfig // { documentRoot = "/webroot/blog.example.org"; });
|
||||
"wiki.example.org" = (commonConfig // { documentRoot = "/webroot/wiki.example.com"; });
|
||||
"wiki.example.org" = (commonConfig // { documentRoot = "/webroot/wiki.example.org"; });
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
@ -201,6 +201,20 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
||||
|
||||
- `himalaya` was updated to v1.0.0-beta.4, which introduces breaking changes. Check out the [release note](https://github.com/soywod/himalaya/releases/tag/v1.0.0-beta.4) for details.
|
||||
|
||||
- `security.pam.enableSSHAgentAuth` was replaced by the `sshAgentAuth` attrset, and **only**
|
||||
`authorized_keys` files listed in [`sshAgentAuth.authorizedKeysFiles`] are trusted,
|
||||
defaulting to `/etc/ssh/authorized_keys.d/%u`.
|
||||
::: {.warning}
|
||||
Users of {manpage}`pam_ssh_agent_auth(8)` must take care that the pubkeys they use (for instance with `sudo`)
|
||||
are listed in [`sshAgentAuth.authorizedKeysFiles`]..
|
||||
:::
|
||||
::: {.note}
|
||||
Previously, all `services.openssh.authorizedKeysFiles` were trusted, including `~/.ssh/authorized_keys`,
|
||||
which results in an **insecure** configuration; see [#31611](https://github.com/NixOS/nixpkgs/issues/31611).
|
||||
:::
|
||||
|
||||
[`sshAgentAuth.authorizedKeysFiles`]: #opt-security.pam.sshAgentAuth.authorizedKeysFiles
|
||||
|
||||
- The `power.ups` module now generates `upsd.conf`, `upsd.users` and `upsmon.conf` automatically from a set of new configuration options. This breaks compatibility with existing `power.ups` setups where these files were created manually. Back up these files before upgrading NixOS.
|
||||
|
||||
- `programs.nix-ld.libraries` no longer sets `baseLibraries` via the option's default but in config and now merges any additional libraries with the default ones.
|
||||
@ -305,6 +319,10 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
||||
|
||||
- `services.vikunja.setupNginx` setting has been removed. Users now need to setup the webserver configuration on their own with a proxy pass to the vikunja service.
|
||||
|
||||
- `services.vmagent` module deprecates `dataDir`, `group` and `user` setting in favor of systemd provided CacheDirectory and DynamicUser.
|
||||
|
||||
- `services.vmagent.remoteWriteUrl` setting has been renamed to `services.vmagent.remoteWrite.url` and now defaults to `null`.
|
||||
|
||||
- `woodpecker-*` packages have been updated to v2 which includes [breaking changes](https://woodpecker-ci.org/docs/next/migrations#200).
|
||||
|
||||
- `services.nginx` will no longer advertise HTTP/3 availability automatically. This must now be manually added, preferably to each location block.
|
||||
@ -572,10 +590,6 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
||||
|
||||
- `mockgen` package source has changed to the [go.uber.org/mock](https://github.com/uber-go/mock) fork because [the original repository is no longer maintained](https://github.com/golang/mock#gomock).
|
||||
|
||||
- `security.pam.enableSSHAgentAuth` was renamed to `security.pam.sshAgentAuth.enable` and an `authorizedKeysFiles`
|
||||
option was added, to control which `authorized_keys` files are trusted. It defaults to the previous behaviour,
|
||||
**which is insecure**: see [#31611](https://github.com/NixOS/nixpkgs/issues/31611).
|
||||
|
||||
- [](#opt-boot.kernel.sysctl._net.core.wmem_max_) changed from a string to an integer because of the addition of a custom merge option (taking the highest value defined to avoid conflicts between 2 services trying to set that value), just as [](#opt-boot.kernel.sysctl._net.core.rmem_max_) since 22.11.
|
||||
|
||||
- [TODO: reword to place an attribute at the front] A new top-level package set, `pkgsExtraHardening` is added. This is a set of packages built with stricter hardening flags - those that have not yet received enough testing to be applied universally, those that are more likely to cause build failures or those that have drawbacks to their use (e.g. performance or required hardware features).
|
||||
|
||||
@ -1044,9 +1044,7 @@ in
|
||||
See [issue #31611](https://github.com/NixOS/nixpkgs/issues/31611)
|
||||
:::
|
||||
'';
|
||||
example = [ "/etc/ssh/authorized_keys.d/%u" ];
|
||||
default = config.services.openssh.authorizedKeysFiles;
|
||||
defaultText = literalExpression "config.services.openssh.authorizedKeysFiles";
|
||||
default = [ "/etc/ssh/authorized_keys.d/%u" ];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -1,63 +1,62 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.vmagent;
|
||||
settingsFormat = pkgs.formats.json { };
|
||||
in {
|
||||
imports = [
|
||||
(lib.mkRemovedOptionModule [ "services" "vmagent" "dataDir" ] "dataDir has been deprecated in favor of systemd provided CacheDirectory")
|
||||
(lib.mkRemovedOptionModule [ "services" "vmagent" "user" ] "user has been deprecated in favor of systemd DynamicUser")
|
||||
(lib.mkRemovedOptionModule [ "services" "vmagent" "group" ] "group has been deprecated in favor of systemd DynamicUser")
|
||||
(lib.mkRenamedOptionModule [ "services" "vmagent" "remoteWriteUrl" ] [ "services" "vmagent" "remoteWrite" "url" ])
|
||||
];
|
||||
|
||||
options.services.vmagent = {
|
||||
enable = mkEnableOption "vmagent";
|
||||
enable = lib.mkEnableOption "vmagent";
|
||||
|
||||
user = mkOption {
|
||||
default = "vmagent";
|
||||
type = types.str;
|
||||
description = ''
|
||||
User account under which vmagent runs.
|
||||
'';
|
||||
package = lib.mkPackageOption pkgs "vmagent" { };
|
||||
|
||||
remoteWrite = {
|
||||
url = lib.mkOption {
|
||||
default = null;
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
description = ''
|
||||
Endpoint for prometheus compatible remote_write
|
||||
'';
|
||||
};
|
||||
basicAuthUsername = lib.mkOption {
|
||||
default = null;
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
description = ''
|
||||
Basic Auth username used to connect to remote_write endpoint
|
||||
'';
|
||||
};
|
||||
basicAuthPasswordFile = lib.mkOption {
|
||||
default = null;
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
description = ''
|
||||
File that contains the Basic Auth password used to connect to remote_write endpoint
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
group = mkOption {
|
||||
type = types.str;
|
||||
default = "vmagent";
|
||||
description = ''
|
||||
Group under which vmagent runs.
|
||||
'';
|
||||
};
|
||||
|
||||
package = mkPackageOption pkgs "vmagent" { };
|
||||
|
||||
dataDir = mkOption {
|
||||
type = types.str;
|
||||
default = "/var/lib/vmagent";
|
||||
description = ''
|
||||
The directory where vmagent stores its data files.
|
||||
'';
|
||||
};
|
||||
|
||||
remoteWriteUrl = mkOption {
|
||||
default = "http://localhost:8428/api/v1/write";
|
||||
type = types.str;
|
||||
description = ''
|
||||
The storage endpoint such as VictoriaMetrics
|
||||
'';
|
||||
};
|
||||
|
||||
prometheusConfig = mkOption {
|
||||
prometheusConfig = lib.mkOption {
|
||||
type = lib.types.submodule { freeformType = settingsFormat.type; };
|
||||
description = ''
|
||||
Config for prometheus style metrics
|
||||
'';
|
||||
};
|
||||
|
||||
openFirewall = mkOption {
|
||||
type = types.bool;
|
||||
openFirewall = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to open the firewall for the default ports.
|
||||
'';
|
||||
};
|
||||
|
||||
extraArgs = mkOption {
|
||||
type = types.listOf types.str;
|
||||
extraArgs = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.str;
|
||||
default = [];
|
||||
description = ''
|
||||
Extra args to pass to `vmagent`. See the docs:
|
||||
@ -67,37 +66,36 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
users.groups = mkIf (cfg.group == "vmagent") { vmagent = { }; };
|
||||
|
||||
users.users = mkIf (cfg.user == "vmagent") {
|
||||
vmagent = {
|
||||
group = cfg.group;
|
||||
description = "vmagent daemon user";
|
||||
home = cfg.dataDir;
|
||||
isSystemUser = true;
|
||||
};
|
||||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ 8429 ];
|
||||
config = lib.mkIf cfg.enable {
|
||||
networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ 8429 ];
|
||||
|
||||
systemd.services.vmagent = let
|
||||
prometheusConfig = settingsFormat.generate "prometheusConfig.yaml" cfg.prometheusConfig;
|
||||
startCommandLine = lib.concatStringsSep " " ([
|
||||
"${cfg.package}/bin/vmagent"
|
||||
"-promscrape.config=${prometheusConfig}"
|
||||
] ++ cfg.extraArgs
|
||||
++ lib.optionals (cfg.remoteWrite.url != null) [
|
||||
"-remoteWrite.url=${cfg.remoteWrite.url}"
|
||||
"-remoteWrite.tmpDataPath=%C/vmagent/remote_write_tmp"
|
||||
] ++ lib.optional (cfg.remoteWrite.basicAuthUsername != null) "-remoteWrite.basicAuth.username=${cfg.remoteWrite.basicAuthUsername}"
|
||||
++ lib.optional (cfg.remoteWrite.basicAuthPasswordFile != null) "-remoteWrite.basicAuth.passwordFile=\${CREDENTIALS_DIRECTORY}/remote_write_basic_auth_password");
|
||||
in {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ];
|
||||
description = "vmagent system service";
|
||||
serviceConfig = {
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
DynamicUser = true;
|
||||
User = "vmagent";
|
||||
Group = "vmagent";
|
||||
Type = "simple";
|
||||
Restart = "on-failure";
|
||||
WorkingDirectory = cfg.dataDir;
|
||||
ExecStart = "${cfg.package}/bin/vmagent -remoteWrite.url=${cfg.remoteWriteUrl} -promscrape.config=${prometheusConfig} ${escapeShellArgs cfg.extraArgs}";
|
||||
CacheDirectory = "vmagent";
|
||||
ExecStart = startCommandLine;
|
||||
LoadCredential = lib.optional (cfg.remoteWrite.basicAuthPasswordFile != null) [
|
||||
"remote_write_basic_auth_password:${cfg.remoteWrite.basicAuthPasswordFile}"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
systemd.tmpfiles.rules =
|
||||
[ "d '${cfg.dataDir}' 0755 ${cfg.user} ${cfg.group} -" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -226,7 +226,7 @@ in {
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
type = types.submodule { freeformType = types.attrs; };
|
||||
type = (pkgs.formats.yaml {}).type;
|
||||
default = {};
|
||||
description = ''
|
||||
Extra configuration as nix values.
|
||||
|
||||
@ -1,68 +1,47 @@
|
||||
{ mkDerivation
|
||||
, lib
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, extra-cmake-modules
|
||||
, kdoctools
|
||||
, wrapGAppsHook
|
||||
, qtscript
|
||||
, kconfig
|
||||
, kcrash
|
||||
, kdbusaddons
|
||||
, kdelibs4support
|
||||
, kguiaddons
|
||||
, kiconthemes
|
||||
, kinit
|
||||
, khtml
|
||||
, konsole
|
||||
, kparts
|
||||
, ktexteditor
|
||||
, kwindowsystem
|
||||
, okular
|
||||
, poppler
|
||||
, cmake
|
||||
, kdePackages
|
||||
, qt6
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kile";
|
||||
version = "2.9.93";
|
||||
version = "2.9.94";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/kile/kile-${version}.tar.bz2";
|
||||
sha256 = "BEmSEv/LJPs6aCkUmnyuTGrV15WYXwgIANbfcviMXfA=";
|
||||
sha256 = "U8Z0K9g/sJXL3ImLA/344Vq2gKgWk8yvnFB2uTrRo8o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
extra-cmake-modules
|
||||
wrapGAppsHook
|
||||
kdoctools
|
||||
cmake
|
||||
kdePackages.extra-cmake-modules
|
||||
qt6.wrapQtAppsHook
|
||||
kdePackages.kdoctools
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
kconfig
|
||||
kcrash
|
||||
kdbusaddons
|
||||
kdelibs4support
|
||||
kguiaddons
|
||||
kiconthemes
|
||||
kinit
|
||||
khtml
|
||||
kparts
|
||||
ktexteditor
|
||||
kwindowsystem
|
||||
okular
|
||||
poppler
|
||||
qtscript
|
||||
qt6.qtbase
|
||||
qt6.qtdeclarative
|
||||
qt6.qt5compat
|
||||
kdePackages.kconfig
|
||||
kdePackages.kcrash
|
||||
kdePackages.kdbusaddons
|
||||
kdePackages.kguiaddons
|
||||
kdePackages.kiconthemes
|
||||
kdePackages.konsole
|
||||
kdePackages.kparts
|
||||
kdePackages.ktexteditor
|
||||
kdePackages.kwindowsystem
|
||||
kdePackages.okular
|
||||
kdePackages.poppler
|
||||
];
|
||||
dontWrapGApps = true;
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
propagatedUserEnvPkgs = [ konsole ];
|
||||
|
||||
meta = {
|
||||
description = "User-friendly TeX/LaTeX authoring tool for the KDE desktop environment";
|
||||
homepage = "https://www.kde.org/applications/office/kile/";
|
||||
maintainers = with lib.maintainers; [ fridh ];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
mainProgram = "kile";
|
||||
};
|
||||
|
||||
@ -14,14 +14,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "drawio";
|
||||
version = "24.1.0";
|
||||
version = "24.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jgraph";
|
||||
repo = "drawio-desktop";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-vwytqlPv8LfOceuBs/MNPxzO1ZYv1hwjIRyBh/wuVEU=";
|
||||
hash = "sha256-8Cs+uME6uXWIWeuS9cgKnlYJG/m13l2BIVNDG0bqEmc=";
|
||||
};
|
||||
|
||||
# `@electron/fuses` tries to run `codesign` and fails. Disable and use autoSignDarwinBinariesHook instead
|
||||
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = src + "/yarn.lock";
|
||||
hash = "sha256-mRnGsfxrdfzk6+z07174zZ7pcS68Zut6inuBPZkLtWQ=";
|
||||
hash = "sha256-tQFcdZc+4N6TYY6MDAwUgpaIvqYkU681DbuYCQhvJ1c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -20,7 +20,7 @@ mkDerivation {
|
||||
mainProgram = "filelight";
|
||||
homepage = "https://apps.kde.org/filelight/";
|
||||
license = with lib.licenses; [ gpl2 ];
|
||||
maintainers = with lib.maintainers; [ fridh vcunat ];
|
||||
maintainers = with lib.maintainers; [ vcunat ];
|
||||
};
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,7 +12,6 @@ mkDerivation {
|
||||
description = "Scientific calculator";
|
||||
mainProgram = "kcalc";
|
||||
license = with lib.licenses; [ gpl2 ];
|
||||
maintainers = [ lib.maintainers.fridh ];
|
||||
};
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [
|
||||
|
||||
@ -77,7 +77,6 @@ mkDerivation {
|
||||
description = "KDE Connect provides several features to integrate your phone and your computer";
|
||||
homepage = "https://community.kde.org/KDEConnect";
|
||||
license = with licenses; [ gpl2 ];
|
||||
maintainers = with maintainers; [ fridh ];
|
||||
mainProgram = "kdeconnect-app";
|
||||
};
|
||||
}
|
||||
|
||||
@ -20,7 +20,6 @@ mkDerivation {
|
||||
homepage = "https://apps.kde.org/kolourpaint/";
|
||||
description = "Paint program";
|
||||
mainProgram = "kolourpaint";
|
||||
maintainers = [ lib.maintainers.fridh ];
|
||||
license = with lib.licenses; [ gpl2 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -19,7 +19,6 @@ mkDerivation {
|
||||
description = "KDE wallet management tool";
|
||||
mainProgram = "kwalletmanager5";
|
||||
license = with lib.licenses; [ gpl2 ];
|
||||
maintainers = with lib.maintainers; [ fridh ];
|
||||
};
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [
|
||||
|
||||
@ -29,7 +29,6 @@ mkDerivation {
|
||||
homepage = "https://yakuake.kde.org";
|
||||
description = "Quad-style terminal emulator for KDE";
|
||||
mainProgram = "yakuake";
|
||||
maintainers = with lib.maintainers; [ fridh ];
|
||||
license = lib.licenses.gpl2;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "confclerk";
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.toastfreeware.priv.at/tarballs/confclerk/confclerk-${version}.tar.gz";
|
||||
sha256 = "0l5i4d6lymh0k6gzihs41x4i8v1dz0mrwpga096af0vchpvlcarg";
|
||||
sha256 = "sha256-GgWvPHcQnQrK9SOC8U9F2P8kuPCn8I2EhoWEEMtKBww=";
|
||||
};
|
||||
|
||||
buildInputs = [ qtbase ];
|
||||
|
||||
@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: let
|
||||
in
|
||||
{
|
||||
pname = "remnote";
|
||||
version = "1.15.4";
|
||||
version = "1.16.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.remnote.io/remnote-desktop/RemNote-${version}.AppImage";
|
||||
hash = "sha256-6WBdTOj/seinx1wJGb/4if3PzCPmtzHyNAFmQwmsrvE=";
|
||||
hash = "sha256-dgbQ0cbPq7BSQ9VwwH6+GoAxb85HDxRixfjeDJBtOrg=";
|
||||
};
|
||||
|
||||
appexec = appimageTools.wrapType2 {
|
||||
|
||||
@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "rofi-rbw";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fdw";
|
||||
repo = "rofi-rbw";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-aTMKwb4BLupY0UmvPC86RnElZ9DFep8sApaMrlGbJ0M=";
|
||||
hash = "sha256-1xbdZlZa3YPz+33AMgvhiMO12vc/ej0RybypQUzEn+8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -12,9 +12,11 @@
|
||||
, gobject-introspection
|
||||
, gtk-layer-shell
|
||||
, gtk3
|
||||
, gvfs
|
||||
, json-glib
|
||||
, libgee
|
||||
, libhandy
|
||||
, libnotify
|
||||
, libpulseaudio
|
||||
, librsvg
|
||||
, meson
|
||||
@ -65,9 +67,11 @@ stdenv.mkDerivation (finalAttrs: rec {
|
||||
glib
|
||||
gtk-layer-shell
|
||||
gtk3
|
||||
gvfs
|
||||
json-glib
|
||||
libgee
|
||||
libhandy
|
||||
libnotify
|
||||
libpulseaudio
|
||||
librsvg
|
||||
pantheon.granite
|
||||
|
||||
@ -33,6 +33,6 @@ stdenv.mkDerivation {
|
||||
homepage = "https://github.com/davidbrazdil/volnoti";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.gilligan ];
|
||||
maintainers = [];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{
|
||||
stable = {
|
||||
chromedriver = {
|
||||
hash_darwin = "sha256-PmLV++FK6aCvdhNNhb2ZAmRLumr+VRFvN+7IByieEZk=";
|
||||
hash_darwin = "sha256-RGOChK4JhrFUgVY/5YqgE0KFLRl6a7X2llw1ZfhiPXY=";
|
||||
hash_darwin_aarch64 =
|
||||
"sha256-6Ys1EMSLmJNNaWdPeQiCT+bC0H7ABInVNzwXorGavn4=";
|
||||
hash_linux = "sha256-iimq37dcEcY2suW73a6lhgHuNaoqtzbAZCHkQP9ro/Y=";
|
||||
version = "123.0.6312.122";
|
||||
"sha256-K1jFXmWtXrS43UJg2mQ39Kae6tv7E9Fxm6LUWg+uwLo=";
|
||||
hash_linux = "sha256-xwaRNh7sllyNaq8+aLAZDQ3uDg06cu3KYqc02LWPSyw=";
|
||||
version = "124.0.6367.91";
|
||||
};
|
||||
deps = {
|
||||
gn = {
|
||||
@ -15,9 +15,9 @@
|
||||
version = "2024-03-14";
|
||||
};
|
||||
};
|
||||
hash = "sha256-apEniFKhIxPo4nhp9gCU+WpiV/EB40qif4RfE7Uniog=";
|
||||
hash_deb_amd64 = "sha256-rSbigG5/xbL32d1ntOn6gnZyxSpgrg1h7lb/RD4YROI=";
|
||||
version = "124.0.6367.60";
|
||||
hash = "sha256-tajZtdiXgs5lRLTmDmgNTM2vD+N+LuWpBS0dYzxUsMA=";
|
||||
hash_deb_amd64 = "sha256-CyCbZQ5ce8WLTt2JVSqbDkLDboE4BloiZ8pJff3dmSY=";
|
||||
version = "124.0.6367.91";
|
||||
};
|
||||
ungoogled-chromium = {
|
||||
deps = {
|
||||
@ -28,12 +28,12 @@
|
||||
version = "2024-03-14";
|
||||
};
|
||||
ungoogled-patches = {
|
||||
hash = "sha256-zgkt0stU/H5Mji429tigVbjOq27Op8UppHTjG6neoeA=";
|
||||
rev = "124.0.6367.60-1";
|
||||
hash = "sha256-1/J3BhUlef8CH/jZ5P5fWGXnWxTiuB0Ep+AWrMrv9cE=";
|
||||
rev = "124.0.6367.91-1";
|
||||
};
|
||||
};
|
||||
hash = "sha256-apEniFKhIxPo4nhp9gCU+WpiV/EB40qif4RfE7Uniog=";
|
||||
hash_deb_amd64 = "sha256-rSbigG5/xbL32d1ntOn6gnZyxSpgrg1h7lb/RD4YROI=";
|
||||
version = "124.0.6367.60";
|
||||
hash = "sha256-tajZtdiXgs5lRLTmDmgNTM2vD+N+LuWpBS0dYzxUsMA=";
|
||||
hash_deb_amd64 = "sha256-CyCbZQ5ce8WLTt2JVSqbDkLDboE4BloiZ8pJff3dmSY=";
|
||||
version = "124.0.6367.91";
|
||||
};
|
||||
}
|
||||
|
||||
@ -298,9 +298,6 @@ buildStdenv.mkDerivation {
|
||||
setOutputFlags = false; # `./mach configure` doesn't understand `--*dir=` flags.
|
||||
|
||||
preConfigure = ''
|
||||
# remove distributed configuration files
|
||||
rm -f configure js/src/configure .mozconfig*
|
||||
|
||||
# Runs autoconf through ./mach configure in configurePhase
|
||||
configureScript="$(realpath ./mach) configure"
|
||||
|
||||
@ -308,8 +305,8 @@ buildStdenv.mkDerivation {
|
||||
export MOZ_BUILD_DATE=$(head -n1 sourcestamp.txt)
|
||||
|
||||
# Set predictable directories for build and state
|
||||
export MOZ_OBJDIR=$(pwd)/mozobj
|
||||
export MOZBUILD_STATE_PATH=$(pwd)/mozbuild
|
||||
export MOZ_OBJDIR=$(pwd)/objdir
|
||||
export MOZBUILD_STATE_PATH=$TMPDIR/mozbuild
|
||||
|
||||
# Don't try to send libnotify notifications during build
|
||||
export MOZ_NOSPAM=1
|
||||
@ -353,7 +350,7 @@ buildStdenv.mkDerivation {
|
||||
# since the profiling build has not been installed to $out
|
||||
''
|
||||
OLD_LDFLAGS="$LDFLAGS"
|
||||
LDFLAGS="-Wl,-rpath,$(pwd)/mozobj/dist/${binaryName}"
|
||||
LDFLAGS="-Wl,-rpath,$(pwd)/objdir/dist/${binaryName}"
|
||||
''}
|
||||
fi
|
||||
'' + lib.optionalString googleAPISupport ''
|
||||
@ -510,7 +507,7 @@ buildStdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
cd mozobj
|
||||
cd objdir
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
@ -535,9 +532,9 @@ buildStdenv.mkDerivation {
|
||||
preInstall = lib.optionalString crashreporterSupport ''
|
||||
./mach buildsymbols
|
||||
mkdir -p $symbols/
|
||||
cp mozobj/dist/*.crashreporter-symbols.zip $symbols/
|
||||
cp objdir/dist/*.crashreporter-symbols.zip $symbols/
|
||||
'' + ''
|
||||
cd mozobj
|
||||
cd objdir
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@ -1,20 +1,20 @@
|
||||
{
|
||||
beta = import ./browser.nix {
|
||||
channel = "beta";
|
||||
version = "124.0.2478.51";
|
||||
version = "124.0.2478.67";
|
||||
revision = "1";
|
||||
hash = "sha256-qQTRPkQBLRZhOqBT8U0PGcmmR2zNRxJiFl3N2UPwoSo=";
|
||||
hash = "sha256-EywgM3G0Yph3dofullSVZpXSvT2MHc4uPyGAoaXCgN8=";
|
||||
};
|
||||
dev = import ./browser.nix {
|
||||
channel = "dev";
|
||||
version = "125.0.2518.0";
|
||||
version = "125.0.2535.6";
|
||||
revision = "1";
|
||||
hash = "sha256-q4TVpO0SxSSLMv/NtmJIOzClT2WqUss2qfE5vgj4O7E=";
|
||||
hash = "sha256-iD/e7AuPG0uNZY20wFQRbvAaKmaUw2RKeRJADU1MFRI=";
|
||||
};
|
||||
stable = import ./browser.nix {
|
||||
channel = "stable";
|
||||
version = "124.0.2478.51";
|
||||
version = "124.0.2478.67";
|
||||
revision = "1";
|
||||
hash = "sha256-dAiTS+KvKVwL6tNp4YsQfH4wdNIJoBJngcLBXgHArjE=";
|
||||
hash = "sha256-PRL2aiebCoK0eGJWlvI+Gsk14FltV+GaQdojLuDFimU=";
|
||||
};
|
||||
}
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "palemoon-bin";
|
||||
version = "33.0.2";
|
||||
version = "33.1.0";
|
||||
|
||||
src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";
|
||||
|
||||
@ -158,11 +158,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
in {
|
||||
gtk3 = fetchzip {
|
||||
urls = urlRegionVariants "gtk3";
|
||||
hash = "sha256-Kahnwlj9PIWB24lvH6h9cZK459NW2Vo2g6ckuv0Ax48=";
|
||||
hash = "sha256-qjztSvNL7KNFG3sszgk5qH77do0HFQ8YTrgjFi2ZM00=";
|
||||
};
|
||||
gtk2 = fetchzip {
|
||||
urls = urlRegionVariants "gtk2";
|
||||
hash = "sha256-XOiLGmU8O96clUpnp/OkzXmWR1PJ2AdzbVFj6adbcvY=";
|
||||
hash = "sha256-q4zAmnCN9SHGb8PthjAx7d5FKq/oAQ8c0R+U1SWqjAA=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -13,16 +13,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "chart-testing";
|
||||
version = "3.10.1";
|
||||
version = "3.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "helm";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-btrnfL9U8k7jwo6ltVfbiSJFCX52zjfgf4E+IsWTYi4=";
|
||||
hash = "sha256-eiU8omDEGDJVmumHwZkNix7qMVkoR6Irg0x9dTBzadA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-E+7ndvXWzsU896/eWyupbvqkLed2ly91osptZKT79fk=";
|
||||
vendorHash = "sha256-o9oZnQPztrK6HvclPt33Y05GQFWDsnUYti5x8R7aWS8=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pkg/config/config.go \
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubedb-cli";
|
||||
version = "0.44.0";
|
||||
version = "0.45.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubedb";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ppsGSzgJvAHRGs6PGPNgE7nDbK8SPYBPNbAlGwocAZs=";
|
||||
sha256 = "sha256-4kmXz8dTxCaGbuAo3zK27BhUrecInwJCu9XOuiQY48A=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -2,17 +2,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kuttl";
|
||||
version = "0.15.0";
|
||||
version = "0.16.0";
|
||||
cli = "kubectl-kuttl";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kudobuilder";
|
||||
repo = "kuttl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-u+j1ulM6B238qXvLMJZwLqglr9CGk81MsnBYiNiZVJQ=";
|
||||
sha256 = "sha256-Kz8+RsLpKwXk4f3k/kBqSFGB9AvA/D6kYBtPEl6aSH8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-taJAQPa0EA0Ph9OpCs7jzLqBV61kVstZrWyNEYc/GBk=";
|
||||
vendorHash = "sha256-IgfPXT4BhfZZVOa7eO1wKUKiDVMcN8vmH11qdWfvFww=";
|
||||
|
||||
subPackages = [ "cmd/kubectl-kuttl" ];
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.11.29";
|
||||
version = "3.11.30";
|
||||
pyproject = true;
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
owner = "Flexget";
|
||||
repo = "Flexget";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-rtLn3QkcVwCh2DfJmtkKvZQcFL/zlZCh7VTUpWtQErw=";
|
||||
hash = "sha256-msvNZ3kE48dNnhtUWLGxulb2iZ78hhyg7fVL2OSOdyY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "chatterino2";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Chatterino";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-uR2X0NNSLyOx5n3mZcp6+wW/7L7rHHH2MlOF+c0Uzm0=";
|
||||
sha256 = "sha256-c3Vhzes54xLjKV0Of7D1eFpQvIWJwcUBXvLT2p6VwBE=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
nativeBuildInputs = [ cmake pkg-config qt6.wrapQtAppsHook ];
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "maestral-qt";
|
||||
version = "1.9.2";
|
||||
version = "1.9.3";
|
||||
disabled = python3.pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SamSchott";
|
||||
repo = "maestral-qt";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-dgiVSwCTNDncbPJ+f0grjtq822TvtG0PhC9gDOKhwRI=";
|
||||
hash = "sha256-7Lt0Neobtofd1JDoz8BhGn+nFKaMLbM/6z0QQmtEKpA=";
|
||||
};
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "flood";
|
||||
version = "unstable-2023-06-03";
|
||||
version = "4.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jesec";
|
||||
repo = pname;
|
||||
rev = "2b652f8148dab7134eeeb201b9d81dd6b8bda074";
|
||||
hash = "sha256-wI6URPGUZUbydSgNaHN2C5IA2x/HHjBWIRT6H6iZU/0=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hth8tk2DHuBGNAXdjknbdQinuwWJ//QF0e23neeTExw=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-XmDnvq+ni5TOf3UQFc4JvGI3LiGpjbrLAocRvrW8qgk=";
|
||||
npmDepsHash = "sha256-WlQ/u7yIbuFETsmbW7ddAOO7OVrNPOXR3ja3N0aFWRE=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Modern web UI for various torrent clients with a Node.js backend and React frontend";
|
||||
|
||||
@ -1,147 +0,0 @@
|
||||
{ lib, stdenv, fetchgit, curl, gnunet, jansson, libgcrypt, libmicrohttpd
|
||||
, qrencode, libsodium, libtool, libunistring, pkg-config, postgresql
|
||||
, autoreconfHook, python3, recutils, wget, jq, gettext, texinfo
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.10.1";
|
||||
|
||||
taler-wallet-core = fetchgit {
|
||||
url = "https://git.taler.net/wallet-core.git";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sgiJd1snN9JDqS7IUeORKL60Gcm7XwL/JCX3sNRDTdY=";
|
||||
};
|
||||
|
||||
taler-exchange = stdenv.mkDerivation {
|
||||
pname = "taler-exchange";
|
||||
inherit version;
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.taler.net/exchange.git";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-SKnMep8bMQaJt4r3u0SrzwYSuFbzv4RnflbutSqwtPg=";
|
||||
|
||||
# When fetching submodules without the .git folder we get the following error:
|
||||
# "Server does not allow request for unadvertised object"
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
rm -rf $out/.git
|
||||
'';
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
libgcrypt
|
||||
libmicrohttpd
|
||||
jansson
|
||||
libsodium
|
||||
postgresql
|
||||
curl
|
||||
recutils
|
||||
gettext
|
||||
texinfo # Fix 'makeinfo' is missing on your system.
|
||||
libunistring
|
||||
python3.pkgs.jinja2
|
||||
# jq is necessary for some tests and is checked by configure script
|
||||
jq
|
||||
];
|
||||
propagatedBuildInputs = [ gnunet ];
|
||||
|
||||
# From ./bootstrap
|
||||
preAutoreconf = ''
|
||||
./contrib/gana-generate.sh
|
||||
pushd contrib
|
||||
find wallet-core/aml-backoffice/ -type f -printf ' %p \\\n' | sort > Makefile.am.ext
|
||||
truncate -s -2 Makefile.am.ext
|
||||
cat Makefile.am.in Makefile.am.ext >> Makefile.am
|
||||
popd
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeCheckInputs = [ wget curl ];
|
||||
doInstallCheck = true;
|
||||
checkTarget = "check";
|
||||
|
||||
meta = with lib; {
|
||||
description = ''
|
||||
Taler is an electronic payment system providing the ability to pay
|
||||
anonymously using digital cash. Taler consists of a network protocol
|
||||
definition (using a RESTful API over HTTP), a Exchange (which creates
|
||||
digital coins), a Wallet (which allows customers to manage, store and
|
||||
spend digital coins), and a Merchant website which allows customers to
|
||||
spend their digital coins. Naturally, each Merchant is different, but
|
||||
Taler includes code examples to help Merchants integrate Taler as a
|
||||
payment system.
|
||||
'';
|
||||
homepage = "https://taler.net/";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ astro ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
};
|
||||
|
||||
taler-merchant = stdenv.mkDerivation {
|
||||
pname = "taler-merchant";
|
||||
inherit version;
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.taler.net/merchant.git";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-8VpoyloLpd/HckSIRU6IclWUXQyEHqlcNdoJI9U3t0Y=";
|
||||
};
|
||||
postUnpack = ''
|
||||
ln -s ${taler-wallet-core}/spa.html $sourceRoot/contrib/
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
buildInputs = taler-exchange.buildInputs ++ [
|
||||
qrencode
|
||||
taler-exchange
|
||||
# for ltdl.h
|
||||
libtool
|
||||
];
|
||||
propagatedBuildInputs = [ gnunet ];
|
||||
|
||||
# From ./bootstrap
|
||||
preAutoreconf = ''
|
||||
pushd contrib
|
||||
find wallet-core/backoffice/ -type f -printf ' %p \\\n' | sort > Makefile.am.ext
|
||||
truncate -s -2 Makefile.am.ext
|
||||
cat Makefile.am.in Makefile.am.ext >> Makefile.am
|
||||
popd
|
||||
'';
|
||||
configureFlags = [
|
||||
"--with-gnunet=${gnunet}"
|
||||
"--with-exchange=${taler-exchange}"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeCheckInputs = [ jq ];
|
||||
doInstallCheck = true;
|
||||
checkTarget = "check";
|
||||
|
||||
meta = with lib; {
|
||||
description = ''
|
||||
This is the GNU Taler merchant backend. It provides the logic that should run
|
||||
at every GNU Taler merchant. The GNU Taler merchant is a RESTful backend that
|
||||
can be used to setup orders and process payments. This component allows
|
||||
merchants to receive payments without invading the customers' privacy. Of
|
||||
course, this applies mostly for digital goods, as the merchant does not need
|
||||
to know the customer's physical address.
|
||||
'';
|
||||
homepage = "https://taler.net/";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ astro ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
};
|
||||
in {
|
||||
inherit taler-exchange taler-merchant;
|
||||
}
|
||||
@ -33,14 +33,14 @@ let
|
||||
}.${system} or throwSystem;
|
||||
|
||||
hash = {
|
||||
x86_64-linux = "sha256-s/1XyEXOyvAQNf32ckKotQ4jYdlo/Y+O9PY3wIUs80A=";
|
||||
x86_64-linux = "sha256-3KMmMDoaYYMKuuqLof/LfdCs1d4I70L2TDxmzvx4Vq0=";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
displayname = "XPipe";
|
||||
|
||||
in stdenvNoCC.mkDerivation rec {
|
||||
pname = "xpipe";
|
||||
version = "8.6";
|
||||
version = "9.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz";
|
||||
|
||||
@ -59,6 +59,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/michaelrsweet/pappl";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux; # should also work for darwin, but requires additional work
|
||||
maintainers = with maintainers; [ jonringer ChlorideCull ];
|
||||
maintainers = with maintainers; [ jonringer ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,14 +1,20 @@
|
||||
{ lib, stdenv, fetchFromGitLab }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
runCommand,
|
||||
mafft,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mafft";
|
||||
version = "7.525";
|
||||
version = "7.526";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "sysimm";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ckBmvFssYAmYcBHAEftjQqBV0MB0theGfemaPx3XUws=";
|
||||
repo = "mafft";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-VNe00r12qEkLEbpZdJCe5xZ73JA3uAmuAeG+eSeRDI0=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
@ -16,14 +22,34 @@ stdenv.mkDerivation rec {
|
||||
make clean
|
||||
'';
|
||||
|
||||
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "PREFIX=$(out)" ];
|
||||
makeFlags = [
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
"PREFIX=$(out)"
|
||||
];
|
||||
|
||||
meta = with lib;
|
||||
{
|
||||
description = "Multiple alignment program for amino acid or nucleotide sequences";
|
||||
homepage = "https://mafft.cbrc.jp/alignment/software/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ natsukium ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
passthru.tests = {
|
||||
simple = runCommand "${finalAttrs.pname}-test" { } ''
|
||||
mkdir $out
|
||||
cd ${finalAttrs.src}/test
|
||||
${lib.getExe mafft} sample > $out/test.fftns2
|
||||
${lib.getExe mafft} --maxiterate 100 sample > $out/test.fftnsi
|
||||
${lib.getExe mafft} --globalpair sample > $out/test.gins1
|
||||
${lib.getExe mafft} --globalpair --maxiterate 100 sample > $out/test.ginsi
|
||||
${lib.getExe mafft} --localpair sample > $out/test.lins1
|
||||
${lib.getExe mafft} --localpair --maxiterate 100 sample > $out/test.linsi
|
||||
diff $out/test.fftns2 sample.fftns2
|
||||
diff $out/test.fftnsi sample.fftnsi
|
||||
diff $out/test.gins1 sample.gins1
|
||||
diff $out/test.ginsi sample.ginsi
|
||||
diff $out/test.lins1 sample.lins1
|
||||
'';
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Multiple alignment program for amino acid or nucleotide sequences";
|
||||
homepage = "https://mafft.cbrc.jp/alignment/software/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ natsukium ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
})
|
||||
|
||||
@ -3,23 +3,23 @@
|
||||
{
|
||||
"kicad" = {
|
||||
kicadVersion = {
|
||||
version = "8.0.1";
|
||||
version = "8.0.2";
|
||||
src = {
|
||||
rev = "20421d65e5a7ede894345d337ab47b469f5ba154";
|
||||
sha256 = "096kvmm96ccxir1rspgzzjkp6y2j80l3w2vphg9iv3drxmjp7qjv";
|
||||
rev = "55a4d4f5e2f54be6ccf74a8919d04684c9df4c50";
|
||||
sha256 = "069ycii9zvdxwxd73afd6bp975r1555yvifi9zdb77qyvn0d9nr9";
|
||||
};
|
||||
};
|
||||
libVersion = {
|
||||
version = "8.0.1";
|
||||
version = "8.0.2";
|
||||
libSources = {
|
||||
symbols.rev = "d6aff3948edfca2bacf36900ff080f6b3f65fe4c";
|
||||
symbols.sha256 = "00xnvikmqd1zkg9p1f89kvryvkybl5f20baij6babqyc29nbzkwy";
|
||||
templates.rev = "0a6c4f798a68a5c639d54b4d3093460ab9267816";
|
||||
templates.sha256 = "0m9bggz3cm27kqpjjwxy19mqzk0c69bywcjkqcni7kafr21c6k4z";
|
||||
footprints.rev = "226b4f3d5c10a4126d88b895188bdab629fe60b0";
|
||||
footprints.sha256 = "1bb3mb2a7vkridgmqqm9ib3hv2m4zx1i14mglb11sribypy0ma5p";
|
||||
packages3d.rev = "49c1cd4017499b8a7f6dedbe7ede834d1713eb28";
|
||||
packages3d.sha256 = "0b5jwr5bbd0kzb75nj3028knjrv0872dk54sbsnxaz669q8zaxap";
|
||||
symbols.rev = "099ac0c8ac402a685fde00b1369e34a116e29661";
|
||||
symbols.sha256 = "0w333f89yw2m0zlpkg0k6hfwlj10snm8laihdjnsb22asyz4pbhn";
|
||||
templates.rev = "2e2da58e02707d327d59d4101c401a82dc9a26f6";
|
||||
templates.sha256 = "073a6cyvzzy0vmkj3ip4ziq7b7pcizs70nm5acw838dxghjfyv3v";
|
||||
footprints.rev = "e8c30550cde4945cbe1bf30cccf0b3c1e2bda6c6";
|
||||
footprints.sha256 = "10j8qjljc1fv8k4zp3zn0da33g57hn6pgrgmbgp18dsa539xvxcz";
|
||||
packages3d.rev = "249f7947587529026e1676cd70c8d7493a8d8162";
|
||||
packages3d.sha256 = "04gvfb54jhnww2qwrxc27wpyrvmjasdc4xhr0ridl7dglh4qcp35";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eigenmath";
|
||||
version = "unstable-2024-04-19";
|
||||
version = "unstable-2024-04-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "georgeweigt";
|
||||
repo = pname;
|
||||
rev = "5d5a538e7c378e9e2d9fabdf88fa2c6dd6d13e2c";
|
||||
hash = "sha256-vPj3YKNJAZgdhw/VVrJIo2P7IyHrt7hVpnUQCUCZmR8=";
|
||||
rev = "14a55ff60d078b752033b4ae29d332b04b6e8912";
|
||||
hash = "sha256-p7wcLmssTqs3LCkZWB9rhCXEc4IVgZJNBvRhS51oH5E=";
|
||||
};
|
||||
|
||||
checkPhase = let emulator = stdenv.hostPlatform.emulator buildPackages; in ''
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "snakemake";
|
||||
version = "8.10.7";
|
||||
version = "8.11.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snakemake";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-tRjyv7pTTTDj3LrcIP3OWOX+9FldHV6rtbPdOYr70E4=";
|
||||
hash = "sha256-bAzhQMGI4t/ftcZnz6h/PmlDlGgMU8vFVHb9QXED/Hw=";
|
||||
# https://github.com/python-versioneer/python-versioneer/issues/217
|
||||
postFetch = ''
|
||||
sed -i "$out"/snakemake/_version.py -e 's#git_refnames = ".*"#git_refnames = " (tag: v${version})"#'
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ghorg";
|
||||
version = "1.9.10";
|
||||
version = "1.9.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gabrie30";
|
||||
repo = "ghorg";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UU8iOpfM5RMwlDceDXofs3Nzyy93zcsUOuTGw/kzVe8=";
|
||||
sha256 = "sha256-22/HM/DYkNh8V1v09fca6/3TLwzYudpH/VNbh+3+iyE=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://github.com/jsdw/git-backup";
|
||||
description = "A tool to help you backup your git repositories from services like GitHub";
|
||||
license = licenses.mit;
|
||||
maintainers = [ ];
|
||||
maintainers = with maintainers; [ cafkafk ];
|
||||
mainProgram = "git-backup";
|
||||
};
|
||||
}
|
||||
|
||||
@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://github.com/swsnr/git-gone";
|
||||
changelog = "https://github.com/swsnr/git-gone/raw/v${version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ ];
|
||||
maintainers = with maintainers; [ cafkafk ];
|
||||
mainProgram = "git-gone";
|
||||
};
|
||||
}
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "git-quick-stats";
|
||||
version = "2.5.4";
|
||||
version = "2.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "git-quick-stats";
|
||||
owner = "arzzen";
|
||||
rev = version;
|
||||
sha256 = "sha256-dbi48rq3ijPa45xtTi6kAly/IwkX4aK1P9hmcPNQEqM=";
|
||||
sha256 = "sha256-7riA3yYw2D8+x/wzzbv0RF+zHCtqVC1ZpVANZp9x2AQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://github.com/siedentop/git-quickfix";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ cafkafk ];
|
||||
mainProgram = "git-quickfix";
|
||||
};
|
||||
}
|
||||
|
||||
@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "Automatically trims your branches whose tracking remote refs are merged or gone";
|
||||
homepage = "https://github.com/foriequal0/git-trim";
|
||||
license = licenses.mit;
|
||||
maintainers = [ ];
|
||||
maintainers = with maintainers; [ cafkafk ];
|
||||
mainProgram = "git-trim";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,5 +1,9 @@
|
||||
{ lib, fetchFromGitHub, rustPlatform, git }:
|
||||
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
git,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gitprompt-rs";
|
||||
version = "0.3.0";
|
||||
@ -14,15 +18,15 @@ rustPlatform.buildRustPackage rec {
|
||||
cargoSha256 = "0avs833vb6q1avjbfygm55s83iy942xgqsx6qdzksry44n35s418";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/main.rs \
|
||||
--replace 'Command::new("git")' 'Command::new("${git}/bin/git")'
|
||||
substituteInPlace src/main.rs \
|
||||
--replace 'Command::new("git")' 'Command::new("${git}/bin/git")'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple Git prompt";
|
||||
homepage = "https://github.com/9ary/gitprompt-rs";
|
||||
license = with licenses; [ mpl20 ];
|
||||
maintainers = with maintainers; [ novenary ];
|
||||
maintainers = with maintainers; [ isabelroses ];
|
||||
mainProgram = "gitprompt-rs";
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,8 +5,6 @@
|
||||
, gobject-introspection
|
||||
, pkg-config
|
||||
, ninja
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, desktop-file-utils
|
||||
, makeWrapper
|
||||
, shared-mime-info
|
||||
@ -56,8 +54,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libGL
|
||||
libadwaita
|
||||
libsoup_3
|
||||
wayland
|
||||
wayland-protocols
|
||||
libmicrodns
|
||||
];
|
||||
|
||||
@ -65,6 +61,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
patchShebangs --build build-aux/meson/postinstall.py
|
||||
'';
|
||||
|
||||
# The package uses "clappersink" provided by itself
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : $out/lib/gstreamer-1.0
|
||||
)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A GNOME media player built using GTK4 toolkit and powered by GStreamer with OpenGL rendering";
|
||||
longDescription = ''
|
||||
@ -73,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
homepage = "https://github.com/Rafostar/clapper";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ aleksana ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@ -1,16 +1,17 @@
|
||||
{ lib
|
||||
, mkDerivation
|
||||
, fetchurl
|
||||
, autoPatchelfHook
|
||||
, pkg-config
|
||||
, curl
|
||||
, ffmpeg
|
||||
, openssl
|
||||
, qtbase
|
||||
, zlib
|
||||
{
|
||||
lib,
|
||||
mkDerivation,
|
||||
fetchurl,
|
||||
autoPatchelfHook,
|
||||
pkg-config,
|
||||
curl,
|
||||
ffmpeg,
|
||||
openssl,
|
||||
qtbase,
|
||||
zlib,
|
||||
|
||||
, withJava ? true
|
||||
, jre_headless
|
||||
withJava ? true,
|
||||
jre_headless,
|
||||
}:
|
||||
|
||||
let
|
||||
@ -30,12 +31,15 @@ let
|
||||
];
|
||||
sha256 = "2dtNdyv0+QYWQrfrIu5RQKSN4scSWKuLFNlJZXpxDUM=";
|
||||
};
|
||||
|
||||
in mkDerivation {
|
||||
in
|
||||
mkDerivation {
|
||||
pname = "makemkv";
|
||||
inherit version;
|
||||
|
||||
srcs = [ src_bin src_oss ];
|
||||
srcs = [
|
||||
src_bin
|
||||
src_oss
|
||||
];
|
||||
|
||||
sourceRoot = "makemkv-oss-${version}";
|
||||
|
||||
@ -43,18 +47,25 @@ in mkDerivation {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [ ffmpeg openssl qtbase zlib ];
|
||||
buildInputs = [
|
||||
ffmpeg
|
||||
openssl
|
||||
qtbase
|
||||
zlib
|
||||
];
|
||||
|
||||
runtimeDependencies = [ (lib.getLib curl) ];
|
||||
|
||||
qtWrapperArgs =
|
||||
let
|
||||
binPath = lib.makeBinPath [ jre_headless ];
|
||||
in lib.optionals withJava [
|
||||
"--prefix PATH : ${binPath}"
|
||||
];
|
||||
in
|
||||
lib.optionals withJava [ "--prefix PATH : ${binPath}" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
@ -84,9 +95,12 @@ in mkDerivation {
|
||||
expiration date.
|
||||
'';
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = [ licenses.unfree licenses.lgpl21 ];
|
||||
license = [
|
||||
licenses.unfree
|
||||
licenses.lgpl21
|
||||
];
|
||||
homepage = "http://makemkv.com";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ jchw ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -69,6 +69,7 @@ let
|
||||
cutter = callPackage ./cutter.nix { };
|
||||
dynamic-crop = callPackage ./dynamic-crop.nix { };
|
||||
inhibit-gnome = callPackage ./inhibit-gnome.nix { };
|
||||
memo = callPackage ./memo.nix { };
|
||||
modernx = callPackage ./modernx.nix { };
|
||||
modernx-zydezu = callPackage ./modernx-zydezu.nix { };
|
||||
mpris = callPackage ./mpris.nix { };
|
||||
|
||||
26
pkgs/applications/video/mpv/scripts/memo.nix
Normal file
26
pkgs/applications/video/mpv/scripts/memo.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ fetchFromGitHub
|
||||
, buildLua
|
||||
, lib
|
||||
, unstableGitUpdater
|
||||
}:
|
||||
|
||||
buildLua {
|
||||
pname = "memo";
|
||||
version = "0-unstable-2023-10-31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "po5";
|
||||
repo = "memo";
|
||||
rev = "6f2b036ef860e130ea584657389e0a7ceb4d954f";
|
||||
hash = "sha256-m8ikXuw7PM4Btg8w7ufLneKA4fnYjMyfVJYueZILMw8=";
|
||||
};
|
||||
|
||||
passthru.updateScript = unstableGitUpdater {};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A recent files menu for mpv";
|
||||
homepage = "https://github.com/po5/memo";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ purrpurrn ];
|
||||
};
|
||||
}
|
||||
@ -13,12 +13,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obs-input-overlay";
|
||||
version = "5.0.4";
|
||||
version = "5.0.5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "univrsal";
|
||||
repo = "input-overlay";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MON68yjHUOF/bggWqhw8D0+23HpKQN3jWs+5lLAacaQ=";
|
||||
sha256 = "sha256-9HqEz+KnTt8MyhwqFWjalbl3H/DCzumckXMctCGhs3o=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -2,37 +2,45 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, ninja
|
||||
, obs-studio
|
||||
, onnxruntime
|
||||
, opencv
|
||||
, qt6
|
||||
, curl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obs-backgroundremoval";
|
||||
version = "0.5.16";
|
||||
version = "1.1.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "royshil";
|
||||
owner = "occ-ai";
|
||||
repo = "obs-backgroundremoval";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-E+pm/Ma6dZTYlX3DpB49ynTETsRS2TBqgHSCijl/Txc=";
|
||||
rev = version;
|
||||
hash = "sha256-QoC9/HkwOXMoFNvcOxQkGCLLAJmsja801LKCNT9O9T0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ obs-studio onnxruntime opencv ];
|
||||
nativeBuildInputs = [ cmake ninja ];
|
||||
buildInputs = [ obs-studio onnxruntime opencv qt6.qtbase curl ];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
cmakeFlags = [
|
||||
"--preset linux-x86_64"
|
||||
"-DCMAKE_MODULE_PATH:PATH=${src}/cmake"
|
||||
"-DUSE_SYSTEM_ONNXRUNTIME=ON"
|
||||
"-DUSE_SYSTEM_OPENCV=ON"
|
||||
"-DDISABLE_ONNXRUNTIME_GPU=ON"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir $out/lib $out/share
|
||||
mv $out/obs-plugins/64bit $out/lib/obs-plugins
|
||||
rm -rf $out/obs-plugins
|
||||
mv $out/data $out/share/obs
|
||||
buildPhase = ''
|
||||
cd ..
|
||||
cmake --build build_x86_64 --parallel
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
cmake --install build_x86_64 --prefix "$out"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
@ -40,6 +48,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/royshil/obs-backgroundremoval";
|
||||
maintainers = with maintainers; [ zahrun ];
|
||||
license = licenses.mit;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -2,27 +2,25 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cloud-hypervisor";
|
||||
version = "38.0";
|
||||
version = "39.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloud-hypervisor";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Lhug7DCa+QutlvksL6EFQa04UK/sWebDIkqQmwPUpX4=";
|
||||
hash = "sha256-sMnfeICo/PhpljstTIj4CiE4QBuyVKYD9oWvWf0Ouew=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"acpi_tables-0.1.0" = "sha256-syDq+db1hTne6QoP0vMGUv4tB0J9arQG2Ea2hHW1k3M=";
|
||||
"igvm-0.1.0" = "sha256-l+Qyhdy3b8h8hPLHg5M0os8aSkjM55hAP5nqi0AGmjo=";
|
||||
"kvm-bindings-0.7.0" = "sha256-hXv5N3TTwGQaVxdQ/DTzLt+uwLxFnstJwNhxRD2K8TM=";
|
||||
"micro_http-0.1.0" = "sha256-gyeOop6AMXEIbLXhJMN/oYGGU8Un8Y0nFZc9ucCa0y4=";
|
||||
"mshv-bindings-0.1.1" = "sha256-yWvkpOcW3lV47s+rWnN4Bki8tt8CkiPVZ0I36nrWMi4=";
|
||||
"versionize_derive-0.1.6" = "sha256-eI9fM8WnEBZvskPhU67IWeN6QAPg2u5EBT+AOxfb/fY=";
|
||||
"vfio-bindings-0.4.0" = "sha256-Dk4T2dMzPZ+Aoq1YSXX2z1Nky8zvyDl7b+A8NH57Hkc=";
|
||||
"acpi_tables-0.1.0" = "sha256-a6ojB2XVeH+YzzXRle0agg+ljn0Jsgyaf6TJZAGt8sQ=";
|
||||
"igvm-0.1.9" = "sha256-OztgRiv+//27MS9SqSBJPbrVlXihK2m9UkG4REZ9Vn0=";
|
||||
"micro_http-0.1.0" = "sha256-yIgcoEfc7eeS1+bijzkifaBxVNHa71Y+Vn79owMaKvM=";
|
||||
"mshv-bindings-0.1.1" = "sha256-US/AzS7iRUQijkGs1EG04Hk4Q7dPz65BeTMsI8rtMqw=";
|
||||
"vfio-bindings-0.4.0" = "sha256-k8Hf5y8MiTnd3k2iEgnnX/o8VdVS7prKlnssyEerVRM=";
|
||||
"vfio_user-0.1.0" = "sha256-LJ84k9pMkSAaWkuaUd+2LnPXnNgrP5LdbPOc1Yjz5xA=";
|
||||
"vm-fdt-0.2.0" = "sha256-lKW4ZUraHomSDyxgNlD5qTaBTZqM0Fwhhh/08yhrjyE=";
|
||||
"vm-fdt-0.3.0" = "sha256-9PywgSnSL+8gT6lcl9t6w7X4fEINa+db+H1vWS+gDOI=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -55,11 +55,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
+ lib.optionalString hostCpuOnly "-host-cpu-only"
|
||||
+ lib.optionalString nixosTestRunner "-for-vm-tests"
|
||||
+ lib.optionalString toolsOnly "-utils";
|
||||
version = "8.2.2";
|
||||
version = "8.2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-hHNGwbgsGlSyw49u29hVSe3rF0MLfU09oSYg4pYrxPM=";
|
||||
hash = "sha256-d1sRjKpjZiCnr0saFWRFoaKA9a1Ss7y7F/jilkhB21g=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ]
|
||||
|
||||
@ -7,20 +7,20 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "csvlens";
|
||||
version = "0.8.1";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "YS-L";
|
||||
repo = "csvlens";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-4lKiqojBF8mqAp56eTDfJcK276IzEDLA3pORKIZpC94=";
|
||||
hash = "sha256-Qpda9qADnj3eGz+nvD6VgxUOwTXrFI1rMam6+sfK6MQ=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.apple_sdk.frameworks.AppKit
|
||||
];
|
||||
|
||||
cargoHash = "sha256-EzM7qGor/B17N4KDTsQzgiV4pgXE2D47RZcrmKVkPu8=";
|
||||
cargoHash = "sha256-PDOuAz+ov1S7i7TpRp4YaeoQQJ4paal6FI0VU25d4zU=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command line csv viewer";
|
||||
|
||||
@ -1,38 +1,68 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, pkgsCross
|
||||
, stdenv
|
||||
, bash
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
overrideCC,
|
||||
fetchFromGitHub,
|
||||
pkgsCross,
|
||||
bash,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs:
|
||||
stdenvNoCC.mkDerivation (
|
||||
finalAttrs:
|
||||
let
|
||||
dxvk32 = if stdenv.isDarwin
|
||||
then pkgsCross.mingw32.dxvk_1.override { enableMoltenVKCompat = true; }
|
||||
else pkgsCross.mingw32.dxvk_2;
|
||||
dxvk64 = if stdenv.isDarwin
|
||||
then pkgsCross.mingwW64.dxvk_1.override { enableMoltenVKCompat = true; }
|
||||
else pkgsCross.mingwW64.dxvk_2;
|
||||
useWin32ThreadModel =
|
||||
stdenv:
|
||||
overrideCC stdenv (
|
||||
stdenv.cc.override (old: {
|
||||
cc = old.cc.override {
|
||||
threadsCross = {
|
||||
model = "win32";
|
||||
package = null;
|
||||
};
|
||||
};
|
||||
})
|
||||
);
|
||||
|
||||
mingw32Stdenv = useWin32ThreadModel pkgsCross.mingw32.stdenv;
|
||||
mingwW64Stdenv = useWin32ThreadModel pkgsCross.mingwW64.stdenv;
|
||||
|
||||
dxvk32 =
|
||||
if stdenvNoCC.isDarwin then
|
||||
pkgsCross.mingw32.dxvk_1.override {
|
||||
stdenv = mingw32Stdenv;
|
||||
enableMoltenVKCompat = true;
|
||||
}
|
||||
else
|
||||
pkgsCross.mingw32.dxvk_2.override { stdenv = mingw32Stdenv; };
|
||||
|
||||
dxvk64 =
|
||||
if stdenvNoCC.isDarwin then
|
||||
pkgsCross.mingwW64.dxvk_1.override {
|
||||
stdenv = mingwW64Stdenv;
|
||||
enableMoltenVKCompat = true;
|
||||
}
|
||||
else
|
||||
pkgsCross.mingwW64.dxvk_2.override { stdenv = mingwW64Stdenv; };
|
||||
in
|
||||
{
|
||||
pname = "dxvk";
|
||||
inherit (dxvk64) version;
|
||||
|
||||
outputs = [ "out" "bin" "lib" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"bin"
|
||||
"lib"
|
||||
];
|
||||
|
||||
dontUnpack = true;
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
strictDeps = true;
|
||||
|
||||
installPhase = ''
|
||||
buildCommand = ''
|
||||
mkdir -p $out/bin $bin $lib
|
||||
substitute ${./setup_dxvk.sh} $out/bin/setup_dxvk.sh \
|
||||
--subst-var-by bash ${bash} \
|
||||
--subst-var-by dxvk32 ${dxvk32} \
|
||||
--subst-var-by dxvk64 ${dxvk64} \
|
||||
--subst-var-by mcfgthreads32 "${pkgsCross.mingw32.windows.mcfgthreads_pre_gcc_13}" \
|
||||
--subst-var-by mcfgthreads64 "${pkgsCross.mingwW64.windows.mcfgthreads_pre_gcc_13}"
|
||||
--subst-var-by version ${finalAttrs.version}
|
||||
chmod a+x $out/bin/setup_dxvk.sh
|
||||
declare -A dxvks=( [x32]=${dxvk32} [x64]=${dxvk64} )
|
||||
for arch in "''${!dxvks[@]}"; do
|
||||
@ -41,6 +71,10 @@ stdenvNoCC.mkDerivation (finalAttrs:
|
||||
done
|
||||
'';
|
||||
|
||||
passthru = { inherit dxvk32 dxvk64; };
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
meta = {
|
||||
description = "Setup script for DXVK";
|
||||
mainProgram = "setup_dxvk.sh";
|
||||
@ -48,6 +82,11 @@ stdenvNoCC.mkDerivation (finalAttrs:
|
||||
changelog = "https://github.com/doitsujin/dxvk/releases";
|
||||
maintainers = [ lib.maintainers.reckenrode ];
|
||||
license = lib.licenses.zlib;
|
||||
platforms = [ "x86_64-darwin" "i686-linux" "x86_64-linux" ];
|
||||
platforms = [
|
||||
"x86_64-darwin"
|
||||
"i686-linux"
|
||||
"x86_64-linux"
|
||||
];
|
||||
};
|
||||
})
|
||||
}
|
||||
)
|
||||
|
||||
@ -6,11 +6,9 @@ set -eu -o pipefail
|
||||
{
|
||||
dxvk32_dir=@dxvk32@/bin
|
||||
dxvk64_dir=@dxvk64@/bin
|
||||
|
||||
mcfgthreads32_dir=@mcfgthreads32@/bin
|
||||
mcfgthreads64_dir=@mcfgthreads64@/bin
|
||||
}
|
||||
|
||||
|
||||
## Defaults
|
||||
|
||||
declare -A dlls=(
|
||||
@ -18,10 +16,23 @@ declare -A dlls=(
|
||||
[d3d10]="dxvk/d3d10.dll dxvk/d3d10_1.dll dxvk/d3d10core.dll"
|
||||
[d3d11]="dxvk/d3d11.dll"
|
||||
[dxgi]="dxvk/dxgi.dll"
|
||||
)
|
||||
|
||||
declare -A obsolete_dlls=(
|
||||
[mcfgthreads]="mcfgthreads/mcfgthread-12.dll"
|
||||
)
|
||||
|
||||
declare -A targets=([d3d9]=1 [d3d11]=1 [dxgi]=1 [mcfgthreads]=1)
|
||||
declare -A targets=([d3d9]=1 [d3d11]=1 [dxgi]=1)
|
||||
|
||||
|
||||
# Option variables
|
||||
|
||||
do_cleanup=false
|
||||
ignore_obsolete=false
|
||||
|
||||
do_symlink=false
|
||||
do_makeprefix=false
|
||||
|
||||
|
||||
## Command-line Parsing
|
||||
|
||||
@ -46,6 +57,10 @@ usage() {
|
||||
}
|
||||
|
||||
case "${1:-}" in
|
||||
cleanup)
|
||||
do_cleanup=true
|
||||
shift
|
||||
;;
|
||||
uninstall|install)
|
||||
action=$1
|
||||
shift
|
||||
@ -61,10 +76,6 @@ case "${1:-}" in
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
do_symlink=false
|
||||
do_makeprefix=false
|
||||
|
||||
while [ -n "${1:-}" ]; do
|
||||
case "$1" in
|
||||
--with-dxgi)
|
||||
@ -100,6 +111,10 @@ while [ -n "${1:-}" ]; do
|
||||
usage
|
||||
fi
|
||||
;;
|
||||
--ignore-obsolete)
|
||||
shift
|
||||
ignore_obsolete=true
|
||||
;;
|
||||
-h|--help)
|
||||
usage
|
||||
;;
|
||||
@ -111,6 +126,7 @@ while [ -n "${1:-}" ]; do
|
||||
shift
|
||||
done
|
||||
|
||||
|
||||
## Get information on the Wine environment
|
||||
|
||||
export WINEPREFIX=${WINEPREFIX:-"$HOME/.wine"}
|
||||
@ -165,6 +181,7 @@ if [ -z "${win32_sys_path:-}" ] && [ -z "${win64_sys_path:-}" ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
## Utility functions
|
||||
|
||||
install_file() {
|
||||
@ -200,6 +217,13 @@ install_file() {
|
||||
uninstall_file() {
|
||||
srcfile=$1
|
||||
dstfile=$2
|
||||
args=$3
|
||||
|
||||
if [ "${args}" = "-f" ]; then
|
||||
rm -v "${dstfile}"
|
||||
[ -e "${dstfile}.old" ] && rm -v "${dstfile}.old"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [ -f "${srcfile}.so" ]; then
|
||||
srcfile="${srcfile}.so"
|
||||
@ -239,6 +263,26 @@ uninstall_override() {
|
||||
fi
|
||||
}
|
||||
|
||||
print_cleanup_message() {
|
||||
declare -a obsolete_paths=($@)
|
||||
if ! $ignore_obsolete && [ -n "${obsolete_paths[@]}" ]; then
|
||||
fold -w $COLUMNS -s <<MSG >&2
|
||||
Obsolete DLLs detected at the specified Wine prefix. These DLLs are no longer needed \
|
||||
or managed by the \`setup_dxvk.sh\` script in nixpkgs. You should remove them manually, \
|
||||
use the cleanup command, or suppress this message using the \`--ignore-obsolete\` option.
|
||||
MSG
|
||||
for obspath in "${obsolete_paths[@]}"; do
|
||||
if $do_cleanup; then
|
||||
cleanup_file "$obspath"
|
||||
else
|
||||
echo " - ${obspath}"
|
||||
fi
|
||||
done
|
||||
! $do_cleanup && echo
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
## Perform the requested command
|
||||
|
||||
declare -A paths
|
||||
@ -260,7 +304,32 @@ for target in "${!targets[@]}"; do
|
||||
done
|
||||
done
|
||||
|
||||
for srcpath in "${!paths[@]}"; do
|
||||
"${action}_file" "$srcpath" "${paths["$srcpath"]}"
|
||||
declare -A obsolete_paths
|
||||
|
||||
for target in "${!obsolete_dlls[@]}"; do
|
||||
for dll in ${obsolete_dlls[$target]}; do
|
||||
dllname=$(basename "$dll")
|
||||
basedir=$(dirname "$dll")
|
||||
|
||||
if [ -e "${win32_sys_path:-}/$dllname" ]; then
|
||||
obsolete_paths["${basedir}32_dir/$dllname"]="${win32_sys_path:-}/$dllname"
|
||||
fi
|
||||
if [ -e "${win64_sys_path:-}/$dllname" ]; then
|
||||
obsolete_paths["${basedir}64_dir/$dllname"]="${win64_sys_path:-}/$dllname"
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
if $do_cleanup; then
|
||||
declare -n action_paths=obsolete_paths
|
||||
action=uninstall
|
||||
args=-f
|
||||
else
|
||||
declare -n action_paths=paths
|
||||
print_cleanup_message "${obsolete_paths[@]}"
|
||||
fi
|
||||
|
||||
for srcpath in "${!action_paths[@]}"; do
|
||||
"${action}_file" "$srcpath" "${action_paths["$srcpath"]}" "${args:-}"
|
||||
"${action}_override" "$(basename "$srcpath" .dll)"
|
||||
done
|
||||
|
||||
@ -1,15 +1,16 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, glslang
|
||||
, meson
|
||||
, ninja
|
||||
, windows
|
||||
, pkgsBuildHost
|
||||
, enableMoltenVKCompat ? false
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
glslang,
|
||||
meson,
|
||||
ninja,
|
||||
windows,
|
||||
enableMoltenVKCompat ? false,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dxvk";
|
||||
version = "1.10.3";
|
||||
|
||||
@ -21,22 +22,35 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
# These patches are required when using DXVK with Wine on Darwin.
|
||||
patches = lib.optionals enableMoltenVKCompat [
|
||||
# Patch DXVK to work with MoltenVK even though it doesn’t support some required features.
|
||||
# Some games work poorly (particularly Unreal Engine 4 games), but others work pretty well.
|
||||
./darwin-dxvk-compat.patch
|
||||
# Use synchronization primitives from the C++ standard library to avoid deadlocks on Darwin.
|
||||
# See: https://www.reddit.com/r/macgaming/comments/t8liua/comment/hzsuce9/
|
||||
./darwin-thread-primitives.patch
|
||||
];
|
||||
patches =
|
||||
[
|
||||
# Fixes errors building with GCC 13.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/doitsujin/dxvk/commit/1a5afc77b1859e6c7e31b55e11ece899e3b5295a.patch";
|
||||
hash = "sha256-tTAsQOMAazgH/6laLNTuG2lki257VUR9EBivnD4vCuY=";
|
||||
})
|
||||
]
|
||||
++ lib.optionals enableMoltenVKCompat [
|
||||
# Patch DXVK to work with MoltenVK even though it doesn’t support some required features.
|
||||
# Some games work poorly (particularly Unreal Engine 4 games), but others work pretty well.
|
||||
./darwin-dxvk-compat.patch
|
||||
# Use synchronization primitives from the C++ standard library to avoid deadlocks on Darwin.
|
||||
# See: https://www.reddit.com/r/macgaming/comments/t8liua/comment/hzsuce9/
|
||||
./darwin-thread-primitives.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ glslang meson ninja ];
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
glslang
|
||||
meson
|
||||
ninja
|
||||
];
|
||||
buildInputs = [ windows.pthreads ];
|
||||
|
||||
mesonFlags = [
|
||||
"--buildtype" "release"
|
||||
"--prefix" "${placeholder "out"}"
|
||||
];
|
||||
mesonBuildType = "release";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
meta = {
|
||||
description = "A Vulkan-based translation layer for Direct3D 9/10/11";
|
||||
|
||||
@ -1,18 +1,19 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkgsBuildHost
|
||||
, glslang
|
||||
, meson
|
||||
, ninja
|
||||
, windows
|
||||
, spirv-headers
|
||||
, vulkan-headers
|
||||
, SDL2
|
||||
, glfw
|
||||
, gitUpdater
|
||||
, sdl2Support ? true
|
||||
, glfwSupport ? false
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
pkgsBuildHost,
|
||||
glslang,
|
||||
meson,
|
||||
ninja,
|
||||
windows,
|
||||
spirv-headers,
|
||||
vulkan-headers,
|
||||
SDL2,
|
||||
glfw,
|
||||
gitUpdater,
|
||||
sdl2Support ? true,
|
||||
glfwSupport ? false,
|
||||
}:
|
||||
|
||||
# SDL2 and GLFW support are mutually exclusive.
|
||||
@ -21,15 +22,15 @@ assert !sdl2Support || !glfwSupport;
|
||||
let
|
||||
isWindows = stdenv.hostPlatform.uname.system == "Windows";
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dxvk";
|
||||
version = "2.3";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "doitsujin";
|
||||
repo = "dxvk";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-RU+B0XfphD5HHW/vSzqHLUaGS3E31d5sOLp3lMmrCB8=";
|
||||
hash = "sha256-lUzD1NHFLO4UqOg/BUr7PnYMJCMr1KBh3VNx8etbt8c=";
|
||||
fetchSubmodules = true; # Needed for the DirectX headers and libdisplay-info
|
||||
};
|
||||
|
||||
@ -38,8 +39,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
--replace "/usr/bin/env python3" "${lib.getBin pkgsBuildHost.python3}/bin/python3"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ glslang meson ninja ];
|
||||
buildInputs = [ spirv-headers vulkan-headers ]
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
glslang
|
||||
meson
|
||||
ninja
|
||||
];
|
||||
buildInputs =
|
||||
[
|
||||
spirv-headers
|
||||
vulkan-headers
|
||||
]
|
||||
++ lib.optionals (!isWindows && sdl2Support) [ SDL2 ]
|
||||
++ lib.optionals (!isWindows && glfwSupport) [ glfw ]
|
||||
++ lib.optionals isWindows [ windows.pthreads ];
|
||||
@ -50,15 +61,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mkdir -p include/spirv/include include/vulkan/include
|
||||
'';
|
||||
|
||||
mesonFlags = [
|
||||
"--buildtype" "release"
|
||||
"--prefix" "${placeholder "out"}"
|
||||
] ++ lib.optional glfwSupport "-Ddxvk_native_wsi=glfw";
|
||||
mesonBuildType = "release";
|
||||
|
||||
mesonFlags = lib.optionals glfwSupport [ "-Ddxvk_native_wsi=glfw" ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
meta = {
|
||||
description = "A Vulkan-based translation layer for Direct3D 9/10/11";
|
||||
homepage = "https://github.com/doitsujin/dxvk";
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "gitlab-ci-local";
|
||||
version = "4.47.0";
|
||||
version = "4.48.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firecow";
|
||||
repo = "gitlab-ci-local";
|
||||
rev = version;
|
||||
hash = "sha256-AMqifAdC4aPra/KfM0Z8L1mF6+lA0dv9tt/cXSd3Ov4=";
|
||||
hash = "sha256-QdbVI6aby/UQCR3G25nvmvoXNMDndgLYz/hOTmj5dnc=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-GVqGA4aMfA08j/+fy+DA6udi52lmfDeAkE59d9CMAqg=";
|
||||
npmDepsHash = "sha256-ebrdMbSAsughHCuV86s6WA12a8hqA2yyC/rJUyViOrI=";
|
||||
|
||||
postPatch = ''
|
||||
# remove cleanup which runs git commands
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "grype";
|
||||
version = "0.77.0";
|
||||
version = "0.77.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = "grype";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-EnAMAmoP8rbkOkdPPxkN14lOPVYPqVpmaekfXBboeyI=";
|
||||
hash = "sha256-Qfoo05MicnQ1shbEV/Rrz9TDrMBDvWBr0U/ZqnlnLTI=";
|
||||
# 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;
|
||||
@ -30,7 +30,7 @@ buildGoModule rec {
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-oJNTvbfVkz4fK+EsF2ZoFfBSlkt0pFT4r2QDyhZhv5Y=";
|
||||
vendorHash = "sha256-lAq1PRElWR0F+OfuSBpR/gnFOptFH33ObR8yd1k7oMk=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
fetchYarnDeps,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
makeWrapper,
|
||||
wrapGAppsHook,
|
||||
electron,
|
||||
}:
|
||||
@ -37,6 +38,7 @@ mkYarnPackage rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
makeWrapper
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
@ -77,8 +79,9 @@ mkYarnPackage rec {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# we use makeShellWrapper instead of the makeBinaryWrapper provided by wrapGAppsHook for proper shell variable expansion
|
||||
postFixup = ''
|
||||
makeWrapper ${electron}/bin/electron $out/bin/koodo-reader \
|
||||
makeShellWrapper ${electron}/bin/electron $out/bin/koodo-reader \
|
||||
--add-flags $out/share/lib/koodo-reader/resources/app.asar \
|
||||
"''${gappsWrapperArgs[@]}" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "labelle";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "labelle-org";
|
||||
repo = "labelle";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JnV5A3/toTCHCEb0dygouR9MZfk2kdmsKVscwYI2y/Y=";
|
||||
hash = "sha256-fLlYqJs/V5t8IdfVkfBsjtjM1rRdCyTYF87G+h1VU5Y=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -39,6 +39,8 @@ python3Packages.buildPythonApplication rec {
|
||||
pyqt6
|
||||
python-barcode
|
||||
pyusb
|
||||
rich
|
||||
typer
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
|
||||
@ -5,10 +5,10 @@
|
||||
|
||||
let
|
||||
pname = "lmstudio";
|
||||
version = "0.2.18";
|
||||
version = "0.2.20";
|
||||
src = fetchurl {
|
||||
url = "https://releases.lmstudio.ai/linux/${version}/beta/LM_Studio-${version}.AppImage";
|
||||
hash = "sha256-cUa0fjV7xx6+2tnGVP7uLG0QQb44LhP2nYsn6Qn0al4=";
|
||||
hash = "sha256-T92ZDqGvxJfBkAWsK8EgHdQZnLefK3gDP2vCTL8X+eM=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
|
||||
@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/michaelrsweet/lprint";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ChlorideCull ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -18,11 +18,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lunacy";
|
||||
version = "9.5.0";
|
||||
version = "9.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://lcdn.icons8.com/setup/Lunacy_${finalAttrs.version}.deb";
|
||||
hash = "sha256-dG2xLoqRQJsaR7v00iN46GP4jB8WVrxayn2CSQLCUlQ=";
|
||||
hash = "sha256-PvQGDUC9BsIql4xMM1OH45gq3YtJMKJcYg4N2o18hno=";
|
||||
};
|
||||
|
||||
unpackCmd = ''
|
||||
|
||||
88
pkgs/by-name/lx/lx-music-desktop/package.nix
Normal file
88
pkgs/by-name/lx/lx-music-desktop/package.nix
Normal file
@ -0,0 +1,88 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, makeWrapper
|
||||
|
||||
, dpkg
|
||||
, libGL
|
||||
, systemd
|
||||
, electron_28
|
||||
|
||||
, commandLineArgs ? ""
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "lx-music-desktop";
|
||||
version = "2.7.0";
|
||||
|
||||
buildUrl = version: arch: "https://github.com/lyswhut/lx-music-desktop/releases/download/v${version}/lx-music-desktop_${version}_${arch}.deb";
|
||||
|
||||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = buildUrl version "amd64";
|
||||
hash = "sha256-+mCAFfiJwa+RQ/9vnSPDrC1LoLIoZyFUEJAF6sXdqRM=";
|
||||
};
|
||||
|
||||
aarch64-linux = fetchurl {
|
||||
url = buildUrl version "arm64";
|
||||
hash = "sha256-fDlgHJqoZLGnUuZeZGdocYLbsE02QBrWPKS31fbGThk=";
|
||||
};
|
||||
|
||||
armv7l-linux = fetchurl {
|
||||
url = buildUrl version "armv7l";
|
||||
hash = "sha256-X6EXsBvTbPGXCJ+ektMCMGDG2zqGKBvWT/TwjGFL3ug=";
|
||||
};
|
||||
};
|
||||
|
||||
host = stdenv.hostPlatform.system;
|
||||
src = srcs.${host} or (throw "Unsupported system: ${host}");
|
||||
|
||||
runtimeLibs = lib.makeLibraryPath [
|
||||
libGL
|
||||
stdenv.cc.cc.lib
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version src;
|
||||
|
||||
nativeBuildInputs = [
|
||||
dpkg
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
runtimeDependencies = map lib.getLib [
|
||||
systemd
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/opt/lx-music-desktop
|
||||
cp -r opt/lx-music-desktop/{resources,locales} $out/opt/lx-music-desktop
|
||||
cp -r usr/share $out/share
|
||||
|
||||
substituteInPlace $out/share/applications/lx-music-desktop.desktop \
|
||||
--replace-fail "/opt/lx-music-desktop/lx-music-desktop" "$out/bin/lx-music-desktop" \
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
makeWrapper ${electron_28}/bin/electron $out/bin/lx-music-desktop \
|
||||
--add-flags $out/opt/lx-music-desktop/resources/app.asar \
|
||||
--prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
|
||||
--add-flags ${lib.escapeShellArg commandLineArgs} \
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A music software based on Electron and Vue";
|
||||
homepage = "https://github.com/lyswhut/lx-music-desktop";
|
||||
changelog = "https://github.com/lyswhut/lx-music-desktop/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" ];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
mainProgram = "lx-music-desktop";
|
||||
maintainers = with maintainers; [ oo-infty ];
|
||||
};
|
||||
}
|
||||
@ -13,6 +13,7 @@
|
||||
enableSass ? true,
|
||||
enableX11 ? true,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mixxc";
|
||||
version = "0.2.2";
|
||||
@ -26,10 +27,11 @@ rustPlatform.buildRustPackage rec {
|
||||
cargoHash = "sha256-l9inqqUiLObrqd/8pNobwBbLaiPJD39YK/38CWfDh+Q=";
|
||||
|
||||
cargoBuildFlags = [ "--locked" ];
|
||||
buildFeatures = with lib; [
|
||||
(optionals enableWayland "Wayland")
|
||||
(optionals enableX11 "X11")
|
||||
(optionals enableSass "Sass")
|
||||
|
||||
buildFeatures = [
|
||||
(lib.optionals enableWayland "Wayland")
|
||||
(lib.optionals enableX11 "X11")
|
||||
(lib.optionals enableSass "Sass")
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -37,11 +39,12 @@ rustPlatform.buildRustPackage rec {
|
||||
installShellFiles
|
||||
wrapGAppsHook4
|
||||
];
|
||||
buildInputs = with lib; [
|
||||
|
||||
buildInputs = [
|
||||
libpulseaudio
|
||||
gtk4
|
||||
(optionals enableWayland gtk4-layer-shell)
|
||||
(optionals enableX11 libxcb)
|
||||
(lib.optionals enableWayland gtk4-layer-shell)
|
||||
(lib.optionals enableX11 libxcb)
|
||||
];
|
||||
|
||||
outputs = [
|
||||
@ -53,12 +56,12 @@ rustPlatform.buildRustPackage rec {
|
||||
installManPage $src/doc/mixxc.1
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "A minimalistic and customizable volume mixer";
|
||||
homepage = "https://github.com/Elvyria/mixxc";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ daru-san ];
|
||||
license = with lib.licenses; [ mit ];
|
||||
maintainers = with lib.maintainers; [ daru-san ];
|
||||
mainProgram = "mixxc";
|
||||
platforms = platforms.linux;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "oelint-adv";
|
||||
version = "5.3.0";
|
||||
version = "5.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "oelint_adv";
|
||||
hash = "sha256-EAYHxp7pXXYNYRGsQ3XckRxDM1pFHgiZr+gj8fJLqa0=";
|
||||
hash = "sha256-8fftHQpv2GZhi3ZDXYUG7uAiWuuX79dntGAbKIvv4Kc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -53,14 +53,14 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "olvid";
|
||||
version = "1.5.0";
|
||||
version = "1.5.2";
|
||||
|
||||
dontUnpack = true;
|
||||
dontWrapGApps = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://static.olvid.io/linux/${repo}-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-iiMc9mM+uUVeS1i1gzXMZaMwSChdz7vNrL9uqJlR8NU=";
|
||||
hash = "sha256-WjIOk3dPSXQdAR2fdXseV0NdOjld0PzyqnUx/VbvQio=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
49
pkgs/by-name/pa/parallel-hashmap/package.nix
Normal file
49
pkgs/by-name/pa/parallel-hashmap/package.nix
Normal file
@ -0,0 +1,49 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, gtest
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "parallel-hashmap";
|
||||
version = "1.3.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greg7mdp";
|
||||
repo = "parallel-hashmap";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-6KhzXUxa4WOsRrPmSSgguFxRGTOTIaxiJBFFSzOhch0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# don't download googletest, but build it from source
|
||||
# https://github.com/greg7mdp/parallel-hashmap/blob/be6a2c79857c9ea76760ca6ce782e1609713428e/CMakeLists.txt#L98
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "include(cmake/DownloadGTest.cmake)" "add_subdirectory(${gtest.src} ./googletest-build EXCLUDE_FROM_ALL)"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DPHMAP_BUILD_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}"
|
||||
"-DPHMAP_BUILD_EXAMPLES=OFF"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
gtest
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A family of header-only, very fast and memory-friendly hashmap and btree containers";
|
||||
homepage = "https://github.com/greg7mdp/parallel-hashmap";
|
||||
changelog = "https://github.com/greg7mdp/parallel-hashmap/releases/tag/${finalAttrs.src.rev}";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ natsukium ];
|
||||
};
|
||||
})
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "qrtool";
|
||||
version = "0.10.9";
|
||||
version = "0.10.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sorairolake";
|
||||
repo = "qrtool";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wLi2lb48+leH7AfpIj0/vDxPZhBjvuacVit8U8zArjs=";
|
||||
sha256 = "sha256-2gUvnQjAA0nTeJL4IbsfCmeSD+mGKjywJCCi914f5mM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-igbRsNWPtE/KcSLqzKIFEm3lmdkIxj/22yo/8Gye96k=";
|
||||
cargoHash = "sha256-M5G5f+aycpIbFaPbkUNalMK3if1PIAXD7MaNsLzdvI4=";
|
||||
|
||||
nativeBuildInputs = [ asciidoctor installShellFiles ];
|
||||
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "quarkus-cli";
|
||||
version = "3.9.4";
|
||||
version = "3.9.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-ez4D+czYDhs/GNrjRF8Bx999JRW0EigMxc39fOH54V8=";
|
||||
hash = "sha256-3vcuf49gutlXbFT5mUuZw9fDjyvb0Q+lXyn4n+RcLdU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
260
pkgs/by-name/rm/rmenu/Cargo.lock
generated
260
pkgs/by-name/rm/rmenu/Cargo.lock
generated
@ -76,9 +76,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "anyhow"
|
||||
version = "1.0.81"
|
||||
version = "1.0.82"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
|
||||
checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
|
||||
|
||||
[[package]]
|
||||
name = "arrayref"
|
||||
@ -105,27 +105,26 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "async-channel"
|
||||
version = "2.2.0"
|
||||
version = "2.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3"
|
||||
checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928"
|
||||
dependencies = [
|
||||
"concurrent-queue",
|
||||
"event-listener 5.3.0",
|
||||
"event-listener-strategy 0.5.1",
|
||||
"event-listener-strategy 0.5.2",
|
||||
"futures-core",
|
||||
"pin-project-lite",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "async-executor"
|
||||
version = "1.10.0"
|
||||
version = "1.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5f98c37cf288e302c16ef6c8472aad1e034c6c84ce5ea7b8101c98eb4a802fee"
|
||||
checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a"
|
||||
dependencies = [
|
||||
"async-lock 3.3.0",
|
||||
"async-task",
|
||||
"concurrent-queue",
|
||||
"fastrand 2.0.2",
|
||||
"fastrand 2.1.0",
|
||||
"futures-lite 2.3.0",
|
||||
"slab",
|
||||
]
|
||||
@ -136,7 +135,7 @@ version = "2.4.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
|
||||
dependencies = [
|
||||
"async-channel 2.2.0",
|
||||
"async-channel 2.2.1",
|
||||
"async-executor",
|
||||
"async-io 2.3.2",
|
||||
"async-lock 3.3.0",
|
||||
@ -177,8 +176,8 @@ dependencies = [
|
||||
"futures-io",
|
||||
"futures-lite 2.3.0",
|
||||
"parking",
|
||||
"polling 3.6.0",
|
||||
"rustix 0.38.32",
|
||||
"polling 3.7.0",
|
||||
"rustix 0.38.34",
|
||||
"slab",
|
||||
"tracing",
|
||||
"windows-sys 0.52.0",
|
||||
@ -232,19 +231,19 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "async-task"
|
||||
version = "4.7.0"
|
||||
version = "4.7.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799"
|
||||
checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
|
||||
|
||||
[[package]]
|
||||
name = "async-trait"
|
||||
version = "0.1.79"
|
||||
version = "0.1.80"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681"
|
||||
checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.58",
|
||||
"syn 2.0.60",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -357,18 +356,16 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "blocking"
|
||||
version = "1.5.1"
|
||||
version = "1.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118"
|
||||
checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88"
|
||||
dependencies = [
|
||||
"async-channel 2.2.0",
|
||||
"async-channel 2.2.1",
|
||||
"async-lock 3.3.0",
|
||||
"async-task",
|
||||
"fastrand 2.0.2",
|
||||
"futures-io",
|
||||
"futures-lite 2.3.0",
|
||||
"piper",
|
||||
"tracing",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -489,9 +486,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.0.92"
|
||||
version = "1.0.95"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41"
|
||||
checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b"
|
||||
|
||||
[[package]]
|
||||
name = "cesu8"
|
||||
@ -512,9 +509,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cfg-expr"
|
||||
version = "0.15.7"
|
||||
version = "0.15.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d"
|
||||
checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
|
||||
dependencies = [
|
||||
"smallvec",
|
||||
"target-lexicon",
|
||||
@ -557,7 +554,7 @@ dependencies = [
|
||||
"heck 0.5.0",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.58",
|
||||
"syn 2.0.60",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -610,9 +607,9 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
|
||||
|
||||
[[package]]
|
||||
name = "combine"
|
||||
version = "4.6.6"
|
||||
version = "4.6.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
|
||||
checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"memchr",
|
||||
@ -620,9 +617,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "concurrent-queue"
|
||||
version = "2.4.0"
|
||||
version = "2.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363"
|
||||
checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
|
||||
dependencies = [
|
||||
"crossbeam-utils",
|
||||
]
|
||||
@ -772,7 +769,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"syn 2.0.58",
|
||||
"syn 2.0.60",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -843,7 +840,7 @@ dependencies = [
|
||||
"ident_case",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.58",
|
||||
"syn 2.0.60",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -876,7 +873,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
|
||||
dependencies = [
|
||||
"darling_core 0.20.8",
|
||||
"quote",
|
||||
"syn 2.0.58",
|
||||
"syn 2.0.60",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -900,7 +897,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "desktop"
|
||||
version = "0.0.1"
|
||||
version = "0.0.2"
|
||||
dependencies = [
|
||||
"freedesktop-desktop-entry",
|
||||
"freedesktop-icons",
|
||||
@ -968,7 +965,7 @@ dependencies = [
|
||||
"prettyplease",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.58",
|
||||
"syn 2.0.60",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -1079,7 +1076,7 @@ dependencies = [
|
||||
"dioxus-core",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.58",
|
||||
"syn 2.0.60",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -1161,9 +1158,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
|
||||
|
||||
[[package]]
|
||||
name = "either"
|
||||
version = "1.10.0"
|
||||
version = "1.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
|
||||
checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
|
||||
|
||||
[[package]]
|
||||
name = "enumset"
|
||||
@ -1183,7 +1180,7 @@ dependencies = [
|
||||
"darling 0.20.8",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.58",
|
||||
"syn 2.0.60",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -1265,9 +1262,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "event-listener-strategy"
|
||||
version = "0.5.1"
|
||||
version = "0.5.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3"
|
||||
checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
|
||||
dependencies = [
|
||||
"event-listener 5.3.0",
|
||||
"pin-project-lite",
|
||||
@ -1284,9 +1281,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "fastrand"
|
||||
version = "2.0.2"
|
||||
version = "2.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984"
|
||||
checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
|
||||
|
||||
[[package]]
|
||||
name = "fdeflate"
|
||||
@ -1309,9 +1306,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "flate2"
|
||||
version = "1.0.28"
|
||||
version = "1.0.29"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
|
||||
checksum = "4556222738635b7a3417ae6130d8f52201e45a0c4d1a907f0826383adb5f85e7"
|
||||
dependencies = [
|
||||
"crc32fast",
|
||||
"miniz_oxide",
|
||||
@ -1480,7 +1477,7 @@ version = "2.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
|
||||
dependencies = [
|
||||
"fastrand 2.0.2",
|
||||
"fastrand 2.1.0",
|
||||
"futures-core",
|
||||
"futures-io",
|
||||
"parking",
|
||||
@ -1495,7 +1492,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.58",
|
||||
"syn 2.0.60",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -1822,7 +1819,7 @@ dependencies = [
|
||||
"proc-macro-error",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.58",
|
||||
"syn 2.0.60",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -2324,9 +2321,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "lock_api"
|
||||
version = "0.4.11"
|
||||
version = "0.4.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
|
||||
checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"scopeguard",
|
||||
@ -2674,9 +2671,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
|
||||
|
||||
[[package]]
|
||||
name = "parking_lot"
|
||||
version = "0.12.1"
|
||||
version = "0.12.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
|
||||
checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb"
|
||||
dependencies = [
|
||||
"lock_api",
|
||||
"parking_lot_core",
|
||||
@ -2684,15 +2681,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "parking_lot_core"
|
||||
version = "0.9.9"
|
||||
version = "0.9.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
|
||||
checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"redox_syscall",
|
||||
"smallvec",
|
||||
"windows-targets 0.48.5",
|
||||
"windows-targets 0.52.5",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -2799,7 +2796,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4"
|
||||
dependencies = [
|
||||
"atomic-waker",
|
||||
"fastrand 2.0.2",
|
||||
"fastrand 2.1.0",
|
||||
"futures-io",
|
||||
]
|
||||
|
||||
@ -2840,15 +2837,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "polling"
|
||||
version = "3.6.0"
|
||||
version = "3.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6"
|
||||
checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"concurrent-queue",
|
||||
"hermit-abi",
|
||||
"pin-project-lite",
|
||||
"rustix 0.38.32",
|
||||
"rustix 0.38.34",
|
||||
"tracing",
|
||||
"windows-sys 0.52.0",
|
||||
]
|
||||
@ -2867,12 +2864,12 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
|
||||
|
||||
[[package]]
|
||||
name = "prettyplease"
|
||||
version = "0.2.17"
|
||||
version = "0.2.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7"
|
||||
checksum = "5ac2cf0f2e4f42b49f5ffd07dae8d746508ef7526c13940e5f524012ae6c6550"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"syn 2.0.58",
|
||||
"syn 2.0.60",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -2917,9 +2914,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.79"
|
||||
version = "1.0.81"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
|
||||
checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
@ -2935,9 +2932,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.35"
|
||||
version = "1.0.36"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
|
||||
checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
@ -3037,11 +3034,11 @@ checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f"
|
||||
|
||||
[[package]]
|
||||
name = "redox_syscall"
|
||||
version = "0.4.1"
|
||||
version = "0.5.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
|
||||
checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"bitflags 2.5.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -3137,7 +3134,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rmenu"
|
||||
version = "1.2.1"
|
||||
version = "1.2.2"
|
||||
dependencies = [
|
||||
"cached 0.44.0",
|
||||
"clap",
|
||||
@ -3257,9 +3254,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rustix"
|
||||
version = "0.38.32"
|
||||
version = "0.38.34"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89"
|
||||
checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
|
||||
dependencies = [
|
||||
"bitflags 2.5.0",
|
||||
"errno",
|
||||
@ -3333,9 +3330,9 @@ checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.197"
|
||||
version = "1.0.199"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
|
||||
checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
@ -3352,20 +3349,20 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.197"
|
||||
version = "1.0.199"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
|
||||
checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.58",
|
||||
"syn 2.0.60",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.115"
|
||||
version = "1.0.116"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd"
|
||||
checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
|
||||
dependencies = [
|
||||
"itoa 1.0.11",
|
||||
"ryu",
|
||||
@ -3380,7 +3377,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.58",
|
||||
"syn 2.0.60",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -3639,9 +3636,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.58"
|
||||
version = "2.0.60"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687"
|
||||
checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@ -3774,22 +3771,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c"
|
||||
|
||||
[[package]]
|
||||
name = "thiserror"
|
||||
version = "1.0.58"
|
||||
version = "1.0.59"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
|
||||
checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa"
|
||||
dependencies = [
|
||||
"thiserror-impl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror-impl"
|
||||
version = "1.0.58"
|
||||
version = "1.0.59"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
|
||||
checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.58",
|
||||
"syn 2.0.60",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -3870,7 +3867,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.58",
|
||||
"syn 2.0.60",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -3891,7 +3888,7 @@ dependencies = [
|
||||
"serde",
|
||||
"serde_spanned",
|
||||
"toml_datetime",
|
||||
"toml_edit 0.22.9",
|
||||
"toml_edit 0.22.12",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -3916,15 +3913,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "toml_edit"
|
||||
version = "0.22.9"
|
||||
version = "0.22.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4"
|
||||
checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef"
|
||||
dependencies = [
|
||||
"indexmap",
|
||||
"serde",
|
||||
"serde_spanned",
|
||||
"toml_datetime",
|
||||
"winnow 0.6.5",
|
||||
"winnow 0.6.7",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -3946,7 +3943,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.58",
|
||||
"syn 2.0.60",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -4211,7 +4208,7 @@ dependencies = [
|
||||
"once_cell",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.58",
|
||||
"syn 2.0.60",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
|
||||
@ -4245,7 +4242,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.58",
|
||||
"syn 2.0.60",
|
||||
"wasm-bindgen-backend",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
@ -4268,9 +4265,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "webbrowser"
|
||||
version = "0.8.14"
|
||||
version = "0.8.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dd595fb70f33583ac61644820ebc144a26c96028b625b96cafcd861f4743fbc8"
|
||||
checksum = "db67ae75a9405634f5882791678772c94ff5f16a66535aae186e26aa0841fc8b"
|
||||
dependencies = [
|
||||
"core-foundation",
|
||||
"home",
|
||||
@ -4380,7 +4377,7 @@ dependencies = [
|
||||
"either",
|
||||
"home",
|
||||
"once_cell",
|
||||
"rustix 0.38.32",
|
||||
"rustix 0.38.34",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -4401,11 +4398,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
||||
|
||||
[[package]]
|
||||
name = "winapi-util"
|
||||
version = "0.1.6"
|
||||
version = "0.1.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
|
||||
checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
|
||||
dependencies = [
|
||||
"winapi",
|
||||
"windows-sys 0.52.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -4498,7 +4495,7 @@ version = "0.52.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
|
||||
dependencies = [
|
||||
"windows-targets 0.52.4",
|
||||
"windows-targets 0.52.5",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -4533,17 +4530,18 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "windows-targets"
|
||||
version = "0.52.4"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
|
||||
checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
|
||||
dependencies = [
|
||||
"windows_aarch64_gnullvm 0.52.4",
|
||||
"windows_aarch64_msvc 0.52.4",
|
||||
"windows_i686_gnu 0.52.4",
|
||||
"windows_i686_msvc 0.52.4",
|
||||
"windows_x86_64_gnu 0.52.4",
|
||||
"windows_x86_64_gnullvm 0.52.4",
|
||||
"windows_x86_64_msvc 0.52.4",
|
||||
"windows_aarch64_gnullvm 0.52.5",
|
||||
"windows_aarch64_msvc 0.52.5",
|
||||
"windows_i686_gnu 0.52.5",
|
||||
"windows_i686_gnullvm",
|
||||
"windows_i686_msvc 0.52.5",
|
||||
"windows_x86_64_gnu 0.52.5",
|
||||
"windows_x86_64_gnullvm 0.52.5",
|
||||
"windows_x86_64_msvc 0.52.5",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -4566,9 +4564,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_gnullvm"
|
||||
version = "0.52.4"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
|
||||
checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
@ -4584,9 +4582,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
version = "0.52.4"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
|
||||
checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
@ -4602,9 +4600,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.52.4"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
|
||||
checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnullvm"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
@ -4620,9 +4624,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.52.4"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
|
||||
checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
@ -4638,9 +4642,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.52.4"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
|
||||
checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
@ -4656,9 +4660,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
version = "0.52.4"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
|
||||
checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
@ -4674,9 +4678,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.52.4"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
|
||||
checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
|
||||
|
||||
[[package]]
|
||||
name = "winnow"
|
||||
@ -4689,9 +4693,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "winnow"
|
||||
version = "0.6.5"
|
||||
version = "0.6.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8"
|
||||
checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rmenu";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "imgurbot12";
|
||||
repo = "rmenu";
|
||||
hash = "sha256-JHJZfDxrDi0rJSloPdOVdvo/XkrFhvshd7yZWn/zELU=";
|
||||
hash = "sha256-khauloUGVuekR+Lran1DLnsxwY8sIf5PsEKY7sNy1K4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://github.com/ikatson/rqbit";
|
||||
changelog = "https://github.com/ikatson/rqbit/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ cafkafk ];
|
||||
mainProgram = "rqbit";
|
||||
};
|
||||
}
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "simdutf";
|
||||
version = "5.2.5";
|
||||
version = "5.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simdutf";
|
||||
repo = "simdutf";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-X/mpVmZ9FyN5MOcQRT1CjH5wsirSQ4rqdPE0lM5meT8=";
|
||||
hash = "sha256-fbDQPHoGqbojvhsMOrg/gMMQJ8bODV/P53F05yIHcTQ=";
|
||||
};
|
||||
|
||||
# Fix build on darwin
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "stirling-pdf";
|
||||
version = "0.23.0";
|
||||
version = "0.23.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Stirling-Tools";
|
||||
repo = "Stirling-PDF";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-MKNXjQSSjpGeIBeXUy42vQkCf3zEQyR3q1/j3xWVFvw=";
|
||||
hash = "sha256-71caSM4J0sNMqWX0ok8aO3wdpVcjfrn/yVGLWeO5fOk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
97
pkgs/by-name/ta/taler-exchange/package.nix
Normal file
97
pkgs/by-name/ta/taler-exchange/package.nix
Normal file
@ -0,0 +1,97 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchgit,
|
||||
curl,
|
||||
gnunet,
|
||||
jansson,
|
||||
libgcrypt,
|
||||
libmicrohttpd,
|
||||
libsodium,
|
||||
libunistring,
|
||||
pkg-config,
|
||||
postgresql,
|
||||
autoreconfHook,
|
||||
python3,
|
||||
recutils,
|
||||
wget,
|
||||
jq,
|
||||
gettext,
|
||||
texinfo,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.10.2";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "taler-exchange";
|
||||
inherit version;
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.taler.net/exchange.git";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-dl8lZ7uKUr+KSUaT4xlkaX3W5UoW2Zfu/0iVXvLejnA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libgcrypt
|
||||
libmicrohttpd
|
||||
jansson
|
||||
libsodium
|
||||
postgresql
|
||||
curl
|
||||
recutils
|
||||
gettext
|
||||
texinfo # Fix 'makeinfo' is missing on your system.
|
||||
libunistring
|
||||
python3.pkgs.jinja2
|
||||
# jq is necessary for some tests and is checked by configure script
|
||||
jq
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ gnunet ];
|
||||
|
||||
# From ./bootstrap
|
||||
preAutoreconf = ''
|
||||
./contrib/gana-generate.sh
|
||||
pushd contrib
|
||||
find wallet-core/aml-backoffice/ -type f -printf ' %p \\\n' | sort > Makefile.am.ext
|
||||
truncate -s -2 Makefile.am.ext
|
||||
cat Makefile.am.in Makefile.am.ext >> Makefile.am
|
||||
popd
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
nativeCheckInputs = [
|
||||
wget
|
||||
curl
|
||||
];
|
||||
|
||||
checkTarget = "check";
|
||||
|
||||
meta = with lib; {
|
||||
description = ''
|
||||
Taler is an electronic payment system providing the ability to pay
|
||||
anonymously using digital cash. Taler consists of a network protocol
|
||||
definition (using a RESTful API over HTTP), a Exchange (which creates
|
||||
digital coins), a Wallet (which allows customers to manage, store and
|
||||
spend digital coins), and a Merchant website which allows customers to
|
||||
spend their digital coins. Naturally, each Merchant is different, but
|
||||
Taler includes code examples to help Merchants integrate Taler as a
|
||||
payment system.
|
||||
'';
|
||||
homepage = "https://taler.net/";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ astro ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
88
pkgs/by-name/ta/taler-merchant/package.nix
Normal file
88
pkgs/by-name/ta/taler-merchant/package.nix
Normal file
@ -0,0 +1,88 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchgit,
|
||||
gnunet,
|
||||
qrencode,
|
||||
taler-exchange,
|
||||
libtool,
|
||||
pkg-config,
|
||||
autoreconfHook,
|
||||
jq,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.10.2";
|
||||
|
||||
taler-wallet-core = fetchgit {
|
||||
url = "https://git.taler.net/wallet-core.git";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jC8XhcHZxv7ww+wspJUqTq6x6FIeEehQmE03ttJZWT4=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "taler-merchant";
|
||||
inherit version;
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.taler.net/merchant.git";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-WY5Fk5HcVjxsnqt69m8E9ikW+nQDkCuKtT1CTsupz5c=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
ln -s ${taler-wallet-core}/spa.html $sourceRoot/contrib/
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
autoreconfHook
|
||||
];
|
||||
|
||||
buildInputs = taler-exchange.buildInputs ++ [
|
||||
qrencode
|
||||
taler-exchange
|
||||
# for ltdl.h
|
||||
libtool
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ gnunet ];
|
||||
|
||||
# From ./bootstrap
|
||||
preAutoreconf = ''
|
||||
pushd contrib
|
||||
find wallet-core/backoffice/ -type f -printf ' %p \\\n' | sort > Makefile.am.ext
|
||||
truncate -s -2 Makefile.am.ext
|
||||
cat Makefile.am.in Makefile.am.ext >> Makefile.am
|
||||
popd
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-gnunet=${gnunet}"
|
||||
"--with-exchange=${taler-exchange}"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
nativeCheckInputs = [ jq ];
|
||||
|
||||
checkTarget = "check";
|
||||
|
||||
meta = with lib; {
|
||||
description = ''
|
||||
This is the GNU Taler merchant backend. It provides the logic that should run
|
||||
at every GNU Taler merchant. The GNU Taler merchant is a RESTful backend that
|
||||
can be used to setup orders and process payments. This component allows
|
||||
merchants to receive payments without invading the customers' privacy. Of
|
||||
course, this applies mostly for digital goods, as the merchant does not need
|
||||
to know the customer's physical address.
|
||||
'';
|
||||
homepage = "https://taler.net/";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ astro ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "tuifimanager";
|
||||
version = "4.0.0";
|
||||
version = "4.0.5";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GiorgosXou";
|
||||
repo = "TUIFIManager";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bv/+x2xppUK9i3HOm93FIQRu1xlB4wCKZzAapkVlrM0=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DuCrIJuADmJ0MHIP0+OJ0zCrQR/oGdgzJ1xck4m/tPo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -34,7 +34,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
attempt to get more attention to the Uni-Curses project.
|
||||
'';
|
||||
homepage = "https://github.com/GiorgosXou/TUIFIManager";
|
||||
changelog = "https://github.com/GiorgosXou/TUIFIManager/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ michaelBelsanti sigmanificient ];
|
||||
mainProgram = "tuifi";
|
||||
|
||||
@ -6,6 +6,8 @@
|
||||
, freetype
|
||||
, lib
|
||||
, libglvnd
|
||||
, libxkbcommon
|
||||
, wayland
|
||||
, makeWrapper
|
||||
, mold
|
||||
, pkg-config
|
||||
@ -47,7 +49,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/uad-ng \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ fontconfig freetype libglvnd xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr ]} \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ fontconfig freetype libglvnd libxkbcommon wayland xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr ]} \
|
||||
--suffix PATH : ${lib.makeBinPath [ android-tools ]}
|
||||
'';
|
||||
|
||||
@ -57,7 +59,7 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation";
|
||||
license = licenses.gpl3Only;
|
||||
mainProgram = "uad-ng";
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ lavafroth ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
59
pkgs/by-name/ve/vencord/package-lock.json
generated
59
pkgs/by-name/ve/vencord/package-lock.json
generated
@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "vencord",
|
||||
"version": "1.7.8",
|
||||
"version": "1.7.9",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "vencord",
|
||||
"version": "1.7.8",
|
||||
"version": "1.7.9",
|
||||
"license": "GPL-3.0-or-later",
|
||||
"dependencies": {
|
||||
"@sapphi-red/web-noise-suppressor": "0.3.3",
|
||||
@ -54,15 +54,6 @@
|
||||
"pnpm": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/@aashutoshrathi/word-wrap": {
|
||||
"version": "1.2.6",
|
||||
"resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
|
||||
"integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
|
||||
"dev": true,
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@babel/code-frame": {
|
||||
"version": "7.24.2",
|
||||
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.2.tgz",
|
||||
@ -779,9 +770,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@types/diff": {
|
||||
"version": "5.0.9",
|
||||
"resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.0.9.tgz",
|
||||
"integrity": "sha512-RWVEhh/zGXpAVF/ZChwNnv7r4rvqzJ7lYNSmZSVTxjV0PBLf6Qu7RNg+SUtkpzxmiNkjCx0Xn2tPp7FIkshJwQ==",
|
||||
"version": "5.2.0",
|
||||
"resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.2.0.tgz",
|
||||
"integrity": "sha512-pjJH+02ukgJRW0mViDUA1cdC+wzSgRu0e4cPuogPLAw0i66y62iMP0ZlXoJAmoXrKRZnF3pMDwyKZsgNVlMX4A==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/@types/filesystem": {
|
||||
@ -845,9 +836,9 @@
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/@types/react": {
|
||||
"version": "18.2.79",
|
||||
"resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.79.tgz",
|
||||
"integrity": "sha512-RwGAGXPl9kSXwdNTafkOEuFrTBD5SA2B3iEB96xi8+xu5ddUa/cpvyVCSNn+asgLCTHkb5ZxN8gbuibYJi4s1w==",
|
||||
"version": "18.3.1",
|
||||
"resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.1.tgz",
|
||||
"integrity": "sha512-V0kuGBX3+prX+DQ/7r2qsv1NsdfnCLnTgnRJ1pYnxykBhGMz+qj+box5lq7XsO5mtZsBqpjwwTu/7wszPfMBcw==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"@types/prop-types": "*",
|
||||
@ -855,9 +846,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@types/react-dom": {
|
||||
"version": "18.2.25",
|
||||
"resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.25.tgz",
|
||||
"integrity": "sha512-o/V48vf4MQh7juIKZU2QGDfli6p1+OOi5oXx36Hffpc9adsHeXjVp8rHuPkjd8VT8sOJ2Zp05HR7CdpGTIUFUA==",
|
||||
"version": "18.3.0",
|
||||
"resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.0.tgz",
|
||||
"integrity": "sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"@types/react": "*"
|
||||
@ -1658,9 +1649,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/css-functions-list": {
|
||||
"version": "3.2.1",
|
||||
"resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.1.tgz",
|
||||
"integrity": "sha512-Nj5YcaGgBtuUmn1D7oHqPW0c9iui7xsTsj5lIX8ZgevdfhmjFfKB3r8moHJtNJnctnYXJyYX5I1pp90HM4TPgQ==",
|
||||
"version": "3.2.2",
|
||||
"resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.2.tgz",
|
||||
"integrity": "sha512-c+N0v6wbKVxTu5gOBBFkr9BEdBWaqqjQeiJ8QvSRIJOf+UxlJh930m8e6/WNeODIK0mYLFkoONrnj16i2EcvfQ==",
|
||||
"dev": true,
|
||||
"engines": {
|
||||
"node": ">=12 || >=16"
|
||||
@ -2779,8 +2770,7 @@
|
||||
"node_modules/gifenc": {
|
||||
"version": "1.0.3",
|
||||
"resolved": "git+ssh://git@github.com/mattdesl/gifenc.git#64842fca317b112a8590f8fef2bf3825da8f6fe3",
|
||||
"integrity": "sha512-TCgWVyjxLxM20WaQQT5neiMbdt2cuFL0BngwxcK8sV9x+M6IF0x3RIETc3VRVxfmRUxzZk+Yfv1b9cLdDnTRIw==",
|
||||
"license": "MIT"
|
||||
"integrity": "sha512-TCgWVyjxLxM20WaQQT5neiMbdt2cuFL0BngwxcK8sV9x+M6IF0x3RIETc3VRVxfmRUxzZk+Yfv1b9cLdDnTRIw=="
|
||||
},
|
||||
"node_modules/glob": {
|
||||
"version": "7.2.3",
|
||||
@ -3823,17 +3813,17 @@
|
||||
}
|
||||
},
|
||||
"node_modules/optionator": {
|
||||
"version": "0.9.3",
|
||||
"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
|
||||
"integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
|
||||
"version": "0.9.4",
|
||||
"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
|
||||
"integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"@aashutoshrathi/word-wrap": "^1.2.3",
|
||||
"deep-is": "^0.1.3",
|
||||
"fast-levenshtein": "^2.0.6",
|
||||
"levn": "^0.4.1",
|
||||
"prelude-ls": "^1.2.1",
|
||||
"type-check": "^0.4.0"
|
||||
"type-check": "^0.4.0",
|
||||
"word-wrap": "^1.2.5"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 0.8.0"
|
||||
@ -5435,6 +5425,15 @@
|
||||
"node": ">= 8"
|
||||
}
|
||||
},
|
||||
"node_modules/word-wrap": {
|
||||
"version": "1.2.5",
|
||||
"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
|
||||
"integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
|
||||
"dev": true,
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/wrap-ansi": {
|
||||
"version": "7.0.0",
|
||||
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
|
||||
|
||||
@ -5,8 +5,8 @@
|
||||
, buildWebExtension ? false
|
||||
}:
|
||||
let
|
||||
version = "1.7.8";
|
||||
gitHash = "97ce410";
|
||||
version = "1.7.9";
|
||||
gitHash = "d294128";
|
||||
in
|
||||
buildNpmPackage rec {
|
||||
pname = "vencord";
|
||||
@ -16,7 +16,7 @@ buildNpmPackage rec {
|
||||
owner = "Vendicated";
|
||||
repo = "Vencord";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5kMBUdFupVxmlQ7NVJ7qzFoyQieDGHrFNkrzhlhEzJ0=";
|
||||
hash = "sha256-iXcWz/ZqhCQnqS37LVTXYW+1eeos0AUA0O5URb2FELU=";
|
||||
};
|
||||
|
||||
ESBUILD_BINARY_PATH = lib.getExe (esbuild.overrideAttrs (final: _: {
|
||||
@ -34,7 +34,7 @@ buildNpmPackage rec {
|
||||
npmRebuildFlags = [ "|| true" ];
|
||||
|
||||
makeCacheWritable = true;
|
||||
npmDepsHash = "sha256-LdLPNM2yCUXh0PxAbzI2YNF6QoX1iG2TixMh6XdVuX0=";
|
||||
npmDepsHash = "sha256-G3adLiSrEyAShTsNEaYLEPYACHoXTISiNp/9jru0mUc=";
|
||||
npmFlags = [ "--legacy-peer-deps" ];
|
||||
npmBuildScript = if buildWebExtension then "buildWeb" else "build";
|
||||
npmBuildFlags = [ "--" "--standalone" "--disable-updater" ];
|
||||
|
||||
@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wlogout";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ArtsyMacaw";
|
||||
repo = "wlogout";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-n8r+E6GXXjyDYBTOMiv5musamaUFSpRTM2qHgb047og=";
|
||||
hash = "sha256-/tYZy56ku68ziSOhy6Dex9RGy+blkU6CN2ze76y7718=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
@ -12,23 +11,15 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xclicker";
|
||||
version = "1.5.0";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "robiot";
|
||||
repo = "xclicker";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-3D49iMzCCT9Z2Pf5INHYFZusG0BQI7La7lLaSVM/4mc=";
|
||||
hash = "sha256-zVbOfqh21+/41N3FcAFajcZCrQ8iNqedZjgNQO0Zj04=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-malloc-size.patch";
|
||||
url = "https://github.com/robiot/xclicker/commit/c99f69a747e9df75fb3676be20a3ec805526d022.patch";
|
||||
hash = "sha256-ESbMBusJVNfbGxlEn1Kby00mnXvM5H0r03bX5ofC6Fg=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
@ -57,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://xclicker.xyz/";
|
||||
license = lib.licenses.gpl3Only;
|
||||
mainProgram = "xclicker";
|
||||
maintainers = with lib.maintainers; [ tomasajt ];
|
||||
maintainers = with lib.maintainers; [ gepbird tomasajt ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://github.com/harlanc/xiu";
|
||||
changelog = "https://github.com/harlanc/xiu/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ cafkafk ];
|
||||
mainProgram = "xiu";
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildGraalvmNativeImage rec {
|
||||
pname = "yamlscript";
|
||||
version = "0.1.57";
|
||||
version = "0.1.58";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/yaml/yamlscript/releases/download/${version}/yamlscript.cli-${version}-standalone.jar";
|
||||
hash = "sha256-nuYfYz1Q7PtVb9A2KEN2XGeINifEjsM4IqGiUBbTGFM=";
|
||||
hash = "sha256-rARUkbVq77uPrQZwfQ0NNM4XwYaVhSinLi0sCoVR63E=";
|
||||
};
|
||||
|
||||
executable = "ys";
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib
|
||||
, writeShellScript
|
||||
, writeShellApplication
|
||||
, coreutils
|
||||
, git
|
||||
, nix
|
||||
@ -10,114 +10,162 @@
|
||||
# commit.
|
||||
{ url ? null # The git url, if empty it will be set to src.gitRepoUrl
|
||||
, branch ? null
|
||||
, stableVersion ? false # Use version format according to RFC 107 (i.e. LAST_TAG+date=YYYY-MM-DD)
|
||||
, tagPrefix ? "" # strip this prefix from a tag name when using stable version
|
||||
, hardcodeZeroVersion ? false # Use a made-up version "0" instead of latest tag. Use when there is no previous release, or the project's tagging system is incompatible with what we expect from versions
|
||||
, tagFormat ? "*" # A `git describe --tags --match '<format>'` pattern that tags must match to be considered
|
||||
, tagPrefix ? null # strip this prefix from a tag name
|
||||
, tagConverter ? null # A command to convert more complex tag formats. It receives the git tag via stdin and should convert it into x.y.z format to stdout
|
||||
, shallowClone ? true
|
||||
}:
|
||||
|
||||
assert lib.asserts.assertMsg (tagPrefix == null || tagConverter == null) "Can only use either tagPrefix or tagConverter!";
|
||||
|
||||
let
|
||||
updateScript = writeShellScript "unstable-update-script.sh" ''
|
||||
set -ex
|
||||
updateScript = writeShellApplication {
|
||||
name = "unstable-update-script";
|
||||
runtimeInputs = [
|
||||
common-updater-scripts
|
||||
coreutils
|
||||
git
|
||||
nix
|
||||
];
|
||||
text = ''
|
||||
set -ex
|
||||
|
||||
url=""
|
||||
branch=""
|
||||
use_stable_version=""
|
||||
tag_prefix=""
|
||||
shallow_clone=""
|
||||
url=""
|
||||
branch=""
|
||||
hardcode_zero_version=""
|
||||
tag_format=""
|
||||
tag_prefix=""
|
||||
tag_converter=""
|
||||
shallow_clone=""
|
||||
: "''${systemArg:=}"
|
||||
|
||||
while (( $# > 0 )); do
|
||||
flag="$1"
|
||||
shift 1
|
||||
case "$flag" in
|
||||
--url=*)
|
||||
url="''${flag#*=}"
|
||||
;;
|
||||
--branch=*)
|
||||
branch="''${flag#*=}"
|
||||
;;
|
||||
--use-stable-version)
|
||||
use_stable_version=1
|
||||
;;
|
||||
--tag-prefix=*)
|
||||
tag_prefix="''${flag#*=}"
|
||||
;;
|
||||
--shallow-clone)
|
||||
shallow_clone=1
|
||||
;;
|
||||
*)
|
||||
echo "$0: unknown option ‘''${flag}’"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
done
|
||||
while (( $# > 0 )); do
|
||||
flag="$1"
|
||||
shift 1
|
||||
case "$flag" in
|
||||
--url=*)
|
||||
url="''${flag#*=}"
|
||||
;;
|
||||
--branch=*)
|
||||
branch="''${flag#*=}"
|
||||
;;
|
||||
--hardcode-zero-version)
|
||||
hardcode_zero_version=1
|
||||
;;
|
||||
--tag-format=*)
|
||||
tag_format="''${flag#*=}"
|
||||
;;
|
||||
--tag-prefix=*)
|
||||
tag_prefix="''${flag#*=}"
|
||||
;;
|
||||
--tag-converter=*)
|
||||
tag_converter="''${flag#*=}"
|
||||
;;
|
||||
--shallow-clone)
|
||||
shallow_clone=1
|
||||
;;
|
||||
*)
|
||||
echo "$0: unknown option ‘''${flag}’"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
# By default we set url to src.gitRepoUrl
|
||||
if [[ -z "$url" ]]; then
|
||||
url="$(${nix}/bin/nix-instantiate $systemArg --eval -E \
|
||||
"with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.gitRepoUrl" \
|
||||
| tr -d '"')"
|
||||
fi
|
||||
# By default we set url to src.gitRepoUrl
|
||||
if [[ -z "$url" ]]; then
|
||||
# system argument cannot be passed as 1 argument
|
||||
# shellcheck disable=SC2086
|
||||
url="$(nix-instantiate $systemArg --eval -E \
|
||||
"with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.gitRepoUrl" \
|
||||
| tr -d '"')"
|
||||
fi
|
||||
|
||||
# Get info about HEAD from a shallow git clone
|
||||
tmpdir="$(${coreutils}/bin/mktemp -d)"
|
||||
# Get info about HEAD from a shallow git clone
|
||||
tmpdir="$(mktemp -d)"
|
||||
|
||||
cloneArgs=(
|
||||
--bare
|
||||
)
|
||||
cloneArgs=()
|
||||
|
||||
if [[ "$shallow_clone" == "1" ]]; then
|
||||
cloneArgs+=(--depth=1)
|
||||
fi
|
||||
if [[ "$shallow_clone" == "1" ]]; then
|
||||
cloneArgs+=(--depth=1)
|
||||
fi
|
||||
|
||||
if [[ -n "$branch" ]]; then
|
||||
cloneArgs+=(--branch="$branch")
|
||||
fi
|
||||
if [[ -n "$branch" ]]; then
|
||||
cloneArgs+=(--branch="$branch")
|
||||
fi
|
||||
|
||||
${git}/bin/git clone "''${cloneArgs[@]}" "$url" "$tmpdir"
|
||||
git clone "''${cloneArgs[@]}" "$url" "$tmpdir"
|
||||
getLatestVersion() {
|
||||
git describe --tags --abbrev=0 --match "''${tag_format}" 2> /dev/null || true
|
||||
}
|
||||
|
||||
pushd "$tmpdir"
|
||||
commit_date="$(${git}/bin/git show -s --pretty='format:%cs')"
|
||||
commit_sha="$(${git}/bin/git show -s --pretty='format:%H')"
|
||||
if [[ -z "$use_stable_version" ]]; then
|
||||
new_version="unstable-$commit_date"
|
||||
else
|
||||
depth=100
|
||||
while (( $depth < 10000 )); do
|
||||
last_tag="$(${git}/bin/git describe --tags --abbrev=0 2> /dev/null || true)"
|
||||
if [[ -n "$last_tag" ]]; then
|
||||
break
|
||||
fi
|
||||
${git}/bin/git fetch --depth="$depth" --tags
|
||||
depth=$(( $depth * 2 ))
|
||||
done
|
||||
if [[ -z "$last_tag" ]]; then
|
||||
echo "Cound not found a tag within last 10000 commits" > /dev/stderr
|
||||
exit 1
|
||||
fi
|
||||
if [[ -n "$tag_prefix" ]]; then
|
||||
last_tag="''${last_tag#$tag_prefix}"
|
||||
fi
|
||||
new_version="$last_tag+date=$commit_date"
|
||||
fi
|
||||
popd
|
||||
# ${coreutils}/bin/rm -rf "$tmpdir"
|
||||
pushd "$tmpdir"
|
||||
commit_date="$(git show -s --pretty='format:%cs')"
|
||||
commit_sha="$(git show -s --pretty='format:%H')"
|
||||
last_tag=""
|
||||
if [[ -z "$hardcode_zero_version" ]]; then
|
||||
if [[ "$shallow_clone" == "1" ]]; then
|
||||
depth=100
|
||||
while (( depth < 10000 )); do
|
||||
last_tag="$(getLatestVersion)"
|
||||
if [[ -n "$last_tag" ]]; then
|
||||
break
|
||||
fi
|
||||
git fetch --depth="$depth" --tags
|
||||
depth=$(( depth * 2 ))
|
||||
done
|
||||
|
||||
# update the nix expression
|
||||
${common-updater-scripts}/bin/update-source-version \
|
||||
"$UPDATE_NIX_ATTR_PATH" \
|
||||
"$new_version" \
|
||||
--rev="$commit_sha"
|
||||
'';
|
||||
if [[ -z "$last_tag" ]]; then
|
||||
# To be extra sure, check if full history helps with finding a tag
|
||||
git fetch --tags
|
||||
last_tag="$(getLatestVersion)"
|
||||
fi
|
||||
else
|
||||
last_tag="$(getLatestVersion)"
|
||||
fi
|
||||
if [[ -z "$last_tag" ]]; then
|
||||
last_tag="0"
|
||||
fi
|
||||
if [[ -n "$tag_prefix" ]]; then
|
||||
echo "Stripping prefix '$tag_prefix' from tag '$last_tag'"
|
||||
last_tag="''${last_tag#"''${tag_prefix}"}"
|
||||
fi
|
||||
if [[ -n "$tag_converter" ]]; then
|
||||
echo "Running '$last_tag' through: $tag_converter"
|
||||
last_tag="$(echo "''${last_tag}" | ''${tag_converter})"
|
||||
fi
|
||||
else
|
||||
last_tag="0"
|
||||
fi
|
||||
if [[ ! "$last_tag" =~ ^[[:digit:]] ]]; then
|
||||
echo "Last tag '$last_tag' does not start with a digit" > /dev/stderr
|
||||
exit 1
|
||||
fi
|
||||
new_version="$last_tag-unstable-$commit_date"
|
||||
popd
|
||||
# rm -rf "$tmpdir"
|
||||
|
||||
# update the nix expression
|
||||
update-source-version \
|
||||
"$UPDATE_NIX_ATTR_PATH" \
|
||||
"$new_version" \
|
||||
--rev="$commit_sha"
|
||||
'';
|
||||
};
|
||||
|
||||
in
|
||||
[
|
||||
updateScript
|
||||
(lib.getExe updateScript)
|
||||
"--url=${builtins.toString url}"
|
||||
"--tag-format=${tagFormat}"
|
||||
] ++ lib.optionals (branch != null) [
|
||||
"--branch=${branch}"
|
||||
] ++ lib.optionals stableVersion [
|
||||
"--use-stable-version"
|
||||
] ++ lib.optionals (tagPrefix != null) [
|
||||
"--tag-prefix=${tagPrefix}"
|
||||
] ++ lib.optionals (tagConverter != null) [
|
||||
"--tag-converter=${tagConverter}"
|
||||
] ++ lib.optionals hardcodeZeroVersion [
|
||||
"--hardcode-zero-version"
|
||||
] ++ lib.optionals shallowClone [
|
||||
"--shallow-clone"
|
||||
]
|
||||
|
||||
@ -31,6 +31,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/tau-OS/tau-hydrogen";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ashvith-shetty ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
})
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user