Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2022-11-04 12:02:07 +00:00 committed by GitHub
commit 2248464524
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
68 changed files with 1481 additions and 1097 deletions

View file

@ -1,4 +1,8 @@
{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }:
{ lib
, fetchFromGitHub
, python3
, wrapQtAppsHook
}:
# As of 2.1, puddletag has started pinning versions of all dependencies that it
# was built against which is an issue as the chances of us having the exact same
@ -14,18 +18,11 @@
# ignoring the pinned versions, it's just something we will have to accept
# unless we want to vendor those versions.
let
# NOTE: check if we can drop any of these overrides when bumping the version
overrideVersions = [
"lxml"
"pyparsing"
"pyqt5"
];
in
python3Packages.buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
pname = "puddletag";
version = "2.2.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "puddletag";
@ -34,26 +31,29 @@ python3Packages.buildPythonApplication rec {
hash = "sha256-KaFfpOWI9u2ZC/3kuCLneWOOKSmAaIuHPFHptkKMH/g=";
};
pythonRelaxDeps = true;
pythonRemoveDeps = [
"chromaprint"
"pyqt5-qt5"
];
postPatch = ''
substituteInPlace setup.py \
--replace share/pixmaps share/icons
'';
cp requirements.in requirements.txt
sed -i requirements.txt -e 's/^chromaprint$//'
'' + lib.concatMapStringsSep "\n"
(e: ''
sed -i requirements.txt -e 's/^${e}.*/${e}/'
'')
overrideVersions;
nativeBuildInputs = [
python3.pkgs.pythonRelaxDepsHook
wrapQtAppsHook
];
nativeBuildInputs = [ wrapQtAppsHook ];
propagatedBuildInputs = with python3Packages; [
pyacoustid
propagatedBuildInputs = with python3.pkgs; [
configobj
levenshtein
lxml
mutagen
pyacoustid
pyparsing
pyqt5
rapidfuzz

View file

@ -2465,8 +2465,8 @@ let
mktplcRef = {
name = "code-spell-checker";
publisher = "streetsidesoftware";
version = "2.10.1";
sha256 = "sha256-FeYkSML6QYtuIHIbAovOqlPwkKfNkHr7IdMCWwkynQ0=";
version = "2.11.0";
sha256 = "sha256-ZYbkCe/FdSxmipV9TTq0AF/Ft01+LTUeo3sVyKMP3iQ=";
};
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog";

View file

@ -28,13 +28,13 @@
stdenv.mkDerivation rec {
pname = "cemu";
version = "2.0-10";
version = "2.0-13";
src = fetchFromGitHub {
owner = "cemu-project";
repo = "Cemu";
rev = "v${version}";
hash = "sha256-GJA/lJJqShuHeYirBW1kyVsU44kMpmAn916PSGOnKkY=";
hash = "sha256-0yomEJoXMKZV2PAjINegSvtDB6gbYxQ6XcXA60/ZkEM=";
};
patches = [

View file

@ -3,11 +3,11 @@
, lib
, fetchurl
# native
, autoreconfHook
, cmake
, pkg-config
# not native
, gdal
, wxGTK31
, wxGTK32
, proj
, dxflib
, curl
@ -31,24 +31,20 @@
mkDerivation rec {
pname = "saga";
version = "7.9.1";
version = "8.4.0";
src = fetchurl {
url = "mirror://sourceforge/saga-gis/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz";
sha256 = "sha256-Jq1LhBSeJuq9SlNl/ko5I8+jnjZnLMfGYNNUnzVWo7w=";
sha256 = "sha256-v6DPwV20fcsznrEaFJk0/ewU4z3cTjzYYuLkyMwSLV0=";
};
sourceRoot = "saga-${version}/saga-gis";
nativeBuildInputs = [
# Upstream's gnerated ./configure is not reliable
autoreconfHook
cmake
pkg-config
];
configureFlags = [
"--with-system-svm"
# hdf is no detected otherwise
"HDF5_LIBS=-l${hdf5}/lib"
"HDF5_CFLAGS=-I${hdf5.dev}/include"
];
buildInputs = [
curl
dxflib
@ -56,7 +52,7 @@ mkDerivation rec {
libsvm
hdf5
gdal
wxGTK31
wxGTK32
proj
libharu
opencv
@ -77,9 +73,9 @@ mkDerivation rec {
sqlite
];
enableParallelBuilding = true;
CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing";
cmakeFlags = [
"-DOpenMP_SUPPORT=${if stdenv.isDarwin then "OFF" else "ON"}"
];
meta = with lib; {
description = "System for Automated Geoscientific Analyses";

View file

@ -3,10 +3,10 @@
rec {
firefox = buildMozillaMach rec {
pname = "firefox";
version = "106.0.3";
version = "106.0.4";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "226bde9082330abe134d1726cec59b473d4d6839ea55ca20faddb901f032d89eb9d2bd5d887ccd4ba515c6b1a44817420cfee2e9f4f8a79ed46a38287083d28d";
sha512 = "598171d3de33fe64b662681f3455d21f788d521ad47c96309a789c20662c3a45e436d6ebb99245e1366ae3cb6c17b672179ec4b7230a86e0fbe6625b40922c5c";
};
# This patch could be applied anywhere (just rebuild, no effect)

View file

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "lagrange";
version = "1.13.7";
version = "1.13.8";
src = fetchFromGitHub {
owner = "skyjake";
repo = "lagrange";
rev = "v${version}";
sha256 = "sha256-WUNDkLKT/AgS5WkBKbVSM5/1zSjQuE8Aq68JLSOHFEs=";
sha256 = "sha256-SdncFkMCAY28njw361R70h6gcK0YHSU7AUwf9wzxCRo=";
};
nativeBuildInputs = [ cmake pkg-config zip ];

View file

@ -12,6 +12,8 @@
, gpgSupport ? false
, gpgmeSupport ? true
, imapSupport ? true
, pop3Support ? true
, smtpSupport ? true
, withSidebar ? true
, gssSupport ? true
, writeScript
@ -44,9 +46,9 @@ stdenv.mkDerivation rec {
(lib.enableFeature headerCache "hcache")
(lib.enableFeature gpgmeSupport "gpgme")
(lib.enableFeature imapSupport "imap")
(lib.enableFeature smtpSupport "smtp")
(lib.enableFeature pop3Support "pop")
(lib.enableFeature withSidebar "sidebar")
"--enable-smtp"
"--enable-pop"
"--with-mailpath="
# Look in $PATH at runtime, instead of hardcoding /usr/bin/sendmail

View file

@ -112,11 +112,11 @@
md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt";
}
{
name = "curl-7.83.1.tar.xz";
url = "https://dev-www.libreoffice.org/src/curl-7.83.1.tar.xz";
sha256 = "2cb9c2356e7263a1272fd1435ef7cdebf2cd21400ec287b068396deb705c22c4";
name = "curl-7.86.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/curl-7.86.0.tar.xz";
sha256 = "2d61116e5f485581f6d59865377df4463f2e788677ac43222b496d4e49fb627b";
md5 = "";
md5name = "2cb9c2356e7263a1272fd1435ef7cdebf2cd21400ec287b068396deb705c22c4-curl-7.83.1.tar.xz";
md5name = "2d61116e5f485581f6d59865377df4463f2e788677ac43222b496d4e49fb627b-curl-7.86.0.tar.xz";
}
{
name = "libe-book-0.1.3.tar.xz";
@ -126,11 +126,11 @@
md5name = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9-libe-book-0.1.3.tar.xz";
}
{
name = "libepoxy-1.5.9.tar.xz";
url = "https://dev-www.libreoffice.org/src/libepoxy-1.5.9.tar.xz";
sha256 = "d168a19a6edfdd9977fef1308ccf516079856a4275cf876de688fb7927e365e4";
name = "libepoxy-1.5.10.tar.gz";
url = "https://dev-www.libreoffice.org/src/libepoxy-1.5.10.tar.gz";
sha256 = "a7ced37f4102b745ac86d6a70a9da399cc139ff168ba6b8002b4d8d43c900c15";
md5 = "";
md5name = "d168a19a6edfdd9977fef1308ccf516079856a4275cf876de688fb7927e365e4-libepoxy-1.5.9.tar.xz";
md5name = "a7ced37f4102b745ac86d6a70a9da399cc139ff168ba6b8002b4d8d43c900c15-libepoxy-1.5.10.tar.gz";
}
{
name = "epm-3.7.tar.gz";
@ -154,11 +154,11 @@
md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz";
}
{
name = "expat-2.4.6.tar.xz";
url = "https://dev-www.libreoffice.org/src/expat-2.4.6.tar.xz";
sha256 = "de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b";
name = "expat-2.4.9.tar.xz";
url = "https://dev-www.libreoffice.org/src/expat-2.4.9.tar.xz";
sha256 = "6e8c0728fe5c7cd3f93a6acce43046c5e4736c7b4b68e032e9350daa0efc0354";
md5 = "";
md5name = "de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b-expat-2.4.6.tar.xz";
md5name = "6e8c0728fe5c7cd3f93a6acce43046c5e4736c7b4b68e032e9350daa0efc0354-expat-2.4.9.tar.xz";
}
{
name = "Firebird-3.0.7.33374-0.tar.bz2";
@ -560,11 +560,11 @@
md5name = "26041d35a20a245ed5a2fb9ee075f10825664d274220cb5190340fa87a4d0931-xmlsec1-1.2.33.tar.gz";
}
{
name = "libxml2-2.9.14.tar.xz";
url = "https://dev-www.libreoffice.org/src/libxml2-2.9.14.tar.xz";
sha256 = "60d74a257d1ccec0475e749cba2f21559e48139efba6ff28224357c7c798dfee";
name = "libxml2-2.10.3.tar.xz";
url = "https://dev-www.libreoffice.org/src/libxml2-2.10.3.tar.xz";
sha256 = "5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c";
md5 = "";
md5name = "60d74a257d1ccec0475e749cba2f21559e48139efba6ff28224357c7c798dfee-libxml2-2.9.14.tar.xz";
md5name = "5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c-libxml2-2.10.3.tar.xz";
}
{
name = "libxslt-1.1.35.tar.xz";
@ -637,11 +637,11 @@
md5name = "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678-neon-0.31.2.tar.gz";
}
{
name = "nss-3.79-with-nspr-4.34.tar.gz";
url = "https://dev-www.libreoffice.org/src/nss-3.79-with-nspr-4.34.tar.gz";
sha256 = "5369ed274a19f480ec94e1faef04da63e3cbac1a82e15bb1751e58b2f274b835";
name = "nss-3.83-with-nspr-4.34.1.tar.gz";
url = "https://dev-www.libreoffice.org/src/nss-3.83-with-nspr-4.34.1.tar.gz";
sha256 = "b1e1198fa7ee4e0fe4fa6937245c94820fd3c3c6897779493858af1bf6310b30";
md5 = "";
md5name = "5369ed274a19f480ec94e1faef04da63e3cbac1a82e15bb1751e58b2f274b835-nss-3.79-with-nspr-4.34.tar.gz";
md5name = "b1e1198fa7ee4e0fe4fa6937245c94820fd3c3c6897779493858af1bf6310b30-nss-3.83-with-nspr-4.34.1.tar.gz";
}
{
name = "libodfgen-0.1.8.tar.xz";
@ -672,11 +672,11 @@
md5name = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34-openldap-2.4.59.tgz";
}
{
name = "openssl-1.1.1l.tar.gz";
url = "https://dev-www.libreoffice.org/src/openssl-1.1.1l.tar.gz";
sha256 = "0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1";
name = "openssl-1.1.1q.tar.gz";
url = "https://dev-www.libreoffice.org/src/openssl-1.1.1q.tar.gz";
sha256 = "d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca";
md5 = "";
md5name = "0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1-openssl-1.1.1l.tar.gz";
md5name = "d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca-openssl-1.1.1q.tar.gz";
}
{
name = "liborcus-0.17.2.tar.bz2";
@ -707,39 +707,39 @@
md5name = "6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc-pixman-0.40.0.tar.gz";
}
{
name = "libpng-1.6.37.tar.xz";
url = "https://dev-www.libreoffice.org/src/libpng-1.6.37.tar.xz";
sha256 = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca";
name = "libpng-1.6.38.tar.xz";
url = "https://dev-www.libreoffice.org/src/libpng-1.6.38.tar.xz";
sha256 = "b3683e8b8111ebf6f1ac004ebb6b0c975cd310ec469d98364388e9cedbfa68be";
md5 = "";
md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz";
md5name = "b3683e8b8111ebf6f1ac004ebb6b0c975cd310ec469d98364388e9cedbfa68be-libpng-1.6.38.tar.xz";
}
{
name = "poppler-21.11.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/poppler-21.11.0.tar.xz";
sha256 = "31b76b5cac0a48612fdd154c02d9eca01fd38fb8eaa77c1196840ecdeb53a584";
name = "poppler-22.09.0.tar.xz";
url = "https://dev-www.libreoffice.org/src/poppler-22.09.0.tar.xz";
sha256 = "d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb30d5852a41e2e";
md5 = "";
md5name = "31b76b5cac0a48612fdd154c02d9eca01fd38fb8eaa77c1196840ecdeb53a584-poppler-21.11.0.tar.xz";
md5name = "d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb30d5852a41e2e-poppler-22.09.0.tar.xz";
}
{
name = "poppler-data-0.4.10.tar.gz";
url = "https://dev-www.libreoffice.org/src/poppler-data-0.4.10.tar.gz";
sha256 = "6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30";
name = "poppler-data-0.4.11.tar.gz";
url = "https://dev-www.libreoffice.org/src/poppler-data-0.4.11.tar.gz";
sha256 = "2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c";
md5 = "";
md5name = "6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30-poppler-data-0.4.10.tar.gz";
md5name = "2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c-poppler-data-0.4.11.tar.gz";
}
{
name = "postgresql-13.5.tar.bz2";
url = "https://dev-www.libreoffice.org/src/postgresql-13.5.tar.bz2";
sha256 = "9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3";
name = "postgresql-13.8.tar.bz2";
url = "https://dev-www.libreoffice.org/src/postgresql-13.8.tar.bz2";
sha256 = "73876fdd3a517087340458dca4ce15b8d2a4dbceb334c0441424551ae6c4cded";
md5 = "";
md5name = "9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3-postgresql-13.5.tar.bz2";
md5name = "73876fdd3a517087340458dca4ce15b8d2a4dbceb334c0441424551ae6c4cded-postgresql-13.8.tar.bz2";
}
{
name = "Python-3.8.10.tar.xz";
url = "https://dev-www.libreoffice.org/src/Python-3.8.10.tar.xz";
sha256 = "6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9";
name = "Python-3.8.15.tar.xz";
url = "https://dev-www.libreoffice.org/src/Python-3.8.15.tar.xz";
sha256 = "5114fc7918a2a5e20eb5aac696b30c36f412c6ef24b13f5c9eb9e056982d9550";
md5 = "";
md5name = "6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9-Python-3.8.10.tar.xz";
md5name = "5114fc7918a2a5e20eb5aac696b30c36f412c6ef24b13f5c9eb9e056982d9550-Python-3.8.15.tar.xz";
}
{
name = "libqxp-0.0.2.tar.xz";
@ -861,11 +861,11 @@
md5name = "a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip";
}
{
name = "zlib-1.2.12.tar.xz";
url = "https://dev-www.libreoffice.org/src/zlib-1.2.12.tar.xz";
sha256 = "7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18";
name = "zlib-1.2.13.tar.xz";
url = "https://dev-www.libreoffice.org/src/zlib-1.2.13.tar.xz";
sha256 = "d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98";
md5 = "";
md5name = "7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18-zlib-1.2.12.tar.xz";
md5name = "d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98-zlib-1.2.13.tar.xz";
}
{
name = "libzmf-0.0.2.tar.xz";

View file

@ -8,7 +8,7 @@ rec {
major = "7";
minor = "3";
patch = "6";
patch = "7";
tweak = "2";
subdir = "${major}.${minor}.${patch}";
@ -17,13 +17,13 @@ rec {
src = fetchurl {
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
hash = "sha256-MwPWr2/7vFg0UFGgCQwTNvi5PEnHhhxlNLzuogWu1aM=";
hash = "sha256-UphmAklfbZdWGlTgmBGsXv53vYPY+oyRpFKfBhBX9Ls=";
};
# FIXME rename
translations = fetchSrc {
name = "translations";
sha256 = "sha256-vjthXfBP6vRY3lMBlithJM7b5SX3uvBwEpi30IeW/Dg=";
sha256 = "sha256-WRgPzLGywfQI6uFRBNhPZ2G1nhhiWa8WbaCYp2XRALk=";
};
# the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
@ -31,6 +31,6 @@ rec {
help = fetchSrc {
name = "help";
sha256 = "sha256-b3VvaNEfnytWqJekAWOKokNoCnefXdQgYB7Hpptra0s=";
sha256 = "sha256-yBnnR0mTexkyWnJnSf2zC6w+DsdBTHU8frOTmPfEedA=";
};
}

View file

@ -4,6 +4,7 @@
, makeWrapper
, readline
, gmp
, pari
, zlib
# one of
# - "minimal" (~400M):
@ -23,27 +24,31 @@ let
# packages absolutely required for gap to start
# `*` represents the version where applicable
requiredPackages = [
"GAPDoc-*"
"primgrp-*"
"SmallGrp-*"
"gapdoc"
"primgrp"
"smallgrp"
"transgrp"
];
# packages autoloaded by default if available
# packages autoloaded by default if available, and their dependencies
autoloadedPackages = [
"atlasrep"
"autpgrp-*"
"alnuth-*"
"crisp-*"
"ctbllib-*"
"FactInt-*"
"autpgrp"
"alnuth"
"crisp"
"ctbllib"
"factint"
"fga"
"irredsol-*"
"laguna-*"
"polenta-*"
"polycyclic-*"
"resclasses-*"
"sophus-*"
"tomlib-*"
"irredsol"
"laguna"
"polenta"
"polycyclic"
"resclasses"
"sophus"
"tomlib"
"autodoc" # dependency of atlasrep
"io" # used by atlasrep to fetch data from online sources
"radiroot" # dependency of polenta
"utils" # dependency of atlasrep
];
keepAll = keepAllPackages || (packageSet == "full");
packagesToKeep = requiredPackages ++ lib.optionals (packageSet == "standard") autoloadedPackages;
@ -61,11 +66,11 @@ in
stdenv.mkDerivation rec {
pname = "gap";
# https://www.gap-system.org/Releases/
version = "4.11.1";
version = "4.12.1";
src = fetchurl {
url = "https://github.com/gap-system/gap/releases/download/v${version}/gap-${version}.tar.gz";
sha256 = "sha256-ZjXF2n2CdV+DOUhrnKwzdm9YcS8pfoI0+6QIGJAuowQ=";
sha256 = "sha256-+evvEe4xshDONuPHCWB0K04lMoK71ScK3JMkJzySsBY=";
};
# remove all non-essential packages (which take up a lot of space)
@ -83,9 +88,14 @@ stdenv.mkDerivation rec {
makeWrapper
];
# "teststandard" is a superset of testinstall. It takes ~1h instead of ~1min.
# tests are run twice, once with all packages loaded and once without
# checkTarget = "teststandard";
propagatedBuildInputs = [
pari # used at runtime by the alnuth package
];
# "teststandard" is a superset of the tests run by "check". it takes ~20min
# instead of ~1min. tests are run twice, once with all packages loaded and
# once without.
# installCheckTarget = "teststandard";
doInstallCheck = true;
installCheckTarget = "check";
@ -104,34 +114,28 @@ stdenv.mkDerivation rec {
# like the defaults the Makefile, but use gap from PATH instead of the
# one from builddir
installCheckFlagsArray+=(
"TESTGAP=gap --quitonbreak -b -m 100m -o 1g -q -x 80 -r -A"
"TESTGAPauto=gap --quitonbreak -b -m 100m -o 1g -q -x 80 -r"
"TESTGAPcore=gap --quitonbreak -b -q -r"
"TESTGAPauto=gap --quitonbreak -b -q -r -m 100m -o 1g -x 80"
"TESTGAP=gap --quitonbreak -b -q -r -m 100m -o 1g -x 80 -A"
)
'';
postBuild = ''
pushd pkg
bash ../bin/BuildPackages.sh
# failures are ignored unless --strict is set
bash ../bin/BuildPackages.sh ${lib.optionalString (!keepAll) "--strict"}
popd
'';
installTargets = [
"install-libgap"
"install-headers"
];
# full `make install` is not yet implemented, just for libgap and headers
postInstall = ''
# Install config.h, which is not currently handled by `make install-headers`
cp gen/config.h "$out/include/gap"
# make install creates an empty pkg dir. since we run "make check" on
# installCheckPhase to make sure the installed GAP finds its libraries, we
# also install the tst dir. this is probably excessively cautious, see
# https://github.com/NixOS/nixpkgs/pull/192548#discussion_r992824942
rm -r "$out/share/gap/pkg"
cp -ar pkg tst "$out/share/gap"
mkdir -p "$out/bin" "$out/share/gap/"
echo "Copying files to target directory"
cp -ar . "$out/share/gap/build-dir"
makeWrapper "$out/share/gap/build-dir/bin/gap.sh" "$out/bin/gap" \
--set GAP_DIR $out/share/gap/build-dir
makeWrapper "$out/lib/gap/gap" "$out/bin/gap" --add-flags "-l $out/share/gap"
'';
preFixup = ''
@ -141,14 +145,11 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Computational discrete algebra system";
maintainers = with maintainers;
[
raskin
chrisjefferson
timokau
];
# We are also grateful to ChrisJefferson for previous work on the package,
# and to ChrisJefferson and fingolfin for help with GAP-related questions
# from the upstream point of view.
maintainers = teams.sage.members;
platforms = platforms.all;
broken = stdenv.isDarwin;
# keeping all packages increases the package size considerably, which is
# why a local build is preferable in that situation. The timeframe is
# reasonable and that way the binary cache doesn't get overloaded.

View file

@ -35,7 +35,7 @@ writeTextFile rec {
export GRAPHS_DATA_DIR='${graphs}/share/graphs'
export ELLCURVE_DATA_DIR='${elliptic_curves}/share/ellcurves'
export POLYTOPE_DATA_DIR='${polytopes_db}/share/reflexive_polytopes'
export GAP_ROOT_DIR='${gap}/share/gap/build-dir'
export GAP_ROOT_DIR='${gap}/share/gap'
export ECLDIR='${maxima.lisp-compiler}/lib/${maxima.lisp-compiler.pname}-${maxima.lisp-compiler.version}/'
export COMBINATORIAL_DESIGN_DATA_DIR="${combinatorial_designs}/share/combinatorial_designs"
export CREMONA_MINI_DATA_DIR="${elliptic_curves}/share/cremona"

View file

@ -130,6 +130,14 @@ stdenv.mkDerivation rec {
rev = "2816dbacb342398a23bb3099e20c92c8020ab0fa";
sha256 = "sha256-tCOsMxXwPkRg3FJGVvTqDzlWdra78UfDY6nci0Nr9GI=";
})
# https://trac.sagemath.org/ticket/34391
(fetchSageDiff {
name = "gap-4.12-upgrade.patch";
base = "9.8.beta2";
rev = "eb8cd42feb58963adba67599bf6e311e03424328";
sha256 = "sha256-0dKewOZe2n3PqSdxCJt18FkqwTdrD0VA5MXAMiTW8Tw=";
})
];
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;

View file

@ -13,14 +13,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "mozo";
version = "1.26.1";
version = "1.26.2";
format = "other";
doCheck = false;
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "DyRCmjsDe9BojsTDkdnYeB5Csj7zRfXlCvHnLF7y+jk=";
sha256 = "RyxILg7y+xYp5h4X2qoaSH9kOSsCmEncmkCCr7OLye4=";
};
nativeBuildInputs = [

View file

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "clojure";
version = "1.11.1.1182";
version = "1.11.1.1189";
src = fetchurl {
# https://clojure.org/releases/tools
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
sha256 = "sha256-u6qTQwtoN47UedSsxsyV0ej3C6Ta5ncbP3lZzTmvPr8=";
sha256 = "sha256-wg5iN5/UT6jb68vF98mgSl21fLG9BdEcXH0EEmvnEOs=";
};
nativeBuildInputs = [

View file

@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, fetchurl
, qmake
}:
@ -19,7 +20,7 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
install -d -m 0755 $out/lib
cp -pr *.so* $out/lib
cp -pr *${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib
install -d -m 0755 $out/include/dxflib
cp -pr src/*.h $out/include/dxflib
# Generate pkg-config file
@ -39,8 +40,8 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://qcad.org/en/90-dxflib";
maintainers = with lib.maintainers; [raskin];
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ raskin ];
platforms = lib.platforms.unix;
description = "DXF file format library";
};
}

View file

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "hsqldb";
version = "2.7.0";
version = "2.7.1";
underscoreMajMin = lib.strings.replaceChars ["."] ["_"] (lib.versions.majorMinor version);
src = fetchurl {
url = "mirror://sourceforge/project/hsqldb/hsqldb/hsqldb_${underscoreMajMin}/hsqldb-${version}.zip";
sha256 = "sha256-nLBCigQMPF6QbjrUuSDjP2ir38TmzC5Pa8Rjpk1BkcQ=";
sha256 = "sha256-d0FruJXNnwme1gPHWcIXpD2LO0fL8CzZOn8H14Quo50=";
};
nativeBuildInputs = [ unzip makeWrapper ];

View file

@ -10,13 +10,13 @@ let
in
stdenv.mkDerivation rec {
pname = "lief";
version = "0.12.1";
version = "0.12.3";
src = fetchFromGitHub {
owner = "lief-project";
repo = "LIEF";
rev = version;
sha256 = "sha256-IQqPwTNFHLOr8iwg8IhXpuiyg2rIdFuVDzwT39eA6/c=";
sha256 = "sha256-wZgv4AFc7DrMCyxMLKQxO1mUTDAU4klK8aZAySqGJoY=";
};
outputs = [ "out" "py" ];

View file

@ -7,13 +7,13 @@ let
in
stdenv.mkDerivation rec {
pname = "mimalloc";
version = "2.0.6";
version = "2.0.7";
src = fetchFromGitHub {
owner = "microsoft";
repo = pname;
rev = "v${version}";
sha256 = "sha256-u2ITXABBN/dwU+mCIbL3tN1f4c17aBuSdNTV+Adtohc=";
sha256 = "sha256-h3+awCdlZaGCkavBeQfJsKgOZX4MHB3quPIfTlj6pDw=";
};
doCheck = true;

View file

@ -1,30 +0,0 @@
{ lib, stdenv, fetchurl, cmake, openssl, pkg-config, qtbase }:
stdenv.mkDerivation rec {
pname = "qca-qt5";
version = "2.3.2";
src = fetchurl {
url = "http://download.kde.org/stable/qca/${version}/qca-${version}.tar.xz";
sha256 = "sha256-RpdgAjfEvDqXnofSzIBiTyewYoDmNfXZDsfdTSqfYG0=";
};
buildInputs = [ openssl qtbase ];
nativeBuildInputs = [ cmake pkg-config ];
dontWrapQtApps = true;
# tells CMake to use this CA bundle file if it is accessible
preConfigure = "export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt";
# tricks CMake into using this CA bundle file if it is not accessible (in a sandbox)
cmakeFlags = [ "-Dqca_CERTSTORE=/etc/ssl/certs/ca-certificates.crt" ];
meta = with lib; {
description = "Qt 5 Cryptographic Architecture";
homepage = "http://delta.affinix.com/qca";
maintainers = with maintainers; [ ttuegel ];
license = licenses.lgpl21Plus;
platforms = with platforms; unix;
};
}

View file

@ -0,0 +1,42 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, hip
, python3
}:
stdenv.mkDerivation rec {
pname = "rocmlir";
rocmVersion = "5.3.1";
# For some reason they didn't add a tag for 5.3.1, should be compatible, change to rocmVersion later
version = "5.3.0";
src = fetchFromGitHub {
owner = "ROCmSoftwarePlatform";
repo = "rocMLIR";
rev = "rocm-${version}"; # change to rocmVersion later
hash = "sha256-s/5gAH5vh2tgATZemPP66juQFDg8BR2sipzX2Q6pOOQ=";
};
nativeBuildInputs = [
cmake
hip
];
buildInputs = [
python3
];
cmakeFlags = [
"-DBUILD_FAT_LIBMLIRMIOPEN=ON"
];
meta = with lib; {
description = "MLIR-based convolution and GEMM kernel generator";
homepage = "https://github.com/ROCmSoftwarePlatform/rocMLIR";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ Madouura ];
broken = rocmVersion != hip.version;
};
}

View file

@ -30,7 +30,14 @@ stdenv.mkDerivation rec {
})
];
cmakeFlags = lib.optionals (!enableModTool) [ "-DENABLE_MODTOOL=OFF" ];
cmakeFlags = lib.optionals (!enableModTool) [
"-DENABLE_MODTOOL=OFF"
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
# offset 14335 in1: -1.03372 in2: -1.03371 tolerance was: 1e-05
# volk_32f_log2_32f: fail on arch neon
"-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;qa_volk_32f_log2_32f"
];
postInstall = lib.optionalString (!stdenv.isDarwin) ''
${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so)
'';

View file

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "brev-cli";
version = "0.6.148";
version = "0.6.153";
src = fetchFromGitHub {
owner = "brevdev";
repo = pname;
rev = "v${version}";
sha256 = "sha256-WMy65tnNYN1RzAEAyn2a+H3c+2ygFjqv1eGbBWIj3v0=";
sha256 = "sha256-v9jkQoamLiH8LsBmqNwUrnAvXamMHxhJ94SXFgdt9Cc=";
};
vendorSha256 = "sha256-cNwfK1LpguRfM/ORebU6v+JLIxDJdT5y+zM3KmEamEw=";

View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "deepdiff";
version = "6.1.0";
version = "6.2.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "seperman";
repo = "deepdiff";
rev = "refs/tags/${version}";
hash = "sha256-ngtQNyVQaywMyYitj37m0RJGBiMpjB4b8Rn+feMOjVU=";
hash = "sha256-AKah3A9srKm/cFWM7IiZ7JxQ8s0KTuh8VLKOymsDgnA=";
};
postPatch = ''

View file

@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "eve";
version = "2.0.2";
version = "2.0.3";
format = "setuptools";
src = fetchPypi {
inherit version;
pname = "Eve";
sha256 = "80cad5702d07189c5f43f432d307c473331144477a6a360d22a27dc018366c13";
sha256 = "sha256-UiOhnJyEy5bPIIRHAhuWo8AqHOCp0OE5d0btujfeq4o=";
};
disabled = pythonOlder "3.7";

View file

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "fastavro";
version = "1.6.1";
version = "1.7.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-2BtJQiDPMMIxbO0FdOQT/jzsaiPMTdmf8S21ezmQRLQ=";
sha256 = "sha256-vzaaX3wj1UkFGCohxYlPw6NA0b+oV/2JtpYXC4zncjk=";
};
preBuild = ''

View file

@ -0,0 +1,56 @@
{ lib
, python-dateutil
, buildPythonPackage
, fetchFromGitHub
, freezegun
, tzdata
, pyparsing
, pydantic
, pytest-asyncio
, pytest-benchmark
, pytest-golden
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "ical";
version = "4.1.0";
format = "setuptools";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "allenporter";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-pZtjGWmEVcHSCgiVTKoEaRvec02cz3x93W+UXx3J8gE=";
};
propagatedBuildInputs = [
python-dateutil
tzdata
pydantic
pyparsing
];
checkInputs = [
freezegun
pytest-asyncio
pytest-benchmark
pytest-golden
pytestCheckHook
];
pythonImportsCheck = [
"ical"
];
meta = with lib; {
description = "Library for handling iCalendar";
homepage = "https://github.com/allenporter/ical";
changelog = "https://github.com/allenporter/ical/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ dotlambda ];
};
}

View file

@ -2,20 +2,14 @@
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, asttokens
, typing-extensions
, pytestCheckHook
, yapf
, docutils
, pygments
, dpcontracts
, tabulate
, py-cpuinfo
, typeguard
, astor
, numpy
, asttokens
, asyncstdlib
, deal
, dpcontracts
, numpy
, pytestCheckHook
, typing-extensions
}:
buildPythonPackage rec {
@ -38,40 +32,39 @@ buildPythonPackage rec {
export ICONTRACT_SLOW=1
'';
propagatedBuildInputs = [
asttokens
typing-extensions
];
checkInputs = [
pytestCheckHook
yapf
docutils
pygments
dpcontracts
tabulate
py-cpuinfo
typeguard
astor
numpy
asyncstdlib
deal
dpcontracts
numpy
pytestCheckHook
];
disabledTestPaths = [
# mypy decorator checks don't pass. For some reaseon mypy
# mypy decorator checks don't pass. For some reason mypy
# doesn't check the python file provided in the test.
"tests/test_mypy_decorators.py"
];
# Upstream adds some plain text files direct to the package's root directory
# https://github.com/Parquery/icontract/blob/master/setup.py#L63
postInstall = ''
rm -f $out/{LICENSE.txt,README.rst,requirements.txt}
'';
pythonImportsCheck = [ "icontract" ];
meta = with lib; {
description = "Provide design-by-contract with informative violation messages";
homepage = "https://github.com/Parquery/icontract";
changelog = "https://github.com/Parquery/icontract/blob/master/CHANGELOG.rst";
changelog = "https://github.com/Parquery/icontract/blob/v${version}/CHANGELOG.rst";
license = licenses.mit;
maintainers = with maintainers; [ gador ];
maintainers = with maintainers; [ gador thiagokokada ];
};
}

View file

@ -0,0 +1,27 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
}:
buildPythonPackage rec {
pname = "lcov_cobertura";
version = "2.0.2";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-xs40e/PuZ/jV0CDNZiYmo1lM8r5yfMY0qg0R+j9/E3Q=";
};
doCheck = true;
pythonImportsCheck = [
"lcov_cobertura"
];
meta = {
description = "Converts code coverage from lcov format to Cobertura's XML format";
homepage = "https://eriwen.github.io/lcov-to-cobertura-xml/";
license = lib.licenses.asl20;
};
}

View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "mediafile";
version = "0.10.0";
version = "0.10.1";
format = "flit";
disabled = pythonOlder "3.6";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "beetbox";
repo = pname;
rev = "v${version}";
hash = "sha256-Sdb5Hvm4Y344msZGie4PJ88ZmFtWfc0chABtmwnEN/Y=";
hash = "sha256-2h17FA0GTY4R+WhZiQtPFYf6gH7XLbI3aOB/nUXFtJI=";
};
nativeBuildInputs = [

View file

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "mutagen";
version = "1.45.1";
version = "1.46.0";
format = "pyproject";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "6397602efb3c2d7baebd2166ed85731ae1c1d475abca22090b7141ff5034b3e1";
hash = "sha256-bl+LqEg2uZ/mC+X7J/hL5K2Rm7trScqmroHnBYS1Xlg=";
};
outputs = [ "out" "doc" ];
@ -44,11 +44,13 @@ buildPythonPackage rec {
disabledTests = [
# Hypothesis produces unreliable results: Falsified on the first call but did not on a subsequent one
"test_test_fileobj_save"
"test_test_fileobj_load"
"test_test_fileobj_delete"
"test_mock_fileobj"
];
disabledTestPaths = [
# we are not interested in code quality measurements
"tests/quality/test_flake8.py"
pythonImportsCheck = [
"mutagen"
];
meta = with lib; {
@ -66,5 +68,6 @@ buildPythonPackage rec {
homepage = "https://mutagen.readthedocs.io";
changelog = "https://mutagen.readthedocs.io/en/latest/changelog.html#release-${lib.replaceStrings [ "." ] [ "-" ] version}";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ];
};
}

View file

@ -0,0 +1,51 @@
{ lib
, buildPythonPackage
, coreutils
, fetchFromGitHub
, icontract
, pytestCheckHook
, pythonOlder
, typing-extensions
}:
buildPythonPackage rec {
pname = "pylddwrap";
version = "1.2.2";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "Parquery";
repo = pname;
rev = "v${version}";
hash = "sha256-Gm82VRu8GP52BohQzpMUJfh6q2tiUA2GJWOcG7ymGgg=";
};
postPatch = ''
substituteInPlace lddwrap/__init__.py \
--replace '/usr/bin/env' '${coreutils}/bin/env'
'';
# Upstream adds some plain text files direct to the package's root directory
# https://github.com/Parquery/pylddwrap/blob/master/setup.py#L71
postInstall = ''
rm -f $out/{LICENSE,README.rst,requirements.txt}
'';
propagatedBuildInputs = [
icontract
typing-extensions
];
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "lddwrap" ];
meta = with lib; {
description = "Python wrapper around ldd *nix utility to determine shared libraries of a program";
homepage = "https://github.com/Parquery/pylddwrap";
changelog = "https://github.com/Parquery/pylddwrap/blob/v${version}/CHANGELOG.rst";
license = licenses.mit;
maintainers = with maintainers; [ thiagokokada ];
};
}

View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "pylitterbot";
version = "2022.10.1";
version = "2022.10.2";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "natekspencer";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-E7rBRPtXa/E6jf75zULuGaiu2DHvq4hZjcwPwj/w9ww=";
hash = "sha256-2rU5CHQjecuS0pQ6DvWDBP+AeLa0SF5Cxyepf62A4Ks=";
};
nativeBuildInputs = [

View file

@ -0,0 +1,65 @@
{ lib
, atomicwrites
, buildPythonPackage
, fetchFromGitHub
#, hatchling
, ruamel-yaml
, poetry
, pytest
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, pythonRelaxDepsHook
, testfixtures
}:
buildPythonPackage rec {
pname = "pytest-golden";
version = "0.2.2";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "oprypin";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-l5fXWDK6gWJc3dkYFTokI9tWvawMRnF0td/lSwqkYXE=";
};
pythonRelaxDeps = [
"testfixtures"
];
nativeBuildInputs = [
# hatchling used for > 0.2.2
poetry
pythonRelaxDepsHook
];
buildInputs = [
pytest
];
propagatedBuildInputs = [
atomicwrites
ruamel-yaml
testfixtures
];
checkInputs = [
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [
"pytest_golden"
];
meta = with lib; {
description = "Plugin for pytest that offloads expected outputs to data files";
homepage = "https://github.com/oprypin/pytest-golden";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

View file

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "scmrepo";
version = "0.1.2";
version = "0.1.3";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-Mm/wwPB1iguCaS3cMp6R2r9+g6Nrs5NPU4BuQgBiMRI=";
hash = "sha256-YivsP5c0fnpm/0VCFfyH054LYAQbyEdH+wZTRxsCAY4=";
};
postPatch = ''

View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "toml-adapt";
version = "0.2.8";
version = "0.2.10";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "firefly-cpp";
repo = pname;
rev = version;
sha256 = "sha256-9auZZl6c+EfAO/2QaHW5BI1aDZkIIGU+fwzudIdFWqI=";
sha256 = "sha256-eVRiMwdYDS2YdQsINy8lBzV8lhcKgq+Vwlc02C5ar0Q=";
};
nativeBuildInputs = [

View file

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "zstandard";
version = "0.18.0";
version = "0.19.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-CsA1eg2YW0/zGoVHRAQNe1dUOF0fmPcUXDDgLGhly28=";
sha256 = "sha256-MdEvzZQt2Nv1LKX2sbvih/ROXVUaCBqYP/PqIIKGeGM=";
};
propagatedNativeBuildInputs = [

View file

@ -2,7 +2,7 @@
let
pname = "allure";
version = "2.19.0";
version = "2.20.0";
in
stdenv.mkDerivation rec {
inherit pname version;
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/allure-framework/allure2/releases/download/${version}/allure-${version}.tgz";
sha256 = "sha256-WjyCU9z+szSeGbnsTTZGq8UFUpmrMPW+pTZPMk1ZC+s=";
sha256 = "sha256-NTDG0mG2qyOrUSRSm59ybXiJd6pSoSq+xE9or8YRMw8=";
};
dontConfigure = true;
dontBuild = true;

View file

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "cirrus-cli";
version = "0.89.0";
version = "0.91.0";
src = fetchFromGitHub {
owner = "cirruslabs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-MsuLMEbOz68RNq0kLicTslSiucdmcOn7Y6Nhbxwyt+Q=";
sha256 = "sha256-nJd7azn42IqIx8CXL7RHJFAZUaN0uq4FumHL3uGIx9U=";
};
vendorSha256 = "sha256-Llq6siZn34sHsZFneT+MLXf2W9cXqi4DZwrH1R5laOY=";

View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "htmltest";
version = "0.16.0";
version = "0.17.0";
src = fetchFromGitHub {
owner = "wjdp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Om3jnaHFEq8XJZhGolPax2NH7PFqtqMG5Rd7JTBdGf8=";
sha256 = "sha256-8tkk476kGEfHo3XGu3/0r6fhX1c4vkYiUACpw0uEu2g=";
};
vendorSha256 = "0zx3ii9crick647kslzwg4d39li6jds938f9j9dp287rhrlzjfbm";
vendorSha256 = "sha256-dTn5aYb5IHFbksmhkXSTJtI0Gnn8Uz0PMZPFzFKMo38=";
ldflags = [
"-w"

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "jo";
version = "1.7";
version = "1.9";
src = fetchFromGitHub {
owner = "jpmens";
repo = "jo";
rev = version;
sha256 ="sha256-uJUbe593k7ENfbKCFhmm4Io0CPB109LF9EH8Qw0BFiY=";
sha256 ="sha256-1q4/RpxfoAdtY3m8bBuj7bhD17V+4dYo3Vb8zMbI1YU=";
};
enableParallelBuilding = true;

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "jql";
version = "5.1.1";
version = "5.1.2";
src = fetchFromGitHub {
owner = "yamafaktory";
repo = pname;
rev = "v${version}";
sha256 = "sha256-d2DETEASOe73mpyuk5NZzSzKln1LPttCbnmWEiFnAks=";
sha256 = "sha256-Vv22BDFecGEketJb0qQ4+FxSB2BLb9LcnEAqm/BKRxM=";
};
cargoSha256 = "sha256-se5tGgZysetH4dlh+oe41FRhVqFQIw218fEKwqa3WCA=";
cargoSha256 = "sha256-DRrewxKOR0LjpgoN7TWXHWxJxcZ/psjI/lSnyzBXRXM=";
meta = with lib; {
description = "A JSON Query Language CLI tool built with Rust";

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "k6";
version = "0.40.0";
version = "0.41.0";
src = fetchFromGitHub {
owner = "grafana";
repo = pname;
rev = "v${version}";
sha256 = "sha256-qYWme1VepGTKuvhUtuCqkalfp1YhKDoW8sc6Co0sbHg=";
sha256 = "sha256-kMWheOf6lR2Fdb77NvjQYB/PHILs6ZIfQORh72ojc8c=";
};
subPackages = [ "./" ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "strace";
version = "5.19";
version = "6.0";
src = fetchurl {
url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-qj3ByOYOT2/z05ZRSqJH88e/cZ2KjcTdT6eTvnhr7KM=";
sha256 = "sha256-ktcgpmaFXp8cahFRL9bplnSoK7/hRCVXgV8s6OEpMzg=";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];

View file

@ -0,0 +1,44 @@
{ stdenv
, lib
, fetchzip
, rustPlatform
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-llvm-cov";
version = "0.5.0";
src = fetchzip {
url = "https://crates.io/api/v1/crates/${pname}/${version}/download#${pname}-${version}.tar.gz";
sha256 = "sha256-ifnwiOuFnpryYxLgescpxN8CzgFzSZlY+RlbyW7ND6g=";
};
cargoSha256 = "sha256-11xNgiOw0qysTWpoKAXQ5gx1uJSAsp+aDDir0zpkpeQ=";
# skip tests which require llvm-tools-preview
checkFlags = [
"--skip bin_crate"
"--skip cargo_config"
"--skip clean_ws"
"--skip instantiations"
"--skip merge"
"--skip merge_failure_mode_all"
"--skip no_test"
"--skip open_report"
"--skip real1"
"--skip show_env"
"--skip virtual1"
];
meta = rec {
homepage = "https://github.com/taiki-e/${pname}";
changelog = homepage + "/blob/v${version}/CHANGELOG.md";
description = "Cargo subcommand to easily use LLVM source-based code coverage";
longDescription = ''
In order for this to work, you either need to run `rustup component add llvm-
tools-preview` or install the `llvm-tools-preview` component using your Nix
library (e.g. nixpkgs-mozilla, or rust-overlay)
'';
license = with lib.licenses; [ asl20 /* or */ mit ];
maintainers = with lib.maintainers; [ wucke13 ];
};
}

View file

@ -0,0 +1,31 @@
{ stdenv
, lib
, fetchFromGitLab
, rustPlatform
}:
rustPlatform.buildRustPackage rec {
pname = "gitlab-clippy";
version = "1.0.3";
src = fetchFromGitLab {
owner = "dlalic";
repo = pname;
rev = version;
sha256 = "sha256-d7SmlAWIV4SngJhIvlud90ZUSF55FWIrzFpkfSXIy2Y=";
};
cargoSha256 = "sha256-ztPbI+ncMNMKnIxUksxgz8GHQpLZ7SVWdC4QJWh18Wk=";
# TODO re-add theses tests once they get fixed in upstream
checkFlags = [
"--skip cli::converts_error_from_pipe"
"--skip cli::converts_warnings_from_pipe"
];
meta = {
homepage = "https://gitlab.com/dlalic/gitlab-clippy";
description = "Convert clippy warnings into GitLab Code Quality report";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ wucke13 ];
};
}

View file

@ -17,15 +17,15 @@
rustPlatform.buildRustPackage rec {
pname = "deno";
version = "1.27.0";
version = "1.27.1";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
sha256 = "sha256-nvQimTCzcmTI37hFqf0aZvVUS01dy6alxkTTkY9nNPU=";
sha256 = "sha256-HlaCssoDySmjLqvsILnE8+SZc0oHtD0SvgjmT0hUPvs=";
};
cargoSha256 = "sha256-1TrzF9h6OHfDzkKL+zQTf5dIMzB820WFtFi9pFQIgig=";
cargoSha256 = "sha256-iP9TPWQlZGLrpRIMnySqiy2LX2y5XXfWqBbSrSQ+BD4=";
postPatch = ''
# upstream uses lld on aarch64-darwin for faster builds

View file

@ -9,6 +9,13 @@ stdenv.mkDerivation rec {
sha256 = "sha256-lyHQYU4aXQ/muAyaigStqO/ULL393SOelagFmuKDqm8=";
};
# utmp.h is deprecated on aarch64-darwin
postPatch = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) ''
for file in login.*; do
substituteInPlace $file --replace "#ifdef HAVE_UTMP_H" "#if 0"
done
'';
buildInputs = [ libxcrypt ];
preConfigure = ''

View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "klipper";
version = "unstable-2022-10-25";
version = "unstable-2022-11-03";
src = fetchFromGitHub {
owner = "KevinOConnor";
repo = "klipper";
rev = "96ea871b355d69ae00220d14c3a9f9c4b8754337";
sha256 = "sha256-40rWK47XDbwOujTiRMrKDXLj0ifCGDiccJEt1RyKzQE=";
rev = "342d3f1414f905fc85ea14a125463ff2df4e9b51";
sha256 = "sha256-w5hvuKrtZUwYfrBWMJD9jntdjWDfDysAiwhQDTc9jb0=";
};
sourceRoot = "source/klippy";

View file

@ -4,19 +4,19 @@ let
generic = { subPackages, pname, postInstall ? "", mainProgram }:
buildGoModule rec {
inherit pname;
version = "6.8.2";
version = "6.9.0";
shortRev = "3a1ac58"; # for internal version info
src = fetchFromGitHub {
owner = "sensu";
repo = "sensu-go";
rev = "v${version}";
sha256 = "sha256-1blHYUwZHaAdWN7xag+aSPP2GEBmJ+HKK10pKXiNDxY=";
sha256 = "sha256-H6mpry6uJtMVJmsdLgka7X/IzMP1dbp+hOl3pGVWUAE=";
};
inherit subPackages postInstall;
vendorSha256 = "sha256-Eiebn4BfdI1VhjzdCl3XT/zoFNUbaC1X0v+tGSfNCOE=";
vendorSha256 = "sha256-zrwTdMlDfG1RudOfV52qOP9NMU3/XYb5TND6xyglJ0I=";
doCheck = false;

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "infra";
version = "0.15.2";
version = "0.16.1";
src = fetchFromGitHub {
owner = "infrahq";
repo = pname;
rev = "v${version}";
sha256 = "sha256-luwswGFI+ygLWp8Yi0PuZpkjQiPiF7bCv0kc8DNYxkw=";
sha256 = "sha256-0HCfJwgeLM4uLiXcaW+9FxMVgeDJG7Opr0dEj525npw=";
};
vendorSha256 = "sha256-j+ZtBqAIeI25qRKu6RvW79Ug/lUGreC06qXL5dgchHc=";
vendorSha256 = "sha256-wtzk5J9b1SbWkRRgPmVdxiMJdgPDwAtNOx6Uup7iakk=";
subPackages = [ "." ];

View file

@ -38,7 +38,7 @@
stdenv.mkDerivation rec {
pname = "vips";
version = "8.13.2";
version = "8.13.3";
outputs = [ "bin" "out" "man" "dev" ];
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
owner = "libvips";
repo = "libvips";
rev = "v${version}";
sha256 = "sha256-Tff+M2qJ/FPxU7Y5gUnuF+Kbwh8DIW5Tb7fe0Lbi0m4=";
sha256 = "sha256-JkG1f2SGLI6tSNlFJ//S37PXIo+L318Mej0bI7p/dVo=";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
postFetch = ''

View file

@ -33,7 +33,8 @@ buildPythonApplication rec {
--replace 'halo = "^0.0.29"' 'halo = "*"'
substituteInPlace tests/test_inspect.py \
--replace "parquet-cpp-arrow version 5.0.0" "parquet-cpp-arrow version ${pyarrow.version}" \
--replace "serialized_size: 2222" "serialized_size: 2221"
--replace "serialized_size: 2222" "serialized_size: 2221" \
--replace "format_version: 1.0" "format_version: 2.6"
'';
nativeBuildInputs = [ poetry-core ];

View file

@ -9,7 +9,7 @@
, qtbase
, qtgraphicaleffects
, qtquickcontrols2
, yubikey-manager
, yubikey-manager4
, yubikey-personalization
}:
@ -41,7 +41,7 @@ mkDerivation rec {
];
pythonPath = [
(yubikey-manager.override { python3Packages = python3.pkgs; })
(yubikey-manager4.override { python3Packages = python3.pkgs; })
];
postInstall = ''

View file

@ -0,0 +1,73 @@
{ python3Packages, fetchFromGitHub, lib, yubikey-personalization, libu2f-host, libusb1, procps
, stdenv, pyOpenSSLSupport ? !(stdenv.isDarwin && stdenv.isAarch64) }:
python3Packages.buildPythonPackage rec {
pname = "yubikey-manager";
version = "4.0.9";
format = "pyproject";
src = fetchFromGitHub {
repo = "yubikey-manager";
rev = "refs/tags/${version}";
owner = "Yubico";
sha256 = "sha256-MwM/b1QP6pkyBjz/r6oC4sW1mKC0CKMay45a0wCktk0=";
};
patches = lib.optionals (!pyOpenSSLSupport) [
./remove-pyopenssl-tests.patch
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'fido2 = ">=0.9, <1.0"' 'fido2 = ">*"'
substituteInPlace "ykman/pcsc/__init__.py" \
--replace 'pkill' '${if stdenv.isLinux then "${procps}" else "/usr"}/bin/pkill'
'';
nativeBuildInputs = with python3Packages; [ poetry-core ];
propagatedBuildInputs =
with python3Packages; ([
click
cryptography
pyscard
pyusb
six
fido2
] ++ lib.optionals pyOpenSSLSupport [
pyopenssl
]) ++ [
libu2f-host
libusb1
yubikey-personalization
];
makeWrapperArgs = [
"--prefix" "LD_LIBRARY_PATH" ":"
(lib.makeLibraryPath [ libu2f-host libusb1 yubikey-personalization ])
];
postInstall = ''
mkdir -p "$out/man/man1"
cp man/ykman.1 "$out/man/man1"
mkdir -p $out/share/bash-completion/completions
_YKMAN_COMPLETE=source $out/bin/ykman > $out/share/bash-completion/completions/ykman || :
mkdir -p $out/share/zsh/site-functions/
_YKMAN_COMPLETE=source_zsh "$out/bin/ykman" > "$out/share/zsh/site-functions/_ykman" || :
substituteInPlace "$out/share/zsh/site-functions/_ykman" \
--replace 'compdef _ykman_completion ykman;' '_ykman_completion "$@"'
'';
checkInputs = with python3Packages; [ pytestCheckHook makefun ];
meta = with lib; {
homepage = "https://developers.yubico.com/yubikey-manager";
description = "Previous release of command line tool for configuring any YubiKey over all USB transports";
license = licenses.bsd2;
platforms = platforms.unix;
maintainers = with maintainers; [ benley lassulus pinpox ];
mainProgram = "ykman";
};
}

View file

@ -1,22 +1,18 @@
{ python3Packages, fetchFromGitHub, lib, yubikey-personalization, libu2f-host, libusb1, procps
, stdenv, pyOpenSSLSupport ? !(stdenv.isDarwin && stdenv.isAarch64) }:
, stdenv }:
python3Packages.buildPythonPackage rec {
pname = "yubikey-manager";
version = "4.0.9";
version = "5.0.0";
format = "pyproject";
src = fetchFromGitHub {
repo = "yubikey-manager";
rev = "refs/tags/${version}";
owner = "Yubico";
sha256 = "sha256-MwM/b1QP6pkyBjz/r6oC4sW1mKC0CKMay45a0wCktk0=";
sha256 = "sha256-ZQQhRiUsQwLaOY8NCzSc/PTmRewTL0ECBKj7Uj+6Gn8=";
};
patches = lib.optionals (!pyOpenSSLSupport) [
./remove-pyopenssl-tests.patch
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'fido2 = ">=0.9, <1.0"' 'fido2 = ">*"'
@ -34,8 +30,7 @@ python3Packages.buildPythonPackage rec {
pyusb
six
fido2
] ++ lib.optionals pyOpenSSLSupport [
pyopenssl
keyring
]) ++ [
libu2f-host
libusb1

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bgpq4";
version = "1.6";
version = "1.7";
src = fetchFromGitHub {
owner = "bgp";
repo = pname;
rev = version;
sha256 = "sha256-O3ZFc2Hc2HpJEctPlwLpWkYI4cJuUVGUXbBIk+1FD7k=";
sha256 = "sha256-0gqd/bEj8ZDpf/3J2iZnGswTO6k8aJOuRiZXMZLm7zo=";
};
nativeBuildInputs = [

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "cassowary";
version = "0.14.1";
version = "0.15.0";
src = fetchFromGitHub {
owner = "rogerwelin";
repo = pname;
rev = "v${version}";
sha256 = "sha256-JWuVoEEViVHn39LmJ0IQGg6ggDKS49WhE5Qwp+ep0Pk=";
sha256 = "sha256-eZ61LIDMv+G7jnSrEFCsm6MP5+BpzJW+OnI9bqAZ5hw=";
};
vendorSha256 = "sha256-caFYa0chTsIVW7pN/TBJNfQpnF6Hm4/GFyULDqL/bH4=";
vendorSha256 = "sha256-5U/YqqNfZfLZLEwuRh4mXACr9Gj7iOrLQRSLC/b8ZRw=";
ldflags = [ "-s" "-w" "-X main.version=${version}" ];

View file

@ -4,7 +4,7 @@ with lib;
buildGoModule rec {
pname = "flannel";
version = "0.19.1";
version = "0.20.1";
rev = "v${version}";
vendorSha256 = null;
@ -13,7 +13,7 @@ buildGoModule rec {
inherit rev;
owner = "flannel-io";
repo = "flannel";
sha256 = "sha256-pWi4JKBfIb6c4fh0EAPf86B4axrDzOPM+ZWquFd6mTk=";
sha256 = "sha256-0DRHUT2kXHQMnIEGHwzF70Gr3eP+Zg3rvAGtYyqtzLo=";
};
ldflags = [ "-X github.com/flannel-io/flannel/version.Version=${rev}" ];

View file

@ -1,7 +1,7 @@
{ callPackage, lib, stdenv, fetchurl, jre, makeWrapper }:
let this = stdenv.mkDerivation rec {
version = "6.2.0";
version = "6.2.1";
pname = "openapi-generator-cli";
jarfilename = "${pname}-${version}.jar";
@ -12,7 +12,7 @@ let this = stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}";
sha256 = "sha256-YHB+LIk4qUJ49iFggdcGfQ8b7O2MjrEnfmJemlnM0to=";
sha256 = "sha256-8shgDywj7hEj7r9H7w9A2zhmJ+dbA0DKFhgsEPQXT6k=";
};
dontUnpack = true;

View file

@ -36,11 +36,11 @@
stdenv.mkDerivation rec {
pname = "pacman";
version = "6.0.1";
version = "6.0.2";
src = fetchurl {
url = "https://sources.archlinux.org/other/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-DbYUVuVqpJ4mDokcCwJb4hAxnmKxVSHynT6TsA079zE=";
hash = "sha256-fY4+jFEhrsCWXfcfWb7fRgUsbPFPljZcRBHsPeCkwaU=";
};
nativeBuildInputs = [

View file

@ -6,13 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "credslayer";
version = "0.1.2";
version = "0.1.3";
format = "setuptools";
src = fetchFromGitHub {
owner = "ShellCode33";
repo = "CredSLayer";
rev = "v${version}";
sha256 = "1rbfy0h9c2gra1r2b39kngj3m7g177nmzzs5xy9np8lxixrh17pc";
rev = "refs/tags/v${version}";
hash = "sha256-gryV9MHULY6ZHy6YDFQDIkZsfIX8La0tHT0vrrQJNDQ=";
};
propagatedBuildInputs = with python3.pkgs; [
@ -24,7 +25,9 @@ python3.pkgs.buildPythonApplication rec {
pytestCheckHook
];
pytestFlagsArray = [ "tests/tests.py" ];
pytestFlagsArray = [
"tests/tests.py"
];
disabledTests = [
# Requires a telnet setup
@ -36,7 +39,9 @@ python3.pkgs.buildPythonApplication rec {
"test_ntlmssp"
];
pythonImportsCheck = [ "credslayer" ];
pythonImportsCheck = [
"credslayer"
];
postInstall = ''
wrapProgram $out/bin/credslayer \
@ -48,8 +53,5 @@ python3.pkgs.buildPythonApplication rec {
homepage = "https://github.com/ShellCode33/CredSLayer";
license = with licenses; [ gpl3Only ];
maintainers = with maintainers; [ fab ];
# Upstream issue https://github.com/ShellCode33/CredSLayer/issues/16
# This package works only with pyshark < 0.5
broken = true;
};
}

View file

@ -8,13 +8,13 @@
buildGoModule rec {
pname = "grype";
version = "0.51.0";
version = "0.52.0";
src = fetchFromGitHub {
owner = "anchore";
repo = pname;
rev = "v${version}";
sha256 = "sha256-WTDUkC+TFVkT/D36hDusqxwidy6O+iMInBpTumdCaw4=";
sha256 = "sha256-RZBO8TpFwRwr1CkGSX06jtAtLiNVHhe+8AJsHwNyPMY=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@ -26,7 +26,7 @@ buildGoModule rec {
find "$out" -name .git -print0 | xargs -0 rm -rf
'';
};
vendorSha256 = "sha256-bpWUo6YA0TkIyDg27mv88X1fh+1Wal362Sqi7loo/Zs=";
vendorSha256 = "sha256-K6MJp07JEit/6AHqLtnzXIaVCi7W6jfX41M96VwnS5A=";
nativeBuildInputs = [
installShellFiles

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "mdbook-mermaid";
version = "0.12.0";
version = "0.12.1";
src = fetchFromGitHub {
owner = "badboy";
repo = pname;
rev = "v${version}";
hash = "sha256-1w132lpkn0m2ZoMyFKFGjwn9Gd3UDksEKr5vq8l4ANQ=";
hash = "sha256-22JmV4cFfUTwiweQP0Em2VbqmTUui2yWnbhKagprQ4Q=";
};
cargoHash = "sha256-OKE8RcCE4pIRtQDW7KNzUVrNpyZzWg6QHchJg0XWmYQ=";
cargoHash = "sha256-tztzmfWOtqFGWERMWgBSAqvT+hKfhBWL9KW4awixXk0=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];

View file

@ -7197,6 +7197,8 @@ with pkgs;
gitlabEnterprise = true;
};
gitlab-clippy = callPackage ../development/tools/rust/gitlab-clippy { };
gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { };
gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell { };
@ -14873,6 +14875,8 @@ with pkgs;
rocminfo = callPackage ../development/tools/rocminfo { };
rocmlir = callPackage ../development/libraries/rocmlir { };
rtags = callPackage ../development/tools/rtags {
inherit (darwin) apple_sdk;
};
@ -14950,6 +14954,7 @@ with pkgs;
cargo-graph = callPackage ../development/tools/rust/cargo-graph { };
cargo-hack = callPackage ../development/tools/rust/cargo-hack { };
cargo-license = callPackage ../development/tools/rust/cargo-license { };
cargo-llvm-cov = callPackage ../development/tools/rust/cargo-llvm-cov { };
cargo-llvm-lines = callPackage ../development/tools/rust/cargo-llvm-lines { };
cargo-lock = callPackage ../development/tools/rust/cargo-lock { };
cargo-outdated = callPackage ../development/tools/rust/cargo-outdated {
@ -22981,6 +22986,7 @@ with pkgs;
yubihsm-connector = callPackage ../tools/security/yubihsm-connector { };
yubikey-manager4 = callPackage ../tools/misc/yubikey-manager/4.nix { };
yubikey-manager = callPackage ../tools/misc/yubikey-manager { };
yubikey-manager-qt = libsForQt5.callPackage ../tools/misc/yubikey-manager-qt { };

View file

@ -4371,6 +4371,8 @@ self: super: with self; {
ibm-watson = callPackage ../development/python-modules/ibm-watson { };
ical = callPackage ../development/python-modules/ical { };
icalendar = callPackage ../development/python-modules/icalendar { };
icecream = callPackage ../development/python-modules/icecream { };
@ -5057,6 +5059,8 @@ self: super: with self; {
lc7001 = callPackage ../development/python-modules/lc7001 { };
lcov_cobertura = callPackage ../development/python-modules/lcov_cobertura { };
ldap3 = callPackage ../development/python-modules/ldap3 { };
ldapdomaindump = callPackage ../development/python-modules/ldapdomaindump { };
@ -6969,6 +6973,8 @@ self: super: with self; {
pykrakenapi = callPackage ../development/python-modules/pykrakenapi { };
pylddwrap = callPackage ../development/python-modules/pylddwrap { };
pynndescent = callPackage ../development/python-modules/pynndescent { };
pynobo = callPackage ../development/python-modules/pynobo { };
@ -8749,6 +8755,8 @@ self: super: with self; {
pytest-freezegun = callPackage ../development/python-modules/pytest-freezegun { };
pytest-golden = callPackage ../development/python-modules/pytest-golden { };
pytest-helpers-namespace = callPackage ../development/python-modules/pytest-helpers-namespace { };
pytest-html = callPackage ../development/python-modules/pytest-html { };

View file

@ -174,11 +174,6 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea
qca-qt5 = callPackage ../development/libraries/qca-qt5 { };
# Until macOS SDK allows for Qt 5.15, darwin is limited to 2.3.2
qca-qt5_2_3_2 = callPackage ../development/libraries/qca-qt5/2.3.2.nix {
openssl = pkgs.openssl_1_1;
};
qcoro = callPackage ../development/libraries/qcoro { };
qcsxcad = callPackage ../development/libraries/science/electronics/qcsxcad { };