nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-26 02:05:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next-26.05 into staging-26.05

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2026-07-27 00:37:30 +00:00
committed by GitHub
parent f931e1475b da7db60ef2
commit d9792e8d41
26 changed files with 296 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/by-name/db/dbeaver-bin/package.nix
View File

@@ -19,7 +19,7 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "dbeaver-bin";
version = "26.0.5";
version = "26.1.3";
src =
let
@@ -32,10 +32,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
aarch64-darwin = "macos-aarch64.dmg";
};
hash = selectSystem {
x86_64-linux = "sha256-urgvGZNM7V5zmts+3Zv7nDtyBuyyAHjc9HDUP2CXx50=";
aarch64-linux = "sha256-Ye6NH8tBmSbDS3sJjTzvc9C+qyU3DA0HL0csFUzD1pc=";
x86_64-darwin = "sha256-iMyHZUNHzSpc2DrKSsduMx13hUY1SdHQTANR3Yj256A=";
aarch64-darwin = "sha256-F60zrgx2cS6HCmSznUapSgmuIxLI1Ma8WHrmawDzEUk=";
x86_64-linux = "sha256-cPRmReV6F+pCkrbF7d1m+bQjOaJCCFndNSThMWPGrsY=";
aarch64-linux = "sha256-bT1bCKzeiAMJbPa6I6fqQq7OrbkKhgDYAUEKuURHP5g=";
x86_64-darwin = "sha256-cT4r0QbA0mhO+fStnU7ORgvSPjNiyz3a0asins0kYaE=";
aarch64-darwin = "sha256-NYX651gUpEDh2O720ZKl7fUTYLFKpTJzyC/YnN4Vnys=";
};
in
fetchurl {

84
pkgs/by-name/fa/factorio/versions.json
View File

@@ -3,99 +3,99 @@
"alpha": {
"experimental": {
"candidateHashFilenames": [
"factorio_linux_2.0.76.tar.xz"
"factorio_linux_2.1.8.tar.xz"
],
"name": "factorio_alpha_x64-2.0.76.tar.xz",
"name": "factorio_alpha_x64-2.1.8.tar.xz",
"needsAuth": true,
"sha256": "b1e50891bdc69cce3fdaee4f840cbe4658e18d465309ac87915b6fc41900754c",
"sha256": "307016173b824ddfa1a1be4067526273f3aafe6dc8a9c49aff7b2250c466b0b0",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/2.0.76/alpha/linux64",
"version": "2.0.76"
"url": "https://factorio.com/get-download/2.1.8/alpha/linux64",
"version": "2.1.8"
},
"stable": {
"candidateHashFilenames": [
"factorio_linux_2.0.76.tar.xz"
"factorio_linux_2.0.77.tar.xz"
],
"name": "factorio_alpha_x64-2.0.76.tar.xz",
"name": "factorio_alpha_x64-2.0.77.tar.xz",
"needsAuth": true,
"sha256": "b1e50891bdc69cce3fdaee4f840cbe4658e18d465309ac87915b6fc41900754c",
"sha256": "2e7c26d999c140335abb82c5e642cdd4c98db559633562d7ad9844aff4f273ff",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/2.0.76/alpha/linux64",
"version": "2.0.76"
"url": "https://factorio.com/get-download/2.0.77/alpha/linux64",
"version": "2.0.77"
}
},
"demo": {
"experimental": {
"candidateHashFilenames": [
"factorio-demo_linux_2.0.76.tar.xz"
"factorio-demo_linux_2.0.77.tar.xz"
],
"name": "factorio_demo_x64-2.0.76.tar.xz",
"name": "factorio_demo_x64-2.0.77.tar.xz",
"needsAuth": false,
"sha256": "d5caee49636290b678d35adc59d2fc80ecbdbad8bf420731f1317971c89f941b",
"sha256": "f2fc889de1924b551cf52ca2ce2c73251f9c20ee2ae38cc8e973415baffef2a1",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/2.0.76/demo/linux64",
"version": "2.0.76"
"url": "https://factorio.com/get-download/2.0.77/demo/linux64",
"version": "2.0.77"
},
"stable": {
"candidateHashFilenames": [
"factorio-demo_linux_2.0.76.tar.xz"
"factorio-demo_linux_2.0.77.tar.xz"
],
"name": "factorio_demo_x64-2.0.76.tar.xz",
"name": "factorio_demo_x64-2.0.77.tar.xz",
"needsAuth": false,
"sha256": "d5caee49636290b678d35adc59d2fc80ecbdbad8bf420731f1317971c89f941b",
"sha256": "f2fc889de1924b551cf52ca2ce2c73251f9c20ee2ae38cc8e973415baffef2a1",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/2.0.76/demo/linux64",
"version": "2.0.76"
"url": "https://factorio.com/get-download/2.0.77/demo/linux64",
"version": "2.0.77"
}
},
"expansion": {
"experimental": {
"candidateHashFilenames": [
"factorio-space-age_linux_2.0.76.tar.xz"
"factorio-space-age_linux_2.1.8.tar.xz"
],
"name": "factorio_expansion_x64-2.0.76.tar.xz",
"name": "factorio_expansion_x64-2.1.8.tar.xz",
"needsAuth": true,
"sha256": "dc24bbbc1b6a619e4425d9a720bcfafce3463d908ab369a6cd1bee1a99332b4f",
"sha256": "92ec753d96eab63fc60f45ac45259a9427268f74bab0c15b63263f10aae0e786",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/2.0.76/expansion/linux64",
"version": "2.0.76"
"url": "https://factorio.com/get-download/2.1.8/expansion/linux64",
"version": "2.1.8"
},
"stable": {
"candidateHashFilenames": [
"factorio-space-age_linux_2.0.76.tar.xz"
"factorio-space-age_linux_2.0.77.tar.xz"
],
"name": "factorio_expansion_x64-2.0.76.tar.xz",
"name": "factorio_expansion_x64-2.0.77.tar.xz",
"needsAuth": true,
"sha256": "dc24bbbc1b6a619e4425d9a720bcfafce3463d908ab369a6cd1bee1a99332b4f",
"sha256": "068cd4778459569cb46e8a8acde1c404969ad533d7e479789af9fce0d29f10a4",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/2.0.76/expansion/linux64",
"version": "2.0.76"
"url": "https://factorio.com/get-download/2.0.77/expansion/linux64",
"version": "2.0.77"
}
},
"headless": {
"experimental": {
"candidateHashFilenames": [
"factorio-headless_linux_2.0.76.tar.xz",
"factorio_headless_x64_2.0.76.tar.xz"
"factorio-headless_linux_2.1.8.tar.xz",
"factorio_headless_x64_2.1.8.tar.xz"
],
"name": "factorio_headless_x64-2.0.76.tar.xz",
"name": "factorio_headless_x64-2.1.8.tar.xz",
"needsAuth": false,
"sha256": "ef3663f66146d76342f7c09a3f743792636f8cd95c39ea26cfca5bd2e0e92430",
"sha256": "16b122cd5f48118cd44bcaf1d27fd933aea60b9902bbd426fd26359440759f12",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/2.0.76/headless/linux64",
"version": "2.0.76"
"url": "https://factorio.com/get-download/2.1.8/headless/linux64",
"version": "2.1.8"
},
"stable": {
"candidateHashFilenames": [
"factorio-headless_linux_2.0.76.tar.xz",
"factorio_headless_x64_2.0.76.tar.xz"
"factorio-headless_linux_2.0.77.tar.xz",
"factorio_headless_x64_2.0.77.tar.xz"
],
"name": "factorio_headless_x64-2.0.76.tar.xz",
"name": "factorio_headless_x64-2.0.77.tar.xz",
"needsAuth": false,
"sha256": "ef3663f66146d76342f7c09a3f743792636f8cd95c39ea26cfca5bd2e0e92430",
"sha256": "c4efc11529f74d37c96933e291e0db73fd9f5aa4738913d9301b24680b3e947f",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/2.0.76/headless/linux64",
"version": "2.0.76"
"url": "https://factorio.com/get-download/2.0.77/headless/linux64",
"version": "2.0.77"
}
}
}

27
pkgs/by-name/go/google-chrome/package.nix
View File

@@ -181,10 +181,24 @@ let
inherit pname meta passthru;
version = "150.0.7871.186";
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-QZPgC21dWWnuY/emlZaGj1RqoOjLB3s+C/nMHixxnQA=";
};
src =
let
debArch =
{
aarch64-linux = "arm64";
x86_64-linux = "amd64";
}
.${stdenvNoCC.hostPlatform.system};
in
fetchurl {
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-QZPgC21dWWnuY/emlZaGj1RqoOjLB3s+C/nMHixxnQA=";
arm64 = "sha256-AllqLQfbFu7EJCK5Xeo3TuItGMnOqunpMBKY4OJnj7M=";
}
.${debArch};
};
# With strictDeps on, some shebangs were not being patched correctly
# ie, $out/share/google/chrome/google-chrome
@@ -338,7 +352,10 @@ let
iedame
mdaniels5757
];
platforms = lib.platforms.darwin ++ [ "x86_64-linux" ];
platforms = lib.platforms.darwin ++ [
"aarch64-linux"
"x86_64-linux"
];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
mainProgram = "google-chrome-stable";
};

18
pkgs/by-name/go/google-chrome/update.sh
View File

@@ -27,8 +27,10 @@ update_linux() {
local version_info
local version
local current_version
local arch
local download_url
local new_hash
local new_sri_hash
local -A new_hashes
read -ra version_info <<< "$(get_version_info "linux" "linux = stdenvNoCC.mkDerivation" "});")"
version="${version_info[0]}"
@@ -39,14 +41,18 @@ update_linux() {
return 0
fi
local download_url="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${version}-1_amd64.deb"
new_hash="$(nix-prefetch-url "$download_url" 2>/dev/null)"
new_sri_hash="$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$new_hash")"
for arch in amd64 arm64; do
download_url="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${version}-1_${arch}.deb"
new_hash="$(nix-prefetch-url "$download_url" 2>/dev/null)"
new_hashes["$arch"]="$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$new_hash")"
done
sed -i "/^ linux = stdenvNoCC.mkDerivation/,/^ });/s/version = \".*\"/version = \"$version\"/" "$DEFAULT_NIX"
sed -i "/^ linux = stdenvNoCC.mkDerivation/,/^ });/s|hash = \".*\"|hash = \"$new_sri_hash\"|" "$DEFAULT_NIX"
echo "[Nix] Linux google-chrome: $current_version -> $version with hash $new_hash"
for arch in amd64 arm64; do
sed -i "/^ linux = stdenvNoCC.mkDerivation/,/^ });/s|^\([[:space:]]*\)${arch} = \".*\";|\1${arch} = \"${new_hashes[$arch]}\";|" "$DEFAULT_NIX"
echo "[Nix] Linux ${arch} google-chrome: $current_version -> $version with hash ${new_hashes[$arch]}"
done
}
update_darwin() {

4
pkgs/by-name/ko/komikku/package.nix
View File

@@ -24,14 +24,14 @@
python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "komikku";
version = "50.9.0";
version = "50.10.0";
pyproject = false;
src = fetchFromCodeberg {
owner = "valos";
repo = "Komikku";
tag = "v${finalAttrs.version}";
hash = "sha256-fjAls3/ikNrQ1AgwUe9hFoQ48zv7UbGCUNB4dlmYM28=";
hash = "sha256-OhQR6hXpQhM0O7pgfTdVn8CY3OAHhH+U1X91G/j8kqk=";
};
nativeBuildInputs = [

6
pkgs/by-name/ku/kubelogin-oidc/package.nix
View File

@@ -8,13 +8,13 @@
buildGoModule (finalAttrs: {
pname = "kubelogin";
version = "1.36.2";
version = "1.36.3";
src = fetchFromGitHub {
owner = "int128";
repo = "kubelogin";
tag = "v${finalAttrs.version}";
hash = "sha256-VzUnjqa3XnKSqcwd2jVwbQwGmyO5+YBwPIIxN0wj81A=";
hash = "sha256-VgsUQcFUbtZSZuar7K/ErJRsJZ0GvyIEixGGhF+hLnY=";
};
subPackages = [ "." ];
@@ -24,7 +24,7 @@ buildGoModule (finalAttrs: {
"-X main.version=v${finalAttrs.version}"
];
vendorHash = "sha256-/30B7krXl0HYm+nUqGtbhNb4L8utdorjZNGkfMCYs3k=";
vendorHash = "sha256-29D31EKO2Y6TXj607Tf3O5dGBHyrMyXoC5tWEKqvbbA=";
# test all packages
preCheck = ''

10
pkgs/by-name/li/librewolf-unwrapped/src.json
View File

@@ -1,11 +1,11 @@
{
"packageVersion": "152.0.6-1",
"packageVersion": "153.0-3",
"source": {
"rev": "152.0.6-1",
"hash": "sha256-O5s1t/ZZVYL/9ik4zyi/kKAQEbSERO6vD1NJzEUmnU4="
"rev": "153.0-3",
"hash": "sha256-kRa+IOicrS2xWO2k3m52qBmmazGSj3Ybuke6UQwQJgg="
},
"firefox": {
"version": "152.0.6",
"hash": "sha512-xNh3g31wB/thHDjUnZtt07xMXJypALVOci4UDOfs0JJPabXO3H+MH+YC5+/h1xWbAZ3ieZnikjXNYxghuxPmsA=="
"version": "153.0",
"hash": "sha512-oa9YZuHJpzKBgSPy8EG/1Zk9CT6W3XQ7WDMS+xHSs51CnfdQ+ewi3tZLWKIJux7KvHqvcwV9emTHNJ5NoEPWbQ=="
}
}

6
pkgs/by-name/mi/miniflux/package.nix
View File

@@ -9,16 +9,16 @@
buildGo126Module (finalAttrs: {
pname = "miniflux";
version = "2.3.2";
version = "2.3.3";
src = fetchFromGitHub {
owner = "miniflux";
repo = "v2";
tag = finalAttrs.version;
hash = "sha256-gfudc11dJKzRtsT2gEazzgGFoUVaZNqgzdIATuGH29U=";
hash = "sha256-zJ8ir6t3J65RTNi7XtTsbuG3VQId3xvEhLP6Cgn0+xg=";
};
vendorHash = "sha256-JjZfZJyml6/ANilLNAKaounUJ35TWhj/wVWWiGEhxps=";
vendorHash = "sha256-+5vpLTpShQegLzFzAl7H86i71G+PXP66w9mIr440+oA=";
nativeBuildInputs = [ installShellFiles ];

6
pkgs/by-name/os/osu-lazer-bin/package.nix
View File

@@ -10,13 +10,13 @@
let
pname = "osu-lazer-bin";
version = "2026.711.0";
version = "2026.726.0";
src =
{
aarch64-darwin = fetchzip {
url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Apple.Silicon.zip";
hash = "sha256-XwfNO38dDaUmu/3AEgRwV0VW6JrAUCxWD6Wt0Ew23Eo=";
hash = "sha256-LwikashfaYrKB2LqQ0YleOqu0ikykxrSgZE68aRaV9s=";
stripRoot = false;
};
x86_64-darwin = fetchzip {
@@ -26,7 +26,7 @@ let
};
x86_64-linux = fetchurl {
url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.AppImage";
hash = "sha256-KyA5UCvb9epk7jRtdG5wl0LzKc6/D2rkw5EJQxIaihw=";
hash = "sha256-PTAoYJVD3/0DewBlJgP3WShRUQC2JFvJKancRv07KaA=";
};
}
.${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported.");

4
pkgs/by-name/os/osu-lazer/deps.json generated
View File

@@ -616,8 +616,8 @@
},
{
"pname": "ppy.osu.Framework",
"version": "2026.629.0",
"hash": "sha256-fb2rmHin/5kCQ4klLvWXHZLnLg4RkrDFn024YIm13R0="
"version": "2026.724.0",
"hash": "sha256-4ZHcI6DdxrppWRGmPeI00MpWyEEZvoZzL4pDfBlT3GY="
},
{
"pname": "ppy.osu.Framework.NativeLibs",

4
pkgs/by-name/os/osu-lazer/package.nix
View File

@@ -22,13 +22,13 @@
buildDotnetModule rec {
pname = "osu-lazer";
version = "2026.711.0";
version = "2026.726.0";
src = fetchFromGitHub {
owner = "ppy";
repo = "osu";
tag = "${version}-lazer";
hash = "sha256-hdrbbPl7ClNx73bsjoN5u4bEmvl/sdcjgFnZ/uxYbOk=";
hash = "sha256-5LA4BLbKqlUYEAQY+8LRvZkzOnTZ/UVqaALZzT/Ybxo=";
};
projectFile = "osu.Desktop/osu.Desktop.csproj";

12
pkgs/by-name/si/signal-desktop/dont-assert-unicode-17-emoji.patch
View File

@@ -1,12 +0,0 @@
diff --git a/scripts/generate-emoji-data.mjs b/scripts/generate-emoji-data.mjs
index 85fd8d484..23ca0bb72 100644
--- a/scripts/generate-emoji-data.mjs
+++ b/scripts/generate-emoji-data.mjs
@@ -207,7 +207,6 @@ for (const emojiSrc of SRC_EMOJIS_SORTED) {
}
const emoji = encodeUnified(emojiSrc.unified);
- assert(isEmoji(emoji), 'Unexpected invalid emoji');
if (isDeprecated(emoji)) {
continue; // drop deprecated emoji

8
pkgs/by-name/si/signal-desktop/libsignal-node.nix
View File

@@ -15,23 +15,23 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "libsignal-node";
version = "0.95.0";
version = "0.96.3";
src = fetchFromGitHub {
owner = "signalapp";
repo = "libsignal";
tag = "v${finalAttrs.version}";
hash = "sha256-stxakRw9CJQetkBcF2BfQh1EvEGurccP5/QLNLyEJz0=";
hash = "sha256-FOppsfocUvUfWa6AfBPOxAnntGJkzTbnPwqMzzbHnWQ=";
};
cargoHash = "sha256-bbOsE6vcFQpplzXAupcvp2oEoIFT3nk8Ug9QWbCe2yc=";
cargoHash = "sha256-wsXlCpNwO+E6rVNaD2R51Mi0sZUv2lhllGxDxzyptYA=";
npmRoot = "node";
npmDeps = fetchNpmDeps {
name = "${finalAttrs.pname}-npm-deps";
inherit (finalAttrs) version src;
sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";
hash = "sha256-lCLM0qI11Ce9w2NNgXHalxa8Ks628nvTjZhy26PvNbM=";
hash = "sha256-p8udihRlXMTnG4BT60D2VlI7D/O3eHV/zCS7ucpeuO4=";
};
nativeBuildInputs = [

54
pkgs/by-name/si/signal-desktop/package.nix
View File

@@ -4,6 +4,7 @@
lib,
nodejs_24,
pnpm_10,
pnpm_11,
node-gyp,
fetchPnpmDeps,
pnpmConfigHook,
@@ -32,22 +33,25 @@ assert lib.warnIf (commandLineArgs != "")
true;
let
nodejs = nodejs_24;
pnpm = pnpm_10;
pnpm = pnpm_11;
electron = electron_42;
libsignal-node = callPackage ./libsignal-node.nix { inherit nodejs; };
signal-sqlcipher = callPackage ./signal-sqlcipher.nix { inherit pnpm nodejs; };
signal-sqlcipher = callPackage ./signal-sqlcipher.nix {
pnpm = pnpm_10;
inherit nodejs;
};
webrtc = callPackage ./webrtc.nix { };
ringrtc = callPackage ./ringrtc.nix { inherit webrtc; };
version = "8.15.0";
version = "8.18.0";
src = fetchFromGitHub {
owner = "signalapp";
repo = "Signal-Desktop";
tag = "v${version}";
hash = "sha256-SiOgNUll6J+EZNlmM6yhXakOc5qFCFRE/GczhaH57Vo=";
hash = "sha256-fynCFGmch3UecT5esNfVVlf0+xDrCdCBGw2HMMqBzWw=";
# Emoji font files will be added in `postFetch` if `withAppleEmojis` is enabled. They
# are fetched separately below.
postFetch = ''
@@ -63,16 +67,28 @@ let
sticker-creator = stdenv.mkDerivation (finalAttrs: {
pname = "signal-desktop-sticker-creator";
inherit version;
src = src + "/sticker-creator";
inherit src version;
pnpmRoot = "sticker-creator";
pnpmWorkspaces = [ "signal-art-creator" ];
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname src version;
inherit (finalAttrs)
pname
src
version
postPatch
pnpmWorkspaces
;
inherit pnpm;
fetcherVersion = 4;
hash = "sha256-WmDSa4PrASaqs8X68LYaPBeE+i+Jh3FfWF30SseN74Y=";
hash = "sha256-bWNs5W2NPk55Sm7UqwWvXU7bY+AXzevU3o2ji23HxtU=";
};
postPatch = ''
rm sticker-creator/pnpm-lock.yaml
'';
strictDeps = true;
nativeBuildInputs = [
nodejs
@@ -83,7 +99,7 @@ let
installPhase = ''
runHook preInstall
cp -r dist $out
cp -r sticker-creator/dist $out
runHook postInstall
'';
});
@@ -113,9 +129,6 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
./force-90-days-expiration.patch
# Drop once https://github.com/NixOS/nixpkgs/pull/520553 and https://github.com/NixOS/nixpkgs/pull/525241 land.
./dont-assert-unicode-17-emoji.patch
]
++ lib.optional (!withAppleEmojis) (
# Signal ships the Apple emoji set without a licence and upstream
@@ -149,6 +162,11 @@ stdenv.mkDerivation (finalAttrs: {
substituteInPlace config/production.json \
--replace-fail '"updatesEnabled": true' '"updatesEnabled": false'
# pnpm 11 verifies node_modules before every `pnpm run`, which fails
# after nixpkgs swaps in the prebuilt native modules below.
substituteInPlace pnpm-workspace.yaml \
--replace-fail "verifyDepsBeforeRun: prompt" "verifyDepsBeforeRun: false"
# Nix builds do not need upstream release hooks (notarization and
# language-pack postprocessing), and they expect a different macOS
# app layout than nixpkgs' Electron provides.
@@ -172,13 +190,13 @@ stdenv.mkDerivation (finalAttrs: {
;
inherit pnpm;
fetcherVersion = 4;
hash = "sha256-/z+P9mb7Cm3FzzMpV6Da6THcHd73JgPuuB0Gx8KwKcc=";
hash = "sha256-bWNs5W2NPk55Sm7UqwWvXU7bY+AXzevU3o2ji23HxtU=";
};
env = {
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
SIGNAL_ENV = "production";
SOURCE_DATE_EPOCH = 1781737260;
SOURCE_DATE_EPOCH = 1783606680;
};
preBuild = ''
@@ -233,6 +251,14 @@ stdenv.mkDerivation (finalAttrs: {
popd
test -f node_modules/fs-xattr/build/Release/xattr.node
# @signalapp/windows-ucv is imported on all platforms, but its TypeScript
# output is normally produced by its preinstall script. pnpmConfigHook runs
# `pnpm install --ignore-scripts`, so build it explicitly.
pushd packages/windows-ucv
pnpm run build
popd
test -f node_modules/@signalapp/windows-ucv/dist/index.js
cp -r ${electron.dist} electron-dist
chmod -R u+w electron-dist
cp -r ${sticker-creator} sticker-creator/dist

12
pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch
View File

@@ -1,13 +1,13 @@
diff --git a/app/AssetService.main.ts b/app/AssetService.main.ts
index 33b20b8d5..c122f8c67 100644
index a4a21b5bb..3d5ab1eb0 100644
--- a/app/AssetService.main.ts
+++ b/app/AssetService.main.ts
@@ -32,7 +32,6 @@ const LOCAL_ASSETS = new Set([
@@ -34,7 +34,6 @@ const OPTIONAL_ASSETS = new Map<string, string>([]);
// pathname to optional resource name
const OPTIONAL_ASSETS = new Map([
- ['optional-fonts/emoji-large.woff2', 'emoji-font.woff2'],
]);
if (!process.mas) {
LOCAL_ASSETS.add('fonts/emoji.woff2');
- OPTIONAL_ASSETS.set('optional-fonts/emoji-large.woff2', 'emoji-font.woff2');
}
export class AssetService {
diff --git a/app/protocol_filter.node.ts b/app/protocol_filter.node.ts

6
pkgs/by-name/si/signal-desktop/ringrtc.nix
View File

@@ -19,16 +19,16 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "ringrtc";
version = "2.69.3";
version = "2.69.4";
src = fetchFromGitHub {
owner = "signalapp";
repo = "ringrtc";
tag = "v${finalAttrs.version}";
hash = "sha256-ekSXEaAyVzd5957qoFakD33UYrUmvxZL19M6uflPR5U=";
hash = "sha256-z/9Y9rrlH4yziEVAXrCmkmP42hdDm3frGJnL1O/qOqg=";
};
cargoHash = "sha256-oNHT2owg3Ob2z8JxdYnICRdogK+XaasVgbF5RYYBJas=";
cargoHash = "sha256-a6CEUVW1HXqgIp/S+4Ype83N3QtNCBrutiEepHNW5pY=";
preConfigure = ''
# Check for matching webrtc version

6
pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix
View File

@@ -16,20 +16,20 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "node-sqlcipher";
version = "3.3.5";
version = "3.3.9";
src = fetchFromGitHub {
owner = "signalapp";
repo = "node-sqlcipher";
tag = "v${finalAttrs.version}";
hash = "sha256-RzuyUx0WEG8j8HwV5cepVJIeqYzJpNemFNtB+9NETto=";
hash = "sha256-eddDeNK8UA6CW1qXZtgS8QpuXVjFO6tVwpFDyYDnX+U=";
};
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
inherit pnpm; # may be different than top-level pnpm
fetcherVersion = 4;
hash = "sha256-HK3AetwGqFq/dhxX+aWgUww6eLCeQEkZIVsmmnYqdmM=";
hash = "sha256-avvXNPfN5YVqwCOU2RX8dos3LTlre1t/4COKb4zHkh4=";
};
cargoRoot = "deps/extension";

2
pkgs/by-name/ta/tailscale/package.nix
View File

@@ -38,7 +38,7 @@ buildGoModule (finalAttrs: {
hash = "sha256-K8eQU/f5s6azGoOwN/0efmkP184t25aHBm5uZZNjIFg=";
};
vendorHash = "sha256-mbxLXR2TBgiwyVGfLmMR5xWk+0f66mPDas95Wla70Lk=";
vendorHash = "sha256-Sd2iLJ7eDfDYdIRuW4xuiKgzhQWJWGAnz97FJWrVRlE=";
nativeBuildInputs = [
makeWrapper

6
pkgs/by-name/te/telegram-bot-api/package.nix
View File

@@ -11,14 +11,14 @@
stdenv.mkDerivation {
pname = "telegram-bot-api";
version = "10.1";
version = "10.2";
src = fetchFromGitHub {
owner = "tdlib";
repo = "telegram-bot-api";
# https://github.com/tdlib/telegram-bot-api/issues/783
rev = "0a9e5696ba149c99bedf972f040d2e28776a8a4f";
hash = "sha256-F3TYYB5sI8nadiHUaxW5BOC1XMnEfsrZQX2dLJXA5Mg=";
rev = "adfd7f6a8e990272851777eeb3ae0def4216f161";
hash = "sha256-sICBisUDMirUOMN5ORQ2B9Wo8KC91hIn1sHyt2xClJ0=";
fetchSubmodules = true;
};

8
pkgs/os-specific/linux/kernel/xanmod-kernels.nix
View File

@@ -15,14 +15,14 @@ let
variants = {
# ./update-xanmod.sh lts
lts = {
version = "6.18.39";
hash = "sha256-Kg2p8MPTQT46nTGw0rP3SMS4BOnuBMXL8zertaC9Wcs=";
version = "6.18.40";
hash = "sha256-UKEKNI11QpTXrDQmh+1JU75voHer10Aw0L8T+f7JhYQ=";
isLTS = true;
};
# ./update-xanmod.sh main
main = {
version = "7.1.4";
hash = "sha256-jHYReidaX4aufcpTeWxr/Lu0+W9yHL7SpF7mgjDSyxY=";
version = "7.1.5";
hash = "sha256-zELqn/UieXjOBkTNTLi2OCkK4+rpD/IfJEDb7GTTJfk=";
};
};

8
pkgs/servers/http/tomcat/default.nix
View File

@@ -60,8 +60,8 @@ let
in
{
tomcat9 = common {
version = "9.0.118";
hash = "sha256-L9Me+dqZKbh4mX9zHPJVNv6sV0FhwC2TmXJ0ccfEBrI=";
version = "9.0.120";
hash = "sha256-HevX6bz17tjIpyccn6r2mfSUGoOZLaxa2BSg52fOXiY=";
};
tomcat10 = common {
@@ -70,7 +70,7 @@ in
};
tomcat11 = common {
version = "11.0.22";
hash = "sha256-c9I5Iy8U394ieOjZMfdn7UVK7ZsBjk1wodQEwlebWZg=";
version = "11.0.24";
hash = "sha256-EO/tkL8zARSvZieeQ9zyEez897iOYYdXlUrIgylgDLo=";
};
}

12
pkgs/servers/nextcloud/default.nix
View File

@@ -57,20 +57,20 @@ let
in
{
nextcloud32 = generic {
version = "32.0.12";
hash = "sha256-rxWPclccjhXim8E2wjqSEYjOHVZoVQAK2U+JuAqPGAw=";
version = "32.0.13";
hash = "sha256-7rAaOJp2z+RfweD2GhW1x0vkDNKciuT1TNa0J817nvA=";
packages = nextcloud32Packages;
};
nextcloud33 = generic {
version = "33.0.6";
hash = "sha256-eRghpVAplE3gQxnPyvysSujn71a0zR78JjG/MLedFt4=";
version = "33.0.7";
hash = "sha256-uuGoL8u/TWmZTS1Y1OgVFm+/T+1a06VRIfOM4H7emRM=";
packages = nextcloud33Packages;
};
nextcloud34 = generic {
version = "34.0.1";
hash = "sha256-BOnDL8P+Ofa2qKGJFe9a/SgKVrSn90Thj1+i7/+8SmM=";
version = "34.0.2";
hash = "sha256-Qc4x3xLMgQkMPQf+DouQveYckrGK6A5NZIutQ9eZEQE=";
packages = nextcloud34Packages;
};

60
pkgs/servers/nextcloud/packages/32.json
View File

File diff suppressed because one or more lines are too long

72
pkgs/servers/nextcloud/packages/33.json
View File

File diff suppressed because one or more lines are too long

82
pkgs/servers/nextcloud/packages/34.json
View File

File diff suppressed because one or more lines are too long

28
shell.nix
View File

@@ -13,15 +13,10 @@
#
{
system ? builtins.currentSystem,
nixpkgs ? null,
}:
let
version = builtins.readFile ./.version;
# On 26.05 we need a CI-pinned Nixpkgs revision that supports x86_64-darwin.
# TODO: remove after 26.05 support ends.
nixpkgs' =
if nixpkgs == null && system == "x86_64-darwin" && version == "26.05" then
nixpkgs ? (
# On 26.05 we need a CI-pinned Nixpkgs revision that supports x86_64-darwin.
# TODO: remove after 26.05 support ends.
if system == "x86_64-darwin" && (builtins.readFile ./.version) == "26.05" then
let
pinned = (builtins.fromJSON (builtins.readFile ./ci/pinned.json)).pins;
warn = builtins.warn or (import ./lib).warn;
@@ -44,16 +39,11 @@ let
sha256 = hash;
}
else
nixpkgs;
inherit
(import ./ci {
inherit system;
nixpkgs = nixpkgs';
})
pkgs
fmt
;
null
),
}:
let
inherit (import ./ci { inherit nixpkgs system; }) pkgs fmt;
# For `nix-shell -A hello`
curPkgs = removeAttrs (import ./. { inherit system; }) [