mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
Merge release-26.05 into staging-nixos-26.05
This commit is contained in:
nixpkgs-ci[bot]
GitHub
commit
cf1ee45dce
76 changed files with 811 additions and 689 deletions
|
|
@ -765,12 +765,6 @@
|
|||
githubId = 168;
|
||||
name = "Alexander Flatter";
|
||||
};
|
||||
afldcr = {
|
||||
email = "alex@fldcr.com";
|
||||
github = "afldcr";
|
||||
githubId = 335271;
|
||||
name = "James Alexander Feldman-Crough";
|
||||
};
|
||||
afontain = {
|
||||
email = "afontain@posteo.net";
|
||||
github = "necessarily-equal";
|
||||
|
|
@ -6527,12 +6521,6 @@
|
|||
githubId = 48378098;
|
||||
name = "Danila Danko";
|
||||
};
|
||||
deepfire = {
|
||||
email = "_deepfire@feelingofgreen.ru";
|
||||
github = "deepfire";
|
||||
githubId = 452652;
|
||||
name = "Kosyrev Serge";
|
||||
};
|
||||
DeeUnderscore = {
|
||||
email = "d.anzorge@gmail.com";
|
||||
github = "DeeUnderscore";
|
||||
|
|
@ -8614,12 +8602,6 @@
|
|||
github = "f2k1de";
|
||||
githubId = 11199213;
|
||||
};
|
||||
f4814n = {
|
||||
email = "me@f4814n.de";
|
||||
github = "f4814";
|
||||
githubId = 11909469;
|
||||
name = "Fabian Geiselhart";
|
||||
};
|
||||
f4z3r = {
|
||||
email = "f4z3r-github@pm.me";
|
||||
name = "Jakob Beckmann";
|
||||
|
|
@ -28250,12 +28232,6 @@
|
|||
githubId = 207457;
|
||||
name = "Matthieu Chevrier";
|
||||
};
|
||||
trepetti = {
|
||||
email = "trepetti@cs.columbia.edu";
|
||||
github = "trepetti";
|
||||
githubId = 25440339;
|
||||
name = "Tom Repetti";
|
||||
};
|
||||
trespaul = {
|
||||
email = "paul@trespaul.com";
|
||||
github = "trespaul";
|
||||
|
|
@ -28906,12 +28882,6 @@
|
|||
githubId = 2612464;
|
||||
name = "Vincent Laporte";
|
||||
};
|
||||
vbmithr = {
|
||||
email = "vb@luminar.eu.org";
|
||||
github = "vbmithr";
|
||||
githubId = 797581;
|
||||
name = "Vincent Bernardoff";
|
||||
};
|
||||
vbrandl = {
|
||||
name = "Valentin Brandl";
|
||||
email = "mail+nixpkgs@vbrandl.net";
|
||||
|
|
|
|||
|
|
@ -733,7 +733,6 @@ with lib.maintainers;
|
|||
dduan
|
||||
samasaur
|
||||
stephank
|
||||
trepetti
|
||||
];
|
||||
scope = "Maintain Swift compiler suite for NixOS.";
|
||||
shortName = "Swift";
|
||||
|
|
|
|||
|
|
@ -127,6 +127,4 @@ in
|
|||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ f4814n ];
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -718,6 +718,7 @@ rec {
|
|||
meta ? { },
|
||||
passthru ? { },
|
||||
substitutions ? { },
|
||||
__structuredAttrs ? false,
|
||||
}@args:
|
||||
script:
|
||||
runCommand name
|
||||
|
|
@ -730,7 +731,7 @@ rec {
|
|||
# TODO(@Artturin:) substitutions should be inside the env attrset
|
||||
# but users are likely passing non-substitution arguments through substitutions
|
||||
# turn off __structuredAttrs to unbreak substituteAll
|
||||
__structuredAttrs = false;
|
||||
inherit __structuredAttrs;
|
||||
pname = name;
|
||||
version = "26.05pre-git";
|
||||
inherit meta;
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
description = "Aurulent Sans";
|
||||
longDescription = "Aurulent Sans is a humanist sans serif intended to be used as an interface font.";
|
||||
homepage = "http://delubrum.org/";
|
||||
maintainers = with lib.maintainers; [ deepfire ];
|
||||
maintainers = with lib.maintainers; [ pancaek ];
|
||||
license = lib.licenses.ofl;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "bottom";
|
||||
version = "0.12.3";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ClementTsang";
|
||||
repo = "bottom";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-arbVp0UjapM8SQ99XQCP7c+iGInyuxxx6LMEONRVl6o=";
|
||||
hash = "sha256-UlkdYrfIjZU6N9W3KSZj4Au333DdejQG3TPRu5CjuBE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-miSMcqy4OFZFhAs9M+zdv4OzYgFxN2/uBo6V/kJql90=";
|
||||
cargoHash = "sha256-bQOhLlnMHFq5O5OUPWGmt00miKJTycBdhDUnfuUWPVk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoAddDriverRunpath
|
||||
|
|
|
|||
|
|
@ -3,24 +3,24 @@
|
|||
|
||||
let
|
||||
pname = "brave";
|
||||
version = "1.91.175";
|
||||
version = "1.91.180";
|
||||
|
||||
allArchives = {
|
||||
aarch64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
|
||||
hash = "sha256-7O7cK9Y0nqn60G/4J7Tit0Z1ndsEgs9WtwS1yrDGZ0Y=";
|
||||
hash = "sha256-HdmJBLANsmlBi3EtzeuMn4USmW8x/LaYKUWDlqw3a2I=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
hash = "sha256-/+xaqBCYzo4bvYASoRgDHDIUb2aWX1DGxqfDifeWKSQ=";
|
||||
hash = "sha256-mM2SOn6V1KQJEjxR0KH1lXJMLSzpx/IiZDeSrJtIFt0=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
|
||||
hash = "sha256-alVhPVmXZ41CI5ou77xk0QepFvyyJqJs8yexDVo1rzY=";
|
||||
hash = "sha256-WkBudj8I0/pIzhA4fynkfY4t6M/6d1zPTZPSQeX3d5Y=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
|
||||
hash = "sha256-18l3fS7O/lieRpFtlZPmhICTVywrRCgD2ntoRrABmQA=";
|
||||
hash = "sha256-mxKhtUiLoloUvYK0hv1WHpVytadHPLGN8IePrscxWxs=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -8,15 +8,15 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-shear";
|
||||
version = "1.12.4";
|
||||
version = "1.13.1";
|
||||
|
||||
src = fetchCrate {
|
||||
pname = "cargo-shear";
|
||||
version = finalAttrs.version;
|
||||
hash = "sha256-nYAZfUh0ZMU0H+Eb5DOHvENCtDWiCLhzuEB3MFAKWpc=";
|
||||
hash = "sha256-Luf6/kG0MgnBDyMLZGUSadPI60DOx5Jra3I3ezOGM4w=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-xJGITXhC02nOky5P5gzUHAmVyiolchcVofDiaHEX14o=";
|
||||
cargoHash = "sha256-d+3ZfygD4CzHLgT45KcCw2rr313eVO7PhGZpgJpbxW8=";
|
||||
|
||||
env = {
|
||||
# https://github.com/Boshen/cargo-shear/blob/v1.6.2/src/lib.rs#L51-L54
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
homepage = "http://pogostick.net/~pnh/ntpasswd/";
|
||||
description = "Utility to reset the password of any user that has a valid local account on a Windows system";
|
||||
maintainers = with lib.maintainers; [ deepfire ];
|
||||
maintainers = [ ];
|
||||
license = lib.licenses.gpl2Only;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
buildDubPackage (finalAttrs: {
|
||||
pname = "ddhx";
|
||||
version = "0.9.3";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dd86k";
|
||||
repo = "ddhx";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-7sXXkn/B9iN8Iq4X/Rj7BufdHKDBS1aG3pXcInG+UaI=";
|
||||
hash = "sha256-1dbY7xUOpwihrppuB+tyHuV2b12E4Yv2J69LXULxmg0=";
|
||||
};
|
||||
|
||||
dubLock = ./dub-lock.json;
|
||||
|
|
|
|||
|
|
@ -65,14 +65,14 @@ let
|
|||
in
|
||||
clangStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "deadbeef";
|
||||
version = "1.10.2";
|
||||
version = "1.10.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DeaDBeeF-Player";
|
||||
repo = "deadbeef";
|
||||
fetchSubmodules = true;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-9naokzS2PxnyeO8AnqwLOsrYf/8I6Ah3oesUy2f22vs=";
|
||||
hash = "sha256-SAp6XAE3fKTR27xYrdkNHneYDGJW1+XJdX6eBI9+EY0=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -32,13 +32,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "deskflow";
|
||||
version = "1.25.0";
|
||||
version = "1.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deskflow";
|
||||
repo = "deskflow";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-IclKXYCvYHMK4e1z1efmOHUaJqnmZgofK5r6Ml+i5OI=";
|
||||
hash = "sha256-XcSG47Ysjn+wrJH5DC/XXGXcneXcW7xIhAn6sguuv+s=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -26,11 +26,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dnsdist";
|
||||
version = "2.0.5";
|
||||
version = "2.0.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.powerdns.com/releases/dnsdist-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-I8Z9usIeVWTflbZ4merP7sfXwZQRiqv5jODnY8zVx64=";
|
||||
hash = "sha256-WGgPeAUXt4fmT+5M1NzFf0Ob5gcIT4nuRpl4nX1iaHU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) cargoRoot src;
|
||||
hash = "sha256-0CfOkjMe3p7xg62jlS3ASZRlr+/nqIJLRyRT+jcDiHQ=";
|
||||
hash = "sha256-xFh+cywfNWalzRfCtM2pPtPfq8/RAlTC1EdZYYEiwxA=";
|
||||
};
|
||||
|
||||
cargoRoot = "dnsdist-rust-lib/rust";
|
||||
|
|
@ -89,11 +89,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) dnsdist;
|
||||
};
|
||||
passthru.tests = nixosTests.dnsdist;
|
||||
|
||||
meta = {
|
||||
changelog = "https://www.dnsdist.org/changelog.html";
|
||||
description = "DNS Loadbalancer";
|
||||
mainProgram = "dnsdist";
|
||||
homepage = "https://dnsdist.org";
|
||||
|
|
|
|||
|
|
@ -80,6 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
docbook_xml_dtd_42
|
||||
docbook-xsl-nons
|
||||
glib
|
||||
gobject-introspection
|
||||
intltool
|
||||
libxml2
|
||||
libxslt
|
||||
|
|
@ -94,7 +95,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
buildInputs = [
|
||||
glib
|
||||
gobject-introspection
|
||||
ipset
|
||||
iptables
|
||||
kmod
|
||||
|
|
|
|||
|
|
@ -146,6 +146,9 @@ freecad-utils.makeCustomizable (
|
|||
};
|
||||
};
|
||||
|
||||
# 6.9k object files, cuts down build time from 2-3 hours to 15 minutes
|
||||
requiredSystemFeatures = [ "big-parallel" ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.freecad.org";
|
||||
description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler";
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
mainProgram = "fujprog";
|
||||
homepage = "https://github.com/kost/fujprog";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [ trepetti ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.all;
|
||||
changelog = "https://github.com/kost/fujprog/releases/tag/v${finalAttrs.version}";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "github-mcp-server";
|
||||
version = "1.0.4";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "github";
|
||||
repo = "github-mcp-server";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-y6QGF2g9FhDxtWR//kaI5Xt2o+MwaNWCf2t0t61/vww=";
|
||||
hash = "sha256-/Wf0p3Ug3fxtXhvfab+ZSPe0XlGlWC0ujxkMb52D+oM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fVNMtCpodsr1Z9E21osHb+e63ZQqFKYwi4fz4OsTJe0=";
|
||||
vendorHash = "sha256-J1hC4hdEKLENXLJrsyV41TaJ9+2CuPz5KoIMm2mXvTE=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -179,11 +179,11 @@ let
|
|||
|
||||
linux = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "149.0.7827.196";
|
||||
version = "149.0.7827.200";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
|
||||
hash = "sha256-B4XIuL7q/kGRd/w2vPmfkvsvFtvHevhL5IfC5u14IuY=";
|
||||
hash = "sha256-HDCPrhH44nKTr6Fzm9SqAV/Vdmtyx1znIZXsPkGmEqg=";
|
||||
};
|
||||
|
||||
# With strictDeps on, some shebangs were not being patched correctly
|
||||
|
|
@ -289,11 +289,11 @@ let
|
|||
|
||||
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "149.0.7827.197";
|
||||
version = "149.0.7827.201";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.google.com/release2/chrome/fs52wiq74uymls47lfo23m5l2q_149.0.7827.197/GoogleChrome-149.0.7827.197.dmg";
|
||||
hash = "sha256-kXN4dPtx0MkTKO3VJnoyTqT8uS4JDXJ16DmojZ3zT+o=";
|
||||
url = "http://dl.google.com/release2/chrome/ph3mj7mqtvbfhr67ckmjvjj5a4_149.0.7827.201/GoogleChrome-149.0.7827.201.dmg";
|
||||
hash = "sha256-AI5oBE0uB2/YacF9LB4d6rXlAqEuZtlPYNQwLbs1K7E=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "1.7.52";
|
||||
version = "1.7.53";
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "grav";
|
||||
|
|
@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation {
|
|||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/getgrav/grav/releases/download/${version}/grav-admin-v${version}.zip";
|
||||
hash = "sha256-xAXUS4qGOSExniggPWwIooalHjHhpk4YK5tQvkRLp0g=";
|
||||
hash = "sha256-Ug8sIEMwIoCUyHpxk5NaGHaJA7lThgbUuu+8NpmI9YI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
# it's updated.
|
||||
buildGo126Module (finalAttrs: {
|
||||
pname = "gtree";
|
||||
version = "1.14.2";
|
||||
version = "1.14.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddddddO";
|
||||
repo = "gtree";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-LMVXC22fTrPt4S5HkErMrpZwwanN5blY/TPUE8bg95s=";
|
||||
hash = "sha256-tGmRVRy+xUq/WEYz7QktR7xuxKFbCWO7LSbAmSAodYw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Vd5VKKl79Qu5R7jOYS1CTtQuAis9vWUbpBWnEI7sgpk=";
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ in
|
|||
crystal.buildCrystalPackage rec {
|
||||
pname = "invidious";
|
||||
inherit (versions.invidious) version;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iv-org";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl crystal crystal2nix jq git moreutils nix nix-prefetch pkg-config pcre gnugrep
|
||||
#!nix-shell -i bash -p curl crystal crystal2nix jq git moreutils nix nurl pkg-config pcre gnugrep
|
||||
git_url='https://github.com/iv-org/invidious.git'
|
||||
git_branch='master'
|
||||
git_dir='/var/tmp/invidious.git'
|
||||
|
|
@ -51,7 +51,7 @@ json_set '.invidious.date' "$date"
|
|||
json_set '.invidious.commit' "$commit"
|
||||
json_set '.invidious.version' "$new_version"
|
||||
|
||||
new_hash=$(nix-prefetch -I 'nixpkgs=../../../..' "$pkg")
|
||||
new_hash=$(nurl --submodules --hash "$git_url" "$new_tag")
|
||||
json_set '.invidious.hash' "$new_hash"
|
||||
|
||||
# fetch video.js dependencies
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"invidious": {
|
||||
"hash": "sha256-tACx4+HqouftDalZlrurS75gYvS02qnmxQoL91YfTjg=",
|
||||
"version": "2.20260207.0",
|
||||
"date": "2026.02.07",
|
||||
"commit": "118d6356"
|
||||
"hash": "sha256-xJZjEnSeMnDo37ohtSAI2ucaPPv+nBYdrslHUCL/Pd8=",
|
||||
"version": "2.20260626.0",
|
||||
"date": "2026.06.27",
|
||||
"commit": "ad0bd928"
|
||||
},
|
||||
"videojs": {
|
||||
"hash": "sha256-jED3zsDkPN8i6GhBBJwnsHujbuwlHdsVpVqa1/pzSH4="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
homepage = "https://lemon.cs.elte.hu/trac/lemon";
|
||||
description = "Efficient library for combinatorial optimization tasks on graphs and networks";
|
||||
license = lib.licenses.boost;
|
||||
maintainers = with lib.maintainers; [ trepetti ];
|
||||
maintainers = with lib.maintainers; [ hzeller ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
stdenv,
|
||||
yarn-berry_4,
|
||||
nodejs_24,
|
||||
electron_39,
|
||||
electron_42,
|
||||
makeWrapper,
|
||||
ffmpeg-headless,
|
||||
copyDesktopItems,
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
let
|
||||
yarn-berry = yarn-berry_4;
|
||||
nodejs = nodejs_24;
|
||||
electron = electron_39;
|
||||
electron = electron_42;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "losslesscut";
|
||||
|
|
|
|||
|
|
@ -55,7 +55,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
homepage = "https://fabiocolacio.github.io/Marker/";
|
||||
description = "Markdown editor for the Linux desktop made with GTK3";
|
||||
maintainers = with lib.maintainers; [
|
||||
trepetti
|
||||
aleksana
|
||||
];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
|
|
|
|||
|
|
@ -26,20 +26,20 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "n8n";
|
||||
version = "2.25.7";
|
||||
version = "2.27.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "n8n-io";
|
||||
repo = "n8n";
|
||||
tag = "n8n@${finalAttrs.version}";
|
||||
hash = "sha256-V8CqEzCw4DcLPCao4HRXrJXFeID2+Ef8fNW1xd1b8Vs=";
|
||||
hash = "sha256-Z8oAetoSJLTCO7UO+DrlSDFAIjLSLND9bQzrcLz0hYg=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-JS4OY6CmihsbJRyPszSlNUEViFKfLm2vu+G2upIoLW8=";
|
||||
hash = "sha256-xTZlv8YZC8u9pzD/WroduyO2MVtRvZ7ajKTphsHfObs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,17 +10,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ndg";
|
||||
version = "2.8.0";
|
||||
version = "2.9.0";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "feel-co";
|
||||
repo = "ndg";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-YIKEyzh0NFQlD0O92LQQNMoVCDwV8yw1Xz0Iu+4ZC5U=";
|
||||
hash = "sha256-be9NxraQyoB4wLjiPHxpmklfJYuB+Qs/x69P395I1Fk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-r4lNSZuGFtNTOkIyd7skdEmA61lfbetI03tIUD+MO+Y=";
|
||||
cargoHash = "sha256-N0em5kNY94sdPv3Fcpprk09yx1yKo8GZMWND/FJSSIw=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
@ -59,7 +59,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
homepage = "https://github.com/feel-co/ndg";
|
||||
changelog = "https://github.com/feel-co/ndg/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.mpl20;
|
||||
maintainers = [ lib.teams.feel-co ];
|
||||
mainProgram = "ndg";
|
||||
teams = [ lib.teams.feel-co ];
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -60,7 +60,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
homepage = "https://noaa-apt.mbernardi.com.ar/";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
trepetti
|
||||
tmarkus
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
buildGoModule (finalAttrs: {
|
||||
pname = "opengist";
|
||||
|
||||
version = "1.12.2";
|
||||
version = "1.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thomiceli";
|
||||
repo = "opengist";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MZ7aKT4qmWH4NyT32ZUpBmqqLJYCtLpdlSJHh+h7IPI=";
|
||||
hash = "sha256-jMB6TudICAjX0DGw62qP8X39q3OOT2Bvg70LJbFWqkE=";
|
||||
};
|
||||
|
||||
frontend = buildNpmPackage {
|
||||
|
|
@ -36,10 +36,10 @@ buildGoModule (finalAttrs: {
|
|||
cp -R public $out
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-KDdXBE5X+fOuXF/hIkyRHscMmBQ/E0PCUednfEm5i8k=";
|
||||
npmDepsHash = "sha256-Ci25S0kgT5C46xTzNTs0kn8QEvYqJuj/yU33Ymfci68=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lhDga5shastI7BfnEnekFnUc2L8Ju6LazeqvD7+CK/o=";
|
||||
vendorHash = "sha256-MRY677UiZg7j5HTFejvuzIJwEMczbhi6sIbGYjRnWeM=";
|
||||
|
||||
tags = [ "fs_embed" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -183,7 +183,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
license = lib.licenses.bsd3;
|
||||
mainProgram = "openroad";
|
||||
maintainers = with lib.maintainers; [
|
||||
trepetti
|
||||
hzeller
|
||||
];
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
downloadPage = "https://github.com/Openwsman/openwsman/releases";
|
||||
homepage = "https://openwsman.github.io";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ deepfire ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux; # PAM is not available on Darwin
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -21,17 +21,17 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pdns-recursor";
|
||||
version = "5.4.1";
|
||||
version = "5.4.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.powerdns.com/releases/pdns-recursor-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-k/I+6T+w06n9SIFyZWMezkdYuAAa9ybDWO46+2ZFtjo=";
|
||||
hash = "sha256-opICnFQ6xFOMpXYouBQsntypsoOjqAyzk+2UfgWE8A8=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src;
|
||||
sourceRoot = "pdns-recursor-${finalAttrs.version}/rec-rust-lib/rust";
|
||||
hash = "sha256-PxnLv1VbZgyQl83Bcvxyf7REsbTKI1MBV4RllHcyJyc=";
|
||||
hash = "sha256-eAiXdsHWZca0wx5FONGfa7JDcpDHyCABJOUROhwAsZo=";
|
||||
};
|
||||
|
||||
cargoRoot = "rec-rust-lib/rust";
|
||||
|
|
@ -72,6 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://doc.powerdns.com/recursor/changelog/${lib.versions.majorMinor finalAttrs.version}.html#change-${finalAttrs.version}";
|
||||
description = "Recursive DNS server";
|
||||
homepage = "https://www.powerdns.com/";
|
||||
platforms = lib.platforms.linux;
|
||||
|
|
|
|||
|
|
@ -101,6 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
__structuredAttrs = true;
|
||||
|
||||
meta = {
|
||||
changelog = "https://doc.powerdns.com/authoritative/changelog/${lib.versions.majorMinor finalAttrs.version}.html#change-${finalAttrs.version}";
|
||||
description = "Authoritative DNS server";
|
||||
homepage = "https://www.powerdns.com";
|
||||
platforms = lib.platforms.unix;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
python3,
|
||||
copyDesktopItems,
|
||||
nodejs,
|
||||
pnpm_10_29_2,
|
||||
pnpm_10,
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
makeDesktopItem,
|
||||
|
|
@ -31,9 +31,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_10_29_2;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-BHxieFMMUFbHJHWu8spz0z803kx+kwJ99oYkDpm6a58=";
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-BNvAGM9ECtptDwxWsmJVq82Bky1AxslYt51FyvOBEvs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
python3
|
||||
nodejs
|
||||
pnpmConfigHook
|
||||
pnpm_10_29_2
|
||||
pnpm_10
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems ];
|
||||
|
||||
|
|
|
|||
|
|
@ -14,16 +14,16 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage.override { inherit stdenv; } (finalAttrs: {
|
||||
pname = "pgdog";
|
||||
version = "0.1.45";
|
||||
version = "0.1.46";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgdogdev";
|
||||
repo = "pgdog";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-XMJNnkSV6c/0wWipFg59ZnnvCp4NwPELpVsQKCOViwA=";
|
||||
hash = "sha256-9NW/LL6GaiYF2p/4MoGXGRS2jv9bLi+dmRDPPNPhnVw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-6Eeon5+KRNFum7AGy8fkdpvtaMLduKzbtuqtJvpB8AY=";
|
||||
cargoHash = "sha256-qt7CD4rTDt5DrQSSYvmheD+ib+JgM1IjbkKFKm6wXBE=";
|
||||
|
||||
# Hardcoded paths for C compiler and linker
|
||||
postPatch = ''
|
||||
|
|
|
|||
10
pkgs/by-name/pn/pnpmBuildHook/package.nix
Normal file
10
pkgs/by-name/pn/pnpmBuildHook/package.nix
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
{
|
||||
makeSetupHook,
|
||||
}:
|
||||
makeSetupHook {
|
||||
# Shouldn't need to propagate anything because for this to do anything useful,
|
||||
# the config hook must also be used.
|
||||
name = "pnpm-build-hook";
|
||||
|
||||
__structuredAttrs = true;
|
||||
} ./pnpm-build-hook.sh
|
||||
52
pkgs/by-name/pn/pnpmBuildHook/pnpm-build-hook.sh
Normal file
52
pkgs/by-name/pn/pnpmBuildHook/pnpm-build-hook.sh
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
# shellcheck shell=bash
|
||||
|
||||
pnpmBuildHook() {
|
||||
echo "Executing pnpmBuildHook"
|
||||
|
||||
if [[ $pnpmRoot ]]; then
|
||||
pushd "$pnpmRoot"
|
||||
fi
|
||||
|
||||
# Add workspace flags before the other flags
|
||||
local -a pnpmWorkspacesArray
|
||||
concatTo pnpmWorkspacesArray pnpmWorkspaces
|
||||
|
||||
local -a pnpmBuildFlagsArray
|
||||
concatTo pnpmBuildFlagsArray pnpmFlags pnpmBuildFlags
|
||||
|
||||
|
||||
echo
|
||||
echo "Running"
|
||||
echo "pnpm run ${pnpmWorkspacesArray[*]/#/--filter=} ${pnpmBuildScript:-build} ${pnpmBuildFlagsArray[*]}"
|
||||
echo
|
||||
|
||||
if ! pnpm run "${pnpmWorkspacesArray[@]/#/--filter=}" "${pnpmBuildScript:-build}" "${pnpmBuildFlagsArray[@]}"; then
|
||||
echo
|
||||
echo "ERROR: 'pnpm run ${pnpmBuildScript:-build}' failed"
|
||||
echo
|
||||
echo "Here are a few things you can try, depending on the error:"
|
||||
echo "1. Make sure your build script (${pnpmBuildScript:-build}) exists"
|
||||
echo ' If there isnt one, set `dontPnpmBuild = true`.'
|
||||
echo
|
||||
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ $pnpmRoot ]]; then
|
||||
popd
|
||||
fi
|
||||
|
||||
echo "Finished pnpmBuildHook"
|
||||
}
|
||||
|
||||
pnpmBuildPhase() {
|
||||
runHook preBuild
|
||||
|
||||
pnpmBuildHook
|
||||
|
||||
runHook postBuild
|
||||
}
|
||||
|
||||
if [ -z "${dontPnpmBuild-}" ] && [ -z "${buildPhase-}" ]; then
|
||||
buildPhase=pnpmBuildPhase
|
||||
fi
|
||||
|
|
@ -13,18 +13,18 @@
|
|||
}:
|
||||
buildGo126Module (finalAttrs: {
|
||||
pname = "pocket-id";
|
||||
version = "2.8.0";
|
||||
version = "2.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pocket-id";
|
||||
repo = "pocket-id";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-mUBCX2FP/ieDCeqQwtAFmR3dKr8P5bGv8K3+f9ULhZM=";
|
||||
hash = "sha256-ZGjlEbx7gU1HHJRRSONFq/nYnubHOjfxQsVYpEHQkGE=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/backend";
|
||||
|
||||
vendorHash = "sha256-QJyy39v4+4+hJO14p6QjgUeHs3t5EXuqCHM/d91jKsM=";
|
||||
vendorHash = "sha256-elY0YGOOtZtlLnyFiDJ6ZzZULhI183kZgsFmQQAg2EE=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
ldflags = [
|
||||
|
|
@ -65,7 +65,7 @@ buildGo126Module (finalAttrs: {
|
|||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-vohVXJWPQA/29ntx4hY1eTDHuTGx5UuYymQH02Ufd/Y=";
|
||||
hash = "sha256-lQw+hmJcEBzMe3uOTmRErfHojAHwnRBN6aTy7yK9BCA=";
|
||||
};
|
||||
|
||||
env.BUILD_OUTPUT_PATH = "dist";
|
||||
|
|
|
|||
|
|
@ -132,7 +132,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
'';
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
afldcr
|
||||
moni
|
||||
];
|
||||
mainProgram = "polybar";
|
||||
|
|
|
|||
|
|
@ -56,6 +56,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
ELECTRON_SKIP_BINARY_DOWNLOAD = true;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Hide update banner
|
||||
echo "<template></template>" > src/components/banner/ManagerUpdateBanner.vue
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
|
|
|
|||
|
|
@ -74,9 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
description = "Qt application for configuring your Razer devices under GNU/Linux";
|
||||
mainProgram = "razergenie";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
f4814n
|
||||
];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
meta = {
|
||||
homepage = "https://github.com/n0la/rcon";
|
||||
description = "Source RCON client for command line";
|
||||
maintainers = with lib.maintainers; [ f4814n ];
|
||||
maintainers = [ ];
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
license = lib.licenses.bsd2;
|
||||
mainProgram = "rcon";
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
description = "Sayonara music player";
|
||||
homepage = "https://sayonara-player.com/";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ deepfire ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ stdenv.mkDerivation {
|
|||
description = "Small Footprint CIM Client Library";
|
||||
homepage = "https://sourceforge.net/projects/sblim/";
|
||||
license = lib.licenses.cpl10;
|
||||
maintainers = with lib.maintainers; [ deepfire ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
13
pkgs/by-name/si/signal-desktop/chromium-147-llvm-22.patch
Normal file
13
pkgs/by-name/si/signal-desktop/chromium-147-llvm-22.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
|
||||
index c092446fa0715351f72913fd449c8dddb855a10f..83670b496575a85ecb02a4671c0287fd0e052c5a 100644
|
||||
--- a/build/config/compiler/BUILD.gn
|
||||
+++ b/build/config/compiler/BUILD.gn
|
||||
@@ -616,7 +616,7 @@ config("compiler") {
|
||||
# The performance improvement does not seem worth the risk. See
|
||||
# https://crbug.com/484082200 for background and https://crrev.com/c/7593035
|
||||
# for discussion.
|
||||
- if (!is_wasm) {
|
||||
+ if (false) {
|
||||
cflags += [ "-fno-lifetime-dse" ]
|
||||
}
|
||||
|
||||
|
|
@ -15,23 +15,23 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "libsignal-node";
|
||||
version = "0.94.1";
|
||||
version = "0.95.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "signalapp";
|
||||
repo = "libsignal";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-re9IAC0R2QOIjyOLUjdaJw/TgDA4JT1nhtOskE5A0FQ=";
|
||||
hash = "sha256-stxakRw9CJQetkBcF2BfQh1EvEGurccP5/QLNLyEJz0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-EVwIRUJ8SmajjocZj3dAHkTiR7Q78m/lf+4qls/oZAM=";
|
||||
cargoHash = "sha256-bbOsE6vcFQpplzXAupcvp2oEoIFT3nk8Ug9QWbCe2yc=";
|
||||
|
||||
npmRoot = "node";
|
||||
npmDeps = fetchNpmDeps {
|
||||
name = "${finalAttrs.pname}-npm-deps";
|
||||
inherit (finalAttrs) version src;
|
||||
sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";
|
||||
hash = "sha256-bEQb+36IB+kXSbIkAFDpeIXWeHoQoIIiHo9q5AbaTio=";
|
||||
hash = "sha256-lCLM0qI11Ce9w2NNgXHalxa8Ks628nvTjZhy26PvNbM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,17 +1,18 @@
|
|||
{
|
||||
actool,
|
||||
stdenv,
|
||||
lib,
|
||||
nodejs_24,
|
||||
pnpm_10_29_2,
|
||||
pnpm_10,
|
||||
node-gyp,
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
electron_41,
|
||||
pnpmBuildHook,
|
||||
electron_42,
|
||||
python3,
|
||||
makeWrapper,
|
||||
callPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
fetchurl,
|
||||
jq,
|
||||
makeDesktopItem,
|
||||
|
|
@ -31,8 +32,8 @@ assert lib.warnIf (commandLineArgs != "")
|
|||
true;
|
||||
let
|
||||
nodejs = nodejs_24;
|
||||
pnpm = pnpm_10_29_2;
|
||||
electron = electron_41;
|
||||
pnpm = pnpm_10;
|
||||
electron = electron_42;
|
||||
|
||||
libsignal-node = callPackage ./libsignal-node.nix { inherit nodejs; };
|
||||
signal-sqlcipher = callPackage ./signal-sqlcipher.nix { inherit pnpm nodejs; };
|
||||
|
|
@ -40,13 +41,13 @@ let
|
|||
webrtc = callPackage ./webrtc.nix { };
|
||||
ringrtc = callPackage ./ringrtc.nix { inherit webrtc; };
|
||||
|
||||
version = "8.13.0";
|
||||
version = "8.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "signalapp";
|
||||
repo = "Signal-Desktop";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-gOYnjNCjI1eNVzcb7sx0XDXbhrAdvlgsZQaRuyBXpwI=";
|
||||
hash = "sha256-SiOgNUll6J+EZNlmM6yhXakOc5qFCFRE/GczhaH57Vo=";
|
||||
# Emoji font files will be added in `postFetch` if `withAppleEmojis` is enabled. They
|
||||
# are fetched separately below.
|
||||
postFetch = ''
|
||||
|
|
@ -68,23 +69,18 @@ let
|
|||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname src version;
|
||||
inherit pnpm;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-CPZkybD/rCBMBK9qUSweBdLr9hXu0Ztn8fekqrRzUR4=";
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-WmDSa4PrASaqs8X68LYaPBeE+i+Jh3FfWF30SseN74Y=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
pnpmConfigHook
|
||||
pnpmBuildHook
|
||||
pnpm
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
pnpm run build
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
cp -r dist $out
|
||||
|
|
@ -98,9 +94,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [
|
||||
actool
|
||||
node-gyp
|
||||
nodejs
|
||||
pnpmConfigHook
|
||||
pnpmBuildHook
|
||||
pnpm
|
||||
makeWrapper
|
||||
python3
|
||||
|
|
@ -173,14 +171,14 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
patches
|
||||
;
|
||||
inherit pnpm;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-3EEeHmtOAdcm2Q3eNUEl2RbTFRB4YBKcZLFtEmwbVOk=";
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-/z+P9mb7Cm3FzzMpV6Da6THcHd73JgPuuB0Gx8KwKcc=";
|
||||
};
|
||||
|
||||
env = {
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
SIGNAL_ENV = "production";
|
||||
SOURCE_DATE_EPOCH = 1780508208;
|
||||
SOURCE_DATE_EPOCH = 1781737260;
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
|
@ -234,17 +232,15 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
node-gyp rebuild
|
||||
popd
|
||||
test -f node_modules/fs-xattr/build/Release/xattr.node
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
export npm_config_nodedir=${electron.headers}
|
||||
cp -r ${electron.dist} electron-dist
|
||||
chmod -R u+w electron-dist
|
||||
cp -r ${sticker-creator} sticker-creator/dist
|
||||
'';
|
||||
|
||||
pnpm run generate
|
||||
pnpmBuildScript = "generate";
|
||||
|
||||
postBuild = ''
|
||||
pnpm exec electron-builder \
|
||||
${
|
||||
if stdenv.hostPlatform.isDarwin then "--mac" else "--linux"
|
||||
|
|
@ -254,8 +250,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
-c.electronVersion=${electron.version} \
|
||||
-c.npmRebuild=false \
|
||||
${lib.optionalString stdenv.hostPlatform.isDarwin "-c.mac.identity=null"}
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -19,16 +19,16 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ringrtc";
|
||||
version = "2.69.0";
|
||||
version = "2.69.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "signalapp";
|
||||
repo = "ringrtc";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-KQ/zAyj9caArZvl8SwMFfRcye1IzPoChjnYA0A8GcWw=";
|
||||
hash = "sha256-ekSXEaAyVzd5957qoFakD33UYrUmvxZL19M6uflPR5U=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-DlRAPFluKdfU1YutDNQbAEF95aydd+duc6T2hqYWwGQ=";
|
||||
cargoHash = "sha256-oNHT2owg3Ob2z8JxdYnICRdogK+XaasVgbF5RYYBJas=";
|
||||
|
||||
preConfigure = ''
|
||||
# Check for matching webrtc version
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
fetchFromGitHub,
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
pnpmBuildHook,
|
||||
nodejs,
|
||||
rustPlatform,
|
||||
cargo,
|
||||
|
|
@ -27,8 +28,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
inherit pnpm; # may be different than top-level pnpm
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-/EcPuqTXXGw1dEN6l1x84cUGyx890/rujjT+zJouIvM=";
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-HK3AetwGqFq/dhxX+aWgUww6eLCeQEkZIVsmmnYqdmM=";
|
||||
};
|
||||
|
||||
cargoRoot = "deps/extension";
|
||||
|
|
@ -42,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
nativeBuildInputs = [
|
||||
nodejs
|
||||
pnpmConfigHook
|
||||
pnpmBuildHook
|
||||
pnpm
|
||||
rustPlatform.cargoSetupHook
|
||||
cargo
|
||||
|
|
@ -53,16 +55,14 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
cctools.libtool
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
preBuild = ''
|
||||
export npm_config_nodedir=${nodejs}
|
||||
pnpm run prebuildify --strip false --arch "${stdenv.hostPlatform.node.arch}" --platform "${stdenv.hostPlatform.node.platform}"
|
||||
pnpm run build
|
||||
|
||||
runHook postBuild
|
||||
pnpm run prebuildify --strip false --arch "${stdenv.hostPlatform.node.arch}" --platform "${stdenv.hostPlatform.node.platform}"
|
||||
'';
|
||||
|
||||
pnpmBuildScript = "build";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
|
|
|||
|
|
@ -1,25 +1,25 @@
|
|||
{
|
||||
"src": {
|
||||
"args": {
|
||||
"hash": "sha256-TsVGiR9qXq6AmvPETkCQP7BGgO21/SUwZJZrSXlj7p8=",
|
||||
"hash": "sha256-kdRUqYFKsEbAR0u4btQc995vtbN+FVcei19PgTf1DyA=",
|
||||
"owner": "signalapp",
|
||||
"repo": "webrtc",
|
||||
"tag": "7680g"
|
||||
"tag": "7778c"
|
||||
},
|
||||
"fetcher": "fetchFromGitHub"
|
||||
},
|
||||
"src/build": {
|
||||
"args": {
|
||||
"hash": "sha256-ZPEL0Oy07aAd/qtboCcbD7t55f4EzHiOnE3fiVkZE3Q=",
|
||||
"rev": "a37e61dc22fd633ab32146e7000068a57a2864ff",
|
||||
"hash": "sha256-XmuuR4mLcaoAPCr82ka6ldtE4OmYFmXlWjNaP/wM2BQ=",
|
||||
"rev": "dd54dd5186566a13bda647123c22540666b12ace",
|
||||
"url": "https://chromium.googlesource.com/chromium/src/build"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
},
|
||||
"src/buildtools": {
|
||||
"args": {
|
||||
"hash": "sha256-wR2qwqxiRmInKzQiVIiZ13SNKuY5k+aJ+dxKAWV1zdo=",
|
||||
"rev": "6a18683f555b4ac8b05ac8395c29c84483ac9588",
|
||||
"hash": "sha256-BvGCdJ3EgUZX6MC3jf86YNl4LzUxpxiptCEBv3bqBIo=",
|
||||
"rev": "95ed44cf5f06dbb5861030b91c9db9ccb4316762",
|
||||
"url": "https://chromium.googlesource.com/chromium/src/buildtools"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
|
|
@ -35,40 +35,40 @@
|
|||
},
|
||||
"src/testing": {
|
||||
"args": {
|
||||
"hash": "sha256-cE8uCDkhkzFjrEJ3ccXq5H45WJ3wvmirLeeSymnR8bk=",
|
||||
"rev": "b887106bc278bb2a49e21f3a0ab2019574e7e47a",
|
||||
"hash": "sha256-tUh/eOrf71OjndY6p6IOJ5MFJUnuisDGWXJzsHHyrHs=",
|
||||
"rev": "629b7bb6055714e23d8125bf790cfc8d94a94159",
|
||||
"url": "https://chromium.googlesource.com/chromium/src/testing"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
},
|
||||
"src/third_party": {
|
||||
"args": {
|
||||
"hash": "sha256-fSsA88V0cv/hAJEZJ7p+RnrnkceLMZCa+XaP+1awo9M=",
|
||||
"rev": "e43b96b7a65dd3f45f066983061e6f8b2f3a112d",
|
||||
"hash": "sha256-sLMCkUCadVZIX5bTVovDd5tPn0ZB/CH/d0tQic8lEQg=",
|
||||
"rev": "4923971b35e39f6bd9be8bc19c4680785a15c80d",
|
||||
"url": "https://chromium.googlesource.com/chromium/src/third_party"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
},
|
||||
"src/third_party/boringssl/src": {
|
||||
"args": {
|
||||
"hash": "sha256-4eCoRVe47hZ6hc3gXgBS1gY64d+sPqeI08hNMh6JkUY=",
|
||||
"rev": "305bcfce00b189f2297f53365b0454f96009927d",
|
||||
"hash": "sha256-OIaU7GoHYKq1ZyPaW/gLSKNq1ipw5nAgjqcPIFXtGwE=",
|
||||
"rev": "8dce4fd20ab7e768c0a5103edc1d8cb7e54366ba",
|
||||
"url": "https://boringssl.googlesource.com/boringssl.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
},
|
||||
"src/third_party/breakpad/breakpad": {
|
||||
"args": {
|
||||
"hash": "sha256-dtuBGcYwwaqSKiW7ASFveAeJqcdnFLeU97ip8D786/Q=",
|
||||
"rev": "79099fdf668ae097c9eca7052fd5c4c5de6c9098",
|
||||
"hash": "sha256-igcX5XwacIwoGbqIcZKwlJYpRWl9Uc32WdpXyHO7UVA=",
|
||||
"rev": "8be0e3114685fcc1589561067282edf75ea1259a",
|
||||
"url": "https://chromium.googlesource.com/breakpad/breakpad.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
},
|
||||
"src/third_party/catapult": {
|
||||
"args": {
|
||||
"hash": "sha256-Buh+Ixx8CTqBb0vuu/Fnv6fx15lPMOatYGPAgQ0aWEI=",
|
||||
"rev": "39805a224bb6c6e80e403a4ebe9a150c7ca0b4d1",
|
||||
"hash": "sha256-f57wYazKyGrjfzcQ7EVqwIG8p+bHLGK0Qb/tZERxwY8=",
|
||||
"rev": "5a34891efa6e41c8aca8842386b8ee528963ffdf",
|
||||
"url": "https://chromium.googlesource.com/catapult.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
|
|
@ -99,16 +99,16 @@
|
|||
},
|
||||
"src/third_party/compiler-rt/src": {
|
||||
"args": {
|
||||
"hash": "sha256-7Jnb0tzi0SkS9vL7VurdTk6Igz5I8ol4H4nRqcZ2+O0=",
|
||||
"rev": "d606e955eec3d4fb0bf831dea336c3b24cba2f27",
|
||||
"hash": "sha256-ay0gzhNjAah27LQd/i0ex6EcHEdqpsWBT9Tw510coRM=",
|
||||
"rev": "bb7645f5e11c9c1d719a890fcb09ccfaaa14580f",
|
||||
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
},
|
||||
"src/third_party/cpuinfo/src": {
|
||||
"args": {
|
||||
"hash": "sha256-eXrfeFK0ADKAYoy/vESv7nQnH0oGpeZKlX8XEqPQspo=",
|
||||
"rev": "84818a41e074779dbb00521a4731d3e14160ff15",
|
||||
"hash": "sha256-LnLtCMMRg+DwB7MijBdt/tmCKD/zN5y2oTgXlYw3hTg=",
|
||||
"rev": "7607ca500436b37ad23fb8d18614bec7796b68a7",
|
||||
"url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
|
|
@ -123,24 +123,24 @@
|
|||
},
|
||||
"src/third_party/dav1d/libdav1d": {
|
||||
"args": {
|
||||
"hash": "sha256-E3da/LJ8HNy1osExmupovqnL8JHgVNzPUCG5F8TJKXQ=",
|
||||
"rev": "b546257f770768b2c88258c533da38b91a06f737",
|
||||
"hash": "sha256-iKq6TYscIBK4ydv+0msNV3tcs82Ljk5ZNr954Qv2lII=",
|
||||
"rev": "d69235dd804b24c04ed05639cffcc912cd6cfd75",
|
||||
"url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
},
|
||||
"src/third_party/depot_tools": {
|
||||
"args": {
|
||||
"hash": "sha256-RsmH8kxnmzOKsrfmDqULDeQsvRr1l+p8ZE1a4bPLVLs=",
|
||||
"rev": "9fd48a305e18b9bbaf61734557ce2c46497192b3",
|
||||
"hash": "sha256-r/mmibfbCBpV9reVbHc/S7FKffrtE729y2Mot/JsHgc=",
|
||||
"rev": "ce1ebad2c35c9387186f01d77edeea28a254c955",
|
||||
"url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
},
|
||||
"src/third_party/eigen3/src": {
|
||||
"args": {
|
||||
"hash": "sha256-GpuSoq887Z1qGKsc4+Vz8X+Sx40P6UnWhaQgrmigkdQ=",
|
||||
"rev": "afb43805349cf1cbec0083d94256bb8f72cbc53b",
|
||||
"hash": "sha256-/nzzcoJ87L7EVsRfAeok3UbxNKQeAWOFjmwZ3TYmGmI=",
|
||||
"rev": "002229ce470065878afb7c2f6f96d22c9a9b7ba0",
|
||||
"url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
|
|
@ -155,8 +155,8 @@
|
|||
},
|
||||
"src/third_party/ffmpeg": {
|
||||
"args": {
|
||||
"hash": "sha256-LphjwzqsrvAOzd+O+lJ/gGfaWuX4h2/UrRC694ftwSs=",
|
||||
"rev": "9e588ab02e16326026aa61cc3b6515da20520cec",
|
||||
"hash": "sha256-JHAicFKBvtkwmZPRBKYPT6JVqYqF8hyXxU0H7kfgCBs=",
|
||||
"rev": "b5e18fb9da84e26ceef30d4e4886696bf59337c0",
|
||||
"url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
|
|
@ -187,16 +187,16 @@
|
|||
},
|
||||
"src/third_party/freetype/src": {
|
||||
"args": {
|
||||
"hash": "sha256-CorCyTiS2fumIF0jhqQgw7VjGkjGXNVD8efdmfZ2wUo=",
|
||||
"rev": "e3a0652b6d706ee1ce77d4dda606b6597dd8b5c4",
|
||||
"hash": "sha256-H5RzBFYWIp/QYKyeBM2wfuX7FvXHPbhCAp7qne5Zvhw=",
|
||||
"rev": "99b479dc34728936b006679a31e12b8cf432fc55",
|
||||
"url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
},
|
||||
"src/third_party/fuzztest/src": {
|
||||
"args": {
|
||||
"hash": "sha256-CqJJ1hj9nQkGONB+5tJgafg1xvrPgTuE3tM8RjO2RY0=",
|
||||
"rev": "54dfec04d5c9ad1f22b08002ab6a5e2d0de77671",
|
||||
"hash": "sha256-0Fk2W4rS1xB6YcXsDbrMfmZUfMxNlGz29xRcBHZbijA=",
|
||||
"rev": "dc327134097700121e4ecd6e1d54d1d0a832a18d",
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
|
|
@ -235,8 +235,8 @@
|
|||
},
|
||||
"src/third_party/grpc/src": {
|
||||
"args": {
|
||||
"hash": "sha256-GvzPndJkPZsVCp0LtaQ29rnORQ7xSZ76if/feEIhvkI=",
|
||||
"rev": "f394c3f07b4c685b9f6948b36d65ca10a629f4fa",
|
||||
"hash": "sha256-LQrig9/ceXS1LclfN9b9DoAvwltIA1R5fSpmHTmaN8s=",
|
||||
"rev": "5e9fb9cbfb12a10ff9c16fbc360328d224b838d6",
|
||||
"url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
|
|
@ -251,16 +251,16 @@
|
|||
},
|
||||
"src/third_party/harfbuzz-ng/src": {
|
||||
"args": {
|
||||
"hash": "sha256-pXAQYEotsqZmfaJSQFaJmZAQVzUiNrHw52z0vmbxQRQ=",
|
||||
"rev": "fa2908bf16d2ccd6623f4d575455fea72a1a722b",
|
||||
"hash": "sha256-jQZElINbJgiVj1IHhkrtBCL5jGYzZrjJkO7gt+bgMA4=",
|
||||
"rev": "6f4c5cec306d31e6822303f5ba248a14293d588e",
|
||||
"url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
},
|
||||
"src/third_party/icu": {
|
||||
"args": {
|
||||
"hash": "sha256-zFxeAY6lEFRGNbCOOJij0CFjp3512WkyaN1Ld0+WADs=",
|
||||
"rev": "a86a32e67b8d1384b33f8fa48c83a6079b86f8cd",
|
||||
"hash": "sha256-hKIzBQVs4C/QJ4BdP3DTm6au9hq8BE0kG1VphtbtHVE=",
|
||||
"rev": "b4aae6832c06df9d538d41b249403cf0678f16b4",
|
||||
"url": "https://chromium.googlesource.com/chromium/deps/icu.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
|
|
@ -291,8 +291,8 @@
|
|||
},
|
||||
"src/third_party/libaom/source/libaom": {
|
||||
"args": {
|
||||
"hash": "sha256-SE9nevzv+e2pVvRECQM0bg3dU1l7rE/4bLPuZDHFi18=",
|
||||
"rev": "557586fde2fdc09dff9c3edf6943d6d54aa8914c",
|
||||
"hash": "sha256-uO+zjmt0g5m780WR823UJ0AmQA+dfVFOjPChTLAciTM=",
|
||||
"rev": "f3dddebddd0dba76fbfb97b96b6336bcf1d3a30c",
|
||||
"url": "https://aomedia.googlesource.com/aom.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
|
|
@ -323,56 +323,56 @@
|
|||
},
|
||||
"src/third_party/libjpeg_turbo": {
|
||||
"args": {
|
||||
"hash": "sha256-FeSS7D3NietL34KgpaDFenBf/GcvapGSpkiKwgIOOHs=",
|
||||
"rev": "6bb85251a8382b5e07f635a981ac685cc5ab5053",
|
||||
"hash": "sha256-KGeB/lTjhm8DQBDZVSPENvZEGSHeLTkviJrYsFh5vEM=",
|
||||
"rev": "d1f5f2393e0d51f840207342ae86e55a86443288",
|
||||
"url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
},
|
||||
"src/third_party/libpfm4/src": {
|
||||
"args": {
|
||||
"hash": "sha256-awpZ22rovLZWQkX/qog93vL4u2gJ+F3w5IGFNlZ0heQ=",
|
||||
"rev": "964baf9d35d5f88d8422f96d8a82c672042e7064",
|
||||
"hash": "sha256-6YaPJcI6Qk0F1Dv5evfFq3MVSsBpsQ7sIreSuHZmOUo=",
|
||||
"rev": "41878eab48c50bb9ec5f741a013e971bb5a9dff2",
|
||||
"url": "https://chromium.googlesource.com/external/git.code.sf.net/p/perfmon2/libpfm4.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
},
|
||||
"src/third_party/libsrtp": {
|
||||
"args": {
|
||||
"hash": "sha256-bkG1+ss+1a2rCHGwZjhvf5UaNVbPPZJt9HZSIPBKGwM=",
|
||||
"rev": "a52756acb1c5e133089c798736dd171567df11f5",
|
||||
"hash": "sha256-xC//VEFrI94nCkyLnRa6uQ+hJQqe41v0Qjm4LJ7K84I=",
|
||||
"rev": "e8383771af8aa4096f5bcfe3743a5ea128f88a9a",
|
||||
"url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
},
|
||||
"src/third_party/libunwind/src": {
|
||||
"args": {
|
||||
"hash": "sha256-iRfpzVN+QEpN6okwVs5oEtZqIJYzFGxsUO/IJY1c/W8=",
|
||||
"rev": "ba19d93d6d4f467fba11ff20fe2fc7c056f79345",
|
||||
"hash": "sha256-miwz3+/fq+7Ohsn8J6xrLsQn/VqyezS9vZO9XzEuZZA=",
|
||||
"rev": "db838d918570d4e381ecf9f5cc70a0098c9c2cd6",
|
||||
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
},
|
||||
"src/third_party/libvpx/source/libvpx": {
|
||||
"args": {
|
||||
"hash": "sha256-/FtYzbcOgOlaaWCoJfYns5oye7DoRZx1/xew3lN7tAM=",
|
||||
"rev": "e83e25f791932202256479052f18bdd03a091147",
|
||||
"hash": "sha256-8vej9g9+L73eOIuXZNfOWe6pV/cNr4JZOihZUtRxbFA=",
|
||||
"rev": "3fce57ecc905d95a4619f33d09851d68c5a88663",
|
||||
"url": "https://chromium.googlesource.com/webm/libvpx.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
},
|
||||
"src/third_party/libyuv": {
|
||||
"args": {
|
||||
"hash": "sha256-2lnobd22L9u+h6JGWJoWT/0gjhI5JImDsEjn+RRYzJg=",
|
||||
"rev": "917276084a49be726c90292ff0a6b0a3d571a6af",
|
||||
"hash": "sha256-DW7PuRqA1x0K8/uJbxBJ4Cn9YEPFhZ9vhuGVVyGKK98=",
|
||||
"rev": "30809ff64a9ca5e45f86439c0d474c2d3eef3d05",
|
||||
"url": "https://chromium.googlesource.com/libyuv/libyuv.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
},
|
||||
"src/third_party/llvm-libc/src": {
|
||||
"args": {
|
||||
"hash": "sha256-ZPsVBO+5v1xR9lvzHi616unK4HEak07Sy/reMSYwiok=",
|
||||
"rev": "d99c56d4b9f6663bff528c4fac5313bceb32e762",
|
||||
"hash": "sha256-nrd+E7LRTclF/Qa3wBvlutJ/wbLQKr73LOBk9k0qFOI=",
|
||||
"rev": "adccc443070c58badd6414fd9a4380ca8c78e7c4",
|
||||
"url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
|
|
@ -387,8 +387,8 @@
|
|||
},
|
||||
"src/third_party/nasm": {
|
||||
"args": {
|
||||
"hash": "sha256-vH3OUzfLZbaPY4DMAvSW0jKYRJmOa7aE8EfIJtZ1/Xs=",
|
||||
"rev": "af5eeeb054bebadfbb79c7bcd100a95e2ad4525f",
|
||||
"hash": "sha256-0KsHYi76IaVNwk0dBhem2AnUXd9PpeS+jUsY+zPmeJ8=",
|
||||
"rev": "45252858722aad12e545819b2d0f370eb865431b",
|
||||
"url": "https://chromium.googlesource.com/chromium/deps/nasm.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
|
|
@ -411,8 +411,8 @@
|
|||
},
|
||||
"src/third_party/perfetto": {
|
||||
"args": {
|
||||
"hash": "sha256-xOFm5u6uwzktkHCLuLmy3ryiuVN8B8Fo+ltHbFmilOY=",
|
||||
"rev": "2074b65d22dd04b65c2688647b9386a63338f0b9",
|
||||
"hash": "sha256-ZDQsBVFq9TgGGf5r2vv8nsHvFy03NM+SkbaXPoa345Q=",
|
||||
"rev": "40b1342aa7bd47d9c963c3617fd98ec1551528f9",
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
|
|
@ -443,32 +443,32 @@
|
|||
},
|
||||
"src/third_party/ruy/src": {
|
||||
"args": {
|
||||
"hash": "sha256-zJ7EYxIoZvN2uOfPscKzWycBO057g4bMnTys2sUrp2M=",
|
||||
"rev": "576e020f06334118994496b45f9796ed7fda3280",
|
||||
"hash": "sha256-4To1BMUgzj2/sV7USN9W0CgHnpRmaktEspfhwWWeVBc=",
|
||||
"rev": "2af88863614a8298689cc52b1a47b3fcad7be835",
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/ruy.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
},
|
||||
"src/third_party/tflite/src": {
|
||||
"args": {
|
||||
"hash": "sha256-pIhOSb9eLzel5oDPCpxCvI2XJ2jGLdLURCRkd1BbMkk=",
|
||||
"rev": "01e030d23d3b904d98cbf908da74d63b3c186949",
|
||||
"hash": "sha256-nvU3p6TzEqBkDtZEoxCZGPsQA0oZNJID8raqHBDS0ko=",
|
||||
"rev": "8fd527849069a358ad6c2980b9a9b34a53c53717",
|
||||
"url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
},
|
||||
"src/third_party/xnnpack/src": {
|
||||
"args": {
|
||||
"hash": "sha256-OdrwYAazY0E3han/fpFjlAiguY4M/xnCMJjL3KAIhvw=",
|
||||
"rev": "4574c4d9b00703c15f2218634ddf101597b22b18",
|
||||
"hash": "sha256-vOUwMXZJbYxTGPpdD5uc9ATfPIpThCDHV/YTlWN0ajw=",
|
||||
"rev": "97f3177fd836fff03b48a886bb130591866ad7ca",
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
},
|
||||
"src/tools": {
|
||||
"args": {
|
||||
"hash": "sha256-QKFYNmNwVcm7aAP3aeuSrY2ScbgMPs4/odf62dI0WJg=",
|
||||
"rev": "f8f65faf07b1132c9d01932ef95846e9a82b8d54",
|
||||
"hash": "sha256-PDjcHq8BTDLD6OsYFfvjw8ffmam/4YSx8SF0G/NvebY=",
|
||||
"rev": "f363a79871a91f36322e845e3134e2f04e1fc18a",
|
||||
"url": "https://chromium.googlesource.com/chromium/src/tools"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
|
|
|
|||
|
|
@ -97,6 +97,32 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
revert = true;
|
||||
hash = "sha256-WZsN2qm6lX121bDf7SoN75flXtCTmPPpwtHK0ayjkPc=";
|
||||
})
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/blob/8e689a91c5b4e47b57dee488dd7e319cc704eb9d/pkgs/applications/networking/browsers/chromium/common.nix#L620-L623
|
||||
# clang++: error: unknown argument: '-fno-lifetime-dse'
|
||||
./chromium-147-llvm-22.patch
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/blob/8e689a91c5b4e47b57dee488dd7e319cc704eb9d/pkgs/applications/networking/browsers/chromium/common.nix#L624-L644
|
||||
# clang++: error: unknown argument: '-fsanitize-ignore-for-ubsan-feature=return'
|
||||
(fetchpatch {
|
||||
name = "chromium-148-revert-build-Add--fsanitizer=return-config.patch";
|
||||
# https://chromium-review.googlesource.com/c/chromium/src/+/7629257
|
||||
url = "https://chromium.googlesource.com/chromium/src/+/99ba1f5302f9433efdb4df302cb7b7de56c72e4c^!?format=TEXT";
|
||||
decode = "base64 -d";
|
||||
revert = true;
|
||||
hash = "sha256-/qzzxwTdPMwIdsqD/G02S7kKHCj3QxECL+g1WYEaWmU=";
|
||||
})
|
||||
# ERROR Unresolved dependencies.
|
||||
# //apps:apps(//build/toolchain/linux/unbundle:default)
|
||||
# needs //build/config/compiler:sanitize_return(//build/toolchain/linux/unbundle:default)
|
||||
(fetchpatch {
|
||||
name = "chromium-148-revert-build-Enable--fsanitizer=return-config.patch";
|
||||
# https://chromium-review.googlesource.com/c/chromium/src/+/7629258
|
||||
url = "https://chromium.googlesource.com/chromium/src/+/9357bfbea03753fe52264c9ec36abe74f48cfef5^!?format=TEXT";
|
||||
decode = "base64 -d";
|
||||
revert = true;
|
||||
hash = "sha256-14fTHNh3vGsf4KgeH8uLX+aK3lrjK0VKd1dfK1g7r0I=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -196,7 +222,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
description = "WebRTC library used by Signal";
|
||||
homepage = "https://github.com/SignalApp/webrtc";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -26,6 +26,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
homepage = "https://github.com/dalance/svlint";
|
||||
changelog = "https://github.com/dalance/svlint/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ trepetti ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -22,6 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
mainProgram = "svls";
|
||||
homepage = "https://github.com/dalance/svls";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ trepetti ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -3,20 +3,20 @@
|
|||
stdenv,
|
||||
fetchFromGitHub,
|
||||
nodejs,
|
||||
pnpm_9,
|
||||
pnpm_10,
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tailwindcss-language-server";
|
||||
version = "0.14.28";
|
||||
version = "0.14.29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tailwindlabs";
|
||||
repo = "tailwindcss-intellisense";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jds6Wq4rcR4wXonZ1v9JITiEc4gflT0sTc3KUSBCMFc=";
|
||||
hash = "sha256-o5NyU52j3ZyuKWT4lL5U78qz4TBbXerylTl2fdvwqlk=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
|
|
@ -25,15 +25,21 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
version
|
||||
src
|
||||
pnpmWorkspaces
|
||||
patchPhase
|
||||
;
|
||||
pnpm = pnpm_9;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-3pHEmYMgQuHFFMyGeFzo9BWRFt6yvWzFFMJEdRhwS2w=";
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-excPYLP+81ftU/LwBeO/lmj4Nbefb4dNvpvudg/sx+w=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace ./packages/tailwindcss-language-server/package.json \
|
||||
--replace '"@tailwindcss/oxide": "^4.1.15",' '"@tailwindcss/oxide": "^4.1.14",'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pnpmConfigHook
|
||||
pnpm_9
|
||||
pnpm_10
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,32 +10,24 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "trivy";
|
||||
# As of March 2026, trivy has made compromised releases twice.
|
||||
# At a minimum, before updating, check the diff of this package, and of all
|
||||
# dependencies/GitHub Actions changes, carefully.
|
||||
# Also read about how the previous compromises occurred, and ensure
|
||||
# that the signs present then are not present now.
|
||||
# Finally, weigh the risk of a compromised release against the expected
|
||||
# benefit of the update, and consider the possibility of not updating.
|
||||
version = "0.69.3"; # Did you read the comment?
|
||||
version = "0.71.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = "trivy";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-lzFcLyrORA+1LxS4nzJVvilg29GTNiGRmnjJ47ev/yU=";
|
||||
hash = "sha256-GC9WiGp2Cn0SmErRxAdjpDJvoF0giKrj+NJAC5CaXV8=";
|
||||
};
|
||||
|
||||
# Hash mismatch on across Linux and Darwin
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-aqSB2pakYH713GSbIAHwAL9Gio17MzZtwqfh9sbzDBs=";
|
||||
vendorHash = "sha256-Xr24mc1nDevpeACKciw1g1bTfLtCEwxfOuwPNxVhGxo=";
|
||||
|
||||
subPackages = [ "cmd/trivy" ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X=github.com/aquasecurity/trivy/pkg/version/app.ver=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
nodejs,
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
pnpm_10_29_2,
|
||||
pnpm_10,
|
||||
|
||||
_7zz,
|
||||
electron,
|
||||
|
|
@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
postPatch
|
||||
;
|
||||
|
||||
pnpm = pnpm_10_29_2;
|
||||
pnpm = pnpm_10;
|
||||
|
||||
# let's just be safe and add these explicitly to nativeBuildInputs
|
||||
# even though the fetcher already uses them in its implementation
|
||||
|
|
@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
moreutils
|
||||
nodejs
|
||||
pnpmConfigHook
|
||||
pnpm_10_29_2
|
||||
pnpm_10
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
copyDesktopItems
|
||||
|
|
|
|||
|
|
@ -54,6 +54,6 @@ stdenv.mkDerivation {
|
|||
homepage = "https://github.com/ianka/xfs_undelete";
|
||||
license = lib.licenses.gpl3;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers.deepfire ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
16
pkgs/by-name/za/zammad/gemset.nix
generated
16
pkgs/by-name/za/zammad/gemset.nix
generated
|
|
@ -798,10 +798,10 @@
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1aymcakhzl83k77g2f2krz07bg1cbafbcd2ghvwr4lky3rz86mkb";
|
||||
sha256 = "1c2i64xsd35vijnb50rxb70g508s0x674xi0qpyyb8jy7bncl4j4";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.6";
|
||||
version = "1.3.7";
|
||||
};
|
||||
connection_pool = {
|
||||
groups = [
|
||||
|
|
@ -1355,10 +1355,10 @@
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1b930ag8nh99v8n9645ac1wcah9fx0mclbp323q4i1ly9acvkk3k";
|
||||
sha256 = "0y7j6yzv07zggic6g0p2v1ivnvkzsbqjnfdl4215qqb6cxz290hq";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.14.2";
|
||||
version = "2.14.3";
|
||||
};
|
||||
faraday-follow_redirects = {
|
||||
dependencies = [ "faraday" ];
|
||||
|
|
@ -1815,10 +1815,10 @@
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1anz6a6n33x4s3906s0bz6x161kk1ns3h7xxsn3rpxkfsw7k2m33";
|
||||
sha256 = "16mp8vzgxa8nsa81np042za453j8b0ihpjkf666s7byxrnvjb44v";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.19.8";
|
||||
version = "2.19.9";
|
||||
};
|
||||
json-jwt = {
|
||||
dependencies = [
|
||||
|
|
@ -2325,10 +2325,10 @@
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1s30b7h7qpyim30m8060xs415mbr3ci7i5hdg09chh1aqfx2qcbq";
|
||||
sha256 = "1d9safb4dly6qmc2g06444l0zifby52yy6j1a5fa1g4j3ihm3jah";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.19.3";
|
||||
version = "1.19.4";
|
||||
};
|
||||
nori = {
|
||||
dependencies = [ "bigdecimal" ];
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
let
|
||||
pname = "zammad";
|
||||
version = "7.1.0";
|
||||
version = "7.1.1";
|
||||
|
||||
src = applyPatches {
|
||||
src = fetchFromGitHub (lib.importJSON ./source.json);
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"owner": "zammad",
|
||||
"repo": "zammad",
|
||||
"rev": "ecbb861ce33908e4b52bb2c78d816a0eef69e6a6",
|
||||
"hash": "sha256-5mK120Oo8LEIA7yY9erc57WRUeCwzsIamTiAxPgePIQ=",
|
||||
"rev": "cdd01e9160ec4b90e869ccf4aa3d99eb223032e7",
|
||||
"hash": "sha256-BCrvhH5pgqG2jM3qE4NmtHXzKuSELHhI0QU3KIXUbMo=",
|
||||
"fetchSubmodules": true
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,49 @@
|
|||
From b225ea23753ce35356ad1b53c0854813004bb605 Mon Sep 17 00:00:00 2001
|
||||
From: rathmann <Uwe.Rathmann@tigertal.de>
|
||||
Date: Thu, 22 May 2025 15:33:04 +0200
|
||||
Subject: [PATCH] pkgconfig for Qt 5/6 adjustments
|
||||
|
||||
---
|
||||
src/src.pro | 15 ++++++++++-----
|
||||
1 file changed, 10 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/src.pro b/src/src.pro
|
||||
index 96e0624..8990ece 100644
|
||||
--- a/src/src.pro
|
||||
+++ b/src/src.pro
|
||||
@@ -81,22 +81,27 @@ contains(QWT_CONFIG, QwtPkgConfig) {
|
||||
|
||||
greaterThan(QT_MAJOR_VERSION, 4) {
|
||||
|
||||
- QMAKE_PKGCONFIG_FILE = Qt$${QT_MAJOR_VERSION}$${QMAKE_PKGCONFIG_NAME}
|
||||
- QMAKE_PKGCONFIG_REQUIRES = Qt5Widgets Qt5Concurrent Qt5PrintSupport
|
||||
+ QTLIB_PREFIX = Qt$${QT_MAJOR_VERSION} # e.g., "Qt5"
|
||||
+ QMAKE_PKGCONFIG_FILE = $${QTLIB_PREFIX}$${QMAKE_PKGCONFIG_NAME} # e.g., "Qt5Qwt6"
|
||||
+
|
||||
+ # Base Qt library requirements
|
||||
+ QMAKE_PKGCONFIG_REQUIRES = $${QTLIB_PREFIX}Widgets
|
||||
+ QMAKE_PKGCONFIG_REQUIRES += $${QTLIB_PREFIX}Concurrent
|
||||
+ QMAKE_PKGCONFIG_REQUIRES += $${QTLIB_PREFIX}PrintSupport
|
||||
|
||||
contains(QWT_CONFIG, QwtSvg) {
|
||||
- QMAKE_PKGCONFIG_REQUIRES += Qt5Svg
|
||||
+ QMAKE_PKGCONFIG_REQUIRES += $${QTLIB_PREFIX}Svg
|
||||
}
|
||||
|
||||
contains(QWT_CONFIG, QwtOpenGL) {
|
||||
- QMAKE_PKGCONFIG_REQUIRES += Qt5OpenGL
|
||||
+ QMAKE_PKGCONFIG_REQUIRES += $${QTLIB_PREFIX}OpenGL
|
||||
}
|
||||
|
||||
QMAKE_DISTCLEAN += $${DESTDIR}/$${QMAKE_PKGCONFIG_DESTDIR}/$${QMAKE_PKGCONFIG_FILE}.pc
|
||||
}
|
||||
else {
|
||||
|
||||
- # there is no QMAKE_PKGCONFIG_FILE fo Qt4
|
||||
+ # there is no QMAKE_PKGCONFIG_FILE for Qt4
|
||||
QMAKE_PKGCONFIG_REQUIRES = QtGui
|
||||
|
||||
contains(QWT_CONFIG, QwtSvg) {
|
||||
--
|
||||
2.54.0
|
||||
|
||||
|
|
@ -23,6 +23,19 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-3LCFiWwoquxVGMvAjA7itOYK2nrJKdgmOfYYmFGmEpo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix the generated pkg-config file when built against Qt6.
|
||||
# The file wrongly pulled in an unsatisfied dependency to Qt5.
|
||||
#
|
||||
# When building Qwt using Qt6, the constructed pkgconfig .pc file was
|
||||
# previously set up to only look for Qt5 libraries. This fix now matches
|
||||
# the library dependency to the Qt version used in building Qwt.
|
||||
#
|
||||
# See upstream commit b225ea23753ce35356ad1b53c0854813004bb605.
|
||||
# https://sourceforge.net/p/qwt/git/ci/b225ea23753ce35356ad1b53c0854813004bb605/basic
|
||||
./0001-pkgconfig-for-Qt-5-6-adjustments.patch
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
qtbase
|
||||
qtsvg
|
||||
|
|
|
|||
|
|
@ -23,8 +23,6 @@ buildDunePackage (finalAttrs: {
|
|||
homepage = "https://mmottl.github.io/pcre-ocaml";
|
||||
description = "Efficient C-library for pattern matching with Perl-style regular expressions in OCaml";
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
vbmithr
|
||||
];
|
||||
maintainers = [ ];
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ stdenv.mkDerivation rec {
|
|||
license = lib.licenses.bsd3;
|
||||
inherit (ocaml.meta) platforms;
|
||||
maintainers = with lib.maintainers; [
|
||||
vbmithr
|
||||
gal_bolle
|
||||
];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,13 +13,14 @@
|
|||
}:
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "composer";
|
||||
version = "2.9.8";
|
||||
version = "2.10.1";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "composer";
|
||||
repo = "composer";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-g9r6l0qjpAxVw0q3wbrUstnq2lISMSLgr13FsjcnHDQ=";
|
||||
hash = "sha256-0EeELI4jCSgG6S5sR6tQbwgcqdhe0JTcObvE5x49v1A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -33,7 +34,7 @@ php.buildComposerProject2 (finalAttrs: {
|
|||
inherit (finalAttrs.passthru) pharHash;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GNu1BMKPi0SKH6+456NPnAVuNOk2ylONogtLygdi1y8=";
|
||||
vendorHash = "sha256-58l07Gt0j4g412rJfsRNSIAQ6Yd3ADpiQ9LXN+pHKNg=";
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/composer \
|
||||
|
|
@ -55,7 +56,7 @@ php.buildComposerProject2 (finalAttrs: {
|
|||
# use together with the version from this package to keep the
|
||||
# bootstrap phar file up-to-date together with the end user composer
|
||||
# package.
|
||||
passthru.pharHash = "sha256-WbLFDhDK+g2O/Bnt6aMm14LwlsZ0omuvmM8ELOI96JA=";
|
||||
passthru.pharHash = "sha256-NFucapjaXDDcvUsNmfyHEL8K6Yo4mO6hj3sq2d7JPwY=";
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/composer/composer/releases/tag/${finalAttrs.version}";
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@
|
|||
psutil,
|
||||
pygments,
|
||||
pymdown-extensions,
|
||||
python-multipart,
|
||||
pyyaml,
|
||||
pyzmq,
|
||||
ruff,
|
||||
starlette,
|
||||
tomlkit,
|
||||
uvicorn,
|
||||
|
|
@ -32,13 +32,13 @@
|
|||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "marimo";
|
||||
version = "0.23.6";
|
||||
version = "0.23.10";
|
||||
pyproject = true;
|
||||
|
||||
# The github archive does not include the static assets
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-1jru7h6ep8rHm/JTDaupFRmRU9zk0Vb63nVGR0Z508o=";
|
||||
hash = "sha256-7XQ0NGLIhDbugeSM97f1zA8FyrJ/1lAnl8Zb1DtTvEA=";
|
||||
};
|
||||
|
||||
build-system = [ uv-build ];
|
||||
|
|
@ -58,9 +58,9 @@ buildPythonPackage rec {
|
|||
psutil
|
||||
pygments
|
||||
pymdown-extensions
|
||||
python-multipart
|
||||
pyyaml
|
||||
pyzmq
|
||||
ruff
|
||||
starlette
|
||||
tomlkit
|
||||
uvicorn
|
||||
|
|
|
|||
|
|
@ -46,6 +46,6 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/PyHDI/Pyverilog";
|
||||
description = "Python-based Hardware Design Processing Toolkit for Verilog HDL";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ trepetti ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ buildPythonPackage rec {
|
|||
description = "Swiss Army knife of sub-GHz ISM band radio";
|
||||
homepage = "https://github.com/atlas0fd00m/rfcat";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ trepetti ];
|
||||
maintainers = [ ];
|
||||
changelog = "https://github.com/atlas0fd00m/rfcat/releases/tag/v${version}";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,6 +46,6 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/deeplook/svglib";
|
||||
changelog = "https://github.com/deeplook/svglib/blob/v${version}/CHANGELOG.rst";
|
||||
license = lib.licenses.lgpl3Only;
|
||||
maintainers = with lib.maintainers; [ trepetti ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, fetchFromGitHub }:
|
||||
let
|
||||
version = "3.14.1";
|
||||
vendorHash = "sha256-fibx+Ky2cfP71tPzeiDybx+0f/+XvZbDXC7PAWQMRIY=";
|
||||
nodeModulesHash = "sha256-wQUOUB5uhWbdEP1nP02ihRZf3F1sEvQeZTDxOa5P1lQ=";
|
||||
version = "3.16.0";
|
||||
vendorHash = "sha256-z87enzlH2jVq/BI6uVbpLG6jKsO5Wr2alJOcFjt/+MM=";
|
||||
nodeModulesHash = "sha256-6sWSybiSJj7G1KO2iv81yylmOV6DBVN1D15PFYpilC0=";
|
||||
in
|
||||
{
|
||||
inherit version vendorHash nodeModulesHash;
|
||||
|
|
@ -11,7 +11,7 @@ in
|
|||
owner = "woodpecker-ci";
|
||||
repo = "woodpecker";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-D9AC9D8O3n420yvEzYhV7ev7dLZULAZ55iUWDmla4z0=";
|
||||
hash = "sha256-9Bc7225CZFELgra5gnmo7KeNeY4X7+YpyvVGG/Y+sAs=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ stdenv.mkDerivation {
|
|||
description = "Server part of irony";
|
||||
mainProgram = "irony-server";
|
||||
homepage = "https://melpa.org/#/irony";
|
||||
maintainers = [ lib.maintainers.deepfire ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -90,9 +90,7 @@ stdenv.mkDerivation rec {
|
|||
description = "O'Caml library manager";
|
||||
homepage = "http://projects.camlcity.org/projects/findlib.html";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
vbmithr
|
||||
];
|
||||
maintainers = [ ];
|
||||
mainProgram = "ocamlfind";
|
||||
platforms = ocaml.meta.platforms or [ ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@ let
|
|||
variants = {
|
||||
# ./update-xanmod.sh lts
|
||||
lts = {
|
||||
version = "6.18.35";
|
||||
hash = "sha256-as5IBHZlphht6LqSzLdUaNAGxvGsgtTWNtwoCj12FNA=";
|
||||
version = "6.18.37";
|
||||
hash = "sha256-8H8V9z8fizt/2DCTTCme0DVYOfJ4431SFs0iubUHONE=";
|
||||
isLTS = true;
|
||||
};
|
||||
# ./update-xanmod.sh main
|
||||
main = {
|
||||
version = "7.0.12";
|
||||
hash = "sha256-yqyHkdSLSyTrhnwsWJ0jq4bhqaCrJ+qzkUzxdrVJP6A=";
|
||||
version = "7.0.14";
|
||||
hash = "sha256-9vb4ORzAppq5S/ukEhDHohNQBW+jWwGnjhv21HztWdk=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ in
|
|||
buildLinux (
|
||||
args
|
||||
// rec {
|
||||
version = "7.0.12";
|
||||
version = "7.1.2";
|
||||
pname = "linux-zen";
|
||||
modDirVersion = lib.versions.pad 3 "${version}-${suffix}";
|
||||
isZen = true;
|
||||
|
|
@ -27,7 +27,7 @@ buildLinux (
|
|||
owner = "zen-kernel";
|
||||
repo = "zen-kernel";
|
||||
rev = "v${version}-${suffix}";
|
||||
sha256 = "02fkkmmc28rw0kg02807jvv6k745zqfb9wg65dfd8sl298krp0fp";
|
||||
sha256 = "0d02lgwl0x415xrbznsldd7j1krpzlnbd2ciis3shz8zhmbhfg1f";
|
||||
};
|
||||
|
||||
# This is based on the following source:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue