diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-01-04 00:03:20 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-04 00:03:20 +0000 |
commit | e859576396de70697d7977f623d9cfaa7829af8c (patch) | |
tree | d07e68b5303e74410116163f6857aef5ced41481 /pkgs/applications | |
parent | fbe2f8a3623c2a114c01f208d1e2833416b97bae (diff) | |
parent | 00ae0b903356de28d03f5c1c63b36584eb05fd88 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/blockchains/ledger-live-desktop/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/emulators/melonDS/default.nix | 24 | ||||
-rw-r--r-- | pkgs/applications/emulators/wibo/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/gis/qgis/unwrapped-ltr.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/gis/qgis/unwrapped.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/misc/librecad/default.nix | 49 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/brave/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/upstream-info.json | 6 | ||||
-rw-r--r-- | pkgs/applications/networking/cluster/karmor/default.nix | 36 | ||||
-rw-r--r-- | pkgs/applications/networking/msmtp/default.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/networking/netmaker/default.nix | 39 | ||||
-rw-r--r-- | pkgs/applications/version-management/gh/default.nix | 12 | ||||
-rw-r--r-- | pkgs/applications/video/mkvtoolnix/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/mpv/default.nix | 4 |
14 files changed, 149 insertions, 58 deletions
diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index cd9ec2a80e774..d64376aae18d9 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, appimageTools, imagemagick, systemd }: +{ lib, fetchurl, appimageTools, imagemagick }: let pname = "ledger-live-desktop"; diff --git a/pkgs/applications/emulators/melonDS/default.nix b/pkgs/applications/emulators/melonDS/default.nix index 6e389b8daf640..d1573ba5967be 100644 --- a/pkgs/applications/emulators/melonDS/default.nix +++ b/pkgs/applications/emulators/melonDS/default.nix @@ -1,34 +1,44 @@ { lib , fetchFromGitHub -, mkDerivation +, stdenv , cmake -, libepoxy +, extra-cmake-modules , libarchive , libpcap , libslirp , pkg-config , qtbase +, qtmultimedia , SDL2 +, wayland +, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "melonDS"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "Arisotura"; repo = pname; rev = version; - sha256 = "sha256-FSacau7DixU6R4eKNIYVRZiMb/GhijTzHbcGlZ6WG/I="; + sha256 = "sha256-n4Vkxb/7fr214PgB6VFNgH1tMDgTBS/UHUQ6V4uGkDA="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + pkg-config + wrapQtAppsHook + ]; + buildInputs = [ - libepoxy libarchive libslirp qtbase + qtmultimedia SDL2 + wayland ]; qtWrapperArgs = [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpcap ]}" ]; diff --git a/pkgs/applications/emulators/wibo/default.nix b/pkgs/applications/emulators/wibo/default.nix index 69137cb8f0304..54a544fc60040 100644 --- a/pkgs/applications/emulators/wibo/default.nix +++ b/pkgs/applications/emulators/wibo/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "wibo"; - version = "0.2.4"; + version = "0.3.0"; src = fetchFromGitHub { owner = "decompals"; repo = "wibo"; rev = version; - hash = "sha256-dpfKSiIWE9L5BLPH2t8RsUz7Ufkdo/5zn1dewaEgJl0="; + hash = "sha256-J5h/RpF+twb5fBjSDQMVB5SoTWWs8VD/EUuikuj73YA="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta.license = lib.licenses.unfree; }; in lib.optionalString doCheck '' - MWCIncludes=. ./wibo ${gc}/GC/2.7/mwcceppc.exe -c ../test/test.c + MWCIncludes=../test ./wibo ${gc}/GC/2.7/mwcceppc.exe -c ../test/test.c file test.o | grep "ELF 32-bit" ''; diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index e11df27ab6c32..5e35e56fe5fe5 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -28,11 +28,12 @@ , qtkeychain , qt3d , qscintilla +, qtlocation , qtserialport , qtxmlpatterns , withGrass ? true , grass -, withWebKit ? true +, withWebKit ? false , qtwebkit , pdal , zstd @@ -109,6 +110,7 @@ in mkDerivation rec { qca-qt5 qtkeychain qscintilla + qtlocation qtserialport qtxmlpatterns qt3d @@ -132,7 +134,11 @@ in mkDerivation rec { "-DWITH_3D=True" "-DWITH_PDAL=TRUE" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" - ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/grass78"; + ++ lib.optional withGrass (let + gmajor = lib.versions.major grass.version; + gminor = lib.versions.minor grass.version; + in "-DGRASS_PREFIX${gmajor}=${grass}/grass${gmajor}${gminor}" + ); dontWrapGApps = true; # wrapper params passed below diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 9f445facb1673..929a40d6daab3 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -28,11 +28,12 @@ , qtkeychain , qt3d , qscintilla +, qtlocation , qtserialport , qtxmlpatterns , withGrass ? true , grass -, withWebKit ? true +, withWebKit ? false , qtwebkit , pdal , zstd @@ -109,6 +110,7 @@ in mkDerivation rec { qca-qt5 qtkeychain qscintilla + qtlocation qtserialport qtxmlpatterns qt3d @@ -132,7 +134,11 @@ in mkDerivation rec { "-DWITH_3D=True" "-DWITH_PDAL=TRUE" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" - ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/grass78"; + ++ lib.optional withGrass (let + gmajor = lib.versions.major grass.version; + gminor = lib.versions.minor grass.version; + in "-DGRASS_PREFIX${gmajor}=${grass}/grass${gmajor}${gminor}" + ); dontWrapGApps = true; # wrapper params passed below diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index 54ed6c10f42a7..566730c12222a 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -1,7 +1,6 @@ { lib , boost , fetchFromGitHub -, fetchpatch , installShellFiles , mkDerivation , muparser @@ -15,38 +14,42 @@ mkDerivation rec { pname = "librecad"; - version = "2.2.0-rc2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "LibreCAD"; repo = "LibreCAD"; rev = version; - sha256 = "sha256-RNg7ioMriH4A7V65+4mh8NhsUHs/8IbTt38nVkYilCE="; + sha256 = "sha256-horKTegmvcMg4m5NbZ4nzy4J6Ac/6+E5OkiZl0v6TBc="; }; - patches = [ - (fetchpatch { - url = "https://github.com/LibreCAD/LibreCAD/pull/1465/commits/4edcbe72679f95cb60979c77a348c1522a20b0f4.patch"; - sha256 = "sha256-P0G2O5sL7Ip860ByxFQ87TfV/lq06wCQnzPxADGqFPs="; - name = "CVE-2021-45342.patch"; - }) + buildInputs = [ + boost + muparser + qtbase + qtsvg + ]; + + nativeBuildInputs = [ + installShellFiles + pkg-config + qmake + qttools + ]; + + qmakeFlags = [ + "MUPARSER_DIR=${muparser}" + "BOOST_DIR=${boost.dev}" ]; postPatch = '' substituteInPlace scripts/postprocess-unix.sh \ --replace /bin/sh ${runtimeShell} - substituteInPlace librecad/src/lib/engine/rs_system.cpp \ - --replace /usr/share $out/share - substituteInPlace librecad/src/main/qc_applicationwindow.cpp \ --replace __DATE__ 0 ''; - qmakeFlags = [ - "MUPARSER_DIR=${muparser}" - "BOOST_DIR=${boost.dev}" - ]; installPhase = '' runHook preInstall @@ -65,20 +68,6 @@ mkDerivation rec { runHook postInstall ''; - buildInputs = [ - boost - muparser - qtbase - qtsvg - ]; - - nativeBuildInputs = [ - installShellFiles - pkg-config - qmake - qttools - ]; - meta = with lib; { description = "2D CAD package based on Qt"; homepage = "https://librecad.org"; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 68a35cf768773..dc171a99bcdbd 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.46.133"; + version = "1.46.144"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-362XVFFsVWR/H0mcn1XQh3tsemksEnqR5quOIwf2QQE="; + sha256 = "sha256-RivuyMPrqBXeTENrH4wApqHglPAZHVXMd863Wlh+EHY="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 7e13b02619ce9..74942ffd03f34 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "109.0.5414.46", - "sha256": "17wzll9024c80fhgxi33ix1rpmqh9sbpx6qvw9cvhdlmhn0b5017", - "sha256bin64": "199n8a7pjnhbgkm2dwh9hq7pzf39x932bh6b056jqp032d5c00ns", + "version": "109.0.5414.61", + "sha256": "1dk832ishjhba0rnf57w7vqrr8dyqga6zsgw9945i7zz997fpjyi", + "sha256bin64": "1s1d7h9ygzpa5b39pdivn5vvpm7fpnhw5p3lz8blrgn61m8h6jg6", "deps": { "gn": { "version": "2022-11-10", diff --git a/pkgs/applications/networking/cluster/karmor/default.nix b/pkgs/applications/networking/cluster/karmor/default.nix new file mode 100644 index 0000000000000..220d38c36f804 --- /dev/null +++ b/pkgs/applications/networking/cluster/karmor/default.nix @@ -0,0 +1,36 @@ +{ buildGoModule, fetchFromGitHub, installShellFiles, lib }: + +buildGoModule rec { + pname = "karmor"; + version = "0.11.1"; + + src = fetchFromGitHub { + owner = "kubearmor"; + repo = "kubearmor-client"; + rev = "v${version}"; + hash = "sha256-s1G5ZcXtjL9TxYpEUvnqiQXaY7OFUwCDXFongRM48Xk="; + }; + + vendorHash = "sha256-VvjcGiBxK2OVvIEc/ScwUT6zJZTccnXu/JfXKXc5WNY="; + + nativeBuildInputs = [ installShellFiles ]; + + # integration tests require network access + doCheck = false; + + postInstall = '' + mv $out/bin/{kubearmor-client,karmor} + installShellCompletion --cmd karmor \ + --bash <($out/bin/karmor completion bash) \ + --fish <($out/bin/karmor completion fish) \ + --zsh <($out/bin/karmor completion zsh) + ''; + + meta = with lib; { + description = "A client tool to help manage KubeArmor"; + homepage = "https://kubearmor.io"; + changelog = "https://github.com/kubearmor/kubearmor-client/releases/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index df5c1354562c2..904239960181c 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -128,4 +128,5 @@ symlinkJoin { name = "msmtp-${version}"; inherit version meta; paths = [ binaries scripts ]; + passthru = { inherit binaries scripts; }; } diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix new file mode 100644 index 0000000000000..ce074c49cb617 --- /dev/null +++ b/pkgs/applications/networking/netmaker/default.nix @@ -0,0 +1,39 @@ +{ buildGoModule, fetchFromGitHub, installShellFiles, lib, libglvnd, pkg-config, xorg }: + +buildGoModule rec { + pname = "netmaker"; + version = "0.17.1"; + + src = fetchFromGitHub { + owner = "gravitl"; + repo = pname; + rev = "v${version}"; + hash = "sha256-8uxPPhy1/FqPGouqzUxY2lGnO/giqH9bJbAqQ9rZI0g="; + }; + + vendorHash = "sha256-4LaGwwDu3pKd6I6r/F3isCi9CuFqPGvc5SdVTV34qOI="; + + subPackages = [ + "." + "netclient" + ]; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + libglvnd + xorg.libX11 + xorg.libXcursor + xorg.libXi + xorg.libXinerama + xorg.libXrandr + ]; + + meta = with lib; { + description = "WireGuard automation from homelab to enterprise"; + homepage = "https://netmaker.io"; + changelog = "https://github.com/gravitl/netmaker/-/releases/v${version}"; + license = licenses.sspl; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index 6035c1d7eb783..cb1690872c013 100644 --- a/pkgs/applications/version-management/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -1,17 +1,17 @@ -{ lib, fetchFromGitHub, buildGoModule, installShellFiles }: +{ lib, fetchFromGitHub, buildGoModule, installShellFiles, testers, gh }: buildGoModule rec { pname = "gh"; - version = "2.21.1"; + version = "2.21.2"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-DVdbyHGBnbFkKu0h01i0d1qw5OuBYydyP7qHc6B1qs0="; + sha256 = "sha256-syd7OMBEMv9uJUDjIIqVkJ3pvuyKnD5pubG4d3TbkY8="; }; - vendorSha256 = "sha256-b4pNcOfG+W+l2cqn4ncvR47zJltKYIcE3W1GvrWEOFY="; + vendorSha256 = "sha256-m9K43Ns8j82nMkz+zkmC7HueOA6q6T4mFPQ1GSdqo24="; nativeBuildInputs = [ installShellFiles ]; @@ -42,6 +42,10 @@ buildGoModule rec { # most tests require network access doCheck = false; + passthru.tests.version = testers.testVersion { + package = gh; + }; + meta = with lib; { description = "GitHub CLI tool"; homepage = "https://cli.github.com/"; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 05aaa8fe646e7..779f8bf3bf7e7 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -47,13 +47,13 @@ let in stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "71.1.0"; + version = "72.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "sha256-JHbnjcXOctB6HQeHXykWbykdn35S2fCYegMkc3GLmAI="; + sha256 = "sha256-3XKvcV6vwXrn2mf8ziclKgEPOwn3IPyLYy6+d0DscHs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 71fd52f35d885..7f6fd0b286f49 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -8,7 +8,7 @@ , ninja , pkg-config , python3 -, ffmpeg +, ffmpeg_5 , freefont_ttf , freetype , libass @@ -129,7 +129,7 @@ in stdenv.mkDerivation rec { ++ lib.optionals waylandSupport [ wayland-scanner ]; buildInputs = [ - ffmpeg + ffmpeg_5 freetype libass libpthreadstubs |