Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
f71a5e7be3
@ -11,14 +11,13 @@
|
||||
, ninja
|
||||
, pango
|
||||
, pkg-config
|
||||
, python3
|
||||
, rustPlatform
|
||||
, wrapGAppsHook4
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "contrast";
|
||||
version = "0.0.5";
|
||||
version = "0.0.7";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
@ -26,13 +25,13 @@ stdenv.mkDerivation rec {
|
||||
owner = "design";
|
||||
repo = "contrast";
|
||||
rev = version;
|
||||
sha256 = "cypSbqLwSmauOoWOuppWpF3hvrxiqmkLspxAWzvlUC0=";
|
||||
hash = "sha256-waoXv8dzqynkpfEPZSgZnS6fyo9+9+3Q2oy2fMtEsoE=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-W4FyqwJpimf0isQRCq9TegpTQPQfsumx40AFQCFG5VQ=";
|
||||
hash = "sha256-94QwPSiGjjPuskg5w6QfM5FuChFno7f9dh0Xr2wWKCI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -41,12 +40,10 @@ stdenv.mkDerivation rec {
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
rustPlatform.rust.cargo
|
||||
rustPlatform.cargoSetupHook
|
||||
rustPlatform.rust.rustc
|
||||
wrapGAppsHook4
|
||||
glib # for glib-compile-resources
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -57,13 +54,6 @@ stdenv.mkDerivation rec {
|
||||
pango
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs build-aux/meson_post_install.py
|
||||
# https://gitlab.gnome.org/World/design/contrast/-/merge_requests/23
|
||||
substituteInPlace build-aux/meson_post_install.py \
|
||||
--replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Checks whether the contrast between two colors meet the WCAG requirements";
|
||||
homepage = "https://gitlab.gnome.org/World/design/contrast";
|
||||
@ -74,4 +64,3 @@ stdenv.mkDerivation rec {
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
# gcc only supports objc on darwin
|
||||
buildGoModule.override { stdenv = clangStdenv; } rec {
|
||||
pname = "go-musicfox";
|
||||
version = "4.0.3";
|
||||
version = "4.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anhoder";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6JOD0RsZY79jLYJqPrzc43jgR03XQEfa8B0mGvlIkF4=";
|
||||
hash = "sha256-EPORD8jDmTnCm/ON1Vz2R7DpFVyAR8q7r2KZyKTiGr4=";
|
||||
};
|
||||
|
||||
deleteVendor = true;
|
||||
|
||||
@ -11,20 +11,21 @@
|
||||
, gobject-introspection
|
||||
, gtksourceview4
|
||||
, gspell
|
||||
, libhandy
|
||||
, poppler_gi
|
||||
, webkitgtk
|
||||
, webkitgtk_4_1
|
||||
, librsvg
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "setzer";
|
||||
version = "0.4.8";
|
||||
version = "55";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cvfosammmm";
|
||||
repo = "Setzer";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7NPyvAof0xObYZws3KFAbdue/GpIRthzdX00jc9GhYs=";
|
||||
hash = "sha256-Mcl9kWeo4w/wW8crR58Yyqoh26w8/SmNrjmHps6DmRA=";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
@ -43,8 +44,9 @@ python3.pkgs.buildPythonApplication rec {
|
||||
buildInputs = [
|
||||
gtksourceview4
|
||||
gspell
|
||||
libhandy
|
||||
poppler_gi
|
||||
webkitgtk
|
||||
webkitgtk_4_1
|
||||
librsvg
|
||||
];
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, mkDerivation, fetchurl, qtbase, qtscript, qtwebengine, qmake, zlib, pkg-config, poppler }:
|
||||
{ lib, mkDerivation, fetchurl, qtbase, qtscript, qtwebengine, qmake, zlib, pkg-config, poppler, wrapGAppsHook }:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "texmaker";
|
||||
@ -10,7 +10,7 @@ mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [ qtbase qtscript poppler zlib qtwebengine ];
|
||||
nativeBuildInputs = [ pkg-config poppler qmake ];
|
||||
nativeBuildInputs = [ pkg-config poppler qmake wrapGAppsHook ];
|
||||
env.NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler";
|
||||
|
||||
qmakeFlags = [
|
||||
@ -19,6 +19,12 @@ mkDerivation rec {
|
||||
"METAINFODIR=${placeholder "out"}/share/metainfo"
|
||||
];
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
preFixup = ''
|
||||
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "TeX and LaTeX editor";
|
||||
longDescription=''
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -238,6 +238,7 @@ https://github.com/Shougo/echodoc.vim/,,
|
||||
https://github.com/sainnhe/edge/,,
|
||||
https://github.com/editorconfig/editorconfig-vim/,,
|
||||
https://github.com/gpanders/editorconfig.nvim/,,
|
||||
https://github.com/elixir-tools/elixir-tools.nvim/,HEAD,
|
||||
https://github.com/elmcast/elm-vim/,,
|
||||
https://github.com/dmix/elvish.vim/,,
|
||||
https://github.com/mattn/emmet-vim/,,
|
||||
|
||||
@ -5,11 +5,12 @@
|
||||
, knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi
|
||||
, qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator
|
||||
, qcoro, qtquickcontrols2, wayland, plasma-wayland-protocols, kpurpose, kpipewire
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
pname = "spectacle";
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
|
||||
buildInputs = [
|
||||
kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
|
||||
kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor
|
||||
@ -20,6 +21,13 @@ mkDerivation {
|
||||
substituteInPlace desktop/org.kde.spectacle.desktop.cmake \
|
||||
--replace "Exec=@QtBinariesDir@/qdbus" "Exec=${lib.getBin qttools}/bin/qdbus"
|
||||
'';
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
preFixup = ''
|
||||
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
propagatedUserEnvPkgs = [ kipi-plugins libkipi ];
|
||||
meta = with lib; {
|
||||
homepage = "https://apps.kde.org/spectacle/";
|
||||
|
||||
@ -22,20 +22,20 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "authenticator";
|
||||
version = "4.2.0";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = "Authenticator";
|
||||
rev = version;
|
||||
hash = "sha256-Nv4QE6gyh42Na/stAgTIapV8GQuUHCdL6IEO//J8dV8=";
|
||||
hash = "sha256-WR5gXGry4wti2M4D/IQvwI7OSak1p+O+XAhr01hdv2Q=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-IS9jdr19VvgX6M1OqM6rjE8veujZcwBuOTuDm5mDXso=";
|
||||
hash = "sha256-ZVDKTJojblVCbbdtnqcL+UVW1vkmu99AXCbgyCGNHCM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -67,19 +67,11 @@ stdenv.mkDerivation rec {
|
||||
zbar
|
||||
];
|
||||
|
||||
# https://gitlab.gnome.org/World/Authenticator/-/issues/362
|
||||
preBuild = ''
|
||||
export BINDGEN_EXTRA_CLANG_ARGS="$BINDGEN_EXTRA_CLANG_ARGS -DPW_ENABLE_DEPRECATED"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Two-factor authentication code generator for GNOME";
|
||||
homepage = "https://gitlab.gnome.org/World/Authenticator";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ austinbutler ];
|
||||
platforms = lib.platforms.linux;
|
||||
# Fails to build on aarch64 with error
|
||||
# "a label can only be part of a statement and a declaration is not a statement"
|
||||
broken = stdenv.isLinux && stdenv.isAarch64;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{
|
||||
"stable": {
|
||||
"version": "112.0.5615.121",
|
||||
"sha256": "1qbsgcsw3jgy9b76i8ypiq91fkm9zy1hy77l52w2xbw53ghjfwlw",
|
||||
"sha256bin64": "1zh674vpczs1nyzbijpcgs2j2r0hdgp7bkwyn5l8w1hcj6az6k3n",
|
||||
"version": "112.0.5615.165",
|
||||
"sha256": "1zbrgkzcb211y1mvi9g35421dnp5bskkczwnpygzja7lm7z6530n",
|
||||
"sha256bin64": "16da3zi0qy2nc92jf90zvncss3xk9ggiys3ld9j0ghbsrs1jxbvm",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2023-02-17",
|
||||
@ -19,9 +19,9 @@
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "113.0.5672.37",
|
||||
"sha256": "0hmn7h5l8q161f6hwp5g7zbxfdsplwqh5j3yby56qgljgca8pj7f",
|
||||
"sha256bin64": "0j4hl2sbh8cig00rpn4ssxi2087wr33749b5sdcrk93kfzqinrix",
|
||||
"version": "113.0.5672.53",
|
||||
"sha256": "0k91xx3fm0kywjn00s9b7p776882b1mfajf2ig0iz3jac6rprh56",
|
||||
"sha256bin64": "1pzpigz8l6hsddb7v2g9m5d32hlq979l1cpj2yfnc6dixjs8x053",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2023-03-18",
|
||||
@ -32,22 +32,22 @@
|
||||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "114.0.5696.0",
|
||||
"sha256": "0hcf971azy3jjsl211qk53b6nk0f4pzf2dwfv3rjh4f6fa3nbwai",
|
||||
"sha256bin64": "1ssj633vdg3ghd87az28q262ly1fk7rc3k70l1531xvj2030ijrl",
|
||||
"version": "114.0.5720.4",
|
||||
"sha256": "1q9r4m1gda1mq0nwi00yfpxsqdghd0qb3k7a0xa9py8l6jcv8ifa",
|
||||
"sha256bin64": "15ss5xix773yn4g24ww9bw38g7wxgwhdqbgmwy44yvp0yl824czb",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2023-03-18",
|
||||
"version": "2023-04-07",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "41fef642de70ecdcaaa26be96d56a0398f95abd4",
|
||||
"sha256": "12w4g2dl58283allclpi1c4i6ih9v2xvdb9hpbmfda12v8lizmlq"
|
||||
"rev": "ffeea1b1fd070cb6a8d47154a03f8523486b50a7",
|
||||
"sha256": "0xpwh06a82nb4j9ifr878rij97dikfcjfbc08cnkmxrx7hs1sjdw"
|
||||
}
|
||||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "112.0.5615.121",
|
||||
"sha256": "1qbsgcsw3jgy9b76i8ypiq91fkm9zy1hy77l52w2xbw53ghjfwlw",
|
||||
"sha256bin64": "1zh674vpczs1nyzbijpcgs2j2r0hdgp7bkwyn5l8w1hcj6az6k3n",
|
||||
"version": "112.0.5615.165",
|
||||
"sha256": "1zbrgkzcb211y1mvi9g35421dnp5bskkczwnpygzja7lm7z6530n",
|
||||
"sha256bin64": "16da3zi0qy2nc92jf90zvncss3xk9ggiys3ld9j0ghbsrs1jxbvm",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2023-02-17",
|
||||
@ -56,8 +56,8 @@
|
||||
"sha256": "075p4jwk1apvwmqmvhwfw5f669ci7nxwjq9mz5aa2g5lz4fkdm4c"
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "112.0.5615.121-1",
|
||||
"sha256": "1zdk0sn84sj5zwcjjxikm0sc8mfpw0gri6w1fmpcbwyqawwjmi4f"
|
||||
"rev": "112.0.5615.165-1",
|
||||
"sha256": "1q2870z4k2hkn3jh24xc0xiadd1sxc4apn1jz740yzlwsi6jmcgw"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -3,7 +3,7 @@ let
|
||||
versions = if stdenv.isLinux then {
|
||||
stable = "0.0.26";
|
||||
ptb = "0.0.41";
|
||||
canary = "0.0.150";
|
||||
canary = "0.0.151";
|
||||
} else {
|
||||
stable = "0.0.273";
|
||||
ptb = "0.0.59";
|
||||
@ -22,7 +22,7 @@ let
|
||||
};
|
||||
canary = fetchurl {
|
||||
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
|
||||
sha256 = "sha256-8huDp1u0t9/kZbeB7bPqQUw8+HQ6rIyzKYUVN02gQfo=";
|
||||
sha256 = "sha256-ZN+lEGtSajgYsyMoGRmyTZCpUGVmb9LKgVv89NA4m7U=";
|
||||
};
|
||||
};
|
||||
x86_64-darwin = {
|
||||
|
||||
@ -60,13 +60,10 @@ gnuradio.pkgs.mkDerivation rec {
|
||||
pugixml
|
||||
protobuf
|
||||
gnuradio.unwrapped.boost
|
||||
gnuradio.unwrapped.logLib
|
||||
] ++ lib.optionals (gnuradio.hasFeature "gr-uhd") [
|
||||
gnuradio.unwrapped.uhd
|
||||
] ++ (if (lib.versionAtLeast gnuradio.unwrapped.versionAttr.major "3.10") then [
|
||||
gnuradio.unwrapped.spdlog
|
||||
] else [
|
||||
gnuradio.unwrapped.log4cpp
|
||||
]) ++ lib.optionals (enableRawUdp) [
|
||||
] ++ lib.optionals (enableRawUdp) [
|
||||
libpcap
|
||||
] ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [
|
||||
thrift
|
||||
|
||||
@ -225,7 +225,7 @@ let
|
||||
inherit (shared) hasFeature; # function
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
inherit pname;
|
||||
inherit (shared)
|
||||
version
|
||||
@ -253,8 +253,10 @@ stdenv.mkDerivation rec {
|
||||
inherit
|
||||
boost
|
||||
volk
|
||||
log4cpp
|
||||
;
|
||||
# Used by many gnuradio modules, the same attribute is present in
|
||||
# gnuradio3.10 where there it's spdlog.
|
||||
logLib = log4cpp;
|
||||
} // lib.optionalAttrs (hasFeature "gr-uhd") {
|
||||
inherit uhd;
|
||||
} // lib.optionalAttrs (hasFeature "gr-qtgui") {
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
# Remove gcc and python references
|
||||
, removeReferencesTo
|
||||
@ -141,6 +140,9 @@ let
|
||||
};
|
||||
gr-blocks = {
|
||||
cmakeEnableFlag = "GR_BLOCKS";
|
||||
runtime = [
|
||||
libsndfile
|
||||
];
|
||||
};
|
||||
gr-fec = {
|
||||
cmakeEnableFlag = "GR_FEC";
|
||||
@ -259,7 +261,7 @@ let
|
||||
inherit (shared) hasFeature; # function
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
inherit pname;
|
||||
inherit (shared)
|
||||
version
|
||||
@ -283,8 +285,10 @@ stdenv.mkDerivation rec {
|
||||
inherit
|
||||
boost
|
||||
volk
|
||||
log4cpp
|
||||
;
|
||||
# Used by many gnuradio modules, the same attribute is present in
|
||||
# gnuradio3.10 where there it's spdlog.
|
||||
logLib = log4cpp;
|
||||
} // lib.optionalAttrs (hasFeature "gr-uhd") {
|
||||
inherit uhd;
|
||||
} // lib.optionalAttrs (hasFeature "gr-qtgui") {
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
# Remove gcc and python references
|
||||
, removeReferencesTo
|
||||
@ -143,6 +142,10 @@ let
|
||||
};
|
||||
gr-blocks = {
|
||||
cmakeEnableFlag = "GR_BLOCKS";
|
||||
runtime = [
|
||||
# Required to compile wavfile blocks.
|
||||
libsndfile
|
||||
];
|
||||
};
|
||||
gr-fec = {
|
||||
cmakeEnableFlag = "GR_FEC";
|
||||
@ -278,7 +281,7 @@ let
|
||||
inherit (shared) hasFeature; # function
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
inherit pname;
|
||||
inherit (shared)
|
||||
version
|
||||
@ -302,8 +305,10 @@ stdenv.mkDerivation rec {
|
||||
inherit
|
||||
boost
|
||||
volk
|
||||
spdlog
|
||||
;
|
||||
# Used by many gnuradio modules, the same attribute is present in
|
||||
# previous gnuradio versions where there it's log4cpp.
|
||||
logLib = spdlog;
|
||||
} // lib.optionalAttrs (hasFeature "gr-uhd") {
|
||||
inherit uhd;
|
||||
} // lib.optionalAttrs (hasFeature "gr-pdu") {
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, qtwayland
|
||||
, gnuradio3_8Minimal
|
||||
, gnuradioMinimal
|
||||
, thrift
|
||||
, mpir
|
||||
, fftwFloat
|
||||
@ -25,7 +25,7 @@ assert portaudioSupport -> portaudio != null;
|
||||
# audio backends are mutually exclusive
|
||||
assert !(pulseaudioSupport && portaudioSupport);
|
||||
|
||||
gnuradio3_8Minimal.pkgs.mkDerivation rec {
|
||||
gnuradioMinimal.pkgs.mkDerivation rec {
|
||||
pname = "gqrx";
|
||||
version = "2.15.10";
|
||||
|
||||
@ -43,21 +43,21 @@ gnuradio3_8Minimal.pkgs.mkDerivation rec {
|
||||
wrapGAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
gnuradio3_8Minimal.unwrapped.log4cpp
|
||||
gnuradioMinimal.unwrapped.logLib
|
||||
mpir
|
||||
fftwFloat
|
||||
alsa-lib
|
||||
libjack2
|
||||
gnuradio3_8Minimal.unwrapped.boost
|
||||
gnuradioMinimal.unwrapped.boost
|
||||
qtbase
|
||||
qtsvg
|
||||
qtwayland
|
||||
gnuradio3_8Minimal.pkgs.osmosdr
|
||||
gnuradioMinimal.pkgs.osmosdr
|
||||
rtl-sdr
|
||||
hackrf
|
||||
] ++ lib.optionals (gnuradio3_8Minimal.hasFeature "gr-ctrlport") [
|
||||
] ++ lib.optionals (gnuradioMinimal.hasFeature "gr-ctrlport") [
|
||||
thrift
|
||||
gnuradio3_8Minimal.unwrapped.python.pkgs.thrift
|
||||
gnuradioMinimal.unwrapped.python.pkgs.thrift
|
||||
] ++ lib.optionals pulseaudioSupport [ libpulseaudio ]
|
||||
++ lib.optionals portaudioSupport [ portaudio ];
|
||||
|
||||
|
||||
@ -49,7 +49,7 @@ gnuradio3_8.pkgs.mkDerivation rec {
|
||||
buildInputs = [
|
||||
gnuradio3_8.unwrapped.boost
|
||||
codec2
|
||||
gnuradio3_8.unwrapped.log4cpp
|
||||
gnuradio3_8.unwrapped.logLib
|
||||
gmp
|
||||
libpulseaudio
|
||||
libconfig
|
||||
|
||||
@ -1,47 +1,76 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3Packages
|
||||
, runtimeShell
|
||||
, bcftools
|
||||
, htslib
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
let
|
||||
ssshtest = fetchFromGitHub {
|
||||
owner = "ryanlayer";
|
||||
repo = "ssshtest";
|
||||
rev = "d21f7f928a167fca6e2eb31616673444d15e6fd0";
|
||||
hash = "sha256-zecZHEnfhDtT44VMbHLHOhRtNsIMWeaBASupVXtmrks=";
|
||||
};
|
||||
in python3Packages.buildPythonApplication rec {
|
||||
pname = "truvari";
|
||||
version = "2.1.1";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spiralgenetics";
|
||||
owner = "ACEnglish";
|
||||
repo = "truvari";
|
||||
rev = "v${version}";
|
||||
sha256 = "14nsdbj063qm175xxixs34cihvsiskc9gym8pg7gbwsh13k5a00h";
|
||||
hash = "sha256-UJNMKEV5m2jFqnWvkVAtymkcE2TjPIXp7JqRZpMSqsE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace 'python-Levenshtein==0.12.1' 'python-Levenshtein>=0.12.1'
|
||||
--replace "rich==" "rich>="
|
||||
substituteInPlace truvari/utils.py \
|
||||
--replace "/bin/bash" "${runtimeShell}"
|
||||
patchShebangs repo_utils/test_files
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pyvcf
|
||||
levenshtein
|
||||
progressbar2
|
||||
rich
|
||||
edlib
|
||||
pysam
|
||||
pyfaidx
|
||||
intervaltree
|
||||
pytabix
|
||||
acebinf
|
||||
bwapy
|
||||
joblib
|
||||
numpy
|
||||
pytabix
|
||||
bwapy
|
||||
pandas
|
||||
];
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
makeWrapperArgs = [
|
||||
"--prefix" "PATH" ":" (lib.makeBinPath [ bcftools htslib ])
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "truvari" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
bcftools
|
||||
htslib
|
||||
] ++ (with python3Packages; [
|
||||
coverage
|
||||
]);
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
ln -s ${ssshtest}/ssshtest .
|
||||
bash repo_utils/truvari_ssshtests.sh
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Structural variant comparison tool for VCFs";
|
||||
homepage = "https://github.com/spiralgenetics/truvari";
|
||||
homepage = "https://github.com/ACEnglish/truvari";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ scalavision ];
|
||||
maintainers = with maintainers; [ natsukium scalavision ];
|
||||
longDescription = ''
|
||||
Truvari is a benchmarking tool for comparison sets of SVs.
|
||||
It can calculate the recall, precision, and f-measure of a
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "JAGS";
|
||||
version = "4.3.1";
|
||||
version = "4.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/mcmc-jags/JAGS-${version}.tar.gz";
|
||||
sha256 = "sha256-+SWDVbXp6xO9M8X6cg8MvrrOp9CkpCtxsPsUUB7hQik=";
|
||||
sha256 = "sha256-hx9VavQDp8LOag8C8Vz4WlcnY+CT0mZY66xVxKtHL8g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gfortran ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "srvc";
|
||||
version = "0.17.0";
|
||||
version = "0.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "insilica";
|
||||
repo = "rs-srvc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6cullXcSnFlGM5O/g/J5WwBBUPfg1cbvjyPcIZ6yjRE=";
|
||||
hash = "sha256-WpzJzjGzYX1IxC9Vz//JhRYCPZyLchv+iv+kuKkw2Os=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-xmHCm4kH4y0ph0ssMXZn+TvLAciYrsggyjmar85zF74=";
|
||||
cargoHash = "sha256-WhmcJQRh2x6DZRXwzy/KtK81XXIDmNMnUtq7ylCpwTw=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.CoreServices
|
||||
|
||||
@ -71,7 +71,7 @@
|
||||
, onlyLibVLC ? false
|
||||
, skins2Support ? !onlyLibVLC, freetype
|
||||
, waylandSupport ? true, wayland, wayland-protocols
|
||||
, withQt5 ? true, qtbase, qtsvg, qtwayland, qtx11extras, wrapQtAppsHook
|
||||
, withQt5 ? true, qtbase, qtsvg, qtwayland, qtx11extras, wrapQtAppsHook, wrapGAppsHook
|
||||
}:
|
||||
|
||||
# chromecastSupport requires TCP port 8010 to be open for it to work.
|
||||
@ -177,6 +177,7 @@ stdenv.mkDerivation rec {
|
||||
pkg-config
|
||||
removeReferencesTo
|
||||
unzip
|
||||
wrapGAppsHook
|
||||
]
|
||||
++ optionals withQt5 [ wrapQtAppsHook ]
|
||||
++ optionals waylandSupport [ wayland wayland-protocols ];
|
||||
@ -209,6 +210,14 @@ stdenv.mkDerivation rec {
|
||||
/usr/share/fonts/truetype/freefont ${freefont_ttf}/share/fonts/truetype
|
||||
'';
|
||||
|
||||
|
||||
# to prevent double wrapping of Qtwrap and Gwrap
|
||||
dontWrapGApps = true;
|
||||
|
||||
preFixup = ''
|
||||
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
# - Touch plugins (plugins cache keyed off mtime and file size:
|
||||
# https://github.com/NixOS/nixpkgs/pull/35124#issuecomment-370552830
|
||||
# - Remove references to the Qt development headers (used in error messages)
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "numix-icon-theme-square";
|
||||
version = "23.04.05";
|
||||
version = "23.04.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "numixproject";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-fyb0qHmZev7kH8/q6mk2WPT30Szx1/jLIweq12eAIaw=";
|
||||
sha256 = "sha256-O9itWigot15qljmPx4msBa7ucb4j+Wb08q5UTsF2sB8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 ];
|
||||
|
||||
@ -24,13 +24,13 @@ lib.checkListOfEnum "${pname}: tweaks" [ "image" "square" "round" ] tweaks
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "2022-11-09";
|
||||
version = "2023-02-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "VmMlebERe6LDyfD/lo8o4TvNrJ37m2OHC25JkUc6sig=";
|
||||
sha256 = "oBUBSPlOCBEaRRFK5ZyoGlk+gwcE8LtdwxvL+iTfuMA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Flat Design theme for GTK based desktop environments";
|
||||
homepage = "https://vinceliuice.github.io/Qogir-theme";
|
||||
homepage = "https://github.com/vinceliuice/Qogir-theme";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
, python
|
||||
, boost
|
||||
, cppunit
|
||||
, log4cpp
|
||||
, logLib
|
||||
, osmosdr
|
||||
, gmp
|
||||
, mpir
|
||||
@ -41,7 +41,7 @@ mkDerivation rec {
|
||||
cppunit
|
||||
osmosdr
|
||||
boost
|
||||
log4cpp
|
||||
logLib
|
||||
gmp
|
||||
mpir
|
||||
fftwFloat
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
, cmake
|
||||
, pkg-config
|
||||
, boost
|
||||
, log4cpp
|
||||
, logLib
|
||||
, python
|
||||
, swig
|
||||
, mpir
|
||||
@ -67,7 +67,7 @@ mkDerivation {
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
log4cpp
|
||||
logLib
|
||||
doxygen
|
||||
mpir
|
||||
gmp
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
, cppunit
|
||||
, swig
|
||||
, boost
|
||||
, log4cpp
|
||||
, logLib
|
||||
, python
|
||||
, libosmocore
|
||||
, osmosdr
|
||||
@ -32,7 +32,7 @@ mkDerivation {
|
||||
|
||||
buildInputs = [
|
||||
cppunit
|
||||
log4cpp
|
||||
logLib
|
||||
boost
|
||||
libosmocore
|
||||
osmosdr
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
, doxygen
|
||||
, swig
|
||||
, python
|
||||
, log4cpp
|
||||
, logLib
|
||||
, mpir
|
||||
, boost
|
||||
, gmp
|
||||
@ -42,7 +42,7 @@ in mkDerivation {
|
||||
python
|
||||
];
|
||||
buildInputs = [
|
||||
log4cpp
|
||||
logLib
|
||||
mpir
|
||||
boost
|
||||
gmp
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
, cppunit
|
||||
, swig
|
||||
, boost
|
||||
, log4cpp
|
||||
, logLib
|
||||
, python
|
||||
, libsodium
|
||||
}:
|
||||
@ -31,7 +31,7 @@ mkDerivation {
|
||||
|
||||
buildInputs = [
|
||||
cppunit
|
||||
log4cpp
|
||||
logLib
|
||||
boost
|
||||
libsodium
|
||||
];
|
||||
|
||||
@ -6,7 +6,8 @@
|
||||
, gnuradio
|
||||
, cmake
|
||||
, pkg-config
|
||||
, log4cpp
|
||||
, logLib
|
||||
, libsndfile
|
||||
, mpir
|
||||
, boost
|
||||
, gmp
|
||||
@ -27,6 +28,8 @@ let
|
||||
version = {
|
||||
"3.7" = "0.1.5";
|
||||
"3.8" = "0.2.3";
|
||||
"3.9" = "0.2.4";
|
||||
"3.10" = "0.2.4";
|
||||
}.${gnuradio.versionAttr.major};
|
||||
src = fetchgit {
|
||||
url = "git://git.osmocom.org/gr-osmosdr";
|
||||
@ -34,17 +37,19 @@ let
|
||||
sha256 = {
|
||||
"3.7" = "0bf9bnc1c3c4yqqqgmg3nhygj6rcfmyk6pybi27f7461d2cw1drv";
|
||||
"3.8" = "sha256-ZfI8MshhZOdJ1U5FlnZKXsg2Rsvb6oKg943ZVYd/IWo=";
|
||||
"3.9" = "sha256-d0hbiJ44lEu8V4XX7JpZVSTQwwykwKPUfiqetRBI6uI=";
|
||||
"3.10" = "sha256-d0hbiJ44lEu8V4XX7JpZVSTQwwykwKPUfiqetRBI6uI=";
|
||||
}.${gnuradio.versionAttr.major};
|
||||
};
|
||||
in mkDerivation {
|
||||
pname = "gr-osmosdr";
|
||||
inherit version src;
|
||||
disabledForGRafter = "3.9";
|
||||
disabledForGRafter = "3.11";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
buildInputs = [
|
||||
log4cpp
|
||||
logLib
|
||||
mpir
|
||||
boost
|
||||
fftwFloat
|
||||
@ -55,11 +60,16 @@ in mkDerivation {
|
||||
libbladeRF
|
||||
rtl-sdr
|
||||
soapysdr-with-plugins
|
||||
] ++ lib.optionals (gnuradio.hasFeature "gr-blocks") [
|
||||
libsndfile
|
||||
] ++ lib.optionals (gnuradio.hasFeature "gr-uhd") [
|
||||
uhd
|
||||
] ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [
|
||||
thrift
|
||||
python.pkgs.thrift
|
||||
] ++ lib.optionals (gnuradio.hasFeature "python-support") [
|
||||
python.pkgs.numpy
|
||||
python.pkgs.pybind11
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.IOKit
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
, pkg-config
|
||||
, swig
|
||||
, python
|
||||
, log4cpp
|
||||
, logLib
|
||||
, mpir
|
||||
, thrift
|
||||
, boost
|
||||
@ -36,7 +36,7 @@ in mkDerivation {
|
||||
disabledForGRafter = "3.9";
|
||||
|
||||
buildInputs = [
|
||||
log4cpp
|
||||
logLib
|
||||
mpir
|
||||
boost
|
||||
gmp
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
# Can also use cuSOLVER
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hipsolver";
|
||||
version = "5.4.2";
|
||||
version = "5.4.4";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ lib, mkDerivation, fetchurl, cmake, extra-cmake-modules, karchive, kconfigwidgets, kcoreaddons, ki18n, kxmlgui, qtkeychain }:
|
||||
mkDerivation rec {
|
||||
pname = "ktextaddons";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-BV1tHCD6kGI5Zj8PRZcEanLi1O7huS+qUijjtePDvik=";
|
||||
hash = "sha256-iBJs7MWSvkxezAxmQUdKTKhG3RhmBWziS62p610IAYM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules ];
|
||||
|
||||
879
pkgs/development/libraries/libdeltachat/Cargo.lock
generated
879
pkgs/development/libraries/libdeltachat/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdeltachat";
|
||||
version = "1.112.7";
|
||||
version = "1.113.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-core-rust";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zBstNj8IZ8ScwZxzvTxDPwe8R0n2z/EuvjbR+bJepJk=";
|
||||
hash = "sha256-Ft7BMgHGeTEM3WQVhAEjtyYYCfVFa2+ZkbdmDF22X9A=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.7.23";
|
||||
version = "0.7.24";
|
||||
pname = "libsolv";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openSUSE";
|
||||
repo = "libsolv";
|
||||
rev = version;
|
||||
sha256 = "sha256-i1g4arr8rII9SzdyITD6xS9CAVN6zP73gFwnZdkc5os=";
|
||||
sha256 = "sha256-UTVnGJO/9mQF9RwK75hh6IkoP1MwAlFaLCtdYU8uS34=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -32,6 +32,10 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ cmake ];
|
||||
propagatedBuildInputs = [ imath zlib ];
|
||||
|
||||
# Without 'sse' enforcement tests fail on i686 as due to excessive precision as:
|
||||
# error reading back channel B pixel 21,-76 got -nan expected -nan
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-msse2 -mfpmath=sse";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -51,7 +51,8 @@ stdenv.mkDerivation rec {
|
||||
--replace '"less"' '"${less}/bin/less"'
|
||||
substituteInPlace bin/rivet-mkhtml \
|
||||
--replace '"make-plots"' \"$out/bin/make-plots\" \
|
||||
--replace '"rivet-cmphistos"' \"$out/bin/rivet-cmphistos\"
|
||||
--replace '"rivet-cmphistos"' \"$out/bin/rivet-cmphistos\" \
|
||||
--replace 'ch_cmd = [sys.executable, os.path.join(os.path.dirname(__file__),' 'ch_cmd = [('
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "arcam-fmj";
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "elupus";
|
||||
repo = "arcam_fmj";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-nRInKju3Q4En+SiSl6DOeeTRK56TzKPweoVXsvzs45I=";
|
||||
hash = "sha256-TFZoWni33dzioADpTt50fqwBlZ/rdUergGs3s3d0504=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "maxbachmann";
|
||||
repo = "Levenshtein";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-YmgNxFChKn1P6FrJx2ybucJP9WP0J9h8bskwDNy+snE=";
|
||||
hash = "sha256-j28OQkJymkh6tIGYLoZLad7OUUImjZqXdqM2zU3haac=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "trove-classifiers";
|
||||
version = "2023.3.9";
|
||||
version = "2023.4.18";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-7kLy+MHUvP4190bkcvB2M1cNSF+rRUB+/8A3knCjuwM=";
|
||||
hash = "sha256-n4kqg8y9+eZphhqUfGsD1bkah/RJrv7x12/EFp943bo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gomplate";
|
||||
version = "3.11.4";
|
||||
version = "3.11.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hairyhenderson";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-3WTscK2nmjd7+cUKGaAi9i+C3HFpuxb7eRCn0fOHFV4=";
|
||||
hash = "sha256-cBSOfjU7A6B7+5zQLGtGLx9kORsjH/IzGgkjwjjTcYY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-X3o00WATVlWoc1Axug5ErPtLDQ+BL3CtO/QyNtavIpg=";
|
||||
vendorHash = "sha256-thsa15CDD7+gCSPSU4xDbovETREeuL4gV6TjdcImj9w=";
|
||||
|
||||
postPatch = ''
|
||||
# some tests require network access
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.106.1";
|
||||
version = "0.106.3";
|
||||
pname = "jbang";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar";
|
||||
sha256 = "sha256-XHrJvHX0fw/T00bJJaX4X3elr19zBJg2V7E01DEFdxs=";
|
||||
sha256 = "sha256-54yXQ3E10dlU/UqHyl3fxzQsawBTgNpIaq6XPmwXmD8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "k6";
|
||||
version = "0.42.0";
|
||||
version = "0.43.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DlB1oTE5RkxSyNupZ2U+dmr7qNPq8xJU3R0pAjm5EFQ=";
|
||||
sha256 = "sha256-JiXVDdCbXCsOSgYXIjJwXcgsbFPPoF/bY4nftaSgtdM=";
|
||||
};
|
||||
|
||||
subPackages = [ "./" ];
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -1,11 +1,38 @@
|
||||
{ stdenv, lib, fetchurl, fetchsvn, fetchFromGitHub,
|
||||
jansson, libedit, libxml2, libxslt, ncurses, openssl, sqlite,
|
||||
util-linux, dmidecode, libuuid, newt,
|
||||
lua, speex, libopus, opusfile, libogg,
|
||||
srtp, wget, curl, iksemel, pkg-config,
|
||||
autoconf, libtool, automake, fetchpatch,
|
||||
python39, writeScript,
|
||||
withOpus ? true,
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchsvn
|
||||
, fetchFromGitHub
|
||||
, jansson
|
||||
, libedit
|
||||
, libxml2
|
||||
, libxslt
|
||||
, ncurses
|
||||
, openssl
|
||||
, sqlite
|
||||
, util-linux
|
||||
, dmidecode
|
||||
, libuuid
|
||||
, newt
|
||||
, lua
|
||||
, speex
|
||||
, libopus
|
||||
, opusfile
|
||||
, libogg
|
||||
, srtp
|
||||
, wget
|
||||
, curl
|
||||
, iksemel
|
||||
, pkg-config
|
||||
, autoconf
|
||||
, libtool
|
||||
, automake
|
||||
, fetchpatch
|
||||
, python39
|
||||
, writeScript
|
||||
, withOpus ? true
|
||||
, ldapSupport ? false
|
||||
, openldap
|
||||
}:
|
||||
|
||||
let
|
||||
@ -27,15 +54,32 @@ let
|
||||
sha256 = "sha256-0iEr/Z4UQpWsTXYWVYzWWk7MQDOFnTQ1BBYpynGLTVQ=";
|
||||
})
|
||||
];
|
||||
common = {version, sha256, externals}: stdenv.mkDerivation {
|
||||
common = { version, sha256, externals }: stdenv.mkDerivation {
|
||||
inherit version;
|
||||
pname = "asterisk";
|
||||
pname = "asterisk"
|
||||
+ lib.optionalString ldapSupport "-ldap";
|
||||
|
||||
buildInputs = [ jansson libedit libxml2 libxslt ncurses openssl sqlite
|
||||
dmidecode libuuid newt
|
||||
lua speex
|
||||
srtp wget curl iksemel ]
|
||||
++ lib.optionals withOpus [ libopus opusfile libogg ];
|
||||
|
||||
buildInputs = [
|
||||
jansson
|
||||
libedit
|
||||
libxml2
|
||||
libxslt
|
||||
ncurses
|
||||
openssl
|
||||
sqlite
|
||||
dmidecode
|
||||
libuuid
|
||||
newt
|
||||
lua
|
||||
speex
|
||||
srtp
|
||||
wget
|
||||
curl
|
||||
iksemel
|
||||
]
|
||||
++ lib.optionals withOpus [ libopus opusfile libogg ]
|
||||
++ lib.optionals ldapSupport [ openldap ];
|
||||
nativeBuildInputs = [ util-linux pkg-config autoconf libtool automake ];
|
||||
|
||||
patches = [
|
||||
@ -135,13 +179,15 @@ let
|
||||
};
|
||||
|
||||
# auto-generated by update.py
|
||||
versions = lib.mapAttrs (_: {version, sha256}: common {
|
||||
inherit version sha256;
|
||||
externals = {
|
||||
"externals_cache/pjproject-2.12.1.tar.bz2" = pjproject_2_12_1;
|
||||
"addons/mp3" = mp3-202;
|
||||
};
|
||||
}) (lib.importJSON ./versions.json);
|
||||
versions = lib.mapAttrs
|
||||
(_: { version, sha256 }: common {
|
||||
inherit version sha256;
|
||||
externals = {
|
||||
"externals_cache/pjproject-2.12.1.tar.bz2" = pjproject_2_12_1;
|
||||
"addons/mp3" = mp3-202;
|
||||
};
|
||||
})
|
||||
(lib.importJSON ./versions.json);
|
||||
|
||||
updateScript_python = python39.withPackages (p: with p; [ packaging beautifulsoup4 requests ]);
|
||||
updateScript = writeScript "asterisk-update" ''
|
||||
@ -149,7 +195,8 @@ let
|
||||
exec ${updateScript_python}/bin/python ${toString ./update.py}
|
||||
'';
|
||||
|
||||
in {
|
||||
in
|
||||
{
|
||||
# Supported releases (as of 2022-04-05).
|
||||
# Source: https://wiki.asterisk.org/wiki/display/AST/Asterisk+Versions
|
||||
# Exact version can be found at https://www.asterisk.org/downloads/asterisk/all-asterisk-versions/
|
||||
@ -162,7 +209,7 @@ in {
|
||||
asterisk-lts = versions.asterisk_18;
|
||||
asterisk-stable = versions.asterisk_19;
|
||||
asterisk = versions.asterisk_19.overrideAttrs (o: {
|
||||
passthru = (o.passthru or {}) // { inherit updateScript; };
|
||||
passthru = (o.passthru or { }) // { inherit updateScript; };
|
||||
});
|
||||
|
||||
} // versions
|
||||
|
||||
@ -5,15 +5,15 @@
|
||||
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2023-03-28";
|
||||
version = "2023-04-21";
|
||||
pname = "oh-my-zsh";
|
||||
rev = "fcbdc330ff50617c8b84d39ce069cc75df41108f";
|
||||
rev = "5d3e86e2a48adf7a308773f8f1b725d187c7c5ef";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "ohmyzsh";
|
||||
repo = "ohmyzsh";
|
||||
sha256 = "MadBDgV3a4jOB5vmUVT4WUDJavQEQVjSYTmGUOApQ/s=";
|
||||
sha256 = "pJRe3UEpXpfop4huOzWwxivyCRJKIDN/y+Slv8bKcmk=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@ -7,13 +7,6 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ fuse libmtp glib libid3tag libmad ];
|
||||
|
||||
# adding LIBS is a hack, duno why it does not find libid3tag.so by adding buildInputs
|
||||
preConfigure = ''
|
||||
export MAD_CFLAGS=${libmad}/include
|
||||
export MAD_LIBS=${libmad}/lib/libmad.so
|
||||
export LIBS=${libid3tag}/lib/libid3tag.so
|
||||
'';
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.adebenham.com/files/mtp/mtpfs-${version}.tar.gz";
|
||||
sha256 = "07acrqb17kpif2xcsqfqh5j4axvsa4rnh6xwnpqab5b9w5ykbbqv";
|
||||
|
||||
@ -24831,6 +24831,8 @@ with pkgs;
|
||||
|
||||
asterisk-module-sccp = callPackage ../servers/asterisk/sccp { };
|
||||
|
||||
asterisk-ldap = lowPrio (asterisk.override { ldapSupport = true; });
|
||||
|
||||
sabnzbd = callPackage ../servers/sabnzbd { };
|
||||
|
||||
baserow = callPackage ../servers/baserow { };
|
||||
|
||||
@ -19,15 +19,12 @@ let
|
||||
# Packages that are potentially overridden and used as deps here.
|
||||
boost
|
||||
volk
|
||||
logLib
|
||||
;
|
||||
inherit mkDerivationWith mkDerivation;
|
||||
} // lib.optionalAttrs (gnuradio.hasFeature "gr-uhd") {
|
||||
inherit (gnuradio) uhd;
|
||||
} // (if (lib.versionAtLeast gnuradio.versionAttr.major "3.10") then {
|
||||
inherit (gnuradio) spdlog;
|
||||
} else {
|
||||
inherit (gnuradio) log4cpp;
|
||||
}));
|
||||
});
|
||||
in {
|
||||
|
||||
inherit callPackage mkDerivation mkDerivationWith;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user