From ad221e06d03086b8730a38e6d926c8e4937233b8 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Wed, 30 Nov 2022 23:18:15 +0100 Subject: [PATCH 01/69] pkgsStatic.redis: make checkPhase pass `getconf` is needed otherwise some tests fail. --- pkgs/servers/nosql/redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 804070d0f0f5..f99935449cb0 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, lua, pkg-config, nixosTests -, tcl, which, ps, fetchpatch +, tcl, which, ps, getconf, fetchpatch , withSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isStatic, systemd # dependency ordering is broken at the moment when building with openssl , tlsSupport ? !stdenv.hostPlatform.isStatic, openssl @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { # darwin currently lacks a pure `pgrep` which is extensively used here doCheck = !stdenv.isDarwin; - checkInputs = [ which tcl ps ]; + checkInputs = [ which tcl ps ] ++ lib.optionals stdenv.hostPlatform.isStatic [ getconf ]; checkPhase = '' runHook preCheck From 6c5d77c487c7d2bb542431ef087eea6b754df5b7 Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Wed, 21 Dec 2022 23:25:40 +0100 Subject: [PATCH 02/69] soapui: 5.6.0 -> 5.7.0 --- pkgs/applications/networking/soapui/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/soapui/default.nix b/pkgs/applications/networking/soapui/default.nix index f3c8301a69b6..fc515590f37a 100644 --- a/pkgs/applications/networking/soapui/default.nix +++ b/pkgs/applications/networking/soapui/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "soapui"; - version = "5.6.0"; + version = "5.7.0"; src = fetchurl { url = "https://s3.amazonaws.com/downloads.eviware/soapuios/${version}/SoapUI-${version}-linux-bin.tar.gz"; - sha256 = "0vmj11fswja0ddnbc4vb7gj1al8km7ilma9bv1waaj8h5c8qpayi"; + sha256 = "sha256-qzhy4yHmOk13dFUd2KEZhXtWY86QwyjJgYxx9GGoN80="; }; nativeBuildInputs = [ makeWrapper ]; @@ -28,16 +28,16 @@ stdenv.mkDerivation rec { (writeText "soapui-${version}.patch" '' --- a/bin/soapui.sh +++ b/bin/soapui.sh - @@ -34,7 +34,7 @@ SOAPUI_CLASSPATH=$SOAPUI_HOME/bin/soapui-${version}.jar:$SOAPUI_HOME/lib/* - export SOAPUI_CLASSPATH + @@ -50,7 +50,7 @@ + #JAVA 16 + JAVA_OPTS="$JAVA_OPTS --illegal-access=permit" - JAVA_OPTS="-Xms128m -Xmx1024m -XX:MinHeapFreeRatio=20 -XX:MaxHeapFreeRatio=40 -Dsoapui.properties=soapui.properties -Dsoapui.home=$SOAPUI_HOME/bin -splash:SoapUI-Spashscreen.png" -JFXRTPATH=`java -cp $SOAPUI_CLASSPATH com.eviware.soapui.tools.JfxrtLocator` +JFXRTPATH=`${jdk}/bin/java -cp $SOAPUI_CLASSPATH com.eviware.soapui.tools.JfxrtLocator` SOAPUI_CLASSPATH=$JFXRTPATH:$SOAPUI_CLASSPATH if $darwin - @@ -69,4 +69,4 @@ echo = SOAPUI_HOME = $SOAPUI_HOME + @@ -85,4 +85,4 @@ echo = echo ================================ From 273bd3bc96332b51bdb183ec0ea6e1b9d8af929d Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Wed, 21 Dec 2022 23:10:17 +0100 Subject: [PATCH 03/69] dwm-status: 1.8.0 -> 1.8.1 --- pkgs/applications/window-managers/dwm/dwm-status.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index a1b790b33da8..7bde797012a8 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -9,19 +9,19 @@ in rustPlatform.buildRustPackage rec { pname = "dwm-status"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "Gerschtli"; repo = pname; rev = version; - sha256 = "sha256-BCnEnBB0OCUwvhh4XEI2eOzfy34VHNFzbqqW26X6If0="; + sha256 = "sha256-GkTPEmsnHFLUvbasAOXOQjFKs1Y9aaG87uyPvnQaT8Y="; }; nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ]; - cargoSha256 = "sha256-ylB0XGmIPW7Dbc6eDS8FZsq1AOOqntx1byaH3XIal0I="; + cargoSha256 = "sha256-eRfXUnyzOfVSEiwjLCaNbETUPXVU2Ed2VUNM9FjS5YE="; postInstall = lib.optionalString (bins != []) '' wrapProgram $out/bin/dwm-status --prefix "PATH" : "${lib.makeBinPath bins}" From aaafc9dc02a4ec776b780861afa2b1833d990ad6 Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Wed, 21 Dec 2022 23:29:32 +0100 Subject: [PATCH 04/69] dwm-status: add meta.changelog --- pkgs/applications/window-managers/dwm/dwm-status.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index 7bde797012a8..424528e9c1aa 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -30,6 +30,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Highly performant and configurable DWM status service"; homepage = "https://github.com/Gerschtli/dwm-status"; + changelog = "https://github.com/Gerschtli/dwm-status/blob/master/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ gerschtli ]; mainProgram = pname; From 0adbfe53763f70b1ae34d65ceaef1076a689ac45 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Thu, 22 Dec 2022 22:46:17 +0100 Subject: [PATCH 05/69] tautulli: 2.10.5 -> 2.11.1 --- pkgs/servers/tautulli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index eb145bccf099..b6b94c673cfc 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "Tautulli"; - version = "2.10.5"; + version = "2.11.1"; format = "other"; pythonPath = [ setuptools ]; @@ -12,7 +12,7 @@ buildPythonApplication rec { owner = "Tautulli"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+lXiRM4D9tOE55guond9coFRC61X7CVPS2HjRDtqiII="; + sha256 = "sha256-9hWTnBi8t3ZJzrDvvViQ/jYDdbNCabVAion9E9sjqRQ="; }; installPhase = '' From cf48fd52483b2753fa5271833c64ac8c6109701c Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Tue, 27 Dec 2022 01:40:06 +0100 Subject: [PATCH 06/69] tautulli: remove maintainer csingley --- pkgs/servers/tautulli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index b6b94c673cfc..e68cbf073e01 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -48,6 +48,6 @@ buildPythonApplication rec { homepage = "https://tautulli.com/"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ csingley rhoriguchi ]; + maintainers = with maintainers; [ rhoriguchi ]; }; } From d7726df8c0cf5a8ef5ffe51cec5507818bbfeb57 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 30 Dec 2022 00:24:28 +0000 Subject: [PATCH 07/69] minizip-ng: fix compat-mode findability for darwin, dynamic and static mode --- pkgs/development/libraries/minizip-ng/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/minizip-ng/default.nix b/pkgs/development/libraries/minizip-ng/default.nix index 8f12dc29784e..19cd07fc1601 100644 --- a/pkgs/development/libraries/minizip-ng/default.nix +++ b/pkgs/development/libraries/minizip-ng/default.nix @@ -51,13 +51,13 @@ stdenv.mkDerivation (finalAttrs: { "-DMZ_LIBCOMP=OFF" ]; - postInstall = let - libext = if stdenv.hostPlatform.isStatic then ".a" else ".so"; - in '' + postInstall = '' # make lib findable as libminizip-ng even if compat is enabled - if [ ! -e $out/lib/libminizip-ng${libext} ]; then - ln -s $out/lib/libminizip${libext} $out/lib/libminizip-ng${libext} - fi + for ext in so dylib a ; do + if [ -e $out/lib/libminizip.$ext ] && [ ! -e $out/lib/libminizip-ng.$ext ]; then + ln -s $out/lib/libminizip.$ext $out/lib/libminizip-ng.$ext + fi + done if [ ! -e $out/include/minizip-ng ]; then ln -s $out/include $out/include/minizip-ng fi From 8a02212d0e3fa564d488d2f66d74d20e6e80fff5 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 27 Dec 2022 17:43:34 +0000 Subject: [PATCH 08/69] opencolorio: 2.1.2 -> 2.2.0 openimageio is no longer required for the apps, so remove it in favour of openexr_3 to avoid a circular dependency --- .../libraries/opencolorio/default.nix | 48 ++++++++++++------- 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 53a37da01fd6..4cf75039c49e 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -8,6 +8,7 @@ , ilmbase , pystring , imath +, minizip-ng # Only required on Linux , glew , freeglut @@ -21,19 +22,18 @@ # Build apps , buildApps ? true # Utility applications , lcms2 -, openimageio2 -, openexr +, openexr_3 }: stdenv.mkDerivation rec { pname = "opencolorio"; - version = "2.1.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenColorIO"; rev = "v${version}"; - sha256 = "sha256-e1PpWjjfSjtgN9Rs/+lsA45Z9S4y4T6nqrJ02DZ4vjs="; + sha256 = "sha256-l5UUysHdP/gb4Mn5A64XEoHOkthl6Mlb95CuI0l4vXQ="; }; patches = [ @@ -43,8 +43,21 @@ stdenv.mkDerivation rec { revert = true; sha256 = "sha256-0DF+lwi2nfkUFG0wYvL3HYbhZS6SqGtPWoOabrFS1Eo="; }) + (fetchpatch { + name = "pkg-config-absolute-path.patch"; + url = "https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/332462e7f5051b7e26ee3d8c22890cd5e71e7c30.patch"; + sha256 = "sha256-7xHALhnOkKszgFBgPIbiZQaORnEJ+1M6RyoZdFgjElM="; + }) ]; + postPatch = lib.optionalString stdenv.isDarwin '' + # these tests don't like being run headless on darwin. no builtin + # way of skipping tests so this is what we're reduced to. + substituteInPlace tests/cpu/Config_tests.cpp \ + --replace 'OCIO_ADD_TEST(Config, virtual_display)' 'static void _skip_virtual_display()' \ + --replace 'OCIO_ADD_TEST(Config, virtual_display_with_active_displays)' 'static void _skip_virtual_display_with_active_displays()' + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ expat @@ -52,25 +65,24 @@ stdenv.mkDerivation rec { ilmbase pystring imath + minizip-ng ] ++ lib.optionals stdenv.hostPlatform.isLinux [ glew freeglut ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon GLUT Cocoa ] ++ lib.optionals pythonBindings [ python3Packages.python python3Packages.pybind11 ] - ++ lib.optionals buildApps [ lcms2 openimageio2 openexr ]; + ++ lib.optionals buildApps [ + lcms2 + openexr_3 + ]; - cmakeFlags = [ - "-DOCIO_INSTALL_EXT_PACKAGES=NONE" - ] ++ lib.optional (!pythonBindings) "-DOCIO_BUILD_PYTHON=OFF" - ++ lib.optional (!buildApps) "-DOCIO_BUILD_APPS=OFF"; + cmakeFlags = [ + "-DOCIO_INSTALL_EXT_PACKAGES=NONE" + # GPU test fails with: freeglut (GPU tests): failed to open display '' + "-DOCIO_BUILD_GPU_TESTS=OFF" + ] ++ lib.optional (!pythonBindings) "-DOCIO_BUILD_PYTHON=OFF" + ++ lib.optional (!buildApps) "-DOCIO_BUILD_APPS=OFF"; - # TODO Investigate this: Python and GPU tests fail to load libOpenColorIO.so.2.0 - # doCheck = true; - - # https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1649 - postPatch = '' - substituteInPlace src/OpenColorIO/CMakeLists.txt \ - --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} \ - --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} - ''; + # precision issues on non-x86 + doCheck = stdenv.isx86_64; meta = with lib; { homepage = "https://opencolorio.org"; From 6fd317a671e576ebc7ca45b83a64d8d718c8b3b1 Mon Sep 17 00:00:00 2001 From: schnusch Date: Fri, 30 Dec 2022 15:15:52 +0100 Subject: [PATCH 09/69] remote-touchpad: 1.2.2 -> 1.2.3 --- pkgs/tools/inputmethods/remote-touchpad/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/inputmethods/remote-touchpad/default.nix b/pkgs/tools/inputmethods/remote-touchpad/default.nix index 35e334a2fe7f..a086892caf44 100644 --- a/pkgs/tools/inputmethods/remote-touchpad/default.nix +++ b/pkgs/tools/inputmethods/remote-touchpad/default.nix @@ -1,27 +1,27 @@ { buildGoModule , fetchFromGitHub , lib -, libX11 , libXi +, libXrandr , libXt , libXtst }: buildGoModule rec { pname = "remote-touchpad"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "unrud"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KkrBWrZBvALM0TdF8AlW5Zf+r8EO9I76Otkq4cA+ikg="; + sha256 = "sha256-Yakx4eHcw3p8UAg3zAiWVrZyOFChhC5wWa0uJIKJn5g="; }; - buildInputs = [ libX11 libXi libXt libXtst ]; + buildInputs = [ libXi libXrandr libXt libXtst ]; tags = [ "portal,x11" ]; - vendorSha256 = "sha256-lEl0SOqbw6PARgO1qIN20p13BbexfCeJug1ZkuahV+k="; + vendorSha256 = "sha256-xlGAxKr2fav8WgAO+zW6ZTL7QgkdyUqRdQIOErDjRTg="; meta = with lib; { description = "Control mouse and keyboard from the webbrowser of a smartphone."; From de947d81f3de76f6c0bbc6e795deab432a10854d Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 27 Dec 2022 17:44:06 +0000 Subject: [PATCH 10/69] openimageio: 2.2.17.0 -> 2.4.6.1 switch to opencolorio 2 & use apple sdk 11.0 because upstream have decided to use futimens and we can't hold back the tide forever --- .../applications/graphics/openimageio/2.x.nix | 21 +++++++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix index d6b710595a31..88d99a0fae76 100644 --- a/pkgs/applications/graphics/openimageio/2.x.nix +++ b/pkgs/applications/graphics/openimageio/2.x.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , boost , cmake , giflib @@ -7,7 +8,7 @@ , libjpeg , libpng , libtiff -, opencolorio_1 +, opencolorio , openexr , robin-map , unzip @@ -16,15 +17,23 @@ stdenv.mkDerivation rec { pname = "openimageio"; - version = "2.2.17.0"; + version = "2.4.6.1"; src = fetchFromGitHub { owner = "OpenImageIO"; repo = "oiio"; - rev = "Release-${version}"; - sha256 = "0jqpb1zci911wdm928addsljxx8zsh0gzbhv9vbw6man4wi93h6h"; + rev = "v${version}"; + sha256 = "sha256-oBICukkborxXFHXyM2rIn5qSbCWECjwDQI9MUg13IRU="; }; + patches = [ + (fetchpatch { + name = "arm-fix-signed-unsigned-simd-mismatch.patch"; + url = "https://github.com/OpenImageIO/oiio/commit/726c51181a2888b0bd1edbef5ac8451e9cc3f893.patch"; + hash = "sha256-G4vexf0OHZ/sbcRob5X92tajkmAv72ok8rcVQtIE9XE="; + }) + ]; + outputs = [ "bin" "out" "dev" "doc" ]; nativeBuildInputs = [ @@ -39,7 +48,7 @@ stdenv.mkDerivation rec { libjpeg libpng libtiff - opencolorio_1 + opencolorio openexr robin-map fmt @@ -58,7 +67,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://www.openimageio.org"; + homepage = "https://openimageio.org"; description = "A library and tools for reading and writing images"; license = licenses.bsd3; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cbee87b1a217..01c4232c6cff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31361,7 +31361,7 @@ with pkgs; boost = boost175; }; - openimageio2 = callPackage ../applications/graphics/openimageio/2.x.nix { }; + openimageio2 = darwin.apple_sdk_11_0.callPackage ../applications/graphics/openimageio/2.x.nix { }; openjump = callPackage ../applications/misc/openjump { }; From 548539679c2b9c6d0584e3ab7d9b63a787a9f58e Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sat, 31 Dec 2022 13:11:53 +0100 Subject: [PATCH 11/69] mousai: Fix 'Namespace Gtk not available' --- pkgs/applications/audio/mousai/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/mousai/default.nix b/pkgs/applications/audio/mousai/default.nix index 96d686864fbc..51b5aa037f06 100644 --- a/pkgs/applications/audio/mousai/default.nix +++ b/pkgs/applications/audio/mousai/default.nix @@ -50,6 +50,7 @@ python3.pkgs.buildPythonApplication rec { desktop-file-utils gettext glib + gobject-introspection gtk4 meson ninja @@ -58,7 +59,6 @@ python3.pkgs.buildPythonApplication rec { ]; buildInputs = [ - gobject-introspection gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good From c4986e8dbfdac8591246d5f02d7b733d2a115416 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 31 Dec 2022 12:45:22 -0500 Subject: [PATCH 12/69] winhelpcgi: Init at 1.0-rc3 --- pkgs/development/tools/winhelpcgi/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/tools/winhelpcgi/default.nix diff --git a/pkgs/development/tools/winhelpcgi/default.nix b/pkgs/development/tools/winhelpcgi/default.nix new file mode 100644 index 000000000000..cd7bfe344357 --- /dev/null +++ b/pkgs/development/tools/winhelpcgi/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, libwmf, libpng, pkg-config, lib }: stdenv.mkDerivation { + name = "winhelpcgi-1.0-rc3"; + + src = fetchurl { + url = "http://www.herdsoft.com/ftp/winhelpcgi_1.0-1.tar.gz"; + sha256 = "sha256-9HIs50ZGoTfGixD9c/DQs0KJMQtmfsDVB8qRMnQtXNw="; + + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ libwmf libpng ]; + + meta = { + description = "CGI module for Linux, Solaris, MacOS X and AIX to read Windows Help Files"; + + homepage = "http://www.herdsoft.com/linux/produkte/winhelpcgi.html"; + + license = lib.licenses.gpl2Only; + + maintainers = [ lib.maintainers.shlevy ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e2a6a76198c..9e9cce3f1806 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3346,6 +3346,10 @@ with pkgs; wiiload = callPackage ../development/tools/wiiload { }; + winhelpcgi = callPackage ../development/tools/winhelpcgi { + libpng = libpng12; + }; + wiimms-iso-tools = callPackage ../tools/filesystems/wiimms-iso-tools { }; waypoint = callPackage ../applications/networking/cluster/waypoint { }; From 1632f9ae0872d645fbbd3ae0fe6b13488d756941 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 31 Dec 2022 18:00:39 +0000 Subject: [PATCH 13/69] wolfssl: 5.5.3 -> 5.5.4 --- pkgs/development/libraries/wolfssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index e61a6f6c3931..a8e2259a3bc1 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "wolfssl"; - version = "5.5.3"; + version = "5.5.4"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - hash = "sha256-36L7kZ9Dqp3pDjodqELBdSBFwrf+GnRP7KNFYrRUCuU="; + hash = "sha256-sR/Gjk50kLej5oJzDH1I6/V+7OIRiwtyeg5tEE3fmHk="; }; postPatch = '' From 0c76da51b644deaa0094b86ae8f75c05b78de7ba Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 31 Dec 2022 23:37:09 +0100 Subject: [PATCH 14/69] libvgm: unstable-2022-08-02 -> unstable-2022-11-25 --- pkgs/development/libraries/libvgm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libvgm/default.nix b/pkgs/development/libraries/libvgm/default.nix index f7c85b292a66..a6d9a68abba5 100644 --- a/pkgs/development/libraries/libvgm/default.nix +++ b/pkgs/development/libraries/libvgm/default.nix @@ -42,13 +42,13 @@ let in stdenv.mkDerivation rec { pname = "libvgm"; - version = "unstable-2022-08-02"; + version = "unstable-2022-11-25"; src = fetchFromGitHub { owner = "ValleyBell"; repo = "libvgm"; - rev = "0e349256338144205303a1495ddc788a854be1eb"; - sha256 = "FNNPiIfBUxkwgEbiFebPGn6ZIxv3ypDefcOzC6r94hE="; + rev = "fd7da37b96b5937a0bb5a41bacbae0a0ef59069f"; + sha256 = "1tjooO/f72lRdZDxXVSxBySWsUMNWuqI2yQOipa7zFY="; }; outputs = [ From 91a4ee458d63243d8d6a9283f9c6ba847c779e0a Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Sat, 31 Dec 2022 22:36:27 -0600 Subject: [PATCH 15/69] python3Packages.azure-storage-blob: 12.13.1 -> 12.14.1 --- .../development/python-modules/azure-storage-blob/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix index 3b3499a780f0..44bb343a23f3 100644 --- a/pkgs/development/python-modules/azure-storage-blob/default.nix +++ b/pkgs/development/python-modules/azure-storage-blob/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-storage-blob"; - version = "12.13.1"; + version = "12.14.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-iZxLjiZxgS0s948QdVaifbsSjKqiuwYJTnKj1YNnQK8="; + sha256 = "sha256-hg1NgphaS/x9MnHnEnWvMw9U8zCnVDVUNae6dJzN6Zc="; }; propagatedBuildInputs = [ From fac4476c190e414b5eef351f20f1070b31a3d1d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Jan 2023 06:44:36 +0000 Subject: [PATCH 16/69] python310Packages.trezor: 0.13.4 -> 0.13.5 --- pkgs/development/python-modules/trezor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index ae9778d91039..080792a98b5a 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -25,13 +25,13 @@ buildPythonPackage rec { pname = "trezor"; - version = "0.13.4"; + version = "0.13.5"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "04a77b44005971819386bbd55242a1004b1f88fbbdb829deb039a1e0028a4af1"; + sha256 = "sha256-jhUBca/+rDge/bFHgpKQhNZBTsd8zNyHHW8NZE/1e9g="; }; nativeBuildInputs = [ installShellFiles ]; From f5bacb577bd0404c9ca999eab9c0fbfa10336d86 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 1 Jan 2023 11:40:38 +0100 Subject: [PATCH 17/69] rubyPackages.nokogiri: 1.13.9 -> 1.13.10 Fixes CVE-2022-23476. https://github.com/sparklemotion/nokogiri/releases/tag/v1.13.10 --- pkgs/top-level/ruby-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 2b5d1349d177..9d80f3935691 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -2124,10 +2124,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn"; + sha256 = "sha256-0+4A8mwVF2PaFpHH/Ghx3dA+Uy90+FEB9aztwtCZ6Vg="; type = "gem"; }; - version = "1.13.9"; + version = "1.13.10"; }; octokit = { dependencies = ["faraday" "sawyer"]; From 2fd154b9f69e647ff23aa0c510f060f6e4f7c3ca Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 1 Jan 2023 13:58:15 +0100 Subject: [PATCH 18/69] rubyPackages.loofah: 2.19.0 -> 2.19.1 Fixes CVE-2022-23514, CVE-2022-23515 and CVE-2022-23516. https://github.com/flavorjones/loofah/releases/tag/v2.19.1 --- pkgs/top-level/ruby-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 2b5d1349d177..dbc46162f473 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -1847,10 +1847,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fpyk1965py77al7iadkn5dibwgvybknkr7r8bii2dj73wvr29rh"; + sha256 = "sha256-bGRp797+NJYBAACjRvnTv3EOEaxGYeNTz1aFIyb7ECM="; type = "gem"; }; - version = "2.19.0"; + version = "2.19.1"; }; mab = { groups = ["default"]; From 8ef668d7f4e0577b638668e3edf2fc0dd77fff1d Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 1 Jan 2023 15:47:21 -0500 Subject: [PATCH 19/69] vimPlugins: only commit nvim-treesitter updates when there are actually updates --- pkgs/applications/editors/vim/plugins/update.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/update.py b/pkgs/applications/editors/vim/plugins/update.py index 7e5c7380597c..20336c66ed6e 100755 --- a/pkgs/applications/editors/vim/plugins/update.py +++ b/pkgs/applications/editors/vim/plugins/update.py @@ -137,11 +137,15 @@ def main(): subprocess.check_call([nvim_treesitter_dir.joinpath("update.py")]) if editor.nixpkgs_repo: - msg = "vimPlugins.nvim-treesitter: update grammars" - print(f"committing to nixpkgs: {msg}") index = editor.nixpkgs_repo.index - index.add([str(nvim_treesitter_dir.joinpath("generated.nix"))]) - index.commit(msg) + for diff in index.diff(None): + if diff.a_path == "pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix": + msg = "vimPlugins.nvim-treesitter: update grammars" + print(f"committing to nixpkgs: {msg}") + index.add([str(nvim_treesitter_dir.joinpath("generated.nix"))]) + index.commit(msg) + return + print("no updates to nvim-treesitter grammars") if __name__ == "__main__": From de88969f125c91309f3f565e1c435b4f2021e770 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 5 Sep 2022 22:02:30 -0700 Subject: [PATCH 20/69] lib/systems: fix uname.processor for powerpc{32,64}, mips64 Cross-compilation of anything downstream of gtk3 requires qemu (due to gobject-introspection) with --target-list=*-linux-user. Without this commit, those qemu builds will fail on a powerpc64le host due to qemu being configured with --cpu=powerpc64le instead of --cpu=ppc64le. Unfortunately the build failure message from qemu in this situation is extremely cryptic. The root cause turns out not to be the qemu expression, but rather the fact that on powerpc64le hostPlatform.uname.processor returns the gnu-name (powerpc64le) for the cpu instead of the linux-name (ppc64le) for the cpu. uname.processor on mips64el also needs adjustment -- the Linux-name is "mips64" for both big and little endian (unlike powerpc64, where the Linux-name includes a "le" suffix): ``` nix@oak:/tmp$ uname -m; lscpu | head -n2 mips64 Architecture: mips64 Byte Order: Little Endian ``` uname.processor on powerpc32 has also been adjusted. --- lib/systems/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 4c1e9d9f2536..4a5e66caec7c 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -101,7 +101,14 @@ rec { }.${final.parsed.kernel.name} or null; # uname -m - processor = final.parsed.cpu.name; + processor = + if final.isPower64 + then "ppc64${lib.optionalString final.isLittleEndian "le"}" + else if final.isPower + then "ppc${lib.optionalString final.isLittleEndian "le"}" + else if final.isMips64 + then "mips64" # endianness is *not* included on mips64 + else final.parsed.cpu.name; # uname -r release = null; @@ -135,12 +142,7 @@ rec { if final.isAarch32 then "arm" else if final.isx86_64 then "x86_64" else if final.isx86 then "i386" - else { - powerpc = "ppc"; - powerpcle = "ppc"; - powerpc64 = "ppc64"; - powerpc64le = "ppc64le"; - }.${final.parsed.cpu.name} or final.parsed.cpu.name; + else final.uname.processor; # Name used by UEFI for architectures. efiArch = From 4c957878fc16e8cc9ddee27eb72377a65eca387c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 Jan 2023 10:19:32 +0100 Subject: [PATCH 21/69] python30Packages.azure-storage-blob: add changelog to meta - disable on unsupporte Python releases - adjust inputs --- .../azure-storage-blob/default.nix | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix index 44bb343a23f3..f8f7f2f403b2 100644 --- a/pkgs/development/python-modules/azure-storage-blob/default.nix +++ b/pkgs/development/python-modules/azure-storage-blob/default.nix @@ -1,37 +1,46 @@ { lib -, buildPythonPackage -, fetchPypi , azure-common , azure-core , azure-storage-common +, buildPythonPackage +, cryptography +, fetchPypi +, isodate , msrest -, isPy3k -, futures ? null +, pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "azure-storage-blob"; version = "12.14.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-hg1NgphaS/x9MnHnEnWvMw9U8zCnVDVUNae6dJzN6Zc="; + hash = "sha256-hg1NgphaS/x9MnHnEnWvMw9U8zCnVDVUNae6dJzN6Zc="; }; propagatedBuildInputs = [ azure-common azure-core azure-storage-common + cryptography + isodate msrest - ] ++ lib.optional (!isPy3k) futures; + typing-extensions + ]; - # has no tests + # Module has no tests doCheck = false; meta = with lib; { description = "Client library for Microsoft Azure Storage services containing the blob service APIs"; homepage = "https://github.com/Azure/azure-sdk-for-python"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-storage-blob_${version}/sdk/storage/azure-storage-blob/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ cmcdragonkai maxwilson ]; }; From 3224a389126cac35453ee6ed2c301ac05ab1e683 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 Jan 2023 11:07:05 +0100 Subject: [PATCH 22/69] python310Packages.aiortm: add changelog to meta --- pkgs/development/python-modules/aiortm/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aiortm/default.nix b/pkgs/development/python-modules/aiortm/default.nix index 83ed397e47d0..b8750de3ea80 100644 --- a/pkgs/development/python-modules/aiortm/default.nix +++ b/pkgs/development/python-modules/aiortm/default.nix @@ -1,4 +1,4 @@ -{ lib +<{ lib , aiohttp , buildPythonPackage , click @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for the Remember the Milk API"; homepage = "https://github.com/MartinHjelmare/aiortm"; + changelog = "https://github.com/MartinHjelmare/aiortm/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; From 0e13b48dcf19e05a45c8675e9aac2d533f864b09 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 Jan 2023 11:10:23 +0100 Subject: [PATCH 23/69] python310Packages.aiortm: 0.3.1 -> 0.4.0 Changelog: https://github.com/MartinHjelmare/aiortm/blob/v0.4.0/CHANGELOG.md --- pkgs/development/python-modules/aiortm/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aiortm/default.nix b/pkgs/development/python-modules/aiortm/default.nix index b8750de3ea80..a305061984ae 100644 --- a/pkgs/development/python-modules/aiortm/default.nix +++ b/pkgs/development/python-modules/aiortm/default.nix @@ -1,8 +1,10 @@ -<{ lib +{ lib , aiohttp +, aioresponses , buildPythonPackage , click , fetchFromGitHub +, pydantic , poetry-core , pytestCheckHook , pythonOlder @@ -11,7 +13,7 @@ buildPythonPackage rec { pname = "aiortm"; - version = "0.3.1"; + version = "0.4.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +22,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = pname; rev = "v${version}"; - hash = "sha256-DTFynPFf0NUBieXDiMKhCNwBqx3s/xzggNmnz/IKjbU="; + hash = "sha256-cdCKcwpQ+u3CkMiPfMf6DnH2SYc7ab8q5W72aEEnNx4="; }; nativeBuildInputs = [ @@ -30,10 +32,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp click + pydantic yarl ]; checkInputs = [ + aioresponses pytestCheckHook ]; From be20fdc7ca0742ff51bb04a836330a3ad1dc39c2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 Jan 2023 11:13:01 +0100 Subject: [PATCH 24/69] python310Packages.plugwise: 0.27.0 -> 0.27.1 --- pkgs/development/python-modules/plugwise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 5762d03e7042..5e169d3231c6 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.27.0"; + version = "0.27.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - sha256 = "sha256-W6aLpm3Z0JQIZcqDu9wH2RFuXfzl0Px61zfIuhm92pk="; + sha256 = "sha256-56KJQBYaQK08o9W6ZLWHCLCVPCLHh5Q+GTZqTTexn90="; }; propagatedBuildInputs = [ From 6b2bb3b60cc3221f12dbfad73b24633871751edf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 Jan 2023 11:16:13 +0100 Subject: [PATCH 25/69] python310Packages.plugwise: add changelog to meta --- pkgs/development/python-modules/plugwise/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 5e169d3231c6..e00f5fa9a619 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - sha256 = "sha256-56KJQBYaQK08o9W6ZLWHCLCVPCLHh5Q+GTZqTTexn90="; + hash = "sha256-56KJQBYaQK08o9W6ZLWHCLCVPCLHh5Q+GTZqTTexn90="; }; propagatedBuildInputs = [ @@ -63,6 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for Plugwise Smiles, Stretch and USB stick"; homepage = "https://github.com/plugwise/python-plugwise"; + changelog = "https://github.com/plugwise/python-plugwise/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From ea9482360d36d1c2f36529af2c124804393a4641 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 2 Jan 2023 11:22:27 +0100 Subject: [PATCH 26/69] linux: 5.15.85 -> 5.15.86 --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 561447eca00b..fa9f84a72f6b 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.85"; + version = "5.15.86"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "024qhjh9mgfnanr1qd8002n6a4wpn98lajli12a0m3n9z8lsw2rc"; + sha256 = "1vpjnmwqsx6akph2nvbsv2jl7pp8b7xns3vmwbljsl23lkpxkz40"; }; } // (args.argsOverride or { })) From 5851c3d993ee956ff827069f9c93de00b5a5d0e9 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 2 Jan 2023 11:22:39 +0100 Subject: [PATCH 27/69] linux: 6.0.15 -> 6.0.16 --- pkgs/os-specific/linux/kernel/linux-6.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.0.nix b/pkgs/os-specific/linux/kernel/linux-6.0.nix index 6cb9aae83be3..aa194a8efdea 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.0.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.0.15"; + version = "6.0.16"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "08389890gq4b9vkvrb22lzkr4blkn3a5ma074ns19gl89wyyp16l"; + sha256 = "1r2wf3hf7yxl7lxma7plyi8pk3dmlsrpm763rf0g1h8ilsy72844"; }; } // (args.argsOverride or { })) From 4b249451ec6df8ecf4431537321f173a6b91df89 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 2 Jan 2023 11:22:51 +0100 Subject: [PATCH 28/69] linux: 6.1.1 -> 6.1.2 --- pkgs/os-specific/linux/kernel/linux-6.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.1.nix b/pkgs/os-specific/linux/kernel/linux-6.1.nix index 594fcb45573f..fb7aff46e537 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.1.1"; + version = "6.1.2"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "1yqxjz0f722s2bcssqg5b6m6lvq5l4vrlh3bjviajda4rxvi7rm3"; + sha256 = "1bni72q0jjg39vqckcif57kh7d1x4k4jir5a11pz9clryp2g6hgf"; }; } // (args.argsOverride or { })) From 7cecdb94d1f8dd45c299331a4a4cc29356af48b8 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 2 Jan 2023 11:23:15 +0100 Subject: [PATCH 29/69] linux_latest-libre: 19007 -> 19027 --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 9900a10417ec..698ca10016ca 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "19007"; - sha256 = "1f37z6xn4ikc2p06y8rdaja8cj2r9qnp9y0zrl8g8kqmdzs6c15g"; + rev = "19027"; + sha256 = "0g7sf48rwicwzwhjpzs82j6v3j4s17xhrgfgysdd523r07437ryv"; } , ... }: From 409c646eebc0410722556c6fefd6a3f8848aac70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 31 Dec 2022 00:41:31 +0000 Subject: [PATCH 30/69] jetty: 11.0.12 -> 11.0.13 --- pkgs/servers/http/jetty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index b5e1611630e4..9082dceb5021 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jetty"; - version = "11.0.12"; + version = "11.0.13"; src = fetchurl { url = "mirror://maven/org/eclipse/jetty/jetty-home/${version}/jetty-home-${version}.tar.gz"; - sha256 = "sha256-otRm4hOJYK5QbWYevMosQlrSbmcni4ZREvwBo751JOQ="; + sha256 = "sha256-RZryj2AJKKv13iwRBVwushOpPFLUj7wd4JIgJ6JVIz4="; }; dontBuild = true; From 8c7d471cb71fa26ac03099a31e0f0422bebb49ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Jan 2023 02:46:17 +0000 Subject: [PATCH 31/69] qownnotes: 22.11.7 -> 22.12.3 --- pkgs/applications/office/qownnotes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 73c470259f14..bb27f0d4ec90 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "22.11.7"; + version = "22.12.3"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-.tar.xz.sha256 - sha256 = "2fbc20f17422bc44c35dd3e78feb710ca275ecb34c550b2a9c743939531f7878"; + sha256 = "sha256-fpI7RYOGmWwmau6tF8FPmY2/FtN9foWRX8/WgrNU6E8="; }; nativeBuildInputs = [ qmake qttools ]; From 93aa5b07fcbe0e6c4d2ce1ff41471ca4479cb469 Mon Sep 17 00:00:00 2001 From: Candy Cloud Date: Mon, 2 Jan 2023 12:40:27 +0000 Subject: [PATCH 32/69] tidb: init at 6.5.0 --- pkgs/servers/tidb/default.nix | 31 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/servers/tidb/default.nix diff --git a/pkgs/servers/tidb/default.nix b/pkgs/servers/tidb/default.nix new file mode 100644 index 000000000000..e9fabdfbd687 --- /dev/null +++ b/pkgs/servers/tidb/default.nix @@ -0,0 +1,31 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "tidb"; + version = "6.5.0"; + + src = fetchFromGitHub { + owner = "pingcap"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-U3RGQADiS3mNq+4U+Qn+LMYbX8vxkTmofnRc+yrAcIA="; + }; + + vendorSha256 = "sha256-ljPFNjnmPaUx1PHtjlJh9ubKBDS3PgvbqTce9pi3GSc="; + + ldflags = [ + "-s" + "-w" + "-X github.com/pingcap/tidb/dumpling/cli.ReleaseVersion=${version}" + "-X github.com/pingcap/tidb/util/versioninfo.TiDBEdition=Community" + ]; + + subPackages = [ "tidb-server" ]; + + meta = with lib; { + description = "An open-source, cloud-native, distributed, MySQL-Compatible database for elastic scale and real-time analytics"; + homepage = "https://pingcap.com"; + license = licenses.asl20; + maintainers = with maintainers; [ candyc1oud ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b81d61fd6f6b..d8424b6ec649 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12285,6 +12285,8 @@ with pkgs; tie = callPackage ../development/tools/misc/tie { }; + tidb = callPackage ../servers/tidb { }; + tikzit = libsForQt5.callPackage ../tools/typesetting/tikzit { }; tinc_pre = callPackage ../tools/networking/tinc/pre.nix { }; From 2973dd8e7c08926079783dbd805c7d498ca7ee69 Mon Sep 17 00:00:00 2001 From: "\"Andrey Kuznetsov\"" <"fear@loathing.in"> Date: Mon, 2 Jan 2023 13:05:04 +0000 Subject: [PATCH 33/69] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 16af8d0a3e74..9df271b80be5 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -2131,12 +2131,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2022-12-17"; + version = "2023-01-02"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "a70328ae638e20548bcfc64eb9561101104b3008"; - sha256 = "0i5bpg4sxm61200mwi3flji5cciv8izbcp38i4bkjm82ad09byzf"; + rev = "d8657ee78e0c5cb47d4ed87aae11047af03491b9"; + sha256 = "0s43mmcx2pmvww7vp1hzgk1xfxw2pcg7rs07wk4lm3ld5a0fyhcs"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -5063,12 +5063,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2023-01-01"; + version = "2023-01-02"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "02eef4955474c026ae425d8888b17e036d93c4c2"; - sha256 = "0w8dd3mzbhvfhyg7qdr97k4wsih81li6pzj19qp36220lzz6a3j7"; + rev = "590ff74e81694088c43f1f73982dcb7aa51c03ff"; + sha256 = "13bz3pdc4lcd8f2jr5g5p8fp12cwszamsvbyzbwbh6cfcj1qi9z0"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5087,12 +5087,12 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2022-12-28"; + version = "2023-01-02"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "8e06acf88e0621badd9499cfcafbce5ca97dfe8e"; - sha256 = "1s09id5l0580ckrn7srkq8d2n0mg75dph3zknwb5wig3k11yajhz"; + rev = "c045c0fe93b1f9c78443d0f3b88660fffbcf64a7"; + sha256 = "1zw7shzfcjnclv1bj4agkbqv0jswpz3bv9amj9397ypjlafm25wc"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5255,12 +5255,12 @@ final: prev: neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2023-01-01"; + version = "2023-01-02"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "5dd9db767538e62005bb028a88c08ff321248aa2"; - sha256 = "03s75winr4i9gdd9wm98g15x2h0w9iwpdrzg2xp771b43qvilxzv"; + rev = "9fe707327c539cf092b8e6c4e7ba82e906ee0d06"; + sha256 = "0j3aqf294967q6b55vjj96mw1ki0dx6306mjvglj52bkl9ya5nhc"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -5963,12 +5963,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2022-12-15"; + version = "2023-01-02"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "d60514f14baf8eacef4166070783d26c28fe3699"; - sha256 = "0fxk2gwq1dpmjsk9vwb8vh54xv7wh21skw1c4wg8pz9fcar3790w"; + rev = "f6ce208ec8b84fe125a4b74566a73d817abec3a8"; + sha256 = "002qphin2cypfwnzp51q042hi5iqmh9dkx6cd0cy0l5yyayvzjrw"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -6035,12 +6035,12 @@ final: prev: nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2022-12-29"; + version = "2023-01-02"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "7fd10c569ed4eb9f7ec5355d7829ab124b4e6f99"; - sha256 = "1jc26mh63pq5jslzxjhbihywa0x4q4qmayc5qcq9davmghdsd5hf"; + rev = "ddc1cb77b84c96152ab2a05cd22215da49d624ba"; + sha256 = "0fxbxi7xy19qhd1mzq2h8q5plq6sbmgy50z6kipc8n8lf57f2p5v"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -6071,12 +6071,12 @@ final: prev: nvim-neoclip-lua = buildVimPluginFrom2Nix { pname = "nvim-neoclip.lua"; - version = "2022-10-13"; + version = "2023-01-01"; src = fetchFromGitHub { owner = "AckslD"; repo = "nvim-neoclip.lua"; - rev = "3e0b9a134838c7356d743f84a272c92410c47d8d"; - sha256 = "19xwirhaw8y9blll37xwk13cn74cw6cl1j76773nkxgx5m5cynpg"; + rev = "db50498b0e07c1fb2e5b9894e512d7b333a8bb76"; + sha256 = "1nicrjh16d2bpqa41c0cz2wq4fqnpjlr2mmidld48p1xl4fvviin"; }; meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/"; }; @@ -6191,12 +6191,12 @@ final: prev: nvim-surround = buildVimPluginFrom2Nix { pname = "nvim-surround"; - version = "2022-12-30"; + version = "2023-01-01"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "64e21061953102b19bbb22e824fbb96054782799"; - sha256 = "11m62i66gicv7spz6bcsxpdqshi19v0306bh69lcmbyawbwyli4a"; + rev = "ad56e6234bf42fb7f7e4dccc7752e25abd5ec80e"; + sha256 = "1fi5lk3iacjdbq1p4wm0bia93awwqfn7jiy019vpg4gngi41azrz"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -6231,20 +6231,20 @@ final: prev: src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "e322fbb80b0be5e885268c91ab29cbfe0143cd5b"; - sha256 = "1195sw9h1wk5p2x9xj3zqkm5a7sm6l8qq8jxhvrbq14xmw5594sm"; + rev = "951b6e7e55da8aee9566cc0b17c11f9451cec349"; + sha256 = "11f1m815bgj0j6xack9q8jcnaqbpzlxhlbkqalwl8ahd6w06n9qv"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-01-01"; + version = "2023-01-02"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "b67822bf58b0fbf0c496ae21a177d02fa8388edf"; - sha256 = "01l1sl39pia8fa2b7ld0rdi76yjlrnh82rlxvgfqjivppq23k0zm"; + rev = "12e95e160d7d45b76a36bca6303dd8447ab77490"; + sha256 = "1vsqcl4xcy02lp8rv1fgvq3y76whb0grmj63rif7b48vrj427w94"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; From b2c22419afa88ba2dd6bf6a9b5539b7e901cd3d8 Mon Sep 17 00:00:00 2001 From: "\"Andrey Kuznetsov\"" <"fear@loathing.in"> Date: Mon, 2 Jan 2023 13:06:41 +0000 Subject: [PATCH 34/69] vimPlugins.copilot-cmp: init at 2022-10-12 --- 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 9df271b80be5..2b2f7f25c406 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -2033,6 +2033,18 @@ final: prev: meta.homepage = "https://github.com/Shougo/context_filetype.vim/"; }; + copilot-cmp = buildVimPluginFrom2Nix { + pname = "copilot-cmp"; + version = "2022-10-12"; + src = fetchFromGitHub { + owner = "zbirenbaum"; + repo = "copilot-cmp"; + rev = "84d5a0e8e4d1638e7554899cb7b642fa24cf463f"; + sha256 = "180y6d89bldlpilhfz7dakyaml6mfhspnxjn4jliwql4k45xckbi"; + }; + meta.homepage = "https://github.com/zbirenbaum/copilot-cmp/"; + }; + copilot-lua = buildVimPluginFrom2Nix { pname = "copilot.lua"; version = "2022-12-20"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index bf53350006c6..c1aaf4c5be2a 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -170,6 +170,7 @@ https://github.com/rhysd/conflict-marker.vim/,, https://github.com/Olical/conjure/,, https://github.com/wellle/context.vim/,, https://github.com/Shougo/context_filetype.vim/,, +https://github.com/zbirenbaum/copilot-cmp/,HEAD, https://github.com/zbirenbaum/copilot.lua/,HEAD, https://github.com/github/copilot.vim/,, https://github.com/ms-jpq/coq.artifacts/,HEAD, From b9e3eb4aae35d2438710fccb32d6d7038f083e11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Thu, 22 Dec 2022 12:46:32 -0300 Subject: [PATCH 35/69] linuxKernel.kernels.linux_zen: 6.1-zen1 -> 6.1.2-zen1 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 08671e83ffc5..255ea7c1ec75 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,9 +4,9 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.1"; #zen + version = "6.1.2"; #zen suffix = "zen1"; #zen - sha256 = "1xxn6hqq2j8l57hb32sqmfdlylzgy21g6fmra73zqql4vbx4r1nb"; #zen + sha256 = "0wys16f4z221r3g3fc8cb5i0hcymjsk780jk657ihx5xm3anv3kf"; #zen isLqx = false; }; # ./update-zen.py lqx From 95667fbfa989c047323bda9e51eb7015f4fb00e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Thu, 22 Dec 2022 12:50:12 -0300 Subject: [PATCH 36/69] linuxKernel.kernels.linux_lqx: 6.0.13-lqx3 -> 6.1.2-lqx1 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 255ea7c1ec75..c061b5433792 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -11,9 +11,9 @@ let }; # ./update-zen.py lqx lqxVariant = { - version = "6.0.13"; #lqx - suffix = "lqx3"; #lqx - sha256 = "0dc295d9dfm3j2nmvkzy21ky1k6jp7c7miqjhqgfjny9yk1b41k4"; #lqx + version = "6.1.2"; #lqx + suffix = "lqx1"; #lqx + sha256 = "03kwp1c3amk87sjdji9643gr396hca8crqf2z614wkd84vdwary0"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { From 61b43ddfe690f28cb1d036ac076ec45d5b578906 Mon Sep 17 00:00:00 2001 From: "\"Andrey Kuznetsov\"" <"fear@loathing.in"> Date: Mon, 2 Jan 2023 13:09:44 +0000 Subject: [PATCH 37/69] vimPlugins.nvim-treesitter: update grammars --- .../vim/plugins/nvim-treesitter/generated.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 49e115be3b7a..c6c995700075 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -604,12 +604,12 @@ }; help = buildGrammar { language = "help"; - version = "61c7505"; + version = "9dee68e"; source = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vimdoc"; - rev = "61c75058299f3d1cf565697e4073d7b2cc6a6d6c"; - hash = "sha256-MTossQzmBoHqXu933suYUUyDbmb20uO5oZlV31BYqIA="; + rev = "9dee68e3912d16e9878b06e3cd87e21ada3d9029"; + hash = "sha256-6XYEC+wKrCbPtcdjFH1O0EdX84M+NpPfTO2tXGFkwtk="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc"; }; @@ -1496,12 +1496,12 @@ }; v = buildGrammar { language = "v"; - version = "f0aa56e"; + version = "0e3725a"; source = fetchFromGitHub { owner = "vlang"; repo = "vls"; - rev = "f0aa56eec7689f08a389c90ad8d3e5e0d18b3cd7"; - hash = "sha256-d69SvXDWxeRk2hvou8MhXUpUrSBwYENqFDGpT/Y5UpM="; + rev = "0e3725a0c10d357f16b716f9a321a337bc802f02"; + hash = "sha256-RDG/HFSMF5zxtO/elhtv2oH3OnUx47X3xYRqS1+Oz9U="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/vls"; From d3e6a03d0c2405e02346d6fa605f05d4329c4581 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Dec 2022 21:07:54 +0000 Subject: [PATCH 38/69] tutanota-desktop: 3.105.9 -> 3.106.4 --- .../networking/mailreaders/tutanota-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index 283091ccc57d..cc6d5ceff758 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -3,12 +3,12 @@ electron, libsecret }: stdenv.mkDerivation rec { pname = "tutanota-desktop"; - version = "3.105.9"; + version = "3.106.4"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; name = "tutanota-desktop-${version}.tar.gz"; - sha256 = "sha256-PkAxtpyL4rXJfz+YgbVteOP1V0hlF25htvOCkEGFq4k="; + sha256 = "sha256-RU2JEFtYOpxqA02YDuB/V4t/ZZ608EHGMPpwxVOzRz4="; }; nativeBuildInputs = [ From 187fa34027bac9fba4466c4081837176f4ce5ba8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 31 Dec 2022 01:56:47 +0000 Subject: [PATCH 39/69] pgpool: 4.3.3 -> 4.4.1 --- pkgs/servers/sql/pgpool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix index 10b8871c5786..f6f40bcd6957 100644 --- a/pkgs/servers/sql/pgpool/default.nix +++ b/pkgs/servers/sql/pgpool/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { pname = "pgpool-II"; - version = "4.3.3"; + version = "4.4.1"; src = fetchurl { url = "https://www.pgpool.net/mediawiki/download.php?f=pgpool-II-${version}.tar.gz"; name = "pgpool-II-${version}.tar.gz"; - sha256 = "sha256-bHNDS67lgThqlVX+WWKL9GeCD31b2+M0F2g5mgOCyXk="; + sha256 = "sha256-Szebu6jheBKKHO5KW9GuEW3ts9phIbcowY8PVMiB8yg="; }; buildInputs = [ From 2ddb29e48ea477f8f57e920d3c735f11e32542f9 Mon Sep 17 00:00:00 2001 From: ckie Date: Thu, 21 Jul 2022 14:49:18 +0300 Subject: [PATCH 40/69] l3afpad: init at unstable-2022-02-14 --- pkgs/applications/editors/l3afpad/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/editors/l3afpad/default.nix diff --git a/pkgs/applications/editors/l3afpad/default.nix b/pkgs/applications/editors/l3afpad/default.nix new file mode 100644 index 000000000000..e047aaa27028 --- /dev/null +++ b/pkgs/applications/editors/l3afpad/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchurl, intltool, pkg-config, gtk3, fetchFromGitHub +, autoreconfHook, wrapGAppsHook }: + +stdenv.mkDerivation rec { + version = "unstable-2022-02-14"; + pname = "l3afpad"; + + src = fetchFromGitHub { + owner = "stevenhoneyman"; + repo = pname; + rev = "16f22222116b78b7f6a6fd83289937cdaabed624"; + sha256 = "sha256-ly2w9jmRlprm/PnyC0LYjrxBVK+J0DLiSpzuTUMZpWA="; + }; + + nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook ]; + buildInputs = [ intltool gtk3 ]; + + meta = with lib; { + description = "Simple text editor forked from Leafpad using GTK+ 3.x"; + homepage = "https://github.com/stevenhoneyman/l3afpad"; + platforms = platforms.linux; + maintainers = with maintainers; [ ckie ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c223b9cd835..bc50f43ec9bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9077,6 +9077,8 @@ with pkgs; leafpad = callPackage ../applications/editors/leafpad { }; + l3afpad = callPackage ../applications/editors/l3afpad { }; + leatherman = callPackage ../development/libraries/leatherman { }; ledit = callPackage ../tools/misc/ledit { From ded2adfe023753279ddf404f6ec3c75f5d324a0b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Dec 2022 11:37:28 +0000 Subject: [PATCH 41/69] java-service-wrapper: 3.5.50 -> 3.5.51 --- pkgs/tools/system/java-service-wrapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/java-service-wrapper/default.nix b/pkgs/tools/system/java-service-wrapper/default.nix index 93d86a75d187..e17271d50ef2 100644 --- a/pkgs/tools/system/java-service-wrapper/default.nix +++ b/pkgs/tools/system/java-service-wrapper/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "java-service-wrapper"; - version = "3.5.50"; + version = "3.5.51"; src = fetchurl { url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz"; - hash = "sha256-Vw5/wN0Yr39bax4XavhM5u+sCgEA7QCrhC2V3BxB7Vo="; + hash = "sha256-XkgzggtFLYCt3gP0F4wq38TFHCoo/x+bDzzz/TqmvB0="; }; buildInputs = [ jdk ]; From a31a2835699ce238631129a9235a0fa6c4b118c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Dec 2022 08:57:21 +0000 Subject: [PATCH 42/69] quakespasm: 0.95.0 -> 0.95.1 --- pkgs/games/quakespasm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix index 030532b524d7..6681370c79d6 100644 --- a/pkgs/games/quakespasm/default.nix +++ b/pkgs/games/quakespasm/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "quakespasm"; - version = "0.95.0"; + version = "0.95.1"; src = fetchurl { url = "mirror://sourceforge/quakespasm/quakespasm-${version}.tar.gz"; - sha256 = "sha256-pjXqOyL5ILu0Tx5sfehYXbVsL11Abt9cgZJ4xkkBrnA="; + sha256 = "sha256-hBmEV3s65yQysMiq4zEP4swfCgCCiT5dzZdhg7bSNOI="; }; sourceRoot = "${pname}-${version}/Quake"; From d3346ad543573b3433b1fc012fbc195f0e689469 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Dec 2022 05:11:07 +0000 Subject: [PATCH 43/69] bookstack: 22.11 -> 22.11.1 --- pkgs/servers/web-apps/bookstack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/servers/web-apps/bookstack/default.nix index bcac0e37ffc0..75fe60e2557a 100644 --- a/pkgs/servers/web-apps/bookstack/default.nix +++ b/pkgs/servers/web-apps/bookstack/default.nix @@ -16,13 +16,13 @@ let in package.override rec { pname = "bookstack"; - version = "22.11"; + version = "22.11.1"; src = fetchFromGitHub { owner = "bookstackapp"; repo = pname; rev = "v${version}"; - sha256 = "1k82dmlrq0ni9c4wf77d4jzrf24jxi1h5zfsj7132z4ql5di5gz4"; + sha256 = "sha256-0yofstZiTK/I6c8go5ENivq41nOfL+0mzIHgbQSEUWo="; }; meta = with lib; { From c2c696e37526c97151f94e29c031d3b75c91e0db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Nov 2022 21:58:30 +0000 Subject: [PATCH 44/69] fend: 1.1.1 -> 1.1.3 --- pkgs/tools/misc/fend/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index 453697e8a5cc..ecf2a4bf0e5a 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "1.1.1"; + version = "1.1.3"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1hoMIZ4mfXYF+ec/Eax2fSNBbx+UEY2c/jQCaRi+UqU="; + sha256 = "sha256-3A+MxRonN1dhF7PrsGgc6zai1TQ9K8YIyqD0lqa3/EY="; }; - cargoSha256 = "sha256-jGPS9x4DKQCXZkaJu9qIEqoxIu+1WraqfqxGFRV5z7A="; + cargoSha256 = "sha256-VgueZKMDI35ERQR+V2SFxnUplHFS0LbJlGb/bRXUYWk="; nativeBuildInputs = [ pandoc installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; From a1d116f99097d15233fb36cb26035589e47e8a0a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Dec 2022 09:35:08 +0000 Subject: [PATCH 45/69] hoard: 1.0.1 -> 1.3.0 --- pkgs/tools/misc/hoard/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/hoard/default.nix b/pkgs/tools/misc/hoard/default.nix index e69b517b4e15..1eb1080c16b8 100644 --- a/pkgs/tools/misc/hoard/default.nix +++ b/pkgs/tools/misc/hoard/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "hoard"; - version = "1.0.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "Hyde46"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xXZ1bbCRhS8/rb1eIErvw2wEWF1unLXSP/YKn5Z4Vwo="; + sha256 = "sha256-WCyu6vW0l8J2Xh8OGXMXVDBs287m2nPlRHeA0j8uvlk="; }; buildInputs = [ ncurses openssl ] @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-c60yxbZG258R5iH6x0LhipbyXal/kDxddEzTfl82hCE="; + cargoSha256 = "sha256-Cku9NnrjWT7VmOCryb0sbCQibG+iU9CHT3Cvd6M/9f4="; meta = with lib; { description = "CLI command organizer written in rust"; From 8259b08d9c7a5d1db9b47e9ac5616c02b0f4c58c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Dec 2022 23:48:07 +0000 Subject: [PATCH 46/69] openfpgaloader: 0.9.1 -> 0.10.0 --- pkgs/development/embedded/fpga/openfpgaloader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/embedded/fpga/openfpgaloader/default.nix b/pkgs/development/embedded/fpga/openfpgaloader/default.nix index db97476dd692..b71e89f2de61 100644 --- a/pkgs/development/embedded/fpga/openfpgaloader/default.nix +++ b/pkgs/development/embedded/fpga/openfpgaloader/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "openfpgaloader"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "trabucayre"; repo = "openFPGALoader"; rev = "v${version}"; - sha256 = "sha256-CnJBmbvJ4FfKqdyoD8K94Eeoqly2Q6UV5wQ6EWv2isI="; + sha256 = "sha256-MPIFD7/jUEotY/EhuzNhaz8C3LVMxUr++fhtCpbbz0o="; }; nativeBuildInputs = [ cmake pkg-config ]; From 9abaddb148295be0ccfeaa272e8d3a19d338a04d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 30 Dec 2022 12:58:11 +0000 Subject: [PATCH 47/69] dcnnt: 0.7.1 -> 0.9.0 --- pkgs/servers/dcnnt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dcnnt/default.nix b/pkgs/servers/dcnnt/default.nix index 07458c40b8f8..1140325b05f3 100644 --- a/pkgs/servers/dcnnt/default.nix +++ b/pkgs/servers/dcnnt/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "dcnnt"; - version = "0.7.1"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vKCQgg0m58hoN79WcZ4mM6bjCJOPxhAT4ifZ3b/5bkA="; + sha256 = "sha256-YG+NLKI9cz8Uu2y+Ut2q+vn67ExTya00XjHlWRAksz8="; }; propagatedBuildInputs = [ From 7b0d2897c06ed224cca7a3328124a43c1020ee12 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Dec 2022 10:08:36 +0000 Subject: [PATCH 48/69] pathvector: 6.0.2 -> 6.0.3 --- pkgs/tools/networking/pathvector/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/pathvector/default.nix b/pkgs/tools/networking/pathvector/default.nix index 4ca1504070a2..b6c0f0b05cbd 100644 --- a/pkgs/tools/networking/pathvector/default.nix +++ b/pkgs/tools/networking/pathvector/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pathvector"; - version = "6.0.2"; + version = "6.0.3"; src = fetchFromGitHub { owner = "natesales"; repo = "pathvector"; rev = "v${version}"; - sha256 = "sha256-Rr7SVvi2K20qFTd4Gd2BzBTVIa/lCeBAJHLZ6iV2aSw="; + sha256 = "sha256-WY9208bbJOSDJ9WaV8KIr65GZjqhFjdzwTga0u4oQo4="; }; - vendorSha256 = "sha256-bqfYILEGgbnla7EUrzjIO2mMAuL6e4WI2OHUwOr6i+g="; + vendorSha256 = "sha256-R3o1L34FXbtRzJ1I2Xj4iWsiFJJWexGWYv2TmvhINe0="; CGO_ENABLED = 0; From f62cbfcaef79f8d0fcc768c5f001d2be3fb07158 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 31 Dec 2022 15:10:48 +0000 Subject: [PATCH 49/69] juicefs: 1.0.2 -> 1.0.3 --- pkgs/tools/filesystems/juicefs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/juicefs/default.nix b/pkgs/tools/filesystems/juicefs/default.nix index 7418e858b20c..193bc25fbc91 100644 --- a/pkgs/tools/filesystems/juicefs/default.nix +++ b/pkgs/tools/filesystems/juicefs/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "juicefs"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "juicedata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JxN8p/935k+mWkGNSKrI7jCTxcGs5TcUXcmkDjwnzZg="; + sha256 = "sha256-zGVOodjNPH/vCIBEjXo3MTg8McybakMv7tg0Y9ahasU="; }; - vendorSha256 = "sha256-rYyzy6UQQu8q+ei4GAEEq+JPhAAUvHcRpIzNts150OA="; + vendorSha256 = "sha256-YzFGqn9r06TEMiKuuUbUkoacFpsAOPopX9MNB4mlTIM="; ldflags = [ "-s" "-w" ]; From fe57dc56d95a798b40a3e5f6e4ae1890bc403717 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 31 Dec 2022 13:48:14 +0000 Subject: [PATCH 50/69] open-pdf-sign: 0.1.1 -> 0.1.2 --- pkgs/tools/misc/open-pdf-sign/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/open-pdf-sign/default.nix b/pkgs/tools/misc/open-pdf-sign/default.nix index 66cccb240233..ca18fb3a0466 100644 --- a/pkgs/tools/misc/open-pdf-sign/default.nix +++ b/pkgs/tools/misc/open-pdf-sign/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, nix-update-script }: stdenv.mkDerivation rec { - version = "0.1.1"; + version = "0.1.2"; pname = "open-pdf-sign"; src = fetchurl { url = "https://github.com/open-pdf-sign/open-pdf-sign/releases/download/v${version}/open-pdf-sign.jar"; - sha256 = "sha256-n8ua/wUz/PquB7viaFqBu2XX1KQYago4s6JUwYRLvNA="; + sha256 = "sha256-k7ECqrZj7MXbQN5HCcVNcKbLe9LjigQboYs65gf4awA="; }; nativeBuildInputs = [ makeWrapper ]; From fbe696daecc11816905841c59c97c61c4547cfa7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Dec 2022 13:17:00 +0000 Subject: [PATCH 51/69] famistudio: 4.0.4 -> 4.0.6 --- pkgs/applications/audio/famistudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/famistudio/default.nix b/pkgs/applications/audio/famistudio/default.nix index 1ff08bd06b93..81a2646ad74a 100644 --- a/pkgs/applications/audio/famistudio/default.nix +++ b/pkgs/applications/audio/famistudio/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { pname = "famistudio"; - version = "4.0.4"; + version = "4.0.6"; src = fetchzip { url = "https://github.com/BleuBleu/FamiStudio/releases/download/${version}/FamiStudio${lib.strings.concatStrings (lib.splitVersion version)}-LinuxAMD64.zip"; stripRoot = false; - sha256 = "sha256-qdSldObfwC5J1b4tpHT9S/xxJ2StBTsPA80QS7bs2vo="; + sha256 = "sha256-Se9EIQTjZQM5qqzlEB4hGVRHDFdu6GecNGpw9gYMbW4="; }; nativeBuildInputs = [ From ce6e8ef91d6901874ab56d5cfb96fbaec96f1084 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Dec 2022 19:26:42 +0000 Subject: [PATCH 52/69] scli: 0.7.1 -> 0.7.2 --- pkgs/applications/misc/scli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/scli/default.nix b/pkgs/applications/misc/scli/default.nix index abd47c149ebb..d300691934b2 100644 --- a/pkgs/applications/misc/scli/default.nix +++ b/pkgs/applications/misc/scli/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "scli"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "isamert"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-YEgeeoUqDeBx3jPddTeykl+68lS8gVKD+zdo+gRTaT4="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-7yyORM77oByH1gxx/TNkjJQBsig6ZxsfeI3ijg71oBs="; }; propagatedBuildInputs = with python3.pkgs; [ From 0044cfa772afd5cc02b8eb2bfec5c15db57725f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Dec 2022 08:16:45 +0000 Subject: [PATCH 53/69] libksi: 3.20.3025 -> 3.21.3075 --- pkgs/development/libraries/libksi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libksi/default.nix b/pkgs/development/libraries/libksi/default.nix index 015121811710..634e52b97ab6 100644 --- a/pkgs/development/libraries/libksi/default.nix +++ b/pkgs/development/libraries/libksi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libksi"; - version = "3.20.3025"; + version = "3.21.3075"; src = fetchFromGitHub { owner = "Guardtime"; repo = pname; rev = "v${version}"; - sha256 = "0cagysr8j92r6g7f0mwrlkpn9xz9ncz2v3jymh47j3ljxmfbagpz"; + sha256 = "sha256-JEdjy91+8xJPNzjkumadT05SxcvtM551+SjLN1SQcAU="; }; nativeBuildInputs = [ autoreconfHook ]; From 71df3d7fb9a8fe99b06eadcb4d69fbaa08396276 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Dec 2022 08:26:06 +0000 Subject: [PATCH 54/69] ssh-askpass-fullscreen: 1.2 -> 1.3 --- pkgs/tools/networking/ssh-askpass-fullscreen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ssh-askpass-fullscreen/default.nix b/pkgs/tools/networking/ssh-askpass-fullscreen/default.nix index beb61502ec7f..3faff612aadc 100644 --- a/pkgs/tools/networking/ssh-askpass-fullscreen/default.nix +++ b/pkgs/tools/networking/ssh-askpass-fullscreen/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ssh-askpass-fullscreen"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "atj"; repo = pname; rev = "v${version}"; - sha256 = "1zldhylln412974cnxyqcrrc6b4ry3m9s5ijq3dnwz2g7nz1bx9d"; + sha256 = "sha256-1GER+SxTpbMiYLwFCwLX/hLvzCIqutyvQc9DNJ7d1C0="; }; nativeBuildInputs = [ From 57b21b39ea0b893d17aa0411c64a85228b3b4b29 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 2 Jan 2023 16:22:51 +0100 Subject: [PATCH 55/69] python3Packages.afdko: disable test broken by the new year --- pkgs/development/python-modules/afdko/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix index 29593503252a..739198fa4aeb 100644 --- a/pkgs/development/python-modules/afdko/default.nix +++ b/pkgs/development/python-modules/afdko/default.nix @@ -91,6 +91,10 @@ buildPythonPackage rec { "test_spec" ] ++ lib.optionals (stdenv.hostPlatform.isi686) [ "test_type1mm_inputs" + ] ++ [ + # No longer succeeds in 2023 + # https://github.com/adobe-type-tools/afdko/issues/1589 + "test_ufo_fontinfo_parsing" ]; passthru.tests = { From 501848c755f35480e59f4054ba43bc6bf56415d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 Dec 2022 05:58:55 +0000 Subject: [PATCH 56/69] unit: 1.28.0 -> 1.29.0 --- pkgs/servers/http/unit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 5ce6af5aae4a..87506287a876 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -30,14 +30,14 @@ let php81-unit = php81.override phpConfig; in stdenv.mkDerivation rec { - version = "1.28.0"; + version = "1.29.0"; pname = "unit"; src = fetchFromGitHub { owner = "nginx"; repo = pname; rev = version; - sha256 = "sha256-nsalloOghC8tOMRP/N/L2raOmWwA4cz6Yr6H3IHHbR4="; + sha256 = "sha256-Na7whutGpd1yLePlcZyiZK9a/Y4YQnv7dkC5FjENqzs="; }; nativeBuildInputs = [ which ]; From f6d575cc22a2084bef6a2c3327e3e80d37ea2aac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 Dec 2022 05:46:17 +0000 Subject: [PATCH 57/69] hans: 1.0 -> 1.1 --- pkgs/tools/networking/hans/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/hans/default.nix b/pkgs/tools/networking/hans/default.nix index 04271d6ef710..86855cf6034f 100644 --- a/pkgs/tools/networking/hans/default.nix +++ b/pkgs/tools/networking/hans/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "hans"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { - sha256 = "1qnfl7wr5x937b6jx3vhhvnwnrclrqvq7d7zxbfhk74pdwnjy8n4"; + sha256 = "sha256-r6IDs8Seys94LBNnedcfVX5aW8x//ZN0Yh/DGTg8niA="; rev = "v${version}"; repo = "hans"; owner = "friedrich"; From 15013b305466fdd0a52222ed2a3ff87bf9e41af9 Mon Sep 17 00:00:00 2001 From: Winter Date: Mon, 2 Jan 2023 10:36:41 -0500 Subject: [PATCH 58/69] darwin.builder: prefer shutting down over halting VM (#208450) This is preferable because it prevents things like disk corruption (requiring the user to delete the disk image when starting up) that I consistently ran into. --- .../special/darwin-builder.section.md | 3 +- nixos/modules/profiles/macos-builder.nix | 30 +++++++++++++------ 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/doc/builders/special/darwin-builder.section.md b/doc/builders/special/darwin-builder.section.md index 205db14347aa..af9de5751b2c 100644 --- a/doc/builders/special/darwin-builder.section.md +++ b/doc/builders/special/darwin-builder.section.md @@ -39,7 +39,8 @@ nixos login: ``` > Note: When you need to stop the VM, type `Ctrl`-`a` + `c` to open the `qemu` -> prompt and then type `quit` followed by `Enter` +> prompt and then type `system_powerdown` followed by `Enter`, or run `shutdown now` +> as the `builder` user (e.g. `ssh -i keys/builder_ed25519 builder@localhost shutdown now`) To delegate builds to the remote builder, add the following options to your `nix.conf` file: diff --git a/nixos/modules/profiles/macos-builder.nix b/nixos/modules/profiles/macos-builder.nix index a981814730a1..fddf19ad1251 100644 --- a/nixos/modules/profiles/macos-builder.nix +++ b/nixos/modules/profiles/macos-builder.nix @@ -9,7 +9,8 @@ let in -{ imports = [ +{ + imports = [ ../virtualisation/qemu-vm.nix # Avoid a dependency on stateVersion @@ -18,8 +19,7 @@ in ../virtualisation/nixos-containers.nix ../services/x11/desktop-managers/xterm.nix ]; - config = { - }; + config = { }; options.boot.isContainer = lib.mkOption { default = false; internal = true; }; } ]; @@ -98,11 +98,11 @@ in ''; in - script.overrideAttrs (old: { - meta = (old.meta or { }) // { - platforms = lib.platforms.darwin; - }; - }); + script.overrideAttrs (old: { + meta = (old.meta or { }) // { + platforms = lib.platforms.darwin; + }; + }); system = { # To prevent gratuitous rebuilds on each change to Nixpkgs @@ -118,10 +118,22 @@ in ''); }; - users.users."${user}"= { + users.users."${user}" = { isNormalUser = true; }; + security.polkit.enable = true; + + security.polkit.extraConfig = '' + polkit.addRule(function(action, subject) { + if (action.id === "org.freedesktop.login1.power-off" && subject.user === "${user}") { + return "yes"; + } else { + return "no"; + } + }) + ''; + virtualisation = { diskSize = 20 * 1024; From ac2fe9388c89b93c87bc53ad8fe2f3157a8ee587 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Dec 2022 14:20:52 +0000 Subject: [PATCH 59/69] kube-score: 1.16.0 -> 1.16.1 --- pkgs/applications/networking/cluster/kube-score/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kube-score/default.nix b/pkgs/applications/networking/cluster/kube-score/default.nix index 6b3bcf54c263..492f9bcd51f4 100644 --- a/pkgs/applications/networking/cluster/kube-score/default.nix +++ b/pkgs/applications/networking/cluster/kube-score/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "kube-score"; - version = "1.16.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "zegl"; repo = pname; rev = "v${version}"; - hash = "sha256-dKvPLAT9e8gNJkKDF7dQPGLSkv9QUjQklUX8Dm8i33E="; + hash = "sha256-/aCuPL0bzzoNczvSdLYS8obTu8bZzO5HhBmRZ3/ArAM="; }; vendorHash = "sha256-pcNdszOfsYKiASOUNKflbr89j/wb9ILQvjMJYsiGPWo="; From 3d3f42e06a33ea3346459a870fef4bc9af51e35f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Dec 2022 14:30:23 +0000 Subject: [PATCH 60/69] kubent: 0.6.0 -> 0.7.0 --- pkgs/applications/networking/cluster/kubent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubent/default.nix b/pkgs/applications/networking/cluster/kubent/default.nix index 5302917cdfff..bba56a5b058a 100644 --- a/pkgs/applications/networking/cluster/kubent/default.nix +++ b/pkgs/applications/networking/cluster/kubent/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubent"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "doitintl"; repo = "kube-no-trouble"; rev = "${version}"; - sha256 = "sha256-aXuBYfXQfg6IQE9cFFTBCPNmDg7IZYPAAeuAxCiU0ro="; + sha256 = "sha256-QIvMhKAo30gInqJBpHvhcyjgVkdRqgBKwLQ80ng/75U="; }; - vendorSha256 = "sha256-WQwWBcwhFZxXPFO6h+5Y8VDM4urJGfZ6AOvhRoaSbpk="; + vendorSha256 = "sha256-XXf6CPPHVvCTZA4Ve5/wmlgXQ/gZZUW0W/jXA0bJgLA="; ldflags = [ "-w" "-s" From 13f2d0a2b8ab2b287f215a3188d4ed7cde2e0277 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Dec 2022 15:45:23 +0000 Subject: [PATCH 61/69] pocketbase: 0.10.1 -> 0.10.4 --- pkgs/servers/pocketbase/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index ae3825c3907d..fc5fc093dcd1 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.10.1"; + version = "0.10.4"; src = fetchFromGitHub { owner = "pocketbase"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IFyiopURkza22VYW5VM23hZ+GAKr+ykxn7r/MyQfGAI="; + sha256 = "sha256-ma60DvoknvB1NN+DEq6CMnhSjcR/ACWCQSOYbyRlsCs="; }; - vendorSha256 = "sha256-5iT67xJ9pH/QhkMTKvYIU0NsMWg6KVum+trNyt2a2rg="; + vendorSha256 = "sha256-crVyKpvy7twZFDwwYNe+8GB0UAJ8j4F1yqYFu2CWW7o="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; From e4604fb4e62e9d3732d95d569b6957f040f35e5d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Dec 2022 11:30:12 +0000 Subject: [PATCH 62/69] nwg-dock: 0.3.2 -> 0.3.3 --- pkgs/applications/misc/nwg-dock/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/nwg-dock/default.nix b/pkgs/applications/misc/nwg-dock/default.nix index 32361b276b20..ff12f5d159ce 100644 --- a/pkgs/applications/misc/nwg-dock/default.nix +++ b/pkgs/applications/misc/nwg-dock/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "nwg-dock"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-X2AhzQsgUWHkPp1YoAxcbq+Oni9C6Yrnyt+Plxya8OI="; + sha256 = "sha256-RCVG38Y8VV7qGz/CaOZ4aw4Sg3PQdrB29zZqATjvYDQ="; }; - vendorSha256 = "sha256-5vGfWEBiC3ZJzVTHaOPbaaK/9+yg7Nj0mpbJbYpbY/A="; + vendorSha256 = "sha256-WDygnKdldZda4GadfStHWsDel1KLdzjVjw0RxmnFPRE="; ldflags = [ "-s" "-w" ]; From 93b0ea3c352be4af75d632326f4c42af94e33278 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 31 Dec 2022 00:07:01 +0000 Subject: [PATCH 63/69] xray: 1.6.6-2 -> 1.7.0 --- pkgs/tools/networking/xray/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/xray/default.nix b/pkgs/tools/networking/xray/default.nix index e3878111d24c..29b898e8da11 100644 --- a/pkgs/tools/networking/xray/default.nix +++ b/pkgs/tools/networking/xray/default.nix @@ -20,16 +20,16 @@ let in buildGoModule rec { pname = "xray"; - version = "1.6.6-2"; + version = "1.7.0"; src = fetchFromGitHub { owner = "XTLS"; repo = "Xray-core"; rev = "v${version}"; - sha256 = "sha256-nNG1HNsV/ITWdM9a4KkV44Oq/P92yD/oQjO7+pSBX38="; + sha256 = "sha256-aNIb90obew+tvd/rYVddK1MmUqLXSqi9xAu65BQFvk0="; }; - vendorSha256 = "sha256-64pyrhPplki0R+rsjh6pi+PCOzWVbES40r0Z1Vhk44o="; + vendorSha256 = "sha256-zZdUPjlul9f1jKy0Zf79KOToHIsvfgwDp6XpFPYyTzk="; nativeBuildInputs = [ makeWrapper ]; From 1d168df13a12585bca57a198e3131e3172bd3d4b Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Fri, 11 Nov 2022 19:29:48 -0500 Subject: [PATCH 64/69] pkgsStatic.libgpg-error: make tests pass Correct config.h generated by ./configure to not attempt to use weak symbols during static linking. --- pkgs/development/libraries/libgpg-error/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 4f687d41dd6e..fcd7946a1351 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -37,13 +37,21 @@ in stdenv.mkDerivation (rec { nativeBuildInputs = [ gettext ]; postConfigure = - lib.optionalString stdenv.isSunOS # For some reason, /bin/sh on OpenIndiana leads to this at the end of the # `config.status' run: # ./config.status[1401]: shift: (null): bad number # (See .) # Thus, re-run it with Bash. - "${stdenv.shell} config.status"; + lib.optionalString stdenv.isSunOS '' + ${stdenv.shell} config.status + '' + # ./configure errorneous decides to use weak symbols on pkgsStatic, + # which, together with other defines results in locking functions in + # src/posix-lock.c to be no-op, causing tests/t-lock.c to fail. + + lib.optionalString stdenv.hostPlatform.isStatic '' + sed '/USE_POSIX_THREADS_WEAK/ d' config.h + echo '#undef USE_POSIX_THREADS_WEAK' >> config.h + ''; doCheck = true; # not cross From 4a9b4b7eaff27b5c8971bdb82136ad08b0e9d893 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Mon, 2 Jan 2023 11:23:32 -0500 Subject: [PATCH 65/69] river: add adamcstephens as maintainer --- pkgs/applications/window-managers/river/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index 3231882a4fba..50813d28014f 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { description = "A dynamic tiling wayland compositor"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ fortuneteller2k adamcstephens ]; }; } From aee464fa94e90c61cc3b848ebc3b744d48379dd2 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Mon, 2 Jan 2023 11:23:02 -0500 Subject: [PATCH 66/69] river: 0.1.3 -> 0.2.0 --- pkgs/applications/window-managers/river/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index 50813d28014f..e4f0760b68eb 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -7,7 +7,7 @@ , scdoc , xwayland , wayland-protocols -, wlroots +, wlroots_0_16 , libxkbcommon , pixman , udev @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "river"; - version = "0.1.3"; + version = "0.2.0"; src = fetchFromGitHub { owner = "riverwm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bHfHhyDx/Wzhvhr7mAeVzJf0TBJgMTGb/ClGjWMLlQ8="; + sha256 = "sha256-BrOZch6wkiBB4rk0M7Aoy8sZh8uOTQFOPxd3xLyy/K0="; fetchSubmodules = true; }; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland-protocols - wlroots + wlroots_0_16 libxkbcommon pixman udev From d7637635d96b5be0ff63a83bded0a236a72ea2b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Jan 2023 14:33:03 +0000 Subject: [PATCH 67/69] inspircd, inspircdMinimal: 3.14.0 -> 3.15.0 Adds new regex_pcre2 module, enabled by default. https://docs.inspircd.org/3/change-log/#inspircd-3150 Co-authored-by: sternenseemann --- pkgs/servers/irc/inspircd/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/irc/inspircd/default.nix b/pkgs/servers/irc/inspircd/default.nix index 8f2d607d1a44..c8a9e12631e4 100644 --- a/pkgs/servers/irc/inspircd/default.nix +++ b/pkgs/servers/irc/inspircd/default.nix @@ -50,6 +50,7 @@ let "mysql" "pgsql" "regex_pcre" + "regex_pcre2" "regex_re2" "regex_tre" "sqlite3" @@ -69,6 +70,7 @@ in , postgresql , libmysqlclient , pcre +, pcre2 , tre , re2 , sqlite @@ -97,6 +99,7 @@ let mysql = [ libmysqlclient ]; pgsql = [ postgresql ]; regex_pcre = [ pcre ]; + regex_pcre2 = [ pcre2 ]; regex_re2 = [ re2 ]; regex_tre = [ tre ]; sqlite3 = [ sqlite ]; @@ -142,13 +145,13 @@ in stdenv.mkDerivation rec { pname = "inspircd"; - version = "3.14.0"; + version = "3.15.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-xrS/lvXHMVdtKta+57Vu4HygAuALFj+odJi8ScyrLGQ="; + sha256 = "sha256-4n9Tj+xTmPRPisiFjlyx7kYfReonIxoCWu18XWfEXY0="; }; outputs = [ "bin" "lib" "man" "doc" "out" ]; From c2e4d92a650215a7808d02a7dfebd1e43c760ab4 Mon Sep 17 00:00:00 2001 From: Tomo <68489118+Tomodachi94@users.noreply.github.com> Date: Sat, 31 Dec 2022 11:03:05 -0800 Subject: [PATCH 68/69] maintainers: add tomodachi94 --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5711042a65f7..ad4f60a57367 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14208,6 +14208,13 @@ githubId = 13155277; name = "Tom Houle"; }; + tomodachi94 = { + email = "tomodachi94+nixpkgs@protonmail.com"; + matrix = "@tomodachi94:matrix.org"; + github = "tomodachi94"; + githubId = 68489118; + name = "Tomodachi94"; + }; tomsmeets = { email = "tom.tsmeets@gmail.com"; github = "TomSmeets"; From 10b497b1ea1d121f9ec8c10c2a13c71d0fe93715 Mon Sep 17 00:00:00 2001 From: Tomo <68489118+Tomodachi94@users.noreply.github.com> Date: Sat, 31 Dec 2022 11:04:13 -0800 Subject: [PATCH 69/69] sanjuuni: init at 0.2 --- pkgs/tools/graphics/sanjuuni/default.nix | 44 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/tools/graphics/sanjuuni/default.nix diff --git a/pkgs/tools/graphics/sanjuuni/default.nix b/pkgs/tools/graphics/sanjuuni/default.nix new file mode 100644 index 000000000000..bccb336b702c --- /dev/null +++ b/pkgs/tools/graphics/sanjuuni/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, ffmpeg +, poco +}: + +stdenv.mkDerivation rec { + pname = "sanjuuni"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "MCJack123"; + repo = "sanjuuni"; + rev = version; + sha256 = "sha256-WWDbPwiU4YD8XCMuqLWEGinpHkq2FNJZsz3GyVqjDHQ="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + ffmpeg + poco + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 sanjuuni $out/bin/sanjuuni + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/MCJack123/sanjuuni"; + description = "A command-line tool that converts images and videos into a format that can be displayed in ComputerCraft"; + maintainers = [ maintainers.tomodachi94 ]; + license = licenses.gpl2Plus; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 967dcde1c9a5..8104286265c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11453,6 +11453,8 @@ with pkgs; sandboxfs = callPackage ../tools/filesystems/sandboxfs { }; + sanjuuni = callPackage ../tools/graphics/sanjuuni { }; + sasquatch = callPackage ../tools/filesystems/sasquatch { }; sasview = libsForQt5.callPackage ../applications/science/misc/sasview {};