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-23.05 into staging-23.05

Browse Source
This commit is contained in:
github-actions[bot]
2023-09-27 00:12:55 +00:00
committed by GitHub
parent 72fd93734a e4fc2f7fa5
commit aa5c19d99f
12 changed files with 462 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
nixos/modules/services/networking/wireguard.nix
View File

@@ -164,6 +164,15 @@ let
of the wireguard network has to be adjusted as well.
'';
};
metric = mkOption {
default = null;
type = with types; nullOr int;
example = 700;
description = lib.mdDoc ''
Set the metric of routes related to this Wireguard interface.
'';
};
};
};
@@ -395,7 +404,7 @@ let
optionalString interfaceCfg.allowedIPsAsRoutes
(concatMapStringsSep "\n"
(allowedIP:
''${ip} route replace "${allowedIP}" dev "${interfaceName}" table "${interfaceCfg.table}"''
''${ip} route replace "${allowedIP}" dev "${interfaceName}" table "${interfaceCfg.table}" ${optionalString (interfaceCfg.metric != null) "metric ${toString interfaceCfg.metric}"}''
) peer.allowedIPs);
in ''
${wg_setup}

4
pkgs/applications/editors/ldtk/default.nix
View File

@@ -3,11 +3,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ldtk";
version = "1.3.4";
version = "1.4.0";
src = fetchurl {
url = "https://github.com/deepnight/ldtk/releases/download/v${finalAttrs.version}/ubuntu-distribution.zip";
hash = "sha256-/EFmuzj8hYhQJegZpZhZb4fuSeMF9wdG1Be4duEvW54=";
hash = "sha256-WuKzhE9r/yMqlV2bf/0AuNVKfxq/SlecmN3rHt6RjXo=";
};
nativeBuildInputs = [ unzip makeWrapper copyDesktopItems appimage-run ];

24
pkgs/applications/networking/browsers/chromium/upstream-info.nix
View File

@@ -27,11 +27,11 @@
};
stable = {
chromedriver = {
sha256_darwin = "0phhcqid7wjw923qdi65zql3fid25swwszksgnw3b8fgz67jn955";
sha256_darwin = "138mw5p6r0n0531fs6322yxsjgj9hia5plw4mj0b3mclykzy5l37";
sha256_darwin_aarch64 =
"00fwq8slvjm6c7krgwjd4mxhkkrp23n4icb63qlvi2hy06gfj4l6";
sha256_linux = "0ws8ch1j2hzp483vr0acvam1zxmzg9d37x6gqdwiqwgrk6x5pvkh";
version = "117.0.5938.88";
"1cym94av2gw2zwj3rdqbjcqkigpzf0zk2bam2hw9n2hiabb4rm0p";
sha256_linux = "1q1vyhmcx6b5criz5bn1c3x3z2dzqdgsmwcvlb0rzqlzpla9q26m";
version = "117.0.5938.92";
};
deps = {
gn = {
@@ -41,9 +41,9 @@
version = "2023-08-01";
};
};
sha256 = "01n9aqnilsjrbpv5kkx3c6nxs9p5l5lfwxj67hd5s5g4740di4a6";
sha256bin64 = "1dhgagphdzbd19gkc7vpl1hxc9vn0l7sxny346qjlmrwafqlhbgi";
version = "117.0.5938.88";
sha256 = "0b1l8gjhqbsyqi30rsn8dyq2hdvwasdqfk1qzk55f9ch4wclkjk5";
sha256bin64 = "047w7y4c8k076yzrjc50lvwncbk8b3lyqnd1si9nrsl7c66j2h0q";
version = "117.0.5938.92";
};
ungoogled-chromium = {
deps = {
@@ -54,12 +54,12 @@
version = "2023-08-01";
};
ungoogled-patches = {
rev = "117.0.5938.88-1";
sha256 = "1wz15ib56j8c84bgrbf0djk5wli49b1lvaqbg18pdclkp1mqy5w9";
rev = "117.0.5938.92-1";
sha256 = "0ix0vaki9r305js61qraiah3vqjaj3dyycabi6grfavdgjpjkasb";
};
};
sha256 = "01n9aqnilsjrbpv5kkx3c6nxs9p5l5lfwxj67hd5s5g4740di4a6";
sha256bin64 = "1dhgagphdzbd19gkc7vpl1hxc9vn0l7sxny346qjlmrwafqlhbgi";
version = "117.0.5938.88";
sha256 = "0b1l8gjhqbsyqi30rsn8dyq2hdvwasdqfk1qzk55f9ch4wclkjk5";
sha256bin64 = "047w7y4c8k076yzrjc50lvwncbk8b3lyqnd1si9nrsl7c66j2h0q";
version = "117.0.5938.92";
};
}

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

File diff suppressed because it is too large Load Diff

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

@@ -3,10 +3,10 @@
{
firefox = buildMozillaMach rec {
pname = "firefox";
version = "117.0.1";
version = "118.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "1583b0ad3b3b17c59bfbfb3e416074766327d0b926ef4f6c6b1e3b2d7cf6a18dec592b7d17fab9493ba1506f3540a02277096d28616dd29b6e7b9e93905f2071";
sha512 = "7c34c43930bda84d17a241fe7e0f8e6ca262410423ae7e7cc8444224aea2d25a52acc9079064ba57f3350e3573eb23aeaf7a2d98136d17e6fa89a61aaf57155d";
};
meta = {
@@ -87,11 +87,11 @@
firefox-esr-115 = buildMozillaMach rec {
pname = "firefox-esr-115";
version = "115.2.1esr";
version = "115.3.0esr";
applicationName = "Mozilla Firefox ESR";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "5f9ff96996e3c482fa4d2e2861fdf14d2154bf0277d412bf9c9435204c7e2e2539ce7ef0891d8dafc74d5a12650a5ccd33d79547aa1bbb2c2a0972aaeb755edf";
sha512 = "4a85095620a61dc516cfce6f288ba491a99c72a78c6dfae264c1292f9eba902e3df7101b97a6f8531114ccce421c92586e143872798aafd7aabbe98a257692ee";
};
meta = {

12
pkgs/applications/networking/instant-messengers/slack/default.nix
View File

@@ -45,14 +45,14 @@ let
pname = "slack";
x86_64-darwin-version = "4.29.149";
x86_64-darwin-sha256 = "sha256-E0YnOPnaWFe17gCpFywxu5uHs1pEktA1tUu4QqvKhYw=";
x86_64-darwin-version = "4.34.119";
x86_64-darwin-sha256 = "17ssha6a8iyvan3k7mbg2cdyy1y7gmlwrh4dlkgcc63bqqxsavy1";
x86_64-linux-version = "4.29.149";
x86_64-linux-sha256 = "sha256-ulXIGLp2ql47ZS6IeaMuqye39deDtukOB1dxy5BNCwI=";
x86_64-linux-version = "4.34.120";
x86_64-linux-sha256 = "0wldnj6hyzqxyc9p365gb46pyqq0im1ayl12mrc8xkrikx9phb7y";
aarch64-darwin-version = "4.29.149";
aarch64-darwin-sha256 = "sha256-Nn+dFD3H/By+aBPLDxnPneNXuFl+tHdLhxJXeYBMORg=";
aarch64-darwin-version = "4.34.119";
aarch64-darwin-sha256 = "0xa39l4ynjmzq6811vprxxz8znwckmxcss9aa7v68cja8vj033vj";
version = {
x86_64-darwin = x86_64-darwin-version;

4
pkgs/development/tools/build-managers/goredo/default.nix
View File

@@ -9,11 +9,11 @@
buildGoModule rec {
pname = "goredo";
version = "1.30.0";
version = "1.31.0";
src = fetchurl {
url = "http://www.goredo.cypherpunks.ru/download/${pname}-${version}.tar.zst";
hash = "sha256-glsg2q8jFd4z6CuKzlZ3afJx/S7Aw6LCxFAS/uHLlUg=";
hash = "sha256-z7u71VFMoq4VwHohMnYx/ahBSkRZHoI8MZet9gO+XVw=";
};
patches = [ ./fix-tests.diff ];

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

@@ -3,14 +3,14 @@
let
# These names are how they are designated in https://xanmod.org.
ltsVariant = {
version = "6.1.52";
hash = "sha256-uzBmgrjNto2CwqkxdFCPeEPQnPSUZEO2pYMnKe8rCfY=";
version = "6.1.54";
hash = "sha256-sAVWtpR0fzBcLR82MFREG4Qv/JEXyJ+5MZ/XDVE0fu8=";
variant = "lts";
};
mainVariant = {
version = "6.4.15";
hash = "sha256-WupJJMLqgHJ7FATwNyMwAHIUl9qj0lNH7wRYRBm0CAA=";
version = "6.5.4";
hash = "sha256-zT+aU/pOtKgzVOH5Xg4qd88RcDVBmO4af/rgrkUrnfw=";
variant = "main";
};

4
pkgs/servers/jellyfin/default.nix
View File

@@ -14,13 +14,13 @@
buildDotnetModule rec {
pname = "jellyfin";
version = "10.8.10"; # ensure that jellyfin-web has matching version
version = "10.8.11"; # ensure that jellyfin-web has matching version
src = fetchFromGitHub {
owner = "jellyfin";
repo = "jellyfin";
rev = "v${version}";
sha256 = "uX56TSyi0V0Rs6R3A8QHZrjTIHUZobLYIgG+nZDE3Hg=";
sha256 = "deJv2lWo0kXGixCBJzfdIBZcNjg45y2ITGQfWcM2smU=";
};
patches = [

6
pkgs/servers/jellyfin/web.nix
View File

@@ -7,16 +7,16 @@
buildNpmPackage rec {
pname = "jellyfin-web";
version = "10.8.10";
version = "10.8.11";
src = fetchFromGitHub {
owner = "jellyfin";
repo = "jellyfin-web";
rev = "v${version}";
hash = "sha256-fJmGiHLwhgd3Ac7ggCbkMu6llob3qN87EpHpCO4K29I=";
hash = "sha256-Gl8eaC/AXBD956tAepwWVG3lSvL4rBCcgmkHeT/mrzM=";
};
npmDepsHash = "sha256-X8a/pmQGAhoGKhThJ86b50sf0nlsCXGgvLQaxRsmA5Q=";
npmDepsHash = "sha256-HoRteA6KFCFxDdwGtDKrvwWCMYNfYQWlit52RAN1eAU=";
npmBuildScript = [ "build:production" ];

15
pkgs/tools/backup/borgbackup/default.nix
View File

@@ -11,28 +11,18 @@
, zstd
, installShellFiles
, nixosTests
, fetchpatch
}:
python3.pkgs.buildPythonApplication rec {
pname = "borgbackup";
version = "1.2.3";
version = "1.2.6";
format = "pyproject";
src = python3.pkgs.fetchPypi {
inherit pname version;
hash = "sha256-4yQY+GM8lvqWgTUqVutjuY4pQgNHLBFKUkJwnTaWZ4U=";
hash = "sha256-t6b48IYDnu7HkHC5FPPGUe1/NhLJZTdK+RDSd8eiE50=";
};
patches = [
(fetchpatch {
# Fix HashIndexSizeTestCase.test_size_on_disk_accurate problems on ZFS,
# see https://github.com/borgbackup/borg/issues/7250
url = "https://github.com/borgbackup/borg/pull/7252/commits/fe3775cf8078c18d8fe39a7f42e52e96d3ecd054.patch";
hash = "sha256-gdssHfhdkmRfSAOeXsq9Afg7xqGM3NLIq4QnzmPBhw4=";
})
];
postPatch = ''
# sandbox does not support setuid/setgid/sticky bits
substituteInPlace src/borg/testsuite/archiver.py \
@@ -124,6 +114,7 @@ python3.pkgs.buildPythonApplication rec {
outputs = [ "out" "doc" "man" ];
meta = with lib; {
changelog = "https://github.com/borgbackup/borg/blob/${version}/docs/changes.rst";
description = "Deduplicating archiver with compression and encryption";
homepage = "https://www.borgbackup.org";
license = licenses.bsd3;

12
pkgs/tools/networking/sing-box/default.nix
View File

@@ -4,21 +4,22 @@
, fetchFromGitHub
, installShellFiles
, buildPackages
, coreutils
, nix-update-script
}:
buildGoModule rec {
pname = "sing-box";
version = "1.2.7";
version = "1.4.5";
src = fetchFromGitHub {
owner = "SagerNet";
repo = pname;
rev = "v${version}";
hash = "sha256-+pRG5nq0Be58at61qqu5QciHC2DMvw+wj7u8tZx8+eY=";
hash = "sha256-Tb+4k0fwb22gif4SSNDmIBDq346CinhyqxwE0fhkXq4=";
};
vendorHash = "sha256-gHPMJ4/W2ZisG/jAtHSLH/NlHgBitg7Bwe95wGJAsOY=";
vendorHash = "sha256-EZ+ehh/FuQWNHqfXWMoSI+z9+OKDTVzRn51CYR/ezZw=";
tags = [
"with_quic"
@@ -50,6 +51,11 @@ buildGoModule rec {
--bash <(${emulator} $out/bin/sing-box completion bash) \
--fish <(${emulator} $out/bin/sing-box completion fish) \
--zsh <(${emulator} $out/bin/sing-box completion zsh )
substituteInPlace release/config/sing-box{,@}.service \
--replace "/usr/bin/sing-box" "$out/bin/sing-box" \
--replace "/bin/kill" "${coreutils}/bin/kill"
install -Dm444 -t "$out/lib/systemd/system/" release/config/sing-box{,@}.service
'';
passthru.updateScript = nix-update-script { };