Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-05-11 18:28:07 +00:00 committed by GitHub
commit 37c26a396b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
39 changed files with 529 additions and 101 deletions

View file

@ -7201,6 +7201,16 @@
githubId = 16385648;
name = "Niko Pavlinek";
};
nixbitcoin = {
email = "nixbitcoin@i2pmail.org";
github = "nixbitcoin";
githubId = 45737139;
name = "nixbitcoindev";
keys = [{
longkeyid = "rsa4096/0xDD11F9AD5308B3BA";
fingerprint = "577A 3452 7F3E 2A85 E80F E164 DD11 F9AD 5308 B3BA";
}];
};
nixinator = {
email = "33lockdown33@protonmail.com";
github = "nixinator";

View file

@ -14,16 +14,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "ncspot";
version = "0.6.0";
version = "0.7.0";
src = fetchFromGitHub {
owner = "hrkfdn";
repo = "ncspot";
rev = "v${version}";
sha256 = "0j4ax3yh0l8v5bd5i3ijd8ys27dcrh7byigjip52mw1qlqfnh8wk";
sha256 = "04ws6xkqs0g5fkl11861vqxh6xr0z6k1z40ln0za7n38ra2mjgh0";
};
cargoSha256 = "022q6rlac97dr6l7rd9xalgx0w257r364i1pij080qx8rk97msb9";
cargoSha256 = "1ws7qr41pqz99cpcigw4bckiwz7l5kzi0dkfif7203v9zy57mmzi";
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];

View file

@ -46,13 +46,13 @@
mkDerivation rec {
pname = "freecad";
version = "0.19.1";
version = "0.19.2";
src = fetchFromGitHub {
owner = "FreeCAD";
repo = "FreeCAD";
rev = version;
hash = "sha256-itIrO+/mKXOPNs+2POKT8u4YZuqx/QAwVBWrHgKP1qQ=";
hash = "sha256-XZ+fRl3CPCIFu3nHeMTLibwwFBlG/cWpKJlI58hTAuU=";
};
nativeBuildInputs = [
@ -102,6 +102,7 @@ mkDerivation rec {
];
cmakeFlags = [
"-Wno-dev" # turns off warnings which otherwise makes it hard to see what is going on
"-DBUILD_FLAT_MESH:BOOL=ON"
"-DBUILD_QT5=ON"
"-DSHIBOKEN_INCLUDE_DIR=${shiboken2}/include"
@ -110,7 +111,7 @@ mkDerivation rec {
+ ";${pyside2}/include/PySide2/QtCore"
+ ";${pyside2}/include/PySide2/QtWidgets"
+ ";${pyside2}/include/PySide2/QtGui"
)
)
"-DPYSIDE_LIBRARY=PySide2::pyside2"
];

View file

@ -5,8 +5,8 @@
, ninja
, pkg-config
, wrapGAppsHook
, gtk3
, gnome
, epoxy
, gtk4
, zbar
, tiffSupport ? true
, libraw
@ -26,20 +26,22 @@ let
in
stdenv.mkDerivation rec {
pname = "megapixels";
version = "0.16.0";
version = "1.0.1";
src = fetchFromSourcehut {
owner = "~martijnbraam";
repo = "megapixels";
rev = version;
sha256 = "0z7sx76x18yqf7carq6mg9lib0zbz0yrd1dsg9qd6hbf5niqis37";
sha256 = "0k9a5dpr5z0g7ngbhk4j22sbs1ffxiwg8wmbzgggdc9xvwmkgppr";
};
nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ];
buildInputs = [ gtk3 gnome.adwaita-icon-theme zbar ]
++ optional tiffSupport libraw
++ optional jpgSupport graphicsmagick;
buildInputs = [
epoxy
gtk4
zbar
];
preFixup = optionalString (tiffSupport || jpgSupport) ''
gappsWrapperArgs+=(
@ -52,7 +54,7 @@ stdenv.mkDerivation rec {
homepage = "https://sr.ht/~martijnbraam/Megapixels";
changelog = "https://git.sr.ht/~martijnbraam/megapixels/refs/${version}";
license = licenses.gpl3Only;
maintainers = with maintainers; [ OPNA2608 ];
maintainers = with maintainers; [ OPNA2608 dotlambda ];
platforms = platforms.linux;
};
}

View file

@ -1,46 +1,65 @@
{ lib
, stdenv
, fetchFromGitLab
, docbook-xsl-nons
, gobject-introspection
, gtk-doc
, libxslt
, meson
, ninja
, pkg-config
, vala
, wrapGAppsHook
, glib
, gsound
, libgudev
, json-glib
, vala
, gobject-introspection
, libgudev
, dbus
}:
stdenv.mkDerivation rec {
pname = "feedbackd-unstable";
version = "2021-01-25";
pname = "feedbackd";
# Not an actual upstream project release,
# only a Debian package release that is tagged in the upstream repo
version = "0.0.0+git20210426";
outputs = [ "out" "dev" "devdoc" ];
src = fetchFromGitLab {
domain = "source.puri.sm";
owner = "Librem5";
repo = "feedbackd";
rev = "v0.0.0+git${builtins.replaceStrings ["-"] [""] version}";
sha256 = "184ag10sfzrka533inv6f38x6z769kq5jj56vdkcm65j5h786w5v";
rev = "v${version}";
sha256 = "12kdchv11c5ynpv6fbagcx755x5p2kd7acpwjxi9khwdwjsqxlmn";
};
nativeBuildInputs = [
docbook-xsl-nons
gobject-introspection
gtk-doc
libxslt
meson
ninja
pkg-config
wrapGAppsHook
vala
gobject-introspection
wrapGAppsHook
];
buildInputs = [
glib
gsound
libgudev
json-glib
libgudev
];
mesonFlags = [ "-Dgtk_doc=true" "-Dman=true" ];
checkInputs = [
dbus
];
doCheck = true;
postInstall = ''
mkdir -p $out/lib/udev/rules.d
sed "s|/usr/libexec/|$out/libexec/|" < $src/debian/feedbackd.udev > $out/lib/udev/rules.d/90-feedbackd.rules
@ -54,4 +73,3 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
};
}

View file

@ -3,27 +3,28 @@
, fetchFromGitLab
, cmake
, extra-cmake-modules
, breeze-icons
, applet-window-buttons
, karchive
, kcoreaddons
, ki18n
, kio
, kirigami2
, mauikit
, mauikit-filebrowsing
, qtmultimedia
, qtquickcontrols2
}:
mkDerivation rec {
pname = "index";
version = "1.2.1";
version = "1.2.2";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "index-fm";
rev = "v${version}";
sha256 = "1v6z44c88cqgr3b758yq6l5d2zj1vhlnaq7v8rrhs7s5dsimzlx8";
sha256 = "sha256-N9/Jt18QRqDMWtEfxWn22e5Ud3YMwJ9B7OQRwTvwX8g=";
};
nativeBuildInputs = [
@ -32,13 +33,14 @@ mkDerivation rec {
];
buildInputs = [
breeze-icons
applet-window-buttons
karchive
kcoreaddons
ki18n
kio
kirigami2
mauikit
mauikit-filebrowsing
qtmultimedia
qtquickcontrols2
];

View file

@ -44,7 +44,7 @@ let
homepage = "https://github.com/kubernetes/kops";
changelog = "https://github.com/kubernetes/kops/tree/master/docs/releases";
license = licenses.asl20;
maintainers = with maintainers; [ offline zimbatm ];
maintainers = with maintainers; [ offline zimbatm diegolelis ];
platforms = platforms.unix;
};
} // attrs';
@ -63,9 +63,14 @@ rec {
sha256 = "0fmrzjz163hda6sl1jkl7cmg8fw6mmqb9953048jnhmd3w428xlz";
};
kops_1_18 = mkKops rec {
kops_1_18 = mkKops {
version = "1.18.2";
sha256 = "17na83j6sfhk69w9ssvicc0xd1904z952ad3zzbpha50lcy6nlhp";
};
kops_1_19 = mkKops rec {
version = "1.19.2";
sha256 = "15csxih1xy8myky37n5dyzp5mc31pc4bq9asaw6zz51mgw8ad5r9";
rev = "v${version}";
};
}

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kubeseal";
version = "0.15.0";
version = "0.16.0";
src = fetchFromGitHub {
owner = "bitnami-labs";
repo = "sealed-secrets";
rev = "v${version}";
sha256 = "sha256-wzaNFM/4V2mWqhkqeT70ieQuhgNK79U2b7PhxKqn/X0=";
sha256 = "sha256-+9yOBrq34VCy1yAkSh1iHbgtckuz2FcHokH/Cb/Heus=";
};
vendorSha256 = null;

View file

@ -22,5 +22,6 @@ buildGoModule {
homepage = "https://linkerd.io/";
license = licenses.asl20;
maintainers = with maintainers; [ Gonzih ];
broken = true;
};
}

View file

@ -0,0 +1,29 @@
{ pkgs, buildGoModule, fetchFromGitHub, lib, perl }:
buildGoModule rec {
pname = "XD";
version = "0.4.0";
src = fetchFromGitHub {
owner = "majestrate";
repo = "XD";
rev = "v${version}";
sha256 = "sha256-fXENoqhR04TYS/kAJUqsqa0+j+KyzdsMlXIZ2GMPMhc=";
};
vendorSha256 = "1wg3cym2rwrhjsqlgd38l8mdq5alccz808465117n3vyga9m35lq";
checkInputs = [ perl ];
postInstall = ''
ln -s $out/bin/XD $out/bin/XD-CLI
'';
meta = with lib; {
description = "i2p bittorrent client";
homepage = "https://xd-torrent.github.io";
maintainers = with maintainers; [ nixbitcoin ];
license = licenses.mit;
platforms = platforms.linux;
};
}

View file

@ -96,7 +96,7 @@ let
]
++ lib.optionals (unwrapped.hasFeature "gr-qtgui" unwrapped.features)
# 3.7 builds with qt4
(if unwrapped.versionAttr.major == "3.8" then
(if lib.versionAtLeast unwrapped.versionAttr.major "3.8" then
[
"--prefix" "QT_PLUGIN_PATH" ":"
"${

View file

@ -16,12 +16,12 @@ with lib;
buildGoPackage rec {
pname = "gitea";
version = "1.14.1";
version = "1.14.2";
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
src = fetchurl {
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
sha256 = "1hpwc5jmkbnn6qf3li8g38qz2l87vk6jq2zxijq92jyfp54kj03p";
sha256 = "sha256-0EvKk0/ro1YAqvc5yCt8vn2LkRoIbXrFTwcQtomoWsM=";
};
unpackPhase = ''

View file

@ -76,6 +76,20 @@ stdenv.mkDerivation rec {
url = "https://github.com/Aegisub/Aegisub/commit/6bd3f4c26b8fc1f76a8b797fcee11e7611d59a39.patch";
sha256 = "sha256-rG8RJokd4V4aSYOQw2utWnrWPVrkqSV3TAvnGXNhLOk=";
})
# Compatibility with ffms2
(fetchpatch {
url = "https://github.com/Aegisub/Aegisub/commit/1aa9215e7fc360de05da9b7ec2cd68f1940af8b2.patch";
sha256 = "sha256-JsuI4hQTcT0TEqHHoSsGbuiTg4hMCH3Cxp061oLk8Go=";
})
./update-ffms2.patch
# Compatibility with X11
(fetchpatch {
url = "https://github.com/Aegisub/Aegisub/commit/7a6da26be6a830f4e1255091952cc0a1326a4520.patch";
sha256 = "sha256-/aTcIjFlZY4N9+IyHL4nwR0hUR4HTJM7ibbdKmNxq0w=";
})
];
nativeBuildInputs = [
@ -113,6 +127,10 @@ stdenv.mkDerivation rec {
"relro"
];
postPatch = ''
sed -i 's/-Wno-c++11-narrowing/-Wno-narrowing/' configure.ac src/Makefile
'';
# compat with icu61+
# https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554
CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ];

View file

@ -0,0 +1,105 @@
commit 89c4e8d34ab77c3322f097b91fd9de22cbea7a37
Author: Thomas Goyne <plorkyeran@aegisub.org>
Date: Wed Nov 21 16:41:05 2018 -0800
Update ffmpeg and ffms2
diff --git a/src/video_provider_ffmpegsource.cpp b/src/video_provider_ffmpegsource.cpp
index 8bd68fbbf..f4ed6a2f2 100644
--- a/src/video_provider_ffmpegsource.cpp
+++ b/src/video_provider_ffmpegsource.cpp
@@ -44,6 +44,23 @@
#include <libaegisub/make_unique.h>
namespace {
+typedef enum AGI_ColorSpaces {
+ AGI_CS_RGB = 0,
+ AGI_CS_BT709 = 1,
+ AGI_CS_UNSPECIFIED = 2,
+ AGI_CS_FCC = 4,
+ AGI_CS_BT470BG = 5,
+ AGI_CS_SMPTE170M = 6,
+ AGI_CS_SMPTE240M = 7,
+ AGI_CS_YCOCG = 8,
+ AGI_CS_BT2020_NCL = 9,
+ AGI_CS_BT2020_CL = 10,
+ AGI_CS_SMPTE2085 = 11,
+ AGI_CS_CHROMATICITY_DERIVED_NCL = 12,
+ AGI_CS_CHROMATICITY_DERIVED_CL = 13,
+ AGI_CS_ICTCP = 14
+} AGI_ColorSpaces;
+
/// @class FFmpegSourceVideoProvider
/// @brief Implements video loading through the FFMS library.
class FFmpegSourceVideoProvider final : public VideoProvider, FFmpegSourceProvider {
@@ -78,7 +95,7 @@ public:
if (matrix == RealColorSpace)
FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), nullptr);
else if (matrix == "TV.601")
- FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
+ FFMS_SetInputFormatV(VideoSource, AGI_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
else
return;
ColorSpace = matrix;
@@ -103,16 +120,16 @@ std::string colormatrix_description(int cs, int cr) {
std::string str = cr == FFMS_CR_JPEG ? "PC" : "TV";
switch (cs) {
- case FFMS_CS_RGB:
+ case AGI_CS_RGB:
return "None";
- case FFMS_CS_BT709:
+ case AGI_CS_BT709:
return str + ".709";
- case FFMS_CS_FCC:
+ case AGI_CS_FCC:
return str + ".FCC";
- case FFMS_CS_BT470BG:
- case FFMS_CS_SMPTE170M:
+ case AGI_CS_BT470BG:
+ case AGI_CS_SMPTE170M:
return str + ".601";
- case FFMS_CS_SMPTE240M:
+ case AGI_CS_SMPTE240M:
return str + ".240M";
default:
throw VideoOpenError("Unknown video color space");
@@ -206,8 +223,10 @@ void FFmpegSourceVideoProvider::LoadVideo(agi::fs::path const& filename, std::st
// set thread count
int Threads = OPT_GET("Provider/Video/FFmpegSource/Decoding Threads")->GetInt();
+#if FFMS_VERSION < ((2 << 24) | (30 << 16) | (0 << 8) | 0)
if (FFMS_GetVersion() < ((2 << 24) | (17 << 16) | (2 << 8) | 1) && FFMS_GetSourceType(Index) == FFMS_SOURCE_LAVF)
Threads = 1;
+#endif
// set seekmode
// TODO: give this its own option?
@@ -235,18 +254,22 @@ void FFmpegSourceVideoProvider::LoadVideo(agi::fs::path const& filename, std::st
else
DAR = double(Width) / Height;
- CS = TempFrame->ColorSpace;
+ int VideoCS = CS = TempFrame->ColorSpace;
CR = TempFrame->ColorRange;
- if (CS == FFMS_CS_UNSPECIFIED)
- CS = Width > 1024 || Height >= 600 ? FFMS_CS_BT709 : FFMS_CS_BT470BG;
+ if (CS == AGI_CS_UNSPECIFIED)
+ CS = Width > 1024 || Height >= 600 ? AGI_CS_BT709 : AGI_CS_BT470BG;
RealColorSpace = ColorSpace = colormatrix_description(CS, CR);
#if FFMS_VERSION >= ((2 << 24) | (17 << 16) | (1 << 8) | 0)
- if (CS != FFMS_CS_RGB && CS != FFMS_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
- if (FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
+ if (CS != AGI_CS_RGB && CS != AGI_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
+ CS = AGI_CS_BT470BG;
+ ColorSpace = colormatrix_description(AGI_CS_BT470BG, CR);
+ }
+
+ if (CS != VideoCS) {
+ if (FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), &ErrInfo))
throw VideoOpenError(std::string("Failed to set input format: ") + ErrInfo.Buffer);
- ColorSpace = colormatrix_description(FFMS_CS_BT470BG, CR);
}
#endif

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "z88dk";
version = "2.0";
version = "2.1";
src = fetchFromGitHub {
owner = "z88dk";
repo = "z88dk";
rev = "v${version}";
sha256 = "14r9bjw6lgz85a59a4ajspvg12swiqxi17zicl8r7p29pi9lsibp";
sha256 = "sha256-NgO8rbM31IX4nrJRU0p1DUafHPagMQepKLLoOLuGlT8=";
fetchSubmodules = true;
};
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
makeFlags = [
"git_rev=${short_rev}"
"version=${version}"
"prefix=$(out)"
"DESTDIR=$(out)"
"git_count=0"
];

View file

@ -0,0 +1,50 @@
{ lib
, mkDerivation
, fetchFromGitHub
, fetchpatch
, cmake
, extra-cmake-modules
, kcoreaddons
, kdeclarative
, kdecoration
, plasma-framework
}:
mkDerivation rec {
pname = "applet-window-buttons";
version = "0.8.1";
src = fetchFromGitHub {
owner = "psifidotos";
repo = "applet-window-buttons";
rev = version;
sha256 = "0r1h4kbdv6pxj15w4n1w50g8zsl0jrc4808dyfygzwf87mghziyz";
};
patches = [
(fetchpatch {
name = "fix-compilation-error-with-plasma-5.21.patch";
url = "https://github.com/psifidotos/applet-window-buttons/commit/dc5ed862fa3cb943f9c0d561c864ff461156a19e.patch";
sha256 = "17bdkkmy7k402viynj2bpw281qzsn0f1w8gf98gq65wkm4sf4j6k";
})
];
nativeBuildInputs = [
cmake
extra-cmake-modules
];
buildInputs = [
kcoreaddons
kdeclarative
kdecoration
plasma-framework
];
meta = with lib; {
description = "Plasma 5 applet in order to show window buttons in your panels";
homepage = "https://github.com/psifidotos/applet-window-buttons";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ dotlambda ];
};
}

View file

@ -13,10 +13,12 @@ assert withBlas -> openblas != null && blas.implementation == "openblas" && lapa
stdenv.mkDerivation rec {
pname = "flint";
version = "2.7.1";
src = fetchurl {
url = "http://www.flintlib.org/flint-${version}.tar.gz";
sha256 = "07j8r96kdzp19cy3a5yvpjxf90mkd6103yr2n42qmpv7mgcjyvhq";
};
buildInputs = [
gmp
mpir
@ -37,9 +39,6 @@ stdenv.mkDerivation rec {
"--with-blas=${openblas}"
];
# issues with ntl -- https://github.com/wbhart/flint2/issues/487
NIX_CXXSTDLIB_COMPILE = "-std=c++11";
doCheck = true;
meta = {
inherit version;

View file

@ -0,0 +1,40 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, kconfig
, kio
, mauikit
}:
mkDerivation rec {
pname = "mauikit-filebrowsing";
version = "1.2.2";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "mauikit-filebrowsing";
rev = "v${version}";
sha256 = "1m56lil7w884wn8qycl7y55abvw2vanfy8c4g786200p6acsh3kl";
};
nativeBuildInputs = [
cmake
extra-cmake-modules
];
buildInputs = [
kconfig
kio
mauikit
];
meta = with lib; {
homepage = "https://invent.kde.org/maui/mauikit-filebrowsing";
description = "MauiKit File Browsing utilities and controls";
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ dotlambda ];
};
}

View file

@ -3,22 +3,23 @@
, fetchFromGitLab
, cmake
, extra-cmake-modules
, kio
, kconfig
, kcoreaddons
, ki18n
, qtbase
, qtquickcontrols2
, syntax-highlighting
}:
mkDerivation rec {
pname = "mauikit";
version = "1.2.1";
version = "1.2.2";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "mauikit";
rev = "v${version}";
sha256 = "1wimbpbn9yqqdcjd59x83z0mw2fycjz09py2rwimfi8ldmvi5lgy";
sha256 = "1jz0a65bbznjg7aaq19rdyp956wn6xc1x4xigfkhj6mwsvnb49av";
};
nativeBuildInputs = [
@ -27,9 +28,10 @@ mkDerivation rec {
];
buildInputs = [
kio
kconfig
kcoreaddons
ki18n
qtquickcontrols2
syntax-highlighting
];
meta = with lib; {

View file

@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1fvmhrqdjs925hzr2i8bszm50h00gwsh17p2kn2pi51zrxck9xjj";
};
configureFlags = [ "--enable-cxx" "--enable-fat" ];
configureFlags = [ "--enable-cxx" ]
++ lib.optionals stdenv.isLinux [ "--enable-fat" ];
meta = {
inherit version;

View file

@ -2,13 +2,13 @@
with lib; stdenv.mkDerivation rec {
pname = "tbb";
version = "2019_U9";
version = "2020_U3";
src = fetchFromGitHub {
owner = "01org";
repo = "tbb";
rev = version;
sha256 = "1a39nflw7b2n51jfp3fdprnkpgzaspzww1dckfvaigflfli9s8rj";
sha256 = "sha256-prO2O5hd+Wz5iA0vfrqmyHFr0Ptzk64so5KpSpvuKmU=";
};
nativeBuildInputs = optional stdenv.isDarwin fixDarwinDylibNames;

View file

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "adafruit-platformdetect";
version = "3.11.0";
version = "3.13.0";
src = fetchPypi {
pname = "Adafruit-PlatformDetect";
inherit version;
sha256 = "sha256-FgE0/OnqUuzpC5jCM4Q1g49F3fg1Mdstr7nys7G1MOs=";
sha256 = "sha256-FlPd3bj2sU52nc2+XohNhBWRa+1Dr/SyaiSusxX6PeE=";
};
nativeBuildInputs = [ setuptools-scm ];

View file

@ -1,4 +1,8 @@
{ stdenv, lib, buildPythonPackage, fetchFromGitHub, python, pythonOlder
{ stdenv
, lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, cython
, eventlet
, futures ? null
@ -21,14 +25,14 @@
buildPythonPackage rec {
pname = "cassandra-driver";
version = "3.24.0";
version = "3.25.0";
# pypi tarball doesn't include tests
src = fetchFromGitHub {
owner = "datastax";
repo = "python-driver";
rev = version;
sha256 = "1rr69hly5q810xpn8rkzxwzlq55wxxp7kwki9vfri3gh674d2wip";
sha256 = "1dn7iiavsrhh6i9hcyw0mk8j95r5ym0gbrvdca998hx2rnz5ark6";
};
nativeBuildInputs = [ cython ];
@ -66,8 +70,10 @@ buildPythonPackage rec {
pytestFlagsArray = [
"tests/unit"
];
disabledTestPaths = [
# requires puresasl
"--ignore=tests/unit/advanced/test_auth.py"
"tests/unit/advanced/test_auth.py"
];
disabledTests = [
# doesn't seem to be intended to be run directly

View file

@ -1,6 +1,15 @@
{ lib, buildPythonPackage, fetchFromGitHub
, pytestCheckHook, pyhamcrest, pytestrunner
, six, isodate, tornado, aenum, radish-bdd, mock
{ lib
, buildPythonPackage
, fetchFromGitHub
, aenum
, importlib-metadata
, isodate
, six
, tornado
, pytestCheckHook
, mock
, pyhamcrest
, radish-bdd
}:
buildPythonPackage rec {
@ -22,13 +31,28 @@ buildPythonPackage rec {
--replace 'PyHamcrest>=1.9.0,<2.0.0' 'PyHamcrest' \
--replace 'radish-bdd==0.8.6' 'radish-bdd' \
--replace 'mock>=3.0.5,<4.0.0' 'mock' \
--replace 'pytest>=4.6.4,<5.0.0' 'pytest'
--replace 'pytest>=4.6.4,<5.0.0' 'pytest' \
--replace 'importlib-metadata<3.0.0' 'importlib-metadata' \
--replace 'pytest-runner==5.2' ' '
'';
nativeBuildInputs = [ pytestrunner ]; # simply to placate requirements
propagatedBuildInputs = [ six isodate tornado aenum ];
# setup-requires requirements
nativeBuildInputs = [
importlib-metadata
];
propagatedBuildInputs = [
aenum
isodate
six
tornado
];
checkInputs = [ pytestCheckHook pyhamcrest radish-bdd mock ];
checkInputs = [
pytestCheckHook
mock
pyhamcrest
radish-bdd
];
# disable custom pytest report generation
preCheck = ''
@ -36,12 +60,14 @@ buildPythonPackage rec {
'';
# many tests expect a running tinkerpop server
disabledTestPaths = [
"tests/driver/test_client.py"
"tests/driver/test_driver_remote_connection.py"
"tests/driver/test_driver_remote_connection_threaded.py"
"tests/process/test_dsl.py"
"tests/structure/io/test_functionalityio.py"
];
pytestFlagsArray = [
"--ignore=tests/driver/test_client.py"
"--ignore=tests/driver/test_driver_remote_connection.py"
"--ignore=tests/driver/test_driver_remote_connection_threaded.py"
"--ignore=tests/process/test_dsl.py"
"--ignore=tests/structure/io/test_functionalityio.py"
# disabledTests doesn't quite allow us to be precise enough for this
"-k 'not (TestFunctionalGraphSONIO and (test_timestamp or test_datetime or test_uuid))'"
];

View file

@ -44,7 +44,9 @@ buildPythonPackage rec {
jupyter_client
notebook
];
# pre-commit tests require a Git repository.
# Tests that use a Jupyter notebook require $HOME to be writable.
HOME = "$TMPDIR";
# Pre-commit tests expect the source directory to be a Git repository.
pytestFlagsArray = [ "--ignore-glob='tests/test_pre_commit_*.py'" ];
pythonImportsCheck = [ "jupytext" "jupytext.cli" ];

View file

@ -1,35 +1,38 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, python
, regex
# Test inputs
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "lark-parser";
version = "0.11.2";
version = "0.11.3";
src = fetchFromGitHub {
owner = "lark-parser";
repo = "lark";
rev = version;
sha256 = "1v1piaxpz4780km2z5i6sr9ygi9wpn09yyh999b3f4y0dcz20pbd";
sha256 = "1ggvlzpdzlrxl46fgi8cfq2rzlwn21shpdkm4pknnhfjlsinv913";
};
# Optional import, but fixes some re known bugs & allows advanced regex features
propagatedBuildInputs = [ regex ];
checkInputs = [ pytestCheckHook ];
disabledTestPaths = [
"tests/test_nearley" # requires Js2Py package (not in nixpkgs)
];
disabledTests = [
"test_override_rule" # has issue with file access paths
];
checkPhase = ''
runHook preCheck
# Official way to run the tests. Runs unittest internally.
# pytest produces issues with some test resource paths (relies on __main__)
${python.interpreter} -m tests
runHook postCheck
'';
meta = with lib; {
description = "A modern parsing library for Python, implementing Earley & LALR(1) and an easy interface";
homepage = "https://github.com/lark-parser/lark";
homepage = "https://lark-parser.readthedocs.io/";
changelog = "https://github.com/lark-parser/lark/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ fridh drewrisinger ];
};

View file

@ -0,0 +1,12 @@
diff --git a/src/build-system.jam b/src/build-system.jam
index 60425c54..c6842217 100644
--- a/src/build-system.jam
+++ b/src/build-system.jam
@@ -644,7 +644,7 @@ local rule should-clean-project ( project )
}
else if [ os.name ] = MACOSX
{
- default-toolset = darwin ;
+ default-toolset = clang-darwin ;
}
}

View file

@ -15,6 +15,11 @@ stdenv.mkDerivation rec {
sha256 = "1r4rwlq87ydmsdqrik4ly5iai796qalvw7603mridg2nwcbbnf54";
};
patches = [
# Upstream defaults to gcc on darwin, but we use clang.
./darwin-default-toolset.patch
];
nativeBuildInputs = [
bison
];

View file

@ -0,0 +1,24 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "evans";
version = "0.9.3";
src = fetchFromGitHub {
owner = "ktr0731";
repo = pname;
rev = "v${version}";
sha256 = "sha256-q8HWDZpUWaitdZcWkvKEWWbIWCj9VmWCxxhAdcYZx8s=";
};
subPackages = [ "." ];
vendorSha256 = "sha256-ntRlrbsQjZmVxEg9361Q+f6Wb/R393+sbOKOEh5VKPk=";
meta = with lib; {
description = "More expressive universal gRPC client";
homepage = "https://evans.syfm.me/";
license = with licenses; [ mit ];
maintainers = with maintainers; [ diogox ];
};
}

View file

@ -13,11 +13,11 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-make";
version = "0.32.17";
version = "0.33.0";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-D/8fjJIyHCRzkomRsYUnGjDMCusjNX8ZYmLjowCYgcM=";
sha256 = "sha256-OnCSWAGcxQsLq5aQmd/15lAQmdsCGPqLeRYWXQG0oG0=";
};
nativeBuildInputs = [ pkg-config ];
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ];
cargoSha256 = "sha256-Upegh3W31sTaXl0iHZ3HiYs9urgXH/XhC0vQBAWvDIc=";
cargoSha256 = "sha256-BsE5+0bL9ctsdZ/PM1d6TfrXuzNMYHejoqA3bgH8140=";
# Some tests fail because they need network access.
# However, Travis ensures a proper build.

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "probe-run";
version = "0.2.1";
version = "0.2.2";
src = fetchFromGitHub {
owner = "knurling-rs";
repo = pname;
rev = "v${version}";
sha256 = "QEUsigoSqVczrsSSDnOhTXm94JTXHgxeNY0tGsOaRyg=";
sha256 = "avaGBIKldr+1Zwq+7NOHt2wldmY/6Lb6bi9uVHZFI5Q=";
};
cargoSha256 = "Fr5XWIUHXyfesouHi0Uryf/ZgB/rDDJ4G1BYGHw0QeQ=";
cargoSha256 = "HmDKfb8F6sGnaX64FR3No2GbBYm4bVopbjs8d35WiZQ=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libusb1 ];

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, cmake
{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, cmake, fetchpatch
, libiconv
, useMimalloc ? false
, doCheck ? true
@ -6,16 +6,32 @@
rustPlatform.buildRustPackage rec {
pname = "rust-analyzer-unwrapped";
version = "2021-04-19";
cargoSha256 = "sha256-CXkI3CQ/v6RBMM2Dpp2u+qnRwba+nqzeaPSJGBiQUoY=";
version = "2021-05-10";
cargoSha256 = "sha256-PUecBFdYIJFZa5IwwNnuXOkuxtyrzWhxy3C+2jv/hvU=";
src = fetchFromGitHub {
owner = "rust-analyzer";
repo = "rust-analyzer";
rev = version;
sha256 = "sha256-W/cUwZEvlUXzqQ/futeNFwDWR/cTL/RLZaW2srIs83Q=";
sha256 = "sha256-oz6FqRMEUUTS4X2XhpWjp2JIgl1A6wQv2OU8auwUoVM=";
};
patches = [
# Revert updates which require rust 1.52.0.
# We currently have rust 1.51.0 in nixpkgs.
# https://github.com/rust-analyzer/rust-analyzer/pull/8718
(fetchpatch {
url = "https://github.com/rust-analyzer/rust-analyzer/pull/8718/commits/607d8a2f61e56fabb7a3bc5132592917fcdca970.patch";
sha256 = "sha256-g1yyq/XSwGxftnqSW1bR5UeMW4gW28f4JciGvwQ/n08=";
revert = true;
})
(fetchpatch {
url = "https://github.com/rust-analyzer/rust-analyzer/pull/8718/commits/6a16ec52aa0d91945577c99cdf421b303b59301e.patch";
sha256 = "sha256-n7Ew/0fG8zPaMFCi8FVLjQZwJSaczI/QoehC6pDLrAk=";
revert = true;
})
];
buildAndTestSubdir = "crates/rust-analyzer";
cargoBuildFlags = lib.optional useMimalloc "--features=mimalloc";

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "cypress";
version = "7.1.0";
version = "7.3.0";
src = fetchzip {
url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
sha256 = "1m52v6hhblrjji9c5885bn5qq0xlaw36krbmqfac7fhgsxmkxd2h";
sha256 = "158bpk4czfv2kkh1al1bb42jb0h3mbx9r72dk6crr2gg0bhabn8m";
};
passthru.updateScript = ./update.sh;

View file

@ -2,12 +2,12 @@
stdenvNoCC.mkDerivation rec {
pname = "firmware-linux-nonfree";
version = "2021-03-15";
version = "2021-05-11";
src = fetchgit {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
rev = "refs/tags/" + lib.replaceStrings ["-"] [""] version;
sha256 = "sha256-BnYqveVFJk/tVYgYuggXgYGcUCZT9iPkCQIi48FOTWc=";
sha256 = "015hajf3mq8dv2hw5wsyvi34zdqiwxp9p5dwdp8nrk4r9z5ysqxw";
};
installFlags = [ "DESTDIR=$(out)" ];
@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "sha256-TzAMGj7IDhzXcFhHAd15aZvAqyN+OKlJTkIhVGoTkIs=";
outputHash = "034bwbl616vzl7lhcbvyz9dzmpzwi12vca3r5mszdxqh3z3s1g6a";
meta = with lib; {
description = "Binary firmware collection packaged by kernel.org";

View file

@ -13,7 +13,10 @@ stdenv.mkDerivation rec {
sha256 = "1i7nhbq1fcbrjwfg64znz8p4l7662f7qz2l6xcvwd5z93dnmgmdr";
};
makeFlags = [ "PREFIX=$(out)" ];
makeFlags = [
"PREFIX=$(out)"
"CXX=${stdenv.cc.targetPrefix}c++"
];
meta = with lib; {
homepage = "https://github.com/hogliux/bomutils";

View file

@ -0,0 +1,37 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
pname = "tnat64";
version = "0.05";
src = fetchFromGitHub {
owner = "andrewshadura";
repo = pname;
rev = "${pname}-${version}";
sha256 = "07lmzidbrd3aahk2jvv93cic9gf36pwmgfd63gmy6hjkxf9a6fw9";
};
postPatch = ''
# Fix usage of deprecated sys_errlist
substituteInPlace tnat64.c --replace 'sys_errlist[errno]' 'strerror(errno)'
'';
configureFlags = [ "--libdir=$(out)/lib" ];
nativeBuildInputs = [ autoreconfHook ];
meta = with lib; {
description = "IPv4 to IPv6 interceptor";
homepage = "https://github.com/andrewshadura/tnat64";
license = licenses.gpl2Plus;
longDescription = ''
TNAT64 is an interceptor which redirects outgoing TCPv4 connections
through NAT64, thus enabling an application running on an IPv6-only host
to communicate with the IPv4 world, even if that application does not
support IPv6 at all.
'';
platforms = platforms.unix;
badPlatforms = platforms.darwin;
maintainers = [ maintainers.rnhmjoj ];
};
}

View file

@ -1,6 +1,6 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub, nixosTests
, pkg-config, openssl
, Security, CoreServices
, libiconv, Security, CoreServices
, dbBackend ? "sqlite", libmysqlclient, postgresql }:
let
@ -19,7 +19,7 @@ in rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = with lib; [ openssl ]
++ optionals stdenv.isDarwin [ Security CoreServices ]
++ optionals stdenv.isDarwin [ libiconv Security CoreServices ]
++ optional (dbBackend == "mysql") libmysqlclient
++ optional (dbBackend == "postgresql") postgresql;

View file

@ -253,6 +253,8 @@ in
eclipse-mat = callPackage ../development/tools/eclipse-mat { };
evans = callPackage ../development/tools/evans { };
frugal = callPackage ../development/tools/frugal { };
glade = callPackage ../development/tools/glade { };
@ -810,6 +812,8 @@ in
tfk8s = callPackage ../tools/misc/tfk8s { };
tnat64 = callPackage ../tools/networking/tnat64 { };
xcd = callPackage ../tools/misc/xcd { };
xtrt = callPackage ../tools/archivers/xtrt { };
@ -27222,6 +27226,8 @@ in
picom = callPackage ../applications/window-managers/picom {};
xd = callPackage ../applications/networking/p2p/xd {};
xdaliclock = callPackage ../tools/misc/xdaliclock {};
xdg-dbus-proxy = callPackage ../development/libraries/xdg-dbus-proxy { };
@ -30127,8 +30133,9 @@ in
kops_1_16
kops_1_17
kops_1_18
kops_1_19
;
kops = kops_1_18;
kops = kops_1_19;
lguf-brightness = callPackage ../misc/lguf-brightness { };

View file

@ -53,6 +53,8 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeApplications // qt5 //
alkimia = callPackage ../development/libraries/alkimia { };
applet-window-buttons = callPackage ../development/libraries/applet-window-buttons { };
appstream-qt = callPackage ../development/libraries/appstream/qt.nix { };
dxflib = callPackage ../development/libraries/dxflib {};
@ -121,6 +123,8 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeApplications // qt5 //
mauikit = callPackage ../development/libraries/mauikit { };
mauikit-filebrowsing = callPackage ../development/libraries/mauikit-filebrowsing { };
mlt = callPackage ../development/libraries/mlt/qt-5.nix { };
openbr = callPackage ../development/libraries/openbr { };