Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
@@ -7,12 +7,13 @@ let
|
||||
|
||||
inherit (builtins) concatStringsSep;
|
||||
|
||||
config_file_content = lib.generators.toKeyValue {} cfg.configItems;
|
||||
config_file_content = lib.generators.toKeyValue { } cfg.configItems;
|
||||
config_file = pkgs.writeText "rabbitmq.conf" config_file_content;
|
||||
|
||||
advanced_config_file = pkgs.writeText "advanced.config" cfg.config;
|
||||
|
||||
in {
|
||||
in
|
||||
{
|
||||
###### interface
|
||||
options = {
|
||||
services.rabbitmq = {
|
||||
@@ -79,7 +80,7 @@ in {
|
||||
};
|
||||
|
||||
configItems = mkOption {
|
||||
default = {};
|
||||
default = { };
|
||||
type = types.attrsOf types.str;
|
||||
example = literalExample ''
|
||||
{
|
||||
@@ -123,16 +124,38 @@ in {
|
||||
};
|
||||
|
||||
plugins = mkOption {
|
||||
default = [];
|
||||
default = [ ];
|
||||
type = types.listOf types.str;
|
||||
description = "The names of plugins to enable";
|
||||
};
|
||||
|
||||
pluginDirs = mkOption {
|
||||
default = [];
|
||||
default = [ ];
|
||||
type = types.listOf types.path;
|
||||
description = "The list of directories containing external plugins";
|
||||
};
|
||||
|
||||
managementPlugin = mkOption {
|
||||
description = "The options to run the management plugin";
|
||||
type = types.submodule {
|
||||
options = {
|
||||
enable = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
description = ''
|
||||
Whether to enable the management plugin
|
||||
'';
|
||||
};
|
||||
port = mkOption {
|
||||
default = 15672;
|
||||
type = types.port;
|
||||
description = ''
|
||||
On which port to run the management plugin
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -157,8 +180,13 @@ in {
|
||||
|
||||
services.rabbitmq.configItems = {
|
||||
"listeners.tcp.1" = mkDefault "${cfg.listenAddress}:${toString cfg.port}";
|
||||
} // optionalAttrs cfg.managementPlugin.enable {
|
||||
"management.tcp.port" = toString cfg.managementPlugin.port;
|
||||
"management.tcp.ip" = cfg.listenAddress;
|
||||
};
|
||||
|
||||
services.rabbitmq.plugins = optional cfg.managementPlugin.enable "rabbitmq_management";
|
||||
|
||||
systemd.services.rabbitmq = {
|
||||
description = "RabbitMQ Server";
|
||||
|
||||
@@ -180,7 +208,7 @@ in {
|
||||
RABBITMQ_ENABLED_PLUGINS_FILE = pkgs.writeText "enabled_plugins" ''
|
||||
[ ${concatStringsSep "," cfg.plugins} ].
|
||||
'';
|
||||
} // optionalAttrs (cfg.config != "") { RABBITMQ_ADVANCED_CONFIG_FILE = advanced_config_file; };
|
||||
} // optionalAttrs (cfg.config != "") { RABBITMQ_ADVANCED_CONFIG_FILE = advanced_config_file; };
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "${cfg.package}/sbin/rabbitmq-server";
|
||||
|
||||
@@ -226,8 +226,8 @@ in {
|
||||
${optionalString (! cfg.localDiscovery) "--profile=server"}
|
||||
else
|
||||
${if cfg.localDiscovery
|
||||
then "ipfs config profile apply local-discovery"
|
||||
else "ipfs config profile apply server"
|
||||
then "ipfs --offline config profile apply local-discovery"
|
||||
else "ipfs --offline config profile apply server"
|
||||
}
|
||||
fi
|
||||
'' + optionalString cfg.autoMount ''
|
||||
|
||||
@@ -4,9 +4,7 @@ with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.epmd;
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
###### interface
|
||||
options.services.epmd = {
|
||||
@@ -27,16 +25,31 @@ in
|
||||
an Erlang runtime that is already installed for other purposes.
|
||||
'';
|
||||
};
|
||||
listenStream = mkOption
|
||||
{
|
||||
type = types.str;
|
||||
default = "[::]:4369";
|
||||
description = ''
|
||||
the listenStream used by the systemd socket.
|
||||
see https://www.freedesktop.org/software/systemd/man/systemd.socket.html#ListenStream= for more informations.
|
||||
use this to change the port epmd will run on.
|
||||
if not defined, epmd will use "[::]:4369"
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
###### implementation
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [{
|
||||
assertion = cfg.listenStream == "[::]:4369" -> config.networking.enableIPv6;
|
||||
message = "epmd listens by default on ipv6, enable ipv6 or change config.services.epmd.listenStream";
|
||||
}];
|
||||
systemd.sockets.epmd = rec {
|
||||
description = "Erlang Port Mapper Daemon Activation Socket";
|
||||
wantedBy = [ "sockets.target" ];
|
||||
before = wantedBy;
|
||||
socketConfig = {
|
||||
ListenStream = "4369";
|
||||
ListenStream = cfg.listenStream;
|
||||
Accept = "false";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -46,7 +46,7 @@ let
|
||||
old_cfg=$(curl ${cfg.guiAddress}/rest/config)
|
||||
|
||||
# generate the new config by merging with the NixOS config options
|
||||
new_cfg=$(echo "$old_cfg" | ${pkgs.jq}/bin/jq -c '. * {
|
||||
new_cfg=$(printf '%s\n' "$old_cfg" | ${pkgs.jq}/bin/jq -c '. * {
|
||||
"devices": (${builtins.toJSON devices}${optionalString (! cfg.overrideDevices) " + .devices"}),
|
||||
"folders": (${builtins.toJSON folders}${optionalString (! cfg.overrideFolders) " + .folders"})
|
||||
} * ${builtins.toJSON cfg.extraOptions}')
|
||||
|
||||
@@ -7,7 +7,10 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
};
|
||||
|
||||
machine = {
|
||||
services.rabbitmq.enable = true;
|
||||
services.rabbitmq = {
|
||||
enable = true;
|
||||
managementPlugin.enable = true;
|
||||
};
|
||||
# Ensure there is sufficient extra disk space for rabbitmq to be happy
|
||||
virtualisation.diskSize = 1024;
|
||||
};
|
||||
@@ -19,5 +22,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
machine.wait_until_succeeds(
|
||||
'su -s ${pkgs.runtimeShell} rabbitmq -c "rabbitmqctl status"'
|
||||
)
|
||||
machine.wait_for_open_port("15672")
|
||||
'';
|
||||
})
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dbeaver";
|
||||
version = "21.1.5"; # When updating also update fetchedMavenDeps.sha256
|
||||
version = "21.2.0"; # When updating also update fetchedMavenDeps.sha256
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dbeaver";
|
||||
repo = "dbeaver";
|
||||
rev = version;
|
||||
sha256 = "sk19Gfu+s7KG1V4f28bFsskagGAuAsEBJEFJzvNh25M=";
|
||||
sha256 = "UYLX8oUHHfdsNiby+emunLRPIHo8ht3bfiredXOjkWs=";
|
||||
};
|
||||
|
||||
fetchedMavenDeps = stdenv.mkDerivation {
|
||||
|
||||
@@ -1,18 +1,37 @@
|
||||
{ callPackage, buildFHSUserEnv, undaemonize, unwrapped ? callPackage ./runtime.nix {} }:
|
||||
{ lib, stdenv, writeScript, callPackage, buildFHSUserEnv, undaemonize, unwrapped ? callPackage ./runtime.nix {} }:
|
||||
|
||||
let
|
||||
houdini-runtime = callPackage ./runtime.nix { };
|
||||
in buildFHSUserEnv {
|
||||
name = "houdini-${houdini-runtime.version}";
|
||||
buildFHSUserEnv rec {
|
||||
name = "houdini-${unwrapped.version}";
|
||||
|
||||
extraBuildCommands = ''
|
||||
mkdir -p $out/usr/lib/sesi
|
||||
'';
|
||||
targetPkgs = pkgs: with pkgs; [
|
||||
libGLU libGL alsa-lib fontconfig zlib libpng dbus nss nspr expat pciutils
|
||||
libxkbcommon libudev0-shim tbb
|
||||
] ++ (with xorg; [
|
||||
libICE libSM libXmu libXi libXext libX11 libXrender libXcursor libXfixes
|
||||
libXrender libXcomposite libXdamage libXtst libxcb libXScrnSaver
|
||||
]);
|
||||
|
||||
passthru = {
|
||||
unwrapped = houdini-runtime;
|
||||
inherit unwrapped;
|
||||
};
|
||||
|
||||
runScript = "${undaemonize}/bin/undaemonize ${houdini-runtime}/bin/houdini";
|
||||
}
|
||||
extraInstallCommands = let
|
||||
executables = [ "bin/houdini" "bin/hkey" "houdini/sbin/sesinetd" ];
|
||||
in ''
|
||||
WRAPPER=$out/bin/${name}
|
||||
EXECUTABLES="${lib.concatStringsSep " " executables}"
|
||||
for executable in $EXECUTABLES; do
|
||||
mkdir -p $out/$(dirname $executable)
|
||||
|
||||
echo "#!${stdenv.shell}" >> $out/$executable
|
||||
echo "$WRAPPER ${unwrapped}/$executable \$@" >> $out/$executable
|
||||
done
|
||||
|
||||
cd $out
|
||||
chmod +x $EXECUTABLES
|
||||
'';
|
||||
|
||||
runScript = writeScript "${name}-wrapper" ''
|
||||
exec $@
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -1,50 +1,14 @@
|
||||
{ lib, stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsa-lib
|
||||
, dbus, xkeyboardconfig, nss, nspr, expat, pciutils, libxkbcommon, bc, addOpenGLRunpath
|
||||
}:
|
||||
{ lib, stdenv, requireFile, bc }:
|
||||
|
||||
let
|
||||
# NOTE: Some dependencies only show in errors when run with QT_DEBUG_PLUGINS=1
|
||||
ld_library_path = builtins.concatStringsSep ":" [
|
||||
"${stdenv.cc.cc.lib}/lib64"
|
||||
(lib.makeLibraryPath [
|
||||
libGLU
|
||||
libGL
|
||||
xorg.libXmu
|
||||
xorg.libXi
|
||||
xorg.libXext
|
||||
xorg.libX11
|
||||
xorg.libXrender
|
||||
xorg.libXcursor
|
||||
xorg.libXfixes
|
||||
xorg.libXrender
|
||||
xorg.libXcomposite
|
||||
xorg.libXdamage
|
||||
xorg.libXtst
|
||||
xorg.libxcb
|
||||
xorg.libXScrnSaver
|
||||
alsa-lib
|
||||
fontconfig
|
||||
libSM
|
||||
libICE
|
||||
zlib
|
||||
libpng
|
||||
dbus
|
||||
addOpenGLRunpath.driverLink
|
||||
nss
|
||||
nspr
|
||||
expat
|
||||
pciutils
|
||||
libxkbcommon
|
||||
])
|
||||
];
|
||||
license_dir = "~/.config/houdini";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "18.0.460";
|
||||
version = "18.5.596";
|
||||
pname = "houdini-runtime";
|
||||
src = requireFile rec {
|
||||
name = "houdini-${version}-linux_x86_64_gcc6.3.tar.gz";
|
||||
sha256 = "18rbwszcks2zfn9zbax62rxmq50z9mc3h39b13jpd39qjqdd3jsd";
|
||||
name = "houdini-py3-${version}-linux_x86_64_gcc6.3.tar.gz";
|
||||
sha256 = "1b1k7rkn7svmciijqdwvi9p00srsf81vkb55grjg6xa7fgyidjx1";
|
||||
url = meta.homepage;
|
||||
};
|
||||
|
||||
@@ -52,37 +16,25 @@ stdenv.mkDerivation rec {
|
||||
installPhase = ''
|
||||
patchShebangs houdini.install
|
||||
mkdir -p $out
|
||||
sed -i "s|/usr/lib/sesi|${license_dir}|g" houdini.install
|
||||
./houdini.install --install-houdini \
|
||||
--install-license \
|
||||
--no-install-menus \
|
||||
--no-install-bin-symlink \
|
||||
--auto-install \
|
||||
--no-root-check \
|
||||
--accept-EULA \
|
||||
--accept-EULA 2020-05-05 \
|
||||
$out
|
||||
echo -e "localValidatorDir = ${license_dir}\nlicensingMode = localValidator" > $out/houdini/Licensing.opt
|
||||
sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/sbin/sesinetd_safe
|
||||
sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/sbin/sesinetd.startup
|
||||
echo "export LD_LIBRARY_PATH=${ld_library_path}" >> $out/bin/app_init.sh
|
||||
echo "export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"" >> $out/bin/app_init.sh
|
||||
echo "export LD_LIBRARY_PATH=${ld_library_path}" >> $out/houdini/sbin/app_init.sh
|
||||
echo "export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"" >> $out/houdini/sbin/app_init.sh
|
||||
echo "licensingMode = localValidator" >> $out/houdini/Licensing.opt
|
||||
'';
|
||||
postFixup = ''
|
||||
INTERPRETER="$(cat "$NIX_CC"/nix-support/dynamic-linker)"
|
||||
for BIN in $(find $out/bin -type f -executable); do
|
||||
if patchelf $BIN 2>/dev/null ; then
|
||||
echo "Patching ELF $BIN"
|
||||
patchelf --set-interpreter "$INTERPRETER" "$BIN"
|
||||
fi
|
||||
done
|
||||
'';
|
||||
meta = {
|
||||
|
||||
dontFixup = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "3D animation application software";
|
||||
homepage = "https://www.sidefx.com";
|
||||
license = lib.licenses.unfree;
|
||||
platforms = lib.platforms.linux;
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.linux;
|
||||
hydraPlatforms = [ ]; # requireFile src's should be excluded
|
||||
maintainers = with lib.maintainers; [ canndrew kwohlfahrt ];
|
||||
maintainers = with maintainers; [ canndrew kwohlfahrt ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -80,10 +80,10 @@
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/aws",
|
||||
"repo": "terraform-provider-aws",
|
||||
"rev": "v3.43.0",
|
||||
"sha256": "05rv93y9hf0l869q6i581748rw4bahvsgggj0h7cwjnf7xap0sxj",
|
||||
"vendorSha256": "1m6pkrpknslqnv60cz5739gp5nxc7xhga402wkl37gdagmadkmrk",
|
||||
"version": "3.43.0"
|
||||
"rev": "v3.56.0",
|
||||
"sha256": "0fa61i172maanxmxz28mj7mkgrs9a5bs61mlvb0d5y97lv6pm2xg",
|
||||
"vendorSha256": "1s22k4b2zq5n0pz6iqbqsf6f7chsbvkpdn432rvyshcryxlklfvl",
|
||||
"version": "3.56.0"
|
||||
},
|
||||
"azuread": {
|
||||
"owner": "hashicorp",
|
||||
@@ -332,11 +332,13 @@
|
||||
"version": "2.1.0"
|
||||
},
|
||||
"fastly": {
|
||||
"owner": "terraform-providers",
|
||||
"owner": "fastly",
|
||||
"provider-source-address": "registry.terraform.io/fastly/fastly",
|
||||
"repo": "terraform-provider-fastly",
|
||||
"rev": "v0.16.1",
|
||||
"sha256": "1pjrcw03a86xgkzcx778f7kk79svv8csy05b7qi0m5x77zy4pws7",
|
||||
"version": "0.16.1"
|
||||
"rev": "v0.34.0",
|
||||
"sha256": "1za00gzmyxr6wfzzq92m3spi9563pbpjwj24sm95kj34l6mfwpyx",
|
||||
"vendorSha256": null,
|
||||
"version": "0.34.0"
|
||||
},
|
||||
"flexibleengine": {
|
||||
"owner": "terraform-providers",
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
, curl, Cocoa, Foundation, libobjc, libcxx, tzdata
|
||||
, withRecommendedPackages ? true
|
||||
, enableStrictBarrier ? false
|
||||
, enableMemoryProfiling ? false
|
||||
# R as of writing does not support outputting both .so and .a files; it outputs:
|
||||
# --enable-R-static-lib conflicts with --enable-R-shlib and will be ignored
|
||||
, static ? false
|
||||
@@ -56,6 +57,7 @@ stdenv.mkDerivation rec {
|
||||
--with-libtiff
|
||||
--with-ICU
|
||||
${lib.optionalString enableStrictBarrier "--enable-strict-barrier"}
|
||||
${lib.optionalString enableMemoryProfiling "--enable-memory-profiling"}
|
||||
${if static then "--enable-R-static-lib" else "--enable-R-shlib"}
|
||||
AR=$(type -p ar)
|
||||
AWK=$(type -p gawk)
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lima";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lima-vm";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UwsAeU7Me2UN9pUWvqGgQ7XSNcrClXYOA+9F6yO2aqA=";
|
||||
sha256 = "sha256-x4IRHxmVeP87M7rSrQWDd9pj2Rb9uGu133mExepxX6Q=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-vdqLdSXQ2ywZoG7ROQP9PLWUqhoOO7N5li+xjc2HtzM=";
|
||||
vendorSha256 = "sha256-PeIEIUX/PwwnbZfXnK3IsENO+zRYLhljBRe910aZgKs=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "podman";
|
||||
version = "3.3.0";
|
||||
version = "3.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "podman";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-EDNpGDjsXULwtUYFLh4u6gntK//rsLLpYgpxRt4R1kc=";
|
||||
sha256 = "sha256-DVRLdJFYD5Ovc0n5SoMv71GPTuBO3wfqREcGRJEuND0=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import ./generic.nix {
|
||||
major_version = "4";
|
||||
minor_version = "13";
|
||||
patch_version = "0-alpha2";
|
||||
patch_version = "0-beta1";
|
||||
src = fetchTarball {
|
||||
url = "https://caml.inria.fr/pub/distrib/ocaml-4.13/ocaml-4.13.0~alpha2.tar.xz";
|
||||
sha256 = "0krb0254i6ihbymjn6mwgzcfrzsvpk9hbagl0agm6wml21zpcsif";
|
||||
url = "https://caml.inria.fr/pub/distrib/ocaml-4.13/ocaml-4.13.0~beta1.tar.xz";
|
||||
sha256 = "0dbz69p1kqabjvzaasy2malfdfn4b93s504x2xs0dl5l3fa3p6c3";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rubygems";
|
||||
version = "3.2.24";
|
||||
version = "3.2.26";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://rubygems.org/rubygems/rubygems-${version}.tgz";
|
||||
sha256 = "09ff830a043y6s7390hsg3k55ffpifb1zsvs0dhz8z8pypwgiscl";
|
||||
sha256 = "sha256-9wa6lOWnua8zBblQKRgjjiTVPYp2TW0n7XOvgW7u1e8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -13,8 +13,13 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
# This can be removed after >=1.20.0, or if the build suceeds with
|
||||
# pie enabled (default on Musl).
|
||||
hardeningDisable = [ "pie" ];
|
||||
|
||||
# This problem is gone on libiscsi master.
|
||||
NIX_CFLAGS_COMPILE = if stdenv.hostPlatform.is32bit then "-Wno-error=sign-compare" else null;
|
||||
NIX_CFLAGS_COMPILE =
|
||||
lib.optional stdenv.hostPlatform.is32bit "-Wno-error=sign-compare";
|
||||
|
||||
meta = with lib; {
|
||||
description = "iscsi client library and utilities";
|
||||
|
||||
@@ -23,7 +23,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
configureFlags = [ "--disable-mac-universal" "--enable-cxx" ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=deprecated-declarations -Wno-error=nullability-completeness-on-arrays";
|
||||
postConfigure = ''
|
||||
substituteInPlace Makefile --replace "-Werror" ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ];
|
||||
|
||||
|
||||
@@ -144,6 +144,7 @@ let
|
||||
inherit (darwin) libobjc;
|
||||
};
|
||||
|
||||
qt3d = callPackage ../modules/qt3d.nix {};
|
||||
qtcharts = callPackage ../modules/qtcharts.nix {};
|
||||
qtconnectivity = callPackage ../modules/qtconnectivity.nix {};
|
||||
qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
|
||||
@@ -192,7 +193,7 @@ let
|
||||
|
||||
env = callPackage ../qt-env.nix {};
|
||||
full = env "qt-full-${qtbase.version}" ([
|
||||
qtcharts qtconnectivity qtdeclarative qtdoc qtgamepad qtgraphicaleffects
|
||||
qt3d qtcharts qtconnectivity qtdeclarative qtdoc qtgamepad qtgraphicaleffects
|
||||
qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2
|
||||
qtscript qtsensors qtserialport qtsvg qttools qttranslations
|
||||
qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets
|
||||
|
||||
@@ -156,6 +156,7 @@ let
|
||||
inherit (darwin) libobjc;
|
||||
};
|
||||
|
||||
qt3d = callPackage ../modules/qt3d.nix {};
|
||||
qtcharts = callPackage ../modules/qtcharts.nix {};
|
||||
qtconnectivity = callPackage ../modules/qtconnectivity.nix {};
|
||||
qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
|
||||
@@ -202,7 +203,7 @@ let
|
||||
|
||||
env = callPackage ../qt-env.nix {};
|
||||
full = env "qt-full-${qtbase.version}" ([
|
||||
qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects
|
||||
qt3d qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects
|
||||
qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2
|
||||
qtscript qtsensors qtserialport qtsvg qttools qttranslations
|
||||
qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets
|
||||
|
||||
@@ -182,6 +182,7 @@ let
|
||||
inherit (darwin) libobjc;
|
||||
};
|
||||
|
||||
qt3d = callPackage ../modules/qt3d.nix {};
|
||||
qtcharts = callPackage ../modules/qtcharts.nix {};
|
||||
qtconnectivity = callPackage ../modules/qtconnectivity.nix {};
|
||||
qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
|
||||
@@ -231,7 +232,7 @@ let
|
||||
|
||||
env = callPackage ../qt-env.nix {};
|
||||
full = env "qt-full-${qtbase.version}" ([
|
||||
qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects
|
||||
qt3d qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects
|
||||
qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2
|
||||
qtscript qtsensors qtserialport qtsvg qttools qttranslations
|
||||
qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
{ qtModule, qtbase, qtdeclarative }:
|
||||
|
||||
qtModule {
|
||||
pname = "qt3d";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
outputs = [ "out" "dev" "bin" ];
|
||||
}
|
||||
@@ -545,8 +545,8 @@ with self;
|
||||
|
||||
ppx_optcomp = janePackage {
|
||||
pname = "ppx_optcomp";
|
||||
version = "0.14.1";
|
||||
hash = "0j5smqa0hig1yn8wfrb4mv0y59kkwsalmqkm5asbd7kcc6589ap4";
|
||||
version = "0.14.3";
|
||||
hash = "1iflgfzs23asw3k6098v84al5zqx59rx2qjw0mhvk56avlx71pkw";
|
||||
minimumOCamlVersion = "4.04.2";
|
||||
meta.description = "Optional compilation for OCaml";
|
||||
propagatedBuildInputs = [ ppxlib ];
|
||||
|
||||
@@ -5,27 +5,27 @@
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocsigen-toolkit";
|
||||
name = "ocaml${ocaml.version}-${pname}-${version}";
|
||||
version = "2.7.0";
|
||||
version = "2.12.2";
|
||||
|
||||
propagatedBuildInputs = [ calendar js_of_ocaml-ppx_deriving_json eliom ];
|
||||
buildInputs = [ ocaml findlib opaline ];
|
||||
|
||||
installPhase =
|
||||
''
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $OCAMLFIND_DESTDIR
|
||||
export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH
|
||||
make install
|
||||
opaline -prefix $out
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocsigen";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0jan5779nc0jf993hmvfii15ralcs20sm4mcnqwqrnhjbq6f6zpk";
|
||||
sha256 = "1fqrh7wrzs76qj3nvmxqy76pzqvsja2dwzqxyl8rkh5jg676vmqy";
|
||||
};
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
meta = {
|
||||
homepage = "http://ocsigen.org/ocsigen-toolkit/";
|
||||
description = " User interface widgets for Ocsigen applications";
|
||||
|
||||
@@ -11,12 +11,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gensim";
|
||||
version = "4.0.1";
|
||||
version = "4.1.0";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b4d0b9562796968684028e06635e0f7aff39ffb33719057fd1667754ea09a6e4";
|
||||
sha256 = "0b09983048a97c7915ab50500bc53eeec438d26366041598709ec156db3eef1f";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ smart-open numpy six scipy ];
|
||||
|
||||
@@ -4,29 +4,32 @@
|
||||
, click
|
||||
, pytestCheckHook
|
||||
, shellingham
|
||||
, pytest-cov
|
||||
, pytest-xdist
|
||||
, pytest-sugar
|
||||
, coverage
|
||||
, mypy
|
||||
, black
|
||||
, isort
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "typer";
|
||||
version = "0.3.2";
|
||||
version = "0.4.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "00v3h63dq8yxahp9vg3yb9r27l2niwv8gv0dbds9dzrc298dfmal";
|
||||
sha256 = "1pgm0zsylbmz1r96q4n3rfi0h3pn4jss2yfs83z0yxa90nmsxhv3";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ click ];
|
||||
propagatedBuildInputs = [
|
||||
click
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
pytest-cov
|
||||
pytest-xdist
|
||||
pytest-sugar
|
||||
shellingham
|
||||
@@ -35,18 +38,17 @@ buildPythonPackage rec {
|
||||
black
|
||||
isort
|
||||
];
|
||||
pytestFlagsArray = [
|
||||
"--ignore=tests/test_completion/test_completion.py"
|
||||
"--ignore=tests/test_completion/test_completion_install.py"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d);
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "typer" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for building CLI applications";
|
||||
homepage = "https://typer.tiangolo.com/";
|
||||
description = "Typer, build great CLIs. Easy to code. Based on Python type hints.";
|
||||
license = licenses.mit;
|
||||
# is incompatible with click8
|
||||
# https://github.com/tiangolo/typer/issues/280
|
||||
broken = true;
|
||||
maintainers = [ maintainers.winpat ];
|
||||
maintainers = with maintainers; [ winpat ];
|
||||
};
|
||||
}
|
||||
|
||||
+1
-1
@@ -10268,7 +10268,7 @@ in with self; {
|
||||
implicitMeasures = derive2 { name="implicitMeasures"; version="0.2.0"; sha256="0w0dwnzfhw5v5j7q3zpfsca4ydmq7b9fzspvyf9sibyh587isb9c"; depends=[ggplot2 stringr tidyr xtable]; };
|
||||
implied = derive2 { name="implied"; version="0.3.1"; sha256="11mrvpsh9qc5a5s5mpbsksri6vx36ij1gvpli6lyz6dkg48a9kdn"; depends=[]; };
|
||||
implyr = derive2 { name="implyr"; version="0.4.0"; sha256="0rblsmx1z2n4g3fims5wa3wyf5znr0gkwd2yfz3130bcm6346da0"; depends=[assertthat DBI dbplyr dplyr rlang tidyselect]; };
|
||||
r_import = derive2 { name="r_import"; version="1.2.0"; sha256="018s0x224gqnv4cjfh0fwliyfg6ma9vslmwybrlizfsmqcc5wp37"; depends=[]; };
|
||||
r_import = derive2 { name="import"; version="1.2.0"; sha256="018s0x224gqnv4cjfh0fwliyfg6ma9vslmwybrlizfsmqcc5wp37"; depends=[]; };
|
||||
importar = derive2 { name="importar"; version="0.1.1"; sha256="0xv445fmjhsbdlsq03k2rlycnggn3rcyq5a49zrg4jvjamzr0rgr"; depends=[]; };
|
||||
importinegi = derive2 { name="importinegi"; version="1.1.3"; sha256="1r0p01mc9wb24ifldn3dmi0fqxwkp0290h0qrgr72grd34v2xszc"; depends=[data_table dplyr foreign haven rgdal]; };
|
||||
impressionist_colors = derive2 { name="impressionist.colors"; version="1.0"; sha256="03z5w7y7vbvlnn30r9y3ip93h364f87nhwdb9hcki26csiq2bnlv"; depends=[]; };
|
||||
|
||||
@@ -237,54 +237,56 @@ let
|
||||
audio = [ pkgs.portaudio ];
|
||||
BayesSAE = [ pkgs.gsl_1 ];
|
||||
BayesVarSel = [ pkgs.gsl_1 ];
|
||||
BayesXsrc = [ pkgs.readline.dev pkgs.ncurses ];
|
||||
BayesXsrc = with pkgs; [ readline.dev ncurses ];
|
||||
bigGP = [ pkgs.mpi ];
|
||||
bio3d = [ pkgs.zlib ];
|
||||
BiocCheck = [ pkgs.which ];
|
||||
Biostrings = [ pkgs.zlib ];
|
||||
bnpmr = [ pkgs.gsl_1 ];
|
||||
cairoDevice = [ pkgs.gtk2.dev ];
|
||||
Cairo = [ pkgs.libtiff pkgs.libjpeg pkgs.cairo.dev pkgs.x11 pkgs.fontconfig.lib ];
|
||||
Cairo = with pkgs; [ libtiff libjpeg cairo.dev x11 fontconfig.lib ];
|
||||
Cardinal = [ pkgs.which ];
|
||||
chebpol = [ pkgs.fftw ];
|
||||
ChemmineOB = [ pkgs.openbabel pkgs.pkg-config ];
|
||||
ChemmineOB = with pkgs; [ openbabel pkg-config ];
|
||||
curl = [ pkgs.curl.dev ];
|
||||
data_table = [pkgs.zlib.dev] ++ lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp;
|
||||
devEMF = [ pkgs.xorg.libXft.dev pkgs.x11 ];
|
||||
diversitree = [ pkgs.gsl_1 pkgs.fftw ];
|
||||
data_table = [ pkgs.zlib.dev ] ++ lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp;
|
||||
devEMF = with pkgs; [ xorg.libXft.dev x11 ];
|
||||
diversitree = with pkgs; [ gsl_1 fftw ];
|
||||
exactextractr = [ pkgs.geos ];
|
||||
EMCluster = [ pkgs.lapack ];
|
||||
fftw = [ pkgs.fftw.dev ];
|
||||
fftwtools = [ pkgs.fftw.dev ];
|
||||
fftwtools = with pkgs; [ fftw.dev pkg-config ];
|
||||
Formula = [ pkgs.gmp ];
|
||||
gdtools = [ pkgs.cairo.dev pkgs.fontconfig.lib pkgs.freetype.dev ];
|
||||
git2r = [ pkgs.zlib.dev pkgs.openssl.dev pkgs.libssh2.dev pkgs.libgit2 pkgs.pkg-config ];
|
||||
gdtools = with pkgs; [ cairo.dev fontconfig.lib freetype.dev ];
|
||||
git2r = with pkgs; [ zlib.dev openssl.dev libssh2.dev libgit2 pkg-config ];
|
||||
GLAD = [ pkgs.gsl_1 ];
|
||||
glpkAPI = [ pkgs.gmp pkgs.glpk ];
|
||||
glpkAPI = with pkgs; [ gmp glpk ];
|
||||
gmp = [ pkgs.gmp.dev ];
|
||||
graphscan = [ pkgs.gsl_1 ];
|
||||
gsl = [ pkgs.gsl_1 ];
|
||||
gert = [ pkgs.libgit2 ];
|
||||
haven = [ pkgs.libiconv pkgs.zlib.dev ];
|
||||
haven = with pkgs; [ libiconv zlib.dev ];
|
||||
h5vc = [ pkgs.zlib.dev ];
|
||||
HiCseg = [ pkgs.gsl_1 ];
|
||||
imager = [ pkgs.x11 ];
|
||||
iBMQ = [ pkgs.gsl_1 ];
|
||||
igraph = [ pkgs.gmp pkgs.libxml2.dev ];
|
||||
igraph = with pkgs; [ gmp libxml2.dev ];
|
||||
JavaGD = [ pkgs.jdk ];
|
||||
jpeg = [ pkgs.libjpeg.dev ];
|
||||
jqr = [ pkgs.jq.dev ];
|
||||
KFKSDS = [ pkgs.gsl_1 ];
|
||||
kza = [ pkgs.fftw.dev ];
|
||||
lwgeom = [ pkgs.gdal pkgs.geos pkgs.proj ];
|
||||
lpsymphony = with pkgs; [ pkg-config gfortran gettext ];
|
||||
lwgeom = with pkgs; [ proj geos gdal ];
|
||||
magick = [ pkgs.imagemagick.dev ];
|
||||
ModelMetrics = lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp;
|
||||
mvabund = [ pkgs.gsl_1 ];
|
||||
mwaved = [ pkgs.fftw.dev ];
|
||||
ncdf4 = [ pkgs.netcdf ];
|
||||
nloptr = [ pkgs.nlopt pkgs.pkg-config ];
|
||||
nloptr = with pkgs; [ nlopt pkg-config ];
|
||||
n1qn1 = [ pkgs.gfortran ];
|
||||
odbc = [ pkgs.unixODBC ];
|
||||
pander = [ pkgs.pandoc pkgs.which ];
|
||||
pander = with pkgs; [ pandoc which ];
|
||||
pbdMPI = [ pkgs.mpi ];
|
||||
pbdPROF = [ pkgs.mpi ];
|
||||
pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.which ];
|
||||
@@ -294,7 +296,7 @@ let
|
||||
png = [ pkgs.libpng.dev ];
|
||||
proj4 = [ pkgs.proj ];
|
||||
protolite = [ pkgs.protobuf ];
|
||||
R2SWF = [ pkgs.zlib pkgs.libpng pkgs.freetype.dev ];
|
||||
R2SWF = with pkgs; [ zlib libpng freetype.dev ];
|
||||
RAppArmor = [ pkgs.libapparmor ];
|
||||
rapportools = [ pkgs.which ];
|
||||
rapport = [ pkgs.which ];
|
||||
@@ -304,42 +306,43 @@ let
|
||||
RcppGSL = [ pkgs.gsl_1 ];
|
||||
RcppZiggurat = [ pkgs.gsl_1 ];
|
||||
reprex = [ pkgs.which ];
|
||||
rgdal = [ pkgs.proj.dev pkgs.gdal ];
|
||||
rgdal = with pkgs; [ proj.dev gdal ];
|
||||
rgeos = [ pkgs.geos ];
|
||||
Rglpk = [ pkgs.glpk ];
|
||||
RGtk2 = [ pkgs.gtk2.dev ];
|
||||
rhdf5 = [ pkgs.zlib ];
|
||||
Rhdf5lib = [ pkgs.zlib.dev ];
|
||||
Rhpc = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.xz.dev pkgs.mpi pkgs.pcre.dev ];
|
||||
Rhtslib = [ pkgs.zlib.dev pkgs.automake pkgs.autoconf pkgs.bzip2.dev pkgs.xz.dev pkgs.curl.dev ];
|
||||
Rhpc = with pkgs; [ zlib bzip2.dev icu xz.dev mpi pcre.dev ];
|
||||
Rhtslib = with pkgs; [ zlib.dev automake autoconf bzip2.dev xz.dev curl.dev ];
|
||||
rjags = [ pkgs.jags ];
|
||||
rJava = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.xz.dev pkgs.pcre.dev pkgs.jdk pkgs.libzip ];
|
||||
rJava = with pkgs; [ zlib bzip2.dev icu xz.dev pcre.dev jdk libzip ];
|
||||
Rlibeemd = [ pkgs.gsl_1 ];
|
||||
rmatio = [ pkgs.zlib.dev ];
|
||||
Rmpfr = [ pkgs.gmp pkgs.mpfr.dev ];
|
||||
Rmpfr = with pkgs; [ gmp mpfr.dev ];
|
||||
Rmpi = [ pkgs.mpi ];
|
||||
RMySQL = [ pkgs.zlib pkgs.libmysqlclient pkgs.openssl.dev ];
|
||||
RNetCDF = [ pkgs.netcdf pkgs.udunits ];
|
||||
RMySQL = with pkgs; [ zlib libmysqlclient openssl.dev ];
|
||||
RNetCDF = with pkgs; [ netcdf udunits ];
|
||||
RODBC = [ pkgs.libiodbc ];
|
||||
rpanel = [ pkgs.bwidget ];
|
||||
Rpoppler = [ pkgs.poppler ];
|
||||
RPostgreSQL = [ pkgs.postgresql pkgs.postgresql ];
|
||||
RPostgreSQL = with pkgs; [ postgresql postgresql ];
|
||||
RProtoBuf = [ pkgs.protobuf ];
|
||||
RSclient = [ pkgs.openssl.dev ];
|
||||
Rserve = [ pkgs.openssl ];
|
||||
Rssa = [ pkgs.fftw.dev ];
|
||||
rsvg = [ pkgs.pkg-config ];
|
||||
runjags = [ pkgs.jags ];
|
||||
RVowpalWabbit = [ pkgs.zlib.dev pkgs.boost ];
|
||||
rzmq = [ pkgs.zeromq pkgs.pkg-config ];
|
||||
RVowpalWabbit = with pkgs; [ zlib.dev boost ];
|
||||
rzmq = with pkgs; [ zeromq pkg-config ];
|
||||
clustermq = [ pkgs.zeromq ];
|
||||
SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.xz pkgs.pcre ];
|
||||
sdcTable = [ pkgs.gmp pkgs.glpk ];
|
||||
seewave = [ pkgs.fftw.dev pkgs.libsndfile.dev ];
|
||||
SAVE = with pkgs; [ zlib bzip2 icu xz pcre ];
|
||||
sdcTable = with pkgs; [ gmp glpk ];
|
||||
seewave = with pkgs; [ fftw.dev libsndfile.dev ];
|
||||
seqinr = [ pkgs.zlib.dev ];
|
||||
seqminer = [ pkgs.zlib.dev pkgs.bzip2 ];
|
||||
sf = [ pkgs.gdal pkgs.proj pkgs.geos ];
|
||||
showtext = [ pkgs.zlib pkgs.libpng pkgs.icu pkgs.freetype.dev ];
|
||||
seqminer = with pkgs; [ zlib.dev bzip2 ];
|
||||
sf = with pkgs; [ gdal proj geos ];
|
||||
terra = with pkgs; [ gdal proj geos ];
|
||||
showtext = with pkgs; [ zlib libpng icu freetype.dev ];
|
||||
simplexreg = [ pkgs.gsl_1 ];
|
||||
spate = [ pkgs.fftw.dev ];
|
||||
ssanv = [ pkgs.proj ];
|
||||
@@ -347,19 +350,19 @@ let
|
||||
stringi = [ pkgs.icu.dev ];
|
||||
survSNP = [ pkgs.gsl_1 ];
|
||||
svglite = [ pkgs.libpng.dev ];
|
||||
sysfonts = [ pkgs.zlib pkgs.libpng pkgs.freetype.dev ];
|
||||
systemfonts = [ pkgs.fontconfig.dev pkgs.freetype.dev ];
|
||||
sysfonts = with pkgs; [ zlib libpng freetype.dev ];
|
||||
systemfonts = with pkgs; [ fontconfig.dev freetype.dev ];
|
||||
TAQMNGR = [ pkgs.zlib.dev ];
|
||||
tesseract = [ pkgs.tesseract pkgs.leptonica ];
|
||||
tesseract = with pkgs; [ tesseract leptonica ];
|
||||
tiff = [ pkgs.libtiff.dev ];
|
||||
tkrplot = [ pkgs.xorg.libX11 pkgs.tk.dev ];
|
||||
tkrplot = with pkgs; [ xorg.libX11 tk.dev ];
|
||||
topicmodels = [ pkgs.gsl_1 ];
|
||||
udunits2 = [ pkgs.udunits pkgs.expat ];
|
||||
udunits2 = with pkgs; [ udunits expat ];
|
||||
units = [ pkgs.udunits ];
|
||||
V8 = [ pkgs.v8 ];
|
||||
XBRL = [ pkgs.zlib pkgs.libxml2.dev ];
|
||||
XBRL = with pkgs; [ zlib libxml2.dev ];
|
||||
xml2 = [ pkgs.libxml2.dev ] ++ lib.optionals stdenv.isDarwin [ pkgs.perl ];
|
||||
XML = [ pkgs.libtool pkgs.libxml2.dev pkgs.xmlsec pkgs.libxslt ];
|
||||
XML = with pkgs; [ libtool libxml2.dev xmlsec libxslt ];
|
||||
affyPLM = [ pkgs.zlib.dev ];
|
||||
bamsignals = [ pkgs.zlib.dev ];
|
||||
BitSeq = [ pkgs.zlib.dev ];
|
||||
@@ -369,10 +372,10 @@ let
|
||||
gmapR = [ pkgs.zlib.dev ];
|
||||
Rsubread = [ pkgs.zlib.dev ];
|
||||
XVector = [ pkgs.zlib.dev ];
|
||||
Rsamtools = [ pkgs.zlib.dev pkgs.curl.dev ];
|
||||
Rsamtools = with pkgs; [ zlib.dev curl.dev ];
|
||||
rtracklayer = [ pkgs.zlib.dev ];
|
||||
affyio = [ pkgs.zlib.dev ];
|
||||
VariantAnnotation = [ pkgs.zlib.dev pkgs.curl.dev ];
|
||||
VariantAnnotation = with pkgs; [ zlib.dev curl.dev ];
|
||||
snpStats = [ pkgs.zlib.dev ];
|
||||
hdf5r = [ pkgs.hdf5.dev ];
|
||||
};
|
||||
@@ -396,7 +399,7 @@ let
|
||||
RcppEigen = [ pkgs.libiconv ];
|
||||
RCurl = [ pkgs.curl.dev ];
|
||||
R2SWF = [ pkgs.pkg-config ];
|
||||
rgl = [ pkgs.libGLU pkgs.libGLU.dev pkgs.libGL pkgs.xlibsWrapper ];
|
||||
rgl = with pkgs; [ libGLU libGLU.dev libGL xlibsWrapper ];
|
||||
RGtk2 = [ pkgs.pkg-config ];
|
||||
RProtoBuf = [ pkgs.pkg-config ];
|
||||
Rpoppler = [ pkgs.pkg-config ];
|
||||
@@ -407,13 +410,14 @@ let
|
||||
gdtools = [ pkgs.pkg-config ];
|
||||
jqr = [ pkgs.jq.lib ];
|
||||
kza = [ pkgs.pkg-config ];
|
||||
lwgeom = [ pkgs.pkg-config pkgs.proj.dev pkgs.sqlite.dev ];
|
||||
lwgeom = with pkgs; [ pkg-config proj.dev sqlite.dev ];
|
||||
magick = [ pkgs.pkg-config ];
|
||||
mwaved = [ pkgs.pkg-config ];
|
||||
odbc = [ pkgs.pkg-config ];
|
||||
openssl = [ pkgs.pkg-config ];
|
||||
pdftools = [ pkgs.pkg-config ];
|
||||
sf = [ pkgs.pkg-config pkgs.sqlite.dev pkgs.proj.dev ];
|
||||
sf = with pkgs; [ pkg-config sqlite.dev proj.dev ];
|
||||
terra = with pkgs; [ pkg-config sqlite.dev proj.dev ];
|
||||
showtext = [ pkgs.pkg-config ];
|
||||
spate = [ pkgs.pkg-config ];
|
||||
stringi = [ pkgs.pkg-config ];
|
||||
@@ -426,11 +430,11 @@ let
|
||||
mashr = [ pkgs.gsl ];
|
||||
hadron = [ pkgs.gsl ];
|
||||
AMOUNTAIN = [ pkgs.gsl ];
|
||||
Rsymphony = [ pkgs.pkg-config pkgs.doxygen pkgs.graphviz pkgs.subversion ];
|
||||
tcltk2 = [ pkgs.tcl pkgs.tk ];
|
||||
tikzDevice = [ pkgs.which pkgs.texlive.combined.scheme-medium ];
|
||||
Rsymphony = with pkgs; [ pkg-config doxygen graphviz subversion ];
|
||||
tcltk2 = with pkgs; [ tcl tk ];
|
||||
tikzDevice = with pkgs; [ which texlive.combined.scheme-medium ];
|
||||
gridGraphics = [ pkgs.which ];
|
||||
adimpro = [ pkgs.which pkgs.xorg.xdpyinfo ];
|
||||
adimpro = with pkgs; [ which xorg.xdpyinfo ];
|
||||
mzR = [ pkgs.netcdf ];
|
||||
cluster = [ pkgs.libiconv ];
|
||||
KernSmooth = [ pkgs.libiconv ];
|
||||
@@ -951,6 +955,18 @@ let
|
||||
'';
|
||||
});
|
||||
|
||||
R_cache = old.R_cache.overrideDerivation (attrs: {
|
||||
preConfigure = ''
|
||||
export R_CACHE_ROOTPATH=$TMP
|
||||
'';
|
||||
});
|
||||
|
||||
lpsymphony = old.lpsymphony.overrideDerivation (attrs: {
|
||||
preConfigure = ''
|
||||
patchShebangs configure
|
||||
'';
|
||||
});
|
||||
|
||||
};
|
||||
in
|
||||
self
|
||||
|
||||
@@ -48,8 +48,7 @@ escapeName <- function(name) {
|
||||
}
|
||||
|
||||
formatPackage <- function(name, version, sha256, depends, imports, linkingTo) {
|
||||
name <- escapeName(name)
|
||||
attr <- gsub(".", "_", name, fixed=TRUE)
|
||||
attr <- gsub(".", "_", escapeName(name), fixed=TRUE)
|
||||
options(warn=5)
|
||||
depends <- paste( if (is.na(depends)) "" else gsub("[ \t\n]+", "", depends)
|
||||
, if (is.na(imports)) "" else gsub("[ \t\n]+", "", imports)
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "tfsec";
|
||||
version = "0.58.5";
|
||||
version = "0.58.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-awTRECHHNGebzV08Qy2I6rX4eS2z07NZLsQFPoA0UXA=";
|
||||
sha256 = "sha256-FTrzEVTmMxXshDOvlSmQEwekde621KIclpFm1oEduEo=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/aquasecurity/tfsec";
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
{ lib, stdenv, fetchurl, elfutils }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dwz";
|
||||
version = "0.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.sourceware.org/ftp/${pname}/releases/${pname}-${version}.tar.gz";
|
||||
sha256 = "07qdvzfk4mvbqj5z3aff7vc195dxqn1mi27w2dzs1w2zhymnw01k";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ elfutils ];
|
||||
|
||||
makeFlags = [ "prefix=${placeholder "out"}" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://sourceware.org/dwz/";
|
||||
description = "DWARF optimization and duplicate removal tool";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ jbcrail ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -1,16 +1,17 @@
|
||||
{ elk7Version
|
||||
, enableUnfree ? true
|
||||
, lib, stdenv
|
||||
, lib
|
||||
, stdenv
|
||||
, makeWrapper
|
||||
, fetchurl
|
||||
, nodejs-10_x
|
||||
, nodejs-14_x
|
||||
, coreutils
|
||||
, which
|
||||
}:
|
||||
|
||||
with lib;
|
||||
let
|
||||
nodejs = nodejs-10_x;
|
||||
nodejs = nodejs-14_x;
|
||||
inherit (builtins) elemAt;
|
||||
info = splitString "-" stdenv.hostPlatform.system;
|
||||
arch = elemAt info 0;
|
||||
@@ -18,20 +19,21 @@ let
|
||||
shas =
|
||||
if enableUnfree
|
||||
then {
|
||||
x86_64-linux = "1wq4fc2fifkg1qz7nxdfb4yi2biay8cgdz7kl5k0p37sxn0sbkja";
|
||||
x86_64-darwin = "06346kj7bv49py49pmmnmh8m24322m88v1af19909pj9cxgd0p6v";
|
||||
x86_64-linux = "sha256-lTPBppKm51zgKSQtSdO0PgZ/aomvaStwqwYYGNPY4Bo=";
|
||||
x86_64-darwin = "sha256-d7xHmoASiywDlZCJX/CfUX1VIi4iOcDrqvK0su54MJc=";
|
||||
}
|
||||
else {
|
||||
x86_64-linux = "0ygpmcm6wdcnvw8azwqc5257lyic7yw31rqvm2pw3afhpha62lpj";
|
||||
x86_64-darwin = "0xy81g0bhxp47p29kkkh5llfzqkzqzr5dk50ap2hy0hjw33ld6g1";
|
||||
x86_64-linux = "sha256-+pkKpiXBpLHs72KKNtMJbqipw6eu5XC1xu/iLFCHGRQ=";
|
||||
x86_64-darwin = "sha256-CyJ5iRXaPgXO2lyy+E24OcGtb9V3e1gMZRIu25bVyzk=";
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "kibana-${optionalString (!enableUnfree) "oss-"}${version}";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kibana${optionalString (!enableUnfree) "-oss"}";
|
||||
version = elk7Version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${arch}.tar.gz";
|
||||
url = "https://artifacts.elastic.co/downloads/kibana/${pname}-${version}-${plat}-${arch}.tar.gz";
|
||||
sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture");
|
||||
};
|
||||
|
||||
|
||||
@@ -2,20 +2,22 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lttng-tools";
|
||||
version = "2.11.0";
|
||||
version = "2.13.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2";
|
||||
sha256 = "1g0g7ypxvc7wd5x4d4ixmfgl9yk0lxax3ymm95hcjwxn5p497r6w";
|
||||
sha256 = "1ri93h45q5z6l3qmg4dakm9aj0ghfmf38i63q51yjh58lzwr9j4d";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ popt libuuid liburcu lttng-ust libxml2 kmod ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tracing tools (kernel + user space) for Linux";
|
||||
homepage = "https://lttng.org/";
|
||||
license = licenses.lgpl21;
|
||||
license = with licenses; [ lgpl21Only gpl2Only ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.bjornfor ];
|
||||
};
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, liburcu, python3 }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, liburcu, numactl, python3 }:
|
||||
|
||||
# NOTE:
|
||||
# ./configure ...
|
||||
@@ -13,14 +13,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lttng-ust";
|
||||
version = "2.10.5";
|
||||
version = "2.13.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://lttng.org/files/lttng-ust/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0ddwk0nl28bkv2xb78gz16a2bvlpfbjmzwfbgwf5p1cq46dyvy86";
|
||||
sha256 = "0l0p6y2zrd9hgd015dhafjmpcj7waz762n6wf5ws1xlwcwrwkr2l";
|
||||
};
|
||||
|
||||
buildInputs = [ python3 ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ numactl python3 ];
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs .
|
||||
@@ -28,10 +29,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
propagatedBuildInputs = [ liburcu ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "LTTng Userspace Tracer libraries";
|
||||
homepage = "https://lttng.org/";
|
||||
license = licenses.lgpl21Plus;
|
||||
license = with licenses; [ lgpl21Only gpl2Only mit ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.bjornfor ];
|
||||
};
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{ callPackage, makeWrapper, gobject-introspection, cmake
|
||||
, python3Packages, gtk3, glib, libxml2, gnuplot, gnome, gdk-pixbuf, librsvg, intltool, libmirage }:
|
||||
let pkg = import ./base.nix {
|
||||
version = "3.2.3";
|
||||
version = "3.2.5";
|
||||
pkgName = "image-analyzer";
|
||||
pkgSha256 = "17yfjmf65s77214qassz6l01cjcni4cv06nzfsm7qrzw172fmci4";
|
||||
pkgSha256 = "00906lky0z1m0bdqnjmzxgcb19dzvljhddhh42lixyr53sjp94cc";
|
||||
};
|
||||
in callPackage pkg {
|
||||
buildInputs = [ glib gtk3 libxml2 gnuplot libmirage makeWrapper
|
||||
|
||||
@@ -4,7 +4,7 @@ let name = "${pkgName}-${version}";
|
||||
in stdenv.mkDerivation ({
|
||||
inherit name buildInputs;
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/cdemu/${name}.tar.bz2";
|
||||
url = "mirror://sourceforge/cdemu/${name}.tar.xz";
|
||||
sha256 = pkgSha256;
|
||||
};
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
@@ -29,7 +29,7 @@ in stdenv.mkDerivation ({
|
||||
|
||||
Optical media emulated by CDemu can be mounted within Linux. Automounting is also allowed.
|
||||
'';
|
||||
homepage = "http://cdemu.sourceforge.net/";
|
||||
homepage = "https://cdemu.sourceforge.io/";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with lib.maintainers; [ bendlas ];
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ callPackage, python3Packages, intltool, makeWrapper }:
|
||||
let pkg = import ./base.nix {
|
||||
version = "3.2.3";
|
||||
version = "3.2.5";
|
||||
pkgName = "cdemu-client";
|
||||
pkgSha256 = "1bvc2m63fx03rbp3ihgl2n7k24lwg5ydwkmr84gsjfcxp46q10zq";
|
||||
pkgSha256 = "1prrdhv0ia0axc6b73crszqzh802wlkihz6d100yvg7wbgmqabd7";
|
||||
};
|
||||
in callPackage pkg {
|
||||
buildInputs = [ python3Packages.python python3Packages.dbus-python python3Packages.pygobject3
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ callPackage, glib, libao, intltool, libmirage }:
|
||||
let pkg = import ./base.nix {
|
||||
version = "3.2.3";
|
||||
version = "3.2.5";
|
||||
pkgName = "cdemu-daemon";
|
||||
pkgSha256 = "022xzgwmncswb9md71w3ly3mjkdfc93lbij2llp2jamq8grxjjxr";
|
||||
pkgSha256 = "16g6fv1lxkdmbsy6zh5sj54dvgwvm900fd18aq609yg8jnqm644d";
|
||||
};
|
||||
in callPackage pkg {
|
||||
buildInputs = [ glib libao libmirage intltool ];
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
, python3Packages, gtk3, glib, libnotify, intltool, gnome, gdk-pixbuf, librsvg }:
|
||||
let
|
||||
pkg = import ./base.nix {
|
||||
version = "3.2.3";
|
||||
version = "3.2.5";
|
||||
pkgName = "gcdemu";
|
||||
pkgSha256 = "19vy1awha8s7cfja3a6npaf3rfy3pl3cbsh4vd609q9jz4v4lyg4";
|
||||
pkgSha256 = "1nvpbq4mz8caw91q5ny9gf206g9bypavxws9nxyfcanfkc4zfkl4";
|
||||
};
|
||||
inherit (python3Packages) python pygobject3;
|
||||
in callPackage pkg {
|
||||
|
||||
@@ -3,9 +3,9 @@
|
||||
, pcre, util-linux, libselinux, libsepol }:
|
||||
|
||||
let pkg = import ./base.nix {
|
||||
version = "3.2.3";
|
||||
version = "3.2.5";
|
||||
pkgName = "libmirage";
|
||||
pkgSha256 = "08mfvqyk3833ksfd47i4j3ppmrw5ry219km6h7lywdh9hm9x14yf";
|
||||
pkgSha256 = "0f8i2ha44rykkk3ac2q8zsw3y1zckw6qnf6zvkyrj3qqbzhrf3fm";
|
||||
};
|
||||
in callPackage pkg {
|
||||
buildInputs = [ glib libsndfile zlib bzip2 xz libsamplerate intltool ];
|
||||
|
||||
@@ -2,21 +2,19 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vhba";
|
||||
version = "20190831";
|
||||
version = "20210418";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/cdemu/vhba-module-${version}.tar.bz2";
|
||||
sha256 = "1ybbk6l06n0y11n5wnfmvdz0baizmq55l458ywimghdyz0n7g0ws";
|
||||
url = "mirror://sourceforge/cdemu/vhba-module-${version}.tar.xz";
|
||||
sha256 = "119zgav6caialmf3hr096wkf72l9h76sqc9w5dhx26kj4yp85g8q";
|
||||
};
|
||||
|
||||
makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ];
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
hardeningDisable = [ "pic" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Provides a Virtual (SCSI) HBA";
|
||||
homepage = "http://cdemu.sourceforge.net/about/vhba/";
|
||||
homepage = "https://cdemu.sourceforge.io/about/vhba/";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ bendlas ];
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromSourcehut
|
||||
, SDL2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "uxn";
|
||||
version = "0.0.0+unstable=2021-08-30";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~rabbits";
|
||||
repo = pname;
|
||||
rev = "a2e40d9d10c11ef48f4f93d0dc86f5085b4263ce";
|
||||
hash = "sha256-/hxDYi814nQydm2iQk4NID4vpJ3BcBcM6NdL0iuZk5M=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
];
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
# It is easier to emulate build.sh script
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
cc -std=c89 -Wall -Wno-unknown-pragmas src/uxnasm.c -o uxnasm
|
||||
cc -std=c89 -Wall -Wno-unknown-pragmas src/uxn.c src/uxncli.c -o uxncli
|
||||
cc -std=c89 -Wall -Wno-unknown-pragmas src/uxn.c src/devices/ppu.c \
|
||||
src/devices/apu.c src/uxnemu.c $(sdl2-config --cflags --libs) -o uxnemu
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -d $out/bin/ $out/share/${pname}/
|
||||
|
||||
cp uxnasm uxncli uxnemu $out/bin/
|
||||
cp -r projects $out/share/${pname}/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.xxiivv.com/site/uxn.html";
|
||||
description = "An assembler and emulator for the Uxn stack machine";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = with platforms; unix;
|
||||
};
|
||||
}
|
||||
@@ -1,30 +1,31 @@
|
||||
{ lib, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, nixosTests, systemd }:
|
||||
{ lib, fetchFromGitHub, elk7Version, buildGoModule, libpcap, nixosTests, systemd }:
|
||||
|
||||
let beat = package : extraArgs : buildGoPackage (rec {
|
||||
name = "${package}-${version}";
|
||||
version = elk7Version;
|
||||
let beat = package: extraArgs: buildGoModule (rec {
|
||||
pname = package;
|
||||
version = elk7Version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elastic";
|
||||
repo = "beats";
|
||||
rev = "v${version}";
|
||||
sha256 = "192ygz3ppfah8d2b811x67jfqhcr5ivz7qh4vwrd729rjfr0bbgb";
|
||||
};
|
||||
src = fetchFromGitHub {
|
||||
owner = "elastic";
|
||||
repo = "beats";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zr0a0LBR4G9okS2pUixDYtYZ0yCp4G6j08jx/zlIKOA=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/elastic/beats";
|
||||
vendorSha256 = "sha256-xmw432vY1T2EixkDcXdGrnMdc8fYOI4R2lEjbkav3JQ=";
|
||||
|
||||
subPackages = [ package ];
|
||||
subPackages = [ package ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.elastic.co/products/beats";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fadenb basvandijk ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
} // extraArgs);
|
||||
in rec {
|
||||
filebeat7 = beat "filebeat" {meta.description = "Lightweight shipper for logfiles";};
|
||||
heartbeat7 = beat "heartbeat" {meta.description = "Lightweight shipper for uptime monitoring";};
|
||||
meta = with lib; {
|
||||
homepage = "https://www.elastic.co/products/beats";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fadenb basvandijk ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
} // extraArgs);
|
||||
in
|
||||
rec {
|
||||
filebeat7 = beat "filebeat" { meta.description = "Lightweight shipper for logfiles"; };
|
||||
heartbeat7 = beat "heartbeat" { meta.description = "Lightweight shipper for uptime monitoring"; };
|
||||
metricbeat7 = beat "metricbeat" {
|
||||
meta.description = "Lightweight shipper for metrics";
|
||||
passthru.tests =
|
||||
@@ -46,14 +47,15 @@ in rec {
|
||||
PostgreSQL, Redis or Thrift and correlate the messages into transactions.
|
||||
'';
|
||||
};
|
||||
journalbeat7 = beat "journalbeat" {
|
||||
journalbeat7 = beat "journalbeat" {
|
||||
meta.description = ''
|
||||
Journalbeat is an open source data collector to read and forward
|
||||
journal entries from Linuxes with systemd.
|
||||
'';
|
||||
buildInputs = [ systemd.dev ];
|
||||
postFixup = let libPath = lib.makeLibraryPath [ (lib.getLib systemd) ]; in ''
|
||||
patchelf --set-rpath ${libPath} "$out/bin/journalbeat"
|
||||
'';
|
||||
postFixup = let libPath = lib.makeLibraryPath [ (lib.getLib systemd) ]; in
|
||||
''
|
||||
patchelf --set-rpath ${libPath} "$out/bin/journalbeat"
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
+539
-527
File diff suppressed because it is too large
Load Diff
@@ -66,7 +66,7 @@ class VimEditor(pluginupdate.Editor):
|
||||
f.write(textwrap.indent(textwrap.dedent(
|
||||
f"""
|
||||
{plugin.normalized_name} = buildVimPluginFrom2Nix {{
|
||||
pname = "{plugin.normalized_name}";
|
||||
pname = "{plugin.name}";
|
||||
version = "{plugin.version}";
|
||||
src = fetchFromGitHub {{
|
||||
owner = "{owner}";
|
||||
|
||||
@@ -573,6 +573,7 @@ Quramy/tsuquyomi
|
||||
racer-rust/vim-racer
|
||||
radenling/vim-dispatch-neovim
|
||||
rafamadriz/friendly-snippets@main
|
||||
rafamadriz/neon@main
|
||||
rafaqz/ranger.vim
|
||||
rafi/awesome-vim-colorschemes
|
||||
raghur/fruzzy
|
||||
|
||||
@@ -1,32 +1,32 @@
|
||||
{ lib, stdenv, fetchFromGitHub, kernel, qmake }:
|
||||
{ lib, stdenv, fetchFromGitHub, kernel }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "akvcam";
|
||||
version = "1.2.0";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "webcamoid";
|
||||
repo = "akvcam";
|
||||
rev = version;
|
||||
sha256 = "0r5xg7pz0wl6pq5029rpzm9fn978vq0md31xjkp2amny7rrgxw72";
|
||||
sha256 = "1f0vjia2d7zj3y5c63lx1r537bdjx6821yxy29ilbrvsbjq2szj8";
|
||||
};
|
||||
sourceRoot = "source/src";
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
dontWrapQtApps = true;
|
||||
|
||||
qmakeFlags = [
|
||||
makeFlags = [
|
||||
"KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
install -m644 -b -D src/akvcam.ko $out/lib/modules/${kernel.modDirVersion}/akvcam.ko
|
||||
install -m644 -b -D akvcam.ko $out/lib/modules/${kernel.modDirVersion}/akvcam.ko
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Virtual camera driver for Linux";
|
||||
homepage = "https://github.com/webcamoid/akvcam";
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Only;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,29 +1,16 @@
|
||||
{ stdenv, lib, fetchFromGitHub, fetchpatch, kernel, kernelAtLeast }:
|
||||
{ stdenv, lib, fetchFromGitHub, kernel, kernelAtLeast }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "isgx-${version}-${kernel.version}";
|
||||
version = "2.11";
|
||||
version = "2.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "linux-sgx-driver";
|
||||
rev = "sgx_driver_${version}";
|
||||
hash = "sha256-zZ0FgCx63LCNmvQ909O27v/o4+93gefhgEE/oDr/bHw=";
|
||||
rev = "sgx_diver_${version}"; # Typo is upstream's.
|
||||
sha256 = "0kbbf2inaywp44lm8ig26mkb36jq3smsln0yp6kmrirdwc3c53mi";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fixes build with kernel >= 5.8
|
||||
(fetchpatch {
|
||||
url = "https://github.com/intel/linux-sgx-driver/commit/276c5c6a064d22358542f5e0aa96b1c0ace5d695.patch";
|
||||
sha256 = "sha256-PmchqYENIbnJ51G/tkdap/g20LUrJEoQ4rDtqy6hj24=";
|
||||
})
|
||||
# Fixes detection with kernel >= 5.11
|
||||
(fetchpatch {
|
||||
url = "https://github.com/intel/linux-sgx-driver/commit/ed2c256929962db1a8805db53bed09bb8f2f4de3.patch";
|
||||
sha256 = "sha256-MRbgS4U8FTCP1J1n+rhsvbXxKDytfl6B7YlT9Izq05U=";
|
||||
})
|
||||
];
|
||||
|
||||
hardeningDisable = [ "pic" ];
|
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
@@ -38,6 +25,8 @@ stdenv.mkDerivation rec {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Intel SGX Linux Driver";
|
||||
longDescription = ''
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
|
||||
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.14";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
||||
# branchVersion needs to be x.y
|
||||
extraMeta.branch = versions.majorMinor version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "1cki6af9r30k8820j73qdyycp23mwpf2a2rjwl82p9i61mg8n1ky";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
@@ -1,8 +1,8 @@
|
||||
{ stdenv, lib, fetchsvn, linux
|
||||
, scripts ? fetchsvn {
|
||||
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
|
||||
rev = "18260";
|
||||
sha256 = "11mmdix0vq9yrivx300ay6np3xx1gdqdr4cqdxr1wa84dbl7c2dm";
|
||||
rev = "18268";
|
||||
sha256 = "050rk485csj41yfydr1cvn60vhb3lzbb3486sm832vp55d34i8fd";
|
||||
}
|
||||
, ...
|
||||
}:
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lttng-modules-${kernel.version}";
|
||||
version = "2.12.6";
|
||||
version = "2.13.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://lttng.org/files/lttng-modules/lttng-modules-${version}.tar.bz2";
|
||||
sha256 = "sha256-lawqLPkthdI/+9rKah7A18FnIR0eD7hQq5AASj9HXqo=";
|
||||
sha256 = "0mikc3fdjd0w6rrcyksjzmv0czvgba6yk8dfmz4a3cr8s4y2pgsy";
|
||||
};
|
||||
|
||||
buildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
@@ -19,10 +19,10 @@ rec {
|
||||
# Policy: use the highest stable version as the default (on our master).
|
||||
stable = if stdenv.hostPlatform.system == "x86_64-linux"
|
||||
then generic {
|
||||
version = "470.57.02";
|
||||
sha256_64bit = "sha256-VdeuEEgn+qeel1Mh/itg+d1C+/9lZCBTRDwOVv20xH0=";
|
||||
settingsSha256 = "sha256-DJg5QbyuKJmPpLQVYgTLvucI1e9YgQOO16690VXIWvk=";
|
||||
persistencedSha256 = "sha256-Cqv6oUFnsSi3S1sjplJKeq9bI2pqgBXPPb11HOJSlDo=";
|
||||
version = "470.63.01";
|
||||
sha256_64bit = "sha256:057dsc0j3136r5gc08id3rwz9c0x7i01xkcwfk77vqic9b6486kg";
|
||||
settingsSha256 = "sha256:0lizp4hn49yvca2yd76yh3awld98pkaa35a067lpcld35vb5brgv";
|
||||
persistencedSha256 = "sha256:1f3gdpa23ipjy2xwf7qnxmw7w8xxhqy25rmcz34xkngjf4fn4pbs";
|
||||
}
|
||||
else legacy_390;
|
||||
|
||||
|
||||
@@ -29,6 +29,8 @@ stdenv.mkDerivation {
|
||||
mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "RealTek RTL8188eus WiFi driver with monitor mode & frame injection support";
|
||||
homepage = "https://github.com/aircrack-ng/rtl8188eus";
|
||||
|
||||
@@ -42,6 +42,8 @@ stdenv.mkDerivation rec {
|
||||
nuke-refs $out/lib/modules/*/kernel/net/wireless/*.ko
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Driver for Realtek 802.11ac, rtl8812au, provides the 8812au mod";
|
||||
homepage = "https://github.com/gordboy/rtl8812au-5.9.3.2";
|
||||
|
||||
@@ -29,6 +29,8 @@ stdenv.mkDerivation {
|
||||
mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Realtek 8814AU USB WiFi driver";
|
||||
homepage = "https://github.com/morrownr/8814au";
|
||||
|
||||
@@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
|
||||
nuke-refs $out/lib/modules/*/kernel/net/wireless/*.ko
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "rtl8821AU and rtl8812AU chipset driver with firmware";
|
||||
homepage = "https://github.com/morrownr/8821au";
|
||||
|
||||
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
|
||||
mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Realtek rtl8821ce driver";
|
||||
homepage = "https://github.com/tomaspinho/rtl8821ce";
|
||||
|
||||
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
|
||||
mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Realtek rtl8821cu driver";
|
||||
homepage = "https://github.com/morrownr/8821cu";
|
||||
|
||||
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
|
||||
mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Realtek rtl88x2bu driver";
|
||||
homepage = "https://github.com/morrownr/88x2bu";
|
||||
|
||||
@@ -40,6 +40,8 @@ stdenv.mkDerivation rec {
|
||||
mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Aircrack-ng kernel module for Realtek 88XXau network cards\n(8811au, 8812au, 8814au and 8821au chipsets) with monitor mode and injection support.";
|
||||
homepage = "https://github.com/aircrack-ng/rtl8812au";
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "slurm";
|
||||
version = "20.11.8.1";
|
||||
version = "21.08.0.1";
|
||||
|
||||
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
|
||||
# because the latter does not keep older releases.
|
||||
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
repo = "slurm";
|
||||
# The release tags use - instead of .
|
||||
rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
|
||||
sha256 = "0id2b01rvq81zd2p34il0gg880f94g9ip4gn1pyh20zz5bxlnbjc";
|
||||
sha256 = "0f1i64vby1qa2y9gv9a9x595s58p6dpw4yhljbgrc2wr7glvnfi3";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "consul";
|
||||
version = "1.10.1";
|
||||
version = "1.10.2";
|
||||
rev = "v${version}";
|
||||
|
||||
# Note: Currently only release tags are supported, because they have the Consul UI
|
||||
@@ -17,7 +17,7 @@ buildGoModule rec {
|
||||
owner = "hashicorp";
|
||||
repo = pname;
|
||||
inherit rev;
|
||||
sha256 = "sha256-oap0pXqtIbT9wMfD/RuJ2tTRynSvfzsgL8TyY4nj3sM=";
|
||||
sha256 = "sha256-mA/s3J0ylE3C3IGaYfadeZV6PQ5Ooth6iQ4JEgPl44Q=";
|
||||
};
|
||||
|
||||
passthru.tests.consul = nixosTests.consul;
|
||||
@@ -26,7 +26,7 @@ buildGoModule rec {
|
||||
# has a split module structure in one repo
|
||||
subPackages = ["." "connect/certgen"];
|
||||
|
||||
vendorSha256 = "sha256-DloQGxeooVhYWA5/ICkL2UEQvNPilb2F5pst78UzWPI=";
|
||||
vendorSha256 = "sha256-MWQ1m2nvKdP8ZCDs0sjZCiW4DSGe3NnVl4sQ448cu5M=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -1,10 +1,13 @@
|
||||
{ elk7Version
|
||||
, enableUnfree ? true
|
||||
, lib, stdenv
|
||||
, lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, makeWrapper
|
||||
, jre_headless
|
||||
, util-linux, gnugrep, coreutils
|
||||
, util-linux
|
||||
, gnugrep
|
||||
, coreutils
|
||||
, autoPatchelfHook
|
||||
, zlib
|
||||
}:
|
||||
@@ -17,12 +20,12 @@ let
|
||||
shas =
|
||||
if enableUnfree
|
||||
then {
|
||||
x86_64-linux = "1s27bzx5y8vcd95qrw6av3fhyxb45219x9ahwaxa2cygmbpighrp";
|
||||
x86_64-darwin = "1ia3byir3i5qaarmcaysrg3dhnxjmxnf0m0kzyf61g9aiy87gb7q";
|
||||
x86_64-linux = "sha256-O3rjtvXyJI+kRBqiz2U2OMkCIQj4E+AIHaE8N4o14R4=";
|
||||
x86_64-darwin = "sha256-AwuY2yMxf+v7U5/KD3Cf+Hv6ijjySEyj6pzF3RCsg24=";
|
||||
}
|
||||
else {
|
||||
x86_64-linux = "005i7d7ag10qkn7bkx7md50iihvcvc84hay2j94wvsm7yghhbmi3";
|
||||
x86_64-darwin = "01f81720rbzdqc0g1xymhz2lflldfbnb0rh7mpki99pss28vj9sh";
|
||||
x86_64-linux = "sha256-cJrdkFIFgAI6wfQh34Z8yFuLrOCOKzgOsWZhU3S/3NQ=";
|
||||
x86_64-darwin = "sha256-OhMVOdXei9D9cH+O5tBhdKvZ05TsImjMqUUsucRyWMo=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (rec {
|
||||
@@ -48,7 +51,7 @@ stdenv.mkDerivation (rec {
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ jre_headless util-linux ]
|
||||
++ optional enableUnfree zlib;
|
||||
++ optional enableUnfree zlib;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
|
||||
@@ -3,17 +3,17 @@
|
||||
let
|
||||
esVersion = elasticsearch.version;
|
||||
|
||||
esPlugin = a@{
|
||||
pluginName,
|
||||
installPhase ? ''
|
||||
mkdir -p $out/config
|
||||
mkdir -p $out/plugins
|
||||
ln -s ${elasticsearch}/lib $out/lib
|
||||
ES_HOME=$out ${elasticsearch}/bin/elasticsearch-plugin install --batch -v file://$src
|
||||
rm $out/lib
|
||||
'',
|
||||
...
|
||||
}:
|
||||
esPlugin =
|
||||
a@{ pluginName
|
||||
, installPhase ? ''
|
||||
mkdir -p $out/config
|
||||
mkdir -p $out/plugins
|
||||
ln -s ${elasticsearch}/lib $out/lib
|
||||
ES_HOME=$out ${elasticsearch}/bin/elasticsearch-plugin install --batch -v file://$src
|
||||
rm $out/lib
|
||||
''
|
||||
, ...
|
||||
}:
|
||||
stdenv.mkDerivation (a // {
|
||||
inherit installPhase;
|
||||
pname = "elasticsearch-${pluginName}";
|
||||
@@ -24,10 +24,11 @@ let
|
||||
nativeBuildInputs = [ unzip ];
|
||||
meta = a.meta // {
|
||||
platforms = elasticsearch.meta.platforms;
|
||||
maintainers = (a.meta.maintainers or []) ++ (with lib.maintainers; [ offline ]);
|
||||
maintainers = (a.meta.maintainers or [ ]) ++ (with lib.maintainers; [ offline ]);
|
||||
};
|
||||
});
|
||||
in {
|
||||
in
|
||||
{
|
||||
|
||||
analysis-icu = esPlugin rec {
|
||||
name = "elasticsearch-analysis-icu-${version}";
|
||||
@@ -36,7 +37,7 @@ in {
|
||||
src = fetchurl {
|
||||
url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";
|
||||
sha256 =
|
||||
if version == "7.5.1" then "0v6ynbk34g7pl9cwy8ga8bk1my18jb6pc3pqbjl8p93w38219vi6"
|
||||
if version == "7.10.2" then "sha256-HXNJy8WPExPeh5afjdLEFg+0WX0LYI/kvvaLGVUke5E="
|
||||
else if version == "6.8.3" then "0vbaqyj0lfy3ijl1c9h92b0nh605h5mjs57bk2zhycdvbw5sx2lv"
|
||||
else throw "unsupported version ${version} for plugin ${pluginName}";
|
||||
};
|
||||
@@ -53,7 +54,7 @@ in {
|
||||
src = fetchurl {
|
||||
url = "https://github.com/vhyza/elasticsearch-${pluginName}/releases/download/v${version}/elasticsearch-${pluginName}-${version}-plugin.zip";
|
||||
sha256 =
|
||||
if version == "7.5.1" then "0js8b9a9ma797448m3sy92qxbwziix8gkcka7hf17dqrb9k29v61"
|
||||
if version == "7.10.2" then "sha256-mW4YNZ20qatyfHCDAmod/gVmkPYh15NrsYPgiBy1/T8="
|
||||
else if version == "6.8.3" then "12bshvp01pp2lgwd0cn9l58axg8gdimsh4g9wfllxi1bdpv4cy53"
|
||||
else throw "unsupported version ${version} for plugin ${pluginName}";
|
||||
};
|
||||
@@ -70,7 +71,7 @@ in {
|
||||
src = fetchurl {
|
||||
url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";
|
||||
sha256 =
|
||||
if version == "7.5.1" then "0znmbdf99bli4kvyb3vxr5x48yb6n64nl38gpa63iqsv3nlbi0hp"
|
||||
if version == "7.10.2" then "sha256-PjA/pwoulkD2d6sHKqzcYxQpb1aS68/l047z5JTcV3Y="
|
||||
else if version == "6.8.3" then "0ggdhf7w50bxsffmcznrjy14b578fps0f8arg3v54qvj94v9jc37"
|
||||
else throw "unsupported version ${version} for plugin ${pluginName}";
|
||||
};
|
||||
@@ -87,7 +88,7 @@ in {
|
||||
src = fetchurl {
|
||||
url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";
|
||||
sha256 =
|
||||
if version == "7.5.1" then "09wl2bpng4xx384xns960rymnm64b5zn2cb1sp25n85pd0isp4p2"
|
||||
if version == "7.10.2" then "sha256-yvxSkVyZDWeu7rcxxq1+IVsljZQKgWEURiXY9qycK1s="
|
||||
else if version == "6.8.3" then "0pmffz761dqjpvmkl7i7xsyw1iyyspqpddxp89rjsznfc9pak5im"
|
||||
else throw "unsupported version ${version} for plugin ${pluginName}";
|
||||
};
|
||||
@@ -104,7 +105,7 @@ in {
|
||||
src = fetchurl {
|
||||
url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";
|
||||
sha256 =
|
||||
if version == "7.5.1" then "0hhwxkjlkw1yv5sp6pdn5k1y8bdv4mnmb6nby1z4367mig6rm8v9"
|
||||
if version == "7.10.2" then "sha256-yOMiYJ2c/mcLDcTA99YrpQBiEBAa/mLtTqJlqTJ5tBc="
|
||||
else if version == "6.8.3" then "0kfr4i2rcwinjn31xrc2piicasjanaqcgnbif9xc7lnak2nnzmll"
|
||||
else throw "unsupported version ${version} for plugin ${pluginName}";
|
||||
};
|
||||
@@ -121,7 +122,7 @@ in {
|
||||
src = fetchurl {
|
||||
url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip";
|
||||
sha256 =
|
||||
if version == "7.5.1" then "1j1rgbha5lh0a02h55zqc5qn0mvvi16l2m5r8lmaswp97px056v9"
|
||||
if version == "7.10.2" then "sha256-fN2RQsY9OACE71pIw87XVJo4c3sUu/6gf/6wUt7ZNIE="
|
||||
else if version == "6.8.3" then "1mm6hj2m1db68n81rzsvlw6nisflr5ikzk5zv9nmk0z641n5vh1x"
|
||||
else throw "unsupported version ${version} for plugin ${pluginName}";
|
||||
};
|
||||
@@ -138,7 +139,7 @@ in {
|
||||
src = fetchurl {
|
||||
url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip";
|
||||
sha256 =
|
||||
if version == "7.5.1" then "15g438zpxrcmsgddwmk3sccy92ha90cyq9c61kcw1q84wfi0a7jl"
|
||||
if version == "7.10.2" then "sha256-JdWt5LzSbs0MIEuLJIE1ceTnNeTYI5Jt2N0Xj7OBO6g="
|
||||
else if version == "6.8.3" then "1s2klpvnhpkrk53p64zbga3b66czi7h1a13f58kfn2cn0zfavnbk"
|
||||
else throw "unsupported version ${version} for plugin ${pluginName}";
|
||||
};
|
||||
@@ -149,26 +150,30 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
search-guard = let
|
||||
majorVersion = lib.head (builtins.splitVersion esVersion);
|
||||
in esPlugin rec {
|
||||
pluginName = "search-guard";
|
||||
version =
|
||||
# https://docs.search-guard.com/latest/search-guard-versions
|
||||
if esVersion == "7.5.1" then "${esVersion}-38.0.0"
|
||||
else if esVersion == "6.8.3" then "${esVersion}-25.5"
|
||||
else throw "unsupported version ${esVersion} for plugin ${pluginName}";
|
||||
src = fetchurl {
|
||||
url = "mirror://maven/com/floragunn/${pluginName}-${majorVersion}/${version}/${pluginName}-${majorVersion}-${version}.zip";
|
||||
sha256 =
|
||||
if version == "7.5.1-38.0.0" then "1a1wp9wrmz6ji2rnpk0b9jqnp86w0w0z8sb48giyc1gzcy1ra9yh"
|
||||
else if version == "6.8.3-25.5" then "0a7ys9qinc0fjyka03cx9rv0pm7wnvslk234zv5vrphkrj52s1cb"
|
||||
else throw "unsupported version ${version} for plugin ${pluginName}";
|
||||
search-guard =
|
||||
let
|
||||
majorVersion = lib.head (builtins.splitVersion esVersion);
|
||||
in
|
||||
esPlugin rec {
|
||||
pluginName = "search-guard";
|
||||
version =
|
||||
# https://docs.search-guard.com/latest/search-guard-versions
|
||||
if esVersion == "7.10.2" then "7.10.1-49.3.0"
|
||||
else if esVersion == "6.8.3" then "${esVersion}-25.5"
|
||||
else throw "unsupported version ${esVersion} for plugin ${pluginName}";
|
||||
src = fetchurl {
|
||||
url =
|
||||
if version == "7.10.1-49.3.0" then "https://maven.search-guard.com/search-guard-suite-release/com/floragunn/search-guard-suite-plugin/${version}/search-guard-suite-plugin-${version}.zip"
|
||||
else "mirror://maven/com/floragunn/${pluginName}-${majorVersion}/${version}/${pluginName}-${majorVersion}-${version}.zip";
|
||||
sha256 =
|
||||
if version == "7.10.1-49.3.0" then "sha256-vKH2+c+7WlncgljrvYH9lAqQTKzg9l0ABZ23Q/xdoK4="
|
||||
else if version == "6.8.3-25.5" then "0a7ys9qinc0fjyka03cx9rv0pm7wnvslk234zv5vrphkrj52s1cb"
|
||||
else throw "unsupported version ${version} for plugin ${pluginName}";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://search-guard.com";
|
||||
description = "Elasticsearch plugin that offers encryption, authentication, and authorisation. ";
|
||||
license = licenses.asl20;
|
||||
};
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://search-guard.com";
|
||||
description = "Elasticsearch plugin that offers encryption, authentication, and authorisation. ";
|
||||
license = licenses.asl20;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -146,10 +146,10 @@ let
|
||||
]);
|
||||
sitePackages = ceph-python-env.python.sitePackages;
|
||||
|
||||
version = "16.2.4";
|
||||
version = "16.2.5";
|
||||
src = fetchurl {
|
||||
url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz";
|
||||
sha256 = "sha256-J6FVK7feNN8cGO5BSDlfRGACAzchmRUSWR+a4ZgeWy0=";
|
||||
sha256 = "sha256-uCBpFvp5k+A5SgwxoJVkuGb9E69paKrs3qda5RpsRt4=";
|
||||
};
|
||||
in rec {
|
||||
ceph = stdenv.mkDerivation {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{ elk7Version
|
||||
, enableUnfree ? true
|
||||
, lib, stdenv
|
||||
, lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, makeWrapper
|
||||
, nixosTests
|
||||
@@ -9,25 +10,38 @@
|
||||
|
||||
with lib;
|
||||
|
||||
let this = stdenv.mkDerivation rec {
|
||||
let
|
||||
info = splitString "-" stdenv.hostPlatform.system;
|
||||
arch = elemAt info 0;
|
||||
plat = elemAt info 1;
|
||||
shas =
|
||||
if enableUnfree
|
||||
then {
|
||||
x86_64-linux = "sha256-5qv4fbFpLf6aduD7wyxXQ6FsCeUqrszRisNBx44vbMY=";
|
||||
x86_64-darwin = "sha256-7H+Xpo8qF1ZZMkR5n92PVplEN4JsBEYar91zHQhE+Lo=";
|
||||
}
|
||||
else {
|
||||
x86_64-linux = "sha256-jiV2yGPwPgZ5plo3ftImVDLSOsk/XBzFkeeALSObLhU=";
|
||||
x86_64-darwin = "sha256-UYG+GGr23eAc2GgNX/mXaGU0WKMjiQMPpD1wUvAVz0A=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = elk7Version;
|
||||
name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}";
|
||||
pname = "logstash${optionalString (!enableUnfree) "-oss"}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz";
|
||||
sha256 =
|
||||
if enableUnfree
|
||||
then "01l6alwgsq6yf0z9d08i0hi8g708nph1vm78nl4xbpg8h964bybj"
|
||||
else "0nlwgaw6rmhp5b68zpp1pzsjs30b0bjzdg8f7xy6rarpk338s8yb";
|
||||
url = "https://artifacts.elastic.co/downloads/logstash/${pname}-${version}-${plat}-${arch}.tar.gz";
|
||||
sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture");
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
dontPatchELF = true;
|
||||
dontStrip = true;
|
||||
dontBuild = true;
|
||||
dontPatchELF = true;
|
||||
dontStrip = true;
|
||||
dontPatchShebangs = true;
|
||||
|
||||
buildInputs = [
|
||||
makeWrapper jre
|
||||
makeWrapper
|
||||
jre
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
@@ -48,9 +62,9 @@ let this = stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems";
|
||||
homepage = "https://www.elastic.co/products/logstash";
|
||||
license = if enableUnfree then licenses.elastic else licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
homepage = "https://www.elastic.co/products/logstash";
|
||||
license = if enableUnfree then licenses.elastic else licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ wjlroe offline basvandijk ];
|
||||
};
|
||||
passthru.tests =
|
||||
@@ -60,5 +74,4 @@ let this = stdenv.mkDerivation rec {
|
||||
elk = nixosTests.elk.ELK-7;
|
||||
}
|
||||
);
|
||||
};
|
||||
in this
|
||||
}
|
||||
|
||||
@@ -29,7 +29,10 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
postPatch = ''
|
||||
# No API changes.
|
||||
substituteInPlace pyproject.toml --replace 'python-frontmatter = "^0.5.0"' 'python-frontmatter = "^1.0.0"'
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'python-frontmatter = "^0.5.0"' 'python-frontmatter = "^1.0.0"' \
|
||||
--replace 'genanki = "^0.10.1"' 'genanki = "^0.11.0"' \
|
||||
--replace 'typer = "^0.3.2"' 'typer = "^0.4.0"'
|
||||
'';
|
||||
|
||||
# No tests available on Pypi and there is only a failing version assertion test in the repo.
|
||||
|
||||
@@ -2,30 +2,21 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mcfly";
|
||||
version = "0.5.8";
|
||||
version = "0.5.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cantino";
|
||||
repo = "mcfly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-D8ScF/3qyT0VuMGmWkkeGRyCu4LdOXt1wvR9whbNURE=";
|
||||
sha256 = "0i3qjgq1b8h3bzc7rxa60kq1yc2im9m6dgzrvial086a1zk8s81r";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace mcfly.bash --replace '$(which mcfly)' $out/bin/mcfly
|
||||
substituteInPlace mcfly.zsh --replace '$(which mcfly)' $out/bin/mcfly
|
||||
substituteInPlace mcfly.fish --replace '(which mcfly)' $out/bin/mcfly
|
||||
install -Dm644 -t $out/share/mcfly mcfly.bash
|
||||
install -Dm644 -t $out/share/mcfly mcfly.zsh
|
||||
install -Dm644 -t $out/share/mcfly mcfly.fish
|
||||
'';
|
||||
|
||||
cargoSha256 = "sha256-VZgxfVmAa5lPfdLNbsotNoRpTLe3HID36sF8T/0mywI=";
|
||||
cargoSha256 = "084v4fsdi25ahz068ssq29z7d5d3k3jh3s8b07irwybdsy18c629";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/cantino/mcfly";
|
||||
description = "An upgraded ctrl-r for Bash whose history results make sense for what you're working on right now";
|
||||
changelog = "https://github.com/cantino/mcfly/blob/v${version}/CHANGELOG.txt";
|
||||
changelog = "https://github.com/cantino/mcfly/raw/v${version}/CHANGELOG.txt";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.melkor333 ];
|
||||
};
|
||||
|
||||
@@ -28,16 +28,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "vector";
|
||||
version = "0.15.2";
|
||||
version = "0.16.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "timberio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-u/KHiny9o/q74dh/w3cShAb6oEkMxNaTMF2lOFx+1po=";
|
||||
sha256 = "sha256-10e0cWt6XW8msNR/RXbaOpdwTAlRLm6jVvDed905rho=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-wUNF+810Yh4hPQzraWo2mDi8KSmRKp9Z9D+4kwKQ+IU=";
|
||||
cargoSha256 = "sha256-ezQ/tX/uKzJprLQt2xIUZwGuUOmuRmTO+gPsf3MLEv8=";
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ oniguruma openssl protobuf rdkafka zstd ]
|
||||
++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ];
|
||||
@@ -53,7 +53,16 @@ rustPlatform.buildRustPackage rec {
|
||||
# dev dependency includes httpmock which depends on iashc which depends on curl-sys with http2 feature enabled
|
||||
# compilation fails because of a missing http2 include
|
||||
doCheck = !stdenv.isDarwin;
|
||||
checkPhase = "TZDIR=${tzdata}/share/zoneinfo cargo test --no-default-features --features ${lib.concatStringsSep "," features} -- --test-threads 1";
|
||||
# healthcheck_grafana_cloud is trying to make a network access
|
||||
# test_stream_errors is flaky on linux-aarch64
|
||||
checkPhase = ''
|
||||
TZDIR=${tzdata}/share/zoneinfo cargo test \
|
||||
--no-default-features \
|
||||
--features ${lib.concatStringsSep "," features} \
|
||||
-- --test-threads 1 \
|
||||
--skip=sinks::loki::tests::healthcheck_grafana_cloud \
|
||||
--skip=kubernetes::api_watcher::tests::test_stream_errors
|
||||
'';
|
||||
|
||||
# recent overhauls of DNS support in 0.9 mean that we try to resolve
|
||||
# vector.dev during the checkPhase, which obviously isn't going to work.
|
||||
|
||||
@@ -1,20 +1,38 @@
|
||||
{lib, stdenv, fetchurl, perl}:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, glib
|
||||
, meson
|
||||
, ninja
|
||||
, libmaxminddb
|
||||
, pkg-config
|
||||
, ronn
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ipcalc";
|
||||
version = "0.41";
|
||||
src = fetchurl {
|
||||
url = "http://jodies.de/ipcalc-archive/${pname}-${version}.tar.gz";
|
||||
sha256 = "dda9c571ce3369e5b6b06e92790434b54bec1f2b03f1c9df054c0988aa4e2e8a";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ipcalc";
|
||||
repo = "ipcalc";
|
||||
rev = version;
|
||||
sha256 = "0qg516jv94dlk0qj0bj5y1dd0i31ziqcjd6m00w8xp5wl97bj2ji";
|
||||
};
|
||||
buildInputs = [perl];
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp ipcalc $out/bin
|
||||
'';
|
||||
meta = {
|
||||
|
||||
nativeBuildInputs = [
|
||||
glib
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
libmaxminddb
|
||||
ronn
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple IP network calculator";
|
||||
homepage = "http://jodies.de/ipcalc";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.all;
|
||||
homepage = "https://gitlab.com/ipcalc/ipcalc";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, nixosTests
|
||||
, pkg-config
|
||||
, systemd
|
||||
@@ -43,11 +42,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libreswan";
|
||||
version = "4.4";
|
||||
version = "4.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.libreswan.org/${pname}-${version}.tar.gz";
|
||||
sha256 = "0xj974yc0y1r7235zl4jhvxqz3bpb8js2fy9ic820zq9swh0lgsz";
|
||||
sha256 = "18whvmaxqfmaqbmq72calyzk21wyvxa0idddcsxd8x36vhdza0q7";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@@ -70,14 +69,6 @@ stdenv.mkDerivation rec {
|
||||
python3 bash
|
||||
] ++ lib.optional stdenv.isLinux libselinux;
|
||||
|
||||
patches = [
|
||||
# Fix compilation on aarch64, remove on next update
|
||||
(fetchpatch {
|
||||
url = "https://github.com/libreswan/libreswan/commit/ea50d36d2886e44317ba5ba841de1d1bf91aee6c.patch";
|
||||
sha256 = "1jp89rm9jp55zmiyimyhg7yadj0fwwxaw7i5gyclrs38w3y1aacj";
|
||||
})
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
# Correct iproute2 path
|
||||
sed -e 's|"/sbin/ip"|"${iproute2}/bin/ip"|' \
|
||||
@@ -111,10 +102,8 @@ stdenv.mkDerivation rec {
|
||||
-i configs/Makefile
|
||||
'';
|
||||
|
||||
# Set appropriate paths for build
|
||||
preBuild = "export INC_USRLOCAL=\${out}";
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=$(out)"
|
||||
"INITSYSTEM=systemd"
|
||||
"UNITDIR=$(out)/etc/systemd/system/"
|
||||
"TMPFILESDIR=$(out)/lib/tmpfiles.d/"
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "nix-update";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mic92";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-n3YuNypKFaBtO5Fhf7Z3Wgh0+WH5bQWR0W0uHCYKtuY=";
|
||||
sha256 = "sha256-D1N7ISLZJ3A8G9X5dvtCbRse5h0MRJoeZM3CHkFpqlE=";
|
||||
};
|
||||
|
||||
makeWrapperArgs = [
|
||||
|
||||
@@ -228,6 +228,8 @@ with pkgs;
|
||||
|
||||
cen64 = callPackage ../misc/emulators/cen64 { };
|
||||
|
||||
uxn = callPackage ../misc/emulators/uxn { };
|
||||
|
||||
cereal = callPackage ../development/libraries/cereal { };
|
||||
|
||||
cewl = callPackage ../tools/security/cewl { };
|
||||
@@ -4616,7 +4618,7 @@ with pkgs;
|
||||
# The latest version used by elasticsearch, logstash, kibana and the the beats from elastic.
|
||||
# When updating make sure to update all plugins or they will break!
|
||||
elk6Version = "6.8.3";
|
||||
elk7Version = "7.5.1";
|
||||
elk7Version = "7.10.2";
|
||||
|
||||
elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix {
|
||||
util-linux = util-linuxMinimal;
|
||||
@@ -4629,12 +4631,12 @@ with pkgs;
|
||||
};
|
||||
elasticsearch7 = callPackage ../servers/search/elasticsearch/7.x.nix {
|
||||
util-linux = util-linuxMinimal;
|
||||
jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
jre_headless = jdk11_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
};
|
||||
elasticsearch7-oss = callPackage ../servers/search/elasticsearch/7.x.nix {
|
||||
enableUnfree = false;
|
||||
util-linux = util-linuxMinimal;
|
||||
jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
jre_headless = jdk11_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
};
|
||||
elasticsearch = elasticsearch6;
|
||||
elasticsearch-oss = elasticsearch6-oss;
|
||||
@@ -13745,6 +13747,8 @@ with pkgs;
|
||||
|
||||
drush = callPackage ../development/tools/misc/drush { };
|
||||
|
||||
dwz = callPackage ../development/tools/misc/dwz { };
|
||||
|
||||
easypdkprog = callPackage ../development/embedded/easypdkprog { };
|
||||
|
||||
editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { };
|
||||
@@ -21261,6 +21265,13 @@ with pkgs;
|
||||
];
|
||||
};
|
||||
|
||||
linux_5_14 = callPackage ../os-specific/linux/kernel/linux-5.14.nix {
|
||||
kernelPatches = [
|
||||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
];
|
||||
};
|
||||
|
||||
linux-rt_5_10 = callPackage ../os-specific/linux/kernel/linux-rt-5.10.nix {
|
||||
kernelPatches = [
|
||||
kernelPatches.bridge_stp_helper
|
||||
@@ -21339,9 +21350,7 @@ with pkgs;
|
||||
|
||||
acpi_call = callPackage ../os-specific/linux/acpi-call {};
|
||||
|
||||
akvcam = callPackage ../os-specific/linux/akvcam {
|
||||
inherit (qt5) qmake;
|
||||
};
|
||||
akvcam = callPackage ../os-specific/linux/akvcam { };
|
||||
|
||||
amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { };
|
||||
|
||||
@@ -21553,7 +21562,7 @@ with pkgs;
|
||||
|
||||
# Update this when adding the newest kernel major version!
|
||||
# And update linux_latest_for_hardened below if the patches are already available
|
||||
linuxPackages_latest = linuxPackages_5_13;
|
||||
linuxPackages_latest = linuxPackages_5_14;
|
||||
linux_latest = linuxPackages_latest.kernel;
|
||||
|
||||
# Realtime kernel packages.
|
||||
@@ -21578,6 +21587,7 @@ with pkgs;
|
||||
linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4);
|
||||
linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10);
|
||||
linuxPackages_5_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_13);
|
||||
linuxPackages_5_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_14);
|
||||
|
||||
# When adding to the list above:
|
||||
# - Update linuxPackages_latest to the latest version
|
||||
|
||||
Reference in New Issue
Block a user