Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2020-12-13 00:42:45 +00:00 committed by GitHub
commit 11d68e6adb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 129 additions and 144 deletions

View file

@ -66,7 +66,10 @@ in {
default = "${cfg.dataDir}/music";
defaultText = ''''${dataDir}/music'';
description = ''
The directory or NFS/SMB network share where mpd reads music from.
The directory or NFS/SMB network share where MPD reads music from. If left
as the default value this directory will automatically be created before
the MPD server starts, otherwise the sysadmin is responsible for ensuring
the directory exists with appropriate ownership and permissions.
'';
};
@ -75,7 +78,10 @@ in {
default = "${cfg.dataDir}/playlists";
defaultText = ''''${dataDir}/playlists'';
description = ''
The directory where mpd stores playlists.
The directory where MPD stores playlists. If left as the default value
this directory will automatically be created before the MPD server starts,
otherwise the sysadmin is responsible for ensuring the directory exists
with appropriate ownership and permissions.
'';
};
@ -94,8 +100,10 @@ in {
type = types.path;
default = "/var/lib/${name}";
description = ''
The directory where MPD stores its state, tag cache,
playlists etc.
The directory where MPD stores its state, tag cache, playlists etc. If
left as the default value this directory will automatically be created
before the MPD server starts, otherwise the sysadmin is responsible for
ensuring the directory exists with appropriate ownership and permissions.
'';
};
@ -185,36 +193,42 @@ in {
};
};
systemd.tmpfiles.rules = [
"d '${cfg.dataDir}' - ${cfg.user} ${cfg.group} - -"
"d '${cfg.playlistDirectory}' - ${cfg.user} ${cfg.group} - -"
];
systemd.services.mpd = {
after = [ "network.target" "sound.target" ];
description = "Music Player Daemon";
wantedBy = optional (!cfg.startWhenNeeded) "multi-user.target";
serviceConfig = {
User = "${cfg.user}";
ExecStart = "${pkgs.mpd}/bin/mpd --no-daemon /etc/mpd.conf";
ExecStartPre = pkgs.writeScript "mpd-start-pre" ''
#!${pkgs.runtimeShell}
set -euo pipefail
cat ${mpdConf} ${cfg.credentialsFile} > /etc/mpd.conf
'';
Type = "notify";
LimitRTPRIO = 50;
LimitRTTIME = "infinity";
ProtectSystem = true;
NoNewPrivileges = true;
ProtectKernelTunables = true;
ProtectControlGroups = true;
ProtectKernelModules = true;
RestrictAddressFamilies = "AF_INET AF_INET6 AF_UNIX AF_NETLINK";
RestrictNamespaces = true;
Restart = "always";
};
serviceConfig = mkMerge [
{
User = "${cfg.user}";
ExecStart = "${pkgs.mpd}/bin/mpd --no-daemon /etc/mpd.conf";
ExecStartPre = pkgs.writeScript "mpd-start-pre" ''
#!${pkgs.runtimeShell}
set -euo pipefail
cat ${mpdConf} ${cfg.credentialsFile} > /etc/mpd.conf
'';
Type = "notify";
LimitRTPRIO = 50;
LimitRTTIME = "infinity";
ProtectSystem = true;
NoNewPrivileges = true;
ProtectKernelTunables = true;
ProtectControlGroups = true;
ProtectKernelModules = true;
RestrictAddressFamilies = "AF_INET AF_INET6 AF_UNIX AF_NETLINK";
RestrictNamespaces = true;
Restart = "always";
}
(mkIf (cfg.dataDir == "/var/lib/${name}") {
StateDirectory = [ name ];
})
(mkIf (cfg.playlistDirectory == "/var/lib/${name}/playlists") {
StateDirectory = [ name "${name}/playlists" ];
})
(mkIf (cfg.musicDirectory == "/var/lib/${name}/music") {
StateDirectory = [ name "${name}/music" ];
})
];
};
environment.etc."mpd.conf" = {
mode = "0640";

View file

@ -5,10 +5,6 @@ with lib;
let
cfg = config.services.prometheus.exporters.py-air-control;
py-air-control-exporter-env = pkgs.python3.withPackages (pyPkgs: [
pyPkgs.py-air-control-exporter
]);
workingDir = "/var/lib/${cfg.stateDir}";
in
@ -45,18 +41,13 @@ in
StateDirectory = cfg.stateDir;
WorkingDirectory = workingDir;
ExecStart = ''
${py-air-control-exporter-env}/bin/python -c \
"from py_air_control_exporter import app; app.create_app().run( \
debug=False, \
port=${toString cfg.port}, \
host='${cfg.listenAddress}', \
)"
${pkgs.python3Packages.py-air-control-exporter}/bin/py-air-control-exporter \
--host ${cfg.deviceHostname} \
--protocol ${cfg.protocol} \
--listen-port ${toString cfg.port} \
--listen-address ${cfg.listenAddress}
'';
Environment = [
"PY_AIR_CONTROL_HOST=${cfg.deviceHostname}"
"PY_AIR_CONTROL_PROTOCOL=${cfg.protocol}"
"HOME=${workingDir}"
];
Environment = [ "HOME=${workingDir}" ];
};
};
}

View file

@ -27,10 +27,12 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
after = [ "mpd.service" ];
wantedBy = [ "default.target" ];
script = ''
mkdir -p ${musicDirectory} && chown -R ${user}:${group} ${musicDirectory}
cp ${track} ${musicDirectory}
chown ${user}:${group} ${musicDirectory}/$(basename ${track})
'';
serviceConfig = {
User = user;
Group = group;
};
};
mkServer = { mpd, musicService, }:

View file

@ -10,13 +10,13 @@
mkDerivation rec {
pname = "goldendict";
version = "2020-05-27";
version = "2020-12-09";
src = fetchFromGitHub {
owner = "goldendict";
repo = pname;
rev = "ec40c1dcfde6df1dc7950443b46ae22c283b1e52";
sha256 = "1zmnwwnpnrqfyf7vmmh38r95q2fl4cqzbkp69bcwkr0xc80wgyz7";
rev = "261e45a5d79f9df2fbc050292410bed0f4ef3132";
sha256 = "01pny06d4cmwf998hpqd7xx7mccbbasb8js1bv3rkdi1ljg01f7n";
};
patches = [

View file

@ -71,7 +71,6 @@ stdenv.mkDerivation rec {
'';
homepage = "http://www.gpsbabel.org/";
license = licenses.gpl2Plus;
maintainers = [ maintainers.rycee ];
platforms = platforms.all;
};
}

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "compactor";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "dns-stats";
repo = pname;
rev = version;
sha256 = "0x5rwbv0ndf9zcvnsbd78ic6shh9hd0bh3gh0lzz9wlb99lslbkk";
sha256 = "0qykdnwi2q9sajkkc2sl5f00lvxjfymqjzqm0limsziykanh87c0";
};
# cbor-diag, cddl and wireshark-cli are only used for tests.

View file

@ -60,7 +60,7 @@ in mkYarnPackage rec {
# https://github.com/vector-im/riot-desktop/blob/develop/package.json
desktopItem = makeDesktopItem {
name = "element-desktop";
exec = executableName;
exec = "${executableName} %u";
icon = "element";
desktopName = "Element (Riot)";
genericName = "Matrix Client";
@ -68,6 +68,7 @@ in mkYarnPackage rec {
categories = "Network;InstantMessaging;Chat;";
extraEntries = ''
StartupWMClass=element
MimeType=x-scheme-handler/element;
'';
};

View file

@ -46,6 +46,11 @@ mkDerivation rec {
url = "https://github.com/mapmapteam/mapmap/pull/519/commits/22eeee59ba7de6de7b73ecec3b0ea93bdc7f04e8.patch";
sha256 = "0is905a4lf9vvl5b1n4ky6shrnbs5kz9mlwfk78hrl4zabfmcl5l";
})
# fix build with libsForQt515
(fetchpatch {
url = "https://github.com/mapmapteam/mapmap/pull/518/commits/ac49acc1e2ec839832b86838e93a8c13030affeb.patch";
sha256 = "sha256-tSLbyIDv5mSejnw9oru5KLAyQqjgJLLREKQomEUcGt8=";
})
];
installPhase = ''

View file

@ -11,7 +11,7 @@
}:
let
inherit (stdenv.lib) optionals optional optionalString;
inherit (stdenv.lib) optionals optional optionalString concatStringsSep;
inherit (darwin.apple_sdk.frameworks) Security;
llvmSharedForBuild = pkgsBuildBuild.llvm_10.override { enableSharedLibraries = true; };
@ -72,7 +72,14 @@ in stdenv.mkDerivation rec {
"--enable-vendor"
"--build=${rust.toRustTargetSpec stdenv.buildPlatform}"
"--host=${rust.toRustTargetSpec stdenv.hostPlatform}"
"--target=${rust.toRustTargetSpec stdenv.targetPlatform}"
# std is built for all platforms in --target. When building a cross-compiler
# we need to add the host platform as well so rustc can compile build.rs
# scripts.
"--target=${concatStringsSep "," ([
(rust.toRustTargetSpec stdenv.targetPlatform)
] ++ optionals (stdenv.hostPlatform != stdenv.targetPlatform) [
(rust.toRustTargetSpec stdenv.hostPlatform)
])}"
"${setBuild}.cc=${ccForBuild}"
"${setHost}.cc=${ccForHost}"

View file

@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "5" "7" "";
jruby = stdenv.mkDerivation rec {
pname = "jruby";
version = "9.2.13.0";
version = "9.2.14.0";
src = fetchurl {
url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
sha256 = "0n5glz6xm3skrfihzn3g5awdxpjsqn2k8k46gv449rk2l50w5a3k";
sha256 = "1dg0fz9b8m1k0sypvpxnf4xjqwc0pyy35xw4rsg4a7pha4jkprrj";
};
buildInputs = [ makeWrapper ];

View file

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "cgal";
version = "5.1";
version = "5.1.1";
src = fetchFromGitHub {
owner = "CGAL";
repo = "releases";
rev = "CGAL-${version}";
sha256 = "0rcv86hn5aqna7vr9nfk4np778qjr7l3742v58w6qw0z4y6l1km0";
sha256 = "1h4kj37zh60zap1gvpkvcl1b1lbdvav959gd59pq2c33i0ziagf6";
};
# note: optional component libCGAL_ImageIO would need zlib and opengl;

View file

@ -298,10 +298,10 @@ in rec {
en = buildOfficialDict {
language = "en";
version = "2019.10.06-0";
version = "2020.12.07-0";
fullName = "English";
filename = "aspell6";
sha256 = "1zai9wrqwgb9z9vfgb22qhrvxvg73jg0ix44j1khm2f6m96lncr4";
sha256 = "1cwzqkm8gr1w51rpckwlvb43sb0b5nbwy7s8ns5vi250515773sc";
};
eo = buildOfficialDict {

View file

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }:
let
version = "4.0.2";
version = "4.1.0";
libPath = stdenv.lib.makeLibraryPath [ oracle-instantclient.lib ];
in stdenv.mkDerivation {
@ -13,7 +13,7 @@ in stdenv.mkDerivation {
owner = "oracle";
repo = "odpi";
rev = "v${version}";
sha256 = "1g2wdchlwdihqj0ynx58nwyrpncxanghlnykgir97p0wimg3hnxl";
sha256 = "1zk08z74q7njbj329xfy8aszphj27rqlkhsyglai60wfzl6mcf4x";
};
nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;

View file

@ -5,13 +5,13 @@
# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
stdenv.mkDerivation rec {
pname = "oneDNN";
version = "1.7";
version = "2.0";
src = fetchFromGitHub {
owner = "oneapi-src";
repo = "oneDNN";
rev = "v${version}";
sha256 = "15kanz3zflmxr355dhny4rdycq0ni9iz42vvlblzc5lmj39n84fj";
sha256 = "0r50r9bz7mdhy9z9zdy5m2nhi8r6kqsn70q2rfwylm1vppmhwkfq";
};
outputs = [ "out" "dev" "doc" ];

View file

@ -22,11 +22,11 @@
buildPythonPackage rec {
pname = "chalice";
version = "1.21.5";
version = "1.21.6";
src = fetchPypi {
inherit pname version;
sha256 = "73149f6a71aa1310f3d000110a915164a72f1d2dc7cd4d37d18a952b0e0c78ac";
sha256 = "b7a17583e0553caa0e44d23186b4aad069f7665c24a473104d1f04e62cc4cb07";
};
checkInputs = [ watchdog pytest hypothesis mock ];

View file

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "deform";
version = "2.0.14";
version = "2.0.15";
src = fetchPypi {
inherit pname version;
sha256 = "35d9acf144245772a70d05bd24b8263e8cd284f0d564011e8bf331d6150acfc7";
sha256 = "1e912937650c1dbb830079dd9c039950762a230223a567740fbf1b23f1090367";
};
postPatch = ''

View file

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "genanki";
version = "0.10.0";
version = "0.10.1";
src = fetchPypi {
inherit pname version;
sha256 = "b4049621469be115bb13b6ff90994c4c68ef9e7e72e6a98d4a3ada629f163a11";
sha256 = "ced1ddcaecc37289c65c26affb20027705e3821e692327e354e0d5b9b0fd8446";
};
propagatedBuildInputs = [

View file

@ -2,9 +2,9 @@
buildGoModule rec {
name = "drone.io-${version}";
version = "1.9.0";
version = "1.10.0";
vendorSha256 = "0idf11sr417lxcjryplgb87affr6lgzxazzlyvk0y40hp8zbhwsx";
vendorSha256 = "sha256-cKHX/GnvGELQBfoo0/1UmDQ4Z66GGnnHG7+1CzjinL0=";
doCheck = false;
@ -12,7 +12,7 @@ buildGoModule rec {
owner = "drone";
repo = "drone";
rev = "v${version}";
sha256 = "1lsyd245fr1f74rpccvvw41h5g75b79afrb8g589bj13ggjav0xy";
sha256 = "sha256-12Jac+mXWdUX8gWvmpdO9ROv7Bi0YzvyqnNDVNJOr34=";
};
meta = with stdenv.lib; {

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "just";
version = "0.7.1";
version = "0.8.3";
src = fetchFromGitHub {
owner = "casey";
repo = pname;
rev = "v${version}";
sha256 = "07fjixz8y5rxfwpyr1kiimnn27jhc20gacd17i0yvfcpy5qf8z5p";
sha256 = "4B72VYQ+HBvhGQNl577DuZpvWNIvv/6fejRQtVKtFKY=";
};
cargoSha256 = "1zn0kiqi8p25lscjd661gczay631nwzadl36cfzqnbww6blayy1j";
cargoSha256 = "uOOpDRWPSoH49NTu82rDxxDR/2icoe4ECxVQb/J/45w=";
nativeBuildInputs = [ installShellFiles ];
@ -38,9 +38,9 @@ rustPlatform.buildRustPackage rec {
-e "s@#!/usr/bin/env bash@#!${bash}/bin/sh@g"
'';
# Skip "edit" when running "cargo test",
# since this test case needs "cat".
checkFlagsArray = [ "--skip=edit" ];
# Skip "edit" when running "cargo test", since this test case needs "cat".
# Skip "choose" when running "cargo test", since this test case needs "fzf".
checkFlags = [ "--skip=choose" "--skip=edit" ];
meta = with stdenv.lib; {
description = "A handy way to save and run project-specific commands";

View file

@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "skaffold";
version = "1.17.1";
version = "1.17.2";
goPackagePath = "github.com/GoogleContainerTools/skaffold";
subPackages = ["cmd/skaffold"];
@ -19,7 +19,7 @@ buildGoPackage rec {
owner = "GoogleContainerTools";
repo = "skaffold";
rev = "v${version}";
sha256 = "1q1rzqsga728cjv89lpgnwjb22azlmkffki9m0q21r1njzc3w74h";
sha256 = "1sn4pmikap93kpdgcalgb3nam7zp60ck6wmynsv8dnzihrr7ycm3";
};
nativeBuildInputs = [ installShellFiles ];

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "flyctl";
version = "0.0.153";
version = "0.0.154";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
sha256 = "1an6j4bv9ib5rn78dbn8h1pdkw3fcd3fdrymhvr6909pvcz7bbgy";
sha256 = "0hf33jm0ph4a79jg9irz0ynvdyah942cm5hb6j04hmg24x1037jm";
};
preBuild = ''

View file

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, buildLinux, ... } @ args:
let
version = "5.9.13";
version = "5.9.14";
in
buildLinux (args // {
@ -13,7 +13,7 @@ buildLinux (args // {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${version}-zen1";
sha256 = "13sv794srmf1p13pb07pl6c4fxw2f1vjkxj8dkdgfhy03b0iasa2";
sha256 = "1b8pm80z49d7qk9mvdf9w3hih34pilqr1zjk110q5im1kdz81zrg";
};
extraMeta = {

View file

@ -1,13 +1,13 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "thanos";
version = "0.17.1";
version = "0.17.2";
src = fetchFromGitHub {
rev = "v${version}";
owner = "thanos-io";
repo = "thanos";
sha256 = "07814hk6nmvvkf7xklrin24vp17wm6nby358gk20ri4man822q8c";
sha256 = "1zxx6vyf0fhrz8yqnlakszwziyq20k3kprshh414qxdpqfj9jax6";
};
vendorSha256 = "1j3gnzas0hpb5dljf5m97nw2v4r1bp3l99z36gbqkm6lqzr6hqk8";

View file

@ -1,13 +1,13 @@
{ stdenv, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub, installShellFiles }:
stdenv.mkDerivation rec {
pname = "dehydrated";
version = "0.6.5";
version = "0.7.0";
src = fetchFromGitHub {
owner = "lukas2511";
repo = "dehydrated";
rev = "v${version}";
sha256 = "14k7ykry16zp09i0bqb5pqaclvnjcb6p3x8knm9v5q0bdvlplkjv";
sha256 = "09jhmkjvnj98zbf92qwdr5rr7pc6v63xzyk2fbi177r7szb2yg09";
};
nativeBuildInputs = [ makeWrapper installShellFiles ];

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "eksctl";
version = "0.33.0";
version = "0.34.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
sha256 = "1rhiak1264czcww5ayz35am9nsn5xa3kjd90szssg46ngxisd61x";
sha256 = "1n2mvnis6r5vpb60jlb3c84sllsbvy93gzsds54igsp6l3zngq19";
};
vendorSha256 = "1s9xhq1k67gf9saada1dr95n1sd265hndkxz0alqw6dm2vdp3n2q";
vendorSha256 = "0ggxilp44mm81b8hrxyb7642vy2q1109yz619z97mgvk0drhkhc0";
doCheck = false;

View file

@ -18,13 +18,13 @@ let
in
buildGoPackage rec {
pname = "lxd";
version = "4.8";
version = "4.9";
goPackagePath = "github.com/lxc/lxd";
src = fetchurl {
url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "0zrk6l2wwc2hmzwd9fayq54qxshp9pin638dihsyp324f5n0jkyy";
sha256 = "0sq3avgsrdzkbsil0xsri60xxi0bzf4l6w43w23lbhacrby1spj4";
};
postPatch = ''

View file

@ -1,11 +0,0 @@
diff --color -ur a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt 2020-12-10 10:39:37.775694976 +0100
+++ b/CMakeLists.txt 2020-12-10 10:40:41.984575938 +0100
@@ -127,6 +127,7 @@
add_definitions(-D__STDC_LIMIT_MACROS)
add_definitions(-D__STDC_CONSTANT_MACROS)
add_definitions(-D__STDC_FORMAT_MACROS)
+add_definitions(-DSPDLOG_FMT_EXTERNAL)
if(MINGW)
add_definitions(-DWINVER=0x0602)
add_definitions(-D_WIN32_WINNT=0x0602)

View file

@ -3,7 +3,7 @@
, fetchpatch
, cmake
, makeWrapper
, python2
, python3
, db
, fuse
, asciidoc
@ -17,50 +17,27 @@
, pam
, spdlog
, fmt
, systemdMinimal
, zlib # optional
}:
stdenv.mkDerivation rec {
pname = "lizardfs";
version = "3.12.0";
version = "3.13.0-rc3";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "0zk73wmx82ari3m2mv0zx04x1ggsdmwcwn7k6bkl5c0jnxffc4ax";
rev = version;
sha256 = "sha256-rgaFhJvmA1RVDL4+vQLMC0GrdlgUlvJeZ5/JJ67C20Q=";
};
patches = [
# Use system-provided spdlog instead of downloading an old one (next two patches)
(fetchpatch {
url = "https://salsa.debian.org/debian/lizardfs/raw/d003c371/debian/patches/system-spdlog.patch";
sha256 = "1znpqqzb0k5bb7s4d7abfxzn5ry1khz8r76sb808c95cpkw91a9i";
})
(fetchpatch {
url = "https://salsa.debian.org/debian/lizardfs/raw/bfcd5bcf/debian/patches/spdlog.patch";
sha256 = "0j44rb816i6kfh3y2qdha59c4ja6wmcnlrlq29il4ybxn42914md";
})
# Fix https://github.com/lizardfs/lizardfs/issues/655
# (Remove upon update to 3.13)
(fetchpatch {
url = "https://github.com/lizardfs/lizardfs/commit/5d20c95179be09241b039050bceda3c46980c004.patch";
sha256 = "185bfcz2rjr4cnxld2yc2nxwzz0rk4x1fl1sd25g8gr5advllmdv";
})
# Add SPDLOG_FMT_EXTERNAL flag to disable spdlog from using bundled fmt
# Would use https://github.com/lizardfs/lizardfs/commit/31b0cd40f84ee75f99643ad19122061e3d6fb6cc.patch
# if it didn't failed to patch
./cmake-def-spdlog-fmt-external.patch
];
nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
buildInputs =
[ db fuse asciidoc libxml2 libxslt docbook_xml_dtd_412 docbook_xsl
zlib boost judy pam spdlog fmt python2
buildInputs = [
db fuse asciidoc libxml2 libxslt docbook_xml_dtd_412 docbook_xsl
zlib boost judy pam spdlog fmt python3 systemdMinimal
];
cmakeFlags = [ "-DSPDLOG_FMT_EXTERNAL=ON" ];
meta = with stdenv.lib; {
homepage = "https://lizardfs.com";

View file

@ -18,11 +18,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2020.12.09";
version = "2020.12.12";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "0qdris00jf6lb9q5qi3f5cyxya5a0sa8yqr6l204wns5px3n7iqa";
sha256 = "0iv4l78ylzx8q6myv4v7xq6r5y0hacz6l30bqk1szncfikvfc3cf";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];

View file

@ -21310,7 +21310,7 @@ in
gnuradio = gnuradio3_7-unwrapped;
};
goldendict = libsForQt514.callPackage ../applications/misc/goldendict {
goldendict = libsForQt5.callPackage ../applications/misc/goldendict {
inherit (darwin) libiconv;
};
@ -21740,11 +21740,11 @@ in
gosmore = callPackage ../applications/misc/gosmore { };
gpsbabel = libsForQt514.callPackage ../applications/misc/gpsbabel {
gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel {
inherit (darwin) IOKit;
};
gpsbabel-gui = libsForQt514.callPackage ../applications/misc/gpsbabel/gui.nix { };
gpsbabel-gui = libsForQt5.callPackage ../applications/misc/gpsbabel/gui.nix { };
gpscorrelate = callPackage ../applications/misc/gpscorrelate { };
@ -22315,7 +22315,7 @@ in
openjpeg = openjpeg_1;
};
krusader = libsForQt514.callPackage ../applications/misc/krusader { };
krusader = libsForQt5.callPackage ../applications/misc/krusader { };
ksuperkey = callPackage ../tools/X11/ksuperkey { };
@ -22589,7 +22589,7 @@ in
mandelbulber = libsForQt5.callPackage ../applications/graphics/mandelbulber { };
mapmap = libsForQt514.callPackage ../applications/video/mapmap { };
mapmap = libsForQt5.callPackage ../applications/video/mapmap { };
marathonctl = callPackage ../tools/virtualization/marathonctl { } ;