Merge staging-next into staging
This commit is contained in:
commit
8dbc95f67b
|
@ -1036,6 +1036,12 @@
|
||||||
githubId = 1015044;
|
githubId = 1015044;
|
||||||
name = "Brandon Carrell";
|
name = "Brandon Carrell";
|
||||||
};
|
};
|
||||||
|
bcc32 = {
|
||||||
|
email = "me@bcc32.com";
|
||||||
|
github = "bcc32";
|
||||||
|
githubId = 1239097;
|
||||||
|
name = "Aaron Zeng";
|
||||||
|
};
|
||||||
bcdarwin = {
|
bcdarwin = {
|
||||||
email = "bcdarwin@gmail.com";
|
email = "bcdarwin@gmail.com";
|
||||||
github = "bcdarwin";
|
github = "bcdarwin";
|
||||||
|
|
|
@ -2,11 +2,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "gpsprune";
|
pname = "gpsprune";
|
||||||
version = "20";
|
version = "20.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar";
|
url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar";
|
||||||
sha256 = "1i9p6h98azgradrrkcwx18zwz4c6zkxp4bfykpa2imi1z3ry5q2b";
|
sha256 = "sha256-NU2AhqMVxjPyCocjZg5dzwHpTgAIBluMqdKqn4lnknM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
|
@ -106,7 +106,7 @@ let
|
||||||
versionRange = min-version: upto-version:
|
versionRange = min-version: upto-version:
|
||||||
let inherit (upstream-info) version;
|
let inherit (upstream-info) version;
|
||||||
result = versionAtLeast version min-version && versionOlder version upto-version;
|
result = versionAtLeast version min-version && versionOlder version upto-version;
|
||||||
ungoogled-version = (importJSON ./upstream-info.json).ungoogled.version;
|
ungoogled-version = (importJSON ./upstream-info.json).ungoogled-chromium.version;
|
||||||
in if versionAtLeast ungoogled-version upto-version
|
in if versionAtLeast ungoogled-version upto-version
|
||||||
then warn "chromium: ungoogled version ${ungoogled-version} is newer than a patchset bounded at ${upto-version}. You can safely delete it."
|
then warn "chromium: ungoogled version ${ungoogled-version} is newer than a patchset bounded at ${upto-version}. You can safely delete it."
|
||||||
result
|
result
|
||||||
|
@ -152,8 +152,12 @@ let
|
||||||
patches = [
|
patches = [
|
||||||
./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed)
|
./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed)
|
||||||
./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags
|
./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags
|
||||||
# ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" )
|
# ++ optional (versionRange "68" "72") (githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000")
|
||||||
];
|
] ++ optional (versionRange "89" "90") (githubPatch
|
||||||
|
# To fix the build of chromiumBeta:
|
||||||
|
"b5b80df7dafba8cafa4c6c0ba2153dfda467dfc9" # add dependency on opus in webcodecs
|
||||||
|
"1r4wmwaxz5xbffmj5wspv2xj8s32j9p6jnwimjmalqg3al2ba64x"
|
||||||
|
);
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
# remove unused third-party
|
# remove unused third-party
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
nodeEnv = import ../../../../development/node-packages/node-env.nix {
|
nodeEnv = import ../../../../development/node-packages/node-env.nix {
|
||||||
inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
|
inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
|
||||||
inherit nodejs;
|
inherit nodejs;
|
||||||
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
||||||
};
|
};
|
||||||
|
|
|
@ -15,11 +15,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "kmymoney";
|
pname = "kmymoney";
|
||||||
version = "5.1.0";
|
version = "5.1.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kde/stable/kmymoney/${version}/src/${pname}-${version}.tar.xz";
|
url = "mirror://kde/stable/kmymoney/${version}/src/${pname}-${version}.tar.xz";
|
||||||
sha256 = "0l8kywq77yaf1bqgdqswrai9ws6a2l11drg0wgyi7f8js7qnif9d";
|
sha256 = "sha256-33ufeOhZb5nSgpXKc4cI8GVe4Fd4nf2SHHsbq5ZXgpg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Hidden dependency that wasn't included in CMakeLists.txt:
|
# Hidden dependency that wasn't included in CMakeLists.txt:
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
nodeEnv = import ./node-env.nix {
|
nodeEnv = import ./node-env.nix {
|
||||||
inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
|
inherit (pkgs) lib stdenv python2 utillinux runCommand writeTextFile;
|
||||||
inherit nodejs;
|
inherit nodejs;
|
||||||
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# This file originates from node2nix
|
# This file originates from node2nix
|
||||||
|
|
||||||
{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}:
|
{lib, stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}:
|
||||||
|
|
||||||
let
|
let
|
||||||
python = if nodejs ? python then nodejs.python else python2;
|
python = if nodejs ? python then nodejs.python else python2;
|
||||||
|
@ -38,8 +38,8 @@ let
|
||||||
};
|
};
|
||||||
|
|
||||||
includeDependencies = {dependencies}:
|
includeDependencies = {dependencies}:
|
||||||
stdenv.lib.optionalString (dependencies != [])
|
lib.optionalString (dependencies != [])
|
||||||
(stdenv.lib.concatMapStrings (dependency:
|
(lib.concatMapStrings (dependency:
|
||||||
''
|
''
|
||||||
# Bundle the dependencies of the package
|
# Bundle the dependencies of the package
|
||||||
mkdir -p node_modules
|
mkdir -p node_modules
|
||||||
|
@ -100,7 +100,7 @@ let
|
||||||
cd "$DIR/${packageName}"
|
cd "$DIR/${packageName}"
|
||||||
${includeDependencies { inherit dependencies; }}
|
${includeDependencies { inherit dependencies; }}
|
||||||
cd ..
|
cd ..
|
||||||
${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
pinpointDependencies = {dependencies, production}:
|
pinpointDependencies = {dependencies, production}:
|
||||||
|
@ -161,12 +161,12 @@ let
|
||||||
''
|
''
|
||||||
node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
|
node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
|
||||||
|
|
||||||
${stdenv.lib.optionalString (dependencies != [])
|
${lib.optionalString (dependencies != [])
|
||||||
''
|
''
|
||||||
if [ -d node_modules ]
|
if [ -d node_modules ]
|
||||||
then
|
then
|
||||||
cd node_modules
|
cd node_modules
|
||||||
${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
|
${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
|
||||||
cd ..
|
cd ..
|
||||||
fi
|
fi
|
||||||
''}
|
''}
|
||||||
|
@ -183,7 +183,7 @@ let
|
||||||
cd "${packageName}"
|
cd "${packageName}"
|
||||||
${pinpointDependencies { inherit dependencies production; }}
|
${pinpointDependencies { inherit dependencies production; }}
|
||||||
cd ..
|
cd ..
|
||||||
${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -344,8 +344,8 @@ let
|
||||||
cd "${packageName}"
|
cd "${packageName}"
|
||||||
runHook preRebuild
|
runHook preRebuild
|
||||||
|
|
||||||
${stdenv.lib.optionalString bypassCache ''
|
${lib.optionalString bypassCache ''
|
||||||
${stdenv.lib.optionalString reconstructLock ''
|
${lib.optionalString reconstructLock ''
|
||||||
if [ -f package-lock.json ]
|
if [ -f package-lock.json ]
|
||||||
then
|
then
|
||||||
echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!"
|
echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!"
|
||||||
|
@ -361,14 +361,14 @@ let
|
||||||
node ${addIntegrityFieldsScript}
|
node ${addIntegrityFieldsScript}
|
||||||
''}
|
''}
|
||||||
|
|
||||||
npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
|
npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild
|
||||||
|
|
||||||
if [ "''${dontNpmInstall-}" != "1" ]
|
if [ "''${dontNpmInstall-}" != "1" ]
|
||||||
then
|
then
|
||||||
# NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
|
# NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
|
||||||
rm -f npm-shrinkwrap.json
|
rm -f npm-shrinkwrap.json
|
||||||
|
|
||||||
npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
|
npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install
|
||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -396,8 +396,8 @@ let
|
||||||
stdenv.mkDerivation ({
|
stdenv.mkDerivation ({
|
||||||
name = "node_${name}-${version}";
|
name = "node_${name}-${version}";
|
||||||
buildInputs = [ tarWrapper python nodejs ]
|
buildInputs = [ tarWrapper python nodejs ]
|
||||||
++ stdenv.lib.optional (stdenv.isLinux) utillinux
|
++ lib.optional (stdenv.isLinux) utillinux
|
||||||
++ stdenv.lib.optional (stdenv.isDarwin) libtool
|
++ lib.optional (stdenv.isDarwin) libtool
|
||||||
++ buildInputs;
|
++ buildInputs;
|
||||||
|
|
||||||
inherit nodejs;
|
inherit nodejs;
|
||||||
|
@ -470,8 +470,8 @@ let
|
||||||
name = "node-dependencies-${name}-${version}";
|
name = "node-dependencies-${name}-${version}";
|
||||||
|
|
||||||
buildInputs = [ tarWrapper python nodejs ]
|
buildInputs = [ tarWrapper python nodejs ]
|
||||||
++ stdenv.lib.optional (stdenv.isLinux) utillinux
|
++ lib.optional (stdenv.isLinux) utillinux
|
||||||
++ stdenv.lib.optional (stdenv.isDarwin) libtool
|
++ lib.optional (stdenv.isDarwin) libtool
|
||||||
++ buildInputs;
|
++ buildInputs;
|
||||||
|
|
||||||
inherit dontStrip; # Stripping may fail a build for some package deployments
|
inherit dontStrip; # Stripping may fail a build for some package deployments
|
||||||
|
@ -491,7 +491,7 @@ let
|
||||||
# Create fake package.json to make the npm commands work properly
|
# Create fake package.json to make the npm commands work properly
|
||||||
cp ${src}/package.json .
|
cp ${src}/package.json .
|
||||||
chmod 644 package.json
|
chmod 644 package.json
|
||||||
${stdenv.lib.optionalString bypassCache ''
|
${lib.optionalString bypassCache ''
|
||||||
if [ -f ${src}/package-lock.json ]
|
if [ -f ${src}/package-lock.json ]
|
||||||
then
|
then
|
||||||
cp ${src}/package-lock.json .
|
cp ${src}/package-lock.json .
|
||||||
|
@ -500,13 +500,13 @@ let
|
||||||
|
|
||||||
# Go to the parent folder to make sure that all packages are pinpointed
|
# Go to the parent folder to make sure that all packages are pinpointed
|
||||||
cd ..
|
cd ..
|
||||||
${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
||||||
|
|
||||||
${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
|
${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
|
||||||
|
|
||||||
# Expose the executables that were installed
|
# Expose the executables that were installed
|
||||||
cd ..
|
cd ..
|
||||||
${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
||||||
|
|
||||||
mv ${packageName} lib
|
mv ${packageName} lib
|
||||||
ln -s $out/lib/node_modules/.bin $out/bin
|
ln -s $out/lib/node_modules/.bin $out/bin
|
||||||
|
@ -516,7 +516,7 @@ let
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "node-shell-${name}-${version}";
|
name = "node-shell-${name}-${version}";
|
||||||
|
|
||||||
buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
|
buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
|
||||||
buildCommand = ''
|
buildCommand = ''
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
cat > $out/bin/shell <<EOF
|
cat > $out/bin/shell <<EOF
|
||||||
|
@ -529,14 +529,14 @@ let
|
||||||
|
|
||||||
# Provide the dependencies in a development shell through the NODE_PATH environment variable
|
# Provide the dependencies in a development shell through the NODE_PATH environment variable
|
||||||
inherit nodeDependencies;
|
inherit nodeDependencies;
|
||||||
shellHook = stdenv.lib.optionalString (dependencies != []) ''
|
shellHook = lib.optionalString (dependencies != []) ''
|
||||||
export NODE_PATH=${nodeDependencies}/lib/node_modules
|
export NODE_PATH=${nodeDependencies}/lib/node_modules
|
||||||
export PATH="${nodeDependencies}/bin:$PATH"
|
export PATH="${nodeDependencies}/bin:$PATH"
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist;
|
buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;
|
||||||
buildNodePackage = stdenv.lib.makeOverridable buildNodePackage;
|
buildNodePackage = lib.makeOverridable buildNodePackage;
|
||||||
buildNodeShell = stdenv.lib.makeOverridable buildNodeShell;
|
buildNodeShell = lib.makeOverridable buildNodeShell;
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,6 +43,7 @@ let
|
||||||
|
|
||||||
patches = []
|
patches = []
|
||||||
++ optional (vpxSupport && hasPrefix "0.8." version) ./vpxenc-0.8.17-libvpx-1.5.patch
|
++ optional (vpxSupport && hasPrefix "0.8." version) ./vpxenc-0.8.17-libvpx-1.5.patch
|
||||||
|
++ optional (vpxSupport && hasPrefix "12." version) ./vpx-12.3-libvpx-1.8.patch
|
||||||
;
|
;
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
46
pkgs/development/libraries/libav/vpx-12.3-libvpx-1.8.patch
Normal file
46
pkgs/development/libraries/libav/vpx-12.3-libvpx-1.8.patch
Normal file
|
@ -0,0 +1,46 @@
|
||||||
|
--- libav/libavcodec/libvpx.c.orig 2018-02-12 21:25:59 UTC
|
||||||
|
+++ libav/libavcodec/libvpx.c
|
||||||
|
@@ -25,6 +25,7 @@
|
||||||
|
enum AVPixelFormat ff_vpx_imgfmt_to_pixfmt(vpx_img_fmt_t img)
|
||||||
|
{
|
||||||
|
switch (img) {
|
||||||
|
+#if VPX_IMAGE_ABI_VERSION < 5
|
||||||
|
case VPX_IMG_FMT_RGB24: return AV_PIX_FMT_RGB24;
|
||||||
|
case VPX_IMG_FMT_RGB565: return AV_PIX_FMT_RGB565BE;
|
||||||
|
case VPX_IMG_FMT_RGB555: return AV_PIX_FMT_RGB555BE;
|
||||||
|
@@ -36,10 +37,13 @@ enum AVPixelFormat ff_vpx_imgfmt_to_pixfmt(vpx_img_fmt
|
||||||
|
case VPX_IMG_FMT_ARGB_LE: return AV_PIX_FMT_BGRA;
|
||||||
|
case VPX_IMG_FMT_RGB565_LE: return AV_PIX_FMT_RGB565LE;
|
||||||
|
case VPX_IMG_FMT_RGB555_LE: return AV_PIX_FMT_RGB555LE;
|
||||||
|
+#endif
|
||||||
|
case VPX_IMG_FMT_I420: return AV_PIX_FMT_YUV420P;
|
||||||
|
case VPX_IMG_FMT_I422: return AV_PIX_FMT_YUV422P;
|
||||||
|
case VPX_IMG_FMT_I444: return AV_PIX_FMT_YUV444P;
|
||||||
|
+#if VPX_IMAGE_ABI_VERSION < 5
|
||||||
|
case VPX_IMG_FMT_444A: return AV_PIX_FMT_YUVA444P;
|
||||||
|
+#endif
|
||||||
|
#if VPX_IMAGE_ABI_VERSION >= 3
|
||||||
|
case VPX_IMG_FMT_I440: return AV_PIX_FMT_YUV440P;
|
||||||
|
case VPX_IMG_FMT_I42016: return AV_PIX_FMT_YUV420P16BE;
|
||||||
|
@@ -53,6 +57,7 @@ enum AVPixelFormat ff_vpx_imgfmt_to_pixfmt(vpx_img_fmt
|
||||||
|
vpx_img_fmt_t ff_vpx_pixfmt_to_imgfmt(enum AVPixelFormat pix)
|
||||||
|
{
|
||||||
|
switch (pix) {
|
||||||
|
+#if VPX_IMAGE_ABI_VERSION < 5
|
||||||
|
case AV_PIX_FMT_RGB24: return VPX_IMG_FMT_RGB24;
|
||||||
|
case AV_PIX_FMT_RGB565BE: return VPX_IMG_FMT_RGB565;
|
||||||
|
case AV_PIX_FMT_RGB555BE: return VPX_IMG_FMT_RGB555;
|
||||||
|
@@ -64,10 +69,13 @@ vpx_img_fmt_t ff_vpx_pixfmt_to_imgfmt(enum AVPixelForm
|
||||||
|
case AV_PIX_FMT_BGRA: return VPX_IMG_FMT_ARGB_LE;
|
||||||
|
case AV_PIX_FMT_RGB565LE: return VPX_IMG_FMT_RGB565_LE;
|
||||||
|
case AV_PIX_FMT_RGB555LE: return VPX_IMG_FMT_RGB555_LE;
|
||||||
|
+#endif
|
||||||
|
case AV_PIX_FMT_YUV420P: return VPX_IMG_FMT_I420;
|
||||||
|
case AV_PIX_FMT_YUV422P: return VPX_IMG_FMT_I422;
|
||||||
|
case AV_PIX_FMT_YUV444P: return VPX_IMG_FMT_I444;
|
||||||
|
+#if VPX_IMAGE_ABI_VERSION < 5
|
||||||
|
case AV_PIX_FMT_YUVA444P: return VPX_IMG_FMT_444A;
|
||||||
|
+#endif
|
||||||
|
#if VPX_IMAGE_ABI_VERSION >= 3
|
||||||
|
case AV_PIX_FMT_YUV440P: return VPX_IMG_FMT_I440;
|
||||||
|
case AV_PIX_FMT_YUV420P16BE: return VPX_IMG_FMT_I42016;
|
|
@ -1,19 +1,24 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config }:
|
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libxml2 }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "libqb-0.17.2";
|
pname = "libqb";
|
||||||
|
version = "2.0.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchFromGitHub {
|
||||||
url = "https://fedorahosted.org/releases/q/u/quarterback/${name}.tar.xz";
|
owner = "ClusterLabs";
|
||||||
sha256 = "1zpl45p3n6dn1jgbsrrmccrmv2mvp8aqmnl0qxfjf7ymkrj9qhcs";
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "1gpfcz84igqncky09hdibxmzapzl37y8914avgq89rsizynj1wsm";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||||
|
|
||||||
|
buildInputs = [ libxml2 ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/clusterlabs/libqb";
|
homepage = "https://github.com/clusterlabs/libqb";
|
||||||
description = "A library providing high performance logging, tracing, ipc, and poll";
|
description = "A library providing high performance logging, tracing, ipc, and poll";
|
||||||
license = licenses.lgpl21;
|
license = licenses.lgpl21Plus;
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
nodeEnv = import ../../node-packages/node-env.nix {
|
nodeEnv = import ../../node-packages/node-env.nix {
|
||||||
inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
|
inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
|
||||||
inherit nodejs;
|
inherit nodejs;
|
||||||
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
||||||
};
|
};
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
nodeEnv = import ./node-env.nix {
|
nodeEnv = import ./node-env.nix {
|
||||||
inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
|
inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
|
||||||
inherit nodejs;
|
inherit nodejs;
|
||||||
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# This file originates from node2nix
|
# This file originates from node2nix
|
||||||
|
|
||||||
{stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}:
|
{lib, stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}:
|
||||||
|
|
||||||
let
|
let
|
||||||
python = if nodejs ? python then nodejs.python else python2;
|
python = if nodejs ? python then nodejs.python else python2;
|
||||||
|
@ -38,8 +38,8 @@ let
|
||||||
};
|
};
|
||||||
|
|
||||||
includeDependencies = {dependencies}:
|
includeDependencies = {dependencies}:
|
||||||
stdenv.lib.optionalString (dependencies != [])
|
lib.optionalString (dependencies != [])
|
||||||
(stdenv.lib.concatMapStrings (dependency:
|
(lib.concatMapStrings (dependency:
|
||||||
''
|
''
|
||||||
# Bundle the dependencies of the package
|
# Bundle the dependencies of the package
|
||||||
mkdir -p node_modules
|
mkdir -p node_modules
|
||||||
|
@ -100,7 +100,7 @@ let
|
||||||
cd "$DIR/${packageName}"
|
cd "$DIR/${packageName}"
|
||||||
${includeDependencies { inherit dependencies; }}
|
${includeDependencies { inherit dependencies; }}
|
||||||
cd ..
|
cd ..
|
||||||
${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
pinpointDependencies = {dependencies, production}:
|
pinpointDependencies = {dependencies, production}:
|
||||||
|
@ -161,12 +161,12 @@ let
|
||||||
''
|
''
|
||||||
node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
|
node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
|
||||||
|
|
||||||
${stdenv.lib.optionalString (dependencies != [])
|
${lib.optionalString (dependencies != [])
|
||||||
''
|
''
|
||||||
if [ -d node_modules ]
|
if [ -d node_modules ]
|
||||||
then
|
then
|
||||||
cd node_modules
|
cd node_modules
|
||||||
${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
|
${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
|
||||||
cd ..
|
cd ..
|
||||||
fi
|
fi
|
||||||
''}
|
''}
|
||||||
|
@ -183,7 +183,7 @@ let
|
||||||
cd "${packageName}"
|
cd "${packageName}"
|
||||||
${pinpointDependencies { inherit dependencies production; }}
|
${pinpointDependencies { inherit dependencies production; }}
|
||||||
cd ..
|
cd ..
|
||||||
${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -344,8 +344,8 @@ let
|
||||||
cd "${packageName}"
|
cd "${packageName}"
|
||||||
runHook preRebuild
|
runHook preRebuild
|
||||||
|
|
||||||
${stdenv.lib.optionalString bypassCache ''
|
${lib.optionalString bypassCache ''
|
||||||
${stdenv.lib.optionalString reconstructLock ''
|
${lib.optionalString reconstructLock ''
|
||||||
if [ -f package-lock.json ]
|
if [ -f package-lock.json ]
|
||||||
then
|
then
|
||||||
echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!"
|
echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!"
|
||||||
|
@ -361,14 +361,14 @@ let
|
||||||
node ${addIntegrityFieldsScript}
|
node ${addIntegrityFieldsScript}
|
||||||
''}
|
''}
|
||||||
|
|
||||||
npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
|
npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild
|
||||||
|
|
||||||
if [ "''${dontNpmInstall-}" != "1" ]
|
if [ "''${dontNpmInstall-}" != "1" ]
|
||||||
then
|
then
|
||||||
# NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
|
# NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
|
||||||
rm -f npm-shrinkwrap.json
|
rm -f npm-shrinkwrap.json
|
||||||
|
|
||||||
npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
|
npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install
|
||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -397,8 +397,8 @@ let
|
||||||
stdenv.mkDerivation ({
|
stdenv.mkDerivation ({
|
||||||
name = "node_${name}-${version}";
|
name = "node_${name}-${version}";
|
||||||
buildInputs = [ tarWrapper python nodejs ]
|
buildInputs = [ tarWrapper python nodejs ]
|
||||||
++ stdenv.lib.optional (stdenv.isLinux) util-linux
|
++ lib.optional (stdenv.isLinux) util-linux
|
||||||
++ stdenv.lib.optional (stdenv.isDarwin) libtool
|
++ lib.optional (stdenv.isDarwin) libtool
|
||||||
++ buildInputs;
|
++ buildInputs;
|
||||||
|
|
||||||
inherit nodejs;
|
inherit nodejs;
|
||||||
|
@ -476,8 +476,8 @@ let
|
||||||
name = "node-dependencies-${name}-${version}";
|
name = "node-dependencies-${name}-${version}";
|
||||||
|
|
||||||
buildInputs = [ tarWrapper python nodejs ]
|
buildInputs = [ tarWrapper python nodejs ]
|
||||||
++ stdenv.lib.optional (stdenv.isLinux) util-linux
|
++ lib.optional (stdenv.isLinux) util-linux
|
||||||
++ stdenv.lib.optional (stdenv.isDarwin) libtool
|
++ lib.optional (stdenv.isDarwin) libtool
|
||||||
++ buildInputs;
|
++ buildInputs;
|
||||||
|
|
||||||
inherit dontStrip; # Stripping may fail a build for some package deployments
|
inherit dontStrip; # Stripping may fail a build for some package deployments
|
||||||
|
@ -497,7 +497,7 @@ let
|
||||||
# Create fake package.json to make the npm commands work properly
|
# Create fake package.json to make the npm commands work properly
|
||||||
cp ${src}/package.json .
|
cp ${src}/package.json .
|
||||||
chmod 644 package.json
|
chmod 644 package.json
|
||||||
${stdenv.lib.optionalString bypassCache ''
|
${lib.optionalString bypassCache ''
|
||||||
if [ -f ${src}/package-lock.json ]
|
if [ -f ${src}/package-lock.json ]
|
||||||
then
|
then
|
||||||
cp ${src}/package-lock.json .
|
cp ${src}/package-lock.json .
|
||||||
|
@ -506,13 +506,13 @@ let
|
||||||
|
|
||||||
# Go to the parent folder to make sure that all packages are pinpointed
|
# Go to the parent folder to make sure that all packages are pinpointed
|
||||||
cd ..
|
cd ..
|
||||||
${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
||||||
|
|
||||||
${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
|
${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
|
||||||
|
|
||||||
# Expose the executables that were installed
|
# Expose the executables that were installed
|
||||||
cd ..
|
cd ..
|
||||||
${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
||||||
|
|
||||||
mv ${packageName} lib
|
mv ${packageName} lib
|
||||||
ln -s $out/lib/node_modules/.bin $out/bin
|
ln -s $out/lib/node_modules/.bin $out/bin
|
||||||
|
@ -522,7 +522,7 @@ let
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "node-shell-${name}-${version}";
|
name = "node-shell-${name}-${version}";
|
||||||
|
|
||||||
buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) util-linux ++ buildInputs;
|
buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) util-linux ++ buildInputs;
|
||||||
buildCommand = ''
|
buildCommand = ''
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
cat > $out/bin/shell <<EOF
|
cat > $out/bin/shell <<EOF
|
||||||
|
@ -535,14 +535,14 @@ let
|
||||||
|
|
||||||
# Provide the dependencies in a development shell through the NODE_PATH environment variable
|
# Provide the dependencies in a development shell through the NODE_PATH environment variable
|
||||||
inherit nodeDependencies;
|
inherit nodeDependencies;
|
||||||
shellHook = stdenv.lib.optionalString (dependencies != []) ''
|
shellHook = lib.optionalString (dependencies != []) ''
|
||||||
export NODE_PATH=${nodeDependencies}/lib/node_modules
|
export NODE_PATH=${nodeDependencies}/lib/node_modules
|
||||||
export PATH="${nodeDependencies}/bin:$PATH"
|
export PATH="${nodeDependencies}/bin:$PATH"
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist;
|
buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;
|
||||||
buildNodePackage = stdenv.lib.makeOverridable buildNodePackage;
|
buildNodePackage = lib.makeOverridable buildNodePackage;
|
||||||
buildNodeShell = stdenv.lib.makeOverridable buildNodeShell;
|
buildNodeShell = lib.makeOverridable buildNodeShell;
|
||||||
}
|
}
|
||||||
|
|
11
pkgs/development/ocaml-modules/caqti/async.nix
Normal file
11
pkgs/development/ocaml-modules/caqti/async.nix
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
{ lib, buildDunePackage, async_kernel, async_unix, caqti, core_kernel }:
|
||||||
|
|
||||||
|
buildDunePackage {
|
||||||
|
pname = "caqti-async";
|
||||||
|
useDune2 = true;
|
||||||
|
inherit (caqti) version src;
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ async_kernel async_unix caqti core_kernel ];
|
||||||
|
|
||||||
|
meta = caqti.meta // { description = "Async support for Caqti"; };
|
||||||
|
}
|
26
pkgs/development/ocaml-modules/caqti/default.nix
Normal file
26
pkgs/development/ocaml-modules/caqti/default.nix
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
{ lib, fetchFromGitHub, buildDunePackage, cppo, logs, ptime, uri }:
|
||||||
|
|
||||||
|
buildDunePackage rec {
|
||||||
|
pname = "caqti";
|
||||||
|
version = "1.3.0";
|
||||||
|
useDune2 = true;
|
||||||
|
|
||||||
|
minimumOCamlVersion = "4.04";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "paurkedal";
|
||||||
|
repo = "ocaml-${pname}";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "1ksjchfjnh059wvd95my1sv9b0ild0dfaiynbf2xsaz7zg1y4xmw";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [ cppo ];
|
||||||
|
propagatedBuildInputs = [ logs ptime uri ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Unified interface to relational database libraries";
|
||||||
|
license = "LGPL-3.0-or-later WITH OCaml-LGPL-linking-exception";
|
||||||
|
maintainers = with lib.maintainers; [ bcc32 ];
|
||||||
|
homepage = "https://github.com/paurkedal/ocaml-caqti";
|
||||||
|
};
|
||||||
|
}
|
13
pkgs/development/ocaml-modules/caqti/driver-mariadb.nix
Normal file
13
pkgs/development/ocaml-modules/caqti/driver-mariadb.nix
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
{ lib, buildDunePackage, caqti, mariadb }:
|
||||||
|
|
||||||
|
buildDunePackage {
|
||||||
|
pname = "caqti-driver-mariadb";
|
||||||
|
useDune2 = true;
|
||||||
|
inherit (caqti) version src;
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ caqti mariadb ];
|
||||||
|
|
||||||
|
meta = caqti.meta // {
|
||||||
|
description = "MariaDB driver for Caqti using C bindings";
|
||||||
|
};
|
||||||
|
}
|
13
pkgs/development/ocaml-modules/caqti/driver-postgresql.nix
Normal file
13
pkgs/development/ocaml-modules/caqti/driver-postgresql.nix
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
{ lib, buildDunePackage, caqti, postgresql }:
|
||||||
|
|
||||||
|
buildDunePackage {
|
||||||
|
pname = "caqti-driver-postgresql";
|
||||||
|
useDune2 = true;
|
||||||
|
inherit (caqti) version src;
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ caqti postgresql ];
|
||||||
|
|
||||||
|
meta = caqti.meta // {
|
||||||
|
description = "PostgreSQL driver for Caqti based on C bindings";
|
||||||
|
};
|
||||||
|
}
|
13
pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix
Normal file
13
pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
{ lib, buildDunePackage, caqti, ocaml_sqlite3 }:
|
||||||
|
|
||||||
|
buildDunePackage {
|
||||||
|
pname = "caqti-driver-sqlite3";
|
||||||
|
useDune2 = true;
|
||||||
|
inherit (caqti) version src;
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ caqti ocaml_sqlite3 ];
|
||||||
|
|
||||||
|
meta = caqti.meta // {
|
||||||
|
description = "Sqlite3 driver for Caqti using C bindings";
|
||||||
|
};
|
||||||
|
}
|
13
pkgs/development/ocaml-modules/caqti/dynload.nix
Normal file
13
pkgs/development/ocaml-modules/caqti/dynload.nix
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
{ lib, buildDunePackage, caqti }:
|
||||||
|
|
||||||
|
buildDunePackage {
|
||||||
|
pname = "caqti-dynload";
|
||||||
|
useDune2 = true;
|
||||||
|
inherit (caqti) version src;
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ caqti ];
|
||||||
|
|
||||||
|
meta = caqti.meta // {
|
||||||
|
description = "Dynamic linking of Caqti drivers using findlib.dynload";
|
||||||
|
};
|
||||||
|
}
|
11
pkgs/development/ocaml-modules/caqti/lwt.nix
Normal file
11
pkgs/development/ocaml-modules/caqti/lwt.nix
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
{ lib, buildDunePackage, caqti, logs, lwt }:
|
||||||
|
|
||||||
|
buildDunePackage {
|
||||||
|
pname = "caqti-lwt";
|
||||||
|
useDune2 = true;
|
||||||
|
inherit (caqti) version src;
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ caqti logs lwt ];
|
||||||
|
|
||||||
|
meta = caqti.meta // { description = "Lwt support for Caqti"; };
|
||||||
|
}
|
14
pkgs/development/ocaml-modules/caqti/type-calendar.nix
Normal file
14
pkgs/development/ocaml-modules/caqti/type-calendar.nix
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
{ lib, buildDunePackage, calendar, caqti }:
|
||||||
|
|
||||||
|
buildDunePackage {
|
||||||
|
pname = "caqti-type-calendar";
|
||||||
|
version = "1.2.0";
|
||||||
|
useDune2 = true;
|
||||||
|
inherit (caqti) src;
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ calendar caqti ];
|
||||||
|
|
||||||
|
meta = caqti.meta // {
|
||||||
|
description = "Date and time field types using the calendar library";
|
||||||
|
};
|
||||||
|
}
|
26
pkgs/development/ocaml-modules/mariadb/default.nix
Normal file
26
pkgs/development/ocaml-modules/mariadb/default.nix
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
{ stdenv, lib, fetchFromGitHub, buildOasisPackage
|
||||||
|
, ctypes, mariadb, libmysqlclient }:
|
||||||
|
|
||||||
|
buildOasisPackage rec {
|
||||||
|
pname = "mariadb";
|
||||||
|
version = "1.1.4";
|
||||||
|
|
||||||
|
minimumOCamlVersion = "4.07.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "andrenth";
|
||||||
|
repo = "ocaml-mariadb";
|
||||||
|
rev = version;
|
||||||
|
sha256 = "1rxqvxr6sv4x2hsi05qm9jz0asaq969m71db4ckl672rcql1kwbr";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [ mariadb libmysqlclient ];
|
||||||
|
propagatedBuildInputs = [ ctypes ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "OCaml bindings for MariaDB";
|
||||||
|
license = lib.licenses.mit;
|
||||||
|
maintainers = with lib.maintainers; [ bcc32 ];
|
||||||
|
homepage = "https://github.com/andrenth/ocaml-mariadb";
|
||||||
|
};
|
||||||
|
}
|
24
pkgs/development/ocaml-modules/postgresql/default.nix
Normal file
24
pkgs/development/ocaml-modules/postgresql/default.nix
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
{ lib, fetchFromGitHub, buildDunePackage, postgresql }:
|
||||||
|
|
||||||
|
buildDunePackage rec {
|
||||||
|
pname = "postgresql";
|
||||||
|
version = "4.6.3";
|
||||||
|
|
||||||
|
minimumOCamlVersion = "4.08";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "mmottl";
|
||||||
|
repo = "postgresql-ocaml";
|
||||||
|
rev = version;
|
||||||
|
sha256 = "0fd96qqwkwjhv6pawk4wivwncszkif0sq05f0g5gd28jzwrsvpqr";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [ postgresql ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Bindings to the PostgreSQL library";
|
||||||
|
license = lib.licenses.lgpl21Plus;
|
||||||
|
maintainers = with lib.maintainers; [ bcc32 ];
|
||||||
|
homepage = "https://mmottl.github.io/postgresql-ocaml";
|
||||||
|
};
|
||||||
|
}
|
24
pkgs/development/python-modules/pebble/default.nix
Normal file
24
pkgs/development/python-modules/pebble/default.nix
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
{ lib, buildPythonPackage, isPy27, fetchPypi, pytestCheckHook }:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "pebble";
|
||||||
|
version = "4.6.0";
|
||||||
|
disabled = isPy27;
|
||||||
|
|
||||||
|
src = fetchPypi {
|
||||||
|
pname = "Pebble";
|
||||||
|
inherit version;
|
||||||
|
sha256 = "0a595f7mrf89xlck9b2x83bqybc9zd9jxkl0sa5cf19vax18rg8h";
|
||||||
|
};
|
||||||
|
|
||||||
|
checkInputs = [
|
||||||
|
pytestCheckHook
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "API to manage threads and processes within an application";
|
||||||
|
homepage = "https://github.com/noxdafox/pebble";
|
||||||
|
license = licenses.lgpl3Plus;
|
||||||
|
maintainers = with maintainers; [ orivej ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -14,13 +14,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "buildah";
|
pname = "buildah";
|
||||||
version = "1.19.2";
|
version = "1.19.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "containers";
|
owner = "containers";
|
||||||
repo = "buildah";
|
repo = "buildah";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1gak5m4n4bfji1hcv8y5lj1m8a39rars8igqxdr89d2i45dkpbx0";
|
sha256 = "sha256-mHr+FuDMxLA5Y7BNbDN75mdHVP6Ah1/S5vXg6cC/dcE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "out" "man" ];
|
outputs = [ "out" "man" ];
|
||||||
|
|
|
@ -2,17 +2,17 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "gomplate";
|
pname = "gomplate";
|
||||||
version = "3.8.0";
|
version = "3.9.0";
|
||||||
owner = "hairyhenderson";
|
owner = "hairyhenderson";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
inherit owner rev;
|
inherit owner rev;
|
||||||
repo = pname;
|
repo = pname;
|
||||||
sha256 = "058shbrhpd8ghdj5qa6n7mf1bh8qvpmiv3yjj39jys359zhin06n";
|
sha256 = "sha256-liy8cqn+hWoTOHchCY1LLu23tNvz7eGA+AN0d0APjC4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "0wqz3anxlzb0ds6xmpnaxq5rjgcmzkzrdqhnkfkjq32b7mj9mks3";
|
vendorSha256 = "sha256-Ph9z/Tom7O7V7yZ/On+etty+Bl653HiY/J3d3yfweeQ=";
|
||||||
|
|
||||||
# some tests require network access
|
# some tests require network access
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
nodeEnv = import ./node-env.nix {
|
nodeEnv = import ./node-env.nix {
|
||||||
inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
|
inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
|
||||||
inherit nodejs;
|
inherit nodejs;
|
||||||
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# This file originates from node2nix
|
# This file originates from node2nix
|
||||||
|
|
||||||
{stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}:
|
{lib, stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}:
|
||||||
|
|
||||||
let
|
let
|
||||||
python = if nodejs ? python then nodejs.python else python2;
|
python = if nodejs ? python then nodejs.python else python2;
|
||||||
|
@ -38,8 +38,8 @@ let
|
||||||
};
|
};
|
||||||
|
|
||||||
includeDependencies = {dependencies}:
|
includeDependencies = {dependencies}:
|
||||||
stdenv.lib.optionalString (dependencies != [])
|
lib.optionalString (dependencies != [])
|
||||||
(stdenv.lib.concatMapStrings (dependency:
|
(lib.concatMapStrings (dependency:
|
||||||
''
|
''
|
||||||
# Bundle the dependencies of the package
|
# Bundle the dependencies of the package
|
||||||
mkdir -p node_modules
|
mkdir -p node_modules
|
||||||
|
@ -100,7 +100,7 @@ let
|
||||||
cd "$DIR/${packageName}"
|
cd "$DIR/${packageName}"
|
||||||
${includeDependencies { inherit dependencies; }}
|
${includeDependencies { inherit dependencies; }}
|
||||||
cd ..
|
cd ..
|
||||||
${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
pinpointDependencies = {dependencies, production}:
|
pinpointDependencies = {dependencies, production}:
|
||||||
|
@ -161,12 +161,12 @@ let
|
||||||
''
|
''
|
||||||
node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
|
node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
|
||||||
|
|
||||||
${stdenv.lib.optionalString (dependencies != [])
|
${lib.optionalString (dependencies != [])
|
||||||
''
|
''
|
||||||
if [ -d node_modules ]
|
if [ -d node_modules ]
|
||||||
then
|
then
|
||||||
cd node_modules
|
cd node_modules
|
||||||
${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
|
${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
|
||||||
cd ..
|
cd ..
|
||||||
fi
|
fi
|
||||||
''}
|
''}
|
||||||
|
@ -183,7 +183,7 @@ let
|
||||||
cd "${packageName}"
|
cd "${packageName}"
|
||||||
${pinpointDependencies { inherit dependencies production; }}
|
${pinpointDependencies { inherit dependencies production; }}
|
||||||
cd ..
|
cd ..
|
||||||
${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -344,8 +344,8 @@ let
|
||||||
cd "${packageName}"
|
cd "${packageName}"
|
||||||
runHook preRebuild
|
runHook preRebuild
|
||||||
|
|
||||||
${stdenv.lib.optionalString bypassCache ''
|
${lib.optionalString bypassCache ''
|
||||||
${stdenv.lib.optionalString reconstructLock ''
|
${lib.optionalString reconstructLock ''
|
||||||
if [ -f package-lock.json ]
|
if [ -f package-lock.json ]
|
||||||
then
|
then
|
||||||
echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!"
|
echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!"
|
||||||
|
@ -361,14 +361,14 @@ let
|
||||||
node ${addIntegrityFieldsScript}
|
node ${addIntegrityFieldsScript}
|
||||||
''}
|
''}
|
||||||
|
|
||||||
npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
|
npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild
|
||||||
|
|
||||||
if [ "''${dontNpmInstall-}" != "1" ]
|
if [ "''${dontNpmInstall-}" != "1" ]
|
||||||
then
|
then
|
||||||
# NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
|
# NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
|
||||||
rm -f npm-shrinkwrap.json
|
rm -f npm-shrinkwrap.json
|
||||||
|
|
||||||
npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
|
npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install
|
||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -396,8 +396,8 @@ let
|
||||||
stdenv.mkDerivation ({
|
stdenv.mkDerivation ({
|
||||||
name = "node_${name}-${version}";
|
name = "node_${name}-${version}";
|
||||||
buildInputs = [ tarWrapper python nodejs ]
|
buildInputs = [ tarWrapper python nodejs ]
|
||||||
++ stdenv.lib.optional (stdenv.isLinux) util-linux
|
++ lib.optional (stdenv.isLinux) util-linux
|
||||||
++ stdenv.lib.optional (stdenv.isDarwin) libtool
|
++ lib.optional (stdenv.isDarwin) libtool
|
||||||
++ buildInputs;
|
++ buildInputs;
|
||||||
|
|
||||||
inherit nodejs;
|
inherit nodejs;
|
||||||
|
@ -470,8 +470,8 @@ let
|
||||||
name = "node-dependencies-${name}-${version}";
|
name = "node-dependencies-${name}-${version}";
|
||||||
|
|
||||||
buildInputs = [ tarWrapper python nodejs ]
|
buildInputs = [ tarWrapper python nodejs ]
|
||||||
++ stdenv.lib.optional (stdenv.isLinux) util-linux
|
++ lib.optional (stdenv.isLinux) util-linux
|
||||||
++ stdenv.lib.optional (stdenv.isDarwin) libtool
|
++ lib.optional (stdenv.isDarwin) libtool
|
||||||
++ buildInputs;
|
++ buildInputs;
|
||||||
|
|
||||||
inherit dontStrip; # Stripping may fail a build for some package deployments
|
inherit dontStrip; # Stripping may fail a build for some package deployments
|
||||||
|
@ -491,7 +491,7 @@ let
|
||||||
# Create fake package.json to make the npm commands work properly
|
# Create fake package.json to make the npm commands work properly
|
||||||
cp ${src}/package.json .
|
cp ${src}/package.json .
|
||||||
chmod 644 package.json
|
chmod 644 package.json
|
||||||
${stdenv.lib.optionalString bypassCache ''
|
${lib.optionalString bypassCache ''
|
||||||
if [ -f ${src}/package-lock.json ]
|
if [ -f ${src}/package-lock.json ]
|
||||||
then
|
then
|
||||||
cp ${src}/package-lock.json .
|
cp ${src}/package-lock.json .
|
||||||
|
@ -500,13 +500,13 @@ let
|
||||||
|
|
||||||
# Go to the parent folder to make sure that all packages are pinpointed
|
# Go to the parent folder to make sure that all packages are pinpointed
|
||||||
cd ..
|
cd ..
|
||||||
${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
||||||
|
|
||||||
${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
|
${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
|
||||||
|
|
||||||
# Expose the executables that were installed
|
# Expose the executables that were installed
|
||||||
cd ..
|
cd ..
|
||||||
${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
||||||
|
|
||||||
mv ${packageName} lib
|
mv ${packageName} lib
|
||||||
ln -s $out/lib/node_modules/.bin $out/bin
|
ln -s $out/lib/node_modules/.bin $out/bin
|
||||||
|
@ -516,7 +516,7 @@ let
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "node-shell-${name}-${version}";
|
name = "node-shell-${name}-${version}";
|
||||||
|
|
||||||
buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) util-linux ++ buildInputs;
|
buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) util-linux ++ buildInputs;
|
||||||
buildCommand = ''
|
buildCommand = ''
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
cat > $out/bin/shell <<EOF
|
cat > $out/bin/shell <<EOF
|
||||||
|
@ -529,14 +529,14 @@ let
|
||||||
|
|
||||||
# Provide the dependencies in a development shell through the NODE_PATH environment variable
|
# Provide the dependencies in a development shell through the NODE_PATH environment variable
|
||||||
inherit nodeDependencies;
|
inherit nodeDependencies;
|
||||||
shellHook = stdenv.lib.optionalString (dependencies != []) ''
|
shellHook = lib.optionalString (dependencies != []) ''
|
||||||
export NODE_PATH=${nodeDependencies}/lib/node_modules
|
export NODE_PATH=${nodeDependencies}/lib/node_modules
|
||||||
export PATH="${nodeDependencies}/bin:$PATH"
|
export PATH="${nodeDependencies}/bin:$PATH"
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist;
|
buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;
|
||||||
buildNodePackage = stdenv.lib.makeOverridable buildNodePackage;
|
buildNodePackage = lib.makeOverridable buildNodePackage;
|
||||||
buildNodeShell = stdenv.lib.makeOverridable buildNodeShell;
|
buildNodeShell = lib.makeOverridable buildNodeShell;
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
nodeEnv = import ../../node-packages/node-env.nix {
|
nodeEnv = import ../../node-packages/node-env.nix {
|
||||||
inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
|
inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
|
||||||
inherit nodejs;
|
inherit nodejs;
|
||||||
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
||||||
};
|
};
|
||||||
|
|
2
pkgs/misc/base16-builder/node-packages.nix
generated
2
pkgs/misc/base16-builder/node-packages.nix
generated
|
@ -10,7 +10,7 @@ let
|
||||||
inherit (pkgs) fetchurl fetchgit;
|
inherit (pkgs) fetchurl fetchgit;
|
||||||
});
|
});
|
||||||
nodeEnv = import ../../development/node-packages/node-env.nix {
|
nodeEnv = import ../../development/node-packages/node-env.nix {
|
||||||
inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
|
inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
|
||||||
inherit nodejs;
|
inherit nodejs;
|
||||||
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
||||||
};
|
};
|
||||||
|
|
|
@ -37,5 +37,10 @@ stdenv.mkDerivation rec {
|
||||||
homepage = "https://www.limesurvey.org";
|
homepage = "https://www.limesurvey.org";
|
||||||
maintainers = with maintainers; [offline];
|
maintainers = with maintainers; [offline];
|
||||||
platforms = with platforms; unix;
|
platforms = with platforms; unix;
|
||||||
|
knownVulnerabilities = [
|
||||||
|
# https://github.com/LimeSurvey/LimeSurvey/blob/3.x-LTS/docs/release_notes.txt
|
||||||
|
"Unauthorized access to statistics of a survey with certain permission configurations"
|
||||||
|
"Persistent XSS in browse response"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
nodeEnv = import ../../../development/node-packages/node-env.nix {
|
nodeEnv = import ../../../development/node-packages/node-env.nix {
|
||||||
inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
|
inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
|
||||||
inherit nodejs;
|
inherit nodejs;
|
||||||
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,7 +0,0 @@
|
||||||
diff --git a/dist/autoconf-version b/dist/autoconf-version
|
|
||||||
index 264f2ce..5e1b8b0 100644
|
|
||||||
--- a/dist/autoconf-version
|
|
||||||
+++ b/dist/autoconf-version
|
|
||||||
@@ -1 +1 @@
|
|
||||||
-2.68
|
|
||||||
+2.69
|
|
|
@ -2,11 +2,12 @@
|
||||||
, file, openssl, perl, perlPackages, unzip, nettools, ncurses }:
|
, file, openssl, perl, perlPackages, unzip, nettools, ncurses }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "net-snmp-5.8";
|
pname = "net-snmp";
|
||||||
|
version = "5.9";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/net-snmp/${name}.tar.gz";
|
url = "mirror://sourceforge/net-snmp/${pname}-${version}.tar.gz";
|
||||||
sha256 = "1pvajzj9gmj56dmwix0ywmkmy2pglh6nny646hkm7ghfhh03bz5j";
|
sha256 = "0wb0vyafpspw3mcifkjjmf17r1r80kjvslycscb8nvaxz1k3lc04";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches =
|
patches =
|
||||||
|
@ -17,7 +18,6 @@ stdenv.mkDerivation rec {
|
||||||
in [
|
in [
|
||||||
(fetchAlpinePatch "fix-includes.patch" "0zpkbb6k366qpq4dax5wknwprhwnhighcp402mlm7950d39zfa3m")
|
(fetchAlpinePatch "fix-includes.patch" "0zpkbb6k366qpq4dax5wknwprhwnhighcp402mlm7950d39zfa3m")
|
||||||
(fetchAlpinePatch "netsnmp-swinst-crash.patch" "0gh164wy6zfiwiszh58fsvr25k0ns14r3099664qykgpmickkqid")
|
(fetchAlpinePatch "netsnmp-swinst-crash.patch" "0gh164wy6zfiwiszh58fsvr25k0ns14r3099664qykgpmickkqid")
|
||||||
./0002-autoconf-version.patch
|
|
||||||
];
|
];
|
||||||
|
|
||||||
outputs = [ "bin" "out" "dev" "lib" ];
|
outputs = [ "bin" "out" "dev" "lib" ];
|
||||||
|
|
2
pkgs/servers/web-apps/cryptpad/node-packages.nix
generated
2
pkgs/servers/web-apps/cryptpad/node-packages.nix
generated
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
nodeEnv = import ../../../development/node-packages/node-env.nix {
|
nodeEnv = import ../../../development/node-packages/node-env.nix {
|
||||||
inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
|
inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
|
||||||
inherit nodejs;
|
inherit nodejs;
|
||||||
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
||||||
};
|
};
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
nodeEnv = import ../../../development/node-packages/node-env.nix {
|
nodeEnv = import ../../../development/node-packages/node-env.nix {
|
||||||
inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
|
inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
|
||||||
inherit nodejs;
|
inherit nodejs;
|
||||||
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
||||||
};
|
};
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
nodeEnv = import ../../development/node-packages/node-env.nix {
|
nodeEnv = import ../../development/node-packages/node-env.nix {
|
||||||
inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
|
inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
|
||||||
inherit nodejs;
|
inherit nodejs;
|
||||||
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
||||||
};
|
};
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
nodeEnv = import ../../../../development/node-packages/node-env.nix {
|
nodeEnv = import ../../../../development/node-packages/node-env.nix {
|
||||||
inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
|
inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
|
||||||
inherit nodejs;
|
inherit nodejs;
|
||||||
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
||||||
};
|
};
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
nodeEnv = import ../../../development/node-packages/node-env.nix {
|
nodeEnv = import ../../../development/node-packages/node-env.nix {
|
||||||
inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
|
inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
|
||||||
inherit nodejs;
|
inherit nodejs;
|
||||||
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
||||||
};
|
};
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
nodeEnv = import ../../../development/node-packages/node-env.nix {
|
nodeEnv = import ../../../development/node-packages/node-env.nix {
|
||||||
inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
|
inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
|
||||||
inherit nodejs;
|
inherit nodejs;
|
||||||
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
||||||
};
|
};
|
||||||
|
|
|
@ -130,6 +130,22 @@ let
|
||||||
|
|
||||||
cairo2 = callPackage ../development/ocaml-modules/cairo2 { };
|
cairo2 = callPackage ../development/ocaml-modules/cairo2 { };
|
||||||
|
|
||||||
|
caqti = callPackage ../development/ocaml-modules/caqti { };
|
||||||
|
|
||||||
|
caqti-async = callPackage ../development/ocaml-modules/caqti/async.nix { };
|
||||||
|
|
||||||
|
caqti-driver-mariadb = callPackage ../development/ocaml-modules/caqti/driver-mariadb.nix { };
|
||||||
|
|
||||||
|
caqti-driver-postgresql = callPackage ../development/ocaml-modules/caqti/driver-postgresql.nix { };
|
||||||
|
|
||||||
|
caqti-driver-sqlite3 = callPackage ../development/ocaml-modules/caqti/driver-sqlite3.nix { };
|
||||||
|
|
||||||
|
caqti-dynload = callPackage ../development/ocaml-modules/caqti/dynload.nix { };
|
||||||
|
|
||||||
|
caqti-lwt = callPackage ../development/ocaml-modules/caqti/lwt.nix { };
|
||||||
|
|
||||||
|
caqti-type-calendar = callPackage ../development/ocaml-modules/caqti/type-calendar.nix { };
|
||||||
|
|
||||||
cfstream = callPackage ../development/ocaml-modules/cfstream { };
|
cfstream = callPackage ../development/ocaml-modules/cfstream { };
|
||||||
|
|
||||||
charInfo_width = callPackage ../development/ocaml-modules/charInfo_width { };
|
charInfo_width = callPackage ../development/ocaml-modules/charInfo_width { };
|
||||||
|
@ -564,6 +580,10 @@ let
|
||||||
|
|
||||||
magick = callPackage ../development/ocaml-modules/magick { };
|
magick = callPackage ../development/ocaml-modules/magick { };
|
||||||
|
|
||||||
|
mariadb = callPackage ../development/ocaml-modules/mariadb {
|
||||||
|
inherit (pkgs) mariadb;
|
||||||
|
};
|
||||||
|
|
||||||
markup = callPackage ../development/ocaml-modules/markup { };
|
markup = callPackage ../development/ocaml-modules/markup { };
|
||||||
|
|
||||||
mdx = callPackage ../development/ocaml-modules/mdx { };
|
mdx = callPackage ../development/ocaml-modules/mdx { };
|
||||||
|
@ -873,6 +893,10 @@ let
|
||||||
|
|
||||||
posix-types = callPackage ../development/ocaml-modules/posix/types.nix { };
|
posix-types = callPackage ../development/ocaml-modules/posix/types.nix { };
|
||||||
|
|
||||||
|
postgresql = callPackage ../development/ocaml-modules/postgresql {
|
||||||
|
inherit (pkgs) postgresql;
|
||||||
|
};
|
||||||
|
|
||||||
ppx_bitstring = callPackage ../development/ocaml-modules/bitstring/ppx.nix { };
|
ppx_bitstring = callPackage ../development/ocaml-modules/bitstring/ppx.nix { };
|
||||||
|
|
||||||
ppxfind = callPackage ../development/ocaml-modules/ppxfind { };
|
ppxfind = callPackage ../development/ocaml-modules/ppxfind { };
|
||||||
|
|
|
@ -4749,6 +4749,8 @@ in {
|
||||||
|
|
||||||
pdoc3 = callPackage ../development/python-modules/pdoc3 { };
|
pdoc3 = callPackage ../development/python-modules/pdoc3 { };
|
||||||
|
|
||||||
|
pebble = callPackage ../development/python-modules/pebble { };
|
||||||
|
|
||||||
pecan = callPackage ../development/python-modules/pecan { };
|
pecan = callPackage ../development/python-modules/pecan { };
|
||||||
|
|
||||||
peewee = callPackage ../development/python-modules/peewee { };
|
peewee = callPackage ../development/python-modules/peewee { };
|
||||||
|
|
Loading…
Reference in a new issue