Merge branch 'master' into staging

Conflicts (simple):
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Vladimír Čunát 2015-02-04 22:00:07 +01:00
commit 4495d06a7f
188 changed files with 3966 additions and 8747 deletions

View file

@ -35,6 +35,7 @@
bluescreen303 = "Mathijs Kwik <mathijs@bluescreen303.nl>";
bobvanderlinden = "Bob van der Linden <bobvanderlinden@gmail.com>";
bodil = "Bodil Stokke <nix@bodil.org>";
boothead = "Ben Ford <ben@perurbis.com>";
bosu = "Boris Sukholitko <boriss@gmail.com>";
calrama = "Moritz Maxeiner <moritz@ucworks.org>";
campadrenalin = "Philip Horger <campadrenalin@gmail.com>";
@ -147,6 +148,7 @@
redbaron = "Maxim Ivanov <ivanov.maxim@gmail.com>";
refnil = "Martin Lavoie <broemartino@gmail.com>";
relrod = "Ricky Elrod <ricky@elrod.me>";
renzo = "Renzo Carbonara <renzocarbonara@gmail.com>";
rickynils = "Rickard Nilsson <rickynils@gmail.com>";
rob = "Rob Vermaas <rob.vermaas@gmail.com>";
robberer = "Longrin Wischnewski <robberer@freakmail.de>";

View file

@ -204,7 +204,7 @@ with lib;
${optionalString (fontconfig.dpi != 0) ''
<match target="pattern">
<edit name="dpi" mode="assign">
<double>${fontconfig.dpi}</double>
<double>${toString fontconfig.dpi}</double>
</edit>
</match>
''}

View file

@ -189,6 +189,7 @@
./services/misc/nix-gc.nix
./services/misc/nixos-manual.nix
./services/misc/nix-ssh-serve.nix
./services/misc/parsoid.nix
./services/misc/phd.nix
./services/misc/redmine.nix
./services/misc/rippled.nix

View file

@ -61,7 +61,7 @@ let
--set GITLAB_SHELL_SECRET_PATH "${cfg.stateDir}/config/gitlab_shell_secret"\
--set GITLAB_HOST "${cfg.host}"\
--set GITLAB_PORT "${toString cfg.port}"\
--set GITLAB_BACKUP_PATH"${cfg.backupPath}"\
--set GITLAB_BACKUP_PATH "${cfg.backupPath}"\
--set RAILS_ENV "production"
'';
};

View file

@ -0,0 +1,100 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.parsoid;
conf = ''
exports.setup = function( parsoidConfig ) {
${toString (mapAttrsToList (name: str: "parsoidConfig.setInterwiki('${name}', '${str}');") cfg.interwikis)}
parsoidConfig.serverInterface = "${cfg.interface}";
parsoidConfig.serverPort = ${toString cfg.port};
parsoidConfig.useSelser = true;
${cfg.extraConfig}
};
'';
confFile = builtins.toFile "localsettings.js" conf;
in
{
##### interface
options = {
services.parsoid = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable Parsoid -- bidirectional
wikitext parser.
'';
};
interwikis = mkOption {
type = types.attrsOf types.str;
example = { localhost = "http://localhost/api.php"; };
description = ''
Used MediaWiki API endpoints.
'';
};
workers = mkOption {
type = types.int;
default = 2;
description = ''
Number of Parsoid workers.
'';
};
interface = mkOption {
type = types.str;
default = "127.0.0.1";
description = ''
Interface to listen on.
'';
};
port = mkOption {
type = types.int;
default = 8000;
description = ''
Port to listen on.
'';
};
extraConfig = mkOption {
type = types.lines;
default = "";
description = ''
Extra configuration to add to parsoid configuration.
'';
};
};
};
##### implementation
config = mkIf cfg.enable {
systemd.services.parsoid = {
description = "Bidirectional wikitext parser";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
serviceConfig = {
ExecStart = "${pkgs.nodePackages.parsoid}/lib/node_modules/parsoid/api/server.js -c ${confFile} -n ${toString cfg.workers}";
};
};
};
}

View file

@ -39,13 +39,14 @@ in
}
];
jobs.sabnzbd =
systemd.services.sabnzbd =
{ description = "sabnzbd server";
startOn = "started network-interfaces";
stopOn = "stopping network-interfaces";
exec = "${sabnzbd}/bin/sabnzbd -d -f ${cfg.configFile}";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
serviceConfig = {
Type = "forking";
ExecStart = "${sabnzbd}/bin/sabnzbd -d -f ${cfg.configFile}";
};
};
};

View file

@ -9,16 +9,18 @@ with lib;
options = {
services.tftpd.enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable the anonymous FTP user.
Whether to enable tftpd, a Trivial File Transfer Protocol server.
'';
};
services.tftpd.path = mkOption {
type = types.path;
default = "/home/tftp";
description = ''
Where the tftp server files are stored
Where the tftp server files are stored.
'';
};

View file

@ -25,7 +25,7 @@ let
fontconfig = config.fonts.fontconfig;
xresourcesXft = pkgs.writeText "Xresources-Xft" ''
${optionalString (fontconfig.dpi != 0) ''Xft.dpi: ${fontconfig.dpi}''}
${optionalString (fontconfig.dpi != 0) ''Xft.dpi: ${toString fontconfig.dpi}''}
Xft.antialias: ${if fontconfig.antialias then "1" else "0"}
Xft.rgba: ${fontconfig.subpixel.rgba}
Xft.lcdfilter: lcd${fontconfig.subpixel.lcdfilter}

View file

@ -3,11 +3,12 @@
let
inherit (lib) mkOption mkIf optionals literalExample;
cfg = config.services.xserver.windowManager.xmonad;
xmonadEnv = cfg.haskellPackages.ghcWithPackages(self: [
self.xmonad
] ++ optionals cfg.enableContribAndExtras [ self.xmonadContrib self.xmonadExtras]
++ optionals (cfg.extraPackages != null) (cfg.extraPackages self));
xmessage = pkgs.xlibs.xmessage;
xmonad = pkgs.xmonad-with-packages.override {
ghcWithPackages = cfg.haskellPackages.ghcWithPackages;
packages = self: cfg.extraPackages self ++
optionals cfg.enableContribAndExtras
[ self.xmonad-contrib self.xmonad-extras ];
};
in
{
options = {
@ -19,9 +20,9 @@ in
};
haskellPackages = mkOption {
default = pkgs.haskellPackages;
defaultText = "pkgs.haskellPackages";
example = literalExample "pkgs.haskellPackages_ghc701";
default = pkgs.haskellngPackages;
defaultText = "pkgs.haskellngPackages";
example = literalExample "pkgs.haskell-ng.packages.ghc784";
description = ''
haskellPackages used to build Xmonad and other packages.
This can be used to change the GHC version used to build
@ -31,17 +32,17 @@ in
};
extraPackages = mkOption {
default = null;
default = self: [];
example = literalExample ''
haskellPackages: [
haskellPackages.xmonadContrib
haskellPackages.monadLogger
haskellPackages.xmonad-contrib
haskellPackages.monad-logger
]
'';
description = ''
Extra packages available to ghc when rebuilding Xmonad. The
value must be a function which receives the attrset defined
in <varname>haskellpackages</varname> as the sole argument.
in <varname>haskellPackages</varname> as the sole argument.
'';
};
@ -58,12 +59,12 @@ in
session = [{
name = "xmonad";
start = ''
XMONAD_GHC=${xmonadEnv}/bin/ghc XMONAD_XMESSAGE=${xmessage}/bin/xmessage xmonad &
${xmonad}/bin/xmonad &
waitPID=$!
'';
}];
};
environment.systemPackages = [ cfg.haskellPackages.xmonad ];
environment.systemPackages = [ xmonad ];
};
}

View file

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, libav, libkeyfinder }:
let version = "20150130"; in
stdenv.mkDerivation rec {
version = "20150125";
name = "keyfinder-cli-${version}";
src = fetchFromGitHub {
repo = "keyfinder-cli";
owner = "EvanPurkhiser";
rev = "3a6f598b3661fdba73ada81cd200a6e56c23ddca";
sha256 = "05k4g9zdzi4q81p8lax9b2j4bcg1bpp04sdbza5i5pfz2fng2cf7";
rev = "e8a20e73f8a465a6c3c9e71dabf4b636244a9b0c";
sha256 = "0x198ijr6wgzq24642s4pz5zxn4gvcc7dxmb6d1bfn3dwzi3j8lp";
};
meta = with stdenv.lib; {

View file

@ -1,10 +1,11 @@
{ stdenv, fetchurl, libmikmod, ncurses }:
stdenv.mkDerivation rec {
name = "mikmod-3.2.2";
name = "mikmod-3.2.6";
src = fetchurl {
url = "http://mikmod.shlomifish.org/files/${name}.tar.gz";
sha256 = "105vl1kyah588wpbpq6ck1wlr0jj55l2ps72q5i01gs9px8ncmp8";
url = "http://downloads.sourceforge.net/project/mikmod/mikmod/3.2.6/mikmod-3.2.6.tar.gz";
sha256 = "0wr61raj10rpl64mk3x9g3rwys898fbzyg93c6mrz89nvc74wm04";
};
buildInputs = [ libmikmod ncurses ];

View file

@ -0,0 +1,26 @@
{ stdenv, fetchzip, autoconf, automake, intltool, pkgconfig, ffmpeg, wxGTK }:
stdenv.mkDerivation rec {
name = "spek-${version}";
version = "0.8.3";
src = fetchzip {
name = "${name}-src";
url = "https://github.com/alexkay/spek/archive/v${version}.tar.gz";
sha256 = "0y4hlhswpqkqpsglrhg5xbfy1a6f9fvasgdf336vhwcjqsc3k2xv";
};
buildInputs = [ autoconf automake intltool pkgconfig ffmpeg wxGTK ];
preConfigure = ''
./autogen.sh
'';
meta = with stdenv.lib; {
description = "Analyse your audio files by showing their spectrogram";
homepage = http://spek.cc/;
license = licenses.gpl3;
platforms = platforms.all;
maintainers = [ maintainers.bjornfor ];
};
}

View file

@ -202,50 +202,50 @@ in
android-studio = buildAndroidStudio rec {
name = "android-studio-${version}";
version = "1.0.2";
build = "135.1653844";
version = "1.1.0b2";
build = "135.1711524";
description = "Android development environment based on IntelliJ IDEA";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://dl.google.com/dl/android/studio/ide-zips/${version}" +
"/android-studio-ide-${build}-linux.zip";
sha256 = "0y20gp5444c2lwyzhlppjpkb657qbgpskj31lwyfhx6xyqy83159";
sha256 = "0pkmyk7ipd4bfbryhanak5mq3x8ix1yv4czx8yi9vdpa34b6pnkw";
};
};
clion = buildClion rec {
name = "clion";
version = "eap";
build = "140.1221.2";
build = "140.1740.3";
description = "C/C++ IDE. New. Intelligent. Cross-platform.";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "http://download.jetbrains.com/cpp/${name}-${build}.tar.gz";
sha256 = "0gf809plnw89dgn47j6hsh5nv0bpdynjnl1rg8wv7jaz2zx9bqcg";
sha256 = "1hpsq37hq61id836wg5j6l3xapln6qdkqa10r3ig2p1rs2hq7i9y";
};
};
idea-community = buildIdea rec {
name = "idea-community-${version}";
version = "14.0.2";
build = "IC-139.659";
version = "14.0.3";
build = "IC-139.1117";
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "http://download-ln.jetbrains.com/idea/ideaIC-${version}.tar.gz";
sha256 = "0g8f66bdxdmsbv2r1jc308by5ca92ifczprf0gwy5bs2xsvxxwlf";
sha256 = "01wcpzdahkh3li2l3k2bgirnlp7hdxk9y1kyrxc3d9d1nazq8wqn";
};
};
idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
version = "14.0.2";
build = "IU-139.659";
version = "14.0.3";
build = "IU-139.1117";
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "http://download-ln.jetbrains.com/idea/ideaIU-${version}.tar.gz";
sha256 = "0swd3lyrlcdlsgp350sa741bkmndlck1ss429f9faf3hm4s2y0k5";
sha256 = "1zkqigdh9l1f3mjjvxsp7b7vc93v5ylvxa1dfpclzmfbzna7h69s";
};
};

View file

@ -31,10 +31,6 @@ let inherit (args.composableDerivation) composableDerivation edf;
'';
in
composableDerivation {
# use gccApple to compile on darwin
mkDerivation = ( if stdenv.isDarwin
then stdenvAdapters.overrideCC stdenv gccApple
else stdenv ).mkDerivation;
} (fix: {
name = "vim_configurable-7.4.516";

View file

@ -6,10 +6,6 @@ in
let inherit (args.composableDerivation) composableDerivation edf; in
composableDerivation {
# use gccApple to compile on darwin
mkDerivation = ( if stdenv.isDarwin
then stdenvAdapters.overrideCC stdenv gccApple
else stdenv ).mkDerivation;
} (fix: {
name = "qvim-7.4." + tag;

View file

@ -12,13 +12,15 @@
# make a copy of this directory first. After copying, be sure to delete ./tmp
# if it exists. Then follow the minor update instructions.
{ autonix, kde4, kf55, pkgs, qt4, stdenv, debug ? false }:
{ autonix, kde4, kf5, pkgs, qt4, stdenv, debug ? false }:
with stdenv.lib; with autonix;
let kf5Orig = kf5; in
let
kf5 = kf55.override { inherit debug; };
kf5 = kf5Orig.override { inherit debug; };
mirror = "mirror://kde";
@ -114,9 +116,14 @@ let
}
);
qt5Only = tgt:
let qt4Deps = [ "KDE4" "Phonon" ];
in mapAttrs (name: if name == tgt then removePkgDeps qt4Deps else id);
preResolve = super:
fold (f: x: f x) super
[
(qt5Only "kmix")
(userEnvPkg "SharedMimeInfo")
(userEnvPkg "SharedDesktopOntologies")
(blacklist ["artikulate"]) # build failure, wrong boost?

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeWrapper, cmake, qt4, perl, shared_mime_info, libvorbis, taglib
, flac, libsamplerate, libdvdread, lame, libsndfile, libmad, gettext
, transcode, cdrdao, dvdplusrwtools, vcdimager, cdparanoia
, transcode, cdrdao, cdrtools, dvdplusrwtools, vcdimager, cdparanoia
, kdelibs, kdemultimedia, automoc4, phonon, libkcddb ? null
}:
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
# at runtime, k3b needs the executables cdrdao, cdrecord, dvd+rw-format,
# eMovix, growisofs, mkisofs, normalize, readcd, transcode, vcdxbuild,
# vcdxminfo, and vcdxrip
propagatedUserEnvPkgs = [ transcode dvdplusrwtools cdrdao vcdimager ];
propagatedUserEnvPkgs = [ cdrdao cdrtools dvdplusrwtools transcode vcdimager ];
postInstall = ''
wrapProgram $out/bin/k3b \

View file

@ -5,10 +5,10 @@ let
s = # Generated upstream information
rec {
baseName="qpdfview";
version = "0.4.13";
version = "0.4.14beta1";
name="${baseName}-${version}";
url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz";
sha256 = "0hcfy9wrgs6vygmq790rqipw2132br3av3nhzrm4gpxlbw2n7xcg";
sha256 = "0ly0xqpgmd1ccsyqs6z0i3w1g4y3ichmibd809bjy344h6fb0m3b";
};
buildInputs = [
qt4 popplerQt4 pkgconfig djvulibre libspectre cups file ghostscript

View file

@ -11,9 +11,11 @@ stdenv.mkDerivation rec {
buildInputs = [ libotr pidgin intltool ];
meta = {
meta = with stdenv.lib; {
homepage = http://www.cypherpunks.ca/otr;
description = "Plugin for Pidgin 2.x which implements OTR Messaging";
license = stdenv.lib.licenses.gpl2;
license = licenses.gpl2;
platforms = platforms.linux;
maintainters = with maintainers; [ abbradar ];
};
}

View file

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "owncloud-client" + "-" + version;
version = "1.7.0";
version = "1.7.1";
src = fetchurl {
url = "https://download.owncloud.com/desktop/stable/mirall-${version}.tar.bz2";
sha256 = "b1cb0612e5022de263dc4c6309eba8207d694a40a80dae6762b4a56fa8d4d944";
sha256 = "0n9gv97jqval7xjyix2lkywvmvvfv052s0bd1i8kybdl9rwca6yf";
};
buildInputs =

View file

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
name = "transmission-" + optionalString enableGTK3 "gtk-" + version;
src = fetchurl {
url = "http://download.transmissionbt.com/files/transmission-${version}.tar.xz";
url = "https://transmission.cachefly.net/transmission-${version}.tar.xz";
sha256 = "1sxr1magqb5s26yvr5yhs1f7bmir8gl09niafg64lhgfnhv1kz59";
};

View file

@ -10,22 +10,22 @@
, bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which
, icu, boost, jdk, ant, cups, xorg
, openssl, gperf, cppunit, GConf, ORBit2, poppler
, librsvg, gnome_vfs, gstreamer, gst_plugins_base, mesa
, librsvg, gnome_vfs, mesa
, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
, libwpg, dbus_glib, glibc, qt4, kde4, clucene_core, libcdr, lcms, vigra
, unixODBC, mdds, saneBackends, mythes, libexttextcat, libvisio
, fontsConf, pkgconfig, libzip, bluez5, libtool, maven
, libatomic_ops, graphite2, harfbuzz
, librevenge, libe-book, libmwaw, glm, glew
, libatomic_ops, graphite2, harfbuzz, libodfgen
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" ]
}:
let
langsSpaces = stdenv.lib.concatStringsSep " " langs;
major = "4";
minor = "3";
patch = "5";
tweak = "2";
minor = "4";
patch = "0";
tweak = "3";
subdir = "${major}.${minor}.${patch}";
version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
@ -80,14 +80,14 @@ let
translations = fetchSrc {
name = "translations";
sha256 = "0xqvfmfab0hq3hcq76hs7ybv32i02lzl8xghilbjf12k1wgqy96c";
sha256 = "0y94sry2cghc82628smka7qb1xqlgrgvy98bxd2fpqfkd1llcqfg";
};
# TODO: dictionaries
help = fetchSrc {
name = "help";
sha256 = "14kdhd9pjy0a7dkyx03a73m5iy3qr3ki2xqkinhml24f3n9qddbq";
sha256 = "05al25vcz2z6fhm8vx77wa47nyi3r0hwll6mg2aclx7yp0s5k01d";
};
};
@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
sha256 = "0dr6xzdnnyhhysayz1yhnmv0l3c14kpnlhwd5h66qyzkd4d85rkq";
sha256 = "1xqc60ckay6xpljipcbm4915qqwk81dm2fbpxwfqc2l4gv9g6s6i";
};
# Openoffice will open libcups dynamically, so we link it directly
@ -211,13 +211,12 @@ stdenv.mkDerivation rec {
# Modified on every upgrade, though
"--disable-kde"
"--disable-postgresql-sdbc"
"--with-package-format=native"
"--with-package-format=installed"
"--enable-epm"
"--with-jdk-home=${jdk.home}"
"--with-ant-home=${ant}/lib/ant"
"--without-fonts"
"--without-myspell-dicts"
"--without-ppds"
"--without-system-beanshell"
"--without-system-hsqldb"
"--without-system-jars"
@ -228,11 +227,14 @@ stdenv.mkDerivation rec {
"--without-system-libetonyek"
"--without-system-libfreehand"
"--without-system-libodfgen"
"--without-system-libabw"
"--without-system-firebird"
"--without-system-liblangtag"
"--without-system-libmspub"
"--without-system-libpagemaker"
"--without-system-coinmp"
"--without-system-libgltf"
];
checkPhase = ''
@ -243,17 +245,18 @@ stdenv.mkDerivation rec {
buildInputs = with xorg;
[ ant ArchiveZip autoconf automake bison boost cairo clucene_core
CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig
freetype GConf getopt gnome_vfs gperf gst_plugins_base gstreamer gtk
freetype GConf getopt gnome_vfs gperf gtk
hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat unixODBC libjpeg
libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
libXaw libXext libXi libXinerama libxml2 libxslt libXtst
libXdmcp libpthreadstubs mesa mythes
libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer
gst_all_1.gst-plugins-base
neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler
python3 sablotron saneBackends tcsh unzip vigra which zip zlib
mdds bluez5 glibc libixion
libxshmfence libatomic_ops graphite2 harfbuzz
librevenge libe-book libmwaw glm glew
liborcus
liborcus libodfgen
];
meta = with stdenv.lib; {

View file

@ -1,7 +1,7 @@
[
{
name = "libabw-0.1.0.tar.bz2";
md5 = "9317e967c8fa8ff50e049744c4b33c87";
name = "libabw-0.1.1.tar.bz2";
md5 = "7a3815b506d064313ba309617b6f5a0b";
brief = true;
}
{
@ -34,6 +34,16 @@
md5 = "e8e197d628436490886d17cffa108fe3";
brief = false;
}
{
name = "commons-httpclient-3.1-src.tar.gz";
md5 = "2c9b0f83ed5890af02c0df1c1776f39b";
brief = false;
}
{
name = "commons-logging-1.2-src.tar.gz";
md5 = "ce977548f1cbf46918e93cd38ac35163";
brief = true;
}
{
name = "apr-1.4.8.tar.gz";
md5 = "eff9d741b0999a9bbab96862dd2a2a3d";
@ -60,8 +70,8 @@
brief = false;
}
{
name = "libcdr-0.1.0.tar.bz2";
md5 = "0e2f56934c8872ec4a254cd4bb1d7cf6";
name = "libcdr-0.1.1.tar.bz2";
md5 = "b33fd0be3befdd1b37777e08ce058bd9";
brief = true;
}
{
@ -70,8 +80,8 @@
brief = false;
}
{
name = "libcmis-0.4.1.tar.gz";
md5 = "22f8a85daf4a012180322e1f52a7563b";
name = "libcmis-0.5.0.tar.gz";
md5 = "5821b806a98e6c38370970e682ce76e8";
brief = false;
}
{
@ -85,9 +95,9 @@
brief = false;
}
{
name = "cppunit-1.13.1.tar.gz";
md5 = "ac4781e01619be13461bb2d562b94a7b";
brief = false;
name = "cppunit-1.13.2.tar.gz";
md5 = "d1c6bdd5a76c66d2c38331e2d287bc01";
brief = true;
}
{
name = "ConvertTextToNumber-1.3.2.oxt";
@ -100,8 +110,8 @@
brief = true;
}
{
name = "libe-book-0.1.1.tar.bz2";
md5 = "c25a881d21abc5b4da19205db513cc22";
name = "libe-book-0.1.2.tar.bz2";
md5 = "6b48eda57914e6343efebc9381027b78";
brief = true;
}
{
@ -179,11 +189,6 @@
md5 = "0279a21fab6f245e85a6f85fea54f511";
brief = false;
}
{
name = "source-sans-font-1.036.tar.gz";
md5 = "1e9ddfe25ac9577da709d7b2ea36f939";
brief = false;
}
{
name = "source-sans-pro-2.010R-ro-1.065R-it.tar.gz";
md5 = "edc4d741888bc0d38e32dbaa17149596";
@ -225,13 +230,13 @@
brief = false;
}
{
name = "hunspell-1.3.2.tar.gz";
md5 = "3121aaf3e13e5d88dfff13fb4a5f1ab8";
name = "hunspell-1.3.3.tar.gz";
md5 = "4967da60b23413604c9e563beacc63b4";
brief = false;
}
{
name = "hyphen-2.8.4.tar.gz";
md5 = "a2f6010987e1c601274ab5d63b72c944";
name = "hyphen-2.8.8.tar.gz";
md5 = "5ade6ae2a99bc1e9e57031ca88d36dad";
brief = false;
}
{
@ -300,8 +305,13 @@
brief = true;
}
{
name = "language-subtag-registry-2014-04-10.tar.bz2";
md5 = "49c94710f7858b1969d74ff72e6aac84";
name = "libjpeg-turbo-1.3.1.tar.gz";
md5 = "2c3a68129dac443a72815ff5bb374b05";
brief = true;
}
{
name = "language-subtag-registry-2014-12-03.tar.bz2";
md5 = "0f2677ec23bb43ddc7355d1b4cc8ed45";
brief = true;
}
{
@ -325,13 +335,13 @@
brief = true;
}
{
name = "libexttextcat-3.4.3.tar.bz2";
md5 = "ae330b9493bd4503ac390106ff6060d7";
name = "libexttextcat-3.4.4.tar.bz2";
md5 = "10d61fbaa6a06348823651b1bd7940fe";
brief = false;
}
{
name = "libgltf-0.0.0.tar.bz2";
md5 = "ca5436e916bfe70694adfe2607782786";
name = "libgltf-0.0.2.tar.bz2";
md5 = "d63a9f47ab048f5009d90693d6aa6424";
brief = true;
subDir = "libgltf/";
}
@ -361,18 +371,18 @@
brief = false;
}
{
name = "mariadb-native-client-1.0.0.tar.bz2";
md5 = "05f84c95b610c21c5fd510d10debcabf";
name = "mariadb_client-2.0.0-src.tar.gz";
md5 = "a233181e03d3c307668b4c722d881661";
brief = false;
}
{
name = "mdds_0.10.3.tar.bz2";
md5 = "aa5ca9d1ed1082890835afab26400a39";
name = "mdds_0.11.2.tar.bz2";
md5 = "cb4207cb913c7a5a8bfa5b91234618ee";
brief = false;
}
{
name = "libmspub-0.1.1.tar.bz2";
md5 = "1d489c4932109e72495b1df8b69e5f11";
name = "libmspub-0.1.2.tar.bz2";
md5 = "ff9d0f9dd8fbc523408ea1953d5bde41";
brief = true;
}
{
@ -381,13 +391,13 @@
brief = true;
}
{
name = "mysql-connector-c++-1.1.0.tar.gz";
md5 = "0981bda6548a8c8233ffce2b6e4b2a23";
name = "mysql-connector-c++-1.1.4.tar.gz";
md5 = "7239a4430efd4d0189c4f24df67f08e5";
brief = false;
}
{
name = "mythes-1.2.3.tar.gz";
md5 = "46e92b68e31e858512b680b3b61dc4c1";
name = "mythes-1.2.4.tar.gz";
md5 = "a8c2c5b8f09e7ede322d5c602ff6a4b6";
brief = false;
}
{
@ -396,8 +406,8 @@
brief = false;
}
{
name = "nss-3.15.3-with-nspr-4.10.2.tar.gz";
md5 = "06beb053e257d9e22641339c905c6eba";
name = "nss-3.16.5-with-nspr-4.10.6.tar.gz";
md5 = "b279551b7638d0e36d1199548124c247";
brief = false;
}
{
@ -416,15 +426,20 @@
brief = false;
}
{
name = "openssl-1.0.1h.tar.gz";
md5 = "8d6d684a9430d5cc98a62a5d8fbda8cf";
brief = false;
name = "openssl-1.0.1j.tar.gz";
md5 = "f7175c9cd3c39bb1907ac8bba9df8ed3";
brief = true;
}
{
name = "liborcus-0.7.0.tar.bz2";
md5 = "7681383be6ce489d84c1c74f4e7f9643";
brief = false;
}
{
name = "libpagemaker-0.0.2.tar.bz2";
md5 = "795cc7a59ace4db2b12586971d668671";
brief = true;
}
{
name = "pixman-0.24.4.tar.bz2";
md5 = "c63f411b3ad147db2bcce1bf262a0e02";
@ -436,9 +451,9 @@
brief = true;
}
{
name = "poppler-0.22.5.tar.gz";
md5 = "1cd27460f7e3379d1eb109cfd7bcdb39";
brief = false;
name = "poppler-0.26.4.tar.gz";
md5 = "35c0660065d023365e9854c13e289d12";
brief = true;
}
{
name = "postgresql-9.2.1.tar.bz2";
@ -466,8 +481,8 @@
brief = false;
}
{
name = "librevenge-0.0.1.tar.bz2";
md5 = "69c367c6b0a360411965a1c409a0b6c1";
name = "librevenge-0.0.2.tar.bz2";
md5 = "2d4183bf17aea1a71842468a71a68c47";
brief = true;
}
{
@ -496,8 +511,8 @@
brief = false;
}
{
name = "libvisio-0.1.0.tar.bz2";
md5 = "931588332ba44682c9cd5eefbd358ab4";
name = "libvisio-0.1.1.tar.bz2";
md5 = "726c1f5be65eb7d649e0d48b63d920e7";
brief = true;
}
{
@ -511,8 +526,8 @@
brief = true;
}
{
name = "libwps-0.3.0.tar.bz2";
md5 = "d4d77d08b9048bae3b8ec8df11f80efd";
name = "libwps-0.3.1.tar.bz2";
md5 = "a111d9ef5a0dab564e9aec0f2cf8d218";
brief = true;
}
{
@ -526,8 +541,8 @@
brief = true;
}
{
name = "libgltf-0.0.2.tar.bz2";
md5 = "d63a9f47ab048f5009d90693d6aa6424";
name = "libgltf-0.0.0.tar.bz2";
md5 = "ca5436e916bfe70694adfe2607782786";
brief = true;
subDir = "libgltf/";
}

View file

@ -22,7 +22,7 @@ let
else "8db101b26dd2978e991421260a2e55d849014f64005930b2528080bbbaa78600";
deps = [
gcc.gcc
gcc.cc
qt4
xlibs.libX11
zlib

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, python2, perl
{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, perl, python3
, libX11, libxcb, qt5, mesa
, ffmpeg
, libchardet
@ -22,16 +22,24 @@ assert portaudioSupport -> portaudio != null;
assert pulseSupport -> pulseaudio != null;
assert cddaSupport -> libcdda != null;
stdenv.mkDerivation rec {
name = "cmplayer-${version}";
version = "0.8.16";
src = fetchurl {
url = "https://github.com/xylosper/cmplayer/releases/download/v${version}/${name}-source.tar.gz";
sha256 = "1yppp0jbq3mwa7vq4sjmm2lsqnfcv4n7cjap50gc2bavq7qynr85";
let
waf = fetchurl {
url = http://ftp.waf.io/pub/release/waf-1.8.4;
sha256 = "1a7skwgpl91adhcwlmdr76xzdpidh91hvcmj34zz6548bpx3a87h";
};
patches = [ ./fix-gcc48.patch ];
in
stdenv.mkDerivation rec {
name = "bomi-${version}";
version = "0.9.0";
src = fetchFromGitHub {
owner = "xylosper";
repo = "bomi";
rev = "v${version}";
sha256 = "12xyz40kl03h1m8g7d7s0wf74l2c70v6bd1drhww7ky48hxi0z14";
};
buildInputs = with stdenv.lib;
[ libX11 libxcb qt5 mesa
@ -55,8 +63,14 @@ stdenv.mkDerivation rec {
;
preConfigure = ''
patchShebangs ./configure
patchShebangs src/mpv/waf
patchShebangs configure
# src/mpv/waf build-mpv; do
'';
preBuild = ''
patchShebangs build-mpv
install -m755 ${waf} src/mpv/waf
sed -i '1 s,.*,#!${python3.interpreter},' src/mpv/waf
'';
configureFlags = with stdenv.lib;
@ -67,15 +81,13 @@ stdenv.mkDerivation rec {
++ optional cddaSupport "--enable-cdda"
;
preBuild = "patchShebangs ./build-mpv";
nativeBuildInputs = [ pkgconfig python2 perl ];
nativeBuildInputs = [ pkgconfig perl ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Powerful and easy-to-use multimedia player";
homepage = http://cmplayer.github.io;
homepage = https://bomi-player.github.io/;
license = licenses.gpl2Plus;
maintainers = [ maintainers.abbradar ];
platforms = platforms.linux;

View file

@ -1,22 +0,0 @@
From f6de1c7537dc3a0b4c9d69a63653c9bb4af26948 Mon Sep 17 00:00:00 2001
From: xylosper <darklin20@gmail.com>
Date: Wed, 2 Jul 2014 11:57:05 +0900
Subject: [PATCH] add a space between user defined literal operator
---
src/cmplayer/stdafx.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/cmplayer/stdafx.hpp b/src/cmplayer/stdafx.hpp
index 5f7d49c..c724f08 100644
--- a/src/cmplayer/stdafx.hpp
+++ b/src/cmplayer/stdafx.hpp
@@ -52,7 +52,7 @@ SIA operator "" _q(const char16_t *str, size_t len) -> QString
SIA operator "" _a(const char *str, size_t len) -> QLatin1String
{ return QLatin1String(str, len); }
-SIA operator ""_b(const char *str, size_t len) -> QByteArray
+SIA operator "" _b(const char *str, size_t len) -> QByteArray
{ return QByteArray::fromRawData(str, len); }
SIA operator "" _8(const char *str, size_t len) -> QString

View file

@ -36,16 +36,18 @@ assert pulseSupport -> pulseaudio != null;
assert cecSupport -> libcec != null;
let
ffmpeg_2_4_4 = fetchurl {
url = "https://github.com/xbmc/FFmpeg/archive/2.4.4-Helix.tar.gz";
sha256 = "1pkkmnq0kbwb13ps1wk01709lp3l2dzbfay6l29zj1204lbc3anb";
rel = "Helix";
ffmpeg_2_4_6 = fetchurl {
url = "https://github.com/xbmc/FFmpeg/archive/2.4.6-${rel}.tar.gz";
sha256 = "1kxp2z2zgcbplm5398zrfgwcfacfzvbg9y9wwrmm8vgwfmj32wh8";
};
in stdenv.mkDerivation rec {
name = "kodi-14.0";
name = "kodi-" + version;
version = "14.1";
src = fetchurl {
url = "https://github.com/xbmc/xbmc/archive/14.0-Helix.tar.gz";
sha256 = "14hip50gg3qgfb0mw7wrdqvw77mxdg9x1abfrqv1ydjrrjansx0i";
url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz";
sha256 = "1mjmf8ag8dg5brzxy7cmnz72b1b85p69zr1li28j71fgjbi5k053";
};
buildInputs = [
@ -82,7 +84,7 @@ in stdenv.mkDerivation rec {
--replace 'usr/share/zoneinfo' 'etc/zoneinfo'
substituteInPlace tools/depends/target/ffmpeg/autobuild.sh \
--replace "/bin/bash" "${bash}/bin/bash -ex"
cp ${ffmpeg_2_4_4} tools/depends/target/ffmpeg/ffmpeg-2.4.4-Helix.tar.gz
cp ${ffmpeg_2_4_6} tools/depends/target/ffmpeg/ffmpeg-2.4.6-${rel}.tar.gz
'';
preConfigure = ''
@ -115,6 +117,6 @@ in stdenv.mkDerivation rec {
description = "Media center";
license = stdenv.lib.licenses.gpl2;
platforms = platforms.linux;
maintainers = [ maintainers.iElectric maintainers.titanous ];
maintainers = with maintainers; [ iElectric titanous edwtjo ];
};
}

View file

@ -50,19 +50,19 @@ assert cacaSupport -> libcaca != null;
let
waf = fetchurl {
url = http://ftp.waf.io/pub/release/waf-1.8.1;
sha256 = "ec658116ba0b96629d91fde0b32321849e866e0819f1e835c4c2c7f7ffe1a21d";
url = http://ftp.waf.io/pub/release/waf-1.8.5;
sha256 = "0gh266076pd9fzwkycskyd3kkv2kds9613blpxmn9w4glkiwmmh5";
};
in
stdenv.mkDerivation rec {
name = "mpv-${version}";
version = "0.7.2";
version = "0.7.3";
src = fetchurl {
url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz";
sha256 = "13yswsl5xfzhzbh5fv7ds5x2wviiq8r7kp75y3zb8ni49293n23x";
sha256 = "1cg82zwzi6qh8s8w3716ikm1l1sigl9h6pd9ffdrp3ja4r2drp48";
};
buildInputs = with stdenv.lib;

View file

@ -21,7 +21,7 @@
, samba ? null, sambaSupport ? true
, libmicrohttpd
# TODO: would be nice to have nfsSupport (needs libnfs library)
# TODO: librtmp
, rtmpdump ? null, rtmpSupport ? true
, libvdpau ? null, vdpauSupport ? true
, pulseaudio ? null, pulseSupport ? true
, libcec ? null, cecSupport ? true
@ -68,7 +68,8 @@ stdenv.mkDerivation rec {
++ lib.optional sambaSupport samba
++ lib.optional vdpauSupport libvdpau
++ lib.optional pulseSupport pulseaudio
++ lib.optional cecSupport libcec;
++ lib.optional cecSupport libcec
++ lib.optional rtmpSupport rtmpdump;
dontUseCmakeConfigure = true;
@ -85,7 +86,8 @@ stdenv.mkDerivation rec {
]
++ lib.optional (! sambaSupport) "--disable-samba"
++ lib.optional vdpauSupport "--enable-vdpau"
++ lib.optional pulseSupport "--enable-pulse";
++ lib.optional pulseSupport "--enable-pulse"
++ lib.optional rtmpSupport "--enable-rtmp";
postInstall = ''
for p in $(ls $out/bin/) ; do
@ -97,7 +99,8 @@ stdenv.mkDerivation rec {
--prefix LD_LIBRARY_PATH ":" "${systemd}/lib" \
--prefix LD_LIBRARY_PATH ":" "${libmad}/lib" \
--prefix LD_LIBRARY_PATH ":" "${libvdpau}/lib" \
--prefix LD_LIBRARY_PATH ":" "${libcec}/lib"
--prefix LD_LIBRARY_PATH ":" "${libcec}/lib" \
--prefix LD_LIBRARY_PATH ":" "${rtmpdump}/lib"
done
'';

View file

@ -1,4 +1,6 @@
{ stdenv, fetchurl, pkgconfig, libX11, libXft, libXmu }:
{ stdenv, fetchurl, pkgconfig
, libX11, libXext, libXft, libXmu, libXinerama, libXrandr, libXpm
, imagemagick, libpng, libjpeg, libexif, libtiff, libungif, libwebp }:
stdenv.mkDerivation rec {
name = "windowmaker-${version}";
@ -10,7 +12,16 @@ stdenv.mkDerivation rec {
sha256 = "1i3dw1yagsa3rs9x2na2ynqlgmbahayws0kz4vl00fla6550nns3";
};
buildInputs = [ pkgconfig libX11 libXft libXmu ];
buildInputs = [ pkgconfig
libX11 libXext libXft libXmu libXinerama libXrandr libXpm
imagemagick libpng libjpeg libexif libtiff libungif libwebp ];
configureFlags = [
"--with-x"
"--enable-modelock"
"--enable-randr"
"--enable-magick"
];
meta = with stdenv.lib; {
homepage = http://windowmaker.org/;
@ -27,3 +38,5 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.AndersonTorres ];
};
}
# TODO: investigate support for WEBP (its autodetection is failing)

View file

@ -18,7 +18,7 @@ cabal.mkDerivation (self: {
'';
patches = [
# Patch to make xmonad use XMONAD_{GHC,XMESSAGE} (if available).
./xmonad_ghc_var_0.11.patch
../../../development/haskell-modules/xmonad-nix.patch
];
meta = {
homepage = "http://xmonad.org";

View file

@ -0,0 +1,22 @@
{ stdenv, buildEnv, ghcWithPackages, xmessage, makeWrapper, packages }:
let
xmonadEnv = ghcWithPackages (self: [ self.xmonad ] ++ packages self);
drv = buildEnv {
name = "xmonad-with-packages";
paths = [ xmonadEnv ];
postBuild = ''
# TODO: This could be avoided if buildEnv could be forced to create all directories
rm $out/bin
mkdir $out/bin
for i in ${xmonadEnv}/bin/*; do
ln -s $i $out/bin
done
wrapProgram $out/bin/xmonad \
--set XMONAD_GHC "${xmonadEnv}/bin/ghc" \
--set XMONAD_XMESSAGE "${xmessage}/bin/xmessage"
'';
};
in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; })

View file

@ -162,6 +162,7 @@ in
inherit generateCollection;
inherit isDepAttr;
inherit manifest;
inherit removePkgDeps;
inherit resolveDeps;
inherit userEnvPkg;
inherit writeManifestXML;

View file

@ -9,7 +9,6 @@
, cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell
, zlib ? null, extraPackages ? []
, setupHook ? ./setup-hook.sh
, libcxx ? null, libcxxabi ? null
}:
with stdenv.lib;
@ -35,7 +34,7 @@ stdenv.mkDerivation {
preferLocalBuild = true;
inherit cc shell libcxx libcxxabi;
inherit cc shell;
libc = if nativeLibc then null else libc;
binutils = if nativeTools then null else binutils;
# The wrapper scripts use 'cat', so we may need coreutils.
@ -88,7 +87,7 @@ stdenv.mkDerivation {
''
+ (if nativeTools then ''
ccPath="${nativePrefix}/bin"
ccPath="${if stdenv.isDarwin then cc else nativePrefix}/bin"
ldPath="${nativePrefix}/bin"
'' else ''
echo $cc > $out/nix-support/orig-cc

View file

@ -262,7 +262,6 @@ rec {
# Apache mirrors (see http://www.apache.org/mirrors/).
apache = [
http://apache.cs.uu.nl/dist/
http://www.eu.apache.org/dist/
ftp://ftp.inria.fr/pub/Apache/
http://apache.cict.fr/
@ -272,6 +271,7 @@ rec {
http://www.apache.org/dist/
http://archive.apache.org/dist/ # fallback for old releases
ftp://ftp.funet.fi/pub/mirrors/apache.org/
http://apache.cs.uu.nl/dist/
];
postgresql = [

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, buildPythonPackage, pythonPackages, picocom
, avrdude, arduino_core, avrgcclibc }:
, avrdude, arduino-core, avrgcclibc }:
buildPythonPackage rec {
name = "ino-0.3.6";
@ -12,12 +12,12 @@ buildPythonPackage rec {
# TODO: add avrgcclibc, it must be rebuild with C++ support
propagatedBuildInputs =
[ arduino_core avrdude picocom pythonPackages.configobj
[ arduino-core avrdude picocom pythonPackages.configobj
pythonPackages.jinja2 pythonPackages.pyserial pythonPackages.six ];
patchPhase = ''
echo "Patching Arduino distribution path"
sed -i 's@/usr/local/share/arduino@${arduino_core}/share/arduino@g' \
sed -i 's@/usr/local/share/arduino@${arduino-core}/share/arduino@g' \
ino/environment.py
sed -i -e 's@argparse@@' -e 's@ordereddict@@' \
requirements.txt

View file

@ -13,11 +13,11 @@ let
in
stdenv.mkDerivation rec {
version = "7.10.0.20140123";
version = "7.10.0.20150123";
name = "ghc-${version}";
src = fetchurl {
url = "https://downloads.haskell.org/~ghc/7.10.1-rc2/ghc-7.10.0.20150123-src.tar.xz";
url = "https://downloads.haskell.org/~ghc/7.10.1-rc2/${name}-src.tar.xz";
sha256 = "0in5zsr2z545yln55c7mwi07x3za0874yxbpsj5xsb4vn3wrcrbn";
};

View file

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
name = "ghc-${version}";
src = fetchurl {
url = "http://deb.haskell.org/dailies/2015-01-18/ghc_7.11.20150118.orig.tar.bz2";
url = "http://deb.haskell.org/dailies/2015-01-18/ghc_${version}.orig.tar.bz2";
sha256 = "1zy960q2faq03camq2n4834bd748vkc15h83bapswc68dqncqj20";
};

View file

@ -0,0 +1,22 @@
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index 198e82e..810d006 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -7355,17 +7355,6 @@ void gnutools::Link::ConstructJob(Compilation &C, const JobAction &JA,
CmdArgs.push_back("-shared");
}
- if (ToolChain.getArch() == llvm::Triple::arm ||
- ToolChain.getArch() == llvm::Triple::armeb ||
- ToolChain.getArch() == llvm::Triple::thumb ||
- ToolChain.getArch() == llvm::Triple::thumbeb ||
- (!Args.hasArg(options::OPT_static) &&
- !Args.hasArg(options::OPT_shared))) {
- CmdArgs.push_back("-dynamic-linker");
- CmdArgs.push_back(Args.MakeArgString(
- D.DyldPrefix + getLinuxDynamicLinker(Args, ToolChain)));
- }
-
CmdArgs.push_back("-o");
CmdArgs.push_back(Output.getFilename());

View file

@ -0,0 +1,8 @@
diff -Naur clang-3.4-orig/tools/extra/CMakeLists.txt clang-3.4/tools/extra/CMakeLists.txt
--- clang-3.4-orig/tools/extra/CMakeLists.txt 2013-11-07 19:08:23.000000000 -0500
+++ clang-3.4/tools/extra/CMakeLists.txt 2014-01-20 11:47:22.678435223 -0500
@@ -1,3 +1,4 @@
+include(CheckLibraryExists)
check_library_exists(edit el_init "" HAVE_LIBEDIT)
add_subdirectory(clang-apply-replacements)

View file

@ -0,0 +1,41 @@
{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }:
stdenv.mkDerivation {
name = "clang-${version}";
unpackPhase = ''
unpackFile ${fetch "cfe" "12yv3jwdjcbkrx7zjm8wh4jrvb59v8fdw4mnmz3zc1jb00p9k07w"}
mv cfe-${version}.src clang
sourceRoot=$PWD/clang
unpackFile ${clang-tools-extra_src}
mv clang-tools-extra-* $sourceRoot/tools/extra
'';
buildInputs = [ cmake libedit libxml2 llvm ];
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DCMAKE_CXX_FLAGS=-std=c++11"
] ++
(stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include");
patches = [ ./clang-purity.patch ];
# Clang expects to find LLVMgold in its own prefix
# Clang expects to find sanitizer libraries in its own prefix
postInstall = ''
ln -sv ${llvm}/lib/LLVMgold.so $out/lib
ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
ln -sv $out/bin/clang $out/bin/cpp
'';
enableParallelBuilding = true;
meta = {
description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
homepage = http://llvm.org/;
license = stdenv.lib.licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.all;
};
}

View file

@ -0,0 +1,41 @@
{ pkgs, newScope, stdenv, isl, fetchurl }:
let
callPackage = newScope (self // { inherit stdenv isl version fetch; });
version = "3.5.0";
fetch = fetch_v version;
fetch_v = ver: name: sha256: fetchurl {
url = "http://llvm.org/releases/${ver}/${name}-${ver}.src.tar.xz";
inherit sha256;
};
compiler-rt_src = fetch "compiler-rt" "0dl1kbrhz96djsxqr61iw5h788s7ncfpfb7aayixky1bhdaydcx4";
clang-tools-extra_src = fetch "clang-tools-extra" "0s8zjgxg8bj15nnqcw1cj1zffcralhh7f0gda1famddgg2rvx099";
self = {
llvm = callPackage ./llvm.nix rec {
version = "3.5.0";
fetch = fetch_v version;
inherit compiler-rt_src;
};
clang = callPackage ./clang.nix rec {
version = "3.5.0";
fetch = fetch_v version;
inherit clang-tools-extra_src;
};
lld = callPackage ./lld.nix {};
lldb = callPackage ./lldb.nix {};
polly = callPackage ./polly.nix {};
dragonegg = callPackage ./dragonegg.nix {};
libcxx = callPackage ./libc++ { stdenv = pkgs.clangStdenv; };
libcxxabi = callPackage ./libc++abi { stdenv = pkgs.clangStdenv; };
};
in self

View file

@ -0,0 +1,34 @@
{stdenv, fetch, fetchpatch, llvm, gmp, mpfr, libmpc, ncurses, zlib, version}:
stdenv.mkDerivation rec {
name = "dragonegg-${version}";
src = fetch "dragonegg" "1733czbvby1ww3xkwcwmm0km0bpwhfyxvf56wb0zv5gksp3kbgrr";
patches = [(fetchpatch {
url = "https://llvm.org/viewvc/llvm-project/dragonegg/trunk/src/x86/ABIHack.inc"
+ "?r1=208730&r2=208729&view=patch";
sha256 = "1al82gqz90hzjx24p0wls029lw2bgnlgd209kgvxsp82p4z1v1c1";
name = "bug-18548.patch";
})];
patchFlags = "-p2";
# The gcc the plugin will be built for (the same used building dragonegg)
GCC = "gcc";
buildInputs = [ llvm gmp mpfr libmpc ncurses zlib ];
installPhase = ''
mkdir -p $out/lib $out/share/doc/${name}
cp -d dragonegg.so $out/lib
cp README COPYING $out/share/doc/${name}
'';
meta = {
homepage = http://dragonegg.llvm.org/;
description = "gcc plugin that replaces gcc's optimizers and code generators by those in LLVM";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [viric shlevy];
platforms = with stdenv.lib.platforms; linux;
};
}

View file

@ -1,15 +1,25 @@
{ lib, stdenv, fetchurl, cmake, libcxxabi, fixDarwinDylibNames }:
let version = "3.4.2"; in
let version = "3.5.0"; in
stdenv.mkDerivation rec {
name = "libc++-${version}";
src = fetchurl {
url = "http://llvm.org/releases/${version}/libcxx-${version}.src.tar.gz";
sha256 = "0z3jdvgcq995khkpis5c5vaxhbmvbqjlalbhn09k6pgb5zp46rc2";
url = "http://llvm.org/releases/${version}/libcxx-${version}.src.tar.xz";
sha256 = "1h5is2jd802344kddm45jcm7bra51llsiv9r34h0rrb3ba2dlic0";
};
# instead of allowing libc++ to link with /usr/lib/libc++abi.dylib,
# force it to link with our copy
preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace lib/CMakeLists.txt \
--replace 'OSX_RE_EXPORT_LINE "/usr/lib/libc++abi.dylib' \
'OSX_RE_EXPORT_LINE "${libcxxabi}/lib/libc++abi.dylib' \
--replace '"''${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib"' \
'"${libcxxabi}/lib/libc++abi.dylib"'
'';
patches = [ ./darwin.patch ];
buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
@ -26,9 +36,6 @@ stdenv.mkDerivation rec {
inherit libcxxabi;
# Remove a Makefile that causes many retained dependencies.
postInstall = "rm $out/include/c++/v1/Makefile";
setupHook = ./setup-hook.sh;
meta = {

View file

@ -0,0 +1,53 @@
{ stdenv, cmake, coreutils, fetchurl, libcxx, libunwind, llvm }:
let version = "3.5.0"; in
stdenv.mkDerivation {
name = "libc++abi-${version}";
src = fetchurl {
url = "http://llvm.org/releases/${version}/libcxxabi-${version}.src.tar.xz";
sha256 = "1ndcpw3gfrzh7m1jac2qadhkrqgvb65cns69j9niydyj5mmbxijk";
};
NIX_CFLAGS_LINK = "-L${libunwind}/lib";
buildInputs = [ coreutils cmake llvm ];
postUnpack = ''
unpackFile ${libcxx.src}
export NIX_CFLAGS_COMPILE+=" -I${libunwind}/include -I$PWD/include"
export cmakeFlags="-DLIBCXXABI_LIBCXX_INCLUDES=$(${coreutils}/bin/readlink -f libcxx-*)/include"
'' + stdenv.lib.optionalString stdenv.isDarwin ''
export TRIPLE=x86_64-apple-darwin
'';
installPhase = if stdenv.isDarwin
then ''
for file in lib/*; do
# this should be done in CMake, but having trouble figuring out
# the magic combination of necessary CMake variables
# if you fancy a try, take a look at
# http://www.cmake.org/Wiki/CMake_RPATH_handling
install_name_tool -id $out/$file $file
done
make install
install -d 755 $out/include
install -m 644 ../include/cxxabi.h $out/include
''
else ''
install -d -m 755 $out/include $out/lib
install -m 644 lib/libc++abi.so.1.0 $out/lib
install -m 644 ../include/cxxabi.h $out/include
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
'';
meta = {
homepage = http://libcxxabi.llvm.org/;
description = "A new implementation of low level support for a standard C++ library";
license = "BSD";
maintainers = with stdenv.lib.maintainers; [ shlevy vlstill ];
platforms = stdenv.lib.platforms.unix;
};
}

View file

@ -0,0 +1,31 @@
{ stdenv, fetch, cmake, llvm, ncurses, zlib, python, version }:
stdenv.mkDerivation {
name = "lld-${version}";
src = fetch "lld" "1sd4scqynryfrmcc4h0ljgwn2dgjmbbmf38z50ya6l0janpd2nxx";
preUnpack = ''
# !!! Hopefully won't be needed for 3.5
unpackFile ${llvm.src}
export cmakeFlags="$cmakeFlags -DLLD_PATH_TO_LLVM_SOURCE="`ls -d $PWD/llvm-*`
'';
buildInputs = [ cmake ncurses zlib python ];
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DCMAKE_CXX_FLAGS=-std=c++11"
"-DLLD_PATH_TO_LLVM_BUILD=${llvm}"
];
enableParallelBuilding = true;
meta = {
description = "A set of modular code for creating linker tools";
homepage = http://llvm.org/;
license = stdenv.lib.licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.all;
};
}

View file

@ -0,0 +1,44 @@
{ stdenv
, fetch
, cmake
, zlib
, ncurses
, swig
, which
, libedit
, llvm
, clang
, python
, version
}:
stdenv.mkDerivation {
name = "lldb-${version}";
src = fetch "lldb" "0h8cmjrhjhigk7k2qll1pcf6jfgmbdzkzfz2i048pkfg851s0x44";
patchPhase = ''
sed -i 's|/usr/bin/env||' \
scripts/Python/finish-swig-Python-LLDB.sh \
scripts/Python/build-swig-Python.sh
'';
buildInputs = [ cmake python which swig ncurses zlib libedit ];
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DCMAKE_CXX_FLAGS=-std=c++11"
"-DLLDB_PATH_TO_LLVM_BUILD=${llvm}"
"-DLLDB_PATH_TO_CLANG_BUILD=${clang}"
];
enableParallelBuilding = true;
meta = {
description = "A next-generation high-performance debugger";
homepage = http://llvm.org/;
license = stdenv.lib.licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.all;
};
}

View file

@ -0,0 +1,12 @@
diff -Naur llvm-3.4-orig/cmake/modules/TableGen.cmake llvm-3.4/cmake/modules/TableGen.cmake
--- llvm-3.4-orig/cmake/modules/TableGen.cmake 2013-10-06 21:00:07.000000000 -0400
+++ llvm-3.4/cmake/modules/TableGen.cmake 2014-01-20 13:06:55.273022149 -0500
@@ -78,8 +78,6 @@
endif()
macro(add_tablegen target project)
- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LLVM_TOOLS_BINARY_DIR})
-
set(${target}_OLD_LLVM_LINK_COMPONENTS ${LLVM_LINK_COMPONENTS})
set(LLVM_LINK_COMPONENTS ${LLVM_LINK_COMPONENTS} TableGen)
add_llvm_utility(${target} ${ARGN})

View file

@ -0,0 +1,72 @@
{ stdenv
, fetch
, perl
, groff
, cmake
, python
, libffi
, binutils
, libxml2
, valgrind
, ncurses
, version
, zlib
, compiler-rt_src
}:
let
src = fetch "llvm" "00swb43mzlvda8306arlg2jw7g6k3acwfccgf1k4c2pgd3rrkq98";
in stdenv.mkDerivation rec {
name = "llvm-${version}";
unpackPhase = ''
unpackFile ${src}
mv llvm-${version}.src llvm
sourceRoot=$PWD/llvm
unpackFile ${compiler-rt_src}
mv compiler-rt-* $sourceRoot/projects/compiler-rt
'';
buildInputs = [ perl groff cmake libxml2 python libffi ] ++ stdenv.lib.optional stdenv.isLinux valgrind;
propagatedBuildInputs = [ ncurses zlib ];
# hacky fix: created binaries need to be run before installation
preBuild = ''
mkdir -p $out/
ln -sv $PWD/lib $out
'';
cmakeFlags = with stdenv; [
"-DCMAKE_BUILD_TYPE=Release"
"-DLLVM_BUILD_TESTS=ON"
"-DLLVM_ENABLE_FFI=ON"
"-DLLVM_BINUTILS_INCDIR=${binutils}/include"
] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON"
++ stdenv.lib.optionals ( isDarwin) [
"-DCMAKE_CXX_FLAGS=-stdlib=libc++"
"-DCAN_TARGET_i386=false"
];
postBuild = ''
rm -fR $out
paxmark m bin/{lli,llvm-rtdyld}
paxmark m unittests/ExecutionEngine/JIT/JITTests
paxmark m unittests/ExecutionEngine/MCJIT/MCJITTests
paxmark m unittests/Support/SupportTests
'';
enableParallelBuilding = true;
passthru.src = src;
meta = {
description = "Collection of modular and reusable compiler and toolchain technologies";
homepage = http://llvm.org/;
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ shlevy lovek323 raskin viric ];
platforms = stdenv.lib.platforms.all;
};
}

View file

@ -0,0 +1,12 @@
diff -Naur polly-3.4-orig/CMakeLists.txt polly-3.4/CMakeLists.txt
--- polly-3.4-orig/CMakeLists.txt 2013-11-21 06:51:46.000000000 -0500
+++ polly-3.4/CMakeLists.txt 2014-01-20 18:49:34.907919933 -0500
@@ -53,7 +53,7 @@
execute_process(COMMAND "${LLVM_INSTALL_ROOT}/bin/llvm-config" --cxxflags
OUTPUT_VARIABLE LLVM_CXX_FLAGS
OUTPUT_STRIP_TRAILING_WHITESPACE)
- set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${LLVM_CXX_FLAGS})
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LLVM_CXX_FLAGS}")
endif(NOT DEFINED LLVM_MAIN_SRC_DIR)
set(POLLY_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})

View file

@ -0,0 +1,27 @@
{ stdenv, fetch, cmake, isl, python, gmp, llvm, version }:
stdenv.mkDerivation {
name = "polly-${version}";
src = fetch "polly" "1rqflmgzg1vzjm0r32c5ck8x3q0qm3g0hh8ggbjazh6x7nvmy6ll";
patches = [ ./polly-separate-build.patch ];
buildInputs = [ cmake isl python gmp ];
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DCMAKE_CXX_FLAGS=-std=c++11"
"-DLLVM_INSTALL_ROOT=${llvm}"
];
enableParallelBuilding = true;
meta = {
description = "A polyhedral optimizer for llvm";
homepage = http://llvm.org/;
license = stdenv.lib.licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.all;
};
}

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "sbcl-${version}";
version = "1.2.7";
version = "1.2.8";
src = fetchurl {
url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
sha256 = "10sjrh91pak4s6j4ks02xp88s25lh8zsii3x7rkn6p7vr7c9jw5j";
sha256 = "0ab9lw056yf6y0rjmx3iirn5n59pmssqxf00fbmpyl6qsnpaja1d";
};
buildInputs = [ which ]

View file

@ -36,8 +36,12 @@ self: super: {
# Link the proper version.
zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; };
# "curl" means pkgs.curl
git-annex = super.git-annex.override { inherit (pkgs) git rsync gnupg1 curl lsof openssh which bup perl wget; };
# These changes are required to support Darwin.
git-annex = 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;
};
# Depends on code distributed under a non-free license.
bindings-yices = dontDistribute super.bindings-yices;
@ -45,15 +49,24 @@ self: super: {
yices-easy = dontDistribute super.yices-easy;
yices-painless = dontDistribute super.yices-painless;
# This package overrides the one from pkgs.gnome.
gtkglext = super.gtkglext.override { inherit (pkgs.gnome) gtkglext; };
# The test suite refers to its own library with an invalid version constraint.
presburger = dontCheck super.presburger;
# Won't find it's header files without help.
sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL";
hzk = overrideCabal super.hzk (drv: {
preConfigure = "sed -i -e /include-dirs/d hzk.cabal";
configureFlags = "--extra-include-dirs=${pkgs.zookeeper_mt}/include/zookeeper";
doCheck = false;
});
haskakafka = overrideCabal super.haskakafka (drv: {
preConfigure = "sed -i -e /extra-lib-dirs/d -e /include-dirs/d haskakafka.cabal";
configureFlags = "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka";
doCheck = false;
});
# Foreign dependency name clashes with another Haskell package.
libarchive-conduit = super.libarchive-conduit.override { archive = pkgs.libarchive; };
@ -88,6 +101,7 @@ self: super: {
markdown-unlit = dontHaddock super.markdown-unlit;
network-conduit = dontHaddock super.network-conduit;
shakespeare-text = dontHaddock super.shakespeare-text;
uhc-light = dontHaddock super.uhc-light; # https://github.com/UU-ComputerScience/uhc/issues/45
# jailbreak doesn't get the job done because the Cabal file uses conditionals a lot.
darcs = overrideCabal super.darcs (drv: {
@ -136,12 +150,6 @@ self: super: {
# https://github.com/liamoc/wizards/issues/5
wizards = doJailbreak super.wizards;
# https://github.com/ekmett/trifecta/issues/41
trifecta = appendPatch super.trifecta (pkgs.fetchpatch {
url = "https://github.com/ekmett/trifecta/pull/40.patch";
sha256 = "0qwz83fp0karf6164jykdwsrafq08l6zsdmcdm83xnkcxabgplxv";
});
# https://github.com/NixOS/cabal2nix/issues/136
gtk = addBuildDepends super.gtk [pkgs.pkgconfig pkgs.gtk];
glib = addBuildDepends super.glib [pkgs.pkgconfig pkgs.glib];
@ -155,6 +163,9 @@ self: super: {
# Upstream notified by e-mail.
permutation = dontCheck super.permutation;
# https://github.com/vincenthz/hs-tls/issues/102
tls = dontCheck super.tls;
# https://github.com/jputcu/serialport/issues/25
serialport = dontCheck super.serialport;
@ -183,6 +194,7 @@ self: super: {
# These packages try to access the network.
concurrent-dns-cache = dontCheck super.concurrent-dns-cache;
dbus = dontCheck super.dbus; # http://hydra.cryp.to/build/498404/log/raw
hadoop-rpc = dontCheck super.hadoop-rpc; # http://hydra.cryp.to/build/527461/nixlog/2/raw
hasql = dontCheck super.hasql; # http://hydra.cryp.to/build/502489/nixlog/4/raw
holy-project = dontCheck super.holy-project; # http://hydra.cryp.to/build/502002/nixlog/1/raw
http-client = dontCheck super.http-client; # http://hydra.cryp.to/build/501430/nixlog/1/raw
@ -388,19 +400,41 @@ self: super: {
# https://github.com/Philonous/xml-picklers/issues/5
xml-picklers = dontCheck super.xml-picklers;
# https://github.com/blamario/monoid-subclasses/issues/4
monoid-subclasses = dontCheck super.monoid-subclasses;
# https://github.com/joeyadams/haskell-stm-delay/issues/3
stm-delay = dontCheck super.stm-delay;
# https://github.com/JPMoresmau/HGraphStorage/issues/2
HGraphStorage = dontHaddock super.HGraphStorage;
# https://github.com/fumieval/call/issues/3
call = markBrokenVersion "0.1.2" super.call;
rhythm-game-tutorial = dontDistribute super.rhythm-game-tutorial; # depends on call
# 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/audreyt/MoeDict.hs/issues/1
MoeDict = markBrokenVersion "0.0.1" super.MoeDict;
# https://github.com/pixbi/duplo/issues/25
duplo = dontCheck super.duplo;
# https://github.com/seagreen/hjsonschema/issues/4
# https://github.com/seagreen/hjsonschema/issues/5
hjsonschema = dontHaddock (dontCheck super.hjsonschema);
# Nix-specific workaround
xmonad = appendPatch super.xmonad ./xmonad-nix.patch;
# https://github.com/evanrinehart/mikmod/issues/1
mikmod = addExtraLibrary super.mikmod pkgs.libmikmod;
# https://github.com/d12frosted/CanonicalPath/issues/3
system-canonicalpath = dontCheck super.system-canonicalpath;
} // {
# Not on Hackage.

View file

@ -63,6 +63,10 @@ self: super: {
# Choose appropriate flags for our version of 'bytestring'.
bytestring-builder = disableCabalFlag super.bytestring-builder "bytestring_has_builder";
# Tagged is not part of base in this environment.
contravariant = addBuildDepend super.contravariant self.tagged;
reflection = dontHaddock (addBuildDepend super.reflection self.tagged);
} // {
# Not on Hackage.

View file

@ -71,6 +71,9 @@ self: super: {
seqid = super.seqid_0_1_0;
seqid-streams = super.seqid-streams_0_1_0;
# https://github.com/ivan-m/monad-levels/issues/1
monad-levels = dontDistribute super.monad-levels;
}
// # packages relating to amazonka

File diff suppressed because it is too large Load diff

View file

@ -25,6 +25,9 @@ rec {
addBuildTool = drv: x: addBuildTools drv [x];
addBuildTools = drv: xs: overrideCabal drv (drv: { buildTools = (drv.buildTools or []) ++ xs; });
addExtraLibrary = drv: x: addExtraLibraries drv [x];
addExtraLibraries = drv: xs: overrideCabal drv (drv: { extraLibraries = (drv.extraLibraries or []) ++ xs; });
addBuildDepend = drv: x: addBuildDepends drv [x];
addBuildDepends = drv: xs: overrideCabal drv (drv: { buildDepends = (drv.buildDepends or []) ++ xs; });

View file

@ -5,8 +5,8 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = git://git.ghostscript.com/mujs.git;
rev = "d9ed73fd717ebbefe5595d139a133b762cea4e92";
sha256 = "0kg69j9ra398mdxzq34k5lv92q18g0zz5vx2wcki3qmag2rzivhr";
rev = "c1ad1ba1e482e7d01743e3f4f9517572bebf99ac";
sha256 = "1713h82zzd189nb54ilpa8fj9xhinhn0jvmd3li4c2fwh6xfjpcy";
};
buildInputs = [ clang ];

View file

@ -66,6 +66,8 @@ stdenv.mkDerivation rec {
${optionalString stdenv.isArm ''
configureFlagsArray=(-Dldflags="-lm -lrt")
''}
'' + optionalString stdenv.isDarwin ''
substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" ""
'';
preBuild = optionalString (!(stdenv ? cc && stdenv.cc.nativeTools))

View file

@ -1,19 +0,0 @@
--- a/rpython/translator/c/gcc/trackgcroot.py
+++ b/rpython/translator/c/gcc/trackgcroot.py
@@ -590,7 +590,7 @@
# The various cmov* operations
for name in '''
- e ne g ge l le a ae b be p np s ns o no
+ e ne g ge l le a ae b be nb p np s ns o no
'''.split():
locals()['visit_cmov' + name] = binary_insn
locals()['visit_cmov' + name + 'l'] = binary_insn
@@ -837,6 +837,7 @@
visit_jb = conditional_jump
visit_jbe = conditional_jump
visit_jp = conditional_jump
+ visit_jnb = conditional_jump
visit_jnp = conditional_jump
visit_js = conditional_jump
visit_jns = conditional_jump

View file

@ -6,7 +6,7 @@ assert zlibSupport -> zlib != null;
let
majorVersion = "2.4";
majorVersion = "2.5";
version = "${majorVersion}.0";
libPrefix = "pypy${majorVersion}";
@ -18,7 +18,7 @@ let
src = fetchurl {
url = "https://bitbucket.org/pypy/pypy/get/release-${version}.tar.bz2";
sha256 = "1lhk86clnkj305dxa6xr9wjib6ckf6xxl6qj0bq20vqh80nfq3by";
sha256 = "126zrsx6663n9w60018mii1z7cqb87iq9irnhp8z630mldallr4d";
};
buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl x11 libX11 makeWrapper ]
@ -30,8 +30,6 @@ let
LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/lib")
(stdenv.lib.filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs));
patches = [ ./fix-gcc-4-9-2.patch ];
preConfigure = ''
substituteInPlace Makefile \
--replace "-Ojit" "-Ojit --batch" \
@ -103,7 +101,7 @@ let
inherit zlibSupport libPrefix;
executable = "pypy";
isPypy = true;
buildEnv = callPackage ../../python/wrapper.nix { python = self; };
buildEnv = callPackage ../python/wrapper.nix { python = self; };
interpreter = "${self}/bin/${executable}";
};

View file

@ -1,12 +1,12 @@
addPythonPath() {
addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.4/site-packages
addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.5/site-packages
}
toPythonPath() {
local paths="$1"
local result=
for i in $paths; do
p="$i/lib/pypy2.4/site-packages"
p="$i/lib/pypy2.5/site-packages"
result="${result}${result:+:}$p"
done
echo $result

View file

@ -6,7 +6,7 @@
url = "https://github.com/cstrahan/bundix.git";
rev = "5df25b11b5b86e636754d54c2a8859c7c6ec78c7";
fetchSubmodules = false;
sha256 = "0334jsavpzkikcs7wrx7a3r0ilvr5vsnqd34lhc58b8cgvgll47p";
sha256 = "1iqx12y777v8gszggj25x0xcf6lzllx58lmv53x6zy3jmvfh4siv";
};
dependencies = [
"thor"

View file

@ -1,17 +0,0 @@
diff -Nuar apr-1.4.6/configure apr-1.4.6-darwin-fix-configure/configure
--- apr-1.4.6/configure 2012-02-08 00:17:57.000000000 +0100
+++ apr-1.4.6-darwin-fix-configure/configure 2012-06-06 23:08:56.000000000 +0200
@@ -6854,10 +6854,10 @@
*-apple-darwin*)
if test "x$CPPFLAGS" = "x"; then
- test "x$silent" != "xyes" && echo " setting CPPFLAGS to \"-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -no-cpp-precomp\""
- CPPFLAGS="-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -no-cpp-precomp"
+ test "x$silent" != "xyes" && echo " setting CPPFLAGS to \"-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK\""
+ CPPFLAGS="-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK"
else
- apr_addto_bugger="-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -no-cpp-precomp"
+ apr_addto_bugger="-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK"
for i in $apr_addto_bugger; do
apr_addto_duplicate="0"
for j in $CPPFLAGS; do

View file

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1b4qw686bwjn19iyb0lg918q23xxd6s2gnyczhjq992d3m1vwjp9";
};
patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin_fix_configure.patch ];
patches = stdenv.lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ];
configureFlags =
# Including the Windows headers breaks unistd.h.

View file

@ -0,0 +1,17 @@
--- apr-1.5.1/file_io/unix/filestat.c 2014-11-01 06:42:50.000000000 -0400
+++ apr-1.5.1/file_io/unix/filestat.c.new 2014-11-01 07:07:32.000000000 -0400
@@ -297,9 +297,11 @@
finfo->pool = pool;
finfo->fname = fname;
fill_out_finfo(finfo, &info, wanted);
- if (wanted & APR_FINFO_LINK)
- wanted &= ~APR_FINFO_LINK;
- return (wanted & ~finfo->valid) ? APR_INCOMPLETE : APR_SUCCESS;
+ if (wanted & APR_FINFO_LINK) {
+ return ((wanted & ~APR_FINFO_LINK) & ~finfo->valid) ? APR_INCOMPLETE : APR_SUCCESS;
+ } else {
+ return (wanted & ~finfo->valid) ? APR_INCOMPLETE : APR_SUCCESS;
+ }
}
else {
#if !defined(ENOENT) || !defined(ENOTDIR)

View file

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
[ ./Fix-pkgconfig-file-by-adding-clucene-shared-library.patch
./Fixing_ZLIB_configuration_in_shared_CMakeLists.patch
./Install-contribs-lib.patch
];
] ++ stdenv.lib.optionals stdenv.isDarwin [ ./fix-darwin.patch ];
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
install_name_tool -change libclucene-shared.1.dylib \

View file

@ -0,0 +1,75 @@
--- a/src/shared/CLucene/LuceneThreads.h
+++ b/src/shared/CLucene/LuceneThreads.h
@@ -7,6 +7,9 @@
#ifndef _LuceneThreads_h
#define _LuceneThreads_h
+#if defined(_CL_HAVE_PTHREAD)
+ #include <pthread.h>
+#endif
CL_NS_DEF(util)
class CLuceneThreadIdCompare;
--- a/src/shared/CLucene/config/repl_tchar.h
+++ b/src/shared/CLucene/config/repl_tchar.h
@@ -28,26 +28,26 @@
#define _istdigit iswdigit //* digit char check
#define _totlower towlower //* convert char to lower case
#define _totupper towupper //* convert char to lower case
- #define _tcslwr wcslwr //* convert string to lower case
+ #define _tcslwr std::wcslwr //* convert string to lower case
//these are the string handling functions
//we may need to create wide-character/multi-byte replacements for these
- #define _tcscpy wcscpy //copy a string to another string
- #define _tcsncpy wcsncpy //copy a specified amount of one string to another string.
- #define _tcscat wcscat //copy a string onto the end of the other string
- #define _tcsncat wcsncat
- #define _tcschr wcschr //find location of one character
- #define _tcsstr wcsstr //find location of a string
- #define _tcslen wcslen //get length of a string
- #define _tcscmp wcscmp //case sensitive compare two strings
- #define _tcsncmp wcsncmp //case sensitive compare two strings
- #define _tcscspn wcscspn //location of any of a set of character in a string
+ #define _tcscpy std::wcscpy //copy a string to another string
+ #define _tcsncpy std::wcsncpy //copy a specified amount of one string to another string.
+ #define _tcscat std::wcscat //copy a string onto the end of the other string
+ #define _tcsncat std::wcsncat
+ #define _tcschr std::wcschr //find location of one character
+ #define _tcsstr std::wcsstr //find location of a string
+ #define _tcslen std::wcslen //get length of a string
+ #define _tcscmp std::wcscmp //case sensitive compare two strings
+ #define _tcsncmp std::wcsncmp //case sensitive compare two strings
+ #define _tcscspn std::wcscspn //location of any of a set of character in a string
//string compare
#ifdef _CL_HAVE_FUNCTION_WCSICMP
- #define _tcsicmp wcsicmp //* case insensitive compare two string
+ #define _tcsicmp std::wcsicmp //* case insensitive compare two string
#else
- #define _tcsicmp wcscasecmp //* case insensitive compare two string
+ #define _tcsicmp std::wcscasecmp //* case insensitive compare two string
#endif
#if defined(_CL_HAVE_FUNCTION_WCSDUP)
#define _tcsdup wcsdup
@@ -56,8 +56,8 @@
#endif
//conversion functions
- #define _tcstod wcstod //convert a string to a double
- #define _tcstoi64 wcstoll //* convers a string to an 64bit bit integer
+ #define _tcstod std::wcstod //convert a string to a double
+ #define _tcstoi64 std::wcstoll //* convers a string to an 64bit bit integer
#define _itot _i64tot
#define _i64tot lltow //* converts a 64 bit integer to a string (with base)
#else //if defined(_ASCII)
@@ -105,7 +105,7 @@
//some tchar headers miss these...
#ifndef _tcstoi64
#if defined(_UCS2)
- #define _tcstoi64 wcstoll //* convers a string to an 64bit bit integer
+ #define _tcstoi64 std::wcstoll //* convers a string to an 64bit bit integer
#else
#define _tcstoi64 strtoll
#endif

View file

@ -2,12 +2,18 @@
, enableX11 ? true, xlibs
, enableSDL ? true, SDL }:
let s = import ./src-for-default.nix; in
let s =
rec {
version = "1.7.6";
name="directfb-${version}";
sha256 = "1qf94vgsbcwfa00x2aqd6795n6z43x4ghclmb4sa4bl4zfn2pws4";
url="http://directfb.org/downloads/Core/DirectFB-1.7/DirectFB-${version}.tar.gz";
}
; in
stdenv.mkDerivation {
inherit (s) name;
src = fetchurl {
url = s.url;
sha256 = s.hash;
inherit (s) url sha256;
};
nativeBuildInputs = [ perl ];

View file

@ -0,0 +1,3 @@
url 'http://directfb.org/index.php?path=Main%2FDownloads'
version_link 'DirectFB-[0-9]'
minimize_overwrite

View file

@ -1,9 +0,0 @@
rec {
version="1.7.6";
name="directfb-${version}";
hash="1qf94vgsbcwfa00x2aqd6795n6z43x4ghclmb4sa4bl4zfn2pws4";
url="http://directfb.org/downloads/Core/DirectFB-1.7/DirectFB-${version}.tar.gz";
advertisedUrl="http://directfb.org/downloads/Core/DirectFB-1.7/DirectFB-1.7.6.tar.gz";
}

View file

@ -1,6 +0,0 @@
{
baseName = "directfb";
downloadPage = "http://directfb.org/index.php?path=Main%2FDownloads";
sourceRegexp = ''DirectFB-.*[.]tar[.].*'';
choiceCommand = ''tail -1'';
}

View file

@ -1,19 +1,16 @@
{ stdenv, fetchurl, cmake }:
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
name = "double-conversion-1.1.5";
version = "2.0.1";
name = "double-conversion-${version}";
src = fetchurl {
url = "https://double-conversion.googlecode.com/files/${name}.tar.gz";
sha256 = "0hnlyn9r8vd9b3dafnk01ykz4k7bk6xvmvslv93as1cswf7vdvqv";
src = fetchFromGitHub {
owner = "floitsch";
repo = "double-conversion";
rev = "v${version}";
sha256 = "05x5rdwndgp1vdq2z1bpvng0dd8pn93kw4vhl6nsvv9vsara2q4b";
};
unpackPhase = ''
mkdir $name
cd $name
tar xzf $src
'';
nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
@ -22,7 +19,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Binary-decimal and decimal-binary routines for IEEE doubles";
homepage = https://code.google.com/p/double-conversion/;
homepage = https://github.com/floitsch/double-conversion;
license = licenses.bsd3;
platforms = platforms.unix;
maintainers = maintainers.abbradar;

View file

@ -1,7 +1,7 @@
{stdenv, fetchurl, cmake}:
let
version = "3.2.3";
version = "3.2.4";
in
stdenv.mkDerivation {
name = "eigen-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
name = "eigen-${version}.tar.gz";
sha256 = "14l5hlgxxymwyava5mx97ipyk3ma3alaj586aaz1xh1r700a7sxm";
sha256 = "19c6as664a3kxvkhas2cq19r6ag19jw9lcz04sc0kza6i1hlh9xv";
};
nativeBuildInputs = [ cmake ];

View file

@ -1,22 +0,0 @@
From 30b8bb70e0fdcc0b85abbfebf43ed9f127db5248 Mon Sep 17 00:00:00 2001
From: Johnny Robeson <johnny@localmomentum.net>
Date: Mon, 1 Dec 2014 23:26:27 -0500
Subject: [PATCH] include gflags header in SSLSessionCacheManager
this is one way to solve #104
---
folly/experimental/wangle/ssl/SSLSessionCacheManager.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/folly/experimental/wangle/ssl/SSLSessionCacheManager.cpp b/folly/experimental/wangle/ssl/SSLSessionCacheManager.cpp
index fc339a1..ca18242 100644
--- folly/experimental/wangle/ssl/SSLSessionCacheManager.cpp
+++ folly/experimental/wangle/ssl/SSLSessionCacheManager.cpp
@@ -7,6 +7,7 @@
* of patent rights can be found in the PATENTS file in the same directory.
*
*/
+#include <gflags/gflags.h>
#include <folly/experimental/wangle/ssl/SSLSessionCacheManager.h>
#include <folly/experimental/wangle/ssl/SSLCacheProvider.h>

View file

@ -1,17 +1,17 @@
{ stdenv, fetchgit, autoreconfHook, boost, libevent, double_conversion, glog
{ stdenv, fetchFromGitHub, autoreconfHook, boost, libevent, double_conversion, glog
, google-gflags, python, libiberty, openssl }:
stdenv.mkDerivation rec {
name = "folly-17";
version = "0.22.0";
name = "folly-${version}";
src = fetchgit {
url = "https://github.com/facebook/folly";
rev = "2c2d5777cd2551397a920007589fd3adba6cb7ab";
sha256 = "13mfnv04ckkr2syigaaxrbaxmfiwqvn0a7fjxvdi6dii3fx81rsx";
src = fetchFromGitHub {
owner = "facebook";
repo = "folly";
rev = "v${version}";
sha256 = "12p7vbx73jmhf772nbqvd8imw4ihpi16cw6cwxq459r7qds4n0ca";
};
patches = [ ./105.patch ];
buildInputs = [ libiberty boost.lib libevent double_conversion glog google-gflags openssl ];
nativeBuildInputs = [ autoreconfHook python boost ];

View file

@ -12,6 +12,8 @@ stdenv.mkDerivation (rec {
nativeBuildInputs = [ m4 ];
patches = if stdenv.isDarwin then [ ./need-size-t.patch ] else null;
configureFlags =
# Build a "fat binary", with routines for several sub-architectures
# (x86), except on Solaris where some tests crash with "Memory fault".

View file

@ -0,0 +1,18 @@
diff --git a/gmp-h.in b/gmp-h.in
index 7deb67a..240d663 100644
--- a/gmp-h.in
+++ b/gmp-h.in
@@ -46,13 +46,11 @@ along with the GNU MP Library. If not, see http://www.gnu.org/licenses/. */
#ifndef __GNU_MP__
#define __GNU_MP__ 5
-#define __need_size_t /* tell gcc stddef.h we only want size_t */
#if defined (__cplusplus)
#include <cstddef> /* for size_t */
#else
#include <stddef.h> /* for size_t */
#endif
-#undef __need_size_t
/* Instantiated by configure. */
#if ! defined (__GMP_WITHIN_CONFIGURE)

View file

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "monad-journal";
version = "0.5.0.1";
sha256 = "1rxmz6hx8kh8sw497h4kpxkvhgaa7jbzif7qssjqijyfmghsxh80";
version = "0.7";
sha256 = "1bfm5p027vf8dz92m6s47z06h05j2jv4pbwkl31svrz5pi5a9lz2";
buildDepends = [
either monadControl mtl transformers transformersBase
];

View file

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "monad-logger";
version = "0.3.11";
sha256 = "0ydxv4pdq660dh3cdmsd5lgjkfhh7c62kb5vcl8jl6qmjf8kvmdq";
version = "0.3.11.1";
sha256 = "1vh847ivymhb20sly9aplcm35zcmn7xmibv8lkv1ws9y7s1951p7";
buildDepends = [
blazeBuilder conduit conduitExtra exceptions fastLogger liftedBase
monadControl monadLoops mtl resourcet stm stmChans text

View file

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "scotty";
version = "0.9.0";
sha256 = "0gx00k5w4cs68bh3ciplkwhzh2412y6wqg0qdsslnnsb41l5kb1d";
version = "0.9.1";
sha256 = "0w07ghnd7l8ibfbl8p74lwn8gxy3z28mp0rlv5crma3yh42irsqm";
buildDepends = [
aeson blazeBuilder caseInsensitive dataDefault httpTypes
monadControl mtl regexCompat text transformers transformersBase wai

View file

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "yi-language";
version = "0.1.0.8";
sha256 = "1lzn1yswrh72lqvc5xcna2xjv5zs3x1mzc1ijkqjl84nvqcabj60";
version = "0.1.1.0";
sha256 = "1gsh0njslncfh0r5wg1rq9w4f03ixkk5grd9zigkspsndhij7379";
buildDepends = [
binary dataDefault derive hashable lens ooPrototypes pointedlist
regexBase regexTdfa transformersBase unorderedContainers

View file

@ -0,0 +1,422 @@
/* hunspell dictionaries */
{ stdenv, fetchurl, unzip }:
with stdenv.lib;
let
mkDict =
{ name, src, meta, readmeFile, dictFileName, ... }:
let
isFrench = hasSuffix "fr_" dictFileName;
isItaly = hasSuffix "it_" dictFileName;
isSpanish = hasSuffix "es_" dictFileName;
isEnglish = hasSuffix "en_" dictFileName;
in
stdenv.mkDerivation rec {
inherit name src meta;
buildInputs = [ unzip ];
sourceRoot = ".";
phases = "unpackPhase installPhase" + (if isItaly then "patchPhase" else "");
unpackCmd = "unzip $src ${readmeFile} ${dictFileName}.dic ${dictFileName}.aff";
prePatch = if isItaly then ''
# Fix dic file empty lines (FS#22275)
sed '/^\/$/d' -i it_IT.dic
'' else "";
installPhase = ''
# hunspell dicts
install -dm755 "$out/share/hunspell"
install -m644 ${dictFileName}.dic "$out/share/hunspell/"
install -m644 ${dictFileName}.aff "$out/share/hunspell/"
# myspell dicts symlinks
install -dm755 "$out/share/myspell/dicts"
ln -sv "$out/share/hunspell/${dictFileName}.dic" "$out/share/myspell/dicts/"
ln -sv "$out/share/hunspell/${dictFileName}.aff" "$out/share/myspell/dicts/"
# docs
install -dm755 "$out/share/doc"
install -m644 ${readmeFile} $out/share/doc/${name}.txt
'';
};
mkDictFromRedIRIS =
{ shortName, shortDescription, dictFileName, src }:
mkDict rec {
inherit src dictFileName;
version = "0.7";
name = "hunspell-dict-${shortName}-rediris-${version}";
readmeFile = "README.txt";
meta = with stdenv.lib; {
description = "Hunspell dictionary for ${shortDescription} from RedIRIS";
homepage = https://forja.rediris.es/projects/rla-es/;
license = with licenses; [ gpl3 lgpl3 mpl11 ];
maintainers = with maintainers; [ renzo ];
platforms = platforms.all;
};
};
mkDictFromDicollecte =
{ shortName, shortDescription, longDescription, dictFileName }:
mkDict rec {
inherit dictFileName;
version = "5.2";
name = "hunspell-dict-${shortName}-dicollecte-${version}";
readmeFile = "README_dict_fr.txt";
src = fetchurl {
url = "http://www.dicollecte.org/download/fr/hunspell-french-dictionaries-v${version}.zip";
sha256 = "c5863f7592a8c4defe8b4ed2b3b45f6f10ef265d34ae9881c1f3bbb3b80bdd02";
};
meta = with stdenv.lib; {
inherit longDescription;
description = "Hunspell dictionary for ${shortDescription} from Dicollecte";
homepage = http://www.dicollecte.org/home.php?prj=fr;
license = licenses.mpl20;
maintainers = with maintainers; [ renzo ];
platforms = platforms.all;
};
};
mkDictFromWordlist =
{ shortName, shortDescription, dictFileName, src }:
mkDict rec {
inherit src dictFileName;
version = "2014.11.17";
name = "hunspell-dict-${shortName}-wordlist-${version}";
readmeFile = "README_" + dictFileName + ".txt";
meta = with stdenv.lib; {
description = "Hunspell dictionary for ${shortDescription} from Wordlist";
homepage =http://wordlist.aspell.net/;
license = licenses.bsd3;
maintainers = with maintainers; [ renzo ];
platforms = platforms.all;
};
};
mkLinguistico =
{ shortName, shortDescription, dictFileName, src }:
mkDict rec {
inherit src dictFileName;
version = "2.4";
name = "hunspell-dict-${shortName}-linguistico-${version}";
readmeFile = dictFileName + "_README.txt";
meta = with stdenv.lib; {
homepage = http://sourceforge.net/projects/linguistico/;
license = licenses.gpl3;
maintainers = with maintainers; [ renzo ];
platforms = platforms.all;
};
};
in {
/* ENGLISH */
en-us = mkDictFromWordlist {
shortName = "en-us";
shortDescription = "English (United States)";
dictFileName = "en_US";
src = fetchurl {
url = mirror://sourceforge/wordlist/speller/2014.11.17/hunspell-en_US-2014.11.17.zip;
sha256 = "4ce88a1af457ce0e256110277a150e5da798213f611929438db059c1c81e20f2";
};
};
en-ca = mkDictFromWordlist {
shortName = "en-ca";
shortDescription = "English (Canada)";
dictFileName = "en_CA";
src = fetchurl {
url = mirror://sourceforge/wordlist/speller/2014.11.17/hunspell-en_CA-2014.11.17.zip;
sha256 = "59950448440657a6fc3ede15720c1b86c0b66c4ec734bf1bd9157f6a1786673b";
};
};
en-gb-ise = mkDictFromWordlist {
shortName = "en-gb-ise";
shortDescription = "English (United Kingdom, 'ise' ending)";
dictFileName = "en_GB-ise";
src = fetchurl {
url = mirror://sourceforge/wordlist/speller/2014.11.17/hunspell-en_GB-ise-2014.11.17.zip;
sha256 = "97f3b25102fcadd626ae4af3cdd97f017ce39264494f98b1f36ad7d96b9d5a94";
};
};
en-gb-ize = mkDictFromWordlist {
shortName = "en-gb-ize";
shortDescription = "English (United Kingdom, 'ize' ending)";
dictFileName = "en_GB-ize";
src = fetchurl {
url = mirror://sourceforge/wordlist/speller/2014.11.17/hunspell-en_GB-ize-2014.11.17.zip;
sha256 = "84270673ed7c014445f3ba02f9efdb0ac44cea9ee0bfec76e3e10feae55c4e1c";
};
};
/* SPANISH */
es-any = mkDictFromRedIRIS {
shortName = "es-any";
shortDescription = "Spanish (any variant)";
dictFileName = "es_ANY";
src = fetchurl {
url = http://forja.rediris.es/frs/download.php/2933/es_ANY.oxt;
md5 = "e3d4b38f280e7376178529db2ece982b";
};
};
es-ar = mkDictFromRedIRIS {
shortName = "es-ar";
shortDescription = "Spanish (Argentina)";
dictFileName = "es_AR";
src = fetchurl {
url = http://forja.rediris.es/frs/download.php/2953/es_AR.oxt;
md5 = "68ee8f4ebc89a1fa461045d4dbb9b7be";
};
};
es-bo = mkDictFromRedIRIS {
shortName = "es-bo";
shortDescription = "Spanish (Bolivia)";
dictFileName = "es_BO";
src = fetchurl {
url = http://forja.rediris.es/frs/download.php/2952/es_BO.oxt;
md5 = "1ebf11b6094e0bfece8e95cc34e7a409";
};
};
es-cl = mkDictFromRedIRIS {
shortName = "es-cl";
shortDescription = "Spanish (Chile)";
dictFileName = "es_CL";
src = fetchurl {
url = http://forja.rediris.es/frs/download.php/2951/es_CL.oxt;
md5 = "092a388101350b77af4fd789668582bd";
};
};
es-co = mkDictFromRedIRIS {
shortName = "es-co";
shortDescription = "Spanish (Colombia)";
dictFileName = "es_CO";
src = fetchurl {
url = http://forja.rediris.es/frs/download.php/2950/es_CO.oxt;
md5 = "fc440fd9fc55ca2dfb9bfa34a1e63864";
};
};
es-cr = mkDictFromRedIRIS {
shortName = "es-cr";
shortDescription = "Spanish (Costra Rica)";
dictFileName = "es_CR";
src = fetchurl {
url = http://forja.rediris.es/frs/download.php/2949/es_CR.oxt;
md5 = "7510fd0f4eb3c6e65523a8d0960f77dd";
};
};
es-cu = mkDictFromRedIRIS {
shortName = "es-cu";
shortDescription = "Spanish (Cuba)";
dictFileName = "es_CU";
src = fetchurl {
url = http://forja.rediris.es/frs/download.php/2948/es_CU.oxt;
md5 = "0ab4b9638f58ddd3d95d1265918ff39e";
};
};
es-do = mkDictFromRedIRIS {
shortName = "es-do";
shortDescription = "Spanish (Dominican Republic)";
dictFileName = "es_DO";
src = fetchurl {
url = http://forja.rediris.es/frs/download.php/2947/es_DO.oxt;
md5 = "24a20fd4d887693afef539e6f1a3b58e";
};
};
es-ec = mkDictFromRedIRIS {
shortName = "es-ec";
shortDescription = "Spanish (Ecuador)";
dictFileName = "es_EC";
src = fetchurl {
url = http://forja.rediris.es/frs/download.php/2946/es_EC.oxt;
md5 = "5d7343a246323ceda58cfbbf1428e279";
};
};
es-es = mkDictFromRedIRIS {
shortName = "es-es";
shortDescription = "Spanish (Spain)";
dictFileName = "es_ES";
src = fetchurl {
url = http://forja.rediris.es/frs/download.php/2945/es_ES.oxt;
md5 = "59dd45e6785ed644adbbd73f4f126182";
};
};
es-gt = mkDictFromRedIRIS {
shortName = "es-gt";
shortDescription = "Spanish (Guatemala)";
dictFileName = "es_GT";
src = fetchurl {
url = http://forja.rediris.es/frs/download.php/2944/es_GT.oxt;
md5 = "b1a9be80687e3117c67ac46aad6b8d66";
};
};
es-hn = mkDictFromRedIRIS {
shortName = "es-hn";
shortDescription = "Spanish (Honduras)";
dictFileName = "es_HN";
src = fetchurl {
url = http://forja.rediris.es/frs/download.php/2943/es_HN.oxt;
md5 = "d0db5bebd6925738b524de9709950f22";
};
};
es-mx = mkDictFromRedIRIS {
shortName = "es-mx";
shortDescription = "Spanish (Mexico)";
dictFileName = "es_MX";
src = fetchurl {
url = http://forja.rediris.es/frs/download.php/2942/es_MX.oxt;
md5 = "0de780714f84955112f38f35fb63a894";
};
};
es-ni = mkDictFromRedIRIS {
shortName = "es-ni";
shortDescription = "Spanish (Nicaragua)";
dictFileName = "es_NI";
src = fetchurl {
url = http://forja.rediris.es/frs/download.php/2941/es_NI.oxt;
md5 = "d259d7be17c34df76c7de40c80720a39";
};
};
es-pa = mkDictFromRedIRIS {
shortName = "es-pa";
shortDescription = "Spanish (Panama)";
dictFileName = "es_PA";
src = fetchurl {
url = http://forja.rediris.es/frs/download.php/2940/es_PA.oxt;
md5 = "085fbdbed6a2e248630c801881563b7a";
};
};
es-pe = mkDictFromRedIRIS {
shortName = "es-pe";
shortDescription = "Spanish (Peru)";
dictFileName = "es_PE";
src = fetchurl {
url = http://forja.rediris.es/frs/download.php/2939/es_PE.oxt;
md5 = "f4673063246888995d4eaa2d4a24ee3d";
};
};
es-pr = mkDictFromRedIRIS {
shortName = "es-pr";
shortDescription = "Spanish (Puerto Rico)";
dictFileName = "es_PR";
src = fetchurl {
url = http://forja.rediris.es/frs/download.php/2938/es_PR.oxt;
md5 = "e67bcf891ba9eeaeb57a60ec8e57f1ac";
};
};
es-py = mkDictFromRedIRIS {
shortName = "es-py";
shortDescription = "Spanish (Paraguay)";
dictFileName = "es_PY";
src = fetchurl {
url = http://forja.rediris.es/frs/download.php/2937/es_PY.oxt;
md5 = "ba98e3197c81db4c572def2c5cca942d";
};
};
es-sv = mkDictFromRedIRIS {
shortName = "es-sv";
shortDescription = "Spanish (El Salvador)";
dictFileName = "es_SV";
src = fetchurl {
url = http://forja.rediris.es/frs/download.php/2936/es_SV.oxt;
md5 = "c68ca9d188cb23c88cdd34a069c5a013";
};
};
es-uy = mkDictFromRedIRIS {
shortName = "es-uy";
shortDescription = "Spanish (Uruguay)";
dictFileName = "es_UY";
src = fetchurl {
url = http://forja.rediris.es/frs/download.php/2935/es_UY.oxt;
md5 = "aeb9d39e4d17e9c904c1f3567178aad6";
};
};
es-ve = mkDictFromRedIRIS {
shortName = "es-ve";
shortDescription = "Spanish (Venezuela)";
dictFileName = "es_VE";
src = fetchurl {
url = http://forja.rediris.es/frs/download.php/2934/es_VE.oxt;
md5 = "8afa9619aede2d9708e799e0f5d0fcab";
};
};
/* FRENCH */
fr-any = mkDictFromDicollecte {
shortName = "fr-any";
dictFileName = "fr-toutesvariantes";
shortDescription = "French (any variant)";
longDescription = ''
Ce dictionnaire contient les nouvelles et les anciennes graphies des
mots concernés par la réforme de 1990.
'';
};
fr-classique = mkDictFromDicollecte {
shortName = "fr-classique";
dictFileName = "fr-classique";
shortDescription = "French (classic)";
longDescription = ''
Ce dictionnaire est une extension du dictionnaire «Moderne» et propose
en sus des graphies alternatives, parfois encore très usitées, parfois
tombées en désuétude.
'';
};
fr-moderne = mkDictFromDicollecte {
shortName = "fr-moderne";
dictFileName = "fr-moderne";
shortDescription = "French (modern)";
longDescription = ''
Ce dictionnaire propose une sélection des graphies classiques et
réformées, suivant la lente évolution de lorthographe actuelle. Ce
dictionnaire contient les graphies les moins polémiques de la réforme.
'';
};
fr-reforme1990 = mkDictFromDicollecte {
shortName = "fr-reforme1990";
dictFileName = "fr-reforme1990";
shortDescription = "French (1990 reform)";
longDescription = ''
Ce dictionnaire ne connaît que les graphies nouvelles des mots concernés
par la réforme de 1990.
'';
};
/* ITALIAN */
it-it = mkLinguistico rec {
shortName = "it-it";
dictFileName = "it_IT";
shortDescription = "Hunspell dictionary for 'Italian (Italy)' from Linguistico";
src = fetchurl {
url = mirror://sourceforge/linguistico/italiano_2_4_2007_09_01.zip;
md5 = "e7fbd9e2dfb25ea3288cdb918e1e1260";
};
};
}

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, unzip, xlibs, libjpeg}:
{ stdenv, fetchurl, unzip, xlibs, libjpeg }:
stdenv.mkDerivation rec {
name = "jasper-1.900.1";
@ -9,8 +9,11 @@ stdenv.mkDerivation rec {
};
patches = [
./jasper-CVE-2014-8137-variant2.diff ./jasper-CVE-2014-8137-noabort.diff
./jasper-CVE-2014-8137-variant2.diff
./jasper-CVE-2014-8137-noabort.diff
./jasper-CVE-2014-8138.diff
./jasper-CVE-2014-8157.diff
./jasper-CVE-2014-8158.diff
./jasper-CVE-2014-9029.diff
];

View file

@ -0,0 +1,12 @@
diff -up jasper-1.900.1/src/libjasper/jpc/jpc_dec.c.CVE-2014-8157 jasper-1.900.1/src/libjasper/jpc/jpc_dec.c
--- jasper-1.900.1/src/libjasper/jpc/jpc_dec.c.CVE-2014-8157 2015-01-19 16:59:36.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_dec.c 2015-01-19 17:07:41.609863268 +0100
@@ -489,7 +489,7 @@ static int jpc_dec_process_sot(jpc_dec_t
dec->curtileendoff = 0;
}
- if (JAS_CAST(int, sot->tileno) > dec->numtiles) {
+ if (JAS_CAST(int, sot->tileno) >= dec->numtiles) {
jas_eprintf("invalid tile number in SOT marker segment\n");
return -1;
}

View file

@ -0,0 +1,329 @@
diff -up jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c.CVE-2014-8158 jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c
--- jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c.CVE-2014-8158 2015-01-19 17:25:28.730195502 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c 2015-01-19 17:27:20.214663127 +0100
@@ -306,11 +306,7 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in
{
int bufsize = JPC_CEILDIVPOW2(numcols, 1);
-#if !defined(HAVE_VLA)
jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE];
-#else
- jpc_fix_t splitbuf[bufsize];
-#endif
jpc_fix_t *buf = splitbuf;
register jpc_fix_t *srcptr;
register jpc_fix_t *dstptr;
@@ -318,7 +314,6 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in
register int m;
int hstartcol;
-#if !defined(HAVE_VLA)
/* Get a buffer. */
if (bufsize > QMFB_SPLITBUFSIZE) {
if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
@@ -326,7 +321,6 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in
abort();
}
}
-#endif
if (numcols >= 2) {
hstartcol = (numcols + 1 - parity) >> 1;
@@ -360,12 +354,10 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in
}
}
-#if !defined(HAVE_VLA)
/* If the split buffer was allocated on the heap, free this memory. */
if (buf != splitbuf) {
jas_free(buf);
}
-#endif
}
@@ -374,11 +366,7 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in
{
int bufsize = JPC_CEILDIVPOW2(numrows, 1);
-#if !defined(HAVE_VLA)
jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE];
-#else
- jpc_fix_t splitbuf[bufsize];
-#endif
jpc_fix_t *buf = splitbuf;
register jpc_fix_t *srcptr;
register jpc_fix_t *dstptr;
@@ -386,7 +374,6 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in
register int m;
int hstartcol;
-#if !defined(HAVE_VLA)
/* Get a buffer. */
if (bufsize > QMFB_SPLITBUFSIZE) {
if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
@@ -394,7 +381,6 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in
abort();
}
}
-#endif
if (numrows >= 2) {
hstartcol = (numrows + 1 - parity) >> 1;
@@ -428,12 +414,10 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in
}
}
-#if !defined(HAVE_VLA)
/* If the split buffer was allocated on the heap, free this memory. */
if (buf != splitbuf) {
jas_free(buf);
}
-#endif
}
@@ -442,11 +426,7 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a,
{
int bufsize = JPC_CEILDIVPOW2(numrows, 1);
-#if !defined(HAVE_VLA)
jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE * JPC_QMFB_COLGRPSIZE];
-#else
- jpc_fix_t splitbuf[bufsize * JPC_QMFB_COLGRPSIZE];
-#endif
jpc_fix_t *buf = splitbuf;
jpc_fix_t *srcptr;
jpc_fix_t *dstptr;
@@ -457,7 +437,6 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a,
int m;
int hstartcol;
-#if !defined(HAVE_VLA)
/* Get a buffer. */
if (bufsize > QMFB_SPLITBUFSIZE) {
if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
@@ -465,7 +444,6 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a,
abort();
}
}
-#endif
if (numrows >= 2) {
hstartcol = (numrows + 1 - parity) >> 1;
@@ -517,12 +495,10 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a,
}
}
-#if !defined(HAVE_VLA)
/* If the split buffer was allocated on the heap, free this memory. */
if (buf != splitbuf) {
jas_free(buf);
}
-#endif
}
@@ -531,11 +507,7 @@ void jpc_qmfb_split_colres(jpc_fix_t *a,
{
int bufsize = JPC_CEILDIVPOW2(numrows, 1);
-#if !defined(HAVE_VLA)
jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE * JPC_QMFB_COLGRPSIZE];
-#else
- jpc_fix_t splitbuf[bufsize * numcols];
-#endif
jpc_fix_t *buf = splitbuf;
jpc_fix_t *srcptr;
jpc_fix_t *dstptr;
@@ -546,7 +518,6 @@ void jpc_qmfb_split_colres(jpc_fix_t *a,
int m;
int hstartcol;
-#if !defined(HAVE_VLA)
/* Get a buffer. */
if (bufsize > QMFB_SPLITBUFSIZE) {
if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
@@ -554,7 +525,6 @@ void jpc_qmfb_split_colres(jpc_fix_t *a,
abort();
}
}
-#endif
if (numrows >= 2) {
hstartcol = (numrows + 1 - parity) >> 1;
@@ -606,12 +576,10 @@ void jpc_qmfb_split_colres(jpc_fix_t *a,
}
}
-#if !defined(HAVE_VLA)
/* If the split buffer was allocated on the heap, free this memory. */
if (buf != splitbuf) {
jas_free(buf);
}
-#endif
}
@@ -619,18 +587,13 @@ void jpc_qmfb_join_row(jpc_fix_t *a, int
{
int bufsize = JPC_CEILDIVPOW2(numcols, 1);
-#if !defined(HAVE_VLA)
jpc_fix_t joinbuf[QMFB_JOINBUFSIZE];
-#else
- jpc_fix_t joinbuf[bufsize];
-#endif
jpc_fix_t *buf = joinbuf;
register jpc_fix_t *srcptr;
register jpc_fix_t *dstptr;
register int n;
int hstartcol;
-#if !defined(HAVE_VLA)
/* Allocate memory for the join buffer from the heap. */
if (bufsize > QMFB_JOINBUFSIZE) {
if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
@@ -638,7 +601,6 @@ void jpc_qmfb_join_row(jpc_fix_t *a, int
abort();
}
}
-#endif
hstartcol = (numcols + 1 - parity) >> 1;
@@ -670,12 +632,10 @@ void jpc_qmfb_join_row(jpc_fix_t *a, int
++srcptr;
}
-#if !defined(HAVE_VLA)
/* If the join buffer was allocated on the heap, free this memory. */
if (buf != joinbuf) {
jas_free(buf);
}
-#endif
}
@@ -684,18 +644,13 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int
{
int bufsize = JPC_CEILDIVPOW2(numrows, 1);
-#if !defined(HAVE_VLA)
jpc_fix_t joinbuf[QMFB_JOINBUFSIZE];
-#else
- jpc_fix_t joinbuf[bufsize];
-#endif
jpc_fix_t *buf = joinbuf;
register jpc_fix_t *srcptr;
register jpc_fix_t *dstptr;
register int n;
int hstartcol;
-#if !defined(HAVE_VLA)
/* Allocate memory for the join buffer from the heap. */
if (bufsize > QMFB_JOINBUFSIZE) {
if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
@@ -703,7 +658,6 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int
abort();
}
}
-#endif
hstartcol = (numrows + 1 - parity) >> 1;
@@ -735,12 +689,10 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int
++srcptr;
}
-#if !defined(HAVE_VLA)
/* If the join buffer was allocated on the heap, free this memory. */
if (buf != joinbuf) {
jas_free(buf);
}
-#endif
}
@@ -749,11 +701,7 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a,
{
int bufsize = JPC_CEILDIVPOW2(numrows, 1);
-#if !defined(HAVE_VLA)
jpc_fix_t joinbuf[QMFB_JOINBUFSIZE * JPC_QMFB_COLGRPSIZE];
-#else
- jpc_fix_t joinbuf[bufsize * JPC_QMFB_COLGRPSIZE];
-#endif
jpc_fix_t *buf = joinbuf;
jpc_fix_t *srcptr;
jpc_fix_t *dstptr;
@@ -763,7 +711,6 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a,
register int i;
int hstartcol;
-#if !defined(HAVE_VLA)
/* Allocate memory for the join buffer from the heap. */
if (bufsize > QMFB_JOINBUFSIZE) {
if (!(buf = jas_alloc2(bufsize, JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) {
@@ -771,7 +718,6 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a,
abort();
}
}
-#endif
hstartcol = (numrows + 1 - parity) >> 1;
@@ -821,12 +767,10 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a,
srcptr += JPC_QMFB_COLGRPSIZE;
}
-#if !defined(HAVE_VLA)
/* If the join buffer was allocated on the heap, free this memory. */
if (buf != joinbuf) {
jas_free(buf);
}
-#endif
}
@@ -835,11 +779,7 @@ void jpc_qmfb_join_colres(jpc_fix_t *a,
{
int bufsize = JPC_CEILDIVPOW2(numrows, 1);
-#if !defined(HAVE_VLA)
jpc_fix_t joinbuf[QMFB_JOINBUFSIZE * JPC_QMFB_COLGRPSIZE];
-#else
- jpc_fix_t joinbuf[bufsize * numcols];
-#endif
jpc_fix_t *buf = joinbuf;
jpc_fix_t *srcptr;
jpc_fix_t *dstptr;
@@ -849,7 +789,6 @@ void jpc_qmfb_join_colres(jpc_fix_t *a,
register int i;
int hstartcol;
-#if !defined(HAVE_VLA)
/* Allocate memory for the join buffer from the heap. */
if (bufsize > QMFB_JOINBUFSIZE) {
if (!(buf = jas_alloc3(bufsize, numcols, sizeof(jpc_fix_t)))) {
@@ -857,7 +796,6 @@ void jpc_qmfb_join_colres(jpc_fix_t *a,
abort();
}
}
-#endif
hstartcol = (numrows + 1 - parity) >> 1;
@@ -907,12 +845,10 @@ void jpc_qmfb_join_colres(jpc_fix_t *a,
srcptr += numcols;
}
-#if !defined(HAVE_VLA)
/* If the join buffer was allocated on the heap, free this memory. */
if (buf != joinbuf) {
jas_free(buf);
}
-#endif
}

View file

@ -6,7 +6,10 @@ stdenv.mkDerivation rec {
name = "ldb-1.1.19";
src = fetchurl {
url = "http://samba.org/ftp/ldb/${name}.tar.gz";
urls = [
"http://samba.org/ftp/ldb/${name}.tar.gz"
"http://distfiles.exherbo.org/distfiles/${name}.tar.gz"
];
sha256 = "1p2815z9sjack08pcdbv4xzp1fvr4lxcn30rj0wh3py4ly6ji1h0";
};

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, libgcrypt}:
{ stdenv, fetchurl, libgcrypt, yacc, flex }:
# library that allows libbluray to play AACS protected bluray disks
# libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info.
@ -9,7 +9,7 @@
let baseName = "libaacs";
version = "0.3.0";
version = "0.8.0";
in
stdenv.mkDerivation {
@ -17,14 +17,17 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://download.videolan.org/pub/videolan/${baseName}/${version}/${baseName}-${version}.tar.bz2";
sha256 = "bf92dab1a6a8ee08a55e8cf347c2cda49e6535b52e85bb1e92e1cfcc8ecec22c";
sha256 = "155sah8z4vbp6j3sq9b17mcn6rj1938ijszz97m8pd2cgif58i2y";
};
buildInputs = [libgcrypt];
buildInputs = [ libgcrypt ];
meta = {
nativeBuildInputs = [ yacc flex ];
meta = with stdenv.lib; {
homepage = http://www.videolan.org/developers/libbluray.html;
description = "Library to access Blu-Ray disks for video playback";
license = stdenv.lib.licenses.lgpl21;
license = licenses.lgpl21;
maintainers = with maintainers; [ abbradar ];
};
}

View file

@ -1,80 +0,0 @@
diff --git a/src/libbluray/bdnav/navigation.c b/src/libbluray/bdnav/navigation.c
index c8dc307..26d0000 100644
--- a/src/libbluray/bdnav/navigation.c
+++ b/src/libbluray/bdnav/navigation.c
@@ -32,9 +32,25 @@
#include <stdlib.h>
#include <string.h>
+static int _stream_cmp(MPLS_STREAM *a, MPLS_STREAM *b)
+{
+ if (a->stream_type == b->stream_type &&
+ a->coding_type == b->coding_type &&
+ a->pid == b->pid &&
+ a->subpath_id == b->subpath_id &&
+ a->subclip_id == b->subclip_id &&
+ a->format == b->format &&
+ a->rate == b->rate &&
+ a->char_code == b->char_code &&
+ memcmp(a->lang, b->lang, 4) == 0) {
+ return 1;
+ }
+ return 0;
+}
+
static int _filter_dup(MPLS_PL *pl_list[], unsigned count, MPLS_PL *pl)
{
- unsigned ii, jj;
+ unsigned ii, jj, kk;
for (ii = 0; ii < count; ii++) {
if (pl->list_count != pl_list[ii]->list_count) {
@@ -54,7 +70,48 @@ static int _filter_dup(MPLS_PL *pl_list[], unsigned count, MPLS_PL *pl)
pi1->out_time != pi2->out_time) {
break;
}
+ if (pi1->stn.num_video != pi2->stn.num_video ||
+ pi1->stn.num_audio != pi2->stn.num_audio ||
+ pi1->stn.num_pg != pi2->stn.num_pg ||
+ pi1->stn.num_ig != pi2->stn.num_ig ||
+ pi1->stn.num_secondary_audio != pi2->stn.num_secondary_audio ||
+ pi1->stn.num_secondary_video != pi2->stn.num_secondary_video) {
+ break;
+ }
+ for (kk = 0; kk < pi1->stn.num_video; kk++) {
+ if (!_stream_cmp(&pi1->stn.video[kk], &pi2->stn.video[kk])) {
+ goto next;
+ }
+ }
+ for (kk = 0; kk < pi1->stn.num_audio; kk++) {
+ if (!_stream_cmp(&pi1->stn.audio[kk], &pi2->stn.audio[kk])) {
+ goto next;
+ }
+ }
+ for (kk = 0; kk < pi1->stn.num_pg; kk++) {
+ if (!_stream_cmp(&pi1->stn.pg[kk], &pi2->stn.pg[kk])) {
+ goto next;
+ }
+ }
+ for (kk = 0; kk < pi1->stn.num_ig; kk++) {
+ if (!_stream_cmp(&pi1->stn.ig[kk], &pi2->stn.ig[kk])) {
+ goto next;
+ }
+ }
+ for (kk = 0; kk < pi1->stn.num_secondary_audio; kk++) {
+ if (!_stream_cmp(&pi1->stn.secondary_audio[kk],
+ &pi2->stn.secondary_audio[kk])) {
+ goto next;
+ }
+ }
+ for (kk = 0; kk < pi1->stn.num_secondary_video; kk++) {
+ if (!_stream_cmp(&pi1->stn.secondary_video[kk],
+ &pi2->stn.secondary_video[kk])) {
+ goto next;
+ }
+ }
}
+next:
if (jj != pl->list_count) {
continue;
}

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig
{ stdenv, fetchurl, pkgconfig, fontconfig
, withAACS ? false, libaacs ? null, jdk ? null, ant ? null
, withMetadata ? true, libxml2 ? null
, withFonts ? true, freetype ? null
@ -13,12 +13,12 @@ assert withFonts -> freetype != null;
stdenv.mkDerivation rec {
baseName = "libbluray";
version = "0.6.2";
version = "0.7.0";
name = "${baseName}-${version}";
src = fetchurl {
url = "ftp://ftp.videolan.org/pub/videolan/${baseName}/${version}/${name}.tar.bz2";
sha256 = "1l2wr9mwz5pikqxlxkjfw3rwz0l1j0n7x9hl80sfiqm1lk41194c";
sha256 = "13dngs4b4cv29f6b825dq14n77mfhvk1kjb42axpq494pfgyp6zp";
};
nativeBuildInputs = with stdenv.lib;
@ -27,7 +27,8 @@ stdenv.mkDerivation rec {
;
buildInputs = with stdenv.lib;
optionals withAACS [jdk libaacs]
[fontconfig]
++ optionals withAACS [jdk libaacs]
++ optional withMetadata libxml2
++ optional withFonts freetype
;

View file

@ -1,51 +0,0 @@
{ lib, stdenv, fetchurl, libcxx, coreutils, gnused }:
let rev = "199626"; in
stdenv.mkDerivation {
name = "libc++abi-${rev}";
src = fetchurl {
url = "http://tarballs.nixos.org/libcxxabi-${rev}.tar.bz2";
sha256 = "09wr6qwgmdzbmgfkdzfhph9giy0zd6fp3s017fcfy4g0prjn5s4c";
};
patches = [ ./no-stdc++.patch ./darwin.patch ];
buildInputs = [ coreutils ];
postUnpack = ''
unpackFile ${libcxx.src}
cp -r libcxx-*/include libcxxabi*/
'' + lib.optionalString stdenv.isDarwin ''
export TRIPLE=x86_64-apple-darwin
# Hack: NIX_CFLAGS_COMPILE doesn't work here because clang++ isn't
# wrapped at this point.
export CXX="clang++ -D_LIBCXX_DYNAMIC_FALLBACK=1"
unset SDKROOT
'';
installPhase = if stdenv.isDarwin
then ''
install -d -m 755 $out/include $out/lib
install -m 644 lib/libc++abi.dylib $out/lib
install -m 644 include/cxxabi.h $out/include
''
else ''
install -d -m 755 $out/include $out/lib
install -m 644 lib/libc++abi.so.1.0 $out/lib
install -m 644 include/cxxabi.h $out/include
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
'';
buildPhase = "(cd lib; ./buildit)";
meta = {
homepage = http://libcxxabi.llvm.org/;
description = "A new implementation of low level support for a standard C++ library";
license = "BSD";
maintainers = with stdenv.lib.maintainers; [ shlevy vlstill ];
platforms = stdenv.lib.platforms.unix;
};
}

View file

@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="libe-book";
version="0.1.1";
version="0.1.2";
name="${baseName}-${version}";
hash="0awv96q92qgxk22w2vrf4vg90cab5qfsrkbhgz252722mrkd5p4a";
url="mirror://sourceforge/project/libebook/libe-book-0.1.1/libe-book-0.1.1.tar.xz";
sha256="0awv96q92qgxk22w2vrf4vg90cab5qfsrkbhgz252722mrkd5p4a";
hash="1v48pd32r2pfysr3a3igc4ivcf6vvb26jq4pdkcnq75p70alp2bz";
url="mirror://sourceforge/project/libebook/libe-book-0.1.2/libe-book-0.1.2.tar.xz";
sha256="1v48pd32r2pfysr3a3igc4ivcf6vvb26jq4pdkcnq75p70alp2bz";
};
buildInputs = [
gperf pkgconfig librevenge libxml2 boost icu cppunit

View file

@ -5,12 +5,10 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = "git://anongit.freedesktop.org/libfprint/libfprint";
rev = "35e356f625d254f44c14f720c0eb9216297d35c2";
sha256 = "b7fd74a914d7c4e2999ac20432a7f2af5d6c7af5e75a367bc3babe03e4576c86";
rev = "a3c90f2b24434aa36f782aca3950fd89af01fce0";
sha256 = "01qa58vq299xzxzxrcqkl51k8396wh56674d9wjmkv2msxx877hi";
};
patches = [ ./0001-lib-Add-VFS5011-driver.patch ];
buildInputs = [ libusb glib nss nspr pixman ];
nativeBuildInputs = [ libtool autoconf automake113x pkgconfig ];

View file

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
sha256 = "1ww6d6myir37fm6pk0n77kdx5hi13yaiymxcs9mf97amdyl58cgw";
sha256 = "154qs3j1k72xn8p5vgjcwvywkskxz0j145cgvlcw7d5xfwr1jq3j";
};
nativeBuildInputs = [ pkgconfig gettext ];
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
MTP, and other vendor specific protocols for controlling and transferring data
from digital cameras.
'';
version = "2.5.6";
version = "2.5.7";
# XXX: the homepage claims LGPL, but several src files are lgpl21Plus
license = stdenv.lib.licenses.lgpl21Plus;
platforms = with stdenv.lib.platforms; unix;

Some files were not shown because too many files have changed in this diff Show more