diff options
36 files changed, 196 insertions, 110 deletions
diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 4c1e9d9f253..4a5e66caec7 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 = diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index ceb4c117285..00e90f5b32b 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -395,7 +395,7 @@ in ROOT_URL = cfg.rootUrl; } (mkIf cfg.enableUnixSocket { - PROTOCOL = "unix"; + PROTOCOL = "http+unix"; HTTP_ADDR = "/run/gitea/gitea.sock"; }) (mkIf (!cfg.enableUnixSocket) { @@ -404,7 +404,6 @@ in }) (mkIf cfg.lfs.enable { LFS_START_SERVER = true; - LFS_CONTENT_PATH = cfg.lfs.contentDir; }) ]; @@ -426,6 +425,10 @@ in oauth2 = { JWT_SECRET = "#oauth2jwtsecret#"; }; + + lfs = mkIf (cfg.lfs.enable) { + PATH = cfg.lfs.contentDir; + }; }; services.postgresql = optionalAttrs (usePostgresql && cfg.database.createDatabase) { diff --git a/pkgs/applications/audio/famistudio/default.nix b/pkgs/applications/audio/famistudio/default.nix index 1ff08bd06b9..81a2646ad74 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 = [ diff --git a/pkgs/applications/audio/mousai/default.nix b/pkgs/applications/audio/mousai/default.nix index 96d686864fb..51b5aa037f0 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 diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index e9b6e76368e..3e0206a654b 100644 --- a/pkgs/applications/audio/qpwgraph/default.nix +++ b/pkgs/applications/audio/qpwgraph/default.nix @@ -5,14 +5,14 @@ mkDerivation rec { pname = "qpwgraph"; - version = "0.3.6"; + version = "0.3.9"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${version}"; - sha256 = "sha256-uN3SAmpurINV+7vw51fWdwnuW2yBxnedY6BXdwn/S2s="; + sha256 = "sha256-KGZ67FF3WlKwUzVV3qz1DR/7i1mXsfXVVyuNoIR9uP0="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/editors/l3afpad/default.nix b/pkgs/applications/editors/l3afpad/default.nix new file mode 100644 index 00000000000..e047aaa2702 --- /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/applications/editors/lite-xl/default.nix b/pkgs/applications/editors/lite-xl/default.nix index 11dd3875237..577ea527804 100644 --- a/pkgs/applications/editors/lite-xl/default.nix +++ b/pkgs/applications/editors/lite-xl/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "lite-xl"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "lite-xl"; repo = "lite-xl"; rev = "v${version}"; - sha256 = "sha256-9nQFdii6SY14Cul7Ki0DUEsu75HWTCeEZtXaU6KGRiM="; + sha256 = "sha256-tZ9bCazs4ygNl5RKFNUtxboaMcG8a7mIz2FuiExX1d4="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix index d6b710595a3..88d99a0fae7 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/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index 283091ccc57..cc6d5ceff75 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 = [ diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 73c470259f1..bb27f0d4ec9 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-<version>.tar.xz.sha256 - sha256 = "2fbc20f17422bc44c35dd3e78feb710ca275ecb34c550b2a9c743939531f7878"; + sha256 = "sha256-fpI7RYOGmWwmau6tF8FPmY2/FtN9foWRX8/WgrNU6E8="; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/science/electronics/dataexplorer/default.nix b/pkgs/applications/science/electronics/dataexplorer/default.nix index 9d06f614870..5df312cd153 100644 --- a/pkgs/applications/science/electronics/dataexplorer/default.nix +++ b/pkgs/applications/science/electronics/dataexplorer/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchurl , jdk -, jre , ant , makeWrapper }: @@ -37,11 +36,11 @@ stdenv.mkDerivation rec { # but it hardcodes bash shebang and does not pin the java path. # So we create our own wrapper, using similar cmdline args as upstream. mkdir -p $out/bin - makeWrapper ${jre}/bin/java $out/bin/DataExplorer \ + makeWrapper ${jdk}/bin/java $out/bin/DataExplorer \ --add-flags "-Xms64m -Xmx3092m -jar $out/share/DataExplorer/DataExplorer.jar" \ --set SWT_GTK3 0 - makeWrapper ${jre}/bin/java $out/bin/DevicePropertiesEditor \ + makeWrapper ${jdk}/bin/java $out/bin/DevicePropertiesEditor \ --add-flags "-Xms32m -Xmx512m -classpath $out/share/DataExplorer/DataExplorer.jar gde.ui.dialog.edit.DevicePropertiesEditor" \ --set SWT_GTK3 0 \ --set LIBOVERLAY_SCROLLBAR 0 diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index aa394fb4527..e90213c971a 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildGoPackage , fetchurl , makeWrapper @@ -14,12 +15,12 @@ buildGoPackage rec { pname = "gitea"; - version = "1.17.4"; + version = "1.18.0"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-koZEr89QhxCf2Dd/7SWiS/ZZoRIBfyu0mbxKknjXPK4="; + sha256 = "sha256-X0KvIB2JvSoh2MR9FcwKObQzod2GxhKeGqIKU5CKTEM="; }; patches = [ @@ -68,5 +69,6 @@ buildGoPackage rec { homepage = "https://gitea.io"; license = licenses.mit; maintainers = with maintainers; [ disassembler kolaente ma27 techknowlogick ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/data/icons/whitesur-icon-theme/default.nix b/pkgs/data/icons/whitesur-icon-theme/default.nix index 80f6b5ce24a..d665c9f2b0d 100644 --- a/pkgs/data/icons/whitesur-icon-theme/default.nix +++ b/pkgs/data/icons/whitesur-icon-theme/default.nix @@ -6,6 +6,7 @@ , jdupes , boldPanelIcons ? false , blackPanelIcons ? false +, alternativeIcons ? false , themeVariants ? [] }: @@ -54,6 +55,7 @@ stdenvNoCC.mkDerivation rec { ./install.sh --dest $out/share/icons \ --name WhiteSur \ --theme ${builtins.toString themeVariants} \ + ${lib.optionalString alternativeIcons "--alternative"} \ ${lib.optionalString boldPanelIcons "--bold"} \ ${lib.optionalString blackPanelIcons "--black"} diff --git a/pkgs/development/embedded/fpga/openfpgaloader/default.nix b/pkgs/development/embedded/fpga/openfpgaloader/default.nix index db97476dd69..b71e89f2de6 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 ]; diff --git a/pkgs/development/libraries/libvgm/default.nix b/pkgs/development/libraries/libvgm/default.nix index f7c85b292a6..a6d9a68abba 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 = [ diff --git a/pkgs/development/libraries/minizip-ng/default.nix b/pkgs/development/libraries/minizip-ng/default.nix index 8f12dc29784..19cd07fc160 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 diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 53a37da01fd..4cf75039c49 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 ]; - - cmakeFlags = [ - "-DOCIO_INSTALL_EXT_PACKAGES=NONE" - ] ++ lib.optional (!pythonBindings) "-DOCIO_BUILD_PYTHON=OFF" - ++ lib.optional (!buildApps) "-DOCIO_BUILD_APPS=OFF"; + ++ lib.optionals buildApps [ + lcms2 + openexr_3 + ]; - # TODO Investigate this: Python and GPU tests fail to load libOpenColorIO.so.2.0 - # doCheck = true; + 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"; - # 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"; diff --git a/pkgs/development/libraries/tinygltf/default.nix b/pkgs/development/libraries/tinygltf/default.nix index 0ea26ffa62a..8d8b6c4c9ed 100644 --- a/pkgs/development/libraries/tinygltf/default.nix +++ b/pkgs/development/libraries/tinygltf/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "2.6.3"; + version = "2.7.0"; pname = "tinygltf"; src = fetchFromGitHub { owner = "syoyo"; repo = "tinygltf"; rev = "v${version}"; - sha256 = "sha256-IyezvHzgLRyc3z8HdNsQMqDEhP+Ytw0stFNak3C8lTo="; + sha256 = "sha256-pIymkC+LzoSPU0jnpBH07ag/04W0c9TmPeDUSYQdgx4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index e61a6f6c393..a8e2259a3bc 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 = '' diff --git a/pkgs/development/tools/winhelpcgi/default.nix b/pkgs/development/tools/winhelpcgi/default.nix new file mode 100644 index 00000000000..cd7bfe34435 --- /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/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix index 030532b524d..6681370c79d 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"; diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 08671e83ffc..c061b543379 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,16 +4,16 @@ 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 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 // { diff --git a/pkgs/servers/dcnnt/default.nix b/pkgs/servers/dcnnt/default.nix index 07458c40b8f..1140325b05f 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 = [ diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index b5e1611630e..9082dceb502 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; diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix index 10b8871c578..f6f40bcd695 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 = [ diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/servers/web-apps/bookstack/default.nix index bcac0e37ffc..75fe60e2557 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; { diff --git a/pkgs/tools/filesystems/juicefs/default.nix b/pkgs/tools/filesystems/juicefs/default.nix index 7418e858b20..193bc25fbc9 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" ]; diff --git a/pkgs/tools/inputmethods/remote-touchpad/default.nix b/pkgs/tools/inputmethods/remote-touchpad/default.nix index 35e334a2fe7..a086892caf4 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."; diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index 453697e8a5c..ecf2a4bf0e5 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 ]; diff --git a/pkgs/tools/misc/hoard/default.nix b/pkgs/tools/misc/hoard/default.nix index e69b517b4e1..1eb1080c16b 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"; diff --git a/pkgs/tools/misc/open-pdf-sign/default.nix b/pkgs/tools/misc/open-pdf-sign/default.nix index 66cccb24023..ca18fb3a046 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 ]; diff --git a/pkgs/tools/networking/pathvector/default.nix b/pkgs/tools/networking/pathvector/default.nix index 4ca1504070a..b6c0f0b05cb 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; diff --git a/pkgs/tools/system/java-service-wrapper/default.nix b/pkgs/tools/system/java-service-wrapper/default.nix index 93d86a75d18..e17271d50ef 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 ]; diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index a07b46c3a3b..e1a75976cfb 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -1,5 +1,4 @@ { lib, stdenv -, gnumake42 , darwin , fetchurl , makeWrapper @@ -44,11 +43,11 @@ in stdenv.mkDerivation rec { pname = "sile"; - version = "0.14.5"; + version = "0.14.7"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "01wf0rihksk2ldxgci5vzl3j575vnp6wgk12yd28mwzxkss6n39g"; + sha256 = "01sx4368bws47989zdahhksgy5jgc1qw4hhvpib4qcz3fs6xpx9j"; }; configureFlags = [ @@ -60,7 +59,6 @@ stdenv.mkDerivation rec { gitMinimal pkg-config makeWrapper - gnumake42 ]; buildInputs = [ luaEnv diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9dbadb5d8e..76bcf726d42 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 { }; @@ -4817,6 +4821,8 @@ with pkgs; jellyfin-media-player = libsForQt5.callPackage ../applications/video/jellyfin-media-player { inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer; + # Disable pipewire to avoid segfault, see https://github.com/jellyfin/jellyfin-media-player/issues/341 + mpv = wrapMpv (mpv-unwrapped.override { pipewireSupport = false; }) {}; }; jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { }; @@ -9082,6 +9088,8 @@ with pkgs; leafpad = callPackage ../applications/editors/leafpad { }; + l3afpad = callPackage ../applications/editors/l3afpad { }; + leatherman = callPackage ../development/libraries/leatherman { }; ledit = callPackage ../tools/misc/ledit { @@ -31379,7 +31387,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 { }; @@ -36324,7 +36332,10 @@ with pkgs; csxcad = callPackage ../applications/science/electronics/csxcad { }; - dataexplorer = callPackage ../applications/science/electronics/dataexplorer { }; + dataexplorer = callPackage ../applications/science/electronics/dataexplorer { + # executable fails at startup for jdk > 17 + jdk = jdk17; + }; diylc = callPackage ../applications/science/electronics/diylc { }; diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 2b5d1349d17..4ae1a50eb75 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"]; @@ -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"]; |