gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-01-26 06:04:38 +00:00
committed by GitHub
parent 8083c16b04 a9f3d45fb1
commit e5cd6d41e9
54 changed files with 428 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
-5
View File
@@ -2243,11 +2243,6 @@
github = "auchter";
githubId = 1190483;
};
aucub = {
name = "aucub";
github = "aucub";
githubId = 78630225;
};
augustebaum = {
email = "auguste.apple@gmail.com";
github = "augustebaum";
pkgs/by-name/ay/ayugram-desktop/package.nix
+1 -1
View File
@@ -53,7 +53,7 @@ telegram-desktop.override {
'';
homepage = "https://github.com/AyuGram/AyuGramDesktop";
changelog = "https://github.com/AyuGram/AyuGramDesktop/releases/tag/v${finalAttrs.version}";
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
};
}
);
pkgs/by-name/bi/bitcomet/package.nix
+1 -1
View File
@@ -38,6 +38,6 @@ appimageTools.wrapType2 {
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
};
}
pkgs/by-name/bl/blade-formatter/package.nix
+3 -3
View File
@@ -16,18 +16,18 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "blade-formatter";
version = "1.42.0";
version = "1.42.1";
src = fetchFromGitHub {
owner = "shufo";
repo = "blade-formatter";
rev = "v${finalAttrs.version}";
hash = "sha256-aH826UKTJPB/pbR/pEFV/RVXwKw+kG9xpj4pLnfqmU4=";
hash = "sha256-tzga32YPRB3ONsguw+Ap6T98YhKk60bnqeV/OYhuvc4=";
};
yarnOfflineCache = fetchYarnDeps {
yarnLock = finalAttrs.src + "/yarn.lock";
hash = "sha256-Iu0J7GHPoU2jwVkX+DY9qWgzgx9JvsBogEJDOS7z1WQ=";
hash = "sha256-ShmvKilQhJN8PNntVbLEKp/cxgmXHIYKOgVrpbrE+3M=";
};
nativeBuildInputs = [
pkgs/by-name/bl/bloomeetunes/package.nix
+1 -1
View File
@@ -55,7 +55,7 @@ flutter324.buildFlutterApplication rec {
homepage = "https://github.com/HemantKArya/BloomeeTunes";
mainProgram = "bloomee";
license = with lib.licenses; [ gpl2Plus ];
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
}
pkgs/by-name/bu/butterfly/package.nix
+1 -1
View File
@@ -48,7 +48,7 @@ flutter327.buildFlutterApplication rec {
cc-by-sa-40
asl20
];
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
platforms = [
"aarch64-linux"
"x86_64-linux"
pkgs/by-name/ca/cargo-tauri/package.nix
+3 -3
View File
@@ -13,17 +13,17 @@
rustPlatform.buildRustPackage rec {
pname = "tauri";
version = "2.2.2";
version = "2.2.3";
src = fetchFromGitHub {
owner = "tauri-apps";
repo = "tauri";
tag = "tauri-v${version}";
hash = "sha256-agmY/39tkz71kCSksIyrbxDrvnOJpBSYCdygjd4rOBY=";
hash = "sha256-VZPMy1UMvELcJxu5DHz4YSVe4wVrxrJjeiJK3ySczCA=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-i4ACVFWVEs866kJHNE49fnFj87GZbJIg5p1J3eVLRwE=";
cargoHash = "sha256-LcwOKUFiHoZ4WmTlwqsA2A9BZkBLPEINjZSyk6skvbA=";
nativeBuildInputs = [ pkg-config ];
pkgs/by-name/ca/cargo-tauri/test-app.nix
+1 -1
View File
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
src
;
hash = "sha256-vTjJz2t7ZrMQqOPjcWAoAl2tfKqJ0zgipegSpEvwJ9k=";
hash = "sha256-deLcw84MsSqoVTUgqEJrcZhzFxACw56WIgsC8iYR4zk=";
};
nativeBuildInputs = [
pkgs/by-name/cl/clash-rs/package.nix
+1 -1
View File
@@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/Watfaq/clash-rs";
mainProgram = "clash";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux ++ lib.platforms.darwin;
};
}
pkgs/by-name/de/deskflow/package.nix
+1 -1
View File
@@ -110,7 +110,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/deskflow/deskflow";
description = "Share one mouse and keyboard between multiple computers on Windows, macOS and Linux";
mainProgram = "deskflow";
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
license = with lib; [
licenses.gpl2Plus
licenses.openssl
pkgs/by-name/de/devtoolbox/package.nix
+1 -4
View File
@@ -122,10 +122,7 @@ python3Packages.buildPythonApplication rec {
unlicense
];
mainProgram = "devtoolbox";
maintainers = with lib.maintainers; [
aleksana
aucub
];
maintainers = with lib.maintainers; [ aleksana ];
platforms = lib.platforms.linux;
};
}
pkgs/by-name/ep/epsonscan2/package.nix
+27 -20
View File
@@ -2,7 +2,7 @@
lib,
stdenv,
autoPatchelfHook,
boost,
boost186,
cmake,
copyDesktopItems,
imagemagick,
@@ -25,13 +25,17 @@
let
pname = "epsonscan2";
description = "Epson Scan 2 scanner driver for many modern Epson scanners and multifunction printers";
version = "6.7.70.0";
# Epson updates projects without changing their version numbers.
# There can be multiple different packages identified by the same
#version, so we also tag them with the month and year shown in
# the Epson download page.
version = "6.7.70.0-01-2025";
system = stdenv.hostPlatform.system;
src = fetchzip {
url = "https://download3.ebz.epson.net/dsc/f/03/00/16/14/37/7577ee65efdad48ee2d2f38d9eda75418e490552/epsonscan2-6.7.70.0-1.src.tar.gz";
hash = "sha256-y7XGxrOpVou/ZSfUffV3qv+SsFFpTiU7pWvtfsiLZWc=";
url = "https://download3.ebz.epson.net/dsc/f/03/00/16/60/70/c7fc14e41ec84255008c6125b63bcac40f55e11c/epsonscan2-6.7.70.0-1.src.tar.gz";
hash = "sha256-WvNBy5hAxNJfwgjBR5VGaXuyTCK2YEiD3i7SMDl3U/U=";
};
bundle =
{
@@ -65,10 +69,8 @@ stdenv.mkDerivation {
];
postPatch = ''
rm CMakeCache.txt
substituteInPlace src/Controller/Src/Scanner/Engine.cpp \
--replace-fail '@KILLALL@' ${killall}/bin/killall
--replace-fail '@KILLALL@' ${lib.getExe killall}
substituteInPlace src/Controller/Src/Filter/GetOrientation.cpp \
--replace-fail '@OCR_ENGINE_GETROTATE@' $out/libexec/epsonscan2-ocr/ocr-engine-getrotate
@@ -88,7 +90,7 @@ stdenv.mkDerivation {
buildInputs =
[
boost
boost186 # uses Boost.Optional but epsonscan2 is pre-C++11.
libjpeg
libpng
libtiff
@@ -135,7 +137,7 @@ stdenv.mkDerivation {
desktopItems = lib.optionals withGui [
(makeDesktopItem {
name = pname;
name = "epsonscan2";
exec = "epsonscan2";
icon = "epsonscan2";
desktopName = "Epson Scan 2";
@@ -152,22 +154,27 @@ stdenv.mkDerivation {
inherit description;
mainProgram = "epsonscan2";
longDescription = ''
Epson Scan 2 scanner driver including optional non-free plugins such as OCR and network
scanning.
The Epson Scan 2 scanner driver, including optional non-free plugins such
as OCR and network scanning.
To use the SANE backend:
<literal>
hardware.sane.extraBackends = [ pkgs.epsonscan2 ];
</literal>
```nix
{
hardware.sane.extraBackends = [ pkgs.epsonscan2 ];
}
```
Overrides can be used to customise this package. For example, to enable non-free plugins and
disable the Epson GUI:
<literal>
pkgs.epsonscan2.override { withNonFreePlugins = true; withGui = false; }
</literal>
Overrides can be used to customise this package. For example, to enable
non-free plugins and disable the Epson GUI:
```nix
pkgs.epsonscan2.override {
withNonFreePlugins = true;
withGui = false;
}
```
'';
homepage = "https://support.epson.net/linux/en/epsonscan2.php";
platforms = [ "x86_64-linux" ];
platforms = lib.systems.inspect.patternLogicalAnd lib.systems.inspect.patterns.isLinux lib.systems.inspect.patterns.isx86_64;
sourceProvenance =
with lib.sourceTypes;
[ fromSource ] ++ lib.optionals withNonFreePlugins [ binaryNativeCode ];
pkgs/by-name/fl/flclash/package.nix
+2 -2
View File
@@ -48,7 +48,7 @@ let
description = "Multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free";
homepage = "https://github.com/chen08209/FlClash";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
};
};
in
@@ -101,7 +101,7 @@ flutter324.buildFlutterApplication {
homepage = "https://github.com/chen08209/FlClash";
mainProgram = "FlClash";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
}
pkgs/by-name/ga/garnet/package.nix
+2 -2
View File
@@ -8,13 +8,13 @@
buildDotnetModule rec {
pname = "garnet";
version = "1.0.50";
version = "1.0.53";
src = fetchFromGitHub {
owner = "microsoft";
repo = "garnet";
tag = "v${version}";
hash = "sha256-jmEPgGO9kQvzyGktFfsyEZdHlgJOZokzE3d5Xneu6/E=";
hash = "sha256-04USuwfoACJdEQ98DCzUKBVAyoGhTn1dHgVHw38xaWY=";
};
projectFile = "main/GarnetServer/GarnetServer.csproj";
pkgs/by-name/gi/gitlab-ci-local/package.nix
+3 -3
View File
@@ -9,16 +9,16 @@
buildNpmPackage rec {
pname = "gitlab-ci-local";
version = "4.56.2";
version = "4.57.0";
src = fetchFromGitHub {
owner = "firecow";
repo = "gitlab-ci-local";
rev = version;
hash = "sha256-rmJM+RRZY0pG0B7HYGU7L2iXdQyTTRhKsPjfh53a5m4=";
hash = "sha256-xr8loGmua8NiXA+YMzuVPUupnjqNsOxcWdyhxTZ7GhE=";
};
npmDepsHash = "sha256-EbgU147by5IwTmSEeC0FvzUqV0XYbMeT6K998UcR3Hg=";
npmDepsHash = "sha256-M/kRs8yaOypbSr3MhUr2UJ5G+lz5OMdBCIs4yyrLX6I=";
postPatch = ''
# remove cleanup which runs git commands
pkgs/by-name/go/gopeed/package.nix
+1 -1
View File
@@ -60,6 +60,6 @@ stdenv.mkDerivation rec {
platforms = [ "x86_64-linux" ];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
};
}
pkgs/by-name/go/gotify-desktop/package.nix
+3 -3
View File
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "gotify-desktop";
version = "1.3.7";
version = "1.4.0";
src = fetchFromGitHub {
owner = "desbma";
repo = pname;
rev = version;
sha256 = "sha256-ISK1sI7NkXJBtuCkl5g8ffrGv5dYgzmpsmPTZmDAaMI=";
sha256 = "sha256-P6zZAd3381/JamrEdbZRVFouhDsPNy1cNAjy4K3jGro=";
};
cargoHash = "sha256-QK2rzC9l+CiDv1+0NzR2x5B/5BYiY8KkLC2jxBdjXMU=";
cargoHash = "sha256-YdvPcg16C7WNHaKdLMXGZoouGFOJ5Z927SMxHL/pwmY=";
nativeBuildInputs = [ pkg-config ];
pkgs/by-name/gu/gui-for-clash/package.nix
+2 -2
View File
@@ -60,7 +60,7 @@ let
meta = {
description = "GUI program developed by vue3";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
});
@@ -132,7 +132,7 @@ buildGoModule {
homepage = "https://github.com/GUI-for-Cores/GUI.for.Clash";
mainProgram = "GUI.for.Clash";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
}
pkgs/by-name/gu/gui-for-singbox/package.nix
+2 -2
View File
@@ -60,7 +60,7 @@ let
meta = {
description = "GUI program developed by vue3";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
});
@@ -132,7 +132,7 @@ buildGoModule {
homepage = "https://github.com/GUI-for-Cores/GUI.for.SingBox";
mainProgram = "GUI.for.SingBox";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
}
pkgs/by-name/ha/handlr-regex/package.nix
+3 -3
View File
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "handlr-regex";
version = "0.12.0";
version = "0.12.1";
src = fetchFromGitHub {
owner = "Anomalocaridid";
repo = pname;
rev = "v${version}";
hash = "sha256-xjrETTBHqekdPn2NwpGVoRoU8mf0F4jZN2yt0k8ypRA=";
hash = "sha256-ZQAUqR0u+2kBLGyeT7qTcfwF87LY2qRClZ0T3WH78+w=";
};
cargoHash = "sha256-V/daNs2vk2N6N5eUq1haxxuNyGMBLLBSmBx0JozaN5A=";
cargoHash = "sha256-upsRGSUitLBf+yR4crIwKI6D7gasLx8O3cG4rqj8BWY=";
nativeBuildInputs = [
installShellFiles
pkgs/by-name/ha/harmony-music/package.nix
+1 -1
View File
@@ -75,7 +75,7 @@ flutter324.buildFlutterApplication rec {
homepage = "https://github.com/anandnet/Harmony-Music";
mainProgram = "harmonymusic";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
}
pkgs/by-name/hi/hiddify-app/package.nix
+2 -2
View File
@@ -65,7 +65,7 @@ let
mainProgram = "HiddifyCli";
license = lib.licenses.cc-by-nc-sa-40;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
};
};
in
@@ -148,6 +148,6 @@ flutter324.buildFlutterApplication {
mainProgram = "hiddify";
license = lib.licenses.cc-by-nc-sa-40;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
};
}
pkgs/by-name/jh/jhentai/package.nix
+1 -1
View File
@@ -63,7 +63,7 @@ flutter.buildFlutterApplication rec {
homepage = "https://github.com/jiangtian616/JHenTai";
mainProgram = "jhentai";
license = with lib.licenses; [ asl20 ];
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
}
pkgs/by-name/ka/kazumi/package.nix
+1 -1
View File
@@ -114,7 +114,7 @@ flutter327.buildFlutterApplication rec {
homepage = "https://github.com/Predidit/Kazumi";
mainProgram = "kazumi";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
}
pkgs/by-name/ke/keyguard/package.nix
+1 -1
View File
@@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/AChep/keyguard-app";
mainProgram = "Keyguard";
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
sourceProvenance = with lib.sourceTypes; [
fromSource
binaryBytecode
pkgs/by-name/li/linux-wallpaperengine/package.nix
+1 -1
View File
@@ -193,7 +193,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/Almamu/linux-wallpaperengine";
license = with lib.licenses; [ gpl3Plus ];
mainProgram = "linux-wallpaperengine";
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
platforms = [
"x86_64-linux"
"aarch64-linux"
pkgs/by-name/lu/lucenepp/package.nix
+4 -1
View File
@@ -27,7 +27,10 @@ stdenv.mkDerivation rec {
zlib
];
cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ];
cmakeFlags = [
(lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
(lib.cmakeBool "ENABLE_TEST" doCheck)
];
patches = [
(fetchpatch {
pkgs/by-name/ma/mangayomi/package.nix
+1 -1
View File
@@ -110,7 +110,7 @@ flutter324.buildFlutterApplication {
homepage = "https://github.com/kodjodevf/mangayomi";
mainProgram = "mangayomi";
license = with lib.licenses; [ asl20 ];
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
}
pkgs/by-name/ma/marble-shell-theme/package.nix
+1 -1
View File
@@ -43,6 +43,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
platforms = lib.platforms.linux;
homepage = "https://github.com/imarkoff/Marble-shell-theme";
changelog = "https://github.com/imarkoff/Marble-shell-theme/releases/tag/${finalAttrs.version}";
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
};
})
pkgs/by-name/ma/marp-cli/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildNpmPackage rec {
pname = "marp-cli";
version = "4.0.4";
version = "4.1.0";
src = fetchFromGitHub {
owner = "marp-team";
repo = pname;
rev = "v${version}";
hash = "sha256-gi9jkWuL63RRKR/X8yI3VBLdMaxWfYVDh0gAtuVHVv4=";
hash = "sha256-WuyDxfyWZNBBivlmztTnYNkL7P+P0yZpcLDu8nTDhhk=";
};
npmDepsHash = "sha256-ZThE92ZcIJToPuTU/7+uOeixLLx+C4jXMzmemSFjPh8=";
npmDepsHash = "sha256-JhsQz3A/RPEuGTbZeYaCEzBawSoD8p2u9agHBr4+hZU=";
npmPackFlags = [ "--ignore-scripts" ];
makeCacheWritable = true;
pkgs/by-name/mi/mihomo-party/package.nix
+1 -1
View File
@@ -92,6 +92,6 @@ stdenv.mkDerivation {
];
license = lib.licenses.gpl3Plus;
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
};
}
pkgs/by-name/mi/minisign/package.nix
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "minisign";
version = "0.11";
version = "0.12";
src = fetchFromGitHub {
repo = "minisign";
owner = "jedisct1";
rev = version;
sha256 = "sha256-sczGs6du797WUkfr3JiTI/bUHp7vKEeZtJdCryFcYu8=";
sha256 = "sha256-qhAzhht9p4bsa2ntJwhcNurm8QgYYiKi3dA3ifpT8aw=";
};
nativeBuildInputs = [
pkgs/by-name/na/navicat-premium/package.nix
+1 -1
View File
@@ -40,7 +40,7 @@ appimageTools.wrapType2 {
description = "Database development tool that allows you to simultaneously connect to many databases";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
platforms = [
"x86_64-linux"
"aarch64-linux"
pkgs/by-name/on/oneanime/package.nix
+2 -2
View File
@@ -50,7 +50,7 @@ let
meta = {
homepage = "https://github.com/Predidit/open_chinese_convert_bridge";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
};
};
in
@@ -164,7 +164,7 @@ flutter327.buildFlutterApplication rec {
homepage = "https://github.com/Predidit/oneAnime";
mainProgram = "oneanime";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
}
pkgs/by-name/pd/pdfium-binaries/package.nix
+1 -1
View File
@@ -48,7 +48,7 @@ stdenv.mkDerivation {
homepage = "https://github.com/bblanchon/pdfium-binaries";
license = with lib.licenses; [ asl20 ];
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
platforms = [
"aarch64-linux"
"aarch64-darwin"
pkgs/by-name/pi/pilipalax/package.nix
+1 -1
View File
@@ -64,7 +64,7 @@ flutter324.buildFlutterApplication rec {
homepage = "https://github.com/orz12/PiliPalaX";
mainProgram = "pilipala";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
}
pkgs/by-name/re/refine/package.nix
+1 -4
View File
@@ -95,9 +95,6 @@ python3Packages.buildPythonApplication rec {
mainProgram = "refine";
platforms = lib.platforms.linux;
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [
getchoo
aucub
];
maintainers = with lib.maintainers; [ getchoo ];
};
}
pkgs/by-name/sa/saber/package.nix
+1 -1
View File
@@ -55,7 +55,7 @@ flutter327.buildFlutterApplication rec {
homepage = "https://github.com/saber-notes/saber";
mainProgram = "saber";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
platforms = [
"aarch64-linux"
"x86_64-linux"
pkgs/by-name/sa/saucectl/package.nix
+2 -2
View File
@@ -5,7 +5,7 @@
}:
let
pname = "saucectl";
version = "0.190.1";
version = "0.191.0";
in
buildGoModule {
inherit pname version;
@@ -14,7 +14,7 @@ buildGoModule {
owner = "saucelabs";
repo = "saucectl";
tag = "v${version}";
hash = "sha256-I1W7hAirtyLppJfM1gdzho3VU9rgFDt6j1dexGIHkXg=";
hash = "sha256-cOgjNoJwcNu04YNqjeVaGIVauApYhFjLTa34HXV78sg=";
};
ldflags = [
pkgs/by-name/si/simple-live-app/package.nix
+1 -1
View File
@@ -119,7 +119,7 @@ flutter324.buildFlutterApplication rec {
homepage = "https://github.com/xiaoyaocz/dart_simple_live";
mainProgram = "simple_live_app";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
}
pkgs/by-name/sl/sly/package.nix
+1 -1
View File
@@ -28,7 +28,7 @@ flutter.buildFlutterApplication {
homepage = "https://github.com/kra-mo/sly";
mainProgram = "sly";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
}
pkgs/by-name/so/sonusmix/package.nix
+1 -1
View File
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec {
description = "Next-gen Pipewire audio routing tool";
homepage = "https://codeberg.org/sonusmix/sonusmix";
license = lib.licenses.mpl20;
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
}
pkgs/by-name/st/stylelint/package.nix
+3 -3
View File
@@ -5,7 +5,7 @@
}:
let
version = "16.13.0";
version = "16.14.0";
in
buildNpmPackage {
pname = "stylelint";
@@ -15,10 +15,10 @@ buildNpmPackage {
owner = "stylelint";
repo = "stylelint";
rev = version;
hash = "sha256-9OMhOkI8SYetzr4yCuEvFEwHGi/sqOjA0CfUVTc7EIE=";
hash = "sha256-AAlo8fGUH+jvUsB66cztLDyKA7j25ZWH0BIM7iiyp+c=";
};
npmDepsHash = "sha256-mGuoNhCoOJnKQxdySMTVCi/dRwgIiSlg/LkqeS01gnk=";
npmDepsHash = "sha256-FT6UctAsUP9KTSWENutibhyXjZHOT7t93z90XCAIuv4=";
dontNpmBuild = true;
pkgs/by-name/v2/v2rayn/package.nix
+1 -1
View File
@@ -101,7 +101,7 @@ buildDotnetModule rec {
homepage = "https://github.com/2dust/v2rayN";
mainProgram = "v2rayN";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
platforms = [
"x86_64-linux"
"aarch64-linux"
pkgs/by-name/ve/venera/package.nix
+1 -1
View File
@@ -91,7 +91,7 @@ flutter327.buildFlutterApplication rec {
homepage = "https://github.com/venera-app/venera";
mainProgram = "venera";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
}
pkgs/by-name/wa/waveterm/package.nix
+1 -1
View File
@@ -48,7 +48,7 @@ let
"x86_64-linux"
"x86_64-darwin"
];
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
};
linux = stdenv.mkDerivation {
pkgs/by-name/wi/windterm/package.nix
+1 -1
View File
@@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
mainProgram = "windterm";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [ aucub ];
maintainers = with lib.maintainers; [ ];
platforms = [ "x86_64-linux" ];
};
}
pkgs/development/libraries/getdns/default.nix
+8 -6
View File
@@ -97,12 +97,14 @@ rec {
yq
];
buildInputs = [
getdns
libyaml
openssl
systemd
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.Security ];
buildInputs =
[
getdns
libyaml
openssl
]
++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.Security ];
postInstall = ''
rm -r $out/share/doc
pkgs/development/python-modules/pynitrokey/default.nix
+2 -2
View File
@@ -30,7 +30,7 @@
let
pname = "pynitrokey";
version = "0.7.1";
version = "0.7.3";
mainProgram = "nitropy";
in
@@ -40,7 +40,7 @@ buildPythonPackage {
src = fetchPypi {
inherit pname version;
hash = "sha256-1hACUig5vH2Ra/ASYesHb8jRkcUpeXGe5O89/lTSrjk=";
hash = "sha256-+sza4ZOJbElIdQLZFpoW0zs6KUYapRiC3gTxcj6Oqsg=";
};
nativeBuildInputs = [ installShellFiles ];
pkgs/os-specific/linux/nvidia-x11/TTM-fbdev-emulation-for-Linux-6.13.patch
+156
View File
@@ -0,0 +1,156 @@
From 88b8ae7642ef21e685d51148e8f57c3dfa1323ac Mon Sep 17 00:00:00 2001
From: Bingwu Zhang <xtex@aosc.io>
Date: Sat, 7 Dec 2024 23:56:43 +0800
Subject: [PATCH 10/10] FROM AOSC: TTM fbdev emulation for Linux 6.13+
Link: https://github.com/torvalds/linux/commit/1000634477d8d178179b1ad45d92e925fabe3deb
Link: https://github.com/NVIDIA/open-gpu-kernel-modules/issues/749
Signed-off-by: xtex <xtexchooser@duck.com>
Signed-off-by: Eric Naim <dnaim@cachyos.org>
---
kernel-open/nvidia-drm/nvidia-drm-drv.c | 72 +++++++++++++++++++
kernel-open/nvidia-drm/nvidia-drm-linux.c | 4 ++
.../nvidia-drm/nvidia-drm-os-interface.h | 5 ++
3 files changed, 81 insertions(+)
diff --git a/kernel-open/nvidia-drm/nvidia-drm-drv.c b/kernel-open/nvidia-drm/nvidia-drm-drv.c
index 2e4f6404..ab85152f 100644
--- a/kernel-open/nvidia-drm/nvidia-drm-drv.c
+++ b/kernel-open/nvidia-drm/nvidia-drm-drv.c
@@ -1951,7 +1951,60 @@ void nv_drm_update_drm_driver_features(void)
#endif /* NV_DRM_ATOMIC_MODESET_AVAILABLE */
}
+#if !defined(NV_DRM_FBDEV_TTM_AVAILABLE) && \
+ !defined(NV_DRM_FBDEV_GENERIC_AVAILABLE)
+// AOSC OS: Workaround for Linux 6.13+
+static const struct drm_fb_helper_funcs nv_drm_fbdev_helper_funcs = {
+ .fb_probe = drm_fbdev_ttm_driver_fbdev_probe,
+};
+
+static void nv_drm_fbdev_client_unregister(struct drm_client_dev *client)
+{
+ struct drm_fb_helper *fb_helper = drm_fb_helper_from_client(client);
+ if (fb_helper->info) {
+ drm_fb_helper_unregister_info(fb_helper);
+ } else {
+ drm_client_release(&fb_helper->client);
+ drm_fb_helper_unprepare(fb_helper);
+ kfree(fb_helper);
+ }
+}
+static int nv_drm_fbdev_client_restore(struct drm_client_dev *client)
+{
+ drm_fb_helper_lastclose(client->dev);
+ return 0;
+}
+static int nv_drm_fbdev_client_hotplug(struct drm_client_dev *client)
+{
+ struct drm_fb_helper *fb_helper = drm_fb_helper_from_client(client);
+ struct drm_device *dev = client->dev;
+ int ret;
+ if (dev->fb_helper)
+ return drm_fb_helper_hotplug_event(dev->fb_helper);
+ ret = drm_fb_helper_init(dev, fb_helper);
+ if (ret)
+ goto err_drm_err;
+ if (!drm_drv_uses_atomic_modeset(dev))
+ drm_helper_disable_unused_functions(dev);
+ ret = drm_fb_helper_initial_config(fb_helper);
+ if (ret)
+ goto err_drm_fb_helper_fini;
+ return 0;
+err_drm_fb_helper_fini:
+ drm_fb_helper_fini(fb_helper);
+err_drm_err:
+ drm_err(dev, "AOSC OS: NV-DRM: fbdev: Failed to setup emulation (ret=%d)\n", ret);
+ return ret;
+}
+
+static const struct drm_client_funcs nv_drm_fbdev_client_funcs = {
+ .owner = THIS_MODULE,
+ .unregister = nv_drm_fbdev_client_unregister,
+ .restore = nv_drm_fbdev_client_restore,
+ .hotplug = nv_drm_fbdev_client_hotplug,
+};
+#endif
/*
* Helper function for allocate/register DRM device for given NVIDIA GPU ID.
@@ -1961,6 +2014,7 @@ void nv_drm_register_drm_device(const nv_gpu_info_t *gpu_info)
struct nv_drm_device *nv_dev = NULL;
struct drm_device *dev = NULL;
struct device *device = gpu_info->os_device_ptr;
+ struct drm_fb_helper *fb_helper = NULL;
bool bus_is_pci;
DRM_DEBUG(
@@ -2039,6 +2093,20 @@ void nv_drm_register_drm_device(const nv_gpu_info_t *gpu_info)
drm_fbdev_ttm_setup(dev, 32);
#elif defined(NV_DRM_FBDEV_GENERIC_AVAILABLE)
drm_fbdev_generic_setup(dev, 32);
+ #else
+ // AOSC OS: Workaround for Linux 6.13+
+ int drm_client_ret;
+ fb_helper = kzalloc(sizeof(*fb_helper), GFP_KERNEL);
+ if (!fb_helper)
+ return;
+ drm_fb_helper_prepare(dev, fb_helper, 32, &nv_drm_fbdev_helper_funcs);
+ drm_client_ret = drm_client_init(dev, &fb_helper->client, "fbdev",
+ &nv_drm_fbdev_client_funcs);
+ if (drm_client_ret) {
+ drm_err(dev, "AOSC OS: NV-DRM: Failed to register DRM client: %d\n", drm_client_ret);
+ goto failed_drm_client_init;
+ }
+ drm_client_register(&fb_helper->client);
#endif
}
#endif /* defined(NV_DRM_FBDEV_AVAILABLE) */
@@ -2050,6 +2118,10 @@ void nv_drm_register_drm_device(const nv_gpu_info_t *gpu_info)
return; /* Success */
+failed_drm_client_init:
+ drm_fb_helper_unprepare(fb_helper);
+ kfree(fb_helper);
+
failed_drm_register:
nv_drm_dev_free(dev);
diff --git a/kernel-open/nvidia-drm/nvidia-drm-linux.c b/kernel-open/nvidia-drm/nvidia-drm-linux.c
index 83d40983..ac4fe967 100644
--- a/kernel-open/nvidia-drm/nvidia-drm-linux.c
+++ b/kernel-open/nvidia-drm/nvidia-drm-linux.c
@@ -39,8 +39,12 @@ MODULE_PARM_DESC(
fbdev,
"Create a framebuffer device (1 = enable (default), 0 = disable) (EXPERIMENTAL)");
module_param_named(fbdev, nv_drm_fbdev_module_param, bool, 0400);
+#else
+#error "nvidia-drm fbdev should always be available."
#endif
+#else
+#error "nvidia-drm is not available"
#endif /* NV_DRM_AVAILABLE */
/*************************************************************************
diff --git a/kernel-open/nvidia-drm/nvidia-drm-os-interface.h b/kernel-open/nvidia-drm/nvidia-drm-os-interface.h
index 71ca5f22..8195af32 100644
--- a/kernel-open/nvidia-drm/nvidia-drm-os-interface.h
+++ b/kernel-open/nvidia-drm/nvidia-drm-os-interface.h
@@ -78,6 +78,11 @@ typedef struct nv_timer nv_drm_timer;
#define NV_DRM_FBDEV_TTM_AVAILABLE
#endif
+// AOSC OS: Always enable DRM fbdev
+// FIXME: Add config test for drm helper functions.
+// The implementation uses drm_client_register, which is added in v5.2-rc1.
+#define NV_DRM_FBDEV_AVAILABLE
+
struct page;
/* Set to true when the atomic modeset feature is enabled. */
--
2.47.1
pkgs/os-specific/linux/nvidia-x11/Use-linux-aperture.c-for-removing-conflict.patch
+146
View File
@@ -0,0 +1,146 @@
From 11501d99348a04c608a19330d984188f4766e603 Mon Sep 17 00:00:00 2001
From: Bingwu Zhang <xtex@aosc.io>
Date: Sat, 7 Dec 2024 23:01:26 +0800
Subject: [PATCH 09/10] FROM AOSC: Use linux/aperture.c for removing
conflicting PCI devices on Linux 6.13.0-rc1+
Link: https://github.com/torvalds/linux/commit/689274a56c0c088796d359f6c6267323931a2429
Link: https://github.com/torvalds/linux/commit/7283f862bd991c8657e9bf1c02db772fcf018f13
Link: https://github.com/NVIDIA/open-gpu-kernel-modules/issues/749
Signed-off-by: Eric Naim <dnaim@cachyos.org>
---
kernel-open/conftest.sh | 19 +++++++++++++++++++
kernel-open/header-presence-tests.mk | 1 +
kernel-open/nvidia-drm/nvidia-drm-drv.c | 15 +++++++++++++++
.../nvidia-drm/nvidia-drm-os-interface.h | 10 ++++++++++
kernel-open/nvidia-drm/nvidia-drm-sources.mk | 1 +
5 files changed, 46 insertions(+)
diff --git a/kernel-open/conftest.sh b/kernel-open/conftest.sh
index fdceda72..5a0f39e0 100755
--- a/kernel-open/conftest.sh
+++ b/kernel-open/conftest.sh
@@ -6615,6 +6615,8 @@ compile_test() {
# Added by commit 2916059147ea ("drm/aperture: Add infrastructure
# for aperture ownership") in v5.14.
#
+ # Removed by commit 689274a56c0c ("drm: Remove DRM aperture helpers") in v6.13.
+ #
CODE="
#if defined(NV_DRM_DRM_APERTURE_H_PRESENT)
#include <drm/drm_aperture.h>
@@ -6626,6 +6628,23 @@ compile_test() {
compile_check_conftest "$CODE" "NV_DRM_APERTURE_REMOVE_CONFLICTING_PCI_FRAMEBUFFERS_PRESENT" "" "functions"
;;
+ aperture_remove_conflicting_pci_devices)
+ #
+ # Determine whether aperture_remove_conflicting_pci_devices is present.
+ #
+ # Added by commit 7283f862bd99 ("drm: Implement DRM aperture helpers under video/") in v6.0.
+ #
+ CODE="
+ #if defined(NV_LINUX_APERTURE_H_PRESENT)
+ #include <linux/aperture.h>
+ #endif
+ void conftest_aperture_remove_conflicting_pci_devices(void) {
+ aperture_remove_conflicting_pci_devices();
+ }"
+
+ compile_check_conftest "$CODE" "NV_APERTURE_REMOVE_CONFLICTING_PCI_DEVICES_PRESENT" "" "functions"
+ ;;
+
drm_aperture_remove_conflicting_pci_framebuffers_has_driver_arg)
#
# Determine whether drm_aperture_remove_conflicting_pci_framebuffers
diff --git a/kernel-open/header-presence-tests.mk b/kernel-open/header-presence-tests.mk
index 9d5217a9..b0268541 100644
--- a/kernel-open/header-presence-tests.mk
+++ b/kernel-open/header-presence-tests.mk
@@ -34,6 +34,7 @@ NV_HEADER_PRESENCE_TESTS = \
generated/autoconf.h \
generated/compile.h \
generated/utsrelease.h \
+ linux/aperture.h \
linux/efi.h \
linux/kconfig.h \
linux/platform/tegra/mc_utils.h \
diff --git a/kernel-open/nvidia-drm/nvidia-drm-drv.c b/kernel-open/nvidia-drm/nvidia-drm-drv.c
index 8f905f82..2e4f6404 100644
--- a/kernel-open/nvidia-drm/nvidia-drm-drv.c
+++ b/kernel-open/nvidia-drm/nvidia-drm-drv.c
@@ -65,7 +65,16 @@
#endif
#if defined(NV_DRM_FBDEV_AVAILABLE)
+// Commit 7283f862bd99 ("drm: Implement DRM aperture helpers under video/")
+// moved implementation of drm_aperture_... to linux/aperture.c.
+// Commit 689274a56c0c ("drm: Remove DRM aperture helpers")
+// removed drm/drm_aperture.h.
+#if defined(NV_DRM_APERTURE_REMOVE_CONFLICTING_PCI_FRAMEBUFFERS_PRESENT)
#include <drm/drm_aperture.h>
+#endif
+#if defined(NV_APERTURE_REMOVE_CONFLICTING_PCI_DEVICES_PRESENT)
+#include <linux/aperture.h>
+#endif
#include <drm/drm_fb_helper.h>
#endif
@@ -2013,10 +2022,16 @@ void nv_drm_register_drm_device(const nv_gpu_info_t *gpu_info)
if (bus_is_pci) {
struct pci_dev *pdev = to_pci_dev(device);
+#if defined(NV_DRM_APERTURE_REMOVE_CONFLICTING_PCI_FRAMEBUFFERS_PRESENT)
+ printk(KERN_INFO "%s: using drm_aperture for old kernels\n", nv_drm_driver.name);
#if defined(NV_DRM_APERTURE_REMOVE_CONFLICTING_PCI_FRAMEBUFFERS_HAS_DRIVER_ARG)
drm_aperture_remove_conflicting_pci_framebuffers(pdev, &nv_drm_driver);
#else
drm_aperture_remove_conflicting_pci_framebuffers(pdev, nv_drm_driver.name);
+#endif
+#elif defined(NV_APERTURE_REMOVE_CONFLICTING_PCI_DEVICES_PRESENT)
+ printk(KERN_INFO "%s: using linux/aperture workaround for Linux 6.13+\n", nv_drm_driver.name);
+ aperture_remove_conflicting_pci_devices(pdev, nv_drm_driver.name);
#endif
nvKms->framebufferConsoleDisabled(nv_dev->pDevice);
}
diff --git a/kernel-open/nvidia-drm/nvidia-drm-os-interface.h b/kernel-open/nvidia-drm/nvidia-drm-os-interface.h
index a6b0f947..71ca5f22 100644
--- a/kernel-open/nvidia-drm/nvidia-drm-os-interface.h
+++ b/kernel-open/nvidia-drm/nvidia-drm-os-interface.h
@@ -63,11 +63,21 @@ typedef struct nv_timer nv_drm_timer;
#define NV_DRM_FBDEV_GENERIC_AVAILABLE
#endif
+#if defined(NV_DRM_FBDEV_GENERIC_SETUP_PRESENT) && defined(NV_APERTURE_REMOVE_CONFLICTING_PCI_DEVICES_PRESENT)
+#define NV_DRM_FBDEV_AVAILABLE
+#define NV_DRM_FBDEV_GENERIC_AVAILABLE
+#endif
+
#if defined(NV_DRM_FBDEV_TTM_SETUP_PRESENT) && defined(NV_DRM_APERTURE_REMOVE_CONFLICTING_PCI_FRAMEBUFFERS_PRESENT)
#define NV_DRM_FBDEV_AVAILABLE
#define NV_DRM_FBDEV_TTM_AVAILABLE
#endif
+#if defined(NV_DRM_FBDEV_TTM_SETUP_PRESENT) && defined(NV_APERTURE_REMOVE_CONFLICTING_PCI_DEVICES_PRESENT)
+#define NV_DRM_FBDEV_AVAILABLE
+#define NV_DRM_FBDEV_TTM_AVAILABLE
+#endif
+
struct page;
/* Set to true when the atomic modeset feature is enabled. */
diff --git a/kernel-open/nvidia-drm/nvidia-drm-sources.mk b/kernel-open/nvidia-drm/nvidia-drm-sources.mk
index 9aaebd04..a4dcad6d 100644
--- a/kernel-open/nvidia-drm/nvidia-drm-sources.mk
+++ b/kernel-open/nvidia-drm/nvidia-drm-sources.mk
@@ -66,6 +66,7 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += dma_fence_set_error
NV_CONFTEST_FUNCTION_COMPILE_TESTS += fence_set_error
NV_CONFTEST_FUNCTION_COMPILE_TESTS += sync_file_get_fence
NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_aperture_remove_conflicting_pci_framebuffers
+NV_CONFTEST_FUNCTION_COMPILE_TESTS += aperture_remove_conflicting_pci_devices
NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_fbdev_generic_setup
NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_fbdev_ttm_setup
NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_connector_attach_hdr_output_metadata_property
--
2.47.1
pkgs/os-specific/linux/nvidia-x11/default.nix
+2
View File
@@ -89,6 +89,8 @@ rec {
patchesOpen = [
./nvidia-nv-Convert-symbol-namespace-to-string-literal.patch
./crypto-Add-fix-for-6.13-Module-compilation.patch
./Use-linux-aperture.c-for-removing-conflict.patch
./TTM-fbdev-emulation-for-Linux-6.13.patch
];
});
pkgs/tools/security/vaultwarden/default.nix
+3 -3
View File
@@ -22,17 +22,17 @@ in
rustPlatform.buildRustPackage rec {
pname = "vaultwarden";
version = "1.32.7";
version = "1.33.0";
src = fetchFromGitHub {
owner = "dani-garcia";
repo = "vaultwarden";
rev = version;
hash = "sha256-mxZQ1San8zlyvZoBRF9Eb7/mbs374MOgC4baOCFyPoc=";
hash = "sha256-2lZfPPHHAoY12cXpkeJnvMab+C3T5O7KdmVpKqRQkgQ=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-OKfu+G+bS72HJDDLhRp9PMji/baBsh7JaYEZgQYdjTw=";
cargoHash = "sha256-f+884HV9oopvr/2UfWk0sw2DW2cU3c16F+5vGc6+IL0=";
# used for "Server Installed" version in admin panel
env.VW_VERSION = version;
pkgs/tools/security/vaultwarden/webvault.nix
+14 -6
View File
@@ -9,7 +9,7 @@
}:
let
version = "2024.6.2c";
version = "2025.1.1";
suffix = lib.head (lib.match "[0-9.]*([a-z]*)" version);
@@ -17,7 +17,7 @@ let
owner = "dani-garcia";
repo = "bw_web_builds";
rev = "v${version}";
hash = "sha256-Gd8yQx9j6ieUvaM6IPSELNRy83y0cBkBwLYMqk8OIjU=";
hash = "sha256-wQGpl7N0D83FrrV4T+LFe9h3n5Q/MqLbGGO2F5R9k2g=";
};
in
@@ -29,10 +29,10 @@ buildNpmPackage rec {
owner = "bitwarden";
repo = "clients";
rev = "web-v${lib.removeSuffix suffix version}";
hash = "sha256-HMQ0oQ04WkLlUgsYt6ZpcziDq05mnSA0+VnJCpteceg=";
hash = "sha256-Bq133V8CsDMnLeaKrW5JmLTGRaZVLRbp+tTgG725tqE=";
};
npmDepsHash = "sha256-zMzQEM5mV14gewzYhy1F2bNEugXjZSOviYwYVV2Cb8c=";
npmDepsHash = "sha256-bWcp3VJI2bObLH/XBx3cdxXQY9Cw+IFpeNA2TXVTtFg=";
postPatch = ''
ln -s ${bw_web_builds}/{patches,resources} ..
@@ -41,12 +41,20 @@ buildNpmPackage rec {
'';
nativeBuildInputs = [
(python3.withPackages (ps: [ ps.setuptools ]))
python3
];
makeCacheWritable = true;
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
env = {
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
npm_config_build_from_source = "true";
};
npmRebuildFlags = [
# FIXME one of the esbuild versions fails to download @esbuild/linux-x64
"--ignore-scripts"
];
npmBuildScript = "dist:oss:selfhost";