Merge master into staging-next
This commit is contained in:
@@ -154,7 +154,7 @@ jobs:
|
||||
# to not interrupt main Eval's compare step.
|
||||
continue-on-error: ${{ matrix.version != '' }}
|
||||
name: ${{ matrix.system }}${{ matrix.version && format(' @ {0} ({1})', matrix.version, needs.versions.outputs.ciPinBumpCommitShort) || '' }}
|
||||
timeout-minutes: 15
|
||||
timeout-minutes: 20
|
||||
steps:
|
||||
# This is not supposed to be used and just acts as a fallback.
|
||||
# Without swap, when Eval runs OOM, it will fail badly with a
|
||||
|
||||
+8
-1
@@ -261,5 +261,12 @@ in
|
||||
"outputName"
|
||||
];
|
||||
in
|
||||
drv // mapAttrs (_: lib.warn msg) drvToWrap;
|
||||
drv
|
||||
// mapAttrs (_: lib.warn msg) drvToWrap
|
||||
// (
|
||||
if drv ? overrideAttrs && builtins.isFunction drv.overrideAttrs then
|
||||
{ overrideAttrs = x: lib.derivations.warnOnInstantiate msg (drv.overrideAttrs x); }
|
||||
else
|
||||
{ }
|
||||
);
|
||||
}
|
||||
|
||||
@@ -23,7 +23,6 @@ let
|
||||
in
|
||||
{
|
||||
meta.maintainers = with maintainers; [
|
||||
etu
|
||||
stunkymonkey
|
||||
mattchrist
|
||||
];
|
||||
|
||||
@@ -19,12 +19,13 @@ in
|
||||
lib.types.oneOf [
|
||||
lib.types.str
|
||||
lib.types.int
|
||||
lib.types.bool
|
||||
]
|
||||
);
|
||||
default = { };
|
||||
example = {
|
||||
SERVER_PORT = 8080;
|
||||
INSTALL_BOOK_AND_ADVANCED_HTML_OPS = "true";
|
||||
INSTALL_BOOK_AND_ADVANCED_HTML_OPS = true;
|
||||
};
|
||||
description = ''
|
||||
Environment variables for the stirling-pdf app.
|
||||
@@ -44,7 +45,9 @@ in
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
systemd.services.stirling-pdf = {
|
||||
environment = lib.mapAttrs (_: toString) cfg.environment;
|
||||
environment = lib.mapAttrs (
|
||||
_: v: if (builtins.isBool v) then (lib.boolToString v) else (toString v)
|
||||
) cfg.environment;
|
||||
|
||||
# following https://docs.stirlingpdf.com/Installation/Unix%20Installation
|
||||
path =
|
||||
|
||||
@@ -1504,6 +1504,7 @@ in
|
||||
stash = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./stash.nix { };
|
||||
static-web-server = runTest ./web-servers/static-web-server.nix;
|
||||
step-ca = handleTestOn [ "x86_64-linux" ] ./step-ca.nix { };
|
||||
stirling-pdf-desktop = runTest ./stirling-pdf-desktop.nix;
|
||||
stratis = handleTest ./stratis { };
|
||||
strongswan-swanctl = runTest ./strongswan-swanctl.nix;
|
||||
stub-ld = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./stub-ld.nix { };
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
{
|
||||
name = "docuseal";
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
etu
|
||||
stunkymonkey
|
||||
];
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
{
|
||||
name = "docuseal";
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
etu
|
||||
stunkymonkey
|
||||
];
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
{
|
||||
name = "freshrss-caddy-sqlite";
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
etu
|
||||
stunkymonkey
|
||||
];
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
{
|
||||
name = "freshrss-nginx-sqlite";
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
etu
|
||||
stunkymonkey
|
||||
];
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
{
|
||||
name = "freshrss-pgsql";
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
etu
|
||||
stunkymonkey
|
||||
];
|
||||
|
||||
|
||||
@@ -0,0 +1,131 @@
|
||||
{ lib, hostPkgs, ... }:
|
||||
let
|
||||
port = 8080;
|
||||
server = "http://server:${toString port}";
|
||||
in
|
||||
{
|
||||
name = "stirling-pdf";
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [
|
||||
timhae
|
||||
phanirithvij
|
||||
];
|
||||
};
|
||||
|
||||
enableOCR = true;
|
||||
globalTimeout = 600;
|
||||
nodes = {
|
||||
server =
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
services.stirling-pdf = {
|
||||
enable = true;
|
||||
package = pkgs.stirling-pdf;
|
||||
environment = {
|
||||
SERVER_PORT = port;
|
||||
DISABLE_ADDITIONAL_FEATURES = false;
|
||||
SECURITY_ENABLELOGIN = true;
|
||||
};
|
||||
};
|
||||
networking.firewall.allowedTCPPorts = [ port ];
|
||||
};
|
||||
client =
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
virtualisation = {
|
||||
memorySize = 4096;
|
||||
cores = 4;
|
||||
qemu.options = [
|
||||
# Force qemu at 640x480 resolution
|
||||
"-vga none -device virtio-gpu-pci,xres=640,yres=480"
|
||||
];
|
||||
};
|
||||
imports = [ ./common/wayland-cage.nix ];
|
||||
services.cage.program = lib.getExe pkgs.stirling-pdf-desktop;
|
||||
systemd.tmpfiles.settings."stirling-provisioning.json"."/etc/stirling-pdf/stirling-provisioning.json"."L+".argument =
|
||||
builtins.toString (
|
||||
pkgs.writeText "stirling-provisioning.json" ''
|
||||
{
|
||||
"serverUrl": "${server}",
|
||||
"lockConnectionMode": true
|
||||
}
|
||||
''
|
||||
);
|
||||
programs.ydotool.enable = true;
|
||||
users.users.alice.extraGroups = [ "ydotool" ];
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
server.start()
|
||||
server.wait_for_unit("stirling-pdf.service")
|
||||
server.wait_for_console_text("Stirling-PDF Started")
|
||||
|
||||
# initial login
|
||||
client.start()
|
||||
client.wait_for_text("Sign in to Server")
|
||||
client.send_chars("admin", 0.1)
|
||||
client.send_key("tab", 1)
|
||||
client.send_chars("stirling\n", 0.1)
|
||||
|
||||
# skip telemetry prompt
|
||||
client.wait_for_text("analytics")
|
||||
client.send_key("shift-tab", 1)
|
||||
client.send_key("tab", 1)
|
||||
client.send_key("tab", 1)
|
||||
client.send_key("kp_enter", 1)
|
||||
|
||||
# update password
|
||||
client.wait_for_text("password")
|
||||
client.send_key("tab", 1)
|
||||
client.send_key("shift-tab", 1)
|
||||
client.send_key("shift-tab", 1)
|
||||
client.send_key("shift-tab", 1)
|
||||
client.send_chars("stirling2", 0.1)
|
||||
client.send_key("tab", 1)
|
||||
client.send_chars("stirling2", 0.1)
|
||||
client.send_key("tab", 1)
|
||||
client.send_key("kp_enter", 1)
|
||||
|
||||
# final login
|
||||
client.wait_for_text("Sign in to Server")
|
||||
client.send_chars("admin", 0.1)
|
||||
client.send_key("tab", 1)
|
||||
client.send_chars("stirling2\n", 0.1)
|
||||
client.wait_for_text("Welcome to Stirling")
|
||||
client.send_key("kp_enter", 1)
|
||||
|
||||
# version prompt
|
||||
client.wait_for_text("Config")
|
||||
client.execute("ydotool mousemove -a -- 290 220") # Config button
|
||||
client.execute("ydotool click 0xC0")
|
||||
client.wait_for_text("Current Frontend Version")
|
||||
client.screenshot("stirling-pdf-version")
|
||||
'';
|
||||
|
||||
# Debug interactively with:
|
||||
# - nix-build -A nixosTests.stirling-pdf-desktop.driverInteractive
|
||||
# - ./result/bin/nixos-test-driver
|
||||
# - run_tests()
|
||||
# ssh -o User=root vsock%3 (can also do vsock/3, but % works with scp etc.)
|
||||
interactive.sshBackdoor.enable = true;
|
||||
interactive.nodes.client =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
# make the mouse visible
|
||||
services.cage.environment.WLR_NO_HARDWARE_CURSORS = "1";
|
||||
};
|
||||
interactive.nodes.server =
|
||||
{ ... }:
|
||||
{
|
||||
virtualisation.forwardPorts = [
|
||||
{
|
||||
from = "host";
|
||||
host.port = port;
|
||||
guest.port = port;
|
||||
}
|
||||
];
|
||||
# forwarded ports need to be accessible
|
||||
networking.firewall.allowedTCPPorts = [ port ];
|
||||
};
|
||||
}
|
||||
@@ -5956,6 +5956,19 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
gitlineage-nvim = buildVimPlugin {
|
||||
pname = "gitlineage.nvim";
|
||||
version = "0-unstable-2026-02-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "LionyxML";
|
||||
repo = "gitlineage.nvim";
|
||||
rev = "da795833925aae2e4d0cf75d2529d258bf4fb82c";
|
||||
hash = "sha256-SlZQMc7xQ3/cCFSgZV+hK9fjEdoIdZR/ESAJ3Z1gbxk=";
|
||||
};
|
||||
meta.homepage = "https://github.com/LionyxML/gitlineage.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
gitlinker-nvim = buildVimPlugin {
|
||||
pname = "gitlinker.nvim";
|
||||
version = "0-unstable-2023-02-03";
|
||||
|
||||
@@ -456,6 +456,7 @@ https://github.com/polarmutex/git-worktree.nvim/,HEAD,
|
||||
https://github.com/projekt0n/github-nvim-theme/,HEAD,
|
||||
https://github.com/wintermute-cell/gitignore.nvim/,HEAD,
|
||||
https://github.com/vim-scripts/gitignore.vim/,,
|
||||
https://github.com/LionyxML/gitlineage.nvim/,HEAD,
|
||||
https://github.com/ruifm/gitlinker.nvim/,,
|
||||
https://github.com/trevorhauter/gitportal.nvim/,,
|
||||
https://github.com/gregsexton/gitv/,,
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "puae";
|
||||
version = "0-unstable-2026-02-27";
|
||||
version = "0-unstable-2026-03-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "libretro-uae";
|
||||
rev = "bea8c084beaf576f54dc1be42d715d424265cda2";
|
||||
hash = "sha256-CU/BVXys7VBra4qaMBjTgKQP1hke7+wqJ2RMYUXIXlo=";
|
||||
rev = "b26def5c5ab9ea35019a42b950e014a22907ea13";
|
||||
hash = "sha256-DoNYpEqlrWueh/rwB4pkPYPdkSi+EVxP5T6BPgqv1nU=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -3,34 +3,45 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
nix-update-script,
|
||||
python3,
|
||||
python3Packages,
|
||||
ruby,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
qtmultimedia,
|
||||
qtsvg,
|
||||
qttools,
|
||||
qtxmlpatterns,
|
||||
qmake,
|
||||
which,
|
||||
perl,
|
||||
libgit2,
|
||||
libpng,
|
||||
expat,
|
||||
curl,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "klayout";
|
||||
version = "0.30.5";
|
||||
version = "0.30.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KLayout";
|
||||
repo = "klayout";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WigRictn6CxOPId2YitlEm43vEw+dSRWdoareD9HtMc=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-W8ry1+wxVOUxg4hXMd0OpcaWcVr6wUBC3eGgDney2Xc=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/klayout.pri --replace "-Wno-reserved-user-defined-literal" ""
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
dontUseQmakeConfigure = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
(python3.withPackages (ps: [ ps.tomli ]))
|
||||
installShellFiles
|
||||
@@ -38,28 +49,37 @@ stdenv.mkDerivation rec {
|
||||
ruby
|
||||
which
|
||||
wrapQtAppsHook
|
||||
qmake
|
||||
qtbase
|
||||
qtmultimedia
|
||||
qtsvg
|
||||
qttools
|
||||
qtxmlpatterns
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtmultimedia
|
||||
qtsvg
|
||||
qttools
|
||||
qtxmlpatterns
|
||||
libgit2
|
||||
libpng
|
||||
expat
|
||||
curl
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
mkdir -p $out/lib
|
||||
|
||||
# -qt5: Using Qt5 as per your previous configuration.
|
||||
# -rpath: Ensures the klayout binary can find its internal libraries (tl, db, etc.)
|
||||
# in the nix store without needing LD_LIBRARY_PATH.
|
||||
./build.sh \
|
||||
-qt5 \
|
||||
-prefix $out/lib \
|
||||
-option "-j$NIX_BUILD_CORES" \
|
||||
-rpath $out/lib
|
||||
-rpath $out/lib \
|
||||
-libpng \
|
||||
-libcurl \
|
||||
-libexpat
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
@@ -95,13 +115,20 @@ stdenv.mkDerivation rec {
|
||||
# Fix for: "gsiDeclQMessageLogger.cc: error: format not a string literal"
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests = {
|
||||
pythonPackage = python3Packages.klayout;
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "High performance layout viewer and editor with support for GDS and OASIS";
|
||||
mainProgram = "klayout";
|
||||
license = with lib.licenses; [ gpl2Plus ];
|
||||
homepage = "https://www.klayout.de/";
|
||||
changelog = "https://www.klayout.de/development.html#${version}";
|
||||
changelog = "https://www.klayout.de/development.html#${finalAttrs.version}";
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -146,13 +146,13 @@
|
||||
"vendorHash": "sha256-Koojva0MAw5WC942VbxZ6d1Pf1VwFvJMmp16TsHRS3w="
|
||||
},
|
||||
"carlpett_sops": {
|
||||
"hash": "sha256-QSo/1ImIWBpLFtML5b0gCjxjvk6/N/QoL9+dGJcYieQ=",
|
||||
"hash": "sha256-VQ3Wpf/xyZqo32zQ4SbYcF08jR5iBTqPZ9C3p+Ry06I=",
|
||||
"homepage": "https://registry.terraform.io/providers/carlpett/sops",
|
||||
"owner": "carlpett",
|
||||
"repo": "terraform-provider-sops",
|
||||
"rev": "v1.4.0",
|
||||
"rev": "v1.4.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-R8y+Zf0wX7Lx/HMl6HnTNU0pCsHSivUU33kXPaPco7k="
|
||||
"vendorHash": "sha256-SO3CX7pZ+q7ytz/55cxTPlW7ByY1zKhxkQxMiqAvm8o="
|
||||
},
|
||||
"checkly_checkly": {
|
||||
"hash": "sha256-OCcEGqjpgsfi0hveucRw7I1j6qtqvuB54oxJS8351RY=",
|
||||
@@ -959,13 +959,13 @@
|
||||
"vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0="
|
||||
},
|
||||
"newrelic_newrelic": {
|
||||
"hash": "sha256-nMQOxgGqdydq2BdlfIJa7kOuRDN4ctr5jREgMLtg6lA=",
|
||||
"hash": "sha256-ZBxkDXXeYgvoOzDqJH6iy/yz7lXDt8fEsvEMnU+EgkQ=",
|
||||
"homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
|
||||
"owner": "newrelic",
|
||||
"repo": "terraform-provider-newrelic",
|
||||
"rev": "v3.81.0",
|
||||
"rev": "v3.82.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-ToIawhtxS0EIew0PE9cc1W7Dge3LOrnuGbZo9kbdYJs="
|
||||
"vendorHash": "sha256-BjBzWdCU/gNZOsh5gp76LuGUgwiUc/TlOTJ6vjP8tyI="
|
||||
},
|
||||
"ns1-terraform_ns1": {
|
||||
"hash": "sha256-MX/Wd9Lztjn7uwDzJjs4bsSSp0PFzUgsu4jXke9jHL8=",
|
||||
@@ -1031,13 +1031,13 @@
|
||||
"vendorHash": "sha256-ofzbDmivXgH1i1Gjhpyp0bk3FDs5SnxwoRuNAWyMqyI="
|
||||
},
|
||||
"opentelekomcloud_opentelekomcloud": {
|
||||
"hash": "sha256-+kEqzgcEHlGq85U55AzJBHSIHif6ClVk7Y159YfbqpQ=",
|
||||
"hash": "sha256-JSVznbwVTc9/c1q16hv76qJuOI8eRPzsEo0ozRR6oxw=",
|
||||
"homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
|
||||
"owner": "opentelekomcloud",
|
||||
"repo": "terraform-provider-opentelekomcloud",
|
||||
"rev": "v1.36.61",
|
||||
"rev": "v1.36.62",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-mZT6DdYvsQiowLZf1U4xW2FNTzYPvxjcIZ6ZWuTUZMs="
|
||||
"vendorHash": "sha256-QFC9oFQ6NiQZiJCltMrwX8p9shm6vEfVnRpJBAtnPW4="
|
||||
},
|
||||
"opsgenie_opsgenie": {
|
||||
"hash": "sha256-Y67kcg/ovvZc22l1CBz0Mqu7DAIit5F0jQNfQrl2EGI=",
|
||||
|
||||
@@ -200,9 +200,9 @@ rec {
|
||||
mkTerraform = attrs: pluggable (generic attrs);
|
||||
|
||||
terraform_1 = mkTerraform {
|
||||
version = "1.14.6";
|
||||
hash = "sha256-zQgy9sGGsE9VHPWerzTNcGj+JxbaGhflpKisZhpepXE=";
|
||||
vendorHash = "sha256-L6b48ZRoW1ItpJsUV7f4Ce/rB9uUhwE10tfooG1P2rw=";
|
||||
version = "1.14.8";
|
||||
hash = "sha256-gKHLwigKc1OTr1Tomz+1p22B/zz4ZMn3TY5qxq82G3Q=";
|
||||
vendorHash = "sha256-45RRqaImkOtuFun2Re2c7kbponyjpQA8xG8FfF3K9Ag=";
|
||||
patches = [ ./provider-path-0_15.patch ];
|
||||
passthru = {
|
||||
inherit plugins;
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule {
|
||||
pname = "ldk-node-go";
|
||||
version = "0-unstable-2025-09-03";
|
||||
version = "0-unstable-2026-02-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getAlby";
|
||||
repo = "ldk-node-go";
|
||||
rev = "91db97badfc261f8c680cf64124914ef97d08d0d";
|
||||
hash = "sha256-7HbwMDLi1vRWMbUzx1bHyq/r+BwEejbz7SM1j/5SdmE=";
|
||||
rev = "f4fc565783308dd4835ba1473a17f25162db9c36";
|
||||
hash = "sha256-jemAzRuZU9aQpENwWtvyGAh9EJUgeb1f1SCx/FpOOPc=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ldk-node";
|
||||
version = "0-unstable-2025-09-03";
|
||||
version = "0-unstable-2026-02-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getAlby";
|
||||
repo = "ldk-node";
|
||||
rev = "75825474e5a551bb5ae5d1cf62cc434a26c30259";
|
||||
hash = "sha256-8LhR2Ep7y+zXTKKwVdqmAqedq1FoTfdL3GyhCruHnz8=";
|
||||
rev = "3996cf18b10545f54c377212e155bb6bd664888e";
|
||||
hash = "sha256-mjIs7CeTRQ7Xuk9V/6LeXMDRZsd/wljeFHZ2vgEe1hg=";
|
||||
};
|
||||
|
||||
buildFeatures = [ "uniffi" ];
|
||||
|
||||
cargoHash = "sha256-VLQohnbuEdnu2E+BXe2mDKFUnDVlSY09rIIvHMIQ+Hg=";
|
||||
cargoHash = "sha256-30eLUzxBiGwQqWOD8MR9eOG8LWM5T8eTQuMTK3bjmV8=";
|
||||
|
||||
# Skip tests because they download bitcoin-core and electrs zip files, and then fail
|
||||
doCheck = false;
|
||||
|
||||
@@ -5,12 +5,10 @@
|
||||
fetchYarnDeps,
|
||||
fixup-yarn-lock,
|
||||
nodejs,
|
||||
pkgs,
|
||||
yarn,
|
||||
stdenv,
|
||||
makeWrapper,
|
||||
callPackage,
|
||||
go,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -23,16 +21,16 @@ in
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "albyhub";
|
||||
version = "1.21.0";
|
||||
version = "1.21.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getAlby";
|
||||
repo = "hub";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-9NtXnEOHgzYM3QUwFKBJ90ZGghgU2/i+hATim4N/JSs=";
|
||||
hash = "sha256-xjFEou+mDtEf7079en5ypoU5P0tf+looeHZS4j1jKzg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-V3uWofAchbLgIadwH4IGyv2lr0cLSz2QCQ6ffhPP9n0=";
|
||||
vendorHash = "sha256-NJeIEFc8oc5rMWAuvrgsnOi3j779mhwMKSALswRy+nE=";
|
||||
proxyVendor = true; # needed for secp256k1-zkp CGO bindings
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -49,7 +47,7 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
frontendYarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = finalAttrs.src + "/frontend/yarn.lock";
|
||||
hash = "sha256-ikGH45JKheivNKwF7juC6rmwU51S3qiicDdYLzjgFJE=";
|
||||
hash = "sha256-wdKm8Zk2iAPvH+EbQxvznctkqHgx8xl/Im37vHmHnoA=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
||||
@@ -3,24 +3,24 @@
|
||||
|
||||
let
|
||||
pname = "brave";
|
||||
version = "1.88.134";
|
||||
version = "1.88.136";
|
||||
|
||||
allArchives = {
|
||||
aarch64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
|
||||
hash = "sha256-F29vQC+Fh1nEZhZzK9/y0mJEEFDkbhomm6uM35/Nr9A=";
|
||||
hash = "sha256-niseHDxEz2fhGeLUCMtMK2GYhe4U5Zk/btf8jariaiA=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
hash = "sha256-rw2ChYy69f4nkKDj5DQvf3WLF6m1y3uLizwtPDZttqc=";
|
||||
hash = "sha256-2OLaXWJ7J58z7y9bUrzWNwRL1T6ZOCDHeUmcb/qnHY0=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
|
||||
hash = "sha256-Q3wpSLj7yUPkaua01sMvShVFaJ4m0KTN+i7/zSS4WVw=";
|
||||
hash = "sha256-Jf/dQy8o87iytsWcTUpPlYTOcdvnzJjlkH1M6y+x9Dw=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
|
||||
hash = "sha256-IzNgmv6tPBsC9vqSTTQnIx6eJLDlKcDGn2JBE6mpuvk=";
|
||||
hash = "sha256-NvDEExLdgeukyT7MTe1MR3Emp0o1Q2bdO5mpSWeBGcA=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-valgrind";
|
||||
version = "2.4.0";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jfrimmel";
|
||||
repo = "cargo-valgrind";
|
||||
tag = finalAttrs.version;
|
||||
sha256 = "sha256-sVW3zNe0a9iQQ0vRWJofqG4gwUJ/w0U4ugVyMNtWX98=";
|
||||
sha256 = "sha256-ImZ0EHg/guPfx3vOfdi1nPz0MG0+61iZCFiVhNglZbs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-sRJGnbQFCk+SJtG/hnde+8ggZuutrdk0279ziickmnA=";
|
||||
cargoHash = "sha256-tH1RF3Uw9KkykgbPtXNY88uTvQ0f++aCP95Sd6Zexc8=";
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
|
||||
@@ -23,13 +23,13 @@ let
|
||||
in
|
||||
buildDartApplication rec {
|
||||
pname = "dart-sass";
|
||||
version = "1.97.3";
|
||||
version = "1.98.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sass";
|
||||
repo = "dart-sass";
|
||||
tag = version;
|
||||
hash = "sha256-9yhjqkWmtSqdLcmZWvHcz46xqN7yd27Quygg/I+WHag=";
|
||||
hash = "sha256-3RmJ41azPeKyLGXtobD6drTaucJGbTWZXPmbYOJlDFQ=";
|
||||
};
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
||||
@@ -4,31 +4,31 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "_fe_analyzer_shared",
|
||||
"sha256": "c209688d9f5a5f26b2fb47a188131a6fb9e876ae9e47af3737c0b4f58a93470d",
|
||||
"sha256": "3b19a47f6ea7c2632760777c78174f47f6aec1e05f0cd611380d4593b8af1dbc",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "91.0.0"
|
||||
"version": "96.0.0"
|
||||
},
|
||||
"analyzer": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "analyzer",
|
||||
"sha256": "f51c8499b35f9b26820cfe914828a6a98a94efd5cc78b37bb7d03debae3a1d08",
|
||||
"sha256": "0c516bc4ad36a1a75759e54d5047cb9d15cded4459df01aa35a0b5ec7db2c2a0",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "8.4.1"
|
||||
"version": "10.2.0"
|
||||
},
|
||||
"archive": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "archive",
|
||||
"sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd",
|
||||
"sha256": "a96e8b390886ee8abb49b7bd3ac8df6f451c621619f52a26e815fdcf568959ff",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.0.7"
|
||||
"version": "4.0.9"
|
||||
},
|
||||
"args": {
|
||||
"dependency": "direct main",
|
||||
@@ -174,41 +174,41 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "dart_mappable",
|
||||
"sha256": "0e219930c9f7b9e0f14ae7c1de931c401875110fd5c67975b6b9492a6d3a531b",
|
||||
"sha256": "97526bd5e1b1739be5c7379c51d391d074b6bbd109e6e92be49028ecb1a9853c",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.6.1"
|
||||
"version": "4.7.0"
|
||||
},
|
||||
"dart_style": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "dart_style",
|
||||
"sha256": "a9c30492da18ff84efe2422ba2d319a89942d93e58eb0b73d32abe822ef54b7b",
|
||||
"sha256": "29f7ecc274a86d32920b1d9cfc7502fa87220da41ec60b55f329559d5732e2b2",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.1.3"
|
||||
"version": "3.1.7"
|
||||
},
|
||||
"dartdoc": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "dartdoc",
|
||||
"sha256": "73335ae67d2766ff753dc78b0f33ceb399ba5b94a5cfe8ce8d4128fb631717ee",
|
||||
"sha256": "c60c01dc5aeb095a3b7b875150fe0e50b46330aec5d3417e7bae235ccd8a00ab",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "9.0.0"
|
||||
"version": "9.0.4"
|
||||
},
|
||||
"ffi": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "ffi",
|
||||
"sha256": "d07d37192dbf97461359c1518788f203b0c9102cfd2c35a716b823741219542c",
|
||||
"sha256": "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.1.5"
|
||||
"version": "2.2.0"
|
||||
},
|
||||
"file": {
|
||||
"dependency": "transitive",
|
||||
@@ -324,21 +324,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "json_annotation",
|
||||
"sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1",
|
||||
"sha256": "cb09e7dac6210041fad964ed7fbee004f14258b4eca4040f72d1234062ace4c8",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.9.0"
|
||||
"version": "4.11.0"
|
||||
},
|
||||
"lints": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "lints",
|
||||
"sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0",
|
||||
"sha256": "12f842a479589fea194fe5c5a3095abc7be0c1f2ddfa9a0e76aed1dbd26a87df",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.0.0"
|
||||
"version": "6.1.0"
|
||||
},
|
||||
"logging": {
|
||||
"dependency": "transitive",
|
||||
@@ -364,21 +364,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "matcher",
|
||||
"sha256": "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6",
|
||||
"sha256": "dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.12.18"
|
||||
"version": "0.12.19"
|
||||
},
|
||||
"meta": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "meta",
|
||||
"sha256": "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349",
|
||||
"sha256": "9f29b9bcc8ee287b1a31e0d01be0eae99a930dbffdaecf04b3f3d82a969f296f",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.18.0"
|
||||
"version": "1.18.1"
|
||||
},
|
||||
"mime": {
|
||||
"dependency": "transitive",
|
||||
@@ -464,11 +464,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "petitparser",
|
||||
"sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1",
|
||||
"sha256": "91bd59303e9f769f108f8df05e371341b15d59e995e6806aefab827b58336675",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "7.0.1"
|
||||
"version": "7.0.2"
|
||||
},
|
||||
"pool": {
|
||||
"dependency": "direct main",
|
||||
@@ -484,11 +484,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "posix",
|
||||
"sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61",
|
||||
"sha256": "185ef7606574f789b40f289c233efa52e96dead518aed988e040a10737febb07",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.0.3"
|
||||
"version": "6.5.0"
|
||||
},
|
||||
"protobuf": {
|
||||
"dependency": "direct main",
|
||||
@@ -614,11 +614,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "source_span",
|
||||
"sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
|
||||
"sha256": "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.10.1"
|
||||
"version": "1.10.2"
|
||||
},
|
||||
"stack_trace": {
|
||||
"dependency": "direct main",
|
||||
@@ -674,31 +674,31 @@
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "test",
|
||||
"sha256": "54c516bbb7cee2754d327ad4fca637f78abfc3cbcc5ace83b3eda117e42cd71a",
|
||||
"sha256": "280d6d890011ca966ad08df7e8a4ddfab0fb3aa49f96ed6de56e3521347a9ae7",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.29.0"
|
||||
"version": "1.30.0"
|
||||
},
|
||||
"test_api": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "test_api",
|
||||
"sha256": "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636",
|
||||
"sha256": "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.7.9"
|
||||
"version": "0.7.10"
|
||||
},
|
||||
"test_core": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "test_core",
|
||||
"sha256": "394f07d21f0f2255ec9e3989f21e54d3c7dc0e6e9dbce160e5a9c1a6be0e2943",
|
||||
"sha256": "0381bd1585d1a924763c308100f2138205252fb90c9d4eeaf28489ee65ccde51",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.6.15"
|
||||
"version": "0.6.16"
|
||||
},
|
||||
"test_descriptor": {
|
||||
"dependency": "direct dev",
|
||||
@@ -822,6 +822,6 @@
|
||||
}
|
||||
},
|
||||
"sdks": {
|
||||
"dart": ">=3.9.0 <4.0.0"
|
||||
"dart": ">=3.10.0 <4.0.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,6 +21,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
rm -r "__MACOSX"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ installFonts ];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "forgejo-mcp";
|
||||
version = "2.16.0";
|
||||
version = "2.17.0";
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "goern";
|
||||
repo = "forgejo-mcp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-LiLzkpbNqY8YKhsDt1Y6SrI28YEAy2KWQiw206Q4MbQ=";
|
||||
hash = "sha256-DcpS2467MCFfIVsdYEfd5t6kPjMeLElMQbDyuXI04XE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-tQyZqtmJnbVIG8lpWeZjflv92OdOdmzJXAmq4xrI5Pw=";
|
||||
vendorHash = "sha256-5CV4drUaYKtZ/RoydAatblhsqU8VWYzYByjhcb9KZVY=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gdu";
|
||||
version = "5.34.1";
|
||||
version = "5.34.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dundee";
|
||||
repo = "gdu";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-u/71Zt5LRt0pHiGyuiE57OYdjA9wtliRI+2rLjFzchg=";
|
||||
hash = "sha256-dt16bq0I//ptofT3s2OnU6C4Rd4itov9+Rzz7jai6hw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Dtjirx2sHbN4AWxED5weRGtCRNc2VIdaz7RHssGuJeQ=";
|
||||
|
||||
@@ -15,18 +15,18 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "gemini-cli";
|
||||
version = "0.34.0";
|
||||
version = "0.35.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google-gemini";
|
||||
repo = "gemini-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/HmcLnScZ2pmzGnRLsNHoqrakyt++1fCv/P2IeE8pGo=";
|
||||
hash = "sha256-tAv34dHEf9uK6A/d+zkYYB7FVPviRnjYrP5E23b9OXw=";
|
||||
};
|
||||
|
||||
nodejs = nodejs_22;
|
||||
|
||||
npmDepsHash = "sha256-3Y9QJC4dqvnCH3qFSsvFMK+XtHnZyYPBP1voLpHpHA4=";
|
||||
npmDepsHash = "sha256-gJJ2UD6m5vwUwYoYU8L4bjefrTX9CMWRYz4YTHi6Q/M=";
|
||||
|
||||
dontPatchElf = stdenv.isDarwin;
|
||||
|
||||
|
||||
@@ -18,16 +18,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "gitoxide";
|
||||
version = "0.50.0";
|
||||
version = "0.52.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GitoxideLabs";
|
||||
repo = "gitoxide";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-TUBBt0RxmyXjBF4fKG6slfU19DjbWkPsaUww0ILz8/k=";
|
||||
hash = "sha256-nOpe+w0ILxS2f7EdDo1gg31eaESobKHdQ1F4pzpxsfE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-CLFDZ/fv0FLcbWvF8LN8dTOKeRCsVy2Ff2kqqWk0LLM=";
|
||||
cargoHash = "sha256-z/aytFu8b23cVsZuIBcjbNUhsvoWi5saQKVgrCEq5+s=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
@@ -60,7 +60,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
mit # or
|
||||
asl20
|
||||
];
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ hythera ];
|
||||
# NB: `ein` is also provided by this package, but `nix run
|
||||
# nixpkgs#gitoxide` doesn't work at all without this set.
|
||||
mainProgram = "gix";
|
||||
|
||||
@@ -1,210 +0,0 @@
|
||||
{
|
||||
stdenvNoCC,
|
||||
lib,
|
||||
fetchurl,
|
||||
autoPatchelfHook,
|
||||
copyDesktopItems,
|
||||
freetype,
|
||||
makeDesktopItem,
|
||||
makeWrapper,
|
||||
libGL,
|
||||
libGLU,
|
||||
# Darwin cannot handle these when devendored:
|
||||
# - DYLD_LIBRARY_PATH masks system libraries with similar, differently-cased names and cause missing symbol errors
|
||||
# - symlinks cause unrelated BMP image loading to fail(?)
|
||||
devendorImageLibs ? !stdenvNoCC.hostPlatform.isDarwin,
|
||||
libjpeg,
|
||||
libpng12,
|
||||
libx11,
|
||||
libxext,
|
||||
libxi,
|
||||
libxmu,
|
||||
runtimeShell,
|
||||
SDL_compat,
|
||||
SDL_image,
|
||||
SDL_ttf,
|
||||
undmg,
|
||||
unrpa,
|
||||
zlib,
|
||||
}:
|
||||
|
||||
let
|
||||
stdenv = stdenvNoCC;
|
||||
srcDetails =
|
||||
rec {
|
||||
x86_64-linux = {
|
||||
archiveDate = "20240825224413";
|
||||
urlSuffix = "%5blinux-x86%5d%5b18161880%5d.tar.bz2";
|
||||
hash = "sha256-7FoFz88dWYHs2/pxkEwnmiFeeb3+slayrWknEJoAB9o=";
|
||||
};
|
||||
i686-linux = x86_64-linux;
|
||||
x86_64-darwin = {
|
||||
archiveDate = "20240825224411";
|
||||
urlSuffix = "%5bmac%5d%5b1DFC84A6%5d.dmg";
|
||||
hash = "sha256-Sc5BAlpJsffjcNrZ8+VU3n7G10DoqDKQn/leHDW32Y8=";
|
||||
};
|
||||
}
|
||||
.${stdenv.hostPlatform.system}
|
||||
or (throw "Don't know how to fetch source for ${stdenv.hostPlatform.system}!");
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "katawa-shoujo";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://web.archive.org/web/${srcDetails.archiveDate}/https://cdn.fhs.sh/ks/bin/gold_${version}/%5b4ls%5d_katawa_shoujo_${version}-${srcDetails.urlSuffix}";
|
||||
inherit (srcDetails) hash;
|
||||
};
|
||||
|
||||
# fetchzip requires a custom unpackPhase to handle dmg, fetchurl cannot handle undmg producing >1 directory without this
|
||||
sourceRoot = ".";
|
||||
|
||||
nativeBuildInputs =
|
||||
lib.optionals stdenv.hostPlatform.isLinux [
|
||||
autoPatchelfHook
|
||||
copyDesktopItems
|
||||
unrpa
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
makeWrapper
|
||||
undmg
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
freetype
|
||||
SDL_compat
|
||||
zlib
|
||||
]
|
||||
++ lib.optionals devendorImageLibs [
|
||||
libjpeg
|
||||
libpng12
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
libx11
|
||||
libxext
|
||||
libxi
|
||||
libxmu
|
||||
libGL
|
||||
libGLU
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem rec {
|
||||
name = "katawa-shoujo";
|
||||
desktopName = "Katawa Shoujo";
|
||||
comment = meta.description;
|
||||
exec = name;
|
||||
icon = name;
|
||||
categories = [ "Game" ];
|
||||
})
|
||||
];
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase =
|
||||
let
|
||||
platformDetails =
|
||||
with stdenv.hostPlatform;
|
||||
if isDarwin then
|
||||
rec {
|
||||
arch = "darwin-x86_64";
|
||||
sourceDir = "'Katawa Shoujo'.app";
|
||||
installDir = "$out/Applications/'Katawa Shoujo'.app";
|
||||
dataDir = "${installDir}/Contents/Resources/autorun";
|
||||
bin = "${installDir}/Contents/MacOS/'Katawa Shoujo'";
|
||||
}
|
||||
else
|
||||
rec {
|
||||
arch = "linux-${if isx86_64 then "x86_64" else "i686"}";
|
||||
sourceDir = "'Katawa Shoujo'-${version}-linux";
|
||||
installDir = "$out/share/katawa-shoujo";
|
||||
dataDir = installDir;
|
||||
bin = "${installDir}/'Katawa Shoujo'.sh";
|
||||
};
|
||||
libDir = with platformDetails; "${dataDir}/lib/${arch}";
|
||||
in
|
||||
with platformDetails;
|
||||
''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$(dirname ${installDir})"
|
||||
cp -R ${sourceDir} ${installDir}
|
||||
|
||||
# Simplify launcher script
|
||||
cat <<EOF >${bin}
|
||||
#!${runtimeShell}
|
||||
exec \$RENPY_GDB ${libDir}/'Katawa Shoujo' \$RENPY_PYARGS -EO ${dataDir}/'Katawa Shoujo'.py "\$@"
|
||||
EOF
|
||||
|
||||
''
|
||||
+ (
|
||||
if stdenv.hostPlatform.isDarwin then
|
||||
''
|
||||
# No autoPatchelfHook on Darwin
|
||||
wrapProgram ${bin} \
|
||||
--prefix DYLD_LIBRARY_PATH : ${lib.makeLibraryPath buildInputs}
|
||||
''
|
||||
else
|
||||
''
|
||||
# Extract icon for xdg desktop file
|
||||
unrpa ${dataDir}/game/data.rpa
|
||||
install -Dm644 ui/icon.png $out/share/icons/hicolor/512x512/apps/katawa-shoujo.png
|
||||
''
|
||||
)
|
||||
+ ''
|
||||
|
||||
# Delete binaries for wrong arch, autoPatchelfHook gets confused by them & less to keep in the store
|
||||
find "$(dirname ${libDir})" -mindepth 1 -maxdepth 1 \
|
||||
-not -name 'python*' -not -name ${arch} \
|
||||
-exec rm -r {} \;
|
||||
|
||||
# Replace some bundled libs so Nixpkgs' versions are used
|
||||
rm ${libDir}/libz*
|
||||
rm ${libDir}/libfreetype*
|
||||
rm ${libDir}/libSDL-1.2*
|
||||
''
|
||||
+ lib.optionalString devendorImageLibs ''
|
||||
rm ${libDir}/libjpeg*
|
||||
rm ${libDir}/libpng12*
|
||||
''
|
||||
+ ''
|
||||
|
||||
mkdir -p $out/share/{doc,licenses}/katawa-shoujo
|
||||
mv ${dataDir}/'Game Manual'.pdf $out/share/doc/katawa-shoujo/
|
||||
mv ${dataDir}/LICENSE.txt $out/share/licenses/katawa-shoujo/
|
||||
|
||||
mkdir -p $out/bin
|
||||
ln -s ${bin} $out/bin/katawa-shoujo
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Bishoujo-style visual novel by Four Leaf Studios, built in Ren'Py";
|
||||
longDescription = ''
|
||||
Katawa Shoujo is a bishoujo-style visual novel set in the fictional Yamaku High School for disabled children,
|
||||
located somewhere in modern Japan. Hisao Nakai, a normal boy living a normal life, has his life turned upside down
|
||||
when a congenital heart defect forces him to move to a new school after a long hospitalization. Despite his difficulties,
|
||||
Hisao is able to find friends—and perhaps love, if he plays his cards right. There are five main paths corresponding
|
||||
to the 5 main female characters, each path following the storyline pertaining to that character.
|
||||
|
||||
The story is told through the perspective of the main character, using a first person narrative. The game uses a
|
||||
traditional text and sprite-based visual novel model with an ADV text box.
|
||||
|
||||
Katawa Shoujo contains adult material, and was created using the Ren'Py scripting system. It is the product of an
|
||||
international team of amateur developers, and is available free of charge under the Creative Commons BY-NC-ND License.
|
||||
'';
|
||||
homepage = "https://www.katawa-shoujo.com/";
|
||||
# https://www.katawa-shoujo.com/about.php
|
||||
# November 2022: Update, is it still ND?
|
||||
# https://ks.renai.us/viewtopic.php?f=13&p=248149#p248149
|
||||
license = with lib.licenses; [ cc-by-nc-nd-30 ];
|
||||
maintainers = with lib.maintainers; [ OPNA2608 ];
|
||||
# Building Ren'Py6 from source would allow more, but too much of a hassle
|
||||
platforms = lib.platforms.x86;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
# Needs different srcDetails & installPhase
|
||||
broken = stdenv.hostPlatform.isWindows;
|
||||
};
|
||||
}
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "kitty-themes";
|
||||
version = "0-unstable-2026-03-09";
|
||||
version = "0-unstable-2026-03-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kovidgoyal";
|
||||
repo = "kitty-themes";
|
||||
rev = "d0008b45127c9765b4beb061ce30d3fd33e3ef86";
|
||||
hash = "sha256-aHAe6SFrnVTpcfpUibHHgzmmudBye7QQOq4Firz+gaA=";
|
||||
rev = "d28a70284e15871108ba45295ce555e893f42f0a";
|
||||
hash = "sha256-Qc5DBupW0FJVuBf0+Jhq55XkgWpNiSu3TO8jb/cVx1I=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -36,7 +36,7 @@ let
|
||||
|
||||
pname = "librewolf-bin-unwrapped";
|
||||
|
||||
version = "148.0.2-2";
|
||||
version = "149.0-1";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@@ -46,8 +46,8 @@ stdenv.mkDerivation {
|
||||
url = "https://codeberg.org/api/packages/librewolf/generic/librewolf/${version}/librewolf-${version}-${arch}-package.tar.xz";
|
||||
hash =
|
||||
{
|
||||
x86_64-linux = "sha256-4FigAIvksbwJ46XqH225woK+inQHUnvyxvQBP/yyagU=";
|
||||
aarch64-linux = "sha256-wp31BZLUgH+pXkaDnlUtXMNuacWEgQbnkxMYt2vhKZY=";
|
||||
x86_64-linux = "sha256-pW10vDNZMFmNx43yI3dsSO0FNQFS16NVBu2X9NAa+Uo=";
|
||||
aarch64-linux = "sha256-2mOleX25KcNG8+2jSgXI2rTDvZ6jVwgVYOooIOHqqJE=";
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or throwSystem;
|
||||
};
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libtorrent-rakshasa";
|
||||
version = "0.16.6";
|
||||
version = "0.16.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rakshasa";
|
||||
repo = "libtorrent";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-pabtM8nf/x/kn661R9STeX3yaSGAP/JbJQkLffUi+CU=";
|
||||
hash = "sha256-catUO7dlJUu8td/+EtBsEs128y/c+teT5xk5H+vkipE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.1.23";
|
||||
version = "2.1.26";
|
||||
pname = "lunatask";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lunatask/lunatask/releases/download/v${version}/Lunatask-${version}.AppImage";
|
||||
hash = "sha256-IvQNc52xd13zCyMnAXRvG/g2xAGYGqC2dk4EHu8w0Gg=";
|
||||
hash = "sha256-Mmn96HMUDHbKKLc+5CDKzYh+M9LN42TR/aRhm5MNv9g=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "moonlight";
|
||||
version = "2026.3.2";
|
||||
version = "2026.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moonlight-mod";
|
||||
repo = "moonlight";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-VcYHwjm5RUfvkABts5ZP+qqqxBHyiF6JwTcBBG+xABA=";
|
||||
hash = "sha256-hGyUoAR0Pv6mkImRDlrnfYAucgJwg2phj6moxewf3aY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nixbit";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pbek";
|
||||
repo = "nixbit";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-f+2ULyHkTV1ACJbp6Evu6hGtQd4wRmmUa38D0YERvuY=";
|
||||
hash = "sha256-jSvYqTBsFWZqk/v7Y+ONfPDJekxRFi1tIt1UIGdRcEs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
}:
|
||||
let
|
||||
pname = "open-webui";
|
||||
version = "0.8.10";
|
||||
version = "0.8.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-webui";
|
||||
repo = "open-webui";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-wXkU3j0Bzpd2H5aVkqmKyUHxukRamBYQh8HBXB8tLpM=";
|
||||
hash = "sha256-ynWv/X4IBKO09+ira+NUwbzw51MK9aEvGkeaHzCngd0=";
|
||||
};
|
||||
|
||||
frontend = buildNpmPackage rec {
|
||||
@@ -32,7 +32,7 @@ let
|
||||
url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-ZiIEGeKee/qEhe44SGlPTDhwP+vL9K8RkFEOeUdzUI8=";
|
||||
npmDepsHash = "sha256-UeoU7UGQ+0ViEIjK/Ze7KazB/JCyFYljHyTmxuza4v8=";
|
||||
|
||||
# See https://github.com/open-webui/open-webui/issues/15880
|
||||
npmFlags = [
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
}:
|
||||
buildDartApplication rec {
|
||||
pname = "pana";
|
||||
version = "0.23.11";
|
||||
version = "0.23.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dart-lang";
|
||||
repo = "pana";
|
||||
tag = version;
|
||||
hash = "sha256-v4iGvywxxcPy0JcXRNo/7JIKIcy777XBMApm0dcgLnM=";
|
||||
hash = "sha256-y72E2ojoAJF38QLb+5iKiAjF7c8AqglmY0qI53MohX4=";
|
||||
};
|
||||
|
||||
dartEntryPoints = {
|
||||
|
||||
@@ -4,21 +4,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "_fe_analyzer_shared",
|
||||
"sha256": "3b19a47f6ea7c2632760777c78174f47f6aec1e05f0cd611380d4593b8af1dbc",
|
||||
"sha256": "1dd467c7e56541bea70bbd35d537e3aa12dfba81f39e2a75bb6a61fc5595985b",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "96.0.0"
|
||||
"version": "97.0.0"
|
||||
},
|
||||
"analyzer": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "analyzer",
|
||||
"sha256": "0c516bc4ad36a1a75759e54d5047cb9d15cded4459df01aa35a0b5ec7db2c2a0",
|
||||
"sha256": "041602214e3ec5a02ba85c08fe8e381aa25ac5367db17d03fbb6d22d851d4bba",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "10.2.0"
|
||||
"version": "11.0.0"
|
||||
},
|
||||
"args": {
|
||||
"dependency": "direct main",
|
||||
@@ -34,11 +34,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "async",
|
||||
"sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
|
||||
"sha256": "e2eb0491ba5ddb6177742d2da23904574082139b07c1e33b8503b9f46f3e1a37",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.13.0"
|
||||
"version": "2.13.1"
|
||||
},
|
||||
"boolean_selector": {
|
||||
"dependency": "transitive",
|
||||
@@ -54,11 +54,11 @@
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "build",
|
||||
"sha256": "275bf6bb2a00a9852c28d4e0b410da1d833a734d57d39d44f94bfc895a484ec3",
|
||||
"sha256": "aadd943f4f8cc946882c954c187e6115a84c98c81ad1d9c6cbf0895a8c85da9c",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.0.4"
|
||||
"version": "4.0.5"
|
||||
},
|
||||
"build_config": {
|
||||
"dependency": "direct dev",
|
||||
@@ -84,11 +84,11 @@
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "build_runner",
|
||||
"sha256": "3552e5c2874ed47cf9ed9d6813ac71b2276ee07622f48530468b8013f1767e3f",
|
||||
"sha256": "521daf8d189deb79ba474e43a696b41c49fb3987818dbacf3308f1e03673a75e",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.13.0"
|
||||
"version": "2.13.1"
|
||||
},
|
||||
"build_verify": {
|
||||
"dependency": "direct dev",
|
||||
@@ -124,11 +124,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "built_value",
|
||||
"sha256": "6ae8a6435a8c6520c7077b107e77f1fb4ba7009633259a4d49a8afd8e7efc5e9",
|
||||
"sha256": "0730c18c770d05636a8f945c32a4d7d81cb6e0f0148c8db4ad12e7748f7e49af",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "8.12.4"
|
||||
"version": "8.12.5"
|
||||
},
|
||||
"checked_yaml": {
|
||||
"dependency": "transitive",
|
||||
@@ -354,11 +354,11 @@
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "json_serializable",
|
||||
"sha256": "44729f5c45748e6748f6b9a57ab8f7e4336edc8ae41fc295070e3814e616a6c0",
|
||||
"sha256": "fbcf404b03520e6e795f6b9b39badb2b788407dfc0a50cf39158a6ae1ca78925",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.13.0"
|
||||
"version": "6.13.1"
|
||||
},
|
||||
"lints": {
|
||||
"dependency": "direct main",
|
||||
@@ -544,21 +544,21 @@
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "source_gen",
|
||||
"sha256": "adc962c96fffb2de1728ef396a995aaedcafbe635abdca13d2a987ce17e57751",
|
||||
"sha256": "732792cfd197d2161a65bb029606a46e0a18ff30ef9e141a7a82172b05ea8ecd",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.2.1"
|
||||
"version": "4.2.2"
|
||||
},
|
||||
"source_helper": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "source_helper",
|
||||
"sha256": "4a85e90b50694e652075cbe4575665539d253e6ec10e46e76b45368ab5e3caae",
|
||||
"sha256": "1d3b229b2934034fb2e691fbb3d53e0f75a4af7b1407f88425ed8f209bcb1b8f",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.3.10"
|
||||
"version": "1.3.11"
|
||||
},
|
||||
"source_map_stack_trace": {
|
||||
"dependency": "transitive",
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
stdenv,
|
||||
testers,
|
||||
texinfo,
|
||||
@@ -10,33 +9,15 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "quickjs-ng";
|
||||
version = "0.11.0";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "quickjs-ng";
|
||||
repo = "quickjs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Mb0YyxTWU6a8HFTVBmlJ5yGEDmjKXHqTSszAvb8Y01U=";
|
||||
hash = "sha256-t1GvD1iBRfJwzZHoLxMbE2Gh1Ow8v0ZASxCVnOT7ST4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# CVE-2026-1145: Fix heap buffer overflow in js_typed_array_constructor_ta
|
||||
# https://github.com/quickjs-ng/quickjs/issues/1305
|
||||
(fetchpatch {
|
||||
name = "CVE-2026-1145.patch";
|
||||
url = "https://github.com/quickjs-ng/quickjs/commit/53aebe66170d545bb6265906fe4324e4477de8b4.patch";
|
||||
hash = "sha256-PObMEqIush07mQ7YcoFUJ3rXitOlEU0tCsgVi6P2zW0=";
|
||||
})
|
||||
# CVE-2026-1144: Fix OOB access in atomic ops
|
||||
# https://github.com/quickjs-ng/quickjs/issues/1301
|
||||
# https://github.com/quickjs-ng/quickjs/issues/1302
|
||||
(fetchpatch {
|
||||
name = "CVE-2026-1144.patch";
|
||||
url = "https://github.com/quickjs-ng/quickjs/commit/ea3e9d77454e8fc9cb3ef3c504e9c16af5a80141.patch";
|
||||
hash = "sha256-ph6U+Mz7gxR4RWEtc+XU5fO6qjApQTqqW5dzwnOqTdc=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"bin"
|
||||
|
||||
@@ -125,6 +125,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
knownVulnerabilities = [
|
||||
"CVE-2026-1144"
|
||||
"CVE-2026-1145"
|
||||
"CVE-2026-3979"
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rtorrent";
|
||||
version = "0.16.6";
|
||||
version = "0.16.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rakshasa";
|
||||
repo = "rtorrent";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Y8LFysyfOsgsMmbLFcf+SjKKDdTFBwDPQU0hW6hiXII=";
|
||||
hash = "sha256-TG5wEJwOPhgmKNcpjTuSu6MNk91t9sR33mXIUueR4yA=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
Generated
+61
-57
@@ -676,27 +676,6 @@
|
||||
"module": "sha256-xE++kmmtbMtw3gmf9fq2d6Te/LtiW7zhQCgFnRS0CHY=",
|
||||
"pom": "sha256-eW8zaKlRawvRBQ6CiZm3JzhD0FrBOEmATFxDSGlYMEg="
|
||||
},
|
||||
"com/fasterxml/jackson/jakarta/rs#jackson-jakarta-rs-base/2.20.2": {
|
||||
"jar": "sha256-JbudRXuOVwUqPLQaA6ahUEXxrDKpRrvGPlHxczhVXyo=",
|
||||
"module": "sha256-Bieb1DnG6C59t9t9r/PYcSJFQcHg4z2vukfgow4vyNM=",
|
||||
"pom": "sha256-4cJKFc1aFWwVxzMXsZnLcdPFwAQIWL9aEZzmvoP79YI="
|
||||
},
|
||||
"com/fasterxml/jackson/jakarta/rs#jackson-jakarta-rs-json-provider/2.20.2": {
|
||||
"jar": "sha256-/7CNTeNMN2mfheATOf6DAzVYJZnSHTY9s6pGIaU/kOM=",
|
||||
"module": "sha256-cv6ZGUXEnkhGlSLnyctGsfmdLZ/81V8nqM0SMfYGzwU=",
|
||||
"pom": "sha256-KlQhkazGt4yX4zjQ4tzOW0hUf68vyT3PNrfgQSeT3mY="
|
||||
},
|
||||
"com/fasterxml/jackson/jakarta/rs#jackson-jakarta-rs-providers/2.20.2": {
|
||||
"pom": "sha256-JKKDVwntaoBpg6pPuWCy2adeKIL5fJxz95hk1TcBJ9Y="
|
||||
},
|
||||
"com/fasterxml/jackson/module#jackson-module-jakarta-xmlbind-annotations/2.20.2": {
|
||||
"jar": "sha256-mA6eS+tQKWUvx9V+GoyVQGHEsP+4PwsMrUP4h/wTYIk=",
|
||||
"module": "sha256-vbUaL5d/8F0nJUGD4wcD5NGf8WI8PxKOpv34i4y2XfY=",
|
||||
"pom": "sha256-xO843ucZSH0ezs83VEm8z1ZjaSzwGeOo0ZOgIwW+fog="
|
||||
},
|
||||
"com/fasterxml/jackson/module#jackson-modules-base/2.20.2": {
|
||||
"pom": "sha256-xKFP/gBFDwDnRiuXnPdCpT/imdJfrm2z1nziubXU760="
|
||||
},
|
||||
"com/fasterxml/jackson/module#jackson-modules-java8/2.20.2": {
|
||||
"pom": "sha256-0TLemnPo0XcwvbbLj1DBJAs4781JX+REDBN6TUmLWPY="
|
||||
},
|
||||
@@ -791,6 +770,10 @@
|
||||
"com/google/errorprone#error_prone_parent/2.43.0": {
|
||||
"pom": "sha256-u5LEWE0CEb1ZvspPsnYXD13FD+NGFG6TV40tqyYDPhA="
|
||||
},
|
||||
"com/google/guava#failureaccess/1.0.2": {
|
||||
"jar": "sha256-io+Bz5s1nj9t+mkaHndphcBh7y8iPJssgHU+G0WOgGQ=",
|
||||
"pom": "sha256-GevG9L207bs9B7bumU+Ea1TvKVWCqbVjRxn/qfMdA7I="
|
||||
},
|
||||
"com/google/guava#failureaccess/1.0.3": {
|
||||
"jar": "sha256-y/w5BrGbj1XdfP1t/gqkUy6DQlDX8IC9jSEaPiRrWcs=",
|
||||
"pom": "sha256-xUvv839tQtQ+FHItVKUiya1R75f8W3knfmKj6/iC87s="
|
||||
@@ -798,12 +781,20 @@
|
||||
"com/google/guava#guava-parent/26.0-android": {
|
||||
"pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ="
|
||||
},
|
||||
"com/google/guava#guava-parent/33.0.0-jre": {
|
||||
"pom": "sha256-BAzIjGgLQT1wup/INxs2CTAhsQmWqjWYYh3nZ9QYIpo="
|
||||
},
|
||||
"com/google/guava#guava-parent/33.4.0-android": {
|
||||
"pom": "sha256-ciDt5hAmWW+8cg7kuTJG+i0U8ygFhTK1nvBT3jl8fYM="
|
||||
},
|
||||
"com/google/guava#guava-parent/33.4.8-jre": {
|
||||
"pom": "sha256-oDxRmaG+FEQ99/1AuoZzscaq4E3u9miM59Vz6kieOiA="
|
||||
},
|
||||
"com/google/guava#guava/33.0.0-jre": {
|
||||
"jar": "sha256-9NhcPk1BFpQzfLhzq+oJskK2ZLsBMyC+YQUyfEWZFTc=",
|
||||
"module": "sha256-WaLb0FXRuqdi548aW6Orlz7dE/wn3MGHEQXi95f2gtM=",
|
||||
"pom": "sha256-/XCxTEQZhsIubSLO0ldnh3Vr5JGLFFqKvSI+OoC24y0="
|
||||
},
|
||||
"com/google/guava#guava/33.4.8-jre": {
|
||||
"jar": "sha256-89f1f2f9Yi9NRo391pKzpeOQkkbCgBesMmNAXw/mF+0=",
|
||||
"module": "sha256-WKM1cwMGmiGTDnuf6bhk3ov7i9RgdDPb5IJjRZYgz/w=",
|
||||
@@ -813,6 +804,10 @@
|
||||
"jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=",
|
||||
"pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s="
|
||||
},
|
||||
"com/google/j2objc#j2objc-annotations/2.8": {
|
||||
"jar": "sha256-8CqV+hpele2z7YWf0Pt99wnRIaNSkO/4t03OKrf01u0=",
|
||||
"pom": "sha256-N/h3mLGDhRE8kYv6nhJ2/lBzXvj6hJtYAMUZ1U2/Efg="
|
||||
},
|
||||
"com/google/j2objc#j2objc-annotations/3.0.0": {
|
||||
"jar": "sha256-iCQVc0Z93KRP/U10qgTCu/0Rv3wX4MNCyUyd56cKfGQ=",
|
||||
"pom": "sha256-I7PQOeForYndEUaY5t1744P0osV3uId9gsc6ZRXnShc="
|
||||
@@ -852,10 +847,6 @@
|
||||
"module": "sha256-ZvG5aHJXUMTc6dp9ezpDFQOEz0JsonDGCJEPo2WlKsI=",
|
||||
"pom": "sha256-aMqh5GELllfKmjy47mpvkr4yIxl9+hqk8qmML09fBOU="
|
||||
},
|
||||
"com/martiansoftware#jsap/2.1": {
|
||||
"jar": "sha256-MxdG+mLPvDNoJgxaLmYJNq0RvmEjCMEgoEThIDYdR04=",
|
||||
"pom": "sha256-ms9WqFecBb7dgZ2ZIyNj4r8yfo9zxnWY29mIWoRaPGk="
|
||||
},
|
||||
"com/nimbusds#content-type/2.3": {
|
||||
"jar": "sha256-YDSXk+AG+6lrUyywwh4Q6Wn+DbjYf5HDuer4K6KZiJU=",
|
||||
"pom": "sha256-y2nm2hYfflEWaHa29Zkf0TW0axEYwbZRSq7IyyQmt8c="
|
||||
@@ -1029,17 +1020,6 @@
|
||||
"com/twelvemonkeys/imageio#imageio/3.13.1": {
|
||||
"pom": "sha256-JgL9Vntyb7HiyLAM5dxI6AdP+0m9ckPxrSv2FBOYZM4="
|
||||
},
|
||||
"com/unboundid/product/scim2#scim2-parent/5.0.0": {
|
||||
"pom": "sha256-oHfpyHRjP8Fk1ZNSmkAz8mVz4TCSWJD7pj65j0YEx+E="
|
||||
},
|
||||
"com/unboundid/product/scim2#scim2-sdk-client/5.0.0": {
|
||||
"jar": "sha256-d/EMUgjuwrWbC88xWhr2o3+FF+Rw4MEctM5P8VXbIlw=",
|
||||
"pom": "sha256-b8NETOKhd0xBXaf998c0TbZR0S9/WbR9PQm22L9bqLY="
|
||||
},
|
||||
"com/unboundid/product/scim2#scim2-sdk-common/5.0.0": {
|
||||
"jar": "sha256-3KgxXh1MkE/sxzEUt0uedmUBLUjY4iT5AYUMLXyVNyI=",
|
||||
"pom": "sha256-Dme2j5E/cZULexv1X5vM/ISFQuHwWQAKy5dGjBpkk50="
|
||||
},
|
||||
"com/vaadin/external/google#android-json/0.0.20131108.vaadin1": {
|
||||
"jar": "sha256-37e64vQEz+C3K00jlEaYy3FrdmUXGBKgpND1kmwPrHk=",
|
||||
"pom": "sha256-L/bBfZwGC4nNfvGPpICuJEbrqGhVpjPziSg3/DuEj+8="
|
||||
@@ -1197,10 +1177,10 @@
|
||||
"io/dropwizard/metrics#metrics-parent/4.2.26": {
|
||||
"pom": "sha256-5itU9ry9xaF6LNVc/xtLJCz94b8vdb8e64d/1P88oBE="
|
||||
},
|
||||
"io/github/pixee#java-security-toolkit/1.2.2": {
|
||||
"jar": "sha256-pPulTpf/b4MOAMdvkN0PZH9gvYQwRHQnxfPKs3fRsFc=",
|
||||
"module": "sha256-Wn2aCi8TDN4Syxl3ycS81+TbGcQlk5MQnMDRAo4K0X8=",
|
||||
"pom": "sha256-HeEZTgkZRy/Eja4Cui/V5C79AUVLnQsoZaoBczdwPfo="
|
||||
"io/github/pixee#java-security-toolkit/1.2.3": {
|
||||
"jar": "sha256-+xHoXZfzVgCC0Ib3Z6iWvgEXccVVqH8pD8Ss1ECHaJE=",
|
||||
"module": "sha256-Wjp4+fWPK65xNWMrpvGrUP7aZ8vw09ZaGd1piwFNF94=",
|
||||
"pom": "sha256-fzK4suTDpgjc7+pWCWGASHtDEqGDyiHdUk/eHRY/QFY="
|
||||
},
|
||||
"io/jsonwebtoken#jjwt-api/0.13.0": {
|
||||
"jar": "sha256-WvipccchWstsNwh5SjkSxW63Bmyjse5z+HmIyeDWwGc=",
|
||||
@@ -1530,6 +1510,9 @@
|
||||
"org/apache#apache/35": {
|
||||
"pom": "sha256-6il9zRFBNui46LYwIw1Sp2wvxp9sXbJdZysYVwAHKLg="
|
||||
},
|
||||
"org/apache#apache/37": {
|
||||
"pom": "sha256-Uk7EeHr/c69rOp+voVTH8YgbZIKZtmP9v8rdoShvI1M="
|
||||
},
|
||||
"org/apache/activemq#activemq-bom/6.1.8": {
|
||||
"pom": "sha256-qUF6jlh2GhfWVwzZClBokbUfd03TKZ7IC4Uxr/TlMHw="
|
||||
},
|
||||
@@ -1700,32 +1683,32 @@
|
||||
"org/apache/logging/log4j#log4j/2.25.3": {
|
||||
"pom": "sha256-pbdIJFris5b1vKlHpJbtwI29vfeWmuLMsattS0lznn8="
|
||||
},
|
||||
"org/apache/pdfbox#fontbox/3.0.6": {
|
||||
"jar": "sha256-egn8sMYw5HGsJrNHykWg2K71qWnMWa6/8cV/6SKT4rE=",
|
||||
"pom": "sha256-RP18HBKL1r/1Kj9kvHiIcQD6zS5J8rJoGGMHfGdoFa4="
|
||||
"org/apache/pdfbox#fontbox/3.0.7": {
|
||||
"jar": "sha256-gUnZiXq1BPej83l9VSzYkl71gUm03j+0cOtG10fmj4Y=",
|
||||
"pom": "sha256-o/xYnFZLQbybtLty0XPM5fjCM10uZtY0SJtqiwS/63o="
|
||||
},
|
||||
"org/apache/pdfbox#jbig2-imageio/3.0.4": {
|
||||
"jar": "sha256-KcspUWIvEKz2H9BlbE5vpVYhlKkJX3odJqpCbi9rF+s=",
|
||||
"pom": "sha256-KOp8SskuCYX3lqi8aJCnvviSZwetrf0eLIVsmwvho4s="
|
||||
},
|
||||
"org/apache/pdfbox#pdfbox-io/3.0.6": {
|
||||
"jar": "sha256-GR6sY3Vv8NvIQeOX6Xz6DL39JRWXLWDvVjmgqohKfkc=",
|
||||
"pom": "sha256-EClai3kj970whlODleHVo/XLQ/503tNMsHwy97P0X4U="
|
||||
"org/apache/pdfbox#pdfbox-io/3.0.7": {
|
||||
"jar": "sha256-uag4KRl4BpCG77zR9iuBueSmAW5h3SxoEE7p9ML/mXs=",
|
||||
"pom": "sha256-dCz9VwGuLNV6HS7mG+z+G9FUm6dwTH+xcZN/rQECFLY="
|
||||
},
|
||||
"org/apache/pdfbox#pdfbox-parent/3.0.6": {
|
||||
"pom": "sha256-EdzNtSovFEpIui+89npGrcTaN5JZQ/xNkhLfiSMxqN4="
|
||||
"org/apache/pdfbox#pdfbox-parent/3.0.7": {
|
||||
"pom": "sha256-z60fFpQrxTkWiDsxQ/JRfseUc3Es1yNKWopxwQsPrnQ="
|
||||
},
|
||||
"org/apache/pdfbox#pdfbox/3.0.6": {
|
||||
"jar": "sha256-h7kSK3j1If74PigG2Y5+SD4Enwh+piZ7ctMZ9nIBkQE=",
|
||||
"pom": "sha256-PkOO4NLXVJ0IVPDy5LJnWK699Ocv1JMTSafHLzPI1S8="
|
||||
"org/apache/pdfbox#pdfbox/3.0.7": {
|
||||
"jar": "sha256-fO+nF2IjMJUbQ0Or8eXTa8yxH0uiRdeKqnMlHQj+xiM=",
|
||||
"pom": "sha256-3nkpJ2LYVd1pqOVVyeDm3kD1OP+9l9AS0bs6TQRa0Ec="
|
||||
},
|
||||
"org/apache/pdfbox#preflight/3.0.6": {
|
||||
"jar": "sha256-QHhfcBZrmnp4BXmQuGNMsVE/aHGt5YU+TCKmLi9IAOM=",
|
||||
"pom": "sha256-NuCmVj9a2QMB1pGtLQ9Qu112/lKvURX8rD0rudNppoo="
|
||||
"org/apache/pdfbox#preflight/3.0.7": {
|
||||
"jar": "sha256-ae3MeMB9ZSe6oAYCzn/X+WcoJHVV7xpNmp0LytBSVpM=",
|
||||
"pom": "sha256-sXRZcjGLrEGdHbpf9RvTh5hUHe9/vlNzIN3B+Bhf9Jw="
|
||||
},
|
||||
"org/apache/pdfbox#xmpbox/3.0.6": {
|
||||
"jar": "sha256-ATRBZTxgKBTu5Bo82DBeBlCHQN5/u/dRxTR/o8TSJ/g=",
|
||||
"pom": "sha256-LwFS3KrhAotX9y88wYUreM/4KNMNEtwefwuh4cGi9XY="
|
||||
"org/apache/pdfbox#xmpbox/3.0.7": {
|
||||
"jar": "sha256-pTB9h3ZBA+YZS7+4AKj3msutLfMtWdq8oiUqv5I8QBo=",
|
||||
"pom": "sha256-fnE6xU8e5I9oIwDC6yft4ZEe9vVZRit38rkS6gPCm1E="
|
||||
},
|
||||
"org/apache/poi#poi-ooxml-lite/5.5.1": {
|
||||
"jar": "sha256-5uN63rbW7otA7Eka2VXZNNj5mCerBQ8QWxgoblmx2ec=",
|
||||
@@ -1830,6 +1813,14 @@
|
||||
"jar": "sha256-9cxnMM4bbFUunMwMQbTkwjPMYmC2w6EAOK1B6iE2TCo=",
|
||||
"pom": "sha256-N7QJgMV65VnNyu/1D2JYGSkumwagk2idPxQrDwqNBBE="
|
||||
},
|
||||
"org/apache/xmlgraphics#batik-svggen/1.19": {
|
||||
"jar": "sha256-a/ie3oFIPaV0sl2GReUS4DCWXo++VgXik4vMqofrtqY=",
|
||||
"pom": "sha256-kyKGVWKEPX5w2nO8ibCivlj8qvmRrGwXNEmjEkWPrjM="
|
||||
},
|
||||
"org/apache/xmlgraphics#batik-transcoder/1.19": {
|
||||
"jar": "sha256-EgRfjiHWx/0qcp9CMXIHIz+ONEbzovbqEXEACGSXInQ=",
|
||||
"pom": "sha256-eM71WFmttLqyObaZE/92JfOhd4yiPKhqKpYD8vBTllw="
|
||||
},
|
||||
"org/apache/xmlgraphics#batik-util/1.19": {
|
||||
"jar": "sha256-PxOJu9vtPEZZpYpQzhIWb9MePQZplN1jtRRNkkX9PbY=",
|
||||
"pom": "sha256-31sAZvdkjeVaV/ejC6fZS+E3+7j+9oQ4Y29931l08ZY="
|
||||
@@ -1898,6 +1889,11 @@
|
||||
"jar": "sha256-7n0OtOdN5wpzX3+za2BN1catNXINULkUYE2wQhFKAYU=",
|
||||
"pom": "sha256-NQafSI8HXgWdVe3jqKgsi+FmOWqR2T56Fve4XT9ESiI="
|
||||
},
|
||||
"org/checkerframework#checker-qual/3.41.0": {
|
||||
"jar": "sha256-L58kW/aOQlnWEIlPJAbcH2Nj3GOTAr1WboJy5PRUEXI=",
|
||||
"module": "sha256-s4ZywX9FUnayEO00Av+S3OZmdwsajGEMfMNK1UxTLSA=",
|
||||
"pom": "sha256-XHOwdwVAhCzwagHSZLu4muXiSGadydqA6GHoIz3UZ1s="
|
||||
},
|
||||
"org/checkerframework#checker-qual/3.52.0": {
|
||||
"jar": "sha256-C1uxpL3E5LEhdIL+WY78qrTh+6ezf5QSY5F4/IEW/AU=",
|
||||
"module": "sha256-jf8ytk0eoRGkV9QR4CxKvHJGH9q6rIzll2bb1+fSpsg=",
|
||||
@@ -1955,6 +1951,14 @@
|
||||
"jar": "sha256-yapavVT8sAe5qGzQFbAJn3exa3cXe1+avml2viimDvE=",
|
||||
"pom": "sha256-4CZlykSVoHBTBsdWADSIfq768JEIEbkQnmnRa3eZLr4="
|
||||
},
|
||||
"org/eclipse/jetty#jetty-alpn-java-server/12.1.6": {
|
||||
"jar": "sha256-Zr4ClInUDovFDUByE4pquqfgddAJJlZMHTgJeXCzHbM=",
|
||||
"pom": "sha256-PyDyA0iYT3NuOd/7dxFVKIkhcLBedYILEJrc11CQ/rQ="
|
||||
},
|
||||
"org/eclipse/jetty#jetty-alpn-server/12.1.6": {
|
||||
"jar": "sha256-PZvd0KYyqiwEPSeynnSFJGBNq3fe3K8Dy5sjeDzB+BU=",
|
||||
"pom": "sha256-24Ry0sYvaXkHJ2VVXPgPUOQrMmmV7sLlO5rS2m9nSXs="
|
||||
},
|
||||
"org/eclipse/jetty#jetty-alpn/12.1.6": {
|
||||
"pom": "sha256-ZZEfoMuIGgKzV9b6cexbd4HD6rZ/OqnNdo7glI0Lyaw="
|
||||
},
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
webkitgtk_4_1,
|
||||
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
|
||||
isDesktopVariant ? false,
|
||||
buildWithFrontend ? !isDesktopVariant,
|
||||
@@ -35,13 +36,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "stirling-pdf" + lib.optionalString isDesktopVariant "-desktop";
|
||||
version = "2.6.0";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Stirling-Tools";
|
||||
repo = "Stirling-PDF";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-nsC/U+9kJo0i5Sh2u+OrjzDO6YREKjVAe+1KBKgtybY=";
|
||||
hash = "sha256-5MZwwBT8Qi1kO+DAO/3JIm0/yAFtQLBo1UXDRZUjK7s=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -60,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
|
||||
inherit (finalAttrs) src patches;
|
||||
postPatch = "cd ${finalAttrs.npmRoot}";
|
||||
hash = "sha256-uMWc/yoOWFtP2JTMr69V/nRPu9YfrGxqvBnOw2DZkQQ=";
|
||||
hash = "sha256-HyQok7Cd1kfWKCtaeHAhvZgxSvaKCk32bdJoNKj//rA=";
|
||||
};
|
||||
|
||||
cargoRoot = "frontend/src-tauri";
|
||||
@@ -74,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
patches
|
||||
cargoRoot
|
||||
;
|
||||
hash = "sha256-JvrZKgTmPGP6m95GBr/UJo1FLaR86KSmJ9LzLlzQhfE=";
|
||||
hash = "sha256-t6TBUsfOadn3KNLxva6iajlhg21dFqxgH962e1bIRLI=";
|
||||
};
|
||||
|
||||
mitmCache = gradle.fetchDeps {
|
||||
@@ -166,7 +167,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
ln -s ${jre} "$res_dir/runtime/jre"
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests = { inherit (nixosTests) stirling-pdf-desktop; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/Stirling-Tools/Stirling-PDF/releases/tag/v${finalAttrs.version}";
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "wifitui";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shazow";
|
||||
repo = "wifitui";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-C34YXANI/jocGZKy/WMVoexuQQXl7VE8koZ73zOkPv4=";
|
||||
hash = "sha256-9e9YaxoqA8JatI1eqsCWoSRvV7veKQMD5kjL1Nns8sU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-2smXAK3mRweg0yKDerKgu3fcT3ulDjRSbbkMCSe+nVs=";
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
buildGo125Module,
|
||||
winboat,
|
||||
}:
|
||||
buildGoModule {
|
||||
|
||||
buildGo125Module {
|
||||
inherit (winboat) version src;
|
||||
modRoot = "guest_server";
|
||||
pname = "winboat-guest-server";
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
electron,
|
||||
electron_40,
|
||||
zip,
|
||||
nodejs_24,
|
||||
makeWrapper,
|
||||
udev,
|
||||
usbutils,
|
||||
@@ -43,7 +42,6 @@ buildNpmPackage (finalAttrs: {
|
||||
|
||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
|
||||
npmDepsHash = "sha256-DLkI9a030uM2X1et94e4nd/HEyw5ugtK8NEAn/J8p9U=";
|
||||
nodejs = nodejs_24;
|
||||
makeCacheWritable = true;
|
||||
|
||||
guest-server = pkgsCross.mingwW64.callPackage ./guest-server.nix { };
|
||||
@@ -61,8 +59,8 @@ buildNpmPackage (finalAttrs: {
|
||||
node scripts/build.ts
|
||||
npm exec electron-builder --linux -- \
|
||||
--dir \
|
||||
-c.electronDist=${electron.dist} \
|
||||
-c.electronVersion=${electron.version}
|
||||
-c.electronDist=${electron_40.dist} \
|
||||
-c.electronVersion=${electron_40.version}
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
@@ -83,7 +81,7 @@ buildNpmPackage (finalAttrs: {
|
||||
ln -sf $out/share/winboat/resources/data $out/share/winboat/data
|
||||
ln -sf $out/share/winboat/resources/guest_server $out/share/winboat/guest_server
|
||||
|
||||
makeWrapper ${electron}/bin/electron $out/bin/winboat \
|
||||
makeWrapper ${electron_40}/bin/electron $out/bin/winboat \
|
||||
--add-flag "$out/share/winboat/resources/app.asar" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--suffix PATH : ${
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
cuda_cudart,
|
||||
cuda_nvcc,
|
||||
cuda_nvml_dev,
|
||||
cuda_nvrtc,
|
||||
cuda_nvtx,
|
||||
cudaAtLeast,
|
||||
cudaMajorMinorVersion,
|
||||
@@ -16,6 +17,7 @@
|
||||
gdrcopy,
|
||||
lib,
|
||||
libfabric,
|
||||
libnvjitlink,
|
||||
mpi,
|
||||
nccl,
|
||||
ninja,
|
||||
@@ -46,13 +48,13 @@ backendStdenv.mkDerivation (finalAttrs: {
|
||||
# NOTE: Depends on the CUDA package set, so use cudaNamePrefix.
|
||||
name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}";
|
||||
pname = "libnvshmem";
|
||||
version = "3.4.5-0";
|
||||
version = "3.6.5-0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = "nvshmem";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-RHZzjDMYlL7vAVP1/UXM/Pt4bhajeWdCi3ihICeD2mc=";
|
||||
hash = "sha256-2E3/WGbg6srT/e3ykK0qxTy1ZlJ9JGGLlergG0ITwTY=";
|
||||
};
|
||||
|
||||
outputs = [ "out" ];
|
||||
@@ -94,9 +96,11 @@ backendStdenv.mkDerivation (finalAttrs: {
|
||||
cuda_cccl
|
||||
cuda_cudart
|
||||
cuda_nvml_dev
|
||||
cuda_nvrtc
|
||||
cuda_nvtx
|
||||
gdrcopy
|
||||
libfabric
|
||||
libnvjitlink
|
||||
nccl
|
||||
pmix
|
||||
rdma-core
|
||||
@@ -179,6 +183,7 @@ backendStdenv.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
description = "Parallel programming interface for NVIDIA GPUs based on OpenSHMEM";
|
||||
homepage = "https://github.com/NVIDIA/nvshmem";
|
||||
changelog = "https://github.com/NVIDIA/nvshmem/releases/tag/${finalAttrs.src.tag}";
|
||||
broken = _cuda.lib._mkMetaBroken finalAttrs;
|
||||
# NOTE: There are many licenses:
|
||||
# https://github.com/NVIDIA/nvshmem/blob/7dd48c9fd7aa2134264400802881269b7822bd2f/License.txt
|
||||
@@ -187,7 +192,10 @@ backendStdenv.mkDerivation (finalAttrs: {
|
||||
"aarch64-linux"
|
||||
"x86_64-linux"
|
||||
];
|
||||
maintainers = [ maintainers.connorbaker ];
|
||||
maintainers = with maintainers; [
|
||||
connorbaker
|
||||
GaetanLepage
|
||||
];
|
||||
teams = [ teams.cuda ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -2,28 +2,34 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitLab,
|
||||
|
||||
# build-system
|
||||
cmake,
|
||||
nanobind,
|
||||
ninja,
|
||||
scikit-build-core,
|
||||
setuptools,
|
||||
|
||||
# dependencies
|
||||
numpy,
|
||||
|
||||
# tests
|
||||
pytest-xdist,
|
||||
pytestCheckHook,
|
||||
scipy,
|
||||
pytest-xdist,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "ducc0";
|
||||
version = "0.40.0";
|
||||
version = "0.41.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.mpcdf.mpg.de";
|
||||
owner = "mtr";
|
||||
repo = "ducc";
|
||||
tag = "ducc0_${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
hash = "sha256-0QzCY9E79hRrLQwxrB6t04NUM6sDQmWIyl/y0H0R3ak=";
|
||||
tag = "ducc0_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
|
||||
hash = "sha256-OeTTrIcvY9bhnctc6h1xUdSriQN4RNy3vjxWKKlT0ew=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -46,22 +52,23 @@ buildPythonPackage rec {
|
||||
dependencies = [ numpy ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
scipy
|
||||
pytest-xdist
|
||||
];
|
||||
enabledTestPaths = [ "python/test" ];
|
||||
pythonImportsCheck = [ "ducc0" ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/include
|
||||
cp -r ${src}/src/ducc0 $out/include
|
||||
cp -r ${finalAttrs.src}/src/ducc0 $out/include
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://gitlab.mpcdf.mpg.de/mtr/ducc";
|
||||
description = "Efficient algorithms for Fast Fourier transforms and more";
|
||||
homepage = "https://gitlab.mpcdf.mpg.de/mtr/ducc";
|
||||
changelog = "https://gitlab.mpcdf.mpg.de/mtr/ducc/-/blob/${finalAttrs.src.tag}/ChangeLog?ref_type=tags";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ parras ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -38,6 +38,8 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
preCheck = "rm -r fastremap/";
|
||||
|
||||
pythonImportsCheck = [
|
||||
"fastremap"
|
||||
];
|
||||
|
||||
@@ -48,14 +48,14 @@
|
||||
}:
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "gdsfactory";
|
||||
version = "9.32.1";
|
||||
version = "9.39.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gdsfactory";
|
||||
repo = "gdsfactory";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-uXFH+6uZx+fFo1QfozI/JVomchFlnWx805CwbAj7CPQ=";
|
||||
hash = "sha256-WwZ0GikpRfg7wpr08QdqdTvZtsNBnwcC5pxiddfG6rM=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "kfactory";
|
||||
version = "2.3.0";
|
||||
version = "2.4.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -45,7 +45,7 @@ buildPythonPackage (finalAttrs: {
|
||||
# assert kf.config.project_dir is not None
|
||||
# E AssertionError: assert None is not None
|
||||
leaveDotGit = true;
|
||||
hash = "sha256-6z2JlndmuegpCAf74YRa/qVVjFOWv1Xy3dabeWlOmbs=";
|
||||
hash = "sha256-rr4EeTk4+g29kjfbc6tdHt85ZofzAL+kGBWnYMG4J7U=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
cython,
|
||||
expat,
|
||||
fixDarwinDylibNames,
|
||||
fetchFromGitHub,
|
||||
klayout,
|
||||
libpng,
|
||||
qt6,
|
||||
setuptools,
|
||||
@@ -15,17 +15,11 @@
|
||||
zlib,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
buildPythonPackage {
|
||||
pname = "klayout";
|
||||
version = "0.30.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KLayout";
|
||||
repo = "klayout";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WigRictn6CxOPId2YitlEm43vEw+dSRWdoareD9HtMc=";
|
||||
};
|
||||
inherit (klayout) version src;
|
||||
|
||||
build-system = [
|
||||
cython
|
||||
@@ -76,4 +70,4 @@ buildPythonPackage (finalAttrs: {
|
||||
maintainers = with lib.maintainers; [ fbeffa ];
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
})
|
||||
}
|
||||
|
||||
@@ -23,14 +23,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "social-auth-core";
|
||||
version = "4.8.3";
|
||||
version = "4.8.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "python-social-auth";
|
||||
repo = "social-core";
|
||||
tag = version;
|
||||
hash = "sha256-8UDJfn1NDNHM8PBTV6n18GFSmOUqXo8UGbrJLFfLlnY=";
|
||||
hash = "sha256-hYqfahjeNRpfpnNdDRTF9VPaoUh5R+nMDM3frvRI5Nw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "twilio";
|
||||
version = "9.10.3";
|
||||
version = "9.10.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "twilio";
|
||||
repo = "twilio-python";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-RzdnpxfLOh/t5uYt8e80EIsjqULJP9oSPwOJYfosrC8=";
|
||||
hash = "sha256-g3GcKHsLcSBJPhpEVi9ue8rSrxD65GID9F40ndH2ho0=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -43,6 +43,7 @@ buildPythonPackage rec {
|
||||
"httpx"
|
||||
"validators"
|
||||
"authlib"
|
||||
"protobuf"
|
||||
];
|
||||
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{
|
||||
"serverVersion": "0.19.16",
|
||||
"uiVersion": "0.19.16",
|
||||
"serverHash": "sha256-LHde5OEP/V8ViGkQY73I5ERX5kza/+t5zGx3XxijvFg=",
|
||||
"serverCargoHash": "sha256-2YqJ5wC7H53JSEjGV6AFTlNnhsCn9PNxwesevxX8R3w=",
|
||||
"uiHash": "sha256-KC2Emn1kGEz6Ic8WW/Xk3R9sP5XHb8pzpk4wRobVwwc=",
|
||||
"uiPNPMDepsHash": "sha256-UOovErxC060rAVTERdNdZRg+zP2RHL6Hii8RqVe5ye8="
|
||||
"serverVersion": "0.19.17",
|
||||
"uiVersion": "0.19.17",
|
||||
"serverHash": "sha256-zEqKuOHmbftN1LGW+yP/Uo6nZ7Q2RoDIPVWkoj5HnXk=",
|
||||
"serverCargoHash": "sha256-1z9CasnGqhaowzmY3nC2IZUI6vI8i9Zh5ZA+SEtI09c=",
|
||||
"uiHash": "sha256-Gysv3VlLL0pwu/JUbK2ViD4wC+rrnEo4lU9HloRSQMw=",
|
||||
"uiPNPMDepsHash": "sha256-dRUD/R7Qtlfy2saX7grfdi5qBDP8gc3L3+C2m7ro1CU="
|
||||
}
|
||||
|
||||
@@ -976,6 +976,7 @@ mapAliases {
|
||||
kanidmWithSecretProvisioning_1_6 = throw "'kanidmWithSecretProvisioning_1_6' has been removed as it has reached end of life"; # Added 2026-01-29
|
||||
kapitano = throw "'kapitano' has been removed, as it is unmaintained upstream"; # Added 2025-10-29
|
||||
karing = throw "'karing' has been removed, as it is unmaintained in nixpkgs"; # Added 2026-01-31
|
||||
katawa-shoujo = throw "'katawa-shoujo' has been removed, as it bundles insecure Python 2. You may install 'katawa-shoujo-re-engineered' instead, which is an updated version remade by Fleeting Heartbeat Studios."; # Added 2026-03-27
|
||||
kbibtex = throw "'kbibtex' has been removed, as it is unmaintained upstream"; # Added 2025-08-30
|
||||
kcli = throw "kcli has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
|
||||
keepkey_agent = throw "'keepkey_agent' has been renamed to/replaced by 'keepkey-agent'"; # Converted to throw 2025-10-27
|
||||
|
||||
@@ -8295,7 +8295,7 @@ self: super: with self; {
|
||||
|
||||
klaus = callPackage ../development/python-modules/klaus { };
|
||||
|
||||
klayout = callPackage ../development/python-modules/klayout { };
|
||||
klayout = callPackage ../development/python-modules/klayout { inherit (pkgs) klayout; };
|
||||
|
||||
klein = callPackage ../development/python-modules/klein { };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user