ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 00:53:12 +03:00
Code Issues Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-10-02 18:01:48 +00:00 committed by GitHub
commit 9960091b16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 181 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/customisation.nix
View File

@ -145,7 +145,8 @@ rec {
let
outputs = drv.outputs or [ "out" ];
commonAttrs = drv // (builtins.listToAttrs outputsList) //
commonAttrs = (removeAttrs drv [ "outputUnspecified" ]) //
(builtins.listToAttrs outputsList) //
({ all = map (x: x.value) outputsList; }) // passthru;
outputToAttrListElement = outputName:

4
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
View File

@ -1002,8 +1002,8 @@ Superuser created successfully.
<listitem>
<para>
The <literal>varnish</literal> package was upgraded from 6.3.x
to 6.5.x. <literal>varnish60</literal> for the last LTS
release is also still available.
to 7.x. <literal>varnish60</literal> for the last LTS release
is also still available.
</para>
</listitem>
<listitem>

2
nixos/doc/manual/release-notes/rl-2111.section.md
View File

@ -310,7 +310,7 @@ In addition to numerous new and upgraded packages, this release has the followin
configures the address and port the web UI is listening, it defaults to `:9001`.
To be able to access the web UI this port needs to be opened in the firewall.
- The `varnish` package was upgraded from 6.3.x to 6.5.x. `varnish60` for the last LTS release is also still available.
- The `varnish` package was upgraded from 6.3.x to 7.x. `varnish60` for the last LTS release is also still available.
- The `kubernetes` package was upgraded to 1.22. The `kubernetes.apiserver.kubeletHttps` option was removed and HTTPS is always used.

10
pkgs/applications/misc/todoist-electron/default.nix
View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_11, libsecret }:
{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron, libsecret }:
stdenv.mkDerivation rec {
pname = "todoist-electron";
version = "0.2.4";
version = "1.0.1";
src = fetchurl {
url = "https://electron-dl.todoist.com/linux/Todoist-${version}.AppImage";
sha256 = "1xrf2qjhq116z18qx7n1zd7mhvkb2dccaq7az4w6fs216l8q5zf2";
sha256 = "1c4qmfyfi4hm3fs5bkxjbq1hxs5sgyp531xi5z5vpnzzi5z7dw0k";
};
appimageContents = appimageTools.extractType2 {
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
cp -a ${appimageContents}/{locales,resources} $out/share/${pname}
cp -a ${appimageContents}/todoist.desktop $out/share/applications/${pname}.desktop
cp -a ${appimageContents}/usr/share/icons/hicolor/0x0/apps $out/share/icons/hicolor/512x512
cp -a ${appimageContents}/usr/share/icons/hicolor/512x512/apps $out/share/icons/hicolor/512x512
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
'';
postFixup = ''
makeWrapper ${electron_11}/bin/electron $out/bin/${pname} \
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
--add-flags $out/share/${pname}/resources/app.asar \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}"
'';

16
pkgs/applications/networking/cluster/multus-cni/default.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, buildGoModule }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "multus-cni";
@ -11,15 +11,14 @@ buildGoModule rec {
sha256 = "sha256-wG6SRts3+bmeMkfScyNorsBvRl/hxe+CUnL0rwfknpc=";
};
ldflags = let
multus = "gopkg.in/intel/multus-cni.v3/pkg/multus";
commit = "f6298a3a294a79f9fbda0b8f175e521799d5f8d7";
in [
"-s" "-w" "-X ${multus}.version=v${version}" "-X ${multus}.commit=${commit}"
ldflags = [
"-s"
"-w"
"-X=gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/multus.version=${version}"
];
preInstall = ''
mv $GOPATH/bin/cmd $GOPATH/bin/multus
mv $GOPATH/bin/cmd $GOPATH/bin/multus
'';
vendorSha256 = null;
@ -28,10 +27,11 @@ buildGoModule rec {
doCheck = false;
meta = with lib; {
description = "Multus CNI is a container network interface (CNI) plugin for Kubernetes that enables attaching multiple network interfaces to pods. ";
description = "Multus CNI is a container network interface (CNI) plugin for Kubernetes that enables attaching multiple network interfaces to pods";
homepage = "https://github.com/k8snetworkplumbingwg/multus-cni";
license = licenses.asl20;
platforms = platforms.linux;
maintainers = with maintainers; [ onixie ];
mainProgram = "multus";
};
}

6
pkgs/applications/networking/juju/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "juju";
version = "2.9.10";
version = "2.9.11";
src = fetchFromGitHub {
owner = "juju";
repo = "juju";
rev = "juju-${version}";
sha256 = "sha256-2gCJ6aN6uN0KtOVddLDry4pLhScSh4JHmdsFws59phk=";
sha256 = "sha256-KcvlnEfDzwhFzwaWLYuRGa8nh6MkjqZ+u+qJSJZl13U=";
};
vendorSha256 = "sha256-vFO3Rv+7CLIkl1qS4zp177GmerewfgmyjxEbzdt/RsE=";
vendorSha256 = "sha256-0KGeMJDv1BdqM1/uMk+mKpK+Nejz9PiCAfRy96pu3OQ=";
# Disable tests because it attempts to use a mongodb instance
doCheck = false;

20
pkgs/applications/science/electronics/dwfv/default.nix Normal file
View File

@ -0,0 +1,20 @@
{ lib, rustPlatform, fetchCrate }:
rustPlatform.buildRustPackage rec {
pname = "dwfv";
version = "0.4.1";
src = fetchCrate {
inherit version pname;
sha256 = "0xxgwbbbzaldbl04k5ksk61wa6i4f9mc84q04ljg438z0k8q6cr7";
};
cargoSha256 = "1z51yx3psdxdzmwny0rzlch5hjx2pssll73q79qij2bc7wgyjscy";
meta = with lib; {
description = "A simple digital waveform viewer with vi-like key bindings";
homepage = "https://github.com/psurply/dwfv";
license = licenses.mit;
maintainers = with maintainers; [ newam ];
};
}

16
pkgs/applications/video/mediathekview/default.nix
View File

@ -1,34 +1,38 @@
{ lib, stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
version = "13.7.1";
version = "13.8.0";
pname = "mediathekview";
src = fetchurl {
url = "https://download.mediathekview.de/stabil/MediathekView-${version}-linux.tar.gz";
sha256 = "sha256-yFPyj1Mbgj2eJv4DpvfOtPyTbL9gMAXC5TzSx8AV27o=";
sha256 = "0zfkwz5psv7m0881ykgqrxwjhadg39c55aj2wpy7m1jdara86c5q";
};
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
runHook preInstall
mkdir -p $out/{bin,lib}
install -m644 MediathekView.jar $out/lib
makeWrapper ${jre}/bin/java $out/bin/mediathek \
--add-flags "-Xmx1G --enable-preview -jar $out/lib/MediathekView.jar"
--add-flags "-jar $out/lib/MediathekView.jar"
makeWrapper ${jre}/bin/java $out/bin/MediathekView \
--add-flags "-Xmx1G --enable-preview -jar $out/lib/MediathekView.jar"
--add-flags "-jar $out/lib/MediathekView.jar"
makeWrapper ${jre}/bin/java $out/bin/MediathekView_ipv4 \
--add-flags "-Xmx1G --enable-preview -Djava.net.preferIPv4Stack=true -jar $out/lib/MediathekView.jar"
--add-flags "-Djava.net.preferIPv4Stack=true -jar $out/lib/MediathekView.jar"
runHook postInstall
'';
meta = with lib; {
description = "Offers access to the Mediathek of different tv stations (ARD, ZDF, Arte, etc.)";
homepage = "https://mediathekview.de/";
license = licenses.gpl3;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ moredread ];
platforms = platforms.all;
};

6
pkgs/build-support/skaware/build-skaware-man-pages.nix
View File

@ -7,8 +7,6 @@
, version
# : string
, sha256
# : list (int | string)
, sections
# : string
, description
# : list Maintainer
@ -39,10 +37,6 @@ stdenv.mkDerivation {
dontBuild = true;
preInstall = lib.concatMapStringsSep "\n"
(section: "mkdir -p \"${manDir}/man${builtins.toString section}\"")
sections;
meta = with lib; {
inherit description license maintainers;
inherit (src.meta) homepage;

5
pkgs/data/documentation/execline-man-pages/default.nix
View File

@ -2,9 +2,8 @@
buildManPages {
pname = "execline-man-pages";
version = "2.8.0.1.1";
sha256 = "0xv9v39na1qnd8cm4v7xb8wa4ap3djq20iws0lrqz7vn1w40i8b4";
version = "2.8.1.0.1";
sha256 = "0d3lzxy7wv91q3nr6bw1wfmrfj285i15wmj4c8v9k9pxjg42iwwx";
description = "Port of the documentation for the execline suite to mdoc";
sections = [ 1 7 ];
maintainers = [ lib.maintainers.sternenseemann ];
}

5
pkgs/data/documentation/s6-man-pages/default.nix
View File

@ -2,9 +2,8 @@
buildManPages {
pname = "s6-man-pages";
version = "2.10.0.3.1";
sha256 = "0q9b6v7kbyjsh390s4bw80kjdp92kih609vlmnpl1qzyrr6kivsg";
version = "2.11.0.0.1";
sha256 = "00nxlpdf0kkdadyv84vj5w66y926pccqls8prkbip3zmcmnqgghs";
description = "Port of the documentation for the s6 supervision suite to mdoc";
sections = [ 1 7 ];
maintainers = [ lib.maintainers.sternenseemann ];
}

5
pkgs/data/documentation/s6-networking-man-pages/default.nix
View File

@ -2,9 +2,8 @@
buildManPages {
pname = "s6-networking-man-pages";
version = "2.4.1.1.1";
sha256 = "1qrqzm2r4rxf8hglz8k4laknjqcx1y0z1kjf636z91w1077qg0pn";
version = "2.5.0.0.1";
sha256 = "02xvyby23b2x30jxd4nw9c5629j4hdaxq9sph3qhajlhl53yiyf2";
description = "Port of the documentation for the s6-networking suite to mdoc";
sections = [ 1 7 ];
maintainers = [ lib.maintainers.sternenseemann ];
}

4
pkgs/data/icons/papirus-icon-theme/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "papirus-icon-theme";
version = "20210901";
version = "20211001";
src = fetchFromGitHub {
owner = "PapirusDevelopmentTeam";
repo = pname;
rev = version;
sha256 = "sha256-SbqEHLXSomUUaLRJA1MJbtF1lTQPiWSUXgapjEzSl00=";
sha256 = "sha256-OVG/bKWOdSxOXVvtMOITnCDoGNSc+zPNZ/XOablfSEE=";
};
nativeBuildInputs = [ gtk3 ];

4
pkgs/development/compilers/sbcl/2.1.8.nix
View File

@ -1,4 +0,0 @@
import ./common.nix {
version = "2.1.8";
sha256 = "0ijmw8adyf6fgaq4ixdj9v5lfg3cs9wyxhb96wxhfld0rjpppsm3";
}

4
pkgs/development/compilers/sbcl/2.1.9.nix Normal file
View File

@ -0,0 +1,4 @@
import ./common.nix {
version = "2.1.9";
sha256 = "189gjqzdz10xh3ybiy4ch1r98bsmkcb4hpnrmggd4y2g5kqnyx4y";
}

4
pkgs/development/interpreters/erlang/R24.nix
View File

@ -3,6 +3,6 @@
# How to obtain `sha256`:
# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
mkDerivation {
version = "24.0.6";
sha256 = "0z01hkzf2y6lz20s2vkn4q874lb6n6j00jkbgk4gg60rhrmq904z";
version = "24.1.1";
sha256 = "sha256-y5QtLCrYeMT4WdHkFngKv02CZ35eYZF3sjfI5OZNAH0=";
}

4
pkgs/development/python-modules/qcengine/default.nix
View File

@ -4,7 +4,7 @@
buildPythonPackage rec {
pname = "qcengine";
version = "0.19.0";
version = "0.20.0";
checkInputs = [
pytest-runner
@ -22,7 +22,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "0lz9r0fh31mcixdhayiwfc69cp8if9b3nkrk7gxdrb6vhbfrxhij";
sha256 = "5b405efb4b6ebe81e7f991b360126a4f61c2768ceed6027346e2b8ef3f57ef39";
};
doCheck = true;

4
pkgs/development/tools/doctl/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "doctl";
version = "1.63.1";
version = "1.64.0";
vendorSha256 = null;
@ -31,7 +31,7 @@ buildGoModule rec {
owner = "digitalocean";
repo = "doctl";
rev = "v${version}";
sha256 = "sha256-SSjTrCR5H+3nIKHKEfrQX917HjgpViS6H1RwmRe4coI=";
sha256 = "sha256-z5uPrhvCt2Sx88LxUPvDjul4AurVBF5WNnNBoJzU6KE=";
};
meta = with lib; {

36
pkgs/development/tools/neil/default.nix Normal file
View File

@ -0,0 +1,36 @@
{ lib
, stdenv
, fetchFromGitHub
, makeWrapper
, babashka
}:
stdenv.mkDerivation rec {
pname = "neil";
version = "0.0.13";
src = fetchFromGitHub {
owner = "babashka";
repo = "neil";
rev = "v${version}";
sha256 = "0jiyl0d39d8kk5bpangwxiy90vqipj4lgp8x84rh4z5m53knjpkd";
};
nativeBuildInputs = [ makeWrapper ];
dontBuild = true;
installPhase = ''
install -D neil $out/bin/neil
wrapProgram $out/bin/neil \
--prefix PATH : "${lib.makeBinPath [ babashka ]}"
'';
meta = with lib; {
homepage = "https://github.com/babashka/neil";
description = "A CLI to add common aliases and features to deps.edn-based projects";
license = licenses.mit;
platforms = babashka.meta.platforms;
maintainers = with maintainers; [ jlesquembre ];
};
}

12
pkgs/misc/vscode-extensions/default.nix
View File

@ -944,6 +944,18 @@ let
};
};
influxdata.flux = buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "influxdata";
name = "flux";
version = "0.6.5";
sha256 = "sha256-rKkZ7Sg8buryFtbIuKsrf3V3Rf7PP8hnbEIRFf4FvSM=";
};
meta = with lib; {
license = licenses.mit;
};
};
james-yu.latex-workshop = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "latex-workshop";

27
pkgs/servers/varnish/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkg-config, readline, libedit, coreutils
{ lib, stdenv, fetchurl, fetchpatch, pcre, pcre2, libxslt, groff, ncurses, pkg-config, readline, libedit, coreutils
, python3, makeWrapper }:
let
@ -16,8 +16,10 @@ let
nativeBuildInputs = with python3.pkgs; [ pkg-config docutils sphinx ];
buildInputs = [
pcre libxslt groff ncurses readline libedit makeWrapper python3
];
libxslt groff ncurses readline libedit makeWrapper python3
]
++ lib.optional (lib.versionOlder version "7") pcre
++ lib.optional (lib.versionAtLeast version "7") pcre2;
buildFlags = [ "localstatedir=/var/spool" ];
@ -45,11 +47,18 @@ let
in
{
varnish60 = common {
version = "6.0.7";
sha256 = "0njs6xpc30nc4chjdm4d4g63bigbxhi4dc46f4az3qcz51r8zl2a";
};
varnish65 = common {
version = "6.5.2";
sha256 = "041gc22h8cwsb8jw7zdv6yk5h8xg2q0g655m5zhi5jxq35f2sljx";
version = "6.0.8";
sha256 = "1zk83hfxgjq1d0n4zx86q3f05y9f2zc6a1miz1zcvfa052q4bljx";
};
varnish70 = (common {
version = "7.0.0";
sha256 = "11z0pa618lh925ih67wmp1gqk7i46l486j4spjy71g1n3w5mqylc";
}).overrideAttrs (oA: {
patches = [
(fetchpatch {
url = "https://github.com/varnishcache/varnish-cache/commit/20e007a5b17c1f68f70ab42080de384f9e192900.patch";
sha256 = "0vvihbjknb0skdv2ksn2lz89pwmn4f2rjmb6q65cvgnnjfj46s82";
})
];
});
}

10
pkgs/servers/varnish/packages.nix
View File

@ -1,4 +1,4 @@
{ callPackage, varnish60, varnish65, fetchFromGitHub }: {
{ callPackage, varnish60, varnish70, fetchFromGitHub }: {
varnish60Packages = rec {
varnish = varnish60;
digest = callPackage ./digest.nix {
@ -12,8 +12,8 @@
sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk";
};
};
varnish65Packages = rec {
varnish = varnish65;
varnish70Packages = rec {
varnish = varnish70;
digest = callPackage ./digest.nix {
inherit varnish;
version = "6.6";
@ -21,8 +21,8 @@
};
dynamic = callPackage ./dynamic.nix {
inherit varnish;
version = "2.3.1";
sha256 = "060vkba7jwcvx5704hh6ds0g0kfzpkdrg8548frvkrkz2s5j9y88";
version = "2.4.0";
sha256 = "1g53zblyxi1jivwppmpdqhi5xnzapsfib453sxyqbc5dfs7fijxr";
};
};
}

4
pkgs/tools/admin/lxd/default.nix
View File

@ -19,13 +19,13 @@ let
in
buildGoPackage rec {
pname = "lxd";
version = "4.18";
version = "4.19";
goPackagePath = "github.com/lxc/lxd";
src = fetchurl {
url = "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz";
sha256 = "19gkllahfd2fgz6vng5lrqx3bdrzaf9s874gzznvzvj9sgj0j3mn";
sha256 = "0mxbzg8xra0qpd3g3z1b230f0519h56x4jnn09lbbqa92p5zck3f";
};
postPatch = ''

24
pkgs/tools/networking/ssh-key-confirmer/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ lib, fetchFromGitHub, buildGoModule }:
buildGoModule rec {
pname = "ssh-key-confirmer";
version = "0.1";
src = fetchFromGitHub {
owner = "benjojo";
repo = "ssh-key-confirmer";
rev = "v${version}";
sha256 = "18whj9ds3rpjj5b71lbadi37ps99v13nnmkn3vq28x6cqfdy6w09";
};
vendorSha256 = "0v9yw6v8fj6dqgbkks4pnmvxx9b7jqdy7bn7ywddk396sbsxjiqa";
ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "Test ssh login key acceptance without having the private key";
homepage = "https://github.com/benjojo/ssh-key-confirmer";
license = licenses.mit;
maintainers = with maintainers; [ oxzi ];
};
}

6
pkgs/tools/text/difftastic/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "difftastic";
version = "0.9";
version = "0.10.1";
src = fetchFromGitHub {
owner = "wilfred";
repo = pname;
rev = version;
sha256 = "sha256-spncRJjROytGnIig6ujqHu0e/XBTN4dsJ3og4aIu+l8=";
sha256 = "12fcfwx56phs64yl94al2hkvss1km4n9wbrn2md7wfh1137jykbg";
};
cargoSha256 = "sha256-2xGwS4wjLQ7zmfZ2gMdlUAkjPDF6SmUaiX2j1KYy0vo=";
cargoSha256 = "0xnlnkdvsd2l7acdrkz918cjkk36k01rvvm0c8hnpx5327v6nsa8";
postPatch = ''
pushd vendor

1
pkgs/top-level/aliases.nix
View File

@ -969,6 +969,7 @@ mapAliases ({
vamp = { vampSDK = vamp-plugin-sdk; }; # added 2020-03-26
varnish62 = throw "varnish62 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-07-26
varnish63 = throw "varnish63 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-07-26
varnish65 = throw "varnish65 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-09-15
venus = throw "venus has been removed from nixpkgs, as it's unmaintained"; # added 2021-02-05
vdirsyncerStable = vdirsyncer; # added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168
vimbWrapper = vimb; # added 2015-01

16
pkgs/top-level/all-packages.nix
View File

@ -1845,6 +1845,8 @@ with pkgs;
ssh-import-id = python3Packages.callPackage ../tools/admin/ssh-import-id { };
ssh-key-confirmer = callPackage ../tools/networking/ssh-key-confirmer { };
sshchecker = callPackage ../tools/security/sshchecker { };
titaniumenv = callPackage ../development/mobile/titaniumenv { };
@ -7696,6 +7698,8 @@ with pkgs;
pwsafe = callPackage ../applications/misc/pwsafe { };
neil = callPackage ../development/tools/neil { };
niff = callPackage ../tools/package-management/niff { };
nifskope = libsForQt5.callPackage ../tools/graphics/nifskope { };
@ -10416,11 +10420,11 @@ with pkgs;
valum = callPackage ../development/web/valum { };
inherit (callPackages ../servers/varnish { })
varnish60 varnish65;
varnish60 varnish70;
inherit (callPackages ../servers/varnish/packages.nix { })
varnish60Packages varnish65Packages;
varnish60Packages varnish70Packages;
varnishPackages = varnish65Packages;
varnishPackages = varnish70Packages;
varnish = varnishPackages.varnish;
hitch = callPackage ../servers/hitch { };
@ -12609,7 +12613,7 @@ with pkgs;
sbcl_2_0_9 = callPackage ../development/compilers/sbcl/2.0.9.nix {};
sbcl_2_1_1 = callPackage ../development/compilers/sbcl/2.1.1.nix {};
sbcl_2_1_2 = callPackage ../development/compilers/sbcl/2.1.2.nix {};
sbcl_2_1_8 = callPackage ../development/compilers/sbcl/2.1.8.nix {};
sbcl_2_1_9 = callPackage ../development/compilers/sbcl/2.1.9.nix {};
sbcl = sbcl_2_1_2;
roswell = callPackage ../development/tools/roswell/default.nix { };
@ -14051,6 +14055,8 @@ with pkgs;
drush = callPackage ../development/tools/misc/drush { };
dwfv = callPackage ../applications/science/electronics/dwfv { };
dwz = callPackage ../development/tools/misc/dwz { };
easypdkprog = callPackage ../development/embedded/easypdkprog { };
@ -25958,7 +25964,7 @@ with pkgs;
mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { };
mediathekview = callPackage ../applications/video/mediathekview { };
mediathekview = callPackage ../applications/video/mediathekview { jre = adoptopenjdk-hotspot-bin-16; };
megapixels = callPackage ../applications/graphics/megapixels { };