diff options
59 files changed, 960 insertions, 286 deletions
diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index ff3c8271a53b..813d032bf964 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -116,8 +116,8 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases - inherit (unstable) version; - hash = "sha256-8uxXyt3zu+LuFJbTQD+bv+Zmnzb18Dhlo3ign1lFT2s="; + version = "8.17.1"; + hash = "sha256-h36NDFYsI0y8TG41IH10IdF4QEuBkBewQ3knZ9iwDpg="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/applications/emulators/wine/staging.nix b/pkgs/applications/emulators/wine/staging.nix index b36d4862a7f0..9e9a03ebfc59 100644 --- a/pkgs/applications/emulators/wine/staging.nix +++ b/pkgs/applications/emulators/wine/staging.nix @@ -5,7 +5,7 @@ with callPackage ./util.nix {}; let patch = (callPackage ./sources.nix {}).staging; build-inputs = pkgNames: extra: (mkBuildInputs wineUnstable.pkgArches pkgNames) ++ extra; -in assert lib.getVersion wineUnstable == patch.version; +in assert lib.versions.majorMinor wineUnstable.version == lib.versions.majorMinor patch.version; (lib.overrideDerivation wineUnstable (self: { buildInputs = build-inputs [ "perl" "util-linux" "autoconf" "gitMinimal" ] self.buildInputs; diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index fed2c944e5c5..6a7a57fd25f2 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "photoqt"; - version = "3.3"; + version = "3.4"; src = fetchurl { url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz"; - hash = "sha256-AD+Uww/tmXRiAkmeuHBBollE6Y9L7c+fB882ALVtSXQ="; + hash = "sha256-kVf9+zI9rtEMmS0N4qrN673T/1fnqfcV3hQPnMXMLas="; }; # error: no member named 'setlocale' in namespace 'std'; did you mean simply 'setlocale'? diff --git a/pkgs/applications/misc/passky-desktop/default.nix b/pkgs/applications/misc/passky-desktop/default.nix index 97df6ba94dae..927035ed8167 100644 --- a/pkgs/applications/misc/passky-desktop/default.nix +++ b/pkgs/applications/misc/passky-desktop/default.nix @@ -1,59 +1,70 @@ -{ lib, stdenv, fetchurl, appimageTools, undmg }: +{ lib +, stdenv +, fetchFromGitHub +, electron_22 +, makeWrapper +, makeDesktopItem +, copyDesktopItems +}: -let +stdenv.mkDerivation rec { pname = "passky-desktop"; - version = "7.1.0"; - - srcs = { - x86_64-linux = fetchurl { - url = "https://github.com/Rabbit-Company/Passky-Desktop/releases/download/v${version}/Passky-${version}.AppImage"; - sha256 = "1xnhrmmm018mmyzjq05mhbf673f0n81fh1k3kbfarbgk2kbwpq6y"; - }; - x86_64-darwin = fetchurl { - url = "https://github.com/Rabbit-Company/Passky-Desktop/releases/download/v${version}/Passky-${version}.dmg"; - sha256 = "0mm7hk4v7zvpjdqyw3nhk33x72j0gh3f59bx3q18azlm4dr61r2d"; - }; - }; - src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + version = "8.1.1"; - appimageContents = appimageTools.extract { inherit pname version src; }; - meta = with lib; { - homepage = "https://passky.org"; - downloadPage = "https://github.com/Rabbit-Company/Passky-Desktop/releases"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ akkesm ]; - platforms = builtins.attrNames srcs; + src = fetchFromGitHub { + owner = "Rabbit-Company"; + repo = "Passky-Desktop"; + rev = "refs/tags/v${version}"; + sha256 = "1ma8s1bngjdzclcc4m5pcmavk38sidaskmz7dgfnv84y35si18dr"; }; - linux = appimageTools.wrapType2 { - inherit pname version src meta; + nativeBuildInputs = [ makeWrapper copyDesktopItems ]; - extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} + installPhase = '' + runHook preInstall - install -D ${appimageContents}/passky.desktop \ - $out/share/applications/${pname}.desktop + mkdir -p $out/share/passky + cp -r "." "$out/share/passky/electron" - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' + local resolution + for icon in $out/share/passky/electron/images/icons/icon*.png; do + resolution=''${icon%".png"} + resolution=''${resolution##*/icon-} + mkdir -p "$out/share/icons/hicolor/''${resolution}/apps" + ln -s "$icon" "$out/share/icons/hicolor/''${resolution}/apps/passky.png" + done - cp -r ${appimageContents}/usr/share/icons $out/share - ''; - }; + mkdir "$out/share/applications" + makeWrapper ${electron_22}/bin/electron "$out/bin/passky" \ + --add-flags "$out/share/passky/electron/" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" - darwin = stdenv.mkDerivation { - inherit pname version src meta; + runHook postInstall + ''; - nativeBuildInputs = [ undmg ]; + desktopItems = [ + ( + makeDesktopItem { + name = "Passky"; + type = "Application"; + desktopName = "passky"; + comment = "Simple, modern, open source and secure password manager."; + icon = "passky"; + exec = "passky %U"; + categories = [ "Utility" ]; + startupWMClass = "Passky"; + } + ) + ]; - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/Applications - cp -r *.app $out/Applications - ''; + meta = with lib; { + description = "A simple, modern, lightweight, open source and secure password manager"; + homepage = "https://passky.org"; + downloadPage = "https://github.com/Rabbit-Company/Passky-Desktop/releases"; + changelog = "https://github.com/Rabbit-Company/Passky-Desktop/releases/tag/v${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ akkesm ]; + mainProgram = "passky"; + platforms = platforms.unix; }; -in -if stdenv.isDarwin - then darwin - else linux +} diff --git a/pkgs/applications/misc/tui-journal/default.nix b/pkgs/applications/misc/tui-journal/default.nix index 25e3058da9aa..39b674d4c3fe 100644 --- a/pkgs/applications/misc/tui-journal/default.nix +++ b/pkgs/applications/misc/tui-journal/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "tui-journal"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "AmmarAbouZor"; repo = "tui-journal"; rev = "v${version}"; - hash = "sha256-ASozznbqtQc9bIzxbL94t2CHY2/PeXfR1DKfhTmsX74="; + hash = "sha256-UK9Pq+QNEk+AeG5/ohyCiL+lSpENQfiR/Qm0nQGJGrg="; }; - cargoHash = "sha256-H+j/i0Gfk7O2TLdw5FYHOrLy/jfMSF4cpzMtQ2XJn2M="; + cargoHash = "sha256-TpNnb3usDkNlcejlSkXb5R1fgVlKNYBFAWi1fEn9uzI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index f195f3e4cb27..b4e85d0cff5f 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.51.7"; + version = "0.52.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-CZKY4/XQsWWlp6Xgv292LstahueJ9iFhxjB//RxlQOo="; + hash = "sha256-7Qd3Eat133pRthoYZzL9UYmL/cqgCRRWKGuZj9kqfFo="; }; vendorHash = "sha256-NSrZVLQ3Qbnp94qCV7NbrEav/7LCRbTov+B2vzbuvdM="; diff --git a/pkgs/applications/networking/cluster/tfupdate/default.nix b/pkgs/applications/networking/cluster/tfupdate/default.nix index 24f7e36049b0..1b9906856878 100644 --- a/pkgs/applications/networking/cluster/tfupdate/default.nix +++ b/pkgs/applications/networking/cluster/tfupdate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tfupdate"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "minamijoyo"; repo = "tfupdate"; rev = "v${version}"; - sha256 = "sha256-ii37Au/2jjGdQjc2LnBPkyNNBMbD5XPPo7i3krF33W0="; + sha256 = "sha256-HyDWye7xL0g5vDoGl8FYFXfuMKU4rxAlFawQ5ynqkmc="; }; - vendorHash = "sha256-gtAenM1URr2wFfe2/zCIyNvG7echjIxSxG1hX2vq16g="; + vendorHash = "sha256-oPqAH+i9ryb1Ps1yCkxoPgMmf4RNtFBCeE94vZAEnuo="; # Tests start http servers which need to bind to local addresses: # panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted diff --git a/pkgs/applications/terminal-emulators/rio/default.nix b/pkgs/applications/terminal-emulators/rio/default.nix index f6f4ea919196..afd3205343e5 100644 --- a/pkgs/applications/terminal-emulators/rio/default.nix +++ b/pkgs/applications/terminal-emulators/rio/default.nix @@ -103,5 +103,6 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ otavio oluceps ]; platforms = lib.platforms.unix; changelog = "https://github.com/raphamorim/rio/blob/v${version}/CHANGELOG.md"; + mainProgram = "rio"; }; } diff --git a/pkgs/applications/version-management/git-mit/default.nix b/pkgs/applications/version-management/git-mit/default.nix index 7e7de848ecad..e2d185b97f29 100644 --- a/pkgs/applications/version-management/git-mit/default.nix +++ b/pkgs/applications/version-management/git-mit/default.nix @@ -10,7 +10,7 @@ }: let - version = "5.12.155"; + version = "5.12.156"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-Hz/FGPnrY3EqlVuSks82UO6/7uHGEgnGgTddFKnj3AQ="; + hash = "sha256-AY+1zJsH4KgMiOfGDuNGxn5XmmYrWARapqiEZhckako="; }; - cargoHash = "sha256-SiYj05OMUWn0hpJeMLEz846QQLTJuv4dtiSG/ow2yHI="; + cargoHash = "sha256-Rz0bgSlvekay5c/TYCu8FJUN3xnXjVFMa0wcUB72nw8="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/video/filebot/default.nix b/pkgs/applications/video/filebot/default.nix index 524e081dc286..9fffd01019e8 100644 --- a/pkgs/applications/video/filebot/default.nix +++ b/pkgs/applications/video/filebot/default.nix @@ -10,11 +10,11 @@ let }; in stdenv.mkDerivation (finalAttrs: { pname = "filebot"; - version = "5.0.3"; + version = "5.1.1"; src = fetchurl { - url = "https://web.archive.org/web/20230418205553/https://get.filebot.net/filebot/FileBot_${finalAttrs.version}/FileBot_${finalAttrs.version}-portable.tar.xz"; - hash = "sha256-8FTmR+ztR2ugPcgHvfwyh9yfxPiUJdeAVvjjl5cQCy0="; + url = "https://web.archive.org/web/20230917142929/https://get.filebot.net/filebot/FileBot_${finalAttrs.version}/FileBot_${finalAttrs.version}-portable.tar.xz"; + hash = "sha256-BCsZBRtT2Ka7WZw7WFnagwoJwIO1L3qpFk/6nlGdpmQ="; }; unpackPhase = "tar xvf $src"; diff --git a/pkgs/by-name/bi/bitmagnet/package.nix b/pkgs/by-name/bi/bitmagnet/package.nix new file mode 100644 index 000000000000..a34802c5de1e --- /dev/null +++ b/pkgs/by-name/bi/bitmagnet/package.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "bitmagnet"; + version = "0.0.6"; + + src = fetchFromGitHub { + owner = "bitmagnet-io"; + repo = "bitmagnet"; + rev = "v${version}"; + hash = "sha256-+KAIHg8M2CM+GRRv+htmev8MFe/Y1sJ8p+um/c7kI7c="; + }; + + vendorHash = "sha256-ydiZ3KMEiVkmdzhHjYYLJ7wuiKmwlMEn4OWrKSOnaSo="; + + ldflags = [ "-s" "-w" ]; + + meta = { + description = "A self-hosted BitTorrent indexer, DHT crawler, and torrent search engine"; + longDescription = '' + A self-hosted BitTorrent indexer, DHT crawler, content classifier and torrent search engine with web UI, GraphQL API and Servarr stack integration. + ''; + homepage = "https://bitmagnet.io/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ eclairevoyant ]; + mainProgram = "bitmagnet"; + }; +} diff --git a/pkgs/misc/dxvk/default.nix b/pkgs/by-name/dx/dxvk/package.nix index 88b7e5b104fb..88b7e5b104fb 100644 --- a/pkgs/misc/dxvk/default.nix +++ b/pkgs/by-name/dx/dxvk/package.nix diff --git a/pkgs/misc/dxvk/setup_dxvk.sh b/pkgs/by-name/dx/dxvk/setup_dxvk.sh index 4926acd3ba89..4926acd3ba89 100644 --- a/pkgs/misc/dxvk/setup_dxvk.sh +++ b/pkgs/by-name/dx/dxvk/setup_dxvk.sh diff --git a/pkgs/misc/dxvk/darwin-dxvk-compat.patch b/pkgs/by-name/dx/dxvk_1/darwin-dxvk-compat.patch index 99833a020cda..99833a020cda 100644 --- a/pkgs/misc/dxvk/darwin-dxvk-compat.patch +++ b/pkgs/by-name/dx/dxvk_1/darwin-dxvk-compat.patch diff --git a/pkgs/misc/dxvk/darwin-thread-primitives.patch b/pkgs/by-name/dx/dxvk_1/darwin-thread-primitives.patch index c008099407c5..c008099407c5 100644 --- a/pkgs/misc/dxvk/darwin-thread-primitives.patch +++ b/pkgs/by-name/dx/dxvk_1/darwin-thread-primitives.patch diff --git a/pkgs/by-name/dx/dxvk_1/package.nix b/pkgs/by-name/dx/dxvk_1/package.nix new file mode 100644 index 000000000000..44a39eeaba25 --- /dev/null +++ b/pkgs/by-name/dx/dxvk_1/package.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, fetchFromGitHub +, glslang +, meson +, ninja +, windows +, pkgsBuildHost +, enableMoltenVKCompat ? false +}: + +let + isCross = stdenv.hostPlatform != stdenv.targetPlatform; +in +stdenv.mkDerivation (finalAttrs: { + pname = "dxvk"; + version = "1.10.3"; + + src = fetchFromGitHub { + owner = "doitsujin"; + repo = "dxvk"; + rev = "v${finalAttrs.version}"; + hash = "sha256-T93ZylxzJGprrP+j6axZwl2d3hJowMCUOKNjIyNzkmE="; + }; + + # These patches are required when using DXVK with Wine on Darwin. + patches = lib.optionals enableMoltenVKCompat [ + # Patch DXVK to work with MoltenVK even though it doesn’t support some required features. + # Some games work poorly (particularly Unreal Engine 4 games), but others work pretty well. + ./darwin-dxvk-compat.patch + # Use synchronization primitives from the C++ standard library to avoid deadlocks on Darwin. + # See: https://www.reddit.com/r/macgaming/comments/t8liua/comment/hzsuce9/ + ./darwin-thread-primitives.patch + ]; + + nativeBuildInputs = [ glslang meson ninja ]; + buildInputs = [ windows.pthreads ]; + + mesonFlags = + let + arch = if stdenv.is32bit then "32" else "64"; + in + [ + "--buildtype" "release" + "--prefix" "${placeholder "out"}" + ] + ++ lib.optionals isCross [ "--cross-file" "build-win${arch}.txt" ]; + + meta = { + description = "A Vulkan-based translation layer for Direct3D 9/10/11"; + homepage = "https://github.com/doitsujin/dxvk"; + changelog = "https://github.com/doitsujin/dxvk/releases"; + maintainers = [ lib.maintainers.reckenrode ]; + license = lib.licenses.zlib; + platforms = lib.platforms.windows; + }; +}) diff --git a/pkgs/by-name/dx/dxvk_2/package.nix b/pkgs/by-name/dx/dxvk_2/package.nix new file mode 100644 index 000000000000..e1fa64ffee05 --- /dev/null +++ b/pkgs/by-name/dx/dxvk_2/package.nix @@ -0,0 +1,77 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkgsBuildHost +, glslang +, meson +, ninja +, windows +, spirv-headers +, vulkan-headers +, SDL2 +, glfw +, gitUpdater +, sdl2Support ? true +, glfwSupport ? false +}: + +# SDL2 and GLFW support are mutually exclusive. +assert !sdl2Support || !glfwSupport; + +let + isCross = stdenv.hostPlatform != stdenv.targetPlatform; + isWindows = stdenv.hostPlatform.uname.system == "Windows"; +in +stdenv.mkDerivation (finalAttrs: { + pname = "dxvk"; + version = "2.3"; + + src = fetchFromGitHub { + owner = "doitsujin"; + repo = "dxvk"; + rev = "v${finalAttrs.version}"; + hash = "sha256-RU+B0XfphD5HHW/vSzqHLUaGS3E31d5sOLp3lMmrCB8="; + fetchSubmodules = true; # Needed for the DirectX headers and libdisplay-info + }; + + postPatch = '' + substituteInPlace "subprojects/libdisplay-info/tool/gen-search-table.py" \ + --replace "/usr/bin/env python3" "${lib.getBin pkgsBuildHost.python3}/bin/python3" + ''; + + nativeBuildInputs = [ glslang meson ninja ]; + buildInputs = [ spirv-headers vulkan-headers ] + ++ lib.optionals (!isWindows && sdl2Support) [ SDL2 ] + ++ lib.optionals (!isWindows && glfwSupport) [ glfw ] + ++ lib.optionals isWindows [ windows.pthreads ]; + + # Build with the Vulkan SDK in nixpkgs. + preConfigure = '' + rm -rf include/spirv/include include/vulkan/include + mkdir -p include/spirv/include include/vulkan/include + ''; + + mesonFlags = + let + arch = if stdenv.is32bit then "32" else "64"; + in + [ + "--buildtype" "release" + "--prefix" "${placeholder "out"}" + ] + ++ lib.optionals isCross [ "--cross-file" "build-win${arch}.txt" ] + ++ lib.optional glfwSupport "-Ddxvk_native_wsi=glfw"; + + doCheck = !isCross; + + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + + meta = { + description = "A Vulkan-based translation layer for Direct3D 9/10/11"; + homepage = "https://github.com/doitsujin/dxvk"; + changelog = "https://github.com/doitsujin/dxvk/releases"; + maintainers = [ lib.maintainers.reckenrode ]; + license = lib.licenses.zlib; + platforms = lib.platforms.windows ++ lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/gb/gbar/package.nix b/pkgs/by-name/gb/gbar/package.nix new file mode 100644 index 000000000000..faa930e9aee8 --- /dev/null +++ b/pkgs/by-name/gb/gbar/package.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, cmake +, pkg-config +, libdbusmenu-gtk3 +, gtk-layer-shell +, stb +, wayland-protocols +, wayland-scanner +, bluez +, gtk3 +, libpulseaudio +, wayland +}: + +stdenv.mkDerivation { + pname = "gbar"; + version = "unstable-2023-09-21"; + + src = fetchFromGitHub { + owner = "scorpion-26"; + repo = "gBar"; + rev = "96485f408efe411f281fa27dceb6d86399ec7804"; + hash = "sha256-4zPvo0JBQOV1qn2X2iI8/JWYEQjFf9sDEICIWSCeaWk="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + meson + ninja + cmake + pkg-config + ]; + + buildInputs = [ + wayland + wayland-protocols + wayland-scanner + bluez + gtk3 + gtk-layer-shell + libpulseaudio + stb + libdbusmenu-gtk3 + ]; + + meta = with lib; { + description = "Blazingly fast status bar written with GTK"; + homepage = "https://github.com/scorpion-26/gBar"; + license = licenses.mit; + maintainers = with maintainers; [ ocfox ]; + mainProgram = "gBar"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/po/poethepoet/package.nix b/pkgs/by-name/po/poethepoet/package.nix index 7505fb4531d5..be4dc7159a3e 100644 --- a/pkgs/by-name/po/poethepoet/package.nix +++ b/pkgs/by-name/po/poethepoet/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "poethepoet"; - version = "0.24.0"; + version = "0.24.1"; pyproject = true; src = fetchFromGitHub { owner = "nat-n"; repo = "poethepoet"; rev = "v${version}"; - hash = "sha256-fW457R8DvkHdgNcPatEf1nJNjMYTmliiRHrYyAAoZuo="; + hash = "sha256-cIIMwQF0jqGQhNyX2qDBeKZlUNvdC6sBTv5LCxk8MMQ="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/web-apps/searxng/default.nix b/pkgs/by-name/se/searxng/package.nix index 37fd2317bb7c..db5c9f6b3419 100644 --- a/pkgs/servers/web-apps/searxng/default.nix +++ b/pkgs/by-name/se/searxng/package.nix @@ -3,15 +3,15 @@ , fetchFromGitHub }: -python3.pkgs.buildPythonApplication rec { +python3.pkgs.toPythonModule (python3.pkgs.buildPythonApplication rec { pname = "searxng"; - version = "unstable-2023-07-19"; + version = "unstable-2023-10-01"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "a446dea1bb492eac417de9a900fae7cdf94aeec0"; - sha256 = "sha256-iZDaKCkDlp3O3IixWdXVykNRIxas+irG0dWAOU4wycI="; + rev = "d56b31d67473e0970bc457469b0cbec2e35f8b10"; + hash = "sha256-/lMjL2dl7UVYRjafFKmV3XsIH6QehUWCozCuBuxFgpQ="; }; postPatch = '' @@ -73,6 +73,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/searxng/searxng"; description = "A fork of Searx, a privacy-respecting, hackable metasearch engine"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ SuperSandro2000 _999eagle ]; }; -} +}) diff --git a/pkgs/by-name/ui/uiua/package.nix b/pkgs/by-name/ui/uiua/package.nix index ab065fcf1303..e4c8fb1c0486 100644 --- a/pkgs/by-name/ui/uiua/package.nix +++ b/pkgs/by-name/ui/uiua/package.nix @@ -6,20 +6,24 @@ , audioSupport ? true , darwin , alsa-lib + +# passthru.tests.run +, runCommand +, uiua }: rustPlatform.buildRustPackage rec { pname = "uiua"; - version = "0.0.16"; + version = "0.0.17"; src = fetchFromGitHub { owner = "uiua-lang"; repo = "uiua"; rev = "refs/tags/${version}"; - hash = "sha256-CMuCl4idoO5qIpXdkXBbglsZQBWVT8w9azbn2rRxviA="; + hash = "sha256-vZo3JKvvlL//4P+EqcsDXyamAMnCBARSF/H6OJTayF4="; }; - cargoHash = "sha256-BLP9OGTnksM9NscfhtVWxE0/CqZgkqqlIMgRclCzEzs="; + cargoHash = "sha256-AkBcvFz7mrYUNTokcfoSXwWpw7SupI0+52GL4QXUu24="; nativeBuildInputs = lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook @@ -37,6 +41,12 @@ rustPlatform.buildRustPackage rec { buildFeatures = lib.optional audioSupport "audio"; + passthru.tests.run = runCommand "uiua-test-run" {nativeBuildInputs = [uiua];} '' + uiua init; + diff -U3 --color=auto <(uiua run main.ua) <(echo '"Hello, World!"') + touch $out; + ''; + meta = with lib; { description = "A stack-oriented array programming language with a focus on simplicity, beauty, and tacit code"; longDescription = '' diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 0fa8bdb8f818..8630b13db7ac 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = if set != null then "iosevka-${set}" else "iosevka"; - version = "27.1.0"; + version = "27.2.0"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-KXF+ePMEwEUh0fs0cOELRmxOp9hHibDLfRdbffLcZDs="; + hash = "sha256-jRUwXnsYzM4BH+tEM6xuoB3/MFqbnR0deT3Slgkemvs="; }; - npmDepsHash = "sha256-NfR7OUVguMZVmeumf8oRaQK28G42zy6p6K+Hx4e1Kgw="; + npmDepsHash = "sha256-6ikjJScy6iL8lZ9eE2JBz7+egRCNli4XC9hnEalX408="; nativeBuildInputs = [ remarshal diff --git a/pkgs/development/compilers/openjdk/21.nix b/pkgs/development/compilers/openjdk/21.nix new file mode 100644 index 000000000000..623ac281acf7 --- /dev/null +++ b/pkgs/development/compilers/openjdk/21.nix @@ -0,0 +1,188 @@ +{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitHub, bash, pkg-config, autoconf, cpio +, file, which, unzip, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib +, libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst +, libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk21-bootstrap +, ensureNewerSourcesForZipFilesHook +, setJavaClassPath +# TODO(@sternenseemann): gtk3 fails to evaluate in pkgsCross.ghcjs.buildPackages +# which should be fixable, this is a no-rebuild workaround for GHC. +, headless ? stdenv.targetPlatform.isGhcjs +, enableJavaFX ? false, openjfx +, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf +}: + +let + version = { + feature = "21"; + interim = ""; + build = "35"; + }; + + # when building a headless jdk, also bootstrap it with a headless jdk + openjdk-bootstrap = openjdk21-bootstrap.override { gtkSupport = !headless; }; + + openjdk = stdenv.mkDerivation { + pname = "openjdk" + lib.optionalString headless "-headless"; + version = "${version.feature}${version.interim}+${version.build}"; + + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jdk${version.feature}u"; + rev = "jdk-${version.feature}${version.interim}+${version.build}"; + hash = "sha256-fA8nRWBuTL87S8mwapmNfCPPQoI2aKHjbHJ6PDN3khs="; + }; + + nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ]; + buildInputs = [ + cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib + libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst + libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap + ] ++ lib.optionals (!headless && enableGnome2) [ + gtk3 gnome_vfs GConf glib + ]; + + patches = [ + ./fix-java-home-jdk21.patch + ./read-truststore-from-env-jdk10.patch + ./currency-date-range-jdk10.patch + ./increase-javadoc-heap-jdk13.patch + ./ignore-LegalNoticeFilePlugin-jdk18.patch + + # -Wformat etc. are stricter in newer gccs, per + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677 + # so grab the work-around from + # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24 + (fetchurl { + url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; + sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; + }) + + # Fix build for gnumake-4.4.1: + # https://github.com/openjdk/jdk/pull/12992 + (fetchpatch { + name = "gnumake-4.4.1"; + url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch"; + hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg="; + }) + ] ++ lib.optionals (!headless && enableGnome2) [ + ./swing-use-gtk-jdk13.patch + ]; + + postPatch = '' + chmod +x configure + patchShebangs --build configure + ''; + + # JDK's build system attempts to specifically detect + # and special-case WSL, and we don't want it to do that, + # so pass the correct platform names explicitly + configurePlatforms = ["build" "host"]; + + configureFlags = [ + "--with-boot-jdk=${openjdk-bootstrap.home}" + "--with-version-build=${version.build}" + "--with-version-opt=nixos" + "--with-version-pre=" + "--enable-unlimited-crypto" + "--with-native-debug-symbols=internal" + "--with-libjpeg=system" + "--with-giflib=system" + "--with-libpng=system" + "--with-zlib=system" + "--with-lcms=system" + "--with-stdc++lib=dynamic" + ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" + ++ lib.optional headless "--enable-headless-only" + ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; + + separateDebugInfo = true; + + env.NIX_CFLAGS_COMPILE = "-Wno-error"; + + NIX_LDFLAGS = toString (lib.optionals (!headless) [ + "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" + ] ++ lib.optionals (!headless && enableGnome2) [ + "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" + ]); + + # -j flag is explicitly rejected by the build system: + # Error: 'make -jN' is not supported, use 'make JOBS=N' + # Note: it does not make build sequential. Build system + # still runs in parallel. + enableParallelBuilding = false; + + buildFlags = [ "images" ]; + + installPhase = '' + mkdir -p $out/lib + + mv build/*/images/jdk $out/lib/openjdk + + # Remove some broken manpages. + rm -rf $out/lib/openjdk/man/ja* + + # Mirror some stuff in top-level. + mkdir -p $out/share + ln -s $out/lib/openjdk/include $out/include + ln -s $out/lib/openjdk/man $out/share/man + + # IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081) + ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/linux/*_md.h $out/include/ + + # Remove crap from the installation. + rm -rf $out/lib/openjdk/demo + ${lib.optionalString headless '' + rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so + ''} + + ln -s $out/lib/openjdk/bin $out/bin + ''; + + preFixup = '' + # Propagate the setJavaClassPath setup hook so that any package + # that depends on the JDK has $CLASSPATH set up properly. + mkdir -p $out/nix-support + #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 + echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs + + # Set JAVA_HOME automatically. + mkdir -p $out/nix-support + cat <<EOF > $out/nix-support/setup-hook + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi + EOF + ''; + + postFixup = '' + # Build the set of output library directories to rpath against + LIBDIRS="" + for output in $(getAllOutputNames); do + if [ "$output" = debug ]; then continue; fi + LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS" + done + # Add the local library paths to remove dependencies on the bootstrap + for output in $(getAllOutputNames); do + if [ "$output" = debug ]; then continue; fi + OUTPUTDIR=$(eval echo \$$output) + BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) + echo "$BINLIBS" | while read i; do + patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true + patchelf --shrink-rpath "$i" || true + done + done + ''; + + disallowedReferences = [ openjdk-bootstrap ]; + + pos = builtins.unsafeGetAttrPos "feature" version; + meta = import ./meta.nix lib version.feature; + + passthru = { + architecture = ""; + home = "${openjdk}/lib/openjdk"; + inherit gtk3; + }; + }; +in openjdk diff --git a/pkgs/development/compilers/openjdk/fix-java-home-jdk21.patch b/pkgs/development/compilers/openjdk/fix-java-home-jdk21.patch new file mode 100644 index 000000000000..ede201ed1ada --- /dev/null +++ b/pkgs/development/compilers/openjdk/fix-java-home-jdk21.patch @@ -0,0 +1,14 @@ +--- a/src/hotspot/os/linux/os_linux.cpp 2017-07-04 23:09:02.533972226 -0400 ++++ b/src/hotspot/os/linux/os_linux.cpp 2017-07-04 23:07:52.118338845 -0400 +@@ -2270,8 +2270,5 @@ + assert(ret, "cannot locate libjvm"); + char *rp = nullptr; + if (ret && dli_fname[0] != '\0') { +- rp = os::Posix::realpath(dli_fname, buf, buflen); +- } +- if (rp == nullptr) { +- return; ++ snprintf(buf, buflen, "%s", dli_fname); + } + + if (Arguments::sun_java_launcher_is_altjvm()) { diff --git a/pkgs/development/compilers/openjdk/openjfx/21.nix b/pkgs/development/compilers/openjdk/openjfx/21.nix new file mode 100644 index 000000000000..4b178736854d --- /dev/null +++ b/pkgs/development/compilers/openjdk/openjfx/21.nix @@ -0,0 +1,113 @@ +{ stdenv, lib, fetchFromGitHub, fetchpatch, writeText, openjdk17_headless +, openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst +, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, icu68 +, withMedia ? true +, withWebKit ? false +}: + +let + major = "21"; + update = ""; + build = "-ga"; + repover = "${major}${update}${build}"; + gradle_ = (gradle_7.override { + # note: gradle does not yet support running on 19 + java = openjdk17_headless; + }); + + makePackage = args: stdenv.mkDerivation ({ + version = "${major}${update}${build}"; + + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jfx"; + rev = repover; + hash = "sha256-deNAGfnA6gwcAa64l0AWdkX+vJd3ZOfIgAifSl+/m+s="; + }; + + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 icu68 ]; + nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; + + dontUseCmakeConfigure = true; + + config = writeText "gradle.properties" ('' + CONF = Release + JDK_HOME = ${openjdk19_headless.home} + '' + args.gradleProperties or ""); + + buildPhase = '' + runHook preBuild + + export GRADLE_USER_HOME=$(mktemp -d) + ln -s $config gradle.properties + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" + gradle --no-daemon $gradleFlags sdk + + runHook postBuild + ''; + } // args); + + # Fake build to pre-download deps into fixed-output derivation. + # We run nearly full build because I see no other way to download everything that's needed. + # Anyone who knows a better way? + deps = makePackage { + pname = "openjfx-deps"; + + # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) + installPhase = '' + find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ + | sh + rm -rf $out/tmp + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + # suspiciously the same as for openjfx 17 ... + # could they really not have changed any of their dependencies? + # or did we miss changing another upstream hash when copy-pasting? + outputHash = "sha256-dV7/U5GpFxhI13smZ587C6cVE4FRNPY0zexZkYK4Yqo="; + }; + +in makePackage { + pname = "openjfx-modular-sdk"; + + gradleProperties = '' + COMPILE_MEDIA = ${lib.boolToString withMedia} + COMPILE_WEBKIT = ${lib.boolToString withWebKit} + ''; + + preBuild = '' + swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)" + substituteInPlace build.gradle \ + --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \ + --replace 'name: SWT_FILE_NAME' "files('$swtJar')" + ''; + + installPhase = '' + cp -r build/modular-sdk $out + ''; + + stripDebugList = [ "." ]; + + postFixup = '' + # Remove references to bootstrap. + export openjdkOutPath='${openjdk19_headless.outPath}' + find "$out" -name \*.so | while read lib; do + new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" + patchelf --set-rpath "$new_refs" "$lib" + done + ''; + + disallowedReferences = [ openjdk17_headless openjdk19_headless ]; + + passthru.deps = deps; + + meta = with lib; { + homepage = "https://openjdk.org/projects/openjfx/"; + license = licenses.gpl2Classpath; + description = "The next-generation Java client toolkit"; + maintainers = with maintainers; [ abbradar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/compilers/zulu/17.nix b/pkgs/development/compilers/zulu/17.nix index 7d1ec7cf473f..fcfe39af10ac 100644 --- a/pkgs/development/compilers/zulu/17.nix +++ b/pkgs/development/compilers/zulu/17.nix @@ -7,6 +7,22 @@ callPackage ./common.nix ({ # Details from https://www.azul.com/downloads/?version=java-17-lts&package=jdk # Note that the latest build may differ by platform dists = { + x86_64-linux = { + zuluVersion = "17.44.53"; + jdkVersion = "17.0.8.1"; + hash = + if enableJavaFX then "sha256-R6VJcSjpKFfsO3l32+8s+wlcuAVoXcSsW5Dg2M/hjpI=" + else "sha256-uUgvIwShpophTfrN3PKVaacvD6wy5sdPg9wbmhV7g0A="; + }; + + aarch64-linux = { + zuluVersion = "17.44.53"; + jdkVersion = "17.0.8.1"; + hash = + if enableJavaFX then throw "JavaFX is not available for aarch64-linux" + else "sha256-ZTHO9h5BbVp7aRVVyM8r3/aJIBuKAB/0WrZ0AGK0QxM="; + }; + x86_64-darwin = { zuluVersion = "17.44.53"; jdkVersion = "17.0.8.1"; diff --git a/pkgs/development/compilers/zulu/21.nix b/pkgs/development/compilers/zulu/21.nix index 0feaf6216bb1..09b420d533a2 100644 --- a/pkgs/development/compilers/zulu/21.nix +++ b/pkgs/development/compilers/zulu/21.nix @@ -7,6 +7,22 @@ callPackage ./common.nix ({ # Details from https://www.azul.com/downloads/?version=java-21-lts&package=jdk # Note that the latest build may differ by platform dists = { + x86_64-linux = { + zuluVersion = "21.28.85"; + jdkVersion = "21.0.0"; + hash = + if enableJavaFX then "sha256-ew/tgSdkrPdk1CTguk9nyl30w7se+YZYqyqOTaeketk=" + else "sha256-DA6t+9xHp8pkrqtRucBh9xtuTSXS2HZ0US6bY4fp46Y="; + }; + + aarch64-linux = { + zuluVersion = "21.28.85"; + jdkVersion = "21.0.0"; + hash = + if enableJavaFX then throw "JavaFX is not available for aarch64-linux" + else "sha256-H7ZLgDbF1GPYq1mvBr9bawBoEeYBLjsOtrzPV/HFWDU="; + }; + x86_64-darwin = { zuluVersion = "21.28.85"; jdkVersion = "21.0.0"; diff --git a/pkgs/development/interpreters/hugs/default.nix b/pkgs/development/interpreters/hugs/default.nix index ed02b41b7668..d8ee5726ef33 100644 --- a/pkgs/development/interpreters/hugs/default.nix +++ b/pkgs/development/interpreters/hugs/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { meta = with lib; { broken = stdenv.isDarwin; + mainProgram = "hugs"; homepage = "https://www.haskell.org/hugs"; description = "Haskell interpreter"; maintainers = with maintainers; [ joachifm ]; diff --git a/pkgs/development/interpreters/luau/default.nix b/pkgs/development/interpreters/luau/default.nix index 153f56d8633d..93aece038980 100644 --- a/pkgs/development/interpreters/luau/default.nix +++ b/pkgs/development/interpreters/luau/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "luau"; - version = "0.596"; + version = "0.598"; src = fetchFromGitHub { owner = "Roblox"; repo = "luau"; rev = version; - hash = "sha256-25SMgBW5Uqh0dGM8A9qCTcUPPP7wzH8wCGk4w+0wp/c="; + hash = "sha256-B3ggPrhvq1kYmclmuomi6PhXIwN8GKBzbKRLIjH0pac="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/liblinphone/backport-cpp17.patch b/pkgs/development/libraries/liblinphone/backport-cpp17.patch new file mode 100644 index 000000000000..d9eb75fa2768 --- /dev/null +++ b/pkgs/development/libraries/liblinphone/backport-cpp17.patch @@ -0,0 +1,98 @@ +From 9ece6e77dcf6545c3b8104068302c6243e3a5e88 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micka=C3=ABl=20Turnel?= + <mickael.turnel@belledonne-communications.com> +Date: Wed, 1 Mar 2023 09:14:53 +0100 +Subject: [PATCH] Set c++ version 17 and fix compilation errors + +Backported-by: Lorenz Brun <lorenz@brun.one> + +--- + CMakeLists.txt | 2 +- + daemon/daemon.cc | 2 +- + libxsd/xsd/cxx/config.hxx | 2 +- + src/conference/session/streams-group.cpp | 10 +++++----- + 4 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 475ff16a8..a771e4595 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -92,7 +92,7 @@ cmake_dependent_option(ENABLE_QRCODE "Enable QRCode support" YES "ENABLE_VIDEO" + # * DISABLE_BC_PACKAGE_SEARCH: skip find_package() for every BC package (bctoolbox, ortp, etc.) + # * DISABLE_SOCI_PACKAGE_SEARCH: skip find_package() for Soci. + +-set(CMAKE_CXX_STANDARD 14) ++set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_EXTENSIONS NO) + + if(NOT CMAKE_BUILD_TYPE) +diff --git a/daemon/daemon.cc b/daemon/daemon.cc +index 197fc22ef..fd09edb26 100644 +--- a/daemon/daemon.cc ++++ b/daemon/daemon.cc +@@ -628,7 +628,7 @@ void Daemon::execCommand(const string &command) { + ist.get(argsbuf); + string args = argsbuf.str(); + if (!args.empty() && (args[0] == ' ')) args.erase(0, 1); +- list<DaemonCommand*>::iterator it = find_if(mCommands.begin(), mCommands.end(), bind2nd(mem_fun(&DaemonCommand::matches), name)); ++ list<DaemonCommand*>::iterator it = find_if(mCommands.begin(), mCommands.end(), [&name](const DaemonCommand *dc) { return dc->matches(name); }); + if (it != mCommands.end()) { + ms_mutex_lock(&mMutex); + (*it)->exec(this, args); +diff --git a/libxsd/xsd/cxx/config.hxx b/libxsd/xsd/cxx/config.hxx +index 076b107f5..385841731 100644 +--- a/libxsd/xsd/cxx/config.hxx ++++ b/libxsd/xsd/cxx/config.hxx +@@ -19,7 +19,7 @@ + # endif + #else + # if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L +-# ifdef __GNUC__ ++# if defined(__GNUC__) && !defined(__clang__) + # if (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4 + # define XSD_CXX11_NULLPTR + # endif +diff --git a/src/conference/session/streams-group.cpp b/src/conference/session/streams-group.cpp +index bff739dda..84277a6b7 100644 +--- a/src/conference/session/streams-group.cpp ++++ b/src/conference/session/streams-group.cpp +@@ -447,11 +447,11 @@ float StreamsGroup::computeOverallQuality(_functor func){ + } + + float StreamsGroup::getAverageQuality(){ +- return computeOverallQuality(mem_fun(&Stream::getAverageQuality)); ++ return computeOverallQuality(mem_fn(&Stream::getAverageQuality)); + } + + float StreamsGroup::getCurrentQuality(){ +- return computeOverallQuality(mem_fun(&Stream::getCurrentQuality)); ++ return computeOverallQuality(mem_fn(&Stream::getCurrentQuality)); + } + + int StreamsGroup::getAvpfRrInterval()const{ +@@ -481,11 +481,11 @@ bool StreamsGroup::avpfEnabled() const{ + } + + void StreamsGroup::refreshSockets(){ +- forEach<Stream>(mem_fun(&Stream::refreshSockets)); ++ forEach<Stream>(mem_fn(&Stream::refreshSockets)); + } + + void StreamsGroup::computeAndReportBandwidth(){ +- forEach<Stream>(mem_fun(&Stream::updateBandwidthReports)); ++ forEach<Stream>(mem_fn(&Stream::updateBandwidthReports)); + + if (!bctbx_log_level_enabled(BCTBX_LOG_DOMAIN, BCTBX_LOG_MESSAGE)) return; + +@@ -540,7 +540,7 @@ void StreamsGroup::finish(){ + mIceService->finish(); // finish ICE first, as it has actions on the streams. + for (auto & ss : mSharedServices) ss.second->checkDestroy(); + mSharedServices.clear(); +- forEach<Stream>(mem_fun(&Stream::finish)); ++ forEach<Stream>(mem_fn(&Stream::finish)); + mFinished = true; + } + +-- +2.41.0 + diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix index 53c56fa36385..c4b792e673fc 100644 --- a/pkgs/development/libraries/liblinphone/default.nix +++ b/pkgs/development/libraries/liblinphone/default.nix @@ -13,6 +13,7 @@ , sqlite , stdenv , xercesc +, zxing-cpp }: stdenv.mkDerivation rec { @@ -28,6 +29,12 @@ stdenv.mkDerivation rec { hash = "sha256-kQZePMa7MTaSJLEObM8khfSFYLqhlgTcVyKfTPLwKYU="; }; + patches = [ + # zxing-cpp 2.0+ requires C++ 17 + # Manual backport as upstream ran formatters in the meantime + ./backport-cpp17.patch + ]; + postPatch = '' substituteInPlace src/CMakeLists.txt \ --replace "jsoncpp_object" "jsoncpp" \ @@ -38,7 +45,6 @@ stdenv.mkDerivation rec { "-DENABLE_STATIC=NO" # Do not build static libraries "-DENABLE_UNIT_TESTS=NO" # Do not build test executables "-DENABLE_STRICT=NO" # Do not build with -Werror - "-DENABLE_QRCODE=NO" # Does not build with zxing-cpp 2 ]; buildInputs = [ @@ -56,6 +62,7 @@ stdenv.mkDerivation rec { (python3.withPackages (ps: [ ps.pystache ps.six ])) sqlite xercesc + zxing-cpp ]; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ircrobots/default.nix b/pkgs/development/python-modules/ircrobots/default.nix index 51de0c11bfe2..ef09e41c2361 100644 --- a/pkgs/development/python-modules/ircrobots/default.nix +++ b/pkgs/development/python-modules/ircrobots/default.nix @@ -13,21 +13,19 @@ buildPythonPackage rec { pname = "ircrobots"; - version = "0.4.6"; + version = "0.6.6"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jesopo"; repo = pname; rev = "v${version}"; - hash = "sha256-+BrS1+ZkgwT/qvqD0PwRZi2LF+31biS738SzKH1dy7w="; + hash = "sha256-mIh3tERwHtGH9eA0AT8Lcnwp1Wn9lQhKkUjuZcOXO/c="; }; postPatch = '' # too specific pins https://github.com/jesopo/ircrobots/issues/3 sed -iE 's/anyio.*/anyio/' requirements.txt - sed -iE 's/ircstates.*/ircstates/' requirements.txt - sed -iE 's/async_timeout.*/async_timeout/' requirements.txt ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ircstates/default.nix b/pkgs/development/python-modules/ircstates/default.nix index 49ddb8c0614e..4ccaea6e6f24 100644 --- a/pkgs/development/python-modules/ircstates/default.nix +++ b/pkgs/development/python-modules/ircstates/default.nix @@ -4,19 +4,20 @@ , pythonOlder , irctokens , pendulum +, freezegun , python }: buildPythonPackage rec { pname = "ircstates"; - version = "0.11.8"; + version = "0.12.1"; disabled = pythonOlder "3.6"; # f-strings src = fetchFromGitHub { owner = "jesopo"; repo = pname; rev = "v${version}"; - sha256 = "0scxqcgby4vzh2q937r0wy2mb46aghjf47q3z6fp6di1b6hlj7zh"; + hash = "sha256-F9yOY3YBacyoUzNTvPs7pxp6yNx08tiq1jWQKhGiagc="; }; propagatedBuildInputs = [ @@ -24,6 +25,10 @@ buildPythonPackage rec { pendulum ]; + nativeCheckInputs = [ + freezegun + ]; + checkPhase = '' ${python.interpreter} -m unittest test ''; diff --git a/pkgs/development/python-modules/irctokens/default.nix b/pkgs/development/python-modules/irctokens/default.nix index 9f40a88dd352..b2b35a7a926b 100644 --- a/pkgs/development/python-modules/irctokens/default.nix +++ b/pkgs/development/python-modules/irctokens/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "irctokens"; - version = "2.0.1"; + version = "2.0.2"; disabled = pythonOlder "3.6"; # f-strings src = fetchFromGitHub { owner = "jesopo"; repo = pname; rev = "v${version}"; - hash = "sha256-FgcLngS11U9eBNV/8jllwdrm89tCmthA1sUaFDovk6U="; + hash = "sha256-Y9NBqxGUkt48hnXxsmfydHkJmWWb+sRrElV8C7l9bpw="; }; nativeCheckInputs = [ pyyaml ]; diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index 61022edb9f22..4edaa22bb16d 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pglast"; - version = "5.4"; + version = "5.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fyLvgaYHmTh9OaWXkuenKmNTHCVYFln/FbN+5u2a9+8="; + hash = "sha256-yz6Q+Vt7ZuT9NaxuQQA+BH7U6Efaim7No6GJmnOQo1o="; }; propagatedBuildInputs = [ @@ -37,10 +37,15 @@ buildPythonPackage rec { pytest ''; + pythonImportsCheck = [ + "pglast" + "pglast.parser" + ]; + meta = with lib; { homepage = "https://github.com/lelit/pglast"; description = "PostgreSQL Languages AST and statements prettifier"; - changelog = "https://github.com/lelit/pglast/raw/v${version}/CHANGES.rst"; + changelog = "https://github.com/lelit/pglast/blob/v${version}/CHANGES.rst"; license = licenses.gpl3Plus; maintainers = with maintainers; [ marsam ]; mainProgram = "pgpp"; diff --git a/pkgs/development/python-modules/python-hl7/default.nix b/pkgs/development/python-modules/python-hl7/default.nix new file mode 100644 index 000000000000..98a73c8252ba --- /dev/null +++ b/pkgs/development/python-modules/python-hl7/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, setuptools +}: + +buildPythonPackage rec { + pname = "python-hl7"; + version = "0.4.5"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "johnpaulett"; + repo = "python-hl7"; + rev = "refs/tags/${version}"; + hash = "sha256-9uFdyL4+9KSWXflyOMOeUudZTv4NwYPa0ADNTmuVbqo="; + }; + + nativeBuildInputs = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "hl7" ]; + + meta = with lib; { + description = "A simple library for parsing messages of Health Level 7 (HL7) version 2.x into Python objects"; + homepage = "https://python-hl7.readthedocs.org"; + changelog = "https://python-hl7.readthedocs.io/en/latest/changelog.html"; + license = licenses.bsd3; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 47b28f3b019c..b647eb851e12 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.217.2"; + version = "0.218.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-0Zu4uPxNDUUeyOLrjdQaCdiRbngtCtHx1qIqtLBmCdA="; + sha256 = "sha256-QmC1K2msiIN7bBwlrsQ8in3YGUoVqf2w21HbiLULWhM="; }; postPatch = '' diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index 99ee4d101b29..01ec94b850a7 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "apktool"; - version = "2.8.1"; + version = "2.9.0"; src = fetchurl { urls = [ "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar" "https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar" ]; - hash = "sha256-e0qOFwPiKNIG2ylkS3EUFofYoRG1WwObCLAt+kQ6sPk="; + hash = "sha256-5ez3WSl7hFvmSjpRRczDctuQWxWoAaIuocke4DxMemU="; }; dontUnpack = true; diff --git a/pkgs/development/tools/darklua/default.nix b/pkgs/development/tools/darklua/default.nix index 18fbafe3b555..d10ef137a378 100644 --- a/pkgs/development/tools/darklua/default.nix +++ b/pkgs/development/tools/darklua/default.nix @@ -1,20 +1,27 @@ { lib +, stdenv +, darwin , rustPlatform , fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "darklua"; - version = "0.10.2"; + version = "0.10.3"; src = fetchFromGitHub { owner = "seaofvoices"; repo = "darklua"; rev = "v${version}"; - hash = "sha256-lZKf+05+qpQe21tMclYYUB9QBI6lC0vhNtsM4O3Jde4="; + hash = "sha256-OgQOsc6upMJveUUJSGqvopsyoKs7ALd6pVYxCi5fmS8="; }; - cargoHash = "sha256-NnMjvi1H3VQGtklzXKPnZX1dOq3kCSiW8MnSvymtZ68="; + cargoHash = "sha256-qq42K4cPrWu/92P4dpegZ/0Wv2ndCb5d5+DgEKzdhbw="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreServices + ]; + # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/development/tools/misc/fzf-make/default.nix b/pkgs/development/tools/misc/fzf-make/default.nix index fdd13e3a2190..0ea3e9505e6a 100644 --- a/pkgs/development/tools/misc/fzf-make/default.nix +++ b/pkgs/development/tools/misc/fzf-make/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "fzf-make"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "kyu08"; repo = "fzf-make"; rev = "v${version}"; - hash = "sha256-QxEYa8+sY7fQVvoXkUJOJkbumus2tYM6T1GmkJRnUHY="; + hash = "sha256-VDPkucvp12pdnJkUxSTfU73X9CMvP/UU1ypBnN0Jp80="; }; - cargoHash = "sha256-EpFSZlzzoZ+Wzsvj5pSk5UhesbftcTFn6t1ZUOHdZsk="; + cargoHash = "sha256-mLbGV0hj571SiM1ZPiHnADYYICgP8ZfgnMTjo2npIgk="; nativeBuildInputs = [ makeBinaryWrapper diff --git a/pkgs/development/tools/misc/rsonpath/default.nix b/pkgs/development/tools/misc/rsonpath/default.nix index 30f04fe95987..fc9b48793faf 100644 --- a/pkgs/development/tools/misc/rsonpath/default.nix +++ b/pkgs/development/tools/misc/rsonpath/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "rsonpath"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "v0ldek"; repo = "rsonpath"; rev = "v${version}"; - hash = "sha256-3/xhYfo23aps3UjjUEcuLYg8JALfIpbCf6LO0F2IS20="; + hash = "sha256-gAoxWdczeaN4VqeQY0qJeLK8aABGhuwXf41QFKUxAG0="; }; - cargoHash = "sha256-2HVPqSkQU90ZAFG0tPbysCVIkd433fpTtTO1y4+ZUTU="; + cargoHash = "sha256-UXPVqc4RNIFKx0f/BPCfkJxilioXbRZSAgqQv1MzK7k="; cargoBuildFlags = [ "-p=rsonpath" ]; cargoTestFlags = cargoBuildFlags; diff --git a/pkgs/development/tools/misc/runme/default.nix b/pkgs/development/tools/misc/runme/default.nix index 00d3c115c3e2..b11573355aef 100644 --- a/pkgs/development/tools/misc/runme/default.nix +++ b/pkgs/development/tools/misc/runme/default.nix @@ -11,16 +11,16 @@ buildGo121Module rec { pname = "runme"; - version = "1.7.5"; + version = "1.7.6"; src = fetchFromGitHub { owner = "stateful"; repo = "runme"; rev = "v${version}"; - hash = "sha256-cy4IUsCMh0sFpHLFce3DW4KAMYT2/BtvKBHKPpkCggQ="; + hash = "sha256-gYaC1ROvW4wFrOKt1Wjl/ExhWX0ZQXHW6n6N70tXa+E="; }; - vendorHash = "sha256-vfLLL/sV8Jg/QE4oT45XLXAwvlLep3ehtPwXbpwo5PQ="; + vendorHash = "sha256-/eofPpXmfpc7Vjz97hjKXH/Fl/EAk0zrnI279iit7MI="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/rust/cargo-binstall/default.nix b/pkgs/development/tools/rust/cargo-binstall/default.nix index 177029648f12..ea860cc0896b 100644 --- a/pkgs/development/tools/rust/cargo-binstall/default.nix +++ b/pkgs/development/tools/rust/cargo-binstall/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-x+fjngKdSS3ujWs2FbdcRSLi99wEuhi3f7uf7wEAvY8="; + hash = "sha256-z69uGnXyzV4spa3pNMwZrqOX1i0RYCgo8dwfZ86MBlA="; }; - cargoHash = "sha256-p/O8v08GjccJGMTvSdAFgOZAMG9jjXmvlJykzyne84w="; + cargoHash = "sha256-/eXdbHDVzM4hHRfP/gw+IXZVDuZcergGyotnvQEKEiw="; nativeBuildInputs = [ pkg-config @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { xz zstd ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; buildNoDefaultFeatures = true; diff --git a/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock b/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock index 69c75963f3a1..48304081a7f6 100644 --- a/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock @@ -1086,7 +1086,7 @@ dependencies = [ [[package]] name = "cargo-shuttle" -version = "0.28.0" +version = "0.28.1" dependencies = [ "anyhow", "assert_cmd", diff --git a/pkgs/development/tools/rust/cargo-shuttle/default.nix b/pkgs/development/tools/rust/cargo-shuttle/default.nix index b8d5cf527046..93cd93d4d624 100644 --- a/pkgs/development/tools/rust/cargo-shuttle/default.nix +++ b/pkgs/development/tools/rust/cargo-shuttle/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-shuttle"; - version = "0.28.0"; + version = "0.28.1"; src = fetchFromGitHub { owner = "shuttle-hq"; repo = "shuttle"; rev = "v${version}"; - hash = "sha256-iBUd42MEfDFMhHXBrgrJaihUeYTRpVt4jFQaKCKhNlc="; + hash = "sha256-j4YFCvBvNJbzxaOwguhczWQt1CzCAMQsxZAVgJoLgUs="; }; cargoLock = { diff --git a/pkgs/development/tools/rust/leptosfmt/default.nix b/pkgs/development/tools/rust/leptosfmt/default.nix index 315b90dddd7b..3bf083932dec 100644 --- a/pkgs/development/tools/rust/leptosfmt/default.nix +++ b/pkgs/development/tools/rust/leptosfmt/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "leptosfmt"; - version = "0.1.14"; + version = "0.1.15"; src = fetchFromGitHub { owner = "bram209"; repo = "leptosfmt"; rev = version; - hash = "sha256-Dj58p//g6sCpZMmTbROrGxs8fiQm4y1WSYqNjQ5K3Oo="; + hash = "sha256-LbF/j6yKcH/OmrcYAvTN8L2XFYnULAAh9hCGsG/JkFg="; }; - cargoHash = "sha256-epCLbr9Z3o/G0rEiYri0CswZYzjOZkb4UVIO4/vD6ko="; + cargoHash = "sha256-92sRJt6d96BoinXlw432Fyn2EjsuSUdOwyFtqj0iUXw="; meta = with lib; { description = "A formatter for the leptos view! macro"; diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 1fb8dc031e13..249be524add5 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.1.102"; + version = "0.1.104"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-OIqAX/Cgh+jpHbjIg7wApTlKGChYx82oq8oUGguDsrE="; + hash = "sha256-iTizgA3MtcG6YN7aHaZF4UXT6jBKodsMxXG61UgDNaQ="; }; - vendorHash = "sha256-XECl5evFO9ml28sILdWS2sQfNDf8ixsvQhiTShOcKKQ="; + vendorHash = "sha256-5Nu9XpYjlZHGazWTK7LmfnEGgewKa017PLHtV9HycD0="; subPackages = [ "." ]; diff --git a/pkgs/misc/dxvk/dxvk.nix b/pkgs/misc/dxvk/dxvk.nix deleted file mode 100644 index 129090faaf47..000000000000 --- a/pkgs/misc/dxvk/dxvk.nix +++ /dev/null @@ -1,114 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, glslang -, meson -, ninja -, windows -, dxvkVersion ? "default" -, spirv-headers -, vulkan-headers -, SDL2 -, glfw -, pkgsBuildHost -, gitUpdater -, sdl2Support ? true -, glfwSupport ? false -, enableMoltenVKCompat ? false -}: - -# SDL2 and GLFW support are mutually exclusive. -assert !sdl2Support || !glfwSupport; - -let - # DXVK 2.0+ no longer vendors certain dependencies. This derivation also needs to build on Darwin, - # which does not currently support DXVK 2.0, so adapt conditionally for this situation. - isDxvk2 = lib.versionAtLeast (srcs.${dxvkVersion}.version) "2.0"; - - # DXVK has effectively the same build script regardless of platform. - srcs = { - "1.10" = rec { - version = "1.10.3"; - src = fetchFromGitHub { - owner = "doitsujin"; - repo = "dxvk"; - rev = "v${version}"; - hash = "sha256-T93ZylxzJGprrP+j6axZwl2d3hJowMCUOKNjIyNzkmE="; - }; - # These patches are required when using DXVK with Wine on Darwin. - patches = lib.optionals enableMoltenVKCompat [ - # Patch DXVK to work with MoltenVK even though it doesn’t support some required features. - # Some games work poorly (particularly Unreal Engine 4 games), but others work pretty well. - ./darwin-dxvk-compat.patch - # Use synchronization primitives from the C++ standard library to avoid deadlocks on Darwin. - # See: https://www.reddit.com/r/macgaming/comments/t8liua/comment/hzsuce9/ - ./darwin-thread-primitives.patch - ]; - }; - "default" = rec { - version = "2.3"; - src = fetchFromGitHub { - owner = "doitsujin"; - repo = "dxvk"; - rev = "v${version}"; - hash = "sha256-RU+B0XfphD5HHW/vSzqHLUaGS3E31d5sOLp3lMmrCB8="; - fetchSubmodules = true; # Needed for the DirectX headers and libdisplay-info - }; - patches = [ ]; - }; - }; - - isWindows = stdenv.targetPlatform.uname.system == "Windows"; - isCross = stdenv.hostPlatform != stdenv.targetPlatform; -in -stdenv.mkDerivation (finalAttrs: { - pname = "dxvk"; - inherit (srcs.${dxvkVersion}) version src patches; - - nativeBuildInputs = [ glslang meson ninja ]; - buildInputs = lib.optionals isWindows [ windows.pthreads ] - ++ lib.optionals isDxvk2 ( - [ spirv-headers vulkan-headers ] - ++ lib.optional (!isWindows && sdl2Support) SDL2 - ++ lib.optional (!isWindows && glfwSupport) glfw - ); - - postPatch = lib.optionalString isDxvk2 '' - substituteInPlace "subprojects/libdisplay-info/tool/gen-search-table.py" \ - --replace "/usr/bin/env python3" "${lib.getBin pkgsBuildHost.python3}/bin/python3" - ''; - - # Build with the Vulkan SDK in nixpkgs. - preConfigure = '' - rm -rf include/spirv/include include/vulkan/include - mkdir -p include/spirv/include include/vulkan/include - ''; - - mesonFlags = - let - arch = if stdenv.is32bit then "32" else "64"; - in - [ - "--buildtype" "release" - "--prefix" "${placeholder "out"}" - ] - ++ lib.optionals isCross [ "--cross-file" "build-win${arch}.txt" ] - ++ lib.optional glfwSupport "-Ddxvk_native_wsi=glfw"; - - doCheck = isDxvk2 && !isCross; - - passthru = lib.optionalAttrs (lib.versionAtLeast finalAttrs.version "2.0") { - updateScript = gitUpdater { - rev-prefix = "v"; - }; - }; - - meta = { - description = "A Vulkan-based translation layer for Direct3D 9/10/11"; - homepage = "https://github.com/doitsujin/dxvk"; - changelog = "https://github.com/doitsujin/dxvk/releases"; - maintainers = [ lib.maintainers.reckenrode ]; - license = lib.licenses.zlib; - platforms = lib.platforms.windows ++ lib.optionals isDxvk2 lib.platforms.linux; - }; -}) diff --git a/pkgs/os-specific/darwin/ios-deploy/default.nix b/pkgs/os-specific/darwin/ios-deploy/default.nix index 6567093700df..c405ac8e1c8b 100644 --- a/pkgs/os-specific/darwin/ios-deploy/default.nix +++ b/pkgs/os-specific/darwin/ios-deploy/default.nix @@ -1,35 +1,62 @@ -{ lib, stdenvNoCC, rsync, fetchFromGitHub }: +{ lib +, stdenv +, fetchFromGitHub +, darwin +, testers +}: -# Note this is impure, using system XCode to build ios-deploy. We -# should have a special flag for users to enable this. - -let version = "1.11.0"; -in stdenvNoCC.mkDerivation { +let + privateFrameworks = "/Library/Apple/System/Library/PrivateFrameworks"; +in +stdenv.mkDerivation (finalAttrs: { pname = "ios-deploy"; - inherit version; + version = "1.12.2"; + src = fetchFromGitHub { owner = "ios-control"; repo = "ios-deploy"; - rev = version; - sha256 = "0hqwikdrcnslx4kkw9b0n7n443gzn2gbrw15pp2fnkcw5s0698sc"; + rev = finalAttrs.version; + hash = "sha256-TVGC+f+1ow3b93CK3PhIL70le5SZxxb2ug5OkIg8XCA="; }; - nativeBuildInputs = [ rsync ]; + + buildInputs = [ + darwin.apple_sdk.frameworks.Foundation + ]; + buildPhase = '' - LD=$CC - tmp=$(mktemp -d) - ln -s /usr/bin/xcodebuild $tmp - export PATH="$PATH:$tmp" - xcodebuild -configuration Release SYMROOT=build OBJROOT=$tmp - ''; - checkPhase = '' - xcodebuild test -scheme ios-deploy-tests -configuration Release SYMROOT=build + runHook preBuild + + awk '{ print "\""$0"\\n\""}' src/scripts/lldb.py >> src/ios-deploy/lldb.py.h + clang src/ios-deploy/ios-deploy.m \ + -framework Foundation \ + -F${privateFrameworks} -framework MobileDevice \ + -o ios-deploy + + runHook postBuild ''; + installPhase = '' - install -D build/Release/ios-deploy $out/bin/ios-deploy + runHook preInstall + + install -Dm755 ios-deploy $out/bin/ios-deploy + + runHook postInstall ''; + + __impureHostDeps = [ + privateFrameworks + ]; + + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + meta = { + description = "Install and debug iPhone apps from the command line, without using Xcode"; + homepage = "https://github.com/ios-control/ios-deploy"; + license = lib.licenses.gpl3Plus; + mainProgram = "ios-deploy"; + maintainers = with lib.maintainers; [ wegank ]; platforms = lib.platforms.darwin; - description = "Install and debug iOS apps from the command line. Designed to work on un-jailbroken devices"; - license = lib.licenses.gpl3; }; -} +}) diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index 4d3c9e785229..9195c1a44276 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "eudev"; - version = "3.2.12"; + version = "3.2.14"; src = fetchFromGitHub { owner = "eudev-project"; repo = pname; rev = "v${version}"; - hash = "sha256-x9l+W8zuFYwG0m9JOIDbEf1x6yeBW36HnJws/buc7HI="; + hash = "sha256-v/szzqrBedQPRGYkZ0lV9rslCH//uqGp4PHEF0/51Lg="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 0c1b366178f1..ecc400e32066 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bird"; - version = "2.13.1"; + version = "2.14"; src = fetchurl { url = "ftp://bird.network.cz/pub/bird/${pname}-${version}.tar.gz"; - hash = "sha256-l7uNV76bxQg+K1ZkFtJ+MUFihWoSynx34gLkZ9INQIA="; + hash = "sha256-sLn2+FZlQbm+SvHwysZ1xaN4VgGlVmen7D194pc1p4Y="; }; nativeBuildInputs = [ flex bison ]; diff --git a/pkgs/servers/invidious/versions.json b/pkgs/servers/invidious/versions.json index 61dc6fe3dd1f..75285e94405e 100644 --- a/pkgs/servers/invidious/versions.json +++ b/pkgs/servers/invidious/versions.json @@ -4,9 +4,9 @@ "sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A=" }, "invidious": { - "rev": "bb14f794969f62582917a39c2dd57bf92fa146a7", - "sha256": "sha256-UX66SBscxvjl0rUHmJko12HXo5+ckKvoOfNtCIVrjXY=", - "version": "unstable-2023-09-18" + "rev": "60fae015d8b5e4b0bfac8306065db07f93c4c661", + "sha256": "sha256-yYTkDlQl6osvIC+k2mCXXsF8/33TB34vqOcZXPV1z/8=", + "version": "unstable-2023-10-07" }, "lsquic": { "sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=", diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 942297b5cdcb..a876a0b9bb73 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -8,21 +8,21 @@ buildGoModule rec { pname = "mattermost"; - version = "8.1.2"; + version = "8.1.3"; src = fetchFromGitHub { owner = "mattermost"; repo = "mattermost"; rev = "v${version}"; - hash = "sha256-hOt3xqrCs7akWyCv/6keiZN0ReF2adwiQNVibKFG3mk="; + hash = "sha256-Xcg24hnQqrq/hW+tlzpdNUmvrC/3zIXzyi2ZkU1a96U="; } + "/server"; webapp = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - hash = "sha256-cIfUIGp51dyfmY3LnV+1F9CX+y5XyTCez6R8TLLz9fo="; + hash = "sha256-FXc0W3W05Hx8jdNHHjRXTcfKw8j6rRZbn2TTEKx/UfU="; }; - vendorHash = "sha256-3OZUWg4e2h7g15FXxiFKk2EXceHP4phBTpyy/uY2Ni4="; + vendorHash = "sha256-uHKd8shLDVd+zjRhEJcxAn+H9e9jqEM8XXqYx7B4hiQ="; subPackages = [ "cmd/mattermost" ]; diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix index e37033839c83..420d1ae04eda 100644 --- a/pkgs/tools/misc/hyperfine/default.nix +++ b/pkgs/tools/misc/hyperfine/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "hyperfine"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "hyperfine"; rev = "v${version}"; - hash = "sha256-IUjOklkEiy/U2HjjMt1X1uSpIkTAYOPiPQ+70xvvxKA="; + hash = "sha256-9YfnCHiG9TDOsEAcrrb0GOxdq39Q+TiltWKwnr3ObAQ="; }; - cargoHash = "sha256-VjkcQueBODEADHdWOts2f3Zjar43hi0UXzVhvkK4o8I="; + cargoHash = "sha256-E2y/hQNcpW6b/ZJBlsp+2RDH2OgpX4kbn36aBHA5X6U="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/networking/containerlab/default.nix b/pkgs/tools/networking/containerlab/default.nix index fe59d72397bb..39982a6ab886 100644 --- a/pkgs/tools/networking/containerlab/default.nix +++ b/pkgs/tools/networking/containerlab/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "containerlab"; - version = "0.45.1"; + version = "0.46.0"; src = fetchFromGitHub { owner = "srl-labs"; repo = "containerlab"; rev = "v${version}"; - hash = "sha256-SjB00hTbY28EsLHAnq5PwtHD9Y2cYTNqu/nSF6smQfE="; + hash = "sha256-uBT9whv1qL3yfO6VoeW2SqLIzG11mk+SU09c/xqboM8="; }; nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-Tkm0BUn1KEFp1EyZu44dueSQlKIbUUrxGK7iT+aTmaQ="; + vendorHash = "sha256-mkQR0lZXYe6Dz4PngxF7d7Bkr4R3HmL/imQDLridmlA="; ldflags = [ "-s" diff --git a/pkgs/tools/text/gtree/default.nix b/pkgs/tools/text/gtree/default.nix index 951bbf4258cc..022ed0b0f0b6 100644 --- a/pkgs/tools/text/gtree/default.nix +++ b/pkgs/tools/text/gtree/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gtree"; - version = "1.9.11"; + version = "1.9.12"; src = fetchFromGitHub { owner = "ddddddO"; repo = "gtree"; rev = "v${version}"; - hash = "sha256-mB/Wftq6YB1aZFJaulNfSXEPYjiznA5rc9hsoCehc5A="; + hash = "sha256-N4gw2SaNAcQULNxE+v4I+UhfziLH7zLs0cIP5mHGUx0="; }; - vendorHash = "sha256-Td2DOMXA/E2ynsAKv+CLuS53pI9Bd4GkWcWBMqHrQ5o="; + vendorHash = "sha256-3VNcis7G0k/WTt8APvFaVBoYTo+RhjpnT1cGWhQhXK0="; subPackages = [ "cmd/gtree" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8fcb1bea8e24..799cdb60a962 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16426,7 +16426,7 @@ with pkgs; hugs = callPackage ../development/interpreters/hugs { }; - inherit (javaPackages) openjfx11 openjfx15 openjfx17 openjfx19 openjfx20; + inherit (javaPackages) openjfx11 openjfx15 openjfx17 openjfx19 openjfx20 openjfx21; openjfx = openjfx17; openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap; @@ -16461,6 +16461,11 @@ with pkgs; jdk20 = openjdk20; jdk20_headless = openjdk20_headless; + openjdk21 = javaPackages.compiler.openjdk21; + openjdk21_headless = javaPackages.compiler.openjdk21.headless; + jdk21 = openjdk21; + jdk21_headless = openjdk21_headless; + /* default JDK */ jdk = jdk19; jdk_headless = jdk19_headless; @@ -17691,6 +17696,8 @@ with pkgs; zulu8 = callPackage ../development/compilers/zulu/8.nix { }; zulu11 = callPackage ../development/compilers/zulu/11.nix { }; + zulu17 = callPackage ../development/compilers/zulu/17.nix { }; + zulu21 = callPackage ../development/compilers/zulu/21.nix { }; zulu = zulu11; ### DEVELOPMENT / INTERPRETERS @@ -27595,8 +27602,6 @@ with pkgs; searx = callPackage ../servers/web-apps/searx { }; - searxng = python3Packages.toPythonModule (callPackage ../servers/web-apps/searxng { }); - selfoss = callPackage ../servers/web-apps/selfoss { }; shaarli = callPackage ../servers/web-apps/shaarli { }; @@ -40466,10 +40471,6 @@ with pkgs; dump = callPackage ../tools/backup/dump { }; - dxvk = callPackage ../misc/dxvk { }; - dxvk_1 = callPackage ../misc/dxvk/dxvk.nix { dxvkVersion = "1.10"; }; - dxvk_2 = callPackage ../misc/dxvk/dxvk.nix { }; - ec2stepshell = callPackage ../tools/security/ec2stepshell { }; ecdsatool = callPackage ../tools/security/ecdsatool { }; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 6e1d0939c3e8..85383eca38e5 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -8,11 +8,12 @@ let openjfx17 = callPackage ../development/compilers/openjdk/openjfx/17.nix { }; openjfx19 = callPackage ../development/compilers/openjdk/openjfx/19.nix { }; openjfx20 = callPackage ../development/compilers/openjdk/openjfx/20.nix { }; + openjfx21 = callPackage ../development/compilers/openjdk/openjfx/21.nix { }; mavenfod = pkgs.maven.buildMavenPackage; in { - inherit mavenfod openjfx11 openjfx15 openjfx17 openjfx19 openjfx20; + inherit mavenfod openjfx11 openjfx15 openjfx17 openjfx19 openjfx20 openjfx21; compiler = let @@ -210,6 +211,14 @@ in { openjfx = openjfx20; }; + openjdk21 = mkOpenjdk + ../development/compilers/openjdk/21.nix + ../development/compilers/zulu/21.nix + { + openjdk21-bootstrap = temurin-bin.jdk-20; + openjfx = openjfx21; + }; + temurin-bin = recurseIntoAttrs (callPackage ( if stdenv.isLinux then ../development/compilers/temurin-bin/jdk-linux.nix diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4f76f654ae01..225979989af9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9199,6 +9199,8 @@ self: super: with self; { python-heatclient = callPackage ../development/python-modules/python-heatclient { }; + python-hl7 = callPackage ../development/python-modules/python-hl7 { }; + python-ipmi = callPackage ../development/python-modules/python-ipmi { }; python-ipware = callPackage ../development/python-modules/python-ipware { }; |