Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -682,6 +682,7 @@ https://github.com/rust-lang/rust.vim/,,
|
||||
https://github.com/hauleth/sad.vim/,,
|
||||
https://github.com/vmware-archive/salt-vim/,,
|
||||
https://github.com/lewis6991/satellite.nvim/,HEAD,
|
||||
https://github.com/davidgranstrom/scnvim/,HEAD,
|
||||
https://github.com/tiagovla/scope.nvim/,HEAD,
|
||||
https://github.com/Xuyuanp/scrollbar.nvim/,,
|
||||
https://github.com/cakebaker/scss-syntax.vim/,,
|
||||
|
||||
@@ -0,0 +1,68 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, boost
|
||||
, eigen
|
||||
, glm
|
||||
, libGL
|
||||
, libpng
|
||||
, openexr
|
||||
, tbb
|
||||
, xorg
|
||||
, ilmbase
|
||||
, llvmPackages
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "curv";
|
||||
version = "0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "curv3d";
|
||||
repo = "curv";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-m4p5uxRk6kEJUilmbQ1zJcQDRvRCV7pkxnqupZJxyjo=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
eigen
|
||||
glm
|
||||
libGL
|
||||
libpng
|
||||
openexr
|
||||
tbb
|
||||
xorg.libX11
|
||||
xorg.libXcursor
|
||||
xorg.libXext
|
||||
xorg.libXi
|
||||
xorg.libXinerama
|
||||
xorg.libXrandr
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
ilmbase
|
||||
llvmPackages.openmp
|
||||
];
|
||||
|
||||
# GPU tests do not work in sandbox, instead we do this for sanity
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
test "$($out/bin/curv -x 2 + 2)" -eq "4"
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A 2D and 3D geometric modelling programming language for creating art with maths";
|
||||
homepage = "https://github.com/curv3d/curv";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.all;
|
||||
broken = stdenv.isDarwin;
|
||||
maintainers = with maintainers; [ pbsds ];
|
||||
};
|
||||
}
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "gallery-dl";
|
||||
version = "1.25.5";
|
||||
version = "1.25.6";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "gallery_dl";
|
||||
sha256 = "sha256-IFzKVHIuZZ2WLk23ZqyxvwxXF45f2O/VAqQ/j98x4ag=";
|
||||
sha256 = "sha256-CCTO/1t6lIK2nQKtqgWq0HAm760t5tOhg8v99zUkY/U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@@ -36,7 +36,7 @@ buildPythonApplication rec {
|
||||
meta = with lib; {
|
||||
description = "Command-line program to download image-galleries and -collections from several image hosting sites";
|
||||
homepage = "https://github.com/mikf/gallery-dl";
|
||||
changelog = "https://github.com/mikf/gallery-dl/raw/v${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/mikf/gallery-dl/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ dawidsowa marsam ];
|
||||
};
|
||||
|
||||
@@ -8,7 +8,7 @@ buildGoModule rec {
|
||||
owner = "cloudnativelabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/ruSSq+iHmJDFHH+mLoqtdljAGlc15lXjTqq+luJIU8=";
|
||||
hash = "sha256-/ruSSq+iHmJDFHH+mLoqtdljAGlc15lXjTqq+luJIU8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-U2TvH4TPBI6verEcyv0Z+ZFAKbADgzncJhW1IAJw4Ms=";
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hydroxide";
|
||||
version = "0.2.26";
|
||||
version = "0.2.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emersion";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UCS49P83dGTD/Wx95Mslstm2C6hKgJB/1tJTZmmwLDg=";
|
||||
sha256 = "sha256-APRa+wZhls7O2q3zVPEB9Kegd1YspcfC8PSJy6KFlR8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-OLsJc/AMtD03KA8SN5rsnaq57/cB7bMB/f7FfEjErEU=";
|
||||
|
||||
@@ -13,19 +13,20 @@
|
||||
, wrapQtAppsHook
|
||||
, botan2
|
||||
, pkg-config
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "qownnotes";
|
||||
appname = "QOwnNotes";
|
||||
version = "23.6.4";
|
||||
version = "23.6.5";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname appname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-4uH76/zLgNcuX6nI6YtTxGB9cYj3jHla/B3w9w6CUx4=";
|
||||
hash = "sha256-FTGptp6RWVJYdLXtDI5cymt1bNr+0yHk0wLCOuTbxlE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -60,6 +61,9 @@ stdenv.mkDerivation {
|
||||
makeWrapper $out/Applications/${appname}.app/Contents/MacOS/${appname} $out/bin/${pname}
|
||||
'';
|
||||
|
||||
# Tests QOwnNotes using the NixOS module by launching xterm:
|
||||
passthru.tests.basic-nixos-module-functionality = nixosTests.qownnotes;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Plain-text file notepad and todo-list manager with markdown support and Nextcloud/ownCloud integration";
|
||||
homepage = "https://www.qownnotes.org/";
|
||||
|
||||
@@ -264,8 +264,8 @@ let
|
||||
makeScriptWriter {
|
||||
interpreter =
|
||||
if libraries == []
|
||||
then "${python}/bin/python"
|
||||
else "${python.withPackages (ps: libraries)}/bin/python"
|
||||
then python.interpreter
|
||||
else (python.withPackages (ps: libraries)).interpreter
|
||||
;
|
||||
check = optionalString python.isPy3k (writeDash "pythoncheck.sh" ''
|
||||
exec ${buildPythonPackages.flake8}/bin/flake8 --show-source ${ignoreAttribute} "$1"
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-mysql";
|
||||
version = "4.9.0";
|
||||
version = "4.10.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adamchainz";
|
||||
repo = "django-mysql";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-mXAdwNqSIrWMh+YcCjksiqmkLSXGAd+ofyzJmiG+gNo=";
|
||||
hash = "sha256-5RmNYOY0m6BRD/3cENQLWPJ+dElR53oZaqk616kfQTA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -45,7 +45,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://django-mysql.readthedocs.io/en/latest/changelog.html";
|
||||
changelog = "https://github.com/adamchainz/django-mysql/blob/${version}/docs/changelog.rst";
|
||||
description = "Extensions to Django for use with MySQL/MariaD";
|
||||
homepage = "https://github.com/adamchainz/django-mysql";
|
||||
license = licenses.mit;
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
, appdirs
|
||||
, buildPythonPackage
|
||||
, cachelib
|
||||
, colorama
|
||||
, cssselect
|
||||
, fetchFromGitHub
|
||||
, keep
|
||||
@@ -10,13 +11,14 @@
|
||||
, pygments
|
||||
, pyquery
|
||||
, requests
|
||||
, rich
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "howdoi";
|
||||
version = "2.0.19";
|
||||
version = "2.0.20";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -25,18 +27,20 @@ buildPythonPackage rec {
|
||||
owner = "gleitz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-uLAc6E8+8uPpo070vsG6Od/855N3gTQMf5pSUvtlh0I=";
|
||||
hash = "sha256-u0k+h7Sp2t/JUnfPqRzDpEA+vNXB7CpyZ/SRvk+B9t0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
appdirs
|
||||
cachelib
|
||||
colorama
|
||||
cssselect
|
||||
keep
|
||||
lxml
|
||||
pygments
|
||||
pyquery
|
||||
requests
|
||||
rich
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
@@ -48,20 +52,7 @@ buildPythonPackage rec {
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# AssertionError: "The...
|
||||
"test_get_text_with_one_link"
|
||||
"test_get_text_without_links"
|
||||
# Those tests are failing in the sandbox
|
||||
# OSError: [Errno 24] Too many open files
|
||||
"test_answers"
|
||||
"test_answers_bing"
|
||||
"test_colorize"
|
||||
"test_json_output"
|
||||
"test_missing_pre_or_code_query"
|
||||
"test_multiple_answers"
|
||||
"test_position"
|
||||
"test_unicode_answer"
|
||||
"test_answer_links_using_l_option"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
@@ -69,7 +60,8 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
|
||||
broken = stdenv.isDarwin;
|
||||
changelog = "https://github.com/gleitz/howdoi/blob/v${version}/CHANGES.txt";
|
||||
description = "Instant coding answers via the command line";
|
||||
homepage = "https://github.com/gleitz/howdoi";
|
||||
license = licenses.mit;
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysigma-backend-insightidr";
|
||||
version = "0.1.9";
|
||||
version = "0.2.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "SigmaHQ";
|
||||
repo = "pySigma-backend-insightidr";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/oHwWe8EcE1CS/hOmzJm9smfRLS/wShfbSGqOuvp8rU=";
|
||||
hash = "sha256-0VBnbThEkGhpxkGNBop0rPYn0NujyrK+ei/2+2f3Wno=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "somajo";
|
||||
version = "2.2.3";
|
||||
version = "2.2.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "tsproisl";
|
||||
repo = "SoMaJo";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-EnYw8TSZLXgB4pZaZBgxaO13PpTDx4lGsdGJ+51A6wE=";
|
||||
hash = "sha256-vO3wEM3WkPQqq+ureJY+cpRHQ4cOLPV6DukA5LOscEM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hcloud";
|
||||
version = "1.34.1";
|
||||
version = "1.35.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hetznercloud";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sibLu/lar1up1E0QiNRiWOwHqb8eYtE01tSLh8d2cqs=";
|
||||
sha256 = "sha256-Bk5IaJp7BzME2nBA/Y3AACyOPY/fRt1AP1qfrsAaHiw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Q9le/jbWkABlobn4qG/h48HEDYAPSkiy1N9YlUo6swQ=";
|
||||
vendorHash = "sha256-3Ot0evdpV7HcWiJLzAJeRXg2rpc9zOUU6LohmOwkR3g=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "circleci-cli";
|
||||
version = "0.1.26837";
|
||||
version = "0.1.26896";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CircleCI-Public";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-psl3I8kvBE+akVuz5bj9xFzKTUX7Lj2kBVzNN5fpltM=";
|
||||
sha256 = "sha256-nSqQr5fLkmN8ePc4JigHOMi7cXmmbpj4m864Ed/jYUw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-LzDofZI54cWP4FQfINq3tQbSi4c9/N1v0YH/aSzttNo=";
|
||||
vendorHash = "sha256-IUDiKAwhJdDkp7qXPMcP6+QjEZvevBH0IFKFPAsHKio=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -5,12 +5,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.4.5";
|
||||
version = "0.4.6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "zinclabs";
|
||||
repo = "zincsearch";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-V4eI7cur+KI+PEcplQJdTBaT0czpN0ENN30W5rrzE+k=";
|
||||
hash = "sha256-M2QNrQFMZJuJ2BlGmHT1eGGWccXqjLSjuEppP8uTWJw=";
|
||||
};
|
||||
|
||||
webui = buildNpmPackage {
|
||||
@@ -40,7 +40,7 @@ buildGoModule rec {
|
||||
cp -r ${webui}/share/zinc-ui web/dist
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-TYs1iRUA4WC3iMS508c7jUC3Co86CKYjL5WFlnoyPhg=";
|
||||
vendorHash = "sha256-/uZh50ImKWW7vYMfRqTbTAMUoRTZ9jXMbc3K16wYJkE=";
|
||||
subPackages = [ "cmd/zincsearch" ];
|
||||
|
||||
ldflags = [
|
||||
|
||||
@@ -115,7 +115,7 @@
|
||||
name = "test-reproducible-builds";
|
||||
buildCommand = ''
|
||||
# can't be tested more precisely because the value of random-seed changes depending on the output
|
||||
[[ $env.NIX_CFLAGS_COMPILE =~ "-frandom-seed=" ]]
|
||||
[[ $NIX_CFLAGS_COMPILE =~ "-frandom-seed=" ]]
|
||||
touch $out
|
||||
'';
|
||||
};
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "simplotask";
|
||||
version = "1.7.0";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "umputun";
|
||||
repo = "spot";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-aacG/s/zo4gMBsRug2i7vUyu1WUg3s+F8wtLsSVt7HQ=";
|
||||
hash = "sha256-u2Nj8AgkqwocxQMcPszzLaUu9vrbAA/cKjEqqxnbnr8=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -72,9 +72,9 @@ let
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = [ lib.maintainers.yarny ];
|
||||
description = "IBM Spectrum Protect (Tivoli Storage Manager) CLI and API";
|
||||
description = "IBM Storage Protect (Tivoli Storage Manager) CLI and API";
|
||||
longDescription = ''
|
||||
IBM Spectrum Protect (Tivoli Storage Manager) provides
|
||||
IBM Storage Protect (Tivoli Storage Manager) provides
|
||||
a single point of control for backup and recovery.
|
||||
This package contains the client software, that is,
|
||||
a command line client and linkable libraries.
|
||||
@@ -104,10 +104,10 @@ let
|
||||
|
||||
unwrapped = stdenv.mkDerivation rec {
|
||||
name = "tsm-client-${version}-unwrapped";
|
||||
version = "8.1.17.2";
|
||||
version = "8.1.19.0";
|
||||
src = fetchurl {
|
||||
url = mkSrcUrl version;
|
||||
hash = "sha512-DZCXb3fZO2VYJJJUdjGt9TSdrYNhf8w7QMgEERzX8xb74jjA+UPNI2dbNCeja/vrgRYLYipWZPyjTQJmkxlM/g==";
|
||||
hash = "sha512-HF4w8R6R+7gfIFsYlO3R6mkDxMo4TvL/KeK7IuuspGLiajGnBU2B7yg9/oUiT11YUBHjklaINyceQWWJoFSQJw==";
|
||||
};
|
||||
inherit meta passthru;
|
||||
|
||||
|
||||
@@ -7,12 +7,12 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "gigalixir";
|
||||
version = "1.3.0";
|
||||
version = "1.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-kNtybgv8j7t1tl6R5ZuC4vj5fnEcEenuNt0twA1kAh0=";
|
||||
hash = "sha256-01CoCT++mGiwZ40vAjU3OFE74WGWlBuhaTwsNFIR1a0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -42,6 +42,12 @@ python3.pkgs.buildPythonApplication rec {
|
||||
disabledTests = [
|
||||
# Test requires network access
|
||||
"test_rollback_without_version"
|
||||
# These following test's are now depraced and removed, check out these commits:
|
||||
# https://github.com/gigalixir/gigalixir-cli/commit/00b758ed462ad8eff6ff0b16cd37fa71f75b2d7d
|
||||
# https://github.com/gigalixir/gigalixir-cli/commit/76fa25f96e71fd75cc22e5439b4a8f9e9ec4e3e5
|
||||
"test_create_config"
|
||||
"test_delete_free_database"
|
||||
"test_get_free_databases"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kapp";
|
||||
version = "0.57.0";
|
||||
version = "0.57.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware-tanzu";
|
||||
repo = "carvel-kapp";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kcG5Ag+1sMy+qePd8NwPFBgwNAboH6d6315fbpi8nTc=";
|
||||
sha256 = "sha256-JNo6+WlMcIUGb/36GM6ofvJBIJnF4oRocdYsEw7V1Ks=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -6805,6 +6805,8 @@ with pkgs;
|
||||
|
||||
trurl = callPackage ../tools/networking/trurl { };
|
||||
|
||||
curv = callPackage ../applications/graphics/curv { };
|
||||
|
||||
cunit = callPackage ../tools/misc/cunit { };
|
||||
bcunit = callPackage ../tools/misc/bcunit { };
|
||||
|
||||
@@ -9248,9 +9250,7 @@ with pkgs;
|
||||
|
||||
kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { };
|
||||
|
||||
kube-router = callPackage ../applications/networking/cluster/kube-router {
|
||||
buildGoModule = buildGo119Module; # go 1.20 build failure
|
||||
};
|
||||
kube-router = callPackage ../applications/networking/cluster/kube-router { };
|
||||
|
||||
kubepug = callPackage ../development/tools/kubepug { };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user