mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-28 10:50:15 +00:00
Merge release-26.05 into staging-nixos-26.05
This commit is contained in:
nixpkgs-ci[bot]
@@ -7513,12 +7513,6 @@
|
||||
matrix = "@dwoffinden:matrix.org";
|
||||
name = "Daniel Woffinden";
|
||||
};
|
||||
dwrege = {
|
||||
email = "email@dwrege.de";
|
||||
github = "DominicWrege";
|
||||
githubId = 7389000;
|
||||
name = "Dominic Wrege";
|
||||
};
|
||||
dwt = {
|
||||
email = "spamfaenger@gmx.de";
|
||||
github = "dwt";
|
||||
|
||||
@@ -53,16 +53,28 @@
|
||||
machine.screenshot("Repath-Studio-GUI-Welcome")
|
||||
machine.send_key("kp_enter") # OK
|
||||
|
||||
# sleep is required it needs time to dismiss the dialog
|
||||
# move the mouse to the "Save" icon on the toolbar
|
||||
machine.execute("su - alice -c \"DISPLAY=:0 xdotool mousemove --sync 95 65\"")
|
||||
|
||||
# click the save icon until the GTK save dialog appears
|
||||
for _ in range(30):
|
||||
status, _ = machine.execute("su - alice -c \"DISPLAY=:0 xdotool search --name 'Save File'\"")
|
||||
if status == 0:
|
||||
break
|
||||
machine.execute("su - alice -c \"DISPLAY=:0 xdotool click 1\"")
|
||||
machine.sleep(1)
|
||||
|
||||
# wait for the GTK dialog to focus the text input field
|
||||
machine.sleep(3)
|
||||
machine.send_chars("saved.rps") # avoid using absolute path here, doesn't work for some reason
|
||||
# wait for text to be typed
|
||||
machine.sleep(2)
|
||||
machine.send_key("ctrl-shift-s")
|
||||
machine.sleep(2)
|
||||
machine.send_chars("/tmp/saved.rps")
|
||||
machine.sleep(2)
|
||||
machine.succeed("su - alice -c 'DISPLAY=:0 xdotool mousemove --sync 975 745 click 1'") # Save file dialog
|
||||
machine.sleep(2)
|
||||
print(machine.succeed("cat /tmp/saved.rps"))
|
||||
assert "${pkgs.repath-studio.version}" in machine.succeed("cat /tmp/saved.rps")
|
||||
|
||||
machine.execute("su - alice -c \"DISPLAY=:0 xdotool key alt+s\"") # save file
|
||||
machine.wait_until_succeeds("ls /home/alice/saved.rps")
|
||||
|
||||
machine.succeed("cat /home/alice/saved.rps")
|
||||
assert "${pkgs.repath-studio.version}" in machine.succeed("cat /home/alice/saved.rps")
|
||||
|
||||
machine.screenshot("Repath-Studio-GUI")
|
||||
'';
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "andcli";
|
||||
version = "2.8.1";
|
||||
version = "2.9.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -19,10 +19,10 @@ buildGoModule (finalAttrs: {
|
||||
owner = "tjblackheart";
|
||||
repo = "andcli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-BVF+r8N+/PvARxANlL7nPf23ABbp+O1DNPblMyXroq8=";
|
||||
hash = "sha256-ls/QWEAxxnsersk7L3AaRo5jo1Vsao61c2mgjt91sAQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-aFOwfloqFPPMgCufwmDgfM9lDinkFvu4i+BiVUo+Iwk=";
|
||||
vendorHash = "sha256-+qz2vIh4GTkdmhjGvYqJYZ9ZMI9f+yXObmyGHk/5Cyg=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "arti";
|
||||
version = "2.5.1";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.torproject.org";
|
||||
@@ -21,18 +21,19 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "core";
|
||||
repo = "arti";
|
||||
tag = "arti-v${finalAttrs.version}";
|
||||
hash = "sha256-fPobYu2ADTeIwpeXyxQKh5yr1zw+yMQfqTkiZMMd8YY=";
|
||||
hash = "sha256-ukGplnZz1O1Djh12COKk8FL/3rLmmWGyl0b816wRWBE=";
|
||||
};
|
||||
|
||||
# Working around a bug in cargo that appears with cargo-auditable, see
|
||||
# https://github.com/rust-secure-code/cargo-auditable/issues/124.
|
||||
postPatch = ''
|
||||
substituteInPlace crates/arti/Cargo.toml \
|
||||
--replace-fail '"http"' '"dep:http"' \
|
||||
--replace-fail '"tokio-util"' '"dep:tokio-util"'
|
||||
'';
|
||||
|
||||
buildAndTestSubdir = "crates/arti";
|
||||
cargoHash = "sha256-+JQ+SkRLyLl4RUq69nIUn1zJ/DmYpVEICQO5o85FsNw=";
|
||||
cargoHash = "sha256-/7sWTLeVolqliggn1Qw+kxqAeWENHgbCR6hK5Th2z+g=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
|
||||
|
||||
|
||||
@@ -16,47 +16,47 @@ let
|
||||
phpMajor = lib.versions.majorMinor php.version;
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
|
||||
version = "2026.8.6";
|
||||
version = "2026.9.0";
|
||||
|
||||
hashes = {
|
||||
"x86_64-linux" = {
|
||||
system = "amd64";
|
||||
hash = {
|
||||
"8.1" = "sha256-lZyZjyLFcjWDCyA8qoHvWA5UTMA23nwJ60Pi0qnF6FU=";
|
||||
"8.2" = "sha256-CyukBCV9EDiFYWOhyren7mLDS1m1K43Cqr+gbKONPZU=";
|
||||
"8.3" = "sha256-6lXP8f302H0isG4a4G25G7F9SeN1/iSN9PXBYoLusOM=";
|
||||
"8.4" = "sha256-LZN56S7uvMfa/HqJZihbJlOH0tRhSXF1C6vI/dHlfJI=";
|
||||
"8.5" = "sha256-xtf4tv37DElCPJqSZn+21+wpkYF1jZ49Wgu9pJhPbbs=";
|
||||
"8.1" = "sha256-0AAgiBdiIQOxSSttD2ERzSTqPM1rLwlQFHZ6ARRSgmI=";
|
||||
"8.2" = "sha256-usSNoM1XeVWKuHLlSMvONAucVa1ZEAb3+I66oOnzGB0=";
|
||||
"8.3" = "sha256-65GoEhgFsQbQleSVuRnHPSZAiCfEUmyVWWhnybnrgaA=";
|
||||
"8.4" = "sha256-0if1fQa7b41TjC3d1ck65cJP7lKdoL670V9t+PLL+qk=";
|
||||
"8.5" = "sha256-3k5jQ+vbxLGp78MRzjiw7uP+tCcEs5gAYM2MEoiYdtk=";
|
||||
};
|
||||
};
|
||||
"i686-linux" = {
|
||||
system = "i386";
|
||||
hash = {
|
||||
"8.1" = "sha256-ssEimBtjlRPI3bNMFT+iizetVkv5SVUn9zadHZ9wPr4=";
|
||||
"8.2" = "sha256-DVz4gm28JhIT0mSiwWYFtRwZ6NJJsrSmS2yYyHLhx6U=";
|
||||
"8.3" = "sha256-2Kn1J0ckLyls3arA7cGQcJEAYP7gob6jbNwAZrCrZ9g=";
|
||||
"8.4" = "sha256-k++71n+gUGqTGS1IKYOFoNoTgQpzakFDoU1IFzqqN98=";
|
||||
"8.5" = "sha256-V3U7GbEcLXw+5jGZCh3QWZa8IHcy3db2/emZhw3IHdM=";
|
||||
"8.1" = "sha256-fmmbY4ecnE05XNxGKq11HcYhs9z7SggLx9iXICHE6DQ=";
|
||||
"8.2" = "sha256-9WP+FpULl0PQJ+0qxxZfm5xJS/A6N137yGk9gv4cYvI=";
|
||||
"8.3" = "sha256-Io2gGAhXLAVdHoaKwKvJWA1N71IJAKeJkudLs8DZUl8=";
|
||||
"8.4" = "sha256-JoGiB8ew3D/qSi7Pg/q67mXLsUy4UDVsazgxgb5BJTM=";
|
||||
"8.5" = "sha256-bSfbhFHV8Zs4cpOfDnKItNlF9++0opUtosTpnosacdU=";
|
||||
};
|
||||
};
|
||||
"aarch64-linux" = {
|
||||
system = "arm64";
|
||||
hash = {
|
||||
"8.1" = "sha256-0SeUcMZGCUrKWD/FI9p0nkOaEq2Q8PWb42esHXFjsNs=";
|
||||
"8.2" = "sha256-wTuS7IaXRg6B3qxH2QkacuHAq5bbPcqPbVDxgwxy9mA=";
|
||||
"8.3" = "sha256-/65Yjji+2Hi/OdhZIin3ttidHbZcprYA33e8SIoK6yM=";
|
||||
"8.4" = "sha256-3n359rNQatVNmKmFIwfQRR9+DMBBhI4wcMpHyJOVWtY=";
|
||||
"8.5" = "sha256-GDv9gZ2KD8281P0xrzDkq1uI4D5Y4uTMCbGNy2tIcfg=";
|
||||
"8.1" = "sha256-7/2Q9Kx3ZEpI0Inj88CfTDzr0sjVpws3DH8KTP26PR0=";
|
||||
"8.2" = "sha256-suFGyE94wY4xHfPk77OXzkqU+Ulb+f42drDZY/M9ZNs=";
|
||||
"8.3" = "sha256-z5IfXX7DElerdRTnq3R95t8IvG0Hl9EKXBw1QbRlDkY=";
|
||||
"8.4" = "sha256-ceTjQ6gtiWJEte5WuVuyc+eTEb3khobYoCWNGP+Vkeo=";
|
||||
"8.5" = "sha256-1jX564B/tLBgb7jN6MB5DfpRgYy0xxmtAaAv768FQqo=";
|
||||
};
|
||||
};
|
||||
"aarch64-darwin" = {
|
||||
system = "arm64";
|
||||
hash = {
|
||||
"8.1" = "sha256-5gdDsxSWTpxGjelGMY7nyvoAGGC0YftF9qHKdw+XbUs=";
|
||||
"8.2" = "sha256-jF4xbQ7RAcyb0obbeiJxJXAwLaW+cO8Yf22ZGU7cEu4=";
|
||||
"8.3" = "sha256-aNtRucr7kBBCAAOcazFq1ZUHDtW8FJpEwqHeYnR0zO4=";
|
||||
"8.4" = "sha256-HAlT3o6QRVDG07MTDGXxp7cmysoHFN4AdZGhUiaol58=";
|
||||
"8.5" = "sha256-NRKTuUVM2sMKARfMFlccY0by77kt3goi+B69snmQpC4=";
|
||||
"8.1" = "sha256-JQZKX8qChvBS3S8cqtxmooZMsFlFqfffnQbNldYNR+M=";
|
||||
"8.2" = "sha256-nGQdweskEw9tiK51IGcu7cGKJJwtmNBL9fZLMUCuiB8=";
|
||||
"8.3" = "sha256-sHQOg6QC+Mm5KwQVwKmeOVR3fUkN2NH9utHs667Oipw=";
|
||||
"8.4" = "sha256-Btrz+U9ejW/Jl1cWBRt5XGV1IzjxK+FJaQwXIgYR/NI=";
|
||||
"8.5" = "sha256-zSQeBioU/3c7HrqEz+9z8vam3EHkR0KbC80/mIuTAFE=";
|
||||
};
|
||||
};
|
||||
"x86_64-darwin" = {
|
||||
|
||||
@@ -13,16 +13,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-release";
|
||||
version = "1.1.3";
|
||||
version = "1.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crate-ci";
|
||||
repo = "cargo-release";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5fe+iIPZAKi8aQW2PfanO7U2d70Oc3KvL/RZTV9/ZU8=";
|
||||
hash = "sha256-ukzR9VAbrvI+r01D7vCXeBouQeamCtEnKmBg8kKGRpg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-abTQuKpVcjorr6RQ1t9sAzqvS39XT6lg4fALAqO68YI=";
|
||||
cargoHash = "sha256-E+ZhFMfASA6rP4E/+hbZihe0Rzf7RRe3I+W+wj389bo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@@ -40,6 +40,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
git
|
||||
];
|
||||
|
||||
checkFlags = [
|
||||
# Skip tests that require internet connection
|
||||
"--skip=publish::unpublished_git_dependency"
|
||||
"--skip=publish::unpublished_workspace_dependency"
|
||||
];
|
||||
|
||||
# disable vendored-libgit2 and vendored-openssl
|
||||
buildNoDefaultFeatures = true;
|
||||
|
||||
|
||||
@@ -16,16 +16,16 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "centrifugo";
|
||||
version = "6.6.2";
|
||||
version = "6.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "centrifugal";
|
||||
repo = "centrifugo";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-V67riIkwBKz4YvCo6PJS3jrVl3Q6DE9ewEzzHPi7YFE=";
|
||||
hash = "sha256-0c+FxylNxRBhELUSgbLSe14G4P+37XUwOmsF9XU3Y4Q=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-K/90YrXkwiDt9Zm6h5nVo34WjtQQKBCNigJguwAdW5E=";
|
||||
vendorHash = "sha256-ElkoxUko+6VuJ+tB3L4P8+G3NAXhrhIYjRJqAFCsajQ=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "crowdsec";
|
||||
version = "1.7.7";
|
||||
version = "1.7.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crowdsecurity";
|
||||
repo = "crowdsec";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-TG9YRKzht9OAnlDNxLNP8060v0klee6GY7vJCu6MugM=";
|
||||
hash = "sha256-2t9nxuqWNDAUOZHtfNkZ4ZFKXvv8k5LuvKrGNjpdGXc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-BjkTMBrQPv8uZzme02WFdobuYdbe1RvRkZ8RjHGubo8=";
|
||||
vendorHash = "sha256-RDkttsV4PNOfjWPr4v+uIwdkmXYH83vkYFQQIO3CYGE=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -8,15 +8,15 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "7.1.310";
|
||||
version = "7.1.320";
|
||||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/aunetx/deezer-linux/releases/download/v${version}/deezer-desktop-${version}-x64.tar.xz";
|
||||
hash = "sha256-G1nrkyQR3pduZulFE30DTCTfVMmZe7X6nl6bcDfSf8E=";
|
||||
hash = "sha256-qCi7Yi2phMtN4IWo8eR0SFIe90TpOk2jqJKj3URSeNQ=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://github.com/aunetx/deezer-linux/releases/download/v${version}/deezer-desktop-${version}-arm64.tar.xz";
|
||||
hash = "sha256-fMShKodtD8/icEcpRIVZZ9H3KlF/GEpMyuihcDkviWk=";
|
||||
hash = "sha256-xgpdmrM3+v9o0sKyYv09MxdD6xoTNff3hPgD+loyhNE=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -180,7 +180,7 @@ let
|
||||
|
||||
linux = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta;
|
||||
version = "152.0.7977.82";
|
||||
version = "153.0.8010.36";
|
||||
|
||||
src =
|
||||
let
|
||||
@@ -195,8 +195,8 @@ let
|
||||
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_${debArch}.deb";
|
||||
hash =
|
||||
{
|
||||
amd64 = "sha256-TSXkoCjHinrpEGg1UcLyNHksxVlefj40k59Zk0KtpEY=";
|
||||
arm64 = "sha256-HcBFWH2AjCB6GenrNw9ukS3X5pZpU6+5PIHZnD/jGOM=";
|
||||
amd64 = "sha256-m7ROMwMcLyhXzza0NDBRoS+TBY5LeB48djE9+H9sjTI=";
|
||||
arm64 = "sha256-H89uxRqdUuJv8a2AciX3Jb5VBprStoxdaTYaJ0ZmUYg=";
|
||||
}
|
||||
.${debArch};
|
||||
};
|
||||
@@ -306,11 +306,11 @@ let
|
||||
|
||||
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta;
|
||||
version = "152.0.7977.83";
|
||||
version = "153.0.8010.37";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.google.com/release2/chrome/g62gliie746ywu62ed7go3adam_152.0.7977.83/GoogleChrome-152.0.7977.83.dmg";
|
||||
hash = "sha256-Uc16WeBPhu/r7zB/UE9yt+cgkbpRYkRM3xtENFltqps=";
|
||||
url = "http://dl.google.com/release2/chrome/mtrht6j77xyruy2gnvuwtsjrcm_153.0.8010.37/GoogleChrome-153.0.8010.37.dmg";
|
||||
hash = "sha256-mNJM1d0Soi8kb3YROZ4SRG24fgA23CIyxaDFXeFY5tw=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.7.53.2";
|
||||
version = "1.7.53.3";
|
||||
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-6cQotHwIwWFR5phFQI9r79jpd+iYA1HpFBbYIzEVBsc=";
|
||||
hash = "sha256-O8XhzwCeaJI8Bu5ra5VqR7UGUyLzUl37FLAdLlNlzhI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -109,7 +109,6 @@ stdenv.mkDerivation {
|
||||
maintainers = with lib.maintainers; [
|
||||
azahi
|
||||
eclairevoyant
|
||||
dwrege
|
||||
];
|
||||
platforms = builtins.attrNames mozillaPlatforms;
|
||||
mainProgram = "librewolf";
|
||||
|
||||
@@ -31,7 +31,6 @@ in
|
||||
homepage = "https://librewolf.net/";
|
||||
maintainers = with lib.maintainers; [
|
||||
azahi
|
||||
dwrege
|
||||
fpletz
|
||||
hythera
|
||||
mBornand
|
||||
|
||||
@@ -18,16 +18,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "lockbook-desktop";
|
||||
version = "26.8.4";
|
||||
version = "26.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lockbook";
|
||||
repo = "lockbook";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ge6uo54T6sWYn4z2fE3teelkTofSLjMPeBGJ84a6N5c=";
|
||||
hash = "sha256-MSRuvyuq8DxQELJHTKCdfYl4cqd9PTDsnAgmA1xeUiw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-KPRlvkhHGiYPTOzNoZ3nDmyJ0VmMESTSLpGvQl+I6Oo=";
|
||||
cargoHash = "sha256-Mo/XO/1/sVRln99Bw1fxtIgn8zkl3s/4OdXI0xcb11c=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -20,21 +20,21 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "matrix-authentication-service";
|
||||
version = "1.23.0";
|
||||
version = "1.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "element-hq";
|
||||
repo = "matrix-authentication-service";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DnaVIMp+pRRsNlyBZiTiqXajOgGFBT38sNLmC+IF8pU=";
|
||||
hash = "sha256-LWGnfM7os9GT6fa/Vk1wAEp9m1L5rEL7tSPmgEKMNfQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-3fBikvSbPTiIYXk7TQKoQ/YqjF5ZCoN0xQRSqCmHF9Q=";
|
||||
cargoHash = "sha256-jAJuRwhc+0IAikLyqctHuCQcS61iNj7iKWHJdRAqsAk=";
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-8dPqsa1/D4q7hdntV1AmbRxQyZgAf7Q/z+etj+R/jIE=";
|
||||
hash = "sha256-DxEjMhYqZGbnobQ/F0WFXq7qaxSkWDcoZ0kmWJsdxEQ=";
|
||||
};
|
||||
|
||||
pnpmRoot = "frontend";
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mongoc";
|
||||
version = "1.30.3";
|
||||
version = "1.30.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mongodb";
|
||||
repo = "mongo-c-driver";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-3mzqsrbXfrtAAC5igIna5dAgU8FH23lkMS2IacVlCmI=";
|
||||
hash = "sha256-5msXPEt4a/Q/LDSowf2Eu2HD7ktrTrB9Adi/PtPIs5o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "pangolin-cli";
|
||||
version = "0.8.2";
|
||||
version = "0.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fosrl";
|
||||
repo = "cli";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-LMLeJVYu2L1+FVOLNapEShj36zv8vCP9BVkU4Y/g0vc=";
|
||||
hash = "sha256-y+B29E6wXUcMQsWLAcLYIpg0uuqjr+zfxf2WVt0oY9A=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
||||
@@ -46,12 +46,12 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rabbitmq-server";
|
||||
version = "4.2.5";
|
||||
version = "4.2.9";
|
||||
|
||||
# when updating, consider bumping elixir version in all-packages.nix
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-cI/imLX4pdZTl1HDKaE2WwOOaWpwC78KyqWHmxsFQj0=";
|
||||
hash = "sha256-3enC+vDQcQh9WMKPpefxjwcYBTxLehJvlBfmixnFEIQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
23
pkgs/by-name/re/repath-studio/fix-karma-sandbox.patch
Normal file
23
pkgs/by-name/re/repath-studio/fix-karma-sandbox.patch
Normal file
@@ -0,0 +1,23 @@
|
||||
--- a/karma.conf.js
|
||||
+++ b/karma.conf.js
|
||||
@@ -7,7 +7,7 @@
|
||||
customLaunchers: {
|
||||
ChromeHeadlessNoSandbox: {
|
||||
base: 'ChromeHeadless',
|
||||
- flags: ['--no-sandbox']
|
||||
+ flags: ['--no-sandbox', '--disable-dev-shm-usage']
|
||||
},
|
||||
CustomElectron: {
|
||||
base: 'Electron',
|
||||
@@ -42,6 +42,10 @@
|
||||
outputDir: junitOutputDir + '/karma', // results will be saved as outputDir/browserName.xml
|
||||
outputFile: undefined, // if included, results will be saved as outputDir/browserName/outputFile
|
||||
suite: '' // suite will become the package name attribute in xml testsuite element
|
||||
- }
|
||||
+ },
|
||||
+
|
||||
+ browserDisconnectTimeout: 300000,
|
||||
+ browserNoActivityTimeout: 300000,
|
||||
+ pingTimeout: 300000
|
||||
})
|
||||
}
|
||||
@@ -36,6 +36,8 @@ buildNpmPackage (finalAttrs: {
|
||||
# outputHash of clojureHome changes each time `clojure` is updated
|
||||
# https://github.com/ngi-nix/ngipkgs/pull/1727#discussion_r2470180998
|
||||
./pin-clojure.patch
|
||||
# checks have become flaky in nix build sandbox, increase timeout and disable dev/shm for chrome
|
||||
./fix-karma-sandbox.patch
|
||||
./0001-disable-auto-update-check.patch
|
||||
];
|
||||
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "runc";
|
||||
version = "1.4.2";
|
||||
version = "1.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencontainers";
|
||||
repo = "runc";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-bBZEcFr/w8r0pKb0ijONUogCKRMgbMQt3o2NR+zhXrU=";
|
||||
hash = "sha256-I9DruagoSWjrEBB4n+w5rzali5wvD/q3tVQFWPDnLAI=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
}:
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "tauno-monitor";
|
||||
version = "0.2.20";
|
||||
version = "0.2.24";
|
||||
pyproject = false;
|
||||
|
||||
__structuredAttrs = true;
|
||||
@@ -23,7 +23,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
owner = "taunoe";
|
||||
repo = "tauno-monitor";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-rtFnWK1K4S866lgR/lGaTB+REqDExKsEFePX8cwai5E=";
|
||||
hash = "sha256-HtoXdKKa/2nvBZVUXSrXH/7JHzdQObjW+7QTx/e8IWo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -46,11 +46,11 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tor";
|
||||
version = "0.4.9.11";
|
||||
version = "0.4.9.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dist.torproject.org/tor-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-LmwXIBGMgSrPAHn9R8+Rtr+rpddmwyHE09KijWoRqO0=";
|
||||
hash = "sha256-wNMHydza7khIqMpT6dbE7JKCPk8wvhJ5Cw+938ZRX1s=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
nodejs,
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
pnpm_10,
|
||||
pnpm_11,
|
||||
prisma_7,
|
||||
prisma-engines_7,
|
||||
openssl,
|
||||
@@ -20,7 +20,7 @@
|
||||
basePath ? "",
|
||||
}:
|
||||
let
|
||||
pnpm = pnpm_10;
|
||||
pnpm = pnpm_11;
|
||||
|
||||
sources = lib.importJSON ./sources.json;
|
||||
|
||||
@@ -46,14 +46,14 @@ let
|
||||
# to guarantee compatibility.
|
||||
prisma-engines' = prisma-engines_7.overrideAttrs (
|
||||
finalAttrs: prevAttrs: {
|
||||
version = "7.8.0";
|
||||
version = "7.9.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "prisma";
|
||||
repo = "prisma-engines";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-nquIcOmFz+ikD0x/YEPZ5NVKCFPCdR5MSCHldn+b9jI=";
|
||||
hash = "sha256-bGtVKGoWZc/3s0lhTXksp+6fM/Q461ve/HQsRPxWD0Q=";
|
||||
};
|
||||
cargoHash = "sha256-uiFvzxwVJXCW9LUDFRC6ZkzSa7LQk+9ZJcaJw8mrBX4=";
|
||||
cargoHash = "sha256-zLl2ErsCTXZVShPFLH94GLJ0q2FrMnfnecnfKD7VDL4=";
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (prevAttrs) pname;
|
||||
@@ -63,25 +63,31 @@ let
|
||||
};
|
||||
}
|
||||
);
|
||||
prisma' = (prisma_7.override { prisma-engines_7 = prisma-engines'; }).overrideAttrs (
|
||||
finalAttrs: prevAttrs: {
|
||||
version = "7.8.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "prisma";
|
||||
repo = "prisma";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-89q5433z54h3oGX+lEYDQykN2mNltGz4+LWlYSE75/E=";
|
||||
};
|
||||
pnpmDeps = prevAttrs.pnpmDeps.override {
|
||||
inherit (finalAttrs) src version;
|
||||
hash = "sha256-mrFU5SAF4QuTBJj5TP8tUkYDG4zchttjcQMLtx6OBnI=";
|
||||
};
|
||||
}
|
||||
);
|
||||
prisma' =
|
||||
(prisma_7.override {
|
||||
prisma-engines_7 = prisma-engines';
|
||||
pnpm_10 = pnpm_11;
|
||||
}).overrideAttrs
|
||||
(
|
||||
finalAttrs: prevAttrs: {
|
||||
version = "7.9.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "prisma";
|
||||
repo = "prisma";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-h89lJbGG2ZkK3Viipsqe8hqTSTZk6vEulaMLPPkgn8c=";
|
||||
};
|
||||
pnpmDeps = prevAttrs.pnpmDeps.override {
|
||||
inherit (finalAttrs) src version;
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-EEfVAdF6QawXV95NUmEL9IqzPqazCz47Y9Hg/F6IybU=";
|
||||
};
|
||||
}
|
||||
);
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "umami";
|
||||
version = "3.2.0";
|
||||
version = "3.3.1";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
@@ -94,17 +100,21 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
owner = "umami-software";
|
||||
repo = "umami";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0nfCcaST06cTg43Rz1rCV8GYYDjQLP+6TrVRJF2/Yuk=";
|
||||
hash = "sha256-LldK8dv3mkgEB9LWzt4X/bfh474G4LWOtJghTo5/n7A=";
|
||||
};
|
||||
|
||||
# Umami uses next/font/google, which tries to download from Google Fonts at build time.
|
||||
# Replace that code with a copy of the required font(s) from nixpkgs instead.
|
||||
postPatch = ''
|
||||
# Umami uses next/font/google, which tries to download from Google Fonts at build time.
|
||||
# Replace that code with a copy of the required font(s) from nixpkgs instead.
|
||||
substituteInPlace ./src/app/layout.tsx \
|
||||
--replace-fail "import { Inter } from 'next/font/google';" "import localFont from 'next/font/local';" \
|
||||
--replace-fail 'const inter = Inter({' "const inter = localFont({ src: './Inter.ttf',"
|
||||
|
||||
cp "${inter}/share/fonts/truetype/InterVariable.ttf" src/app/Inter.ttf
|
||||
|
||||
# Biome executable needs to be patched to run, but we don't need to format code anyway, so just skip it.
|
||||
substituteInPlace ./package.json \
|
||||
--replace-fail ' && biome format --write src/tracker/index.d.ts' '''
|
||||
'';
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
@@ -115,7 +125,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
;
|
||||
inherit pnpm;
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-6ho5xoVdqZdihThL5q8+RhVPfaSwu1y3+p9d8DnfO3o=";
|
||||
hash = "sha256-253jfz20wXwh/8/d7KVEl4jlaj7IURWJrW2/F0FS4BI=";
|
||||
};
|
||||
|
||||
env.NODE_ENV = "production";
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"geocities": {
|
||||
"rev": "04017f13909e499135afea605a1e07427e845641",
|
||||
"date": "2026-07-02",
|
||||
"hash": "sha256-4IYGsxNGdzilI0mYXlwEo43auqNug307pYyPuilR3aw="
|
||||
"rev": "f9f57fe9861c93e7dacf53671b22ea3afe4768ba",
|
||||
"date": "2026-08-20",
|
||||
"hash": "sha256-4B78nMlzsXTAosnTgjYrl2YiWLYEWs3Xois8o6BZIuM="
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zellij-unwrapped";
|
||||
version = "0.45.0";
|
||||
version = "0.45.1";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zellij-org";
|
||||
repo = "zellij";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-1kS0DuF+mO60jf2UZTKhwZuekO31aoXIEytGuljzd08=";
|
||||
hash = "sha256-pp++8CTIM4PuAYOjM7GnzU4TXTaw8XuDMow5k/7KQgY=";
|
||||
};
|
||||
|
||||
# Remove the `vendored_curl` feature in order to link against the libcurl from nixpkgs instead of
|
||||
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
--replace-fail ', "vendored_curl"' ""
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-ZwxoqdZ73/HvdkdNWOKW3Av6htI/vCFcJ0zVpSL1SuU=";
|
||||
cargoHash = "sha256-rCK7FyAUIjUq6dxEw9YBaGm29xYvlYjX0b1xHU03XVU=";
|
||||
|
||||
env.OPENSSL_NO_VENDOR = 1;
|
||||
|
||||
|
||||
10
pkgs/development/libraries/nettle/4.nix
Normal file
10
pkgs/development/libraries/nettle/4.nix
Normal file
@@ -0,0 +1,10 @@
|
||||
{ callPackage, fetchurl }:
|
||||
|
||||
callPackage ./generic.nix rec {
|
||||
version = "4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/nettle/nettle-${version}.tar.gz";
|
||||
hash = "sha256-Ot28ANoBhGsjL7O8RTU46lRo2kMDPyG7NFyx6Qc/UJQ=";
|
||||
};
|
||||
}
|
||||
@@ -1,12 +1,14 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
_experimental-update-script-combinators,
|
||||
alsa-lib,
|
||||
alsa-plugins,
|
||||
autoPatchelfHook,
|
||||
fetchFromGitHub,
|
||||
freetype,
|
||||
installShellFiles,
|
||||
libGL,
|
||||
libGLU,
|
||||
libpulseaudio,
|
||||
libx11,
|
||||
@@ -18,24 +20,27 @@
|
||||
libxrandr,
|
||||
libxrender,
|
||||
makeWrapper,
|
||||
nix-update-script,
|
||||
openssl,
|
||||
pkg-config,
|
||||
scons,
|
||||
testers,
|
||||
udev,
|
||||
writeScriptBin,
|
||||
yasm,
|
||||
zlib,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "godot3";
|
||||
version = "3.6.2";
|
||||
version = "3.6.3";
|
||||
godotBuildDescription = "X11 tools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "godotengine";
|
||||
repo = "godot";
|
||||
rev = "${finalAttrs.version}-stable";
|
||||
hash = "sha256-loNjE+NmHniZ827Eb9MHSNo27F2LrURhWURjUq4d8xw=";
|
||||
hash = "sha256-5MerJVY+SAri85mo2dbqxjDftpJJXzjsMAvlwidGEs4=";
|
||||
};
|
||||
|
||||
# Fix PIE hardening: https://github.com/godotengine/godot/pull/50737
|
||||
@@ -170,6 +175,39 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]
|
||||
);
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
};
|
||||
|
||||
updateScript = _experimental-update-script-combinators.sequence [
|
||||
(nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"(3\\..*)-stable"
|
||||
];
|
||||
})
|
||||
./mono/update-glue-version.sh
|
||||
];
|
||||
|
||||
patch-godot-bin =
|
||||
let
|
||||
libPath = lib.makeLibraryPath [
|
||||
libxcursor
|
||||
libxinerama
|
||||
libxext
|
||||
libxrandr
|
||||
libxrender
|
||||
libx11
|
||||
libxi
|
||||
libGL
|
||||
];
|
||||
in
|
||||
writeScriptBin "patch-godot-bin" ''
|
||||
patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" --set-rpath "${libPath}" "$1"
|
||||
'';
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://godotengine.org";
|
||||
description =
|
||||
|
||||
@@ -44,17 +44,15 @@
|
||||
# official glue version by building from the official source.
|
||||
#
|
||||
# To address this, we are patching the python script with a hard-coded glue version number. This
|
||||
# patch file needs to be updated for every new version of godot, so to enforce this, the godot
|
||||
# version is baked in to the file name, causing the build to fail until the patch is updated.
|
||||
# patch file needs to be updated for every new version of godot.
|
||||
#
|
||||
# The correct glue version number for a given godot version is obtained by running the official
|
||||
# build of that version of godot with the --generate-mono-glue flag. This generates the mono
|
||||
# glue files. One of those files, mono_glue.gen.cpp, has a function called get_cs_glue_version()
|
||||
# which contains a hard-coded number. This is the glue version to put in the patch file.
|
||||
#
|
||||
# For convenience, the accompanying update-glue-version.sh script automates this work. Run it by
|
||||
# passing the godot version as an argument, e.g. "3.5.2".
|
||||
"/gen_cs_glue_version.py/hardcodeGlueVersion_${self.version}.patch"
|
||||
# For convenience, the accompanying update-glue-version.sh script automates this work.
|
||||
"/gen_cs_glue_version.py/hardcodeGlueVersion.patch"
|
||||
];
|
||||
|
||||
outputs = [ "out" ];
|
||||
|
||||
@@ -16,7 +16,7 @@ index 98bbb4d9be..5189f2551b 100644
|
||||
- latest_mtime = mtime if mtime > latest_mtime else latest_mtime
|
||||
-
|
||||
- glue_version = int(latest_mtime) # The latest modified time will do for now
|
||||
+ glue_version = 1761170065
|
||||
+ glue_version = 1787344265
|
||||
|
||||
with open(version_header_dst, "w") as version_header:
|
||||
version_header.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n")
|
||||
@@ -1,39 +1,41 @@
|
||||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p steam-run unzip wget
|
||||
#! nix-shell -i bash -p unzip wget godot3.patch-godot-bin -I nixpkgs=.
|
||||
# shellcheck shell=bash
|
||||
|
||||
# This script updates the hard-coded glue_version in:
|
||||
#
|
||||
# patches/gen_cs_glue_version.py/hardcodeGlueVersionFor{version}.patch
|
||||
# patches/gen_cs_glue_version.py/hardcodeGlueVersionFor.patch
|
||||
#
|
||||
# It does so by pulling it from the official build.
|
||||
|
||||
set -e
|
||||
|
||||
[ -z "$1" ] && echo "Godot version not specified. Exiting." && exit 1
|
||||
|
||||
gdversion=$1
|
||||
if [[ -z "$1" ]]; then
|
||||
gdversion=$(nix-instantiate --eval --raw -A ${UPDATE_NIX_ATTR_PATH:-godot3}.version)
|
||||
else
|
||||
gdversion=$1
|
||||
fi
|
||||
|
||||
# Download and extract the official stable 64-bit X11 mono build of Godot.
|
||||
gddir="$(mktemp -d)"
|
||||
trap 'rm -rf -- "$gddir"' EXIT
|
||||
tmpdir="$(mktemp -d)"
|
||||
trap 'rm -rf -- "$tmpdir"' EXIT
|
||||
gddir="$tmpdir"/gd
|
||||
gluedir="$tmpdir"/glue
|
||||
mkdir -p "$gddir" "$gluedir"
|
||||
|
||||
wget -O "$gddir"/Godot_v$gdversion-stable_mono_x11_64.zip "https://downloads.godotengine.org/?version=$gdversion&flavor=stable&slug=mono_x11_64.zip&platform=linux.64"
|
||||
unzip "$gddir"/Godot_v$gdversion-stable_mono_x11_64.zip -d "$gddir"
|
||||
|
||||
# Generate the mono glue from the official build.
|
||||
gluedir="$(mktemp -d)"
|
||||
trap 'rm -rf -- "$gluedir"' EXIT
|
||||
steam-run "$gddir"/Godot_v$gdversion-stable_mono_x11_64/Godot_v$gdversion-stable_mono_x11.64 --generate-mono-glue "$gluedir"
|
||||
patch-godot-bin "$gddir"/Godot_v$gdversion-stable_mono_x11_64/Godot_v$gdversion-stable_mono_x11.64
|
||||
"$gddir"/Godot_v$gdversion-stable_mono_x11_64/Godot_v$gdversion-stable_mono_x11.64 --generate-mono-glue "$gluedir"
|
||||
|
||||
# Extract the glue version.
|
||||
glueversion=$(grep -Po '(?<=get_cs_glue_version\(\) \{ return )[0-9]+(?=; \})' "$gluedir"/mono_glue.gen.cpp)
|
||||
|
||||
patchdir=./patches/gen_cs_glue_version.py/
|
||||
patchprefix=hardcodeGlueVersion_
|
||||
newpatchname=$patchprefix$gdversion.patch
|
||||
patch="$(dirname "${BASH_SOURCE[0]}")"/patches/gen_cs_glue_version.py/hardcodeGlueVersion.patch
|
||||
|
||||
# Update the patch with the obtained glue version.
|
||||
sed -i "s/^+ glue_version = [0-9]\+$/+ glue_version = $glueversion/" $patchdir/$patchprefix*.patch
|
||||
sed -i "s/^+ glue_version = [0-9]\+$/+ glue_version = $glueversion/" "$patch"
|
||||
|
||||
mv $patchdir/$patchprefix*.patch $patchdir/$patchprefix$gdversion.patch
|
||||
|
||||
echo "Updated $patchdir/$patchprefix$gdversion.patch with glue_version: $glueversion"
|
||||
echo "Updated $patch with glue_version: $glueversion"
|
||||
|
||||
@@ -6691,6 +6691,7 @@ with pkgs;
|
||||
};
|
||||
|
||||
nettle = import ../development/libraries/nettle { inherit callPackage fetchurl; };
|
||||
nettle_4 = import ../development/libraries/nettle/4.nix { inherit callPackage fetchurl; };
|
||||
|
||||
libnghttp2 = nghttp2.lib;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user