diff --git a/doc/haskell-users-guide.xml b/doc/haskell-users-guide.xml
index 87c8e1b92dd..2f3b1eabb11 100644
--- a/doc/haskell-users-guide.xml
+++ b/doc/haskell-users-guide.xml
@@ -354,6 +354,90 @@ if [ -e ~/.nix-profile/bin/ghc ]; then
fi
+
+ How to install a compiler with libraries, hoogle and documentation indexes
+
+ If you plan to use your environment for interactive programming,
+ not just compiling random Haskell code, you might want to
+ replace ghcWithPackages in all the listings
+ above with ghcWithHoogle.
+
+
+ This environment generator not only produces an environment with
+ GHC and all the specified libraries, but also generates a
+ hoogle and haddock indexes
+ for all the packages, and provides a wrapper script around
+ hoogle binary that uses all those things. A
+ precise name for this thing would be
+ "ghcWithPackagesAndHoogleAndDocumentationIndexes",
+ which is, regrettably, too long and scary.
+
+
+ For example, installing the following environment
+
+
+{
+ packageOverrides = super: let self = super.pkgs; in
+ {
+ myHaskellEnv = self.haskellPackages.ghcWithHoogle
+ (haskellPackages: with haskellPackages; [
+ # libraries
+ arrows async cgi criterion
+ # tools
+ cabal-install haskintex
+ ]);
+ };
+}
+
+
+ allows one to browse module documentation index not
+ too dissimilar to this for all the specified packages and
+ their dependencies by directing a browser of choice to
+ ~/.nix-profiles/share/doc/hoogle/index.html
+ (or
+ /run/current-system/sw/share/doc/hoogle/index.html
+ in case you put it in
+ environment.systemPackages in NixOS).
+
+
+ After you've marveled enough at that try adding the following to
+ your ~/.ghc/ghci.conf
+
+
+:def hoogle \s -> return $ ":! hoogle search -cl --count=15 \"" ++ s ++ "\""
+:def doc \s -> return $ ":! hoogle search -cl --info \"" ++ s ++ "\""
+
+
+ and test it by typing into ghci:
+
+
+:hoogle a -> a
+:doc a -> a
+
+
+ Be sure to note the links to haddock files in
+ the output. With any modern and properly configured terminal
+ emulator you can just click those links to navigate there.
+
+
+ Finally, you can run
+
+
+hoogle server -p 8080
+
+
+ and navigate to for
+ your own local Hoogle.
+ Note, however, that Firefox and possibly other browsers disallow
+ navigation from http: to
+ file: URIs for security reasons, which might
+ be quite an inconvenience. See this
+ page for workarounds.
+
+
How to create ad hoc environments for
<literal>nix-shell</literal>
diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index 2300ee9c000..5aad76e75e4 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -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 ]; }
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 86f488993ed..78de8ca2c44 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -90,6 +90,7 @@
emery = "Emery Hemingway ";
epitrochoid = "Mabry Cervin ";
ericbmerritt = "Eric Merritt ";
+ erikryb = "Erik Rybakken ";
ertes = "Ertugrul Söylemez ";
exlevan = "Alexey Levan ";
falsifian = "James Cook ";
diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index 2781cee3614..6d9f9412b62 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -23,5 +23,17 @@
wmii-hg package.
+
+ 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:
+ ];
+ }
+ ]]>
+
+ Will include the gitit service configuration options.
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 195d22f455c..b0e9ceea10b 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -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
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 82e0cdc6926..b03f4494522 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -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
diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix
index 8e9e761b609..befd8c628f1 100644
--- a/nixos/modules/services/misc/gitit.nix
+++ b/nixos/modules/services/misc/gitit.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";
diff --git a/nixos/modules/services/search/kibana.nix b/nixos/modules/services/search/kibana.nix
new file mode 100644
index 00000000000..f47ab8f5586
--- /dev/null
+++ b/nixos/modules/services/search/kibana.nix
@@ -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;
+ };
+ };
+}
diff --git a/nixos/modules/services/security/physlock.nix b/nixos/modules/services/security/physlock.nix
new file mode 100644
index 00000000000..34d0be3b1be
--- /dev/null
+++ b/nixos/modules/services/security/physlock.nix
@@ -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 physlock screen locking mechanism.
+
+ Enable this and then run systemctl start physlock
+ to securely lock the screen.
+
+ This will switch to a new virtual terminal, turn off console
+ switching and disable SysRq mechanism (when
+ is set)
+ until the root or
+ 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 ~/.xsession 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}"}
+ '';
+ };
+
+ };
+
+}
diff --git a/pkgs/applications/audio/beast/default.nix b/pkgs/applications/audio/beast/default.nix
index 3997855a75b..7113a169e80 100644
--- a/pkgs/applications/audio/beast/default.nix
+++ b/pkgs/applications/audio/beast/default.nix
@@ -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";
};
diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix
index 4ded807cb29..e5c49846b23 100644
--- a/pkgs/applications/graphics/djview/default.nix
+++ b/pkgs/applications/graphics/djview/default.nix
@@ -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 ];
+ };
}
diff --git a/pkgs/applications/graphics/djview/djview4-qt-4.8.patch b/pkgs/applications/graphics/djview/djview4-qt-4.8.patch
deleted file mode 100644
index ce3694197f6..00000000000
--- a/pkgs/applications/graphics/djview/djview4-qt-4.8.patch
+++ /dev/null
@@ -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 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);
- if (l < h) {
-- swap(v[l],v[h]);
-+ myswap(v[l],v[h]);
- goto loop;
- }
- /* Finish up */
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index 12dbbe6a9aa..e1807b3aff9 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -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 ];
diff --git a/pkgs/applications/misc/vit/default.nix b/pkgs/applications/misc/vit/default.nix
new file mode 100644
index 00000000000..d8dea641c3a
--- /dev/null
+++ b/pkgs/applications/misc/vit/default.nix
@@ -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;
+ };
+}
+
diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix
index 1caa78d580d..2c47e1c9805 100644
--- a/pkgs/applications/misc/xterm/default.nix
+++ b/pkgs/applications/misc/xterm/default.nix
@@ -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 =
diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix
index 732568291d3..965c7885416 100644
--- a/pkgs/applications/networking/browsers/chromium/source/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/default.nix
@@ -74,8 +74,6 @@ in stdenv.mkDerivation {
cat $opensslPatches | patch -p1 -d "$bundled/openssl/openssl"
'';
- preferLocalBuild = true;
-
passthru = {
inherit version channel;
plugins = fetchurl binary;
diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index f57f48e357a..51b5df176cc 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -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 = [
diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index 1a9f8f8feab..ac4776c2072 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -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 ];
diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix
index c1944cf6d0d..4cc54b9f812 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@@ -54,6 +54,8 @@ in with stdenv; mkDerivation rec {
])
);
+ NIX_CFLAGS_COMPILE = "-fPIC";
+
cmakeFlags = [
"-DEMBED_DATA=OFF"
"-DSTATIC=OFF" ]
diff --git a/pkgs/applications/networking/linssid/0001-unbundled-qwt.patch b/pkgs/applications/networking/linssid/0001-unbundled-qwt.patch
new file mode 100644
index 00000000000..46224ede33d
--- /dev/null
+++ b/pkgs/applications/networking/linssid/0001-unbundled-qwt.patch
@@ -0,0 +1,43 @@
+From e57f22a5089f194013534c9a9bbc42ee639297f1 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel
+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
+
diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix
index 2b4c5f564be..369010f41b5 100644
--- a/pkgs/applications/networking/linssid/default.nix
+++ b/pkgs/applications/networking/linssid/default.nix
@@ -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";
diff --git a/pkgs/applications/networking/p2p/retroshare/0.6.nix b/pkgs/applications/networking/p2p/retroshare/0.6.nix
index 6ea7089b3fb..855ebdd0593 100644
--- a/pkgs/applications/networking/p2p/retroshare/0.6.nix
+++ b/pkgs/applications/networking/p2p/retroshare/0.6.nix
@@ -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
diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
index 01ba9ff47ea..5d76b295dda 100644
--- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
+++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
@@ -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;
diff --git a/pkgs/applications/science/math/perseus/default.nix b/pkgs/applications/science/math/perseus/default.nix
new file mode 100644
index 00000000000..94029a04349
--- /dev/null
+++ b/pkgs/applications/science/math/perseus/default.nix
@@ -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;
+ };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index adf8027bf27..12ca1434466 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -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 {
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index ceedf313f28..22d46257075 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -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
}
diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix
new file mode 100644
index 00000000000..a231d3b93c1
--- /dev/null
+++ b/pkgs/data/fonts/noto-fonts/default.nix
@@ -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 ];
+ };
+ };
+}
\ No newline at end of file
diff --git a/pkgs/data/fonts/source-han-sans/default.nix b/pkgs/data/fonts/source-han-sans/default.nix
index 9e0bf750571..2fb4787774f 100644
--- a/pkgs/data/fonts/source-han-sans/default.nix
+++ b/pkgs/data/fonts/source-han-sans/default.nix
@@ -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";
};
}
diff --git a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
index b0958d232fc..7d5447ae52a 100644
--- a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
+++ b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
@@ -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 = ''
diff --git a/pkgs/desktops/xfce/core/exo.nix b/pkgs/desktops/xfce/core/exo.nix
index f48a3e3808b..83610a4e4a6 100644
--- a/pkgs/desktops/xfce/core/exo.nix
+++ b/pkgs/desktops/xfce/core/exo.nix
@@ -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;
};
}
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 459158a136a..f2a9f848342 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -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;
};
diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix
index 70ba2b6fd06..710ddec9c10 100644
--- a/pkgs/development/compilers/julia/0.3.nix
+++ b/pkgs/development/compilers/julia/0.3.nix
@@ -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" ];
};
}
diff --git a/pkgs/development/compilers/llvm/3.3/llvm.nix b/pkgs/development/compilers/llvm/3.3/llvm.nix
index d0f8fcb3bf8..8dca8b43bc2 100644
--- a/pkgs/development/compilers/llvm/3.3/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.3/llvm.nix
@@ -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 ];
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 80cf5ebd478..9f7a18fa2da 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -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 .
+ 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;
+
}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index db3cb7bd3ce..c685f310393 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -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;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index 3579c697ada..e5f5d3c953a 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -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;
+
}
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 249ef06b650..1c9ec499717 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -30,14 +30,11 @@ core-packages:
- xhtml-3000.2.1
default-package-overrides:
- - cabal-helper < 0.6.0.0 # newer versions break ghc-mod
extra-packages:
- aeson < 0.8 # newer versions don't work with GHC 6.12.3
- Cabal == 1.18.* # required for cabal-install et al on old GHC versions
- Cabal == 1.20.* # required for cabal-install et al on old GHC versions
- - cabal-install == 1.18.* # required for ghc-mod on 7.8.x
- - conduit < 1.2.4.2 # newer versions trigger non-deterministic ID bugs in GHC versions prior to 7.10.x
- containers < 0.5 # required to build alex with GHC 6.12.3
- control-monad-free <