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

Merge staging-next-23.11 into staging-23.11

Browse Source
This commit is contained in:
github-actions[bot]
2024-04-17 00:14:29 +00:00
committed by GitHub
parent eac92386fc 7d9f678a1f
commit cfa6509d41
21 changed files with 558 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
nixos/modules/services/web-apps/akkoma.nix
View File

@@ -777,6 +777,11 @@ in {
default = if lib.versionOlder config.system.stateVersion "24.05"
then "${httpConf.scheme}://${httpConf.host}:${builtins.toString httpConf.port}/media/"
else null;
defaultText = literalExpression ''
if lib.versionOlder config.system.stateVersion "24.05"
then "$\{httpConf.scheme}://$\{httpConf.host}:$\{builtins.toString httpConf.port}/media/"
else null;
'';
description = mdDoc ''
Base path which uploads will be stored at.
Whilst this can just be set to a subdirectory of the main domain, it is now recommended to use a different subdomain.
@@ -809,6 +814,7 @@ in {
enabled = mkOption {
type = types.bool;
default = false;
defaultText = literalExpression "false";
description = mdDoc ''
Whether to enable proxying of remote media through the instance's proxy.
'';
@@ -818,6 +824,11 @@ in {
default = if lib.versionOlder config.system.stateVersion "24.05"
then "${httpConf.scheme}://${httpConf.host}:${builtins.toString httpConf.port}/media/"
else null;
defaultText = literalExpression ''
if lib.versionOlder config.system.stateVersion "24.05"
then "$\{httpConf.scheme}://$\{httpConf.host}:$\{builtins.toString httpConf.port}/media/"
else null;
'';
description = mdDoc ''
Base path for the media proxy.
Whilst this can just be set to a subdirectory of the main domain, it is now recommended to use a different subdomain.

818
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View File

File diff suppressed because it is too large Load Diff

4
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@@ -3,10 +3,10 @@
{
firefox = buildMozillaMach rec {
pname = "firefox";
version = "125.0";
version = "125.0.1";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "c520070e5a8872f3df4f5e35b9a605eef95f61254f6242040f02b2b68d6c8eef993885a18144353326a7488ac27115fa4ad2ef5615885e5155ab3f8194a61977";
sha512 = "6f2f336de8b0ec9cb19ba20c909407b7b88c0319ee3b2f1f3429133516b0c45b4c7846f287985a0cdb9f34acc7d5378ed14fb48e26bef113c8ac360501a30c4d";
};
extraPatches = [

4
pkgs/applications/networking/browsers/floorp/default.nix
View File

@@ -7,7 +7,7 @@
((buildMozillaMach rec {
pname = "floorp";
packageVersion = "11.11.2";
packageVersion = "11.12.0";
applicationName = "Floorp";
binaryName = "floorp";
branding = "browser/branding/official";
@@ -20,7 +20,7 @@
repo = "Floorp";
fetchSubmodules = true;
rev = "v${packageVersion}";
hash = "sha256-a9f4+t2w8aOOLNaKkr+FuY0ENa/Nkukg9pvJTiUMfWk=";
hash = "sha256-9mJW8VFYClQ3D8/nPtlCVaVULvEICS+RQhz1dLujn6Q=";
};
extraConfigureFlags = [

2
pkgs/applications/networking/browsers/floorp/update.sh
View File

@@ -19,7 +19,7 @@ updateBaseVersion() {
updateHash() {
local hash
hash=$(nix-prefetch-github --fetch-submodules --rev "v$1" $owner $repo | jq .hash)
hash=$(nix-prefetch-github --fetch-submodules --rev "v$1" $owner $repo | jq -r .hash)
sed -i "s|hash = \"[a-zA-Z0-9\/+-=]*\";|hash = \"$hash\";|g" "$dirname/default.nix"
}

59
pkgs/applications/networking/browsers/palemoon/bin.nix
View File

@@ -14,23 +14,15 @@
, libpulseaudio
, makeDesktopItem
, wrapGAppsHook
, writeScript
, testers
}:
stdenv.mkDerivation (finalAttrs: {
pname = "palemoon-bin";
version = "33.0.0";
version = "33.0.2";
src = fetchzip {
urls = [
"https://rm-eu.palemoon.org/release/palemoon-${finalAttrs.version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz"
"https://rm-us.palemoon.org/release/palemoon-${finalAttrs.version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz"
];
hash = if withGTK3 then
"sha256-qZX23dsKNg5AOIaBAAmTWT6VDEl3OGz3kb3idtvJElw="
else
"sha256-Lz1+5I8Rj0GrBUBTJoRsatpyzkqVHZuWbKARkuWFs5U=";
};
src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";
preferLocalBuild = true;
@@ -155,8 +147,49 @@ stdenv.mkDerivation (finalAttrs: {
wrapGApp $out/lib/palemoon/palemoon
'';
passthru.tests.version = testers.testVersion {
package = finalAttrs.finalPackage;
passthru = {
sources = let
urlRegionVariants = buildVariant: map
(region: "https://rm-${region}.palemoon.org/release/palemoon-${finalAttrs.version}.linux-x86_64-${buildVariant}.tar.xz")
[
"eu"
"us"
];
in {
gtk3 = fetchzip {
urls = urlRegionVariants "gtk3";
hash = "sha256-Kahnwlj9PIWB24lvH6h9cZK459NW2Vo2g6ckuv0Ax48=";
};
gtk2 = fetchzip {
urls = urlRegionVariants "gtk2";
hash = "sha256-XOiLGmU8O96clUpnp/OkzXmWR1PJ2AdzbVFj6adbcvY=";
};
};
tests.version = testers.testVersion {
package = finalAttrs.finalPackage;
};
updateScript = writeScript "update-palemoon-bin" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p common-updater-scripts curl libxml2
set -eu -o pipefail
# Only release note announcement == finalized release
version="$(
curl -s 'http://www.palemoon.org/releasenotes.shtml' |
xmllint --html --xpath 'html/body/table/tbody/tr/td/h3/text()' - 2>/dev/null | head -n1 |
sed 's/v\(\S*\).*/\1/'
)"
for variant in gtk3 gtk2; do
# The script will not perform an update when the version attribute is up to date from previous platform run
# We need to clear it before each run
update-source-version palemoon-bin 0 "${lib.fakeHash}" --source-key="sources.$variant"
update-source-version palemoon-bin "$version" --source-key="sources.$variant"
done
'';
};
meta = with lib; {

4
pkgs/applications/networking/ftp/filezilla/default.nix
View File

@@ -22,11 +22,11 @@
stdenv.mkDerivation rec {
pname = "filezilla";
version = "3.66.5";
version = "3.67.0";
src = fetchurl {
url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.xz";
hash = "sha256-khIoGbrmNBBwuktuy0V+ZzC0bn3ImUKZCQPymJA9Gzs=";
hash = "sha256-5drcgH25mc60ZJhPl00+9ZtWLFlUZlgFfpsgEYOtr5o=";
};
configureFlags = [

4
pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
View File

@@ -63,14 +63,14 @@ let
in
stdenv.mkDerivation rec {
pname = "telegram-desktop";
version = "4.16.6";
version = "4.16.7";
src = fetchFromGitHub {
owner = "telegramdesktop";
repo = "tdesktop";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-1NRA8guTbDEraW1uXSo7q54d1e8/QnXwxkfb6k3e6b0=";
hash = "sha256-+BXuFHXGOgpmAX7wsGLxZxfzvNsntFLtd+Obhb339Yc=";
};
patches = [

52
pkgs/applications/networking/remote/putty/default.nix
View File

@@ -1,9 +1,9 @@
{ stdenv, lib, fetchurl, autoconf, automake, pkg-config, libtool
, gtk2, halibut, ncurses, perl, darwin
{ stdenv, lib, fetchurl, cmake, perl, pkg-config
, gtk3, ncurses, darwin, copyDesktopItems, makeDesktopItem
}:
stdenv.mkDerivation rec {
version = "0.76";
version = "0.81";
pname = "putty";
src = fetchurl {
@@ -11,36 +11,34 @@ stdenv.mkDerivation rec {
"https://the.earth.li/~sgtatham/putty/${version}/${pname}-${version}.tar.gz"
"ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${pname}-${version}.tar.gz"
];
sha256 = "0gvi8phabszqksj2by5jrjmshm7bpirhgavz0dqyz1xaimxdjz2l";
hash = "sha256-y4sAqU9FNJTjRaPfKB16PtJrsN1+NiZPFFIG+IV2Of4=";
};
# glib-2.62 deprecations
env.NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
preConfigure = lib.optionalString stdenv.hostPlatform.isUnix ''
perl mkfiles.pl
( cd doc ; make );
./mkauto.sh
cd unix
'' + lib.optionalString stdenv.hostPlatform.isWindows ''
cd windows
'';
TOOLPATH = stdenv.cc.targetPrefix;
makefile = if stdenv.hostPlatform.isWindows then "Makefile.mgw" else null;
installPhase = if stdenv.hostPlatform.isWindows then ''
for exe in *.exe; do
install -D $exe $out/bin/$exe
done
'' else null;
nativeBuildInputs = [ autoconf automake halibut libtool perl pkg-config ];
nativeBuildInputs = [ cmake perl pkg-config copyDesktopItems ];
buildInputs = lib.optionals stdenv.hostPlatform.isUnix [
gtk2 ncurses
gtk3 ncurses
] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.libs.utmp;
enableParallelBuilding = true;
desktopItems = [
(makeDesktopItem {
name = "PuTTY SSH Client";
exec = "putty";
icon = "putty";
desktopName = "PuTTY";
comment = "Connect to an SSH server with PuTTY";
categories = [ "GTK" "Network" ];
})
(makeDesktopItem {
name = "PuTTY Terminal Emulator";
exec = "pterm";
icon = "pterm";
desktopName = "Pterm";
comment = "Start a PuTTY terminal session";
categories = [ "GTK" "System" "Utility" "TerminalEmulator" ];
})
];
meta = with lib; {
description = "A Free Telnet/SSH Client";
longDescription = ''

12
pkgs/applications/version-management/gitlab/data.json
View File

@@ -1,15 +1,15 @@
{
"version": "16.10.2",
"repo_hash": "sha256-hKd++fjBaCidBB9DbitWTJjvmiXU0iN1HY4S2gtscW8=",
"version": "16.10.3",
"repo_hash": "sha256-JeZHnoNMk7NYBeUy25YK+f6K7WOeTQnYV/pG08bmiwA=",
"yarn_hash": "0yzywfg4lqxjwm5cqsm4bn97zcrfvpnrs8rjrv9wv3xqvi9h9skd",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v16.10.2-ee",
"rev": "v16.10.3-ee",
"passthru": {
"GITALY_SERVER_VERSION": "16.10.2",
"GITLAB_PAGES_VERSION": "16.10.2",
"GITALY_SERVER_VERSION": "16.10.3",
"GITLAB_PAGES_VERSION": "16.10.3",
"GITLAB_SHELL_VERSION": "14.34.0",
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.8.0",
"GITLAB_WORKHORSE_VERSION": "16.10.2"
"GITLAB_WORKHORSE_VERSION": "16.10.3"
}
}

4
pkgs/applications/version-management/gitlab/gitaly/default.nix
View File

@@ -6,7 +6,7 @@
}:
let
version = "16.10.2";
version = "16.10.3";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@@ -18,7 +18,7 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
hash = "sha256-oV6MV9W5kC43orMn78A3UpuR71crN7tcN3xy56S/Ar0=";
hash = "sha256-WdEYZL3g/aYh2Iy1ZgJhIHgQ4967FOxhiuQEokk1S2A=";
};
vendorHash = "sha256-zaldiRg7fk/HncpfR7k+dDprsOp1ziQHgX8B4l7bwe0=";

4
pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
View File

@@ -2,14 +2,14 @@
buildGoModule rec {
pname = "gitlab-pages";
version = "16.10.2";
version = "16.10.3";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${version}";
hash = "sha256-lJYQBNJFAVq9SKS1gc2rhdE3qFO7x7xcCXT4hlDwtB8=";
hash = "sha256-mQNDnxdrM679ejjXZuqSV8SwLXFcKKKGOQt3DJWOZOo=";
};
vendorHash = "sha256-WrR4eZRAuYkhr7ZqP7OXqJ6uwvxzn+t+3OdBNcNaq0M=";

2
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View File

@@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "16.10.2";
version = "16.10.3";
# nixpkgs-update: no auto update
src = fetchFromGitLab {

6
pkgs/by-name/sn/snipe-it/package.nix
View File

@@ -8,16 +8,16 @@
php.buildComposerProject (finalAttrs: {
pname = "snipe-it";
version = "6.3.3";
version = "6.3.4";
src = fetchFromGitHub {
owner = "snipe";
repo = "snipe-it";
rev = "v${finalAttrs.version}";
hash = "sha256-ePE55mK8woopNuRXox51I0sJGBmjF6XDfjE+k+ncoJ0=";
hash = "sha256-xjVrf8RgHzVHSyPK+fqLOCS2pjPvUMFUHZtwkrQWHWM=";
};
vendorHash = "sha256-wO+hKttiI7T7C+4oSl8G0I4pQEfZpXjYspUhoaaLrAQ=";
vendorHash = "sha256-HNMn50gTYtRHH9bKcvrM7fnCMQsf6lBOqr825kgEsvE=";
postInstall = ''
snipe_it_out="$out/share/php/snipe-it"

4
pkgs/development/libraries/libfilezilla/default.nix
View File

@@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "libfilezilla";
version = "0.46.0";
version = "0.47.0";
src = fetchurl {
url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-OHr1xNSENIKl+/GD0B3ZYZtLha+g1olcXuyzpgEvrCE=";
hash = "sha256-YYpYa2E773EKYzxCv92mFmbLsPyKkq1JA2HQvJHFg0E=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

4
pkgs/development/libraries/mbedtls/2.nix
View File

@@ -1,6 +1,6 @@
{ callPackage }:
callPackage ./generic.nix {
version = "2.28.7";
hash = "sha256-JI0Frbz4HkPqrLQNrSIj1ikN8201h4kd1wTwyPotERw=";
version = "2.28.8";
hash = "sha256-A1DYZrvJ8SRujroVwqPfcTOSgLnT5xRat/RVdq2fL/o=";
}

10
pkgs/development/libraries/mbedtls/3.nix
View File

@@ -1,6 +1,14 @@
{ callPackage }:
{ callPackage, fetchpatch }:
callPackage ./generic.nix {
version = "3.5.2";
hash = "sha256-lVGmnSYccNmRS6vfF/fDiny5cYRPc/wJBpgciFLPUvM=";
patches = [
(fetchpatch {
name = "CVE-2024-28755.patch";
url = "https://github.com/Mbed-TLS/mbedtls/commit/ad736991bb59211118a29fe115367c24495300c2.patch";
hash = "sha256-MUnGT2ptlBikpZYL6+cvoF7fOiD2vMK4cbkgevgyl60=";
})
];
}

3
pkgs/development/libraries/mbedtls/generic.nix
View File

@@ -3,6 +3,7 @@
, version
, hash
, fetchFromGitHub
, patches ? []
, cmake
, ninja
@@ -23,6 +24,8 @@ stdenv.mkDerivation rec {
inherit hash;
};
inherit patches;
nativeBuildInputs = [ cmake ninja perl python3 ];
strictDeps = true;

18
pkgs/development/python-modules/blosc2/default.nix
View File

@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
# build-system
, cmake
@@ -37,6 +38,23 @@ buildPythonPackage rec {
hash = "sha256-5a94Zm6sYl/nSfkcFbKG7PkyXwLB6bAoIvfaq0yVGHo=";
};
patches = [
(fetchpatch {
name = "CVE-2024-3203.CVE-2024-3204.part-1.patch";
url = "https://github.com/Blosc/c-blosc2/commit/892f6d9c8ffc6e3c4d571df8fc02114f88c69b52.patch";
stripLen = 1;
extraPrefix = "blosc2/c-blosc2/";
hash = "sha256-sNgDcdT9HFrx41VKohp4GNUEjM1sqLYkIZu4baKRMeI=";
})
(fetchpatch {
name = "CVE-2024-3203.CVE-2024-3204.part-2.patch";
url = "https://github.com/Blosc/c-blosc2/commit/9cc79a79373f1b338b2e029e2e489b4e7971cd0c.patch";
stripLen = 1;
extraPrefix = "blosc2/c-blosc2/";
hash = "sha256-J/zcyNrxQr43+ROhDDQFmUJZQSTwo9qDuLwZeLd/ooo=";
})
];
postPatch = ''
substituteInPlace requirements-runtime.txt \
--replace "pytest" ""

17
pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix
View File

@@ -3,8 +3,8 @@
, fetchFromGitHub
, fetchYarnDeps
, prefetch-yarn-deps
, nodejs
, nodejs-slim
, nodejs_20
, nodejs-slim_20
, matrix-sdk-crypto-nodejs
, nixosTests
, nix-update-script
@@ -12,19 +12,19 @@
let
pname = "matrix-appservice-irc";
version = "1.0.1";
version = "2.0.0";
src = fetchFromGitHub {
owner = "matrix-org";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-wUbWvCa9xvot73nXZjF3/RawM98ffBCW5YR2+ZKzmEo=";
hash = "sha256-voZJVBggsuwmGw/imt2HYmqiYBkRYMpppt/Nemh6fsM=";
};
yarnOfflineCache = fetchYarnDeps {
name = "${pname}-${version}-offline-cache";
yarnLock = "${src}/yarn.lock";
hash = "sha256-P9u5sK9rIHWRE8kFMj05fVjv26jwsawvHBZgSn7j5BE=";
hash = "sha256-hapEbdjvvzeZHfrpYRW9W3vXkQVNyGZ0qydO34+mQqQ=";
};
in
@@ -35,9 +35,9 @@ stdenv.mkDerivation {
nativeBuildInputs = [
prefetch-yarn-deps
nodejs-slim
nodejs.pkgs.yarn
nodejs.pkgs.node-gyp-build
nodejs-slim_20
nodejs_20.pkgs.yarn
nodejs_20.pkgs.node-gyp-build
];
configurePhase = ''
@@ -83,6 +83,7 @@ stdenv.mkDerivation {
passthru.updateScript = nix-update-script { };
meta = with lib; {
changelog = "https://github.com/matrix-org/matrix-appservice-irc/releases/tag/${version}";
description = "Node.js IRC bridge for Matrix";
maintainers = with maintainers; [ rhysmdnz ];
homepage = "https://github.com/matrix-org/matrix-appservice-irc";

2
pkgs/top-level/all-packages.nix
View File

@@ -41009,7 +41009,7 @@ with pkgs;
pwntools = with python3Packages; toPythonApplication pwntools;
putty = callPackage ../applications/networking/remote/putty {
gtk2 = gtk2-x11;
gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3;
};
qMasterPassword = libsForQt5.callPackage ../applications/misc/qMasterPassword { };