Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2024-01-14 12:01:53 +00:00 committed by GitHub
commit d841ab8796
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
37 changed files with 515 additions and 155 deletions

View File

@ -26,6 +26,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
with subtest("Test we can see usernames in elementary-greeter"):
machine.wait_for_text("${user.description}")
machine.wait_until_succeeds("pgrep -f io.elementary.greeter-compositor")
# OCR was struggling with this one.
# machine.wait_for_text("${bob.description}")
# Ensure the password box is focused by clicking it.
@ -39,21 +40,29 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
machine.wait_for_x()
machine.wait_for_file("${user.home}/.Xauthority")
machine.succeed("xauth merge ${user.home}/.Xauthority")
machine.wait_until_succeeds('journalctl -t gnome-session-binary --grep "Entering running state"')
with subtest("Check that logging in has given the user ownership of devices"):
machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
with subtest("Check if pantheon session components actually start"):
machine.wait_until_succeeds("pgrep gala")
machine.wait_for_window("gala")
machine.wait_until_succeeds("pgrep -f io.elementary.wingpanel")
machine.wait_for_window("io.elementary.wingpanel")
machine.wait_until_succeeds("pgrep plank")
machine.wait_for_window("plank")
machine.wait_until_succeeds("pgrep -f gsd-media-keys")
with subtest("Check if Pantheon components actually start"):
for i in ["gala", "io.elementary.wingpanel", "plank", "gsd-media-keys", "io.elementary.desktop.agent-polkit"]:
machine.wait_until_succeeds(f"pgrep -f {i}")
for i in ["gala", "io.elementary.wingpanel", "plank"]:
machine.wait_for_window(i)
machine.wait_for_unit("bamfdaemon.service", "${user.name}")
machine.wait_for_unit("io.elementary.files.xdg-desktop-portal.service", "${user.name}")
with subtest("Check if various environment variables are set"):
cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf /run/current-system/sw/bin/gala)/environ"
machine.succeed(f"{cmd} | grep 'XDG_CURRENT_DESKTOP' | grep 'Pantheon'")
# Hopefully from the sessionPath option.
machine.succeed(f"{cmd} | grep 'XDG_DATA_DIRS' | grep 'gsettings-schemas/pantheon-agent-geoclue2'")
# Hopefully from login shell.
machine.succeed(f"{cmd} | grep '__NIXOS_SET_ENVIRONMENT_DONE' | grep '1'")
# See elementary-session-settings packaging.
machine.succeed(f"{cmd} | grep 'XDG_CONFIG_DIRS' | grep 'elementary-default-settings'")
with subtest("Open elementary videos"):
machine.execute("su - ${user.name} -c 'DISPLAY=:0 io.elementary.videos >&2 &'")
machine.sleep(2)
@ -61,6 +70,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
machine.wait_for_text("No Videos Open")
with subtest("Open elementary calendar"):
machine.wait_until_succeeds("pgrep -f evolution-calendar-factory")
machine.execute("su - ${user.name} -c 'DISPLAY=:0 io.elementary.calendar >&2 &'")
machine.sleep(2)
machine.wait_for_window("io.elementary.calendar")
@ -75,6 +85,14 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
machine.execute("su - ${user.name} -c 'DISPLAY=:0 io.elementary.terminal >&2 &'")
machine.wait_for_window("io.elementary.terminal")
with subtest("Trigger multitasking view"):
cmd = "dbus-send --session --dest=org.pantheon.gala --print-reply /org/pantheon/gala org.pantheon.gala.PerformAction int32:1"
env = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${toString user.uid}/bus DISPLAY=:0"
machine.succeed(f"su - ${user.name} -c '{env} {cmd}'")
machine.sleep(3)
machine.screenshot("multitasking")
machine.succeed(f"su - ${user.name} -c '{env} {cmd}'")
with subtest("Check if gala has ever coredumped"):
machine.fail("coredumpctl --json=short | grep gala")
# So you can see the dock in the below screenshot.

View File

@ -2749,8 +2749,8 @@ let
publisher = "nvarner";
# Please update the corresponding binary (typst-lsp) when updating
# this extension.
version = "0.12.0";
sha256 = "sha256-9v6zJyeUBj0TOpK2otLqZ0ksjmzExKTJYRF+9akvuuo=";
version = "0.12.1";
sha256 = "sha256-JcfFaR1wU5XwapH8vnfVy7Cb7DfUWVeoLfBV3wEtCpE=";
};
nativeBuildInputs = [ jq moreutils ];

View File

@ -0,0 +1,131 @@
{ lib
, stdenv
, callPackage
, fetchFromGitHub
, testers
, enableE57 ? lib.meta.availableOn stdenv.hostPlatform libe57format
, cmake
, curl
, gdal
, hdf5-cpp
, LASzip
, libe57format
, libgeotiff
, libtiff
, libxml2
, openscenegraph
, pkg-config
, postgresql
, tiledb
, xercesc
, zlib
, zstd
}:
stdenv.mkDerivation (finalAttrs: {
pname = "pdal";
version = "2.5.6";
src = fetchFromGitHub {
owner = "PDAL";
repo = "PDAL";
rev = finalAttrs.version;
sha256 = "sha256-JKwa89c05EfZ/FxOkj8lYmw0o2EgSqafRDIV2mTpZ5E=";
};
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
curl
gdal
hdf5-cpp
LASzip
libgeotiff
libtiff
libxml2
openscenegraph
postgresql
tiledb
xercesc
zlib
zstd
] ++ lib.optionals enableE57 [
libe57format
];
cmakeFlags = [
"-DBUILD_PLUGIN_E57=${if enableE57 then "ON" else "OFF"}"
"-DBUILD_PLUGIN_HDF=ON"
"-DBUILD_PLUGIN_PGPOINTCLOUD=ON"
"-DBUILD_PLUGIN_TILEDB=ON"
"-DWITH_TESTS=ON"
"-DBUILD_PGPOINTCLOUD_TESTS=OFF"
# Plugins can probably not be made work easily:
"-DBUILD_PLUGIN_CPD=OFF"
"-DBUILD_PLUGIN_FBX=OFF" # Autodesk FBX SDK is gratis+proprietary; not packaged in nixpkgs
"-DBUILD_PLUGIN_GEOWAVE=OFF"
"-DBUILD_PLUGIN_I3S=OFF"
"-DBUILD_PLUGIN_ICEBRIDGE=OFF"
"-DBUILD_PLUGIN_MATLAB=OFF"
"-DBUILD_PLUGIN_MBIO=OFF"
"-DBUILD_PLUGIN_MRSID=OFF"
"-DBUILD_PLUGIN_NITF=OFF"
"-DBUILD_PLUGIN_OCI=OFF"
"-DBUILD_PLUGIN_RDBLIB=OFF" # Riegl rdblib is proprietary; not packaged in nixpkgs
"-DBUILD_PLUGIN_RIVLIB=OFF"
];
doCheck = true;
disabledTests = [
# Tests failing due to TileDB library implementation, disabled also
# by upstream CI.
# See: https://github.com/PDAL/PDAL/blob/bc46bc77f595add4a6d568a1ff923d7fe20f7e74/.github/workflows/linux.yml#L81
"pdal_io_tiledb_writer_test"
"pdal_io_tiledb_reader_test"
"pdal_io_tiledb_time_writer_test"
"pdal_io_tiledb_time_reader_test"
"pdal_io_tiledb_bit_fields_test"
"pdal_io_e57_read_test"
"pdal_io_e57_write_test"
"pdal_io_stac_reader_test"
# Segfault
"pdal_io_hdf_reader_test"
# Failure
"pdal_app_plugin_test"
];
checkPhase = ''
runHook preCheck
# tests are flaky and they seem to fail less often when they don't run in
# parallel
ctest -j 1 --output-on-failure -E '^${lib.concatStringsSep "|" finalAttrs.disabledTests}$'
runHook postCheck
'';
passthru.tests = {
version = testers.testVersion {
package = finalAttrs.finalPackage;
command = "pdal --version";
version = "pdal ${finalAttrs.finalPackage.version}";
};
pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
};
meta = with lib; {
description = "PDAL is Point Data Abstraction Library. GDAL for point cloud data";
homepage = "https://pdal.io";
license = licenses.bsd3;
maintainers = teams.geospatial.members;
platforms = platforms.all;
pkgConfigModules = [ "pdal" ];
};
})

View File

@ -1,4 +1,5 @@
{ lib
, callPackage
, fetchFromGitHub
, fetchpatch
, makeWrapper
@ -24,7 +25,7 @@
, netcdf
, ninja
, openssl
, pdal
# , pdal
, postgresql
, proj
, protobuf
@ -47,6 +48,10 @@
let
# replace with global pdal version once
# https://github.com/qgis/QGIS/pull/54940 is backported
pdal = callPackage ./pdal-2_5.nix { };
py = python3.override {
packageOverrides = self: super: {
pyqt5 = super.pyqt5.override {

View File

@ -2,6 +2,8 @@
, fetchFromGitea
, rustPlatform
, nix-update-script
, imagemagick
, makeWrapper
}:
let
version = "2.9.0";
@ -20,6 +22,13 @@ rustPlatform.buildRustPackage {
cargoHash = "sha256-O9w18ae83mgF3zjk0WUMeu16Ap7CF2ubuPnOqeCt4Nw=";
nativeBuildInputs = [ makeWrapper ];
postFixup = ''
wrapProgram $out/bin/wallust \
--prefix PATH : "${lib.makeBinPath [ imagemagick ]}"
'';
passthru.updateScript = nix-update-script { };
meta = {

View File

@ -7,18 +7,18 @@
rustPlatform.buildRustPackage rec {
pname = "wttrbar";
version = "0.7.0";
version = "0.7.1";
src = fetchFromGitHub {
owner = "bjesus";
repo = "wttrbar";
rev = version;
hash = "sha256-AGIUMw4lvYiUJol4VYS+ozNMsCDNGPCsg+fwMlpWEJY=";
hash = "sha256-b5GJNbXv6W4UA7nKYMgoWpfd9J+yWlWij5W0fh52vgs=";
};
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Security SystemConfiguration ]);
cargoHash = "sha256-3FDY0SUl1lb9jUjUj14j/5gF5NoSpS1PMj1AtXr/4Hk=";
cargoHash = "sha256-MCsblCDiCRDEHTfTcE6CyhqDclSbj0TJEf2cX6ISDFo=";
meta = {
description = "A simple but detailed weather indicator for Waybar using wttr.in";

View File

@ -0,0 +1,29 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "exiflooter";
version = "1.0.0";
src = fetchFromGitHub {
owner = "aydinnyunus";
repo = "exiflooter";
rev = "v${version}";
hash = "sha256-E7fxV+w8N9xi8UuaKBTZBzPjIHJt9/U+oVIu2+Ond+Y=";
};
vendorHash = "sha256-uV7O2H3gPQ+kFdEHLgM+v+TXn+87QfFwOAEQpnKQIQk=";
ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "Finds geolocation on all image urls and directories";
homepage = "https://github.com/aydinnyunus/exiflooter";
changelog = "https://github.com/aydinnyunus/exifLooter/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ octodi ];
mainProgram = "exiflooter";
};
}

View File

@ -0,0 +1,36 @@
{ lib
, stdenv
, fetchzip
}:
stdenv.mkDerivation (finalAttrs: {
pname = "galleta";
version = "20040505_1";
src = fetchzip {
url = "mirror://sourceforge/project/odessa/Galleta/${finalAttrs.version}/galleta_${finalAttrs.version}.zip";
hash = "sha256-tc5XLToyQZutb51ZoBlGWXDpsSqdJ89bjzJwY8kRncA=";
};
makeFlags = [
"-C src"
];
enableParallelBuilding = true;
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp bin/galleta $out/bin
runHook postInstall
'';
meta = with lib; {
description = "Examine the contents of the IE's cookie files for forensic purposes";
mainProgram = "galleta";
homepage = "https://sourceforge.net/projects/odessa/files/Galleta";
maintainers = with maintainers; [ d3vil0p3r ];
platforms = platforms.unix;
license = licenses.bsd3;
};
})

View File

@ -0,0 +1,37 @@
{ lib
, python3
, fetchFromGitHub
}:
python3.pkgs.buildPythonApplication rec {
pname = "h8mail";
version = "2.5.6";
pyproject = true;
src = fetchFromGitHub {
owner = "khast3x";
repo = "h8mail";
rev = "refs/tags/${version}";
hash = "sha256-gKRght/12apPD1u3mRY/yCPT0XAyXwaYgaqyJHrDLgw=";
};
nativeBuildInputs = with python3.pkgs; [
setuptools
wheel
];
propagatedBuildInputs = with python3.pkgs; [
requests
];
pythonImportsCheck = [ "h8mail" ];
meta = with lib; {
description = "Email OSINT & Password breach hunting tool";
homepage = "https://github.com/khast3x/h8mail";
changelog = "https://github.com/khast3x/h8mail/releases/tag/${version}";
license = licenses.bsd3;
maintainers = with maintainers; [ octodi ];
mainProgram = "h8mail";
};
}

View File

@ -54,29 +54,28 @@ stdenv.mkDerivation (finalAttrs: {
"-DBUILD_BUNDLE=OFF"
];
installPhase =
let
library_path = lib.strings.makeLibraryPath [
"$out"
cairo
freetype
libgit2
SDL2
];
in
''
runHook preInstall
installPhase = ''
runHook preInstall
cmake --build . --target=install
mkdir -p "$out/lib"
mkdir "$out/bin"
cp build/vm/*.so* "$out/lib/"
cp build/vm/pharo "$out/bin/pharo"
patchelf --allowed-rpath-prefixes "$NIX_STORE" --shrink-rpath "$out/bin/pharo"
wrapProgram "$out/bin/pharo" --set LD_LIBRARY_PATH "${library_path}"
cmake --build . --target=install
mkdir -p "$out/lib"
mkdir "$out/bin"
cp build/vm/*.so* "$out/lib/"
cp build/vm/pharo "$out/bin/pharo"
runHook postInstall
'';
runHook postInstall
'';
preFixup = let
libPath = lib.makeLibraryPath (finalAttrs.buildInputs ++ [
stdenv.cc.cc.lib
"$out"
]);
in ''
patchelf --allowed-rpath-prefixes "$NIX_STORE" --shrink-rpath "$out/bin/pharo"
ln -s "${libgit2}/lib/libgit2.so" $out/lib/libgit2.so.1.1
wrapProgram "$out/bin/pharo" --argv0 $out/bin/pharo --prefix LD_LIBRARY_PATH ":" "${libPath}"
'';
meta = {
description = "Clean and innovative Smalltalk-inspired environment";

View File

@ -0,0 +1,26 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "scout";
version = "0.15.1";
src = fetchFromGitHub {
owner = "liamg";
repo = pname;
rev = "v${version}";
hash = "sha256-9SimePyBUXXfT4+ZtciQMaoyXpyKi9D3LTwud8QMJ6w=";
};
vendorHash = "sha256-reoE3WNgulREwxoeGFEN1QONZ2q1LHmQF7+iGx0SGTY=";
meta = with lib; {
description = "Lightweight URL fuzzer and spider: Discover a web server's undisclosed files, directories and VHOSTs";
homepage = "https://github.com/liamg/scout";
platforms = platforms.unix;
license = licenses.unlicense;
maintainers = with maintainers; [ totoroot ];
};
}

View File

@ -7,14 +7,14 @@
rustPlatform.buildRustPackage rec {
pname = "systemctl-tui";
version = "0.2.2";
version = "0.2.4";
src = fetchCrate {
inherit pname version;
hash = "sha256-q/LzehMspiqxQOgALh1smhmL1803xr4GzIw9t+jE6NM=";
hash = "sha256-SZmOCx9S5WWz9fSlicvT/glZKj5AsFDRnxmHbGxM9Ms=";
};
cargoHash = "sha256-GNuWag8Y1aSkBMzXcHpwfVU80zmhusLIOrKtZSe/jI0=";
cargoHash = "sha256-zUc6RchoGtJB+gnJNwNu93to775fdM5JDJ4qYwRdJn0=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.AppKit

View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "tarlz";
version = "0.24";
version = "0.25";
outputs = [ "out" "man" "info" ];
nativeBuildInputs = [ lzip texinfo ];
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://savannah/lzip/${pname}/${pname}-${version}.tar.lz";
sha256 = "49838effe95acb29d548b7ef2ddbb4b63face40536df0d9a80a62900c7170576";
sha256 = "7d0bbe9c3a137bb93a10be56988fcf7362e4dbc65490639edc4255b704105fce";
};
enableParallelBuilding = true;

View File

@ -8,14 +8,14 @@
stdenv.mkDerivation rec {
pname = "capnproto";
version = "1.0.1.1";
version = "1.0.2";
# release tarballs are missing some ekam rules
src = fetchFromGitHub {
owner = "capnproto";
repo = "capnproto";
rev = "v${version}";
sha256 = "sha256-LFpCQiepPG78iMq/d3NAN6cSZI1X0QgkKRIxeeZhfEQ=";
sha256 = "sha256-LVdkqVBTeh8JZ1McdVNtRcnFVwEJRNjt0JV2l7RkuO8=";
};
nativeBuildInputs = [ cmake ];

View File

@ -447,7 +447,7 @@ stdenv.mkDerivation (finalAttrs: {
*/
(enableFeature withAlsa "alsa")
# FIXME: see if jellyfin-ffmpeg is already on a version >= 6.1 to use enableFeature
(optionalString withAribcaption "--enable-libaribcaption")
(optionalString (withAribcaption && lib.versionAtLeast finalAttrs.version "6.1") "--enable-libaribcaption")
(enableFeature withBzlib "bzlib")
(enableFeature withCelt "libcelt")
(enableFeature withCuda "cuda")

View File

@ -86,7 +86,9 @@ stdenv.mkDerivation rec {
# ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration";
doCheck = stdenv.isLinux;
# Checks last re-enabled in https://github.com/NixOS/nixpkgs/pull/279843, but timeouts in tests still
# occur inconsistently
doCheck = false;
# Prevents e-d-s add-contacts-stress-test from timing out
checkPhase = ''

View File

@ -5,7 +5,6 @@
, cmake
, expat
, yaml-cpp
, ilmbase
, pystring
, imath
, minizip-ng
@ -60,7 +59,6 @@ stdenv.mkDerivation rec {
buildInputs = [
expat
yaml-cpp
ilmbase
pystring
imath
minizip-ng

View File

@ -2,6 +2,7 @@
, stdenv
, callPackage
, fetchFromGitHub
, fetchpatch
, testers
, enableE57 ? lib.meta.availableOn stdenv.hostPlatform libe57format
@ -18,6 +19,7 @@
, openscenegraph
, pkg-config
, postgresql
, proj
, tiledb
, xercesc
, zlib
@ -26,15 +28,24 @@
stdenv.mkDerivation (finalAttrs: {
pname = "pdal";
version = "2.5.6";
version = "2.6.2";
src = fetchFromGitHub {
owner = "PDAL";
repo = "PDAL";
rev = finalAttrs.version;
sha256 = "sha256-JKwa89c05EfZ/FxOkj8lYmw0o2EgSqafRDIV2mTpZ5E=";
sha256 = "sha256-bYTSmrel8MLza+OxO+aOSsnkahjjqRRqUiVwAk23Gxk=";
};
patches = [
# Fix running tests
# https://github.com/PDAL/PDAL/issues/4280
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/PDAL/PDAL/pull/4291.patch";
sha256 = "sha256-jFS+trwMRBfm+MpT0CcuD/hdYmfyuQj2zyoe06B6G9U=";
})
];
nativeBuildInputs = [
cmake
pkg-config
@ -50,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
libxml2
openscenegraph
postgresql
proj
tiledb
xercesc
zlib
@ -63,6 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
"-DBUILD_PLUGIN_HDF=ON"
"-DBUILD_PLUGIN_PGPOINTCLOUD=ON"
"-DBUILD_PLUGIN_TILEDB=ON"
"-DWITH_COMPLETION=ON"
"-DWITH_TESTS=ON"
"-DBUILD_PGPOINTCLOUD_TESTS=OFF"
@ -92,6 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
"pdal_io_tiledb_time_writer_test"
"pdal_io_tiledb_time_reader_test"
"pdal_io_tiledb_bit_fields_test"
"pdal_io_tiledb_utils_test"
"pdal_io_e57_read_test"
"pdal_io_e57_write_test"
"pdal_io_stac_reader_test"

View File

@ -1,38 +1,35 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, poetry-dynamic-versioning
, aiobotocore
, aiofiles
, boto3
, buildPythonPackage
, chalice
, cryptography
, boto3
, pytestCheckHook
, pytest-asyncio
, requests
, aiofiles
, moto
, dill
, fetchFromGitHub
, moto
, poetry-core
, poetry-dynamic-versioning
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, requests
}:
buildPythonPackage rec {
pname = "aioboto3";
version = "11.3.0";
version = "12.1.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "terrycain";
repo = "aioboto3";
rev = "v${version}";
hash = "sha256-jU9sKhbUdVeOvOXQnXR/S/4sBwTNcQCc9ZduO+HDXho=";
rev = "refs/tags/v${version}";
hash = "sha256-CVRDQhymQRi5dyVBLJYTnF3RI4jPBB966dVMT4lOd8g=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace poetry.masonry.api poetry.core.masonry.api \
--replace "poetry>=0.12" "poetry-core>=0.12"
'';
nativeBuildInputs = [
poetry-core
poetry-dynamic-versioning
@ -53,15 +50,27 @@ buildPythonPackage rec {
};
nativeCheckInputs = [
pytestCheckHook
pytest-asyncio
requests
aiofiles
moto
dill
moto
pytest-asyncio
pytestCheckHook
requests
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
pythonImportsCheck = [ "aioboto3" ];
pythonImportsCheck = [
"aioboto3"
];
disabledTests = [
# Our moto package is not ready to support more tests
"encrypt_decrypt_aes_cbc"
"test_chalice_async"
"test_dynamo"
"test_flush_doesnt_reset_item_buffer"
"test_kms"
"test_s3"
];
meta = with lib; {
description = "Wrapper to use boto3 resources with the aiobotocore async backend";

View File

@ -1,24 +1,41 @@
{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook }:
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "argparse-dataclass";
version = "1.0.0";
format = "setuptools";
version = "2.0.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "mivade";
repo = "argparse_dataclass";
rev = version;
sha256 = "6//XQKUnCH3ZtOL6M/EstMJ537nEmbuGQNqfelTluOs=";
rev = "refs/tags/${version}";
hash = "sha256-ASdP6LOEeTszyppYV6vRQX8BKOHYUimI36tMSZTQfTk=";
};
checkInputs = [ pytestCheckHook ];
nativeBuildInputs = [
setuptools
];
pythonImportsCheck = [ "argparse_dataclass" ];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"argparse_dataclass"
];
meta = with lib; {
description = "Declarative CLIs with argparse and dataclasses";
homepage = "https://github.com/mivade/argparse_dataclass";
changelog = "https://github.com/mivade/argparse_dataclass/blob/${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ tm-drtina ];
};

View File

@ -5,22 +5,27 @@
, pytest-aiohttp
, pytestCheckHook
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "arris-tg2492lg";
version = "2.1.0";
format = "setuptools";
version = "2.2.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "vanbalken";
repo = pname;
rev = version;
hash = "sha256-C1o9HWWJ/G/7Pp6I0FbRmX2PQvUJx71L9wHRkUMtnL4=";
repo = "arris-tg2492lg";
rev = "refs/tags/${version}";
hash = "sha256-MQq9jMUoJgqaY0f9YIbhME2kO+ektPqBnT9REg3qDpg=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
aiohttp
];
@ -37,6 +42,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library to connect to an Arris TG2492LG";
homepage = "https://github.com/vanbalken/arris-tg2492lg";
changelog = "https://github.com/vanbalken/arris-tg2492lg/releases/tag/${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "casbin";
version = "1.34.0";
version = "1.35.0";
pyproject = true;
disabled = pythonOlder "3.6";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "casbin";
repo = "pycasbin";
rev = "refs/tags/v${version}";
hash = "sha256-SlXM97rLRGZvqpzkYlrL+SClWYtw6xAKotaeQ7kVpjM=";
hash = "sha256-XVFuRmeQwm+3kyO71F8nxB+VdaPS+5oTAk5XqcjvkCM=";
};
nativeBuildInputs = [

View File

@ -2,22 +2,21 @@
, buildPythonPackage
, fetchFromGitHub
, substituteAll
, cmdstan
, pythonRelaxDepsHook
, setuptools
, pandas
, numpy
, tqdm
, stanio
, xarray
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "cmdstanpy";
version = "1.2.0";
format = "setuptools";
pyproject = true;
src = fetchFromGitHub {
owner = "stan-dev";
@ -38,6 +37,11 @@ buildPythonPackage rec {
rm test/conftest.py
'';
nativeBuildInputs = [
setuptools
pythonRelaxDepsHook
];
propagatedBuildInputs = [
pandas
numpy
@ -49,6 +53,8 @@ buildPythonPackage rec {
all = [ xarray ];
};
pythonRelaxDeps = [ "stanio" ];
preCheck = ''
export HOME=$(mktemp -d)
'';

View File

@ -3,6 +3,7 @@
, setuptools
, setuptools-changelog-shortener
, requests
, tomli
, pytestCheckHook
, lazy
}:
@ -27,6 +28,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
requests
lazy
tomli
];
nativeCheckInputs = [

View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "dominate";
version = "2.9.0";
version = "2.9.1";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-sVeR6+pDIhhUOhcC12rkXS/5X/mU5SAUuGhqadrXcv0=";
hash = "sha256-VYKEaH2biq4ZBOPWBRrRMt1KjAz1UbN+pOfkKjHRncQ=";
};
nativeBuildInputs = [
@ -33,6 +33,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library for creating and manipulating HTML documents using an elegant DOM API";
homepage = "https://github.com/Knio/dominate/";
changelog = "https://github.com/Knio/dominate/releases/tag/${version}";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ ];
};

View File

@ -56,14 +56,14 @@
buildPythonPackage rec {
pname = "dvc";
version = "3.38.1";
version = "3.39.0";
pyproject = true;
src = fetchFromGitHub {
owner = "iterative";
repo = "dvc";
rev = "refs/tags/${version}";
hash = "sha256-P3N9wCmua0kS9vli+QUjJPZSeQXO9t8m1Ei+CeN2tEU=";
hash = "sha256-sFrbG9CKt8PaW9qdXBxEa516lnRWzFdTEbdCW6VFUuQ=";
};
pythonRelaxDeps = [

View File

@ -1,13 +1,11 @@
{ lib
, aiofiles
, aiohttp
, anyio
, backoff
, botocore
, buildPythonPackage
, fetchFromGitHub
, graphql-core
, httpx
, mock
, parse
, pytest-asyncio
@ -16,7 +14,6 @@
, pythonOlder
, requests
, requests-toolbelt
, setuptools
, urllib3
, vcrpy
, websockets
@ -25,26 +22,25 @@
buildPythonPackage rec {
pname = "gql";
version = "3.6.0b0";
pyproject = true;
version = "3.4.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "graphql-python";
repo = "gql";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-yX6NbtGxBa3lL/bS3j2ouTPku6a4obqNGx1xRzx+Skk=";
hash = "sha256-/uPaRju2AJCjMCfA29IKQ4Hu71RBu/Yz8jHwk9EE1Eg=";
};
__darwinAllowLocalNetworking = true;
nativeBuildInputs = [
setuptools
];
postPatch = ''
substituteInPlace setup.py --replace \
"websockets>=10,<11;python_version>'3.6'" \
"websockets>=10,<12;python_version>'3.6'"
'';
propagatedBuildInputs = [
anyio
backoff
graphql-core
yarl
@ -64,7 +60,6 @@ buildPythonPackage rec {
all = [
aiohttp
botocore
httpx
requests
requests-toolbelt
urllib3
@ -73,9 +68,6 @@ buildPythonPackage rec {
aiohttp = [
aiohttp
];
httpx = [
httpx
];
requests = [
requests
requests-toolbelt

View File

@ -1,13 +1,12 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, jinja2
, lxml
, mock
, ncclient
, netaddr
, nose
, nose2
, ntc-templates
, paramiko
, pyparsing
@ -15,6 +14,8 @@
, pythonOlder
, pyyaml
, scp
, setuptools
, pytestCheckHook
, six
, transitions
, yamlordereddictloader
@ -22,23 +23,21 @@
buildPythonPackage rec {
pname = "junos-eznc";
version = "2.6.8";
format = "setuptools";
version = "2.7.0";
pyproject = true;
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "Juniper";
repo = "py-junos-eznc";
rev = "refs/tags/${version}";
hash = "sha256-5xZjuU2U3BodAMQiWZIJ27AZiAwoMm4yJ4qr3DjMd9o=";
hash = "sha256-06OV6UrF2i4SxL5dCvVxsEX2e8ef8UBFx/oMbvCZDaM=";
};
postPatch = ''
# https://github.com/Juniper/py-junos-eznc/issues/1236
substituteInPlace lib/jnpr/junos/utils/scp.py \
--replace "inspect.getargspec" "inspect.getfullargspec"
'';
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
jinja2
@ -58,21 +57,33 @@ buildPythonPackage rec {
nativeCheckInputs = [
mock
nose
nose2
pytestCheckHook
];
checkPhase = ''
nosetests -v -a unit --exclude=test_sw_put_ftp
'';
pytestFlagsArray = [
"tests/unit"
];
disabledTests = [
# jnpr.junos.exception.FactLoopError: A loop was detected while gathering the...
"TestPersonality"
"TestGetSoftwareInformation"
"TestIfdStyle"
# KeyError: 'mac'
"test_textfsm_table_mutli_key"
# AssertionError: None != 'juniper.net'
"test_domain_fact_from_config"
];
pythonImportsCheck = [
"jnpr.junos"
];
meta = with lib; {
changelog = "https://github.com/Juniper/py-junos-eznc/releases/tag/${version}";
description = "Junos 'EZ' automation for non-programmers";
homepage = "https://github.com/Juniper/py-junos-eznc";
changelog = "https://github.com/Juniper/py-junos-eznc/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ xnaveira ];
};

View File

@ -1,11 +1,8 @@
{
cp39 = {
sha256 = "0e0f7dbeb4444940c72b64fdecd6f331593466914b2dffeed03ce97225acec14";
};
cp310 = {
sha256 = "b83621f5d2d4079e6ae624c3bf30046a4fefa0ea7ea5e4a4dfe4b50c580b3768";
hash = "sha256-u3lZbEScS6AnvJg5KZYX2Mh2saW2Hxah5AGqkBrUUYM=";
};
cp311 = {
sha256 = "8384b3f30bc1446ef810e9e894afa03238c5ac40d3c40c0740d82f347112015d";
hash = "sha256-E8VV/nMPzjVXJuja56fWztvkcKfhJXSACOv8RLDFgn0=";
};
}

View File

@ -52,13 +52,13 @@
let
pname = "ray";
version = "2.7.0";
version = "2.9.0";
in
buildPythonPackage rec {
inherit pname version;
format = "wheel";
disabled = pythonOlder "3.9" || pythonAtLeast "3.12";
disabled = pythonOlder "3.10" || pythonAtLeast "3.12";
src =
let

View File

@ -20,6 +20,12 @@ buildPythonPackage rec {
hash = "sha256-moCWUPzn9stxehVEnjqpx8ILYhxzuy8QG+uxR53rCew=";
};
postPatch = ''
# Upstream doesn't set a version in the pyproject.toml file
substituteInPlace pyproject.toml \
--replace "0.0.0" "${version}"
'';
nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [ pillow ];

View File

@ -21,6 +21,12 @@ buildPythonPackage rec {
hash = "sha256-cZNmoqzU73iF965abFeM6qgEVmg6j2kIQHDhj1MYQpE=";
};
postPatch = ''
# Upstream doesn't set a version in the pyproject.toml file
substituteInPlace pyproject.toml \
--replace "0.0.0" "${version}"
'';
nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [

View File

@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "virt-firmware";
version = "23.11";
version = "24.1.1";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-9HA87J01M9VGCHdcmdlA50AikXG8vYHDw/5ig8h9YXc=";
hash = "sha256-dUDfDQypP8hCo4eZcnUsOovgMksSX7hxMQI8mliCx2c=";
};
pythonImportsCheck = [ "virt.firmware.efi" ];

View File

@ -637,9 +637,9 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
[[package]]
name = "elsa"
version = "1.9.0"
version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "714f766f3556b44e7e4776ad133fcc3445a489517c25c704ace411bb14790194"
checksum = "d98e71ae4df57d214182a2e5cb90230c0192c6ddfcaa05c36453d46a54713e10"
dependencies = [
"stable_deref_trait",
]
@ -1755,9 +1755,9 @@ dependencies = [
[[package]]
name = "once_cell"
version = "1.18.0"
version = "1.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
[[package]]
name = "openssl"
@ -2983,9 +2983,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
version = "1.34.0"
version = "1.35.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9"
checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
dependencies = [
"backtrace",
"bytes",
@ -3364,7 +3364,7 @@ dependencies = [
[[package]]
name = "typst-lsp"
version = "0.12.0"
version = "0.12.1"
dependencies = [
"anyhow",
"async-compression",
@ -3479,8 +3479,8 @@ dependencies = [
[[package]]
name = "typstfmt_lib"
version = "0.2.6"
source = "git+https://github.com/astrale-sharp/typstfmt?tag=0.2.6#b45cab03ac76e621ef1174160d03c4f7637a82df"
version = "0.2.7"
source = "git+https://github.com/astrale-sharp/typstfmt?tag=0.2.7#46b4ec34b4726c3c6541012f433c68c22d9e509c"
dependencies = [
"globmatch",
"itertools 0.10.5",
@ -3582,9 +3582,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
[[package]]
name = "unsafe-libyaml"
version = "0.2.9"
version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa"
checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b"
[[package]]
name = "unscanny"

View File

@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec {
pname = "typst-lsp";
# Please update the corresponding vscode extension when updating
# this derivation.
version = "0.12.0";
version = "0.12.1";
src = fetchFromGitHub {
owner = "nvarner";
repo = "typst-lsp";
rev = "v${version}";
hash = "sha256-7T5BxAq67mHve2FeYCN0L63e+2LE7agG1LgmKy5y1bc=";
hash = "sha256-KFW2CzdDi/z3Tk9qEubssy/iTh7Awl/tLQGv9CVkdXw=";
};
cargoLock = {
@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
outputHashes = {
"typst-0.10.0" = "sha256-qiskc0G/ZdLRZjTicoKIOztRFem59TM4ki23Rl55y9s=";
"typst-syntax-0.7.0" = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg=";
"typstfmt_lib-0.2.6" = "sha256-UUVbnxIj7kQVpZvSbbB11i6wAvdTnXVk5cNSNoGBeRM=";
"typstfmt_lib-0.2.7" = "sha256-LBYsTCjZ+U+lgd7Z3H1sBcWwseoHsuepPd66bWgfvhI=";
};
};

View File

@ -5,20 +5,25 @@
python3.pkgs.buildPythonApplication rec {
pname = "crackql";
version = "unstable-20220821";
format = "pyproject";
version = "unstable-20230818";
pyproject = true;
src = fetchFromGitHub {
owner = "nicholasaleks";
repo = "CrackQL";
# rev = "refs/tags/${version}";
# Switch to tag with the next update
rev = "5bcf92f4520a4dd036baf9f47c5ebbf18e6a032a";
rev = "ac26a44c2dd201f65da0d1c3f95eaf776ed1b2dd";
hash = "sha256-XlHbGkwdOV1nobjtQP/M3IIEuzXHBuwf52EsXf3MWoM=";
};
pythonRelaxDeps = [
"graphql-core"
];
nativeBuildInputs = with python3.pkgs; [
poetry-core
pythonRelaxDepsHook
];
propagatedBuildInputs = with python3.pkgs; [

View File

@ -13731,8 +13731,6 @@ with pkgs;
target-isns = callPackage ../os-specific/linux/target-isns { };
tarlz = callPackage ../tools/archivers/tarlz { };
tarsnap = callPackage ../tools/backup/tarsnap { };
tarsnapper = callPackage ../tools/backup/tarsnapper { };