Merge master into staging-next
This commit is contained in:
@@ -19,6 +19,7 @@
|
||||
/.github/workflows @NixOS/nixpkgs-ci
|
||||
/ci @NixOS/nixpkgs-ci
|
||||
/ci/OWNERS @infinisil @philiptaron
|
||||
/maintainers @philiptaron
|
||||
|
||||
# Development support
|
||||
/.editorconfig @Mic92 @zowoq
|
||||
|
||||
@@ -27636,6 +27636,12 @@
|
||||
githubId = 25372613;
|
||||
name = "Woze Parrot";
|
||||
};
|
||||
wozrer = {
|
||||
name = "wozrer";
|
||||
email = "wozrer@proton.me";
|
||||
github = "wrrrzr";
|
||||
githubId = 161970349;
|
||||
};
|
||||
wr0belj = {
|
||||
name = "Jakub Wróbel";
|
||||
email = "wrobel.jakub@protonmail.com";
|
||||
|
||||
@@ -18,6 +18,8 @@
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
- [byedpi](https://github.com/hufrea/byedpi), a DPI bypass service. Available as [services.byedpi](#opt-services.byedpi.enable).
|
||||
|
||||
- [Overseerr](https://overseerr.dev), a request management and media discovery tool for the Plex ecosystem. Available as [services.overseerr](#opt-services.overseerr.enable).
|
||||
|
||||
- [gtklock](https://github.com/jovanlanik/gtklock), a GTK-based lockscreen for Wayland. Available as [programs.gtklock](#opt-programs.gtklock.enable).
|
||||
|
||||
@@ -1094,6 +1094,7 @@
|
||||
./services/networking/bitlbee.nix
|
||||
./services/networking/blockbook-frontend.nix
|
||||
./services/networking/blocky.nix
|
||||
./services/networking/byedpi.nix
|
||||
./services/networking/cato-client.nix
|
||||
./services/networking/centrifugo.nix
|
||||
./services/networking/cgit.nix
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.services.byedpi;
|
||||
in
|
||||
{
|
||||
options.services.byedpi = {
|
||||
enable = lib.mkEnableOption "the ByeDPI service";
|
||||
package = lib.mkPackageOption pkgs "byedpi" { };
|
||||
extraArgs = lib.mkOption {
|
||||
type = with lib.types; listOf str;
|
||||
default = [ ];
|
||||
example = [
|
||||
"--split"
|
||||
"1"
|
||||
"--disorder"
|
||||
"3+s"
|
||||
"--mod-http=h,d"
|
||||
"--auto=torst"
|
||||
"--tlsrec"
|
||||
"1+s"
|
||||
];
|
||||
description = "Extra command line arguments.";
|
||||
};
|
||||
};
|
||||
config = lib.mkIf cfg.enable {
|
||||
systemd.services.byedpi = {
|
||||
description = "ByeDPI";
|
||||
wantedBy = [ "default.target" ];
|
||||
wants = [ "network-online.target" ];
|
||||
after = [
|
||||
"network-online.target"
|
||||
"nss-lookup.target"
|
||||
];
|
||||
serviceConfig = {
|
||||
ExecStart = lib.escapeShellArgs ([ (lib.getExe cfg.package) ] ++ cfg.extraArgs);
|
||||
NoNewPrivileges = "yes";
|
||||
StandardOutput = "null";
|
||||
StandardError = "journal";
|
||||
TimeoutStopSec = "5s";
|
||||
PrivateTmp = "true";
|
||||
ProtectSystem = "full";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ wozrer ];
|
||||
}
|
||||
@@ -1188,7 +1188,6 @@ in
|
||||
pingvin-share = runTest ./pingvin-share.nix;
|
||||
pinnwand = runTest ./pinnwand.nix;
|
||||
plantuml-server = runTest ./plantuml-server.nix;
|
||||
plasma-bigscreen = runTest ./plasma-bigscreen.nix;
|
||||
plasma6 = runTest ./plasma6.nix;
|
||||
plausible = runTest ./plausible.nix;
|
||||
playwright-python = runTest ./playwright-python.nix;
|
||||
|
||||
@@ -36,20 +36,20 @@ let
|
||||
|
||||
hash =
|
||||
{
|
||||
x86_64-linux = "sha256-0zM9dyK226l4RgF1H81ojp5HC25snaN5K1QCnWIw/nw=";
|
||||
x86_64-darwin = "sha256-PpThKF6TKp7hcku8QEsVYhQYVwgiVFaCWSgNI6Vo2+s=";
|
||||
aarch64-linux = "sha256-bv9WsrvvlUc4PCKNZmsFBXQD6le5Ier1nm5qaXD2Mic=";
|
||||
aarch64-darwin = "sha256-5wWmlgarDlWvk2Y4HRk00/oi0WcjDmnT7YL2Z1rfJ+Y=";
|
||||
armv7l-linux = "sha256-hSYqK1hXg3nfxz344XdLrnWfixmlqbJUpI68PCcfF+I=";
|
||||
x86_64-linux = "sha256-vlmvPk2ljwdDklGygdxmtodPzGB+gNjwEaaVp3N+fQI=";
|
||||
x86_64-darwin = "sha256-k1W/85ehc8YXBKSac+E9aoV2AEif85iyTqqxEZ3MNr8=";
|
||||
aarch64-linux = "sha256-26QfnBYm1Rx1Udzk4dtpNOUSpuDqpIkimv0QlkcnsAg=";
|
||||
aarch64-darwin = "sha256-au/H0QxWb9KwuJkJVV+gVyjUlArziV0zptrAlBtt9f0=";
|
||||
armv7l-linux = "sha256-VRbzwhoqrLCdGbAYRkzVMzVjg8pioRhvKTvV3F+tjjE=";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.103.1";
|
||||
version = "1.103.2";
|
||||
|
||||
# This is used for VS Code - Remote SSH test
|
||||
rev = "e3550cfac4b63ca4eafca7b601f0d2885817fd1f";
|
||||
rev = "6f17636121051a53c88d3e605c491d22af2ba755";
|
||||
in
|
||||
callPackage ./generic.nix {
|
||||
pname = "vscode" + lib.optionalString isInsiders "-insiders";
|
||||
@@ -82,7 +82,7 @@ callPackage ./generic.nix {
|
||||
src = fetchurl {
|
||||
name = "vscode-server-${rev}.tar.gz";
|
||||
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
|
||||
hash = "sha256-GEN8WMPaYhwQsgml3tXWJP7F4RXH5vy6Ht0RUGauxnw=";
|
||||
hash = "sha256-6E/rh22SC97uzkDsLMsrard9kbfSanuUcAImrV69JLw=";
|
||||
};
|
||||
stdenv = stdenvNoCC;
|
||||
};
|
||||
|
||||
@@ -75,11 +75,11 @@ in
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "recoll";
|
||||
version = "1.43.2";
|
||||
version = "1.43.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.recoll.org/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-FbDXknumjktcikOfAe4FKtPmggJGGHasq8dpD+8mNzE=";
|
||||
hash = "sha256-QsciFCPPThcOlMoAx24ykigfHSEopnUtViquHf1kNMs=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
|
||||
@@ -577,7 +577,7 @@ buildStdenv.mkDerivation {
|
||||
xorg.xorgproto
|
||||
zlib
|
||||
(
|
||||
if (lib.versionAtLeast version "141") then nss_latest else nss_esr # 3.90
|
||||
if (lib.versionAtLeast version "129") then nss_latest else nss_esr # 3.90
|
||||
)
|
||||
]
|
||||
++ lib.optional alsaSupport alsa-lib
|
||||
|
||||
@@ -66,7 +66,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
procps
|
||||
]
|
||||
}"
|
||||
wrapProgram $out/bin/aplay --set-default ALSA_PLUGIN_DIR ${plugin-dir}
|
||||
for program in $out/bin/*; do
|
||||
wrapProgram "$program" --set-default ALSA_PLUGIN_DIR "${plugin-dir}"
|
||||
done
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python312Packages.buildPythonPackage rec {
|
||||
pname = "ark-pixel-font";
|
||||
version = "2025.07.21";
|
||||
version = "2025.08.11";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TakWolf";
|
||||
repo = "ark-pixel-font";
|
||||
tag = version;
|
||||
hash = "sha256-NnkXKe4qlWl4lDHNcO5aVJWwyeSrHoHxqlla+RMgtQw=";
|
||||
hash = "sha256-Rcn2zlZyMoziYd1b3wjjh1tYpm6A0qYGiKEg+Wd+0m8=";
|
||||
};
|
||||
|
||||
dependencies = with python312Packages; [
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
pandoc,
|
||||
installShellFiles,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "autotrash";
|
||||
version = "0.4.7";
|
||||
@@ -17,22 +18,29 @@ python3Packages.buildPythonPackage rec {
|
||||
hash = "sha256-qMU3jjBL5+fd9vKX5BIqES5AM8D/54aBOmdHFiBtfEo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail 'version = "0.0.0"' 'version = "${version}"'
|
||||
'';
|
||||
|
||||
build-system = [ python3Packages.poetry-core ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
pandoc
|
||||
];
|
||||
|
||||
postBuild = "make -C doc autotrash.1";
|
||||
|
||||
postInstall = "installManPage doc/autotrash.1";
|
||||
|
||||
pythonImportsCheck = [ "autotrash" ];
|
||||
nativeCheckInputs = [ python3Packages.pytestCheckHook ];
|
||||
|
||||
meta = {
|
||||
description = "Tool to automatically purge old trashed files";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
homepage = "https://bneijt.nl/pr/autotrash";
|
||||
changelog = "https://github.com/bneijt/autotrash/releases/tag/${src.tag}";
|
||||
maintainers = with lib.maintainers; [
|
||||
sigmanificient
|
||||
mithicspirit
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "azurehound";
|
||||
version = "2.7.0";
|
||||
version = "2.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SpecterOps";
|
||||
repo = "AzureHound";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-UmEgrADPolWw1Ml1nHobH9xHjG9cIL6Rzup42Bw6GAU=";
|
||||
hash = "sha256-fCs9C86IO1aTzBFZiA7SaVlk0Zdm/ItWtLhE8Ii2W0A=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ScFHEIarDvxd9R6eUONdECmtK+5aZRdo71khljLz8c4=";
|
||||
|
||||
@@ -1,48 +1,58 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
bzip2,
|
||||
callPackage,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
gtk4,
|
||||
nix-update-script,
|
||||
openssl,
|
||||
pkg-config,
|
||||
webkitgtk_4_1,
|
||||
testers,
|
||||
xz,
|
||||
zstd,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "tauri";
|
||||
version = "2.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tauri-apps";
|
||||
repo = "tauri";
|
||||
tag = "tauri-cli-v${version}";
|
||||
tag = "tauri-cli-v${finalAttrs.version}";
|
||||
hash = "sha256-0J55AvAvvqTVls4474GcgLPBtSC+rh8cXVKluMjAVBE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-nkY1ydc2VewRwY+B5nR68mz8Ff3FK1KoHE4dLzNtPkY=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
gtk4
|
||||
webkitgtk_4_1
|
||||
nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
# Required for tauri-macos-sign and RPM support in tauri-bundler
|
||||
lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) [
|
||||
bzip2
|
||||
xz
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
zstd
|
||||
];
|
||||
|
||||
cargoBuildFlags = [ "--package tauri-cli" ];
|
||||
cargoTestFlags = cargoBuildFlags;
|
||||
cargoTestFlags = finalAttrs.cargoBuildFlags;
|
||||
|
||||
env = lib.optionalAttrs stdenv.hostPlatform.isLinux {
|
||||
ZSTD_SYS_USE_PKG_CONFIG = true;
|
||||
};
|
||||
|
||||
passthru = {
|
||||
# See ./doc/hooks/tauri.section.md
|
||||
hook = callPackage ./hook.nix { };
|
||||
hook = callPackage ./hook.nix { cargo-tauri = finalAttrs.finalPackage; };
|
||||
|
||||
tests = {
|
||||
hook = callPackage ./test-app.nix { };
|
||||
hook = callPackage ./test-app.nix { cargo-tauri = finalAttrs.finalPackage; };
|
||||
version = testers.testVersion { package = finalAttrs.finalPackage; };
|
||||
};
|
||||
|
||||
updateScript = nix-update-script {
|
||||
@@ -56,7 +66,7 @@ rustPlatform.buildRustPackage rec {
|
||||
meta = {
|
||||
description = "Build smaller, faster, and more secure desktop applications with a web frontend";
|
||||
homepage = "https://tauri.app/";
|
||||
changelog = "https://github.com/tauri-apps/tauri/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/tauri-apps/tauri/releases/tag/tauri-cli-v${finalAttrs.version}";
|
||||
license = with lib.licenses; [
|
||||
asl20 # or
|
||||
mit
|
||||
@@ -68,4 +78,4 @@ rustPlatform.buildRustPackage rec {
|
||||
];
|
||||
mainProgram = "cargo-tauri";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,52 +1,53 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
bzip2,
|
||||
pkg-config,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
xz,
|
||||
zstd,
|
||||
cargo-tauri,
|
||||
cargo-tauri_1,
|
||||
gtk3,
|
||||
libsoup_2_4,
|
||||
openssl,
|
||||
webkitgtk_4_0,
|
||||
}:
|
||||
|
||||
cargo-tauri.overrideAttrs (
|
||||
newAttrs: oldAttrs: {
|
||||
version = "1.8.1";
|
||||
finalAttrs: oldAttrs: {
|
||||
version = "1.6.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tauri-apps";
|
||||
repo = "tauri";
|
||||
rev = "tauri-v${newAttrs.version}";
|
||||
hash = "sha256-z8dfiLghN6m95PLCMDgpBMNo+YEvvsGN9F101fAcVF4=";
|
||||
src = oldAttrs.src.override {
|
||||
hash = "sha256-UE/mJ0WdbVT4E1YuUCtu80UB+1WR+KRWs+4Emy3Nclc=";
|
||||
};
|
||||
|
||||
# Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
|
||||
# https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
|
||||
sourceRoot = "${newAttrs.src.name}/tooling/cli";
|
||||
sourceRoot = "${finalAttrs.src.name}/tooling/cli";
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (newAttrs)
|
||||
inherit (finalAttrs)
|
||||
pname
|
||||
version
|
||||
src
|
||||
sourceRoot
|
||||
;
|
||||
hash = "sha256-t5sR02qC06H7A2vukwyZYKA2XMVUzJrgIOYuNSf42mE=";
|
||||
hash = "sha256-kAaq6Kam3e5n8569Y4zdFEiClI8q97XFX1hBD7NkUqw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = oldAttrs.nativeBuildInputs or [ ] ++ [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
# Required by `zip` in `tauri-bundler`
|
||||
bzip2
|
||||
zstd
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
gtk3
|
||||
libsoup_2_4
|
||||
webkitgtk_4_0
|
||||
];
|
||||
# Required by `rpm` in `tauri-bundler`
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ xz ];
|
||||
|
||||
env = {
|
||||
ZSTD_SYS_USE_PKG_CONFIG = true;
|
||||
};
|
||||
|
||||
passthru = {
|
||||
hook = cargo-tauri.hook.override { cargo-tauri = cargo-tauri_1; };
|
||||
inherit (oldAttrs.passthru) hook;
|
||||
tests = { inherit (oldAttrs.passthru.tests) version; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "favirecon";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "edoardottt";
|
||||
repo = "favirecon";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-nL5W4i4NJEjhkiO83hL9qK4XCIT5fnwRshyDkU1fASk=";
|
||||
hash = "sha256-fxUukhKbxxUUaOMcYxNR29H1nxRb0IWT0Qy5XJNOYjU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-PRLXVuqth9z0FkaMqUlEue1BFTI37oiobKOg3JvBYGU=";
|
||||
vendorHash = "sha256-Xsi4EA6wBgF7jmel38csh1T3I/SQfkMI0g1pR54nwCM=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
Generated
+21
-21
@@ -6,13 +6,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "Azure.Storage.Blobs",
|
||||
"version": "12.24.0",
|
||||
"hash": "sha256-PcI3Jf9VrDfkr0YfoR89us45HE1DE8g5J3ZpZ8vZkLs="
|
||||
"version": "12.25.0",
|
||||
"hash": "sha256-SjIwM1sIBd4I9ShAeaIAfPUzc3K7tbodW6y1vNAD+4U="
|
||||
},
|
||||
{
|
||||
"pname": "Azure.Storage.Common",
|
||||
"version": "12.23.0",
|
||||
"hash": "sha256-DAMzFlls76hH5jtXtU89SvbQWhhELaQq+PfG4SK7W+Q="
|
||||
"version": "12.24.0",
|
||||
"hash": "sha256-ZjeMv8xaZXkmb1OgZlN9uJelhAcU7KhO/FK02qiz/zA="
|
||||
},
|
||||
{
|
||||
"pname": "Castle.Core",
|
||||
@@ -31,13 +31,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeCoverage",
|
||||
"version": "17.13.0",
|
||||
"hash": "sha256-GKrIxeyQo5Az1mztfQgea1kGtJwonnNOrXK/0ULfu8o="
|
||||
"version": "17.14.1",
|
||||
"hash": "sha256-f8QytG8GvRoP47rO2KEmnDLxIpyesaq26TFjDdW40Gs="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NET.Test.Sdk",
|
||||
"version": "17.13.0",
|
||||
"hash": "sha256-sc2wvyV8cGm1FrNP2GGHEI584RCvRPu15erYCsgw5QY="
|
||||
"version": "17.14.1",
|
||||
"hash": "sha256-mZUzDFvFp7x1nKrcnRd0hhbNu5g8EQYt8SKnRgdhT/A="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.Platforms",
|
||||
@@ -96,13 +96,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.TestPlatform.ObjectModel",
|
||||
"version": "17.13.0",
|
||||
"hash": "sha256-6S0fjfj8vA+h6dJVNwLi6oZhYDO/I/6hBZaq2VTW+Uk="
|
||||
"version": "17.14.1",
|
||||
"hash": "sha256-QMf6O+w0IT+16Mrzo7wn+N20f3L1/mDhs/qjmEo1rYs="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.TestPlatform.TestHost",
|
||||
"version": "17.13.0",
|
||||
"hash": "sha256-L/CJzou7dhmShUgXq3aXL3CaLTJll17Q+JY2DBdUUpo="
|
||||
"version": "17.14.1",
|
||||
"hash": "sha256-1cxHWcvHRD7orQ3EEEPPxVGEkTpxom1/zoICC9SInJs="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Win32.Primitives",
|
||||
@@ -134,11 +134,6 @@
|
||||
"version": "1.5.0-rc2-24027",
|
||||
"hash": "sha256-lddIyqj8Y3IexOm5I1hsE5w1/dOoOaNDHoUPI1vkX80="
|
||||
},
|
||||
{
|
||||
"pname": "Newtonsoft.Json",
|
||||
"version": "13.0.1",
|
||||
"hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="
|
||||
},
|
||||
{
|
||||
"pname": "Newtonsoft.Json",
|
||||
"version": "13.0.3",
|
||||
@@ -449,6 +444,11 @@
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="
|
||||
},
|
||||
{
|
||||
"pname": "System.Collections.Immutable",
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w="
|
||||
},
|
||||
{
|
||||
"pname": "System.Console",
|
||||
"version": "4.0.0-rc2-24027",
|
||||
@@ -576,8 +576,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.IO.Hashing",
|
||||
"version": "6.0.0",
|
||||
"hash": "sha256-gSxLJ/ujWthLknylguRv40mwMl/qNcqnFI9SNjQY6lE="
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-szOGt0TNBo6dEdC3gf6H+e9YW3Nw0woa6UnCGGGK5cE="
|
||||
},
|
||||
{
|
||||
"pname": "System.Linq",
|
||||
@@ -661,8 +661,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.Reflection.Metadata",
|
||||
"version": "1.6.0",
|
||||
"hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE="
|
||||
},
|
||||
{
|
||||
"pname": "System.Reflection.Primitives",
|
||||
|
||||
@@ -25,13 +25,13 @@ assert builtins.all (x: builtins.elem x [ "node20" ]) nodeRuntimes;
|
||||
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "github-runner";
|
||||
version = "2.327.1";
|
||||
version = "2.328.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "actions";
|
||||
repo = "runner";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-wTbhuBg9eIq1wGifeORTUvp9+yWDHb42J88o2Fmnrfo=";
|
||||
hash = "sha256-3Q2bscLKdUBPx+5X0qxwtcy3CU6N/wE8yO1CcATSyBQ=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C $out rev-parse --short HEAD > $out/.git-revision
|
||||
|
||||
@@ -7,18 +7,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "harper";
|
||||
version = "0.58.0";
|
||||
version = "0.59.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Automattic";
|
||||
repo = "harper";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KGi/toi02JPDYdNvrhIg9hh+188C5jP41Zk3IKOgO/E=";
|
||||
hash = "sha256-SUrTdVbxMQ/oPTinYyQD60el6a6Pt3ZDVlFdA+plnnM=";
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "harper-ls";
|
||||
|
||||
cargoHash = "sha256-Er056RhUW33UrRMP412/tj+Qa878Jk+nIcFuF8Ytaes=";
|
||||
cargoHash = "sha256-tlJ5D1M15QEFmyZ/+FJAVHxKUg9ajfiQxAi+YRz3yk4=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -12,6 +12,8 @@
|
||||
ocl-icd,
|
||||
perl,
|
||||
python3,
|
||||
rocmPackages ? { },
|
||||
rocmSupport ? config.rocmSupport,
|
||||
xxHash,
|
||||
zlib,
|
||||
libiconv,
|
||||
@@ -43,7 +45,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
]
|
||||
++ lib.optionals cudaSupport [
|
||||
++ lib.optionals (cudaSupport || rocmSupport) [
|
||||
addDriverRunpath
|
||||
];
|
||||
|
||||
@@ -102,13 +104,16 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optionals cudaSupport [
|
||||
"${cudaPackages.cudatoolkit}/lib"
|
||||
]
|
||||
++ lib.optionals rocmSupport [
|
||||
"${rocmPackages.clr}/lib"
|
||||
]
|
||||
);
|
||||
in
|
||||
''
|
||||
wrapProgram $out/bin/hashcat \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.escapeShellArg LD_LIBRARY_PATH}
|
||||
''
|
||||
+ lib.optionalString cudaSupport ''
|
||||
+ lib.optionalString (cudaSupport || rocmSupport) ''
|
||||
for program in $out/bin/hashcat $out/bin/.hashcat-wrapped; do
|
||||
isELF "$program" || continue
|
||||
addDriverRunpath "$program"
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kubectl-ai";
|
||||
version = "0.0.20";
|
||||
version = "0.0.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleCloudPlatform";
|
||||
repo = "kubectl-ai";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-iyyaQBulncPNJXm7ir/aOjJxJvd0Q178weneiwQbGcU=";
|
||||
hash = "sha256-sU8CATzhp0seUJNYjvxFkRoA/Xqb57kZqGpEOCxypUA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-a84HesnInU7JZZTx0Rm1Qgsmo7SJC0kMnckgmUk0Vow=";
|
||||
vendorHash = "sha256-OJnpd8z4e6ytoUi5ydFHYPMA77ryU7Tp8wriuab7yuk=";
|
||||
|
||||
# Build the main command
|
||||
subPackages = [ "cmd" ];
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "liboprf";
|
||||
version = "0.7.1";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stef";
|
||||
repo = "liboprf";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-auC6iVTMbLktKCPY8VgOdx2dMI2KDzNgtY1zyNXjM1A=";
|
||||
hash = "sha256-xDE9UkHDAaA7zC6IxxEIUG7ziS1yYNLJbmVJZLJyL7U=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src";
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "nak";
|
||||
version = "0.15.2";
|
||||
version = "0.15.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fiatjaf";
|
||||
repo = "nak";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-pYSD6pVp4WRbRzv/voiHpgPKbC9J+PLJGGx6hH813FQ=";
|
||||
hash = "sha256-PSg+27uTpPIrKlYArWOv92l5muQRQiFZ6Vvu7hDLt5s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Xoi0sepupJK3pT0egbXRYQkPgwc0G2Xgwiz71Tqj8T4=";
|
||||
vendorHash = "sha256-qwi3awU1DHjT/4scGUrhsdlmXJYwq0g/t4LaZ8FGYB0=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nvc";
|
||||
version = "1.17.1";
|
||||
version = "1.17.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nickg";
|
||||
repo = "nvc";
|
||||
tag = "r${version}";
|
||||
hash = "sha256-5mOw69qqKabvbMCJbLoaIV8WwcRr6m4zc/lM0ssvtEw=";
|
||||
hash = "sha256-YNbRgqJSf22YV/4e2Sr9CwKFOQcBVhS6ScDNon3yJUM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -152,15 +152,6 @@ python.pkgs.buildPythonApplication rec {
|
||||
|
||||
inherit version src;
|
||||
|
||||
# Manual partial backport of:
|
||||
# - https://github.com/paperless-ngx/paperless-ngx/commit/9889c59d3daa8f4ac8ec2400c00ddc36a7ca63c9
|
||||
# - https://github.com/paperless-ngx/paperless-ngx/pull/10538
|
||||
# Fixes build with latest dependency versions.
|
||||
# FIXME: remove in next update
|
||||
patches = [
|
||||
./dep-updates.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# pytest-xdist with to many threads makes the tests flaky
|
||||
if (( $NIX_BUILD_CORES > 3)); then
|
||||
|
||||
@@ -42,13 +42,13 @@ let
|
||||
};
|
||||
|
||||
pname = "pretix";
|
||||
version = "2025.7.0";
|
||||
version = "2025.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pretix";
|
||||
repo = "pretix";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-fKAHakrgvtkQR/dpXWL0prsq90TvEdYaS6FLyaI8MrM=";
|
||||
hash = "sha256-emPzCwViqbGqlQRYmyamhQ5y6a3g67TTYIdv6FWbGEU=";
|
||||
};
|
||||
|
||||
npmDeps = buildNpmPackage {
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "redocly";
|
||||
version = "2.0.2";
|
||||
version = "2.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Redocly";
|
||||
repo = "redocly-cli";
|
||||
rev = "@redocly/cli@${version}";
|
||||
hash = "sha256-dIPKvvJpNOvJLQ/tT0EOtRIx9/LfQf0g4+N9JChk37U=";
|
||||
hash = "sha256-diTs1SudDtATY1sNghnWr4Uel1UT38YVSuJZLdb6sZs=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-nb6QPtCqnXeRA7YEG3+U3ZWWG41v5cpkIplgNYej4dQ=";
|
||||
npmDepsHash = "sha256-iHfbrX3HYDDol9Nt++vJAhlaBQJDRLypkuVdp0Iwjuc=";
|
||||
|
||||
npmBuildScript = "prepare";
|
||||
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
diff --git a/src/tauon/__main__.py b/src/tauon/__main__.py
|
||||
index 04691586..e48afa02 100755
|
||||
--- a/src/tauon/__main__.py
|
||||
+++ b/src/tauon/__main__.py
|
||||
@@ -115,8 +115,8 @@ def transfer_args_and_exit() -> None:
|
||||
if "--no-start" in sys.argv:
|
||||
transfer_args_and_exit()
|
||||
|
||||
-# If we're installed, use home data locations
|
||||
-install_mode = bool(str(install_directory).startswith(("/opt/", "/usr/", "/app/", "/snap/")) or sys.platform in ("darwin", "win32"))
|
||||
+# Nixpkgs install, use home data dirs.
|
||||
+install_mode = True
|
||||
|
||||
# Assume that it's a classic Linux install, use standard paths
|
||||
if str(install_directory).startswith("/usr/") and Path("/usr/share/TauonMusicBox").is_dir():
|
||||
@@ -48,14 +48,14 @@ let
|
||||
in
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "tauon";
|
||||
version = "8.0.1";
|
||||
version = "8.1.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Taiko2k";
|
||||
repo = "Tauon";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-m94/zdlJu/u/dchIXhqB47bkl6Uej2hVr8R6RNg8Vaw=";
|
||||
hash = "sha256-AV8B09H/25+2ZOoGux2/A4xP8sBBpRP197JYkS9/awk=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
@@ -66,10 +66,6 @@ python3Packages.buildPythonApplication rec {
|
||||
ln -s ${miniaudio.src} source/src/phazor/miniaudio
|
||||
'';
|
||||
|
||||
patches = [
|
||||
./install_mode_true.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/tauon/t_modules/t_phazor.py \
|
||||
--replace-fail 'base_path = Path(pctl.install_directory).parent.parent / "build"' 'base_path = Path("${placeholder "out"}/${python3Packages.python.sitePackages}")'
|
||||
|
||||
@@ -124,7 +124,7 @@ stdenv.mkDerivation {
|
||||
|
||||
for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
|
||||
patchelf --set-rpath $libPath:$out/opt/viber/lib $file || true
|
||||
patchelf --set-rpath $libPath:$out/opt/viber/lib:$out/lib $file || true
|
||||
done
|
||||
|
||||
# qt.conf is not working, so override everything using environment variables
|
||||
@@ -143,6 +143,10 @@ stdenv.mkDerivation {
|
||||
substituteInPlace $out/share/applications/viber.desktop \
|
||||
--replace /opt/viber/Viber $out/opt/viber/Viber \
|
||||
--replace /usr/share/ $out/share/
|
||||
|
||||
# Fix libxml2 breakage. See https://github.com/NixOS/nixpkgs/pull/396195#issuecomment-2881757108
|
||||
mkdir -p "$out/lib"
|
||||
ln -s "${lib.getLib libxml2}/lib/libxml2.so" "$out/opt/viber/lib/libxml2.so.2"
|
||||
'';
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
@@ -6,17 +6,17 @@
|
||||
|
||||
buildGo124Module rec {
|
||||
pname = "vuls";
|
||||
version = "0.33.2";
|
||||
version = "0.33.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "future-architect";
|
||||
repo = "vuls";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-6tpX8pZNKJXJv6ArwNWn9ih19LU3DNeBUXy9U/dHhVc=";
|
||||
hash = "sha256-sIsdXtvMoVi72eHGuJqGQz9dAb9OqAyYvbDT55dnJb8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-vZMpQvEswcsfppZ5tIaI4fqrKkwbN53shefRyLR/Sg8=";
|
||||
vendorHash = "sha256-OjE+j91QgS74FknfYLnkA7RKDSnC8yUZDIRXw3taORA=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "webcord";
|
||||
version = "4.11.0";
|
||||
version = "4.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SpacingBat3";
|
||||
repo = "WebCord";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-JHPvUEHBPsDqdesVifPFtg9mRwTUsln6JeXKXj/o8d8=";
|
||||
hash = "sha256-u2Asoc5cwVRtD6yz77iJ8hA2IfVSA4iYI8snPCLufnE=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-5R3kcMZ9TsuZ89M6C3y/daEYDd/0ekRqf3uLBzSOOJA=";
|
||||
npmDepsHash = "sha256-sREnthfmE01yzVwqMN6zbhTAquulztriytMSOcj3ZCo=";
|
||||
|
||||
makeCacheWritable = true;
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
nix-update-script,
|
||||
pkg-config,
|
||||
meson,
|
||||
@@ -22,24 +21,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-terminal";
|
||||
version = "7.1.0";
|
||||
version = "7.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "terminal";
|
||||
rev = version;
|
||||
sha256 = "sha256-IbN01o3rojlwp4rBt8NlIPthxIPMOm/bD1rzD5Taibw=";
|
||||
sha256 = "sha256-B/VEVS1dJQGJ8+gqgJ/mb3+r29ZPtCSSlur/CAr6BJg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix incorrect line breaks when pasting/dropping into foreground processes
|
||||
# https://github.com/elementary/terminal/pull/862
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/terminal/commit/8f93bc77437e45090e59266c7813436a0903d27b.patch";
|
||||
hash = "sha256-4xUFnFVUV4EIDZFprEbL+S49j5Maof5/egHPVaJAVg4=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
desktop-file-utils
|
||||
meson
|
||||
|
||||
@@ -1,6 +1,12 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
mkXfceDerivation,
|
||||
fetchFromGitLab,
|
||||
fetchpatch,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
wrapGAppsHook3,
|
||||
clutter,
|
||||
gettext,
|
||||
libXcomposite,
|
||||
@@ -14,26 +20,48 @@
|
||||
xfconf,
|
||||
gtk3,
|
||||
glib,
|
||||
dbus-glib,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
mkXfceDerivation {
|
||||
category = "apps";
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xfdashboard";
|
||||
version = "1.0.0-unstable-2025-07-18";
|
||||
# Fix build with gettext 0.25
|
||||
rev = "93255940950ef5bc89cab729c8b977a706f98e0c";
|
||||
rev-prefix = "";
|
||||
version = "1.1.0";
|
||||
|
||||
sha256 = "sha256-Qv0ASuJF0FzPoeLx2D6/kXkxnOJV7mdAFD6PCk+CMac=";
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.xfce.org";
|
||||
owner = "apps";
|
||||
repo = "xfdashboard";
|
||||
tag = "xfdashboard-${finalAttrs.version}";
|
||||
hash = "sha256-D8Tue+45CO5yy7sxealKQoFQZobCiDUzoxCsDksTTxI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Exit early if not on X11
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.xfce.org/apps/xfdashboard/-/commit/7452a7074dfc36c5af42c4105aadaac8656c2f60.patch";
|
||||
hash = "sha256-u0djTProV3On0uutg89Q+psgmVGJS768KwiYxZ7dhrE=";
|
||||
})
|
||||
|
||||
# build: Fix version/so_version inversion
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.xfce.org/apps/xfdashboard/-/commit/20f23e62576d186fada6688af3bb05bc7f223f44.patch";
|
||||
hash = "sha256-C2oIBi9tfoQF123Ez3YbFUs8vX2DeYdr3BDc85ExTgQ=";
|
||||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
glib # glib-genmarshal
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
clutter
|
||||
dbus-glib
|
||||
garcon
|
||||
glib
|
||||
gtk3
|
||||
@@ -47,8 +75,14 @@ mkXfceDerivation {
|
||||
xfconf
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Gnome shell like dashboard";
|
||||
teams = [ teams.xfce ];
|
||||
passthru.updateScript = gitUpdater { rev-prefix = "xfdashboard-"; };
|
||||
|
||||
meta = {
|
||||
description = "GNOME shell like dashboard";
|
||||
homepage = "https://gitlab.xfce.org/apps/xfdashboard";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
mainProgram = "xfdashboard";
|
||||
teams = [ lib.teams.xfce ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
import ./common.nix {
|
||||
version = "140.2.0";
|
||||
hash = "sha512-5Fl8TYOuGoT86SSP5splKvbDYVYH/IlzvZF7/b0qu87Kk3/kxinAzcifoKXIRrXi2KS0Tav3/rIB3rOC3gzMWw==";
|
||||
}
|
||||
@@ -24,6 +24,7 @@
|
||||
|
||||
# runtime
|
||||
icu75,
|
||||
icu77,
|
||||
nspr,
|
||||
readline,
|
||||
zlib,
|
||||
@@ -65,6 +66,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
url = "https://src.fedoraproject.org/rpms/mozjs91/raw/e3729167646775e60a3d8c602c0412e04f206baf/f/0001-Python-Build-Use-r-instead-of-rU-file-read-modes.patch";
|
||||
hash = "sha256-WgDIBidB9XNQ/+HacK7jxWnjOF8PEUt5eB0+Aubtl48=";
|
||||
})
|
||||
]
|
||||
++ lib.optionals (lib.versionAtLeast version "140") [
|
||||
# mozjs-140.pc does not contain -DXP_UNIX on Linux
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1973994
|
||||
(fetchpatch {
|
||||
url = "https://src.fedoraproject.org/rpms/mozjs140/raw/49492baa47bc1d7b7d5bc738c4c81b4661302f27/f/9aa8b4b051dd539e0fbd5e08040870b3c712a846.patch";
|
||||
hash = "sha256-SsyO5g7wlrxE7y2+VTHfmUDamofeZVqge8fv2y0ZhuU=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -89,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
icu75
|
||||
(if (lib.versionAtLeast version "140") then icu77 else icu75)
|
||||
nspr
|
||||
readline
|
||||
zlib
|
||||
@@ -120,6 +129,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optionals (lib.versionAtLeast version "91") [
|
||||
"--disable-debug"
|
||||
]
|
||||
++ lib.optionals (lib.versionAtLeast version "140") [
|
||||
# For pkgconfig file.
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1907030
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1957023
|
||||
"--includedir=${placeholder "dev"}/include"
|
||||
]
|
||||
++ [
|
||||
"--disable-jemalloc"
|
||||
"--disable-strip"
|
||||
@@ -177,6 +192,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
configureScript=../js/src/configure
|
||||
'';
|
||||
|
||||
env = lib.optionalAttrs (lib.versionAtLeast version "140") {
|
||||
# '-Wformat-security' ignored without '-Wformat'
|
||||
NIX_CFLAGS_COMPILE = "-Wformat";
|
||||
};
|
||||
|
||||
# Remove unnecessary static lib
|
||||
preFixup = ''
|
||||
moveToOutput bin/js${lib.versions.major version}-config "$dev"
|
||||
@@ -195,6 +215,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
maintainers = with maintainers; [
|
||||
lostnet
|
||||
catap
|
||||
bobby285271
|
||||
];
|
||||
broken = stdenv.hostPlatform.isDarwin; # 91 is broken, >=115 requires SDK 13.3 (see #242666).
|
||||
platforms = platforms.unix;
|
||||
|
||||
@@ -1,27 +1,36 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
isPy3k,
|
||||
fetchFromGitHub,
|
||||
numpy,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "arrayqueues";
|
||||
version = "1.4.1";
|
||||
format = "setuptools";
|
||||
disabled = !isPy3k;
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-7I+5BQO/gsvTREDkBfxrMblw3JPfY48S4KI4PCGPtFY=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "portugueslab";
|
||||
repo = "arrayqueues";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-tqIfpkwbJNd9jMe0YvAWz9Z8rOO80qxVM2ZcJFeAmwo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ numpy ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "arrayqueues" ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/portugueslab/arrayqueues";
|
||||
description = "Multiprocessing queues for numpy arrays using shared memory";
|
||||
changelog = "https://github.com/portugueslab/arrayqueues/releases/tag/${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ tbenst ];
|
||||
};
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bidsschematools";
|
||||
version = "1.0.13";
|
||||
version = "1.0.14";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "bidsschematools";
|
||||
inherit version;
|
||||
hash = "sha256-l9DN68kf1HwE0Th6XBuLxlikAyaARIEK/jwE6/mC0Vo=";
|
||||
hash = "sha256-Kj3vxue6dGdFV2gzYr6SBa3D1s/X+KV/izWR6kMKOKE=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -56,19 +56,23 @@ buildPythonPackage rec {
|
||||
# redisTestHook does not work on darwin
|
||||
doCheck = !stdenv.hostPlatform.isDarwin;
|
||||
|
||||
# disable broken pinning test
|
||||
preCheck = ''
|
||||
substituteInPlace cachalot/tests/read.py \
|
||||
--replace-fail \
|
||||
"def test_explain(" \
|
||||
"def _test_explain("
|
||||
export DJANGO_SETTINGS_MODULE=settings
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
${python.interpreter} runtests.py
|
||||
runHook postCheck
|
||||
'';
|
||||
pytestFlags = [
|
||||
"-o python_files=*.py"
|
||||
"-o collect_imported_tests=false"
|
||||
"cachalot/tests"
|
||||
"cachalot/admin_tests"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# relies on specific EXPLAIN output format from sqlite, which is not stable
|
||||
"test_explain"
|
||||
# broken on django-debug-toolbar 6.0
|
||||
"test_rendering"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "No effort, no worry, maximum performance";
|
||||
|
||||
@@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-hierarkey";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raphaelm";
|
||||
repo = "django-hierarkey";
|
||||
tag = version;
|
||||
hash = "sha256-vXc31tUQrukdXeiMHZYP12o0C3R28CsC5fHjhMgRdU0=";
|
||||
hash = "sha256-zIz7aokOGLGXV/xJnYcz8lBP7b2rxLrfaD3i/DLpFR8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "govee-ble";
|
||||
version = "0.44.0";
|
||||
version = "0.45.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = "govee-ble";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-19kGgelUFuMuiZxzb0ySkG6L52I/CHsfPQdzSbwucPY=";
|
||||
hash = "sha256-SUxK4H0Vo8C4GykIv8duFhhiGBA860QofVQDO37Ubdw=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "h5netcdf";
|
||||
version = "1.6.3";
|
||||
version = "1.6.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "h5netcdf";
|
||||
repo = "h5netcdf";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-frKnnUh5OFeQGAhf/y5idMWGb0ufHznz4u5A8FRJSuA=";
|
||||
hash = "sha256-SFlea/ABP78GQgGkh7hscAlGfpKVnXN2zr99D9LCpeQ=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -28,14 +28,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mkdocs-material";
|
||||
version = "9.6.16";
|
||||
version = "9.6.17";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "squidfunk";
|
||||
repo = "mkdocs-material";
|
||||
tag = version;
|
||||
hash = "sha256-wGzrlDf6bJFIfJXlCMlOQvRlpOcDXeMVY2/GRjOG1H4=";
|
||||
hash = "sha256-yl5bc037gr3oAUH01uNvNj7fIe8ca2jH+yfWlgMImZE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -19,18 +19,18 @@
|
||||
let
|
||||
dochash =
|
||||
if stdenv.hostPlatform.isLinux then
|
||||
"sha256-+1zLd308zL+m68kLMeOWWxT0wYDgCd6g9cc2hEtaeUs="
|
||||
"sha256-d2YQUBWRlDROwiDMJ5mQAR9o+cYsbv1jiulsr1SAaik="
|
||||
else if stdenv.hostPlatform.isDarwin then
|
||||
"sha256-2uB9+ABgv5O376LyHb0ShGjM4LHYzMRMxk/k+1LBmv0="
|
||||
"sha256-eIzTsn4wYz7TEyWN8QssM7fxpMfz/ENlxDVUMz0Cm4c="
|
||||
else if stdenv.hostPlatform.isWindows then
|
||||
"sha256-46bQSPYctycizf2GXichd5V74LjxwIAPhBmklXAJ/Jg="
|
||||
"sha256-+iagR5jvpHi8WDh4/DO+GDP6jajEpZ6G1ROhM+zkSiw="
|
||||
else
|
||||
throw "PySDL3 does not support ${stdenv.hostPlatform.uname.system}";
|
||||
lib_ext = stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "pysdl3";
|
||||
version = "0.9.8b1";
|
||||
version = "0.9.8b9";
|
||||
pyproject = true;
|
||||
|
||||
pythonImportsCheck = [ "sdl3" ];
|
||||
@@ -39,7 +39,7 @@ buildPythonPackage rec {
|
||||
owner = "Aermoss";
|
||||
repo = "PySDL3";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-FVUCcqKTq6qdNkYHTYFiUxt2HIaNC5LK0BEUfz8Mue8=";
|
||||
hash = "sha256-TpfMpp8CGb8lYALCWlMtyucxObDg1VYEvBW+mVHN9JM=";
|
||||
};
|
||||
|
||||
docfile = fetchurl {
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyswitchbot";
|
||||
version = "0.68.3";
|
||||
version = "0.68.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "Danielhiversen";
|
||||
repo = "pySwitchbot";
|
||||
tag = version;
|
||||
hash = "sha256-PMwXaOIEUuJcZ8D7xuOfwTqYStqynu30wS0wWHyc2WI=";
|
||||
hash = "sha256-B3xORFuvgVM4MoAMWWXkO5wUe1wU2gEo+NzWVikMrXg=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -6,25 +6,25 @@
|
||||
fetchFromGitHub,
|
||||
ffmpeg-python,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
requests,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "reolink";
|
||||
version = "0053";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
version = "0.64";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fwestenberg";
|
||||
repo = "reolink";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-DZcTfmzO9rBhhRN2RkgoPwUPE+LPPeZgc8kmhYU9V2I=";
|
||||
hash = "sha256-3r5BwVlNolji2HIGjqv8gkizx4wWxrKYkiNmSJedKmI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
aiohttp
|
||||
ffmpeg-python
|
||||
requests
|
||||
@@ -57,11 +57,13 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "reolink" ];
|
||||
|
||||
passthru.skipBulkUpdate = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module to interact with the Reolink IP camera API";
|
||||
homepage = "https://github.com/fwestenberg/reolink";
|
||||
changelog = "https://github.com/fwestenberg/reolink/releases/tag/v${version}";
|
||||
license = with licenses; [ mit ];
|
||||
changelog = "https://github.com/fwestenberg/reolink/releases/tag/${src.tag}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sharkiq";
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JeffResc";
|
||||
repo = "sharkiq";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-FIPU2D0e0JGcoxFKe5gf5nKZ0T/a18WS9I+LXeig1is=";
|
||||
hash = "sha256-bojLyL16DOFgbU8rglzBRxcgsHwaTQQAsJQZCaXo5pw=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
flit-core,
|
||||
sphinx,
|
||||
}:
|
||||
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
flit-core
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
beautifulsoup4,
|
||||
setuptools-scm,
|
||||
flit-core,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinxext-opengraph";
|
||||
version = "0.12.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
hash = "sha256-2ch9BxgrqbfIJ8fzFKYscha4+G7OAVz+OIOqYwX2gSA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
build-system = [ flit-core ];
|
||||
|
||||
optional-dependencies = {
|
||||
social_cards_generation = [ matplotlib ];
|
||||
|
||||
@@ -28,14 +28,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "streamlit";
|
||||
version = "1.47.1";
|
||||
version = "1.48.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-2u15dj0cr+sDzdgAuRqpx63DaIxrLL9OzCyomaq4Kio=";
|
||||
hash = "sha256-xuKp8kRxdGu+qlSiiPX9/G4rzzupqXU/3l1J7UJDkfE=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-html5lib";
|
||||
version = "1.1.11.20250708";
|
||||
version = "1.1.11.20250809";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "types_html5lib";
|
||||
inherit version;
|
||||
hash = "sha256-JDIXIP26xxzuUNWkvsm3RISVtyF5dM/+P88e3k7vev4=";
|
||||
hash = "sha256-eXbsdCa7AJmX3F4HK8o+2YjddH0Mv+CTx9+9PV7Iv1c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
@@ -15,13 +15,13 @@ let
|
||||
variants = {
|
||||
# ./update-xanmod.sh lts
|
||||
lts = {
|
||||
version = "6.12.42";
|
||||
hash = "sha256-q/a6ik5kKRKOcbmGxGBdCDW3dsgIDf/7tvEpcGjDrHI=";
|
||||
version = "6.12.43";
|
||||
hash = "sha256-Jc3VKpUaIc1nBbbCZ/jAx/kteuQBQBO6TEPlaNq8Jrk=";
|
||||
};
|
||||
# ./update-xanmod.sh main
|
||||
main = {
|
||||
version = "6.15.10";
|
||||
hash = "sha256-6ed820JXJr7QqOX3IiF50SFrYeVrx0xCh73zrlmMy5I=";
|
||||
version = "6.15.11";
|
||||
hash = "sha256-251rQqXkzLzmgl1uqN3mvXlkIbH+B25C30hMJ6v4tBE=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -6382,10 +6382,12 @@ with pkgs;
|
||||
spidermonkey_91 = callPackage ../development/interpreters/spidermonkey/91.nix { };
|
||||
spidermonkey_115 = callPackage ../development/interpreters/spidermonkey/115.nix { };
|
||||
spidermonkey_128 = callPackage ../development/interpreters/spidermonkey/128.nix { };
|
||||
spidermonkey_140 = callPackage ../development/interpreters/spidermonkey/140.nix { };
|
||||
})
|
||||
spidermonkey_91
|
||||
spidermonkey_115
|
||||
spidermonkey_128
|
||||
spidermonkey_140
|
||||
;
|
||||
|
||||
supercollider = libsForQt5.callPackage ../development/interpreters/supercollider {
|
||||
|
||||
Reference in New Issue
Block a user