Merge master into staging-next

This commit is contained in:
github-actions[bot]
2024-12-23 00:15:04 +00:00
committed by GitHub
83 changed files with 5121 additions and 349 deletions
+5
View File
@@ -2155,6 +2155,11 @@
github = "AtilaSaraiva";
githubId = 29521461;
};
atinba = {
name = "Atin Bainada";
github = "atinba";
githubId = 61903527;
};
atkinschang = {
email = "atkinschang+nixpkgs@gmail.com";
github = "AtkinsChang";
+4 -4
View File
@@ -123,10 +123,10 @@ in
User = "tts";
StateDirectory = "tts";
ExecStart =
"${pkgs.tts}/bin/tts-server --port ${toString options.port}"
+ optionalString (options.model != null) " --model_name ${options.model}"
+ optionalString (options.useCuda) " --use_cuda"
+ (concatMapStringsSep " " escapeShellArgs options.extraArgs);
"${pkgs.tts}/bin/tts-server --port ${toString options.port} "
+ optionalString (options.model != null) "--model_name ${options.model} "
+ optionalString (options.useCuda) "--use_cuda "
+ (escapeShellArgs options.extraArgs);
CapabilityBoundingSet = "";
DeviceAllow =
if options.useCuda then
+17 -3
View File
@@ -7,9 +7,11 @@
let
cfg = config.services.evremap;
format = pkgs.formats.toml { };
settings = lib.attrsets.filterAttrs (n: v: v != null) cfg.settings;
configFile = format.generate "evremap.toml" settings;
key = lib.types.strMatching "KEY_[[:upper:]]+" // {
description = "key ID prefixed with KEY_";
key = lib.types.strMatching "(BTN|KEY)_[[:upper:]]+" // {
description = "key ID prefixed with BTN_ or KEY_";
};
mkKeyOption =
@@ -63,6 +65,18 @@ in
'';
};
phys = lib.mkOption {
type = lib.types.nullOr lib.types.str;
default = null;
example = "usb-0000:07:00.3-2.1.1/input0";
description = ''
The physical device name to listen on.
This attribute may be specified to disambiguate multiple devices with the same device name.
The physical device names of each device can be obtained by running `evremap list-devices` with elevated permissions.
'';
};
dual_role = lib.mkOption {
type = lib.types.listOf dualRoleModule;
default = [ ];
@@ -117,7 +131,7 @@ in
description = "evremap - keyboard input remapper";
wantedBy = [ "multi-user.target" ];
script = "${lib.getExe pkgs.evremap} remap ${format.generate "evremap.toml" cfg.settings}";
script = "${lib.getExe pkgs.evremap} remap ${configFile}";
serviceConfig = {
DynamicUser = true;
@@ -142,6 +142,7 @@ in
group = "ntp";
description = "NTP daemon user";
home = "/var/lib/ntp";
createHome = true;
};
users.groups.ntp = { };
@@ -155,7 +156,6 @@ in
serviceConfig = {
ExecStart = "@${ntp}/bin/ntpd ntpd -g ${builtins.toString ntpFlags}";
Type = "forking";
StateDirectory = "ntp";
# Hardening options
PrivateDevices = true;
+31 -9
View File
@@ -1,11 +1,11 @@
{ config, lib, pkgs, ... }:
{ config, lib, pkgs, utils, ... }:
with lib;
let
cfg = config.services.nginx.sso;
pkg = getBin cfg.package;
configYml = pkgs.writeText "nginx-sso.yml" (builtins.toJSON cfg.configuration);
format = pkgs.formats.yaml { };
configPath = "/var/lib/nginx-sso/config.yaml";
in {
options.services.nginx.sso = {
enable = mkEnableOption "nginx-sso service";
@@ -13,14 +13,16 @@ in {
package = mkPackageOption pkgs "nginx-sso" { };
configuration = mkOption {
type = types.attrsOf types.unspecified;
type = format.type;
default = {};
example = literalExpression ''
{
listen = { addr = "127.0.0.1"; port = 8080; };
providers.token.tokens = {
myuser = "MyToken";
myuser = {
_secret = "/path/to/secret/token.txt"; # File content should be the secret token
};
};
acl = {
@@ -37,6 +39,11 @@ in {
nginx-sso configuration
([documentation](https://github.com/Luzifer/nginx-sso/wiki/Main-Configuration))
as a Nix attribute set.
Options containing secret data should be set to an attribute set
with the singleton attribute `_secret` - a string value set to the path
to the file containing the secret value which should be used in the
configuration. This file must be readable by `nginx-sso`.
'';
};
};
@@ -47,14 +54,29 @@ in {
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
StateDirectory = "nginx-sso";
WorkingDirectory = "/var/lib/nginx-sso";
ExecStartPre = pkgs.writeShellScript "merge-nginx-sso-config" ''
rm -f '${configPath}'
# Relies on YAML being a superset of JSON
${utils.genJqSecretsReplacementSnippet cfg.configuration configPath}
'';
ExecStart = ''
${pkg}/bin/nginx-sso \
--config ${configYml} \
--frontend-dir ${pkg}/share/frontend
${lib.getExe cfg.package} \
--config ${configPath} \
--frontend-dir ${lib.getBin cfg.package}/share/frontend
'';
Restart = "always";
DynamicUser = true;
User = "nginx-sso";
Group = "nginx-sso";
};
};
users.users.nginx-sso = {
isSystemUser = true;
group = "nginx-sso";
};
users.groups.nginx-sso = { };
};
}
@@ -40,6 +40,13 @@ in
description = "Log level";
};
nextcloudUrl = lib.mkOption {
type = lib.types.str;
default = "http${lib.optionalString cfgN.https "s"}://${cfgN.hostName}";
defaultText = lib.literalExpression ''"http''${lib.optionalString config.services.nextcloud.https "s"}://''${config.services.nextcloud.hostName}"'';
description = "Configure the nextcloud URL notify_push tries to connect to.";
};
bendDomainToLocalhost = lib.mkOption {
type = lib.types.bool;
default = false;
@@ -71,66 +78,62 @@ in
);
config = lib.mkIf cfg.enable {
systemd.services.nextcloud-notify_push =
let
nextcloudUrl = "http${lib.optionalString cfgN.https "s"}://${cfgN.hostName}";
in
{
description = "Push daemon for Nextcloud clients";
documentation = [ "https://github.com/nextcloud/notify_push" ];
after = [
"phpfpm-nextcloud.service"
"redis-nextcloud.service"
];
wantedBy = [ "multi-user.target" ];
environment = {
NEXTCLOUD_URL = nextcloudUrl;
SOCKET_PATH = cfg.socketPath;
DATABASE_PREFIX = cfg.dbtableprefix;
LOG = cfg.logLevel;
};
postStart = ''
${cfgN.occ}/bin/nextcloud-occ notify_push:setup ${nextcloudUrl}/push
'';
script =
let
dbType = if cfg.dbtype == "pgsql" then "postgresql" else cfg.dbtype;
dbUser = lib.optionalString (cfg.dbuser != null) cfg.dbuser;
dbPass = lib.optionalString (cfg.dbpassFile != null) ":$DATABASE_PASSWORD";
dbHostHasPrefix = prefix: lib.hasPrefix prefix (toString cfg.dbhost);
isPostgresql = dbType == "postgresql";
isMysql = dbType == "mysql";
isSocket = (isPostgresql && dbHostHasPrefix "/") || (isMysql && dbHostHasPrefix "localhost:/");
dbHost = lib.optionalString (cfg.dbhost != null) (
if isSocket then lib.optionalString isMysql "@localhost" else "@${cfg.dbhost}"
);
dbOpts = lib.optionalString (cfg.dbhost != null && isSocket) (
if isPostgresql then
"?host=${cfg.dbhost}"
else if isMysql then
"?socket=${lib.removePrefix "localhost:" cfg.dbhost}"
else
throw "unsupported dbtype"
);
dbName = lib.optionalString (cfg.dbname != null) "/${cfg.dbname}";
dbUrl = "${dbType}://${dbUser}${dbPass}${dbHost}${dbName}${dbOpts}";
in
lib.optionalString (dbPass != "") ''
export DATABASE_PASSWORD="$(<"${cfg.dbpassFile}")"
''
+ ''
export DATABASE_URL="${dbUrl}"
exec ${cfg.package}/bin/notify_push '${cfgN.datadir}/config/config.php'
'';
serviceConfig = {
User = "nextcloud";
Group = "nextcloud";
RuntimeDirectory = [ "nextcloud-notify_push" ];
Restart = "on-failure";
RestartSec = "5s";
Type = "notify";
};
systemd.services.nextcloud-notify_push = {
description = "Push daemon for Nextcloud clients";
documentation = [ "https://github.com/nextcloud/notify_push" ];
after = [
"phpfpm-nextcloud.service"
"redis-nextcloud.service"
];
wantedBy = [ "multi-user.target" ];
environment = {
NEXTCLOUD_URL = cfg.nextcloudUrl;
SOCKET_PATH = cfg.socketPath;
DATABASE_PREFIX = cfg.dbtableprefix;
LOG = cfg.logLevel;
};
postStart = ''
${cfgN.occ}/bin/nextcloud-occ notify_push:setup ${cfg.nextcloudUrl}/push
'';
script =
let
dbType = if cfg.dbtype == "pgsql" then "postgresql" else cfg.dbtype;
dbUser = lib.optionalString (cfg.dbuser != null) cfg.dbuser;
dbPass = lib.optionalString (cfg.dbpassFile != null) ":$DATABASE_PASSWORD";
dbHostHasPrefix = prefix: lib.hasPrefix prefix (toString cfg.dbhost);
isPostgresql = dbType == "postgresql";
isMysql = dbType == "mysql";
isSocket = (isPostgresql && dbHostHasPrefix "/") || (isMysql && dbHostHasPrefix "localhost:/");
dbHost = lib.optionalString (cfg.dbhost != null) (
if isSocket then lib.optionalString isMysql "@localhost" else "@${cfg.dbhost}"
);
dbOpts = lib.optionalString (cfg.dbhost != null && isSocket) (
if isPostgresql then
"?host=${cfg.dbhost}"
else if isMysql then
"?socket=${lib.removePrefix "localhost:" cfg.dbhost}"
else
throw "unsupported dbtype"
);
dbName = lib.optionalString (cfg.dbname != null) "/${cfg.dbname}";
dbUrl = "${dbType}://${dbUser}${dbPass}${dbHost}${dbName}${dbOpts}";
in
lib.optionalString (dbPass != "") ''
export DATABASE_PASSWORD="$(<"${cfg.dbpassFile}")"
''
+ ''
export DATABASE_URL="${dbUrl}"
exec ${cfg.package}/bin/notify_push '${cfgN.datadir}/config/config.php'
'';
serviceConfig = {
User = "nextcloud";
Group = "nextcloud";
RuntimeDirectory = [ "nextcloud-notify_push" ];
Restart = "on-failure";
RestartSec = "5s";
Type = "notify";
};
};
networking.hosts = lib.mkIf cfg.bendDomainToLocalhost {
"127.0.0.1" = [ cfgN.hostName ];
@@ -134,6 +134,10 @@ let
extraFlags+=("--network-bridge=$HOST_BRIDGE")
fi
if [ -n "$NETWORK_NAMESPACE_PATH" ]; then
extraFlags+=("--network-namespace-path=$NETWORK_NAMESPACE_PATH")
fi
extraFlags+=(${lib.escapeShellArgs (mapAttrsToList nspawnExtraVethArgs cfg.extraVeths)})
for iface in $INTERFACES; do
@@ -632,6 +636,20 @@ in
'';
};
networkNamespace = mkOption {
type = types.nullOr types.path;
default = null;
description = ''
Takes the path to a file representing a kernel network namespace that the container
shall run in. The specified path should refer to a (possibly bind-mounted) network
namespace file, as exposed by the kernel below /proc/<PID>/ns/net. This makes the
container enter the given network namespace. One of the typical use cases is to give
a network namespace under /run/netns created by ip-netns(8).
Note that this option cannot be used together with other network-related options,
such as --private-network or --network-interface=.
'';
};
interfaces = mkOption {
type = types.listOf types.str;
default = [];
@@ -793,6 +811,11 @@ in
{
warnings = optional (!config.boot.enableContainers && config.containers != {})
"containers.<name> is used, but boot.enableContainers is false. To use containers.<name>, set boot.enableContainers to true.";
assertions = let
mapper = name: cfg: optional (cfg.networkNamespace != null && (cfg.privateNetwork || cfg.interfaces != []))
"containers.${name}.networkNamespace is mutally exclusive to containers.${name}.privateNetwork and containers.${name}.interfaces.";
in mkMerge (mapAttrsToList mapper config.containers);
}
(mkIf (config.boot.enableContainers) (let
@@ -897,6 +920,9 @@ in
LOCAL_ADDRESS6=${cfg.localAddress6}
''}
''}
${optionalString (cfg.networkNamespace != null) ''
NETWORK_NAMESPACE_PATH=${cfg.networkNamespace}
''}
INTERFACES="${toString cfg.interfaces}"
MACVLANS="${toString cfg.macvlans}"
${optionalString cfg.autoStart ''
@@ -39,6 +39,11 @@ import ./make-test-python.nix (
}
];
networking.interfaces.eth1 = {
ipv4.addresses = lib.mkForce [ ];
ipv6.addresses = lib.mkForce [ ];
};
specialisation.eth1.configuration = {
networking.bridges.br0.interfaces = [ "eth1" ];
networking.interfaces = {
+1 -1
View File
@@ -160,7 +160,7 @@ rec {
### Verify that file contents are as expected
file_content = machine.succeed("cat ${user.home}/fcitx_test.out")
assert file_content == "\n"
assert file_content == "\n", f'output does not match input:\n{file_content}'
''
;
})
@@ -38,6 +38,7 @@ runTest (
config.dbtype = "pgsql";
notify_push = {
enable = true;
bendDomainToLocalhost = true;
logLevel = "debug";
};
extraAppsEnable = true;
+3 -1
View File
@@ -11,7 +11,9 @@ import ./make-test-python.nix ({ pkgs, ... }: {
listen = { addr = "127.0.0.1"; port = 8080; };
providers.token.tokens = {
myuser = "MyToken";
myuser = {
_secret = pkgs.writeText "secret-token" "MyToken";
};
};
acl = {
+2
View File
@@ -20,6 +20,8 @@ import ./make-test-python.nix (
machine.wait_for_console_text('Listen normally on 10 eth*')
machine.succeed('systemctl is-active ntpd.service')
machine.succeed('ntpq -p')
# ntp user must be able to create drift files
machine.succeed('su -s /bin/sh -c "touch /var/lib/ntp/ntp.drift" ntp')
'';
}
)
@@ -9018,6 +9018,18 @@ final: prev:
meta.homepage = "https://github.com/neovimhaskell/nvim-hs.vim/";
};
nvim-impairative = buildVimPlugin {
pname = "nvim-impairative";
version = "2024-11-20";
src = fetchFromGitHub {
owner = "idanarye";
repo = "nvim-impairative";
rev = "f591e206e377c90e419ae24edb4fd81a22b6f1d5";
sha256 = "0z4vlzb42j1263vnxxk3vka8wg0ggn3xkr42gmrw7dviz88l9x04";
};
meta.homepage = "https://github.com/idanarye/nvim-impairative/";
};
nvim-jdtls = buildVimPlugin {
pname = "nvim-jdtls";
version = "2024-11-26";
@@ -10677,6 +10689,18 @@ final: prev:
meta.homepage = "https://github.com/unblevable/quick-scope/";
};
quicker-nvim = buildVimPlugin {
pname = "quicker.nvim";
version = "2024-11-14";
src = fetchFromGitHub {
owner = "stevearc";
repo = "quicker.nvim";
rev = "049d66534d3de5920663ee1b8dd0096d70f55a67";
sha256 = "052bsqgjk3gh80vqpisv972d3snlf4hgmxag3hkhca5mp7zcpp2x";
};
meta.homepage = "https://github.com/stevearc/quicker.nvim/";
};
quickfix-reflector-vim = buildVimPlugin {
pname = "quickfix-reflector.vim";
version = "2022-02-02";
@@ -2173,6 +2173,10 @@ in
}
);
nvim-impairative = super.nvim-impairative.overrideAttrs {
nvimRequireCheck = "impairative";
};
nvim-navic = super.nvim-navic.overrideAttrs {
dependencies = [ self.nvim-lspconfig ];
nvimRequireCheck = "nvim-navic";
@@ -2460,6 +2464,10 @@ in
];
};
quicker-nvim = super.quicker-nvim.overrideAttrs {
nvimRequireCheck = "quicker";
};
rainbow-delimiters-nvim = super.rainbow-delimiters-nvim.overrideAttrs {
nvimSkipModule = [
# rainbow-delimiters.types.lua
@@ -748,6 +748,7 @@ https://github.com/brenoprata10/nvim-highlight-colors/,HEAD,
https://github.com/Iron-E/nvim-highlite/,,
https://github.com/kevinhwang91/nvim-hlslens/,,
https://github.com/neovimhaskell/nvim-hs.vim/,,
https://github.com/idanarye/nvim-impairative/,HEAD,
https://github.com/mfussenegger/nvim-jdtls/,,
https://github.com/gennaro-tedesco/nvim-jqx/,,
https://gitlab.com/usmcamp0811/nvim-julia-autotest,HEAD,
@@ -886,6 +887,7 @@ https://github.com/AlphaTechnolog/pywal.nvim/,,
https://github.com/codethread/qmk.nvim/,HEAD,
https://github.com/quarto-dev/quarto-nvim/,,
https://github.com/unblevable/quick-scope/,,
https://github.com/stevearc/quicker.nvim/,HEAD,
https://github.com/stefandtw/quickfix-reflector.vim/,,
https://github.com/dannyob/quickfixstatus/,,
https://github.com/jbyuki/quickmath.nvim/,HEAD,
@@ -2,7 +2,6 @@
stdenv,
lib,
fetchFromGitHub,
fetchpatch2,
copyDesktopItems,
makeDesktopItem,
qmake,
@@ -56,31 +55,15 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "openboard";
version = "1.7.1";
version = "1.7.3";
src = fetchFromGitHub {
owner = "OpenBoard-org";
repo = "OpenBoard";
rev = "v${finalAttrs.version}";
hash = "sha256-gXxxlAEuzMCvFu5oSQayNW191XAC/YKvldItYEFxvNM=";
hash = "sha256-Igp5WSVQ9FrzS2AhDDPwVBo76SaFw9xP6lqgW7S/KIE=";
};
patches = [
# fix: Support FFmpeg 7.0
# https://github.com/OpenBoard-org/OpenBoard/pull/1017
(fetchpatch2 {
url = "https://github.com/OpenBoard-org/OpenBoard/commit/4f45b6c4016972cf5835f9188bda6197b1b4ed2f.patch?full_index=1";
hash = "sha256-MUJbHfOCMlRO4pg5scm+DrBsngZwB7UPuDJZss5x9Zs=";
})
# fix: Resolve FFmpeg 7.0 warnings
# https://github.com/OpenBoard-org/OpenBoard/pull/1017
(fetchpatch2 {
url = "https://github.com/OpenBoard-org/OpenBoard/commit/315bcac782e10cc6ceef1fc8b78fff40541ea38f.patch?full_index=1";
hash = "sha256-736eX+uXuZwHJxOXAgxs2/vjjD1JY9mMyj3rR45/7xk=";
})
];
postPatch = ''
substituteInPlace OpenBoard.pro \
--replace-fail '/usr/include/quazip5' '${lib.getDev quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \
@@ -167,8 +150,12 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "Interactive whiteboard application";
homepage = "https://openboard.ch/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ fufexan ];
maintainers = with maintainers; [
atinba
fufexan
];
platforms = platforms.linux;
mainProgram = "OpenBoard";
};
@@ -9,10 +9,10 @@
buildMozillaMach rec {
pname = "firefox";
version = "128.5.1esr";
version = "128.5.2esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "476d71ff45a7178301081191d1b4c47fb21b42618f12191605f95ad48603b84a9150cb5c96f668751a43c8f6a4a43ecf337d38007d8e2b546f006faead2d66d5";
sha512 = "1e5b6bfe63279acc8b7350c08f2767620f01b979057f50ab1952331b6efc05124f7c9530a7cc793b0f3616344334a2903fe5712bbb45418e936684d294c5530a";
};
meta = {
@@ -1,18 +1,18 @@
{
"airgap-images-amd64": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.2%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
"sha256": "0dfixvnra0havzmrnabjhpzvkxfqb3jdd12cbfyd76ann6ijrxn1"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.4%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
"sha256": "1dykfk58sp4phf125jfrzx031pp1mj0g8q0kliis139sig14vagp"
},
"airgap-images-arm": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.2%2Bk3s1/k3s-airgap-images-arm.tar.zst",
"sha256": "06r6vifzd2dhx3md0i45cx2ynmzjgrd49iz09x1zissz223ic325"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.4%2Bk3s1/k3s-airgap-images-arm.tar.zst",
"sha256": "0z4h9yd8843q58hhm8jw072k1ixxnmprp9c30pwb796iy1mpirbm"
},
"airgap-images-arm64": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.2%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
"sha256": "11phgk5snb5ga1krm8nfssniarsd1pd3d4n59jzmjzwhznvq4v7n"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.4%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
"sha256": "0xsq095dkf89c6jjd126rrdl7k0zy7cxb38rimzpacb8zfj4ss82"
},
"images-list": {
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.2%2Bk3s1/k3s-images.txt",
"sha256": "05229bfg174pvy525dcy7rvmgv9i9v1nnz5ngq80n7zkxj9cp8m8"
"url": "https://github.com/k3s-io/k3s/releases/download/v1.31.4%2Bk3s1/k3s-images.txt",
"sha256": "1gqiaszfw49hsbn7xkkadykaf028vys13ykqvpkqar0f7hwwbja6"
}
}
@@ -1,15 +1,15 @@
{
k3sVersion = "1.31.2+k3s1";
k3sCommit = "6da204241bfd40220cb1af4cde35609e0c58df72";
k3sRepoSha256 = "0n0sfvxnkz8d9prswmqd6paqisis05l0494znjy2y30418ql580x";
k3sVendorHash = "sha256-SYIg/lYwIY/e0FQt59Ki4ROzhZ5HfJ03Hd0XE2LIIyc=";
k3sVersion = "1.31.4+k3s1";
k3sCommit = "a562d090b05cf8d55b6a8b57556787c24c8ce21a";
k3sRepoSha256 = "1kgw3jnaqh8lnbljgdvyl14vdlyvy8gw2jsqqj3qv1kv1m3qqsjw";
k3sVendorHash = "sha256-OtIQ3pmN4V3qJODF5/fSespbKvucvzi4ykdmGkRVlf4=";
chartVersions = import ./chart-versions.nix;
imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
k3sRootVersion = "0.14.0";
k3sRootSha256 = "15cs9faw3jishsb5nhgmb5ldjc47hkwf7hz2126fp8ahf80m0fcl";
k3sCNIVersion = "1.5.1-k3s1";
k3sCNISha256 = "1bkz78p77aiw64hdvmlgc5zir9x8zha8qprfaab48jxbcsj3dfi7";
containerdVersion = "1.7.22-k3s1";
containerdSha256 = "031rapiynpm7zlzn42l8z4m125lww2vyspw02irs4q3qb6mpx3px";
k3sRootVersion = "0.14.1";
k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7";
k3sCNIVersion = "1.6.0-k3s1";
k3sCNISha256 = "0g7zczvwba5xqawk37b0v96xysdwanyf1grxn3l3lhxsgjjsmkd7";
containerdVersion = "1.7.23-k3s2";
containerdSha256 = "0lp9vxq7xj74wa7hbivvl5hwg2wzqgsxav22wa0p1l7lc1dqw8dm";
criCtlVersion = "1.31.0-k3s2";
}
+1
View File
@@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
"-DBUILD_SHARED_LIBS=ON"
"-DINTERFACE64=${if blas.isILP64 then "1" else "0"}"
"-DMPI=${if useMpi then "ON" else "OFF"}"
"-DICB=ON"
];
preCheck = ''
+6 -4
View File
@@ -11,16 +11,18 @@
rustPlatform.buildRustPackage rec {
pname = "easytier";
version = "2.0.3";
version = "2.1.0";
src = fetchFromGitHub {
owner = "EasyTier";
repo = "EasyTier";
rev = "refs/tags/v${version}";
hash = "sha256-0bS2VzddRZcFGmHugR0yXHjHqz06tpL4+IhQ6ReaU4Y=";
tag = "v${version}";
hash = "sha256-kPKCsKsTNT0vuESquILQJxBltP5MJ6/wKrPGx2g1Z78=";
};
cargoHash = "sha256-AkEgEymgq2asxT4oR+NtGe8bUEPRUskVvwIJYrCD7xs=";
useFetchCargoVendor = true;
cargoHash = "sha256-/avdvHl7rfATGxHS5F1drK/J4pT+srX0+qRzA3cniAk=";
nativeBuildInputs = [ protobuf ];
+3 -3
View File
@@ -6,16 +6,16 @@
}:
buildGoModule rec {
pname = "eigenlayer";
version = "0.10.8";
version = "0.11.0";
src = fetchFromGitHub {
owner = "Layr-Labs";
repo = "eigenlayer-cli";
rev = "v${version}";
hash = "sha256-/8fLIdD14k8KgUdlfEHU+xSovFj6f0FfaweZKegihyQ=";
hash = "sha256-NIie5x7gaveUFkKPP6BXtrFfnjYmwV0NbsTGufmMw1A=";
};
vendorHash = "sha256-7KC99PqAPfGnm7yA4nfAlC7V4NhCEYDyPxY7CdOdwno=";
vendorHash = "sha256-cKESs8W0q25KRlEPEqkcV7bMcknti28OkF/LmmZ0vO0=";
ldflags = ["-s" "-w"];
subPackages = ["cmd/eigenlayer"];
+2 -2
View File
@@ -6,7 +6,7 @@
}:
python3.pkgs.buildPythonApplication rec {
pname = "exegol";
version = "4.3.8";
version = "4.3.9";
format = "setuptools";
# Project has no unit tests
@@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec {
src = fetchPypi {
inherit pname version;
hash = "sha256-x2kIQOwbokJ0/uOafWZp0X67FmuEjF0WvI4D4jCLWnk=";
hash = "sha256-CoPQMEk8eagYU/TfaPAM6ItfSCZbrvzUww8H9ND8VUk=";
};
meta = with lib; {
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "gatekeeper";
version = "3.18.0";
version = "3.18.1";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "gatekeeper";
rev = "v${version}";
hash = "sha256-PT4IU4vb8j5WQ6C6m65IXLRuQ7s5SzvIW8/XhP+5YSo=";
hash = "sha256-u/XOJjXk6gq+A6VFh/97VgI7eu33/lA91YqL9efUjTU=";
};
vendorHash = null;
+65
View File
@@ -0,0 +1,65 @@
{
lib,
fetchurl,
stdenv,
autoPatchelfHook,
dpkg,
makeWrapper,
wrapGAppsHook3,
libayatana-appindicator,
libayatana-indicator,
libdbusmenu,
ayatana-ido,
zenity,
}:
stdenv.mkDerivation rec {
pname = "gopeed";
version = "1.6.4";
src = fetchurl {
url = "https://github.com/GopeedLab/gopeed/releases/download/v${version}/Gopeed-v${version}-linux-amd64.deb";
hash = "sha256-tfBeoUlZOMmGeeKNgm22X/QzYKOUozI8dt3H76TiqB4=";
};
nativeBuildInputs = [
dpkg
autoPatchelfHook
wrapGAppsHook3
makeWrapper
];
buildInputs = [
libayatana-appindicator
libayatana-indicator
libdbusmenu
ayatana-ido
];
installPhase = ''
runHook preInstall
mkdir $out
cp -r opt $out/app
cp -r usr/share $out/share
runHook postInstall
'';
dontWrapGApps = true;
preFixup = ''
makeWrapper $out/app/gopeed/gopeed $out/bin/gopeed \
"''${gappsWrapperArgs[@]}" \
--prefix PATH : ${lib.makeBinPath [ zenity ]}
'';
meta = {
homepage = "https://gopeed.com";
description = "Modern download manager that supports all platforms. Built with Golang and Flutter";
mainProgram = "gopeed";
platforms = [ "x86_64-linux" ];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ aucub ];
};
}
+81
View File
@@ -0,0 +1,81 @@
{
autoPatchelfHook,
lib,
fetchFromGitHub,
flutter324,
pkg-config,
makeDesktopItem,
libayatana-appindicator,
copyDesktopItems,
mpv,
}:
flutter324.buildFlutterApplication rec {
pname = "harmony-music";
version = "1.10.31";
src = fetchFromGitHub {
owner = "anandnet";
repo = "Harmony-Music";
tag = "v${version}";
hash = "sha256-hHwkBNqYcwYlez3SCdc+I+LKyduHU93LCFaAZqpKIO4=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;
desktopItems = [
(makeDesktopItem {
name = "harmony-music";
exec = "harmonymusic";
icon = "harmony-music";
genericName = "Harmony Music";
desktopName = "Harmony Music";
categories = [
"AudioVideo"
];
keywords = [
"Music"
"Media"
"Streaming"
];
})
];
nativeBuildInputs = [
copyDesktopItems
pkg-config
autoPatchelfHook
];
buildInputs = [
libayatana-appindicator
];
gitHashes = {
device_equalizer = "sha256-fvS611D/0U5yJC5i88JdyVNhJozt8tXPhgkkvHgIDRo=";
just_audio_media_kit = "sha256-cNuKwOAEcFCTfbKhvBvYAdmD5qFeNW16jc3A+6ID3bM=";
player_response = "sha256-4Lc6yelLzYjH3K9rzzHHJ1XDyAyQK1xFGfj/rC7wAkg=";
sdk_int = "sha256-ABlghY7RE/E/1G7xP10LuVSWPxbg4jyfLon8XMv8rYo=";
sidebar_with_animation = "sha256-Y7dTO4wN7cOmm2mnzQPW/gDYltLr7wMKMXbGtAg8WzY=";
};
postInstall = ''
install -Dm644 ./assets/icons/icon.png $out/share/pixmaps/harmony-music.png
'';
extraWrapProgramArgs = ''
--prefix LD_LIBRARY_PATH : "$out/app/harmony-music/lib:${
lib.makeLibraryPath [
mpv
]
}"
'';
meta = {
description = "Cross platform App for streaming Music";
homepage = "https://github.com/anandnet/Harmony-Music";
mainProgram = "harmonymusic";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ aucub ];
platforms = lib.platforms.linux;
};
}
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -14,7 +14,7 @@
swig,
systemd,
# ImportError: cannot import name 'mlog' from 'mesonbuild'
withDocs ? stdenv.hostPlatform.canExecute stdenv.buildPlatform,
withDocs ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
}:
stdenv.mkDerivation (finalAttrs: {
+40
View File
@@ -0,0 +1,40 @@
{
lib,
stdenv,
fetchFromGitLab,
autoreconfHook,
pkg-config,
libvlc,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libvlcpp";
version = "0.1.0-unstable-2024-02-04";
src = fetchFromGitLab {
domain = "code.videolan.org";
owner = "videolan";
repo = "libvlcpp";
rev = "44c1f48e56a66c3f418175af1e1ef3fd1ab1b118";
hash = "sha256-nnS4DMz/2VciCrhOBGRb1+kDbxj+ZOnEtQmzs/TJ870=";
};
nativeBuildInputs = [
pkg-config
autoreconfHook
];
propagatedBuildInputs = [
libvlc
];
doCheck = true;
meta = {
description = "Header-only C++ bindings for the libvlc crossplatform multimedia API";
homepage = "https://code.videolan.org/videolan/libvlcpp";
maintainers = with lib.maintainers; [ l33tname ];
platforms = lib.platforms.all;
license = lib.licenses.lgpl21Only;
};
})
+2 -2
View File
@@ -19,13 +19,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lxc";
version = "6.0.2";
version = "6.0.3";
src = fetchFromGitHub {
owner = "lxc";
repo = "lxc";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-qc60oSs2KahQJpSmhrctXpV2Zumv7EvlnGFaOCSCX/E=";
hash = "sha256-h41lcHGjJmIH28XRpM0gdFsOQOCLSWevSLfvQ7gIf7Q=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "mediawiki";
version = "1.42.3";
version = "1.42.4";
src = fetchurl {
url = "https://releases.wikimedia.org/mediawiki/${lib.versions.majorMinor version}/mediawiki-${version}.tar.gz";
hash = "sha256-4FVjA/HYRnnNk5sykMyrP4nLxp02B/8dRJymxZU7ILw=";
hash = "sha256-jiCXmH1Nu6fASFP2LNo338M4GeACjKSALSXzRM/o5yc=";
};
postPatch = ''
@@ -235,6 +235,7 @@ stdenv.mkDerivation (
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgram = "${placeholder "out"}/bin/nvim";
versionCheckProgramArg = [ "--version" ];
doInstallCheck = true;
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "open-in-mpv";
version = "2.3.0";
version = "2.4.0";
src = fetchFromGitHub {
owner = "Baldomo";
repo = "open-in-mpv";
rev = "v${version}";
hash = "sha256-XlP8bGlftyNHoJI+yiVHVvd2Qa80miJdXqt+qljYNys=";
hash = "sha256-EkWz28X+pPfSjinYEMP2y1YiZ46HdnjRGjXRDwO28PY=";
};
vendorHash = "sha256-G6GZO2+CfEAYcf7zBcqDa808A0eJjM8dq7+4VGZ+P4c=";
+15 -1
View File
@@ -14,7 +14,21 @@
opensnitch,
nixosTests,
}:
let
# Override protoc-gen-go-grpc to use the compatible version
protoc-gen-go-grpc' = protoc-gen-go-grpc.overrideAttrs (oldAttrs: rec {
version = "1.3.0";
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc-go";
rev = "cmd/protoc-gen-go-grpc/v${version}";
hash = "sha256-Zy0k5X/KFzCao9xAGt5DNb0MMGEyqmEsDj+uvXI4xH4=";
};
vendorHash = "sha256-y+/hjYUTFZuq55YAZ5M4T1cwIR+XFQBmWVE+Cg1Y7PI=";
});
in
buildGoModule rec {
pname = "opensnitch";
version = "1.6.6";
@@ -43,7 +57,7 @@ buildGoModule rec {
protobuf
go-protobuf
makeWrapper
protoc-gen-go-grpc
protoc-gen-go-grpc'
];
vendorHash = "sha256-urRujxcp58ZuhUtTAqCK0etSZ16YYG/6JY/aOUodl9g=";
@@ -5,6 +5,7 @@
autoPatchelfHook,
fixDarwinDylibNames,
unzip,
_7zz,
libaio,
makeWrapper,
odbcSupport ? true,
@@ -32,6 +33,7 @@ let
x86_64-linux = "21.10.0.0.0";
aarch64-linux = "19.10.0.0.0";
x86_64-darwin = "19.8.0.0.0";
aarch64-darwin = "23.3.0.23.09";
}
.${stdenv.hostPlatform.system} or throwSystem;
@@ -40,6 +42,7 @@ let
x86_64-linux = "2110000";
aarch64-linux = "191000";
x86_64-darwin = "198000";
aarch64-darwin = "233023";
}
.${stdenv.hostPlatform.system} or throwSystem;
@@ -67,11 +70,25 @@ let
tools = "sha256-1xFFGZapFq9ogGQ6ePSv4PrXl5qOAgRZWAp4mJ5uxdU=";
odbc = "sha256-S6+5P4daK/+nXwoHmOkj4DIkHtwdzO5GOkCCI612bRY=";
};
aarch64-darwin = {
basic = "sha256-G83bWDhw9wwjLVee24oy/VhJcCik7/GtKOzgOXuo1/4=";
sdk = "sha256-PerfzgietrnAkbH9IT7XpmaFuyJkPHx0vl4FCtjPzLs=";
sqlplus = "sha256-khOjmaExAb3rzWEwJ/o4XvRMQruiMw+UgLFtsOGn1nY=";
tools = "sha256-gA+SbgXXpY12TidpnjBzt0oWQ5zLJg6wUpzpSd/N5W4=";
odbc = "sha256-JzoSdH7mJB709cdXELxWzpgaNTjOZhYH/wLkdzKA2N0=";
};
}
.${stdenv.hostPlatform.system} or throwSystem;
# rels per component and architecture, optional
rels = { }.${stdenv.hostPlatform.system} or { };
rels =
{
aarch64-darwin = {
basic = "1";
tools = "1";
};
}
.${stdenv.hostPlatform.system} or { };
# convert platform to oracle architecture names
arch =
@@ -79,6 +96,7 @@ let
x86_64-linux = "linux.x64";
aarch64-linux = "linux.arm64";
x86_64-darwin = "macos.x64";
aarch64-darwin = "macos.arm64";
}
.${stdenv.hostPlatform.system} or throwSystem;
@@ -87,15 +105,20 @@ let
x86_64-linux = "linux";
aarch64-linux = "linux";
x86_64-darwin = "mac";
aarch64-darwin = "mac";
}
.${stdenv.hostPlatform.system} or throwSystem;
suffix =
{
aarch64-darwin = ".dmg";
}
.${stdenv.hostPlatform.system} or "dbru.zip";
# calculate the filename of a single zip file
srcFilename =
component: arch: version: rel:
"instantclient-${component}-${arch}-${version}"
+ (optionalString (rel != "") "-${rel}")
+ "dbru.zip"; # ¯\_(ツ)_/¯
"instantclient-${component}-${arch}-${version}" + (optionalString (rel != "") "-${rel}") + suffix;
# fetcher for the non clickthrough artifacts
fetcher =
@@ -111,6 +134,8 @@ let
(fetcher (srcFilename component arch version rels.${component} or "") hashes.${component} or "")
) components;
isDarwinAarch64 = stdenv.hostPlatform.system == "aarch64-darwin";
pname = "oracle-instantclient";
extLib = stdenv.hostPlatform.extensions.sharedLibrary;
in
@@ -118,14 +143,16 @@ stdenv.mkDerivation {
inherit pname version srcs;
buildInputs =
[ (lib.getLib stdenv.cc.cc) ]
[
(lib.getLib stdenv.cc.cc)
]
++ optional stdenv.hostPlatform.isLinux libaio
++ optional odbcSupport unixODBC;
nativeBuildInputs =
[
makeWrapper
unzip
(if isDarwinAarch64 then _7zz else unzip)
]
++ optional stdenv.hostPlatform.isLinux autoPatchelfHook
++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
@@ -136,7 +163,7 @@ stdenv.mkDerivation {
"lib"
];
unpackCmd = "unzip $curSrc";
unpackCmd = if isDarwinAarch64 then "7zz x $curSrc -aoa -oinstantclient" else "unzip $curSrc";
installPhase = ''
mkdir -p "$out/"{bin,include,lib,"share/java","share/${pname}-${version}/demo/"} $lib/lib
@@ -174,6 +201,7 @@ stdenv.mkDerivation {
"x86_64-linux"
"aarch64-linux"
"x86_64-darwin"
"aarch64-darwin"
];
maintainers = with maintainers; [ dylanmtaylor ];
hydraPlatforms = [ ];
+1 -1
View File
@@ -23,7 +23,7 @@ buildGoModule {
description = "Linux Go library and CLI utility to control a Dasung Paperlike display via I2C DDC";
homepage = "https://github.com/leoluk/paperlike-go";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.adisbladis ];
maintainers = [ ];
platforms = lib.platforms.linux;
mainProgram = "paperlike-cli";
};
+51
View File
@@ -0,0 +1,51 @@
{
lib,
python3Packages,
fetchFromGitHub,
nix-update-script,
}:
python3Packages.buildPythonApplication rec {
pname = "pgsrip";
version = "0.1.11";
pyproject = true;
disabled = python3Packages.pythonOlder "3.9";
src = fetchFromGitHub {
owner = "ratoaq2";
repo = "pgsrip";
rev = version;
hash = "sha256-H9gZXge+m/bCq25Fv91oFZ8Cq2SRNrKhOaDrLZkjazg=";
};
build-system = [ python3Packages.poetry-core ];
dependencies = with python3Packages; [
babelfish
cleanit
click
numpy
opencv-python
pysrt
pytesseract
setuptools
trakit
];
pythonRelaxDeps = [
"numpy"
"setuptools"
];
passthru.updateScript = nix-update-script { };
meta = {
description = "Rip your PGS subtitles";
homepage = "https://github.com/ratoaq2/pgsrip";
changelog = "https://github.com/ratoaq2/pgsrip/blob/${src.rev}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ eljamm ];
mainProgram = "pgsrip";
};
}
+12 -6
View File
@@ -6,22 +6,28 @@
buildGoModule rec {
pname = "protoc-gen-go-grpc";
version = "1.3.0";
version = "1.5.1";
modRoot = "cmd/protoc-gen-go-grpc";
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc-go";
rev = "cmd/protoc-gen-go-grpc/v${version}";
sha256 = "sha256-Zy0k5X/KFzCao9xAGt5DNb0MMGEyqmEsDj+uvXI4xH4=";
hash = "sha256-PAUM0chkZCb4hGDQtCgHF3omPm0jP1sSDolx4EuOwXo=";
};
vendorHash = "sha256-y+/hjYUTFZuq55YAZ5M4T1cwIR+XFQBmWVE+Cg1Y7PI=";
vendorHash = "sha256-yn6jo6Ku/bnbSX8FL0B/Uu3Knn59r1arjhsVUkZ0m9g=";
meta = with lib; {
ldflags = [
"-s"
"-w"
];
meta = {
description = "Go language implementation of gRPC. HTTP/2 based RPC";
homepage = "https://grpc.io/";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ aaronjheng ];
mainProgram = "protoc-gen-go-grpc";
license = licenses.asl20;
maintainers = [ ];
};
}
+8 -7
View File
@@ -14,17 +14,18 @@ in
pythonPackages.buildPythonApplication rec {
pname = "quast";
version = "5.0.2";
version = "5.3.0";
src = fetchurl {
url = "https://github.com/ablab/quast/releases/download/${pname}_${version}/${pname}-${version}.tar.gz";
sha256 = "13ml8qywbb4cc7wf2x7z5mz1rjqg51ab8wkizwcg4f6c40zgif6d";
hash = "sha256-rJ26A++dClHXqeLFaCYQTnjzQPYmOjrTk2SEQt68dOw=";
};
pythonPath = with pythonPackages; [
simplejson
joblib
setuptools
distutils
matplotlib
];
@@ -58,15 +59,15 @@ pythonPackages.buildPythonApplication rec {
# Tests need to download data files, so manual run after packaging is needed
doCheck = false;
meta = with lib; {
meta = {
description = "Evaluates genome assemblies by computing various metrics";
homepage = "https://github.com/ablab/quast";
sourceProvenance = with sourceTypes; [
sourceProvenance = with lib.sourceTypes; [
fromSource
binaryNativeCode # source bundles binary dependencies
];
license = licenses.gpl2;
maintainers = [ maintainers.bzizou ];
platforms = platforms.all;
license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.bzizou ];
platforms = lib.platforms.all;
};
}
+1 -1
View File
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
installManPage rgr.1
popd
''
+ lib.optionalString (stdenv.hostPlatform.canExecute stdenv.buildPlatform) ''
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
# As it can be seen here: https://github.com/acheronfail/repgrep/blob/0.15.0/.github/workflows/release.yml#L206, the completions are just the same as ripgrep
installShellCompletion --cmd rgr \
--bash <(${lib.getExe ripgrep} --generate complete-bash | sed 's/-c rg/-c rgr/') \
@@ -38,15 +38,11 @@ stdenv.mkDerivation {
buildInputs = [ libusb1 ];
meta =
let
inherit (lib) maintainers;
in
{
homepage = "https://gitlab.com/pine64-org/quartz-bsp/rkdeveloptool/";
description = "Tool from Rockchip to communicate with Rockusb devices (pine64 fork)";
license = lib.licenses.gpl2Only;
maintainers = [ maintainers.adisbladis ];
mainProgram = "rkdeveloptool";
};
meta = {
homepage = "https://gitlab.com/pine64-org/quartz-bsp/rkdeveloptool/";
description = "Tool from Rockchip to communicate with Rockusb devices (pine64 fork)";
license = lib.licenses.gpl2Only;
maintainers = [ ];
mainProgram = "rkdeveloptool";
};
}
+2 -2
View File
@@ -11,13 +11,13 @@
buildGoModule rec {
pname = "rosa";
version = "1.2.48";
version = "1.2.49";
src = fetchFromGitHub {
owner = "openshift";
repo = "rosa";
rev = "v${version}";
hash = "sha256-qJKzJrCZKhaqoRxloTUqaRsR4/X/hoMxmDQCTNccTqk=";
hash = "sha256-x1P9Z0TpKw90/eLJHMcoO7niqSM3F+iFVKKTcJAstng=";
};
vendorHash = null;
+2 -2
View File
@@ -72,14 +72,14 @@ let
];
in
stdenv.mkDerivation rec {
version = "4.4.0";
version = "4.4.1";
pname = "sabnzbd";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
hash = "sha256-GzNQKPk/+2wbybp7HSAoBAv0cOuszKKCi+eBopLZeXk=";
hash = "sha256-7CR2hn+mXd6eKoFjrapZuB+Fpfi1UWzTQK5DnP2303k=";
};
nativeBuildInputs = [ makeWrapper ];
+125
View File
@@ -0,0 +1,125 @@
{
autoPatchelfHook,
lib,
fetchFromGitHub,
flutter324,
mpv,
libass,
ffmpeg,
libplacebo,
libunwind,
shaderc,
vulkan-loader,
lcms,
libdovi,
libdvdnav,
libdvdread,
mujs,
libbluray,
lua,
rubberband,
libuchardet,
zimg,
alsa-lib,
openal,
pipewire,
libpulseaudio,
libcaca,
libdrm,
mesa,
libXScrnSaver,
nv-codec-headers-11,
libXpresent,
libva,
libvdpau,
pkg-config,
makeDesktopItem,
wrapGAppsHook3,
copyDesktopItems,
}:
flutter324.buildFlutterApplication rec {
pname = "simple-live-app";
version = "1.7.5";
src = fetchFromGitHub {
owner = "xiaoyaocz";
repo = "dart_simple_live";
tag = "v${version}";
hash = "sha256-0tEvPKYJnPDLvHv873JaRSuhkeXTTK4whnCuYpUK0yo=";
};
sourceRoot = "${src.name}/simple_live_app";
pubspecLock = lib.importJSON ./pubspec.lock.json;
desktopItems = [
(makeDesktopItem {
name = "simple-live-app";
exec = "simple_live_app";
icon = "simple-live-app";
genericName = "Simple-Live";
desktopName = "Simple-Live";
keywords = [
"Simple Live"
];
})
];
nativeBuildInputs = [
pkg-config
autoPatchelfHook
wrapGAppsHook3
copyDesktopItems
];
buildInputs = [
mpv
libass
ffmpeg
libplacebo
libunwind
shaderc
vulkan-loader
lcms
libdovi
libdvdnav
libdvdread
mujs
libbluray
lua
rubberband
libuchardet
zimg
alsa-lib
openal
pipewire
libpulseaudio
libcaca
libdrm
mesa
libXScrnSaver
libXpresent
nv-codec-headers-11
libva
libvdpau
];
gitHashes.ns_danmaku = "sha256-Hzp5QsdgBStaPVSHdHul7ZqOhZHQS9dbO+RpC4wMYqo=";
postInstall = ''
install -Dm644 ./assets/logo.png $out/share/pixmaps/simple-live-app.png
'';
extraWrapProgramArgs = ''
--prefix LD_LIBRARY_PATH : "$out/app/simple-live-app/lib"
'';
meta = {
description = "Simply Watch Live";
homepage = "https://github.com/xiaoyaocz/dart_simple_live";
mainProgram = "simple_live_app";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ aucub ];
platforms = lib.platforms.linux;
};
}
File diff suppressed because it is too large Load Diff
+24 -24
View File
@@ -1,12 +1,12 @@
{
"name": "svelte-language-server",
"version": "0.17.7",
"version": "0.17.8",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "svelte-language-server",
"version": "0.17.7",
"version": "0.17.8",
"license": "MIT",
"dependencies": {
"@jridgewell/trace-mapping": "^0.3.25",
@@ -20,7 +20,7 @@
"prettier-plugin-svelte": "^3.3.0",
"svelte": "^4.2.19",
"svelte2tsx": "~0.7.25",
"typescript": "^5.6.3",
"typescript": "~5.6.3",
"typescript-auto-import-cache": "^0.3.5",
"vscode-css-languageservice": "~6.3.0",
"vscode-html-languageservice": "~5.3.0",
@@ -110,9 +110,9 @@
"license": "MIT"
},
"node_modules/@jridgewell/gen-mapping": {
"version": "0.3.5",
"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
"integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
"version": "0.3.8",
"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
"integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
"license": "MIT",
"dependencies": {
"@jridgewell/set-array": "^1.2.1",
@@ -253,9 +253,9 @@
"license": "MIT"
},
"node_modules/@types/node": {
"version": "18.19.65",
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.65.tgz",
"integrity": "sha512-Ay5BZuO1UkTmVHzZJNvZKw/E+iB3GQABb6kijEz89w2JrfhNA+M/ebp18pfz9Gqe9ywhMC8AA8yC01lZq48J+Q==",
"version": "18.19.68",
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.68.tgz",
"integrity": "sha512-QGtpFH1vB99ZmTa63K4/FU8twThj4fuVSBkGddTp7uIL/cuoLWIUSL2RcOaigBhfR+hg5pgGkBnkoOxrTVBMKw==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -504,9 +504,9 @@
}
},
"node_modules/chokidar": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz",
"integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==",
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
"integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
"license": "MIT",
"dependencies": {
"readdirp": "^4.0.1"
@@ -1123,9 +1123,9 @@
}
},
"node_modules/magic-string": {
"version": "0.30.13",
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.13.tgz",
"integrity": "sha512-8rYBO+MsWkgjDSOvLomYnzhdwEG51olQ4zL5KXnNJWV5MNmrb4rTZdrtkhxjnD/QyZUqR/Z/XDsUs/4ej2nx0g==",
"version": "0.30.17",
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
"integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
"license": "MIT",
"dependencies": {
"@jridgewell/sourcemap-codec": "^1.5.0"
@@ -1708,9 +1708,9 @@
}
},
"node_modules/svelte2tsx": {
"version": "0.7.28",
"resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.28.tgz",
"integrity": "sha512-TJjA+kU8AnkyoprZPgQACMfTX8N0MA5NsIL//h9IuHOxmmaCLluqhcZU+fCkWipi5c/pooHLFOMpqjhq4v7JLQ==",
"version": "0.7.31",
"resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.31.tgz",
"integrity": "sha512-exrN1o9mdCLAA7hTCudz731FIxomH/0SN9ZIX+WrY/XnlLuno/NNC1PF6JXPZVqp/4sMMDKteqyKoG44hliljQ==",
"license": "MIT",
"dependencies": {
"dedent-js": "^1.0.1",
@@ -1805,9 +1805,9 @@
}
},
"node_modules/typescript": {
"version": "5.7.2",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.2.tgz",
"integrity": "sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==",
"version": "5.6.3",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
"integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
"license": "Apache-2.0",
"bin": {
"tsc": "bin/tsc",
@@ -1841,9 +1841,9 @@
"license": "MIT"
},
"node_modules/vscode-css-languageservice": {
"version": "6.3.1",
"resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.1.tgz",
"integrity": "sha512-1BzTBuJfwMc3A0uX4JBdJgoxp74cjj4q2mDJdp49yD/GuAq4X0k5WtK6fNcMYr+FfJ9nqgR6lpfCSZDkARJ5qQ==",
"version": "6.3.2",
"resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.2.tgz",
"integrity": "sha512-GEpPxrUTAeXWdZWHev1OJU9lz2Q2/PPBxQ2TIRmLGvQiH3WZbqaNoute0n0ewxlgtjzTW3AKZT+NHySk5Rf4Eg==",
"license": "MIT",
"dependencies": {
"@vscode/l10n": "^0.0.18",
@@ -4,7 +4,7 @@
fetchurl,
}:
let
version = "0.17.7";
version = "0.17.8";
in
buildNpmPackage {
pname = "svelte-language-server";
@@ -12,10 +12,10 @@ buildNpmPackage {
src = fetchurl {
url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-${version}.tgz";
hash = "sha256-UghjUS16hYxF37xn40B2GhFUxjnR6OfS2HRDACmEDjg=";
hash = "sha256-IbLjoXLN8sdnGy5SmoEeJUl1BzCulptMFtbJc+IRH70=";
};
npmDepsHash = "sha256-HZUuu+qqwV1U6nDWzd4vCdko3iqtWn+3XI4vDmiPb4I=";
npmDepsHash = "sha256-2rCgzEkwht03jxusPCdemA8EOabwRsHeDxiV4Uf4K8g=";
postPatch = ''
ln -s ${./package-lock.json} package-lock.json
+21 -29
View File
@@ -17,15 +17,15 @@ let
};
in
python.pkgs.buildPythonApplication rec {
pname = "tts";
version = "0.20.2";
pname = "coqui-tts";
version = "0.25.1";
pyproject = true;
src = fetchFromGitHub {
owner = "coqui-ai";
repo = "TTS";
owner = "idiap";
repo = "coqui-ai-TTS";
rev = "refs/tags/v${version}";
hash = "sha256-1nlSf15IEX1qKfDtR6+jQqskjxIuzaIWatkj9Z1fh8Y=";
hash = "sha256-5w1Y9wdoJ+EV/WBwK3nqyY60NEsMjQsfE4g+sJB7VwQ=";
};
postPatch =
@@ -41,22 +41,16 @@ python.pkgs.buildPythonApplication rec {
"numpy"
"unidic-lite"
"trainer"
"spacy\\[ja\\]"
"transformers"
];
in
''
sed -r -i \
${lib.concatStringsSep "\n" (
map (package: ''-e 's/${package}\s*[<>=]+.+/${package}/g' \'') relaxedConstraints
)}
requirements.txt
sed -r -i \
${lib.concatStringsSep "\n" (
map (package: ''-e 's/${package}\s*[<>=]+[^"]+/${package}/g' \'') relaxedConstraints
)}
pyproject.toml
# only used for notebooks and visualization
sed -r -i -e '/umap-learn/d' requirements.txt
'';
nativeBuildInputs = with python.pkgs; [
@@ -64,6 +58,7 @@ python.pkgs.buildPythonApplication rec {
numpy
packaging
setuptools
hatchling
];
propagatedBuildInputs = with python.pkgs; [
@@ -102,15 +97,12 @@ python.pkgs.buildPythonApplication rec {
transformers
unidic-lite
webrtcvad
spacy
monotonic-alignment-search
];
postInstall = ''
cp -r TTS/server/templates/ $out/${python.sitePackages}/TTS/server
# cython modules are not installed for some reasons
(
cd TTS/tts/utils/monotonic_align
${python.pythonOnBuildForHost.interpreter} setup.py install --prefix=$out
)
'';
# tests get stuck when run in nixpkgs-review, tested in passthru
@@ -161,14 +153,14 @@ python.pkgs.buildPythonApplication rec {
"tests/text_tests/test_phonemizer.py"
# no training, it takes too long
"tests/aux_tests/test_speaker_encoder_train.py"
"tests/tts_tests/test_align_tts_train.py"
"tests/tts_tests/test_fast_pitch_speaker_emb_train.py"
"tests/tts_tests/test_fast_pitch_train.py"
"tests/tts_tests/test_fastspeech_2_speaker_emb_train.py"
"tests/tts_tests/test_fastspeech_2_train.py"
"tests/tts_tests/test_glow_tts_d-vectors_train.py"
"tests/tts_tests/test_glow_tts_speaker_emb_train.py"
"tests/tts_tests/test_glow_tts_train.py"
"tests/tts_tests2/test_align_tts_train.py"
"tests/tts_tests2/test_fast_pitch_speaker_emb_train.py"
"tests/tts_tests2/test_fast_pitch_train.py"
"tests/tts_tests2/test_fastspeech_2_speaker_emb_train.py"
"tests/tts_tests2/test_fastspeech_2_train.py"
"tests/tts_tests2/test_glow_tts_d-vectors_train.py"
"tests/tts_tests2/test_glow_tts_speaker_emb_train.py"
"tests/tts_tests2/test_glow_tts_train.py"
"tests/tts_tests/test_neuralhmm_tts_train.py"
"tests/tts_tests/test_overflow_train.py"
"tests/tts_tests/test_speedy_speech_train.py"
@@ -197,11 +189,11 @@ python.pkgs.buildPythonApplication rec {
};
meta = with lib; {
homepage = "https://github.com/coqui-ai/TTS";
changelog = "https://github.com/coqui-ai/TTS/releases/tag/v${version}";
homepage = "https://github.com/idiap/coqui-ai-TTS";
changelog = "https://github.com/idiap/coqui-ai-TTS/releases/tag/v${version}";
description = "Deep learning toolkit for Text-to-Speech, battle-tested in research and production";
license = licenses.mpl20;
maintainers = teams.tts.members;
broken = true; # added 2024-04-08
broken = false;
};
}
+2 -2
View File
@@ -11,12 +11,12 @@
}:
let
version = "0.24.5";
version = "0.24.6";
src = fetchFromGitHub {
owner = "go-vikunja";
repo = "vikunja";
rev = "v${version}";
hash = "sha256-P5H+NfjE8wTmPD1VOI72hPi2DlDb4pCyq0nphK1VGK0=";
hash = "sha256-yUUZ6gPI2Bte36HzfUE6z8B/I1NlwWDSJA2pwkuzd34=";
};
frontend = stdenv.mkDerivation (finalAttrs: {
+1 -1
View File
@@ -253,7 +253,7 @@ stdenv.mkDerivation (finalAttrs: {
${freefont_ttf}/share/fonts/truetype
''
# Upstream luac can't cross compile, so we have to install the lua sources
# instead of bytecode:
# instead of bytecode, which was built for buildPlatform:
# https://www.lua.org/wshop13/Jericke.pdf#page=39
+ lib.optionalString (!stdenv.hostPlatform.canExecute stdenv.buildPlatform) ''
substituteInPlace share/Makefile.am \
@@ -0,0 +1,629 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
[[package]]
name = "addr2line"
version = "0.24.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
dependencies = [
"gimli",
]
[[package]]
name = "adler2"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
[[package]]
name = "allo-isolate"
version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f67642eb6773fb42a95dd3b348c305ee18dee6642274c6b412d67e985e3befc"
dependencies = [
"anyhow",
"atomic",
"backtrace",
"chrono",
]
[[package]]
name = "android-tzdata"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
[[package]]
name = "android_system_properties"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
dependencies = [
"libc",
]
[[package]]
name = "anyhow"
version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7"
[[package]]
name = "atomic"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba"
[[package]]
name = "audiotags"
version = "1.4.1"
dependencies = [
"anyhow",
"flutter_rust_bridge",
"lofty",
]
[[package]]
name = "autocfg"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "backtrace"
version = "0.3.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
dependencies = [
"addr2line",
"cfg-if",
"libc",
"miniz_oxide",
"object",
"rustc-demangle",
"windows-targets",
]
[[package]]
name = "bitflags"
version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
[[package]]
name = "build-target"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "832133bbabbbaa9fbdba793456a2827627a7d2b8fb96032fa1e7666d7895832b"
[[package]]
name = "bumpalo"
version = "3.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
[[package]]
name = "bytemuck"
version = "1.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a"
[[package]]
name = "byteorder"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "cc"
version = "1.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f34d93e62b03caf570cccc334cbc6c2fceca82f39211051345108adcba3eebdc"
dependencies = [
"shlex",
]
[[package]]
name = "cfg-if"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "chrono"
version = "0.4.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
dependencies = [
"android-tzdata",
"iana-time-zone",
"js-sys",
"num-traits",
"wasm-bindgen",
"windows-targets",
]
[[package]]
name = "console_error_panic_hook"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
dependencies = [
"cfg-if",
"wasm-bindgen",
]
[[package]]
name = "core-foundation-sys"
version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
[[package]]
name = "crc32fast"
version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
dependencies = [
"cfg-if",
]
[[package]]
name = "dart-sys"
version = "4.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57967e4b200d767d091b961d6ab42cc7d0cc14fe9e052e75d0d3cf9eb732d895"
dependencies = [
"cc",
]
[[package]]
name = "data-encoding"
version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
[[package]]
name = "flate2"
version = "1.0.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
dependencies = [
"crc32fast",
"miniz_oxide",
]
[[package]]
name = "flutter_rust_bridge"
version = "1.82.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5b3f423054f2fbc74e3dcef394ef3fd7a4f8309265a6b9a6ccf9c0fb07bb14b"
dependencies = [
"allo-isolate",
"anyhow",
"backtrace",
"build-target",
"bytemuck",
"cc",
"chrono",
"console_error_panic_hook",
"dart-sys",
"flutter_rust_bridge_macros",
"js-sys",
"lazy_static",
"libc",
"log",
"parking_lot",
"threadpool",
"wasm-bindgen",
"web-sys",
]
[[package]]
name = "flutter_rust_bridge_macros"
version = "1.82.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7fe743d921bedf4578b9472346d03a9643a01cd565ca7df7961baebad534ba5"
[[package]]
name = "gimli"
version = "0.31.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
[[package]]
name = "hermit-abi"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
[[package]]
name = "iana-time-zone"
version = "0.1.61"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
dependencies = [
"android_system_properties",
"core-foundation-sys",
"iana-time-zone-haiku",
"js-sys",
"wasm-bindgen",
"windows-core",
]
[[package]]
name = "iana-time-zone-haiku"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
dependencies = [
"cc",
]
[[package]]
name = "js-sys"
version = "0.3.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a865e038f7f6ed956f788f0d7d60c541fff74c7bd74272c5d4cf15c63743e705"
dependencies = [
"once_cell",
"wasm-bindgen",
]
[[package]]
name = "lazy_static"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
[[package]]
name = "libc"
version = "0.2.167"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc"
[[package]]
name = "lock_api"
version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
dependencies = [
"autocfg",
"scopeguard",
]
[[package]]
name = "lofty"
version = "0.18.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f75066eb1d25a7047fb2667edb410ae2592439ed81546f95c28b0a1c7d7d3818"
dependencies = [
"byteorder",
"data-encoding",
"flate2",
"lofty_attr",
"log",
"ogg_pager",
"paste",
]
[[package]]
name = "lofty_attr"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "764b60e1ddd07e5665a6a17636a95cd7d8f3b86c73503a69c32979d05f72f3cf"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "log"
version = "0.4.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
[[package]]
name = "memchr"
version = "2.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
[[package]]
name = "miniz_oxide"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
dependencies = [
"adler2",
]
[[package]]
name = "num-traits"
version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
dependencies = [
"autocfg",
]
[[package]]
name = "num_cpus"
version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
dependencies = [
"hermit-abi",
"libc",
]
[[package]]
name = "object"
version = "0.36.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
dependencies = [
"memchr",
]
[[package]]
name = "ogg_pager"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87b0bef808533c5890ab77279538212efdbbbd9aa4ef1ccdfcfbf77a42f7e6fa"
dependencies = [
"byteorder",
]
[[package]]
name = "once_cell"
version = "1.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
[[package]]
name = "parking_lot"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
dependencies = [
"lock_api",
"parking_lot_core",
]
[[package]]
name = "parking_lot_core"
version = "0.9.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
dependencies = [
"cfg-if",
"libc",
"redox_syscall",
"smallvec",
"windows-targets",
]
[[package]]
name = "paste"
version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
[[package]]
name = "proc-macro2"
version = "1.0.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quote"
version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
dependencies = [
"proc-macro2",
]
[[package]]
name = "redox_syscall"
version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
dependencies = [
"bitflags",
]
[[package]]
name = "rustc-demangle"
version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
[[package]]
name = "scopeguard"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
name = "shlex"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
[[package]]
name = "smallvec"
version = "1.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
[[package]]
name = "syn"
version = "2.0.90"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]]
name = "threadpool"
version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa"
dependencies = [
"num_cpus",
]
[[package]]
name = "unicode-ident"
version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
[[package]]
name = "wasm-bindgen"
version = "0.2.97"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d15e63b4482863c109d70a7b8706c1e364eb6ea449b201a76c5b89cedcec2d5c"
dependencies = [
"cfg-if",
"once_cell",
"wasm-bindgen-macro",
]
[[package]]
name = "wasm-bindgen-backend"
version = "0.2.97"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d36ef12e3aaca16ddd3f67922bc63e48e953f126de60bd33ccc0101ef9998cd"
dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2",
"quote",
"syn",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-macro"
version = "0.2.97"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "705440e08b42d3e4b36de7d66c944be628d579796b8090bfa3471478a2260051"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
]
[[package]]
name = "wasm-bindgen-macro-support"
version = "0.2.97"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "98c9ae5a76e46f4deecd0f0255cc223cfa18dc9b261213b8aa0c7b36f61b3f1d"
dependencies = [
"proc-macro2",
"quote",
"syn",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
version = "0.2.97"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ee99da9c5ba11bd675621338ef6fa52296b76b83305e9b6e5c77d4c286d6d49"
[[package]]
name = "web-sys"
version = "0.3.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a98bc3c33f0fe7e59ad7cd041b89034fa82a7c2d4365ca538dda6cdaf513863c"
dependencies = [
"js-sys",
"wasm-bindgen",
]
[[package]]
name = "windows-core"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
dependencies = [
"windows-targets",
]
[[package]]
name = "windows-targets"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
dependencies = [
"windows_aarch64_gnullvm",
"windows_aarch64_msvc",
"windows_i686_gnu",
"windows_i686_gnullvm",
"windows_i686_msvc",
"windows_x86_64_gnu",
"windows_x86_64_gnullvm",
"windows_x86_64_msvc",
]
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
[[package]]
name = "windows_aarch64_msvc"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
[[package]]
name = "windows_i686_gnu"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
[[package]]
name = "windows_i686_gnullvm"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
[[package]]
name = "windows_i686_msvc"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
[[package]]
name = "windows_x86_64_gnu"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
[[package]]
name = "windows_x86_64_msvc"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
@@ -0,0 +1,52 @@
{
stdenv,
lib,
rustPlatform,
}:
{ version, src, ... }:
let
rustDep = rustPlatform.buildRustPackage rec {
pname = "audiotags-rs";
inherit version src;
postPatch = ''
cp ${cargoLock.lockFile} Cargo.lock
'';
sourceRoot = "${src.name}/rust";
cargoLock =
{
_1_4_1.lockFile = ./Cargo-1.4.1.lock;
}
.${"_" + (lib.replaceStrings [ "." ] [ "_" ] version)} or (throw ''
Unsupported version of pub 'audiotags': '${version}'
Please add Cargo.lock here. If the Cargo.lock
is the same with existing versions, add an alias here.
'');
doCheck = false; # test failed
passthru.libraryPath = "lib/libaudiotags.so";
};
in
stdenv.mkDerivation {
pname = "audiotags";
inherit version src;
inherit (src) passthru;
postPatch = ''
sed -i -e '/if(NOT EXISTS/,/endif()/d' -e '/if(NOT EXISTS/,/endif()/d' ./linux/CMakeLists.txt
sed -i 's|.*libaudiotags.so.*|${rustDep}/${rustDep.passthru.libraryPath}|' ./linux/CMakeLists.txt
'';
installPhase = ''
runHook preInstall
cp -r . $out
runHook postInstall
'';
}
@@ -1,6 +1,7 @@
{ callPackage }:
{
audiotags = callPackage ./audiotags { };
file_picker = callPackage ./file_picker { };
flutter_secure_storage_linux = callPackage ./flutter-secure-storage-linux { };
flutter_volume_controller = callPackage ./flutter_volume_controller { };
+39 -27
View File
@@ -1,32 +1,44 @@
{ stdenv, lib, fetchgit, buildGoModule, zlib, makeWrapper, xcodeenv, androidenv
, xcodeWrapperArgs ? { }
, xcodeWrapper ? xcodeenv.composeXcodeWrapper xcodeWrapperArgs
, withAndroidPkgs ? true
, androidPkgs ? androidenv.composeAndroidPackages {
includeNDK = true;
ndkVersion = "22.1.7171670";
} }:
{
stdenv,
lib,
fetchgit,
buildGoModule,
zlib,
makeWrapper,
xcodeenv,
androidenv,
xcodeWrapperArgs ? { },
xcodeWrapper ? xcodeenv.composeXcodeWrapper xcodeWrapperArgs,
withAndroidPkgs ? true,
androidPkgs ? (
androidenv.composeAndroidPackages {
includeNDK = true;
}
),
}:
buildGoModule {
pname = "gomobile";
version = "unstable-2022-05-18";
vendorHash = "sha256-AmOy3X+d2OD7ZLbFuy+SptdlgWbZJaXYEgO79M64ufE=";
version = "0-unstable-2024-12-13";
src = fetchgit {
rev = "8578da9835fd365e78a6e63048c103b27a53a82c";
name = "gomobile";
url = "https://go.googlesource.com/mobile";
sha256 = "sha256-AOR/p+DW83f2+BOxm2rFXBCrotcIyunK3UzQ/dnauWY=";
rev = "a87c1cf6cf463f0d4476cfe0fcf67c2953d76e7c";
hash = "sha256-7j4rdmCZMC8tn4vAsC9x/mMNkom/+Tl7uAY+5gkSvfY=";
};
subPackages = [ "bind" "cmd/gobind" "cmd/gomobile" ];
vendorHash = "sha256-6ycxEDEE0/i6Lxo0gb8wq3U2U7Q49AJj+PdzSl57wwI=";
subPackages = [
"bind"
"cmd/gobind"
"cmd/gomobile"
];
# Fails with: go: cannot find GOROOT directory
doCheck = false;
nativeBuildInputs = [ makeWrapper ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodeWrapper ];
nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodeWrapper ];
# Prevent a non-deterministic temporary directory from polluting the resulting object files
postPatch = ''
@@ -45,21 +57,21 @@ buildGoModule {
'';
postFixup = ''
for bin in $(ls $out/bin); do
wrapProgram $out/bin/$bin \
for prog in gomobile gobind; do
wrapProgram $out/bin/$prog \
--suffix GOPATH : $out \
'' + lib.optionalString withAndroidPkgs ''
--prefix PATH : "${androidPkgs.androidsdk}/bin" \
--set-default ANDROID_HOME "${androidPkgs.androidsdk}/libexec/android-sdk" \
'' + ''
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ zlib ]}"
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ zlib ]}" \
${lib.optionalString withAndroidPkgs ''
--prefix PATH : "${androidPkgs.androidsdk}/bin" \
--set-default ANDROID_HOME "${androidPkgs.androidsdk}/libexec/android-sdk"
''}
done
'';
meta = with lib; {
meta = {
description = "Tool for building and running mobile apps written in Go";
homepage = "https://pkg.go.dev/golang.org/x/mobile/cmd/gomobile";
license = licenses.bsd3;
maintainers = with maintainers; [ jakubgs ];
license = with lib.licenses; [ bsd3 ];
maintainers = with lib.maintainers; [ jakubgs ];
};
}
@@ -0,0 +1,64 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
nix-update-script,
# build dependencies
poetry-core,
# dependencies
appdirs,
babelfish,
chardet,
click,
jsonschema,
pysrt,
pyyaml,
# tests
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "cleanit";
version = "0.4.8";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "ratoaq2";
repo = "cleanit";
rev = version;
hash = "sha256-z1QAWWm+yg/pRCQfPqGbL0EFFT9UwqIkwhmjUuRHyuk=";
};
build-system = [ poetry-core ];
dependencies = [
appdirs
babelfish
chardet
click
jsonschema
pysrt
pyyaml
];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "cleanit" ];
passthru.updateScript = nix-update-script { };
meta = {
description = "Command line tool that helps you to keep your subtitles clean";
homepage = "https://github.com/ratoaq2/cleanit";
changelog = "https://github.com/ratoaq2/cleanit/releases/tag/${version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ eljamm ];
mainProgram = "cleanit";
};
}
@@ -4,22 +4,32 @@
fetchFromGitHub,
pythonAtLeast,
pytestCheckHook,
hatchling,
typing-extensions,
}:
buildPythonPackage rec {
pname = "coqpit";
version = "0.0.17";
format = "setuptools";
pname = "coqpit-config";
version = "0.1.2";
format = "pyproject";
src = fetchFromGitHub {
owner = "coqui-ai";
repo = pname;
owner = "idiap";
repo = "coqui-ai-coqpit";
rev = "refs/tags/v${version}";
hash = "sha256-FY3PYd8dY5HFKkhD6kBzPt0k1eFugdqsO3yIN4oDk3E=";
hash = "sha256-3LZxoj2aFTpezakBymogkNPCaEBBaaUmyIa742cSMgU=";
};
nativeCheckInputs = [ pytestCheckHook ];
nativeBuildInputs = [
hatchling
];
propagatedBuildInputs = [
typing-extensions
];
pythonImportsCheck = [
"coqpit"
"coqpit.coqpit"
@@ -35,7 +45,7 @@ buildPythonPackage rec {
longDescription = ''
Simple, light-weight and no dependency config handling through python data classes with to/from JSON serialization/deserialization.
'';
homepage = "https://github.com/coqui-ai/coqpit";
homepage = "https://github.com/idiap/coqui-ai-coqpit";
license = licenses.mit;
maintainers = teams.tts.members;
};
@@ -89,7 +89,7 @@ buildPythonPackage rec {
});
};
pythonImportCheck = [ "cms" ];
pythonImportsCheck = [ "cms" ];
meta = {
description = "Lean enterprise content management powered by Django";
@@ -120,7 +120,7 @@ buildPythonPackage rec {
export PLAYWRIGHT_BROWSERS_PATH="${playwright-driver.browsers}"
'';
pythonImportCheck = [ "filingcabinet" ];
pythonImportsCheck = [ "filingcabinet" ];
meta = {
description = "Django app that manages documents with pages, annotations and collections";
@@ -37,7 +37,7 @@ buildPythonPackage rec {
export DJANGO_SETTINGS_MODULE=tests.settings
'';
pythonImportCheck = [ "django_json_widget" ];
pythonImportsCheck = [ "django_json_widget" ];
meta = {
description = "Alternative widget that makes it easy to edit the jsonfield field of django";
@@ -61,7 +61,7 @@ buildPythonPackage rec {
});
};
pythonImportCheck = [ "djangocms_admin_style" ];
pythonImportsCheck = [ "djangocms_admin_style" ];
meta = {
description = "Django Theme tailored to the needs of django CMS";
@@ -54,7 +54,7 @@ buildPythonPackage rec {
# Disable tests because dependency djangocms-versioning isn't packaged yet.
doCheck = false;
pythonImportCheck = [ "djangocms_alias" ];
pythonImportsCheck = [ "djangocms_alias" ];
meta = {
description = "Lean enterprise content management powered by Django";
@@ -44,7 +44,7 @@ buildPythonPackage rec {
# Tests require module "djangocms-helper" which is not yet packaged
doCheck = false;
pythonImportCheck = [ "djangocms_text_ckeditor" ];
pythonImportsCheck = [ "djangocms_text_ckeditor" ];
meta = {
description = "Text Plugin for django CMS using CKEditor 4";
@@ -2,32 +2,39 @@
lib,
stdenv,
buildPythonPackage,
fetchPypi,
fetchFromGitHub,
# build-system
hatch-jupyter-builder,
hatchling,
jupyter-client,
# dependencies
markdown-it-py,
mdit-py-plugins,
nbformat,
notebook,
packaging,
pyyaml,
pythonOlder,
tomli,
# tests
jupyter-client,
notebook,
pytest-xdist,
pytestCheckHook,
pythonOlder,
pyyaml,
tomli,
versionCheckHook,
}:
buildPythonPackage rec {
pname = "jupytext";
version = "1.16.4";
version = "1.16.6";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-KOM/RvLOekH7nWd6SiyVMnKFV5tkyhBEN8S56x5BdOk=";
src = fetchFromGitHub {
owner = "mwouts";
repo = "jupytext";
tag = "v${version}";
hash = "sha256-MkFTIHXpe0rYBJsaXwFqDEao+wSL2tG4JtPx1CjHGoY=";
};
build-system = [
@@ -48,7 +55,9 @@ buildPythonPackage rec {
notebook
pytest-xdist
pytestCheckHook
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
preCheck = ''
# Tests that use a Jupyter notebook require $HOME to be writable
@@ -56,7 +65,10 @@ buildPythonPackage rec {
export PATH=$out/bin:$PATH;
'';
disabledTestPaths = [ "tests/external" ];
disabledTestPaths = [
# Requires the `git` python module
"tests/external"
];
disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
# requires access to trash
@@ -68,12 +80,12 @@ buildPythonPackage rec {
"jupytext.cli"
];
meta = with lib; {
meta = {
description = "Jupyter notebooks as Markdown documents, Julia, Python or R scripts";
homepage = "https://github.com/mwouts/jupytext";
changelog = "https://github.com/mwouts/jupytext/releases/tag/v${version}";
license = licenses.mit;
maintainers = teams.jupyter.members;
changelog = "https://github.com/mwouts/jupytext/blob/${src.tag}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = lib.teams.jupyter.members;
mainProgram = "jupytext";
};
}
@@ -126,7 +126,7 @@ buildPythonPackage rec {
nativeCheckInputs = [
mpiCheckPhaseHook
];
pythonImportCheck = [
pythonImportsCheck = [
"meep.mpb"
];
checkPhase = ''
@@ -0,0 +1,48 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
# build-system
setuptools,
cython,
numpy_2,
# dependencies
torch,
}:
buildPythonPackage rec {
pname = "monotonic-alignment-search";
version = "0.1.1";
pyproject = true;
src = fetchFromGitHub {
owner = "eginhard";
repo = "monotonic_alignment_search";
rev = "refs/tags/v${version}";
hash = "sha256-qBkJKED0KVArhzmhZo8UuWQ55XMMBgvKM3xOwiPVwKU=";
};
build-system = [
setuptools
cython
numpy_2
];
dependencies = [
torch
];
pytestFlagsArray = [ "tests" ];
pythonImportsCheck = [ "monotonic_alignment_search" ];
meta = {
homepage = "https://github.com/eginhard/monotonic_alignment_search";
description = "Monotonically align text and speech";
changelog = "https://github.com/eginhard/monotonic_alignment_search/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ jbgi ];
};
}
@@ -43,7 +43,7 @@ buildPythonPackage rec {
hypothesis
];
pythonImportCheck = [ "picologging" ];
pythonImportsCheck = [ "picologging" ];
meta = {
homepage = "https://github.com/microsoft/picologging";
@@ -45,7 +45,7 @@ buildPythonPackage rec {
sqlite
];
pythonImportCheck = [ "cangjie" ];
pythonImportsCheck = [ "cangjie" ];
# `buildPythonApplication` skips checkPhase
postInstallCheck = ''
@@ -17,27 +17,29 @@
numpy,
scipy,
# checks
# tests
jax,
jaxlib,
numba,
pytestCheckHook,
pytest-benchmark,
pytest-mock,
pytestCheckHook,
tensorflow-probability,
pythonAtLeast,
nix-update-script,
}:
buildPythonPackage rec {
pname = "pytensor";
version = "2.26.3";
version = "2.26.4";
pyproject = true;
src = fetchFromGitHub {
owner = "pymc-devs";
repo = "pytensor";
rev = "refs/tags/rel-${version}";
hash = "sha256-RhicZSVkaDtIngIOvzyEQ+VMZwdV45wDk7e7bThTIh8=";
tag = "rel-${version}";
hash = "sha256-pREyBedkF9MW7g3Bctnk8C9vVbRTsLLreldxlqDdHVI=";
};
pythonRelaxDeps = [
@@ -63,8 +65,9 @@ buildPythonPackage rec {
jax
jaxlib
numba
pytestCheckHook
pytest-benchmark
pytest-mock
pytestCheckHook
tensorflow-probability
];
@@ -153,6 +156,11 @@ buildPythonPackage rec {
"test_unbroadcast"
"test_update_equiv"
"test_update_same"
]
++ lib.optionals (pythonAtLeast "3.12") [
# Flaky: TypeError: cannot pickle 'PyCapsule' object
"test_blockwise"
"test_blockwise_benchmark"
];
disabledTestPaths = [
@@ -173,7 +181,7 @@ buildPythonPackage rec {
description = "Python library to define, optimize, and efficiently evaluate mathematical expressions involving multi-dimensional arrays";
mainProgram = "pytensor-cache";
homepage = "https://github.com/pymc-devs/pytensor";
changelog = "https://github.com/pymc-devs/pytensor/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
changelog = "https://github.com/pymc-devs/pytensor/releases/tag/rel-${version}";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [
bcdarwin
@@ -44,7 +44,7 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
pythonImportCheck = [ "poppler" ];
pythonImportsCheck = [ "poppler" ];
meta = {
description = "Python binding to poppler-cpp";
@@ -55,7 +55,7 @@ buildPythonPackage rec {
"tests/integration/test_widget.py"
];
pythonImportCheck = [ "qtile_bonsai" ];
pythonImportsCheck = [ "qtile_bonsai" ];
meta = {
changelog = "https://github.com/aravinda0/qtile-bonsai/releases/tag/${version}";
@@ -4,6 +4,8 @@
fetchFromGitHub,
fetchpatch,
hatchling,
coqpit,
fsspec,
torch,
@@ -17,32 +19,24 @@
}:
let
pname = "trainer";
version = "0.0.36";
pname = "coqui-tts-trainer";
version = "0.2.0";
in
buildPythonPackage {
inherit pname version;
format = "pyproject";
src = fetchFromGitHub {
owner = "coqui-ai";
repo = "Trainer";
owner = "idiap";
repo = "coqui-ai-Trainer";
rev = "refs/tags/v${version}";
hash = "sha256-z6TOzWqE3NytkdG3nUzh9GpFVGQEXFyzSQ8gvdB4wiw=";
hash = "sha256-zm8BTfXvfwuWpmHFcSxuu+/V4bKanSBU2dniQboVdLY=";
};
patches = [
(fetchpatch {
name = "add-support-for-python312.patch";
hash = "sha256-V5RPn/2pGKzQrf/SIRU3imo6nBhpBEJpI7HsFYbVZj4=";
url = "https://github.com/coqui-ai/Trainer/commit/0278012c7e6f5972b656d11757add4ab89f6d272.patch";
})
nativeBuildInputs = [
hatchling
];
postPatch = ''
sed -i 's/^protobuf.*/protobuf/' requirements.txt
'';
propagatedBuildInputs = [
coqpit
fsspec
@@ -65,8 +59,8 @@ buildPythonPackage {
meta = with lib; {
description = "General purpose model trainer, as flexible as it gets";
homepage = "https://github.com/coqui-ai/Trainer";
changelog = "https://github.com/coqui-ai/Trainer/releases/tag/v${version}";
homepage = "https://github.com/idiap/coqui-ai-Trainer";
changelog = "https://github.com/idiap/coqui-ai-Trainer/releases/tag/v${version}";
license = licenses.asl20;
maintainers = teams.tts.members;
};
@@ -0,0 +1,64 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
nix-update-script,
# build dependencies
poetry-core,
# dependencies
babelfish,
pyyaml,
rebulk,
unidecode,
# tests
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "trakit";
version = "0.2.2";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "ratoaq2";
repo = "trakit";
rev = version;
hash = "sha256-VV+pdsQ5WEALYZgu4AmvNce1rCTLSYPZtTMjh+aExsU=";
};
build-system = [ poetry-core ];
dependencies = [
babelfish
pyyaml
rebulk
];
nativeCheckInputs = [
pytestCheckHook
unidecode
];
disabledTests = [
# requires network access
"test_generate_config"
];
pythonImportsCheck = [ "trakit" ];
passthru.updateScript = nix-update-script { };
meta = {
description = "Guess additional information from track titles";
homepage = "https://github.com/ratoaq2/trakit";
changelog = "https://github.com/ratoaq2/trakit/releases/tag/${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ eljamm ];
};
}
+4 -25
View File
@@ -49,31 +49,10 @@ buildPythonPackage rec {
dontStrip = true;
# If this breaks, consider replacing with "${cuda_nvcc}/bin/ptxas"
postFixup =
''
chmod +x "$out/${python.sitePackages}/triton/third_party/cuda/bin/ptxas"
''
+ (
let
# Bash was getting weird without linting,
# but basically upstream contains [cc, ..., "-lcuda", ...]
# and we replace it with [..., "-lcuda", "-L/run/opengl-driver/lib", "-L$stubs", ...]
old = [ "-lcuda" ];
new = [
"-lcuda"
"-L${addDriverRunpath.driverLink}"
"-L${cudaPackages.cuda_cudart}/lib/stubs/"
];
quote = x: ''"${x}"'';
oldStr = lib.concatMapStringsSep ", " quote old;
newStr = lib.concatMapStringsSep ", " quote new;
in
''
substituteInPlace $out/${python.sitePackages}/triton/common/build.py \
--replace '${oldStr}' '${newStr}'
''
);
postFixup = ''
mkdir -p $out/${python.sitePackages}/triton/third_party/cuda/bin/
ln -s ${cudaPackages.cuda_nvcc}/bin/ptxas $out/${python.sitePackages}/triton/third_party/cuda/bin/
'';
meta = with lib; {
description = "Language and compiler for custom Deep Learning operations";
@@ -285,6 +285,9 @@ buildPythonPackage rec {
"test_parse_project_path"
"test_translates_azure_err_to_normal_err"
# tests assertion if filesystem is compressed
"test_artifact_file_cache_cleanup"
# Tries to access a storage disk but there are none in the sandbox
# psutil.test_disk_out() returns None
"test_disk_in"
+1
View File
@@ -91,6 +91,7 @@ let
pkgs:
(with pkgs; [
xorg.libxkbfile
xorg.libxshmfence
xcb-util-cursor-HEAD
krb5
zstd
@@ -0,0 +1,26 @@
{
lib,
buildHomeAssistantComponent,
fetchFromGitHub,
}:
buildHomeAssistantComponent rec {
owner = "jwillemsen";
domain = "daikin_onecta";
version = "4.2.2";
src = fetchFromGitHub {
owner = "jwillemsen";
repo = "daikin_onecta";
tag = "v${version}";
hash = "sha256-kjFBy+Nq9aQSsmvzWT2Wy/BwMpyd8GdgSXIrp44cMnA=";
};
meta = {
changelog = "https://github.com/jwillemsen/daikin_onecta/tag/v${version}";
description = "Home Assistant Integration for devices supported by the Daikin Onecta App";
homepage = "https://github.com/jwillemsen/daikin_onecta";
maintainers = with lib.maintainers; [ dandellion ];
license = lib.licenses.gpl3Only;
};
}
+1 -1
View File
@@ -31,7 +31,7 @@ buildNpmPackage {
prisma
];
npmDepsHash = "sha256-2q+3NgXkpqdljW/AnBU44002arMc0K/Rl15eqr+oa9E=";
npmDepsHash = "sha256-BkwFQVHpg7PuMU5MaW73S6R+wbdGOJ62PR9EE2ghQFg=";
makeCacheWritable = true;
npmFlags = [ "--legacy-peer-deps" ];
+2 -2
View File
@@ -5,12 +5,12 @@
}:
let
version = "1.6.1";
version = "1.7.0";
src = fetchFromGitHub {
owner = "stonith404";
repo = "pingvin-share";
rev = "v${version}";
hash = "sha256-uoOkr5awBa7MQA4tNUzFp7we5zVnBpjX6V6fNcTI84o=";
hash = "sha256-wZV3PKnGoD3g4PjSDPwMm4ftUTlEZykNkWlwLCDJfuM=";
};
in
+1 -1
View File
@@ -23,7 +23,7 @@ buildNpmPackage {
buildInputs = [ vips ];
nativeBuildInputs = [ pkg-config ];
npmDepsHash = "sha256-TC3I3suUJTCmKykitpf2vvO6aGUSoYWOnB3jFwV2W/4=";
npmDepsHash = "sha256-uu/JX039QjVwMtGI8lOjuzPC7kM1knhKycbJ/4cc1o4=";
makeCacheWritable = true;
npmFlags = [ "--legacy-peer-deps" ];
+3
View File
@@ -469,6 +469,9 @@ let
# resulting LLVM IR isn't platform-independent this doesn't give you much.
# In fact, I tried to test the result in a VM-test, but as soon as JIT was used to optimize
# a query, postgres would coredump with `Illegal instruction`.
#
# Note: This is "host canExecute build" on purpose, since this is about the LLVM that is called
# to do JIT at **runtime**.
broken = jitSupport && !stdenv.hostPlatform.canExecute stdenv.buildPlatform;
};
});
@@ -71,6 +71,6 @@ stdenv.mkDerivation {
homepage = "https://github.com/Cangjians/ibus-cangjie";
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ adisbladis ];
maintainers = with lib.maintainers; [ ];
};
}
+4
View File
@@ -1656,6 +1656,8 @@ with pkgs;
stdenv = gccStdenv;
};
arpack-mpi = arpack.override { useMpi = true; };
inherit (callPackages ../data/fonts/arphic {})
arphic-ukai arphic-uming;
@@ -2123,6 +2125,8 @@ with pkgs;
clevercsv = with python3Packages; toPythonApplication clevercsv;
cleanit = with python3Packages; toPythonApplication cleanit;
clickgen = with python3Packages; toPythonApplication clickgen;
cloud-init = python3.pkgs.callPackage ../tools/virtualization/cloud-init { inherit systemd; };
+8
View File
@@ -2336,6 +2336,8 @@ self: super: with self; {
clean-fid = callPackage ../development/python-modules/clean-fid { };
cleanit = callPackage ../development/python-modules/cleanit { };
cleanlab = callPackage ../development/python-modules/cleanlab { };
cleanvision = callPackage ../development/python-modules/cleanvision { };
@@ -8384,6 +8386,10 @@ self: super: with self; {
monotonic = callPackage ../development/python-modules/monotonic { };
monotonic-alignment-search =
callPackage ../development/python-modules/monotonic-alignment-search
{ };
monty = callPackage ../development/python-modules/monty { };
monzopy = callPackage ../development/python-modules/monzopy { };
@@ -16311,6 +16317,8 @@ self: super: with self; {
traittypes = callPackage ../development/python-modules/traittypes { };
trakit = callPackage ../development/python-modules/trakit { };
trampoline = callPackage ../development/python-modules/trampoline { };
transaction = callPackage ../development/python-modules/transaction { };