From 90d55a091ff3fd20077e997ea9e5832e2994c2e9 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Thu, 27 Apr 2023 10:43:18 +0200 Subject: [PATCH 01/70] livecaptions: init at 0.4.0 Signed-off-by: Sefa Eyeoglu --- .../misc/livecaptions/default.nix | 76 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 78 insertions(+) create mode 100644 pkgs/applications/misc/livecaptions/default.nix diff --git a/pkgs/applications/misc/livecaptions/default.nix b/pkgs/applications/misc/livecaptions/default.nix new file mode 100644 index 00000000000..b64b16a416d --- /dev/null +++ b/pkgs/applications/misc/livecaptions/default.nix @@ -0,0 +1,76 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchurl, + meson, + ninja, + pkg-config, + cmake, + desktop-file-utils, + wrapGAppsHook4, + onnxruntime, + libadwaita, + libpulseaudio, + xorg, +}: let + aprilAsr = fetchFromGitHub { + name = "april-asr"; + owner = "abb128"; + repo = "april-asr"; + rev = "c2f138c674cad58e2708ecaddc95cc72e7f85549"; + sha256 = "hZe2iss3BGdzeTM5FCp9wp6LaDOjtGJrZS5vB5F6uLg="; + }; + + aprilModel = fetchurl { + name = "aprilv0_en-us.april"; + url = "https://april.sapples.net/aprilv0_en-us.april"; + sha256 = "9aMPiI55d2mxt94UPAXSySoXAsJjtbcdYv0gKM7eVic="; + }; +in + stdenv.mkDerivation rec { + pname = "livecaptions"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "abb128"; + repo = "LiveCaptions"; + rev = "v${version}"; + hash = "sha256-RepuvqNPHRGENupPG5ezadn6f7FxEUYFDi4+DpNanuA="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + cmake + desktop-file-utils # update-desktop-database + wrapGAppsHook4 + ]; + + buildInputs = [ + onnxruntime + libadwaita + libpulseaudio + xorg.libX11 + ]; + + postUnpack = '' + rm -r source/subprojects/april-asr + ln -sf ${aprilAsr} source/subprojects/april-asr + ''; + + preFixup = '' + gappsWrapperArgs+=( + --set APRIL_MODEL_PATH ${aprilModel} + ) + ''; + + meta = with lib; { + description = "Linux Desktop application that provides live captioning"; + homepage = "https://github.com/abb128/LiveCaptions"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [Scrumplex]; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82e27448e19..052345c787b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1033,6 +1033,8 @@ with pkgs; libredirect = callPackage ../build-support/libredirect { }; + livecaptions = callPackage ../applications/misc/livecaptions { }; + madonctl = callPackage ../applications/misc/madonctl { }; copyDesktopItems = makeSetupHook { From 71d6ed698f6a6228fe97f69ea761614dd602a8bd Mon Sep 17 00:00:00 2001 From: rewine Date: Sun, 14 May 2023 05:32:38 +0800 Subject: [PATCH 02/70] nixos/gnupg: default to qt pinentry program in deepin --- nixos/modules/programs/gnupg.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix index cb8d0ecff4c..764a67a160c 100644 --- a/nixos/modules/programs/gnupg.nix +++ b/nixos/modules/programs/gnupg.nix @@ -10,7 +10,8 @@ let defaultPinentryFlavor = if xserverCfg.desktopManager.lxqt.enable - || xserverCfg.desktopManager.plasma5.enable then + || xserverCfg.desktopManager.plasma5.enable + || xserverCfg.desktopManager.deepin.enable then "qt" else if xserverCfg.desktopManager.xfce.enable then "gtk2" From 333d285072d7e026f50003e69b1758130bf7a22e Mon Sep 17 00:00:00 2001 From: rewine Date: Sun, 14 May 2023 15:45:47 +0800 Subject: [PATCH 03/70] deepin.deepin-screensaver: init at 5.0.16 --- .../apps/deepin-screensaver/default.nix | 69 +++++++++++++++++++ pkgs/desktops/deepin/default.nix | 1 + 2 files changed, 70 insertions(+) create mode 100644 pkgs/desktops/deepin/apps/deepin-screensaver/default.nix diff --git a/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix b/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix new file mode 100644 index 00000000000..27b96a23937 --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix @@ -0,0 +1,69 @@ +{ stdenv +, lib +, fetchFromGitHub +, qmake +, qttools +, pkg-config +, wrapQtAppsHook +, qtbase +, qtx11extras +, qtdeclarative +, dtkwidget +, dde-qt-dbus-factory +, xorg +, xscreensaver +}: + +stdenv.mkDerivation rec { + pname = "deepin-screensaver"; + version = "5.0.16"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-d/BllaXZxRdJe8nH+hhQIEutpBvAWFnBHWbIjznUfQU="; + }; + + postPatch = '' + patchShebangs {src,customscreensaver/deepin-custom-screensaver}/{generate_translations.sh,update_translations.sh} + + substituteInPlace src/{dbusscreensaver.cpp,com.deepin.ScreenSaver.service,src.pro} \ + customscreensaver/deepin-custom-screensaver/deepin-custom-screensaver.pro \ + --replace "/usr" "$out" \ + --replace "/etc" "$out/etc" + + substituteInPlace tools/preview/main.cpp \ + --replace "/usr/lib/xscreensaver" "${xscreensaver}/libexec/xscreensaver" + ''; + + nativeBuildInputs = [ + qmake + qttools + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + qtx11extras + qtdeclarative + dtkwidget + dde-qt-dbus-factory + xorg.libXScrnSaver + ]; + + qmakeFlags = [ + "XSCREENSAVER_DATA_PATH=${xscreensaver}/libexec/xscreensaver" + "COMPILE_ON_V23=false" + ]; + + meta = with lib; { + description = "A screensaver service developed by deepin"; + homepage = "https://github.com/linuxdeepin/deepin-screensaver"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} + diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index c11114e9899..524e4ee0f1f 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -57,6 +57,7 @@ let deepin-terminal = callPackage ./apps/deepin-terminal { }; deepin-reader = callPackage ./apps/deepin-reader { }; deepin-voice-note = callPackage ./apps/deepin-voice-note { }; + deepin-screensaver = callPackage ./apps/deepin-screensaver { }; #### Go Packages go-lib = callPackage ./go-package/go-lib { }; From f9713de024f457b49fa44908f3db235d8f989fe3 Mon Sep 17 00:00:00 2001 From: piegames Date: Fri, 23 Apr 2021 23:50:14 +0200 Subject: [PATCH 04/70] python3Packages.muscima: init at unstable-2023-04-26 --- .../python-modules/muscima/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/muscima/default.nix diff --git a/pkgs/development/python-modules/muscima/default.nix b/pkgs/development/python-modules/muscima/default.nix new file mode 100644 index 00000000000..f13cbecb7b7 --- /dev/null +++ b/pkgs/development/python-modules/muscima/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, lxml +, matplotlib +, numpy +, pytestCheckHook +, scikitimage +, scikit-learn +}: + +let + rev = "9a016380625927f385e699664026c90356557850"; +in +buildPythonPackage { + pname = "muscima"; + version = "unstable-2023-04-26"; + + src = fetchFromGitHub { + owner = "hajicj"; + repo = "muscima"; + inherit rev; + hash = "sha256-0mRLJATn+6dYswgDg2zs7RHKSvY4+gNt4SBHeF0G3Xg="; + }; + + format = "setuptools"; + + propagatedBuildInputs = [ + lxml + numpy + scikitimage + scikit-learn + matplotlib + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + # They hard-code the path to the dataset and expect you to edit the test to update it to your value + "test/test_dataset.py" + ]; + + meta = with lib; { + description = "Tools for working with the MUSCIMA++ dataset of handwritten music notation"; + homepage = "https://github.com/hajicj/muscima"; + changelog = "https://github.com/hajicj/muscima/blob/${rev}/CHANGES.md"; + license = licenses.mit; + maintainers = with maintainers; [ piegames ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9b4fa24e413..a3b2968e897 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6430,6 +6430,8 @@ self: super: with self; { murmurhash = callPackage ../development/python-modules/murmurhash { }; + muscima = callPackage ../development/python-modules/muscima { }; + musicbrainzngs = callPackage ../development/python-modules/musicbrainzngs { }; mutag = callPackage ../development/python-modules/mutag { }; From ed68fa60fba4c00c701c0d38f13d9aed0316d26b Mon Sep 17 00:00:00 2001 From: piegames Date: Fri, 23 Apr 2021 23:51:02 +0200 Subject: [PATCH 05/70] python3Packages.mung: init at unstable-2022-07-10 --- .../python-modules/mung/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/mung/default.nix diff --git a/pkgs/development/python-modules/mung/default.nix b/pkgs/development/python-modules/mung/default.nix new file mode 100644 index 00000000000..2ec14dc4c91 --- /dev/null +++ b/pkgs/development/python-modules/mung/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, lxml +, matplotlib +, midiutil +, numpy +, pytestCheckHook +, scikitimage +, scikit-learn +}: +let + rev = "8d0ce91d831b0592c111ddb38fc9aa8eba130ed2"; +in +buildPythonPackage { + pname = "mung"; + version = "unstable-2022-07-10"; + + src = fetchFromGitHub { + owner = "OMR-Research"; + repo = "mung"; + inherit rev; + hash = "sha256-QzCkB9Wj4dTPuMCMweFw6IsSwBBzV0Nfx7+VX7Plnio="; + }; + + format = "setuptools"; + + propagatedBuildInputs = [ + lxml + numpy + scikitimage + scikit-learn + matplotlib + midiutil + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Music Notation Graph: a data model for optical music recognition"; + homepage = "https://github.com/OMR-Research/mung"; + changelog = "https://github.com/OMR-Research/mung/blob/${rev}/CHANGES.md"; + license = licenses.mit; + maintainers = with maintainers; [ piegames ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a3b2968e897..5f4d75cef65 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6426,6 +6426,8 @@ self: super: with self; { munch = callPackage ../development/python-modules/munch { }; + mung = callPackage ../development/python-modules/mung { }; + munkres = callPackage ../development/python-modules/munkres { }; murmurhash = callPackage ../development/python-modules/murmurhash { }; From bc87805d558718feca01013063a73d19998b9e3d Mon Sep 17 00:00:00 2001 From: piegames Date: Fri, 23 Apr 2021 23:51:21 +0200 Subject: [PATCH 06/70] python3Packages.omrdatasettools: init at 1.3.1 --- .../omrdatasettools/default.nix | 74 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 76 insertions(+) create mode 100644 pkgs/development/python-modules/omrdatasettools/default.nix diff --git a/pkgs/development/python-modules/omrdatasettools/default.nix b/pkgs/development/python-modules/omrdatasettools/default.nix new file mode 100644 index 00000000000..cf2e91382de --- /dev/null +++ b/pkgs/development/python-modules/omrdatasettools/default.nix @@ -0,0 +1,74 @@ +{ lib +, buildPythonPackage +, fetchPypi +, h5py +, ipython +, lxml +, mung +, muscima +, numpy +, pillow +, pytestCheckHook +, scikitimage +, sphinx-rtd-theme +, sympy +, pandas +, pyhamcrest +, tqdm +, twine +}: + +buildPythonPackage rec { + pname = "omrdatasettools"; + version = "1.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0cdq02jp8vh78yjq9bncjjl0pb554idrcxkd62rzwk4l6ss2fkw5"; + }; + + propagatedBuildInputs = [ + pillow + scikitimage + h5py + pyhamcrest + muscima + mung + numpy + lxml + tqdm + twine + sympy + sphinx-rtd-theme + pandas + ipython + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + # The download tests require internet access + "omrdatasettools/tests/test_downloader.py" + ]; + + disabledTests = [ + # The download tests require internet access + "test_download_extract_and_crop_bitmaps" + "test_download_extract_and_render_all_symbols" + "test_download_extract_and_draw_bitmaps" + # Other failures + "test_render_node_masks_instance_segmentation_of_staff_blobs" + "test_render_node_masks_instance_segmentation_of_staff_lines" + "test_render_node_masks_semantic_segmentation_of_nodes" + ]; + + meta = with lib; { + description = "Collection of datasets used for Optical Music Recognition"; + homepage = "https://github.com/apacha/OMR-Datasets"; + changelog = "https://github.com/apacha/OMR-Datasets/blob/${version}/CHANGES.md"; + license = licenses.mit; + maintainers = with maintainers; [ piegames ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5f4d75cef65..748a0e07815 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6931,6 +6931,8 @@ self: super: with self; { omnilogic = callPackage ../development/python-modules/omnilogic { }; + omrdatasettools = callPackage ../development/python-modules/omrdatasettools { }; + ondilo = callPackage ../development/python-modules/ondilo { }; onetimepass = callPackage ../development/python-modules/onetimepass { }; From 964d55b1e02051f94f3d0bb9dab800e2f72b8a3f Mon Sep 17 00:00:00 2001 From: "\"s1341\"" <"github@shmarya.net"> Date: Mon, 15 May 2023 09:07:28 +0300 Subject: [PATCH 07/70] vimPlugins.monokai-pro-nvim: init at 2023-05-13 --- pkgs/applications/editors/vim/plugins/vim-plugin-names | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 60dd01d9244..b89a3ad8a41 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -437,6 +437,7 @@ https://github.com/jose-elias-alvarez/minsnip.nvim/,, https://github.com/jghauser/mkdir.nvim/,main, https://github.com/SidOfc/mkdx/,, https://github.com/tomasr/molokai/,, +https://github.com/loctvl842/monokai-pro.nvim/,HEAD, https://github.com/shaunsingh/moonlight.nvim/,,pure-lua https://github.com/leafo/moonscript-vim/,HEAD, https://github.com/yegappan/mru/,, From 763dbd1d4676ae832d819db409fcc22b87fb1e1f Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Mon, 15 May 2023 21:01:23 +0300 Subject: [PATCH 08/70] sfwbar: init at 1.0_beta11 --- pkgs/applications/misc/sfwbar/default.nix | 48 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/applications/misc/sfwbar/default.nix diff --git a/pkgs/applications/misc/sfwbar/default.nix b/pkgs/applications/misc/sfwbar/default.nix new file mode 100644 index 00000000000..ec85d9d0e40 --- /dev/null +++ b/pkgs/applications/misc/sfwbar/default.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchFromGitHub +, gtk3 +, meson +, ninja +, json_c +, pkg-config +, gtk-layer-shell +, libpulseaudio +, libmpdclient +, libxkbcommon +, +}: +stdenv.mkDerivation rec { + pname = "sfwbar"; + version = "1.0_beta11"; + + src = fetchFromGitHub { + owner = "LBCrion"; + repo = pname; + rev = "v${version}"; + sha256 = "PmpiO5gvurpaFpoq8bQdZ53FYSVDnyjN8MxDpelMnAU="; + }; + + buildInputs = [ + gtk3 + json_c + gtk-layer-shell + libpulseaudio + libmpdclient + libxkbcommon + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + meta = with lib; { + homepage = "https://github.com/LBCrion/sfwbar"; + description = "A flexible taskbar application for wayland compositors, designed with a stacking layout in mind"; + platforms = platforms.linux; + maintainers = with maintainers; [ NotAShelf ]; + license = licenses.gpl3Only; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8eea39db380..2c31b7c864e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31234,6 +31234,8 @@ with pkgs; singularity-overriden-nixos ; + sfwbar = callPackage ../applications/misc/sfwbar { }; + skate = callPackage ../applications/misc/skate { }; slack = callPackage ../applications/networking/instant-messengers/slack { }; From e217274f2eac8ad1c043503c0c440cf99b056c2f Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Tue, 16 May 2023 19:45:47 +0200 Subject: [PATCH 09/70] mautrix-whatsapp: 0.8.4 -> 0.8.5 https://github.com/mautrix/whatsapp/releases/tag/v0.8.5 --- pkgs/servers/mautrix-whatsapp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 6e537b88ec7..cfde1959028 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - hash = "sha256-4dOkSnurg2Sk36Z2WNjPaO092IiRlzc9oWM6sQ+wUwM="; + hash = "sha256-XiDuH4W5yghbT2wIcqcC2y1qJH62mWvTk6ca3KedkIk="; }; buildInputs = [ olm ]; - vendorSha256 = "sha256-48C9aaOe148emSsxzfKFKtnXyC39IFO8Ge7d+rIhDac="; + vendorSha256 = "sha256-m9wB6u76ONw0+mZeCnwEYOqBvghil+rcKUJFKRaT5Nk="; doCheck = false; From 2df23a6b37c96854065ae96af51dddab806ef300 Mon Sep 17 00:00:00 2001 From: nat-418 <93013864+nat-418@users.noreply.github.com> Date: Wed, 10 May 2023 23:54:17 +0200 Subject: [PATCH 10/70] wapp: init at unstable-2023-05-05 --- pkgs/development/libraries/wapp/default.nix | 32 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/libraries/wapp/default.nix diff --git a/pkgs/development/libraries/wapp/default.nix b/pkgs/development/libraries/wapp/default.nix new file mode 100644 index 00000000000..8c414a28f12 --- /dev/null +++ b/pkgs/development/libraries/wapp/default.nix @@ -0,0 +1,32 @@ +{ lib, fetchurl, tcl }: + +tcl.mkTclDerivation { + pname = "wapp"; + version = "unstable-2023-05-05"; + + src = fetchurl { + url = "https://wapp.tcl-lang.org/home/raw/72d0d081e3e6a4aea91ddf429a85cbdf40f9a32d46cccfe81bb75ee50e6cf9cf?at=wapp.tcldir?ci=9d3368116c59ef16"; + hash = "sha256-poG7dvaiOXMi4oWMQ5t3v7SYEqZLUY/TsWXrTL62xd0="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/wapp + cp $src $out/lib/wapp/wapp.tcl + cat < $out/lib/wapp/pkgIndex.tcl + package ifneeded wapp 1.0 [list source [file join \$dir wapp.tcl]] + EOF + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://wapp.tcl-lang.org/home/doc/trunk/README.md"; + description = "A framework for writing web applications in Tcl"; + license = licenses.bsd2; + maintainers = with maintainers; [ nat-418 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b52924cb15..da9008ac10f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24312,6 +24312,8 @@ with pkgs; wangle = callPackage ../development/libraries/wangle { }; + wapp = callPackage ../development/libraries/wapp { }; + wavpack = callPackage ../development/libraries/wavpack { }; wayland = darwin.apple_sdk_11_0.callPackage ../development/libraries/wayland { }; From cb3180c0fef15858e0d1405d42db8dccc6b68173 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 May 2023 04:55:31 +0000 Subject: [PATCH 11/70] daemon: 0.8 -> 0.8.2 --- pkgs/tools/system/daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/daemon/default.nix b/pkgs/tools/system/daemon/default.nix index b7be04bcfcb..3c8689416c2 100644 --- a/pkgs/tools/system/daemon/default.nix +++ b/pkgs/tools/system/daemon/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "daemon"; - version = "0.8"; + version = "0.8.2"; src = fetchurl { url = "http://libslack.org/daemon/download/daemon-${version}.tar.gz"; - sha256 = "sha256-dPEubUs8hWMkib0IQx09mXvBcmS/V7cgI4Ty6AnP9ZY="; + sha256 = "sha256-s0s3VDu6Q70Ibln0t1TIECOArlwXKLmHyJDV2ktM88o="; }; makeFlags = [ From 4401af698c53d494142f6e537cf6ba393ff69056 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 18 May 2023 12:50:00 +0200 Subject: [PATCH 12/70] mqttui: 0.18.0 -> 0.19.0 Diff: https://github.com/EdJoPaTo/mqttui/compare/v0.18.0...v0.19.0 --- pkgs/tools/networking/mqttui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/mqttui/default.nix b/pkgs/tools/networking/mqttui/default.nix index 126d68ad7ad..830a23c0f73 100644 --- a/pkgs/tools/networking/mqttui/default.nix +++ b/pkgs/tools/networking/mqttui/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "mqttui"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "EdJoPaTo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XREY86CcxH+YqzOpu5vXiP6lIZaj+twKQgGmn7MR1As="; + sha256 = "sha256-cezG9hdHOeTExX4OJwJ22e/PvfdySPzQGwxumavV++Q="; }; - cargoSha256 = "sha256-V5jVgNIV+Bl1nYKy2RYFbKYo/x65gG3RmB+XjFATxN8="; + cargoSha256 = "sha256-vSlziZtjyzsd346qUBEPEl8I3UlPhWHRu4+FiD1XqOo="; buildInputs = lib.optional stdenv.isDarwin Security; From 1412b439704bba22e9f6c2e54501472875f58613 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Thu, 18 May 2023 22:04:13 +1000 Subject: [PATCH 13/70] minimal-bootstrap.bash_2_05: init at 2.05b --- .../linux/minimal-bootstrap/bash/2.nix | 146 ++++++++++++++++++ .../linux/minimal-bootstrap/default.nix | 3 + 2 files changed, 149 insertions(+) create mode 100644 pkgs/os-specific/linux/minimal-bootstrap/bash/2.nix diff --git a/pkgs/os-specific/linux/minimal-bootstrap/bash/2.nix b/pkgs/os-specific/linux/minimal-bootstrap/bash/2.nix new file mode 100644 index 00000000000..41e3547a786 --- /dev/null +++ b/pkgs/os-specific/linux/minimal-bootstrap/bash/2.nix @@ -0,0 +1,146 @@ +{ lib +, derivationWithMeta +, fetchurl +, kaem +, tinycc +, gnumake +, gnupatch +, coreutils +, mescc-tools-extra +, bash_2_05 +}: +let + pname = "bash"; + version = "2.05b"; + + src = fetchurl { + url = "mirror://gnu/bash/bash-${version}.tar.gz"; + sha256 = "1r1z2qdw3rz668nxrzwa14vk2zcn00hw7mpjn384picck49d80xs"; + }; + + # Thanks to the live-bootstrap project! + # See https://github.com/fosslinux/live-bootstrap/blob/1bc4296091c51f53a5598050c8956d16e945b0f5/sysa/bash-2.05b/bash-2.05b.kaem + liveBootstrap = "https://github.com/fosslinux/live-bootstrap/raw/1bc4296091c51f53a5598050c8956d16e945b0f5/sysa/bash-2.05b"; + + main_mk = fetchurl { + url = "${liveBootstrap}/mk/main.mk"; + sha256 = "0hj29q3pq3370p18sxkpvv9flb7yvx2fs96xxlxqlwa8lkimd0j4"; + }; + + common_mk = fetchurl { + url = "${liveBootstrap}/mk/common.mk"; + sha256 = "09rigxxf85p2ybnq248sai1gdx95yykc8jmwi4yjx389zh09mcr8"; + }; + + builtins_mk = fetchurl { + url = "${liveBootstrap}/mk/builtins.mk"; + sha256 = "0939dy5by1xhfmsjj6w63nlgk509fjrhpb2crics3dpcv7prl8lj"; + }; + + patches = [ + # mes libc does not have locale support + (fetchurl { + url = "${liveBootstrap}/patches/mes-libc.patch"; + sha256 = "0zksdjf6zbb3p4hqg6plq631y76hhhgab7kdvf7cnpk8bcykn12z"; + }) + # int name, namelen; is wrong for mes libc, it is char* name, so we modify tinycc + # to reflect this. + (fetchurl { + url = "${liveBootstrap}/patches/tinycc.patch"; + sha256 = "042d2kr4a8klazk1hlvphxr6frn4mr53k957aq3apf6lbvrjgcj2"; + }) + # add ifdef's for features we don't want + (fetchurl { + url = "${liveBootstrap}/patches/missing-defines.patch"; + sha256 = "1q0k1kj5mrvjkqqly7ki5575a5b3hy1ywnmvhrln318yh67qnkj4"; + }) + # mes libc + setting locale = not worky + (fetchurl { + url = "${liveBootstrap}/patches/locale.patch"; + sha256 = "1p1q1slhafsgj8x4k0dpn9h6ryq5fwfx7dicbbxhldbw7zvnnbx9"; + }) + # We do not have /dev at this stage of the bootstrap, including /dev/tty + (fetchurl { + url = "${liveBootstrap}/patches/dev-tty.patch"; + sha256 = "1315slv5f7ziajqyxg4jlyanf1xwd06xw14y6pq7xpm3jzjk55j9"; + }) + ]; +in +kaem.runCommand "${pname}-${version}" { + inherit pname version; + + nativeBuildInputs = [ + tinycc.compiler + gnumake + gnupatch + coreutils + ]; + + passthru.runCommand = name: env: buildCommand: + derivationWithMeta ({ + inherit name buildCommand; + builder = "${bash_2_05}/bin/bash"; + args = [ + "-e" + (builtins.toFile "bash-builder.sh" '' + export CONFIG_SHELL=$SHELL + bash -eux $buildCommandPath + '') + ]; + passAsFile = [ "buildCommand" ]; + + SHELL = "${bash_2_05}/bin/bash"; + PATH = lib.makeBinPath ((env.nativeBuildInputs or []) ++ [ + bash_2_05 + coreutils + # provides untar, ungz, and unbz2 + mescc-tools-extra + ]); + } // (builtins.removeAttrs env [ "nativeBuildInputs" ])); + + passthru.tests.get-version = result: + kaem.runCommand "${pname}-get-version-${version}" {} '' + ${result}/bin/bash --version + mkdir ''${out} + ''; + + meta = with lib; { + description = "GNU Bourne-Again Shell, the de facto standard shell on Linux"; + homepage = "https://www.gnu.org/software/bash"; + license = licenses.gpl3Plus; + maintainers = teams.minimal-bootstrap.members; + platforms = platforms.unix; + }; +} '' + # Unpack + ungz --file ${src} --output bash.tar + untar --file bash.tar + rm bash.tar + cd bash-${version} + + # Patch + ${lib.concatMapStringsSep "\n" (f: "patch -Np0 -i ${f}") patches} + + # Configure + cp ${main_mk} Makefile + cp ${builtins_mk} builtins/Makefile + cp ${common_mk} common.mk + touch config.h + touch include/version.h + touch include/pipesize.h + + # Build + make \ + CC="tcc -B ${tinycc.libs}/lib" \ + mkbuiltins + cd builtins + make \ + CC="tcc -B ${tinycc.libs}/lib" \ + libbuiltins.a + cd .. + make CC="tcc -B ${tinycc.libs}/lib" + + # Install + install -D bash ''${out}/bin/bash + ln -s bash ''${out}/bin/sh +'' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/default.nix index f4f81a70fac..fb4a455a3e9 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/default.nix @@ -11,6 +11,8 @@ lib.makeScope (extra: lib.callPackageWith ({ inherit lib config buildPlatform hostPlatform; } // extra)) (self: with self; { + bash_2_05 = callPackage ./bash/2.nix { tinycc = tinycc-mes; }; + coreutils = callPackage ./coreutils { tinycc = tinycc-mes; }; gnupatch = callPackage ./gnupatch { tinycc = tinycc-mes; }; @@ -34,6 +36,7 @@ lib.makeScope test = kaem.runCommand "minimal-bootstrap-test" {} '' echo ${mes.compiler.tests.get-version} echo ${tinycc-mes.compiler.tests.chain} + echo ${bash_2_05.tests.get-version} mkdir ''${out} ''; }) From 47e1eefcc3acbd639503938236318f68be39c10e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 19 May 2023 01:38:35 +0200 Subject: [PATCH 14/70] quisk: Migrate to python 3.10 --- pkgs/applications/radio/quisk/default.nix | 22 +++++++++++++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/radio/quisk/default.nix b/pkgs/applications/radio/quisk/default.nix index 5fcd11a1752..86b4db693ca 100644 --- a/pkgs/applications/radio/quisk/default.nix +++ b/pkgs/applications/radio/quisk/default.nix @@ -1,7 +1,12 @@ -{ lib, python39Packages, fetchPypi -, fftw, alsa-lib, pulseaudio, pyusb, wxPython_4_2 }: +{ lib +, python3 +, fetchPypi +, fftw +, alsa-lib +, pulseaudio +}: -python39Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "quisk"; version = "4.2.17"; @@ -10,9 +15,16 @@ python39Packages.buildPythonApplication rec { sha256 = "sha256-eF/3++wRG0JulVTT+GvtqleBPkzLSZeu+RfHDI1xfOY="; }; - buildInputs = [ fftw alsa-lib pulseaudio ]; + buildInputs = [ + fftw + alsa-lib + pulseaudio + ]; - propagatedBuildInputs = [ pyusb wxPython_4_2 ]; + propagatedBuildInputs = with python3.pkgs; [ + pyusb + wxPython_4_2 + ]; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0633ae5679..6afc2f3ec80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33640,7 +33640,7 @@ with pkgs; quirc = callPackage ../tools/graphics/quirc { }; - quisk = python39Packages.callPackage ../applications/radio/quisk { }; + quisk = callPackage ../applications/radio/quisk { }; quiterss = libsForQt5.callPackage ../applications/networking/newsreaders/quiterss { }; From 8d7bc3658f813db5256c16e50369d092ebe027f8 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Fri, 19 May 2023 01:44:20 +0200 Subject: [PATCH 15/70] _1password-gui: 8.10.4 -> 8.10.6 --- pkgs/applications/misc/1password-gui/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 68e63ead7aa..51ebc6ec63a 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -9,25 +9,25 @@ let pname = "1password"; - version = if channel == "stable" then "8.10.4" else "8.10.6-20.BETA"; + version = if channel == "stable" then "8.10.6" else "8.10.6-20.BETA"; sources = { stable = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "sha256-zFB8bUl0FNmMvNN5AoDeYdUjasJblVxRAi50V2BF5OU="; + sha256 = "sha256-wCY94x67z+X8l3wr79+BXuu6/UXJldbVIA67AAD9mj0="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz"; - sha256 = "sha256-gALQ43mAJy3eX/0qmdBp0yfMLgAdqAqD93CbDydvJR8="; + sha256 = "sha256-iLjuudWmkLMuoZSZZo9pRpx0MZludUrGTpTHCTNk4Vo="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - sha256 = "sha256-4kpf3U4G3Jx8g24kU4nXZbDA3o29hEpwACOE2zAadhA="; + sha256 = "sha256-FVj5x1RVBxPsgWhG6R4ykarZdLdJcj6gO5mQy3hHB4M="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - sha256 = "sha256-eTRI7reSZ24S8uwNFPk8BkwMexdoXD5tlL6Bd3zzIGI="; + sha256 = "sha256-ilQP1OF4gydzlLZq3aZzqNbzvacRbruzWS7pVt6DP9g="; }; }; beta = { From 809eaafd8b19027b57215596179d0d2cca0c4cb6 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Fri, 19 May 2023 01:45:00 +0200 Subject: [PATCH 16/70] _1password-gui-beta: 8.10.6-20.BETA -> 8.10.7-11.BETA --- pkgs/applications/misc/1password-gui/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 51ebc6ec63a..235bb967272 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.6" else "8.10.6-20.BETA"; + version = if channel == "stable" then "8.10.6" else "8.10.7-11.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"; - sha256 = "sha256-zhZF6BlJMlEcjKUv43f5yKv8cOzjX01yiVtIrAgw578="; + sha256 = "sha256-O7dzNRukIk654FoS1HxqHYcB8mLNORvz59p3skRXuYM="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; - sha256 = "sha256-pzZSV4mKhdm/zGErWSLwaf0WISvYBheGzCgB34ysCe4="; + sha256 = "sha256-npEVlGwMmYXH4wW6VvAhPzWNFOZl1LvuCnOgvm94rds="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - sha256 = "sha256-2Lbh5WPhBAJxvZ7J8/DDXDHkN8Th595RdA/S4Dwi3+0="; + sha256 = "sha256-Z0IZNEU8ggSF20SZziT5UTEMiWPNdVWY82nhuGyeFVU="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - sha256 = "sha256-XpVT5yfo6HkvbmZWyoPLD7/M3FrNIKec6yt450bPUxQ="; + sha256 = "sha256-qy1Vr6nDJo44Qd7mKZYR65+tIaSq0YOjjw84/mg1RgE="; }; }; }; From 8bd588bb31d5f1417c9fef03a34ca6d4ae96ca79 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 May 2023 00:35:04 +0000 Subject: [PATCH 17/70] exodus: 23.4.10 -> 23.5.8 --- pkgs/applications/blockchains/exodus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index d0ba9d2834b..22981064a1c 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }: stdenv.mkDerivation rec { pname = "exodus"; - version = "23.4.10"; + version = "23.5.8"; src = fetchzip { url = "https://downloads.exodus.com/releases/${pname}-linux-x64-${version}.zip"; - sha256 = "sha256-NWUIJCsoCsG8FKZnApicHsBTBwTL2fNb0su1KWd1E1o="; + sha256 = "sha256-3mABHkxEMS985NqQBZ7HijtTiun1iSXFJmi0qOh3m7g="; }; installPhase = '' From bfe471df4d34375c69ffcd06a841ea846388880a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 May 2023 01:03:45 +0000 Subject: [PATCH 18/70] easyeffects: 7.0.3 -> 7.0.4 --- pkgs/applications/audio/easyeffects/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/easyeffects/default.nix b/pkgs/applications/audio/easyeffects/default.nix index e45627162e5..e62e489539a 100644 --- a/pkgs/applications/audio/easyeffects/default.nix +++ b/pkgs/applications/audio/easyeffects/default.nix @@ -37,13 +37,13 @@ stdenv.mkDerivation rec { pname = "easyeffects"; - version = "7.0.3"; + version = "7.0.4"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; rev = "v${version}"; - sha256 = "sha256-vHswNRu4JrW95nZaEBs95exUqslO0dyIr41E1gJhHow="; + sha256 = "sha256-JaqwzCWVnvFzzGHnmzYwe3occ9iw7s9xCH54eVKEuOs="; }; nativeBuildInputs = [ From 56c21f04d1ef198f6e91626d01d70cff6c0bcb3c Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 18 May 2023 22:34:25 -0400 Subject: [PATCH 19/70] python310Packages.pyshark: skip flaky test --- pkgs/development/python-modules/pyshark/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyshark/default.nix b/pkgs/development/python-modules/pyshark/default.nix index 52a0b55aaf8..cef7660d63e 100644 --- a/pkgs/development/python-modules/pyshark/default.nix +++ b/pkgs/development/python-modules/pyshark/default.nix @@ -49,7 +49,11 @@ buildPythonPackage rec { nativeCheckInputs = [ py pytestCheckHook wireshark-cli ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = [ + # flaky + # KeyError: 'Packet of index 0 does not exist in capture' + "test_getting_packet_summary" + ] ++ lib.optionals stdenv.isDarwin [ # fails on darwin # _pickle.PicklingError: logger cannot be pickled "test_iterate_empty_psml_capture" From 8328c914e9c628d5ab823e0d891aa436dae7fd64 Mon Sep 17 00:00:00 2001 From: Ryan Hendrickson Date: Thu, 18 May 2023 22:55:41 -0400 Subject: [PATCH 20/70] python311Packages.contextlib2: disable --- pkgs/development/python-modules/contextlib2/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/contextlib2/default.nix b/pkgs/development/python-modules/contextlib2/default.nix index b5ea34675f6..19c26dbdd21 100644 --- a/pkgs/development/python-modules/contextlib2/default.nix +++ b/pkgs/development/python-modules/contextlib2/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , python +, pythonAtLeast , pythonOlder , unittestCheckHook }: @@ -11,7 +12,9 @@ buildPythonPackage rec { version = "21.6.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + # Python 3.11 not currently supported + # https://github.com/jazzband/contextlib2/issues/43 + disabled = pythonOlder "3.6" || pythonAtLeast "3.11"; src = fetchPypi { inherit pname version; From 985286d4a763cdecf02967382fb4a303728bbdc8 Mon Sep 17 00:00:00 2001 From: Ryan Hendrickson Date: Thu, 18 May 2023 23:22:55 -0400 Subject: [PATCH 21/70] python311Packages.gmpy: disable --- pkgs/development/python-modules/gmpy/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gmpy/default.nix b/pkgs/development/python-modules/gmpy/default.nix index c0522587724..9a2957fa23d 100644 --- a/pkgs/development/python-modules/gmpy/default.nix +++ b/pkgs/development/python-modules/gmpy/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchurl, isPyPy, gmp } : +{ buildPythonPackage, fetchurl, isPyPy, gmp, pythonAtLeast } : let pname = "gmpy"; @@ -8,7 +8,10 @@ in buildPythonPackage { inherit pname version; - disabled = isPyPy; + # Python 3.11 has finally made changes to its C API for which gmpy 1.17, + # published in 2013, would require patching. It seems unlikely that any + # patches will be forthcoming. + disabled = isPyPy || pythonAtLeast "3.11"; src = fetchurl { url = "mirror://pypi/g/gmpy/${pname}-${version}.zip"; From fe4ac7ec965ffb7c546159a2194aa0b851de207a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 May 2023 03:59:56 +0000 Subject: [PATCH 22/70] morgen: 2.6.7 -> 2.7.0 --- pkgs/applications/office/morgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index f6e8ac7e640..20928b71d7a 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "2.6.7"; + version = "2.7.0"; src = fetchurl { url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb"; - sha256 = "sha256-DlwAMA/YEnB9Z6Ry1Hvu9R9TgTw737PLtZfAVEKLjPY="; + sha256 = "sha256-v01mytnyJA1GQ/9/+7/HDIbwW1Jl4dpgf+84k0sRf4o="; }; nativeBuildInputs = [ From 4f7eab5c821195b0f81b03a1e5a863c463b8ada3 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 19 May 2023 12:01:42 +0800 Subject: [PATCH 23/70] python3Packages.edk2-pytool-library: 0.14.1 -> 0.15.0 Diff: https://github.com/tianocore/edk2-pytool-library/compare/v0.14.1...v0.15.0 --- .../python-modules/edk2-pytool-library/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index 75bfc7eb5af..f30802655ca 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.14.1"; + version = "0.15.0"; format = "pyproject"; src = fetchFromGitHub { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "v${version}"; - hash = "sha256-l3ZM2xxZrFz7n/uLSd994l+mGJDi4Qw4C2Lg2uyttL8="; + hash = "sha256-YNXaptzsIlMXaZu8mFihsaQfmPALUcL47BFn4m8GMfY="; }; nativeBuildInputs = [ From 8cd9cecc5b2aeec23c4464b9d4e7da1e41f58d19 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 May 2023 06:09:46 +0200 Subject: [PATCH 24/70] python3Packages.edk2-pytool-library: add changelog to meta --- pkgs/development/python-modules/edk2-pytool-library/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index f30802655ca..2506c5411fb 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library package that supports UEFI development"; homepage = "https://github.com/tianocore/edk2-pytool-library"; + changelog = "https://github.com/tianocore/edk2-pytool-library/releases/tag/v${version}"; license = licenses.bsd2Patent; maintainers = with maintainers; [ nickcao ]; }; From 0eb61aafd793580d44e1ca7ea12bfa2511e3c0f7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 May 2023 06:18:26 +0200 Subject: [PATCH 25/70] python310Packages.google-auth: move urllib3 to propagatedBuildInputs --- pkgs/development/python-modules/google-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index b501ad6b085..7c091acb8b4 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -1,8 +1,8 @@ { lib , stdenv -, buildPythonPackage , aiohttp , aioresponses +, buildPythonPackage , cachetools , cryptography , fetchPypi @@ -42,6 +42,7 @@ buildPythonPackage rec { pyasn1-modules rsa six + urllib3 ]; passthru.optional-dependencies = { @@ -75,7 +76,6 @@ buildPythonPackage rec { pytest-localserver pytestCheckHook responses - urllib3 ] ++ passthru.optional-dependencies.aiohttp # `cryptography` is still required on `aarch64-darwin` for `tests/crypt/*` ++ (if (stdenv.isDarwin && stdenv.isAarch64) then [ cryptography ] else passthru.optional-dependencies.enterprise_cert) From be0dec613ed2c165f5acb811a643925ec7ae4c34 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 May 2023 04:30:14 +0000 Subject: [PATCH 26/70] karlender: 0.9.1 -> 0.9.2 --- pkgs/applications/office/karlender/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/karlender/default.nix b/pkgs/applications/office/karlender/default.nix index 84777373d2d..222a91b5d62 100644 --- a/pkgs/applications/office/karlender/default.nix +++ b/pkgs/applications/office/karlender/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "karlender"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitLab { owner = "floers"; repo = pname; rev = "v${version}"; - hash = "sha256-mtkVdVxO796hZZJrGohNTeZfC43rdvEUgUZvBG92f8c="; + hash = "sha256-txPMOWwxgs9PH1Scnwr/X4cuMIUa+eoLW3K2aqmqRMQ="; }; - cargoHash = "sha256-jbdQ1dwTRJuA4F89YfxsO2PaHVef8bvxAj13veDteNM="; + cargoHash = "sha256-OyyzzkoYBed2XFCesj3QBodT9e/BaapGl/z0f6+cDZA="; nativeBuildInputs = [ pkg-config From a728604a9ff1d39a8ce94d213b6cdbc79264644e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 May 2023 04:40:15 +0000 Subject: [PATCH 27/70] ombi: 4.35.10 -> 4.39.1 --- pkgs/servers/ombi/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/ombi/default.nix b/pkgs/servers/ombi/default.nix index 945549a5988..1f648f095bd 100644 --- a/pkgs/servers/ombi/default.nix +++ b/pkgs/servers/ombi/default.nix @@ -10,14 +10,14 @@ let "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-ospnFR3syNLxy6USCrfFea2zePMa9P7opRk3hbPtpOM="; - arm64-linux_hash = "sha256-weOfb1NcVGHF1bkll0tkLxVn3TQnIq2VsRegVWk8aDc="; - x64-osx_hash = "sha256-dhQbmwDkezPZFHnGg0+bLKBWPDbRUX82imrGx5cX+ks="; + x64-linux_hash = "sha256-3gvR82JiWvw+jkF68Xm/UH7OsOPqmDlVwYDaNbNf7Jg="; + arm64-linux_hash = "sha256-4ckLs7vwTffB205Pa9BOkw+6PbVOb8tVp8S2D+Ic8fM="; + x64-osx_hash = "sha256-by2+rf/pODD7RuxTEeyh1pJ+kGYVmwlVSwxDPgeNzW4="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "ombi"; - version = "4.35.10"; + version = "4.39.1"; sourceRoot = "."; From df473425cacc7ba47c84d9a9fdb99faf0036637d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 May 2023 08:01:17 +0200 Subject: [PATCH 28/70] python310Packages.linetable: init at 0.0.3 --- .../python-modules/linetable/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/linetable/default.nix diff --git a/pkgs/development/python-modules/linetable/default.nix b/pkgs/development/python-modules/linetable/default.nix new file mode 100644 index 00000000000..6c1cde30e6f --- /dev/null +++ b/pkgs/development/python-modules/linetable/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "linetable"; + version = "0.0.3"; + format = "setuptools"; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "amol-"; + repo = "linetable"; + rev = "refs/tags/${version}"; + hash = "sha256-nVZVxK6uB5TP0pReaEya3/lFXFkiqpnnaWqYzxzO6bM="; + }; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "linetable" + ]; + + meta = with lib; { + description = "Library to parse and generate co_linetable attributes in Python code objects"; + homepage = "https://github.com/amol-/linetable"; + changelog = "https://github.com/amol-/linetable/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e74a45dd12e..092c7cc231b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5759,6 +5759,8 @@ self: super: with self; { line_profiler = callPackage ../development/python-modules/line_profiler { }; + linetable = callPackage ../development/python-modules/linetable { }; + lingua = callPackage ../development/python-modules/lingua { }; linkify-it-py = callPackage ../development/python-modules/linkify-it-py { }; From cd582d8d370f6d158b718697fce20f53102f4feb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 May 2023 08:03:54 +0200 Subject: [PATCH 29/70] python311Packages.kajiki: add input linetable --- .../python-modules/kajiki/default.nix | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/kajiki/default.nix b/pkgs/development/python-modules/kajiki/default.nix index 7ebd9d6cdbd..e11e16fbedb 100644 --- a/pkgs/development/python-modules/kajiki/default.nix +++ b/pkgs/development/python-modules/kajiki/default.nix @@ -1,15 +1,18 @@ { lib +, babel , buildPythonPackage , fetchFromGitHub -, babel -, pytz -, nine +, linetable , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "kajiki"; version = "0.9.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jackrosenthal"; @@ -18,15 +21,24 @@ buildPythonPackage rec { hash = "sha256-EbXe4Jh2IKAYw9GE0kFgKVv9c9uAOiFFYaMF8CGaOfg="; }; - propagatedBuildInputs = [ babel pytz nine ]; + propagatedBuildInputs = [ + linetable + ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + babel + pytestCheckHook + ]; + + pythonImportsCheck = [ + "kajiki" + ]; meta = with lib; { - description = "Kajiki provides fast well-formed XML templates"; + description = "Module provides fast well-formed XML templates"; homepage = "https://github.com/nandoflorestan/kajiki"; + changelog = "https://github.com/jackrosenthal/kajiki/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ onny ]; }; - } From 1be8707a2c1319b33a957435113eb3523b81f476 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 May 2023 06:08:59 +0000 Subject: [PATCH 30/70] dataexplorer: 3.7.6 -> 3.7.7 --- .../applications/science/electronics/dataexplorer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/dataexplorer/default.nix b/pkgs/applications/science/electronics/dataexplorer/default.nix index 94d24283990..33930ff08d7 100644 --- a/pkgs/applications/science/electronics/dataexplorer/default.nix +++ b/pkgs/applications/science/electronics/dataexplorer/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "dataexplorer"; - version = "3.7.6"; + version = "3.7.7"; src = fetchurl { url = "mirror://savannah/dataexplorer/dataexplorer-${version}-src.tar.gz"; - sha256 = "sha256-mwz4o1m2ldjyD4pbwMQxeaI8a8JXzis+s0I+6GW8WaY="; + sha256 = "sha256-tZ/+m+CeOE+84LbqXYPBGSMRkRU2oGnJpAP5OQkYmfY="; }; nativeBuildInputs = [ ant makeWrapper ]; From 38ed4d99adb22bb5b20d44cdea4b687240223dd3 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 19 May 2023 07:58:50 +0100 Subject: [PATCH 31/70] alpine: pull CC_FOR_BUILD Without the change alpine build on aarch64-linux fails due to missing $target-gcc wrapper: https://hydra.nixos.org/build/219995705 checking whether the C compiler works... no configure: error: in `/build/alpine': configure: error: C compiler cannot create executables --- .../networking/mailreaders/alpine/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/alpine/default.nix b/pkgs/applications/networking/mailreaders/alpine/default.nix index 99304cfef08..82239761190 100644 --- a/pkgs/applications/networking/mailreaders/alpine/default.nix +++ b/pkgs/applications/networking/mailreaders/alpine/default.nix @@ -1,5 +1,15 @@ -{ lib, stdenv, fetchgit, ncurses, tcl, openssl, pam, libkrb5 -, openldap, libxcrypt, gitUpdater +{ lib +, stdenv +, fetchgit +, buildPackages +, ncurses +, tcl +, openssl +, pam +, libkrb5 +, openldap +, libxcrypt +, gitUpdater }: stdenv.mkDerivation rec { @@ -12,6 +22,8 @@ stdenv.mkDerivation rec { hash = "sha256-cJyUBatQBjD6RG+jesJ0JRhWghPRBACc/HQl+2aCTd0="; }; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + buildInputs = [ ncurses tcl openssl pam libkrb5 openldap libxcrypt ]; From db31fcec3ff370ddc6195e9d933deac9351a529c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 19 May 2023 08:21:38 +0100 Subject: [PATCH 32/70] cassandra-cpp-driver: fix libuv include path After `libuv` split out `dev` output `cassandra-cpp-driver` build failed as https://hydra.nixos.org/build/219951761: -- Could NOT find libuv, try to set the path to libuv root folder in the system variable LIBUV_ROOT_DIR (missing: LIBUV_INCLUDE_DIR) (Required is at least version "1.0.0") Fix build by passing `LIBUV_INCLUDE_DIR` explicitly. ZHF #230712 --- .../cassandra-cpp-driver/default.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/cassandra-cpp-driver/default.nix b/pkgs/development/libraries/cassandra-cpp-driver/default.nix index fb31f1e50ab..f9f823bf0ae 100644 --- a/pkgs/development/libraries/cassandra-cpp-driver/default.nix +++ b/pkgs/development/libraries/cassandra-cpp-driver/default.nix @@ -1,7 +1,12 @@ -{ fetchFromGitHub, - lib, stdenv, - cmake, zlib, libuv, openssl, - examples ? false +{ fetchFromGitHub +, lib +, stdenv +, cmake +, zlib +, libuv +, openssl +, pkg-config +, examples ? false }: stdenv.mkDerivation rec { pname = "cassandra-cpp-driver"; version = "2.16.2"; @@ -13,14 +18,13 @@ sha256 = "sha256-NAvaRLhEvFjSmXcyM039wLC6IfLws2rkeRpbE5eL/rQ="; }; - LIBUV_ROOT_DIR = "${libuv}/"; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib libuv openssl.dev ]; - cmakeFlags = lib.attrsets.mapAttrsToList + cmakeFlags = (lib.attrsets.mapAttrsToList (name: value: "-DCASS_BUILD_${name}:BOOL=${if value then "ON" else "OFF"}") { EXAMPLES = examples; - }; + }) ++ [ "-DLIBUV_INCLUDE_DIR=${lib.getDev libuv}/include" ]; meta = with lib; { description = "DataStax CPP cassandra driver"; From 037e2285227e4b48c318d3711964e0648eaf4955 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 19 May 2023 08:36:57 +0100 Subject: [PATCH 33/70] isl_0_24: pull CC_FOR_BUILD Without the change `isl_0_24` build on aarch64-linux fails due to missing $target-gcc wrapper: https://hydra.nixos.org/build/220002237 configure: error: in `/build/isl-0.24': configure: error: C compiler cannot create executables See `config.log' for more details ZHF #230712 --- pkgs/development/libraries/isl/generic.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/isl/generic.nix b/pkgs/development/libraries/isl/generic.nix index fb71a364066..31bd990645b 100644 --- a/pkgs/development/libraries/isl/generic.nix +++ b/pkgs/development/libraries/isl/generic.nix @@ -5,7 +5,12 @@ , patches ? [] }: -{ lib, stdenv, fetchurl, gmp, autoreconfHook +{ lib +, stdenv +, fetchurl +, gmp +, autoreconfHook +, buildPackages }: stdenv.mkDerivation { @@ -19,6 +24,7 @@ stdenv.mkDerivation { inherit patches; strictDeps = true; + depsBuildBuild = lib.optionals (lib.versionAtLeast version "0.24") [ buildPackages.stdenv.cc ]; nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isRiscV && lib.versionOlder version "0.24") [ autoreconfHook ]; buildInputs = [ gmp ]; From a357a3e0919ef81b24ae6efee8e37d98d9a7e4b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 May 2023 09:26:30 +0000 Subject: [PATCH 34/70] libarchive-qt: 2.0.7 -> 2.0.8 --- pkgs/development/libraries/libarchive-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libarchive-qt/default.nix b/pkgs/development/libraries/libarchive-qt/default.nix index ae74fd3028a..14608b9f970 100644 --- a/pkgs/development/libraries/libarchive-qt/default.nix +++ b/pkgs/development/libraries/libarchive-qt/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "libarchive-qt"; - version = "2.0.7"; + version = "2.0.8"; src = fetchFromGitLab { owner = "marcusbritanicus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KRywB+Op44N00q9tgO2WNCliRgUDRvrCms1O8JYt62o="; + sha256 = "sha256-31a6DsxObSJWyLfT6mVtyjloT26IwFHpH53iuyC2mco="; }; nativeBuildInputs = [ From 17db7c08d86625fd0aea1453a4b59a131b7f1975 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 May 2023 10:22:11 +0000 Subject: [PATCH 35/70] pomerium: 0.21.3 -> 0.22.1 --- pkgs/servers/http/pomerium/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/pomerium/default.nix b/pkgs/servers/http/pomerium/default.nix index e867b79fff8..9cd49e98d98 100644 --- a/pkgs/servers/http/pomerium/default.nix +++ b/pkgs/servers/http/pomerium/default.nix @@ -14,15 +14,15 @@ let in buildGoModule rec { pname = "pomerium"; - version = "0.21.3"; + version = "0.22.1"; src = fetchFromGitHub { owner = "pomerium"; repo = "pomerium"; rev = "v${version}"; - sha256 = "sha256-OB44/6ha72882SzaMpotchU8RrU10rvUL58sCiCKcok="; + sha256 = "sha256-Z3mnBPFF354QQ/oswzvlsHoBmQ4QRYltAnsBKmjQ3Hc="; }; - vendorSha256 = "sha256-8g3jhxKIT0EGUXh0hrvDbw3i04khqlAfGzM6k4q3O8g="; + vendorSha256 = "sha256-xe8as7OY1+tTSqgpwk2Q1jcBnn89latJpMyx4KG7zg8="; ui = mkYarnPackage { inherit version; From bee52d7d8e791ec07fc14976d5f15dc5fd6d6e47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 May 2023 10:39:18 +0000 Subject: [PATCH 36/70] grafana-image-renderer: 3.7.0 -> 3.7.1 --- pkgs/servers/monitoring/grafana-image-renderer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/pkgs/servers/monitoring/grafana-image-renderer/default.nix index e9641b9f7a2..5587829f923 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/default.nix +++ b/pkgs/servers/monitoring/grafana-image-renderer/default.nix @@ -7,13 +7,13 @@ mkYarnPackage rec { pname = "grafana-image-renderer"; - version = "3.7.0"; + version = "3.7.1"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; rev = "v${version}"; - sha256 = "sha256-kbL6I2aFHyCmBiB1x02e3H7wIO4TE8ty6vHJEu/T8fI="; + sha256 = "sha256-hYjl8jwRqcWdxDlUxUBTd3A6giJVWa0l+BZvfYInD0Y="; }; buildPhase = '' From df8b05e0bacc783c37f3b7c50de81254bb522762 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 May 2023 13:34:13 +0000 Subject: [PATCH 37/70] callaudiod: 0.1.7 -> 0.1.9 --- pkgs/applications/audio/callaudiod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/callaudiod/default.nix b/pkgs/applications/audio/callaudiod/default.nix index 221febf35dc..0723bfe7a0f 100644 --- a/pkgs/applications/audio/callaudiod/default.nix +++ b/pkgs/applications/audio/callaudiod/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "callaudiod"; - version = "0.1.7"; + version = "0.1.9"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "mobian1"; repo = pname; rev = version; - sha256 = "sha256-BDEu3ASlnovMK0lQC+CQvpXvtdt33BRntstPAWaAnsg="; + sha256 = "sha256-OuWn1DA+4LmN1KwouiqW3kn6CMg8jhm0FiyAgMSi1GI="; }; strictDeps = true; From 4676146840140489e20aad7525ff1f0e31ad4a46 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 19 May 2023 21:44:55 +0800 Subject: [PATCH 38/70] numix-icon-theme: 22.11.17 -> 23.04.26 https://github.com/numixproject/numix-icon-theme/compare/22.11.17...23.04.26 --- pkgs/data/icons/numix-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index cb425ee00cb..af84d20c16a 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -11,13 +11,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme"; - version = "22.11.17"; + version = "23.04.26"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-B6Yg9NkPBpByMMV4GcEBmOlSKx1s0MClGWL2RWIJMwA="; + sha256 = "sha256-6tkE23G67nH/aZjDEtW64RcZsBrcd9iNj1r9lDlUFsk="; }; nativeBuildInputs = [ From a43c3a7874d8ccb99276c88e31f21e9e16848bd7 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 19 May 2023 09:56:45 -0400 Subject: [PATCH 39/70] typos: 1.14.9 -> 1.14.10, add figsoda as a maintainer Diff: https://github.com/crate-ci/typos/compare/v1.14.9...v1.14.10 Changelog: https://github.com/crate-ci/typos/blob/v1.14.10/CHANGELOG.md --- pkgs/development/tools/typos/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index 5be5bce2c5c..7a39c0b8e1d 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -1,22 +1,23 @@ -{ fetchFromGitHub, rustPlatform, lib }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.14.9"; + version = "1.14.10"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-dfUXH7MRTnHYSqNJzlT0fUn/Er0wrTARq3ZuOdWToow="; + hash = "sha256-RPdDPVOV2V+WK2crZ9e84BjNOYGJCgLhYDTj17QX+IM="; }; - cargoHash = "sha256-+u/3XtC/HxtAsX4dRf74u0BLh872Y2kK+BnbWqUnUdo="; + cargoHash = "sha256-LAZcyGU/qrBhmF+Nx+ypmSzCieW49ZQCqmG+0h6yB3g="; meta = with lib; { description = "Source code spell checker"; - homepage = "https://github.com/crate-ci/typos/"; + homepage = "https://github.com/crate-ci/typos"; + changelog = "https://github.com/crate-ci/typos/blob/${src.rev}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = [ maintainers.mgttlinger ]; + maintainers = with maintainers; [ figsoda mgttlinger ]; }; } From 8ef16d70af4b813a6dbeca47435fae18443af650 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 19 May 2023 09:58:13 -0400 Subject: [PATCH 40/70] muffet: 2.8.0 -> 2.8.1 Diff: https://github.com/raviqqe/muffet/compare/v2.8.0...v2.8.1 Changelog: https://github.com/raviqqe/muffet/releases/tag/v2.8.1 --- pkgs/tools/networking/muffet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/muffet/default.nix b/pkgs/tools/networking/muffet/default.nix index f209336aea4..c40ded8e6b8 100644 --- a/pkgs/tools/networking/muffet/default.nix +++ b/pkgs/tools/networking/muffet/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "muffet"; - version = "2.8.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "raviqqe"; repo = "muffet"; rev = "v${version}"; - hash = "sha256-8+aOxrmLc0iM6uQ35Qtn+a8bzNS1zg1AM25hDylvAEQ="; + hash = "sha256-SQtAT4vK1jLwwMha/HuJjh3BtDTdxV7BDgmwxlK+lqc="; }; - vendorHash = "sha256-BmaljudKwALbx8ECVOpXlEi+/3pOt6osRqHvn9Ek/MI="; + vendorHash = "sha256-/qK4x44J2fDSXxGK3kczWY4NZVPPhRo4NMnyxV6W6CY="; meta = with lib; { description = "A website link checker which scrapes and inspects all pages in a website recursively"; From cca08be917d33f82e45719b13132a43f89b1db3d Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 19 May 2023 23:16:54 +0900 Subject: [PATCH 41/70] cz-cli: 4.2.4 -> 4.3.0 bump and repackage with `buildNpmPackage` --- .../version-management/cz-cli/default.nix | 28 +- .../cz-cli/generate-dependencies.sh | 9 - .../cz-cli/node-composition.nix | 17 - .../version-management/cz-cli/node-env.nix | 588 - .../cz-cli/node-packages.nix | 9432 ----------------- .../version-management/cz-cli/package.json | 3 - 6 files changed, 18 insertions(+), 10059 deletions(-) delete mode 100755 pkgs/applications/version-management/cz-cli/generate-dependencies.sh delete mode 100644 pkgs/applications/version-management/cz-cli/node-composition.nix delete mode 100644 pkgs/applications/version-management/cz-cli/node-env.nix delete mode 100644 pkgs/applications/version-management/cz-cli/node-packages.nix delete mode 100644 pkgs/applications/version-management/cz-cli/package.json diff --git a/pkgs/applications/version-management/cz-cli/default.nix b/pkgs/applications/version-management/cz-cli/default.nix index 769aa0abb8c..d87b6d48c22 100644 --- a/pkgs/applications/version-management/cz-cli/default.nix +++ b/pkgs/applications/version-management/cz-cli/default.nix @@ -1,18 +1,26 @@ -{ pkgs, nodejs, stdenv, lib, ... }: +{ lib +, buildNpmPackage +, fetchFromGitHub +}: -let - nodePackages = import ./node-composition.nix { - inherit pkgs nodejs; - inherit (stdenv.hostPlatform) system; +buildNpmPackage rec { + pname = "cz-cli"; + version = "4.3.0"; + + src = fetchFromGitHub { + owner = "commitizen"; + repo = "cz-cli"; + rev = "refs/tags/v${version}"; + hash = "sha256-4kyGxidE8dzkHL0oPv/XxDxQ3qlEE6TKSgj+1g9uvJM="; }; -in -nodePackages.commitizen.override { - name = "cz-cli"; + + npmDepsHash = "sha256-zQ0T/1khnn+CXm/3yc9nANL0ROEEE03U5fV57btEmPg="; + meta = with lib; { description = "The commitizen command line utility"; homepage = "https://commitizen.github.io/cz-cli"; - maintainers = with maintainers; [ freezeboy ]; + changelog = "https://github.com/commitizen/cz-cli/releases/tag/v${version}"; + maintainers = with maintainers; [ freezeboy natsukium ]; license = licenses.mit; - platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/version-management/cz-cli/generate-dependencies.sh b/pkgs/applications/version-management/cz-cli/generate-dependencies.sh deleted file mode 100755 index 9855e2d41d1..00000000000 --- a/pkgs/applications/version-management/cz-cli/generate-dependencies.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -I nixpkgs=../../../.. -i bash -p nodePackages.node2nix - -node2nix \ - --node-env node-env.nix \ - --development \ - --input package.json \ - --output node-packages.nix \ - --composition node-composition.nix diff --git a/pkgs/applications/version-management/cz-cli/node-composition.nix b/pkgs/applications/version-management/cz-cli/node-composition.nix deleted file mode 100644 index 5bd4f169fc8..00000000000 --- a/pkgs/applications/version-management/cz-cli/node-composition.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! - -{pkgs ? import { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: - -let - nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; - inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; - }; -in -import ./node-packages.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; - inherit nodeEnv; -} diff --git a/pkgs/applications/version-management/cz-cli/node-env.nix b/pkgs/applications/version-management/cz-cli/node-env.nix deleted file mode 100644 index 5f055785791..00000000000 --- a/pkgs/applications/version-management/cz-cli/node-env.nix +++ /dev/null @@ -1,588 +0,0 @@ -# This file originates from node2nix - -{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}: - -let - # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master - utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; - - python = if nodejs ? python then nodejs.python else python2; - - # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise - tarWrapper = runCommand "tarWrapper" {} '' - mkdir -p $out/bin - - cat > $out/bin/tar <> $out/nix-support/hydra-build-products - ''; - }; - - # Common shell logic - installPackage = writeShellScript "install-package" '' - installPackage() { - local packageName=$1 src=$2 - - local strippedName - - local DIR=$PWD - cd $TMPDIR - - unpackFile $src - - # Make the base dir in which the target dependency resides first - mkdir -p "$(dirname "$DIR/$packageName")" - - if [ -f "$src" ] - then - # Figure out what directory has been unpacked - packageDir="$(find . -maxdepth 1 -type d | tail -1)" - - # Restore write permissions to make building work - find "$packageDir" -type d -exec chmod u+x {} \; - chmod -R u+w "$packageDir" - - # Move the extracted tarball into the output folder - mv "$packageDir" "$DIR/$packageName" - elif [ -d "$src" ] - then - # Get a stripped name (without hash) of the source directory. - # On old nixpkgs it's already set internally. - if [ -z "$strippedName" ] - then - strippedName="$(stripHash $src)" - fi - - # Restore write permissions to make building work - chmod -R u+w "$strippedName" - - # Move the extracted directory into the output folder - mv "$strippedName" "$DIR/$packageName" - fi - - # Change to the package directory to install dependencies - cd "$DIR/$packageName" - } - ''; - - # Bundle the dependencies of the package - # - # Only include dependencies if they don't exist. They may also be bundled in the package. - includeDependencies = {dependencies}: - lib.optionalString (dependencies != []) ( - '' - mkdir -p node_modules - cd node_modules - '' - + (lib.concatMapStrings (dependency: - '' - if [ ! -e "${dependency.name}" ]; then - ${composePackage dependency} - fi - '' - ) dependencies) - + '' - cd .. - '' - ); - - # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }@args: - builtins.addErrorContext "while evaluating node package '${packageName}'" '' - installPackage "${packageName}" "${src}" - ${includeDependencies { inherit dependencies; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - ''; - - pinpointDependencies = {dependencies, production}: - let - pinpointDependenciesFromPackageJSON = writeTextFile { - name = "pinpointDependencies.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function resolveDependencyVersion(location, name) { - if(location == process.env['NIX_STORE']) { - return null; - } else { - var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); - - if(fs.existsSync(dependencyPackageJSON)) { - var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); - - if(dependencyPackageObj.name == name) { - return dependencyPackageObj.version; - } - } else { - return resolveDependencyVersion(path.resolve(location, ".."), name); - } - } - } - - function replaceDependencies(dependencies) { - if(typeof dependencies == "object" && dependencies !== null) { - for(var dependency in dependencies) { - var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); - - if(resolvedVersion === null) { - process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); - } else { - dependencies[dependency] = resolvedVersion; - } - } - } - } - - /* Read the package.json configuration */ - var packageObj = JSON.parse(fs.readFileSync('./package.json')); - - /* Pinpoint all dependencies */ - replaceDependencies(packageObj.dependencies); - if(process.argv[2] == "development") { - replaceDependencies(packageObj.devDependencies); - } - replaceDependencies(packageObj.optionalDependencies); - - /* Write the fixed package.json file */ - fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); - ''; - }; - in - '' - node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - - ${lib.optionalString (dependencies != []) - '' - if [ -d node_modules ] - then - cd node_modules - ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} - cd .. - fi - ''} - ''; - - # Recursively traverses all dependencies of a package and pinpoints all - # dependencies in the package.json file to the versions that are actually - # being used. - - pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: - '' - if [ -d "${packageName}" ] - then - cd "${packageName}" - ${pinpointDependencies { inherit dependencies production; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - fi - ''; - - # Extract the Node.js source code which is used to compile packages with - # native bindings - nodeSources = runCommand "node-sources" {} '' - tar --no-same-owner --no-same-permissions -xf ${nodejs.src} - mv node-* $out - ''; - - # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) - addIntegrityFieldsScript = writeTextFile { - name = "addintegrityfields.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function augmentDependencies(baseDir, dependencies) { - for(var dependencyName in dependencies) { - var dependency = dependencies[dependencyName]; - - // Open package.json and augment metadata fields - var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); - var packageJSONPath = path.join(packageJSONDir, "package.json"); - - if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored - console.log("Adding metadata fields to: "+packageJSONPath); - var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); - - if(dependency.integrity) { - packageObj["_integrity"] = dependency.integrity; - } else { - packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. - } - - if(dependency.resolved) { - packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided - } else { - packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. - } - - if(dependency.from !== undefined) { // Adopt from property if one has been provided - packageObj["_from"] = dependency.from; - } - - fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); - } - - // Augment transitive dependencies - if(dependency.dependencies !== undefined) { - augmentDependencies(packageJSONDir, dependency.dependencies); - } - } - } - - if(fs.existsSync("./package-lock.json")) { - var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); - - if(![1, 2].includes(packageLock.lockfileVersion)) { - process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); - process.exit(1); - } - - if(packageLock.dependencies !== undefined) { - augmentDependencies(".", packageLock.dependencies); - } - } - ''; - }; - - # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes - reconstructPackageLock = writeTextFile { - name = "addintegrityfields.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - var packageObj = JSON.parse(fs.readFileSync("package.json")); - - var lockObj = { - name: packageObj.name, - version: packageObj.version, - lockfileVersion: 1, - requires: true, - dependencies: {} - }; - - function augmentPackageJSON(filePath, dependencies) { - var packageJSON = path.join(filePath, "package.json"); - if(fs.existsSync(packageJSON)) { - var packageObj = JSON.parse(fs.readFileSync(packageJSON)); - dependencies[packageObj.name] = { - version: packageObj.version, - integrity: "sha1-000000000000000000000000000=", - dependencies: {} - }; - processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies); - } - } - - function processDependencies(dir, dependencies) { - if(fs.existsSync(dir)) { - var files = fs.readdirSync(dir); - - files.forEach(function(entry) { - var filePath = path.join(dir, entry); - var stats = fs.statSync(filePath); - - if(stats.isDirectory()) { - if(entry.substr(0, 1) == "@") { - // When we encounter a namespace folder, augment all packages belonging to the scope - var pkgFiles = fs.readdirSync(filePath); - - pkgFiles.forEach(function(entry) { - if(stats.isDirectory()) { - var pkgFilePath = path.join(filePath, entry); - augmentPackageJSON(pkgFilePath, dependencies); - } - }); - } else { - augmentPackageJSON(filePath, dependencies); - } - } - }); - } - } - - processDependencies("node_modules", lockObj.dependencies); - - fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); - ''; - }; - - prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: - let - forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; - in - '' - # Pinpoint the versions of all dependencies to the ones that are actually being used - echo "pinpointing versions of dependencies..." - source $pinpointDependenciesScriptPath - - # Patch the shebangs of the bundled modules to prevent them from - # calling executables outside the Nix store as much as possible - patchShebangs . - - # Deploy the Node.js package by running npm install. Since the - # dependencies have been provided already by ourselves, it should not - # attempt to install them again, which is good, because we want to make - # it Nix's responsibility. If it needs to install any dependencies - # anyway (e.g. because the dependency parameters are - # incomplete/incorrect), it fails. - # - # The other responsibilities of NPM are kept -- version checks, build - # steps, postprocessing etc. - - export HOME=$TMPDIR - cd "${packageName}" - runHook preRebuild - - ${lib.optionalString bypassCache '' - ${lib.optionalString reconstructLock '' - if [ -f package-lock.json ] - then - echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" - echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" - rm package-lock.json - else - echo "No package-lock.json file found, reconstructing..." - fi - - node ${reconstructPackageLock} - ''} - - node ${addIntegrityFieldsScript} - ''} - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild - - if [ "''${dontNpmInstall-}" != "1" ] - then - # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. - rm -f npm-shrinkwrap.json - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install - fi - ''; - - # Builds and composes an NPM package including all its dependencies - buildNodePackage = - { name - , packageName - , version - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , preRebuild ? "" - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , meta ? {} - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; - in - stdenv.mkDerivation ({ - name = "${name}-${version}"; - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit nodejs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall preRebuild unpackPhase buildPhase; - - compositionScript = composePackage args; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; - - installPhase = '' - source ${installPackage} - - # Create and enter a root node_modules/ folder - mkdir -p $out/lib/node_modules - cd $out/lib/node_modules - - # Compose the package and all its dependencies - source $compositionScriptPath - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Create symlink to the deployed executable folder, if applicable - if [ -d "$out/lib/node_modules/.bin" ] - then - ln -s $out/lib/node_modules/.bin $out/bin - fi - - # Create symlinks to the deployed manual page folders, if applicable - if [ -d "$out/lib/node_modules/${packageName}/man" ] - then - mkdir -p $out/share - for dir in "$out/lib/node_modules/${packageName}/man/"* - do - mkdir -p $out/share/man/$(basename "$dir") - for page in "$dir"/* - do - ln -s $page $out/share/man/$(basename "$dir") - done - done - fi - - # Run post install hook, if provided - runHook postInstall - ''; - - meta = { - # default to Node.js' platforms - platforms = nodejs.meta.platforms; - } // meta; - } // extraArgs); - - # Builds a node environment (a node_modules folder and a set of binaries) - buildNodeDependencies = - { name - , packageName - , version - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; - in - stdenv.mkDerivation ({ - name = "node-dependencies-${name}-${version}"; - - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall unpackPhase buildPhase; - - includeScript = includeDependencies { inherit dependencies; }; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; - - installPhase = '' - source ${installPackage} - - mkdir -p $out/${packageName} - cd $out/${packageName} - - source $includeScriptPath - - # Create fake package.json to make the npm commands work properly - cp ${src}/package.json . - chmod 644 package.json - ${lib.optionalString bypassCache '' - if [ -f ${src}/package-lock.json ] - then - cp ${src}/package-lock.json . - fi - ''} - - # Go to the parent folder to make sure that all packages are pinpointed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Expose the executables that were installed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - mv ${packageName} lib - ln -s $out/lib/node_modules/.bin $out/bin - ''; - } // extraArgs); - - # Builds a development shell - buildNodeShell = - { name - , packageName - , version - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - nodeDependencies = buildNodeDependencies args; - in - stdenv.mkDerivation { - name = "node-shell-${name}-${version}"; - - buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; - buildCommand = '' - mkdir -p $out/bin - cat > $out/bin/shell < Date: Fri, 19 May 2023 16:36:39 +0200 Subject: [PATCH 42/70] xpdf: add recent CVE IDs to the knownVulnerabilities The package already has some known vulnerabilities. I'm adding the new ones mostly to save future me some time so I do not have to ask myself if this long list on unpatched issues is expected or not. Upstream expects to to fix all of that in xpdf 5. --- pkgs/applications/misc/xpdf/default.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index 168db4e3bd9..0205208c86b 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -78,6 +78,27 @@ stdenv.mkDerivation rec { "CVE-2019-9587: loop in PDF objects" "CVE-2019-9588: loop in PDF objects" "CVE-2019-16088: loop in PDF objects" + "CVE-2022-38334" + "CVE-2022-38928" + "CVE-2022-41842" + "CVE-2022-41843" + "CVE-2022-41844" + "CVE-2022-43071" + "CVE-2022-43295" + "CVE-2022-45586" + "CVE-2022-45587" + "CVE-2023-2662" + "CVE-2023-2663" + "CVE-2023-2664" + "CVE-2023-26930" + "CVE-2023-26931" + "CVE-2023-26934" + "CVE-2023-26935" + "CVE-2023-26936" + "CVE-2023-26937" + "CVE-2023-26938" + "CVE-2023-27655" + "CVE-2023-31557" ]; }; } From 6b296fbcf2fed22c85aaf555e81a21c3399f75f4 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 19 May 2023 11:09:09 -0400 Subject: [PATCH 43/70] ast-grep: fix build on aarch64-linux --- pkgs/development/tools/misc/ast-grep/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/tools/misc/ast-grep/default.nix b/pkgs/development/tools/misc/ast-grep/default.nix index 2cad8d017d7..caed883531d 100644 --- a/pkgs/development/tools/misc/ast-grep/default.nix +++ b/pkgs/development/tools/misc/ast-grep/default.nix @@ -15,6 +15,11 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-ed6hc7MIo/Hu1JY7yy6dYHbaTZ9S+T0dh/2H3sTT52Y="; + # error: linker `aarch64-linux-gnu-gcc` not found + postPatch = '' + rm .cargo/config.toml + ''; + meta = with lib; { mainProgram = "sg"; description = "A fast and polyglot tool for code searching, linting, rewriting at large scale"; From 99079728ab0a3f398d05177c188faad21cfc4237 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 19 May 2023 11:11:51 -0400 Subject: [PATCH 44/70] ast-grep: fix build on x86_64-darwin --- pkgs/development/tools/misc/ast-grep/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/tools/misc/ast-grep/default.nix b/pkgs/development/tools/misc/ast-grep/default.nix index caed883531d..fc23e9e3d2e 100644 --- a/pkgs/development/tools/misc/ast-grep/default.nix +++ b/pkgs/development/tools/misc/ast-grep/default.nix @@ -1,7 +1,9 @@ { lib , rustPlatform , fetchFromGitHub +, stdenv }: + rustPlatform.buildRustPackage rec { pname = "ast-grep"; version = "0.5.2"; @@ -20,6 +22,12 @@ rustPlatform.buildRustPackage rec { rm .cargo/config.toml ''; + checkFlags = lib.optionals (stdenv.isx86_64 && stdenv.isDarwin) [ + # fails on emulated x86_64-darwin + # mach-o file, but is an incompatible architecture (have 'arm64', need 'x86_64') + "--skip=test::test_load_parser" + ]; + meta = with lib; { mainProgram = "sg"; description = "A fast and polyglot tool for code searching, linting, rewriting at large scale"; From 2dfec9ca750d68af9a7237fe12d151d70b48055f Mon Sep 17 00:00:00 2001 From: fanquake Date: Fri, 19 May 2023 16:28:16 +0100 Subject: [PATCH 45/70] bitcoin: 24.0.1 -> 24.1 --- pkgs/applications/blockchains/bitcoin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index 98483391973..c9dc328504e 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -32,14 +32,14 @@ let in stdenv.mkDerivation rec { pname = if withGui then "bitcoin" else "bitcoind"; - version = "24.0.1"; + version = "24.1"; src = fetchurl { urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; # hash retrieved from signed SHA256SUMS - sha256 = "12d4ad6dfab4767d460d73307e56d13c72997e114fad4f274650f95560f5f2ff"; + sha256 = "8a0a3db3b2d9cc024e897113f70a3a65d8de831c129eb6d1e26ffa65e7bfaf4e"; }; nativeBuildInputs = From f7c59ea08cbda5bad1c3222db7c1662f2596cf6f Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 19 May 2023 11:29:52 -0400 Subject: [PATCH 46/70] arrayfire: fix build on darwin --- .../libraries/arrayfire/default.nix | 58 ++++++++++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 45 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/arrayfire/default.nix b/pkgs/development/libraries/arrayfire/default.nix index bc0da2ddea2..8692aa3017f 100644 --- a/pkgs/development/libraries/arrayfire/default.nix +++ b/pkgs/development/libraries/arrayfire/default.nix @@ -1,9 +1,27 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config -, opencl-clhpp, ocl-icd, fftw, fftwFloat -, blas, lapack, boost, mesa, libGLU, libGL -, freeimage, python3, clfft, clblas -, doxygen, buildDocs ? false -, cudaSupport ? false, cudatoolkit +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, opencl-clhpp +, ocl-icd +, fftw +, fftwFloat +, blas +, lapack +, boost +, mesa +, libGLU +, libGL +, freeimage +, python3 +, clfft +, clblas +, doxygen +, buildDocs ? false +, cudaSupport ? false +, cudatoolkit +, darwin }: stdenv.mkDerivation rec { @@ -48,14 +66,26 @@ stdenv.mkDerivation rec { strictDeps = true; buildInputs = [ - opencl-clhpp fftw fftwFloat - blas lapack - libGLU libGL - mesa freeimage - boost.out boost.dev - ] ++ (lib.optional stdenv.isLinux ocl-icd) - ++ (lib.optional cudaSupport cudatoolkit) - ++ (lib.optional buildDocs doxygen); + opencl-clhpp + fftw + fftwFloat + blas + lapack + libGLU + libGL + mesa + freeimage + boost.out + boost.dev + ] ++ lib.optionals stdenv.isLinux [ + ocl-icd + ] ++ lib.optionals cudaSupport [ + cudatoolkit + ] ++ lib.optionals buildDocs [ + doxygen + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk_11_0.frameworks.Accelerate + ]; meta = with lib; { description = "A general-purpose library for parallel and massively-parallel computations"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b03392cf33..e1bf4acd6f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19577,7 +19577,7 @@ with pkgs; armadillo = callPackage ../development/libraries/armadillo { }; - arrayfire = callPackage ../development/libraries/arrayfire { }; + arrayfire = darwin.apple_sdk_11_0.callPackage ../development/libraries/arrayfire { }; arrow-cpp = callPackage ../development/libraries/arrow-cpp { }; From a8c242fce0f2c623e9f4e89c9a1d06c18cee2761 Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Sat, 20 May 2023 00:20:28 +0800 Subject: [PATCH 47/70] vimPlugins.base46: init at unstable-2023-05-06 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index b4c320f3b28..b07c646f014 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -953,6 +953,18 @@ final: prev: meta.homepage = "https://github.com/chriskempson/base16-vim/"; }; + base46 = buildVimPluginFrom2Nix { + pname = "base46"; + version = "unstable-2023-05-06"; + src = fetchFromGitHub { + owner = "nvchad"; + repo = "base46"; + rev = "bad87b034430b0241d03868c3802c2f1a4e0b4be"; + sha256 = "1nplnd4f5wzwkbbfw9nnpm3jdy0il4wbqh5gdnbh9xmldb3lf376"; + }; + meta.homepage = "https://github.com/nvchad/base46/"; + }; + bat-vim = buildVimPluginFrom2Nix { pname = "bat.vim"; version = "2022-11-14"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 60dd01d9244..34f068f7300 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -78,6 +78,7 @@ https://github.com/taybart/b64.nvim/,HEAD, https://github.com/romgrk/barbar.nvim/,, https://github.com/utilyre/barbecue.nvim/,, https://github.com/chriskempson/base16-vim/,, +https://github.com/nvchad/base46/,HEAD, https://github.com/jamespwilliams/bat.vim/,HEAD, https://github.com/vim-scripts/bats.vim/,, https://github.com/rbgrouleff/bclose.vim/,, From 9a6c4bc66fdc2935ec3635c43f59ac2777df339c Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Sat, 20 May 2023 00:21:34 +0800 Subject: [PATCH 48/70] vimPlugins.nvterm: init at unstable-2023-05-05 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index b07c646f014..c9c6a5d99df 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -7160,6 +7160,18 @@ final: prev: meta.homepage = "https://github.com/neovim/nvimdev.nvim/"; }; + nvterm = buildVimPluginFrom2Nix { + pname = "nvterm"; + version = "unstable-2023-05-05"; + src = fetchFromGitHub { + owner = "nvchad"; + repo = "nvterm"; + rev = "5ae78fb332e92447121d2af58a6313189a7799fb"; + sha256 = "0rcj5njhkh1pwaa8d8d15nqqacx1h8j4ijygwhplvszi64kqb9r5"; + }; + meta.homepage = "https://github.com/nvchad/nvterm/"; + }; + oceanic-material = buildVimPluginFrom2Nix { pname = "oceanic-material"; version = "2022-08-17"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 34f068f7300..be11795e1e5 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -602,6 +602,7 @@ https://github.com/AckslD/nvim-whichkey-setup.lua/,, https://github.com/roxma/nvim-yarp/,, https://github.com/haringsrob/nvim_context_vt/,, https://github.com/neovim/nvimdev.nvim/,, +https://github.com/nvchad/nvterm/,HEAD, https://github.com/glepnir/oceanic-material/,, https://github.com/mhartington/oceanic-next/,, https://github.com/pwntester/octo.nvim/,, From 04a6d9fc61391fe229a3bfe5aa7ccce6c8c77b3c Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Sat, 20 May 2023 00:22:29 +0800 Subject: [PATCH 49/70] vimPlugins.nvchad-extensions: init at unstable-2023-05-14 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index c9c6a5d99df..f6ca58557d4 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -6213,6 +6213,18 @@ final: prev: meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/"; }; + nvchad-extensions = buildVimPluginFrom2Nix { + pname = "nvchad-extensions"; + version = "unstable-2023-05-14"; + src = fetchFromGitHub { + owner = "nvchad"; + repo = "extensions"; + rev = "6025bdbbac5c14b96ba4734e61eaf28db2742676"; + sha256 = "1dfj4a3vh8djgylcc4f7bg7hq2mmg8imizglzbqr0my74v4shd1w"; + }; + meta.homepage = "https://github.com/nvchad/extensions/"; + }; + nvim-FeMaco-lua = buildVimPluginFrom2Nix { pname = "nvim-FeMaco.lua"; version = "2023-04-20"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index be11795e1e5..b96603b45bd 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -254,6 +254,7 @@ https://github.com/dmix/elvish.vim/,, https://github.com/mattn/emmet-vim/,, https://github.com/vim-scripts/emodeline/,, https://github.com/sainnhe/everforest/,, +https://github.com/nvchad/extensions/,HEAD,nvchad-extensions https://github.com/fenetikm/falcon/,, https://github.com/brooth/far.vim/,, https://github.com/konfekt/fastfold/,, From bff94277d34a30be1488ef5407cac3252e52a53d Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Sat, 20 May 2023 00:23:19 +0800 Subject: [PATCH 50/70] vimPlugins.nvchad-ui: init at unstable-2023-05-18 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index f6ca58557d4..b7ba30d5c97 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -6225,6 +6225,18 @@ final: prev: meta.homepage = "https://github.com/nvchad/extensions/"; }; + nvchad-ui = buildVimPluginFrom2Nix { + pname = "nvchad-ui"; + version = "unstable-2023-05-18"; + src = fetchFromGitHub { + owner = "nvchad"; + repo = "ui"; + rev = "168ca134ae186ad977872bff3301378c0af5be71"; + sha256 = "0xwvgbv7xj1ja7fgw14vnm083hab6q19rihv8nky93wj5v5xjkya"; + }; + meta.homepage = "https://github.com/nvchad/ui/"; + }; + nvim-FeMaco-lua = buildVimPluginFrom2Nix { pname = "nvim-FeMaco.lua"; version = "2023-04-20"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index b96603b45bd..012363306ab 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -796,6 +796,7 @@ https://github.com/Quramy/tsuquyomi/,, https://github.com/folke/twilight.nvim/,, https://github.com/leafgarland/typescript-vim/,, https://github.com/jose-elias-alvarez/typescript.nvim/,, +https://github.com/nvchad/ui/,HEAD,nvchad-ui https://github.com/SirVer/ultisnips/,, https://github.com/mbbill/undotree/,, https://github.com/chrisbra/unicode.vim/,, From 38c0524988250a43c16846e579ce92d06f7be0e0 Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Sat, 20 May 2023 00:24:03 +0800 Subject: [PATCH 51/70] vimPlugins.nvchad: init at unstable-2023-05-18 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index b7ba30d5c97..e357eb4f25d 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -6213,6 +6213,18 @@ final: prev: meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/"; }; + nvchad = buildVimPluginFrom2Nix { + pname = "nvchad"; + version = "unstable-2023-05-18"; + src = fetchFromGitHub { + owner = "nvchad"; + repo = "nvchad"; + rev = "262a06776aa731ad89369394f73320461d4a7e63"; + sha256 = "1nfa1sikdrmjq8v64jsvbrfgap1dmlx8pvvpspxs4rz3i0y3scfv"; + }; + meta.homepage = "https://github.com/nvchad/nvchad/"; + }; + nvchad-extensions = buildVimPluginFrom2Nix { pname = "nvchad-extensions"; version = "unstable-2023-05-14"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 012363306ab..245b65915c1 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -522,6 +522,7 @@ https://github.com/jlesquembre/nterm.nvim/,, https://github.com/MunifTanjim/nui.nvim/,main, https://github.com/jose-elias-alvarez/null-ls.nvim/,, https://github.com/nacro90/numb.nvim/,, +https://github.com/nvchad/nvchad/,HEAD, https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/,, https://github.com/catppuccin/nvim/,,catppuccin-nvim https://github.com/AckslD/nvim-FeMaco.lua/,HEAD, From a41a78efc135a4924a6dee542a9edcf3e606e45b Mon Sep 17 00:00:00 2001 From: stepech <29132060+stepech@users.noreply.github.com> Date: Fri, 19 May 2023 14:41:51 +0200 Subject: [PATCH 52/70] burpsuite: 2023.4.3 -> 2023.4.4 https://portswigger.net/burp/releases/professional-community-2023-4-4 --- pkgs/tools/networking/burpsuite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix index d8c9e79edd6..53ed53c0089 100644 --- a/pkgs/tools/networking/burpsuite/default.nix +++ b/pkgs/tools/networking/burpsuite/default.nix @@ -1,6 +1,6 @@ { lib, fetchurl, jdk, buildFHSEnv, unzip, makeDesktopItem }: let - version = "2023.4.3"; + version = "2023.4.4"; src = fetchurl { name = "burpsuite.jar"; @@ -8,7 +8,7 @@ let "https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar" "https://web.archive.org/web/https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar" ]; - sha256 = "2e756e48f31b88590445f2b1dc4806c2f3613f9fde4dab357acb3850fd77303e"; + sha256 = "fac29bfd58be87b3c77091befede82b417aca3145e66c5d9ff02ca4939f420a3"; }; name = "burpsuite-${version}"; From edaf6d04135616543dc86cc949d1158c34801f06 Mon Sep 17 00:00:00 2001 From: eigengrau Date: Fri, 19 May 2023 18:51:56 +0200 Subject: [PATCH 53/70] rabtap: init at 1.38.2 (#230385) * rabtap: init at 1.38.2 * Update pkgs/tools/networking/rabtap/default.nix --------- Co-authored-by: Sandro --- pkgs/tools/networking/rabtap/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/networking/rabtap/default.nix diff --git a/pkgs/tools/networking/rabtap/default.nix b/pkgs/tools/networking/rabtap/default.nix new file mode 100644 index 00000000000..fded1938842 --- /dev/null +++ b/pkgs/tools/networking/rabtap/default.nix @@ -0,0 +1,22 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "rabtap"; + version = "1.38.2"; + + src = fetchFromGitHub { + owner = "jandelgado"; + repo = "rabtap"; + rev = "v${version}"; + sha256 = "sha256-l35MHr7NWBlzKcGSDGjHTwGfnDrOpjeJp9/YAp1Areo="; + }; + + vendorSha256 = "sha256-sJFMef9VnU6iKGf9UwEK60axLUBkubFWgI+pWKjaWNU="; + + meta = with lib; { + description = "RabbitMQ wire tap and swiss army knife"; + license = licenses.gpl3Only; + homepage = "https://github.com/jandelgado/rabtap"; + maintainers = with maintainers; [ eigengrau ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5935e3a36a2..ea550ed3a1c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1667,6 +1667,8 @@ with pkgs; quich = callPackage ../tools/misc/quich { } ; + rabtap = callPackage ../tools/networking/rabtap { } ; + redfang = callPackage ../tools/networking/redfang { }; s0ix-selftest-tool = callPackage ../tools/system/s0ix-selftest-tool { }; From b23eb059cca34e280382bb224e072727c5d6143a Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Fri, 19 May 2023 20:04:06 +0300 Subject: [PATCH 54/70] doomretro: fix build on darwin --- pkgs/games/doom-ports/doomretro/default.nix | 3 +++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/games/doom-ports/doomretro/default.nix b/pkgs/games/doom-ports/doomretro/default.nix index dd274c1bfea..c584f64b5d3 100644 --- a/pkgs/games/doom-ports/doomretro/default.nix +++ b/pkgs/games/doom-ports/doomretro/default.nix @@ -6,6 +6,7 @@ , SDL2 , SDL2_image , SDL2_mixer +, Cocoa }: stdenv.mkDerivation (finalAttrs: { @@ -28,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: { SDL2 SDL2_image SDL2_mixer + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + Cocoa ]; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index feac7c4a2d9..fa32f91b99a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35942,7 +35942,9 @@ with pkgs; doomseeker = qt5.callPackage ../games/doom-ports/doomseeker { }; - doomretro = callPackage ../games/doom-ports/doomretro { }; + doomretro = callPackage ../games/doom-ports/doomretro { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; chocolate-doom = callPackage ../games/doom-ports/chocolate-doom { }; From 0b0df14f76c07e2852f1d8f831203e9671691fb2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 May 2023 19:12:17 +0200 Subject: [PATCH 55/70] mqttui: add changelog to meta --- pkgs/tools/networking/mqttui/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/mqttui/default.nix b/pkgs/tools/networking/mqttui/default.nix index 830a23c0f73..b090b19ba8f 100644 --- a/pkgs/tools/networking/mqttui/default.nix +++ b/pkgs/tools/networking/mqttui/default.nix @@ -12,17 +12,18 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "EdJoPaTo"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-cezG9hdHOeTExX4OJwJ22e/PvfdySPzQGwxumavV++Q="; + rev = "refs/tags/v${version}"; + hash = "sha256-cezG9hdHOeTExX4OJwJ22e/PvfdySPzQGwxumavV++Q="; }; - cargoSha256 = "sha256-vSlziZtjyzsd346qUBEPEl8I3UlPhWHRu4+FiD1XqOo="; + cargoHash = "sha256-vSlziZtjyzsd346qUBEPEl8I3UlPhWHRu4+FiD1XqOo="; buildInputs = lib.optional stdenv.isDarwin Security; meta = with lib; { description = "Terminal client for MQTT"; homepage = "https://github.com/EdJoPaTo/mqttui"; + changelog = "https://github.com/EdJoPaTo/mqttui/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; }; From 7ae9a372d9b79e0fa5b299fedd5bf324ced051a6 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Fri, 19 May 2023 19:48:25 +0200 Subject: [PATCH 56/70] mung: fix scikit-image name --- pkgs/development/python-modules/mung/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mung/default.nix b/pkgs/development/python-modules/mung/default.nix index 2ec14dc4c91..0e5528c112d 100644 --- a/pkgs/development/python-modules/mung/default.nix +++ b/pkgs/development/python-modules/mung/default.nix @@ -6,7 +6,7 @@ , midiutil , numpy , pytestCheckHook -, scikitimage +, scikit-image , scikit-learn }: let @@ -28,7 +28,7 @@ buildPythonPackage { propagatedBuildInputs = [ lxml numpy - scikitimage + scikit-image scikit-learn matplotlib midiutil From aca056ff37550920ed737b67f01170726bc5caca Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Fri, 19 May 2023 19:56:45 +0200 Subject: [PATCH 57/70] omrdatasettools,muscima: rename scikit-image --- pkgs/development/python-modules/muscima/default.nix | 4 ++-- pkgs/development/python-modules/omrdatasettools/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/muscima/default.nix b/pkgs/development/python-modules/muscima/default.nix index f13cbecb7b7..37eb4950bfb 100644 --- a/pkgs/development/python-modules/muscima/default.nix +++ b/pkgs/development/python-modules/muscima/default.nix @@ -5,7 +5,7 @@ , matplotlib , numpy , pytestCheckHook -, scikitimage +, scikit-image , scikit-learn }: @@ -28,7 +28,7 @@ buildPythonPackage { propagatedBuildInputs = [ lxml numpy - scikitimage + scikit-image scikit-learn matplotlib ]; diff --git a/pkgs/development/python-modules/omrdatasettools/default.nix b/pkgs/development/python-modules/omrdatasettools/default.nix index cf2e91382de..4448a686e1a 100644 --- a/pkgs/development/python-modules/omrdatasettools/default.nix +++ b/pkgs/development/python-modules/omrdatasettools/default.nix @@ -9,7 +9,7 @@ , numpy , pillow , pytestCheckHook -, scikitimage +, scikit-image , sphinx-rtd-theme , sympy , pandas @@ -29,7 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pillow - scikitimage + scikit-image h5py pyhamcrest muscima From b3460634eab7dc93a20d85a246fa95c5c82752b6 Mon Sep 17 00:00:00 2001 From: networkException Date: Fri, 19 May 2023 19:19:47 +0200 Subject: [PATCH 58/70] maintainers: add networkexception --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8065425973f..79d6e098d72 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11211,6 +11211,16 @@ githubId = 13920346; name = "Sébastien Iooss"; }; + networkexception = { + name = "networkException"; + email = "nix@nwex.de"; + matrix = "@networkexception:chat.upi.li"; + github = "networkException"; + githubId = 42888162; + keys = [{ + fingerprint = "A0B9 48C5 A263 55C2 035F 8567 FBB7 2A94 52D9 1A72"; + }]; + }; neverbehave = { email = "i@never.pet"; github = "NeverBehave"; From 690a8f613d98455da45d926108f28c071128443c Mon Sep 17 00:00:00 2001 From: networkException Date: Fri, 19 May 2023 19:28:48 +0200 Subject: [PATCH 59/70] ungoogled-chromium: add networkexception as maintainer --- pkgs/applications/networking/browsers/chromium/browser.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 63465f370ca..7678d87ccff 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -85,7 +85,7 @@ mkChromiumDerivation (base: rec { then "https://github.com/ungoogled-software/ungoogled-chromium" else "https://www.chromium.org/"; maintainers = with lib.maintainers; if ungoogled - then [ squalus primeos michaeladler ] + then [ squalus primeos michaeladler networkexception ] else [ primeos thefloweringash ]; license = if enableWideVine then lib.licenses.unfree else lib.licenses.bsd3; platforms = lib.platforms.linux; From 9b942da0bd0e41fe44b16793705d5cf141a0632a Mon Sep 17 00:00:00 2001 From: networkException Date: Fri, 19 May 2023 19:48:26 +0200 Subject: [PATCH 60/70] ungoogled-chromium: 113.0.5672.93 -> 113.0.5672.126 --- .../networking/browsers/chromium/upstream-info.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index b8f8b3a8714..c4f4281a26a 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -45,9 +45,9 @@ } }, "ungoogled-chromium": { - "version": "113.0.5672.93", - "sha256": "1cy33mvhws59d358s30xqs2p9hdb28n37wmv5ihx0d07x30y3azb", - "sha256bin64": null, + "version": "113.0.5672.126", + "sha256": "14rdvidabbh0abp932m747iribvpfcha8hhxh9spck9hjkaprvqd", + "sha256bin64": "1w8b41ij6xl8byh1977skxwwq0nivpfn8wb3gv12xvm7sw24jqka", "deps": { "gn": { "version": "2023-03-18", @@ -56,8 +56,8 @@ "sha256": "12w4g2dl58283allclpi1c4i6ih9v2xvdb9hpbmfda12v8lizmlq" }, "ungoogled-patches": { - "rev": "113.0.5672.93-1", - "sha256": "0ffb33k2kgnpswq1f61gzcblvgsw7qazh8yq2kcdwc4k9bd9gr93" + "rev": "113.0.5672.126-1", + "sha256": "0s47zpl5qw5755hjhzk9g8l3ns9cwdzskq6dh1biyx1qpw0h8pld" } } } From 26f38459ada3689899de2d2fea44f338e2dba2fd Mon Sep 17 00:00:00 2001 From: networkException Date: Fri, 19 May 2023 20:02:43 +0200 Subject: [PATCH 61/70] maintainers: mention sort script --- maintainers/maintainer-list.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8065425973f..4c457228031 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -50,7 +50,8 @@ More fields may be added in the future, however, in order to comply with GDPR this file should stay as minimal as possible. When editing this file: - * keep the list alphabetically sorted + * keep the list alphabetically sorted, check with: + nix-instantiate --eval maintainers/scripts/check-maintainers-sorted.nix * test the validity of the format with: nix-build lib/tests/maintainers.nix From 7a7b0862dbe772582eb3e41c85430faf206fb606 Mon Sep 17 00:00:00 2001 From: Shane Sveller Date: Tue, 16 May 2023 11:11:39 -0500 Subject: [PATCH 62/70] erlang_26: init https://www.erlang.org/blog/otp-26-highlights/ https://www.erlang.org/patches/otp-26.0 https://www.erlang.org/doc/apps/erts/notes.html#erts-14.0 --- pkgs/development/interpreters/erlang/26.nix | 7 +++++++ pkgs/top-level/aliases.nix | 2 +- pkgs/top-level/beam-packages.nix | 16 +++++++++++++++- 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/interpreters/erlang/26.nix diff --git a/pkgs/development/interpreters/erlang/26.nix b/pkgs/development/interpreters/erlang/26.nix new file mode 100644 index 00000000000..f8d72ab3314 --- /dev/null +++ b/pkgs/development/interpreters/erlang/26.nix @@ -0,0 +1,7 @@ +{ lib, mkDerivation }: + +mkDerivation { + version = "26.0"; + sha256 = "sha256-7z5LkCLyjqGlo48XlcwAUiu1FkmAAewEGnP30QDDme8="; +} + diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 874d45b287d..b4f2d7d2d21 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -459,7 +459,7 @@ mapAliases ({ enyo-doom = enyo-launcher; # Added 2022-09-09 epoxy = libepoxy; # Added 2021-11-11 epsxe = throw "epsxe has been removed from nixpkgs, as it was unmaintained."; # added 2021-12-15 - inherit (beam.interpreters) erlangR25 erlangR24 erlangR23; # added 2023-03-21 + inherit (beam.interpreters) erlangR26 erlangR25 erlangR24 erlangR23; # added 2023-03-21 erlang_21 = throw "erlangR21 has been removed in favor of newer versions."; # added 2023-03-21 erlangR21 = erlang_21; erlang_22 = throw "erlangR22 has been removed in favor of newer versions."; # added 2023-03-21 diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 9402bd668e7..3210dddfac9 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -14,7 +14,7 @@ let self = beam; # Aliases added 2023-03-21 - versionLoop = f: lib.lists.foldr (version: acc: (f version) // acc) { } [ "25" "24" "23" ]; + versionLoop = f: lib.lists.foldr (version: acc: (f version) // acc) { } [ "26" "25" "24" "23" ]; interpretersAliases = versionLoop (version: { "erlangR${version}" = self.interpreters."erlang_${version}"; @@ -42,6 +42,19 @@ in # Standard Erlang versions, using the generic builder. + erlang_26 = self.beamLib.callErlang ../development/interpreters/erlang/26.nix { + wxGTK = wxGTK32; + parallelBuild = true; + autoconf = buildPackages.autoconf269; + inherit wxSupport systemdSupport; + }; + erlang_26_odbc = self.interpreters.erlang_26.override { odbcSupport = true; }; + erlang_26_javac = self.interpreters.erlang_26.override { javacSupport = true; }; + erlang_26_odbc_javac = self.interpreters.erlang_26.override { + javacSupport = true; + odbcSupport = true; + }; + erlang_25 = self.beamLib.callErlang ../development/interpreters/erlang/25.nix { wxGTK = wxGTK32; parallelBuild = true; @@ -100,6 +113,7 @@ in packages = { erlang = self.packages.${self.latestVersion}; + erlang_26 = self.packagesWith self.interpreters.erlang_26; erlang_25 = self.packagesWith self.interpreters.erlang_25; erlang_24 = self.packagesWith self.interpreters.erlang_24; erlang_23 = self.packagesWith self.interpreters.erlang_23; From 7c428691d28b345cc4c7c3ad80a876ccad72f7bd Mon Sep 17 00:00:00 2001 From: Atemu Date: Fri, 19 May 2023 20:16:07 +0200 Subject: [PATCH 63/70] spotify: use ffmpeg_4 Fixes https://github.com/NixOS/nixpkgs/issues/232869 --- pkgs/applications/audio/spotify/linux.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/spotify/linux.nix b/pkgs/applications/audio/spotify/linux.nix index bd869cc543b..0a5e368384d 100644 --- a/pkgs/applications/audio/spotify/linux.nix +++ b/pkgs/applications/audio/spotify/linux.nix @@ -1,6 +1,6 @@ { fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeShellWrapper, wrapGAppsHook, openssl, freetype , glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss_latest, libpng, libnotify -, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curlWithGnuTls, zlib, gnome +, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_4, curlWithGnuTls, zlib, gnome , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon , pname, meta, harfbuzz # High-DPI support: Spotify's --force-device-scale-factor argument @@ -33,7 +33,7 @@ let curlWithGnuTls dbus expat - ffmpeg + ffmpeg_4 # Requires libavcodec < 59 as of 1.2.9.743.g85d9593d fontconfig freetype gdk-pixbuf @@ -135,8 +135,8 @@ stdenv.mkDerivation { ln -s ${nspr.out}/lib/libnspr4.so $libdir/libnspr4.so ln -s ${nspr.out}/lib/libplc4.so $libdir/libplc4.so - ln -s ${ffmpeg.lib}/lib/libavcodec.so* $libdir - ln -s ${ffmpeg.lib}/lib/libavformat.so* $libdir + ln -s ${ffmpeg_4.lib}/lib/libavcodec.so* $libdir + ln -s ${ffmpeg_4.lib}/lib/libavformat.so* $libdir rpath="$out/share/spotify:$libdir" From 99a570d2727b1c9d90d19fdea08d815ea14ce5cd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 May 2023 21:28:50 +0200 Subject: [PATCH 64/70] exploitdb: 2023-05-17 -> 2023-05-19 Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2023-05-17...2023-05-19 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 071ae578c7d..6929b8417a8 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-05-17"; + version = "2023-05-19"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-WbGtfxnEBOmmK9TjxSWJSEUHaUE9gX1hm9hmA4xkHhU="; + hash = "sha256-5VHsf7qvbDZPLyr411qNwZM0/aDo2PXfdh94/lgrc5M="; }; nativeBuildInputs = [ From 431cae5b51fc9f7aa91bba881d02031671db514b Mon Sep 17 00:00:00 2001 From: Arjan Schrijver Date: Thu, 18 May 2023 20:53:33 +0200 Subject: [PATCH 65/70] oh-my-posh: 16.4.2 -> 16.7.0 Diff: https://github.com/jandedobbeleer/oh-my-posh/compare/refs/tags/v16.4.2...v16.7.0 Changelog: https://github.com/JanDeDobbeleer/oh-my-posh/releases/tag/v16.7.0 --- pkgs/development/tools/oh-my-posh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index 745f567e654..536e8b58792 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "16.4.2"; + version = "16.7.0"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hCLnoT7xkXHKCp3dvNhMjEKvKCHEWsuO9+aORcH7E8E="; + hash = "sha256-4jbZDCQTeqotR7X1gPPcwPrd8vqVS0Xrl/gZKIW49dY="; }; vendorHash = "sha256-KdvZ0OY6iJYwdK0oKqBp7bYlCe7F5BUfSWTEIMbkZcA="; From 8ee5a6fcbf8d98936fe1a336ac21ef1f31d28310 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 19 May 2023 19:45:40 +0000 Subject: [PATCH 66/70] linuxManualConfig: don't ignore cross config errors All "pc" kernel configurations in lib.systems.examples build fine without errors when cross compiling. --- pkgs/os-specific/linux/kernel/generic.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 5a39ef91500..56d89f67c64 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -47,8 +47,7 @@ # symbolic name and `patch' is the actual patch. The patch may # optionally be compressed with gzip or bzip2. kernelPatches ? [] -, ignoreConfigErrors ? stdenv.hostPlatform.linux-kernel.name != "pc" || - stdenv.hostPlatform != stdenv.buildPlatform +, ignoreConfigErrors ? stdenv.hostPlatform.linux-kernel.name != "pc" , extraMeta ? {} , isZen ? false From ef85c3fe518186ae1effb0441a92c33468c475e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 11 May 2023 22:43:12 +0200 Subject: [PATCH 67/70] nixos: use passAsFile to avoid "Argument list too long" error This patch fixes "Argument list too long" build failure when passing a list of store paths to system.extraDependencies that exceeds Linux' MAX_ARG_STRLEN limit of 128 KiB. With the shortest possible derivation names (one byte), the 128 KiB limit is equivalent to about 2850 derivations. With longer derivations names, the limit is hit earlier. Fix this restriction. --- nixos/modules/system/activation/top-level.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index c28e530cdc7..c4427149d9c 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -78,7 +78,7 @@ let ${config.system.systemBuilderCommands} - echo -n "$extraDependencies" > $out/extra-dependencies + cp "$extraDependenciesPath" "$out/extra-dependencies" ${optionalString (!config.boot.isContainer && config.boot.bootspec.enable) '' ${config.boot.bootspec.writer} @@ -98,6 +98,7 @@ let name = "nixos-system-${config.system.name}-${config.system.nixos.label}"; preferLocalBuild = true; allowSubstitutes = false; + passAsFile = [ "extraDependencies" ]; buildCommand = systemBuilder; inherit (pkgs) coreutils; From ee0de1a8cc08b9ae6a0296d272dc2824417d8ba0 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 20 May 2023 00:02:09 +0300 Subject: [PATCH 68/70] linuxPackages_latest.prl-tools: 18.2.0-53488 -> 18.3.0-53606 --- pkgs/os-specific/linux/prl-tools/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index b800e2ee98d..933622b6814 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -35,14 +35,14 @@ let ]; in stdenv.mkDerivation rec { - version = "18.2.0-53488"; + version = "18.3.0-53606"; pname = "prl-tools"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso src = fetchurl { url = "https://download.parallels.com/desktop/v${lib.versions.major version}/${version}/ParallelsDesktop-${version}.dmg"; - hash = "sha256-FpAbQQapIcZ7GsGjH4ZeJ81Ke+NUF7GvgV1wEDLKoUU="; + hash = "sha256-uthaY6266YJqh5UtlI6ifmJVZVC6JTlsEoxEUOihx4I="; }; hardeningDisable = [ "pic" "format" ]; @@ -84,8 +84,6 @@ stdenv.mkDerivation rec { runHook postUnpack ''; - env.NIX_CFLAGS_COMPILE = lib.optionalString (lib.versionAtLeast kernelVersion "6.3") "-Wno-incompatible-pointer-types"; - buildPhase = '' runHook preBuild From 8a89abcb7897d989e0d6067c57e42b8d1d82c8ba Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 20 May 2023 05:34:03 +0900 Subject: [PATCH 69/70] python3Packages.manticore: remove --- .../python-modules/manticore/default.nix | 136 ------------------ pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 - 3 files changed, 1 insertion(+), 140 deletions(-) delete mode 100644 pkgs/development/python-modules/manticore/default.nix diff --git a/pkgs/development/python-modules/manticore/default.nix b/pkgs/development/python-modules/manticore/default.nix deleted file mode 100644 index 8bc54fabf18..00000000000 --- a/pkgs/development/python-modules/manticore/default.nix +++ /dev/null @@ -1,136 +0,0 @@ -{ lib -, buildPythonPackage -, capstone -, crytic-compile -, fetchFromGitHub -, intervaltree -, ply -, prettytable -, protobuf -, pyelftools -, pyevmasm -, pysha3 -, pytestCheckHook -, pythonOlder -, pyyaml -, rlp -, stdenv -, unicorn -, wasm -, yices -, z3 -}: - -buildPythonPackage rec { - pname = "manticore"; - version = "0.3.7"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "trailofbits"; - repo = "manticore"; - rev = version; - hash = "sha256-+17VBfAtkZZIi3SF5Num1Uqg3WjIpgbz3Jx65rD5zkM="; - }; - - propagatedBuildInputs = [ - crytic-compile - intervaltree - ply - prettytable - protobuf - pyevmasm - pysha3 - pyyaml - rlp - wasm - ] ++ lib.optionals (stdenv.isLinux) [ - capstone - pyelftools - unicorn - ]; - - postPatch = '' - # Python API is not used in the code, only z3 from PATH - substituteInPlace setup.py \ - --replace "z3-solver" "" \ - --replace "crytic-compile==0.2.2" "crytic-compile>=0.2.2" - ''; - - nativeCheckInputs = [ - pytestCheckHook - ]; - - preCheck = '' - export PATH=${yices}/bin:${z3}/bin:$PATH - ''; - - disabledTestPaths = [ - "tests/ethereum" # Enable when solc works again - "tests/ethereum_bench" - ] ++ lib.optionals (!stdenv.isLinux) [ - "tests/native" - "tests/other/test_locking.py" - "tests/other/test_state_introspection.py" - ]; - - disabledTests = [ - # Failing tests - "test_chmod" - "test_timeout" - "test_wasm_main" - # Slow tests - "testmprotectFailSymbReading" - "test_ConstraintsForking" - "test_resume" - "test_symbolic" - "test_symbolic_syscall_arg" - "test_state_merging" - "test_decree" - "test_register_comparison" - "test_arguments_assertions_armv7" - "test_integration_basic_stdout" - "test_fclose_linux_amd64" - "test_fileio_linux_amd64" - "test_arguments_assertions_amd64" - "test_ioctl_bogus" - "test_ioctl_socket" - "test_brk_regression" - "test_basic_arm" - "test_logger_verbosity" - "test_profiling_data" - "test_integration_basic_stdin" - "test_getchar" - "test_ccmp_reg" - "test_ld1_mlt_structs" - "test_ccmp_imm" - "test_try_to_allocate_greater_than_last_space_memory_page_12" - "test_not_enough_memory_page_12" - "test_PCMPISTRI_30_symbolic" - "test_ld1_mlt_structs" - "test_time" - "test_implicit_call" - "test_trace" - "test_plugin" - # Tests are failing with latest unicorn - "Aarch64UnicornInstructions" - "test_integration_resume" - ]; - - pythonImportsCheck = [ - "manticore" - ]; - - meta = with lib; { - # m.c.manticore:WARNING: Manticore is only supported on Linux. Proceed at your own risk! - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; - description = "Symbolic execution tool for analysis of smart contracts and binaries"; - homepage = "https://github.com/trailofbits/manticore"; - changelog = "https://github.com/trailofbits/manticore/releases/tag/${version}"; - license = licenses.agpl3Only; - platforms = platforms.unix; - maintainers = with maintainers; [ arturcygan ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 882c75b9aed..08f14364af1 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -160,6 +160,7 @@ mapAliases ({ mailman = throw "Please use pkgs.mailman"; # added 2022-04-29 mailman-hyperkitty = throw "Please use pkgs.mailmanPackages.mailman-hyperkitty"; # added 2022-04-29 mailman-web = throw "Please use pkgs.mailman-web"; # added 2022-04-29 + manticore = throw "manticore has been removed because its dependency wasm no longer builds and is unmaintained"; # added 2023-05-20 mistune_0_8 = throw "mistune_0_8 was removed because it was outdated and insecure"; # added 2022-08-12 mistune_2_0 = mistune; # added 2022-08-12 mox = throw "mox was removed because it is unmaintained"; # added 2023-02-21 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9f2309f864c..787daef2316 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5966,10 +5966,6 @@ self: super: with self; { manuel = callPackage ../development/python-modules/manuel { }; - manticore = callPackage ../development/python-modules/manticore { - inherit (pkgs) z3; - }; - mapbox = callPackage ../development/python-modules/mapbox { }; mapbox-earcut = callPackage ../development/python-modules/mapbox-earcut { }; From 7c5d339b09a02c25af5333cb9de071faaa946b26 Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 20 May 2023 05:35:09 +0900 Subject: [PATCH 70/70] python3Packages.wasm: remove --- .../python-modules/wasm/default.nix | 30 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 pkgs/development/python-modules/wasm/default.nix diff --git a/pkgs/development/python-modules/wasm/default.nix b/pkgs/development/python-modules/wasm/default.nix deleted file mode 100644 index adc3c958bee..00000000000 --- a/pkgs/development/python-modules/wasm/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ buildPythonPackage -, fetchPypi -, pythonAtLeast -, lib -}: - -buildPythonPackage rec { - pname = "wasm"; - version = "1.2"; - - disabled = pythonAtLeast "3.10"; # project is abandoned, remove we whe move to py310/311 - - src = fetchPypi { - inherit pname version; - sha256 = "179xcinfc35xgk0bf9y58kwxzymzk7c1p58w6khmqfiqvb91j3r8"; - }; - - # there are no tests - doCheck = false; - - pythonImportsCheck = [ "wasm" ]; - - meta = with lib; { - description = "WebAssembly decoder and disassembler"; - homepage = "https://github.com/athre0z/wasm"; - changelog = "https://github.com/athre0z/wasm/blob/master/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ arturcygan ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 08f14364af1..d1e377abe03 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -306,6 +306,7 @@ mapAliases ({ uproot3-methods = throw "uproot3-methods has been removed"; # added 2022-12-13 virtual-display = throw "virtual-display has been renamed to PyVirtualDisplay"; # added 2023-01-07 Wand = wand; # added 2022-11-13 + wasm = throw "wasm has been removed because it no longer builds and is unmaintained"; # added 2023-05-20 WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29 weakrefmethod = throw "weakrefmethod was removed since it's not needed in Python >= 3.4"; # added 2022-12-01 webapp2 = throw "webapp2 is unmaintained since 2012"; # added 2022-05-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 787daef2316..6402f35bd98 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12786,8 +12786,6 @@ self: super: with self; { wasserstein = callPackage ../development/python-modules/wasserstein { }; - wasm = callPackage ../development/python-modules/wasm { }; - wasmerPackages = pkgs.recurseIntoAttrs (callPackage ../development/python-modules/wasmer { }); inherit (self.wasmerPackages) wasmer wasmer-compiler-cranelift wasmer-compiler-llvm wasmer-compiler-singlepass;