Merge master into staging-next

This commit is contained in:
github-actions[bot] 2022-10-30 12:01:18 +00:00 committed by GitHub
commit 082314708c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
46 changed files with 353 additions and 127 deletions

View File

@ -26,11 +26,11 @@
with lib;
stdenv.mkDerivation rec {
pname = if withGui then "bitcoin-knots" else "bitcoind-knots";
version = "22.0.knots20211108";
version = "23.0.knots20220529";
src = fetchurl {
url = "https://bitcoinknots.org/files/22.x/${version}/guix/bitcoin-${version}.tar.gz";
sha256 = "04sqbx4sp3bzwbl8z53nz96n3s0590h327ih0mbgyvfvl3b8pj4i";
url = "https://bitcoinknots.org/files/23.x/${version}/bitcoin-${version}.tar.gz";
sha256 = "0c6l4bvj4ck8gp5vm4dla3l32swsp6ijk12fyf330wgry4mhqxyi";
};
nativeBuildInputs =

View File

@ -1,4 +1,18 @@
{ lib, stdenv, fetchurl, fox, pkg-config, gettext, xlibsWrapper, xcbutil, gcc, intltool, file, libpng }:
{ lib
, stdenv
, fetchurl
, fox
, fontconfig
, freetype
, pkg-config
, gettext
, xcbutil
, gcc
, intltool
, file
, libpng
, xorg
}:
stdenv.mkDerivation rec {
pname = "xfe";
@ -10,7 +24,18 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config intltool ];
buildInputs = [ fox gettext xlibsWrapper xcbutil gcc file libpng ];
buildInputs = [
fox
gettext
xcbutil
gcc
file
libpng
fontconfig
freetype
xorg.libX11
xorg.libXft
];
preConfigure = ''
sed -i s,/usr/share/xfe,$out/share/xfe, src/xfedefs.h

View File

@ -28,11 +28,11 @@ let
in
stdenv.mkDerivation rec {
pname = "blender";
version = "3.3.0";
version = "3.3.1";
src = fetchurl {
url = "https://download.blender.org/source/${pname}-${version}.tar.xz";
hash = "sha256-IsUaTmY4XLFIGKpNdtz3+m1uEDr7DTaRbhLqFZiNIfA=";
hash = "sha256-KtpI8L+KDKgCuYfXV0UgEuH48krPTSNFOwnC1ZURjMo=";
};
patches = lib.optional stdenv.isDarwin ./darwin.patch;

View File

@ -1,4 +1,11 @@
{ lib, stdenv, fetchFromGitHub, imake, gccmakedep, xlibsWrapper }:
{ lib
, stdenv
, fetchFromGitHub
, imake
, gccmakedep
, libX11
, libXext
}:
stdenv.mkDerivation rec {
version_name = "1.2.hanami.6";
@ -11,7 +18,7 @@ stdenv.mkDerivation rec {
sha256 = "0vx12v5fm8ar3f1g6jbpmd3b1q652d32nc67ahkf28djbqjgcbnc";
};
nativeBuildInputs = [ imake gccmakedep ];
buildInputs = [ xlibsWrapper ];
buildInputs = [ libX11 libXext ];
makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ];
installTargets = [ "install" "install.man" ];

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, tcl, tk, Cocoa, xlibsWrapper, makeWrapper }:
{ lib, stdenv, fetchurl, tcl, tk, Cocoa, makeWrapper }:
stdenv.mkDerivation rec {
version = "3.0";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ tcl tk xlibsWrapper ]
buildInputs = [ tcl tk ]
++ lib.optionals stdenv.isDarwin [ Cocoa ];
hardeningDisable = [ "format" ];

View File

@ -47,15 +47,15 @@ with lib;
# Those pieces of software we entirely ignore upstream's handling of, and just
# make sure they're in the path if desired.
let
k3sVersion = "1.25.2+k3s1"; # k3s git tag
k3sCommit = "53c268d8eb90ceea5e1c7865f89db5c7fb8763bc"; # k3s git commit at the above version
k3sRepoSha256 = "1w040bsrf981k19rwaaxjsv52pgzc0k77x083fkhysmrca565z0y";
k3sVendorSha256 = "sha256-8Xti08sjFk1WKimH/GEb99oqBdFO79WVCvYyXIWMpgo=";
k3sVersion = "1.25.3+k3s1"; # k3s git tag
k3sCommit = "f2585c1671b31b4b34bddbb3bf4e7d69662b0821"; # k3s git commit at the above version
k3sRepoSha256 = "0zwf3iwjcidx14zw36s1hr0q8wmmbfc0rfqwd7fmpjq597h8zkms";
k3sVendorSha256 = "sha256-U67tJRGqPFk5AfRe7I50zKGC9HJ2oh+iI/C7qF/76BQ=";
# taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9
# The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know.
traefikChartVersion = "10.19.3";
traefikChartSha256 = "04zg5li957svgscdmkzmzjkwljaljyav68rzxmhakkwgav6q9058";
traefikChartVersion = "12.0.0";
traefikChartSha256 = "1sqmi71fi3ad5dh5fmsp9mv80x6pkgqwi4r9fr8l6i9sdnai6f1a";
# taken from ./scripts/version.sh VERSION_ROOT https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L47
k3sRootVersion = "0.11.0";

View File

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "lima";
version = "0.12.0";
version = "0.13.0";
src = fetchFromGitHub {
owner = "lima-vm";
repo = pname;
rev = "v${version}";
sha256 = "sha256-v2zvcUDbzjisJVxEic6VDZewaE0kp1rcB2NK8y3utnQ=";
sha256 = "sha256-alE7fUVxJRkLMtdia5ruHxh9nlWIubM0J6iIrmpreRM=";
};
vendorSha256 = "sha256-MlfDvdzkegtS8sW/GjkOMLQTK30G6RipHaYzNcwIkEE=";
vendorSha256 = "sha256-Kb2R8USWOWRFMjQO3tjdl5UHOzzb2B3ld+5vO2gF3KY=";
nativeBuildInputs = [ makeWrapper installShellFiles ];

View File

@ -9,12 +9,12 @@
ocamlPackages.buildDunePackage rec {
pname = "ligo";
version = "0.54.0";
version = "0.54.1";
src = fetchFromGitLab {
owner = "ligolang";
repo = "ligo";
rev = version;
sha256 = "sha256-Iq72gDaS05yhxAYjIUrqiCwBkx5aWbVpYPcQlgojhNU=";
sha256 = "sha256-P4oScKsf2A6qtkzpep8lewqSMM9A+vHyN5VaH7+/6xQ=";
fetchSubmodules = true;
};

View File

@ -1,5 +1,17 @@
{ lib, stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft
, CoreServices ? null }:
{ lib
, stdenv
, fetchurl
, libpng
, libjpeg
, libtiff
, zlib
, bzip2
, libXcursor
, libXext
, libXrandr
, libXft
, CoreServices ? null
}:
stdenv.mkDerivation rec {
pname = "fox";
@ -12,7 +24,7 @@ stdenv.mkDerivation rec {
patches = [ ./clang.patch ];
buildInputs = [ libpng xlibsWrapper libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ]
buildInputs = [ libpng libjpeg libtiff zlib bzip2 libXcursor libXext libXrandr libXft ]
++ lib.optional stdenv.isDarwin CoreServices;
doCheck = true;

View File

@ -1,4 +1,4 @@
{ fetchhg, lib, stdenv, cmake, coin3d, motif, xlibsWrapper, libXmu, libGLU, libGL }:
{ fetchhg, lib, stdenv, cmake, coin3d, motif, libXext, libXmu, libGLU, libGL }:
stdenv.mkDerivation {
pname = "soxt";
@ -12,7 +12,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ cmake ];
buildInputs = [ coin3d motif xlibsWrapper libGLU libGL libXmu ];
buildInputs = [ coin3d motif libGLU libGL libXext libXmu ];
meta = with lib; {
homepage = "https://bitbucket.org/Coin3D/coin/wiki/Home";

View File

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "aioambient";
version = "2021.12.0";
version = "2022.10.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = version;
sha256 = "sha256-nFCLMpkuSVPecKrtJ/z7KuyGw4Z9X79wKXmWsewbxvY=";
sha256 = "sha256-Oppi4J0TuLbqwVn1Hpa4xcU9c/I+YDP3E0VXwiP8a/w=";
};
postPatch = ''

View File

@ -15,13 +15,13 @@
buildPythonPackage rec {
pname = "aioguardian";
version = "2022.07.0";
version = "2022.10.0";
src = fetchFromGitHub {
owner = "bachya";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-87MumQ6MuhRRDHrcH1nmOPviKDaT4crYnq5Pd26qsLw=";
sha256 = "sha256-plgO+pyKmG0mYnFZxDcrENcuEg5AG2Og2xWipzuzyHo=";
};
format = "pyproject";

View File

@ -13,18 +13,21 @@
buildPythonPackage rec {
pname = "aionotion";
version = "2021.10.0";
version = "2022.10.0";
format = "pyproject";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "bachya";
repo = pname;
rev = version;
sha256 = "sha256-5bu2XveDi2e6lGdI/T+0apqXzcnqdztVtaHEpp+Vkzs=";
hash = "sha256-DJkqFj87N8OlWHNto+tInj8QvVoNA9faLBb/pBbQl0U=";
};
nativeBuildInputs = [ poetry-core ];
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiohttp
@ -38,9 +41,13 @@ buildPythonPackage rec {
pytestCheckHook
];
disabledTestPaths = [ "examples" ];
disabledTestPaths = [
"examples"
];
pythonImportsCheck = [ "aionotion" ];
pythonImportsCheck = [
"aionotion"
];
meta = with lib; {
description = "Python library for Notion Home Monitoring";

View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aiorecollect";
version = "2021.10.0";
version = "2022.10.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = version;
sha256 = "sha256-cLutszJ8VXGcqb8kZv7Qn1ZD/LRYjVgQWQxNMHNd0UQ=";
sha256 = "sha256-JIh6jr4pFXGZTUi6K7VsymaCxCrTNBevk9xo9TsrFnM=";
};
nativeBuildInputs = [

View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "aioridwell";
version = "2022.03.0";
version = "2022.10.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = version;
hash = "sha256-UiHT1YbBb9UTughVw2oJxRtvhUDVqQWqEcXMEXwy2cI=";
hash = "sha256-cc5l72QHcyCBFZtw3F9EFFtmz58NnZ9gkDTcFZFlL4E=";
};
nativeBuildInputs = [

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "aioswitcher";
version = "3.1.0";
version = "3.2.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "TomerFi";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-UnKi9/+BmQoJcv/Mlv9C9FYUgMy3J8KCGRrWPMGrM8Y=";
hash = "sha256-Vob5p0+SlZR2eHj5Br2pWp3FCxW+zgY6crh8jrkreT0=";
};
nativeBuildInputs = [

View File

@ -36,6 +36,9 @@ buildPythonPackage rec {
disabledTests = [
# AssertionError: <_io.TextIOWrapper name='<stdout>' mode='w' encoding='utf-8'> is not...
"test_init"
# AssertionError: Invalid format specifier (deprecated since prefixed 0.4.0)
"test_floats_prefixed"
"test_subcounter_prefixed"
] ++ lib.optionals stdenv.isDarwin [
# https://github.com/Rockhopper-Technologies/enlighten/issues/44
"test_autorefresh"

View File

@ -0,0 +1,35 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchPypi
, requests
}:
buildPythonPackage rec {
pname = "hydrus-api";
version = "4.0.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-4by2TlZJIKElGgaof1w555ik2hUNbg16YekSWwICGmg=";
};
disabled = pythonOlder "3.9";
propagatedBuildInputs = [
requests
];
pythonImportsCheck = [ "hydrus_api" ];
# There are no unit tests
doCheck = false;
meta = with lib; {
description = "Python module implementing the Hydrus API";
homepage = "https://gitlab.com/cryzed/hydrus-api";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ dandellion ];
};
}

View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "md-toc";
version = "8.1.4";
version = "8.1.5";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "frnmst";
repo = pname;
rev = version;
hash = "sha256-7bXd+kTB1NF5KfcDVsvemCfIbZxv6nAw851bNo375Xs=";
hash = "sha256-jt2ZZV63s7LL0R9ay/tvMH3cIDElYXiNPBuHlxj/Z8E=";
};
propagatedBuildInputs = [

View File

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "meshtastic";
version = "1.3.42";
version = "1.3.43";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -26,8 +26,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "meshtastic";
repo = "Meshtastic-python";
rev = version;
hash = "sha256-yQjUepoKHYsQg49hY3ABtRGBxAppqm/DODnCM4tBH5A=";
rev = "refs/tags/${version}";
hash = "sha256-Gy9fnYUbv5jR+YeFjbNGdng+loM/J71Yn9Y1mKERVUA=";
};
propagatedBuildInputs = [

View File

@ -8,24 +8,32 @@
buildPythonPackage rec {
pname = "motor";
version = "3.1.0";
disabled = pythonOlder "3.6";
version = "3.1.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "mongodb";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-Wc0C4sO33v/frBtZVV2u9ESunHKyJI+eQ59l72h2eFk=";
hash = "sha256-PD41ZyUFY4fYaO4Fo7kiTWcn1a6LOd81K3PWAAagmr4=";
};
propagatedBuildInputs = [ pymongo ];
propagatedBuildInputs = [
pymongo
];
checkInputs = [ mockupdb ];
checkInputs = [
mockupdb
];
# network connections
doCheck = false;
pythonImportsCheck = [ "motor" ];
pythonImportsCheck = [
"motor"
];
meta = with lib; {
description = "Non-blocking MongoDB driver for Tornado or asyncio";

View File

@ -1,13 +1,19 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k }:
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
}:
buildPythonPackage rec {
pname = "mss";
version = "6.1.0";
disabled = !isPy3k;
version = "7.0.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "aebd069f3e05667fe9c7b9fa4b1771fe42a4710ce1058ce0236936ce06fa5394";
hash = "sha256-8UzuUokDw7AdO48SCc1JhCL3Hj0NLZLFuTPt07l3ICI=";
};
# By default it attempts to build Windows-only functionality
@ -16,10 +22,12 @@ buildPythonPackage rec {
'';
# Skipping tests due to most relying on DISPLAY being set
pythonImportsCheck = [ "mss" ];
pythonImportsCheck = [
"mss"
];
meta = with lib; {
description = "Cross-platform multiple screenshots module in pure Python";
description = "Cross-platform multiple screenshots module";
homepage = "https://github.com/BoboTiG/python-mss";
license = licenses.mit;
maintainers = with maintainers; [ austinbutler ];

View File

@ -0,0 +1,63 @@
{ lib
, buildPythonPackage
, factory_boy
, fetchFromGitHub
, httpretty
, inflection
, jsondate
, mock
, more-itertools
, numpy
, pandas
, parameterized
, pytestCheckHook
, python-dateutil
, pythonOlder
, requests
, six
}:
buildPythonPackage rec {
pname = "nasdaq-data-link";
version = "1.0.4";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "Nasdaq";
repo = "data-link-python";
rev = "refs/tags/${version}";
hash = "sha256-Q3Ay9FpJsvSVu0WU2bxFyo3ODKP/ZUo3SqsBtOGrIIE=";
};
propagatedBuildInputs = [
inflection
more-itertools
numpy
pandas
python-dateutil
requests
six
];
checkInputs = [
factory_boy
httpretty
jsondate
mock
parameterized
pytestCheckHook
];
pythonImportsCheck = [
"nasdaqdatalink"
];
meta = with lib; {
description = "Library for Nasdaq Data Link's RESTful API";
homepage = "https://github.com/Nasdaq/data-link-python";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "panel";
version = "0.14.0";
version = "0.14.1";
format = "wheel";
@ -23,7 +23,7 @@ buildPythonPackage rec {
# tries to fetch even more artifacts
src = fetchPypi {
inherit pname version format;
hash = "sha256-3kZba0R9J978bvjsjRMLSTo7dOPd5Ml7VPkZqMQV2uY=";
hash = "sha256-DSurTC+inYSoGJ047u03K+wEQhGFqqRX0uS5qb3sNEI=";
};
propagatedBuildInputs = [

View File

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "peaqevcore";
version = "7.0.10";
version = "7.0.13";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-97Evn/FT1SCQaiSNKBi0akajc7LkywqzJQEaqxm6s+U=";
hash = "sha256-0qzqnmMzgiUBe2NQsYC/EmjmoBmZsG+tUkfGc9cyKP8=";
};
postPatch = ''

View File

@ -1,26 +1,44 @@
{ lib
, python
, buildPythonPackage
, fetchPypi
, freezegun
, pytestCheckHook
, python-utils
, pythonOlder
}:
buildPythonPackage rec {
pname = "progressbar2";
version = "4.1.1";
version = "4.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Y5odWSJ4RIg5kwvf/SQrTU6pzgyeZWrqgQKCwtNrwSE=";
hash = "sha256-E5OSL8tkWYlErUV1afvrSzrBie9Qta25zvMoTofjlM4=";
};
propagatedBuildInputs = [ python-utils ];
postPatch = ''
sed -i "/-cov/d" pytest.ini
'';
pythonImportsCheck = [ "progressbar" ];
propagatedBuildInputs = [
python-utils
];
checkInputs = [
freezegun
pytestCheckHook
];
pythonImportsCheck = [
"progressbar"
];
meta = with lib; {
homepage = "https://progressbar-2.readthedocs.io/en/latest/";
description = "Text progressbar library for python";
description = "Text progressbar library";
homepage = "https://progressbar-2.readthedocs.io/";
license = licenses.bsd3;
maintainers = with maintainers; [ ashgillman turion ];
};

View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "psygnal";
version = "0.5.0";
version = "0.6.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "tlambert03";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-Hh1HG4VVcNXo62M/4mU3ZcSQNHmalcIDprkwD6/WRf8=";
hash = "sha256-KCdX+pMUAQxeQRZhkrdGCKGjBaB1Ode/r1W8LJQPxyM=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pulumi-aws";
# Version is independant of pulumi's.
version = "5.18.0";
version = "5.19.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "pulumi";
repo = "pulumi-aws";
rev = "refs/tags/v${version}";
hash = "sha256-IHvmiX5drRm4PNY+N5VZ7OjsH5xIswr/G7AREN1XYtM=";
hash = "sha256-ZpbWqhTScWOlcVsX4OYlA5dYQg0UsfOhMLllXjEDdUI=";
};
sourceRoot = "${src.name}/sdk/python";

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "shtab";
version = "1.5.5";
version = "1.5.6";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-I6De64eawNi36c8NiyVxj63PkxnZfUYYT4Dw4l42Ztk=";
hash = "sha256-w04wvmzWcp92slPIc2f1En+52J9Z/XvjGHHntCeuTd0=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "teamcity-messages";
version = "1.31";
version = "1.32";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "JetBrains";
repo = pname;
rev = "v${version}";
sha256 = "sha256-oYXP9HWdgmEq48rYyuX6zHf+cp835C0BtHUAME+5S+k=";
sha256 = "sha256-9az7kD7nKqMF2b3/eFgF+pOKKIYLvTy2sf4TSJfHRnA=";
};
checkInputs = [

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "velbus-aio";
version = "2022.10.3";
version = "2022.10.4";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "Cereal2nd";
repo = pname;
rev = version;
sha256 = "sha256-p/oWyi5417rTSG2+xYsPlaiiHfdyAACyvRwTsmqAoUI=";
sha256 = "sha256-6Sg2t8UmIyVCfjTW3GDldOk09gVg2ngV9sXhyQI4Kz4=";
fetchSubmodules = true;
};

View File

@ -4,13 +4,13 @@ with lib;
buildGoModule rec {
pname = "kind";
version = "0.15.0";
version = "0.17.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "kubernetes-sigs";
repo = "kind";
sha256 = "sha256-IDSWmNWHnTKOl6/N1Mz+OKOkZSBarpuN39CBsSjYhKY=";
sha256 = "sha256-YAa5Dr8Pc6P3RZ3SCiyi7zwmVd5tPalM88R8bxgg6JU=";
};
patches = [
@ -18,7 +18,7 @@ buildGoModule rec {
./kernel-module-path.patch
];
vendorSha256 = "sha256-FE1GvNgXkBt2cH4YB3jTsPXp91DSiYlniQLtMwvi384=";
vendorSha256 = "sha256-J/sJd2LLMBr53Z3sGrWgnWA8Ry+XqqfCEObqFyUD96g=";
CGO_ENABLED = 0;
GOFLAGS = [ "-trimpath" ];

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "millet";
version = "0.5.8";
version = "0.5.10";
src = fetchFromGitHub {
owner = "azdavis";
repo = pname;
rev = "v${version}";
sha256 = "sha256-AsI0n76ZWzW326/kpzP+6zjVA42WrhPqnid02OJ5fEo=";
sha256 = "sha256-6TFXaVIbdHO6smM20I2olURdBPZfcPBQ4Pyk5hU9Mx8=";
};
cargoSha256 = "sha256-tHa/DXcWLdOlMlauerSiLsLImYrbnslN6R991mSTyvs=";
cargoSha256 = "sha256-fsguAk77XXMaGokqyGEumngBW2G4lmSU3Q2HMo5EtKY=";
postPatch = ''
rm .cargo/config.toml

View File

@ -1,17 +0,0 @@
{ stdenv, fetchurl, patchelf }:
stdenv.mkDerivation rec {
pname = "patchelf";
version = "0.9";
src = fetchurl {
url = "https://nixos.org/releases/patchelf/patchelf-${version}/patchelf-${version}.tar.bz2";
sha256 = "a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83";
};
setupHook = [ ./setup-hook.sh ];
doCheck = false; # fails 8 out of 24 tests, problems when loading libc.so.6
inherit (patchelf) meta;
}

View File

@ -0,0 +1,27 @@
{ lib
, rustPlatform
, fetchFromGitHub
}:
rustPlatform.buildRustPackage rec {
pname = "toast";
version = "0.45.5";
src = fetchFromGitHub {
owner = "stepchowfun";
repo = pname;
rev = "v${version}";
sha256 = "sha256-7EF9DCT8Vg7aGOUlRG9c4Lv2EhCX/P9k4zQC6Ruqv0c=";
};
cargoSha256 = "sha256-tyZrNUT2i9i0yOqz1KqIuFSb4PO+fx1SNa+ZVNfIGfM=";
checkFlags = [ "--skip=format::tests::code_str_display" ]; # fails
meta = with lib; {
description = "Containerize your development and continuous integration environments";
homepage = "https://github.com/stepchowfun/toast";
license = licenses.mit;
maintainers = with maintainers; [ dit7ya ];
};
}

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "yq-go";
version = "4.28.2";
version = "4.29.1";
src = fetchFromGitHub {
owner = "mikefarah";
repo = "yq";
rev = "v${version}";
sha256 = "sha256-wLb7M/M/t6CCpjTyhMMDODaQUp1t6gbQaCY+JPBi/4Q=";
sha256 = "sha256-aZMlWC6qtN2TvND18QO8Q3UicSNa9cZT/xPmia3V6FM=";
};
vendorSha256 = "sha256-5GHkl9bwzf0ZUQXjhDPke4Fm7ffH+GqbTXC1Qd71B7M=";
vendorSha256 = "sha256-L3l6wH4bR1/R6MtQTHYsyRE5E/EPnpNwa310zUONo+s=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -8,7 +8,6 @@
, bullet
, glm
, libmad
, xlibsWrapper
, openal
, SDL2
, boost
@ -36,7 +35,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ cmake ];
buildInputs = [
sfml libGLU libGL bullet glm libmad xlibsWrapper openal SDL2 boost ffmpeg
sfml libGLU libGL bullet glm libmad openal SDL2 boost ffmpeg
] ++ lib.optionals stdenv.isDarwin [ OpenAL Cocoa ];
meta = with lib; {

View File

@ -3,9 +3,14 @@
, bzip2
, cmake
, expat
, freetype
, irrlicht
, libICE
, libGL
, libGLU
, libSM
, libX11
, libXext
, libXxf86vm
, libjpeg
, libpng
@ -13,7 +18,6 @@
, openal
, pkg-config
, sqlite
, xlibsWrapper
}:
stdenv.mkDerivation rec {
@ -39,18 +43,24 @@ stdenv.mkDerivation rec {
];
buildInputs = [
# has to go before others to override transitive libpng-1.6
libpng
bzip2
expat
freetype
irrlicht
libICE
libGL
libGLU
libSM
libX11
libXext
libXxf86vm
libjpeg
libpng
libvorbis
openal
sqlite
xlibsWrapper
];
meta = with lib; {

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, xlibsWrapper
, imake, gccmakedep, libXScrnSaver, xorgproto
{ lib, stdenv, fetchFromGitHub
, imake, gccmakedep, libX11, libXext, libXScrnSaver, xorgproto
}:
stdenv.mkDerivation rec {
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ imake gccmakedep ];
buildInputs = [ xlibsWrapper libXScrnSaver xorgproto ];
buildInputs = [ libX11 libXext libXScrnSaver xorgproto ];
makeFlags = [
"BINDIR=$(out)/bin"

View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchpatch, fetchFromGitHub, pkg-config, autoreconfHook, wrapGAppsHook
, gnome, avahi, gtk3, libayatana-appindicator, libnotify, libpulseaudio
, xlibsWrapper, gsettings-desktop-schemas
, gsettings-desktop-schemas
}:
stdenv.mkDerivation rec {
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook ];
buildInputs = [
gnome.adwaita-icon-theme
avahi gtk3 libayatana-appindicator libnotify libpulseaudio xlibsWrapper
avahi gtk3 libayatana-appindicator libnotify libpulseaudio
gsettings-desktop-schemas
];

View File

@ -1,5 +1,17 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, boost
, zlib, libpng, libjpeg, libtiff, xlibsWrapper, SDL
{ lib
, stdenv
, fetchFromGitHub
, autoconf
, automake
, boost
, zlib
, libX11
, libICE
, libSM
, libpng
, libjpeg
, libtiff
, SDL
}:
stdenv.mkDerivation rec {
@ -14,7 +26,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ automake autoconf ];
buildInputs = [ boost zlib libpng libjpeg libtiff xlibsWrapper SDL ];
buildInputs = [ boost zlib libX11 libICE libSM libpng libjpeg libtiff SDL ];
# the installPhase wants to put files into $HOME. I let it put the files
# to $TMPDIR, so they don't get into the $out

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub,
xlibsWrapper, libev, libXi, libXfixes,
libev, libX11, libXext, libXi, libXfixes,
pkg-config, asciidoc, libxslt, docbook_xsl }:
stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config asciidoc libxslt docbook_xsl ];
buildInputs = [ xlibsWrapper libev libXi libXfixes ];
buildInputs = [ libev libX11 libXext libXi libXfixes ];
prePatch = ''
substituteInPlace Makefile --replace 'PKG_CONFIG =' 'PKG_CONFIG ?='

View File

@ -1,4 +1,8 @@
{lib, stdenv, fetchurl, xlibsWrapper}:
{ lib
, stdenv
, fetchurl
, libX11
}:
stdenv.mkDerivation rec {
pname = "unclutter";
@ -8,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "33a78949a7dedf2e8669ae7b5b2c72067896497820292c96afaa60bb71d1f2a6";
};
buildInputs = [xlibsWrapper];
buildInputs = [ libX11 ];
buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "netdiscover";
version = "0.9";
version = "0.10";
src = fetchFromGitHub {
owner = "netdiscover-scanner";
repo = pname;
rev = version;
sha256 = "sha256-4pSGWMTOMECXKpba5739OQA8FIuNmffFbniU9Gd4GlM=";
sha256 = "sha256-Pd/Rf1G9z8sBZA5i+bzuzYUCiNI0Tv7Bz0lJDJCQU9I=";
};
nativeBuildInputs = [ autoreconfHook ];

View File

@ -1423,6 +1423,8 @@ with pkgs;
tnat64 = callPackage ../tools/networking/tnat64 { };
toast = callPackage ../development/tools/toast { };
topicctl = callPackage ../tools/misc/topicctl { };
ttchat = callPackage ../tools/misc/ttchat { };
@ -17344,7 +17346,6 @@ with pkgs;
patchelf_0_13
else
patchelf_0_14;
patchelf_0_9 = callPackage ../development/tools/misc/patchelf/0.9.nix { };
patchelf_0_13 = callPackage ../development/tools/misc/patchelf/0.13.nix {
patchelf = patchelf_0_14;
};

View File

@ -4311,6 +4311,8 @@ self: super: with self; {
hydrawiser = callPackage ../development/python-modules/hydrawiser { };
hydrus-api = callPackage ../development/python-modules/hydrus-api { };
hypchat = callPackage ../development/python-modules/hypchat { };
hypercorn = callPackage ../development/python-modules/hypercorn { };
@ -5987,6 +5989,8 @@ self: super: with self; {
napari-svg = callPackage ../development/python-modules/napari-svg { };
nasdaq-data-link = callPackage ../development/python-modules/nasdaq-data-link { };
nats-py = callPackage ../development/python-modules/nats-py { };
nats-python = callPackage ../development/python-modules/nats-python { };