diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3da3cf664806..eb934d99bc13 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16521,6 +16521,12 @@ github = "RossComputerGuy"; githubId = 19699320; }; + rostan-t = { + name = "Rostan Tabet"; + email = "rostan.tabet@gmail.com"; + github = "rostan-t"; + githubId = 30502549; + }; rotaerk = { name = "Matthew Stewart"; email = "m.scott.stewart@gmail.com"; diff --git a/nixos/modules/services/x11/desktop-managers/deepin.nix b/nixos/modules/services/x11/desktop-managers/deepin.nix index 7d3acada6073..0824d6e30a8a 100644 --- a/nixos/modules/services/x11/desktop-managers/deepin.nix +++ b/nixos/modules/services/x11/desktop-managers/deepin.nix @@ -173,19 +173,20 @@ in ]; optionalPackages = [ onboard # dde-dock plugin - deepin-camera deepin-calculator deepin-compressor deepin-editor deepin-picker deepin-draw - deepin-album - deepin-image-viewer deepin-music deepin-movie-reborn deepin-system-monitor - deepin-screen-recorder deepin-shortcut-viewer + # freeimage has knownVulnerabilties, don't install packages using freeiamge by default + # deepin-album + # deepin-camera + # deepin-image-viewer + # deepin-screen-recorder ]; in requiredPackages diff --git a/nixos/modules/system/boot/uki.nix b/nixos/modules/system/boot/uki.nix index 63a7cbc5967b..ce00ac8e6397 100644 --- a/nixos/modules/system/boot/uki.nix +++ b/nixos/modules/system/boot/uki.nix @@ -27,6 +27,20 @@ in description = lib.mdDoc "Version of the image or generation the UKI belongs to"; }; + tries = lib.mkOption { + type = lib.types.nullOr lib.types.ints.unsigned; + default = null; + description = lib.mdDoc '' + Number of boot attempts before this UKI is considered bad. + + If no tries are specified (the default) automatic boot assessment remains inactive. + + See documentation on [Automatic Boot Assessment](https://systemd.io/AUTOMATIC_BOOT_ASSESSMENT/) and + [boot counting](https://uapi-group.org/specifications/specs/boot_loader_specification/#boot-counting) + for more information. + ''; + }; + settings = lib.mkOption { type = format.type; description = lib.mdDoc '' @@ -69,8 +83,9 @@ in name = config.boot.uki.name; version = config.boot.uki.version; versionInfix = if version != null then "_${version}" else ""; + triesInfix = if cfg.tries != null then "+${builtins.toString cfg.tries}" else ""; in - name + versionInfix + ".efi"; + name + versionInfix + triesInfix + ".efi"; system.build.uki = pkgs.runCommand config.system.boot.loader.ukiFile { } '' mkdir -p $out diff --git a/pkgs/applications/editors/rehex/default.nix b/pkgs/applications/editors/rehex/default.nix index bc2bc733c6c0..617ae79c6849 100644 --- a/pkgs/applications/editors/rehex/default.nix +++ b/pkgs/applications/editors/rehex/default.nix @@ -5,6 +5,7 @@ , which , zip , libicns +, botan2 , capstone , jansson , libunistring @@ -19,19 +20,19 @@ stdenv.mkDerivation rec { pname = "rehex"; - version = "0.60.1"; + version = "0.61.0"; src = fetchFromGitHub { owner = "solemnwarning"; repo = pname; rev = version; - hash = "sha256-oF8XtxKqyo6c2lNH6WDq6aEPeZw8RqBinDVhPpaDAWg="; + hash = "sha256-NBBBeTy15q6G30XR2PVd/xdIg41U2pWSPtqpdQX/+9o="; }; nativeBuildInputs = [ pkg-config which zip ] ++ lib.optionals stdenv.isDarwin [ libicns ]; - buildInputs = [ capstone jansson libunistring wxGTK32 ] + buildInputs = [ botan2 capstone jansson libunistring wxGTK32 ] ++ (with lua53Packages; [ lua busted ]) ++ (with perlPackages; [ perl TemplateToolkit ]) ++ lib.optionals stdenv.isLinux [ gtk3 ] diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 7fccd80e71c7..fad043aa6c82 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -9,7 +9,7 @@ let pname = "1password"; - version = if channel == "stable" then "8.10.24" else "8.10.26-1.BETA"; + version = if channel == "stable" then "8.10.24" else "8.10.26-38.BETA"; sources = { stable = { @@ -33,19 +33,19 @@ let beta = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; - hash = "sha256-dAasy1D5HXQ8Eu5cx0u9exobNMf2TIV4iCTcys/uCtQ="; + hash = "sha256-7+rwEX/BP5KD77djrJXCl41zviwHfiEi+WZfQeOQksc="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-sIPNv4HiU/6CLaER6deMG88zOOFwu6cm5XoB2Cr4qLQ="; + hash = "sha256-ELnO6cRgyZQHWTdB0143Z37Tdkc2iZUauFWTf3eL8AE="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-Va4WgbPKrI7u+GYzVmA8Gp6NRY4EdJuoz00Pc5HsMIg="; + hash = "sha256-fTpz1POmnqWcMtKCfkwyEFoyrZcpV5y7UP4DamsKbzU="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-Dj96QoEcmJxV7qBkb68ovonr+XYqQdScb9GMeL8OCJo="; + hash = "sha256-vAWPcOrjrcY8rC0N9PuNe+vivOkWvB6etW2QQWJJz1k="; }; }; }; diff --git a/pkgs/applications/office/super-productivity/default.nix b/pkgs/applications/office/super-productivity/default.nix index a50efea6096b..a8aa978081e7 100644 --- a/pkgs/applications/office/super-productivity/default.nix +++ b/pkgs/applications/office/super-productivity/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "super-productivity"; - version = "7.17.2"; + version = "8.0.0"; src = fetchurl { url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage"; - sha256 = "sha256-CcgjfA0BRfCrRb8N+KIgheUAF+JJK3yIv9Trp+gg+s0="; + sha256 = "sha256-VYyJ3tsCyabwNSxLXQsc3GBAmDmdgl50T8ZP2qkXTeM="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/science/electronics/gnucap/default.nix b/pkgs/applications/science/electronics/gnucap/default.nix index 0ec10f2444fd..d50e6eb8712d 100644 --- a/pkgs/applications/science/electronics/gnucap/default.nix +++ b/pkgs/applications/science/electronics/gnucap/default.nix @@ -1,16 +1,15 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "gnucap"; - version = "20210107"; - - src = fetchurl { - url = "https://git.savannah.gnu.org/cgit/gnucap.git/snapshot/${pname}-${version}.tar.gz"; - sha256 = "12rlwd4mfc54qq1wrx5k8qk578xls5z4isf94ybkf2z6qxk4mhnj"; - }; - - doCheck = true; +{ lib +, stdenv +, fetchurl +, readline +, termcap +, gnucap +, callPackage +, writeScript +}: +let + version = "20240130-dev"; meta = with lib; { description = "Gnu Circuit Analysis Package"; longDescription = '' @@ -23,5 +22,52 @@ It performs nonlinear dc and transient analyses, fourier analysis, and ac analys platforms = platforms.all; broken = stdenv.isDarwin; # Relies on LD_LIBRARY_PATH maintainers = [ maintainers.raboof ]; + mainProgram = "gnucap"; }; +in +stdenv.mkDerivation rec { + pname = "gnucap"; + inherit version; + + src = fetchurl { + url = "https://git.savannah.gnu.org/cgit/gnucap.git/snapshot/${pname}-${version}.tar.gz"; + hash = "sha256-MUCtGw3BxGWgXgUwzklq5T1y9kjBTnFBa0/GK0hhl0E="; + }; + + buildInputs = [ + readline + termcap + ]; + + doCheck = true; + + inherit meta; +} // { + plugins = callPackage ./plugins.nix {}; + withPlugins = p: + let + selectedPlugins = p gnucap.plugins; + wrapper = writeScript "gnucap" '' + export GNUCAP_PLUGPATH=${gnucap}/lib/gnucap + for plugin in ${builtins.concatStringsSep " " selectedPlugins}; do + export GNUCAP_PLUGPATH=$plugin/lib/gnucap:$GNUCAP_PLUGPATH + done + ${lib.getExe gnucap} + ''; + in + stdenv.mkDerivation { + pname = "gnucap-with-plugins"; + inherit version; + + propagatedBuildInputs = selectedPlugins; + + phases = [ "installPhase" "fixupPhase" ]; + + installPhase = '' + mkdir -p $out/bin + cp ${wrapper} $out/bin/gnucap + ''; + + inherit meta; + }; } diff --git a/pkgs/applications/science/electronics/gnucap/modelgen-verilog.nix b/pkgs/applications/science/electronics/gnucap/modelgen-verilog.nix new file mode 100644 index 000000000000..c22cd368bee6 --- /dev/null +++ b/pkgs/applications/science/electronics/gnucap/modelgen-verilog.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, fetchurl +, gnucap +}: + +stdenv.mkDerivation rec { + pname = "gnucap-modelgen-verilog"; + version = "20240130-dev"; + + src = fetchurl { + url = "https://git.savannah.gnu.org/cgit/gnucap/gnucap-modelgen-verilog.git/snapshot/${pname}-${version}.tar.gz"; + hash = "sha256-7w0eWUJKVRYFicQgDvKrJTkZ6fzgwxvcCKj78KrHj8E="; + }; + + propagatedBuildInputs = [ gnucap ]; + + doCheck = true; + + preInstall = '' + export GNUCAP_EXEC_PREFIX=$out + export GNUCAP_DATA=$out/share/gnucap + mkdir -p $out/include/gnucap + export GNUCAP_INCLUDEDIR=$out/include/gnucap + export GNUCAP_PKGLIBDIR=$out/lib/gnucap + ''; + + meta = with lib; { + description = "gnucap modelgen to preprocess, parse and dump vams files."; + homepage = "http://www.gnucap.org/"; + changelog = "https://git.savannah.gnu.org/cgit/gnucap.git/plain/NEWS?h=v${version}"; + mainProgram = "gnucap-mg-vams"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = [ maintainers.raboof ]; + }; +} diff --git a/pkgs/applications/science/electronics/gnucap/plugins.nix b/pkgs/applications/science/electronics/gnucap/plugins.nix new file mode 100644 index 000000000000..fbdcd9548b33 --- /dev/null +++ b/pkgs/applications/science/electronics/gnucap/plugins.nix @@ -0,0 +1,6 @@ +{ callPackage +}: + +{ + verilog = callPackage ./modelgen-verilog.nix {}; +} diff --git a/pkgs/applications/video/frigate/default.nix b/pkgs/applications/video/frigate/default.nix index d6437d09f421..9aee25c46ce5 100644 --- a/pkgs/applications/video/frigate/default.nix +++ b/pkgs/applications/video/frigate/default.nix @@ -9,14 +9,14 @@ }: let - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { #name = "frigate-${version}-source"; owner = "blakeblackshear"; repo = "frigate"; rev = "refs/tags/v${version}"; - hash = "sha256-2J7DhnYDX9ubbsk0qhji/vIKDouy9IqQztzbdPj2kxo="; + hash = "sha256-NVT7yaJkVA7b7GL0S0fHjNneBzhjCru56qY1Q4sTVcE="; }; frigate-web = callPackage ./web.nix { diff --git a/pkgs/by-name/dn/dns2tcp/package.nix b/pkgs/by-name/dn/dns2tcp/package.nix new file mode 100644 index 000000000000..2cbd2149d0e5 --- /dev/null +++ b/pkgs/by-name/dn/dns2tcp/package.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dns2tcp"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "alex-sector"; + repo = "dns2tcp"; + rev = "v${finalAttrs.version}"; + hash = "sha256-oBKkuQGVQNVzx8pds3qkZkZpwg8b44g1ovonrq2nqKw="; + }; + + patches = [ + # fixes gcc-10 build issues. + (fetchpatch { + url = "https://salsa.debian.org/debian/dns2tcp/-/raw/86b518ce169e88488d71c6b0270d4fc814dc1fbc/debian/patches/01_fix_gcc10_issues.patch."; + hash = "sha256-IGpUIajkhruou7meZZJEJ5nnsQ/hVflyPfAuh3J0otI="; + }) + # fixes some spelling errors. + (fetchpatch { + url = "https://salsa.debian.org/debian/dns2tcp/-/raw/13481f37b7184e52b83cc0c41edfc6b20a5debed/debian/patches/fix_spelling_errors.patch"; + hash = "sha256-b65olctlwLOY2GnVb7i7axGFiR0iLoTYstXdtVkU3vQ="; + }) + ]; + + + meta = with lib; { + description = "A tool for relaying TCP connections over DNS"; + homepage = "https://github.com/alex-sector/dns2tcp"; + license = licenses.gpl2Plus; + mainProgram = "dns2tcpc"; + maintainers = with maintainers; [ d3vil0p3r ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/by-name/zi/zigpy-cli/package.nix b/pkgs/by-name/zi/zigpy-cli/package.nix new file mode 100644 index 000000000000..f0ddf387354b --- /dev/null +++ b/pkgs/by-name/zi/zigpy-cli/package.nix @@ -0,0 +1,60 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonPackage rec { + pname = "zigpy-cli"; + version = "1.0.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "zigpy"; + repo = "zigpy-cli"; + rev = "refs/tags/v${version}"; + hash = "sha256-OxVSEBo+wFEBZnWpmQ4aUZWppCh0oavxlQvwDXiWiG8="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"setuptools-git-versioning<2"' "" \ + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' + ''; + + nativeBuildInputs = with python3.pkgs; [ + setuptools + ]; + + propagatedBuildInputs = with python3.pkgs; [ + bellows + click + coloredlogs + scapy + zigpy + zigpy-deconz + zigpy-xbee + # zigpy-zboss # not packaged + zigpy-zigate + zigpy-znp + ]; + + nativeCheckInputs = with python3.pkgs; [ + freezegun + pytest-asyncio + pytest-timeout + pytestCheckHook + ]; + + pythonImportsCheck = [ + "zigpy_cli" + ]; + + meta = with lib; { + description = "Command line interface for zigpy"; + homepage = "https://github.com/zigpy/zigpy-cli"; + changelog = "https://github.com/zigpy/zigpy/releases/tag/v${version}"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ SuperSandro2000 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix index a609d707a03c..c1a26e100a29 100644 --- a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix +++ b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix @@ -9,7 +9,6 @@ , dde-file-manager , deepin-desktop-schemas , deepin-movie-reborn -, deepin-screen-recorder , deepin-system-monitor , gsettings-desktop-schemas , extraGSettingsOverrides ? "" @@ -24,7 +23,6 @@ let dde-file-manager deepin-desktop-schemas deepin-movie-reborn - deepin-screen-recorder deepin-system-monitor gsettings-desktop-schemas # dde-appearance need org.gnome.desktop.background ] ++ extraGSettingsOverridePackages; diff --git a/pkgs/desktops/deepin/library/dtkgui/default.nix b/pkgs/desktops/deepin/library/dtkgui/default.nix index 7d21911be6b1..0094f5a305f8 100644 --- a/pkgs/desktops/deepin/library/dtkgui/default.nix +++ b/pkgs/desktops/deepin/library/dtkgui/default.nix @@ -12,8 +12,6 @@ , qtimageformats , lxqt , librsvg -, freeimage -, libraw }: stdenv.mkDerivation rec { @@ -50,8 +48,6 @@ stdenv.mkDerivation rec { qtbase lxqt.libqtxdg librsvg - freeimage - libraw ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/cxxopts/default.nix b/pkgs/development/libraries/cxxopts/default.nix index f587cf33308d..89276c7a0b44 100644 --- a/pkgs/development/libraries/cxxopts/default.nix +++ b/pkgs/development/libraries/cxxopts/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "cxxopts"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "jarro2783"; repo = "cxxopts"; rev = "v${version}"; - sha256 = "sha256-tOO0YCIG3MxSJZhurNcDR1pWIUEO/Har9mrCrZs3iVk="; + sha256 = "sha256-aOF3owz7SIV4trJY0PnMtIcwqoUpDbB3tNxZcsl9dzM="; }; buildInputs = lib.optionals enableUnicodeHelp [ icu.dev ]; diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index de1b616fc20a..245ea93f63e4 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -72,6 +72,20 @@ stdenv.mkDerivation (finalAttrs: { description = "Open Source library for accessing popular graphics image file formats"; homepage = "http://freeimage.sourceforge.net/"; license = "GPL"; + knownVulnerabilities = [ + "CVE-2021-33367" + "CVE-2021-40262" + "CVE-2021-40263" + "CVE-2021-40264" + "CVE-2021-40265" + "CVE-2021-40266" + + "CVE-2023-47992" + "CVE-2023-47993" + "CVE-2023-47994" + "CVE-2023-47995" + "CVE-2023-47996" + ]; maintainers = with lib.maintainers; [viric l-as]; platforms = with lib.platforms; unix; }; diff --git a/pkgs/development/libraries/java/jffi/default.nix b/pkgs/development/libraries/java/jffi/default.nix index b4351f4e9df9..3ba336aa18e9 100644 --- a/pkgs/development/libraries/java/jffi/default.nix +++ b/pkgs/development/libraries/java/jffi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jffi"; - version = "1.3.12"; + version = "1.3.13"; src = fetchFromGitHub { owner = "jnr"; repo = "jffi"; rev = "jffi-${version}"; - sha256 = "sha256-U0pBoKewZEen7aH3rIvZ8dKKeXKE1+Z5WtfM0HK6/LQ="; + sha256 = "sha256-aBQkkZyXZkaJc4sr/jHnIRaJYP116u4Jqsr9XXzfOBA="; }; nativeBuildInputs = [ jdk ant texinfo pkg-config ]; diff --git a/pkgs/development/python-modules/a2wsgi/default.nix b/pkgs/development/python-modules/a2wsgi/default.nix index 9f798a03edd6..dc19f1506958 100644 --- a/pkgs/development/python-modules/a2wsgi/default.nix +++ b/pkgs/development/python-modules/a2wsgi/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "a2wsgi"; - version = "1.10.0"; - format = "pyproject"; + version = "1.10.2"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-yA7qK3Uu2kEhbGRbgqQ6YvYAbGM27zGn2xQDOZ7ffBY="; + hash = "sha256-RrLKQnz5rVOMFF4y6zaFfhy/R3ty/h7Q49NemMBgYbk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mizani/default.nix b/pkgs/development/python-modules/mizani/default.nix index d87d5af94e25..f54c01821240 100644 --- a/pkgs/development/python-modules/mizani/default.nix +++ b/pkgs/development/python-modules/mizani/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mizani"; - version = "0.9.3"; + version = "0.11.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "has2k1"; repo = "mizani"; rev = "refs/tags/v${version}"; - hash = "sha256-gZwM8/9ipcA73m1sPCz9oxD7cndli+qX9+gLILdbq1A="; + hash = "sha256-4xk8FCUiNOp5n512asYKcjAS7fsyExyMQiWg14XWwHY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index d13831de3301..1ec7760eaeb7 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -38,14 +38,14 @@ buildPythonPackage rec { pname = "mlflow"; - version = "2.8.1"; + version = "2.10.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5OW90tnvsLOG7Lzi335D8ExGoyCAIIQU3FO1/XFVlng="; + hash = "sha256-Pd8yuiwB2seeTQd9S7ntRtgqCC3JkiMgfVYsfua+5nE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/plotnine/default.nix b/pkgs/development/python-modules/plotnine/default.nix index d1ac7b37a76f..fa44670965eb 100644 --- a/pkgs/development/python-modules/plotnine/default.nix +++ b/pkgs/development/python-modules/plotnine/default.nix @@ -16,16 +16,16 @@ buildPythonPackage rec { pname = "plotnine"; - version = "0.12.4"; + version = "0.13.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "has2k1"; repo = "plotnine"; rev = "refs/tags/v${version}"; - hash = "sha256-bm7xMCFDFimINlUePqLYw5bZtI5B151QOtltajgSm2U="; + hash = "sha256-qhmo1Ckc4OUzWCnjCNQvwsExB98/BCKydMZdB/yfOY0="; }; nativeBuildInputs = [ @@ -64,19 +64,24 @@ buildPythonPackage rec { # Assertion Errors: # Generated plot images do not exactly match the expected files. # After manually checking, this is caused by extremely subtle differences in label placement. + "tests/test_aes.py" "tests/test_annotation_logticks.py" "tests/test_coords.py" - "tests/test_facets.py" "tests/test_facet_labelling.py" + "tests/test_facets.py" "tests/test_geom_bar_col_histogram.py" "tests/test_geom_bin_2d.py" "tests/test_geom_boxplot.py" + "tests/test_geom_count.py" + "tests/test_geom_density_2d.py" "tests/test_geom_density.py" "tests/test_geom_dotplot.py" + "tests/test_geom_freqpoly.py" "tests/test_geom_map.py" "tests/test_geom_path_line_step.py" "tests/test_geom_point.py" "tests/test_geom_raster.py" + "tests/test_geom_rect_tile.py" "tests/test_geom_ribbon_area.py" "tests/test_geom_sina.py" "tests/test_geom_smooth.py" @@ -87,6 +92,7 @@ buildPythonPackage rec { "tests/test_scale_internals.py" "tests/test_scale_labelling.py" "tests/test_stat_ecdf.py" + "tests/test_stat_function.py" "tests/test_stat_summary.py" "tests/test_theme.py" diff --git a/pkgs/development/python-modules/posthog/default.nix b/pkgs/development/python-modules/posthog/default.nix index 94d374225f2c..6795ebf1f691 100644 --- a/pkgs/development/python-modules/posthog/default.nix +++ b/pkgs/development/python-modules/posthog/default.nix @@ -14,7 +14,7 @@ }: let pname = "posthog"; - version = "3.4.1"; + version = "3.4.2"; in buildPythonPackage { inherit pname version; @@ -24,7 +24,7 @@ buildPythonPackage { owner = "PostHog"; repo = "posthog-python"; rev = "refs/tags/v${version}"; - hash = "sha256-vqq8yCfIDaCWcWwpr8ogdDpmZY4lPcDwoNV33W664pc="; + hash = "sha256-PhZBpcMwU7fjmE0g+l83zHm+95N60Sbd9pNNc4Roa2A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/refery/default.nix b/pkgs/development/python-modules/refery/default.nix new file mode 100644 index 000000000000..0bae769fbdad --- /dev/null +++ b/pkgs/development/python-modules/refery/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder + +, poetry-core +, pyyaml +, colorama +, junit-xml +}: + +buildPythonPackage rec { + pname = "refery"; + version = "2.1.0"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha512-ju0lqCSg0zcZNqRXDmFX6X1ugBocpmHMBWJApO6Tzhm/tLMQTKy2RpB4C8fkKCEWA2mYX4w1dLdHe68hZixwkQ=="; + }; + + propagatedBuildInputs = [ + poetry-core + pyyaml + colorama + junit-xml + ]; + + pythonImportCheck = [ + "refery" + ]; + + disabled = pythonOlder "3.10"; + + # No tests yet + doCheck = false; + + meta = with lib; { + description = "Functional testing tool"; + homepage = "https://github.com/RostanTabet/refery"; + mainProgram = "refery"; + maintainers = with maintainers; [ rostan-t ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index b9928c41ba60..bd6b37304987 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -25,11 +25,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "4.25.1"; + version = "4.26.0"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-iyt6qOx1XU7lL6AhDNKiRP0W7WlfxKciRVYpUHdtKlY="; + hash = "sha256-RoULX9IcVI+WklPLvJfcbIRhmKgiVYHjr1NGrIqn2/I="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/gocover-cobertura/default.nix b/pkgs/development/tools/gocover-cobertura/default.nix new file mode 100644 index 000000000000..78f69d3b260d --- /dev/null +++ b/pkgs/development/tools/gocover-cobertura/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "gocover-cobertura"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "boumenot"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-nbwqfObU1tod5gWa9UbhmS6CpLLilvFyvNJ6XjeR8Qc="; + }; + + vendorHash = null; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + homepage = "https://github.com/boumenot/gocover-cobertura"; + description = "This is a simple helper tool for generating XML output in Cobertura format for CIs like Jenkins and others from go tool cover output."; + license = licenses.mit; + maintainers = with maintainers; [ hmajid2301 ]; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/gpio/default.nix b/pkgs/servers/home-assistant/custom-components/gpio/default.nix index 98cf56a3b52a..ff06822d664a 100644 --- a/pkgs/servers/home-assistant/custom-components/gpio/default.nix +++ b/pkgs/servers/home-assistant/custom-components/gpio/default.nix @@ -7,14 +7,14 @@ buildHomeAssistantComponent rec { owner = "raboof"; domain = "gpio"; - version = "0.0.2"; + version = "0.0.4"; src = fetchFromGitea { domain = "codeberg.org"; owner = "raboof"; repo = "ha-gpio"; rev = "v${version}"; - hash = "sha256-oito5W7uQYgxUQFIynW9G7jbIpmFONWC8FslRdX3gsE="; + hash = "sha256-JyyJPI0lbZLJj+016WgS1KXU5rnxUmRMafel4/wKsYk="; }; propagatedBuildInputs = [ libgpiod ]; diff --git a/pkgs/servers/nosql/ferretdb/default.nix b/pkgs/servers/nosql/ferretdb/default.nix index 69ee8650697f..526253c7b67f 100644 --- a/pkgs/servers/nosql/ferretdb/default.nix +++ b/pkgs/servers/nosql/ferretdb/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "ferretdb"; - version = "1.19.0"; + version = "1.20.1"; src = fetchFromGitHub { owner = "FerretDB"; repo = "FerretDB"; rev = "v${version}"; - hash = "sha256-G2eQ0CjvZYYTFnx1U+qUGiZLqY8Xx70p7J1lkzbxmF8="; + hash = "sha256-joLl0LTDGP2FVYcUIknrLPYorfIlMXli+igV/Z4P0BI="; }; postPatch = '' @@ -20,7 +20,7 @@ buildGoModule rec { echo nixpkgs > build/version/package.txt ''; - vendorHash = "sha256-27WwvhX4QHmhBbg8/OFA7MKo34jwngkDQ/ahqV3N4qY="; + vendorHash = "sha256-lkJagsagJT8qP3/cd6Rfe2mqjOmDK7R+we0eblyT9rw="; CGO_ENABLED = 0; diff --git a/pkgs/tools/security/ldeep/default.nix b/pkgs/tools/security/ldeep/default.nix index 623acf50f3b8..6e44829f7ee9 100644 --- a/pkgs/tools/security/ldeep/default.nix +++ b/pkgs/tools/security/ldeep/default.nix @@ -5,25 +5,34 @@ python3.pkgs.buildPythonApplication rec { pname = "ldeep"; - version = "1.0.51"; - format = "setuptools"; + version = "1.0.52"; + pyproject = true; src = fetchFromGitHub { owner = "franc-pentest"; repo = "ldeep"; rev = "refs/tags/${version}"; - hash = "sha256-UbZotbq97ehVj8dF0vXM2Z61IG1H+21xk14DXKmWirA="; + hash = "sha256-I51vz3zF1J3223hcO3cdfsNBfpq/UolDxUEXyqx3dLI="; }; + pythonRelaxDeps = [ + "cryptography" + ]; + nativeBuildInputs = with python3.pkgs; [ cython + pythonRelaxDepsHook + setuptools ]; propagatedBuildInputs = with python3.pkgs; [ commandparse cryptography dnspython + gssapi ldap3 + oscrypto + pycryptodome pycryptodomex six termcolor diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5c0acc55607..c26822cf5c18 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8642,6 +8642,7 @@ with pkgs; }; gnucap = callPackage ../applications/science/electronics/gnucap { }; + gnucap-full = gnucap.withPlugins(p: [ p.verilog ]); gnu-cim = callPackage ../development/compilers/gnu-cim { }; @@ -16295,6 +16296,8 @@ with pkgs; go-junit-report = callPackage ../development/tools/go-junit-report { }; + gocover-cobertura = callPackage ../development/tools/gocover-cobertura { }; + gobang = callPackage ../development/tools/database/gobang { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a94342c01b6e..bdd6908c95fe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12620,6 +12620,8 @@ self: super: with self; { referencing = callPackage ../development/python-modules/referencing { }; + refery = callPackage ../development/python-modules/refery { }; + reflink = callPackage ../development/python-modules/reflink { }; regenmaschine = callPackage ../development/python-modules/regenmaschine { };