nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-03 13:30:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge release-22.11 into staging-next-22.11

Browse Source
This commit is contained in:
github-actions[bot]
2023-03-29 00:15:15 +00:00
committed by GitHub
parent e19bd3602e 6cfba1a8e7
commit 1cf59f6a29
13 changed files with 51 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View File

@@ -89,7 +89,7 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
version = "12.0.3";
version = "12.0.4";
lang = "ALL";
@@ -101,7 +101,7 @@ let
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
];
hash = "sha256-bOGY/RdwD6O7QIuOiBw7OVnZfpumGGso6hwMJJwN2g0=";
hash = "sha256-VT0bD4v8SBq0emFYsxELreY4o+u+FQfyBEnSMzmRd7Y=";
};
i686-linux = fetchurl {
@@ -111,7 +111,7 @@ let
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
hash = "sha256-t1tnEZtiRig2r8GNJpqT+J0XoxCLMyUsI9tX6aa0lYk=";
hash = "sha256-mi8btxI6de5iQ8HzNpvuFdJHjzi03zZJT65dsWEiDHA=";
};
};
in

6
pkgs/applications/networking/cluster/argocd/default.nix
View File

@@ -2,17 +2,17 @@
buildGoModule rec {
pname = "argocd";
version = "2.5.12";
version = "2.5.16";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo-cd";
rev = "v${version}";
sha256 = "sha256-MoiXlWhPbCuD5Q/izKundNqFrbnykh1dH9eP9z9rq8M=";
sha256 = "sha256-EGCfJrfQV/c+5OZ4KQqH1+zYzKtj+7dryrPxvd0PhqY=";
};
proxyVendor = true; # darwin/linux hash mismatch
vendorHash = "sha256-rkgwfSmUmxmCxbS/0r5sU+XJTGZ6NTZ+VIXpBElT0uA=";
vendorHash = "sha256-2nITqgTI4itNBoBlLiRI5DoXQpQtaz5R4ldPNaH1OEQ=";
# Set target as ./cmd per cli-local
# https://github.com/argoproj/argo-cd/blob/master/Makefile#L227

4
pkgs/applications/networking/mailreaders/mutt/default.nix
View File

@@ -21,12 +21,12 @@
stdenv.mkDerivation rec {
pname = "mutt";
version = "2.2.9";
version = "2.2.10";
outputs = [ "out" "doc" "info" ];
src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
sha256 = "+lMbIx1Y/h8wztoO1iZoPqnr37ds5H74uyfC93Qiz/s=";
sha256 = "sha256-TXc/IkIveQlve5S1e+5FZUrZolFl27NkY8WClbTNPYg=";
};
patches = lib.optional smimeSupport (fetchpatch {

10
pkgs/applications/networking/shellhub-agent/default.nix
View File

@@ -1,5 +1,5 @@
{ lib
, buildGoModule
, buildGo120Module
, fetchFromGitHub
, gitUpdater
, makeWrapper
@@ -7,20 +7,20 @@
, libxcrypt
}:
buildGoModule rec {
buildGo120Module rec {
pname = "shellhub-agent";
version = "0.10.8";
version = "0.11.7";
src = fetchFromGitHub {
owner = "shellhub-io";
repo = "shellhub";
rev = "v${version}";
sha256 = "BtD22Ss5PuVx2RVLQIsUeGBJBl5lh1XHJ0vcM2bOEwk=";
sha256 = "d5ESQQgBPUFe2tuCbeFIqiWPpr9wUczbXLc5QdXurXY=";
};
modRoot = "./agent";
vendorSha256 = "sha256-tvKiTQioj999oIUDHUSXTMXOh/LKoykzu8JEUnrelws=";
vendorSha256 = "sha256-/85rIBfFBpXYrsCBDGVzXfAxO6xXQ8uTL2XeEPKQwDQ=";
ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ];

6
pkgs/applications/science/astronomy/calcmysky/default.nix
View File

@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "calcmysky";
version = "0.2.1";
version = "unstable-2023-02-11";
src = fetchFromGitHub {
owner = "10110111";
repo = "CalcMySky";
rev = "v${version}";
hash = "sha256-7Yj6OlZ7weenekXYGhK5EWcME20oCHiLPOxz5KEuKy4=";
rev = "c5f281452816d8de775b13a70fb90e79427c93c4";
hash = "sha256-mzxtu6YTaZpR17m2WGiSDo/bAPXGJdQskyz7aqtxGoQ=";
};
nativeBuildInputs = [ cmake wrapQtAppsHook ];

4
pkgs/applications/science/astronomy/stellarium/default.nix
View File

@@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "stellarium";
version = "1.1";
version = "23.1";
src = fetchFromGitHub {
owner = "Stellarium";
repo = "stellarium";
rev = "v${version}";
sha256 = "sha256-ellfBZWOkvlRauuwug96C7P/WjQ6dXiDnT0b3KH5zRM=";
hash = "sha256-7jzS3pRklPsCTgCr3nrywfHCNlBDHuyuGGvrVoI9+A0=";
};
nativeBuildInputs = [

9
pkgs/build-support/rust/build-rust-package/sysroot/default.nix
View File

@@ -1,10 +1,10 @@
{ stdenv, rust, rustPlatform, buildPackages }:
{ lib, stdenv, rust, rustPlatform, buildPackages }:
{ shortTarget, originalCargoToml, target, RUSTFLAGS }:
let
cargoSrc = import ../../sysroot/src.nix {
inherit stdenv rustPlatform buildPackages originalCargoToml;
inherit lib stdenv rustPlatform buildPackages originalCargoToml;
};
in rustPlatform.buildRustPackage {
inherit target RUSTFLAGS;
@@ -14,7 +14,7 @@ in rustPlatform.buildRustPackage {
RUSTC_BOOTSTRAP = 1;
__internal_dontAddSysroot = true;
cargoSha256 = "0y6dqfhsgk00y3fv5bnjzk0s7i30nwqc1rp0xlrk83hkh80x81mw";
cargoSha256 = "sha256-zgkwevitxsu1C4OgGTsqNSc0gDxaNXYK1WPbfER48d0=";
doCheck = false;
@@ -29,4 +29,7 @@ in rustPlatform.buildRustPackage {
host=${rust.toRustTarget stdenv.buildPlatform}
cp -r $RUST_SYSROOT/lib/rustlib/$host $out
'';
# allows support for cross-compilation
meta.platforms = lib.platforms.all;
}

6
pkgs/build-support/rust/sysroot/Cargo.lock generated
View File

@@ -1,5 +1,7 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
[[package]]
name = "alloc"
version = "0.0.0"
@@ -10,9 +12,9 @@ dependencies = [
[[package]]
name = "compiler_builtins"
version = "0.1.52"
version = "0.1.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6591c2442ee984e2b264638a8b5e7ae44fd47b32d28e3a08e2e9c3cdb0c2fb0"
checksum = "f867ce54c09855ccd135ad4a50c777182a0c7af5ff20a8f537617bd648b10d50"
dependencies = [
"rustc-std-workspace-core",
]

2
pkgs/build-support/rust/sysroot/src.nix
View File

@@ -19,7 +19,7 @@ stdenv.mkDerivation {
+ ''
${buildPackages.python3.withPackages (ps: with ps; [ toml ])}/bin/python3 ${./cargo.py}
mkdir -p $out/src
touch $out/src/lib.rs
echo '#![no_std]' > $out/src/lib.rs
cp Cargo.toml $out/Cargo.toml
cp ${./Cargo.lock} $out/Cargo.lock
'';

9
pkgs/development/python-modules/cairosvg/default.nix
View File

@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchpatch
, isPy3k
, cairocffi
, cssselect2
@@ -20,6 +21,14 @@ buildPythonPackage rec {
sha256 = "sha256-sLmSnPXboAUXjXRqgDb88AJVUPSYylTbYYczIjhHg7w=";
};
patches = [
(fetchpatch {
name = "CVE-2023-27586.patch";
url = "https://github.com/Kozea/CairoSVG/commit/12d31c653c0254fa9d9853f66b04ea46e7397255.patch";
hash = "sha256-6ElTepPjEmhbv59jkzTnw+qhY7JlqS/lToIzZtfkh08=";
})
];
propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ];
propagatedNativeBuildInputs = [ cairocffi ];

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

@@ -11,20 +11,20 @@ in
with python3.pkgs;
buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.79.0";
version = "1.80.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "synapse";
rev = "v${version}";
hash = "sha256-2MHP4Gu+C5yyXObbd7NLYWCy1E0L7fUwpzYsoD7ULDo=";
hash = "sha256-Lw6gmuI+ntOW54HQbmDoY9QYNDTu5vgtrJz6HMWWmMM=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-yDKs6KRStjJMC/48dZcyQ4OmBXY1TombjH/ZDfBJbSc=";
hash = "sha256-KqPpaIJ8VuVV6f6n14/7wbA+Vtk7NvWm09bUBWuAAlY=";
};
postPatch = ''

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

@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tailscale";
version = "1.38.1";
version = "1.38.2";
src = fetchFromGitHub {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
hash = "sha256-2VTYZhC/U32fzEJCxkCB35IqQBALKXQA23SvhY57lSU=";
hash = "sha256-5WNP1wVaKKTauny/dANODMCiQmyzOcWRd83RUInoCuk=";
};
vendorHash = "sha256-LIvaxSo+4LuHUk8DIZ27IaRQwaDnjW6Jwm5AEc/V95A=";

13
pkgs/servers/wsdd/default.nix
View File

@@ -1,17 +1,19 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper, nixosTests, python3 }:
{ lib, stdenv, fetchFromGitHub, installShellFiles, makeWrapper, nixosTests, python3 }:
stdenv.mkDerivation rec {
pname = "wsdd";
version = "0.7.0";
version = "0.7.1";
src = fetchFromGitHub {
owner = "christgau";
repo = pname;
rev = "v${version}";
sha256 = "sha256-9cwzkF2mg6yOIsurLMXTLoEIOsKbPIWMicpWBQ0XVhE=";
hash = "sha256-xfZVGi3OxuRI+Zh6L3Ru4J4j5BB1EAN3fllRCVA/c5o=";
};
nativeBuildInputs = [ makeWrapper ];
outputs = [ "out" "man" ];
nativeBuildInputs = [ installShellFiles makeWrapper ];
buildInputs = [ python3 ];
@@ -22,7 +24,8 @@ stdenv.mkDerivation rec {
];
installPhase = ''
install -Dm0755 src/wsdd.py $out/bin/wsdd
install -Dm0555 src/wsdd.py $out/bin/wsdd
installManPage man/wsdd.8
wrapProgram $out/bin/wsdd --prefix PYTHONPATH : "$PYTHONPATH"
'';