Merge master into staging-next

Changed files
+92 -69
maintainers
pkgs
applications
audio
wolf-shaper
zam-plugins
networking
coreth
instant-messengers
video
virtualization
docker
data
misc
clash-geoip
development
compilers
go
teyjus
libraries
qxlsx
octave-modules
image
python-modules
flask-caching
tools
continuous-integration
drone-runner-docker
rust
cargo-modules
tools
misc
nurl
qflipper
package-management
nix-index
security
osv-scanner
wayland
swayr
top-level
+1
maintainers/team-list.nix
···
kalbasit
mic92
zowoq
+
qbit
];
scope = "Maintain Golang compilers.";
shortName = "Go";
+2 -2
pkgs/applications/audio/wolf-shaper/default.nix
···
stdenv.mkDerivation rec {
pname = "wolf-shaper";
-
version = "0.1.8";
+
version = "1.0.0";
src = fetchFromGitHub {
owner = "pdesaulniers";
repo = "wolf-shaper";
rev = "v${version}";
-
sha256 = "1j9xmh1nkf45ay1c5dz2g165qvrwlanzcq6mvb3nfxar265drd9q";
+
sha256 = "sha256-BREv0nQVysWdx/sVd0cdFji49xtLmHEL8b2jLtgjDfI=";
fetchSubmodules = true;
};
+2 -2
pkgs/applications/audio/zam-plugins/default.nix
···
stdenv.mkDerivation rec {
pname = "zam-plugins";
-
version = "3.14";
+
version = "4.1";
src = fetchFromGitHub {
owner = "zamaudio";
repo = pname;
rev = version;
-
sha256 = "sha256-zlANfFuEXQdXlSu4CuXNyChiuV7wkumaOJqgthl6Y9Q=";
+
sha256 = "sha256-NKa6lOP3fpAFMYwzZAMFgW0tBSM/F89oB/nDbEUeflw=";
fetchSubmodules = true;
};
+3 -3
pkgs/applications/networking/coreth/default.nix
···
buildGoModule rec {
pname = "coreth";
-
version = "0.11.5";
+
version = "0.11.6";
src = fetchFromGitHub {
owner = "ava-labs";
repo = pname;
rev = "v${version}";
-
hash = "sha256-tXwcwMNSrjgQOXcEIucEZjpmPL0cvgYPOV4CMU51Bz8=";
+
hash = "sha256-Me+kmEfvSJs8EPU4D7MwkEyHQuvDmQCSIATxygXws5o=";
};
# go mod vendor has a bug, see: golang/go#57529
proxyVendor = true;
-
vendorHash = "sha256-Wd0m/Bcbn3so0mh83tTfebfOBn51MiAxF3Azmu6ZA0o=";
+
vendorHash = "sha256-jI01tdAVdJOj/ocpwCiaANdyYKSLw00bV7ZtU7HvslA=";
ldflags = [
"-s"
+1 -1
pkgs/applications/networking/instant-messengers/qq/default.nix
···
alsa-lib
at-spi2-core
cups
+
gtk3
libdrm
libgcrypt
libkrb5
···
];
runtimeDependencies = [
-
gtk3
(lib.getLib systemd)
];
+9 -4
pkgs/applications/video/dvdstyler/default.nix
···
, libjpeg
, pkg-config
, wrapGAppsHook
-
, wxGTK30 # crash with wxGTK30 with GTK2 compat
+
, wxGTK32
, wxSVG
, xine-ui
, xmlto
···
inherit (lib) optionals makeBinPath;
in stdenv.mkDerivation rec {
pname = "dvdstyler";
-
version = "3.1.2";
+
version = "3.2.1";
src = fetchurl {
url = "mirror://sourceforge/project/dvdstyler/dvdstyler/${version}/DVDStyler-${version}.tar.bz2";
-
sha256 = "03lsblqficcadlzkbyk8agh5rqcfz6y6dqvy9y866wqng3163zq4";
+
sha256 = "sha256-C7M0hzn0yTCXRUuBTss6WPa6zo8DD0Fhmp/ur7R0dVg=";
};
+
patches = [
+
# https://sourceforge.net/p/dvdstyler/DVDStyler/ci/679fa8dc6ac7657775eda9d7b0ed9da9d069aeec/
+
./wxgtk32.patch
+
];
+
nativeBuildInputs = [
bison
docbook_xml_dtd_412
···
libexif
libjpeg
wxSVG
-
wxGTK30
+
wxGTK32
xine-ui
]
++ optionals dvdisasterSupport [ dvdisaster ]
+12
pkgs/applications/video/dvdstyler/wxgtk32.patch
···
+
--- a/wxVillaLib/PropDlg.cpp
+
+++ b/wxVillaLib/PropDlg.cpp
+
@@ -12,7 +12,9 @@
+
#include "utils.h"
+
#include <wx/fontdlg.h>
+
#include <wx/colordlg.h>
+
+#ifdef __WXMSW__
+
#include <wx/generic/colrdlgg.h>
+
+#endif
+
#include <wx/filedlg.h>
+
#include <wx/dirdlg.h>
+
#include <wx/grid.h>
+3 -3
pkgs/applications/virtualization/docker/compose.nix
···
buildGoModule rec {
pname = "docker-compose";
-
version = "2.14.2";
+
version = "2.15.1";
src = fetchFromGitHub {
owner = "docker";
repo = "compose";
rev = "v${version}";
-
sha256 = "sha256-Yr4R2w6tUsir57etZeex2jT1PW3EZvsLJkVAo/QkhUA=";
+
sha256 = "sha256-CDkewlZFvjp6kb6UoMDUv9iAUfm0akMD9RpI9/H7Sz8=";
};
postPatch = ''
···
rm -rf e2e/
'';
-
vendorSha256 = "sha256-ar61gvbcm7bcgoPodppqrVJnyFHdZkPIMQ6IUXNpGBA=";
+
vendorSha256 = "sha256-sv4lK6MRwmp/1CSGBoYMpcGunVCuE8p1vB4VKaRuwQc=";
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
+2 -2
pkgs/data/misc/clash-geoip/default.nix
···
stdenvNoCC.mkDerivation rec {
pname = "clash-geoip";
-
version = "20221212";
+
version = "20230112";
src = fetchurl {
url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb";
-
sha256 = "sha256-pApPPRIvG8qak5chupTN2u1IUKANXtkcEMlSAPedjH4=";
+
sha256 = "sha256-mMu+U3gtoZmi6LrTMTqsNZKZ+w4J6LZ16Aorneyy7P8=";
};
dontUnpack = true;
+2 -2
pkgs/development/compilers/go/1.20.nix
···
in
stdenv.mkDerivation rec {
pname = "go";
-
version = "1.20rc2";
+
version = "1.20rc3";
src = fetchurl {
url = "https://go.dev/dl/go${version}.src.tar.gz";
-
sha256 = "sha256-V1IqKi4pXKYpJJRQHxMfiJO1kRqMD4VzfniqdOC5/PY=";
+
sha256 = "sha256-iMSJjeo/vu1Mi/CXZCXyxx27EdodN7U3TdR2JjKOMYs=";
};
strictDeps = true;
+17 -6
pkgs/development/compilers/teyjus/default.nix
···
stdenv.mkDerivation rec {
pname = "teyjus";
-
version = "2.1";
+
version = "unstable-2019-07-26";
src = fetchFromGitHub {
owner = "teyjus";
repo = "teyjus";
-
rev = "v${version}";
-
sha256 = "sha256-nz7jZ+GdF6mZQPzBrVD9K/RtoeuVRuhfs7vej4zDkhg=";
+
rev = "e63f40aa9f1d0ea5e7bac41aae5e479c3616545c";
+
sha256 = "sha256-gaAWKd5/DZrIPaaQzx9l0KtCMW9LPw17vvNPsnopZA0=";
};
-
patches = [ ./fix-lex-to-flex.patch ];
+
patches = [
+
./fix-lex-to-flex.patch
+
];
+
+
postPatch = ''
+
sed -i "/TST/d" source/OMakefile
+
rm -rf source/front/caml
+
'';
+
+
strictDeps = true;
-
buildInputs = [ omake ocaml flex bison ];
+
nativeBuildInputs = [ omake ocaml flex bison ];
hardeningDisable = [ "format" ];
+
+
NIX_CFLAGS_COMPILE = "-I${ocaml}/include";
buildPhase = "omake all";
···
homepage = "https://github.com/teyjus/teyjus";
license = lib.licenses.gpl3;
maintainers = [ maintainers.bcdarwin ];
-
platforms = platforms.linux;
+
platforms = platforms.unix;
};
}
+2 -8
pkgs/development/libraries/qxlsx/default.nix
···
stdenv.mkDerivation rec {
pname = "qxlsx";
-
version = "1.4.4";
+
version = "1.4.5";
src = fetchFromGitHub {
owner = "QtExcel";
repo = "QXlsx";
rev = "v${version}";
-
hash = "sha256-01G7eJRrnee/acEeobYAYMY+93y+I0ASOTVRGuO+IcA=";
+
hash = "sha256-T+PUeml4O6uwY6DCAsBer4gDo+nrSGGus+yQv02CJcE=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ qtbase ];
-
-
# Don't force Qt definitions onto users: https://github.com/QtExcel/QXlsx/commit/8e83402d
-
postPatch = ''
-
substituteInPlace QXlsx/CMakeLists.txt \
-
--replace 'target_compile_definitions(QXlsx PUBLIC' 'target_compile_definitions(QXlsx PRIVATE'
-
'';
preConfigure = ''
cd QXlsx
+2 -2
pkgs/development/octave-modules/image/default.nix
···
buildOctavePackage rec {
pname = "image";
-
version = "2.12.0";
+
version = "2.14.0";
src = fetchurl {
url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-
sha256 = "1d3kqhbkq9acc29k42fcilfmykk9a0r321mvk46l5iibc7nqrmg7";
+
sha256 = "sha256-dRXqIRqMuO9dnTurhaNunfVHXosFqRmgeODVJ0YHcTM=";
};
meta = with lib; {
+10 -9
pkgs/development/python-modules/flask-caching/default.nix
···
{ lib
+
, stdenv
, buildPythonPackage
, pythonOlder
, fetchPypi
···
buildPythonPackage rec {
pname = "Flask-Caching";
-
version = "2.0.1";
+
version = "2.0.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
-
sha256 = "sha256-EN8gCgPwMq9gB3vv5Bd53ZSJi2fIIEDTTochC3G6Jjg=";
+
sha256 = "sha256-JLYMVS1ZqWBcwbakLFbNs5qCoo2rRTK77bkiKuVOy04=";
};
-
-
postPatch = ''
-
substituteInPlace setup.py \
-
--replace "Flask <= 2.1.2" "Flask <= 2.2"
-
'';
propagatedBuildInputs = [
cachelib
···
# optional backends
"Redis"
"Memcache"
+
] ++ lib.optionals stdenv.isDarwin [
+
# ignore flaky test
+
"test_cached_view_class"
];
meta = with lib; {
-
description = "Adds caching support to your Flask application";
-
homepage = "https://github.com/sh4nks/flask-caching";
+
description = "A caching extension for Flask";
+
homepage = "https://github.com/pallets-eco/flask-caching";
+
changelog = "https://github.com/pallets-eco/flask-caching/blob/v${version}/CHANGES.rst";
+
maintainers = with maintainers; [ ];
license = licenses.bsd3;
};
}
+3 -3
pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix
···
buildGoModule rec {
pname = "drone-runner-docker";
-
version = "1.8.2";
+
version = "1.8.3";
src = fetchFromGitHub {
owner = "drone-runners";
repo = pname;
rev = "refs/tags/v${version}";
-
sha256 = "sha256-ZpkVfzqeltZSYrKYB6dXtlVjl1uFpQdl2fa+c5ApiW4=";
+
sha256 = "sha256-ZoQeCuT5FRhxp/ikB0gkp3QVOQ6OS7ukkz4QanWT9G0=";
};
-
vendorSha256 = "sha256-KcNp3VdJ201oxzF0bLXY4xWHqHNz54ZrVSI96cfhU+k=";
+
vendorHash = "sha256-KcNp3VdJ201oxzF0bLXY4xWHqHNz54ZrVSI96cfhU+k=";
meta = with lib; {
maintainers = with maintainers; [ endocrimes indeednotjames ];
+3 -3
pkgs/development/tools/rust/cargo-modules/default.nix
···
rustPlatform.buildRustPackage rec {
pname = "cargo-modules";
-
version = "0.7.3";
+
version = "0.7.4";
src = fetchFromGitHub {
owner = "regexident";
repo = pname;
rev = version;
-
sha256 = "sha256-xjAjm23hzuyvxU0S7m9AsfvXui/jb0oFrAqcY8m9Cq0=";
+
sha256 = "sha256-5j7zTAFUkevhSpiOn8KNG5+N7M9M1+c6hAKpDwPXdBQ=";
};
-
cargoSha256 = "sha256-XU4kNP0xODuY5I16zLZeQqpxS37HJI67YF3enB/5N+s=";
+
cargoSha256 = "sha256-jCbs/y0L9YP9VDEtofeqWXbUlsBpVRMbjIYtPRlmQVY=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreServices
+3 -3
pkgs/tools/misc/nurl/default.nix
···
rustPlatform.buildRustPackage rec {
pname = "nurl";
-
version = "0.3.4";
+
version = "0.3.5";
src = fetchFromGitHub {
owner = "nix-community";
repo = "nurl";
rev = "v${version}";
-
hash = "sha256-cPbvYrMeARNi9b97EPUUzYN5j0YjenOCDdrdRVLBviw=";
+
hash = "sha256-MPgJIO7pHpXeryJZB/u1iBpBhleKfTWkrArW2L0E4EM=";
};
-
cargoSha256 = "sha256-CBZe3UdTucgWrCzbXCSWjBjCNWCFUHmCpRwCXUX2sA8=";
+
cargoSha256 = "sha256-yMWNFY9exmDyqcU2iT9YFAcknYmtbYJ9VhJqlKg+NF4=";
nativeBuildInputs = [
installShellFiles
+4 -1
pkgs/tools/misc/qflipper/default.nix
···
, libusb1
, libGL
, qmake
+
, wrapGAppsHook
, wrapQtAppsHook
, mkDerivation
···
pkg-config
qmake
qttools
+
wrapGAppsHook
wrapQtAppsHook
];
···
"CONFIG+=qtquickcompiler"
];
+
dontWrapGApps = true;
+
postPatch = ''
substituteInPlace qflipper_common.pri \
--replace 'GIT_VERSION = unknown' 'GIT_VERSION = "${version}"' \
···
maintainers = with maintainers; [ cab404 ];
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; # qtbase doesn't build yet on aarch64-darwin
};
-
}
+3 -3
pkgs/tools/package-management/nix-index/default.nix
···
rustPlatform.buildRustPackage rec {
pname = "nix-index";
-
version = "0.1.3";
+
version = "0.1.4";
src = fetchFromGitHub {
owner = "bennofs";
repo = "nix-index";
rev = "v${version}";
-
sha256 = "sha256-UbM4041AiYUOcj8e5dJ5HmD26Db3szs6dABVCwseliU=";
+
sha256 = "sha256-TDGtnSgY897fRm1BWLlQZQa8v6Wu5/JIF4UH+1CZm4U=";
};
-
cargoSha256 = "sha256-TMfnjtUo7Kxx/kWnc0scC8qU6vi+E+TL0hE73NNIyjk=";
+
cargoSha256 = "sha256-z1lLpZBD4HjO6gLw96wbucfchRgZs26Q8Gl+hpUB1xo=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl curl sqlite ]
+3 -3
pkgs/tools/security/osv-scanner/default.nix
···
}:
buildGoModule rec {
pname = "osv-scanner";
-
version = "1.0.2";
+
version = "1.1.0";
src = fetchFromGitHub {
owner = "google";
repo = pname;
rev = "v${version}";
-
hash = "sha256-RmR6ZJg+UkE+eSmz4hGuMlObl6UvnGKNoLtBGVKoQ8Q=";
+
hash = "sha256-wU42911t4L2tsVBdmNnc1ABu3zEv94SRi9Z0/8zfUJs=";
};
-
vendorHash = "sha256-HUgzoQuWBRnt8+lCiu9QfO1XR5EMnqVIkrL+nIMf0IA=";
+
vendorHash = "sha256-8z/oRR2ru4SNdxgqelAQGmAPvOEvh9jlLl17k7Cv20g=";
ldflags = [
"-s"
+3 -3
pkgs/tools/wayland/swayr/default.nix
···
rustPlatform.buildRustPackage rec {
pname = "swayr";
-
version = "0.22.0";
+
version = "0.24.0";
src = fetchFromSourcehut {
owner = "~tsdh";
repo = "swayr";
rev = "swayr-${version}";
-
sha256 = "sha256-HThKeuFe4slqakQE1QAfu3SMUL/Gq9DodnAKcU/gTEY=";
+
sha256 = "sha256-Cl/c8KfBfrBIL/AqhZK7DfEcMQNLvxOoWvAq9qqLQDQ=";
};
-
cargoSha256 = "sha256-c13u5EWRrTd9HbL6oLMd4xeQyAncrx5OjzW7FwPIBsE=";
+
cargoHash = "sha256-+z/Ru1c4U/v8EDtz5uUPy/qQu47p1BzdCIWhsHWViGY=";
patches = [
./icon-paths.patch
+2 -6
pkgs/top-level/all-packages.nix
···
inherit (darwin.apple_sdk.frameworks) Cocoa Foundation;
-
teyjus = callPackage ../development/compilers/teyjus (
-
with ocaml-ng.ocamlPackages_4_02; {
-
inherit ocaml;
-
omake = omake_rc1;
-
});
+
teyjus = callPackage ../development/compilers/teyjus { };
thrust = callPackage ../development/tools/thrust {
gconf = gnome2.GConf;
···
wxSVG = callPackage ../development/libraries/wxSVG {
-
wxGTK = wxGTK30;
+
wxGTK = wxGTK32;
wtk = callPackage ../development/libraries/wtk { };