Merge remote-tracking branch 'upstream/master' into HEAD

This commit is contained in:
Frederik Rietdijk 2018-01-20 21:04:17 +01:00
commit 75d8096108
24 changed files with 35106 additions and 36939 deletions

View file

@ -299,6 +299,7 @@
ivan-tkatchev = "Ivan Tkatchev <tkatchev@gmail.com>";
ixmatus = "Parnell Springmeyer <parnell@digitalmentat.com>";
izorkin = "Yurii Izorkin <Izorkin@gmail.com>";
ixxie = "Matan Bendix Shenhav <matan@fluxcraft.net>";
j-keck = "Jürgen Keck <jhyphenkeck@gmail.com>";
jagajaga = "Arseniy Seroka <ars.seroka@gmail.com>";
jammerful = "jammerful <jammerful@gmail.com>";

View file

@ -20,20 +20,32 @@ rec {
# Helper for the common case where we have separate feature and
# plugin JARs.
buildEclipsePlugin = { name, srcFeature, srcPlugin, ... } @ attrs:
buildEclipsePluginBase (attrs // {
srcs = [ srcFeature srcPlugin ];
buildEclipsePlugin =
{ name, srcFeature, srcPlugin ? null, srcPlugins ? [], ... } @ attrs:
assert srcPlugin == null -> srcPlugins != [];
assert srcPlugin != null -> srcPlugins == [];
buildCommand = ''
dropinDir="$out/eclipse/dropins/${name}"
let
mkdir -p $dropinDir/features
unzip ${srcFeature} -d $dropinDir/features/
pSrcs = if (srcPlugin != null) then [ srcPlugin ] else srcPlugins;
mkdir -p $dropinDir/plugins
cp -v ${srcPlugin} $dropinDir/plugins/${name}.jar
'';
});
in
buildEclipsePluginBase (attrs // {
srcs = [ srcFeature ] ++ pSrcs;
buildCommand = ''
dropinDir="$out/eclipse/dropins/${name}"
mkdir -p $dropinDir/features
unzip ${srcFeature} -d $dropinDir/features/
mkdir -p $dropinDir/plugins
for plugin in ${toString pSrcs}; do
cp -v $plugin $dropinDir/plugins/$(stripHash $plugin)
done
'';
});
# Helper for the case where the build directory has the layout of an
# Eclipse update site, that is, it contains the directories
@ -125,6 +137,29 @@ rec {
};
};
antlr-runtime_4_5 = buildEclipsePluginBase rec {
name = "antlr-runtime-4.5.3";
src = fetchurl {
url = "http://www.antlr.org/download/${name}.jar";
sha256 = "0lm78i2annlczlc2cg5xvby0g1dyl0sh1y5xc2pymjlmr67a1g4k";
};
buildCommand = ''
dropinDir="$out/eclipse/dropins/"
mkdir -p $dropinDir
cp -v $src $dropinDir/${name}.jar
'';
meta = with stdenv.lib; {
description = "A powerful parser generator for processing structured text or binary files";
homepage = http://www.antlr.org/;
license = licenses.bsd3;
platforms = platforms.all;
maintainers = [ maintainers.rycee ];
};
};
anyedittools = buildEclipsePlugin rec {
name = "anyedit-${version}";
version = "2.7.1.201709201439";
@ -256,7 +291,7 @@ rec {
};
};
cup = buildEclipsePluginBase rec {
cup = buildEclipsePlugin rec {
name = "cup-${version}";
version = "1.1.0.201604221613";
version_ = "1.0.0.201604221613";
@ -266,31 +301,20 @@ rec {
sha256 = "13nnsf0cqg02z3af6xg45rhcgiffsibxbx6h1zahjv7igvqgkyna";
};
srcPlugin1 = fetchurl {
url = "http://www2.in.tum.de/projects/cup/eclipse/plugins/CupReferencedLibraries_${version_}.jar";
sha256 = "0kif8kivrysprva1pxzajm88gi967qf7idhb6ga2xpvsdcris91j";
};
srcPlugins = [
(fetchurl {
url = "http://www2.in.tum.de/projects/cup/eclipse/plugins/CupReferencedLibraries_${version_}.jar";
sha256 = "0kif8kivrysprva1pxzajm88gi967qf7idhb6ga2xpvsdcris91j";
})
srcPlugin2 = fetchurl {
url = "http://www2.in.tum.de/projects/cup/eclipse/plugins/de.tum.in.www2.CupPlugin_${version}.jar";
sha256 = "022phbrsny3gb8npb6sxyqqxacx138q5bd7dq3gqxh3kprx5chbl";
};
srcs = [ srcFeature srcPlugin1 srcPlugin2 ];
(fetchurl {
url = "http://www2.in.tum.de/projects/cup/eclipse/plugins/de.tum.in.www2.CupPlugin_${version}.jar";
sha256 = "022phbrsny3gb8npb6sxyqqxacx138q5bd7dq3gqxh3kprx5chbl";
})
];
propagatedBuildInputs = [ zest ];
phases = [ "installPhase" ];
installPhase = ''
dropinDir="$out/eclipse/dropins/${name}"
mkdir -p $dropinDir/features
unzip ${srcFeature} -d $dropinDir/features/
mkdir -p $dropinDir/plugins
cp -v ${srcPlugin1} $dropinDir/plugins/''${srcPlugin1#*-}
cp -v ${srcPlugin2} $dropinDir/plugins/''${srcPlugin2#*-}
'';
meta = with stdenv.lib; {
homepage = http://www2.cs.tum.edu/projects/cup/eclipse.php;
description = "IDE for developing CUP based parsers";
@ -383,6 +407,44 @@ rec {
};
};
jsonedit = buildEclipsePlugin rec {
name = "jsonedit-${version}";
version = "1.0.1";
srcFeature = fetchurl {
url = "https://boothen.github.io/Json-Eclipse-Plugin/features/jsonedit-feature_${version}.jar";
sha256 = "19221409wzcsrlm2fqf6mrxzb5ip1x6y5ba8anw788p7aaz1w30k";
};
srcPlugins =
let
fetch = { n, h }:
fetchurl {
url = "https://boothen.github.io/Json-Eclipse-Plugin/plugins/jsonedit-${n}_${version}.jar";
sha256 = h;
};
in
map fetch [
{ n = "core"; h = "05ipjbh9yz97zhqaqq6cja3zz44n0dn40ms13qnlgf4bxyaf0f6w"; }
{ n = "editor"; h = "1i71rh2fd5hsx6gygnafz2gjz4hlb0ckazxn0maxmnlx4p5apjql"; }
{ n = "folding"; h = "13p8vqdna23ln82w1jgchm59375f1ky0p2b1v7jih55yfhw1ymam"; }
{ n = "model"; h = "0llswhsd58f0rjb9canjncavq4z7q8zidn26yl5gradbbz580p6w"; }
{ n = "outline"; h = "1rs8g0iv2kklbl7j0p6nr26m6ii89yyr9bpi05mh21xva40pzkl5"; }
{ n = "preferences"; h = "0vs074ahhiba7if43ryf9m8xd81sqj9grppy0pzcnkkdkbk870n0"; }
{ n = "text"; h = "0nqpzjw8hhvh9jlpldpmcmg83a170wjdabgsvjq207j12jkvfiqq"; }
];
propagatedBuildInputs = [ antlr-runtime_4_5 ];
meta = with stdenv.lib; {
description = "Adds support for JSON files to Eclipse";
homepage = https://github.com/boothen/Json-Eclipse-Plugin;
license = licenses.epl10;
platforms = platforms.all;
maintainers = [ maintainers.rycee ];
};
};
jdt = buildEclipseUpdateSite rec {
name = "jdt-${version}";
version = "4.7.2";

View file

@ -1,13 +1,13 @@
{ stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext
, pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }:
let version = "3.29.0"; in
let version = "3.30.0"; in
stdenv.mkDerivation {
name = "filezilla-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
sha256 = "0najf2w6p5j4qc8jmglx6j63mph749s5p90lz2nkmwwwy5sfvlga";
sha256 = "1w0zqkccbsbmnjc9pfd1i3ywzwrdp0pprryvdk4sfn5ms9nnf2wi";
};
configureFlags = [

View file

@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl
perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar
];
propagatedUserEnvPkgs = [ gconf ];
configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx --enable-aqbanking";

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "diff-so-fancy-${version}";
version = "1.1.1";
version = "1.2.0";
src = fetchFromGitHub {
owner = "so-fancy";
repo = "diff-so-fancy";
rev = "v${version}";
sha256 = "1hgppp8ngjbjzbi96529p36hzi0ysdndrh6d6m71gs21am8v4m9r";
sha256 = "0j8dxfl4js7agwdpcvxwigzpp0lik33h7s3vsjg0pd413h2j4mvz";
};
# Perl is needed here for patchShebangs

View file

@ -11,6 +11,12 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl qtbase ];
nativeBuildInputs = [ cmake pkgconfig ];
# tells CMake to use this CA bundle file if it is accessible
preConfigure = ''export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt'';
# tricks CMake into using this CA bundle file if it is not accessible (in a sandbox)
cmakeFlags = [ "-Dqca_CERTSTORE=/etc/ssl/certs/ca-certificates.crt" ];
meta = with stdenv.lib; {
description = "Qt 5 Cryptographic Architecture";
homepage = http://delta.affinix.com/qca;

View file

@ -14,6 +14,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
# tells CMake to use this CA bundle file if it is accessible
preConfigure = ''export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt'';
# tricks CMake into using this CA bundle file if it is not accessible (in a sandbox)
cmakeFlags = [ "-Dqca_CERTSTORE=/etc/ssl/certs/ca-certificates.crt" ];
meta = with stdenv.lib; {
description = "Qt Cryptographic Architecture";
license = "LGPL";

View file

@ -24,7 +24,7 @@ top-level attribute to `top-level/all-packages.nix`.
# options
developerBuild ? false,
decryptSslTraffic ? false,
debug ? null,
debug ? false,
}:
with stdenv.lib;
@ -37,7 +37,7 @@ let
srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
patches = {
qtbase = [ ./qtbase.patch ];
qtbase = [ ./qtbase.patch ] ++ optional stdenv.isDarwin ./qtbase-darwin.patch;
qtdeclarative = [ ./qtdeclarative.patch ];
qtscript = [ ./qtscript.patch ];
qtserialport = [ ./qtserialport.patch ];

View file

@ -0,0 +1,57 @@
diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm
index 341d3bccf2..3368234c26 100644
--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm
+++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm
@@ -287,7 +287,7 @@ void QScanThread::getUserConfigurations()
QMacAutoReleasePool pool;
userProfiles.clear();
- NSArray<NSString *> *wifiInterfaces = [CWWiFiClient interfaceNames];
+ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames];
for (NSString *ifName in wifiInterfaces) {
CWInterface *wifiInterface = [[CWWiFiClient sharedWiFiClient] interfaceWithName:ifName];
@@ -602,7 +602,7 @@ void QCoreWlanEngine::doRequestUpdate()
QMacAutoReleasePool pool;
- NSArray<NSString *> *wifiInterfaces = [CWWiFiClient interfaceNames];
+ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames];
for (NSString *ifName in wifiInterfaces) {
scanThread->interfaceName = QString::fromNSString(ifName);
scanThread->start();
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
index d1f19f2..1ac2cf1 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -1699,7 +1699,7 @@ void QCocoaWindow::applyContentBorderThickness(NSWindow *window)
if (!m_drawContentBorderGradient) {
window.styleMask = window.styleMask & ~NSTexturedBackgroundWindowMask;
- [window.contentView.superview setNeedsDisplay:YES];
+ [[window.contentView superview] setNeedsDisplay:YES];
window.titlebarAppearsTransparent = NO;
return;
}
diff --git a/src/plugins/platforms/cocoa/qnswindow.mm b/src/plugins/platforms/cocoa/qnswindow.mm
index e846fa0..4171cd4 100644
--- a/src/plugins/platforms/cocoa/qnswindow.mm
+++ b/src/plugins/platforms/cocoa/qnswindow.mm
@@ -224,7 +224,7 @@ static bool isMouseEvent(NSEvent *ev)
if (pw->frameStrutEventsEnabled() && isMouseEvent(theEvent)) {
NSPoint loc = [theEvent locationInWindow];
NSRect windowFrame = [self convertRectFromScreen:self.frame];
- NSRect contentFrame = self.contentView.frame;
+ NSRect contentFrame = [self.contentView frame];
if (NSMouseInRect(loc, windowFrame, NO) && !NSMouseInRect(loc, contentFrame, NO))
[qnsview_cast(pw->view()) handleFrameStrutMouseEvent:theEvent];
}
@@ -253,7 +253,7 @@ static bool isMouseEvent(NSEvent *ev)
+ (void)applicationActivationChanged:(NSNotification*)notification
{
const id sender = self;
- NSEnumerator<NSWindow*> *windowEnumerator = nullptr;
+ NSEnumerator *windowEnumerator = nullptr;
NSApplication *application = [NSApplication sharedApplication];
#if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12)

View file

@ -33,7 +33,7 @@ existing packages here and modify it as necessary.
# options
developerBuild ? false,
decryptSslTraffic ? false,
debug ? null,
debug ? false,
}:
with stdenv.lib;

View file

@ -24,7 +24,7 @@ top-level attribute to `top-level/all-packages.nix`.
# options
developerBuild ? false,
decryptSslTraffic ? false,
debug ? null,
debug ? false,
}:
with stdenv.lib;

View file

@ -11,17 +11,18 @@ let
qmakeFlags =
(args.qmakeFlags or [])
++ optional (debug != null)
(if debug then "CONFIG+=debug" else "CONFIG+=release");
++ [ ("CONFIG+=" + (if debug then "debug" else "release")) ];
NIX_CFLAGS_COMPILE = optional (debug != null) "-DQT_NO_DEBUG";
NIX_CFLAGS_COMPILE =
optional (!debug) "-DQT_NO_DEBUG"
++ lib.toList (args.NIX_CFLAGS_COMPILE or []);
cmakeFlags =
(args.cmakeFlags or [])
++ [ "-DBUILD_TESTING=OFF" ]
++ optional (debug != null)
(if debug then "-DCMAKE_BUILD_TYPE=Debug"
else "-DCMAKE_BUILD_TYPE=Release");
++ [
"-DBUILD_TESTING=OFF"
("-DCMAKE_BUILD_TYPE=" + (if debug then "Debug" else "Release"))
];
enableParallelBuilding = args.enableParallelBuilding or true;

View file

@ -6,8 +6,10 @@
, "bower2nix"
, "browserify"
, "castnow"
, "clean-css"
, "coffee-script"
, "coinmon"
, "configurable-http-proxy"
, "cordova"
, "csslint"
, "dat"
@ -48,6 +50,8 @@
, "karma"
, { "kibana-authentication-proxy": "git://github.com/fangli/kibana-authentication-proxy.git" }
, "lerna"
, "less"
, "less-plugin-clean-css"
, "lcov-result-merger"
, "livedown"
, "live-server"

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,122 @@
{ lib
, python
, buildPythonPackage
, fetchPypi
, fetchzip
, alembic
, ipython
, jinja2
, python-oauth2
, pamela
, sqlalchemy
, tornado
, traitlets
, requests
, pythonOlder
, nodejs-8_x
, nodePackages
}:
let
# js/css assets that setup.py tries to fetch via `npm install` when building
# from source.
bootstrap =
fetchzip {
url = "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz";
sha256 = "0r7s54bbf68ri1na9bbabyf12mcpb6zk5ja2q6z82aw1fa4xi3yd";
};
font-awesome =
fetchzip {
url = "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz";
sha256 = "1xnxbdlfdd60z5ix152m8r2kk9dkwlqwpypky1mm3dv64ajnzdbk";
};
jquery =
fetchzip {
url = "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz";
sha256 = "1j6y18miwzafdj8kfpwbmbn9qvgnbnpc7l4arqrhqj33m04xrlgi";
};
moment =
fetchzip {
url = "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz";
sha256 = "1b4vyvs24v6y92pf2iqjm5aa7jg7khcpspn00girc7lpi917f9vw";
};
requirejs =
fetchzip {
url = "https://registry.npmjs.org/requirejs/-/requirejs-2.3.4.tgz";
sha256 = "0q6mkj0iv341kks06dya6lfs2kdw0n6vc7n4a7aa3ia530fk9vja";
};
in
buildPythonPackage rec {
pname = "jupyterhub";
version = "0.8.1";
src = fetchPypi {
inherit pname version;
sha256 = "100cf18d539802807a45450d38fefbb376cf1c810f3b1b31be31638829a5c69c";
};
# Most of this only applies when building from source (e.g. js/css assets are
# pre-built and bundled in the official release tarball on pypi).
#
# Stuff that's always needed:
# * At runtime, we need configurable-http-proxy, so we substitute the store
# path.
#
# Other stuff that's only needed when building from source:
# * js/css assets are fetched from npm.
# * substitute store path for `lessc` commmand.
# * set up NODE_PATH so `lessc` can find `less-plugin-clean-css`.
# * don't run `npm install`.
preBuild = ''
export NODE_PATH=${nodePackages.less-plugin-clean-css}/lib/node_modules
substituteInPlace jupyterhub/proxy.py --replace \
"'configurable-http-proxy'" \
"'${nodePackages.configurable-http-proxy}/bin/configurable-http-proxy'"
substituteInPlace jupyterhub/tests/test_proxy.py --replace \
"'configurable-http-proxy'" \
"'${nodePackages.configurable-http-proxy}/bin/configurable-http-proxy'"
substituteInPlace setup.py --replace \
"'npm', 'run', 'lessc', '--'" \
"'${nodePackages.less}/bin/lessc'"
substituteInPlace setup.py --replace \
"'npm', 'install', '--progress=false'" \
"'true'"
declare -A deps
deps[bootstrap]=${bootstrap}
deps[font-awesome]=${font-awesome}
deps[jquery]=${jquery}
deps[moment]=${moment}
deps[requirejs]=${requirejs}
mkdir -p share/jupyter/hub/static/components
for dep in "''${!deps[@]}"; do
if [ ! -e share/jupyter/hub/static/components/$dep ]; then
cp -r ''${deps[$dep]} share/jupyter/hub/static/components/$dep
fi
done
'';
propagatedBuildInputs = [
alembic ipython jinja2 pamela python-oauth2 requests sqlalchemy tornado
traitlets
];
# Disable tests because they take an excessive amount of time to complete.
doCheck = false;
disabled = pythonOlder "3.4";
meta = with lib; {
description = "Serves multiple Jupyter notebook instances";
homepage = http://jupyter.org/;
license = licenses.bsd3;
maintainers = with maintainers; [ ixxie cstrahan ];
};
}

View file

@ -0,0 +1,24 @@
{ lib
, python
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "python-oauth2";
version = "1.0.1";
src = fetchPypi {
inherit pname version;
sha256 = "0a1d0qnlgm07wq9r9bbm5jqkqry73w34m87p0141bk76lg7bb0sm";
};
# attempts to run mysql
doCheck = false;
meta = with lib; {
description = "Framework that aims at making it easy to provide authentication via OAuth 2.0 within an application stack";
homepage = https://github.com/wndhydrnt/python-oauth2;
license = licenses.mit;
maintainers = with maintainers; [ ixxie ];
};
}

View file

@ -0,0 +1,29 @@
{ lib
, buildPythonPackage
, fetchPypi
, jellyfish
}:
buildPythonPackage rec {
pname = "us";
version = "1.0.0";
propagatedBuildInputs = [ jellyfish ];
src = fetchPypi {
inherit pname version;
sha256 = "1niglalkp7pinibzbxjdz9mxx9qmwkrh8884dag3kr72cfkrpp09";
};
meta = {
description = "A package for easily working with US and state metadata";
longDescription = ''
all US states and territories, postal abbreviations, Associated Press style
abbreviations, FIPS codes, capitals, years of statehood, time zones, phonetic
state name lookup, is contiguous or continental, URLs to shapefiles for state,
census, congressional districts, counties, and census tracts
'';
homepage = https://github.com/unitedstates/python-us/;
license = lib.licenses.bsd3;
};
}

View file

@ -3,13 +3,13 @@
with stdenv.lib;
stdenv.mkDerivation rec {
name = "sysdig-${version}";
version = "0.19.1";
version = "0.20.0";
src = fetchFromGitHub {
owner = "draios";
repo = "sysdig";
rev = version;
sha256 = "04bsb7g6mh6dwk023v1rbdcjwp898y6ixdvrd7nxzm186qpycpnn";
sha256 = "0nbsfm2jh5gjy2wh79f35rqk3c3z15lymmcz3gviw0jaxdv6drzw";
};
buildInputs = [

View file

@ -2,13 +2,13 @@
buildGoPackage rec {
name = "matterbridge-${version}";
version = "1.4.1";
version = "1.6.3";
goPackagePath = "github.com/42wim/matterbridge";
src = fetchurl {
url = "https://github.com/42wim/matterbridge/archive/v${version}.tar.gz";
sha256 = "0m0phv8rngrp9gfn71gd2z184n60rng1fmvmv5nkmzsclr2y7x8b";
sha256 = "1d2wrfq07kk5l19w2d6yyjcdvn9b39cji1k5vzsfq0xkdb6b8spb";
};
meta = with stdenv.lib; {

View file

@ -3,18 +3,19 @@
, gnupg ? null
, goobook ? null
, khard ? null
, mu ? null
}:
let
version = "0.45.3";
version = "0.46";
in
with stdenv.lib;
with perlPackages;
stdenv.mkDerivation {
name = "lbdb-${version}";
src = fetchurl {
url = "http://www.spinnaker.de/debian/lbdb_${version}.tar.gz";
sha256 = "01lx1nb5nlhwz663v35gg7crd36c78hnipq4z0dqyb9wjigwwg9k";
url = "http://www.spinnaker.de/lbdb/download/lbdb_${version}.tar.gz";
sha256 = "16fx02xk98k3friigq2lcgk535xagp3kfnmngni5kw61f7yj6gxi";
};
buildInputs = [ goobook makeWrapper perl ConvertASN1 NetLDAP AuthenSASL ]
@ -22,12 +23,14 @@ stdenv.mkDerivation {
++ optional (abook != null) abook
++ optional (gnupg != null) gnupg
++ optional (goobook != null) goobook
++ optional (khard != null) khard;
++ optional (khard != null) khard
++ optional (mu != null) mu;
configureFlags = [ ]
++ optional (abook != null) "--with-abook"
++ optional (gnupg != null) "--with-gpg"
++ optional (goobook != null) "--with-goobook"
++ optional (khard != null) "--with-khard";
++ optional (khard != null) "--with-khard"
++ optional (mu != null) "--with-mu";
patches = [ ./add-methods-to-rc.patch ];
postFixup = "wrapProgram $out/lib/mutt_ldap_query --prefix PERL5LIB : "

View file

@ -15853,7 +15853,7 @@ with pkgs;
lastfmsubmitd = callPackage ../applications/audio/lastfmsubmitd { };
lbdb = callPackage ../tools/misc/lbdb { abook = null; gnupg = null; goobook = null; khard = null; };
lbdb = callPackage ../tools/misc/lbdb { abook = null; gnupg = null; goobook = null; khard = null; mu = null; };
lbzip2 = callPackage ../tools/compression/lbzip2 { };

View file

@ -8068,10 +8068,10 @@ let self = _self // overrides; _self = with self; {
};
LogContextual = buildPerlPackage rec {
name = "Log-Contextual-0.008000";
name = "Log-Contextual-0.008001";
src = fetchurl {
url = "mirror://cpan/authors/id/F/FR/FREW/${name}.tar.gz";
sha256 = "acd804508740e35c208e0cff575f3dbca2e01b8e64ec00eec3f88c7c4e3d656c";
sha256 = "b93cbcfbb8796d51c836e3b00243cda5630808c152c14eee5f20ca09c9451993";
};
buildInputs = [ TestFatal ];
propagatedBuildInputs = [ DataDumperConcise ExporterDeclare Moo ];

View file

@ -5844,6 +5844,12 @@ in {
sha256 = "0ssxbqsshrm8p642g3h6wsq20z1fsqhpdvqdm827gn6dlr38868y";
};
postUnpack = ''
substituteInPlace $sourceRoot/pamela.py --replace \
'find_library("pam")' \
'"${getLib pkgs.pam}/lib/libpam.so"'
'';
doCheck = false;
meta = {
@ -9394,6 +9400,8 @@ in {
jupyter_core = callPackage ../development/python-modules/jupyter_core { };
jupyterhub = callPackage ../development/python-modules/jupyterhub { };
jsonpath_rw = buildPythonPackage rec {
name = "jsonpath-rw-${version}";
version = "1.4.0";
@ -9650,6 +9658,8 @@ in {
];
};
python-oauth2 = callPackage ../development/python-modules/python-oauth2 { };
python-Levenshtein = buildPythonPackage rec {
name = "python-Levenshtein-${version}";
version = "0.12.0";
@ -13573,11 +13583,6 @@ in {
export PYCURL_SSL_LIBRARY=openssl
'';
#TODO no idea why this is needed
postInstall = ''
ln -s ${pkgs.openssl.out}/lib/libcrypto* $out/lib/
'';
meta = {
homepage = http://pycurl.sourceforge.net/;
description = "Python wrapper for libcurl";
@ -22403,6 +22408,8 @@ EOF
voluptuous = callPackage ../development/python-modules/voluptuous { };
pysigset = callPackage ../development/python-modules/pysigset { };
us = callPackage ../development/python-modules/us { };
});
in fix' (extends overrides packages)