Merge remote-tracking branch 'origin/master' into staging-next
This commit is contained in:
Martin Weinelt
commit
85713b7e37
21 changed files with 229 additions and 203 deletions
|
|
@ -1,17 +1,29 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub }:
|
||||
{ lib, rustPlatform, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "genact";
|
||||
version = "1.2.0";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "svenstaro";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-POOXawhxrPT2UgbSZE3r0br7cqJ0ao7MpycrPYa/oCc=";
|
||||
sha256 = "sha256-MB/i1jCxoGE8cPF+NE8aS7kF7ZsGb4+OyLcPcGp1hwI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-2c34YarMFw2CK+7zn41GL5tXfXfnw3NvGtgSlPH5d64=";
|
||||
cargoSha256 = "sha256-OBGJIR3REeMxHQu3ovEKSZZ8QNlhl/5jvWbR5OdsRTQ=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
$out/bin/genact --print-manpage > genact.1
|
||||
installManPage genact.1
|
||||
|
||||
installShellCompletion --cmd genact \
|
||||
--bash <($out/bin/genact --print-completions bash) \
|
||||
--fish <($out/bin/genact --print-completions fish) \
|
||||
--zsh <($out/bin/genact --print-completions zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A nonsense activity generator";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, mkDerivation, fetchFromGitHub, pkg-config
|
||||
, qmake, qttools, kirigami2, qtquickcontrols2, qtlocation
|
||||
, libosmscout, valhalla, libpostal, osrm-backend, protobuf
|
||||
, libmicrohttpd_0_9_70, sqlite, marisa, kyotocabinet, boost
|
||||
, libmicrohttpd, sqlite, marisa, kyotocabinet, boost
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -27,7 +27,7 @@ mkDerivation rec {
|
|||
nativeBuildInputs = [ qmake pkg-config qttools ];
|
||||
buildInputs = [
|
||||
kirigami2 qtquickcontrols2 qtlocation
|
||||
valhalla libosmscout osrm-backend libmicrohttpd_0_9_70
|
||||
valhalla libosmscout osrm-backend libmicrohttpd
|
||||
libpostal sqlite marisa kyotocabinet boost protobuf date
|
||||
];
|
||||
|
||||
|
|
|
|||
81
pkgs/applications/misc/parsec/bin.nix
Normal file
81
pkgs/applications/misc/parsec/bin.nix
Normal file
|
|
@ -0,0 +1,81 @@
|
|||
{ stdenvNoCC, stdenv
|
||||
, lib
|
||||
, dpkg, autoPatchelfHook, makeWrapper
|
||||
, fetchurl
|
||||
, alsa-lib, openssl, udev
|
||||
, libglvnd
|
||||
, libX11, libXcursor, libXi, libXrandr
|
||||
, libpulseaudio
|
||||
, libva
|
||||
, ffmpeg
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "parsec-bin";
|
||||
version = "150_28";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://web.archive.org/web/20220622215230id_/https://builds.parsecgaming.com/package/parsec-linux.deb";
|
||||
sha256 = "1hfdzjd8qiksv336m4s4ban004vhv00cv2j461gc6zrp37s0fwhc";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
|
||||
dpkg-deb -x $src .
|
||||
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ dpkg autoPatchelfHook makeWrapper ];
|
||||
|
||||
buildInputs = [
|
||||
stdenv.cc.cc # libstdc++
|
||||
libglvnd
|
||||
libX11
|
||||
];
|
||||
|
||||
runtimeDependenciesPath = lib.makeLibraryPath [
|
||||
stdenv.cc.cc
|
||||
libglvnd
|
||||
openssl
|
||||
udev
|
||||
alsa-lib
|
||||
libpulseaudio
|
||||
libva
|
||||
ffmpeg
|
||||
libX11
|
||||
libXcursor
|
||||
libXi
|
||||
libXrandr
|
||||
];
|
||||
|
||||
prepareParsec = ''
|
||||
if [[ ! -e "$HOME/.parsec/appdata.json" ]]; then
|
||||
mkdir -p "$HOME/.parsec"
|
||||
cp --no-preserve=mode,ownership,timestamps ${placeholder "out"}/share/parsec/skel/* "$HOME/.parsec/"
|
||||
fi
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir $out
|
||||
mv usr/* $out
|
||||
|
||||
wrapProgram $out/bin/parsecd \
|
||||
--prefix LD_LIBRARY_PATH : "$runtimeDependenciesPath" \
|
||||
--run "$prepareParsec"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://parsecgaming.com/";
|
||||
description = "Remote streaming service client";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ arcnmx ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "parsecd";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, stdenvGcc6, lib
|
||||
, fetchFromGitHub, cmake, libmicrohttpd_0_9_70, openssl
|
||||
{ stdenv, lib, fetchpatch
|
||||
, fetchFromGitHub, cmake, libmicrohttpd, openssl
|
||||
, opencl-headers, ocl-icd, hwloc
|
||||
, devDonationLevel ? "0.0"
|
||||
, openclSupport ? true
|
||||
|
|
@ -18,11 +18,18 @@ stdenv.mkDerivation rec {
|
|||
|
||||
NIX_CFLAGS_COMPILE = "-O3";
|
||||
|
||||
patches = [ (fetchpatch {
|
||||
name = "fix-libmicrohttpd-0-9-71.patch";
|
||||
url = "https://github.com/fireice-uk/xmr-stak/compare/06e08780eab54dbc025ce3f38c948e4eef2726a0...8adb208987f5881946992ab9cd9a45e4e2a4b870.patch";
|
||||
excludes = [ "CMakeLists.txt.user" ];
|
||||
hash = "sha256-Yv0U5EO1P5eikn1fKvUXEwemoUIjjeTjpP9p5J8pbC0=";
|
||||
}) ];
|
||||
|
||||
cmakeFlags = [ "-DCUDA_ENABLE=OFF" ]
|
||||
++ lib.optional (!openclSupport) "-DOpenCL_ENABLE=OFF";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ libmicrohttpd_0_9_70 openssl hwloc ]
|
||||
buildInputs = [ libmicrohttpd openssl hwloc ]
|
||||
++ lib.optionals openclSupport [ opencl-headers ocl-icd ];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -45,9 +45,9 @@
|
|||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "106.0.5249.91",
|
||||
"sha256": "16jlwzlfqdhhyajsxxrdfcqmh76ds8g1w4xd5mz3bdbd81mljh2p",
|
||||
"sha256bin64": "1cfhsar79f319417cx4blcg5hk7b7ix45r7vhrbbwla18p0jij5y",
|
||||
"version": "106.0.5249.103",
|
||||
"sha256": "0k2f3hc6mdmwzw9zzwcv6pnpibdz47a3xxkhfcvdki5gbag6cpr2",
|
||||
"sha256bin64": "0bg6d9fv3ha7iql17nj8h22klbs3ls2nlvabczhh067mh3fpzf5x",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-08-11",
|
||||
|
|
@ -56,8 +56,8 @@
|
|||
"sha256": "13zks2z65kg7fzzsysq4mswd4bhhy3h7ycdrpxfilcvixx2n2gac"
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "106.0.5249.91-1",
|
||||
"sha256": "1cih72ay2gr9xjwwa8iw0wmpmfs4xm4200c4z04v7vi9sxadxnrd"
|
||||
"rev": "106.0.5249.103-1",
|
||||
"sha256": "00acfq9hsdjqqlxddr9lr45l4372mpqxj717qpf78z8iyrccjm23"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "clusterctl";
|
||||
version = "1.2.2";
|
||||
version = "1.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "cluster-api";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-U9U1r74E4ryc8zUb1EogfBT57kfsd89i7DWO05tnQw4=";
|
||||
sha256 = "sha256-QVzhRaNLFhH+5x+/X/Nc3bW/09txurhVd0yDU9LYhAo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-jM5qU/KaBf+CzKKOuVXjawn/QqwrCjXKaQFFomEPndg=";
|
||||
vendorSha256 = "sha256-jPIrUW4el8sAO+4j20qMYVXqvov6Ac0cENd7gOrYj+U=";
|
||||
|
||||
subPackages = [ "cmd/clusterctl" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "talosctl";
|
||||
version = "1.2.3";
|
||||
version = "1.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siderolabs";
|
||||
repo = "talos";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BCbbQQUk3iJJQhjkwlSAVz/SbVPvZGhGHwXSPgCPBHg=";
|
||||
sha256 = "sha256-nAT9tn/YfivM25xBL3POgdAF87MB/J2HQfcFOeCEj2o=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-jUVPJ1mq9pMJGwS/0nBv9hsXotiqUksbKChjegF7KRk=";
|
||||
vendorSha256 = "sha256-b9F7P6WRdJywRNQdFY+SJqYxic2W/HrIEYhvCLo3Lok=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
meta = with lib; {
|
||||
broken = true; # unmaintained and not compatible with current Tox API.
|
||||
homepage = "https://github.com/jin-eld/tox-prpl";
|
||||
description = "Tox plugin for Pidgin / libpurple";
|
||||
license = licenses.gpl3;
|
||||
|
|
|
|||
|
|
@ -1,27 +1,18 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch, libsodium, ncurses, curl
|
||||
{ lib, stdenv, fetchFromGitHub, libsodium, ncurses, curl
|
||||
, libtoxcore, openal, libvpx, freealut, libconfig, pkg-config, libopus
|
||||
, qrencode, gdk-pixbuf, libnotify }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "toxic";
|
||||
version = "0.11.1";
|
||||
version = "0.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Tox";
|
||||
repo = "toxic";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5jLXXI+IMrYa7ZtdMjJrah1zB5TJ3GdHfvcMd1TYE4E=";
|
||||
sha256 = "sha256-BabRY9iu5ccEXo5POrWkWaIWAeQU4MVlMK8I+Iju6aQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pending for upstream inclusion fix for ncurses-6.3 compatibility.
|
||||
(fetchpatch {
|
||||
name = "ncurses-6.3.patch";
|
||||
url = "https://github.com/JFreegman/toxic/commit/41e93adbdbd56db065166af5a6676a7996e9e451.patch";
|
||||
sha256 = "sha256-LYEseB5FmXFNifa1RZUxhkXeWlkEEMm3ASD55IoUPa0=";
|
||||
})
|
||||
];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)"];
|
||||
installFlags = [ "PREFIX=$(out)"];
|
||||
|
||||
|
|
@ -32,10 +23,10 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
nativeBuildInputs = [ pkg-config libconfig ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = with lib; src.meta // {
|
||||
description = "Reference CLI for Tox";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ ehmry ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -126,8 +126,8 @@ let
|
|||
# echo hello world
|
||||
# ''
|
||||
writeFish = makeScriptWriter {
|
||||
interpreter = "${pkgs.fish}/bin/fish";
|
||||
check = "${pkgs.fish}/bin/fish --no-execute"; # syntax check only
|
||||
interpreter = "${pkgs.fish}/bin/fish --no-config";
|
||||
check = "${pkgs.fish}/bin/fish --no-config --no-execute"; # syntax check only
|
||||
};
|
||||
|
||||
# Like writeScriptBin but the first line is a shebang to fish
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{ callPackage, fetchurl }:
|
||||
|
||||
callPackage ./generic.nix ( rec {
|
||||
version = "0.9.70";
|
||||
version = "0.9.69";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz";
|
||||
sha256 = "01vkjy89b1ylmh22dy5yza2r414nfwcfixxh3v29nvzrjv9s7l4h";
|
||||
sha256 = "sha256-+5trFIt4dJPmN9MINYhxHmXLy3JvoCzuLNVDxd4n434=";
|
||||
};
|
||||
})
|
||||
|
|
@ -1,4 +1,8 @@
|
|||
{ lib, stdenv, libgcrypt, curl, gnutls, pkg-config, libiconv, libintl, version, src }:
|
||||
{ lib, stdenv, libgcrypt, curl, gnutls, pkg-config, libiconv, libintl, version, src, meta ? {} }:
|
||||
|
||||
let
|
||||
meta_ = meta;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmicrohttpd";
|
||||
|
|
@ -30,5 +34,5 @@ stdenv.mkDerivation rec {
|
|||
|
||||
maintainers = with maintainers; [ eelco vrthra fpletz ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
} // meta_;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,60 +1,48 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, msgpack
|
||||
{ lib, stdenv, fetchurl, cmake, libsodium, ncurses, libopus, msgpack
|
||||
, libvpx, check, libconfig, pkg-config }:
|
||||
|
||||
let
|
||||
generic = { version, sha256 }:
|
||||
stdenv.mkDerivation {
|
||||
pname = "libtoxcore";
|
||||
inherit version;
|
||||
let buildToxAV = !stdenv.isAarch32;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "libtoxcore";
|
||||
version = "0.2.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TokTok";
|
||||
repo = "c-toxcore";
|
||||
rev = "v${version}";
|
||||
inherit sha256;
|
||||
src =
|
||||
# We need the prepared sources tarball.
|
||||
fetchurl {
|
||||
url =
|
||||
"https://github.com/TokTok/c-toxcore/releases/download/v${version}/c-toxcore-${version}.tar.gz";
|
||||
sha256 = "sha256-8pQFN5mIY1k+KLxqa19W8JZ19s2KKDJre8MbSDbAiUI=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_NTOX=ON"
|
||||
"-DDHT_BOOTSTRAP=ON"
|
||||
"-DBOOTSTRAP_DAEMON=ON"
|
||||
];
|
||||
cmakeFlags =
|
||||
[ "-DBUILD_NTOX=ON" "-DDHT_BOOTSTRAP=ON" "-DBOOTSTRAP_DAEMON=ON" ]
|
||||
++ lib.optional buildToxAV "-DMUST_BUILD_TOXAV=ON";
|
||||
|
||||
buildInputs = [
|
||||
libsodium msgpack ncurses libconfig
|
||||
] ++ lib.optionals (!stdenv.isAarch32) [
|
||||
libopus libvpx
|
||||
];
|
||||
buildInputs = [
|
||||
libsodium msgpack ncurses libconfig
|
||||
] ++ lib.optionals buildToxAV [
|
||||
libopus libvpx
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
doCheck = false; # hangs, tries to access the net?
|
||||
checkInputs = [ check ];
|
||||
doCheck = true;
|
||||
checkInputs = [ check ];
|
||||
|
||||
postFixup =''
|
||||
sed -i $out/lib/pkgconfig/*.pc \
|
||||
-e "s|^libdir=.*|libdir=$out/lib|" \
|
||||
-e "s|^includedir=.*|includedir=$out/include|"
|
||||
'';
|
||||
postInstall = ''
|
||||
substituteInPlace $out/lib/pkgconfig/toxcore.pc \
|
||||
--replace '=''${prefix}/' '=' \
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "P2P FOSS instant messaging application aimed to replace Skype";
|
||||
homepage = "https://tox.chat";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
};
|
||||
'';
|
||||
# We might be getting the wrong pkg-config file anyway:
|
||||
# https://github.com/TokTok/c-toxcore/issues/2334
|
||||
|
||||
in {
|
||||
libtoxcore_0_1 = generic {
|
||||
version = "0.1.11";
|
||||
sha256 = "1fya5gfiwlpk6fxhalv95n945ymvp2iidiyksrjw1xw95fzsp1ij";
|
||||
};
|
||||
|
||||
libtoxcore_0_2 = generic {
|
||||
version = "0.2.17";
|
||||
sha256 = "sha256-SOI6QKOSt/EK9JDrSaV6CrD5sx8aYb5ZL3StYq8u/Dg=";
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "P2P FOSS instant messaging application aimed to replace Skype";
|
||||
homepage = "https://tox.chat";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ peterhoeg ehmry ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,58 +0,0 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, libsodium, ncurses, libopus
|
||||
, libvpx, check, libconfig, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "tox-core-new";
|
||||
version = "unstable-2016-07-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "irungentoo";
|
||||
repo = "toxcore";
|
||||
rev = "755f084e8720b349026c85afbad58954cb7ff1d4";
|
||||
sha256 = "0ap1gvlyihnfivv235dbrgsxsiiz70bhlmlr5gn1027w3h5kqz8w";
|
||||
};
|
||||
|
||||
NIX_LDFLAGS = "-lgcc_s";
|
||||
|
||||
postPatch = ''
|
||||
# within Nix chroot builds, localhost is unresolvable
|
||||
sed -i -e '/DEFTESTCASE(addr_resolv_localhost)/d' \
|
||||
auto_tests/network_test.c
|
||||
# takes WAAAY too long (~10 minutes) and would timeout
|
||||
sed -i -e '/DEFTESTCASE[^(]*(many_clients\>/d' \
|
||||
auto_tests/tox_test.c
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-libsodium-headers=${libsodium.dev}/include"
|
||||
"--with-libsodium-libs=${libsodium.out}/lib"
|
||||
"--enable-ntox"
|
||||
"--enable-daemon"
|
||||
];
|
||||
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [
|
||||
libsodium ncurses check libconfig
|
||||
] ++ lib.optionals (!stdenv.isAarch32) [
|
||||
libopus
|
||||
];
|
||||
|
||||
propagatedBuildInputs = lib.optionals (!stdenv.isAarch32) [ libvpx ];
|
||||
|
||||
# Some tests fail randomly due to timeout. This kind of problem is well known
|
||||
# by upstream: https://github.com/irungentoo/toxcore/issues/{950,1054}
|
||||
# They don't recommend running tests on 50core machines with other cpu-bound
|
||||
# tests running in parallel.
|
||||
#
|
||||
# NOTE: run the tests locally on your machine before upgrading this package!
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "P2P FOSS instant messaging application aimed to replace Skype with crypto";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -83,6 +83,9 @@ stdenv.mkDerivation rec {
|
|||
"-D_b_symbolic_functions=false"
|
||||
];
|
||||
|
||||
# error: argument unused during compilation: '-pie' [-Werror,-Wunused-command-line-argument]
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isMusl "-Wno-unused-command-line-argument";
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs perf/*
|
||||
patchShebangs src/box_drawing_generate.sh
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, musl-fts
|
||||
, musl-obstack, m4, zlib, zstd, bzip2, bison, flex, gettext, xz, setupDebugInfoDirs
|
||||
, argp-standalone
|
||||
, enableDebuginfod ? false, sqlite, curl, libmicrohttpd_0_9_70, libarchive
|
||||
, enableDebuginfod ? false, sqlite, curl, libmicrohttpd, libarchive
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
|
|
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
|
|||
] ++ lib.optionals enableDebuginfod [
|
||||
sqlite
|
||||
curl
|
||||
libmicrohttpd_0_9_70
|
||||
libmicrohttpd
|
||||
libarchive
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
, libev
|
||||
, libgcrypt
|
||||
, libinjection
|
||||
, libmicrohttpd_0_9_70
|
||||
, libmicrohttpd_0_9_69
|
||||
, libuuid
|
||||
, lz4
|
||||
, nlohmann_json
|
||||
|
|
@ -100,7 +100,7 @@ stdenv.mkDerivation rec {
|
|||
{ f = "libdaemon"; p = libdaemon; }
|
||||
{ f = "libev"; p = libev; }
|
||||
{ f = "libinjection"; p = libinjection; }
|
||||
{ f = "libmicrohttpd"; p = libmicrohttpd_0_9_70; }
|
||||
{ f = "libmicrohttpd"; p = libmicrohttpd_0_9_69; }
|
||||
{ f = "libssl"; p = openssl; }
|
||||
{ f = "lz4"; p = lz4; }
|
||||
{ f = "pcre"; p = pcre; }
|
||||
|
|
|
|||
|
|
@ -41,27 +41,6 @@
|
|||
# around it.
|
||||
|
||||
let
|
||||
modules = [
|
||||
{
|
||||
path = "web/api/app/Plugin/Crud";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ZoneMinder";
|
||||
repo = "crud";
|
||||
rev = "3.1.0-zm";
|
||||
sha256 = "061avzyml7mla4hlx057fm8a9yjh6m6qslgyzn74cv5p2y7f463l";
|
||||
};
|
||||
}
|
||||
{
|
||||
path = "web/api/app/Plugin/CakePHP-Enum-Behavior";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ZoneMinder";
|
||||
repo = "CakePHP-Enum-Behavior";
|
||||
rev = "1.0-zm";
|
||||
sha256 = "0zsi6s8xymb183kx3szspbrwfjqcgga7786zqvydy6hc8c909cgx";
|
||||
};
|
||||
}
|
||||
];
|
||||
|
||||
addons = [
|
||||
{
|
||||
path = "scripts/ZoneMinder/lib/ZoneMinder/Control/Xiaomi.pm";
|
||||
|
|
@ -78,13 +57,13 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "zoneminder";
|
||||
version = "1.36.15";
|
||||
version = "1.36.28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ZoneMinder";
|
||||
repo = "zoneminder";
|
||||
rev = version;
|
||||
sha256 = "1qlsg7gd9kpjdbq9d5yrjmc7g1pbscrg4sws7xrdln1z8509sv50";
|
||||
sha256 = "sha256-x00u7AWMNS+wAO/tdWi7GYbMZZM7XnszCO57ZDlm0J0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -94,11 +73,6 @@ in stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
postPatch = ''
|
||||
${lib.concatStringsSep "\n" (map (e: ''
|
||||
rm -rf ${e.path}/*
|
||||
cp -r ${e.src}/* ${e.path}/
|
||||
'') modules)}
|
||||
|
||||
rm -rf web/api/lib/Cake/Test
|
||||
|
||||
${lib.concatStringsSep "\n" (map (e: ''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, stdenv }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "infracost";
|
||||
|
|
@ -63,5 +63,6 @@ buildGoModule rec {
|
|||
'';
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ davegallant jk ];
|
||||
broken = stdenv.isx86_64; # https://hydra.nixos.org/build/193087915
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -613,6 +613,7 @@ mapAliases ({
|
|||
liblapackWithoutAtlas = throw "'liblapackWithoutAtlas' has been renamed to/replaced by 'lapack-reference'"; # Converted to throw 2022-02-22
|
||||
liblastfm = throw "'liblastfm' has been renamed to/replaced by 'libsForQt5.liblastfm'"; # Converted to throw 2022-09-24
|
||||
liblrdf = throw "'liblrdf' has been renamed to/replaced by 'lrdf'"; # Converted to throw 2022-02-22
|
||||
libmicrohttpd_0_9_70 = throw "'libmicrohttpd_0_9_70' has been removed because it is insecure, and has been replaced by 'libmicrohttpd_0_9_69' and 'libmicrohttpd_0_9_71'"; # Added 2022-10-10
|
||||
libmsgpack = throw "'libmsgpack' has been renamed to/replaced by 'msgpack'"; # Converted to throw 2022-02-22
|
||||
libnih = throw "'libnih' has been removed"; # Converted to throw 2022-05-17
|
||||
libosmpbf = throw "libosmpbf was removed because it is no longer required by osrm-backend";
|
||||
|
|
|
|||
|
|
@ -310,7 +310,9 @@ with pkgs;
|
|||
|
||||
breakpad = callPackage ../development/misc/breakpad { };
|
||||
|
||||
brev-cli = callPackage ../development/misc/brev-cli { };
|
||||
brev-cli = callPackage ../development/misc/brev-cli {
|
||||
buildGoModule = buildGo118Module; # build fails with 1.19
|
||||
};
|
||||
|
||||
buf = callPackage ../development/tools/buf { };
|
||||
|
||||
|
|
@ -2453,7 +2455,9 @@ with pkgs;
|
|||
|
||||
cudd = callPackage ../development/libraries/cudd { };
|
||||
|
||||
cue = callPackage ../development/tools/cue { };
|
||||
cue = callPackage ../development/tools/cue {
|
||||
buildGoModule = buildGo118Module; # tests fail with 1.19
|
||||
};
|
||||
|
||||
cuelsp = callPackage ../development/tools/cuelsp {};
|
||||
|
||||
|
|
@ -4776,7 +4780,9 @@ with pkgs;
|
|||
|
||||
string-machine = callPackage ../applications/audio/string-machine { };
|
||||
|
||||
stripe-cli = callPackage ../tools/admin/stripe-cli { };
|
||||
stripe-cli = callPackage ../tools/admin/stripe-cli {
|
||||
buildGoModule = buildGo118Module; # tests fail with 1.19
|
||||
};
|
||||
|
||||
bash-supergenpass = callPackage ../tools/security/bash-supergenpass { };
|
||||
|
||||
|
|
@ -5856,7 +5862,9 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
doggo = callPackage ../tools/networking/doggo { };
|
||||
doggo = callPackage ../tools/networking/doggo {
|
||||
buildGoModule = buildGo118Module; # build fails with 1.19
|
||||
};
|
||||
|
||||
dosfstools = callPackage ../tools/filesystems/dosfstools { };
|
||||
|
||||
|
|
@ -7889,7 +7897,9 @@ with pkgs;
|
|||
|
||||
ipfs-upload-client = callPackage ../applications/networking/ipfs-upload-client { };
|
||||
|
||||
ipget = callPackage ../applications/networking/ipget { };
|
||||
ipget = callPackage ../applications/networking/ipget {
|
||||
buildGoModule = buildGo118Module; # build fails with 1.19
|
||||
};
|
||||
|
||||
i-pi = with python3Packages; toPythonApplication i-pi;
|
||||
|
||||
|
|
@ -10285,7 +10295,9 @@ with pkgs;
|
|||
pocketbase = callPackage ../servers/pocketbase { };
|
||||
|
||||
podman = callPackage ../applications/virtualization/podman/wrapper.nix { };
|
||||
podman-unwrapped = callPackage ../applications/virtualization/podman { };
|
||||
podman-unwrapped = callPackage ../applications/virtualization/podman {
|
||||
buildGoModule = buildGo118Module; # nixosTests.oci-containers.podman fails with 1.19 (channel blocker)
|
||||
};
|
||||
|
||||
podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {};
|
||||
|
||||
|
|
@ -11955,7 +11967,9 @@ with pkgs;
|
|||
|
||||
tracebox = callPackage ../tools/networking/tracebox { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
tracee = callPackage ../tools/security/tracee { };
|
||||
tracee = callPackage ../tools/security/tracee {
|
||||
buildGoModule = buildGo118Module; # tests fail with 1.19
|
||||
};
|
||||
|
||||
tracefilegen = callPackage ../development/tools/analysis/garcosim/tracefilegen { };
|
||||
|
||||
|
|
@ -15321,7 +15335,9 @@ with pkgs;
|
|||
|
||||
io = callPackage ../development/interpreters/io { };
|
||||
|
||||
ivy = callPackage ../development/interpreters/ivy { };
|
||||
ivy = callPackage ../development/interpreters/ivy {
|
||||
buildGoModule = buildGo118Module; # tests fail with 1.19
|
||||
};
|
||||
|
||||
j = callPackage ../development/interpreters/j {
|
||||
stdenv = clangStdenv;
|
||||
|
|
@ -20221,7 +20237,7 @@ with pkgs;
|
|||
|
||||
libmemcached = callPackage ../development/libraries/libmemcached { };
|
||||
|
||||
libmicrohttpd_0_9_70 = callPackage ../development/libraries/libmicrohttpd/0.9.70.nix { };
|
||||
libmicrohttpd_0_9_69 = callPackage ../development/libraries/libmicrohttpd/0.9.69.nix { };
|
||||
libmicrohttpd_0_9_71 = callPackage ../development/libraries/libmicrohttpd/0.9.71.nix { };
|
||||
libmicrohttpd_0_9_72 = callPackage ../development/libraries/libmicrohttpd/0.9.72.nix { };
|
||||
libmicrohttpd = libmicrohttpd_0_9_71;
|
||||
|
|
@ -20513,12 +20529,7 @@ with pkgs;
|
|||
|
||||
libtorrent-rasterbar = libtorrent-rasterbar-2_0_x;
|
||||
|
||||
# this is still the new version of the old API
|
||||
libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { };
|
||||
|
||||
inherit (callPackages ../development/libraries/libtoxcore {})
|
||||
libtoxcore_0_1 libtoxcore_0_2;
|
||||
libtoxcore = libtoxcore_0_2;
|
||||
libtoxcore = callPackage ../development/libraries/libtoxcore {};
|
||||
|
||||
libtpms = callPackage ../tools/security/libtpms { };
|
||||
|
||||
|
|
@ -23224,7 +23235,9 @@ with pkgs;
|
|||
grafana = callPackage ../servers/monitoring/grafana { };
|
||||
grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { };
|
||||
|
||||
grafana-agent = callPackage ../servers/monitoring/grafana-agent { };
|
||||
grafana-agent = callPackage ../servers/monitoring/grafana-agent {
|
||||
buildGoModule = buildGo118Module; # tests fail with 1.19
|
||||
};
|
||||
|
||||
grafana-loki = callPackage ../servers/monitoring/loki { };
|
||||
promtail = callPackage ../servers/monitoring/loki/promtail.nix { };
|
||||
|
|
@ -23913,7 +23926,9 @@ with pkgs;
|
|||
prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit;
|
||||
};
|
||||
prometheus-openldap-exporter = callPackage ../servers/monitoring/prometheus/openldap-exporter.nix { };
|
||||
prometheus-openldap-exporter = callPackage ../servers/monitoring/prometheus/openldap-exporter.nix {
|
||||
buildGoModule = buildGo118Module; # nixosTests.prometheus-exporter.ldap fails with 1.19
|
||||
};
|
||||
prometheus-openvpn-exporter = callPackage ../servers/monitoring/prometheus/openvpn-exporter.nix { };
|
||||
prometheus-pihole-exporter = callPackage ../servers/monitoring/prometheus/pihole-exporter.nix { };
|
||||
prometheus-postfix-exporter = callPackage ../servers/monitoring/prometheus/postfix-exporter.nix { };
|
||||
|
|
@ -30084,7 +30099,9 @@ with pkgs;
|
|||
|
||||
normalize = callPackage ../applications/audio/normalize { };
|
||||
|
||||
norouter = callPackage ../tools/networking/norouter { };
|
||||
norouter = callPackage ../tools/networking/norouter {
|
||||
buildGoModule = buildGo118Module; # tests fail with 1.19
|
||||
};
|
||||
|
||||
mailspring = callPackage ../applications/networking/mailreaders/mailspring {};
|
||||
|
||||
|
|
@ -30673,6 +30690,8 @@ with pkgs;
|
|||
enableDbusUi = false;
|
||||
};
|
||||
|
||||
parsec-bin = callPackage ../applications/misc/parsec/bin.nix { };
|
||||
|
||||
pavucontrol = callPackage ../applications/audio/pavucontrol { };
|
||||
|
||||
paraview = libsForQt5.callPackage ../applications/graphics/paraview { };
|
||||
|
|
@ -30822,10 +30841,6 @@ with pkgs;
|
|||
|
||||
tdlib-purple = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tdlib-purple { };
|
||||
|
||||
toxprpl = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tox-prpl {
|
||||
libtoxcore = libtoxcore-new;
|
||||
};
|
||||
|
||||
pidgin-opensteamworks = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks { };
|
||||
|
||||
purple-facebook = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-facebook { };
|
||||
|
|
@ -31524,7 +31539,9 @@ with pkgs;
|
|||
|
||||
robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { };
|
||||
|
||||
routedns = callPackage ../tools/networking/routedns { };
|
||||
routedns = callPackage ../tools/networking/routedns {
|
||||
buildGoModule = buildGo118Module; # build fails with 1.19
|
||||
};
|
||||
|
||||
skrooge = libsForQt5.callPackage ../applications/office/skrooge {};
|
||||
|
||||
|
|
@ -37381,13 +37398,17 @@ with pkgs;
|
|||
|
||||
dapper = callPackage ../development/tools/dapper { };
|
||||
|
||||
kube3d = callPackage ../applications/networking/cluster/kube3d {};
|
||||
kube3d = callPackage ../applications/networking/cluster/kube3d {
|
||||
buildGoModule = buildGo118Module; # tests fail with 1.19
|
||||
};
|
||||
|
||||
zfs-prune-snapshots = callPackage ../tools/backup/zfs-prune-snapshots {};
|
||||
|
||||
zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { };
|
||||
|
||||
zrepl = callPackage ../tools/backup/zrepl { };
|
||||
zrepl = callPackage ../tools/backup/zrepl {
|
||||
buildGoModule = buildGo118Module; # nixosTests.zrepl fails with 1.19
|
||||
};
|
||||
|
||||
uhubctl = callPackage ../tools/misc/uhubctl {};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue