colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2023-01-14 06:01:02 +00:00 committed by GitHub
commit f656c3e849
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 92 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
maintainers/team-list.nix
View File

@ -280,6 +280,7 @@ with lib.maintainers; {
kalbasit
mic92
zowoq
qbit
];
scope = "Maintain Golang compilers.";
shortName = "Go";

4
pkgs/applications/audio/wolf-shaper/default.nix
View File

@ -2,13 +2,13 @@
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;
};

4
pkgs/applications/audio/zam-plugins/default.nix
View File

@ -2,13 +2,13 @@
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;
};

6
pkgs/applications/networking/coreth/default.nix
View File

@ -6,19 +6,19 @@
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"

2
pkgs/applications/networking/instant-messengers/qq/default.nix
View File

@ -49,6 +49,7 @@ stdenv.mkDerivation {
alsa-lib
at-spi2-core
cups
gtk3
libdrm
libgcrypt
libkrb5
@ -58,7 +59,6 @@ stdenv.mkDerivation {
];
runtimeDependencies = [
gtk3
(lib.getLib systemd)
];

13
pkgs/applications/video/dvdstyler/default.nix
View File

@ -17,7 +17,7 @@
, libjpeg
, pkg-config
, wrapGAppsHook
, wxGTK30 # crash with wxGTK30 with GTK2 compat
, wxGTK32
, wxSVG
, xine-ui
, xmlto
@ -33,13 +33,18 @@ let
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
@ -62,7 +67,7 @@ in stdenv.mkDerivation rec {
libexif
libjpeg
wxSVG
wxGTK30
wxGTK32
xine-ui
]
++ optionals dvdisasterSupport [ dvdisaster ]

12
pkgs/applications/video/dvdstyler/wxgtk32.patch Normal file
View File

@ -0,0 +1,12 @@
--- 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>

6
pkgs/applications/virtualization/docker/compose.nix
View File

@ -2,13 +2,13 @@
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 = ''
@ -16,7 +16,7 @@ buildGoModule rec {
rm -rf e2e/
'';
vendorSha256 = "sha256-ar61gvbcm7bcgoPodppqrVJnyFHdZkPIMQ6IUXNpGBA=";
vendorSha256 = "sha256-sv4lK6MRwmp/1CSGBoYMpcGunVCuE8p1vB4VKaRuwQc=";
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];

4
pkgs/data/misc/clash-geoip/default.nix
View File

@ -2,11 +2,11 @@
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;

4
pkgs/development/compilers/go/1.20.nix
View File

@ -45,11 +45,11 @@ let
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;

23
pkgs/development/compilers/teyjus/default.nix
View File

@ -2,21 +2,32 @@
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
];
buildInputs = [ omake ocaml flex bison ];
postPatch = ''
sed -i "/TST/d" source/OMakefile
rm -rf source/front/caml
'';
strictDeps = true;
nativeBuildInputs = [ omake ocaml flex bison ];
hardeningDisable = [ "format" ];
NIX_CFLAGS_COMPILE = "-I${ocaml}/include";
buildPhase = "omake all";
checkPhase = "omake check";
@ -28,6 +39,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/teyjus/teyjus";
license = lib.licenses.gpl3;
maintainers = [ maintainers.bcdarwin ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

10
pkgs/development/libraries/qxlsx/default.nix
View File

@ -7,24 +7,18 @@
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
'';

4
pkgs/development/octave-modules/image/default.nix
View File

@ -5,11 +5,11 @@
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; {

19
pkgs/development/python-modules/flask-caching/default.nix
View File

@ -1,4 +1,5 @@
{ lib
, stdenv
, buildPythonPackage
, pythonOlder
, fetchPypi
@ -11,20 +12,15 @@
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
flask
@ -42,11 +38,16 @@ buildPythonPackage rec {
# 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;
};
}

6
pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix
View File

@ -2,16 +2,16 @@
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 ];

6
pkgs/development/tools/rust/cargo-modules/default.nix
View File

@ -2,16 +2,16 @@
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

6
pkgs/tools/misc/nurl/default.nix
View File

@ -12,16 +12,16 @@
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

5
pkgs/tools/misc/qflipper/default.nix
View File

@ -6,6 +6,7 @@
, libusb1
, libGL
, qmake
, wrapGAppsHook
, wrapQtAppsHook
, mkDerivation
@ -44,6 +45,7 @@ mkDerivation {
pkg-config
qmake
qttools
wrapGAppsHook
wrapQtAppsHook
];
@ -69,6 +71,8 @@ mkDerivation {
"CONFIG+=qtquickcompiler"
];
dontWrapGApps = true;
postPatch = ''
substituteInPlace qflipper_common.pri \
--replace 'GIT_VERSION = unknown' 'GIT_VERSION = "${version}"' \
@ -98,5 +102,4 @@ mkDerivation {
maintainers = with maintainers; [ cab404 ];
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; # qtbase doesn't build yet on aarch64-darwin
};
}

6
pkgs/tools/package-management/nix-index/default.nix
View File

@ -4,16 +4,16 @@
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 ]

6
pkgs/tools/security/osv-scanner/default.nix
View File

@ -6,16 +6,16 @@
}:
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"

6
pkgs/tools/wayland/swayr/default.nix
View File

@ -2,16 +2,16 @@
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

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

@ -15815,11 +15815,7 @@ with pkgs;
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;
@ -23491,7 +23487,7 @@ with pkgs;
};
wxSVG = callPackage ../development/libraries/wxSVG {
wxGTK = wxGTK30;
wxGTK = wxGTK32;
};
wtk = callPackage ../development/libraries/wtk { };