Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
@@ -19269,6 +19269,12 @@
|
||||
githubId = 22085373;
|
||||
name = "Luis Hebendanz";
|
||||
};
|
||||
qubic = {
|
||||
name = "qubic";
|
||||
email = "ThatQubicFox@protonmail.com";
|
||||
github = "AwesomeQubic";
|
||||
githubId = 77882752;
|
||||
};
|
||||
qubitnano = {
|
||||
name = "qubitnano";
|
||||
email = "qubitnano@protonmail.com";
|
||||
@@ -25108,6 +25114,12 @@
|
||||
name = "Han Verstraete";
|
||||
keys = [ { fingerprint = "2145 955E 3F5E 0C95 3458 41B5 11F7 BAEA 8567 43FF"; } ];
|
||||
};
|
||||
wenjinnn = {
|
||||
name = "wenjin";
|
||||
email = "hewenjin94@outlook.com";
|
||||
github = "wenjinnn";
|
||||
githubId = 30885216;
|
||||
};
|
||||
wenngle = {
|
||||
name = "Zeke Stephens";
|
||||
email = "zekestephens@gmail.com";
|
||||
|
||||
@@ -116,6 +116,7 @@ markdown,,,,,,
|
||||
mediator_lua,,,,,,
|
||||
middleclass,,,,,,
|
||||
mimetypes,,,,,,
|
||||
mini.test,,,,,,
|
||||
moonscript,https://raw.githubusercontent.com/leafo/moonscript/master/moonscript-dev-1.rockspec,,,,,arobyn
|
||||
mpack,,,,,,
|
||||
neorg,,,,,,GaetanLepage
|
||||
|
||||
|
@@ -378,13 +378,14 @@ with lib.maintainers;
|
||||
piegames
|
||||
infinisil
|
||||
das_j
|
||||
tomberek
|
||||
_0x4A6F
|
||||
MattSturgeon
|
||||
jfly
|
||||
# Not in the maintainer list
|
||||
# Sereja313
|
||||
];
|
||||
scope = "Tentative Nix formatter team to be established in https://github.com/NixOS/rfcs/pull/166";
|
||||
shortName = "Nix formatter team";
|
||||
scope = "Nix formatting team: https://nixos.org/community/teams/formatting/";
|
||||
shortName = "Nix formatting team";
|
||||
};
|
||||
|
||||
freedesktop = {
|
||||
|
||||
@@ -528,6 +528,8 @@
|
||||
|
||||
- `services.avahi.ipv6` now defaults to true.
|
||||
|
||||
- hddfancontrol has been updated to major release 2. See the [migration guide](https://github.com/desbma/hddfancontrol/tree/master?tab=readme-ov-file#migrating-from-v1x), as there are breaking changes.
|
||||
|
||||
- The Home Assistant module has new options {option}`services.home-assistant.blueprints.automation`, `services.home-assistant.blueprints.script`, and {option}`services.home-assistant.blueprints.template` that allow for the declarative installation of [blueprints](https://www.home-assistant.io/docs/blueprint/) into the appropriate configuration directories.
|
||||
|
||||
- For matrix homeserver Synapse we are now following the upstream recommendation to enable jemalloc as the memory allocator by default.
|
||||
|
||||
@@ -7,16 +7,24 @@
|
||||
|
||||
let
|
||||
cfg = config.services.hddfancontrol;
|
||||
types = lib.types;
|
||||
in
|
||||
|
||||
{
|
||||
options = {
|
||||
meta.maintainers = with lib.maintainers; [ philipwilk ];
|
||||
|
||||
imports = [
|
||||
(lib.mkRemovedOptionModule [
|
||||
"services"
|
||||
"hddfancontrol"
|
||||
"smartctl"
|
||||
] "Smartctl is now automatically used when necessary, which makes this option redundant")
|
||||
];
|
||||
|
||||
options = {
|
||||
services.hddfancontrol.enable = lib.mkEnableOption "hddfancontrol daemon";
|
||||
|
||||
services.hddfancontrol.disks = lib.mkOption {
|
||||
type = with types; listOf path;
|
||||
type = lib.types.listOf lib.types.path;
|
||||
default = [ ];
|
||||
description = ''
|
||||
Drive(s) to get temperature from
|
||||
@@ -25,32 +33,37 @@ in
|
||||
};
|
||||
|
||||
services.hddfancontrol.pwmPaths = lib.mkOption {
|
||||
type = with types; listOf path;
|
||||
type = lib.types.listOf lib.types.path;
|
||||
default = [ ];
|
||||
description = ''
|
||||
PWM filepath(s) to control fan speed (under /sys)
|
||||
PWM filepath(s) to control fan speed (under /sys), followed by initial and fan-stop PWM values
|
||||
'';
|
||||
example = [ "/sys/class/hwmon/hwmon2/pwm1" ];
|
||||
example = [ "/sys/class/hwmon/hwmon2/pwm1:30:10" ];
|
||||
};
|
||||
|
||||
services.hddfancontrol.smartctl = lib.mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
services.hddfancontrol.logVerbosity = lib.mkOption {
|
||||
type = lib.types.enum [
|
||||
"TRACE"
|
||||
"DEBUG"
|
||||
"INFO"
|
||||
"WARN"
|
||||
"ERROR"
|
||||
];
|
||||
default = "INFO";
|
||||
description = ''
|
||||
Probe temperature using smartctl instead of hddtemp or hdparm
|
||||
Verbosity of the log level
|
||||
'';
|
||||
};
|
||||
|
||||
services.hddfancontrol.extraArgs = lib.mkOption {
|
||||
type = with types; listOf str;
|
||||
type = lib.types.listOf lib.types.str;
|
||||
default = [ ];
|
||||
description = ''
|
||||
Extra commandline arguments for hddfancontrol
|
||||
'';
|
||||
example = [
|
||||
"--pwm-start-value=32"
|
||||
"--pwm-stop-value=0"
|
||||
"--spin-down-time=900"
|
||||
"--min-fan-speed-prct=10"
|
||||
"--interval=1min"
|
||||
];
|
||||
};
|
||||
};
|
||||
@@ -62,19 +75,22 @@ in
|
||||
cfg.disks
|
||||
[ "-p" ]
|
||||
cfg.pwmPaths
|
||||
(lib.optional cfg.smartctl "--smartctl")
|
||||
cfg.extraArgs
|
||||
];
|
||||
in
|
||||
{
|
||||
systemd.packages = [ pkgs.hddfancontrol ];
|
||||
|
||||
hardware.sensor.hddtemp = {
|
||||
enable = true;
|
||||
drives = cfg.disks;
|
||||
};
|
||||
|
||||
systemd.services.hddfancontrol = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
environment.HDDFANCONTROL_ARGS = lib.escapeShellArgs args;
|
||||
serviceConfig = {
|
||||
# Hardening
|
||||
PrivateNetwork = true;
|
||||
environment = {
|
||||
HDDFANCONTROL_LOG_LEVEL = cfg.logVerbosity;
|
||||
HDDFANCONTROL_DAEMON_ARGS = lib.escapeShellArgs args;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -482,7 +482,6 @@ in {
|
||||
hbase_2_5 = handleTest ./hbase.nix { package=pkgs.hbase_2_5; };
|
||||
hbase_2_4 = handleTest ./hbase.nix { package=pkgs.hbase_2_4; };
|
||||
hbase3 = handleTest ./hbase.nix { package=pkgs.hbase3; };
|
||||
hddfancontrol = handleTest ./hddfancontrol.nix {};
|
||||
hedgedoc = handleTest ./hedgedoc.nix {};
|
||||
herbstluftwm = handleTest ./herbstluftwm.nix {};
|
||||
homebox = handleTest ./homebox.nix {};
|
||||
|
||||
@@ -1,51 +0,0 @@
|
||||
import ./make-test-python.nix (
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
name = "hddfancontrol";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ benley ];
|
||||
};
|
||||
|
||||
nodes.machine =
|
||||
{ ... }:
|
||||
{
|
||||
imports = [ ../modules/profiles/minimal.nix ];
|
||||
|
||||
services.hddfancontrol.enable = true;
|
||||
services.hddfancontrol.disks = [ "/dev/vda" ];
|
||||
services.hddfancontrol.pwmPaths = [ "/test/hwmon1/pwm1" ];
|
||||
services.hddfancontrol.extraArgs = [
|
||||
"--pwm-start-value=32"
|
||||
"--pwm-stop-value=0"
|
||||
];
|
||||
|
||||
systemd.services.hddfancontrol_fixtures = {
|
||||
description = "Install test fixtures for hddfancontrol";
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
};
|
||||
script = ''
|
||||
mkdir -p /test/hwmon1
|
||||
echo 255 > /test/hwmon1/pwm1
|
||||
echo 2 > /test/hwmon1/pwm1_enable
|
||||
'';
|
||||
wantedBy = [ "hddfancontrol.service" ];
|
||||
before = [ "hddfancontrol.service" ];
|
||||
};
|
||||
|
||||
systemd.services.hddfancontrol.serviceConfig.ReadWritePaths = "/test";
|
||||
};
|
||||
|
||||
# hddfancontrol.service will fail to start because qemu /dev/vda doesn't have
|
||||
# any thermal interfaces, but it should ensure that fans appear to be running
|
||||
# before it aborts.
|
||||
testScript = ''
|
||||
start_all()
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
machine.succeed("journalctl -eu hddfancontrol.service|grep 'Setting fan speed'")
|
||||
machine.shutdown()
|
||||
|
||||
'';
|
||||
|
||||
}
|
||||
)
|
||||
@@ -7975,19 +7975,6 @@ final: prev:
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
mini-test = buildVimPlugin {
|
||||
pname = "mini.test";
|
||||
version = "2025-02-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "echasnovski";
|
||||
repo = "mini.test";
|
||||
rev = "82ae4d87a23faa27e7e4119d4a5cf5897cbf1b70";
|
||||
sha256 = "0n3n7j8lkxp6mc0wf80ysnwxfw29zjqyfs3ghjl518xbsvjbgcz6";
|
||||
};
|
||||
meta.homepage = "https://github.com/echasnovski/mini.test/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
mini-trailspace = buildVimPlugin {
|
||||
pname = "mini.trailspace";
|
||||
version = "2025-01-31";
|
||||
|
||||
@@ -4035,6 +4035,7 @@ in
|
||||
"lzextras"
|
||||
"lzn-auto-require"
|
||||
"middleclass"
|
||||
"mini-test"
|
||||
"neorg"
|
||||
"neotest"
|
||||
"nui-nvim"
|
||||
|
||||
+13
@@ -0,0 +1,13 @@
|
||||
diff --git a/package.json b/package.json
|
||||
index 7ab70e8..2ebe541 100644
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -437,7 +437,7 @@
|
||||
},
|
||||
"asciidoc.asciidoctorpdf_command": {
|
||||
"type": "string",
|
||||
- "default": "asciidoctor-pdf",
|
||||
+ "default": "@ASCIIDOCTOR_PDF_BIN@",
|
||||
"markdownDescription": "%asciidoc.asciidoctorpdf_command.desc%",
|
||||
"markdownDeprecationMessage": "%asciidoc.asciidoctorpdf_command.deprecationMessage%",
|
||||
"scope": "resource"
|
||||
+9
-8
@@ -8,17 +8,18 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "asciidoctor-vscode";
|
||||
publisher = "asciidoctor";
|
||||
version = "2.8.9";
|
||||
sha256 = "1xkxx5i3nhd0dzqhhdmx0li5jifsgfhv0p5h7xwsscz3gzgsdcyb";
|
||||
version = "3.4.2";
|
||||
hash = "sha256-HG3y7999xeE1erQZCnBgUPj/aC0Kwyn20PEZR9gKrxY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./commands-abspath.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace dist/src/text-parser.js \
|
||||
--replace "get('asciidoctor_command', 'asciidoctor')" \
|
||||
"get('asciidoctor_command', '${asciidoctor}/bin/asciidoctor')"
|
||||
substituteInPlace dist/src/commands/exportAsPDF.js \
|
||||
--replace "get('asciidoctorpdf_command', 'asciidoctor-pdf')" \
|
||||
"get('asciidoctorpdf_command', '${asciidoctor}/bin/asciidoctor-pdf')"
|
||||
substituteInPlace package.json \
|
||||
--replace-fail "@ASCIIDOCTOR_PDF_BIN@" \
|
||||
"${asciidoctor}/bin/asciidoctor-pdf"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -1593,8 +1593,8 @@ let
|
||||
# semver scheme, contrary to preview versions which are listed on
|
||||
# the VSCode Marketplace and use a calver scheme. We should avoid
|
||||
# using preview versions, because they expire after two weeks.
|
||||
version = "16.0.5";
|
||||
hash = "sha256-9xvArjUXxgofGuEg+XcrI5cX32gd9CvPZxWlj4eKavo=";
|
||||
version = "16.3.2";
|
||||
hash = "sha256-+TYE2kwgSTYtg8V8M7VSxpxsm6agj8sFun79wIMT5gs=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";
|
||||
@@ -3029,8 +3029,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-clangd";
|
||||
publisher = "llvm-vs-code-extensions";
|
||||
version = "0.1.24";
|
||||
hash = "sha256-yOpsYjjwHRXxbiHDPgrtswUtgbQAo+3RgN2s6UYe9mg=";
|
||||
version = "0.1.33";
|
||||
hash = "sha256-NAQ7qT99vudcb/R55pKY3M5H6sV32aB4P8IWZKVQJas=";
|
||||
};
|
||||
meta = {
|
||||
description = "C/C++ completion, navigation, and insights";
|
||||
@@ -4615,8 +4615,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "code-spell-checker";
|
||||
publisher = "streetsidesoftware";
|
||||
version = "4.0.21";
|
||||
hash = "sha256-AcZAhmJeAD4nGDhBXieUxldzNZhTPCOg6W44Sc7W4H0=";
|
||||
version = "4.0.41";
|
||||
hash = "sha256-M/uqzU64nqSdRtxxQ1H+pg0YdkqYXEHlxmXrVcn/UqA=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog";
|
||||
@@ -5332,8 +5332,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vim";
|
||||
publisher = "vscodevim";
|
||||
version = "1.26.1";
|
||||
hash = "sha256-zshuABicdkT52Nqj1L2RrfMziBRgO+R15fM32SCnyXI=";
|
||||
version = "1.29.0";
|
||||
hash = "sha256-J3V8SZJZ2LSL8QfdoOtHI1ZDmGDVerTRYP4NZU17SeQ=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
|
||||
@@ -21,8 +21,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
|
||||
mktplcRef = {
|
||||
name = "python";
|
||||
publisher = "ms-python";
|
||||
version = "2025.1.2025021102";
|
||||
hash = "sha256-qXQrBEKzZthZu1fdnRJXjryyHjpcxJA4c5LrhOI3deM=";
|
||||
version = "2025.1.2025022501";
|
||||
hash = "sha256-hPVT86Uvok4BAKbbB6FhjWxQoEY/TWVKCliEn/+QNWY=";
|
||||
};
|
||||
|
||||
buildInputs = [ icu ];
|
||||
|
||||
@@ -9,8 +9,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "jupyter";
|
||||
publisher = "ms-toolsai";
|
||||
version = "2025.1.0";
|
||||
hash = "sha256-xZMk7eNnmWviqpUvl9hXcoKL3Uwii0ZJz6DCCI9UM2k=";
|
||||
version = "2025.2.0";
|
||||
hash = "sha256-YMvu8aEumV3VTdNZKiLK+5jmTL9y5tcMxrEBwEMcTI4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -24,20 +24,19 @@
|
||||
qtwayland,
|
||||
qt5compat,
|
||||
qtmultimedia,
|
||||
qtspeech,
|
||||
wrapQtAppsHook,
|
||||
wrapGAppsHook3,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
stdenv.mkDerivation {
|
||||
pname = "goldendict-ng";
|
||||
version = "24.09.1";
|
||||
version = "25.02.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xiaoyifang";
|
||||
repo = "goldendict-ng";
|
||||
rev = "v${finalAttrs.version}-Release.ca9dd133";
|
||||
hash = "sha256-HvXC9fNLDZAEtXNjzFmaKz9Ih3n4Au69NPMuVeCiQPk=";
|
||||
tag = "v25.02.0-Release.e895b18c";
|
||||
hash = "sha256-k8pGzrSFbAUP7DG3lSAYBa5WeeSUbjZMvMqmxPqdT3E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -96,4 +95,4 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
license = licenses.gpl3Plus;
|
||||
};
|
||||
})
|
||||
}
|
||||
|
||||
@@ -10,27 +10,27 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "termdown";
|
||||
version = "1.17.0";
|
||||
version = "1.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = version;
|
||||
sha256 = "1sd9z5n2a4ir35832wgxs68vwav7wxhq39b5h8pq934mp8sl3v2k";
|
||||
repo = "termdown";
|
||||
owner = "trehn";
|
||||
repo = "termdown";
|
||||
tag = version;
|
||||
hash = "sha256-Hnk/MOYdbOl14fI0EFbIq7Hmc7TyhcZWGEg2/jmNJ5Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
python-dateutil
|
||||
click
|
||||
pyfiglet
|
||||
setuptools
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Starts a countdown to or from TIMESPEC";
|
||||
mainProgram = "termdown";
|
||||
longDescription = "Countdown timer and stopwatch in your terminal";
|
||||
homepage = "https://github.com/trehn/termdown";
|
||||
license = licenses.gpl3;
|
||||
license = lib.licenses.gpl3;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
qtbase,
|
||||
qmake,
|
||||
wrapQtAppsHook,
|
||||
@@ -10,28 +9,16 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.8.1";
|
||||
pname = "tpmmanager";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Rohde-Schwarz";
|
||||
repo = "TPMManager";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UZYn4ssbvLpdB0DssT7MXqQZCu1KkLf/Bsb45Rvgm+E=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-FhdrUJQq4us6BT8CxgWqWiXnbl900204yjyS3nnQACU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# build with Qt5
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Rohde-Schwarz/TPMManager/commit/f62c0f2de2097af9b504c80d6193818e6e4ca84f.patch";
|
||||
sha256 = "sha256-gMhDNN2UkX2lJf/oJEzOkCvF6+EGdIj9xwtXb1rCeys=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Rohde-Schwarz/TPMManager/commit/c287a841ac6b057ed35799949211866b9f533561.patch";
|
||||
sha256 = "sha256-2ZyUml8Q9bKQLVZWr18AzLt8VYLICXH9VDeq6B5Xfto=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
wrapQtAppsHook
|
||||
@@ -43,6 +30,8 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
install -Dpm755 -D bin/tpmmanager $out/bin/tpmmanager
|
||||
|
||||
@@ -56,6 +45,8 @@ stdenv.mkDerivation rec {
|
||||
Exec=$out/bin/tpmmanager
|
||||
Terminal=false
|
||||
EOF
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
@@ -64,6 +55,6 @@ stdenv.mkDerivation rec {
|
||||
mainProgram = "tpmmanager";
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = [ ];
|
||||
platforms = with lib.platforms; linux;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -32,6 +32,7 @@ let
|
||||
mozillaPlatforms = {
|
||||
i686-linux = "linux-i686";
|
||||
x86_64-linux = "linux-x86_64";
|
||||
aarch64-linux = "linux-aarch64";
|
||||
};
|
||||
|
||||
arch = mozillaPlatforms.${stdenv.hostPlatform.system};
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -67,7 +67,7 @@ writeScript "update-${pname}" ''
|
||||
version = "$version";
|
||||
sources = [
|
||||
EOF
|
||||
for arch in linux-x86_64 linux-i686; do
|
||||
for arch in linux-x86_64 linux-i686 linux-aarch64; do
|
||||
# retriving a list of all tarballs for each arch
|
||||
# - only select tarballs for current arch
|
||||
# - only select tarballs for current version
|
||||
|
||||
@@ -68,7 +68,6 @@ in
|
||||
, gnum4
|
||||
, gtk3
|
||||
, icu73
|
||||
, icu74
|
||||
, libGL
|
||||
, libGLU
|
||||
, libevent
|
||||
@@ -254,7 +253,8 @@ buildStdenv.mkDerivation {
|
||||
patches = lib.optionals (lib.versionAtLeast version "111" && lib.versionOlder version "133") [ ./env_var_for_system_dir-ff111.patch ]
|
||||
++ lib.optionals (lib.versionAtLeast version "133") [ ./env_var_for_system_dir-ff133.patch ]
|
||||
++ lib.optionals (lib.versionAtLeast version "96" && lib.versionOlder version "121") [ ./no-buildconfig-ffx96.patch ]
|
||||
++ lib.optionals (lib.versionAtLeast version "121") [ ./no-buildconfig-ffx121.patch ]
|
||||
++ lib.optionals (lib.versionAtLeast version "121" && lib.versionOlder version "136") [ ./no-buildconfig-ffx121.patch ]
|
||||
++ lib.optionals (lib.versionAtLeast version "136") [ ./no-buildconfig-ffx136.patch ]
|
||||
++ lib.optionals (lib.versionOlder version "128.2" || (lib.versionAtLeast version "129" && lib.versionOlder version "130")) [
|
||||
(fetchpatch {
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1912663
|
||||
@@ -448,7 +448,8 @@ buildStdenv.mkDerivation {
|
||||
# MacOS builds use bundled versions of libraries: https://bugzilla.mozilla.org/show_bug.cgi?id=1776255
|
||||
"--enable-system-pixman"
|
||||
"--with-system-ffi"
|
||||
"--with-system-icu"
|
||||
# Firefox 136 fails to link with our icu76.1
|
||||
(lib.optionalString (lib.versionOlder version "136") "--with-system-icu")
|
||||
"--with-system-jpeg"
|
||||
"--with-system-libevent"
|
||||
"--with-system-libvpx"
|
||||
@@ -532,9 +533,7 @@ buildStdenv.mkDerivation {
|
||||
++ lib.optional sndioSupport sndio
|
||||
++ lib.optionals waylandSupport [ libxkbcommon libdrm ]
|
||||
))
|
||||
# icu74 fails to build on 127 and older
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1862601
|
||||
++ [ (if (lib.versionAtLeast version "134") then icu74 else icu73) ]
|
||||
++ lib.optionals (lib.versionOlder version "136") [ icu73 ]
|
||||
++ lib.optional gssSupport libkrb5
|
||||
++ lib.optional jemallocSupport jemalloc
|
||||
++ extraBuildInputs;
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
|
||||
index 16888323d7..b96450a247 100644
|
||||
--- a/docshell/base/nsAboutRedirector.cpp
|
||||
+++ b/docshell/base/nsAboutRedirector.cpp
|
||||
@@ -90,9 +90,6 @@ static const RedirEntry kRedirMap[] = {
|
||||
{"addons", "chrome://mozapps/content/extensions/aboutaddons.html",
|
||||
nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},
|
||||
#endif
|
||||
- {"buildconfig", "chrome://global/content/buildconfig.html",
|
||||
- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
|
||||
- nsIAboutModule::IS_SECURE_CHROME_UI},
|
||||
{"checkerboard", "chrome://global/content/aboutCheckerboard.html",
|
||||
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
|
||||
nsIAboutModule::ALLOW_SCRIPT},
|
||||
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
|
||||
index eb6c179b60..57568668b1 100644
|
||||
--- a/toolkit/content/jar.mn
|
||||
+++ b/toolkit/content/jar.mn
|
||||
@@ -40,7 +40,6 @@ toolkit.jar:
|
||||
content/global/aboutUrlClassifier.js
|
||||
content/global/aboutUrlClassifier.xhtml
|
||||
content/global/aboutUrlClassifier.css
|
||||
-* content/global/buildconfig.html
|
||||
content/global/buildconfig.css
|
||||
content/global/contentAreaUtils.js
|
||||
content/global/datepicker.xhtml
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "128.7.0esr";
|
||||
version = "128.8.0esr";
|
||||
applicationName = "Firefox ESR";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "26f9661b395b85a44b42bd72ef1ad976c614216c68f6c2dd834d0ac8b84b9c9f398b8ac550a47396995d96e6bb5fa9a50064d7f2f526bddd45aed5039ef131b8";
|
||||
sha512 = "7c0ef22bc14d4fa248cbae14d629174c9c967f891f4525f609760595f5a108aedf7dd804d1b63b97ec268613fa98378f4742a9b6ab562454351cf21175fdb802";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -9,10 +9,10 @@
|
||||
|
||||
buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "135.0.1";
|
||||
version = "136.0";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "9ff7c2ab6bc1660e339cdcd7745f8bdac5be25d3a79b9f0393385935270d7ef488599856bc38c22ae0b067389fa71a6999703b74804a6e0ea8265eb99788cea9";
|
||||
sha512 = "a2b7e74e8404138b294f7b3c5f1eaeaeb8ce84c9aad25379e8ec785a9686f42def9f8c119d4bc276dd371d13d7bebbe4b1b092af41500aa8c2b2c827971445b4";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
stdenv,
|
||||
extra-cmake-modules,
|
||||
fetchurl,
|
||||
fetchFromGitLab,
|
||||
fetchpatch,
|
||||
kconfig,
|
||||
kdoctools,
|
||||
kguiaddons,
|
||||
@@ -35,6 +37,36 @@
|
||||
libxisf,
|
||||
curl,
|
||||
}:
|
||||
|
||||
let
|
||||
# reverts 'eigen: 3.4.0 -> 3.4.0-unstable-2022-05-19'
|
||||
# https://github.com/nixos/nixpkgs/commit/d298f046edabc84b56bd788e11eaf7ed72f8171c
|
||||
eigen' = eigen.overrideAttrs (old: rec {
|
||||
version = "3.4.0";
|
||||
src = fetchFromGitLab {
|
||||
owner = "libeigen";
|
||||
repo = "eigen";
|
||||
rev = version;
|
||||
hash = "sha256-1/4xMetKMDOgZgzz3WMxfHUEpmdAm52RqZvz6i0mLEw=";
|
||||
};
|
||||
patches = (old.patches or [ ]) ++ [
|
||||
# Fixes e.g. onnxruntime on aarch64-darwin:
|
||||
# https://hydra.nixos.org/build/248915128/nixlog/1,
|
||||
# originally suggested in https://github.com/NixOS/nixpkgs/pull/258392.
|
||||
#
|
||||
# The patch is from
|
||||
# ["Fix vectorized reductions for Eigen::half"](https://gitlab.com/libeigen/eigen/-/merge_requests/699)
|
||||
# which is two years old,
|
||||
# but Eigen hasn't had a release in two years either:
|
||||
# https://gitlab.com/libeigen/eigen/-/issues/2699.
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/libeigen/eigen/-/commit/d0e3791b1a0e2db9edd5f1d1befdb2ac5a40efe0.patch";
|
||||
hash = "sha256-8qiNpuYehnoiGiqy0c3Mcb45pwrmc6W4rzCxoLDSvj0=";
|
||||
})
|
||||
];
|
||||
});
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kstars";
|
||||
version = "3.7.4";
|
||||
@@ -68,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
qtdatavis3d
|
||||
breeze-icons
|
||||
libsecret
|
||||
eigen
|
||||
eigen'
|
||||
zlib
|
||||
cfitsio
|
||||
indi-full
|
||||
|
||||
@@ -115,15 +115,15 @@ convertIconTheme() {
|
||||
}
|
||||
|
||||
# macOS does not correctly display 16x and 32x png icons on app bundles
|
||||
# they need to be converted to rgb+mask (argb is supported only from macOS 11)
|
||||
# they need to be converted to argb
|
||||
function convertIfUnsupportedIcon() {
|
||||
local -r in=$1
|
||||
local -r iconSize=$2
|
||||
local -r scale=$3
|
||||
local -r out=${in%.png}.rgb
|
||||
local -r out=${in%.png}.argb
|
||||
|
||||
if [[ ($scale -eq 1) && ($iconSize -eq 32 || $iconSize -eq 16) ]]; then
|
||||
echo "desktopToDarwinBundle: converting ${iconSize}x icon to rgb" >&2
|
||||
echo "desktopToDarwinBundle: converting ${iconSize}x icon to argb" >&2
|
||||
icnsutil convert "$out" "$in"
|
||||
rm "$in"
|
||||
fi
|
||||
|
||||
@@ -64,14 +64,14 @@ let
|
||||
in
|
||||
py.pkgs.buildPythonApplication rec {
|
||||
pname = "awscli2";
|
||||
version = "2.24.7"; # N.B: if you change this, check if overrides are still up-to-date
|
||||
version = "2.24.16"; # N.B: if you change this, check if overrides are still up-to-date
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "aws-cli";
|
||||
tag = version;
|
||||
hash = "sha256-yTfTWLI12ASKb6zkXb37vARIOVBLxqFWvtEDOMjXges=";
|
||||
hash = "sha256-WbCJ3sBCI5wC6QbxY1KKNpJ8hkK6yhonq7F2Gzxw8DA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -27,11 +27,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bochs";
|
||||
version = "2.8";
|
||||
version = "3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/bochs/bochs/${finalAttrs.version}/bochs-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-qFsTr/fYQR96nzVrpsM7X13B+7EH61AYzCOmJjnaAFk=";
|
||||
hash = "sha256-y29UK1HzWizJIGsqmA21YCt80bfPLk7U8Ras1VB3gao=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -65,6 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${lib.getExe electron} $out/bin/bs-manager \
|
||||
--set-default ELECTRON_FORCE_IS_PACKAGED 1 \
|
||||
--add-flags $out/opt/BSManager/resources \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--inherit-argv0
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
cargo,
|
||||
makeWrapper,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-clean-recursive";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IgaguriMK";
|
||||
repo = "cargo-clean-recursive";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-H/t9FW7zxS+58lrvay/lmb0xFgpeJQ1dCIm0oSEtflA=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-PcUKvVm9pKyw4sxJo9m6UJhsVURdlAwp1so199DAQBI=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/cargo-clean-recursive \
|
||||
--prefix PATH : ${lib.makeBinPath [ cargo ]}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Cleans all projects under specified directory.";
|
||||
mainProgram = "cargo-clean-recursive";
|
||||
homepage = "https://github.com/IgaguriMK/cargo-clean-recursive";
|
||||
license = with lib.licenses; [
|
||||
asl20 # or
|
||||
mit
|
||||
];
|
||||
maintainers = with lib.maintainers; [ qubic ];
|
||||
};
|
||||
})
|
||||
@@ -1,6 +1,5 @@
|
||||
{
|
||||
buildGoModule,
|
||||
fetchFromGitLab,
|
||||
fetchFromGitHub,
|
||||
gobject-introspection,
|
||||
gst_all_1,
|
||||
@@ -14,28 +13,15 @@
|
||||
wrapGAppsHook4,
|
||||
}:
|
||||
|
||||
let
|
||||
libspelling_2_1 = libspelling.overrideAttrs {
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = "libspelling";
|
||||
rev = "refs/tags/0.2.1";
|
||||
hash = "sha256-0OGcwPGWtYYf0XmvzXEaQgebBOW/6JWcDuF4MlQjCZQ=";
|
||||
};
|
||||
};
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "dissent";
|
||||
version = "0.0.31";
|
||||
version = "0.0.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "diamondburned";
|
||||
repo = "dissent";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mI0rZ7w2a6fzELYRHgeekTWYDaQGcDYectRWUdOmlYc=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-6ZUJp4pW+rbV+2TJ9H69kThc5zzDFG5KjGRHVwFS76Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -56,7 +42,7 @@ buildGoModule rec {
|
||||
sound-theme-freedesktop
|
||||
# gotk4-spelling fails to build with libspelling >= 0.3.0
|
||||
# https://github.com/diamondburned/gotk4-spelling/issues/1
|
||||
libspelling_2_1
|
||||
libspelling
|
||||
gtksourceview5
|
||||
];
|
||||
|
||||
@@ -70,17 +56,17 @@ buildGoModule rec {
|
||||
install -D -m 444 -t $out/share/dbus-1/services nix/so.libdb.dissent.service
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-JISIS8k/veBAqZ0DlxVBrc+25IVM6BpY4eE5uxsjo+Y=";
|
||||
vendorHash = "sha256-cA+rD7mbTYE+LqdLFFV8Li65wL2B5cUFwxWsMwNMRQg=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A third-party Discord client designed for a smooth, native experience (formerly gtkcord4)";
|
||||
meta = {
|
||||
description = "Third-party Discord client designed for a smooth, native experience (formerly gtkcord4)";
|
||||
homepage = "https://github.com/diamondburned/dissent";
|
||||
license = with licenses; [
|
||||
license = with lib.licenses; [
|
||||
gpl3Plus
|
||||
cc0
|
||||
];
|
||||
mainProgram = "dissent";
|
||||
maintainers = with maintainers; [
|
||||
maintainers = with lib.maintainers; [
|
||||
hmenke
|
||||
urandom
|
||||
aleksana
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
makeWrapper,
|
||||
cmake,
|
||||
python3,
|
||||
@@ -17,20 +18,29 @@
|
||||
git,
|
||||
libusb-compat-0_1,
|
||||
cereal,
|
||||
minizip,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "domoticz";
|
||||
version = "2024.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "domoticz";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
repo = "domoticz";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-D8U1kK3m1zT83YvZ42hGSU9PzBfS1VGr2mxUYbM2vNQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Boost 1.87 compatibility, remove once upgraded to 2025.1
|
||||
(fetchpatch {
|
||||
url = "https://github.com/domoticz/domoticz/commit/5d0db89bbd120ed5dc05b4ff8c136f14a42f0cd3.patch";
|
||||
hash = "sha256-FPe83yJKJEgnY3kABy9CTRe1CBh42dPG1ZWCUE5PO8E=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
python3
|
||||
@@ -44,6 +54,7 @@ stdenv.mkDerivation rec {
|
||||
git
|
||||
libusb-compat-0_1
|
||||
cereal
|
||||
minizip
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -60,7 +71,7 @@ stdenv.mkDerivation rec {
|
||||
"-DUSE_BUILTIN_ZLIB=false"
|
||||
"-DUSE_OPENSSL_STATIC=false"
|
||||
"-DUSE_STATIC_BOOST=false"
|
||||
"-DUSE_BUILTIN_MINIZIP=true"
|
||||
"-DUSE_BUILTIN_MINIZIP=false"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
@@ -75,19 +86,24 @@ stdenv.mkDerivation rec {
|
||||
wrapProgram $out/bin/domoticz --set LD_LIBRARY_PATH ${python3}/lib;
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Home automation system";
|
||||
longDescription = ''
|
||||
Domoticz is a home automation system that lets you monitor and configure
|
||||
various devices like: lights, switches, various sensors/meters like
|
||||
temperature, rain, wind, UV, electra, gas, water and much more
|
||||
'';
|
||||
maintainers = with maintainers; [ edcragg ];
|
||||
maintainers = with lib.maintainers; [ edcragg ];
|
||||
homepage = "https://www.domoticz.com/";
|
||||
changelog = "https://github.com/domoticz/domoticz/blob/${version}/History.txt";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.all;
|
||||
changelog = "https://github.com/domoticz/domoticz/blob/${finalAttrs.version}/History.txt";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.all;
|
||||
broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/domoticz.x86_64-darwin
|
||||
mainProgram = "domoticz";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -63,7 +63,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
# Path to vips (otherwise it looks within the electron derivation)
|
||||
postPatch = ''
|
||||
substituteInPlace src/main/services/image.ts --replace-fail "process.resourcesPath" "\"$out/share/ente-desktop/resources\""
|
||||
substituteInPlace src/main/services/image.ts src/main.ts \
|
||||
--replace-fail "process.resourcesPath" '"$out/share/ente-desktop/resources"'
|
||||
'';
|
||||
|
||||
postConfigure = ''
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fingerprintx";
|
||||
version = "1.1.14";
|
||||
version = "1.1.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "praetorian-inc";
|
||||
repo = "fingerprintx";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-o0u6UOrdzORnTgfOlc0kSQ5diDtNHjjbwfuyvPoHHKs=";
|
||||
hash = "sha256-kbSP/nSdCrcEYVvLVawjZ2RDvTGv5JsHEIXXcPLA1ng=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-TMy6FwAFlo+ARvm+RiRqly0xIk4lBCXuZrtdnNSMSxw=";
|
||||
vendorHash = "sha256-1KSNvK2ylqWjfhxMY+NQFoDahPgqGb12nA4oGqqoFIA=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -15,18 +15,18 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fish-lsp";
|
||||
version = "1.0.8-1";
|
||||
version = "1.0.8-4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ndonfris";
|
||||
repo = "fish-lsp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-u125EZXQEouVbmJuoW3KNDNqLB5cS/TzblXraClcw6Q=";
|
||||
hash = "sha256-rtogxbcnmOEFT1v7aK+pzt9Z4B2O4rFwH3pTNVLTxiA=";
|
||||
};
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = src + "/yarn.lock";
|
||||
hash = "sha256-hHw7DbeqaCapqx4dK5Y3sPut94ist9JOU8g9dd6gBdo=";
|
||||
hash = "sha256-83QhVDG/zyMbHJbV48m84eimXejLKdeVrdk1uZjI8bk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -45,6 +45,11 @@ stdenv.mkDerivation rec {
|
||||
yarn --offline compile
|
||||
'';
|
||||
|
||||
# We do it in postPatch, since it needs to be fixed before buildPhase
|
||||
postPatch = ''
|
||||
patchShebangs bin/fish-lsp
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "flix";
|
||||
version = "0.57.1";
|
||||
version = "0.58.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar";
|
||||
sha256 = "sha256-baUKhAC0M4nLbukxdWaxsToGGS1Zb+Oj9CTCqtwHE4o=";
|
||||
sha256 = "sha256-nneE2qE7k89gg8aBscyRHRD5jpNmQxwdxQmKlX1w/KA=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-passbolt-cli";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "passbolt";
|
||||
repo = "go-passbolt-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-I+niNUowKTFDMa7yOnRToMFPzO/CbnjXHJr5nAhhHcg=";
|
||||
hash = "sha256-BtMPOmp9dbi/HoNigEeGWIYXRh1/gorV8ycrtWw9I8s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XRHGq3Qeq7VWHzw5WWVv4x5orQu740lttGVreiu7qP4=";
|
||||
vendorHash = "sha256-wGSrhW7OsSjHlSKLkOf2AYIxU1m2lM1WGUsy16qxBwA=";
|
||||
|
||||
ldflags = [
|
||||
"-X=main.version=${version}"
|
||||
|
||||
@@ -17,17 +17,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "grafana-alloy";
|
||||
version = "1.6.1";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "alloy";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-7NcSe+6MqS5Bxu64qaJKKxSsQYYEqeGGRgDpcag8t1I=";
|
||||
hash = "sha256-t1YDYQ+0RKHYaL/oE9XGjV7/g28rHO9avL6/CTfMHeE=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-DmSyEgEIJEMOOfOQxDZUGT81Iw6QO0gOhSkXSilL16g=";
|
||||
vendorHash = "sha256-d9uWbZ+5YSnB3yqL/YZ0ld+8soO3oGb8gttzj3Q7MXs=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
fixup-yarn-lock
|
||||
@@ -127,7 +127,12 @@ buildGoModule rec {
|
||||
package = grafana-alloy;
|
||||
};
|
||||
};
|
||||
updateScript = nix-update-script { };
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"v(.+)"
|
||||
];
|
||||
};
|
||||
# alias for nix-update to be able to find and update this attribute
|
||||
offlineCache = yarnOfflineCache;
|
||||
};
|
||||
|
||||
@@ -1,45 +1,68 @@
|
||||
{
|
||||
lib,
|
||||
python3Packages,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
hddtemp,
|
||||
hdparm,
|
||||
smartmontools,
|
||||
nixosTests,
|
||||
makeWrapper,
|
||||
installShellFiles,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "hddfancontrol";
|
||||
version = "1.5.1";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "desbma";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0b2grf98qnikayn18xll01dkm5pjpcjxdffgx1nyw9s0gqig8dg0";
|
||||
repo = "hddfancontrol";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-QckNS1IT2GorCYRgVX5B0VY5Rf5U6pHa1uSqzz8ctgE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
python3Packages.python-daemon
|
||||
hddtemp
|
||||
hdparm
|
||||
smartmontools
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-drOWc00zqkR2sep1aoAe3urZeA31zM0sUUGW6oDojOM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
postBuild = ''
|
||||
mkdir -p target/man
|
||||
cargo run --features gen-man-pages -- target/man
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/etc/systemd/system
|
||||
substitute systemd/hddfancontrol.service $out/etc/systemd/system/hddfancontrol.service \
|
||||
--replace /usr/bin/hddfancontrol $out/bin/hddfancontrol
|
||||
--replace-fail /usr/bin/hddfancontrol $out/bin/hddfancontrol
|
||||
sed -i -e '/EnvironmentFile=.*/d' $out/etc/systemd/system/hddfancontrol.service
|
||||
|
||||
cd target/man
|
||||
installManPage hddfancontrol-daemon.1 hddfancontrol-pwm-test.1 hddfancontrol.1
|
||||
'';
|
||||
|
||||
passthru.tests = { inherit (nixosTests) hddfancontrol; };
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/hddfancontrol \
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
hddtemp
|
||||
hdparm
|
||||
smartmontools
|
||||
]
|
||||
}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Dynamically control fan speed according to hard drive temperature on Linux";
|
||||
changelog = "https://github.com/desbma/hddfancontrol/releases/tag/${finalAttrs.version}";
|
||||
homepage = "https://github.com/desbma/hddfancontrol";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ benley ];
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
benley
|
||||
philipwilk
|
||||
];
|
||||
mainProgram = "hddfancontrol";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -7,15 +7,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "istioctl";
|
||||
version = "1.24.3";
|
||||
version = "1.25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "istio";
|
||||
repo = "istio";
|
||||
rev = version;
|
||||
hash = "sha256-/ABy0zZF/+rxYkpS5H6EAXZVYZxt7I4SCjLtrtkacGw=";
|
||||
hash = "sha256-dTV5yjQZG7RjfUmXGil6ad46HaZzUCwk27EdP+yYbRE=";
|
||||
};
|
||||
vendorHash = "sha256-B4MxvOzKxsQJmc9dKQFt1CGi1PnElOt8H72H2JVaZUU=";
|
||||
vendorHash = "sha256-KecRVqI00F/qoLkbi1CaKotyTnSp0K/u7xKPb45TYMY=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "klog-rs";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tobifroe";
|
||||
repo = "klog";
|
||||
rev = version;
|
||||
hash = "sha256-AlXyCDjs5xFqM0TmaBGfzvYn/ZDWAgBzLV/mDPQHflI=";
|
||||
hash = "sha256-t53HC5eBC587jyvJKxlG3B3Im7RM6bDcZfUO4npgGfM=";
|
||||
};
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-A9QhOFsjEXljsugakJ0s7XdAPF447JIFaQGfDGDVp1E=";
|
||||
cargoHash = "sha256-HmKMxI94j0cLLAjmUJQhymop9qiH71Rm8dnVVs2VDF8=";
|
||||
checkFlags = [
|
||||
# this integration test depends on a running kubernetes cluster
|
||||
"--skip=k8s::tests::test_get_pod_list"
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libmsquic";
|
||||
version = "2.4.7";
|
||||
version = "2.4.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "msquic";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WveyZ9rMevLTc5C4cgMFcnj0O6Hd+HcfU8ccD6VBgyU=";
|
||||
hash = "sha256-cgLrTcoa77XuVsMBvOWw9oKoNtD1ihJM553YpZ+GzQQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
# Heavily based on
|
||||
# https://github.com/risicle/nix-heuristic-gc/blob/0.6.0/default.nix
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
nix,
|
||||
boost,
|
||||
python3Packages,
|
||||
}:
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "nix-heuristic-gc";
|
||||
version = "0.6.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "risicle";
|
||||
repo = "nix-heuristic-gc";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-lph+rm8qXoA6h2dJTYeuj9HJAx6PnKZSdsKBElbBUbY=";
|
||||
};
|
||||
|
||||
# NIX_SYSTEM suggested at
|
||||
# https://github.com/NixOS/nixpkgs/issues/386184#issuecomment-2692433531
|
||||
NIX_SYSTEM = nix.stdenv.hostPlatform.system;
|
||||
NIX_CFLAGS_COMPILE = [ "-I${lib.getDev nix}/include/nix" ];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
nix
|
||||
python3Packages.pybind11
|
||||
python3Packages.setuptools
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
python3Packages.humanfriendly
|
||||
python3Packages.rustworkx
|
||||
];
|
||||
checkInputs = [ python3Packages.pytestCheckHook ];
|
||||
|
||||
preCheck = "mv nix_heuristic_gc .nix_heuristic_gc";
|
||||
|
||||
meta = {
|
||||
mainProgram = "nix-heuristic-gc";
|
||||
description = "Discerning garbage collection for Nix";
|
||||
longDescription = ''
|
||||
A more discerning cousin of `nix-collect-garbage`, mostly intended as a
|
||||
testbed to allow experimentation with more advanced selection processes.
|
||||
'';
|
||||
homepage = "https://github.com/risicle/nix-heuristic-gc";
|
||||
license = lib.licenses.lgpl21Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
ris
|
||||
me-and
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,133 @@
|
||||
{
|
||||
lib,
|
||||
runCommand,
|
||||
buildEnv,
|
||||
makeWrapper,
|
||||
writers,
|
||||
treefmt2,
|
||||
nixfmt-rfc-style,
|
||||
nixfmt-tree,
|
||||
|
||||
settings ? {
|
||||
# The default is warn, which would be too annoying for people who just care about Nix
|
||||
on-unmatched = "info";
|
||||
# Assumes the user is using Git, fails if it's not
|
||||
tree-root-file = ".git/index";
|
||||
|
||||
formatter.nixfmt = {
|
||||
command = "nixfmt";
|
||||
includes = [ "*.nix" ];
|
||||
};
|
||||
},
|
||||
runtimePackages ? [
|
||||
nixfmt-rfc-style
|
||||
],
|
||||
}:
|
||||
buildEnv {
|
||||
name = "nixfmt-tree";
|
||||
|
||||
# Allows this derivation to be used as a shell providing both treefmt and nixfmt
|
||||
paths = [ treefmt2 ] ++ runtimePackages;
|
||||
pathsToLink = [ "/bin" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
postBuild = ''
|
||||
wrapProgram $out/bin/treefmt \
|
||||
--prefix PATH : $out/bin \
|
||||
--add-flags "--config-file ${writers.writeTOML "treefmt.toml" settings}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
mainProgram = "treefmt";
|
||||
description = "Official Nix formatter zero-setup starter using treefmt";
|
||||
longDescription = ''
|
||||
A zero-setup [treefmt](https://treefmt.com/) starter to get started using the [official Nix formatter](https://github.com/NixOS/nixfmt).
|
||||
|
||||
- For `nix fmt` to format all Nix files, add this to the `flake.nix` outputs:
|
||||
|
||||
```nix
|
||||
formatter.''${system} = nixpkgs.legacyPackages.''${system}.nixfmt-tree;
|
||||
```
|
||||
|
||||
- The same can be done more efficiently with the `treefmt` command,
|
||||
which you can get in `nix-shell`/`nix develop` by extending `mkShell` using
|
||||
|
||||
```nix
|
||||
mkShell {
|
||||
packages = [ pkgs.nixfmt-tree ];
|
||||
}
|
||||
```
|
||||
|
||||
You can then also use `treefmt` in a pre-commit/pre-push [Git hook](https://git-scm.com/docs/githooks)
|
||||
and `nixfmt` with your editors format-on-save feature.
|
||||
|
||||
- To check formatting in CI, run the following in a checkout of your Git repository:
|
||||
```
|
||||
treefmt --ci
|
||||
```
|
||||
|
||||
For more flexibility, you can customise this package using
|
||||
```nix
|
||||
nixfmt-tree.override {
|
||||
settings = { /* treefmt config */ };
|
||||
runtimePackages = [ /* List any formatters here */ ];
|
||||
}
|
||||
```
|
||||
|
||||
Alternatively you can switch to the more fully-featured [treefmt-nix](https://github.com/numtide/treefmt-nix).
|
||||
'';
|
||||
# All the code is in this file, so same license as Nixpkgs
|
||||
license = lib.licenses.mit;
|
||||
maintainers = lib.teams.formatter.members;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
||||
passthru.tests.simple = runCommand "nixfmt-tree-test-simple" { } ''
|
||||
export XDG_CACHE_HOME=$(mktemp -d)
|
||||
cat > unformatted.nix <<EOF
|
||||
let to = "be formatted"; in to
|
||||
EOF
|
||||
|
||||
cat > formatted.nix <<EOF
|
||||
let
|
||||
to = "be formatted";
|
||||
in
|
||||
to
|
||||
EOF
|
||||
|
||||
mkdir -p repo
|
||||
(
|
||||
cd repo
|
||||
mkdir .git dir
|
||||
touch .git/index
|
||||
cp ../unformatted.nix a.nix
|
||||
cp ../unformatted.nix dir/b.nix
|
||||
|
||||
${lib.getExe nixfmt-tree} dir
|
||||
if [[ "$(<dir/b.nix)" != "$(<../formatted.nix)" ]]; then
|
||||
echo "File dir/b.nix was not formatted properly after dir was requested to be formatted"
|
||||
exit 1
|
||||
elif [[ "$(<a.nix)" != "$(<../unformatted.nix)" ]]; then
|
||||
echo "File a.nix was formatted when only dir was requested to be formatted"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
(
|
||||
cd dir
|
||||
${lib.getExe nixfmt-tree}
|
||||
)
|
||||
|
||||
if [[ "$(<a.nix)" != "$(<../formatted.nix)" ]]; then
|
||||
echo "File a.nix was not formatted properly after running treefmt without arguments in dir"
|
||||
exit 1
|
||||
fi
|
||||
)
|
||||
|
||||
echo "Success!"
|
||||
|
||||
touch $out
|
||||
'';
|
||||
}
|
||||
@@ -12,13 +12,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.17.1";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SmilyOrg";
|
||||
repo = "photofield";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-leCXj8vETlrU1fwTqLcjcCGvhWWC1ESjpNDWSytAq4s=";
|
||||
hash = "sha256-ZPEkvh+wVudDz7h+5V8I90myyi4ksTU5B5ffI7DrCL0=";
|
||||
};
|
||||
|
||||
webui = buildNpmPackage {
|
||||
@@ -40,7 +40,7 @@ buildGo122Module {
|
||||
pname = "photofield";
|
||||
inherit version src;
|
||||
|
||||
vendorHash = "sha256-eN9syG9/QUA8yut3LaeIb+xlaNUvRAFspyqcCHv6oSA=";
|
||||
vendorHash = "sha256-m0RJgwDO+IcMCbtq2WZixMzZWtglHM6wpoPKOEU0CCw=";
|
||||
|
||||
preBuild = ''
|
||||
cp -r ${webui}/share/photofield-ui ui/dist
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rasm";
|
||||
version = "2.3.4";
|
||||
version = "2.3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EdouardBERGE";
|
||||
repo = "rasm";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Yi4E8sgaQmUkQL7sxpbGDG6IPsL9RfMW2xXBCBhYXwg=";
|
||||
hash = "sha256-gH1YGN8uM4K8JpkV2r7PilAcgv8leswaN+IOgMM0m74=";
|
||||
};
|
||||
|
||||
# by default the EXEC variable contains `rasm.exe`
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "remotebox";
|
||||
version = "3.4";
|
||||
version = "3.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://remotebox.knobgoblin.org.uk/downloads/RemoteBox-${version}.tar.bz2";
|
||||
sha256 = "sha256-oIWSli/pc+kqMkYqkeHr3fZshWUHx6ecqAZXf6fl2ik=";
|
||||
sha256 = "sha256-dJCeiF2gYfpECLo9UtSuiAcvTHUQPX/NZE4vYX8v1F4=";
|
||||
};
|
||||
|
||||
buildInputs = with perlPackages; [
|
||||
|
||||
@@ -32,13 +32,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "renderdoc";
|
||||
version = "1.36";
|
||||
version = "1.37";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "baldurk";
|
||||
repo = "renderdoc";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-a7jUWjNrpy3FnLRccljV7obAlnQwyMJrAaGf9iZa0UY=";
|
||||
hash = "sha256-udi3v5DyJ9aDBsfTv+T9VTa7SyhNAyuNB3LF5G8vZVg=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
networkmanager,
|
||||
libnotify,
|
||||
coreutils,
|
||||
gnused,
|
||||
gawk,
|
||||
}:
|
||||
|
||||
let
|
||||
wrapperPath = lib.makeBinPath [
|
||||
coreutils
|
||||
libnotify
|
||||
gnused
|
||||
gawk
|
||||
networkmanager
|
||||
];
|
||||
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "rofi-network-manager";
|
||||
version = "0-unstable-2024-09-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "meowrch";
|
||||
repo = "rofi-network-manager";
|
||||
rev = "90302dd1c0ea2d460a3455a208c10dff524469cd";
|
||||
sha256 = "sha256-D8/Lh5a5rAUOhCXbjmL65PFzgmj3uu2mwCtxakHTefM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm 0755 network-manager.sh $out/bin/rofi-network-manager
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/rofi-network-manager \
|
||||
--prefix PATH : "${wrapperPath}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Manage wifi and ethernet with rofi";
|
||||
homepage = "https://github.com/meowrch/rofi-network-manager";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ wenjinnn ];
|
||||
mainProgram = "rofi-network-manager";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "saunafs";
|
||||
version = "4.7.0";
|
||||
version = "4.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "leil-io";
|
||||
repo = "saunafs";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-6WXSnItbydH3Lk04l0Iph14EKzL/Pl5vriWdhHxTF6I=";
|
||||
hash = "sha256-Tu2AAKUHmj3x9tI+8vuel+nHluQXZM5v3WT2FgTlRSs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -8,12 +8,12 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "sigal";
|
||||
version = "2.4";
|
||||
version = "2.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version pname;
|
||||
hash = "sha256-pDTaqtqfuk7tACkyaKClTJotuVcTKli5yx1wbEM93TM=";
|
||||
hash = "sha256-IOAQ6lMudYH+Ukx27VKbPNKmQKBaX3j0p750nC5Y1Hg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signalbackup-tools";
|
||||
version = "20250303-2";
|
||||
version = "20250304-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bepaald";
|
||||
repo = "signalbackup-tools";
|
||||
rev = version;
|
||||
hash = "sha256-sBhkD68SC5puovPe8XyiBFWYAt/ADddVyKm4thB9dtw=";
|
||||
hash = "sha256-rm3mzQTQCMBia7xexo+fC4sD+ufevbltSA46GsgQAXs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -26,14 +26,14 @@ with py.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "ssh-mitm";
|
||||
version = "5.0.0";
|
||||
version = "5.0.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ssh-mitm";
|
||||
repo = "ssh-mitm";
|
||||
tag = version;
|
||||
hash = "sha256-jRheKLAXbbMyxdtDSJ4QSN4PoUM2YoK7nmU5xqPq7DY=";
|
||||
hash = "sha256-FmxVhYkPRZwS+zFwuId9nRGN832LRkgCNgDYb8Pg01U=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -10,15 +10,15 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "star-history";
|
||||
version = "1.0.26";
|
||||
version = "1.0.27";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-qwpUV+amv/n/lRcFYf/TgXoj3aHdg3kZJigEeA0fKBg=";
|
||||
hash = "sha256-IpMhCI6XS6h7kHaohCdS0YAUUR6PeC9mbMRCiS3p29c=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-Lzuzb0d1p5JGrz1cp+GuB7uoCIV+xJLNs6N22Gd8Nbs=";
|
||||
cargoHash = "sha256-bu7YUwrLKHdDL+rxw++8mrWH2hBhEF4jNqZls/9F+aM=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildGo123Module,
|
||||
buildGoModule,
|
||||
tailscale,
|
||||
}:
|
||||
|
||||
buildGo123Module {
|
||||
buildGoModule {
|
||||
pname = "tailscale-nginx-auth";
|
||||
inherit (tailscale) version src vendorHash;
|
||||
|
||||
@@ -27,11 +27,11 @@ buildGo123Module {
|
||||
install -D -m0444 -t $out/lib/systemd/system ./cmd/nginx-auth/tailscale.nginx-auth.socket
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://tailscale.com";
|
||||
description = "Tool that allows users to use Tailscale Whois authentication with NGINX as a reverse proxy";
|
||||
license = licenses.bsd3;
|
||||
license = lib.licenses.bsd3;
|
||||
mainProgram = "tailscale.nginx-auth";
|
||||
maintainers = with maintainers; [ phaer ];
|
||||
maintainers = with lib.maintainers; [ phaer ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,25 +1,30 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildGo123Module,
|
||||
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
|
||||
makeWrapper,
|
||||
installShellFiles,
|
||||
# runtime tooling - linux
|
||||
getent,
|
||||
iproute2,
|
||||
iptables,
|
||||
lsof,
|
||||
shadow,
|
||||
procps,
|
||||
# runtime tooling - darwin
|
||||
lsof,
|
||||
|
||||
nixosTests,
|
||||
installShellFiles,
|
||||
tailscale-nginx-auth,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.80.2";
|
||||
version = "1.80.3";
|
||||
in
|
||||
buildGo123Module {
|
||||
buildGoModule {
|
||||
pname = "tailscale";
|
||||
inherit version;
|
||||
|
||||
@@ -32,7 +37,7 @@ buildGo123Module {
|
||||
owner = "tailscale";
|
||||
repo = "tailscale";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5HGY9hVSnzqmAdXNJdQ+ZvsK/PmyZ94201UHlHclQE8=";
|
||||
hash = "sha256-UOz2EAUlYZx2XBzw8hADO0ti9bgwz19MTg60rSefSB8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -60,6 +65,12 @@ buildGo123Module {
|
||||
"cmd/tsidp"
|
||||
];
|
||||
|
||||
excludedPackages = [
|
||||
# exlude integration tests which fail to work
|
||||
# and require additional tooling
|
||||
"tstest/integration"
|
||||
];
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
"-s"
|
||||
@@ -71,7 +82,59 @@ buildGo123Module {
|
||||
"ts_include_cli"
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
# remove vendored tooling to ensure it's not used
|
||||
# also avoids some unnecessary tests
|
||||
preBuild = ''
|
||||
rm -rf ./tool
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
# feed in all tests for testing
|
||||
# subPackages above limits what is built to just what we
|
||||
# want but also limits the tests
|
||||
unset subPackages
|
||||
|
||||
# several tests hang
|
||||
rm tsnet/tsnet_test.go
|
||||
'';
|
||||
|
||||
checkFlags =
|
||||
let
|
||||
skippedTests = [
|
||||
# dislikes vendoring
|
||||
"TestPackageDocs" # .
|
||||
# tries to start tailscaled
|
||||
"TestContainerBoot" # cmd/containerboot
|
||||
|
||||
# just part of a tool which generates yaml for k8s CRDs
|
||||
# requires helm
|
||||
"Test_generate" # cmd/k8s-operator/generate
|
||||
# self reported potentially flakey test
|
||||
"TestConnMemoryOverhead" # control/controlbase
|
||||
|
||||
# interacts with `/proc/net/route` and need a default route
|
||||
"TestDefaultRouteInterface" # net/netmon
|
||||
"TestRouteLinuxNetlink" # net/netmon
|
||||
"TestGetRouteTable" # net/routetable
|
||||
|
||||
# remote udp call to 8.8.8.8
|
||||
"TestDefaultInterfacePortable" # net/netutil
|
||||
|
||||
# launches an ssh server which works when provided openssh
|
||||
# also requires executing commands but nixbld user has /noshell
|
||||
"TestSSH" # ssh/tailssh
|
||||
# wants users alice & ubuntu
|
||||
"TestMultipleRecorders" # ssh/tailssh
|
||||
"TestSSHAuthFlow" # ssh/tailssh
|
||||
"TestSSHRecordingCancelsSessionsOnUploadFailure" # ssh/tailssh
|
||||
"TestSSHRecordingNonInteractive" # ssh/tailssh
|
||||
|
||||
# test for a dev util which helps to fork golang.org/x/crypto/acme
|
||||
# not necessary and fails to match
|
||||
"TestSyncedToUpstream" # tempfork/acme
|
||||
];
|
||||
in
|
||||
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
|
||||
|
||||
postInstall =
|
||||
''
|
||||
@@ -93,9 +156,9 @@ buildGo123Module {
|
||||
wrapProgram $out/bin/tailscaled \
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
getent
|
||||
iproute2
|
||||
iptables
|
||||
getent
|
||||
shadow
|
||||
]
|
||||
} \
|
||||
@@ -116,13 +179,13 @@ buildGo123Module {
|
||||
inherit tailscale-nginx-auth;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://tailscale.com";
|
||||
description = "Node agent for Tailscale, a mesh VPN built on WireGuard";
|
||||
changelog = "https://github.com/tailscale/tailscale/releases/tag/v${version}";
|
||||
license = licenses.bsd3;
|
||||
license = lib.licenses.bsd3;
|
||||
mainProgram = "tailscale";
|
||||
maintainers = with maintainers; [
|
||||
maintainers = with lib.maintainers; [
|
||||
mbaillie
|
||||
jk
|
||||
mfrw
|
||||
|
||||
@@ -16,8 +16,8 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "termius";
|
||||
version = "9.14.0";
|
||||
revision = "214";
|
||||
version = "9.15.2";
|
||||
revision = "216";
|
||||
|
||||
src = fetchurl {
|
||||
# find the latest version with
|
||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
# and the sha512 with
|
||||
# curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r
|
||||
url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_${revision}.snap";
|
||||
hash = "sha512-jnQXsmKrdL7OldmzSzriD6U8lMgme0Ya9aA/OPuc74DkRM9SJkI09XaXz03pZLVDKlWByAN9f+j1P0s5fvbkdA==";
|
||||
hash = "sha512-BbO/DMQOlUYm0Y7PLxgfRhRfWoZds8f6M2rizswlwF8x3EqT+A1ZoWYAbWJ0KSeU5o/ZTQoVD8VldqkS2AVoMw==";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
|
||||
@@ -23,12 +23,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tradingview";
|
||||
version = "2.9.3";
|
||||
revision = "60";
|
||||
version = "2.9.6";
|
||||
revision = "63";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://api.snapcraft.io/api/v1/snaps/download/nJdITJ6ZJxdvfu8Ch7n5kH5P99ClzBYV_${finalAttrs.revision}.snap";
|
||||
hash = "sha256-Oa3YfmXDiqKxEMJloTu6ihJ6LKoz2XwQ0su1KrlSaYo=";
|
||||
hash = "sha256-WmeGtR/rOzlgTpa1JZKskxre2ONtzppYsA/yhDhv5TI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -59,7 +59,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
|
||||
unsquashfs $src
|
||||
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
@@ -71,24 +73,28 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
rm -rf $out/share/tradingview/meta
|
||||
|
||||
install -Dm444 squashfs-root/meta/gui/tradingview.desktop -t $out/share/applications
|
||||
substituteInPlace $out/share/applications/tradingview.desktop --replace \$\{SNAP}/meta/gui/icon.png tradingview
|
||||
substituteInPlace $out/share/applications/tradingview.desktop \
|
||||
--replace-fail \$\{SNAP}/meta/gui/icon.png tradingview
|
||||
|
||||
mkdir $out/share/icons
|
||||
cp squashfs-root/meta/gui/icon.png $out/share/icons/tradingview.png
|
||||
|
||||
mkdir $out/bin
|
||||
makeBinaryWrapper $out/share/tradingview/tradingview $out/bin/tradingview --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath finalAttrs.buildInputs}
|
||||
makeBinaryWrapper $out/share/tradingview/tradingview $out/bin/tradingview \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath finalAttrs.buildInputs}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
description = "Charting platform for traders and investors";
|
||||
homepage = "https://www.tradingview.com/desktop/";
|
||||
changelog = "https://www.tradingview.com/support/solutions/43000673888/";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ prominentretail ];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [ prominentretail ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "tradingview";
|
||||
};
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "upcloud-cli";
|
||||
version = "3.14.0";
|
||||
version = "3.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "UpCloudLtd";
|
||||
repo = "upcloud-cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-zKPoJFfgqi6ZIeZKJy7YeYuqHWVPH0LXvWpOYCEM7dE=";
|
||||
hash = "sha256-bluq5rrfsd8xmKeqtNDqsZnhEAVZ4VqY/eYvOzXFKv4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-76bLk4zten9SGXbt/M8VKPSylCwQqclyscSVQQaAtbA=";
|
||||
vendorHash = "sha256-J0hLDQzyLYa8Nao0pR2eRkuJ5gP2VM9z+2n694YDYgI=";
|
||||
|
||||
ldflags = [
|
||||
"-s -w -X github.com/UpCloudLtd/upcloud-cli/v3/internal/config.Version=${version}"
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "vunnel";
|
||||
version = "0.30.0";
|
||||
version = "0.31.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = "vunnel";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-sWZ0y4ueUcDlbHh55iplIy0mTJOObVqeUi4hMtefjqc=";
|
||||
hash = "sha256-3o4ap8BElDxxg3pohzXz38AQlQbzOPeSc5/OYZg8VFM=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yoshimi";
|
||||
version = "2.3.3.2";
|
||||
version = "2.3.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Yoshimi";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-DfmNC78azqNVg0o4JumRytl6JqolweYbZTt1svjzwIo=";
|
||||
hash = "sha256-i6kzVtg2ukob0QBr/hbxblm+eTkPIKbnGLpFdUl/zGQ=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/src";
|
||||
|
||||
@@ -34,9 +34,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
postFixup =
|
||||
let
|
||||
libExt = stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
qtVersion = lib.versions.major qtbase.version;
|
||||
in
|
||||
''
|
||||
ln -s $out/lib/libqscintilla2_qt5${libExt} $out/lib/libqscintilla2${libExt}
|
||||
ln -s $out/lib/libqscintilla2_qt${qtVersion}${libExt} $out/lib/libqscintilla2${libExt}
|
||||
'';
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
+11
@@ -0,0 +1,11 @@
|
||||
# From https://933368.bugs.gentoo.org/attachment.cgi?id=896907
|
||||
--- ./src/3rdparty/chromium/qtwebengine/browser/pdf/BUILD.gn.orig 2024-07-03 13:49:13.812285886 +0100
|
||||
+++ ./src/3rdparty/chromium/qtwebengine/browser/pdf/BUILD.gn 2024-07-03 13:51:45.789966941 +0100
|
||||
@@ -6,6 +6,7 @@ source_set("pdf") {
|
||||
]
|
||||
|
||||
deps = [
|
||||
+ "//chrome/app:generated_resources",
|
||||
"//content/public/browser",
|
||||
]
|
||||
}
|
||||
@@ -157,6 +157,10 @@ qtModule (
|
||||
stripLen = 1;
|
||||
extraPrefix = "src/3rdparty/";
|
||||
})
|
||||
|
||||
# Fix race condition exposed by missing dependency
|
||||
# https://bugs.gentoo.org/933368
|
||||
./qtwebengine-fix_build_pdf_extension_util.patch
|
||||
];
|
||||
|
||||
postPatch =
|
||||
|
||||
@@ -2772,6 +2772,28 @@ buildLuarocksPackage {
|
||||
};
|
||||
}) {};
|
||||
|
||||
mini-test = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
|
||||
buildLuarocksPackage {
|
||||
pname = "mini.test";
|
||||
version = "0.15.0-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/mini.test-0.15.0-1.rockspec";
|
||||
sha256 = "1shfgfcjy3ab3a1mn79w4sw3nf6mf8fmdph6h7bxn5nhyhzbfxvk";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/echasnovski/mini.test/archive/v0.15.0.zip";
|
||||
sha256 = "02zslska1g4ixy51slbvlxbjzcys0spc4wh200q8mwv4ipiignrn";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/echasnovski/mini.test";
|
||||
description = "Test neovim plugins. Part of the mini.nvim suite.";
|
||||
license.fullName = "MIT";
|
||||
};
|
||||
}) {};
|
||||
|
||||
moonscript = callPackage({ argparse, buildLuarocksPackage, fetchFromGitHub, lpeg, luaOlder, luafilesystem }:
|
||||
buildLuarocksPackage {
|
||||
pname = "moonscript";
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
aiohttp,
|
||||
typing-extensions,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -18,7 +19,10 @@ buildPythonPackage rec {
|
||||
sha256 = "RL5Ck4wsBZO88afmoojeFKbdIeCjDo/SwNqUcERH6Ls=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ aiohttp ];
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
# tests require docker daemon
|
||||
doCheck = false;
|
||||
|
||||
@@ -359,7 +359,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.37.2";
|
||||
version = "1.37.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -367,7 +367,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "boto3_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-NskKT2L3TC1DN6g8yvcRKKsKyqGdTrFWNq0BBuA7uAE=";
|
||||
hash = "sha256-EdOovc4OMFlRFBdi4vhh7ttTr347BN8Qr0TJztGWGIM=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "deal";
|
||||
version = "4.24.4";
|
||||
version = "4.24.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
owner = "life4";
|
||||
repo = "deal";
|
||||
tag = version;
|
||||
hash = "sha256-4orpoYfPGSvquhg9w63uUe8QbBa2RUpxaEJ9uy28+fU=";
|
||||
hash = "sha256-oSvLi+9JYnwilJa63MuGb2iir2Mjr3UewzpPLCtOVzs=";
|
||||
};
|
||||
|
||||
build-system = [ flit-core ];
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
dvc-objects,
|
||||
fetchPypi,
|
||||
ossfs,
|
||||
pythonOlder,
|
||||
setuptools-scm,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-oss";
|
||||
version = "3.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-EEf3NAIvzSuW0ysGv24JIc0KZYEPf8HpsPrCmhR7apo=";
|
||||
};
|
||||
|
||||
# Prevent circular dependency
|
||||
pythonRemoveDeps = [ "dvc" ];
|
||||
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
dependencies = [
|
||||
dvc-objects
|
||||
ossfs
|
||||
];
|
||||
|
||||
# Circular dependency
|
||||
# pythonImportsCheck = [ "dvc_ssh" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Alibaba OSS plugin for dvc";
|
||||
homepage = "https://pypi.org/project/dvc-oss/";
|
||||
changelog = "https://github.com/iterative/dvc-oss/releases/tag/${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@@ -6,16 +6,20 @@
|
||||
fetchPypi,
|
||||
setuptools-scm,
|
||||
sshfs,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-ssh";
|
||||
version = "4.1.1";
|
||||
version = "4.2.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-lvC6oAXQR4u7s+11n6NgQExPc9yrq3JAmmXtuOw22tI=";
|
||||
pname = "dvc_ssh";
|
||||
inherit version;
|
||||
hash = "sha256-ld6uaAIA+8lHK/TjKtrjtmGKj5847SBMYYvKKN+MkS4=";
|
||||
};
|
||||
|
||||
pythonRemoveDeps = [
|
||||
@@ -23,16 +27,18 @@ buildPythonPackage rec {
|
||||
"dvc"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
bcrypt
|
||||
dvc-objects
|
||||
sshfs
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
gssapi = [ sshfs ];
|
||||
};
|
||||
|
||||
# bcrypt is enabled for sshfs in nixpkgs
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg --replace "sshfs[bcrypt]" "sshfs"
|
||||
@@ -47,7 +53,7 @@ buildPythonPackage rec {
|
||||
# ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "ssh plugin for dvc";
|
||||
description = "SSH plugin for dvc";
|
||||
homepage = "https://pypi.org/project/dvc-ssh/${version}";
|
||||
changelog = "https://github.com/iterative/dvc-ssh/releases/tag/${version}";
|
||||
license = licenses.asl20;
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
dvc-objects,
|
||||
fetchPypi,
|
||||
pythonOlder,
|
||||
setuptools-scm,
|
||||
setuptools,
|
||||
webdav4,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-webdav";
|
||||
version = "3.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Zefu8uvINBWo3b3LV5vyGaN5fGfnpi1FaMXILeK2pQg=";
|
||||
};
|
||||
|
||||
# Prevent circular dependency
|
||||
pythonRemoveDeps = [ "dvc" ];
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
dvc-objects
|
||||
webdav4
|
||||
];
|
||||
|
||||
# Circular dependency
|
||||
# pythonImportsCheck = [ "dvc_webdav" ];
|
||||
|
||||
meta = {
|
||||
description = "Webdav plugin for dvc";
|
||||
homepage = "https://pypi.org/project/dvc-webdav/";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
dvc-objects,
|
||||
fetchPypi,
|
||||
fsspec,
|
||||
pythonOlder,
|
||||
requests-kerberos,
|
||||
setuptools-scm,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-webhdfs";
|
||||
version = "3.1.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-bolIQ9Fc52agXGFt7anZvDYSSOk7+eozi5lublHqD+o=";
|
||||
};
|
||||
|
||||
# Prevent circular dependency
|
||||
pythonRemoveDeps = [ "dvc" ];
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
dvc-objects
|
||||
fsspec
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
kerberos = [ requests-kerberos ];
|
||||
};
|
||||
|
||||
# Circular dependency
|
||||
# pythonImportsCheck = [ "dvc_webhdfs" ];
|
||||
|
||||
meta = {
|
||||
description = "Webhdfs plugin for dvc";
|
||||
homepage = "https://pypi.org/project/dvc-webhdfs/";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@@ -1,9 +1,11 @@
|
||||
{
|
||||
lib,
|
||||
appdirs,
|
||||
attrs,
|
||||
buildPythonPackage,
|
||||
celery,
|
||||
colorama,
|
||||
configobj,
|
||||
dulwich,
|
||||
distro,
|
||||
dpath,
|
||||
dvc-azure,
|
||||
@@ -12,14 +14,18 @@
|
||||
dvc-gs,
|
||||
dvc-hdfs,
|
||||
dvc-http,
|
||||
dvc-oss,
|
||||
dvc-render,
|
||||
dvc-s3,
|
||||
dvc-ssh,
|
||||
dvc-studio-client,
|
||||
dvc-task,
|
||||
dvc-webdav,
|
||||
dvc-webhdfs,
|
||||
fetchFromGitHub,
|
||||
flatten-dict,
|
||||
flufl-lock,
|
||||
fsspec,
|
||||
funcy,
|
||||
grandalf,
|
||||
gto,
|
||||
@@ -27,7 +33,9 @@
|
||||
importlib-metadata,
|
||||
importlib-resources,
|
||||
iterative-telemetry,
|
||||
kombu,
|
||||
networkx,
|
||||
omegaconf,
|
||||
packaging,
|
||||
pathspec,
|
||||
platformdirs,
|
||||
@@ -60,7 +68,7 @@ buildPythonPackage rec {
|
||||
version = "3.59.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iterative";
|
||||
@@ -85,11 +93,13 @@ buildPythonPackage rec {
|
||||
|
||||
dependencies =
|
||||
[
|
||||
appdirs
|
||||
attrs
|
||||
celery
|
||||
colorama
|
||||
configobj
|
||||
distro
|
||||
dpath
|
||||
dulwich
|
||||
dvc-data
|
||||
dvc-http
|
||||
dvc-render
|
||||
@@ -97,12 +107,15 @@ buildPythonPackage rec {
|
||||
dvc-task
|
||||
flatten-dict
|
||||
flufl-lock
|
||||
fsspec
|
||||
funcy
|
||||
grandalf
|
||||
gto
|
||||
hydra-core
|
||||
iterative-telemetry
|
||||
kombu
|
||||
networkx
|
||||
omegaconf
|
||||
packaging
|
||||
pathspec
|
||||
platformdirs
|
||||
@@ -126,17 +139,20 @@ buildPythonPackage rec {
|
||||
++ lib.optionals enableGoogle optional-dependencies.gs
|
||||
++ lib.optionals enableAWS optional-dependencies.s3
|
||||
++ lib.optionals enableAzure optional-dependencies.azure
|
||||
++ lib.optionals enableSSH optional-dependencies.ssh
|
||||
++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]
|
||||
++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
|
||||
++ lib.optionals enableSSH optional-dependencies.ssh;
|
||||
|
||||
optional-dependencies = {
|
||||
azure = [ dvc-azure ];
|
||||
gdrive = [ dvc-gdrive ];
|
||||
gs = [ dvc-gs ];
|
||||
hdfs = [ dvc-hdfs ];
|
||||
oss = [ dvc-oss ];
|
||||
s3 = [ dvc-s3 ];
|
||||
ssh = [ dvc-ssh ];
|
||||
ssh_gssapi = [ dvc-ssh ] ++ dvc-ssh.optional-dependencies.gssapi;
|
||||
webdav = [ dvc-webdav ];
|
||||
webhdfs = [ dvc-webhdfs ];
|
||||
webhdfs_kerberos = [ dvc-webhdfs ] ++ dvc-webhdfs.optional-dependencies.kerberos;
|
||||
};
|
||||
|
||||
# Tests require access to real cloud services
|
||||
|
||||
@@ -13,19 +13,19 @@
|
||||
|
||||
# tests
|
||||
pytest-timeout,
|
||||
pytest7CheckHook,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lightning-utilities";
|
||||
version = "0.12.0";
|
||||
version = "0.13.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Lightning-AI";
|
||||
repo = "utilities";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Uu5VhrETDOYnTwjSSKkJx08yjt7cpgP2fmkpRyDepaI=";
|
||||
hash = "sha256-LFrBr8fumGp4KY7mNtMEMrE9vX1lyNoQKf+xxRymzTE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -45,7 +45,7 @@ buildPythonPackage rec {
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-timeout
|
||||
pytest7CheckHook
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
@@ -53,12 +53,10 @@ buildPythonPackage rec {
|
||||
"lightning_utilities.core.imports.RequirementCache"
|
||||
"lightning_utilities.core.imports.compare_version"
|
||||
"lightning_utilities.core.imports.get_dependency_min_version_spec"
|
||||
|
||||
# weird doctests fail on imports, but providing the dependency
|
||||
# fails another test
|
||||
"lightning_utilities.core.imports.ModuleAvailableCache"
|
||||
"lightning_utilities.core.imports.requires"
|
||||
# Failed: DID NOT RAISE <class 'AssertionError'>
|
||||
"test_no_warning_call"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
termcolor,
|
||||
yapf,
|
||||
|
||||
# checks
|
||||
# tests
|
||||
bitsandbytes,
|
||||
coverage,
|
||||
dvclive,
|
||||
@@ -26,18 +26,19 @@
|
||||
parameterized,
|
||||
pytestCheckHook,
|
||||
transformers,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mmengine";
|
||||
version = "0.10.6";
|
||||
version = "0.10.7";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-mmlab";
|
||||
repo = "mmengine";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-J9p+JCtNoBlBvvv4p57/DHUIifYs/jdo+pK+paD+iXI=";
|
||||
hash = "sha256-hQnwenuxHQwl+DwQXbIfsKlJkmcRvcHV1roK7q2X1KA=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -53,6 +54,8 @@ buildPythonPackage rec {
|
||||
yapf
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "mmengine" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
bitsandbytes
|
||||
coverage
|
||||
@@ -63,49 +66,43 @@ buildPythonPackage rec {
|
||||
parameterized
|
||||
pytestCheckHook
|
||||
transformers
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
preCheck =
|
||||
''
|
||||
export HOME=$(mktemp -d)
|
||||
''
|
||||
# Otherwise, the backprop hangs forever. More precisely, this exact line:
|
||||
# https://github.com/open-mmlab/mmengine/blob/02f80e8bdd38f6713e04a872304861b02157905a/tests/test_runner/test_activation_checkpointing.py#L46
|
||||
# Solution suggested in https://github.com/pytorch/pytorch/issues/91547#issuecomment-1370011188
|
||||
+ ''
|
||||
''
|
||||
export MKL_NUM_THREADS=1
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "mmengine" ];
|
||||
pytestFlagsArray = [
|
||||
# Require unpackaged aim
|
||||
"--deselect tests/test_visualizer/test_vis_backend.py::TestAimVisBackend"
|
||||
|
||||
disabledTestPaths = [
|
||||
# AttributeError
|
||||
"tests/test_fileio/test_backends/test_petrel_backend.py"
|
||||
# Freezes forever?
|
||||
"tests/test_runner/test_activation_checkpointing.py"
|
||||
# missing dependencies
|
||||
"tests/test_visualizer/test_vis_backend.py"
|
||||
# Cannot find SSL certificate
|
||||
# _pygit2.GitError: OpenSSL error: failed to load certificates: error:00000000:lib(0)::reason(0)
|
||||
"--deselect tests/test_visualizer/test_vis_backend.py::TestDVCLiveVisBackend"
|
||||
|
||||
# AttributeError: type object 'MagicMock' has no attribute ...
|
||||
"--deselect tests/test_fileio/test_backends/test_petrel_backend.py::TestPetrelBackend"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Tests are disabled due to sandbox
|
||||
# Require network access
|
||||
"test_fileclient"
|
||||
"test_http_backend"
|
||||
"test_misc"
|
||||
|
||||
# RuntimeError
|
||||
"test_dump"
|
||||
"test_deepcopy"
|
||||
"test_copy"
|
||||
"test_lazy_import"
|
||||
# AssertionError
|
||||
|
||||
# AssertionError: os is not <module 'os' (frozen)>
|
||||
"test_lazy_module"
|
||||
# Require unpackaged aim
|
||||
"test_experiment"
|
||||
"test_add_config"
|
||||
"test_add_image"
|
||||
"test_add_scalar"
|
||||
"test_add_scalars"
|
||||
"test_close"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -314,8 +314,8 @@ rec {
|
||||
"sha256-MK11RuIgZfoy8vvZWHFEJjkSsJSzqKjXvm9GCjt3QH4=";
|
||||
|
||||
mypy-boto3-cognito-idp =
|
||||
buildMypyBoto3Package "cognito-idp" "1.37.0"
|
||||
"sha256-I1twKtJqOUuHA+gkOzmRGr7GuDQ6GsYQeAGeX9ZVf8c=";
|
||||
buildMypyBoto3Package "cognito-idp" "1.37.5"
|
||||
"sha256-FAMF7HEM+StH7vkhPomIxh2GRSIhNxQaCZx0o6/EoYc=";
|
||||
|
||||
mypy-boto3-cognito-sync =
|
||||
buildMypyBoto3Package "cognito-sync" "1.37.0"
|
||||
@@ -446,8 +446,8 @@ rec {
|
||||
"sha256-wvOqjmqNMbCG7E1o+ZSOlWEwBdcCKjD/qVFlepZ51ec=";
|
||||
|
||||
mypy-boto3-ec2 =
|
||||
buildMypyBoto3Package "ec2" "1.37.2"
|
||||
"sha256-vWMLnpS6zvwdzAEyiNH33SrKS57WH6sRHsTUxjLKISI=";
|
||||
buildMypyBoto3Package "ec2" "1.37.5"
|
||||
"sha256-0isaGfUCSEUl8CpbmwXHO5PWIHbl+/k9xVR+2mpJiUs=";
|
||||
|
||||
mypy-boto3-ec2-instance-connect =
|
||||
buildMypyBoto3Package "ec2-instance-connect" "1.37.0"
|
||||
@@ -1158,8 +1158,8 @@ rec {
|
||||
"sha256-/4XdwWIkx8VYxrUp7I8IDCPZ34cFudV+gp3xR4uS8jk=";
|
||||
|
||||
mypy-boto3-rum =
|
||||
buildMypyBoto3Package "rum" "1.37.0"
|
||||
"sha256-fpotQHQ8Hksw/08bg9IMwyeh0ZdY+7lOpRypbSmn/j8=";
|
||||
buildMypyBoto3Package "rum" "1.37.5"
|
||||
"sha256-/cLHocPVefBea8g6oIRrSis6JOL7wFw+AEYyGNEOdx0=";
|
||||
|
||||
mypy-boto3-s3 =
|
||||
buildMypyBoto3Package "s3" "1.37.0"
|
||||
@@ -1174,8 +1174,8 @@ rec {
|
||||
"sha256-c0vXkW5sR7JkdzvsS/rMFme9EwY1x5eZAbRWYKew0v4=";
|
||||
|
||||
mypy-boto3-sagemaker =
|
||||
buildMypyBoto3Package "sagemaker" "1.37.3"
|
||||
"sha256-9iExn7nmPWu1/Bk9gY39yYTMtpP1lnJM9cfPWwKEfl0=";
|
||||
buildMypyBoto3Package "sagemaker" "1.37.5"
|
||||
"sha256-CZmB3zmQwsWy85vzK891HXuRfmgNBg2YXEasihOrbUY=";
|
||||
|
||||
mypy-boto3-sagemaker-a2i-runtime =
|
||||
buildMypyBoto3Package "sagemaker-a2i-runtime" "1.37.0"
|
||||
@@ -1366,8 +1366,8 @@ rec {
|
||||
"sha256-mGqJUJF826MADOYCDXwPNbk+x82zumHRb+cTazCEzAY=";
|
||||
|
||||
mypy-boto3-transcribe =
|
||||
buildMypyBoto3Package "transcribe" "1.37.0"
|
||||
"sha256-oOjD14VrJrc7De48X2YAnPOC5BDKtouPj3ZBQmewqCI=";
|
||||
buildMypyBoto3Package "transcribe" "1.37.5"
|
||||
"sha256-UonLSCWk8CUYjVBkxwbwxnR+NdQnsFTx11dZXIesDv0=";
|
||||
|
||||
mypy-boto3-transfer =
|
||||
buildMypyBoto3Package "transfer" "1.37.0"
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "optree";
|
||||
version = "0.14.0";
|
||||
version = "0.14.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "metaopt";
|
||||
repo = "optree";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-etFWoUmD4MoXrR3caIxEtLLSkcSngCOtUh/M/2SA958=";
|
||||
hash = "sha256-5PIe/mXPNohwM0oNT/zSPmNUycjXuujtIFCki5t7V1I=";
|
||||
};
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycfmodel";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Skyscanner";
|
||||
repo = "pycfmodel";
|
||||
tag = version;
|
||||
hash = "sha256-iCjOSwW6rdG3H4e/B/um+QioP45nOr9OcPAwXxZs3mU=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-TcSTJevWcr+fnQrYBkygPrMKhHb9QYAlmTkC6hlM2BE=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "pydantic" ];
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyfibaro";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "rappenze";
|
||||
repo = "pyfibaro";
|
||||
tag = version;
|
||||
hash = "sha256-M7ntlPK88er9Se3pPZEHjCDw3TIYtiruHdaCLB0ee8A=";
|
||||
hash = "sha256-0mWqjiKPyXlnXDG+SP/RrV3aergTG9cEFKe3Zczr8IE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -37,7 +37,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Library to access FIBARO Home center";
|
||||
homepage = "https://github.com/rappenze/pyfibaro";
|
||||
changelog = "https://github.com/rappenze/pyfibaro/releases/tag/${version}";
|
||||
changelog = "https://github.com/rappenze/pyfibaro/releases/tag/${src.tag}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pygithub";
|
||||
version = "2.6.0";
|
||||
version = "2.6.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "PyGithub";
|
||||
repo = "PyGithub";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-/j90wLVZyOpukRAWO368+LxoKgnKTOs+gBc2SseNXRg=";
|
||||
hash = "sha256-CfAgN5vxHbVyDSeP0KR1QFnL6gDQsd46Q0zosr0ALqM=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -49,7 +49,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Python library to access the GitHub API v3";
|
||||
homepage = "https://github.com/PyGithub/PyGithub";
|
||||
changelog = "https://github.com/PyGithub/PyGithub/raw/v${version}/doc/changes.rst";
|
||||
changelog = "https://github.com/PyGithub/PyGithub/raw/${src.tag}/doc/changes.rst";
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "reptor";
|
||||
version = "0.26";
|
||||
version = "0.27";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -39,7 +39,7 @@ buildPythonPackage rec {
|
||||
owner = "Syslifters";
|
||||
repo = "reptor";
|
||||
tag = version;
|
||||
hash = "sha256-o/nykMeRvyvlloDNJJb7fTUqiOYg7P4AsSUjS4qr3aI=";
|
||||
hash = "sha256-aba2f+7I/Lo3Vr7u9VCDRXQ5BRbQpJlQCCnib+Wp9Vs=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rich-argparse";
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "hamdanal";
|
||||
repo = "rich-argparse";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ae++npgZ8jZazwARwlPw73uhpQ8IT+7OekNl2vfu4Z0=";
|
||||
hash = "sha256-XuRQeE9JrF4ym2H1ky1yH0fENnsWbL90vboQzTo23w0=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
@@ -33,7 +33,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Format argparse help output using rich";
|
||||
homepage = "https://github.com/hamdanal/rich-argparse";
|
||||
changelog = "https://github.com/hamdanal/rich-argparse/blob/v${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/hamdanal/rich-argparse/blob/${src.tag}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ graham33 ];
|
||||
};
|
||||
|
||||
@@ -2,10 +2,12 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
|
||||
# dependencies
|
||||
appdirs,
|
||||
asgiref,
|
||||
click,
|
||||
@@ -26,42 +28,35 @@
|
||||
watchfiles,
|
||||
websockets,
|
||||
|
||||
# tests
|
||||
anthropic,
|
||||
cacert,
|
||||
google-generativeai,
|
||||
langchain-core,
|
||||
ollama,
|
||||
openai,
|
||||
pytestCheckHook,
|
||||
pytest-asyncio,
|
||||
pytest-playwright,
|
||||
pytest-xdist,
|
||||
pytest-timeout,
|
||||
pytest-rerunfailures,
|
||||
pandas,
|
||||
polars,
|
||||
pytest-asyncio,
|
||||
pytest-playwright,
|
||||
pytest-rerunfailures,
|
||||
pytest-timeout,
|
||||
pytest-xdist,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "shiny";
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "posit-dev";
|
||||
repo = "py-shiny";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8bo2RHuIP7X7EaOlHd+2m4XU287owchAwiqPnpjKFjI=";
|
||||
hash = "sha256-YCPHjelGPYYo23Vzxy5+8Kn9fVlSZy1Qva7zp93+nzg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-narwhals-test.patch";
|
||||
url = "https://github.com/posit-dev/py-shiny/commit/184a9ebd81ff730439513f343576a68f8c1f6eb9.patch";
|
||||
hash = "sha256-DsGnuHQXODzGwpe8ZUHeXGzRFxxduwxCRk82RJaYZg0=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
@@ -104,30 +99,32 @@ buildPythonPackage rec {
|
||||
langchain-core
|
||||
ollama
|
||||
openai
|
||||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
pytest-playwright
|
||||
pytest-xdist
|
||||
pytest-timeout
|
||||
pytest-rerunfailures
|
||||
pandas
|
||||
polars
|
||||
pytest-asyncio
|
||||
pytest-playwright
|
||||
pytest-rerunfailures
|
||||
pytest-timeout
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
] ++ lib.flatten (lib.attrValues optional-dependencies);
|
||||
|
||||
env.SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||
|
||||
disabledTests = [
|
||||
# Requires unpackaged brand-yml
|
||||
"test_theme_from_brand_base_case_compiles"
|
||||
# ValueError: A tokenizer is required to impose `token_limits` on messages
|
||||
"test_chat_message_trimming"
|
||||
# https://github.com/posit-dev/py-shiny/pull/1791
|
||||
"test_as_ollama_message"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/posit-dev/py-shiny/blob/${src.tag}/CHANGELOG.md";
|
||||
description = "Build fast, beautiful web applications in Python";
|
||||
license = lib.licenses.mit;
|
||||
homepage = "https://shiny.posit.co/py";
|
||||
changelog = "https://github.com/posit-dev/py-shiny/blob/v${version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ sigmanificient ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,829 +0,0 @@
|
||||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
version = 3
|
||||
|
||||
[[package]]
|
||||
name = "aho-corasick"
|
||||
version = "1.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "arc-swap"
|
||||
version = "1.7.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
|
||||
|
||||
[[package]]
|
||||
name = "autocfg"
|
||||
version = "1.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "2.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
|
||||
|
||||
[[package]]
|
||||
name = "bitvec"
|
||||
version = "1.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
|
||||
dependencies = [
|
||||
"funty",
|
||||
"radium",
|
||||
"tap",
|
||||
"wyz",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "block"
|
||||
version = "0.1.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
|
||||
|
||||
[[package]]
|
||||
name = "byteorder"
|
||||
version = "1.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
|
||||
|
||||
[[package]]
|
||||
name = "bytes"
|
||||
version = "1.6.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952"
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.1.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f"
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-channel"
|
||||
version = "0.5.13"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
|
||||
dependencies = [
|
||||
"crossbeam-utils",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-utils"
|
||||
version = "0.8.20"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
|
||||
|
||||
[[package]]
|
||||
name = "desmume-rs"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "95166a679be6515156852dfd35dd5b086929b1a82104a0fdc68c7e3c3dcccd05"
|
||||
dependencies = [
|
||||
"desmume-sys",
|
||||
"thiserror",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "desmume-sys"
|
||||
version = "0.0.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8414d5cfbc53315f1956069a67d34e2a1c4c05d420e669504a4dfc4e5ba278e3"
|
||||
dependencies = [
|
||||
"glob",
|
||||
"libc",
|
||||
"pkg-config",
|
||||
"tempfile",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "either"
|
||||
version = "1.13.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
|
||||
|
||||
[[package]]
|
||||
name = "encoding"
|
||||
version = "0.2.33"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec"
|
||||
dependencies = [
|
||||
"encoding-index-japanese",
|
||||
"encoding-index-korean",
|
||||
"encoding-index-simpchinese",
|
||||
"encoding-index-singlebyte",
|
||||
"encoding-index-tradchinese",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "encoding-index-japanese"
|
||||
version = "1.20141219.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91"
|
||||
dependencies = [
|
||||
"encoding_index_tests",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "encoding-index-korean"
|
||||
version = "1.20141219.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81"
|
||||
dependencies = [
|
||||
"encoding_index_tests",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "encoding-index-simpchinese"
|
||||
version = "1.20141219.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7"
|
||||
dependencies = [
|
||||
"encoding_index_tests",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "encoding-index-singlebyte"
|
||||
version = "1.20141219.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a"
|
||||
dependencies = [
|
||||
"encoding_index_tests",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "encoding-index-tradchinese"
|
||||
version = "1.20141219.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18"
|
||||
dependencies = [
|
||||
"encoding_index_tests",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "encoding_index_tests"
|
||||
version = "0.1.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
|
||||
|
||||
[[package]]
|
||||
name = "errno"
|
||||
version = "0.3.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "fastrand"
|
||||
version = "2.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
|
||||
|
||||
[[package]]
|
||||
name = "funty"
|
||||
version = "2.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
|
||||
|
||||
[[package]]
|
||||
name = "gettext-rs"
|
||||
version = "0.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364"
|
||||
dependencies = [
|
||||
"gettext-sys",
|
||||
"locale_config",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gettext-sys"
|
||||
version = "0.21.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"temp-dir",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "glob"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
|
||||
|
||||
[[package]]
|
||||
name = "heck"
|
||||
version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
|
||||
|
||||
[[package]]
|
||||
name = "indoc"
|
||||
version = "2.0.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
|
||||
|
||||
[[package]]
|
||||
name = "itertools"
|
||||
version = "0.13.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
|
||||
dependencies = [
|
||||
"either",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "itoa"
|
||||
version = "1.0.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
|
||||
|
||||
[[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.155"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
|
||||
|
||||
[[package]]
|
||||
name = "linux-raw-sys"
|
||||
version = "0.4.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
|
||||
|
||||
[[package]]
|
||||
name = "locale_config"
|
||||
version = "0.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934"
|
||||
dependencies = [
|
||||
"lazy_static",
|
||||
"objc",
|
||||
"objc-foundation",
|
||||
"regex",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "log"
|
||||
version = "0.4.22"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
|
||||
|
||||
[[package]]
|
||||
name = "malloc_buf"
|
||||
version = "0.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
version = "2.7.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
|
||||
|
||||
[[package]]
|
||||
name = "memoffset"
|
||||
version = "0.9.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-derive"
|
||||
version = "0.4.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.71",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-traits"
|
||||
version = "0.2.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "objc"
|
||||
version = "0.2.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
|
||||
dependencies = [
|
||||
"malloc_buf",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "objc-foundation"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
|
||||
dependencies = [
|
||||
"block",
|
||||
"objc",
|
||||
"objc_id",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "objc_id"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
|
||||
dependencies = [
|
||||
"objc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "once_cell"
|
||||
version = "1.19.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
|
||||
|
||||
[[package]]
|
||||
name = "packed_struct"
|
||||
version = "0.10.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "36b29691432cc9eff8b282278473b63df73bea49bc3ec5e67f31a3ae9c3ec190"
|
||||
dependencies = [
|
||||
"bitvec",
|
||||
"packed_struct_codegen",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "packed_struct_codegen"
|
||||
version = "0.10.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9cd6706dfe50d53e0f6aa09e12c034c44faacd23e966ae5a209e8bdb8f179f98"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "paste"
|
||||
version = "1.0.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
|
||||
|
||||
[[package]]
|
||||
name = "pkg-config"
|
||||
version = "0.3.30"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
|
||||
|
||||
[[package]]
|
||||
name = "portable-atomic"
|
||||
version = "1.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.86"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pyo3"
|
||||
version = "0.22.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "831e8e819a138c36e212f3af3fd9eeffed6bf1510a805af35b0edee5ffa59433"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"indoc",
|
||||
"libc",
|
||||
"memoffset",
|
||||
"once_cell",
|
||||
"portable-atomic",
|
||||
"pyo3-build-config",
|
||||
"pyo3-ffi",
|
||||
"pyo3-macros",
|
||||
"unindent",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pyo3-build-config"
|
||||
version = "0.22.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1e8730e591b14492a8945cdff32f089250b05f5accecf74aeddf9e8272ce1fa8"
|
||||
dependencies = [
|
||||
"once_cell",
|
||||
"target-lexicon",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pyo3-ffi"
|
||||
version = "0.22.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5e97e919d2df92eb88ca80a037969f44e5e70356559654962cbb3316d00300c6"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"pyo3-build-config",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pyo3-log"
|
||||
version = "0.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3ac84e6eec1159bc2a575c9ae6723baa6ee9d45873e9bebad1e3ad7e8d28a443"
|
||||
dependencies = [
|
||||
"arc-swap",
|
||||
"log",
|
||||
"pyo3",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pyo3-macros"
|
||||
version = "0.22.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eb57983022ad41f9e683a599f2fd13c3664d7063a3ac5714cae4b7bee7d3f206"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"pyo3-macros-backend",
|
||||
"quote",
|
||||
"syn 2.0.71",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pyo3-macros-backend"
|
||||
version = "0.22.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ec480c0c51ddec81019531705acac51bcdbeae563557c982aa8263bb96880372"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro2",
|
||||
"pyo3-build-config",
|
||||
"quote",
|
||||
"syn 2.0.71",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.36"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "radium"
|
||||
version = "0.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
|
||||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
version = "1.10.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
"regex-automata",
|
||||
"regex-syntax",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "regex-automata"
|
||||
version = "0.4.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
"regex-syntax",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "regex-syntax"
|
||||
version = "0.8.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
|
||||
|
||||
[[package]]
|
||||
name = "rustix"
|
||||
version = "0.38.34"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"errno",
|
||||
"libc",
|
||||
"linux-raw-sys",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ryu"
|
||||
version = "1.0.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.204"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.204"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.71",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.120"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"ryu",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "skytemple_rust"
|
||||
version = "1.8.1"
|
||||
source = "git+https://github.com/SkyTemple/skytemple-rust.git?tag=1.8.1#889e3e9e4f9fe82b350c0e36368a28d82727fbe9"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"encoding",
|
||||
"gettext-rs",
|
||||
"itertools",
|
||||
"log",
|
||||
"num-derive",
|
||||
"num-traits",
|
||||
"packed_struct",
|
||||
"paste",
|
||||
"pyo3",
|
||||
"pyo3-log",
|
||||
"skytemple_rust_macros",
|
||||
"thiserror",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "skytemple_rust_macros"
|
||||
version = "1.4.0"
|
||||
source = "git+https://github.com/SkyTemple/skytemple-rust.git?tag=1.8.1#889e3e9e4f9fe82b350c0e36368a28d82727fbe9"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "skytemple_ssb_emulator"
|
||||
version = "1.8.0"
|
||||
dependencies = [
|
||||
"byteorder",
|
||||
"crossbeam-channel",
|
||||
"desmume-rs",
|
||||
"lazy_static",
|
||||
"log",
|
||||
"pyo3",
|
||||
"pyo3-log",
|
||||
"serde_json",
|
||||
"skytemple_rust",
|
||||
"sprintf",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sprintf"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "39b60413e681681e22dfe3966674082c075c5f6ed73c3900b95dd19eb9e0181d"
|
||||
dependencies = [
|
||||
"thiserror",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "1.0.109"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.71"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tap"
|
||||
version = "1.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
|
||||
|
||||
[[package]]
|
||||
name = "target-lexicon"
|
||||
version = "0.12.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2"
|
||||
|
||||
[[package]]
|
||||
name = "temp-dir"
|
||||
version = "0.1.13"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231"
|
||||
|
||||
[[package]]
|
||||
name = "tempfile"
|
||||
version = "3.10.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"fastrand",
|
||||
"rustix",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror"
|
||||
version = "1.0.63"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
|
||||
dependencies = [
|
||||
"thiserror-impl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror-impl"
|
||||
version = "1.0.63"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.71",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "unicode-ident"
|
||||
version = "1.0.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
|
||||
|
||||
[[package]]
|
||||
name = "unindent"
|
||||
version = "0.2.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce"
|
||||
|
||||
[[package]]
|
||||
name = "winapi"
|
||||
version = "0.3.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
|
||||
dependencies = [
|
||||
"winapi-i686-pc-windows-gnu",
|
||||
"winapi-x86_64-pc-windows-gnu",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "winapi-i686-pc-windows-gnu"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
||||
|
||||
[[package]]
|
||||
name = "winapi-x86_64-pc-windows-gnu"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
||||
|
||||
[[package]]
|
||||
name = "windows-sys"
|
||||
version = "0.52.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
|
||||
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"
|
||||
|
||||
[[package]]
|
||||
name = "wyz"
|
||||
version = "0.5.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
|
||||
dependencies = [
|
||||
"tap",
|
||||
]
|
||||
@@ -1,75 +1,94 @@
|
||||
{
|
||||
alsa-lib,
|
||||
buildPythonPackage,
|
||||
cargo,
|
||||
fetchFromGitHub,
|
||||
glib,
|
||||
lib,
|
||||
libpcap,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
|
||||
# build-system
|
||||
meson,
|
||||
setuptools,
|
||||
setuptools-rust,
|
||||
|
||||
# buildInputs
|
||||
SDL2,
|
||||
alsa-lib,
|
||||
glib,
|
||||
libpcap,
|
||||
soundtouch,
|
||||
zlib,
|
||||
|
||||
# nativeBuildInputs
|
||||
cargo,
|
||||
ninja,
|
||||
openal,
|
||||
pkg-config,
|
||||
range-typed-integers,
|
||||
rustc,
|
||||
rustPlatform,
|
||||
SDL2,
|
||||
setuptools,
|
||||
setuptools-rust,
|
||||
soundtouch,
|
||||
zlib,
|
||||
|
||||
# dependencies
|
||||
range-typed-integers,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "skytemple-ssb-emulator";
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SkyTemple";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-9xD9Q/oYsi9tuxTOJ6ItLbWkqAjG78uzXYZXOiITDEA=";
|
||||
repo = "skytemple-ssb-emulator";
|
||||
tag = version;
|
||||
hash = "sha256-WDTSW0Vg0oL9+2J5/nIx6sd/ZWqsiDu1trpzuXNw0Kg=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"skytemple_rust-1.8.1" = "sha256-KtMqgUOlyF02msQRouE4NpvCHqahY+aRiRV9P32ASqg=";
|
||||
};
|
||||
# Otherwise, fails with:
|
||||
# [-Wimplicit-function-declaration] and [-Wint-conversion] errors
|
||||
# https://github.com/SkyTemple/desmume-rs/pull/38
|
||||
postPatch = ''
|
||||
substituteInPlace "$cargoDepsCopy"/desmume-sys-*/build.rs \
|
||||
--replace-fail \
|
||||
'.arg("-Dbuildtype=release")' \
|
||||
'.arg("-Dbuildtype=release").arg("-Dc_std=gnu11").arg("-Dcpp_std=gnu++14")'
|
||||
'';
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src pname;
|
||||
hash = "sha256-Fgc0gFzDrdcV73HU39cqyw74nln4EKHokz86V8k8TAI=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
meson
|
||||
setuptools
|
||||
setuptools-rust
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
alsa-lib
|
||||
glib
|
||||
libpcap
|
||||
SDL2
|
||||
soundtouch
|
||||
zlib
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo
|
||||
meson
|
||||
ninja
|
||||
openal
|
||||
pkg-config
|
||||
rustc
|
||||
rustPlatform.cargoSetupHook
|
||||
setuptools
|
||||
setuptools-rust
|
||||
rustc
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ range-typed-integers ];
|
||||
dependencies = [ range-typed-integers ];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
doCheck = false; # there are no tests
|
||||
pythonImportsCheck = [ "skytemple_ssb_emulator" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "SkyTemple Script Engine Debugger Emulator Backend";
|
||||
homepage = "https://github.com/SkyTemple/skytemple-ssb-emulator";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ marius851000 ];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ marius851000 ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -57,6 +57,8 @@
|
||||
|
||||
# tests
|
||||
pytestCheckHook,
|
||||
writableTmpDirAsHomeHook,
|
||||
pythonAtLeast,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -148,20 +150,11 @@ buildPythonPackage rec {
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
disabledTests =
|
||||
[
|
||||
# TODO: try to re-enable when triton will have been updated to 3.0
|
||||
# torch._dynamo.exc.BackendCompilerFailed: backend='inductor' raised:
|
||||
# LoweringException: ImportError: cannot import name 'triton_key' from 'triton.compiler.compiler'
|
||||
"test_compile_hetero_conv_graph_breaks"
|
||||
"test_compile_multi_aggr_sage_conv"
|
||||
|
||||
# RuntimeError: addmm: computation on CPU is not implemented for SparseCsr + SparseCsr @ SparseCsr without MKL.
|
||||
# PyTorch built with MKL has better support for addmm with sparse CPU tensors.
|
||||
"test_asap"
|
||||
@@ -174,6 +167,21 @@ buildPythonPackage rec {
|
||||
# This test uses `torch.jit` which might not be working on darwin:
|
||||
# RuntimeError: required keyword attribute 'value' has the wrong type
|
||||
"test_traceable_my_conv_with_self_loops"
|
||||
]
|
||||
++ lib.optionals (pythonAtLeast "3.13") [
|
||||
# RuntimeError: Dynamo is not supported on Python 3.13+
|
||||
"test_compile"
|
||||
|
||||
# RuntimeError: Python 3.13+ not yet supported for torch.compile
|
||||
"test_compile_graph_breaks"
|
||||
"test_compile_multi_aggr_sage_conv"
|
||||
"test_compile_hetero_conv_graph_breaks"
|
||||
|
||||
# AttributeError: module 'typing' has no attribute 'io'. Did you mean: 'IO'?
|
||||
"test_packaging"
|
||||
|
||||
# RuntimeError: Boolean value of Tensor with more than one value is ambiguous
|
||||
"test_feature_store"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
aiohttp,
|
||||
aresponses,
|
||||
async-timeout,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
poetry-core,
|
||||
@@ -25,9 +26,14 @@ buildPythonPackage rec {
|
||||
hash = "sha256-j864+3c0GDDftdLqLDD0hizT54c0IgTjT77jOneXlq0=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "async-timeout" ];
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
dependencies = [ aiohttp ];
|
||||
dependencies = [
|
||||
aiohttp
|
||||
async-timeout
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
aresponses
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sbt";
|
||||
version = "1.10.7";
|
||||
version = "1.10.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/sbt/sbt/releases/download/v${finalAttrs.version}/sbt-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-MsFSM8Y2wjPuJaLDGHkEnbcCHP73CAfBh1FcOblrD+Y=";
|
||||
hash = "sha256-a3BLpJduUqkcTx+zmU1yXturCAfF/DrCnMVB18JSYzU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -151,31 +151,26 @@ let
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/libexec/electron $out/bin
|
||||
mkdir -p $out/libexec/electron
|
||||
unzip -d $out/libexec/electron $src
|
||||
ln -s $out/libexec/electron/electron $out/bin
|
||||
chmod u-x $out/libexec/electron/*.so*
|
||||
'';
|
||||
|
||||
# We use null here to not cause unnecessary rebuilds.
|
||||
dontWrapGApps = if needsAarch64PageSizeFix then true else null;
|
||||
preFixup =
|
||||
if needsAarch64PageSizeFix then
|
||||
''
|
||||
wrapProgram "$out/libexec/electron/chrome_crashpad_handler" "''${gappsWrapperArgs[@]}"
|
||||
wrapProgram "$out/libexec/electron/chrome-sandbox" "''${gappsWrapperArgs[@]}"
|
||||
wrapProgram "$out/libexec/electron/electron" "''${gappsWrapperArgs[@]}" \
|
||||
--add-flags "--js-flags=--no-decommit-pooled-pages"
|
||||
''
|
||||
else
|
||||
null;
|
||||
# We don't want to wrap the contents of $out/libexec automatically
|
||||
dontWrapGApps = true;
|
||||
|
||||
preFixup = ''
|
||||
makeWrapper "$out/libexec/electron/electron" $out/bin/electron \
|
||||
"''${gappsWrapperArgs[@]}" \
|
||||
${lib.optionalString needsAarch64PageSizeFix "--add-flags '--js-flags=--no-decommit-pooled-pages'"}
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
patchelf \
|
||||
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--set-rpath "${electronLibPath}:$out/libexec/electron" \
|
||||
$out/libexec/electron/.electron-wrapped \
|
||||
$out/libexec/electron/.chrome_crashpad_handler-wrapped
|
||||
$out/libexec/electron/electron \
|
||||
$out/libexec/electron/chrome_crashpad_handler
|
||||
|
||||
# patch libANGLE
|
||||
patchelf \
|
||||
|
||||
@@ -620,7 +620,7 @@ rec {
|
||||
import xmltodict
|
||||
|
||||
with open(os.environ["valuePath"], "r") as f:
|
||||
print(xmltodict.unparse(json.load(f), full_document=${toString withHeader}, pretty=True, indent=" " * 2))
|
||||
print(xmltodict.unparse(json.load(f), full_document=${if withHeader then "True" else "False"}, pretty=True, indent=" " * 2))
|
||||
'';
|
||||
passAsFile = [
|
||||
"value"
|
||||
|
||||
@@ -1,31 +1,31 @@
|
||||
{ fetchurl, fetchzip }:
|
||||
{
|
||||
x86_64-darwin = fetchzip {
|
||||
sha256 = "sha256-uviTmopXz7OYVr4H2M/dFOMw0vD5P+3t5CChSL2HyrE=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_darwin_amd64.zip";
|
||||
sha256 = "sha256-wNDPmB/RyTc3ZZWx7glhDx3aeWFrvcsiNv7hvsnWWu4=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.57/AdGuardHome_darwin_amd64.zip";
|
||||
};
|
||||
aarch64-darwin = fetchzip {
|
||||
sha256 = "sha256-P9n6H8YmttcZE5E/7nw/Bc+Gzb4nHbs3L/2pgdqUyFw=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_darwin_arm64.zip";
|
||||
sha256 = "sha256-gm9QHJFrCbKyEK6RsSKCeIQY2eYJIXO1n4vAkA3yatY=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.57/AdGuardHome_darwin_arm64.zip";
|
||||
};
|
||||
i686-linux = fetchurl {
|
||||
sha256 = "sha256-JPhx1Hqu5o3K4bBulStedLZexCtZhgZNgzvGTqUn3XY=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_linux_386.tar.gz";
|
||||
sha256 = "sha256-2TVrjG4C4uLsBUJoya4YxiOlTJlcmzPG6lUWcCj/PYE=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.57/AdGuardHome_linux_386.tar.gz";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
sha256 = "sha256-BEqPo3jeLukMnykO+6GNZ93bplDCOcV33BOHleQLWDI=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_linux_amd64.tar.gz";
|
||||
sha256 = "sha256-E2bzQIYsRpijlJnjD+V3lh5a1nauD5aMVoI/9tHfrRM=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.57/AdGuardHome_linux_amd64.tar.gz";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
sha256 = "sha256-JxitRduWdp4uJCcoR7FA26prDIc68CzsFOviehxDRxI=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_linux_arm64.tar.gz";
|
||||
sha256 = "sha256-0yedCjUkpye2Rly87a5Qdyfy8/kgrEOrHKpbZ0YhruM=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.57/AdGuardHome_linux_arm64.tar.gz";
|
||||
};
|
||||
armv6l-linux = fetchurl {
|
||||
sha256 = "sha256-TdBDGSny3xWRrMG5MamrN26E/fOf7V9jHvxxbK+7BPU=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_linux_armv6.tar.gz";
|
||||
sha256 = "sha256-RhPXB3G9iDmijTCsljXedJxqLr8Zna5IzU18KITU0m0=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.57/AdGuardHome_linux_armv6.tar.gz";
|
||||
};
|
||||
armv7l-linux = fetchurl {
|
||||
sha256 = "sha256-mrBsebAKSelAMcuurAUiZdPKr2AGi9lnk1Dhz+PAm/0=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_linux_armv7.tar.gz";
|
||||
sha256 = "sha256-tAtuMWgy+HMUIMbKLQZOMVO7z65UuPIZnHpJr1IYpJw=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.57/AdGuardHome_linux_armv7.tar.gz";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "adguardhome";
|
||||
version = "0.107.56";
|
||||
version = "0.107.57";
|
||||
src = sources.${system} or (throw "Source for ${pname} is not available for ${system}");
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -43,11 +43,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "percona-server";
|
||||
version = "8.0.40-31";
|
||||
version = "8.0.41-32";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-${finalAttrs.version}/source/tarball/percona-server-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-ExhnDY4XbCTfdAGfdI9fIz4nh/hl3T1B1heQq1p3LE4=";
|
||||
hash = "sha256-3ua/8X0vzbBzjRNhmMjdz3Wfk7ECs67bPoCYBBNXywc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -4042,6 +4042,8 @@ self: super: with self; {
|
||||
|
||||
dvc-objects = callPackage ../development/python-modules/dvc-objects { };
|
||||
|
||||
dvc-oss = callPackage ../development/python-modules/dvc-oss { };
|
||||
|
||||
dvc-render = callPackage ../development/python-modules/dvc-render { };
|
||||
|
||||
dvc-s3 = callPackage ../development/python-modules/dvc-s3 { };
|
||||
@@ -4052,6 +4054,10 @@ self: super: with self; {
|
||||
|
||||
dvc-task = callPackage ../development/python-modules/dvc-task { };
|
||||
|
||||
dvc-webdav = callPackage ../development/python-modules/dvc-webdav { };
|
||||
|
||||
dvc-webhdfs = callPackage ../development/python-modules/dvc-webhdfs { };
|
||||
|
||||
dvclive = callPackage ../development/python-modules/dvclive { };
|
||||
|
||||
dwdwfsapi = callPackage ../development/python-modules/dwdwfsapi { };
|
||||
|
||||
Reference in New Issue
Block a user