nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-29 19:30:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next-24.05 into staging-24.05

Browse Source
This commit is contained in:
github-actions[bot]
2024-12-15 00:21:00 +00:00
committed by GitHub
parent 86fc6502e5 930eee5125
commit c283fc42f2
6 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/networking/instant-messengers/discord/default.nix
View File

@@ -11,15 +11,15 @@ let
{
stable = "0.0.77";
ptb = "0.0.121";
canary = "0.0.538";
development = "0.0.53";
canary = "0.0.541";
development = "0.0.54";
}
else
{
stable = "0.0.329";
ptb = "0.0.151";
canary = "0.0.650";
development = "0.0.67";
canary = "0.0.653";
development = "0.0.68";
};
version = versions.${branch};
srcs = rec {
@@ -34,11 +34,11 @@ let
};
canary = fetchurl {
url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
hash = "sha256-RYwHDoPj0TsraI/7dNpngCiB6Fiyhi5ec/iCZD7YMoQ=";
hash = "sha256-upT12C23Vkm+BZycKAufRzM5YHizpZJtEaJjHGzYtv4=";
};
development = fetchurl {
url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
hash = "sha256-4FxdZsVTQTr5yzuzV6IZYZ6qk7sa9WZ27zCtVA1/uOg=";
hash = "sha256-3Qhysb7QFE7W4nqAHffgz9hbud6n6PGcGN6xGBmD6ow=";
};
};
x86_64-darwin = {
@@ -52,11 +52,11 @@ let
};
canary = fetchurl {
url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
hash = "sha256-QFeUeuJMZ9r7lqFhE51jQfpSw5v4+MgUoO2HEcKF4mI=";
hash = "sha256-uBnVz+d5Mp3fjICQQ/SZgFmkXVQGprf7VvUxv0hy00o=";
};
development = fetchurl {
url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";
hash = "sha256-nyOQhSjlARvIjFc3uDi7IFtKxxIpO/V6M1eIg56dMdU=";
hash = "sha256-5sUkGN9ucyYArGkfbGBdJokoqpHKBrkwxH055LpMlrs=";
};
};
aarch64-darwin = x86_64-darwin;

8
pkgs/by-name/br/brave/package.nix
View File

@@ -6,17 +6,17 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ])
if stdenv.isAarch64 then
rec {
pname = "brave";
version = "1.73.91";
version = "1.73.101";
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
hash = "sha256-q1Bb44JT6J/KX5zAfphH42s41ZyVkhUlypmd64G+1bs=";
hash = "sha256-0nV+NxiXM+m1GbAxECXC/8QWiOyVaMb63JmGtrIFcqM=";
platform = "aarch64-linux";
}
else if stdenv.isx86_64 then
rec {
pname = "brave";
version = "1.73.91";
version = "1.73.101";
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
hash = "sha256-Q0vM9CRuRl9G+L0G+1PT/HXXFm0qT+j6DduojPwjqtI=";
hash = "sha256-yz3EENDg0khJYVF/W6RAvO3qWoDqs9oFH22WxqWay78=";
platform = "x86_64-linux";
}
else

4
pkgs/servers/dns/knot-dns/default.nix
View File

@@ -30,11 +30,11 @@
stdenv.mkDerivation rec {
pname = "knot-dns";
version = "3.3.9";
version = "3.3.10";
src = fetchurl {
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
sha256 = "7cf2bd93bf487179aca1d2acf7b462dc269e769944c3ea73c7f9a4570dde86ab";
sha256 = "969ec9b56f52128ddb659ae3ecbe7897da4b3d499dd1c082cb2e90763f6ab989";
};
outputs = [

6
pkgs/servers/matrix-synapse/default.nix
View File

@@ -18,20 +18,20 @@ let
in
python3.pkgs.buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.120.2";
version = "1.121.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "element-hq";
repo = "synapse";
rev = "v${version}";
hash = "sha256-GW5ZcrVLLR2dPADHasdqhtV8HF+X+N4W3/OZCFBd2uI=";
hash = "sha256-0sLzngo6jBpKyqgw8XwgPzpmSWR7pjXT58XcDJCUq0s=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-5x64eKFuiTWuzwbuhfJ38rksYowq9Nq3LTYCMwuXKzc=";
hash = "sha256-LGFuz3NtNqH+XumJOirvflH0fyfTtqz5qgYlJx2fmAU=";
};
postPatch = ''

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

@@ -51,8 +51,8 @@ in {
};
nextcloud28 = generic {
version = "28.0.12";
hash = "sha256-KgDKT3mTYPCYf8vIXZmywlj30sz35vfgxMzxehJ/AQU=";
version = "28.0.14";
hash = "sha256-SpN/GIJIZCbJcD5Z7EspP2Ib6NCAt/hQFvYpkDw68zY=";
packages = nextcloud28Packages;
};
@@ -63,8 +63,8 @@ in {
};
nextcloud30 = generic {
version = "30.0.2";
hash = "sha256-kpu4BF6WIW/iKmXc1mJ55b17oauynZm/QB1CO2RqRF8=";
version = "30.0.4";
hash = "sha256-62qrqazvRC8rPkqZa37ope0kRC+bumgSN/so7ZcOH6U=";
packages = nextcloud30Packages;
};

8
pkgs/servers/web-apps/nifi/default.nix
View File

@@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "nifi";
version = "1.28.0";
version = "1.28.1";
src = fetchzip {
url = "mirror://apache/nifi/${version}/nifi-${version}-bin.zip";
hash = "sha256-EQqosdwNdaSUIcP3QlvzJZhDNu1JbHg08FlnZo6ogmQ=";
hash = "sha256-YFQIV2/B+8/fBmrWPs7Q3FkqaIxBqNBP0BIkIm4M7Zo=";
};
nativeBuildInputs = [ makeWrapper ];
@@ -29,9 +29,9 @@ stdenv.mkDerivation rec {
mv $out/{LICENSE,NOTICE,README} $out/share/nifi
substituteInPlace $out/bin/nifi.sh \
--replace "/bin/sh" "${stdenv.shell}"
--replace-fail "/bin/sh" "${stdenv.shell}"
substituteInPlace $out/bin/nifi-env.sh \
--replace "#export JAVA_HOME=/usr/java/jdk1.8.0/" "export JAVA_HOME=${jdk11}"
--replace-fail "#export JAVA_HOME=/usr/java/jdk1.8.0/" "export JAVA_HOME=${jdk11}"
'';
passthru = {