Merge release-26.05 into staging-nixos-26.05

This commit is contained in:
nixpkgs-ci[bot] 2026-06-30 00:52:02 +00:00 committed by GitHub
commit ed176b12d5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
108 changed files with 1463 additions and 727 deletions

View file

@ -64,6 +64,7 @@ jobs:
'ci/github-script/supportedSystems.js',
'ci/pinned.json',
'ci/supportedBranches.js',
'pkgs/top-level/release-supported-systems.json',
].includes(file))) core.setOutput('merge-group', true)
if (files.some(file => [
@ -88,6 +89,7 @@ jobs:
'ci/github-script/withRateLimit.js',
'ci/pinned.json',
'ci/supportedBranches.js',
'pkgs/top-level/release-supported-systems.json',
].includes(file))) core.setOutput('pr', true)
merge-group:

View file

@ -77,10 +77,6 @@
# Nixpkgs build-support
/pkgs/build-support/writers @lassulus
# Nixpkgs make-disk-image
/doc/build-helpers/images/makediskimage.section.md @raitobezarius
/nixos/lib/make-disk-image.nix @raitobezarius
# Nix, the package manager
# @raitobezarius is not "code owner", but is listed here to be notified of changes
# pertaining to the Nix package manager.
@ -232,9 +228,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @Artturin @Ericson2314 @lo
# C compilers
/pkgs/development/compilers/gcc
/pkgs/development/compilers/llvm @NixOS/llvm
/pkgs/development/compilers/emscripten @raitobezarius
/doc/toolchains/llvm.chapter.md @NixOS/llvm
/doc/languages-frameworks/emscripten.section.md @raitobezarius
# Audio
/nixos/modules/services/audio/botamusique.nix @mweinelt
@ -327,11 +321,6 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
/nixos/tests/kea.nix @mweinelt
/nixos/tests/knot.nix @mweinelt
# Web servers
/doc/packages/nginx.section.md @raitobezarius
/pkgs/servers/http/nginx/ @raitobezarius
/nixos/modules/services/web-servers/nginx/ @raitobezarius
# D
/pkgs/build-support/dlang @jtbx @TomaSajt

View file

@ -410,6 +410,18 @@
},
"name": "GNOME"
},
"gnome-circle": {
"description": "Maintain GNOME Circle applications.",
"id": 18234720,
"maintainers": {
"Aleksanaa": 42209822,
"Hythera": 87016780,
"getchoo": 48872998,
"michaelgrahamevans": 5932424
},
"members": {},
"name": "GNOME Circle"
},
"golang": {
"description": "Maintain Golang compilers",
"id": 4020424,
@ -937,8 +949,7 @@
"description": "Reviews changes to core packages for Nixpkgs security vulnerabilities: https://github.com/NixOS/nixpkgs/issues/494349",
"id": 16430758,
"maintainers": {
"balsoft": 18467667,
"infinisil": 20525370
"balsoft": 18467667
},
"members": {
"andir": 638836,

View file

@ -25,7 +25,7 @@ let
};
in
{
meta.maintainers = [ lib.maintainers.raitobezarius ];
meta.maintainers = [ ];
options.services.hebbot = {
enable = mkEnableOption "hebbot";
package = lib.mkPackageOption pkgs "hebbot" { };

View file

@ -28,7 +28,7 @@ in
)
];
meta.maintainers = [ lib.maintainers.raitobezarius ];
meta.maintainers = [ ];
options.services.journald.gateway = {
enable = lib.mkEnableOption "the HTTP gateway to the journal";

View file

@ -16,7 +16,7 @@ let
};
in
{
meta.maintainers = [ lib.maintainers.raitobezarius ];
meta.maintainers = [ ];
options.services.journald.remote = {
enable = lib.mkEnableOption "receiving systemd journals from the network";

View file

@ -10,7 +10,7 @@ let
format = pkgs.formats.systemd { };
in
{
meta.maintainers = [ lib.maintainers.raitobezarius ];
meta.maintainers = [ ];
options.services.journald.upload = {
enable = lib.mkEnableOption "uploading the systemd journal to a remote server";

View file

@ -2,7 +2,7 @@ import ./make-test-python.nix (
{ lib, ... }:
{
name = "listmonk";
meta.maintainers = with lib.maintainers; [ raitobezarius ];
meta.maintainers = [ ];
nodes.machine =
{ pkgs, ... }:

View file

@ -6,7 +6,6 @@
meta = with pkgs.lib.maintainers; {
maintainers = [
cransom
raitobezarius
];
};

View file

@ -4,7 +4,6 @@
meta = with pkgs.lib.maintainers; {
maintainers = [
minijackson
raitobezarius
];
};

View file

@ -4,7 +4,6 @@
meta = with pkgs.lib.maintainers; {
maintainers = [
minijackson
raitobezarius
];
};

View file

@ -18,7 +18,6 @@ in
meta.maintainers = with lib.maintainers; [
minijackson
raitobezarius
];
node.pkgsReadOnly = false;

View file

@ -18,20 +18,20 @@ let
# update-script-start: urls
urls = {
x86_64-linux = {
url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.2.tar.gz";
hash = "sha256-INIz7nGar/oHh+CHfz4jm5t9/ARPcMfpnOl99Z3kg3I=";
url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.3.tar.gz";
hash = "sha256-0+v05zxvFqXV13c8oV9dTTwtO+shgywD75cwUiZAab0=";
};
aarch64-linux = {
url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.2-aarch64.tar.gz";
hash = "sha256-PmCDYM8nqySQm6cpUJQ9PyzSkKOR6V3LuXnYpE0i7fU=";
url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.3-aarch64.tar.gz";
hash = "sha256-SZ4OkWgAGeSafFo1ml5dv5tN5su+HgzbEhQ5GzPqGdo=";
};
x86_64-darwin = {
url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.2.dmg";
hash = "sha256-HI2qt6wTddANqdRuKQ4X7mXQyBA4dJYz9ewfI2iAYfw=";
url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.3.dmg";
hash = "sha256-JA++mbKvRTvjHEblbgmjBzbWbxcV7ss3+W9M6i6ePu0=";
};
aarch64-darwin = {
url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.2-aarch64.dmg";
hash = "sha256-JMg/vs3aVeHmr6tiZZTggRGpH9O6lKlyeP8Ot4mm24w=";
url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.3-aarch64.dmg";
hash = "sha256-ndipMTztrYeUdo4MfOHjJHk3liHutWmMj+J6G8xjtWA=";
};
};
# update-script-end: urls
@ -45,8 +45,8 @@ in
product = "RustRover";
# update-script-start: version
version = "2026.1.2";
buildNumber = "261.24374.182";
version = "2026.1.3";
buildNumber = "261.25134.134";
# update-script-end: version
src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

View file

@ -270,7 +270,6 @@ edk2.mkDerivation projectDscPath (finalAttrs: {
platforms = metaPlatforms;
maintainers = with lib.maintainers; [
adamcstephens
raitobezarius
mjoerg
sigmasquadron
];

View file

@ -420,16 +420,16 @@ in
docker_29 =
let
version = "29.5.3";
version = "29.6.0";
in
callPackage dockerGen {
inherit version;
cliRev = "v${version}";
cliHash = "sha256-ZYfBWNVp7w8ZKdRA6bmDVQV4UEp+t8lWehInvtfysxM=";
cliHash = "sha256-2JTiqvrIYhpwbEgU+5DnmlHpaf8Re1vYPkySs93sKZU=";
mobyRev = "docker-v${version}";
mobyHash = "sha256-D+XjHsKUFgMBCQsFI825JIGHEQmDt3NQCwpTdu6XSc8=";
runcRev = "v1.3.5";
runcHash = "sha256-Swphxbu/OLkUrfRjLMZIVGwYb7AN0xHdyxm0ysAVam0=";
mobyHash = "sha256-xr3+RZANLP4IkLv26/7znXnTCOm/5Gm7k6WBaOlZfQk=";
runcRev = "v1.3.6";
runcHash = "sha256-cBMYZOElWHQ4OkF2NlYJSZrlW4833WD8CRJRkkXeKJc=";
containerdRev = "v2.2.4";
containerdHash = "sha256-F0lw7zh4V9JlFQGkE4RNT1VLX8WWLgZAAvbP12jnRMw=";
tiniRev = "369448a167e8b3da4ca5bca0b3307500c3371828";

View file

@ -45,6 +45,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
description = "Turing-complete language for creating provable programs for general computation";
homepage = "https://github.com/starkware-libs/cairo";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ raitobezarius ];
maintainers = [ ];
};
})

View file

@ -9,16 +9,27 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cedar";
version = "4.5.1";
version = "4.11.0";
src = fetchFromGitHub {
owner = "cedar-policy";
repo = "cedar";
tag = "v${finalAttrs.version}";
hash = "sha256-f8d7KL1DzEfJqEJ5uwwOJCgePE/frOXIFcXuoybIp2U=";
hash = "sha256-9IJ/AMWOtkNAoBbzTKqUZI87MvHPihdhNBwsmn0qpDA=";
};
cargoHash = "sha256-MK6Zcpf12mGzntEv632kQjH7YOx31QBCmSJHxjE3l1c=";
cargoHash = "sha256-sinfwdi3/ZFmdbxRiUbtmhsVGcJenn82HFu8mJz415I=";
cargoBuildFlags = [
"--bin"
"cedar"
];
cargoTestFlags = finalAttrs.cargoBuildFlags;
preCheck = ''
export TMPDIR="/tmp"
'';
passthru = {
tests.version = testers.testVersion { package = cedar; };

View file

@ -0,0 +1,73 @@
diff --git a/package-lock.json b/package-lock.json
index 044aa5b..45ebc08 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2390,16 +2390,6 @@
"ieee754": "^1.1.13"
}
},
- "node_modules/buffer-crc32": {
- "version": "0.2.13",
- "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
- "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "*"
- }
- },
"node_modules/buffer-equal-constant-time": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
@@ -4372,16 +4362,6 @@
"reusify": "^1.0.4"
}
},
- "node_modules/fd-slicer": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
- "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "pend": "~1.2.0"
- }
- },
"node_modules/filename-reserved-regex": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz",
@@ -8633,14 +8613,16 @@
}
},
"node_modules/yauzl": {
- "version": "2.10.0",
- "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
- "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.4.0.tgz",
+ "integrity": "sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==",
"dev": true,
"license": "MIT",
"dependencies": {
- "buffer-crc32": "~0.2.3",
- "fd-slicer": "~1.1.0"
+ "pend": "~1.2.0"
+ },
+ "engines": {
+ "node": ">=12"
}
},
"node_modules/yocto-queue": {
diff --git a/package.json b/package.json
index 369f312..51b8563 100644
--- a/package.json
+++ b/package.json
@@ -42,5 +42,8 @@
"@electron/fuses": "^1.8.0",
"@reforged/maker-appimage": "^5.0.0",
"electron": "^30.0.5"
+ },
+ "overrides": {
+ "yauzl": "^3.3.1"
}
}

View file

@ -22,7 +22,12 @@ buildNpmPackage (finalAttrs: {
hash = "sha256-/xH3tBnZAnDr/EbewtJc0WpBirW1Obn6tka7NP0ovAc=";
};
npmDepsHash = "sha256-xoZ/qz7fGw858GsITkx/ag0FeeL4zcXh32qwb+OTLbg=";
patches = [
# zip extraction fails on newer nodejs versions without this fix
./bump-yauzl.patch
];
npmDepsHash = "sha256-p26yEuIiK7baeAxf06E+cmuzl45NS2WOmWNeFfTplQA=";
nativeBuildInputs = [
copyDesktopItems

View file

@ -24,6 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
homepage = "https://github.com/iden3/circom";
changelog = "https://github.com/iden3/circom/blob/${finalAttrs.src.rev}/RELEASES.md";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ raitobezarius ];
maintainers = [ ];
};
})

View file

@ -1,32 +1,53 @@
{
lib,
organicmaps,
stdenv,
fetchFromGitHub,
fetchurl,
fetchFromCodeberg,
cmake,
boost,
expat,
gtest,
glm,
getopt,
gflags,
glm,
gtest,
icu,
imgui,
jansson,
libxcursor,
libxinerama,
libxrandr,
ninja,
pkg-config,
pugixml,
python3,
qt6,
optipng,
utf8cpp,
which,
nix-update-script,
}:
let
# https://codeberg.org/comaps/comaps/src/branch/main/data/countries.txt
mapRev = 260321;
world_feed_integration_tests_data = fetchFromGitHub {
owner = "organicmaps";
repo = "world_feed_integration_tests_data";
rev = "30ecb0b3fe694a582edfacc2a7425b6f01f9fec6";
hash = "sha256-1FF658OhKg8a5kKX/7TVmsxZ9amimn4lB6bX9i7pnI4=";
};
# Update mapRev here based on v field near the top in https://codeberg.org/comaps/comaps/src/branch/main/data/countries.txt
mapRev = 260603;
worldMap = fetchurl {
name = "World-${toString mapRev}.mwm";
url = "https://cdn-fi-1.comaps.app/maps/${toString mapRev}/World.mwm";
hash = "sha256-pMmzPcWbS9drQzJCfiac2dfSMihiHDfhFyG5ux0pG54=";
hash = "sha256-1cq2gDiqeybA7VxjuSUFnlLagdZipdWiuAy5QI1LdZE=";
};
worldCoasts = fetchurl {
name = "WorldCoasts-${toString mapRev}.mwm";
url = "https://cdn-fi-1.comaps.app/maps/${toString mapRev}/WorldCoasts.mwm";
hash = "sha256-5LI6itC6LhprVfgGbT/HYy1lzZLZLUe2QoSil0/7kIc=";
hash = "sha256-MLRUPEXvXW2GqYdlxfhS5ODRiiWya4i2U+mpXnqc6rY=";
};
pythonEnv = python3.withPackages (
@ -35,26 +56,27 @@ let
]
);
in
organicmaps.overrideAttrs (oldAttrs: rec {
stdenv.mkDerivation (finalAttrs: {
pname = "comaps";
version = "2026.03.23-5";
version = "2026.06.05-11";
src = fetchFromCodeberg {
owner = "comaps";
repo = "comaps";
tag = "v${version}";
hash = "sha256-1bD0QiEZu6nB7wwBpfpEf+WypqbOd9XuXbq7FDTL7bw=";
tag = "v${finalAttrs.version}";
hash = "sha256-W05fZT82H78TqlH4MFaIexX1LYhjATYL1E6e0WCYrBI=";
fetchSubmodules = true;
};
patches = [
./use-vendored-protobuf.patch
# Include missing editor_tests_support.
./fix-editor-tests.patch
];
postPatch = (oldAttrs.postPatch or "") + ''
postPatch = ''
patchShebangs 3party/boost/tools/build/src/engine/build.sh
ln -s ${world_feed_integration_tests_data} data/test_data/world_feed_integration_tests_data
rm -f 3party/boost/b2
substituteInPlace configure.sh \
--replace-fail "git submodule update --init --recursive --depth 1" ""
@ -64,19 +86,34 @@ organicmaps.overrideAttrs (oldAttrs: rec {
--replace-fail "/usr/bin/env python3" "${pythonEnv.interpreter}"
'';
nativeBuildInputs = (builtins.filter (x: x != python3) oldAttrs.nativeBuildInputs or [ ]) ++ [
nativeBuildInputs = [
cmake
ninja
getopt
which
pkg-config
pythonEnv
qt6.wrapQtAppsHook
optipng
];
buildInputs = (oldAttrs.buildInputs or [ ]) ++ [
buildInputs = [
qt6.qtbase
qt6.qtpositioning
qt6.qtsvg
boost
expat
gtest
gflags
glm
icu
imgui
jansson
libxcursor
libxinerama
libxrandr
pugixml
utf8cpp
];
@ -85,6 +122,7 @@ organicmaps.overrideAttrs (oldAttrs: rec {
'';
cmakeFlags = [
(lib.cmakeBool "SKIP_TESTS" false)
(lib.cmakeBool "WITH_SYSTEM_PROVIDED_3PARTY" true)
];
@ -98,7 +136,6 @@ organicmaps.overrideAttrs (oldAttrs: rec {
postInstall = ''
install -Dm644 ${worldMap} $out/share/comaps/data/World.mwm
install -Dm644 ${worldCoasts} $out/share/comaps/data/WorldCoasts.mwm
ln -s $out/bin/CoMaps $out/bin/comaps
'';
passthru.updateScript = nix-update-script {
@ -108,11 +145,14 @@ organicmaps.overrideAttrs (oldAttrs: rec {
];
};
meta = oldAttrs.meta // {
meta = {
broken = stdenv.hostPlatform.isDarwin;
description = "Community-led fork of Organic Maps";
homepage = "https://comaps.app";
changelog = "https://codeberg.org/comaps/comaps/releases/tag/v${version}";
changelog = "https://codeberg.org/comaps/comaps/releases/tag/v${finalAttrs.version}";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.ryand56 ];
mainProgram = "comaps";
platforms = lib.platforms.unix;
mainProgram = "CoMaps";
};
})

View file

@ -1,21 +1,21 @@
diff --git a/3party/CMakeLists.txt b/3party/CMakeLists.txt
index dd851d7d..1b4e3ed3 100644
index 2146a5fdcf..9fc67abfb3 100644
--- a/3party/CMakeLists.txt
+++ b/3party/CMakeLists.txt
@@ -41,9 +41,6 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
@@ -41,9 +41,6 @@
# Add pugixml library.
add_subdirectory(pugixml)
- # Add protobuf library.
- add_subdirectory(protobuf)
-
if (NOT PLATFORM_LINUX)
add_subdirectory(freetype)
add_subdirectory(icu)
@@ -55,6 +52,9 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
@@ -55,6 +52,9 @@
target_include_directories(utf8cpp INTERFACE "${OMIM_ROOT}/3party/utfcpp/source")
endif()
+# Add protobuf library.
+add_subdirectory(protobuf)
+
@ -23,13 +23,13 @@ index dd851d7d..1b4e3ed3 100644
add_subdirectory(bsdiff-courgette)
add_subdirectory(glaze)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ba193a9..dd2df855 100644
index 096d31389e..c6e4aabdeb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -225,25 +225,6 @@ endif()
# Used in qt/ and shaders/
find_package(Python3 REQUIRED COMPONENTS Interpreter)
@@ -212,26 +212,6 @@
message(STATUS "==> Python Virtual Environment detected : ${PYTHON_VENV_PATH}" " ==> " "Using python command: ${Python3_EXECUTABLE}" )
endif()
-execute_process(
- COMMAND ${Python3_EXECUTABLE} -c "import google.protobuf;
-print(google.protobuf.__version__)"
@ -40,15 +40,16 @@ index 3ba193a9..dd2df855 100644
-)
-
-if(PROTOBUF_CHECK EQUAL 0)
- if(PROTOBUF_VERSION VERSION_LESS "4.0.0")
- message(STATUS "Python protobuf ${PROTOBUF_VERSION} found (< 4.0)")
- if(PROTOBUF_VERSION VERSION_LESS "3.20.0" OR PROTOBUF_VERSION VERSION_GREATER_EQUAL "4.0.0")
- message(FATAL_ERROR "Python protobuf ${PROTOBUF_VERSION} found, but version (>=3.20, <4.0) is required")
- else()
- message(FATAL_ERROR "Python protobuf ${PROTOBUF_VERSION} found, but version < 4.0 required")
- message(STATUS "Python protobuf ${PROTOBUF_VERSION} found (>=3.20, <4.0)")
- endif()
-else()
- message(FATAL_ERROR "Python protobuf not found. Install version <4.0")
- message(FATAL_ERROR "Python protobuf not found. Install version (>=3.20, <4.0)")
-endif()
-
-
add_subdirectory(libs)
if (PLATFORM_DESKTOP)

View file

@ -41,7 +41,6 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
panicgh
raitobezarius
];
};
})

View file

@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "croaring";
version = "4.7.1";
version = "4.7.2";
src = fetchFromGitHub {
owner = "RoaringBitmap";
repo = "CRoaring";
tag = "v${finalAttrs.version}";
hash = "sha256-FZP+RTV4pcj9pzDq3G2+sWeJnkh9WnW3Atd0CC9zDCk=";
hash = "sha256-WSEMkXkR6diE5CV3gQ3tUAodLqNsWmBmrGyXOKg4CJA=";
};
# roaring.pc.in cannot handle absolute CMAKE_INSTALL_*DIRs, nor

View file

@ -115,7 +115,6 @@ stdenv.mkDerivation (finalAttrs: {
mainProgram = "cryptsetup";
maintainers = with lib.maintainers; [
numinit
raitobezarius
];
platforms = with lib.platforms; linux;
identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "cryptsetup_project" finalAttrs.version;

View file

@ -0,0 +1,97 @@
From fade8d04bfdbf473f3930feba7183957372e7fa7 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 28 Jun 2026 16:20:43 -0400
Subject: [PATCH] fix tests with zipdetails 4.006
---
tests/comparators/test_zip.py | 3 ++-
tests/data/zip2_zipdetails_expected_diff | 2 +-
tests/data/zip_zipdetails_expected_diff | 10 +++++-----
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/tests/comparators/test_zip.py b/tests/comparators/test_zip.py
index 75ec38be..ecff1930 100644
--- a/tests/comparators/test_zip.py
+++ b/tests/comparators/test_zip.py
@@ -81,7 +81,7 @@ def differences2(zip1, zip3):
@skip_unless_tools_exist("zipinfo", "zipdetails")
-@skip_unless_tool_is_at_least("zipdetails", zipdetails_version, "4.004")
+@skip_unless_tool_is_at_least("zipdetails", zipdetails_version, "4.006")
@skip_unless_tool_is_at_least("perl", io_compress_zip_version, "2.212")
def test_metadata(differences):
assert_diff(differences[0], "zip_zipinfo_expected_diff")
@@ -96,6 +96,7 @@ def test_compressed_files(differences):
@skip_unless_tools_exist("zipinfo", "bsdtar", "zipdetails")
+@skip_unless_tool_is_at_least("zipdetails", zipdetails_version, "4.006")
@skip_unless_tool_is_at_least("perl", io_compress_zip_version, "2.212")
def test_extra_fields(differences2):
assert_diff(differences2[0], "zip_bsdtar_expected_diff")
diff --git a/tests/data/zip2_zipdetails_expected_diff b/tests/data/zip2_zipdetails_expected_diff
index 291dca88..281cf6c5 100644
--- a/tests/data/zip2_zipdetails_expected_diff
+++ b/tests/data/zip2_zipdetails_expected_diff
@@ -5,7 +5,7 @@
#
0064 Extra ID #1 5455 (21589) 'Extended Timestamp [UT]'
0066 Length 0009 (9)
- 0068 Flags 03 (3) 'Modification Access'
+ 0068 Flags 03 (3) 'Modification & Access'
-0069 Modification Time 558AB455 (1435153493) 'Wed Jun 24 13:44:53 2015'
-006D Access Time 558AB45F (1435153503) 'Wed Jun 24 13:45:03 2015'
+0069 Modification Time 41414141 (1094795585) 'Fri Sep 10 05:53:05 2004'
diff --git a/tests/data/zip_zipdetails_expected_diff b/tests/data/zip_zipdetails_expected_diff
index 978c2583..50df2696 100644
--- a/tests/data/zip_zipdetails_expected_diff
+++ b/tests/data/zip_zipdetails_expected_diff
@@ -23,7 +23,7 @@
#
0064 Extra ID #1 5455 (21589) 'Extended Timestamp [UT]'
0066 Length 0009 (9)
- 0068 Flags 03 (3) 'Modification Access'
+ 0068 Flags 03 (3) 'Modification & Access'
-0069 Modification Time 558AB455 (1435153493) 'Wed Jun 24 13:44:53 2015'
+0069 Modification Time 558AB474 (1435153524) 'Wed Jun 24 13:45:24 2015'
006D Access Time 558AB45F (1435153503) 'Wed Jun 24 13:45:03 2015'
@@ -85,7 +85,7 @@
#
-01BF Extra ID #1 5455 (21589) 'Extended Timestamp [UT]'
-01C1 Length 0005 (5)
--01C3 Flags 03 (3) 'Modification Access'
+-01C3 Flags 03 (3) 'Modification & Access'
-01C4 Modification Time 558AB455 (1435153493) 'Wed Jun 24 13:44:53 2015'
-01C8 Extra ID #2 7875 (30837) 'Unix Extra type 3 [ux]'
-01CA Length 000B (11)
@@ -96,7 +96,7 @@
-01D3 GID 000003E8 (1000)
+024E Extra ID #1 5455 (21589) 'Extended Timestamp [UT]'
+0250 Length 0005 (5)
-+0252 Flags 03 (3) 'Modification Access'
++0252 Flags 03 (3) 'Modification & Access'
+0253 Modification Time 558AB455 (1435153493) 'Wed Jun 24 13:44:53 2015'
+0257 Extra ID #2 7875 (30837) 'Unix Extra type 3 [ux]'
+0259 Length 000B (11)
@@ -163,7 +163,7 @@
#
-020D Extra ID #1 5455 (21589) 'Extended Timestamp [UT]'
-020F Length 0005 (5)
--0211 Flags 03 (3) 'Modification Access'
+-0211 Flags 03 (3) 'Modification & Access'
-0212 Modification Time 558AB455 (1435153493) 'Wed Jun 24 13:44:53 2015'
-0216 Extra ID #2 7875 (30837) 'Unix Extra type 3 [ux]'
-0218 Length 000B (11)
@@ -174,7 +174,7 @@
-0221 GID 000003E8 (1000)
+029C Extra ID #1 5455 (21589) 'Extended Timestamp [UT]'
+029E Length 0005 (5)
-+02A0 Flags 03 (3) 'Modification Access'
++02A0 Flags 03 (3) 'Modification & Access'
+02A1 Modification Time 558AB474 (1435153524) 'Wed Jun 24 13:45:24 2015'
+02A5 Extra ID #2 7875 (30837) 'Unix Extra type 3 [ux]'
+02A7 Length 000B (11)
--
2.54.0

View file

@ -121,7 +121,11 @@ python.pkgs.buildPythonApplication rec {
"man"
];
patches = [ ./ignore_links.patch ];
patches = [
./ignore_links.patch
# https://salsa.debian.org/reproducible-builds/diffoscope/-/merge_requests/166
./fix-tests-with-zipdetails-4.006.patch
];
postPatch = ''
# When generating manpage, use the installed version
@ -358,7 +362,6 @@ python.pkgs.buildPythonApplication rec {
maintainers = with lib.maintainers; [
danielfullmer
mdaniels5757
raitobezarius
];
platforms = lib.platforms.unix;
mainProgram = "diffoscope";

View file

@ -0,0 +1,61 @@
diff --git a/package.json b/package.json
index 7e49e7a..ab5c306 100644
--- a/package.json
+++ b/package.json
@@ -166,6 +166,7 @@
]
},
"resolutions": {
+ "yauzl": "^3.3.1",
"@electron-forge/maker-base": "7.8.1",
"@electron-forge/shared-types": "7.8.1"
}
diff --git a/yarn.lock b/yarn.lock
index a4d91bb..8ae6ff9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3653,11 +3653,6 @@ browserslist@^4.21.10:
node-releases "^2.0.18"
update-browserslist-db "^1.1.0"
-buffer-crc32@~0.2.3:
- version "0.2.13"
- resolved "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz"
- integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
-
buffer-from@^1.0.0:
version "1.1.2"
resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"
@@ -5746,13 +5741,6 @@ faye-websocket@^0.11.3:
dependencies:
websocket-driver ">=0.5.1"
-fd-slicer@~1.1.0:
- version "1.1.0"
- resolved "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz"
- integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==
- dependencies:
- pend "~1.2.0"
-
fdir@^6.4.4, fdir@^6.4.6:
version "6.4.6"
resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.4.6.tgz#2b268c0232697063111bbf3f64810a2a741ba281"
@@ -12352,13 +12340,12 @@ yargs@^17.0.1:
y18n "^5.0.5"
yargs-parser "^21.1.1"
-yauzl@^2.10.0:
- version "2.10.0"
- resolved "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz"
- integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==
+yauzl@^2.10.0, yauzl@^3.3.1:
+ version "3.4.0"
+ resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-3.4.0.tgz#88b2a21455f37ca7dccf2eeb33bacb4392322719"
+ integrity sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==
dependencies:
- buffer-crc32 "~0.2.3"
- fd-slicer "~1.1.0"
+ pend "~1.2.0"
yocto-queue@^0.1.0:
version "0.1.0"

View file

@ -25,15 +25,20 @@ let
hash = "sha256-e9PLgkqWBNLBw7uuNpPluOQ6+aGLYQLyTzcLa+LMOzs=";
};
patches = [
./dont-use-initial-releases-json.patch
# zip extraction fails on newer nodejs versions without this fix
./bump-yauzl.patch
];
unwrapped = stdenvNoCC.mkDerivation {
pname = "${pname}-unwrapped";
inherit version src;
patches = [ ./dont-use-initial-releases-json.patch ];
inherit version src patches;
offlineCache = fetchYarnDeps {
inherit src;
hash = "sha256-mB8WG6tX204u6AJ8qLbWrA+pSN3oDihHqj0t3bWcuAI=";
inherit src patches;
hash = "sha256-5yUsjXQ3OHwEGFgMTUJAXAuTdAl4zkb8zxTs5OT6sw4=";
};
nativeBuildInputs = [

View file

@ -51,7 +51,8 @@
dbusSupport ? true,
flashfetchSupport ? false,
terminalSupport ? true,
enlightenmentSupport ? true,
# NOTE: disabled by default until lib dependency closure is minimal
enlightenmentSupport ? false,
gnomeSupport ? true,
imageSupport ? true,
openclSupport ? true,

View file

@ -18,16 +18,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "gelly";
version = "1.6.2";
version = "1.7.0";
src = fetchFromGitHub {
owner = "Fingel";
repo = "gelly";
tag = "v${finalAttrs.version}";
hash = "sha256-yAbItAKzvn2mxNPqg+iuiI5GvFAYXw1721DaVzS0axI=";
hash = "sha256-diezT6zEI7+ljDpzmJeIZDKbmdnsMfaabSuQ1/AvkFE=";
};
cargoHash = "sha256-nKWpawdvBdu57O/Fs+cumrfbYrPUouD3uL0YKWOZY+I=";
cargoHash = "sha256-XYnBMBhv/8wKV+cZ06Ks8gzi/ib1FH1AM1FrWr81ghg=";
nativeBuildInputs = [
pkg-config

View file

@ -51,6 +51,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
description = "Tool for integrating Git with Patchwork, the web-based patch tracking system";
homepage = "https://github.com/getpatchwork/git-pw";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ raitobezarius ];
maintainers = [ ];
};
})

View file

@ -6,16 +6,16 @@
buildGoModule (finalAttrs: {
pname = "gogup";
version = "1.3.0";
version = "1.7.1";
src = fetchFromGitHub {
owner = "nao1215";
repo = "gup";
rev = "v${finalAttrs.version}";
hash = "sha256-h7hozN4ggDqEqu2KlQpBEttT7j8JKW+4J4NyM+ftK2M=";
hash = "sha256-XRwYvXrg6sF15mvRpldru+mNBu1qKzntoLnhx5+CtOk=";
};
vendorHash = "sha256-GbeyuZNpT3wqy52sk0B/9wrab906/E4ds06vQ5tHK7c=";
vendorHash = "sha256-uvyt/JVHX/R44NOZ8Hl0Jwzge9v3bph/Jy9kX4vNReQ=";
doCheck = false;
ldflags = [

View file

@ -9,14 +9,14 @@
}:
buildGoModule (finalAttrs: {
version = "3.7.2";
version = "3.7.3";
pname = "grafana-loki";
src = fetchFromGitHub {
owner = "grafana";
repo = "loki";
rev = "v${finalAttrs.version}";
hash = "sha256-2VM5/SMgjxHraP+7H+AmDor9g4r+xglhqd/cVL7mCgQ=";
hash = "sha256-2dqwnM2+9+P/ZIiz5Z9JPN9WicHLRzq9xn6jG1OBqLs=";
};
vendorHash = null;

View file

@ -4,7 +4,7 @@
stdenv,
fetchFromGitHub,
# Pinned, because our FODs are not guaranteed to be stable between major versions.
pnpm_10_29_2,
pnpm_10,
fetchPnpmDeps,
pnpmConfigHook,
nodejs,
@ -21,7 +21,7 @@
}:
let
pnpm = pnpm_10_29_2;
pnpm = pnpm_10;
legendary = callPackage ./legendary.nix { };
epic-integration = callPackage ./epic-integration.nix { };

View file

@ -70,6 +70,12 @@ stdenv.mkDerivation (finalAttrs: {
export npm_config_nodedir=${nodejs-slim}
npm rebuild --verbose cpu-features
# register-scheme is an optional dependency of discord-rpc that fails to compile on modern macOS/Electron
# and is not required for the application's core functionality.
${lib.optionalString stdenv.hostPlatform.isDarwin ''
rm -rf node_modules/register-scheme
''}
export npm_config_nodedir=${electron.headers}
# Explicitly set identity to null to avoid signing on darwin
yarn --offline run electron-builder --dir \

View file

@ -51,7 +51,6 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.lgpl3;
maintainers = with lib.maintainers; [
panicgh
raitobezarius
];
};
})

View file

@ -51,11 +51,11 @@ in
stdenv.mkDerivation rec {
pname = "libreswan";
version = "5.3";
version = "5.3.1";
src = fetchurl {
url = "https://download.libreswan.org/libreswan-${version}.tar.gz";
hash = "sha256-wdNQw/Mpb9IbnbB5TiPT8xmykviAv4F4uC71xjkcYMA=";
hash = "sha256-4/DlHYtkK/aTpqjMbx5ip2TP9BgKAjvzx+QtQ6Yt/p4=";
};
strictDeps = true;

View file

@ -78,7 +78,6 @@ buildGoModule (finalAttrs: {
homepage = "https://github.com/knadh/listmonk";
changelog = "https://github.com/knadh/listmonk/releases/tag/v${finalAttrs.version}";
maintainers = with lib.maintainers; [
raitobezarius
hougo
];
license = lib.licenses.agpl3Only;

View file

@ -0,0 +1,61 @@
diff --git a/resources/package.json b/resources/package.json
index d42b7fb..6e66826 100644
--- a/resources/package.json
+++ b/resources/package.json
@@ -60,6 +60,7 @@
"electron-forge-maker-appimage": "https://github.com/logseq/electron-forge-maker-appimage.git"
},
"resolutions": {
+ "yauzl": "^3.3.1",
"**/electron": "38.4.0",
"**/node-abi": "4.14.0",
"**/node-gyp": "12.0.0",
diff --git a/static/yarn.lock b/static/yarn.lock
index 4738ef9..413dcd9 100644
--- a/static/yarn.lock
+++ b/static/yarn.lock
@@ -1729,11 +1729,6 @@ browserslist@^4.26.3:
node-releases "^2.0.27"
update-browserslist-db "^1.1.4"
-buffer-crc32@~0.2.3:
- version "0.2.13"
- resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
- integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
-
buffer-equal@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.1.tgz#2f7651be5b1b3f057fcd6e7ee16cf34767077d90"
@@ -2839,13 +2834,6 @@ fastq@^1.17.1, fastq@^1.6.0:
dependencies:
reusify "^1.0.4"
-fd-slicer@~1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
- integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==
- dependencies:
- pend "~1.2.0"
-
fdir@^6.5.0:
version "6.5.0"
resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.5.0.tgz#ed2ab967a331ade62f18d077dae192684d50d350"
@@ -5771,13 +5759,12 @@ yargs@^17.0.1, yargs@^17.6.2:
y18n "^5.0.5"
yargs-parser "^21.1.1"
-yauzl@^2.10.0:
- version "2.10.0"
- resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
- integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==
+yauzl@^2.10.0, yauzl@^3.3.1:
+ version "3.4.0"
+ resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-3.4.0.tgz#88b2a21455f37ca7dccf2eeb33bacb4392322719"
+ integrity sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==
dependencies:
- buffer-crc32 "~0.2.3"
- fd-slicer "~1.1.0"
+ pend "~1.2.0"
yocto-queue@^0.1.0:
version "0.1.0"

View file

@ -62,6 +62,9 @@ stdenv.mkDerivation (finalAttrs: {
# bumps better-sqlite3 to work with electron 39+
# also fixes outdated yarn.lock
./bump-better-sqlite3.patch
# zip extraction fails on newer nodejs versions without this fix
./bump-yauzl.patch
];
mavenRepo = stdenv.mkDerivation {
@ -116,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: {
name = "logseq-${finalAttrs.version}-yarn-deps-static-resources";
inherit (finalAttrs) src patches;
postPatch = "cd ./static";
hash = "sha256-5DBVlCWlUXYvo0bJWQwvSNMW4P9E8kjE9RQe9/ViJM0=";
hash = "sha256-TFisR5GwcKmuddGhe0i6rAmr2wDWzed/mXnxVGARYK0=";
};
yarnOfflineCacheAmplify = fetchYarnDeps {

View file

@ -16,38 +16,38 @@
},
{
"pname": "MailKit",
"version": "4.15.1",
"hash": "sha256-ZI2ASxX1dY53YxWRii0Dow4aojR8VCEWzCWZLrH7wPw="
"version": "4.17.0",
"hash": "sha256-LGruedMrHrI0AXHcXOFxsYP2awwPbrC9Q41AeQk4+9U="
},
{
"pname": "Microsoft.IdentityModel.Abstractions",
"version": "8.17.0",
"hash": "sha256-AU+EMOZArc3rTdsnKYzAufFAtspuYQM3XYi8/VsQAio="
"version": "8.18.0",
"hash": "sha256-mkguJA4aXIVVQvSJ9Duq9mivbGXAIkLQp3a8PKy223A="
},
{
"pname": "Microsoft.IdentityModel.JsonWebTokens",
"version": "8.17.0",
"hash": "sha256-MH7vdhCNAae32p6UTvaDtmyvFDxa/W71qTsEQ6yC9xM="
"version": "8.18.0",
"hash": "sha256-MdqY9CGRs+fTLb3HYYcSfuzqDFo4Dpho4McFWWferjA="
},
{
"pname": "Microsoft.IdentityModel.Logging",
"version": "8.17.0",
"hash": "sha256-IM6jsPMz+l9JA0cye/v2ke51xlfP0u5HtWBqc2aKDYM="
"version": "8.18.0",
"hash": "sha256-09WyYskyL8gjjVDzoZBQAGXgsPmyagWftALSBCdt4gg="
},
{
"pname": "Microsoft.IdentityModel.Tokens",
"version": "8.17.0",
"hash": "sha256-XcA0KXJbqMWt0I5LuHHMRLpgVQ18KcBej1BoySHeA1A="
"version": "8.18.0",
"hash": "sha256-sFhonZW9G6H4ooQ6N/78fkZvADZ2Hf5WAS3FKd/ue1E="
},
{
"pname": "MimeKit",
"version": "4.15.1",
"hash": "sha256-MI4Wr+JWoxR9wsYhKmW8j1EdJ59W/O4jv5D9Zb8mEUw="
"version": "4.17.0",
"hash": "sha256-GpWv+8shoprshuPNB+H+C5saffiKQ6Pek3zhLUGklRo="
},
{
"pname": "Npgsql",
"version": "9.0.4",
"hash": "sha256-YH2QYLe56dH6NNGgSwLIaHefjkKQLh0Sf4vMWoJciyU="
"version": "9.0.5",
"hash": "sha256-5AF0qiVQwfKUqCXSFb+oJhe3Q1wwK9F9+Q9/A4RTIdo="
},
{
"pname": "System.Security.Cryptography.Pkcs",

View file

@ -3,17 +3,18 @@
buildDotnetModule,
dotnetCorePackages,
fetchFromGitHub,
nix-update-script,
}:
buildDotnetModule rec {
pname = "lubelogger";
version = "1.6.4";
version = "1.6.7";
src = fetchFromGitHub {
owner = "hargata";
repo = "lubelog";
rev = "v${version}";
hash = "sha256-w1UxnmuMBPi5Ov+3h7R0I0EIiZShsZm+TgXmfKdc1BU=";
hash = "sha256-goj9xGHZaX6XMYqlvOpabTXTT3/GcuvcRjr6GwVTFA4=";
};
projectFile = "CarCareTracker.sln";
@ -28,6 +29,8 @@ buildDotnetModule rec {
executables = [ "CarCareTracker" ]; # This wraps "$out/lib/$pname/foo" to `$out/bin/foo`.
passthru.updateScript = nix-update-script { };
meta = {
description = "Vehicle service records and maintainence tracker";
longDescription = ''

View file

@ -48,9 +48,7 @@ buildGoModule (finalAttrs: {
homepage = "https://github.com/equinix/metal-cli/";
changelog = "https://github.com/equinix/metal-cli/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
teutat3s
];
maintainers = [ ];
mainProgram = "metal";
};
})

View file

@ -128,7 +128,6 @@ py.pkgs.buildPythonApplication rec {
];
maintainers = with lib.maintainers; [
minijackson
raitobezarius
transcaffeine
];
};

View file

@ -141,7 +141,6 @@ py.pkgs.buildPythonApplication rec {
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
minijackson
raitobezarius
transcaffeine
];
};

View file

@ -1,38 +1,22 @@
{
lib,
stdenvNoCC,
buildNpmPackage,
fetchFromGitHub,
yarnConfigHook,
yarnBuildHook,
yarnInstallHook,
fetchYarnDeps,
nodejs,
nix-update-script,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
buildNpmPackage (finalAttrs: {
pname = "nezha-theme-nazhua";
version = "0.8.0";
version = "1.2.0";
src = fetchFromGitHub {
owner = "hi2shark";
repo = "nazhua";
tag = "v${finalAttrs.version}";
hash = "sha256-kXiFvVSwOXn/MDwQIBmN+1wp8wO4P9hw1zcYcTBHmXA=";
hash = "sha256-lyrkWJDMMMellM8lIaZMvxXJT54gjjP4gnwxMcytrdA=";
};
yarnOfflineCache = fetchYarnDeps {
yarnLock = finalAttrs.src + "/yarn.lock";
hash = "sha256-/CQsG3iQdPyKHdApeMzq4w90NsMBdLXUP2lya8vtK5Q=";
};
nativeBuildInputs = [
yarnConfigHook
yarnBuildHook
yarnInstallHook
# Needed for executing package.json scripts
nodejs
];
npmDepsHash = "sha256-V+fdXp2QevPRYQQ4j5w9OQro6w3qnyi7imhgzGdUiVs=";
# Copied from .github/workflows/release.yml
env = {

View file

@ -53,7 +53,7 @@ buildNpmPackage rec {
homepage = "https://github.com/TritonDataCenter/node-manta";
changelog = "https://github.com/TritonDataCenter/node-manta/blob/v${version}/CHANGES.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ teutat3s ];
maintainers = [ ];
mainProgram = "mls";
};
}

View file

@ -9,13 +9,13 @@
}:
let
pname = "open-webui";
version = "0.9.5";
version = "0.9.6";
src = fetchFromGitHub {
owner = "open-webui";
repo = "open-webui";
tag = "v${version}";
hash = "sha256-RVmFRThK6dNJyqxKepk9WfxzXIwkRoYijZjR1HEhDm8=";
hash = "sha256-0d9GfBQY6YtsUbHeO6NTFPFHV6WE51D4fq+NfsM7J5g=";
};
frontend = buildNpmPackage rec {
@ -30,7 +30,7 @@ let
url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2";
};
npmDepsHash = "sha256-kAUbFAFNo5RHMGqO7sPHSxSEZw9Ky6Pxp/vddDyw90E=";
npmDepsHash = "sha256-NhDsqfP95RAbSarM07OSII8vbPYWScRMxtWt+gRQ/4c=";
npmFlags = [ "--force" ];

View file

@ -37,10 +37,12 @@ buildGoModule (finalAttrs: {
runHook preInstall
install -Dm 644 -t $out/etc/udev/rules.d 99-openlinkhub.rules
install -Dm 755 -t $out/bin $GOPATH/bin/OpenLinkHub
install -Dm 755 -t $out/opt/OpenLinkHub $GOPATH/bin/OpenLinkHub
mkdir -p $out/opt/OpenLinkHub
cp -r {database,static,web} $out/opt/OpenLinkHub
cp -rt $out/opt/OpenLinkHub database static web
mkdir -p $out/bin
ln -st $out/bin $out/opt/OpenLinkHub/OpenLinkHub
runHook postInstall
'';

View file

@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Signing tools for PE-COFF binaries. Compliant with the PE and Authenticode specifications";
homepage = "https://github.com/rhboot/pesign";
license = lib.licenses.gpl2Only;
maintainers = with lib.maintainers; [ raitobezarius ];
maintainers = [ ];
# efivar is currently Linux-only.
platforms = lib.platforms.linux;
};

View file

@ -42,16 +42,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "rapidraw";
version = "1.5.6";
version = "1.5.8";
src = fetchFromGitHub {
owner = "CyberTimon";
repo = "RapidRAW";
tag = "v${finalAttrs.version}";
hash = "sha256-pfOdq2Q7GLGbzcgFkrRiczMWnS5TImbayYE1VWenYuo=";
hash = "sha256-LbAEQwZeFeiKV6lVt8vh+mZpqlJ02RSHs0rZEMeMRc4=";
};
cargoHash = "sha256-liWOY+Jq8Yqo0QsntKjq2ntMAacfFyHCm6yhQM+KwRA=";
cargoHash = "sha256-vx4+5aMxML5Cp1s7HKHSOYS4d4HaAGO2l6jMZuFPUsQ=";
npmDeps = fetchNpmDeps {
inherit (finalAttrs) src;

View file

@ -0,0 +1,131 @@
diff --git a/package-lock.json b/package-lock.json
index cc8b8bd..cb5b207 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2354,6 +2354,7 @@
"version": "0.2.13",
"resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
"integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+ "dev": true,
"engines": {
"node": "*"
}
@@ -5014,14 +5015,6 @@
"node": ">=0.4.0"
}
},
- "node_modules/fd-slicer": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
- "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
- "dependencies": {
- "pend": "~1.2.0"
- }
- },
"node_modules/figures": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/figures/-/figures-5.0.0.tgz",
@@ -9118,7 +9111,8 @@
"node_modules/pend": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
- "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
+ "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
+ "license": "MIT"
},
"node_modules/picomatch": {
"version": "2.3.1",
@@ -12371,12 +12365,15 @@
}
},
"node_modules/yauzl": {
- "version": "2.10.0",
- "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
- "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.4.0.tgz",
+ "integrity": "sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==",
+ "license": "MIT",
"dependencies": {
- "buffer-crc32": "~0.2.3",
- "fd-slicer": "~1.1.0"
+ "pend": "~1.2.0"
+ },
+ "engines": {
+ "node": ">=12"
}
},
"node_modules/yocto-queue": {
@@ -14109,7 +14106,8 @@
"buffer-crc32": {
"version": "0.2.13",
"resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
- "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI="
+ "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+ "dev": true
},
"buildcheck": {
"version": "0.0.6",
@@ -16094,7 +16092,7 @@
"@types/yauzl": "^2.9.1",
"debug": "^4.1.1",
"get-stream": "^5.1.0",
- "yauzl": "^2.10.0"
+ "yauzl": "^3.3.1"
}
},
"fast-deep-equal": {
@@ -16152,14 +16150,6 @@
"websocket-driver": ">=0.5.1"
}
},
- "fd-slicer": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
- "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
- "requires": {
- "pend": "~1.2.0"
- }
- },
"figures": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/figures/-/figures-5.0.0.tgz",
@@ -19260,7 +19250,7 @@
"pend": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
- "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
+ "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="
},
"picomatch": {
"version": "2.3.1",
@@ -21718,12 +21708,11 @@
"integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="
},
"yauzl": {
- "version": "2.10.0",
- "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
- "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.4.0.tgz",
+ "integrity": "sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==",
"requires": {
- "buffer-crc32": "~0.2.3",
- "fd-slicer": "~1.1.0"
+ "pend": "~1.2.0"
}
},
"yocto-queue": {
diff --git a/package.json b/package.json
index 4a9025f..76f4407 100644
--- a/package.json
+++ b/package.json
@@ -48,5 +48,8 @@
"spectron": "^19.0.0",
"temp": "^0.9.4",
"ws": "^8.13.0"
+ },
+ "overrides": {
+ "yauzl": "^3.3.1"
}
}

View file

@ -24,7 +24,7 @@ buildNpmPackage rec {
hash = "sha256-11wlKK0z3/KRKMKNrDvZLvK7vV0UzrMTaG0ei9n6VEk=";
};
npmDepsHash = "sha256-o8pwjx5P/1eFV3HTWlHGV1/ad9YUSOI0zUWvqkqIf3I=";
npmDepsHash = "sha256-6Os6aWkgbA6m4JCp3b6UeZ4NC8N+7pwCWkPBc4xXAHY=";
patches = [
# Fix info in the "about" page, enable asar, add option to build for the detected system
@ -34,6 +34,9 @@ buildNpmPackage rec {
# would not build with nodejs_24 and above without this
./update-nan.patch
# zip extraction fails on newer nodejs versions without this fix
./bump-yauzl.patch
];
postPatch = ''

View file

@ -100,6 +100,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
homepage = "https://github.com/RIPE-NCC/ripe-atlas-tools";
changelog = "https://github.com/RIPE-NCC/ripe-atlas-tools/blob/v${finalAttrs.version}/CHANGES.rst";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ raitobezarius ];
maintainers = [ ];
};
})

View file

@ -0,0 +1,73 @@
diff --git a/src/node/desktop/package-lock.json b/src/node/desktop/package-lock.json
index c78746a..93d15e5 100644
--- a/src/node/desktop/package-lock.json
+++ b/src/node/desktop/package-lock.json
@@ -4372,16 +4372,6 @@
"ieee754": "^1.2.1"
}
},
- "node_modules/buffer-crc32": {
- "version": "0.2.13",
- "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
- "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "*"
- }
- },
"node_modules/buffer-from": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
@@ -6777,16 +6767,6 @@
"node": ">=0.8.0"
}
},
- "node_modules/fd-slicer": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
- "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "pend": "~1.2.0"
- }
- },
"node_modules/fecha": {
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz",
@@ -14054,14 +14034,16 @@
}
},
"node_modules/yauzl": {
- "version": "2.10.0",
- "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
- "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.4.0.tgz",
+ "integrity": "sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==",
"dev": true,
"license": "MIT",
"dependencies": {
- "buffer-crc32": "~0.2.3",
- "fd-slicer": "~1.1.0"
+ "pend": "~1.2.0"
+ },
+ "engines": {
+ "node": ">=12"
}
},
"node_modules/yn": {
diff --git a/src/node/desktop/package.json b/src/node/desktop/package.json
index 613361f..c18514f 100644
--- a/src/node/desktop/package.json
+++ b/src/node/desktop/package.json
@@ -85,5 +85,8 @@
"vue": "3.5.29",
"winston": "3.19.0",
"winston-syslog": "2.7.1"
+ },
+ "overrides": {
+ "yauzl": "^3.3.1"
}
}

View file

@ -204,6 +204,9 @@ stdenv.mkDerivation (finalAttrs: {
# Partly taken from https://github.com/rstudio/rstudio/pull/17470
./electron-41.patch
# zip extraction fails on newer nodejs versions without this fix
./bump-yauzl.patch
# Hack RStudio to only use the input R and provided libclang.
(replaceVars ./r-location.patch {
R = lib.getBin R;
@ -254,7 +257,7 @@ stdenv.mkDerivation (finalAttrs: {
name = "rstudio-${finalAttrs.version}-npm-deps";
inherit (finalAttrs) src patches;
postPatch = "cd ${finalAttrs.npmRoot}";
hash = "sha256-MuTY+vjtbgbk73dm6bsCUmi34z/HCDnB5/RLkZ/rrVo=";
hash = "sha256-rdtnQKaOUp9jfWRA4BuEOyJn8emimiy+Kvxu1939H30=";
};
preConfigure = ''

View file

@ -68,7 +68,6 @@ buildGoModule (finalAttrs: {
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
Pokeylooted
raitobezarius
Scrumplex
];
# go-uefi does not support darwin at the moment:

View file

@ -73,7 +73,6 @@ stdenv.mkDerivation (finalAttrs: {
];
maintainers = with lib.maintainers; [
baloo
raitobezarius
];
};
})

View file

@ -24,7 +24,6 @@ let
maintainers = with lib.maintainers; [
mmahut
prince213
teutat3s
];
platforms = [
"x86_64-darwin"

View file

@ -1,5 +1,6 @@
{
lib,
git,
stdenv,
fetchurl,
makeDesktopItem,
@ -16,13 +17,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "smartgit";
version = "24.1.5";
version = "26.1.038";
src = fetchurl {
url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${
url = "https://download.smartgit.dev/smartgit/smartgit-${
builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version
}.tar.gz";
hash = "sha256-YqueTbwA9KcXEJG5TeWkPzzNyAnnJQ1+VQYsqZKS2/I=";
}-no-git-linux-amd64.tar.gz";
hash = "sha256-XyMdojfyaTS3S3felGRvOOazx1mym/wE3j4GyCU9crc=";
};
nativeBuildInputs = [ wrapGAppsHook3 ];
@ -37,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
gappsWrapperArgs+=( \
--prefix PATH : ${
lib.makeBinPath [
git
jre
which
]
@ -103,11 +105,11 @@ stdenv.mkDerivation (finalAttrs: {
SmartGit is a multi-platform Git GUI client, free to use for active Open Source developers and users from academic institutions.
Command line Git is required.
'';
homepage = "https://www.syntevo.com/smartgit/";
changelog = "https://www.syntevo.com/smartgit/changelog-${lib.versions.majorMinor finalAttrs.version}.txt";
homepage = "https://www.smartgit.dev/";
changelog = "https://www.smartgit.dev/changelogs/changelog-${lib.versions.majorMinor finalAttrs.version}.txt";
license = lib.licenses.unfree;
mainProgram = "smartgit";
platforms = lib.platforms.linux;
platforms = [ "x86_64-linux" ];
maintainers = with lib.maintainers; [
jraygauthier
tmssngr

View file

@ -54,6 +54,6 @@ buildGoModule (finalAttrs: {
homepage = "https://sq.io/";
license = lib.licenses.mit;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ raitobezarius ];
maintainers = [ ];
};
})

View file

@ -0,0 +1,123 @@
diff --git a/package.json b/package.json
index d0f7837..fbdcb92 100644
--- a/package.json
+++ b/package.json
@@ -55,5 +55,10 @@
"update-electron-app": "^3.1.1",
"utf-8-validate": "^6.0.5"
},
+ "pnpm": {
+ "overrides": {
+ "yauzl": "^3.3.1"
+ }
+ },
"packageManager": "pnpm@10.18.1+sha512.77a884a165cbba2d8d1c19e3b4880eee6d2fcabd0d879121e282196b80042351d5eb3ca0935fa599da1dc51265cc68816ad2bddd2a2de5ea9fdf92adbec7cd34"
-}
\ No newline at end of file
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9c7ff44..7e9007d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4,6 +4,9 @@ settings:
autoInstallPeers: true
excludeLinksFromLockfile: false
+overrides:
+ yauzl: ^3.3.1
+
importers:
.:
@@ -1086,9 +1089,6 @@ packages:
resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
engines: {node: '>=8'}
- buffer-crc32@0.2.13:
- resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==}
-
buffer-from@1.1.2:
resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
@@ -1575,9 +1575,6 @@ packages:
fastq@1.19.1:
resolution: {integrity: sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==}
- fd-slicer@1.1.0:
- resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==}
-
figures@2.0.0:
resolution: {integrity: sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==}
engines: {node: '>=4'}
@@ -1722,7 +1719,7 @@ packages:
glob@7.2.3:
resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
- deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
+ deprecated: Glob versions prior to v9 are no longer supported
glob@8.1.0:
resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==}
@@ -2883,7 +2880,7 @@ packages:
tar@6.2.1:
resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==}
engines: {node: '>=10'}
- deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
+ deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exhorbitant rates) by contacting i@izs.me
temp@0.9.4:
resolution: {integrity: sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==}
@@ -3174,8 +3171,9 @@ packages:
resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==}
engines: {node: '>=12'}
- yauzl@2.10.0:
- resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==}
+ yauzl@3.4.0:
+ resolution: {integrity: sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==}
+ engines: {node: '>=12'}
yocto-queue@0.1.0:
resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
@@ -4439,8 +4437,6 @@ snapshots:
dependencies:
fill-range: 7.1.1
- buffer-crc32@0.2.13: {}
-
buffer-from@1.1.2: {}
buffer@5.7.1:
@@ -5110,7 +5106,7 @@ snapshots:
dependencies:
debug: 4.4.3
get-stream: 5.2.0
- yauzl: 2.10.0
+ yauzl: 3.4.0
optionalDependencies:
'@types/yauzl': 2.10.3
transitivePeerDependencies:
@@ -5136,10 +5132,6 @@ snapshots:
dependencies:
reusify: 1.1.0
- fd-slicer@1.1.0:
- dependencies:
- pend: 1.2.0
-
figures@2.0.0:
dependencies:
escape-string-regexp: 1.0.5
@@ -6839,10 +6831,9 @@ snapshots:
y18n: 5.0.8
yargs-parser: 21.1.1
- yauzl@2.10.0:
+ yauzl@3.4.0:
dependencies:
- buffer-crc32: 0.2.13
- fd-slicer: 1.1.0
+ pend: 1.2.0
yocto-queue@0.1.0: {}

View file

@ -30,6 +30,11 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-l4kxlPwohaxserVyNAb3Dp4f5XhnPUKeuRJwrOl9EWc=";
};
patches = [
# zip extraction fails on newer nodejs versions without this fix
./bump-yauzl.patch
];
postPatch = ''
# Disable auto-updates
sed -i '/updateElectronApp([^)]*)/d' src/main.ts
@ -53,10 +58,15 @@ stdenv.mkDerivation (finalAttrs: {
];
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
inherit (finalAttrs)
pname
version
src
patches
;
fetcherVersion = 3;
pnpm = pnpm_10;
hash = "sha256-bIDwEmt/8URBMx7XIQ1EP4SucwMuyGZE1hlQM0rxDnw=";
hash = "sha256-0v+MHYFgnIN4FvzFkv5D3Bqc7538763yCIWu05XR+fA=";
};
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";

View file

@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
description = "Compress and embed static files and assets into Go binaries and access them with a virtual file system in production";
homepage = "https://github.com/knadh/stuffbin";
changelog = "https://github.com/knadh/stuffbin/releases/tag/v${finalAttrs.version}";
maintainers = with lib.maintainers; [ raitobezarius ];
maintainers = [ ];
license = lib.licenses.mit;
};
})

View file

@ -9,16 +9,16 @@
buildGoModule (finalAttrs: {
pname = "talosctl";
version = "1.13.4";
version = "1.13.5";
src = fetchFromGitHub {
owner = "siderolabs";
repo = "talos";
tag = "v${finalAttrs.version}";
hash = "sha256-jcBRAixpdfbzOfCc7BjyDScWPsrW9Mc7A8vGLyN1f68=";
hash = "sha256-woMLG4m7snKD3naTZWYEu78zC/eK5lDxd+uLyXdkzMo=";
};
vendorHash = "sha256-dbuPRXAz+YOxmhEdd1R3R5rOAiNn9TOEeDavL+40MV4=";
vendorHash = "sha256-98jQJ7M/3ki5L6YQAxtk3bBnixfXhLX4WXY7DN4hsQ4=";
ldflags = [
"-s"

View file

@ -5,6 +5,8 @@
versionCheckHook,
installShellFiles,
nix-update-script,
pkg-config,
libgit2,
}:
rustPlatform.buildRustPackage (finalAttrs: {
@ -22,7 +24,18 @@ rustPlatform.buildRustPackage (finalAttrs: {
cargoHash = "sha256-OIOffnCC9PlT/SXPOuTnKx3feZnkHP+jzbQIJWX0tzk=";
nativeBuildInputs = [ installShellFiles ];
nativeBuildInputs = [
installShellFiles
pkg-config
];
buildInputs = [
libgit2
];
env = {
LIBGIT2_NO_VENDOR = 1;
};
postInstall = ''
installManPage \
@ -50,8 +63,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
mainProgram = "teamtype";
teams = [ lib.teams.ngi ];
maintainers = with lib.maintainers; [
prince213
alerque
ethancedwards8
prince213
];
};
})

View file

@ -100,7 +100,6 @@ stdenv.mkDerivation (finalAttrs: {
changelog = "https://github.com/thelounge/thelounge/releases/tag/v${finalAttrs.version}";
maintainers = with lib.maintainers; [
winter
raitobezarius
];
license = lib.licenses.mit;
inherit (nodejs.meta) platforms;

View file

@ -40,7 +40,7 @@ buildNpmPackage rec {
description = "TritonDataCenter Client CLI and Node.js SDK";
homepage = "https://github.com/TritonDataCenter/node-triton";
license = lib.licenses.mpl20;
maintainers = with lib.maintainers; [ teutat3s ];
maintainers = [ ];
mainProgram = "triton";
};
}

View file

@ -61,7 +61,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
meta = {
description = "Unified tool for managing your Upsun services from the command line";
homepage = "https://github.com/platformsh/cli";
homepage = "https://github.com/upsun/cli";
license = lib.licenses.mit;
mainProgram = "upsun";
maintainers = with lib.maintainers; [ spk ];

View file

@ -1,18 +1,18 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl jq
#!nix-shell -i bash -p curl jq nix
#shellcheck shell=bash
set -eu -o pipefail
version=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \
https://api.github.com/repos/platformsh/cli/releases/latest | jq -e -r ".tag_name")
https://api.github.com/repos/upsun/cli/releases/latest | jq -e -r ".tag_name" | sed 's/^v//')
linux_arm64_url=https://github.com/platformsh/cli/releases/download/$version/upsun_${version}_linux_arm64.tar.gz
linux_amd64_url=https://github.com/platformsh/cli/releases/download/$version/upsun_${version}_linux_amd64.tar.gz
darwin_all_url=https://github.com/platformsh/cli/releases/download/$version/upsun_${version}_darwin_all.tar.gz
linux_arm64_hash=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "$linux_arm64_url"))
linux_amd64_hash=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "$linux_amd64_url"))
darwin_all_hash=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "$darwin_all_url"))
linux_arm64_url=https://github.com/upsun/cli/releases/download/v$version/upsun_${version}_linux_arm64.tar.gz
linux_amd64_url=https://github.com/upsun/cli/releases/download/v$version/upsun_${version}_linux_amd64.tar.gz
darwin_all_url=https://github.com/upsun/cli/releases/download/v$version/upsun_${version}_darwin_all.tar.gz
linux_arm64_hash=$(nix store prefetch-file --json "$linux_arm64_url" | jq -r .hash)
linux_amd64_hash=$(nix store prefetch-file --json "$linux_amd64_url" | jq -r .hash)
darwin_all_hash=$(nix store prefetch-file --json "$darwin_all_url" | jq -r .hash)
jq -n \
--arg version "$version" \
--arg darwin_all_hash "$darwin_all_hash" \

View file

@ -1,19 +1,19 @@
{
"version": "5.9.0",
"version": "5.10.7",
"darwin-amd64": {
"hash": "sha256-B1F+01ltzErGujECC1CM8tPRuVMUOIkcKSpypqlRG2M=",
"url": "https://github.com/platformsh/cli/releases/download/5.9.0/upsun_5.9.0_darwin_all.tar.gz"
"hash": "sha256-EczhSmIDcG7K8L+BtOOHRT1cmvsB86IvkSWa3A5bwjk=",
"url": "https://github.com/upsun/cli/releases/download/v5.10.7/upsun_5.10.7_darwin_all.tar.gz"
},
"darwin-arm64": {
"hash": "sha256-B1F+01ltzErGujECC1CM8tPRuVMUOIkcKSpypqlRG2M=",
"url": "https://github.com/platformsh/cli/releases/download/5.9.0/upsun_5.9.0_darwin_all.tar.gz"
"hash": "sha256-EczhSmIDcG7K8L+BtOOHRT1cmvsB86IvkSWa3A5bwjk=",
"url": "https://github.com/upsun/cli/releases/download/v5.10.7/upsun_5.10.7_darwin_all.tar.gz"
},
"linux-amd64": {
"hash": "sha256-J8A4h39dEgMAJHKLwmgWBsj4Al9STIccUAal6JctPyQ=",
"url": "https://github.com/platformsh/cli/releases/download/5.9.0/upsun_5.9.0_linux_amd64.tar.gz"
"hash": "sha256-SF9GkeQlh9jdONO24zQ7LC6419txRXyl+x4q0Gfvntk=",
"url": "https://github.com/upsun/cli/releases/download/v5.10.7/upsun_5.10.7_linux_amd64.tar.gz"
},
"linux-arm64": {
"hash": "sha256-gyVqD4cBYo6L1Y0xMLl06WK4/sKvudFXLiqvEmcrRPE=",
"url": "https://github.com/platformsh/cli/releases/download/5.9.0/upsun_5.9.0_linux_arm64.tar.gz"
"hash": "sha256-F8YfXhTd0fU75InxLgZ02hrLrx3ELDhkRpRvYNrRGu4=",
"url": "https://github.com/upsun/cli/releases/download/v5.10.7/upsun_5.10.7_linux_arm64.tar.gz"
}
}

View file

@ -13,7 +13,7 @@
pipewire,
libpulseaudio,
autoPatchelfHook,
pnpm_10_29_2,
pnpm_10,
fetchPnpmDeps,
pnpmConfigHook,
nodejs,
@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
src
patches
;
pnpm = pnpm_10_29_2;
pnpm = pnpm_10;
fetcherVersion = 3;
hash = "sha256-Ue1K1KmRi4gF7E519deVY7QH+22dqlECMjdA7Z7qDCA=";
};
@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
nodejs
pnpmConfigHook
pnpm_10_29_2
pnpm_10
jq
]
++ lib.optionals stdenv.hostPlatform.isLinux [

View file

@ -3,7 +3,7 @@
fetchFromGitHub,
stdenv,
nodejs_24,
pnpm_10_29_2,
pnpm_10,
fetchPnpmDeps,
pnpmConfigHook,
buildGoModule,
@ -35,7 +35,7 @@ let
src
sourceRoot
;
pnpm = pnpm_10_29_2;
pnpm = pnpm_10;
fetcherVersion = 3;
hash = "sha256-cDGeIrCxZtcomu3YxikutjXpVe3EeUZ/L3+3y9yx67s=";
};
@ -44,7 +44,7 @@ let
nodejs_24
dart-sass
pnpmConfigHook
pnpm_10_29_2
pnpm_10
];
doCheck = true;

View file

@ -13,20 +13,20 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "wasmtime";
version = "45.0.0";
version = "45.0.2";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = "wasmtime";
tag = "v${finalAttrs.version}";
hash = "sha256-oCIMfBGhWZiaNNfH7Pc9DCpbEXs8AU3w8tIE6o/vjLk=";
hash = "sha256-LEQitwz+UDSX4mrjEecmoO/ZPgRnYTZ3DsD1pu8Jybs=";
fetchSubmodules = true;
};
# Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
auditable = false;
cargoHash = "sha256-yAPs2o2ayxxh3jk5+T8DiP9uFjBGyPTLzgP/RXPSj2g=";
cargoHash = "sha256-uTgEW2w0RSMetd2W1ucGiVMEEvz2A7CQ79SEsE8/+BM=";
cargoBuildFlags = [
"--package"
"wasmtime-cli"

View file

@ -10,11 +10,11 @@
}:
stdenv.mkDerivation rec {
pname = "worldpainter";
version = "2.26.2";
version = "2.27.0";
src = fetchurl {
url = "https://www.worldpainter.net/files/worldpainter_${version}.tar.gz";
hash = "sha256-vYsIDzzt6VeeXXDDHDduH8jb/sGgviqVRMilk5dl0tU=";
hash = "sha256-UY2KB6IUlv35wEG9PNU5gWvV5L6KsEiUvJEpqWXSBSA=";
};
nativeBuildInputs = [

View file

@ -1,192 +1,71 @@
{
lib,
stdenv,
fetchFromGitHub,
flutter341,
keybinder3,
nodejs,
pnpm_9,
fetchPnpmDeps,
pnpmConfigHook,
python3Packages,
writableTmpDirAsHomeHook,
callPackage,
buildGoModule,
pkg-config,
replaceVars,
# build-time
autoPatchelfHook,
libxtst,
copyDesktopItems,
desktop-file-utils,
makeDesktopItem,
pkg-config,
xdg-utils,
# run-time
gtk3,
libayatana-appindicator,
libx11,
libxkbcommon,
xorgproto,
libayatana-appindicator,
gtk3,
desktop-file-utils,
xdg-utils,
copyDesktopItems,
makeDesktopItem,
libxtst,
nodejs,
}:
let
version = "2.0.2";
buildGoModule (finalAttrs: {
pname = "wox";
version = "2.2.0";
src = fetchFromGitHub {
owner = "Wox-launcher";
repo = "Wox";
tag = "v${version}";
hash = "sha256-Qav2RhmhJQr2D1D3okshIrnnQuOh7V1gWbZwXR3LBAc=";
tag = "v${finalAttrs.version}";
hash = "sha256-FbOnENSko/BYtTI7z2Ep+IIYufgZpNWcz6d0mqhTL5g=";
};
metaCommon = {
description = "Cross-platform launcher that simply works";
homepage = "https://github.com/Wox-launcher/Wox";
license = with lib.licenses; [ gpl3Plus ];
maintainers = [ ];
};
ui-flutter = flutter341.buildFlutterApplication {
pname = "wox-ui-flutter";
inherit version src;
sourceRoot = "${src.name}/wox.ui.flutter/wox";
pubspecLock = lib.importJSON ./pubspec.lock.json;
postPatch = ''
substituteInPlace linux/runner/my_application.cc \
--replace-fail "X11/Xkeysym.h" "X11/keysym.h"
'';
nativeBuildInputs = [ autoPatchelfHook ];
buildInputs = [
keybinder3
xorgproto
libx11
libxtst
];
meta = metaCommon // {
mainProgram = "wox";
platforms = lib.platforms.linux;
};
};
plugin-host-nodejs = stdenv.mkDerivation (finalAttrs: {
pname = "wox-plugin-host-nodejs";
inherit version src;
sourceRoot = "${finalAttrs.src.name}/wox.plugin.host.nodejs";
nativeBuildInputs = [
nodejs
pnpmConfigHook
pnpm_9
];
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs)
pname
version
src
sourceRoot
;
pnpm = pnpm_9;
fetcherVersion = 3;
hash = "sha256-cbuVQV8ih8rztERFLUHGnK63MBz8+QVmzeegYLDwcj4=";
};
buildPhase = ''
runHook preBuild
pnpm run build
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -Dm644 dist/index.js $out/node-host.js
runHook postInstall
'';
meta = metaCommon;
});
plugin-python = python3Packages.buildPythonApplication {
pname = "wox-plugin";
inherit version src;
pyproject = true;
sourceRoot = "${src.name}/wox.plugin.python";
build-system = with python3Packages; [ hatchling ];
meta = metaCommon;
};
plugin-host-python = python3Packages.buildPythonApplication {
pname = "wox-plugin-host-python";
inherit version src;
pyproject = true;
sourceRoot = "${src.name}/wox.plugin.host.python";
build-system = with python3Packages; [ hatchling ];
nativeBuildInputs = [ writableTmpDirAsHomeHook ];
buildInputs = with python3Packages; [
loguru
websockets
plugin-python
];
dependencies = with python3Packages; [
loguru
websockets
plugin-python
];
meta = metaCommon // {
mainProgram = "run";
};
};
in
buildGoModule {
pname = "wox";
inherit version src;
sourceRoot = "${src.name}/wox.core";
postPatch = ''
substituteInPlace plugin/host/host_python.go \
--replace-fail 'n.findPythonPath(ctx), path.Join(util.GetLocation().GetHostDirectory(), "python-host.pyz")' '"env", "${plugin-host-python}/bin/run"'
substituteInPlace plugin/host/host_nodejs.go \
--replace-fail "/usr/bin/node" "${lib.getExe nodejs}"
substituteInPlace util/deeplink.go \
--replace-fail "update-desktop-database" "${desktop-file-utils}/bin/update-desktop-database" \
--replace-fail "xdg-mime" "${xdg-utils}/bin/xdg-mime" \
--replace-fail "Exec=%s" "Exec=wox"
sed -i '/^ "path"$/d' plugin/host/host_python.go
'';
vendorHash = "sha256-IDcIEZVCJp1ls5c2fblgX+I+MhfRDXqFbf0GhgcFiTo=";
sourceRoot = "${finalAttrs.src.name}/wox.core";
patches = [
(replaceVars ./plugin-host-python.patch {
plugin-host-python = "${finalAttrs.passthru.plugin-host-python}/bin/run";
})
(replaceVars ./plugin-host-nodejs.patch {
nodejs-path = "${lib.getExe nodejs}";
plugin-host-nodejs = "${finalAttrs.passthru.plugin-host-python}/node-host.js";
})
];
postPatch = ''
substituteInPlace util/deeplink.go \
--replace-fail "update-desktop-database" "${desktop-file-utils}/bin/update-desktop-database" \
--replace-fail "xdg-mime" "${xdg-utils}/bin/xdg-mime"
'';
proxyVendor = true;
nativeBuildInputs = [
pkg-config
autoPatchelfHook
copyDesktopItems
pkg-config
];
buildInputs = [
libx11
libxtst
libxkbcommon
libayatana-appindicator
gtk3
libayatana-appindicator
libx11
libxkbcommon
libxtst
];
env.CGO_ENABLED = 1;
@ -199,8 +78,8 @@ buildGoModule {
preBuild = ''
mkdir -p resource/ui/flutter resource/hosts
cp -r ${ui-flutter}/app/${ui-flutter.pname} resource/ui/flutter/wox
cp ${plugin-host-nodejs}/node-host.js resource/hosts/node-host.js
cp -r ${finalAttrs.passthru.ui-flutter}/app/${finalAttrs.passthru.ui-flutter.pname} resource/ui/flutter/wox
cp ${finalAttrs.passthru.plugin-host-nodejs}/node-host.js resource/hosts/node-host.js
'';
# XOpenDisplay failure!
@ -220,8 +99,19 @@ buildGoModule {
install -Dm644 ../assets/app.png $out/share/icons/wox.png
'';
meta = metaCommon // {
passthru = {
plugin-host-nodejs = callPackage ./plugin-host-nodejs.nix { };
plugin-host-python = callPackage ./plugin-host-python.nix { };
ui-flutter = callPackage ./ui-flutter.nix { };
};
meta = {
description = "Cross-platform launcher that simply works";
homepage = "https://github.com/Wox-launcher/Wox";
changelog = "https://github.com/Wox-launcher/Wox/blob/${finalAttrs.src.rev}/CHANGELOG.md";
mainProgram = "wox";
platforms = lib.platforms.linux;
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ eljamm ];
};
}
})

View file

@ -0,0 +1,61 @@
{
lib,
stdenv,
wox,
fetchPnpmDeps,
nodejs,
pnpmConfigHook,
pnpm_11,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "wox-plugin-host-nodejs";
inherit (wox)
version
src
;
sourceRoot = "${finalAttrs.src.name}/wox.plugin.host.nodejs";
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs)
pname
version
src
sourceRoot
;
pnpm = pnpm_11;
fetcherVersion = 4;
hash = "sha256-6zQDbNUxysqwrRaEMp8Sb5Vcf2HdkkdrdCpJwG8pHSs=";
};
nativeBuildInputs = [
nodejs
pnpmConfigHook
pnpm_11
];
buildPhase = ''
runHook preBuild
pnpm run build
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -Dm644 dist/index.js $out/node-host.js
runHook postInstall
'';
meta = {
inherit (wox.meta)
description
homepage
license
maintainers
;
};
})

View file

@ -0,0 +1,51 @@
---
plugin/host/host_nodejs.go | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/plugin/host/host_nodejs.go b/plugin/host/host_nodejs.go
index c7554883..b81f693f 100644
--- a/plugin/host/host_nodejs.go
+++ b/plugin/host/host_nodejs.go
@@ -6,7 +6,6 @@ import (
"fmt"
"os"
"os/exec"
- "path"
"path/filepath"
"runtime"
"strings"
@@ -39,12 +38,7 @@ func (n *NodejsHost) GetRuntime(ctx context.Context) plugin.Runtime {
}
func (n *NodejsHost) Start(ctx context.Context) error {
- nodePath, nodeErr := n.resolveNodejsPath(ctx)
- if nodeErr != nil {
- return nodeErr
- }
-
- return n.websocketHost.StartHost(ctx, nodePath, path.Join(util.GetLocation().GetHostDirectory(), "node-host.js"), nil)
+ return n.websocketHost.StartHost(ctx, "env", "@plugin-host-nodejs@", nil)
}
// FindNodejsPath finds the best available Node.js interpreter path
@@ -276,7 +270,7 @@ func collectNodejsPathsForDarwin() []string {
paths := []string{
"/opt/homebrew/bin/node",
"/usr/local/bin/node",
- "/usr/bin/node",
+ "@nodejs-path@",
"/usr/local/node",
}
paths = append(paths, collectNodejsPathsFromNvmUnix()...)
@@ -287,7 +281,7 @@ func collectNodejsPathsForDarwin() []string {
func collectNodejsPathsForLinux() []string {
paths := []string{
"/usr/local/bin/node",
- "/usr/bin/node",
+ "@nodejs-path@",
"/usr/local/node",
}
paths = append(paths, collectNodejsPathsFromNvmUnix()...)
--
2.54.0

View file

@ -0,0 +1,46 @@
{
python3Packages,
callPackage,
wox,
writableTmpDirAsHomeHook,
}:
python3Packages.buildPythonApplication (finalAttrs: {
pname = "wox-plugin-host-python";
inherit (wox) version src;
pyproject = true;
sourceRoot = "${finalAttrs.src.name}/wox.plugin.host.python";
build-system = with python3Packages; [
hatchling
];
nativeBuildInputs = [
writableTmpDirAsHomeHook
];
buildInputs = with python3Packages; [
loguru
websockets
finalAttrs.passthru.plugin-python
];
dependencies = with python3Packages; [
loguru
websockets
finalAttrs.passthru.plugin-python
];
passthru = {
plugin-python = callPackage ./plugin-python.nix { };
};
meta = {
inherit (wox.meta)
description
homepage
license
maintainers
;
};
})

View file

@ -0,0 +1,33 @@
---
plugin/host/host_python.go | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/plugin/host/host_python.go b/plugin/host/host_python.go
index 40e0195e..91a09501 100644
--- a/plugin/host/host_python.go
+++ b/plugin/host/host_python.go
@@ -6,7 +6,6 @@ import (
"fmt"
"os"
"os/exec"
- "path"
"path/filepath"
"runtime"
"strings"
@@ -39,12 +38,7 @@ func (n *PythonHost) GetRuntime(ctx context.Context) plugin.Runtime {
}
func (n *PythonHost) Start(ctx context.Context) error {
- pythonPath, pythonErr := n.resolvePythonPath(ctx)
- if pythonErr != nil {
- return pythonErr
- }
-
- return n.websocketHost.StartHost(ctx, pythonPath, path.Join(util.GetLocation().GetHostDirectory(), "python-host.pyz"), []string{"SHIV_ROOT=" + util.GetLocation().GetCacheDirectory()})
+ return n.websocketHost.StartHost(ctx, "env", "@plugin-host-python@", []string{"SHIV_ROOT=" + util.GetLocation().GetCacheDirectory()})
}
// FindPythonPath finds the best available Python interpreter path
--
2.54.0

View file

@ -0,0 +1,27 @@
{
python3Packages,
wox,
}:
python3Packages.buildPythonApplication (finalAttrs: {
pname = "wox-plugin";
inherit (wox)
version
src
;
pyproject = true;
sourceRoot = "${finalAttrs.src.name}/wox.plugin.python";
build-system = with python3Packages; [
hatchling
];
meta = {
inherit (wox.meta)
description
homepage
license
maintainers
;
};
})

View file

@ -1,7 +1,7 @@
{
"packages": {
"archive": {
"dependency": "transitive",
"dependency": "direct main",
"description": {
"name": "archive",
"sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd",
@ -54,11 +54,11 @@
"dependency": "transitive",
"description": {
"name": "characters",
"sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803",
"sha256": "faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.4.0"
"version": "1.4.1"
},
"charcode": {
"dependency": "transitive",
@ -100,16 +100,6 @@
"source": "hosted",
"version": "1.19.1"
},
"convert": {
"dependency": "transitive",
"description": {
"name": "convert",
"sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.1.2"
},
"cross_file": {
"dependency": "transitive",
"description": {
@ -150,26 +140,6 @@
"source": "hosted",
"version": "0.7.0"
},
"device_info_plus": {
"dependency": "transitive",
"description": {
"name": "device_info_plus",
"sha256": "72d146c6d7098689ff5c5f66bcf593ac11efc530095385356e131070333e64da",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "11.3.0"
},
"device_info_plus_platform_interface": {
"dependency": "transitive",
"description": {
"name": "device_info_plus_platform_interface",
"sha256": "e1ea89119e34903dca74b883d0dd78eb762814f97fb6c76f35e9ff74d261a18f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "7.0.3"
},
"dio": {
"dependency": "direct main",
"description": {
@ -213,11 +183,12 @@
"extended_text_field": {
"dependency": "direct main",
"description": {
"name": "extended_text_field",
"sha256": "3996195c117c6beb734026a7bc0ba80d7e4e84e4edd4728caa544d8209ab4d7d",
"url": "https://pub.dev"
"path": ".",
"ref": "b9b2c8faff334c794ce70e5b6a30bda43e407009",
"resolved-ref": "b9b2c8faff334c794ce70e5b6a30bda43e407009",
"url": "https://github.com/qianlifeng/extended_text_field.git"
},
"source": "hosted",
"source": "git",
"version": "16.0.2"
},
"extended_text_library": {
@ -286,16 +257,6 @@
"source": "sdk",
"version": "0.0.0"
},
"flutter_acrylic": {
"dependency": "direct main",
"description": {
"name": "flutter_acrylic",
"sha256": "b3996dbde5abf5823cc9ead4cf2e5267c3181f15585fe47ce4dc4472e7ec827a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.4"
},
"flutter_code_editor": {
"dependency": "direct main",
"description": {
@ -414,11 +375,11 @@
"dependency": "direct main",
"description": {
"name": "gpt_markdown",
"sha256": "9b88dfaffea644070b648c204ca4a55745a49f4ad0b58ed0ab70913ad593c7a1",
"sha256": "c14c2a4599a67df5b6a984808cbb7631b8d15c91984ffdd7998597b93a6ff136",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.5"
"version": "1.1.7"
},
"highlight": {
"dependency": "direct main",
@ -440,56 +401,6 @@
"source": "hosted",
"version": "2.2.3"
},
"hotkey_manager": {
"dependency": "direct main",
"description": {
"name": "hotkey_manager",
"sha256": "06f0655b76c8dd322fb7101dc615afbdbf39c3d3414df9e059c33892104479cd",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.2.3"
},
"hotkey_manager_linux": {
"dependency": "transitive",
"description": {
"name": "hotkey_manager_linux",
"sha256": "83676bda8210a3377bc6f1977f193bc1dbdd4c46f1bdd02875f44b6eff9a8473",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.2.0"
},
"hotkey_manager_macos": {
"dependency": "transitive",
"description": {
"name": "hotkey_manager_macos",
"sha256": "03b5967e64357b9ac05188ea4a5df6fe4ed4205762cb80aaccf8916ee1713c96",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.2.0"
},
"hotkey_manager_platform_interface": {
"dependency": "transitive",
"description": {
"name": "hotkey_manager_platform_interface",
"sha256": "98ffca25b8cc9081552902747b2942e3bc37855389a4218c9d50ca316b653b13",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.2.0"
},
"hotkey_manager_windows": {
"dependency": "transitive",
"description": {
"name": "hotkey_manager_windows",
"sha256": "0d03ced9fe563ed0b68f0a0e1b22c9ffe26eb8053cb960e401f68a4f070e0117",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.2.0"
},
"http": {
"dependency": "transitive",
"description": {
@ -516,26 +427,6 @@
"source": "sdk",
"version": "0.0.0"
},
"intl": {
"dependency": "transitive",
"description": {
"name": "intl",
"sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.20.2"
},
"json_annotation": {
"dependency": "transitive",
"description": {
"name": "json_annotation",
"sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.9.0"
},
"leak_tracker": {
"dependency": "transitive",
"description": {
@ -616,35 +507,25 @@
"source": "hosted",
"version": "2.0.3"
},
"macos_window_utils": {
"dependency": "transitive",
"description": {
"name": "macos_window_utils",
"sha256": "d4df3501fd32ac0d2d7590cb6a8e4758337d061c8fa0db816fdd636be63a8438",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.9.0"
},
"matcher": {
"dependency": "transitive",
"description": {
"name": "matcher",
"sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
"sha256": "dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.12.17"
"version": "0.12.19"
},
"material_color_utilities": {
"dependency": "transitive",
"description": {
"name": "material_color_utilities",
"sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec",
"sha256": "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.11.1"
"version": "0.13.0"
},
"math_expressions": {
"dependency": "direct main",
@ -660,11 +541,11 @@
"dependency": "transitive",
"description": {
"name": "meta",
"sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
"sha256": "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.16.0"
"version": "1.18.0"
},
"mime": {
"dependency": "transitive",
@ -962,96 +843,6 @@
"source": "hosted",
"version": "0.3.1"
},
"syncfusion_flutter_core": {
"dependency": "transitive",
"description": {
"name": "syncfusion_flutter_core",
"sha256": "e1fdfcc3ed7e1f040ba95838780b2eb1857e3e5eccb817fbe94ea2b09c35eac4",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "31.2.18"
},
"syncfusion_flutter_pdf": {
"dependency": "transitive",
"description": {
"name": "syncfusion_flutter_pdf",
"sha256": "4077abff3d3dcae757317c0a85cb607b98cc6ea8f3b47c7d8488d4144ef01a9f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "31.2.18"
},
"syncfusion_flutter_pdfviewer": {
"dependency": "direct main",
"description": {
"name": "syncfusion_flutter_pdfviewer",
"sha256": "4bb3cdff34fe937430fdd0b5d6488f6a68efa8cfe08c73cc4b19d2a879dde057",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "31.1.21"
},
"syncfusion_flutter_signaturepad": {
"dependency": "transitive",
"description": {
"name": "syncfusion_flutter_signaturepad",
"sha256": "56c35321879b900f59a91e0758af7ca66973447bfdaeb643fe1da0084cbc5b22",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "31.2.18"
},
"syncfusion_pdfviewer_linux": {
"dependency": "transitive",
"description": {
"name": "syncfusion_pdfviewer_linux",
"sha256": "bae7feb109b38ecf9f8be99bd032503adf98e56da048307a17af8515d0f9d2ed",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "31.2.18"
},
"syncfusion_pdfviewer_macos": {
"dependency": "transitive",
"description": {
"name": "syncfusion_pdfviewer_macos",
"sha256": "5c02ead2a430cd3f203639ede38ce2e06fb6c8aab6791b0d15c01436f882f482",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "31.2.18"
},
"syncfusion_pdfviewer_platform_interface": {
"dependency": "transitive",
"description": {
"name": "syncfusion_pdfviewer_platform_interface",
"sha256": "65641e064385ac65253930ec96a6edc2eea781c9e15bf3d5fa15e459037817e7",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "31.2.18"
},
"syncfusion_pdfviewer_web": {
"dependency": "transitive",
"description": {
"name": "syncfusion_pdfviewer_web",
"sha256": "c55201d9eda49f543b9ad21f539b0f5fbe45ca1a3b30081ee471eb4dff7132f4",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "31.2.18"
},
"syncfusion_pdfviewer_windows": {
"dependency": "transitive",
"description": {
"name": "syncfusion_pdfviewer_windows",
"sha256": "1b706e58a95c794687d037e055cf0580370ceee27a59a8cd4e14368534161af8",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "31.2.18"
},
"term_glyph": {
"dependency": "transitive",
"description": {
@ -1066,11 +857,11 @@
"dependency": "transitive",
"description": {
"name": "test_api",
"sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00",
"sha256": "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.7.6"
"version": "0.7.11"
},
"tuple": {
"dependency": "transitive",
@ -1092,16 +883,6 @@
"source": "hosted",
"version": "1.4.0"
},
"uni_platform": {
"dependency": "transitive",
"description": {
"name": "uni_platform",
"sha256": "e02213a7ee5352212412ca026afd41d269eb00d982faa552f419ffc2debfad84",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.1.3"
},
"universal_platform": {
"dependency": "transitive",
"description": {
@ -1312,6 +1093,17 @@
"source": "hosted",
"version": "1.1.5"
},
"windows_gpu_recovery": {
"dependency": "direct main",
"description": {
"path": ".",
"ref": "master",
"resolved-ref": "5d4f3101af0c1a28b80500703c0fd95844545a1e",
"url": "https://github.com/DitriXNew/windows_gpu_recovery.git"
},
"source": "git",
"version": "0.1.0"
},
"xdg_directories": {
"dependency": "transitive",
"description": {
@ -1334,7 +1126,7 @@
}
},
"sdks": {
"dart": ">=3.9.0 <4.0.0",
"flutter": ">=3.35.1"
"dart": ">=3.10.0-0 <4.0.0",
"flutter": ">=3.35.0"
}
}

View file

@ -0,0 +1,46 @@
{
lib,
flutter341,
wox,
autoPatchelfHook,
keybinder3,
xorgproto,
libx11,
libxtst,
}:
flutter341.buildFlutterApplication (finalAttrs: {
pname = "wox-ui-flutter";
inherit (wox)
version
src
;
sourceRoot = "${finalAttrs.src.name}/wox.ui.flutter/wox";
pubspecLock = lib.importJSON ./pubspec.lock.json;
gitHashes.extended_text_field = "sha256-GOvaWGklfmJKRWYbVTvpZfKj9QMxxlaqrJkfDKR2T0o=";
gitHashes.windows_gpu_recovery = "sha256-+LQV2wgbQ0ADM2KeRfgbvCHPODBBsq5XrPulXl6GWG8=";
nativeBuildInputs = [
autoPatchelfHook
];
buildInputs = [
keybinder3
xorgproto
libx11
libxtst
];
meta = {
inherit (wox.meta)
description
homepage
mainProgram
platforms
license
maintainers
;
};
})

View file

@ -0,0 +1,51 @@
diff --git a/yarn.lock b/yarn.lock
index baa6475..4ff4481 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2952,13 +2952,6 @@ __metadata:
languageName: node
linkType: hard
-"buffer-crc32@npm:~0.2.3":
- version: 0.2.13
- resolution: "buffer-crc32@npm:0.2.13"
- checksum: 10c0/cb0a8ddf5cf4f766466db63279e47761eb825693eeba6a5a95ee4ec8cb8f81ede70aa7f9d8aeec083e781d47154290eb5d4d26b3f7a465ec57fb9e7d59c47150
- languageName: node
- linkType: hard
-
"buffer-from@npm:^1.0.0":
version: 1.1.2
resolution: "buffer-from@npm:1.1.2"
@@ -4750,15 +4743,6 @@ __metadata:
languageName: node
linkType: hard
-"fd-slicer@npm:~1.1.0":
- version: 1.1.0
- resolution: "fd-slicer@npm:1.1.0"
- dependencies:
- pend: "npm:~1.2.0"
- checksum: 10c0/304dd70270298e3ffe3bcc05e6f7ade2511acc278bc52d025f8918b48b6aa3b77f10361bddfadfe2a28163f7af7adbdce96f4d22c31b2f648ba2901f0c5fc20e
- languageName: node
- linkType: hard
-
"fdir@npm:^6.4.4":
version: 6.4.5
resolution: "fdir@npm:6.4.5"
@@ -9915,12 +9899,11 @@ __metadata:
linkType: hard
"yauzl@npm:^2.10.0":
- version: 2.10.0
- resolution: "yauzl@npm:2.10.0"
+ version: 3.4.0
+ resolution: "yauzl@npm:3.4.0"
dependencies:
- buffer-crc32: "npm:~0.2.3"
- fd-slicer: "npm:~1.1.0"
- checksum: 10c0/f265002af7541b9ec3589a27f5fb8f11cf348b53cc15e2751272e3c062cd73f3e715bc72d43257de71bbaecae446c3f1b14af7559e8ab0261625375541816422
+ pend: "npm:~1.2.0"
+ checksum: 10c0/17a98c42c0065e8af429eb8a61f7a0e4562181ed54080366b838f34f741b6829f167f804787c86b7646bb042707f35871739f053de0548285e405a2eae4da025
languageName: node
linkType: hard

View file

@ -47,6 +47,10 @@ stdenv.mkDerivation (finalAttrs: {
# Remove after upstream updates to Yarn 4.14
# https://github.com/ytmdesktop/ytmdesktop/blob/v2.0.11/package.json#L77
./yarn-4.14-support.patch
# zip extraction fails on newer nodejs versions without this fix
# generated by running `yarn set resolution yauzl@npm:^2.10.0 npm:^3.3.1`
./bump-yauzl.patch
];
postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
@ -61,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
yarnOfflineCache = yarn-berry.fetchYarnBerryDeps {
inherit (finalAttrs) src missingHashes patches;
hash = "sha256-Vvvhi1db/ld2rNz+XhtNzlgI/4z3ym6QENG0GMlZAd0=";
hash = "sha256-VpNK+44/FwHxZ+Hyx0QShpZ9fdP06VhhpoXxMFeLUzE=";
};
nativeBuildInputs = [

View file

@ -4,39 +4,40 @@
fetchFromGitHub,
fetchPnpmDeps,
nodejs,
pnpm_10_29_2,
pnpm_11,
pnpmConfigHook,
python3,
electron_39,
electron_42,
makeDesktopItem,
makeBinaryWrapper,
copyDesktopItems,
}:
let
electron = electron_39;
electron = electron_42;
pnpm = pnpm_11;
in
stdenv.mkDerivation (finalAttrs: {
pname = "zulip";
version = "5.12.3";
version = "5.12.4";
src = fetchFromGitHub {
owner = "zulip";
repo = "zulip-desktop";
tag = "v${finalAttrs.version}";
hash = "sha256-jRco2eyQrWf5jGvdWYn4mt8FD/xu1+FftQoB3wuF2Lw=";
hash = "sha256-0TQKQfjfA1Nn/xvtHF0t6i+whLkyu1kVwuZ62Z0AZgk=";
};
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
pnpm = pnpm_10_29_2;
fetcherVersion = 3;
hash = "sha256-s/KllzT46L2o4SWS3z3Z7FDQD6FEEEAnPdM6tsfGRUo=";
inherit pnpm;
fetcherVersion = 4;
hash = "sha256-D9Ge0Ao1fnVA1hk+K1ScZ3iCnl1+iqUtZSG5ACO2H2M=";
};
nativeBuildInputs = [
nodejs
pnpm_10_29_2
pnpm
pnpmConfigHook
makeBinaryWrapper
copyDesktopItems
@ -46,8 +47,9 @@ stdenv.mkDerivation (finalAttrs: {
buildPhase = ''
runHook preBuild
npm_config_nodedir=${electron.headers} \
node --run pack -- \
pnpm exec electron-vite build
npm_package_config_node_gyp_nodedir=${electron.headers} \
pnpm exec electron-builder --dir \
-c.electronDist=${electron.dist} \
-c.electronVersion=${electron.version}

View file

@ -209,7 +209,6 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [
qknight
raitobezarius
willcohen
];
license = lib.licenses.ncsa;

View file

@ -33,6 +33,6 @@ buildPythonPackage rec {
mainProgram = "amarna";
homepage = "https://github.com/crytic/amarna";
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ raitobezarius ];
maintainers = [ ];
};
}

View file

@ -47,6 +47,6 @@ buildPythonPackage rec {
homepage = "https://github.com/bergercookie/bubop";
changelog = "https://github.com/bergercookie/bubop/blob/${src.tag}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ raitobezarius ];
maintainers = [ ];
};
}

View file

@ -42,6 +42,6 @@ buildPythonPackage {
description = "Online Change-Point Detection library based on ChangeFinder algorithm";
homepage = "https://github.com/shunsukeaihara/changefinder";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ raitobezarius ];
maintainers = [ ];
};
}

View file

@ -42,6 +42,6 @@ buildPythonPackage rec {
homepage = "https://github.com/PaulGilmartin/django-pgpubsub";
changelog = "https://github.com/PaulGilmartin/django-pgpubsub/blob/${src.rev}/CHANGELOG.md";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ raitobezarius ];
maintainers = [ ];
};
}

View file

@ -34,7 +34,6 @@ buildPythonPackage rec {
changelog = "https://github.com/Opus10/django-pgtrigger/blob/${src.tag}/CHANGELOG.md";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [
raitobezarius
pyrox0
];
};

View file

@ -38,6 +38,6 @@ buildPythonPackage rec {
homepage = "https://github.com/bergercookie/item_synchronizer";
changelog = "https://github.com/bergercookie/item_synchronizer/blob/${src.rev}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ raitobezarius ];
maintainers = [ ];
};
}

View file

@ -8,12 +8,12 @@
}:
buildPythonPackage rec {
pname = "jsonpath-python";
version = "1.1.5";
version = "1.1.6";
pyproject = true;
src = fetchPypi {
inherit version;
pname = "jsonpath_python";
hash = "sha256-zuou/Z5WrdCTMKLJYx6j1VKXuWGTSMEFXlv7nLC4xTg=";
hash = "sha256-3e2ZMrTsQfuHJuCcg6+k5r5hj5OMLbKHzCqBcjxjlnE=";
};
build-system = [ hatchling ];
nativeCheckInputs = [

View file

@ -38,6 +38,6 @@ buildPythonPackage rec {
description = "Library to pull data from the netdata REST API into a pandas dataframe";
homepage = "https://github.com/netdata/netdata-pandas";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ raitobezarius ];
maintainers = [ ];
};
}

View file

@ -1,12 +1,13 @@
{
lib,
stdenv,
pkgs,
fetchPypi,
fetchpatch,
fetchFromGitHub,
buildPythonPackage,
click,
joblib,
regex,
setuptools,
tqdm,
# preInstallCheck
@ -20,33 +21,25 @@
pytest-mock,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "nltk";
version = "3.9.2";
format = "setuptools";
version = "3.9.4";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-D0CemwacpBd8GQPD6EPu+Qx+kpkvpJMa5gfabeSeFBk=";
src = fetchFromGitHub {
owner = "nltk";
repo = "nltk";
tag = finalAttrs.version;
hash = "sha256-kDfMiqXgLq91zzDjv/qDn0XwQkYRn2sITI6E4pgWe/8=";
};
patches = [
# https://github.com/nltk/nltk/security/advisories/GHSA-jm6w-m3j8-898g
# https://github.com/NixOS/nixpkgs/issues/502599
(fetchpatch {
name = "fix-unauthed-shutdown";
url = "https://github.com/nltk/nltk/commit/bbaae83db86a0f49e00f5b0db44a7254c268de9b.patch";
hash = "sha256-1ZzOQXiNxZ6o7JQs0b9FpsUjZtuUAjXEmDkc9mV3dYU=";
})
postPatch = ''
# In the nix store we trust
substituteInPlace nltk/pathsec.py \
--replace-fail 'if not (target == scoped_root or target.is_relative_to(scoped_root)):' 'if not (target == scoped_root or target.is_relative_to(scoped_root) or target.is_relative_to("/nix/store")):'
'';
# https://github.com/nltk/nltk/security/advisories/GHSA-469j-vmhf-r6v7
# https://github.com/NixOS/nixpkgs/issues/502535
(fetchpatch {
name = "fix-downloader-path-traversal";
url = "https://github.com/nltk/nltk/commit/89fe2ec2c6bae6e2e7a46dad65cc34231976ed8a.patch";
hash = "sha256-hQJmVEDDcio4Ew+Y10WzMV53mpYZuuDsFcEZKEzl7nk=";
})
];
build-system = [ setuptools ];
dependencies = [
click
@ -108,6 +101,11 @@ buildPythonPackage rec {
"nltk/test/unit/test_downloader.py" # Touches network
];
disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
# ModuleNotFoundError: No module named '_tkinter'
"test_chartparser_app_uses_pickle_load_not_pickle_load_standard"
];
pythonImportsCheck = [ "nltk" ];
passthru = {
@ -122,4 +120,4 @@ buildPythonPackage rec {
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.bengsparks ];
};
}
})

View file

@ -58,6 +58,6 @@ buildPythonPackage rec {
homepage = "https://recordlinkage.readthedocs.io/";
changelog = "https://github.com/J535D165/recordlinkage/releases/tag/v${version}";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ raitobezarius ];
maintainers = [ ];
};
}

View file

@ -46,6 +46,6 @@ buildPythonPackage rec {
homepage = "https://github.com/RIPE-NCC/ripe-atlas-cousteau";
changelog = "https://github.com/RIPE-NCC/ripe-atlas-cousteau/blob/v${version}/CHANGES.rst";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ raitobezarius ];
maintainers = [ ];
};
}

View file

@ -46,6 +46,6 @@ buildPythonPackage rec {
description = "Parsing library for RIPE Atlas measurements results";
homepage = "https://github.com/RIPE-NCC/ripe-atlas-sagan";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ raitobezarius ];
maintainers = [ ];
};
}

Some files were not shown because too many files have changed in this diff Show more