Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
39d4ab1e0b
|
|
@ -2471,6 +2471,12 @@
|
|||
fingerprint = "4EBB 30F1 E89A 541A A7F2 52BE 830A 9728 6309 66F4";
|
||||
}];
|
||||
};
|
||||
christophcharles = {
|
||||
email = "23055925+christophcharles@users.noreply.github.com";
|
||||
github = "christophcharles";
|
||||
githubId = 23055925;
|
||||
name = "Christoph Charles";
|
||||
};
|
||||
christopherpoole = {
|
||||
email = "mail@christopherpoole.net";
|
||||
github = "christopherpoole";
|
||||
|
|
|
|||
|
|
@ -1,29 +1,69 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, qttools
|
||||
, alsa-lib, ftgl, libGLU, libjack2, qtbase, rtmidi, wrapQtAppsHook
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, qttools
|
||||
, alsa-lib
|
||||
, ftgl
|
||||
, libGLU
|
||||
, qtbase
|
||||
, rtmidi
|
||||
, libjack2
|
||||
, fluidsynth
|
||||
, soundfont-fluid
|
||||
, unzip
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pianobooster";
|
||||
version = "0.7.2b";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "captnfab";
|
||||
owner = "pianobooster";
|
||||
repo = "PianoBooster";
|
||||
rev = "v${version}";
|
||||
sha256 = "03xcdnlpsij22ca3i6xj19yqzn3q2ch0d32r73v0c96nm04gvhjj";
|
||||
hash = "sha256-1WOlAm/HXSL6QK0Kd1mnFEZxxpMseTG+6WzgMNWt+RA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ];
|
||||
postPatch = ''
|
||||
substituteInPlace src/Settings.cpp src/GuiMidiSetupDialog.cpp \
|
||||
--replace "/usr/share/soundfonts" "${soundfont-fluid}/share/soundfonts" \
|
||||
--replace "FluidR3_GM.sf2" "FluidR3_GM2-2.sf2"
|
||||
'';
|
||||
|
||||
buildInputs = [ alsa-lib ftgl libGLU libjack2 qtbase rtmidi ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
ftgl
|
||||
libGLU
|
||||
qtbase
|
||||
rtmidi
|
||||
libjack2
|
||||
fluidsynth
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DOpenGL_GL_PREFERENCE=GLVND"
|
||||
"-DUSE_JACK=ON"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
qtWrapperArgs+=(
|
||||
--prefix PATH : "${lib.makeBinPath [ unzip ]}"
|
||||
)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A MIDI file player that teaches you how to play the piano";
|
||||
homepage = "https://github.com/captnfab/PianoBooster";
|
||||
homepage = "https://github.com/pianobooster/PianoBooster";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ goibhniu orivej ];
|
||||
|
|
|
|||
|
|
@ -72,6 +72,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/linuxmint/timeshift";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ShamrockLee ];
|
||||
maintainers = with maintainers; [ ShamrockLee bobby285271 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
|
|||
description = "A slick-looking LightDM greeter";
|
||||
homepage = "https://github.com/linuxmint/slick-greeter";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ water-sucks ];
|
||||
maintainers = with maintainers; [ water-sucks bobby285271 ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,6 +63,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/linuxmint/xed";
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ tu-maurice ];
|
||||
maintainers = with maintainers; [ tu-maurice bobby285271 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -85,6 +85,6 @@ python3.pkgs.buildPythonApplication rec {
|
|||
homepage = "https://github.com/linuxmint/sticky";
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ linsui ];
|
||||
maintainers = with maintainers; [ linsui bobby285271 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
, qtsvg
|
||||
, qtwebengine
|
||||
, qtwebchannel
|
||||
, withWebengine ? false
|
||||
, withWebengine ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
|
@ -32,7 +32,7 @@ stdenv.mkDerivation {
|
|||
|
||||
preConfigure = ''
|
||||
python gen-resources.py
|
||||
echo 'const char VERSION_STRING[] = "${version}";' > src/version.h
|
||||
echo 'const char VERSION_STRING[] = "${version}";' > src/app/version.h
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, callPackage
|
||||
, fetchFromGitHub
|
||||
, fetchzip
|
||||
, ffmpeg_4
|
||||
, ffmpeg
|
||||
, pjsip
|
||||
, opendht
|
||||
, jack
|
||||
|
|
@ -12,11 +12,11 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "20220726.1515.da8d1da";
|
||||
version = "20220825.0828.c10f01f";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://dl.jami.net/release/tarballs/jami_${version}.tar.gz";
|
||||
hash = "sha256-yK+xo+YpNYmmWyNAE31hiL6HLvDdEFkm8FO6LQmPCL0=";
|
||||
hash = "sha256-axQYU7+kOFE9SnI8fR4F6NFvD9ITZ85UJhg5OVniSlg=";
|
||||
|
||||
stripRoot = false;
|
||||
postFetch = ''
|
||||
|
|
@ -40,7 +40,12 @@ let
|
|||
readLinesToList = with builtins; file: filter (s: isString s && stringLength s > 0) (split "\n" (readFile file));
|
||||
in
|
||||
rec {
|
||||
ffmpeg-jami = ffmpeg_4.overrideAttrs (old:
|
||||
ffmpeg-jami = (ffmpeg.override rec {
|
||||
version = "5.0.1";
|
||||
branch = version;
|
||||
sha256 = "sha256-KN8z1AChwcGyDQepkZeAmjuI73ZfXwfcH/Bn+sZMWdY=";
|
||||
doCheck = false;
|
||||
}).overrideAttrs (old:
|
||||
let
|
||||
patch-src = src + "/daemon/contrib/src/ffmpeg/";
|
||||
in
|
||||
|
|
@ -51,10 +56,6 @@ rec {
|
|||
++ lib.optionals stdenv.isLinux (readLinesToList ./config/ffmpeg_args_linux)
|
||||
++ lib.optionals (stdenv.isx86_32 || stdenv.isx86_64) (readLinesToList ./config/ffmpeg_args_x86);
|
||||
outputs = [ "out" "doc" ];
|
||||
meta = old.meta // {
|
||||
# undefined reference to `ff_nlmeans_init_aarch64'
|
||||
broken = stdenv.isAarch64;
|
||||
};
|
||||
});
|
||||
|
||||
pjsip-jami = pjsip.overrideAttrs (old:
|
||||
|
|
@ -62,23 +63,19 @@ rec {
|
|||
patch-src = src + "/daemon/contrib/src/pjproject/";
|
||||
in
|
||||
rec {
|
||||
version = "4af5d666d18837abaac94c8ec6bfc84984dcf1e2";
|
||||
version = "513a3f14c44b2c2652f9219ec20dea64b236b713";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "savoirfairelinux";
|
||||
repo = "pjproject";
|
||||
rev = version;
|
||||
sha256 = "sha256-ENRfQh/HCXqInTV0tu8tGQO7+vTbST6XXpptERXMACE=";
|
||||
sha256 = "sha256-93AlJGMnlzJMrJquelpHQQKjhEgfpTFXTMqkBnm87u8=";
|
||||
};
|
||||
|
||||
patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches));
|
||||
|
||||
configureFlags = (readLinesToList ./config/pjsip_args_common)
|
||||
++ lib.optionals stdenv.isLinux (readLinesToList ./config/pjsip_args_linux);
|
||||
|
||||
meta = {
|
||||
knownVulnerabilities = [ "CVE-2022-39269" "CVE-2022-39244" ];
|
||||
} // old.meta;
|
||||
});
|
||||
|
||||
opendht-jami = opendht.override {
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ echo "Latest version: ${version}"
|
|||
|
||||
update-source-version jami-daemon "$version" --file=$jami_dir/default.nix
|
||||
|
||||
src=$(nix-build --no-out-link -A jami-libclient.src)
|
||||
src=$(nix-build --no-out-link -A jami-daemon.src)
|
||||
|
||||
config_dir="$jami_dir/config"
|
||||
mkdir -p $config_dir
|
||||
|
|
@ -47,7 +47,7 @@ echo "${pjsip_patches}" > "$config_dir/pjsip_patches"
|
|||
|
||||
# Update pjsip version
|
||||
pjsip_version=$(sed -n -E 's/.*PJPROJECT_VERSION := ([0-9a-f]+).*/\1/p' ${src}/daemon/contrib/src/pjproject/rules.mak)
|
||||
update-source-version jami-daemon.pjsip "$pjsip_version" --file=pkgs/applications/networking/instant-messengers/jami/daemon.nix
|
||||
update-source-version jami.pjsip-jami "$pjsip_version" --file=$jami_dir/default.nix
|
||||
|
||||
pjsip_rules="${src}/daemon/contrib/src/pjproject/rules.mak"
|
||||
|
||||
|
|
|
|||
|
|
@ -110,11 +110,11 @@ in stdenv.mkDerivation {
|
|||
|
||||
# Fix the desktop link
|
||||
substituteInPlace $out/share/applications/skypeforlinux.desktop \
|
||||
--replace /usr/bin/ $out/bin/
|
||||
--replace /usr/bin/ ""
|
||||
substituteInPlace $out/share/applications/skypeforlinux-share.desktop \
|
||||
--replace /usr/bin/ $out/bin/
|
||||
--replace /usr/bin/ ""
|
||||
substituteInPlace $out/share/kservices5/ServiceMenus/skypeforlinux.desktop \
|
||||
--replace /usr/bin/ $out/bin/
|
||||
--replace /usr/bin/ ""
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -55,11 +55,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "webex";
|
||||
version = "42.7.0.22904";
|
||||
version = "42.10.0.24000";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20220907184519/Webex_ubuntu.7z";
|
||||
sha256 = "731ec24d95243171649213b19a1709bef98846fd631f54a27d11fe16ebcc7d33";
|
||||
url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20221019145240/Webex_ubuntu.7z";
|
||||
sha256 = "03b77a3fcce76f04cf684bcdecb3bcce97c5a8b6cc36b40967cc14fa9a46c102";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "irssi";
|
||||
version = "1.4.2";
|
||||
version = "1.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "irssi";
|
||||
repo = "irssi";
|
||||
rev = version;
|
||||
hash = "sha256-dQZ/CeBfcfWGjKPF3fR62JDqyEXGv5hd9VT4OEbgJhQ=";
|
||||
hash = "sha256-wRJp4KfI+2IAJ70XW7+0LR83cRvS/SGq7CpDVuc636Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freedv";
|
||||
version = "1.8.3.1";
|
||||
version = "1.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drowe67";
|
||||
repo = "freedv-gui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LPCY5gPinxJkfPfumKggI/JQorcW+Qw/ZAP6XQmPkeA=";
|
||||
hash = "sha256-X/jL6q2yLNtRq7Xg9JeXu1zXD0KCs59D1poA9hM3Ndo=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
|
|
@ -58,12 +58,15 @@ stdenv.mkDerivation rec {
|
|||
cmakeFlags = [
|
||||
"-DUSE_INTERNAL_CODEC2:BOOL=FALSE"
|
||||
"-DUSE_STATIC_DEPS:BOOL=FALSE"
|
||||
"-DUNITTEST=ON"
|
||||
] ++ lib.optionals pulseSupport [ "-DUSE_PULSEAUDIO:BOOL=TRUE" ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
|
||||
"-DAPPLE_OLD_XCODE"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://freedv.org/";
|
||||
description = "Digital voice for HF radio";
|
||||
|
|
|
|||
50
pkgs/applications/science/biology/mmseqs2/default.nix
Normal file
50
pkgs/applications/science/biology/mmseqs2/default.nix
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, xxd
|
||||
, perl
|
||||
, installShellFiles
|
||||
, enableAvx2 ? stdenv.hostPlatform.avx2Support
|
||||
, enableSse4_1 ? stdenv.hostPlatform.sse4_1Support
|
||||
, enableMpi ? false
|
||||
, mpi
|
||||
, openmp
|
||||
, zlib
|
||||
, bzip2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mmseqs2";
|
||||
version = "14-7e284";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "soedinglab";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-pVryZGblgMEqJl5M20CHxav269yGY6Y4ci+Gxt6SHOU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake xxd perl installShellFiles ];
|
||||
cmakeFlags =
|
||||
lib.optional enableAvx2 "-DHAVE_AVX2=1"
|
||||
++ lib.optional enableSse4_1 "-DHAVE_SSE4_1=1"
|
||||
++ lib.optional enableMpi "-DHAVE_MPI=1";
|
||||
|
||||
buildInputs =
|
||||
lib.optionals stdenv.cc.isClang [ openmp zlib bzip2 ]
|
||||
++ lib.optional enableMpi mpi;
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --bash --cmd mmseqs $out/util/bash-completion.sh
|
||||
rm -r $out/util/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Ultra fast and sensitive sequence search and clustering suite";
|
||||
homepage = "https://mmseqs.com/";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ natsukium ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -17,17 +17,18 @@
|
|||
, tomlkit
|
||||
, typing-extensions
|
||||
, argcomplete
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "commitizen";
|
||||
version = "2.35.0";
|
||||
version = "2.37.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "commitizen-tools";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9ek6m5k01sGVHwqWXjWYDsPmIeAgK+H23D9sF5hjrf0=";
|
||||
hash = "sha256-wo1I6QDWLxByHISmkPdass+BcKh0oxR5hD31UN/5+WQ=";
|
||||
deepClone = true;
|
||||
};
|
||||
|
||||
|
|
@ -80,9 +81,14 @@ buildPythonApplication rec {
|
|||
"test_get_commits_with_signature"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to create committing rules for projects, auto bump versions, and generate changelogs";
|
||||
homepage = "https://github.com/commitizen-tools/commitizen";
|
||||
changelog = "https://github.com/commitizen-tools/commitizen/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lovesegfault anthonyroussel ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/linuxmint/hypnotix";
|
||||
changelog = "https://github.com/linuxmint/hypnotix/blob/${src.rev}/debian/changelog";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
maintainers = with lib.maintainers; [ dotlambda bobby285271 ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
|
|||
description = "A generic media player from Linux Mint";
|
||||
license = with licenses; [ gpl2Plus lgpl21Plus ];
|
||||
homepage = "https://github.com/linuxmint/xplayer";
|
||||
maintainers = with maintainers; [ tu-maurice ];
|
||||
maintainers = with maintainers; [ tu-maurice bobby285271 ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Playlist parsing library for xplayer";
|
||||
homepage = "https://github.com/linuxmint/xplayer-plparser";
|
||||
maintainers = with maintainers; [ tu-maurice ];
|
||||
maintainers = with maintainers; [ tu-maurice bobby285271 ];
|
||||
license = licenses.lgpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
|||
33
pkgs/development/compilers/nqc/default.nix
Normal file
33
pkgs/development/compilers/nqc/default.nix
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nqc";
|
||||
version = "3.1.r6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bricxcc.sourceforge.net/nqc/release/nqc-${version}.tgz";
|
||||
sha256 = "sha256-v9XmVPY5r3pYjP3vTSK9Xvz/9UexClbOvr3ljvK/52Y=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
patches = [
|
||||
./nqc-unistd.patch
|
||||
(fetchpatch {
|
||||
url = "https://sourceforge.net/p/bricxcc/patches/_discuss/thread/00b427dc/b84b/attachment/nqc-01-Linux_usb_and_tcp.diff";
|
||||
sha256 = "sha256-UZmmhhhfLAUus36TOBhiDQ8KUeEdYhGHVFwqKqDIqII=";
|
||||
})
|
||||
];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://bricxcc.sourceforge.net/nqc/";
|
||||
description = "A programming language for several LEGO MINDSTORMS products including the RCX, CyberMaster, and Scout";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.mpl10;
|
||||
maintainers = with maintainers; [ christophcharles ];
|
||||
};
|
||||
}
|
||||
11
pkgs/development/compilers/nqc/nqc-unistd.patch
Normal file
11
pkgs/development/compilers/nqc/nqc-unistd.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
diff -ruN nqc-3.1.r6-old/compiler/lexer.cpp nqc-3.1.r6-new/compiler/lexer.cpp
|
||||
--- nqc-3.1.r6-old/compiler/lexer.cpp 2007-06-06 20:19:10.000000000 +0200
|
||||
+++ nqc-3.1.r6-new/compiler/lexer.cpp 2022-10-13 07:57:08.247213954 +0200
|
||||
@@ -11,6 +11,7 @@
|
||||
#define YY_FLEX_MINOR_VERSION 5
|
||||
|
||||
#include <stdio.h>
|
||||
+#include <unistd.h>
|
||||
|
||||
#if defined(__MWERKS__) && !__MACH__ && !YY_NEVER_INTERACTIVE
|
||||
#include <unix.h>
|
||||
|
|
@ -26,7 +26,7 @@ self: super:
|
|||
|
||||
# GHCJS does not ship with the same core packages as GHC.
|
||||
# https://github.com/ghcjs/ghcjs/issues/676
|
||||
stm = doJailbreak self.stm_2_5_0_2;
|
||||
stm = doJailbreak self.stm_2_5_1_0;
|
||||
exceptions = dontCheck self.exceptions_0_10_5;
|
||||
|
||||
## OTHER PACKAGES
|
||||
|
|
|
|||
|
|
@ -1,4 +1,11 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, freedvSupport ? false
|
||||
, lpcnetfreedv
|
||||
, codec2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "codec2";
|
||||
|
|
@ -13,6 +20,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = lib.optionals freedvSupport [
|
||||
lpcnetfreedv
|
||||
];
|
||||
|
||||
# Install a binary that is used by openwebrx
|
||||
postInstall = ''
|
||||
install -Dm0755 src/freedv_rx -t $out/bin/
|
||||
|
|
@ -26,6 +37,8 @@ stdenv.mkDerivation rec {
|
|||
cmakeFlags = [
|
||||
# RPATH of binary /nix/store/.../bin/freedv_rx contains a forbidden reference to /build/
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=ON"
|
||||
] ++ lib.optionals freedvSupport [
|
||||
"-DLPCNET=ON"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -42,13 +42,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libvgm";
|
||||
version = "unstable-2022-06-18";
|
||||
version = "unstable-2022-08-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ValleyBell";
|
||||
repo = "libvgm";
|
||||
rev = "001ca758538ca3f82403dff654d82342730b215d";
|
||||
sha256 = "O3jvEEW1M0cwZoG6j2ndmuQW4jP0dvt6gGp2BS4VD5s=";
|
||||
rev = "0e349256338144205303a1495ddc788a854be1eb";
|
||||
sha256 = "FNNPiIfBUxkwgEbiFebPGn6ZIxv3ypDefcOzC6r94hE=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
|
|
|||
|
|
@ -4,21 +4,21 @@ let
|
|||
dataVersion = "191005_v1.0";
|
||||
data = fetchurl {
|
||||
url = "http://rowetel.com/downloads/deep/lpcnet_${dataVersion}.tgz";
|
||||
sha256 = "1j1695hm2pg6ri611f9kr3spm4yxvpikws55z9zxizai8y94152h";
|
||||
sha256 = "sha256-UJRAkkdR/dh/+qVoPuPd3ZN69cgzuRBMzOZdUWFJJsg=";
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lpcnetfreedv";
|
||||
version = "unstable-2021-06-29";
|
||||
version = "unstable-2022-08-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drowe67";
|
||||
repo = "LPCNet";
|
||||
rev = "0dc5935bbf49ff3ba3c9654cc2f802838ebbaead";
|
||||
sha256 = "0r6488z40fkar11ync8achpg5l6qz7y7cbh7cs3b3w4fsxn58q9i";
|
||||
rev = "67a6eb74d0c07faddcdce199856862cc45779d25";
|
||||
sha256 = "sha256-eHYZoDgoZBuuLvQn9X7H/zmK5onOAniOgY1/8RVn8gk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ codec2 ];
|
||||
|
||||
postPatch = ''
|
||||
mkdir build
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sundials";
|
||||
version = "6.4.0";
|
||||
version = "6.4.1";
|
||||
|
||||
outputs = [ "out" "examples" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/LLNL/sundials/releases/download/v${version}/sundials-${version}.tar.gz";
|
||||
hash = "sha256-Cv+AOhLG0pjQW1aDkZfdCYWGMYZAF+JV7Ynii0m2UvE=";
|
||||
hash = "sha256-e/EKjSkgWRrz+6LbklSOka1g63JBqyM1CpsbxR4F6NA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
|
||||
let
|
||||
pname = "box";
|
||||
version = "3.16.0";
|
||||
version = "4.1.0";
|
||||
in
|
||||
mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/box-project/box/releases/download/${version}/box.phar";
|
||||
sha256 = "sha256-9QjijzCdfpWjGb3NXxPc+7GOuRy3psrJtpvHeZ14vfk=";
|
||||
sha256 = "sha256-DtrTsCocCpLngiEPrKBrFeU+OnND8AoI83g+Y7+zHzs=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
|
||||
let
|
||||
pname = "psalm";
|
||||
version = "4.25.0";
|
||||
version = "4.29.0";
|
||||
in
|
||||
mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/vimeo/psalm/releases/download/v${version}/psalm.phar";
|
||||
sha256 = "sha256-bEv9YzBycN+fs3DeAU/QpuOvsmUFLgrltGEe2KuUM0c=";
|
||||
url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar";
|
||||
sha256 = "q+OjEPNAPwSjtnbfBynbbJy3WDITr01ci8O74BMO0Og=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -12,12 +12,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-compat";
|
||||
version = "2.2.1";
|
||||
version = "2.2.3";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-egEnU6CgLasvIrDldOPnsAOZ9mBgYVRHT/4lYh+oDTs=";
|
||||
sha256 = "sha256-H06GH6OwhDaIrdMsWHOyCEjr75bvcV0dgI0mWDViBCg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "emoji";
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "carpedm20";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-mcbrlPD2BHjm4WJQZrymv+2wK2NUjv+qvpD/G7iCjwA=";
|
||||
hash = "sha256-3mCzbFuBIMdF6tbKLxqNKAO50vaRWeOxpydJ4ZeE+Vc=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
let
|
||||
pname = "findpython";
|
||||
version = "0.2.1";
|
||||
version = "0.2.2";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Q5Shy828+NEOo0OeLYCGsuwHRQcJe25tvuGAKMblKwg=";
|
||||
hash = "sha256-gFV5YcBM8cjEukyjrHz3bsJ/qSeIpq9Cy3AeNFDElDA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyterlab_server";
|
||||
version = "2.16.1";
|
||||
version = "2.16.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-/g3lWP87tEejLiQJmqfhdET9vIwI9tvAFxyxoK44LT8=";
|
||||
hash = "sha256-BwB6Ogowv8ZCSyi3bfjWc4bMLV+fQohnc7GzxHPLmj8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "libpyfoscam";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-2E6zQT86UEOKoFnAfXfeWt352HIdOQZBGy5vR0WQO6Y=";
|
||||
hash = "sha256-FLPerVzx2+3f5biiqt0JHJjBuMIalUBkY+bGb2ShVao=";
|
||||
};
|
||||
|
||||
# tests need access to a camera
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "miniaudio";
|
||||
version = "1.52";
|
||||
version = "1.53";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "irmen";
|
||||
repo = "pyminiaudio";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-qy2FKzg02M1MwUwuPKmK8uGhCrR19Hyzg2YRmlHl67s=";
|
||||
sha256 = "sha256-TB4V41GN48Q2ocsDM1uIyRziY+y8njRNoPxZpTqk+Tk=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "moku";
|
||||
version = "2.4";
|
||||
version = "2.5.1";
|
||||
|
||||
/*
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
*/
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-yFA2NkiRt6wjXJk6i7oxrjD597acAligWId3MDYwTd0=";
|
||||
hash = "sha256-oFRwJ6i4wfjA3E2QMqE4ybutT7OZiFZ3LYXoplY3D/I=";
|
||||
};
|
||||
/*
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-bsblan";
|
||||
version = "0.5.6";
|
||||
version = "0.5.7";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "liudger";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-eTKexiuomlTryy2bD2w9Pzhb4R9C3OIbLNX+7h/5l+c=";
|
||||
hash = "sha256-eavARej+R8SPNuwX6LOGr43SJi1AuZszThJVG00vKhQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -24,6 +24,12 @@ buildPythonPackage rec {
|
|||
hash = "sha256-2cxAaSyreIzQzCUtiolEV7JbGFKL8Mob3337J0jlMsU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# urllib3[secure] is not picked-up
|
||||
substituteInPlace setup.py \
|
||||
--replace "urllib3[secure]" "urllib3"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
urllib3
|
||||
|
|
@ -31,12 +37,11 @@ buildPythonPackage rec {
|
|||
] ++ urllib3.optional-dependencies.secure;
|
||||
|
||||
checkInputs = [
|
||||
responses
|
||||
mock
|
||||
pytestCheckHook
|
||||
responses
|
||||
];
|
||||
|
||||
|
||||
pythonImportsCheck = [
|
||||
"tank_utility"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -41,6 +41,6 @@ buildPythonPackage rec {
|
|||
description = "Cross-desktop libraries and common resources for python";
|
||||
license = licenses.lgpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.mkg20001 ];
|
||||
maintainers = teams.cinnamon.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "bob";
|
||||
version = "0.6.2";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "benchkram";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-Bq/BL45EN4h7eV1glCkuVqUhZCrDS5b5mVg6JJxlTD4=";
|
||||
hash = "sha256-jZDyZVjo4Purt2tabJew5N4MZmLXli6gqBTejv5FGJM=";
|
||||
};
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.Version=${version}" ];
|
||||
|
||||
vendorHash = "sha256-jakmXkDHjcA1BOIorrP2ZukcJhosbkJoC+Y/+wAPBCc=";
|
||||
vendorHash = "sha256-dmMoFyl9IX0QS6sNC6qzC4DQQQfvxmxuUeUfx0DBd/I=";
|
||||
|
||||
excludedPackages = [ "example/server-db" "test/e2e" "tui-example" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "konf";
|
||||
version = "0.4.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SimonTheLeg";
|
||||
repo = "konf-go";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8TXr/jYMl3NLERtLkm7qG97IL/idz4xxP0g0LEy4/j8=";
|
||||
hash = "sha256-uzB3quuex00Gp7YRkgo7gF92oPcBoQtLwG6hqMzK6oo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-sB3j19HrTtaRqNcooqNy8vBvuzxxyGDa7MOtiGoVgN8=";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "grcov";
|
||||
version = "0.8.12";
|
||||
version = "0.8.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mozilla";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-any14rCn4hE4j2AM4H4jSHIB9qTgPYb6dCZqoRerxXE=";
|
||||
sha256 = "sha256-fyITsOlkBY1f9AjQqUII7G1Onm0i0FIqNspPi8J+eOM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-uY/PCYqtoqffod6Ts7LsRY7YWN2O8d5J73rO6Tr12eM=";
|
||||
cargoSha256 = "sha256-qbxJJGwJ7hRNIujud10AYnM2NaNwjBB5zhOxXp/5z/k=";
|
||||
|
||||
# tests do not find grcov path correctly
|
||||
checkFlags = let
|
||||
|
|
|
|||
|
|
@ -115,6 +115,12 @@ let
|
|||
IOSCHED_BFQ = whenAtLeast "4.12" module;
|
||||
};
|
||||
|
||||
|
||||
timer = {
|
||||
# Enable Full Dynticks System.
|
||||
NO_HZ_FULL = yes;
|
||||
};
|
||||
|
||||
# Enable NUMA.
|
||||
numa = {
|
||||
NUMA = option yes;
|
||||
|
|
|
|||
|
|
@ -3,28 +3,15 @@
|
|||
let
|
||||
# These names are how they are designated in https://xanmod.org.
|
||||
ltsVariant = {
|
||||
version = "5.15.70";
|
||||
hash = "sha256-gMtGoj/HzMqd6Y3PSc6QTsu/PI7vfb+1pg4mt878cxs=";
|
||||
version = "5.15.75";
|
||||
hash = "sha256-tgm5nmguEfRFq3OhmZgRgFLIW7E798Rv1basxnfdqLI=";
|
||||
variant = "lts";
|
||||
};
|
||||
|
||||
currentVariant = {
|
||||
version = "5.19.13";
|
||||
hash = "sha256-BzQH4c24CtE3R5HNe2sOc3McVkRmf/RKOOjuf1W4YfE=";
|
||||
variant = "current";
|
||||
};
|
||||
|
||||
nextVariant = {
|
||||
version = "6.0.0";
|
||||
hash = "sha256-E7T8eHwMKYShv4KWdCbHQmpn+54edJoKdimZY3GFbPU=";
|
||||
variant = "next";
|
||||
};
|
||||
|
||||
ttVariant = {
|
||||
version = "5.15.54";
|
||||
suffix = "xanmod1-tt";
|
||||
hash = "sha256-4ck9PAFuIt/TxA/U+moGlVfCudJnzSuAw7ooFG3OJis=";
|
||||
variant = "tt";
|
||||
mainVariant = {
|
||||
version = "6.0.6";
|
||||
hash = "sha256-JMfAtiPDgoVF+ypeFXev06PL39ZM2H7m07IxpasjAoM=";
|
||||
variant = "main";
|
||||
};
|
||||
|
||||
xanmodKernelFor = { version, suffix ? "xanmod1", hash, variant }: buildLinux (args // rec {
|
||||
|
|
@ -46,6 +33,10 @@ let
|
|||
TCP_CONG_BBR2 = yes;
|
||||
DEFAULT_BBR2 = yes;
|
||||
|
||||
# Google's Multigenerational LRU framework
|
||||
LRU_GEN = yes;
|
||||
LRU_GEN_ENABLED = yes;
|
||||
|
||||
# FQ-PIE Packet Scheduling
|
||||
NET_SCH_DEFAULT = yes;
|
||||
DEFAULT_FQ_PIE = yes;
|
||||
|
|
@ -56,12 +47,11 @@ let
|
|||
|
||||
# WineSync driver for fast kernel-backed Wine
|
||||
WINESYNC = module;
|
||||
} // lib.optionalAttrs (variant == "tt") {
|
||||
# removed options
|
||||
CFS_BANDWIDTH = lib.mkForce (option no);
|
||||
RT_GROUP_SCHED = lib.mkForce (option no);
|
||||
SCHED_AUTOGROUP = lib.mkForce (option no);
|
||||
SCHED_CORE = lib.mkForce (option no);
|
||||
|
||||
# Preemptive Full Tickless Kernel at 500Hz
|
||||
HZ = freeform "500";
|
||||
HZ_500 = yes;
|
||||
HZ_1000 = no;
|
||||
};
|
||||
|
||||
extraMeta = {
|
||||
|
|
@ -74,7 +64,5 @@ let
|
|||
in
|
||||
{
|
||||
lts = xanmodKernelFor ltsVariant;
|
||||
current = xanmodKernelFor currentVariant;
|
||||
next = xanmodKernelFor nextVariant;
|
||||
tt = xanmodKernelFor ttVariant;
|
||||
main = xanmodKernelFor mainVariant;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "v4l2loopback";
|
||||
version = "unstable-2021-07-13-${kernel.version}";
|
||||
version = "unstable-2022-08-05-${kernel.version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "umlaeute";
|
||||
repo = "v4l2loopback";
|
||||
rev = "baf9de279afc7a7c7513e9c40a0c9ff88f456af4";
|
||||
sha256 = "sha256-uglYTeqz81fgkKYYU9Cw8x9+S088jGxDEGkb3rmkhrw==";
|
||||
rev = "76434ab6f71d5ecbff8a218ff6bed91ea2bf73b8";
|
||||
sha256 = "sha256-TdZacRkFAO2HAEbljzXeJ241VcDqSwBECq3bnn7yvBY=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" "pic" ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "VictoriaMetrics";
|
||||
version = "1.82.1";
|
||||
version = "1.83.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Lor4rpL19xc/eA2quJ1D0WrJiviEcKnArBKUQhb9Z0k=";
|
||||
sha256 = "sha256-bc13aIo2gCHZfBRbi5CoPLcCGoNJgTuWJbCwqX/QgtU=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -257,13 +257,6 @@ in
|
|||
inherit (self.darwin) cctools;
|
||||
inherit (self.darwin.apple_sdk.frameworks) CoreServices;
|
||||
};
|
||||
mariadb_107 = self.callPackage generic {
|
||||
# Supported until 2023-02. TODO: remove ahead of 22.11 release.
|
||||
version = "10.7.6";
|
||||
hash = "sha256-erX7pDmQV33BdPG5a9NAszN8G9Rv48NmIgsJ0siNLqA=";
|
||||
inherit (self.darwin) cctools;
|
||||
inherit (self.darwin.apple_sdk.frameworks) CoreServices;
|
||||
};
|
||||
mariadb_108 = self.callPackage generic {
|
||||
# Supported until 2023-05
|
||||
version = "10.8.5";
|
||||
|
|
@ -272,7 +265,7 @@ in
|
|||
inherit (self.darwin.apple_sdk.frameworks) CoreServices;
|
||||
};
|
||||
mariadb_109 = self.callPackage generic {
|
||||
# Supported until 2023-08(?)
|
||||
# Supported until 2023-08
|
||||
version = "10.9.3";
|
||||
hash = "sha256-mh4imXL8zMgnDmM/aNP7gk2hUdz09T2h342UesqHa+4=";
|
||||
inherit (self.darwin) cctools;
|
||||
|
|
|
|||
|
|
@ -1,94 +0,0 @@
|
|||
{ lib, stdenv, fetchurl, cmake, bison, pkg-config, nukeReferences
|
||||
, boost, libedit, libevent, lz4, ncurses, openssl, protobuf, readline, zlib, perl
|
||||
, cctools, CoreServices, developer_cmds
|
||||
, libtirpc, rpcsvc-proto, nixosTests
|
||||
}:
|
||||
|
||||
# Note: zlib is not required; MySQL can use an internal zlib.
|
||||
|
||||
let
|
||||
self = stdenv.mkDerivation rec {
|
||||
pname = "mysql";
|
||||
version = "5.7.39";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://mysql/MySQL-5.7/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-ERw6ypGJfkUwOds5GkdSZeAg/ZIcuXMHwACEqI5NYQQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./mysql-5.7-add-protobuf-3.8+-support.patch
|
||||
];
|
||||
|
||||
preConfigure = lib.optionalString stdenv.isDarwin ''
|
||||
ln -s /bin/ps $TMPDIR/ps
|
||||
export PATH=$PATH:$TMPDIR
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ bison cmake pkg-config nukeReferences ]
|
||||
++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ];
|
||||
|
||||
buildInputs = [ boost libedit libevent lz4 ncurses openssl protobuf readline zlib ]
|
||||
++ lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ]
|
||||
++ lib.optionals stdenv.isLinux [ libtirpc ];
|
||||
|
||||
outputs = [ "out" "static" ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DWITH_SSL=yes"
|
||||
"-DWITH_EMBEDDED_SERVER=yes"
|
||||
"-DWITH_UNIT_TESTS=no"
|
||||
"-DWITH_EDITLINE=system"
|
||||
"-DWITH_LIBEVENT=system"
|
||||
"-DWITH_LZ4=system"
|
||||
"-DWITH_PROTOBUF=system"
|
||||
"-DWITH_ZLIB=system"
|
||||
"-DWITH_ARCHIVE_STORAGE_ENGINE=yes"
|
||||
"-DWITH_BLACKHOLE_STORAGE_ENGINE=yes"
|
||||
"-DWITH_FEDERATED_STORAGE_ENGINE=yes"
|
||||
"-DHAVE_IPV6=yes"
|
||||
"-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
|
||||
"-DMYSQL_DATADIR=/var/lib/mysql"
|
||||
"-DINSTALL_INFODIR=share/mysql/docs"
|
||||
"-DINSTALL_MANDIR=share/man"
|
||||
"-DINSTALL_PLUGINDIR=lib/mysql/plugin"
|
||||
"-DINSTALL_SCRIPTDIR=bin"
|
||||
"-DINSTALL_INCLUDEDIR=include/mysql"
|
||||
"-DINSTALL_DOCREADMEDIR=share/mysql"
|
||||
"-DINSTALL_SUPPORTFILESDIR=share/mysql"
|
||||
"-DINSTALL_MYSQLSHAREDIR=share/mysql"
|
||||
"-DINSTALL_MYSQLTESTDIR="
|
||||
"-DINSTALL_DOCDIR=share/mysql/docs"
|
||||
"-DINSTALL_SHAREDIR=share/mysql"
|
||||
];
|
||||
|
||||
CXXFLAGS = "-fpermissive -std=c++11";
|
||||
NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s";
|
||||
|
||||
prePatch = ''
|
||||
sed -i -e "s|/usr/bin/libtool|libtool|" cmake/merge_archives.cmake.in
|
||||
'';
|
||||
postInstall = ''
|
||||
nuke-refs "$out/share/mysql/docs/INFO_BIN"
|
||||
moveToOutput "lib/*.a" $static
|
||||
ln -s libmysqlclient${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libmysqlclient_r${stdenv.hostPlatform.extensions.sharedLibrary}
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
client = self;
|
||||
connector-c = self;
|
||||
server = self;
|
||||
mysqlVersion = "5.7";
|
||||
tests = nixosTests.mysql.mysql57;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.mysql.com/";
|
||||
description = "The world's most popular open source database";
|
||||
platforms = platforms.unix;
|
||||
license = with licenses; [
|
||||
artistic1 bsd0 bsd2 bsd3 bsdOriginal
|
||||
gpl2 lgpl2 lgpl21 mit publicDomain licenses.zlib
|
||||
];
|
||||
};
|
||||
}; in self
|
||||
|
|
@ -1,66 +0,0 @@
|
|||
diff --git a/cmake/build_configurations/compiler_options.cmake b/cmake/build_configurations/compiler_options.cmake
|
||||
index a935227e523..b4ebd61c5c1 100644
|
||||
--- a/cmake/build_configurations/compiler_options.cmake
|
||||
+++ b/cmake/build_configurations/compiler_options.cmake
|
||||
@@ -43,7 +43,7 @@ IF(UNIX)
|
||||
|
||||
# Default GCC flags
|
||||
IF(CMAKE_COMPILER_IS_GNUCC)
|
||||
- SET(COMMON_C_FLAGS "-fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
|
||||
+ SET(COMMON_C_FLAGS "-fno-omit-frame-pointer -fno-strict-aliasing")
|
||||
# Disable inline optimizations for valgrind testing to avoid false positives
|
||||
IF(WITH_VALGRIND)
|
||||
STRING_PREPEND(COMMON_C_FLAGS "-fno-inline ")
|
||||
@@ -68,7 +68,7 @@ IF(UNIX)
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
IF(CMAKE_COMPILER_IS_GNUCXX)
|
||||
- SET(COMMON_CXX_FLAGS "-fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
|
||||
+ SET(COMMON_CXX_FLAGS "-fno-omit-frame-pointer -fno-strict-aliasing")
|
||||
# GCC 6 has C++14 as default, set it explicitly to the old default.
|
||||
EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
|
||||
OUTPUT_VARIABLE GXX_VERSION)
|
||||
diff --git a/rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc b/rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc
|
||||
index 5dc91ba269c..3a45284859f 100644
|
||||
--- a/rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc
|
||||
+++ b/rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc
|
||||
@@ -629,12 +629,12 @@ class ErrorDumper : public ::google::protobuf::io::ErrorCollector
|
||||
std::stringstream m_out;
|
||||
|
||||
public:
|
||||
- virtual void AddError(int line, int column, const string & message)
|
||||
+ virtual void AddError(int line, int column, const std::string & message)
|
||||
{
|
||||
m_out << "ERROR in message: line " << line+1 << ": column " << column << ": " << message<<"\n";
|
||||
}
|
||||
|
||||
- virtual void AddWarning(int line, int column, const string & message)
|
||||
+ virtual void AddWarning(int line, int column, const std::string & message)
|
||||
{
|
||||
m_out << "WARNING in message: line " << line+1 << ": column " << column << ": " << message<<"\n";
|
||||
}
|
||||
diff --git a/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h b/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h
|
||||
index 90f7cc77a39..cf6c607a818 100644
|
||||
--- a/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h
|
||||
+++ b/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h
|
||||
@@ -36,7 +36,6 @@
|
||||
#include <google/protobuf/io/tokenizer.h>
|
||||
#include <google/protobuf/io/zero_copy_stream.h>
|
||||
#include <google/protobuf/wire_format_lite.h>
|
||||
-#include <google/protobuf/wire_format_lite_inl.h>
|
||||
#include <google/protobuf/dynamic_message.h>
|
||||
|
||||
#include "mysqlx_connection.pb.h"
|
||||
diff --git a/rapid/plugin/x/ngs/src/protocol_decoder.cc b/rapid/plugin/x/ngs/src/protocol_decoder.cc
|
||||
index 298b6a6884c..fae21d18f78 100644
|
||||
--- a/rapid/plugin/x/ngs/src/protocol_decoder.cc
|
||||
+++ b/rapid/plugin/x/ngs/src/protocol_decoder.cc
|
||||
@@ -123,7 +123,7 @@ Error_code Message_decoder::parse(Request &request)
|
||||
google::protobuf::io::CodedInputStream stream(reinterpret_cast<const uint8_t*>(request.buffer()),
|
||||
static_cast<int>(request.buffer_size()));
|
||||
// variable 'mysqlx_max_allowed_packet' has been checked when buffer was filling by data
|
||||
- stream.SetTotalBytesLimit(static_cast<int>(request.buffer_size()), -1 /*no warnings*/);
|
||||
+ stream.SetTotalBytesLimit(static_cast<int>(request.buffer_size()));
|
||||
// Protobuf limits the number of nested objects when decoding messages
|
||||
// lets set the value in explicit way (to ensure that is set accordingly with
|
||||
// out stack size)
|
||||
|
|
@ -5,17 +5,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "trivy";
|
||||
version = "0.33.0";
|
||||
version = "0.34.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Df81rXRPJ0wDQLVwEtk9mR9dHXqhLvkxhIfMdr5FTCE=";
|
||||
sha256 = "sha256-6xALedNX37+xUhvsVz7lWgqDppK0b3avUJ3zA6W2n6M=";
|
||||
};
|
||||
# hash missmatch on across linux and darwin
|
||||
proxyVendor = true;
|
||||
vendorSha256 = "sha256-I2myL1A3SrI4oBpIPWC0UItCvfslhIktD1ixVPDd3pA=";
|
||||
vendorSha256 = "sha256-CBsu2p66XgpeInKw/F6f6ULyoLc6cTtlXzNv3fI41YU=";
|
||||
|
||||
excludedPackages = "misc";
|
||||
|
||||
|
|
|
|||
|
|
@ -91,6 +91,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/linuxmint/blueberry";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
maintainers = with maintainers; [ bobby285271 romildo ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tar2ext4";
|
||||
version = "0.9.4";
|
||||
version = "0.9.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "hcsshim";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-P2ri+9MDV6ObyAiqUguifjqkPg+8zE+Ha6jgFS5aCsQ=";
|
||||
sha256 = "sha256-p64BQlxwXU9+6MbT2Aw9EcW82t2i3E6mKfOWoEEFf9g=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/cmd/tar2ext4";
|
||||
|
|
|
|||
|
|
@ -1,22 +1,23 @@
|
|||
{ lib, fetchFromGitHub, buildGoPackage }:
|
||||
{ lib, fetchFromGitHub, buildGoModule }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "lnch";
|
||||
version = "unstable-2021-02-10";
|
||||
|
||||
goPackagePath = "github.com/oem/${pname}";
|
||||
version = "unstable-2021-08-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oem";
|
||||
repo = pname;
|
||||
rev = "6ed336dd893afa071178b8ac6f6297d23fc55514";
|
||||
sha256 = "K2TV+mx6C3/REJyDpC6a/Zn/ZZFxkDMC3EnkveH6YNQ=";
|
||||
rev = "56b5e256b46c002821bef3b9c1b6f68b9dbb4207";
|
||||
sha256 = "sha256-Iro/FjPFMqulcK90MbludnOXkMEHW0QSCoQRL01/LDE";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/oem/lnch";
|
||||
description = "Launches a process and moves it out of the process group";
|
||||
license = licenses.mit;
|
||||
platforms = with platforms; all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchurl, makeWrapper, jre, graphviz }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.2022.10";
|
||||
version = "1.2022.12";
|
||||
pname = "plantuml";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/plantuml/plantuml/releases/download/v${version}/plantuml-pdf-${version}.jar";
|
||||
sha256 = "sha256-/I4wRcnF3Gad0Wr9aMe3CCAmAUODHSnDDAexVwiHE2E=";
|
||||
sha256 = "sha256-smxdHluEVJxga03aAu4WmTtbPsAKTckHsHn+aUNrtcg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tbls";
|
||||
version = "1.56.5";
|
||||
version = "1.56.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k1LoW";
|
||||
repo = "tbls";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gS3LOE6TiRMWXKjOO6D9YGMYsg/dGgoSNwZgwHLulrE=";
|
||||
hash = "sha256-GscA0nLGnz8Ae6V6vBgn7TCGj9AgzrIJREqkLKsZEH0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-pmnSeQHZEtsshldfq6D/r5pMYA5ivMWkzjOq2/WseYU=";
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nix-eval-jobs";
|
||||
version = "2.9.0";
|
||||
version = "2.11.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fN9D1rqJ4UFmCykTK8cU0oPWqN3wR8m9/zQ6fwVdBcY=";
|
||||
hash = "sha256-xgXYe/IJfGhLc1D9q+QdPHsjUlq10oKBbEn9AR37pn8=";
|
||||
};
|
||||
buildInputs = [
|
||||
boost
|
||||
|
|
|
|||
|
|
@ -836,6 +836,8 @@ mapAliases ({
|
|||
linux_rpi2 = linuxKernel.kernels.linux_rpi2;
|
||||
linux_rpi3 = linuxKernel.kernels.linux_rpi3;
|
||||
linux_rpi4 = linuxKernel.kernels.linux_rpi4;
|
||||
linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; # Added 2022-11-01
|
||||
linuxPackages_xanmod_tt = throw "linuxPackages_xanmod_tt was removed because upstream no longer offers this option"; # Added 2022-11-01
|
||||
|
||||
# Added 2020-04-04
|
||||
linuxPackages_testing_hardened = throw "linuxPackages_testing_hardened has been removed, please use linuxPackages_latest_hardened";
|
||||
|
|
|
|||
|
|
@ -14750,6 +14750,8 @@ with pkgs;
|
|||
|
||||
nasmfmt = callPackage ../development/tools/nasmfmt { };
|
||||
|
||||
nqc = callPackage ../development/compilers/nqc { };
|
||||
|
||||
nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { };
|
||||
|
||||
obliv-c = callPackage ../development/compilers/obliv-c
|
||||
|
|
@ -23989,7 +23991,6 @@ with pkgs;
|
|||
mariadb_104
|
||||
mariadb_105
|
||||
mariadb_106
|
||||
mariadb_107
|
||||
mariadb_108
|
||||
mariadb_109
|
||||
;
|
||||
|
|
@ -25160,8 +25161,6 @@ with pkgs;
|
|||
linux_xanmod_stable = linuxKernel.kernels.linux_xanmod_stable;
|
||||
linuxPackages_xanmod_latest = linuxKernel.packages.linux_xanmod_latest;
|
||||
linux_xanmod_latest = linuxKernel.kernels.linux_xanmod_latest;
|
||||
linuxPackages_xanmod_tt = linuxKernel.packages.linux_xanmod_tt;
|
||||
linux_xanmod_tt = linuxKernel.kernels.linux_xanmod_tt;
|
||||
|
||||
linux-doc = callPackage ../os-specific/linux/kernel/htmldocs.nix { };
|
||||
|
||||
|
|
@ -28650,6 +28649,9 @@ with pkgs;
|
|||
|
||||
freedv = callPackage ../applications/radio/freedv {
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit AVFoundation Cocoa CoreMedia;
|
||||
codec2 = codec2.override {
|
||||
freedvSupport = true;
|
||||
};
|
||||
};
|
||||
|
||||
freemind = callPackage ../applications/misc/freemind {
|
||||
|
|
@ -31079,7 +31081,7 @@ with pkgs;
|
|||
|
||||
pianobar = callPackage ../applications/audio/pianobar { };
|
||||
|
||||
pianobooster = qt5.callPackage ../applications/audio/pianobooster { stdenv = gcc10StdenvCompat; };
|
||||
pianobooster = qt5.callPackage ../applications/audio/pianobooster { };
|
||||
|
||||
pianoteq = callPackage ../applications/audio/pianoteq { };
|
||||
|
||||
|
|
@ -35203,6 +35205,10 @@ with pkgs;
|
|||
|
||||
minimap2 = callPackage ../applications/science/biology/minimap2 { };
|
||||
|
||||
mmseqs2 = callPackage ../applications/science/biology/mmseqs2 {
|
||||
inherit (llvmPackages) openmp;
|
||||
};
|
||||
|
||||
mosdepth = callPackage ../applications/science/biology/mosdepth { };
|
||||
|
||||
niftyreg = callPackage ../applications/science/biology/niftyreg { };
|
||||
|
|
|
|||
|
|
@ -232,9 +232,9 @@ in {
|
|||
};
|
||||
|
||||
linux_xanmod = xanmodKernels.lts;
|
||||
linux_xanmod_stable = xanmodKernels.current;
|
||||
linux_xanmod_latest = xanmodKernels.next;
|
||||
linux_xanmod_tt = xanmodKernels.tt;
|
||||
linux_xanmod_stable = xanmodKernels.main;
|
||||
linux_xanmod_latest = xanmodKernels.main;
|
||||
linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option";
|
||||
|
||||
linux_libre = deblobKernel packageAliases.linux_default.kernel;
|
||||
|
||||
|
|
@ -583,7 +583,7 @@ in {
|
|||
linux_xanmod = recurseIntoAttrs (packagesFor kernels.linux_xanmod);
|
||||
linux_xanmod_stable = recurseIntoAttrs (packagesFor kernels.linux_xanmod_stable);
|
||||
linux_xanmod_latest = recurseIntoAttrs (packagesFor kernels.linux_xanmod_latest);
|
||||
linux_xanmod_tt = recurseIntoAttrs (packagesFor kernels.linux_xanmod_tt);
|
||||
linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option";
|
||||
|
||||
hardkernel_4_14 = recurseIntoAttrs (packagesFor kernels.linux_hardkernel_4_14);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue