Merge branch 'master.upstream' into staging.upstream
This commit is contained in:
William A. Kennington III
commit
3fcbd5a829
@ -354,6 +354,90 @@ if [ -e ~/.nix-profile/bin/ghc ]; then
|
||||
fi
|
||||
</programlisting>
|
||||
</section>
|
||||
<section xml:id="how-to-install-a-compiler-with-indexes">
|
||||
<title>How to install a compiler with libraries, hoogle and documentation indexes</title>
|
||||
<para>
|
||||
If you plan to use your environment for interactive programming,
|
||||
not just compiling random Haskell code, you might want to
|
||||
replace <literal>ghcWithPackages</literal> in all the listings
|
||||
above with <literal>ghcWithHoogle</literal>.
|
||||
</para>
|
||||
<para>
|
||||
This environment generator not only produces an environment with
|
||||
GHC and all the specified libraries, but also generates a
|
||||
<literal>hoogle</literal> and <literal>haddock</literal> indexes
|
||||
for all the packages, and provides a wrapper script around
|
||||
<literal>hoogle</literal> binary that uses all those things. A
|
||||
precise name for this thing would be
|
||||
"<literal>ghcWithPackagesAndHoogleAndDocumentationIndexes</literal>",
|
||||
which is, regrettably, too long and scary.
|
||||
</para>
|
||||
<para>
|
||||
For example, installing the following environment
|
||||
</para>
|
||||
<programlisting>
|
||||
{
|
||||
packageOverrides = super: let self = super.pkgs; in
|
||||
{
|
||||
myHaskellEnv = self.haskellPackages.ghcWithHoogle
|
||||
(haskellPackages: with haskellPackages; [
|
||||
# libraries
|
||||
arrows async cgi criterion
|
||||
# tools
|
||||
cabal-install haskintex
|
||||
]);
|
||||
};
|
||||
}
|
||||
</programlisting>
|
||||
<para>
|
||||
allows one to browse module documentation index <link
|
||||
xlink:href="https://downloads.haskell.org/~ghc/latest/docs/html/libraries/index.html">not
|
||||
too dissimilar to this</link> for all the specified packages and
|
||||
their dependencies by directing a browser of choice to
|
||||
<literal>~/.nix-profiles/share/doc/hoogle/index.html</literal>
|
||||
(or
|
||||
<literal>/run/current-system/sw/share/doc/hoogle/index.html</literal>
|
||||
in case you put it in
|
||||
<literal>environment.systemPackages</literal> in NixOS).
|
||||
</para>
|
||||
<para>
|
||||
After you've marveled enough at that try adding the following to
|
||||
your <literal>~/.ghc/ghci.conf</literal>
|
||||
</para>
|
||||
<programlisting>
|
||||
:def hoogle \s -> return $ ":! hoogle search -cl --count=15 \"" ++ s ++ "\""
|
||||
:def doc \s -> return $ ":! hoogle search -cl --info \"" ++ s ++ "\""
|
||||
</programlisting>
|
||||
<para>
|
||||
and test it by typing into <literal>ghci</literal>:
|
||||
</para>
|
||||
<programlisting>
|
||||
:hoogle a -> a
|
||||
:doc a -> a
|
||||
</programlisting>
|
||||
<para>
|
||||
Be sure to note the links to <literal>haddock</literal> files in
|
||||
the output. With any modern and properly configured terminal
|
||||
emulator you can just click those links to navigate there.
|
||||
</para>
|
||||
<para>
|
||||
Finally, you can run
|
||||
</para>
|
||||
<programlisting>
|
||||
hoogle server -p 8080
|
||||
</programlisting>
|
||||
<para>
|
||||
and navigate to <link xlink:href="http://localhost:8080/"/> for
|
||||
your own local <link
|
||||
xlink:href="https://www.haskell.org/hoogle/">Hoogle</link>.
|
||||
Note, however, that Firefox and possibly other browsers disallow
|
||||
navigation from <literal>http:</literal> to
|
||||
<literal>file:</literal> URIs for security reasons, which might
|
||||
be quite an inconvenience. See <link
|
||||
xlink:href="http://kb.mozillazine.org/Links_to_local_pages_do_not_work">this
|
||||
page</link> for workarounds.
|
||||
</para>
|
||||
</section>
|
||||
<section xml:id="how-to-create-ad-hoc-environments-for-nix-shell">
|
||||
<title>How to create ad hoc environments for
|
||||
<literal>nix-shell</literal></title>
|
||||
|
||||
@ -78,6 +78,26 @@ rec {
|
||||
listToAttrs (concatMap (name: let v = set.${name}; in if pred name v then [(nameValuePair name v)] else []) (attrNames set));
|
||||
|
||||
|
||||
/* Filter an attribute set recursivelly by removing all attributes for
|
||||
which the given predicate return false.
|
||||
|
||||
Example:
|
||||
filterAttrsRecursive (n: v: v != null) { foo = { bar = null; }; }
|
||||
=> { foo = {}; }
|
||||
*/
|
||||
filterAttrsRecursive = pred: set:
|
||||
listToAttrs (
|
||||
concatMap (name:
|
||||
let v = set.${name}; in
|
||||
if pred name v then [
|
||||
(nameValuePair name (
|
||||
if isAttrs v then filterAttrsRecursive pred v
|
||||
else v
|
||||
))
|
||||
] else []
|
||||
) (attrNames set)
|
||||
);
|
||||
|
||||
/* foldAttrs: apply fold functions to values grouped by key. Eg accumulate values as list:
|
||||
foldAttrs (n: a: [n] ++ a) [] [{ a = 2; } { a = 3; }]
|
||||
=> { a = [ 2 3 ]; }
|
||||
|
||||
@ -90,6 +90,7 @@
|
||||
emery = "Emery Hemingway <emery@vfemail.net>";
|
||||
epitrochoid = "Mabry Cervin <mpcervin@uncg.edu>";
|
||||
ericbmerritt = "Eric Merritt <eric@afiniate.com>";
|
||||
erikryb = "Erik Rybakken <erik.rybakken@math.ntnu.no>";
|
||||
ertes = "Ertugrul Söylemez <ertesx@gmx.de>";
|
||||
exlevan = "Alexey Levan <exlevan@gmail.com>";
|
||||
falsifian = "James Cook <james.cook@utoronto.ca>";
|
||||
|
||||
@ -23,5 +23,17 @@
|
||||
<command>wmii-hg</command> package.
|
||||
</para></listitem>
|
||||
</itemizedlist>
|
||||
|
||||
<listitem><para>Gitit! Is no longer automatically added to the module list in
|
||||
NixOS and as such there will not be any manual entries for it. You will need to
|
||||
add an import statement to your nixos configuration in order to use it. As
|
||||
an example adding:
|
||||
<programlisting><![CDATA[
|
||||
{
|
||||
imports = [ <nixos/modules/services/misc/gitit.nix> ];
|
||||
}
|
||||
]]>
|
||||
</programlisting>
|
||||
Will include the gitit service configuration options.
|
||||
</para>
|
||||
</section>
|
||||
|
||||
@ -232,6 +232,7 @@
|
||||
namecoin = 208;
|
||||
dnschain = 209;
|
||||
#lxd = 210; # unused
|
||||
kibana = 211;
|
||||
|
||||
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
|
||||
|
||||
@ -442,6 +443,7 @@
|
||||
namecoin = 208;
|
||||
#dnschain = 209; #unused
|
||||
lxd = 210; # unused
|
||||
#kibana = 211;
|
||||
|
||||
# When adding a gid, make sure it doesn't match an existing
|
||||
# uid. Users and groups with the same name should have equal
|
||||
|
||||
@ -197,7 +197,7 @@
|
||||
./services/misc/etcd.nix
|
||||
./services/misc/felix.nix
|
||||
./services/misc/folding-at-home.nix
|
||||
./services/misc/gitit.nix
|
||||
#./services/misc/gitit.nix
|
||||
./services/misc/gitlab.nix
|
||||
./services/misc/gitolite.nix
|
||||
./services/misc/gpsd.nix
|
||||
@ -365,6 +365,7 @@
|
||||
./services/scheduling/fcron.nix
|
||||
./services/scheduling/marathon.nix
|
||||
./services/search/elasticsearch.nix
|
||||
./services/search/kibana.nix
|
||||
./services/search/solr.nix
|
||||
./services/security/clamav.nix
|
||||
./services/security/fail2ban.nix
|
||||
@ -374,6 +375,7 @@
|
||||
./services/security/haveged.nix
|
||||
./services/security/hologram.nix
|
||||
./services/security/munge.nix
|
||||
./services/security/physlock.nix
|
||||
./services/security/torify.nix
|
||||
./services/security/tor.nix
|
||||
./services/security/torsocks.nix
|
||||
|
||||
@ -35,6 +35,7 @@ let
|
||||
};
|
||||
|
||||
haskellPackages = mkOption {
|
||||
default = pkgs.haskellPackages;
|
||||
defaultText = "pkgs.haskellPackages";
|
||||
example = literalExample "pkgs.haskell.packages.ghc784";
|
||||
description = "haskellPackages used to build gitit and plugins.";
|
||||
@ -137,6 +138,7 @@ let
|
||||
|
||||
staticDir = mkOption {
|
||||
type = types.path;
|
||||
default = gititShared + "/data/static";
|
||||
description = ''
|
||||
Specifies the path of the static directory (containing javascript,
|
||||
css, and images). If it does not exist, gitit will create it and
|
||||
@ -207,6 +209,7 @@ let
|
||||
|
||||
templatesDir = mkOption {
|
||||
type = types.path;
|
||||
default = gititShared + "/data/templates";
|
||||
description = ''
|
||||
Specifies the path of the directory containing page templates. If it
|
||||
does not exist, gitit will create it with default templates. Users
|
||||
@ -288,6 +291,7 @@ let
|
||||
|
||||
plugins = mkOption {
|
||||
type = with types; listOf str;
|
||||
default = [ (gititShared + "/plugins/Dot.hs") ];
|
||||
description = ''
|
||||
Specifies a list of plugins to load. Plugins may be specified either
|
||||
by their path or by their module name. If the plugin name starts
|
||||
@ -641,13 +645,6 @@ in
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
services.gitit = {
|
||||
haskellPackages = mkDefault pkgs.haskellPackages;
|
||||
staticDir = gititShared + "/data/static";
|
||||
templatesDir = gititShared + "/data/templates";
|
||||
plugins = [ ];
|
||||
};
|
||||
|
||||
users.extraUsers.gitit = {
|
||||
group = config.users.extraGroups.gitit.name;
|
||||
description = "Gitit user";
|
||||
|
||||
168
nixos/modules/services/search/kibana.nix
Normal file
168
nixos/modules/services/search/kibana.nix
Normal file
@ -0,0 +1,168 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.kibana;
|
||||
|
||||
cfgFile = pkgs.writeText "kibana.json" (builtins.toJSON (
|
||||
(filterAttrsRecursive (n: v: v != null) ({
|
||||
server = {
|
||||
host = cfg.host;
|
||||
port = cfg.port;
|
||||
ssl = {
|
||||
cert = cfg.cert;
|
||||
key = cfg.key;
|
||||
};
|
||||
};
|
||||
|
||||
kibana = {
|
||||
index = cfg.index;
|
||||
defaultAppId = cfg.defaultAppId;
|
||||
};
|
||||
|
||||
elasticsearch = {
|
||||
url = cfg.elasticsearch.url;
|
||||
username = cfg.elasticsearch.username;
|
||||
password = cfg.elasticsearch.password;
|
||||
ssl = {
|
||||
cert = cfg.elasticsearch.cert;
|
||||
key = cfg.elasticsearch.key;
|
||||
ca = cfg.elasticsearch.ca;
|
||||
};
|
||||
};
|
||||
|
||||
logging = {
|
||||
verbose = cfg.logLevel == "verbose";
|
||||
quiet = cfg.logLevel == "quiet";
|
||||
silent = cfg.logLevel == "silent";
|
||||
dest = "stdout";
|
||||
};
|
||||
} // cfg.extraConf)
|
||||
)));
|
||||
in {
|
||||
options.services.kibana = {
|
||||
enable = mkEnableOption "enable kibana service";
|
||||
|
||||
host = mkOption {
|
||||
description = "Kibana listening host";
|
||||
default = "127.0.0.1";
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
description = "Kibana listening port";
|
||||
default = 5601;
|
||||
type = types.int;
|
||||
};
|
||||
|
||||
cert = mkOption {
|
||||
description = "Kibana ssl certificate.";
|
||||
default = null;
|
||||
type = types.nullOr types.path;
|
||||
};
|
||||
|
||||
key = mkOption {
|
||||
description = "Kibana ssl key.";
|
||||
default = null;
|
||||
type = types.nullOr types.path;
|
||||
};
|
||||
|
||||
index = mkOption {
|
||||
description = "Elasticsearch index to use for saving kibana config.";
|
||||
default = ".kibana";
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
defaultAppId = mkOption {
|
||||
description = "Elasticsearch default application id.";
|
||||
default = "discover";
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
elasticsearch = {
|
||||
url = mkOption {
|
||||
description = "Elasticsearch url";
|
||||
default = "http://localhost:9200";
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
username = mkOption {
|
||||
description = "Username for elasticsearch basic auth.";
|
||||
default = null;
|
||||
type = types.nullOr types.str;
|
||||
};
|
||||
|
||||
password = mkOption {
|
||||
description = "Password for elasticsearch basic auth.";
|
||||
default = null;
|
||||
type = types.nullOr types.str;
|
||||
};
|
||||
|
||||
ca = mkOption {
|
||||
description = "CA file to auth against elasticsearch.";
|
||||
default = null;
|
||||
type = types.nullOr types.path;
|
||||
};
|
||||
|
||||
cert = mkOption {
|
||||
description = "Certificate file to auth against elasticsearch.";
|
||||
default = null;
|
||||
type = types.nullOr types.path;
|
||||
};
|
||||
|
||||
key = mkOption {
|
||||
description = "Key file to auth against elasticsearch.";
|
||||
default = null;
|
||||
type = types.nullOr types.path;
|
||||
};
|
||||
};
|
||||
|
||||
logLevel = mkOption {
|
||||
description = "Kibana log level";
|
||||
default = "normal";
|
||||
type = types.enum ["verbose" "normal" "silent" "quiet"];
|
||||
};
|
||||
|
||||
package = mkOption {
|
||||
description = "Kibana package to use";
|
||||
default = pkgs.kibana;
|
||||
type = types.package;
|
||||
};
|
||||
|
||||
dataDir = mkOption {
|
||||
description = "Kibana data directory";
|
||||
default = "/var/lib/kibana";
|
||||
type = types.path;
|
||||
};
|
||||
|
||||
extraConf = mkOption {
|
||||
description = "Kibana extra configuration";
|
||||
default = {};
|
||||
type = types.attrs;
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf (cfg.enable) {
|
||||
systemd.services.kibana = {
|
||||
description = "Kibana Service";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network-interfaces.target" "elasticsearch.service" ];
|
||||
serviceConfig = {
|
||||
ExecStart = "${cfg.package}/bin/kibana --config ${cfgFile}";
|
||||
User = "kibana";
|
||||
WorkingDirectory = cfg.dataDir;
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
users.extraUsers = singleton {
|
||||
name = "kibana";
|
||||
uid = config.ids.uids.kibana;
|
||||
description = "Kibana service user";
|
||||
home = cfg.dataDir;
|
||||
createHome = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
114
nixos/modules/services/security/physlock.nix
Normal file
114
nixos/modules/services/security/physlock.nix
Normal file
@ -0,0 +1,114 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.physlock;
|
||||
in
|
||||
|
||||
{
|
||||
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
|
||||
services.physlock = {
|
||||
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to enable the <command>physlock</command> screen locking mechanism.
|
||||
|
||||
Enable this and then run <command>systemctl start physlock</command>
|
||||
to securely lock the screen.
|
||||
|
||||
This will switch to a new virtual terminal, turn off console
|
||||
switching and disable SysRq mechanism (when
|
||||
<option>services.physlock.disableSysRq</option> is set)
|
||||
until the root or <option>services.physlock.user</option>
|
||||
password is given.
|
||||
'';
|
||||
};
|
||||
|
||||
user = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
description = ''
|
||||
User whose password will be used to unlock the screen on par
|
||||
with the root password.
|
||||
'';
|
||||
};
|
||||
|
||||
disableSysRq = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to disable SysRq when locked with physlock.
|
||||
'';
|
||||
};
|
||||
|
||||
lockOn = {
|
||||
|
||||
suspend = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to lock screen with physlock just before suspend.
|
||||
'';
|
||||
};
|
||||
|
||||
hibernate = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to lock screen with physlock just before hibernate.
|
||||
'';
|
||||
};
|
||||
|
||||
extraTargets = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
example = [ "display-manager.service" ];
|
||||
description = ''
|
||||
Other targets to lock the screen just before.
|
||||
|
||||
Useful if you want to e.g. both autologin to X11 so that
|
||||
your <filename>~/.xsession</filename> gets executed and
|
||||
still to have the screen locked so that the system can be
|
||||
booted relatively unattended.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
# for physlock -l and physlock -L
|
||||
environment.systemPackages = [ pkgs.physlock ];
|
||||
|
||||
systemd.services."physlock" = {
|
||||
enable = true;
|
||||
description = "Physlock";
|
||||
wantedBy = optional cfg.lockOn.suspend "suspend.target"
|
||||
++ optional cfg.lockOn.hibernate "hibernate.target"
|
||||
++ cfg.lockOn.extraTargets;
|
||||
before = optional cfg.lockOn.suspend "systemd-suspend.service"
|
||||
++ optional cfg.lockOn.hibernate "systemd-hibernate.service"
|
||||
++ cfg.lockOn.extraTargets;
|
||||
serviceConfig.Type = "forking";
|
||||
script = ''
|
||||
${pkgs.physlock}/bin/physlock -d${optionalString cfg.disableSysRq "s"}${optionalString (cfg.user != null) " -u ${cfg.user}"}
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, zlib, guile, libart_lgpl, pkgconfig, intltool
|
||||
, gtk, glib, libogg, libvorbis, libgnomecanvas, gettext, perl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
name = "beast-0.7.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = ftp://beast.gtk.org/pub/beast/v0.7/beast-0.7.1.tar.bz2;
|
||||
url = "http://ftp.gtk.org/pub/beast/v0.7/${name}.tar.bz2";
|
||||
sha256 = "0jyl1i1918rsn4296w07fsf6wx3clvad522m3bzgf8ms7gxivg5l";
|
||||
};
|
||||
|
||||
|
||||
@ -1,27 +1,29 @@
|
||||
{stdenv, fetchurl, djvulibre, qt4, pkgconfig }:
|
||||
{ stdenv, fetchurl, pkgconfig, djvulibre, qt4, xorg, libtiff }:
|
||||
|
||||
let
|
||||
qt = qt4;
|
||||
# TODO: qt = qt5.base; # should work but there's a mysterious "-silent" error
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "djview-4.8";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/djvu/${name}.tar.gz";
|
||||
sha256 = "17y8jvbvj98h25qwsr93v24x75famv8d0jbb0h46xjj555y6wx4c";
|
||||
};
|
||||
|
||||
buildInputs = [djvulibre qt4];
|
||||
name = "djview-4.10.3";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/djvu/${name}.tar.gz";
|
||||
sha256 = "09dbws0k8giizc0xqpad8plbyaply8x1pjc2k3207v2svk6hxf2h";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
patches = [ ./djview4-qt-4.8.patch ];
|
||||
buildInputs = [ djvulibre qt xorg.libXt libtiff ];
|
||||
|
||||
passthru = {
|
||||
mozillaPlugin = "/lib/netscape/plugins";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = http://djvu.sourceforge.net/djview4.html;
|
||||
description = "A new portable DjVu viewer and browser plugin";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
inherit (qt4.meta) platforms;
|
||||
maintainers = [ stdenv.lib.maintainers.urkud ];
|
||||
};
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://djvu.sourceforge.net/djview4.html;
|
||||
description = "A portable DjVu viewer and browser plugin";
|
||||
license = licenses.gpl2;
|
||||
inherit (qt.meta) platforms;
|
||||
maintainers = [ maintainers.urkud ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
Origin: OpenSUSE
|
||||
Index: djview-4.8/src/qdjvuwidget.cpp
|
||||
===================================================================
|
||||
--- djview-4.8.orig/src/qdjvuwidget.cpp
|
||||
+++ djview-4.8/src/qdjvuwidget.cpp
|
||||
@@ -153,7 +153,7 @@ all_numbers(const char *s)
|
||||
}
|
||||
|
||||
template<class T> static inline void
|
||||
-swap(T& x, T& y)
|
||||
+myswap(T& x, T& y)
|
||||
{
|
||||
T tmp;
|
||||
tmp = x;
|
||||
@@ -173,11 +173,11 @@ ksmallest(T *v, int n, int k)
|
||||
/* Sort v[lo], v[m], v[hi] by insertion */
|
||||
m = (lo+hi)/2;
|
||||
if (v[lo]>v[m])
|
||||
- swap(v[lo],v[m]);
|
||||
+ myswap(v[lo],v[m]);
|
||||
if (v[m]>v[hi]) {
|
||||
- swap(v[m],v[hi]);
|
||||
+ myswap(v[m],v[hi]);
|
||||
if (v[lo]>v[m])
|
||||
- swap(v[lo],v[m]);
|
||||
+ myswap(v[lo],v[m]);
|
||||
}
|
||||
/* Extract pivot, place sentinel */
|
||||
pivot = v[m];
|
||||
@@ -191,7 +191,7 @@ ksmallest(T *v, int n, int k)
|
||||
do ++l; while (v[l]<pivot);
|
||||
do --h; while (v[h]>pivot);
|
||||
if (l < h) {
|
||||
- swap(v[l],v[h]);
|
||||
+ myswap(v[l],v[h]);
|
||||
goto loop;
|
||||
}
|
||||
/* Finish up */
|
||||
@ -2,12 +2,12 @@
|
||||
, libX11, libXext }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.7a";
|
||||
version = "1.7";
|
||||
name = "mupdf-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://mupdf.com/download/archive/${name}-source.tar.gz";
|
||||
sha256 = "073xq6kczq331awycvznpc49b22idqzdlw4g9254zi0z07x5y0wc";
|
||||
sha256 = "0hjn1ywxhblqgj63qkp8x7qqjnwsgid3viw8az5i2i26dijmrgfh";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig zlib freetype libjpeg jbig2dec openjpeg libX11 libXext ];
|
||||
|
||||
36
pkgs/applications/misc/vit/default.nix
Normal file
36
pkgs/applications/misc/vit/default.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{ pkgs, fetchgit, stdenv, makeWrapper, taskwarrior, ncurses,
|
||||
perl, perlPackages }:
|
||||
|
||||
let
|
||||
version = "1.2";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "vit-${version}";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.tasktools.org/scm/ex/vit.git";
|
||||
rev = "7d0042ca30e9d09cfbf9743b3bc72096e4a8fe1e";
|
||||
sha256 = "92cad7169b3870145dff02256e547ae270996a314b841d3daed392ac6722827f";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace Makefile.in \
|
||||
--replace sudo ""
|
||||
substituteInPlace configure \
|
||||
--replace /usr/bin/perl ${perl}/bin/perl
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/vit --prefix PERL5LIB : $PERL5LIB
|
||||
'';
|
||||
|
||||
buildInputs = [ taskwarrior ncurses perlPackages.Curses perl makeWrapper ];
|
||||
|
||||
meta = {
|
||||
description = "Visual Interactive Taskwarrior";
|
||||
maintainers = with pkgs.lib.maintainers; [ matthiasbeyer ];
|
||||
platforms = pkgs.lib.platforms.linux;
|
||||
license = pkgs.lib.licenses.gpl3;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xterm-317";
|
||||
name = "xterm-320";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://invisible-island.net/xterm/${name}.tgz";
|
||||
sha256 = "0v9mirqws1vb8wxbdgn1w166ln7xmapg1913c7kzjs3mwkdv1rfj";
|
||||
sha256 = "19r4rs5pjq944m7aiqligazf6wgmv4f023x3bx183h1l8dbvn3d6";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
||||
@ -74,8 +74,6 @@ in stdenv.mkDerivation {
|
||||
cat $opensslPatches | patch -p1 -d "$bundled/openssl/openssl"
|
||||
'';
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
passthru = {
|
||||
inherit version channel;
|
||||
plugins = fetchurl binary;
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext
|
||||
, pkgconfig, xdg_utils, gtk2, sqlite, pugixml }:
|
||||
|
||||
let version = "3.13.1"; in
|
||||
let version = "3.14.0"; in
|
||||
stdenv.mkDerivation {
|
||||
name = "filezilla-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
|
||||
sha256 = "1iz82zqi1dqxm21ngmvh3sv97mj8069xy276gpv3yrmnyv4psvn1";
|
||||
sha256 = "1zbrsmrqnxzj6cnf2y1sx384nv6c8l3338ynazjfbiqbyfs5lf4j";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, automake, autoconf, pkgconfig, glib, openssl, expat
|
||||
, ncurses, libotr, curl, libstrophe
|
||||
, ncurses, libotr, curl, libstrophe, readline, libuuid
|
||||
|
||||
, autoAwaySupport ? false, libXScrnSaver ? null, libX11 ? null
|
||||
, notifySupport ? false, libnotify ? null, gdk_pixbuf ? null
|
||||
@ -12,15 +12,15 @@ with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "profanity-${version}";
|
||||
version = "0.4.6";
|
||||
version = "0.4.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.profanity.im/profanity-${version}.tar.gz";
|
||||
sha256 = "17ra53c1m0w0lzm5bj63y1ysx8bv119z5h0csisxsn4r85z6cwln";
|
||||
sha256 = "1p8ixvxacvf63r6lnf6iwlyz4pgiyp6widna1h2l2jg8kw14wb5h";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
automake autoconf pkgconfig
|
||||
automake autoconf pkgconfig readline libuuid
|
||||
glib openssl expat ncurses libotr curl libstrophe
|
||||
] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ]
|
||||
++ optionals notifySupport [ libnotify gdk_pixbuf ];
|
||||
|
||||
@ -54,6 +54,8 @@ in with stdenv; mkDerivation rec {
|
||||
])
|
||||
);
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-fPIC";
|
||||
|
||||
cmakeFlags = [
|
||||
"-DEMBED_DATA=OFF"
|
||||
"-DSTATIC=OFF" ]
|
||||
|
||||
@ -0,0 +1,43 @@
|
||||
From e57f22a5089f194013534c9a9bbc42ee639297f1 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Sat, 19 Sep 2015 11:10:32 -0500
|
||||
Subject: [PATCH] unbundled qwt
|
||||
|
||||
---
|
||||
linssid-app/linssid-app.pro | 4 +---
|
||||
linssid.pro | 4 +---
|
||||
2 files changed, 2 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/linssid-app/linssid-app.pro b/linssid-app/linssid-app.pro
|
||||
index 26f61e7..7b80b60 100644
|
||||
--- a/linssid-app/linssid-app.pro
|
||||
+++ b/linssid-app/linssid-app.pro
|
||||
@@ -19,13 +19,11 @@ QMAKE_CC = gcc
|
||||
QMAKE_CXX = g++
|
||||
DEFINES +=
|
||||
INCLUDEPATH += /usr/include/qt5
|
||||
-# /usr/local/qwt-6.1.0/include
|
||||
-INCLUDEPATH += ../qwt-lib/src
|
||||
# LIBS += /usr/lib/x86_64-linux-gnu/libboost_regex.a
|
||||
# LIBS += -lboost_regex
|
||||
LIBS += -l:libboost_regex.a
|
||||
# /usr/local/qwt-6.1.0/lib/libqwt.a
|
||||
-LIBS += ../qwt-lib/lib/libqwt.a
|
||||
+LIBS += -lqwt
|
||||
QMAKE_CXXFLAGS += -std=c++11
|
||||
#
|
||||
TARGET = linssid
|
||||
diff --git a/linssid.pro b/linssid.pro
|
||||
index 42dc277..26d1a2c 100644
|
||||
--- a/linssid.pro
|
||||
+++ b/linssid.pro
|
||||
@@ -1,5 +1,3 @@
|
||||
TEMPLATE = subdirs
|
||||
CONFIG += ordered
|
||||
-SUBDIRS = qwt-lib \
|
||||
- linssid-app
|
||||
-linssid-app.depends = qwt-lib
|
||||
+SUBDIRS = linssid-app
|
||||
--
|
||||
2.5.2
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, qt5, pkgconfig, boost, wirelesstools, iw }:
|
||||
{ stdenv, fetchurl, qt5, pkgconfig, boost, wirelesstools, iw, qwt6 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "linssid-${version}";
|
||||
@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl";
|
||||
};
|
||||
|
||||
buildInputs = [ qt5 pkgconfig boost ];
|
||||
buildInputs = [ qt5.base qt5.svg pkgconfig boost qwt6 ];
|
||||
|
||||
patches = [ ./0001-unbundled-qwt.patch ];
|
||||
|
||||
postPatch = ''
|
||||
sed -e "s|/usr/include/|/nonexistent/|g" -i linssid-app/*.pro
|
||||
@ -20,6 +22,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
sed -e "s|iwlist|${wirelesstools}/sbin/iwlist|g" -i linssid-app/Getter.cpp
|
||||
sed -e "s|iw dev|${iw}/sbin/iw dev|g" -i linssid-app/MainForm.cpp
|
||||
|
||||
# Remove bundled qwt
|
||||
rm -fr qwt-lib
|
||||
'';
|
||||
|
||||
configurePhase = "qmake linssid.pro";
|
||||
|
||||
@ -1,13 +1,14 @@
|
||||
{ stdenv, fetchsvn, cmake, qt, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2
|
||||
, libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher }:
|
||||
{ stdenv, fetchFromGitHub, cmake, qt, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2
|
||||
, libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "retroshare-0.6-svn-7445";
|
||||
name = "retroshare-0.6-git-fabc3a3";
|
||||
|
||||
src = fetchsvn {
|
||||
url = svn://svn.code.sf.net/p/retroshare/code/trunk;
|
||||
rev = 7445;
|
||||
sha256 = "1dqh65bn21g7ix752ddrr10kijjdwjgjipgysyxnm90zjmdlx3cc";
|
||||
src = fetchFromGitHub {
|
||||
owner = "RetroShare";
|
||||
repo = "RetroShare";
|
||||
rev = "fabc3a398536565efe77fb1b1ef37bd484dc7d4a";
|
||||
sha256 = "189qndkfq9kgv3qi3wx8ivla4j8fxr4iv7c8y9rjrjaz8jwdkn5x";
|
||||
};
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${libxml2}/include/libxml2 -I${sqlcipher}/include/sqlcipher";
|
||||
@ -29,12 +30,14 @@ stdenv.mkDerivation {
|
||||
# retroshare-nogui/src/retroshare-nogui.pro
|
||||
|
||||
buildInputs = [ speex qt libupnp gpgme gnome3.libgnome_keyring glib libssh pkgconfig
|
||||
protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher ];
|
||||
protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ];
|
||||
|
||||
configurePhase = ''
|
||||
qmake PREFIX=$out DESTDIR=$out RetroShare.pro
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/bin
|
||||
mv $out/retroshare-nogui $out/bin
|
||||
|
||||
@ -1,15 +1,21 @@
|
||||
{ stdenv, makeWrapper, fetchurl, pkgconfig, intltool, gtk3, json_glib, curl }:
|
||||
{ stdenv, autoconf, automake, libtool, makeWrapper, fetchgit, pkgconfig
|
||||
, intltool, gtk3, json_glib, curl }:
|
||||
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "transmission-remote-gtk-1.1.1";
|
||||
name = "transmission-remote-gtk-${version}";
|
||||
version = "1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://transmission-remote-gtk.googlecode.com/files/${name}.tar.gz";
|
||||
sha256 = "1jbh2pm4i740cmzqd2r7zxnqqipvv2v2ndmnmk53nqrxcbgc4nlz";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/ajf8/transmission-remote-gtk.git";
|
||||
rev = "aa4e0c7d836cfcc10d8effd10225abb050343fc8";
|
||||
sha256 = "0qz0jzr5w5fik2awfps0q49blwm4z7diqca2405rr3fyhyjhx42b";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper pkgconfig intltool gtk3 json_glib curl ];
|
||||
buildInputs = [ libtool autoconf automake makeWrapper pkgconfig intltool
|
||||
gtk3 json_glib curl ];
|
||||
|
||||
preConfigure = "sh autogen.sh";
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram "$out/bin/transmission-remote-gtk" \
|
||||
@ -19,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with stdenv.lib;
|
||||
{ description = "GTK remote control for the Transmission BitTorrent client";
|
||||
homepage = http://code.google.com/p/transmission-remote-gtk/;
|
||||
homepage = https://github.com/ajf8/transmission-remote-gtk;
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.emery ];
|
||||
platforms = platforms.linux;
|
||||
|
||||
38
pkgs/applications/science/math/perseus/default.nix
Normal file
38
pkgs/applications/science/math/perseus/default.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{ stdenv, fetchurl, unzip, gcc48 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "perseus-4-beta";
|
||||
version = "4-beta";
|
||||
buildInputs = [unzip gcc48];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.sas.upenn.edu/~vnanda/source/perseus_4_beta.zip";
|
||||
sha256 = "09brijnqabhgfjlj5wny0bqm5dwqcfkp1x5wif6yzdmqh080jybj";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
buildPhase = ''
|
||||
g++ Pers.cpp -O3 -o perseus
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp perseus $out/bin
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "The Persistent Homology Software";
|
||||
longDescription = ''
|
||||
Persistent homology - or simply, persistence - is an algebraic
|
||||
topological invariant of a filtered cell complex. Perseus
|
||||
computes this invariant for a wide class of filtrations built
|
||||
around datasets arising from point samples, images, distance
|
||||
matrices and so forth.
|
||||
'';
|
||||
homepage = "www.sas.upenn.edu/~vnanda/perseus/index.html";
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
maintainers = with stdenv.lib.maintainers; [erikryb];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
/* moving all git tools into one attribute set because git is unlikely to be
|
||||
* referenced by other packages and you can get a fast overview.
|
||||
*/
|
||||
/* All git-relates tools live here, in a separate attribute set so that users
|
||||
* can get a fast overview over what's available.
|
||||
*/
|
||||
args @ {pkgs}: with args; with pkgs;
|
||||
let
|
||||
inherit (pkgs) stdenv fetchgit fetchurl subversion;
|
||||
@ -46,7 +46,7 @@ rec {
|
||||
sendEmailSupport = !stdenv.isDarwin;
|
||||
};
|
||||
|
||||
inherit (pkgs.haskellPackages) git-annex;
|
||||
git-annex = pkgs.haskellPackages.git-annex-with-assistant;
|
||||
gitAnnex = git-annex;
|
||||
|
||||
qgit = import ./qgit {
|
||||
|
||||
@ -109,7 +109,7 @@ checkout_hash(){
|
||||
hash=$(hash_from_ref $ref)
|
||||
fi
|
||||
|
||||
git fetch ${builder:+--progress} origin || return 1
|
||||
git fetch -t ${builder:+--progress} origin || return 1
|
||||
git checkout -b $branchName $hash || return 1
|
||||
}
|
||||
|
||||
|
||||
119
pkgs/data/fonts/noto-fonts/default.nix
Normal file
119
pkgs/data/fonts/noto-fonts/default.nix
Normal file
@ -0,0 +1,119 @@
|
||||
{ stdenv, fetchurl, fetchFromGitHub, optipng, cairo, unzip, fontforge, pythonPackages, pkgconfig }:
|
||||
rec {
|
||||
# 18MB
|
||||
noto-fonts = let version = "git-2015-09-08"; in stdenv.mkDerivation {
|
||||
name = "noto-fonts-${version}";
|
||||
src = fetchFromGitHub {
|
||||
owner = "googlei18n";
|
||||
repo = "noto-fonts";
|
||||
rev = "9d677e7e47a13f6e88052833277783fe4f27671f";
|
||||
sha256 = "1dw1142znlk19a4mzhfi9pg3jzmz8pl1ivix7sd2grg70vxscxqc";
|
||||
};
|
||||
phases = "unpackPhase installPhase";
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/fonts/noto
|
||||
cp hinted/*.ttf $out/share/fonts/noto
|
||||
# Also copy unhinted & alpha fonts for better glyph coverage,
|
||||
# if they don't have a hinted version
|
||||
# (see https://groups.google.com/d/msg/noto-font/ZJSkZta4n5Y/tZBnLcPdbS0J)
|
||||
cp -n unhinted/*.ttf $out/share/fonts/noto
|
||||
cp -n alpha/*.ttf $out/share/fonts/noto
|
||||
'';
|
||||
meta = with stdenv.lib; {
|
||||
inherit version;
|
||||
description = "Beautiful and free fonts for many languages";
|
||||
homepage = https://www.google.com/get/noto/;
|
||||
longDescription =
|
||||
''
|
||||
When text is rendered by a computer, sometimes characters are displayed as
|
||||
“tofu”. They are little boxes to indicate your device doesn’t have a font to
|
||||
display the text.
|
||||
|
||||
Google has been developing a font family called Noto, which aims to support all
|
||||
languages with a harmonious look and feel. Noto is Google’s answer to tofu. The
|
||||
name noto is to convey the idea that Google’s goal is to see “no more tofu”.
|
||||
Noto has multiple styles and weights, and freely available to all.
|
||||
|
||||
This package also includes the Arimo, Cousine, and Tinos fonts.
|
||||
'';
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ mathnerd314 ];
|
||||
};
|
||||
};
|
||||
# 89MB
|
||||
noto-fonts-cjk = let version = "1.004"; in stdenv.mkDerivation {
|
||||
name = "noto-fonts-cjk-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
# Same as https://noto-website.storage.googleapis.com/pkgs/NotoSansCJK.ttc.zip but versioned & with no extra SIL license file
|
||||
url = "https://raw.githubusercontent.com/googlei18n/noto-cjk/40d9f5b179a59a06b98373c76bdc3e2119e4e6b2/NotoSansCJK.ttc.zip";
|
||||
sha256 = "1vg3si6slvk8cklq6s5c76s84kqjc4wvwzr4ysljzjpgzra2rfn6";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
|
||||
phases = "unpackPhase installPhase";
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/fonts/noto
|
||||
cp *.ttc $out/share/fonts/noto
|
||||
'';
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
inherit version;
|
||||
description = "Beautiful and free fonts for CJK languages";
|
||||
homepage = https://www.google.com/get/noto/help/cjk/;
|
||||
longDescription =
|
||||
''
|
||||
Noto Sans CJK is a sans serif typeface designed as an intermediate style
|
||||
between the modern and traditional. It is intended to be a multi-purpose
|
||||
digital font for user interface designs, digital content, reading on laptops,
|
||||
mobile devices, and electronic books. Noto Sans CJK comprehensively covers
|
||||
Simplified Chinese, Traditional Chinese, Japanese, and Korean in a unified font
|
||||
family. It supports regional variants of ideographic characters for each of the
|
||||
four languages. In addition, it supports Japanese kana, vertical forms, and
|
||||
variant characters (itaiji); it supports Korean hangeul — both contemporary and
|
||||
archaic.
|
||||
'';
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ mathnerd314 ];
|
||||
};
|
||||
};
|
||||
# 12MB
|
||||
noto-fonts-emoji = let version = "git-2015-08-17"; in stdenv.mkDerivation {
|
||||
name = "noto-fonts-emoji-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googlei18n";
|
||||
repo = "noto-emoji";
|
||||
rev = "ffd7cfd0c84b7bf37210d0908ac94adfe3259ff2";
|
||||
sha256 = "1pa94gw2y0b6p8r81zbjzcjgi5nrx4dqrqr6mk98wj6jbi465sh2";
|
||||
};
|
||||
|
||||
buildInputs = [ optipng cairo fontforge pythonPackages.nototools pythonPackages.fonttools pkgconfig ];
|
||||
|
||||
preBuild = ''
|
||||
export PYTHONPATH=$PYTHONPATH:$PWD
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/fonts/noto
|
||||
cp NotoColorEmoji.ttf NotoEmoji-Regular.ttf $out/share/fonts/noto
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
inherit version;
|
||||
description = "Color and Black-and-White emoji fonts";
|
||||
homepage = https://github.com/googlei18n/noto-emoji;
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ mathnerd314 ];
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -1,23 +1,29 @@
|
||||
{stdenv, fetchurl}:
|
||||
{stdenv, fetchurl, unzip}:
|
||||
|
||||
let
|
||||
makePackage = {language, region, description}: stdenv.mkDerivation rec {
|
||||
version = "1.001R";
|
||||
name = "source-han-sans-${language}-${version}";
|
||||
makePackage = {variant, language, region, sha256}: stdenv.mkDerivation rec {
|
||||
version = "1.004R";
|
||||
name = "source-han-sans-${variant}-${version}";
|
||||
revision = "5f5311e71cb628321cc0cffb51fb38d862b726aa";
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/adobe-fonts/source-han-sans/archive/${version}.tar.gz";
|
||||
sha256 = "0cwz3d8jancl0a7vbjxhnh1vgwsjba62lahfjya9yrjkp1ndxlap";
|
||||
url = "https://github.com/adobe-fonts/source-han-sans/raw/${revision}/SubsetOTF/SourceHanSans${region}.zip";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
setSourceRoot = ''
|
||||
sourceRoot=$( echo SourceHanSans* )
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/fonts/opentype
|
||||
cp $( find SubsetOTF/${region} -name '*.otf' ) $out/share/fonts/opentype
|
||||
cp $( find . -name '*.otf' ) $out/share/fonts/opentype
|
||||
'';
|
||||
|
||||
meta = {
|
||||
inherit description;
|
||||
|
||||
description = "${language} subset of an open source Pan-CJK typeface";
|
||||
homepage = https://github.com/adobe-fonts/source-han-sans;
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
};
|
||||
@ -25,23 +31,27 @@ let
|
||||
in
|
||||
{
|
||||
japanese = makePackage {
|
||||
language = "japanese";
|
||||
variant = "japanese";
|
||||
language = "Japanese";
|
||||
region = "JP";
|
||||
description = "Japanese subset of an open source Pan-CJK typeface";
|
||||
sha256 = "0m1zprwqnqp3za42firg53hyzir6p0q73fl8mh5j4px3zgivlvfw";
|
||||
};
|
||||
korean = makePackage {
|
||||
language = "korean";
|
||||
variant = "korean";
|
||||
language = "Korean";
|
||||
region = "KR";
|
||||
description = "Korean subset of an open source Pan-CJK typeface";
|
||||
sha256 = "1bz6n2sd842vgnqky0i7a3j3i2ixhzzkkbx1m8plk04r1z41bz9q";
|
||||
};
|
||||
simplified-chinese = makePackage {
|
||||
language = "simplified-chinese";
|
||||
variant = "simplified-chinese";
|
||||
language = "Simplified Chinese";
|
||||
region = "CN";
|
||||
description = "Simplified Chinese subset of an open source Pan-CJK typeface";
|
||||
sha256 = "0ksafcwmnpj3yxkgn8qkqkpw10ivl0nj9n2lsi9c6fw3aa71s3ha";
|
||||
};
|
||||
traditional-chinese = makePackage {
|
||||
language = "traditional-chinese";
|
||||
variant = "traditional-chinese";
|
||||
language = "Traditional Chinese";
|
||||
region = "TW";
|
||||
description = "Traditional Chinese subset of an open source Pan-CJK typeface";
|
||||
sha256 = "1l4zymd5n4nl9gmja707xq6bar88dxki2mwdixdfrkf544cidflj";
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
majorVersion = "0.3";
|
||||
minorVersion = "0.1";
|
||||
minorVersion = "1.3";
|
||||
name = "pantheon-terminal-${majorVersion}.${minorVersion}";
|
||||
src = fetchurl {
|
||||
url = "https://launchpad.net/pantheon-terminal/${majorVersion}.x/${majorVersion}.${minorVersion}/+download/${name}.tgz";
|
||||
sha256 = "14wspqxp79myyyjngr1x7jg1kw15g3nm2pav2zffp8xs16s1i5za";
|
||||
sha256 = "0bfrqxig26i9qhm15kk7h9lgmzgnqada5snbbwqkp0n0pnyyh4ss";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
stdenv.mkDerivation rec {
|
||||
p_name = "exo";
|
||||
ver_maj = "0.10";
|
||||
ver_min = "6";
|
||||
ver_min = "7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
|
||||
sha256 = "1cc0e5a432e050a5e5aa64d126b988f4440da4f27474aaf42a4d8e13651d0752";
|
||||
sha256 = "521581481128af93e815f9690020998181f947ac9e9c2b232b1f144d76b1b35c";
|
||||
};
|
||||
name = "${p_name}-${ver_maj}.${ver_min}";
|
||||
|
||||
@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://www.xfce.org/projects/${p_name}";
|
||||
description = "Application library for the Xfce desktop environment";
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -4,7 +4,7 @@ let
|
||||
|
||||
callPackage = newScope (deps // xfce_self);
|
||||
|
||||
deps = rec { # xfce-global dependency overrides should be here
|
||||
deps = { # xfce-global dependency overrides should be here
|
||||
inherit (pkgs.gnome) libglade libwnck vte gtksourceview;
|
||||
inherit (pkgs.perlPackages) URI;
|
||||
};
|
||||
|
||||
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
||||
md5 = "cb61be3be7254eae39684612c524740d";
|
||||
};
|
||||
|
||||
in [ dsfmt_src llvm.src ];
|
||||
in [ dsfmt_src ];
|
||||
|
||||
prePatch = ''
|
||||
copy_kill_hash(){
|
||||
@ -70,22 +70,18 @@ stdenv.mkDerivation rec {
|
||||
sed -e "s@/sbin/ldconfig@true@" -i src/ccall.*
|
||||
'';
|
||||
|
||||
buildInputs =
|
||||
[ libunwind readline utf8proc zlib
|
||||
double_conversion fftw fftwSinglePrec glpk gmp mpfr pcre
|
||||
openblas arpack suitesparse
|
||||
];
|
||||
buildInputs = [
|
||||
arpack double_conversion fftw fftwSinglePrec glpk gmp libunwind
|
||||
llvm mpfr pcre openblas readline suitesparse utf8proc zlib
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ gfortran git m4 patchelf perl which python2 ];
|
||||
nativeBuildInputs = [ gfortran git m4 patchelf perl python2 which ];
|
||||
|
||||
makeFlags =
|
||||
let
|
||||
arch = head (splitString "-" stdenv.system);
|
||||
march =
|
||||
{ "x86_64-linux" = "x86-64";
|
||||
"x86_64-darwin" = "x86-64";
|
||||
"i686-linux" = "i686";
|
||||
}."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
|
||||
march = { "x86_64" = "x86-64"; "i686" = "i686"; }."${arch}"
|
||||
or (throw "unsupported architecture: ${arch}");
|
||||
in [
|
||||
"ARCH=${arch}"
|
||||
"MARCH=${march}"
|
||||
@ -108,6 +104,7 @@ stdenv.mkDerivation rec {
|
||||
"USE_SYSTEM_GMP=1"
|
||||
"USE_SYSTEM_GRISU=1"
|
||||
"USE_SYSTEM_LIBUNWIND=1"
|
||||
"USE_SYSTEM_LLVM=1"
|
||||
"USE_SYSTEM_MPFR=1"
|
||||
"USE_SYSTEM_PATCHELF=1"
|
||||
"USE_SYSTEM_PCRE=1"
|
||||
@ -143,6 +140,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# Test fail on i686 (julia version 0.3.10)
|
||||
doCheck = !stdenv.isi686;
|
||||
checkTarget = "testall";
|
||||
|
||||
meta = {
|
||||
@ -150,6 +149,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "http://julialang.org/";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = with stdenv.lib.maintainers; [ raskin ttuegel ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -12,6 +12,11 @@ in stdenv.mkDerivation rec {
|
||||
patches = [
|
||||
./more-memory-for-bugpoint.patch # The default rlimits in 3.3 are too low for shared libraries.
|
||||
./no-rule-aarch64.patch # http://llvm.org/bugs/show_bug.cgi?id=16625
|
||||
# Patch needed for Julia, backports fixes from LLVM 3.5
|
||||
(fetchurl {
|
||||
url = "https://raw.githubusercontent.com/JuliaLang/julia/3bdda3750efc4ebf8ce7eda8a0888ffef3851605/deps/llvm-3.3.patch";
|
||||
sha256 = "0j6chyx4k8zr1qha5dks8lqlcraqrj4q1hwnk2kj3qi6cajsd8k3";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ perl groff cmake python libffi ];
|
||||
|
||||
@ -8,8 +8,8 @@ self: super: {
|
||||
Cabal_1_18_1_6 = dontCheck super.Cabal_1_18_1_6;
|
||||
Cabal_1_20_0_3 = dontCheck super.Cabal_1_20_0_3;
|
||||
Cabal_1_22_4_0 = dontCheck super.Cabal_1_22_4_0;
|
||||
cabal-install = (dontCheck super.cabal-install).overrideScope (self: super: { Cabal = self.Cabal_1_22_4_0; zlib = self.zlib_0_5_4_2; });
|
||||
cabal-install_1_18_1_0 = (dontCheck super.cabal-install_1_18_1_0).overrideScope (self: super: { Cabal = self.Cabal_1_18_1_6; zlib = self.zlib_0_5_4_2; });
|
||||
cabal-install = (dontCheck super.cabal-install).overrideScope (self: super: { Cabal = self.Cabal_1_22_4_0; });
|
||||
cabal-install_1_18_1_0 = (dontCheck super.cabal-install_1_18_1_0).overrideScope (self: super: { Cabal = self.Cabal_1_18_1_6; });
|
||||
|
||||
# Link statically to avoid runtime dependency on GHC.
|
||||
jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = dontJailbreak self.Cabal_1_20_0_3; };
|
||||
@ -20,28 +20,59 @@ self: super: {
|
||||
# Break infinite recursions.
|
||||
Dust-crypto = dontCheck super.Dust-crypto;
|
||||
hasql-postgres = dontCheck super.hasql-postgres;
|
||||
hspec_2_1_10 = super.hspec_2_1_10.override { stringbuilder = dontCheck super.stringbuilder; };
|
||||
hspec_2_1_2 = super.hspec_2_1_2.override { stringbuilder = dontCheck super.stringbuilder; };
|
||||
hspec_2_1_3 = super.hspec_2_1_3.override { stringbuilder = dontCheck super.stringbuilder; };
|
||||
hspec_2_1_4 = super.hspec_2_1_4.override { stringbuilder = dontCheck super.stringbuilder; };
|
||||
hspec_2_1_5 = super.hspec_2_1_5.override { stringbuilder = dontCheck super.stringbuilder; };
|
||||
hspec_2_1_6 = super.hspec_2_1_6.override { stringbuilder = dontCheck super.stringbuilder; };
|
||||
hspec_2_1_7 = super.hspec_2_1_7.override { stringbuilder = dontCheck super.stringbuilder; };
|
||||
hspec-expectations_0_6_1_1 = dontCheck super.hspec-expectations_0_6_1_1;
|
||||
hspec-expectations_0_6_1 = dontCheck super.hspec-expectations_0_6_1;
|
||||
hspec-expectations_0_7_1 = dontCheck super.hspec-expectations_0_7_1;
|
||||
hspec-expectations = dontCheck super.hspec-expectations;
|
||||
hspec = super.hspec.override { stringbuilder = dontCheck super.stringbuilder; };
|
||||
HTTP = dontCheck super.HTTP;
|
||||
mwc-random_0_13_2_2 = dontCheck super.mwc-random_0_13_2_2;
|
||||
mwc-random_0_13_3_0 = dontCheck super.mwc-random_0_13_3_0;
|
||||
mwc-random = dontCheck super.mwc-random;
|
||||
nanospec_0_2_0 = dontCheck super.nanospec_0_2_0;
|
||||
nanospec = dontCheck super.nanospec;
|
||||
options_1_2_1 = dontCheck super.options_1_2_1;
|
||||
options_1_2 = dontCheck super.options_1_2;
|
||||
options = dontCheck super.options;
|
||||
statistics = dontCheck super.statistics;
|
||||
text_1_1_1_3 = dontCheck super.text_1_1_1_3;
|
||||
text_1_2_0_3 = dontCheck super.text_1_2_0_3;
|
||||
text_1_2_0_4 = dontCheck super.text_1_2_0_4;
|
||||
text_1_2_0_6 = dontCheck super.text_1_2_0_6;
|
||||
text = dontCheck super.text;
|
||||
|
||||
# The package doesn't compile with ruby 1.9, which is our default at the moment.
|
||||
hruby = super.hruby.override { ruby = pkgs.ruby_2_1; };
|
||||
|
||||
# Doesn't compile with lua 5.2.
|
||||
hslua = super.hslua.override { lua = pkgs.lua5_1; };
|
||||
|
||||
# Use the default version of mysql to build this package (which is actually mariadb).
|
||||
mysql = super.mysql.override { mysql = pkgs.mysql.lib; };
|
||||
|
||||
# Link the proper version.
|
||||
zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; };
|
||||
|
||||
# These changes are required to support Darwin.
|
||||
git-annex = (disableSharedExecutables super.git-annex).override {
|
||||
# This package needs a little help compiling properly on Darwin. Furthermore,
|
||||
# Stackage compiles git-annex without the Assistant, supposedly because not
|
||||
# all required dependencies are part of Stackage. To comply with Stackage, we
|
||||
# make 'git-annex-without-assistant' our default version, but offer another
|
||||
# build which has the assistant to be used in the top-level.
|
||||
git-annex_5_20150916 = (disableCabalFlag super.git-annex_5_20150916 "assistant").override {
|
||||
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
|
||||
fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null;
|
||||
hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
|
||||
};
|
||||
git-annex = (disableCabalFlag super.git-annex "assistant").override {
|
||||
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
|
||||
fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null;
|
||||
hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
|
||||
};
|
||||
git-annex-with-assistant = super.git-annex.override {
|
||||
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
|
||||
fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null;
|
||||
hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
|
||||
@ -65,33 +96,6 @@ self: super: {
|
||||
# https://github.com/phaazon/al/issues/1
|
||||
al = appendConfigureFlag super.al "--extra-include-dirs=${pkgs.openal}/include/AL";
|
||||
|
||||
# Depends on code distributed under a non-free license.
|
||||
accelerate-cublas = dontDistribute super.accelerate-cublas;
|
||||
accelerate-cuda = dontDistribute super.accelerate-cuda;
|
||||
accelerate-cufft = dontDistribute super.accelerate-cufft;
|
||||
accelerate-examples = dontDistribute super.accelerate-examples;
|
||||
accelerate-fft = dontDistribute super.accelerate-fft;
|
||||
accelerate-fourier-benchmark = dontDistribute super.accelerate-fourier-benchmark;
|
||||
AttoJson = markBroken super.AttoJson;
|
||||
bindings-yices = dontDistribute super.bindings-yices;
|
||||
cublas = dontDistribute super.cublas;
|
||||
cufft = dontDistribute super.cufft;
|
||||
gloss-accelerate = dontDistribute super.gloss-accelerate;
|
||||
gloss-raster-accelerate = dontDistribute super.gloss-raster-accelerate;
|
||||
GoogleTranslate = dontDistribute super.GoogleTranslate;
|
||||
GoogleDirections = dontDistribute super.GoogleDirections;
|
||||
libnvvm = dontDistribute super.libnvvm;
|
||||
manatee-all = dontDistribute super.manatee-all;
|
||||
manatee-ircclient = dontDistribute super.manatee-ircclient;
|
||||
Obsidian = dontDistribute super.Obsidian;
|
||||
patch-image = dontDistribute super.patch-image;
|
||||
yices = dontDistribute super.yices;
|
||||
yices-easy = dontDistribute super.yices-easy;
|
||||
yices-painless = dontDistribute super.yices-painless;
|
||||
|
||||
# https://github.com/GaloisInc/RSA/issues/9
|
||||
RSA = dontCheck super.RSA;
|
||||
|
||||
# https://github.com/froozen/kademlia/issues/2
|
||||
kademlia = dontCheck super.kademlia;
|
||||
|
||||
@ -116,17 +120,7 @@ self: super: {
|
||||
# https://github.com/haskell/time/issues/23
|
||||
time_1_5_0_1 = dontCheck super.time_1_5_0_1;
|
||||
|
||||
# Help libconfig find it's C language counterpart.
|
||||
libconfig = (dontCheck super.libconfig).override { config = pkgs.libconfig; };
|
||||
|
||||
hmatrix = overrideCabal super.hmatrix (drv: {
|
||||
configureFlags = (drv.configureFlags or []) ++ [ "-fopenblas" ];
|
||||
extraLibraries = [ pkgs.openblasCompat ];
|
||||
preConfigure = ''
|
||||
sed -i hmatrix.cabal -e 's@/usr/lib/openblas/lib@${pkgs.openblasCompat}/lib@'
|
||||
'';
|
||||
});
|
||||
|
||||
# Switch levmar build to openblas.
|
||||
bindings-levmar = overrideCabal super.bindings-levmar (drv: {
|
||||
preConfigure = ''
|
||||
sed -i bindings-levmar.cabal \
|
||||
@ -156,6 +150,13 @@ self: super: {
|
||||
HDBC-odbc = dontHaddock super.HDBC-odbc;
|
||||
hoodle-core = dontHaddock super.hoodle-core;
|
||||
hsc3-db = dontHaddock super.hsc3-db;
|
||||
hspec-discover_2_1_10 = dontHaddock super.hspec-discover_2_1_10;
|
||||
hspec-discover_2_1_2 = dontHaddock super.hspec-discover_2_1_2;
|
||||
hspec-discover_2_1_3 = dontHaddock super.hspec-discover_2_1_3;
|
||||
hspec-discover_2_1_4 = dontHaddock super.hspec-discover_2_1_4;
|
||||
hspec-discover_2_1_5 = dontHaddock super.hspec-discover_2_1_5;
|
||||
hspec-discover_2_1_6 = dontHaddock super.hspec-discover_2_1_6;
|
||||
hspec-discover_2_1_7 = dontHaddock super.hspec-discover_2_1_7;
|
||||
hspec-discover = dontHaddock super.hspec-discover;
|
||||
http-client-conduit = dontHaddock super.http-client-conduit;
|
||||
http-client-multipart = dontHaddock super.http-client-multipart;
|
||||
@ -170,7 +171,7 @@ self: super: {
|
||||
darcs = (overrideCabal super.darcs (drv: {
|
||||
doCheck = false; # The test suite won't even start.
|
||||
postPatch = "sed -i -e 's|attoparsec .*,|attoparsec,|' -e 's|vector .*,|vector,|' darcs.cabal";
|
||||
})).overrideScope (self: super: { zlib = self.zlib_0_5_4_2; });
|
||||
}));
|
||||
|
||||
# https://github.com/massysett/rainbox/issues/1
|
||||
rainbox = dontCheck super.rainbox;
|
||||
@ -178,13 +179,6 @@ self: super: {
|
||||
# https://github.com/techtangents/ablist/issues/1
|
||||
ABList = dontCheck super.ABList;
|
||||
|
||||
# These packages have broken dependencies.
|
||||
ASN1 = dontDistribute super.ASN1; # NewBinary
|
||||
frame-markdown = dontDistribute super.frame-markdown; # frame
|
||||
hails-bin = dontDistribute super.hails-bin; # Hails
|
||||
lss = markBrokenVersion "0.1.0.0" super.lss; # https://github.com/dbp/lss/issues/2
|
||||
snaplet-lss = markBrokenVersion "0.1.0.0" super.snaplet-lss; # https://github.com/dbp/lss/issues/2
|
||||
|
||||
# https://github.com/haskell/vector/issues/47
|
||||
vector = if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector;
|
||||
|
||||
@ -225,21 +219,6 @@ self: super: {
|
||||
'';
|
||||
});
|
||||
|
||||
# Does not compile: "fatal error: ieee-flpt.h: No such file or directory"
|
||||
base_4_8_1_0 = markBroken super.base_4_8_1_0;
|
||||
|
||||
# Obsolete: https://github.com/massysett/prednote/issues/1.
|
||||
prednote-test = markBrokenVersion "0.26.0.4" super.prednote-test;
|
||||
|
||||
# Doesn't compile: "Setup: can't find include file ghc-gmp.h"
|
||||
integer-gmp_1_0_0_0 = markBroken super.integer-gmp_1_0_0_0;
|
||||
|
||||
# Obsolete.
|
||||
lushtags = markBrokenVersion "0.0.1" super.lushtags;
|
||||
|
||||
# https://github.com/haskell/bytestring/issues/41
|
||||
bytestring_0_10_6_0 = dontCheck super.bytestring_0_10_6_0;
|
||||
|
||||
# tests don't compile for some odd reason
|
||||
jwt = dontCheck super.jwt;
|
||||
|
||||
@ -303,6 +282,7 @@ self: super: {
|
||||
pocket-dns = dontCheck super.pocket-dns;
|
||||
postgresql-simple = dontCheck super.postgresql-simple;
|
||||
postgrest = dontCheck super.postgrest;
|
||||
setenv_0_1_1_1 = dontCheck super.setenv_0_1_1_1;
|
||||
snowball = dontCheck super.snowball;
|
||||
sophia = dontCheck super.sophia;
|
||||
test-sandbox = dontCheck super.test-sandbox;
|
||||
@ -313,8 +293,8 @@ self: super: {
|
||||
xmlgen = dontCheck super.xmlgen;
|
||||
|
||||
# These packages try to access the network.
|
||||
amqp = dontCheck super.amqp;
|
||||
amqp-conduit = dontCheck super.amqp-conduit;
|
||||
amqp = dontCheck super.amqp;
|
||||
bitcoin-api = dontCheck super.bitcoin-api;
|
||||
bitcoin-api-extra = dontCheck super.bitcoin-api-extra;
|
||||
bitx-bitcoin = dontCheck super.bitx-bitcoin; # http://hydra.cryp.to/build/926187/log/raw
|
||||
@ -326,9 +306,38 @@ self: super: {
|
||||
hasql = dontCheck super.hasql; # http://hydra.cryp.to/build/502489/nixlog/4/raw
|
||||
hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; });
|
||||
holy-project = dontCheck super.holy-project; # http://hydra.cryp.to/build/502002/nixlog/1/raw
|
||||
holy-project_0_1_1_1 = dontCheck super.holy-project_0_1_1_1;
|
||||
holy-project_0_2_0_0 = dontCheck super.holy-project_0_2_0_0 ;
|
||||
hoogle = overrideCabal super.hoogle (drv: { testTarget = "--test-option=--no-net"; });
|
||||
http-client_0_4_11_1 = dontCheck super.http-client_0_4_11_1;
|
||||
http-client_0_4_11_2 = dontCheck super.http-client_0_4_11_2;
|
||||
http-client_0_4_11_3 = dontCheck super.http-client_0_4_11_3;
|
||||
http-client_0_4_11 = dontCheck super.http-client_0_4_11;
|
||||
http-client_0_4_12 = dontCheck super.http-client_0_4_12;
|
||||
http-client_0_4_13 = dontCheck super.http-client_0_4_13;
|
||||
http-client_0_4_15 = dontCheck super.http-client_0_4_15;
|
||||
http-client_0_4_16 = dontCheck super.http-client_0_4_16;
|
||||
http-client_0_4_18_1 = dontCheck super.http-client_0_4_18_1;
|
||||
http-client_0_4_19 = dontCheck super.http-client_0_4_19;
|
||||
http-client_0_4_20 = dontCheck super.http-client_0_4_20;
|
||||
http-client_0_4_21 = dontCheck super.http-client_0_4_21;
|
||||
http-client_0_4_22 = dontCheck super.http-client_0_4_22;
|
||||
http-client_0_4_6_1 = dontCheck super.http-client_0_4_6_1;
|
||||
http-client_0_4_6_2 = dontCheck super.http-client_0_4_6_2;
|
||||
http-client_0_4_6 = dontCheck super.http-client_0_4_6;
|
||||
http-client_0_4_7_1 = dontCheck super.http-client_0_4_7_1;
|
||||
http-client_0_4_7 = dontCheck super.http-client_0_4_7;
|
||||
http-client_0_4_8_1 = dontCheck super.http-client_0_4_8_1;
|
||||
http-client_0_4_8 = dontCheck super.http-client_0_4_8;
|
||||
http-client_0_4_9 = dontCheck super.http-client_0_4_9;
|
||||
http-client = dontCheck super.http-client; # http://hydra.cryp.to/build/501430/nixlog/1/raw
|
||||
http-conduit_2_1_5_1 = dontCheck super.http-conduit_2_1_5_1;
|
||||
http-conduit_2_1_5 = dontCheck super.http-conduit_2_1_5;
|
||||
http-conduit_2_1_7_1 = dontCheck super.http-conduit_2_1_7_1;
|
||||
http-conduit_2_1_7_2 = dontCheck super.http-conduit_2_1_7_2;
|
||||
http-conduit = dontCheck super.http-conduit; # http://hydra.cryp.to/build/501966/nixlog/1/raw
|
||||
js-jquery_1_11_1 = dontCheck super.js-jquery_1_11_1;
|
||||
js-jquery_1_11_2 = dontCheck super.js-jquery_1_11_2;
|
||||
js-jquery = dontCheck super.js-jquery;
|
||||
marmalade-upload = dontCheck super.marmalade-upload; # http://hydra.cryp.to/build/501904/nixlog/1/raw
|
||||
network-transport-tcp = dontCheck super.network-transport-tcp;
|
||||
@ -425,6 +434,9 @@ self: super: {
|
||||
hsexif = dontCheck super.hsexif;
|
||||
hspec-server = dontCheck super.hspec-server;
|
||||
HTF = dontCheck super.HTF;
|
||||
HTF_0_12_2_3 = dontCheck super.HTF_0_12_2_3;
|
||||
HTF_0_12_2_4 = dontCheck super.HTF_0_12_2_4;
|
||||
HTF_0_13_0_0 = dontCheck super.HTF_0_13_0_0;
|
||||
htsn = dontCheck super.htsn;
|
||||
htsn-import = dontCheck super.htsn-import;
|
||||
http2 = dontCheck super.http2;
|
||||
@ -452,6 +464,9 @@ self: super: {
|
||||
optional = dontCheck super.optional;
|
||||
os-release = dontCheck super.os-release;
|
||||
pandoc-citeproc = dontCheck super.pandoc-citeproc;
|
||||
pandoc-citeproc_0_6 = dontCheck super.pandoc-citeproc_0_6;
|
||||
pandoc-citeproc_0_6_0_1 = dontCheck super.pandoc-citeproc_0_6_0_1;
|
||||
pandoc-citeproc_0_7_3 = dontCheck super.pandoc-citeproc_0_7_3;
|
||||
persistent-redis = dontCheck super.persistent-redis;
|
||||
pipes-extra = dontCheck super.pipes-extra;
|
||||
pipes-websockets = dontCheck super.pipes-websockets;
|
||||
@ -470,6 +485,9 @@ self: super: {
|
||||
separated = dontCheck super.separated;
|
||||
shadowsocks = dontCheck super.shadowsocks;
|
||||
shake-language-c = dontCheck super.shake-language-c;
|
||||
shake-language-c_0_6_3 = dontCheck super.shake-language-c_0_6_3;
|
||||
shake-language-c_0_6_4 = dontCheck super.shake-language-c_0_6_4;
|
||||
shake-language-c_0_8_0 = dontCheck super.shake-language-c_0_8_0;
|
||||
static-resources = dontCheck super.static-resources;
|
||||
strive = dontCheck super.strive; # fails its own hlint test with tons of warnings
|
||||
svndump = dontCheck super.svndump;
|
||||
@ -487,9 +505,6 @@ self: super: {
|
||||
webdriver = dontCheck super.webdriver;
|
||||
xsd = dontCheck super.xsd;
|
||||
|
||||
# https://bitbucket.org/wuzzeb/webdriver-utils/issue/1/hspec-webdriver-101-cant-compile-its-test
|
||||
hspec-webdriver = markBroken super.hspec-webdriver;
|
||||
|
||||
# Needs access to locale data, but looks for it in the wrong place.
|
||||
scholdoc-citeproc = dontCheck super.scholdoc-citeproc;
|
||||
|
||||
@ -509,30 +524,12 @@ self: super: {
|
||||
# Help the test suite find system timezone data.
|
||||
tz = overrideCabal super.tz (drv: { preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo"; });
|
||||
|
||||
# Deprecated upstream and doesn't compile.
|
||||
BASIC = dontDistribute super.BASIC;
|
||||
bytestring-arbitrary = dontDistribute (addBuildTool super.bytestring-arbitrary self.llvm);
|
||||
llvm = dontDistribute super.llvm;
|
||||
llvm-base = markBroken super.llvm-base;
|
||||
llvm-base-util = dontDistribute super.llvm-base-util;
|
||||
llvm-extra = dontDistribute super.llvm-extra;
|
||||
llvm-tf = dontDistribute super.llvm-tf;
|
||||
objectid = dontDistribute super.objectid;
|
||||
saltine-quickcheck = dontDistribute super.saltine-quickcheck;
|
||||
stable-tree = dontDistribute super.stable-tree;
|
||||
synthesizer-llvm = dontDistribute super.synthesizer-llvm;
|
||||
optimal-blocks = dontDistribute super.optimal-blocks;
|
||||
hs-blake2 = dontDistribute super.hs-blake2;
|
||||
|
||||
# https://ghc.haskell.org/trac/ghc/ticket/9625
|
||||
vty = dontCheck super.vty;
|
||||
|
||||
# https://github.com/vincenthz/hs-crypto-pubkey/issues/20
|
||||
crypto-pubkey = dontCheck super.crypto-pubkey;
|
||||
|
||||
# https://github.com/zouppen/stratum-tool/issues/14
|
||||
stratum-tool = markBrokenVersion "0.0.4" super.stratum-tool;
|
||||
|
||||
# https://github.com/Gabriel439/Haskell-Turtle-Library/issues/1
|
||||
turtle = dontCheck super.turtle;
|
||||
|
||||
@ -545,15 +542,6 @@ self: super: {
|
||||
# https://github.com/cgaebel/stm-conduit/issues/33
|
||||
stm-conduit = dontCheck super.stm-conduit;
|
||||
|
||||
# The install target tries to run lots of commands as "root". WTF???
|
||||
hannahci = markBroken super.hannahci;
|
||||
|
||||
# https://github.com/jkarni/th-alpha/issues/1
|
||||
th-alpha = markBrokenVersion "0.2.0.0" super.th-alpha;
|
||||
|
||||
# https://github.com/haskell-hub/hub-src/issues/24
|
||||
hub = markBrokenVersion "1.4.0" super.hub;
|
||||
|
||||
# https://github.com/pixbi/duplo/issues/25
|
||||
duplo = dontCheck super.duplo;
|
||||
|
||||
@ -573,9 +561,6 @@ self: super: {
|
||||
rematch = dontCheck super.rematch; # https://github.com/tcrayford/rematch/issues/5
|
||||
rematch-text = dontCheck super.rematch-text; # https://github.com/tcrayford/rematch/issues/6
|
||||
|
||||
# Upstream notified by e-mail.
|
||||
MonadCompose = markBrokenVersion "0.2.0.0" super.MonadCompose;
|
||||
|
||||
# no haddock since this is an umbrella package.
|
||||
cloud-haskell = dontHaddock super.cloud-haskell;
|
||||
|
||||
@ -585,12 +570,6 @@ self: super: {
|
||||
# https://github.com/NixOS/nixpkgs/issues/6350
|
||||
paypal-adaptive-hoops = overrideCabal super.paypal-adaptive-hoops (drv: { testTarget = "local"; });
|
||||
|
||||
# https://github.com/jwiegley/simple-conduit/issues/2
|
||||
simple-conduit = markBroken super.simple-conduit;
|
||||
|
||||
# https://code.google.com/p/linux-music-player/issues/detail?id=1
|
||||
mp = markBroken super.mp;
|
||||
|
||||
# https://github.com/afcowie/http-streams/issues/80
|
||||
http-streams = dontCheck super.http-streams;
|
||||
|
||||
@ -622,42 +601,15 @@ self: super: {
|
||||
apiary-session = dontCheck super.apiary-session;
|
||||
apiary-websockets = dontCheck super.apiary-websockets;
|
||||
|
||||
# https://github.com/mikeizbicki/hmm/issues/12
|
||||
hmm = markBroken super.hmm;
|
||||
|
||||
# https://github.com/alephcloud/hs-configuration-tools/issues/40
|
||||
configuration-tools = dontCheck super.configuration-tools;
|
||||
|
||||
# https://github.com/fumieval/karakuri/issues/1
|
||||
karakuri = markBroken super.karakuri;
|
||||
|
||||
# Upstream notified by e-mail.
|
||||
gearbox = markBroken super.gearbox;
|
||||
|
||||
# https://github.com/deech/fltkhs/issues/7
|
||||
fltkhs = markBroken super.fltkhs;
|
||||
|
||||
# Build fails, but there seems to be no issue tracker available. :-(
|
||||
hmidi = markBrokenVersion "0.2.1.0" super.hmidi;
|
||||
padKONTROL = markBroken super.padKONTROL;
|
||||
Bang = dontDistribute super.Bang;
|
||||
launchpad-control = dontDistribute super.launchpad-control;
|
||||
|
||||
# Upstream provides no issue tracker and no contact details.
|
||||
vivid = markBroken super.vivid;
|
||||
|
||||
# Test suite wants to connect to $DISPLAY.
|
||||
hsqml = dontCheck (super.hsqml.override { qt5 = pkgs.qt53; });
|
||||
|
||||
# https://github.com/lookunder/RedmineHs/issues/4
|
||||
Redmine = markBroken super.Redmine;
|
||||
hsqml = dontCheck (addExtraLibrary (super.hsqml.override { qt5 = pkgs.qt5Full; }) pkgs.mesa);
|
||||
|
||||
# HsColour: Language/Unlambda.hs: hGetContents: invalid argument (invalid byte sequence)
|
||||
unlambda = dontHyperlinkSource super.unlambda;
|
||||
|
||||
# https://github.com/megantti/rtorrent-rpc/issues/2
|
||||
rtorrent-rpc = markBroken super.rtorrent-rpc;
|
||||
|
||||
# https://github.com/PaulJohnson/geodetics/issues/1
|
||||
geodetics = dontCheck super.geodetics;
|
||||
|
||||
@ -680,42 +632,12 @@ self: super: {
|
||||
# /homeless-shelter. Disabled.
|
||||
purescript = dontCheck super.purescript;
|
||||
|
||||
# Broken by GLUT update.
|
||||
Monadius = markBroken super.Monadius;
|
||||
|
||||
# We don't have the groonga package these libraries bind to.
|
||||
haroonga = markBroken super.haroonga;
|
||||
haroonga-httpd = markBroken super.haroonga-httpd;
|
||||
|
||||
# Build is broken and no contact info available.
|
||||
hopenpgp-tools = markBroken super.hopenpgp-tools;
|
||||
|
||||
# https://github.com/hunt-framework/hunt/issues/99
|
||||
hunt-server = markBrokenVersion "0.3.0.2" super.hunt-server;
|
||||
|
||||
# https://github.com/bjpop/blip/issues/16
|
||||
blip = markBroken super.blip;
|
||||
|
||||
# https://github.com/tych0/xcffib/issues/37
|
||||
xcffib = dontCheck super.xcffib;
|
||||
|
||||
# https://github.com/afcowie/locators/issues/1
|
||||
locators = dontCheck super.locators;
|
||||
|
||||
# https://github.com/scravy/hydrogen-syntax/issues/1
|
||||
hydrogen-syntax = markBroken super.hydrogen-syntax;
|
||||
hydrogen-cli = dontDistribute super.hydrogen-cli;
|
||||
|
||||
# https://github.com/meteficha/Hipmunk/issues/8
|
||||
Hipmunk = markBroken super.Hipmunk;
|
||||
HipmunkPlayground = dontDistribute super.HipmunkPlayground;
|
||||
click-clack = dontDistribute super.click-clack;
|
||||
|
||||
# https://github.com/fumieval/audiovisual/issues/1
|
||||
audiovisual = markBroken super.audiovisual;
|
||||
call = dontDistribute super.call;
|
||||
rhythm-game-tutorial = dontDistribute super.rhythm-game-tutorial;
|
||||
|
||||
# https://github.com/haskell/haddock/issues/378
|
||||
haddock-library = dontCheck super.haddock-library;
|
||||
|
||||
@ -759,11 +681,6 @@ self: super: {
|
||||
hackage2nix = self.callPackage ../tools/haskell/cabal2nix/hackage2nix.nix {};
|
||||
distribution-nixpkgs = self.callPackage ../tools/haskell/cabal2nix/distribution-nixpkgs.nix {};
|
||||
|
||||
# https://github.com/urs-of-the-backwoods/HGamer3D/issues/7
|
||||
HGamer3D-Bullet-Binding = dontDistribute super.HGamer3D-Bullet-Binding;
|
||||
HGamer3D-Common = dontDistribute super.HGamer3D-Common;
|
||||
HGamer3D-Data = markBroken super.HGamer3D-Data;
|
||||
|
||||
# https://github.com/ndmitchell/shake/issues/206
|
||||
# https://github.com/ndmitchell/shake/issues/267
|
||||
shake = overrideCabal super.shake (drv: { doCheck = !pkgs.stdenv.isDarwin && false; });
|
||||
@ -771,11 +688,6 @@ self: super: {
|
||||
# https://github.com/nushio3/doctest-prop/issues/1
|
||||
doctest-prop = dontCheck super.doctest-prop;
|
||||
|
||||
# https://github.com/anton-k/temporal-music-notation/issues/1
|
||||
temporal-music-notation = markBroken super.temporal-music-notation;
|
||||
temporal-music-notation-demo = dontDistribute super.temporal-music-notation-demo;
|
||||
temporal-music-notation-western = dontDistribute super.temporal-music-notation-western;
|
||||
|
||||
# https://github.com/adamwalker/sdr/issues/1
|
||||
sdr = dontCheck super.sdr;
|
||||
|
||||
@ -783,13 +695,9 @@ self: super: {
|
||||
aeson = dontCheck super.aeson;
|
||||
|
||||
# Won't compile with recent versions of QuickCheck.
|
||||
testpack = markBroken super.testpack;
|
||||
inilist = dontCheck super.inilist;
|
||||
MissingH = dontCheck super.MissingH;
|
||||
|
||||
# Obsolete for GHC versions after GHC 6.10.x.
|
||||
utf8-prelude = markBroken super.utf8-prelude;
|
||||
|
||||
# https://github.com/yaccz/saturnin/issues/3
|
||||
Saturnin = dontCheck super.Saturnin;
|
||||
|
||||
@ -819,9 +727,6 @@ self: super: {
|
||||
inline-c-win32 = dontDistribute super.inline-c-win32;
|
||||
Southpaw = dontDistribute super.Southpaw;
|
||||
|
||||
# Doesn't work with recent versions of mtl.
|
||||
cron-compat = markBroken super.cron-compat;
|
||||
|
||||
# https://github.com/yesodweb/serversession/issues/1
|
||||
serversession = dontCheck super.serversession;
|
||||
|
||||
@ -833,10 +738,6 @@ self: super: {
|
||||
# https://github.com/commercialhaskell/stack/issues/409
|
||||
stack = overrideCabal super.stack (drv: { preCheck = "export HOME=$TMPDIR"; doCheck = false; });
|
||||
|
||||
# Missing dependency on some hid-usb library.
|
||||
hid = markBroken super.hid;
|
||||
msi-kb-backlit = dontDistribute super.msi-kb-backlit;
|
||||
|
||||
# Hydra no longer allows building texlive packages.
|
||||
lhs2tex = dontDistribute super.lhs2tex;
|
||||
|
||||
@ -856,18 +757,12 @@ self: super: {
|
||||
# https://github.com/edwinb/EpiVM/issues/14
|
||||
epic = addExtraLibraries (addBuildTool super.epic self.happy) [pkgs.boehmgc pkgs.gmp];
|
||||
|
||||
# Upstream has no issue tracker.
|
||||
dpkg = markBroken super.dpkg;
|
||||
|
||||
# https://github.com/ekmett/wl-pprint-terminfo/issues/7
|
||||
wl-pprint-terminfo = addExtraLibrary super.wl-pprint-terminfo pkgs.ncurses;
|
||||
|
||||
# https://github.com/bos/pcap/issues/5
|
||||
pcap = addExtraLibrary super.pcap pkgs.libpcap;
|
||||
|
||||
# https://github.com/skogsbaer/hscurses/issues/24
|
||||
hscurses = markBroken super.hscurses;
|
||||
|
||||
# https://github.com/qnikst/imagemagick/issues/34
|
||||
imagemagick = dontCheck super.imagemagick;
|
||||
|
||||
@ -877,9 +772,6 @@ self: super: {
|
||||
# https://github.com/k0ral/hbro-contrib/issues/1
|
||||
hbro-contrib = dontDistribute super.hbro-contrib;
|
||||
|
||||
# https://github.com/aka-bash0r/multi-cabal/issues/4
|
||||
multi-cabal = markBroken super.multi-cabal;
|
||||
|
||||
# Elm is no longer actively maintained on Hackage: https://github.com/NixOS/nixpkgs/pull/9233.
|
||||
Elm = markBroken super.Elm;
|
||||
elm-build-lib = markBroken super.elm-build-lib;
|
||||
@ -956,12 +848,6 @@ self: super: {
|
||||
# https://github.com/bos/configurator/issues/22
|
||||
configurator = dontCheck super.configurator;
|
||||
|
||||
# https://github.com/thoughtpolice/hs-ed25519/issues/9
|
||||
ed25519 = markBroken super.ed25519;
|
||||
hackage-repo-tool = dontDistribute super.hackage-repo-tool;
|
||||
hackage-security = dontDistribute super.hackage-security;
|
||||
hackage-security-HTTP = dontDistribute super.hackage-security-HTTP;
|
||||
|
||||
# The cabal files for these libraries do not list the required system dependencies.
|
||||
SDL-image = overrideCabal super.SDL-image (drv: {
|
||||
librarySystemDepends = [ pkgs.SDL pkgs.SDL_image ] ++ drv.librarySystemDepends or [];
|
||||
@ -982,11 +868,8 @@ self: super: {
|
||||
];
|
||||
});
|
||||
|
||||
# https://github.com/chrisdone/freenect/pull/11
|
||||
freenect = overrideCabal super.freenect (drv: {
|
||||
libraryPkgconfigDepends = [ pkgs.freenect ];
|
||||
prePatch = '' echo " Pkgconfig-Depends: libfreenect" >> freenect.cabal '';
|
||||
});
|
||||
# Old versions don't detect this library reliably.
|
||||
freenect = appendConfigureFlag super.freenect "--extra-include-dirs=${pkgs.freenect}/include/libfreenect --extra-lib-dirs=${pkgs.freenect}/lib";
|
||||
|
||||
# https://github.com/ivanperez-keera/hcwiid/pull/4
|
||||
hcwiid = overrideCabal super.hcwiid (drv: {
|
||||
@ -1024,4 +907,30 @@ self: super: {
|
||||
});
|
||||
in g';
|
||||
|
||||
# https://github.com/guillaume-nargeot/hpc-coveralls/issues/52
|
||||
hpc-coveralls = disableSharedExecutables super.hpc-coveralls;
|
||||
hpc-coveralls_0_9_0 = disableSharedExecutables super.hpc-coveralls_0_9_0;
|
||||
|
||||
# Test suite won't compile.
|
||||
semigroupoids_5_0_0_3 = dontCheck super.semigroupoids_5_0_0_3;
|
||||
|
||||
# This is fixed in newer versions.
|
||||
zip-archive_0_2_3_5 = addBuildTool super.zip-archive_0_2_3_5 pkgs.zip;
|
||||
|
||||
# https://github.com/fpco/stackage/issues/838
|
||||
cryptonite = dontCheck super.cryptonite;
|
||||
cryptonite_0_6 = dontCheck super.cryptonite_0_6 ;
|
||||
|
||||
# https://github.com/fpco/stackage/issues/843
|
||||
hmatrix-gsl-stats_0_4_1 = overrideCabal super.hmatrix-gsl-stats_0_4_1 (drv: {
|
||||
postUnpack = "rm */Setup.lhs";
|
||||
});
|
||||
|
||||
# We cannot build this package w/o the C library from <http://www.phash.org/>.
|
||||
phash = markBroken super.phash;
|
||||
|
||||
# https://github.com/yesodweb/serversession/issues/2
|
||||
# https://github.com/haskell/cabal/issues/2661
|
||||
serversession-backend-acid-state_1_0_1 = dontCheck super.serversession-backend-acid-state_1_0_1;
|
||||
|
||||
}
|
||||
|
||||
@ -61,19 +61,14 @@ self: super: {
|
||||
});
|
||||
};
|
||||
|
||||
idris =
|
||||
let idris' = overrideCabal super.idris (drv: {
|
||||
# "idris" binary cannot find Idris library otherwise while building.
|
||||
# After installing it's completely fine though. Seems like Nix-specific
|
||||
# issue so not reported.
|
||||
preBuild = "export LD_LIBRARY_PATH=$PWD/dist/build:$LD_LIBRARY_PATH";
|
||||
# https://github.com/idris-lang/Idris-dev/issues/2499
|
||||
librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp];
|
||||
});
|
||||
in idris'.overrideScope (self: super: {
|
||||
# https://github.com/idris-lang/Idris-dev/issues/2500
|
||||
zlib = self.zlib_0_5_4_2;
|
||||
});
|
||||
idris = overrideCabal super.idris (drv: {
|
||||
# "idris" binary cannot find Idris library otherwise while building.
|
||||
# After installing it's completely fine though. Seems like Nix-specific
|
||||
# issue so not reported.
|
||||
preBuild = "export LD_LIBRARY_PATH=$PWD/dist/build:$LD_LIBRARY_PATH";
|
||||
# https://github.com/idris-lang/Idris-dev/issues/2499
|
||||
librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp];
|
||||
});
|
||||
|
||||
Extra = appendPatch super.Extra (pkgs.fetchpatch {
|
||||
url = "https://github.com/seereason/sr-extra/commit/29787ad4c20c962924b823d02a7335da98143603.patch";
|
||||
@ -180,22 +175,6 @@ self: super: {
|
||||
in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3
|
||||
self.webkitgtk3-javascriptcore ];
|
||||
|
||||
# https://github.com/cartazio/arithmoi/issues/1
|
||||
arithmoi = markBroken super.arithmoi;
|
||||
NTRU = dontDistribute super.NTRU;
|
||||
arith-encode = dontDistribute super.arith-encode;
|
||||
barchart = dontDistribute super.barchart;
|
||||
constructible = dontDistribute super.constructible;
|
||||
cyclotomic = dontDistribute super.cyclotomic;
|
||||
diagrams = dontDistribute super.diagrams;
|
||||
diagrams-contrib = dontDistribute super.diagrams-contrib;
|
||||
enumeration = dontDistribute super.enumeration;
|
||||
ghci-diagrams = dontDistribute super.ghci-diagrams;
|
||||
ihaskell-diagrams = dontDistribute super.ihaskell-diagrams;
|
||||
nimber = dontDistribute super.nimber;
|
||||
pell = dontDistribute super.pell;
|
||||
quadratic-irrational = dontDistribute super.quadratic-irrational;
|
||||
|
||||
# https://github.com/lymar/hastache/issues/47
|
||||
hastache = dontCheck super.hastache;
|
||||
|
||||
@ -214,37 +193,9 @@ self: super: {
|
||||
# https://github.com/HugoDaniel/RFC3339/issues/14
|
||||
timerep = dontCheck super.timerep;
|
||||
|
||||
# Upstream has no issue tracker.
|
||||
llvm-base-types = markBroken super.llvm-base-types;
|
||||
llvm-analysis = dontDistribute super.llvm-analysis;
|
||||
llvm-data-interop = dontDistribute super.llvm-data-interop;
|
||||
llvm-tools = dontDistribute super.llvm-tools;
|
||||
|
||||
# Upstream has no issue tracker.
|
||||
MaybeT = markBroken super.MaybeT;
|
||||
grammar-combinators = dontDistribute super.grammar-combinators;
|
||||
|
||||
# Required to fix version 0.91.0.0.
|
||||
wx = dontHaddock (appendConfigureFlag super.wx "--ghc-option=-XFlexibleContexts");
|
||||
|
||||
# Upstream has no issue tracker.
|
||||
Graphalyze = markBroken super.Graphalyze;
|
||||
gbu = dontDistribute super.gbu;
|
||||
SourceGraph = dontDistribute super.SourceGraph;
|
||||
|
||||
# Upstream has no issue tracker.
|
||||
markBroken = super.protocol-buffers;
|
||||
caffegraph = dontDistribute super.caffegraph;
|
||||
|
||||
# Deprecated: https://github.com/mikeizbicki/ConstraintKinds/issues/8
|
||||
ConstraintKinds = markBroken super.ConstraintKinds;
|
||||
HLearn-approximation = dontDistribute super.HLearn-approximation;
|
||||
HLearn-distributions = dontDistribute super.HLearn-distributions;
|
||||
HLearn-classification = dontDistribute super.HLearn-classification;
|
||||
|
||||
# Doesn't work with LLVM 3.5.
|
||||
llvm-general = markBroken super.llvm-general;
|
||||
|
||||
# Inexplicable haddock failure
|
||||
# https://github.com/gregwebs/aeson-applicative/issues/2
|
||||
aeson-applicative = dontHaddock super.aeson-applicative;
|
||||
|
||||
@ -121,10 +121,6 @@ self: super: {
|
||||
# needs mtl-compat to build with mtl 2.1.x
|
||||
cgi = addBuildDepend super.cgi self.mtl-compat;
|
||||
|
||||
# Newer versions always trigger the non-deterministic library ID bug
|
||||
# and are virtually impossible to compile on Hydra.
|
||||
conduit = super.conduit_1_2_4_1;
|
||||
|
||||
# https://github.com/magthe/sandi/issues/7
|
||||
sandi = overrideCabal super.sandi (drv: {
|
||||
postPatch = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal";
|
||||
@ -133,4 +129,13 @@ self: super: {
|
||||
# Overriding mtl 2.2.x is fine here because ghc-events is an stand-alone executable.
|
||||
ghc-events = super.ghc-events.override { mtl = self.mtl_2_2_1; };
|
||||
|
||||
# The network library is required in configurations that don't have network-uri.
|
||||
hxt = addBuildDepend super.hxt self.network;
|
||||
hxt_9_3_1_7 = addBuildDepend super.hxt_9_3_1_7 self.network;
|
||||
hxt_9_3_1_10 = addBuildDepend super.hxt_9_3_1_10 self.network;
|
||||
hxt_9_3_1_12 = addBuildDepend super.hxt_9_3_1_12 self.network;
|
||||
xss-sanitize = addBuildDepend super.xss-sanitize self.network;
|
||||
xss-sanitize_0_3_5_4 = addBuildDepend super.xss-sanitize_0_3_5_4 self.network;
|
||||
xss-sanitize_0_3_5_5 = addBuildDepend super.xss-sanitize_0_3_5_5 self.network;
|
||||
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
8463
pkgs/development/haskell-modules/configuration-lts-0.0.nix
Normal file
8463
pkgs/development/haskell-modules/configuration-lts-0.0.nix
Normal file
File diff suppressed because it is too large
Load Diff
8462
pkgs/development/haskell-modules/configuration-lts-0.1.nix
Normal file
8462
pkgs/development/haskell-modules/configuration-lts-0.1.nix
Normal file
File diff suppressed because it is too large
Load Diff
8462
pkgs/development/haskell-modules/configuration-lts-0.2.nix
Normal file
8462
pkgs/development/haskell-modules/configuration-lts-0.2.nix
Normal file
File diff suppressed because it is too large
Load Diff
8462
pkgs/development/haskell-modules/configuration-lts-0.3.nix
Normal file
8462
pkgs/development/haskell-modules/configuration-lts-0.3.nix
Normal file
File diff suppressed because it is too large
Load Diff
8457
pkgs/development/haskell-modules/configuration-lts-0.4.nix
Normal file
8457
pkgs/development/haskell-modules/configuration-lts-0.4.nix
Normal file
File diff suppressed because it is too large
Load Diff
8456
pkgs/development/haskell-modules/configuration-lts-0.5.nix
Normal file
8456
pkgs/development/haskell-modules/configuration-lts-0.5.nix
Normal file
File diff suppressed because it is too large
Load Diff
8445
pkgs/development/haskell-modules/configuration-lts-0.6.nix
Normal file
8445
pkgs/development/haskell-modules/configuration-lts-0.6.nix
Normal file
File diff suppressed because it is too large
Load Diff
8445
pkgs/development/haskell-modules/configuration-lts-0.7.nix
Normal file
8445
pkgs/development/haskell-modules/configuration-lts-0.7.nix
Normal file
File diff suppressed because it is too large
Load Diff
8422
pkgs/development/haskell-modules/configuration-lts-1.0.nix
Normal file
8422
pkgs/development/haskell-modules/configuration-lts-1.0.nix
Normal file
File diff suppressed because it is too large
Load Diff
8402
pkgs/development/haskell-modules/configuration-lts-1.1.nix
Normal file
8402
pkgs/development/haskell-modules/configuration-lts-1.1.nix
Normal file
File diff suppressed because it is too large
Load Diff
8353
pkgs/development/haskell-modules/configuration-lts-1.10.nix
Normal file
8353
pkgs/development/haskell-modules/configuration-lts-1.10.nix
Normal file
File diff suppressed because it is too large
Load Diff
8347
pkgs/development/haskell-modules/configuration-lts-1.11.nix
Normal file
8347
pkgs/development/haskell-modules/configuration-lts-1.11.nix
Normal file
File diff suppressed because it is too large
Load Diff
8343
pkgs/development/haskell-modules/configuration-lts-1.12.nix
Normal file
8343
pkgs/development/haskell-modules/configuration-lts-1.12.nix
Normal file
File diff suppressed because it is too large
Load Diff
8339
pkgs/development/haskell-modules/configuration-lts-1.13.nix
Normal file
8339
pkgs/development/haskell-modules/configuration-lts-1.13.nix
Normal file
File diff suppressed because it is too large
Load Diff
8330
pkgs/development/haskell-modules/configuration-lts-1.14.nix
Normal file
8330
pkgs/development/haskell-modules/configuration-lts-1.14.nix
Normal file
File diff suppressed because it is too large
Load Diff
8315
pkgs/development/haskell-modules/configuration-lts-1.15.nix
Normal file
8315
pkgs/development/haskell-modules/configuration-lts-1.15.nix
Normal file
File diff suppressed because it is too large
Load Diff
8395
pkgs/development/haskell-modules/configuration-lts-1.2.nix
Normal file
8395
pkgs/development/haskell-modules/configuration-lts-1.2.nix
Normal file
File diff suppressed because it is too large
Load Diff
8386
pkgs/development/haskell-modules/configuration-lts-1.4.nix
Normal file
8386
pkgs/development/haskell-modules/configuration-lts-1.4.nix
Normal file
File diff suppressed because it is too large
Load Diff
8382
pkgs/development/haskell-modules/configuration-lts-1.5.nix
Normal file
8382
pkgs/development/haskell-modules/configuration-lts-1.5.nix
Normal file
File diff suppressed because it is too large
Load Diff
8375
pkgs/development/haskell-modules/configuration-lts-1.7.nix
Normal file
8375
pkgs/development/haskell-modules/configuration-lts-1.7.nix
Normal file
File diff suppressed because it is too large
Load Diff
8368
pkgs/development/haskell-modules/configuration-lts-1.8.nix
Normal file
8368
pkgs/development/haskell-modules/configuration-lts-1.8.nix
Normal file
File diff suppressed because it is too large
Load Diff
8364
pkgs/development/haskell-modules/configuration-lts-1.9.nix
Normal file
8364
pkgs/development/haskell-modules/configuration-lts-1.9.nix
Normal file
File diff suppressed because it is too large
Load Diff
8225
pkgs/development/haskell-modules/configuration-lts-2.0.nix
Normal file
8225
pkgs/development/haskell-modules/configuration-lts-2.0.nix
Normal file
File diff suppressed because it is too large
Load Diff
8222
pkgs/development/haskell-modules/configuration-lts-2.1.nix
Normal file
8222
pkgs/development/haskell-modules/configuration-lts-2.1.nix
Normal file
File diff suppressed because it is too large
Load Diff
8140
pkgs/development/haskell-modules/configuration-lts-2.10.nix
Normal file
8140
pkgs/development/haskell-modules/configuration-lts-2.10.nix
Normal file
File diff suppressed because it is too large
Load Diff
8126
pkgs/development/haskell-modules/configuration-lts-2.11.nix
Normal file
8126
pkgs/development/haskell-modules/configuration-lts-2.11.nix
Normal file
File diff suppressed because it is too large
Load Diff
8125
pkgs/development/haskell-modules/configuration-lts-2.12.nix
Normal file
8125
pkgs/development/haskell-modules/configuration-lts-2.12.nix
Normal file
File diff suppressed because it is too large
Load Diff
8121
pkgs/development/haskell-modules/configuration-lts-2.13.nix
Normal file
8121
pkgs/development/haskell-modules/configuration-lts-2.13.nix
Normal file
File diff suppressed because it is too large
Load Diff
8112
pkgs/development/haskell-modules/configuration-lts-2.14.nix
Normal file
8112
pkgs/development/haskell-modules/configuration-lts-2.14.nix
Normal file
File diff suppressed because it is too large
Load Diff
8103
pkgs/development/haskell-modules/configuration-lts-2.15.nix
Normal file
8103
pkgs/development/haskell-modules/configuration-lts-2.15.nix
Normal file
File diff suppressed because it is too large
Load Diff
8087
pkgs/development/haskell-modules/configuration-lts-2.16.nix
Normal file
8087
pkgs/development/haskell-modules/configuration-lts-2.16.nix
Normal file
File diff suppressed because it is too large
Load Diff
8073
pkgs/development/haskell-modules/configuration-lts-2.17.nix
Normal file
8073
pkgs/development/haskell-modules/configuration-lts-2.17.nix
Normal file
File diff suppressed because it is too large
Load Diff
8059
pkgs/development/haskell-modules/configuration-lts-2.18.nix
Normal file
8059
pkgs/development/haskell-modules/configuration-lts-2.18.nix
Normal file
File diff suppressed because it is too large
Load Diff
8052
pkgs/development/haskell-modules/configuration-lts-2.19.nix
Normal file
8052
pkgs/development/haskell-modules/configuration-lts-2.19.nix
Normal file
File diff suppressed because it is too large
Load Diff
8216
pkgs/development/haskell-modules/configuration-lts-2.2.nix
Normal file
8216
pkgs/development/haskell-modules/configuration-lts-2.2.nix
Normal file
File diff suppressed because it is too large
Load Diff
8043
pkgs/development/haskell-modules/configuration-lts-2.20.nix
Normal file
8043
pkgs/development/haskell-modules/configuration-lts-2.20.nix
Normal file
File diff suppressed because it is too large
Load Diff
8033
pkgs/development/haskell-modules/configuration-lts-2.21.nix
Normal file
8033
pkgs/development/haskell-modules/configuration-lts-2.21.nix
Normal file
File diff suppressed because it is too large
Load Diff
8029
pkgs/development/haskell-modules/configuration-lts-2.22.nix
Normal file
8029
pkgs/development/haskell-modules/configuration-lts-2.22.nix
Normal file
File diff suppressed because it is too large
Load Diff
8212
pkgs/development/haskell-modules/configuration-lts-2.3.nix
Normal file
8212
pkgs/development/haskell-modules/configuration-lts-2.3.nix
Normal file
File diff suppressed because it is too large
Load Diff
8205
pkgs/development/haskell-modules/configuration-lts-2.4.nix
Normal file
8205
pkgs/development/haskell-modules/configuration-lts-2.4.nix
Normal file
File diff suppressed because it is too large
Load Diff
8201
pkgs/development/haskell-modules/configuration-lts-2.5.nix
Normal file
8201
pkgs/development/haskell-modules/configuration-lts-2.5.nix
Normal file
File diff suppressed because it is too large
Load Diff
8190
pkgs/development/haskell-modules/configuration-lts-2.6.nix
Normal file
8190
pkgs/development/haskell-modules/configuration-lts-2.6.nix
Normal file
File diff suppressed because it is too large
Load Diff
8188
pkgs/development/haskell-modules/configuration-lts-2.7.nix
Normal file
8188
pkgs/development/haskell-modules/configuration-lts-2.7.nix
Normal file
File diff suppressed because it is too large
Load Diff
8178
pkgs/development/haskell-modules/configuration-lts-2.8.nix
Normal file
8178
pkgs/development/haskell-modules/configuration-lts-2.8.nix
Normal file
File diff suppressed because it is too large
Load Diff
8159
pkgs/development/haskell-modules/configuration-lts-2.9.nix
Normal file
8159
pkgs/development/haskell-modules/configuration-lts-2.9.nix
Normal file
File diff suppressed because it is too large
Load Diff
7654
pkgs/development/haskell-modules/configuration-lts-3.0.nix
Normal file
7654
pkgs/development/haskell-modules/configuration-lts-3.0.nix
Normal file
File diff suppressed because it is too large
Load Diff
7639
pkgs/development/haskell-modules/configuration-lts-3.1.nix
Normal file
7639
pkgs/development/haskell-modules/configuration-lts-3.1.nix
Normal file
File diff suppressed because it is too large
Load Diff
7617
pkgs/development/haskell-modules/configuration-lts-3.2.nix
Normal file
7617
pkgs/development/haskell-modules/configuration-lts-3.2.nix
Normal file
File diff suppressed because it is too large
Load Diff
7588
pkgs/development/haskell-modules/configuration-lts-3.3.nix
Normal file
7588
pkgs/development/haskell-modules/configuration-lts-3.3.nix
Normal file
File diff suppressed because it is too large
Load Diff
7582
pkgs/development/haskell-modules/configuration-lts-3.4.nix
Normal file
7582
pkgs/development/haskell-modules/configuration-lts-3.4.nix
Normal file
File diff suppressed because it is too large
Load Diff
7540
pkgs/development/haskell-modules/configuration-lts-3.5.nix
Normal file
7540
pkgs/development/haskell-modules/configuration-lts-3.5.nix
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,4 +1,5 @@
|
||||
{ pkgs, stdenv, ghc
|
||||
, compilerConfig ? (self: super: {})
|
||||
, packageSetConfig ? (self: super: {})
|
||||
, overrides ? (self: super: {})
|
||||
}:
|
||||
@ -77,4 +78,4 @@ let
|
||||
|
||||
in
|
||||
|
||||
fix (extend (extend (extend haskellPackages commonConfiguration) packageSetConfig) overrides)
|
||||
fix (extend (extend (extend (extend haskellPackages commonConfiguration) compilerConfig) packageSetConfig) overrides)
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,63 +0,0 @@
|
||||
From 35d5995a58c86a6addbf0aaf0d1be64d39182872 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Mon, 1 Dec 2014 17:21:58 -0600
|
||||
Subject: [PATCH] dlopen-gtkstyle
|
||||
|
||||
---
|
||||
qtbase/src/widgets/styles/qgtk2painter.cpp | 2 +-
|
||||
qtbase/src/widgets/styles/qgtkstyle_p.cpp | 12 ++++++------
|
||||
2 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/qtbase/src/widgets/styles/qgtk2painter.cpp b/qtbase/src/widgets/styles/qgtk2painter.cpp
|
||||
index 7b9bd97..075947a 100644
|
||||
--- a/qtbase/src/widgets/styles/qgtk2painter.cpp
|
||||
+++ b/qtbase/src/widgets/styles/qgtk2painter.cpp
|
||||
@@ -104,7 +104,7 @@ static void initGtk()
|
||||
static bool initialized = false;
|
||||
if (!initialized) {
|
||||
// enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0
|
||||
- QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0);
|
||||
+ QLibrary libgtk(QLS("@gtk@/lib/libgtk-x11-2.0"), 0, 0);
|
||||
|
||||
QGtk2PainterPrivate::gdk_pixmap_new = (Ptr_gdk_pixmap_new)libgtk.resolve("gdk_pixmap_new");
|
||||
QGtk2PainterPrivate::gdk_pixbuf_get_from_drawable = (Ptr_gdk_pixbuf_get_from_drawable)libgtk.resolve("gdk_pixbuf_get_from_drawable");
|
||||
diff --git a/qtbase/src/widgets/styles/qgtkstyle_p.cpp b/qtbase/src/widgets/styles/qgtkstyle_p.cpp
|
||||
index 2c64225..3343d32 100644
|
||||
--- a/qtbase/src/widgets/styles/qgtkstyle_p.cpp
|
||||
+++ b/qtbase/src/widgets/styles/qgtkstyle_p.cpp
|
||||
@@ -334,7 +334,7 @@ void QGtkStylePrivate::gtkWidgetSetFocus(GtkWidget *widget, bool focus)
|
||||
void QGtkStylePrivate::resolveGtk() const
|
||||
{
|
||||
// enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0
|
||||
- QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0);
|
||||
+ QLibrary libgtk(QLS("@gtk@/lib/libgtk-x11-2.0"), 0, 0);
|
||||
|
||||
gtk_init = (Ptr_gtk_init)libgtk.resolve("gtk_init");
|
||||
gtk_window_new = (Ptr_gtk_window_new)libgtk.resolve("gtk_window_new");
|
||||
@@ -432,8 +432,8 @@ void QGtkStylePrivate::resolveGtk() const
|
||||
pango_font_description_get_family = (Ptr_pango_font_description_get_family)libgtk.resolve("pango_font_description_get_family");
|
||||
pango_font_description_get_style = (Ptr_pango_font_description_get_style)libgtk.resolve("pango_font_description_get_style");
|
||||
|
||||
- gnome_icon_lookup_sync = (Ptr_gnome_icon_lookup_sync)QLibrary::resolve(QLS("gnomeui-2"), 0, "gnome_icon_lookup_sync");
|
||||
- gnome_vfs_init= (Ptr_gnome_vfs_init)QLibrary::resolve(QLS("gnomevfs-2"), 0, "gnome_vfs_init");
|
||||
+ gnome_icon_lookup_sync = (Ptr_gnome_icon_lookup_sync)QLibrary::resolve(QLS("@libgnomeui@/lib/libgnomeui-2"), 0, "gnome_icon_lookup_sync");
|
||||
+ gnome_vfs_init= (Ptr_gnome_vfs_init)QLibrary::resolve(QLS("@gnome_vfs@/lib/libgnomevfs-2"), 0, "gnome_vfs_init");
|
||||
}
|
||||
|
||||
/* \internal
|
||||
@@ -601,9 +601,9 @@ void QGtkStylePrivate::cleanupGtkWidgets()
|
||||
static bool resolveGConf()
|
||||
{
|
||||
if (!QGtkStylePrivate::gconf_client_get_default) {
|
||||
- QGtkStylePrivate::gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_default");
|
||||
- QGtkStylePrivate::gconf_client_get_string = (Ptr_gconf_client_get_string)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_string");
|
||||
- QGtkStylePrivate::gconf_client_get_bool = (Ptr_gconf_client_get_bool)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_bool");
|
||||
+ QGtkStylePrivate::gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_default");
|
||||
+ QGtkStylePrivate::gconf_client_get_string = (Ptr_gconf_client_get_string)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_string");
|
||||
+ QGtkStylePrivate::gconf_client_get_bool = (Ptr_gconf_client_get_bool)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_bool");
|
||||
}
|
||||
return (QGtkStylePrivate::gconf_client_get_default !=0);
|
||||
}
|
||||
--
|
||||
2.1.3
|
||||
|
||||
@ -1,53 +0,0 @@
|
||||
From 8c30f72dbe11752e8ed25f292c6e5695d7733f72 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Mon, 1 Dec 2014 17:22:23 -0600
|
||||
Subject: [PATCH] dlopen-webkit-nsplugin
|
||||
|
||||
---
|
||||
qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp | 2 +-
|
||||
qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp | 2 +-
|
||||
.../WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp | 2 +-
|
||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp
|
||||
index 679480b..2c373cc 100644
|
||||
--- a/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp
|
||||
+++ b/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp
|
||||
@@ -132,7 +132,7 @@ static void initializeGtk(QLibrary* module = 0)
|
||||
}
|
||||
}
|
||||
|
||||
- QLibrary library(QLatin1String("libgtk-x11-2.0"), 0);
|
||||
+ QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0);
|
||||
if (library.load()) {
|
||||
typedef void *(*gtk_init_check_ptr)(int*, char***);
|
||||
gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check");
|
||||
diff --git a/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp b/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp
|
||||
index de06a2f..363bde5 100644
|
||||
--- a/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp
|
||||
+++ b/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp
|
||||
@@ -697,7 +697,7 @@ static Display *getPluginDisplay()
|
||||
// support gdk based plugins (like flash) that use a different X connection.
|
||||
// The code below has the same effect as this one:
|
||||
// Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
|
||||
- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
|
||||
+ QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0);
|
||||
if (!library.load())
|
||||
return 0;
|
||||
|
||||
diff --git a/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
|
||||
index d734ff6..62a2197 100644
|
||||
--- a/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
|
||||
+++ b/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
|
||||
@@ -64,7 +64,7 @@ static Display* getPluginDisplay()
|
||||
// The code below has the same effect as this one:
|
||||
// Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
|
||||
|
||||
- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
|
||||
+ QLibrary library(QLatin1String("@gdk_pixbuf@/libgdk-x11-2.0"), 0);
|
||||
if (!library.load())
|
||||
return 0;
|
||||
|
||||
--
|
||||
2.1.3
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From a41c3e3a3a1ce4b373b1bbb98f3a835e9e8a0718 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Mon, 1 Dec 2014 17:22:39 -0600
|
||||
Subject: [PATCH] glib-2.32
|
||||
|
||||
---
|
||||
qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
|
||||
index 1f6d25e..087c3fb 100644
|
||||
--- a/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
|
||||
+++ b/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
|
||||
@@ -81,7 +81,7 @@
|
||||
#include <pthread.h>
|
||||
#elif PLATFORM(GTK)
|
||||
#include <wtf/gtk/GOwnPtr.h>
|
||||
-typedef struct _GMutex GMutex;
|
||||
+typedef union _GMutex GMutex;
|
||||
typedef struct _GCond GCond;
|
||||
#endif
|
||||
|
||||
--
|
||||
2.1.3
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
From 63af41c6eeca28c911c13b1a77afeaf860863c2d Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Mon, 1 Dec 2014 17:22:55 -0600
|
||||
Subject: [PATCH] dlopen-resolv
|
||||
|
||||
---
|
||||
qtbase/src/network/kernel/qdnslookup_unix.cpp | 2 +-
|
||||
qtbase/src/network/kernel/qhostinfo_unix.cpp | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/qtbase/src/network/kernel/qdnslookup_unix.cpp b/qtbase/src/network/kernel/qdnslookup_unix.cpp
|
||||
index 8c5a0eb..27ebf16 100644
|
||||
--- a/qtbase/src/network/kernel/qdnslookup_unix.cpp
|
||||
+++ b/qtbase/src/network/kernel/qdnslookup_unix.cpp
|
||||
@@ -87,7 +87,7 @@ static void resolveLibrary()
|
||||
if (!lib.load())
|
||||
#endif
|
||||
{
|
||||
- lib.setFileName(QLatin1String("resolv"));
|
||||
+ lib.setFileName(QLatin1String("@glibc/lib/resolv"));
|
||||
if (!lib.load())
|
||||
return;
|
||||
}
|
||||
diff --git a/qtbase/src/network/kernel/qhostinfo_unix.cpp b/qtbase/src/network/kernel/qhostinfo_unix.cpp
|
||||
index df8c8b1..613d0e0 100644
|
||||
--- a/qtbase/src/network/kernel/qhostinfo_unix.cpp
|
||||
+++ b/qtbase/src/network/kernel/qhostinfo_unix.cpp
|
||||
@@ -103,7 +103,7 @@ static void resolveLibrary()
|
||||
if (!lib.load())
|
||||
#endif
|
||||
{
|
||||
- lib.setFileName(QLatin1String("resolv"));
|
||||
+ lib.setFileName(QLatin1String("@glibc@/lib/libresolv"));
|
||||
if (!lib.load())
|
||||
return;
|
||||
}
|
||||
--
|
||||
2.1.3
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From 6aaf6858bf817172a4c503158e1701c4837ee790 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Mon, 1 Dec 2014 17:23:08 -0600
|
||||
Subject: [PATCH] dlopen-gl
|
||||
|
||||
---
|
||||
qtbase/src/plugins/platforms/xcb/qglxintegration.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp b/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp
|
||||
index 67235e0..2220a2e 100644
|
||||
--- a/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp
|
||||
+++ b/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp
|
||||
@@ -434,7 +434,7 @@ void (*QGLXContext::getProcAddress(const QByteArray &procName)) ()
|
||||
{
|
||||
extern const QString qt_gl_library_name();
|
||||
// QLibrary lib(qt_gl_library_name());
|
||||
- QLibrary lib(QLatin1String("GL"));
|
||||
+ QLibrary lib(QLatin1String("@openglDriver@/lib/libGL"));
|
||||
glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB");
|
||||
}
|
||||
}
|
||||
--
|
||||
2.1.3
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
From 775fd74351faaabd45f6751618b28e2b05812d05 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Mon, 1 Dec 2014 17:23:22 -0600
|
||||
Subject: [PATCH] tzdir
|
||||
|
||||
---
|
||||
qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp | 21 +++++++++++++++------
|
||||
1 file changed, 15 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp b/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp
|
||||
index b4ea91e..a56a245 100644
|
||||
--- a/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp
|
||||
+++ b/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp
|
||||
@@ -68,7 +68,10 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash;
|
||||
// Parse zone.tab table, assume lists all installed zones, if not will need to read directories
|
||||
static QTzTimeZoneHash loadTzTimeZones()
|
||||
{
|
||||
- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
|
||||
+ QString path = qgetenv("TZDIR");
|
||||
+ path += "/zone.tab";
|
||||
+ if (!QFile::exists(path))
|
||||
+ path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
|
||||
if (!QFile::exists(path))
|
||||
path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");
|
||||
|
||||
@@ -559,12 +562,18 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId)
|
||||
if (!tzif.open(QIODevice::ReadOnly))
|
||||
return;
|
||||
} else {
|
||||
- // Open named tz, try modern path first, if fails try legacy path
|
||||
- tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId));
|
||||
+ // Try TZDIR first
|
||||
+ QString zoneinfoDir = qgetenv("TZDIR");
|
||||
+ zoneinfoDir += "/" + QString::fromLocal8Bit(ianaId);
|
||||
+ tzif.setFileName(zoneinfoDir);
|
||||
if (!tzif.open(QIODevice::ReadOnly)) {
|
||||
- tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId));
|
||||
- if (!tzif.open(QIODevice::ReadOnly))
|
||||
- return;
|
||||
+ // Open named tz, try modern path first, if fails try legacy path
|
||||
+ tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId));
|
||||
+ if (!tzif.open(QIODevice::ReadOnly)) {
|
||||
+ tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId));
|
||||
+ if (!tzif.open(QIODevice::ReadOnly))
|
||||
+ return;
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
2.1.3
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From 089db8835c80bf2b7dd91a97a5c6eb26636b6ab9 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Mon, 1 Dec 2014 17:26:39 -0600
|
||||
Subject: [PATCH] dlopen-webkit-gtk
|
||||
|
||||
---
|
||||
qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
|
||||
index 8de6521..0b25748 100644
|
||||
--- a/qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
|
||||
+++ b/qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
|
||||
@@ -53,7 +53,7 @@ static void messageHandler(QtMsgType type, const QMessageLogContext&, const QStr
|
||||
|
||||
static bool initializeGtk()
|
||||
{
|
||||
- QLibrary gtkLibrary(QLatin1String("libgtk-x11-2.0"), 0);
|
||||
+ QLibrary gtkLibrary(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0);
|
||||
if (!gtkLibrary.load())
|
||||
return false;
|
||||
typedef void* (*gtk_init_ptr)(void*, void*);
|
||||
--
|
||||
2.1.3
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
From 25d2922cce383fcaa4c138e0cc6c8d92328eeacb Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Mon, 1 Dec 2014 17:30:41 -0600
|
||||
Subject: [PATCH] dlopen-webkit-udev
|
||||
|
||||
---
|
||||
qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp b/qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp
|
||||
index 60ff317..da8ac69 100644
|
||||
--- a/qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp
|
||||
+++ b/qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp
|
||||
@@ -111,12 +111,12 @@ private:
|
||||
bool load()
|
||||
{
|
||||
m_libUdev.setLoadHints(QLibrary::ResolveAllSymbolsHint);
|
||||
- m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 1);
|
||||
+ m_libUdev.setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 1);
|
||||
m_loaded = m_libUdev.load();
|
||||
if (resolveMethods())
|
||||
return true;
|
||||
|
||||
- m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 0);
|
||||
+ m_libUdev.setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 0);
|
||||
m_loaded = m_libUdev.load();
|
||||
return resolveMethods();
|
||||
}
|
||||
--
|
||||
2.1.3
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
From 17c7257e54c00ea2121f2cf95fb2be5e5db6b4ad Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Mon, 1 Dec 2014 17:31:03 -0600
|
||||
Subject: [PATCH] dlopen-serialport-udev
|
||||
|
||||
---
|
||||
qtserialport/src/serialport/qtudev_p.h | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/qtserialport/src/serialport/qtudev_p.h b/qtserialport/src/serialport/qtudev_p.h
|
||||
index 09940ab..45460f9 100644
|
||||
--- a/qtserialport/src/serialport/qtudev_p.h
|
||||
+++ b/qtserialport/src/serialport/qtudev_p.h
|
||||
@@ -119,9 +119,9 @@ inline void *resolveSymbol(QLibrary *udevLibrary, const char *symbolName)
|
||||
inline bool resolveSymbols(QLibrary *udevLibrary)
|
||||
{
|
||||
if (!udevLibrary->isLoaded()) {
|
||||
- udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1);
|
||||
+ udevLibrary->setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 1);
|
||||
if (!udevLibrary->load()) {
|
||||
- udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0);
|
||||
+ udevLibrary->setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 0);
|
||||
if (!udevLibrary->load()) {
|
||||
qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0);
|
||||
return false;
|
||||
--
|
||||
2.1.3
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
From b56e3737ca97e3de664603976989da4419297eb3 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Mon, 1 Dec 2014 17:33:51 -0600
|
||||
Subject: [PATCH] dlopen-libXcursor
|
||||
|
||||
---
|
||||
qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp b/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
|
||||
index 6dbac90..4b23fc2 100644
|
||||
--- a/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
|
||||
+++ b/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
|
||||
@@ -305,10 +305,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen)
|
||||
#ifdef XCB_USE_XLIB
|
||||
static bool function_ptrs_not_initialized = true;
|
||||
if (function_ptrs_not_initialized) {
|
||||
- QLibrary xcursorLib(QLatin1String("Xcursor"), 1);
|
||||
+ QLibrary xcursorLib(QLatin1String("@libXcursor@/lib/libXcursor"), 1);
|
||||
bool xcursorFound = xcursorLib.load();
|
||||
if (!xcursorFound) { // try without the version number
|
||||
- xcursorLib.setFileName(QLatin1String("Xcursor"));
|
||||
+ xcursorLib.setFileName(QLatin1String("@libXcursor@/lib/Xcursor"));
|
||||
xcursorFound = xcursorLib.load();
|
||||
}
|
||||
if (xcursorFound) {
|
||||
--
|
||||
2.1.3
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user