Merge remote-tracking branch 'origin/master' into glibc-2.18

This commit is contained in:
Eelco Dolstra 2013-12-18 15:42:54 +01:00
commit 134ba27ea2
487 changed files with 5102 additions and 1831 deletions

View file

@ -225,4 +225,5 @@ in rec {
deepSeqList = xs: y: if any (x: deepSeq x false) xs then y else y; deepSeqList = xs: y: if any (x: deepSeq x false) xs then y else y;
crossLists = f: foldl (fs: args: concatMap (f: map f args) fs) [f];
} }

View file

@ -49,6 +49,7 @@
rickynils = "Rickard Nilsson <rickynils@gmail.com>"; rickynils = "Rickard Nilsson <rickynils@gmail.com>";
rob = "Rob Vermaas <rob.vermaas@gmail.com>"; rob = "Rob Vermaas <rob.vermaas@gmail.com>";
roconnor = "Russell O'Connor <roconnor@theorem.ca>"; roconnor = "Russell O'Connor <roconnor@theorem.ca>";
roelof = "Roelof Wobben <rwobben@hotmail.com>";
sander = "Sander van der Burg <s.vanderburg@tudelft.nl>"; sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";
shlevy = "Shea Levy <shea@shealevy.com>"; shlevy = "Shea Levy <shea@shealevy.com>";
simons = "Peter Simons <simons@cryp.to>"; simons = "Peter Simons <simons@cryp.to>";

View file

@ -494,7 +494,7 @@ module writers.</para>
<variablelist> <variablelist>
<varlistentry> <varlistentry>
<term><option>etc.environment</option></term> <term><option>environment.etc</option></term>
<listitem> <listitem>
<para>This set defines files in <filename>/etc</filename>. A <para>This set defines files in <filename>/etc</filename>. A
typical use is: typical use is:

View file

@ -108,6 +108,7 @@
haproxy = 97; haproxy = 97;
mongodb = 98; mongodb = 98;
openldap = 99; openldap = 99;
memcached = 100;
# When adding a uid, make sure it doesn't match an existing gid. # When adding a uid, make sure it doesn't match an existing gid.

View file

@ -170,6 +170,7 @@
./services/networking/minidlna.nix ./services/networking/minidlna.nix
./services/networking/nat.nix ./services/networking/nat.nix
./services/networking/networkmanager.nix ./services/networking/networkmanager.nix
./services/networking/ntopng.nix
./services/networking/ntpd.nix ./services/networking/ntpd.nix
./services/networking/oidentd.nix ./services/networking/oidentd.nix
./services/networking/openfire.nix ./services/networking/openfire.nix

View file

@ -68,8 +68,9 @@ in
config = mkIf config.services.memcached.enable { config = mkIf config.services.memcached.enable {
users.extraUsers = singleton users.extraUsers.memcached =
{ name = cfg.user; { name = cfg.user;
uid = config.ids.uids.memcached;
description = "Memcached server user"; description = "Memcached server user";
}; };

View file

@ -211,6 +211,7 @@ in
# Shut down Postgres using SIGINT ("Fast Shutdown mode"). See # Shut down Postgres using SIGINT ("Fast Shutdown mode"). See
# http://www.postgresql.org/docs/current/static/server-shutdown.html # http://www.postgresql.org/docs/current/static/server-shutdown.html
KillSignal = "SIGINT"; KillSignal = "SIGINT";
KillMode = "process"; # FIXME: this may cause processes to be left behind in the cgroup even after the final SIGKILL
# Give Postgres a decent amount of time to clean up after # Give Postgres a decent amount of time to clean up after
# receiving systemd's SIGINT. # receiving systemd's SIGINT.

View file

@ -51,7 +51,10 @@ in
hostName = mkOption { hostName = mkOption {
type = types.str; type = types.str;
description = ''Host name advertised on the LAN.''; description = ''
Host name advertised on the LAN. If not set, avahi will use the value
of config.networking.hostName.
'';
}; };
browseDomains = mkOption { browseDomains = mkOption {

View file

@ -86,7 +86,7 @@ in
}; };
web = mkOption { web = mkOption {
default = "web, web=checkip.dyndns.com/, web-skip='IP Address'" ; default = "web, web=checkip.dyndns.com/, web-skip='Current IP Address: '" ;
description = ""; description = "";
}; };

View file

@ -0,0 +1,116 @@
{ config, pkgs, ... }:
with pkgs.lib;
let
cfg = config.services.ntopng;
redisCfg = config.services.redis;
configFile = if cfg.configText != "" then
pkgs.writeText "ntopng.conf" ''
${cfg.configText}
''
else
pkgs.writeText "ntopng.conf" ''
${concatStringsSep " " (map (e: "--interface=" + e) cfg.interfaces)}
--http-port=${toString cfg.http-port}
--redis=localhost:${toString redisCfg.port}
${cfg.extraConfig}
'';
in
{
options = {
services.ntopng = {
enable = mkOption {
default = false;
type = types.bool;
description = ''
Enable ntopng, a high-speed web-based traffic analysis and flow
collection tool.
With the default configuration, ntopng monitors all network
interfaces and displays its findings at http://localhost:${toString
cfg.http-port}. Default username and password is admin/admin.
See the ntopng(8) manual page and http://www.ntop.org/products/ntop/
for more info.
Note that enabling ntopng will also enable redis (key-value
database server) for persistent data storage.
'';
};
interfaces = mkOption {
default = [ "any" ];
example = [ "eth0" "wlan0" ];
type = types.listOf types.str;
description = ''
List of interfaces to monitor. Use "any" to monitor all interfaces.
'';
};
http-port = mkOption {
default = 3000;
type = types.uniq types.int;
description = ''
Sets the HTTP port of the embedded web server.
'';
};
configText = mkOption {
default = "";
example = ''
--interface=any
--http-port=3000
--disable-login
'';
type = types.lines;
description = ''
Overridable configuration file contents to use for ntopng. By
default, use the contents automatically generated by NixOS.
'';
};
extraConfig = mkOption {
default = "";
type = types.lines;
description = ''
Configuration lines that will be appended to the generated ntopng
configuration file. Note that this mechanism does not work when the
manual <option>configText</option> option is used.
'';
};
};
};
config = mkIf cfg.enable {
# ntopng uses redis for data storage
services.redis.enable = true;
# nice to have manual page and ntopng command in PATH
environment.systemPackages = [ pkgs.ntopng ];
systemd.services.ntopng = {
description = "Ntopng Network Monitor";
requires = [ "redis.service" ];
after = [ "network.target" "redis.service" ];
wantedBy = [ "multi-user.target" ];
preStart = "mkdir -p /var/lib/ntopng/";
serviceConfig.ExecStart = "${pkgs.ntopng}/bin/ntopng ${configFile}";
unitConfig.Documentation = "man:ntopng(8)";
};
# ntopng drops priveleges to user "nobody" and that user is already defined
# in users-groups.nix.
};
}

View file

@ -106,7 +106,7 @@ in
serviceConfig = serviceConfig =
{ ExecStart = "${pkgs.fail2ban}/bin/fail2ban-server -f"; { ExecStart = "${pkgs.fail2ban}/bin/fail2ban-server -f";
ReadOnlyDirectories = "/"; ReadOnlyDirectories = "/";
ReadWriteDirectories = "/run/fail2ban /var/tmp"; ReadWriteDirectories = "/run /var/tmp";
CapabilityBoundingSet = "CAP_DAC_READ_SEARCH CAP_NET_ADMIN CAP_NET_RAW"; CapabilityBoundingSet = "CAP_DAC_READ_SEARCH CAP_NET_ADMIN CAP_NET_RAW";
}; };

View file

@ -17,6 +17,7 @@ in
./xmonad.nix ./xmonad.nix
./i3.nix ./i3.nix
./xbmc.nix ./xbmc.nix
./herbstluftwm.nix
]; ];
options = { options = {

View file

@ -0,0 +1,28 @@
{ config, pkgs, ... }:
with pkgs.lib;
let
cfg = config.services.xserver.windowManager.herbstluftwm;
in
{
options = {
services.xserver.windowManager.herbstluftwm.enable = mkOption {
type = types.bool;
default = false;
example = true;
description = "Enable the herbstluftwm window manager.";
};
};
config = mkIf cfg.enable {
services.xserver.windowManager.session = singleton {
name = "herbstluftwm";
start = "
${pkgs.herbstluftwm}/bin/herbstluftwm
";
};
environment.systemPackages = [ pkgs.herbstluftwm ];
};
}

View file

@ -0,0 +1,5 @@
{ config, pkgs, modulesPath, ... }:
{
imports = [ "${modulesPath}/virtualisation/google-compute-image.nix" ];
}

View file

@ -0,0 +1,155 @@
{ config, pkgs, ... }:
with pkgs.lib;
{
imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ];
system.build.googleComputeImage =
pkgs.vmTools.runInLinuxVM (
pkgs.runCommand "google-compute-image"
{ preVM =
''
mkdir $out
diskImage=$out/$diskImageBase
truncate $diskImage --size 10G
mv closure xchg/
'';
postVM =
''
PATH=$PATH:${pkgs.gnutar}/bin:${pkgs.gzip}/bin
pushd $out
tar -Szcf $diskImageBase.tar.gz $diskImageBase
rm $out/$diskImageBase
popd
'';
diskImageBase = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw";
buildInputs = [ pkgs.utillinux pkgs.perl ];
exportReferencesGraph =
[ "closure" config.system.build.toplevel ];
}
''
# Create partition table
${pkgs.parted}/sbin/parted /dev/vda mklabel msdos
${pkgs.parted}/sbin/parted /dev/vda mkpart primary ext4 1 10G
${pkgs.parted}/sbin/parted /dev/vda print
. /sys/class/block/vda1/uevent
mknod /dev/vda1 b $MAJOR $MINOR
# Create an empty filesystem and mount it.
${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda1
${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1
mkdir /mnt
mount /dev/vda1 /mnt
# The initrd expects these directories to exist.
mkdir /mnt/dev /mnt/proc /mnt/sys
mount --bind /proc /mnt/proc
mount --bind /dev /mnt/dev
mount --bind /sys /mnt/sys
# Copy all paths in the closure to the filesystem.
storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure)
mkdir -p /mnt/nix/store
echo "copying everything (will take a while)..."
cp -prd $storePaths /mnt/nix/store/
# Register the paths in the Nix database.
printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
chroot /mnt ${config.nix.package}/bin/nix-store --load-db
# Create the system profile to allow nixos-rebuild to work.
chroot /mnt ${config.nix.package}/bin/nix-env \
-p /nix/var/nix/profiles/system --set ${config.system.build.toplevel}
# `nixos-rebuild' requires an /etc/NIXOS.
mkdir -p /mnt/etc
touch /mnt/etc/NIXOS
# `switch-to-configuration' requires a /bin/sh
mkdir -p /mnt/bin
ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh
# Install a configuration.nix.
mkdir -p /mnt/etc/nixos /mnt/boot/grub
cp ${./google-compute-config.nix} /mnt/etc/nixos/configuration.nix
# Generate the GRUB menu.
ln -s vda /dev/sda
chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot
umount /mnt/proc /mnt/dev /mnt/sys
umount /mnt
''
);
fileSystems."/".label = "nixos";
boot.kernelParams = [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ];
boot.initrd.kernelModules = [ "virtio_scsi" ];
# Generate a GRUB menu. Amazon's pv-grub uses this to boot our kernel/initrd.
boot.loader.grub.device = "/dev/sda";
boot.loader.grub.timeout = 0;
# Don't put old configurations in the GRUB menu. The user has no
# way to select them anyway.
boot.loader.grub.configurationLimit = 0;
# Allow root logins only using the SSH key that the user specified
# at instance creation time.
services.openssh.enable = true;
services.openssh.permitRootLogin = "without-password";
# Force getting the hostname from Google Compute.
networking.hostName = mkDefault "";
# Always include cryptsetup so that NixOps can use it.
environment.systemPackages = [ pkgs.cryptsetup ];
# Prevent logging in as root without a password. This doesn't really matter,
# since the only PAM services that allow logging in with a null
# password are local ones that are inaccessible on Google Compute machines.
security.initialRootPassword = "!";
# Configure default metadata hostnames
networking.extraHosts = ''
169.254.169.254 metadata.google.internal metadata
'';
systemd.services.fetch-root-authorized-keys =
{ description = "Fetch authorized_keys for root user";
wantedBy = [ "multi-user.target" ];
before = [ "sshd.service" ];
after = [ "network.target" ];
path = [ pkgs.curl ];
script =
''
# Don't download the SSH key if it has already been downloaded
if ! [ -e /root/.ssh/authorized_keys ]; then
echo "obtaining SSH key..."
mkdir -p /root/.ssh
curl -o /root/authorized-keys-metadata http://metadata/0.1/meta-data/authorized-keys
if [ $? -eq 0 -a -e /root/authorized-keys-metadata ]; then
cat /root/authorized-keys-metadata | cut -d: -f2- > /root/key.pub
if ! grep -q -f /root/key.pub /root/.ssh/authorized_keys; then
cat /root/key.pub >> /root/.ssh/authorized_keys
echo "new key added to authorized_keys"
fi
chmod 600 /root/.ssh/authorized_keys
rm -f /root/key.pub /root/authorized-keys-metadata
fi
fi
'';
serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true;
};
}

View file

@ -107,6 +107,7 @@ in
# while still being used by the virtual machine. So update the # while still being used by the virtual machine. So update the
# emulator path on each startup to something valid (re-scan $PATH). # emulator path on each startup to something valid (re-scan $PATH).
for file in /etc/libvirt/qemu/*.xml; do for file in /etc/libvirt/qemu/*.xml; do
test -f "$file" || continue
# get (old) emulator path from config file # get (old) emulator path from config file
emulator=$(grep "^[[:space:]]*<emulator>" "$file" | sed 's,^[[:space:]]*<emulator>\(.*\)</emulator>.*,\1,') emulator=$(grep "^[[:space:]]*<emulator>" "$file" | sed 's,^[[:space:]]*<emulator>\(.*\)</emulator>.*,\1,')
# get a (definitely) working emulator path by re-scanning $PATH # get a (definitely) working emulator path by re-scanning $PATH

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "a2jmidid-${version}"; name = "a2jmidid-${version}";
version = "7"; version = "8";
src = fetchurl { src = fetchurl {
url = "http://download.gna.org/a2jmidid/${name}.tar.bz2"; url = "http://download.gna.org/a2jmidid/${name}.tar.bz2";
sha256 = "1pl91y7npirhmikzlizpbyx2vkfvdkvc6qvc2lv4capj3cp6ypx7"; sha256 = "0pzm0qk5ilqhwz74pydg1jwrds27vm47185dakdrxidb5bv3b5ia";
}; };
buildInputs = [ alsaLib dbus jackaudio pkgconfig python ]; buildInputs = [ alsaLib dbus jackaudio pkgconfig python ];

View file

@ -4,12 +4,12 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.0.4"; version = "2.0.5";
name = "audacity-${version}"; name = "audacity-${version}";
src = fetchurl { src = fetchurl {
url = "http://audacity.googlecode.com/files/audacity-minsrc-${version}.tar.xz"; url = "http://audacity.googlecode.com/files/audacity-minsrc-${version}.tar.xz";
sha256 = "0pl92filykzs4g2pn7i02kdqgja326wjgafzw2vcgwn3dwrs4avp"; sha256 = "0y9bvc3a3zxsk31yg7bha029mzkjiw5i9m86kbyj7x8ps0fm91z2";
}; };
preConfigure = /* we prefer system-wide libs */ '' preConfigure = /* we prefer system-wide libs */ ''
@ -33,5 +33,6 @@ stdenv.mkDerivation rec {
homepage = http://audacity.sourceforge.net; homepage = http://audacity.sourceforge.net;
license = "GPLv2+"; license = "GPLv2+";
platforms = with stdenv.lib.platforms; linux; platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [ the-kenny ];
}; };
} }

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bristol-${version}"; name = "bristol-${version}";
version = "0.60.10"; version = "0.60.11";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/bristol/${name}.tar.gz"; url = "mirror://sourceforge/bristol/${name}.tar.gz";
sha256 = "070rn5zdx6vrqmq7w1rrpxig3bxlylbsw82nlmkjnhjrgm6yx753"; sha256 = "1fi2m4gmvxdi260821y09lxsimq82yv4k5bbgk3kyc3x1nyhn7vx";
}; };
buildInputs = [ buildInputs = [

View file

@ -1,10 +1,10 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "caps-${version}"; name = "caps-${version}";
version = "0.9.7"; version = "0.9.16";
src = fetchurl { src = fetchurl {
url = "http://www.quitte.de/dsp/caps_${version}.tar.bz2"; url = "http://www.quitte.de/dsp/caps_${version}.tar.bz2";
sha256 = "0ks98r3j404s9h88x50lj5lj4l64ijj29fz5i08iyq8jrb7r0zm0"; sha256 = "117l04w2zwqak856lihmaxg6f22vlz71knpxy0axiyri0x82lbwv";
}; };
configurePhase = '' configurePhase = ''
echo "PREFIX = $out" > defines.make echo "PREFIX = $out" > defines.make

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "drumkv1-${version}"; name = "drumkv1-${version}";
version = "0.3.2"; version = "0.3.5";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
sha256 = "0bafg06iavri9dmg7hpz554kpqf1iv9crcdq46y4n4wyyxd7kajl"; sha256 = "125aa1lmmwjdbzyv13yaax4n6ni7h7v7c7clmjaz7bglzay7xq5w";
}; };
buildInputs = [ jackaudio libsndfile lv2 qt4 ]; buildInputs = [ jackaudio libsndfile lv2 qt4 ];

View file

@ -3,11 +3,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "fluidsynth-${version}"; name = "fluidsynth-${version}";
version = "1.1.5"; version = "1.1.6";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/fluidsynth/${name}.tar.bz2"; url = "mirror://sourceforge/fluidsynth/${name}.tar.bz2";
sha256 = "1x73a5rsyvfmh1j0484kzgnk251q61g1g2jdja673l8fizi0xd24"; sha256 = "00gn93bx4cz9bfwf3a8xyj2by7w23nca4zxf09ll53kzpzglg2yj";
}; };
preBuild = stdenv.lib.optionalString stdenv.isDarwin '' preBuild = stdenv.lib.optionalString stdenv.isDarwin ''

View file

@ -3,11 +3,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "jalv-${version}"; name = "jalv-${version}";
version = "1.4.0"; version = "1.4.2";
src = fetchurl { src = fetchurl {
url = "http://download.drobilla.net/${name}.tar.bz2"; url = "http://download.drobilla.net/${name}.tar.bz2";
sha256 = "1hq968fhiz86428krqhjl3vlw71bigc9bsfcv97zgvsjh0fh6qa0"; sha256 = "132cq347xpa91d9m7nnmpla7gz4xg0njfw7kzwnp0gz172k0klp7";
}; };
buildInputs = [ buildInputs = [

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk, alsaLib, libglade }: { stdenv, fetchurl, pkgconfig, intltool, gtk, alsaLib, libglade }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "lingot-0.9.0"; name = "lingot-0.9.1";
src = fetchurl { src = fetchurl {
url = mirror://savannah/lingot/lingot-0.9.0.tar.gz; url = mirror://savannah/lingot/lingot-0.9.1.tar.gz;
sha256 = "07z129lp8m4sz608q409wb11c639w7cbn497r7bscgg08p6c07xb"; sha256 = "0ygras6ndw2fylwxx86ac11pcr2y2bcfvvgiwrh92z6zncx254gc";
}; };
buildInputs = [ pkgconfig intltool gtk alsaLib libglade ]; buildInputs = [ pkgconfig intltool gtk alsaLib libglade ];

View file

@ -0,0 +1,21 @@
{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg, libvorbis, mpc, libsndfile, jackaudio, db4, libav, libmodplug, timidity, libid3tag, libtool }:
stdenv.mkDerivation rec {
name = "moc-${version}";
version = "2.5.0-beta1";
src = fetchurl {
url = "http://ftp.daper.net/pub/soft/moc/unstable/moc-${version}.tar.bz2";
sha256 = "076816da9c6d1e61a386a1dda5f63ee2fc84bc31e9011ef70acc1d391d4c46a6";
};
configurePhase = "./configure prefix=$out";
buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg libvorbis mpc libsndfile jackaudio db4 libav libmodplug timidity libid3tag libtool ];
meta = {
description = "MOC (music on console) is a console audio player for LINUX/UNIX designed to be powerful and easy to use.";
homepage = http://moc.daper.net/;
license = stdenv.lib.licenses.gpl2;
};
}

View file

@ -1,11 +1,11 @@
{stdenv, fetchurl, alsaLib }: {stdenv, fetchurl, alsaLib }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "mpg123-1.15.4"; name = "mpg123-1.16.0";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/mpg123/mpg123-1.15.4.tar.bz2; url = mirror://sourceforge/mpg123/mpg123-1.16.0.tar.bz2;
sha256 = "05aizspky9mp1bq2lfrkjzrsnjykl7gkbrhn93xcarj5b2izv1b8"; sha256 = "1lznnfdvg69a9qbbhvhfc9i86hxdmdqx67lvbkqbh8mmhpip43zh";
}; };
buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib; buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;

View file

@ -67,7 +67,7 @@ stdenv.mkDerivation {
ln -s $out/spotify-client/spotify $out/bin/spotify ln -s $out/spotify-client/spotify $out/bin/spotify
patchelf \ patchelf \
--interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
--set-rpath $out/spotify-client/Data:$out/lib:$out/spotify-client:${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver xlibs.libX11 qt4 alsaLib stdenv.gcc.gcc freetype glib pango cairo atk gdk_pixbuf gtk GConf cups sqlite]}:${stdenv.gcc.gcc}/lib64 \ --set-rpath $out/spotify-client/Data:$out/lib:$out/spotify-client:${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver xlibs.libX11 qt4 alsaLib stdenv.gcc.gcc freetype glib pango cairo atk gdk_pixbuf gtk GConf cups sqlite xlibs.libXdamage ]}:${stdenv.gcc.gcc}/lib64 \
$out/spotify-client/spotify $out/spotify-client/spotify
dpkg-deb -x ${qt4webkit} ./ dpkg-deb -x ${qt4webkit} ./
@ -78,7 +78,7 @@ stdenv.mkDerivation {
mkdir -p $out/libexec/spotify mkdir -p $out/libexec/spotify
gcc -shared ${./preload.c} -o $preload -ldl -DOUT=\"$out\" -fPIC gcc -shared ${./preload.c} -o $preload -ldl -DOUT=\"$out\" -fPIC
wrapProgram $out/bin/spotify --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ GConf libpng cups libgcrypt sqlite gst_plugins_base gstreamer]}:$out/lib" wrapProgram $out/bin/spotify --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ GConf libpng cups libgcrypt sqlite gst_plugins_base gstreamer xlibs.libXdamage ]}:$out/lib"
# Desktop file # Desktop file
mkdir -p "$out/share/applications/" mkdir -p "$out/share/applications/"

View file

@ -1,11 +1,11 @@
{stdenv, fetchurl, fltk13, ghostscript}: {stdenv, fetchurl, fltk13, ghostscript}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "flpsed-0.7.0"; name = "flpsed-0.7.1";
src = fetchurl { src = fetchurl {
url = "http://www.ecademix.com/JohannesHofmann/flpsed-0.7.0.tar.gz"; url = "http://www.ecademix.com/JohannesHofmann/flpsed-0.7.1.tar.gz";
sha1 = "7966fd3b6fb3aa2a376386533ed4421ebb66ad62"; sha256 = "16i3mjc1cdx2wiwfhnv3z2ywmjma9785vwl3l31izx9l51w7ngj3";
}; };
buildInputs = [ fltk13 ghostscript ]; buildInputs = [ fltk13 ghostscript ];

View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, gtk2, which, pkgconfig, intltool }: { stdenv, fetchurl, gtk2, which, pkgconfig, intltool }:
let let
version = "1.23"; version = "1.23.1";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "http://download.geany.org/${name}.tar.bz2"; url = "http://download.geany.org/${name}.tar.bz2";
sha256 = "1c78rggjaz9fa8gj25wka1sa3argvixnzrarmqvwh0s8d5ragm6d"; sha256 = "1bcgjxywggsljs9kq22kr9xpzrq5xr7pb9d1b71rwryqb5pb25c8";
}; };
buildInputs = [ gtk2 which pkgconfig intltool ]; buildInputs = [ gtk2 which pkgconfig intltool ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "hexedit-${version}"; name = "hexedit-${version}";
version = "1.2.12"; version = "1.2.13";
src = fetchurl { src = fetchurl {
url = "http://rigaux.org/${name}.src.tgz"; url = "http://rigaux.org/${name}.src.tgz";
sha256 = "bcffbf3d128516cc4e1da64485866fbb5f62754f2af8327e7a527855186ba10f"; sha256 = "1mwdp1ikk64cqmagnrrps5jkn3li3n47maiqh2qc1xbp1ains4ka";
}; };
buildInputs = [ ncurses ]; buildInputs = [ ncurses ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
pname = "nano"; pname = "nano";
version = "2.2.6"; version = "2.3.2";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/nano/${name}.tar.gz"; url = "mirror://gnu/nano/${name}.tar.gz";
sha256 = "0yp6pid67k8h7394spzw0067fl2r7rxm2b6kfccg87g8nlry2s5y"; sha256 = "1s3b21h5p7r8xafw0gahswj16ai6k2vnjhmd15b491hl0x494c7z";
}; };
buildInputs = [ ncurses gettext ]; buildInputs = [ ncurses gettext ];

View file

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
export DVIDecodeDelegate=${tetex}/bin/dvips export DVIDecodeDelegate=${tetex}/bin/dvips
'' else ""; '' else "";
configureFlags = "" + stdenv.lib.optionalString (ghostscript != null && stdenv.system != "x86_64-darwin") '' configureFlags = "" + stdenv.lib.optionalString (stdenv.system != "x86_64-darwin") ''
--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts --with-gs-font-dir=${ghostscript}/share/ghostscript/fonts
--with-gslib --with-gslib
'' + '' '' + ''
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = propagatedBuildInputs =
[ bzip2 fontconfig freetype libjpeg libpng libtiff libxml2 zlib librsvg [ bzip2 fontconfig freetype libjpeg libpng libtiff libxml2 zlib librsvg
libtool jasper libX11 libtool jasper libX11
] ++ stdenv.lib.optional (ghostscript != null && stdenv.system != "x86_64-darwin") ghostscript; ] ++ stdenv.lib.optional (stdenv.system != "x86_64-darwin") ghostscript;
buildInputs = [ tetex pkgconfig ]; buildInputs = [ tetex pkgconfig ];

View file

@ -1,11 +1,11 @@
{stdenv, fetchurl, cmake, libpng, libtiff, libjpeg, panotools, libxml2 }: {stdenv, fetchurl, cmake, libpng, libtiff, libjpeg, panotools, libxml2 }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "autopano-sift-C-2.5.0"; name = "autopano-sift-C-2.5.1";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/hugin/autopano-sift-C-2.5.0.tar.gz; url = mirror://sourceforge/hugin/autopano-sift-C-2.5.1.tar.gz;
sha256 = "0pvkapjg7qdkjg151wjc7islly9ag8fg6bj0g5nbllv981ixjql3"; sha256 = "0dqk8ff82gmy4v5ns5nr9gpzkc1p7c2y8c8fkid102r47wsjk44s";
}; };
buildInputs = [ cmake libpng libtiff libjpeg panotools libxml2 ]; buildInputs = [ cmake libpng libtiff libjpeg panotools libxml2 ];

View file

@ -4,11 +4,11 @@ liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost
shared_desktop_ontologies, marble, mysql }: shared_desktop_ontologies, marble, mysql }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "digikam-3.2.0"; name = "digikam-3.5.0";
src = fetchurl { src = fetchurl {
url = "http://download.kde.org/stable/digikam/${name}.tar.bz2"; url = "http://download.kde.org/stable/digikam/${name}.tar.bz2";
sha256 = "06j858d2nvbqh0bw6m60rh1bsws06fm5vfjpwwi3zxsf5ka08wmx"; sha256 = "0an4awlg0b8pwl6v8p5zfl3aghgnxck2pc322cyk6i6yznj2mgap";
}; };
nativeBuildInputs = [ cmake automoc4 pkgconfig ]; nativeBuildInputs = [ cmake automoc4 pkgconfig ];

View file

@ -1,6 +1,6 @@
{ fetchurl, stdenv, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts, { stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts
boost, zlib, , boost, zlib, python, swig, gfortran, soqt, libf2c , pyqt4, makeWrapper
python, swig, gfortran, soqt, libf2c, pyqt4, makeWrapper }: , matplotlib, pycollada }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "freecad-${version}"; name = "freecad-${version}";
@ -12,7 +12,9 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost
zlib python swig gfortran soqt libf2c pyqt4 makeWrapper ]; zlib python swig gfortran soqt libf2c pyqt4 makeWrapper matplotlib
pycollada
];
enableParallelBuilding = true; enableParallelBuilding = true;

View file

@ -1,18 +1,18 @@
{stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript {stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript
, libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz
, libX11}: , libX11, quantumdepth ? 8}:
let version = "1.3.13"; in let version = "1.3.18"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "graphicsmagick-${version}"; name = "graphicsmagick-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
sha256 = "08lgjvhvhw3by5h4kfpl7072dbvkcpsajy5f6izq69cv61vadqs5"; sha256 = "1axh4j2jr3l92dan15b2nmx9da4l7i0rcz9b5bvfd4q742zfwj7x";
}; };
configureFlags = "--enable-shared"; configureFlags = "--enable-shared --with-quantum-depth=" + toString quantumdepth;
buildInputs = buildInputs =
[ bzip2 freetype ghostscript graphviz libjpeg libpng libtiff libX11 libxml2 [ bzip2 freetype ghostscript graphviz libjpeg libpng libtiff libX11 libxml2

View file

@ -1,6 +1,6 @@
# Generated by debian-patches.sh from debian-patches.txt # Generated by debian-patches.sh from debian-patches.txt
let let
prefix = "http://patch-tracker.debian.org/patch/series/dl/k3d/0.8.0.2-15"; prefix = "http://patch-tracker.debian.org/patch/series/dl/k3d/0.8.0.2-18";
in in
[ [
{ {
@ -9,6 +9,6 @@ in
} }
{ {
url = "${prefix}/k3d_gtkmm224.patch"; url = "${prefix}/k3d_gtkmm224.patch";
sha256 = "0a81fg96zby6kidqwj6n8mhbrh0j5fpnmfh7lr6havz5r2is9ks5"; sha256 = "1c7z2zkqs9qw185q7bhz6vvzl6vlf1zpg9vlhc1f0cz9rgak3gji";
} }
] ]

View file

@ -0,0 +1,16 @@
{ stdenv, fetchhg, cmake, qt4, fftw, graphicsmagick_q16,
lcms2, lensfun, pkgconfig, libjpeg, exiv2, liblqr1 }:
stdenv.mkDerivation rec {
name = "photivo-2013-05-20";
src = fetchhg {
url = "http://code.google.com/p/photivo/";
tag = "6256ff175312";
sha256 = "0pyvkijr7wwik21hdp1zwbbyqnhc07kf0m48ih1rws78fq3h86cc";
};
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ qt4 fftw graphicsmagick_q16 lcms2 lensfun libjpeg exiv2 liblqr1 ];
}

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, libX11, imlib2, giflib }: { stdenv, fetchurl, libX11, imlib2, giflib }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "sxiv-1.1"; name = "sxiv-1.1.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/muennich/sxiv/archive/v1.1.tar.gz"; url = "https://github.com/muennich/sxiv/archive/v1.1.1.tar.gz";
name = "sxiv-1.1.tar.gz"; name = "sxiv-1.1.tar.gz";
sha256 = "0gsqwa1yacsig7ycjrw0sjyrsa9mynfzzbwm1vp2bgk4s9hb08kx"; sha256 = "07r8125xa8d5q71ql71s4i1dx4swy8hypxh2s5h7z2jnn5y9nmih";
}; };
buildInputs = [ libX11 imlib2 giflib ]; buildInputs = [ libX11 imlib2 giflib ];

View file

@ -2,7 +2,7 @@ a :
let let
fetchurl = a.fetchurl; fetchurl = a.fetchurl;
version = a.lib.attrByPath ["version"] "3.5" a; version = a.lib.attrByPath ["version"] "3.6" a;
buildInputs = with a; [ buildInputs = with a; [
aalib gsl libpng libX11 xproto libXext xextproto aalib gsl libpng libX11 xproto libXext xextproto
libXt zlib gettext intltool perl libXt zlib gettext intltool perl
@ -11,7 +11,7 @@ in
rec { rec {
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/xaos/xaos-${version}.tar.gz"; url = "mirror://sourceforge/xaos/xaos-${version}.tar.gz";
sha256 = "0hj8sxya4s9rc1m4xvxj00jgiczi3ljf2zvrhx34r3ja2m9af7s7"; sha256 = "15cd1cx1dyygw6g2nhjqq3bsfdj8sj8m4va9n75i0f3ryww3x7wq";
}; };
inherit buildInputs; inherit buildInputs;

View file

@ -4,11 +4,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "calibre-1.13.0"; name = "calibre-1.14.0";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/calibre/${name}.tar.xz"; url = "mirror://sourceforge/calibre/${name}.tar.xz";
sha256 = "0j0l81jkjzd8n3ciqwxh8zxz945y594xjfsizp3cxjjfhj90aagj"; sha256 = "1nwrahh8rkllazwjgwv1a5fxcg0x221760ixm3707ikz33i0qvx6";
}; };
inherit python; inherit python;

View file

@ -1,19 +1,22 @@
{ fetchgit, stdenv, pkgconfig, libtool, autoconf, automake, { fetchgit, stdenv, pkgconfig, libtool, autoconf, automake,
curl, ncurses, amdappsdk, amdadlsdk, xorg }: curl, ncurses, amdappsdk, amdadlsdk, xorg, jansson }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.11.4"; version = "3.7.2";
name = "cgminer-${version}"; name = "cgminer-${version}";
src = fetchgit { src = fetchgit {
url = "https://github.com/ckolivas/cgminer.git"; url = "https://github.com/ckolivas/cgminer.git";
rev = "96c8ff5f10f2d8f0cf4d1bd889e8eeac2e4aa715"; rev = "refs/tags/v3.7.2";
sha256 = "1vf9agy4vw50cap03qig2y65hdrsdy7cknkzyagv89w5xb230r9a"; sha256 = "0hl71328l19rlclajb6k9xsqybm2ln8g44p788gijpw4laj9yli6";
}; };
buildInputs = [ autoconf automake pkgconfig libtool curl ncurses amdappsdk amdadlsdk xorg.libX11 xorg.libXext xorg.libXinerama ]; buildInputs = [
autoconf automake pkgconfig libtool curl ncurses amdappsdk amdadlsdk
xorg.libX11 xorg.libXext xorg.libXinerama jansson
];
configureScript = "./autogen.sh"; configureScript = "./autogen.sh";
configureFlags = "--enable-scrypt"; configureFlags = "--enable-scrypt --enable-opencl";
NIX_LDFLAGS = "-lgcc_s -lX11 -lXext -lXinerama"; NIX_LDFLAGS = "-lgcc_s -lX11 -lXext -lXinerama";
preConfigure = '' preConfigure = ''
@ -21,7 +24,7 @@ stdenv.mkDerivation rec {
''; '';
postBuild = '' postBuild = ''
gcc api-example.c -I compat/jansson -o cgminer-api gcc api-example.c -o cgminer-api
''; '';
postInstall = '' postInstall = ''

View file

@ -1,10 +1,10 @@
{ fetchurl, stdenv, gettext, pkgconfig, glib, gtk, libX11, libSM, libICE }: { fetchurl, stdenv, gettext, pkgconfig, glib, gtk, libX11, libSM, libICE }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gkrellm-2.3.4"; name = "gkrellm-2.3.5";
src = fetchurl { src = fetchurl {
url = "http://members.dslextreme.com/users/billw/gkrellm/${name}.tar.bz2"; url = "http://members.dslextreme.com/users/billw/gkrellm/${name}.tar.bz2";
sha256 = "0mjg2pxpiqms7d6dvxzxvpa420cakhpjxvrclhq0y8jd2dlv2irl"; sha256 = "12rc6zaa7kb60b9744lbrlfkxxfniprm6x0mispv63h4kh75navh";
}; };
buildInputs = [gettext pkgconfig glib gtk libX11 libSM libICE]; buildInputs = [gettext pkgconfig glib gtk libX11 libSM libICE];

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "hello-2.8"; name = "hello-2.9";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/hello/${name}.tar.gz"; url = "mirror://gnu/hello/${name}.tar.gz";
sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"; sha256 = "19qy37gkasc4csb1d3bdiz9snn8mir2p3aj0jgzmfv0r2hi7mfzc";
}; };
doCheck = true; doCheck = true;

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, automoc4, kdelibs, taglib, exiv2, podofo, gettext, qt4, phonon }: { stdenv, fetchurl, cmake, automoc4, kdelibs, taglib, exiv2, podofo, gettext, qt4, phonon }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "krename-4.0.4"; name = "krename-4.0.9";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/krename/${name}.tar.bz2"; url = "mirror://sourceforge/krename/${name}.tar.bz2";
sha256 = "12qhclw1vbg5bv6619qd4408y8d1w26499gcr8gwhgfzk0v83hic"; sha256 = "11bdg5vdcs393n0aibhm3jh3wxlk5kz78jhkwf7cj9086qkg9wds";
}; };
buildInputs = [ cmake automoc4 kdelibs taglib exiv2 podofo gettext qt4 phonon ]; buildInputs = [ cmake automoc4 kdelibs taglib exiv2 podofo gettext qt4 phonon ];

View file

@ -0,0 +1,22 @@
{ stdenv, buildPythonPackage, python, fetchurl }:
buildPythonPackage {
name = "ranger-1.6.1";
meta = {
description = "File manager with minimalistic curses interface";
homepage = "http://ranger.nongnu.org/";
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ iyzsong ];
};
src = fetchurl {
url = "http://ranger.nongnu.org/ranger-1.6.1.tar.gz";
sha256 = "0pnvfwk2a1p35246fihm3fsr1m7r2njirbxm28ba276psajk1cnc";
};
doCheck = false;
propagatedBuildInputs = with python.modules; [ curses ];
}

View file

@ -0,0 +1,24 @@
{ stdenv, fetchurl, qt5, openssl, boost, cmake, scons, python, pcre, bzip2 }:
stdenv.mkDerivation {
name = "robomongo-0.8.3";
src = fetchurl {
url = https://github.com/paralect/robomongo/archive/v0.8.3.tar.gz;
sha256 = "1x8vpmqvjscjcw30hf0i5vsrg3rldlwx6z52i1hymlck2jfzkank";
};
patches = [ ./robomongo.patch ];
NIX_CFLAGS_COMPILE = "-fno-stack-protector";
buildInputs = [ cmake boost scons qt5 openssl python pcre bzip2 ];
meta = {
homepage = "http://robomongo.org/";
description = "Query GUI for mongodb";
platforms = stdenv.lib.platforms.unix;
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.amorsillo ];
};
}

View file

@ -0,0 +1,48 @@
Remove check for QT_NO_STYLE_GTK to avoid building with QCleanlooksStyle which results in error due to missing QCleanlooksStyle
Ensure environment is preserved for scons build -- scons clears the env but we want to keep the nix build environment
Fix typo in cmakelists
diff -rupN robomongo-0.8.3/CMakeLists.txt robomongo-0.8.3-patched/CMakeLists.txt
--- robomongo-0.8.3/CMakeLists.txt 2013-10-01 10:55:00.000000000 -0400
+++ robomongo-0.8.3-patched/CMakeLists.txt 2013-12-06 12:22:06.070659856 -0500
@@ -133,7 +133,7 @@ ELSE()
ENDIF()
##################################DEFAULT VALUES##########################################
-IF(NOT CMAKE_INSTALL_PREFIX})
+IF(NOT CMAKE_INSTALL_PREFIX)
SET(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install")
ENDIF()
diff -rupN robomongo-0.8.3/src/robomongo/gui/AppStyle.h robomongo-0.8.3-patched/src/robomongo/gui/AppStyle.h
--- robomongo-0.8.3/src/robomongo/gui/AppStyle.h 2013-10-01 10:55:00.000000000 -0400
+++ robomongo-0.8.3-patched/src/robomongo/gui/AppStyle.h 2013-12-06 12:20:57.417297186 -0500
@@ -8,13 +8,8 @@
#include <QProxyStyle>
typedef QProxyStyle OsStyle;
#elif defined OS_LINUX
- #if !defined(QT_NO_STYLE_GTK)
- #include <QProxyStyle>
- typedef QProxyStyle OsStyle;
- #else
- #include <QCleanlooksStyle>
- typedef QCleanlooksStyle OsStyle;
- #endif
+ #include <QProxyStyle>
+ typedef QProxyStyle OsStyle;
#endif
namespace Robomongo
diff -rupN robomongo-0.8.3/src/third-party/mongodb/SConstruct robomongo-0.8.3-patched/src/third-party/mongodb/SConstruct
--- robomongo-0.8.3/src/third-party/mongodb/SConstruct 2013-10-01 10:55:00.000000000 -0400
+++ robomongo-0.8.3-patched/src/third-party/mongodb/SConstruct 2013-12-06 12:21:45.705255731 -0500
@@ -283,7 +283,8 @@ usePCH = has_option( "usePCH" )
justClientLib = (COMMAND_LINE_TARGETS == ['mongoclient'])
-env = Environment( BUILD_DIR=variantDir,
+env = Environment( ENV=os.environ,
+ BUILD_DIR=variantDir,
CLIENT_ARCHIVE='${CLIENT_DIST_BASENAME}${DIST_ARCHIVE_SUFFIX}',
CLIENT_DIST_BASENAME=get_option('client-dist-basename'),
CLIENT_LICENSE='#distsrc/client/LICENSE.txt',

View file

@ -4,11 +4,11 @@
{stdenv, fetchurl, libX11, pkgconfig}: {stdenv, fetchurl, libX11, pkgconfig}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xlsfonts-1.0.2"; name = "xlsfonts-1.0.4";
src = fetchurl { src = fetchurl {
url = "mirror://xorg/individual/app/${name}.tar.bz2"; url = "mirror://xorg/individual/app/${name}.tar.bz2";
sha256 = "070iym754g3mf9x6xczl4gdnpvlk6rdyl1ndwhpjl21vg2dm2vnc"; sha256 = "1lhcx600z9v65nk93xaxfzi79bm4naynabb52gz1vy1bxj2r25r8";
}; };
buildInputs = [libX11 pkgconfig]; buildInputs = [libX11 pkgconfig];

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils, file, makeWrapper }: { stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils, file, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.2.5"; version = "0.2.6";
name = "zathura-core-${version}"; name = "zathura-core-${version}";
src = fetchurl { src = fetchurl {
url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz"; url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz";
sha256 = "1lw9q0x4b7x6z86hwgs93f8srimd0sj8fwg91185f63yz9g800fr"; sha1 = "d84878388969d523027a1661f49fd29638bd460b";
}; };
buildInputs = [ pkgconfig file gtk girara gettext makeWrapper ]; buildInputs = [ pkgconfig file gtk girara gettext makeWrapper ];

View file

@ -17,9 +17,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec { rec {
firefoxVersion = "25.0.1"; firefoxVersion = "26.0";
xulVersion = "25.0.1"; # this attribute is used by other packages xulVersion = "26.0"; # this attribute is used by other packages
src = fetchurl { src = fetchurl {
@ -29,7 +29,7 @@ rec {
# Fall back to this url for versions not available at releases.mozilla.org. # Fall back to this url for versions not available at releases.mozilla.org.
"http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
]; ];
sha1 = "592ebd242c4839ef0e18707a7e959d8bed2a98f3"; sha1 = "f7c6642d6f62aea8d4eced48dd27aba0634edcd5";
}; };
commonConfigureFlags = commonConfigureFlags =
@ -143,6 +143,7 @@ rec {
patches = [ patches = [
./disable-reporter.patch # fixes "search box not working when built on xulrunner" ./disable-reporter.patch # fixes "search box not working when built on xulrunner"
./xpidl.patch
]; ];
propagatedBuildInputs = [xulrunner]; propagatedBuildInputs = [xulrunner];

View file

@ -0,0 +1,11 @@
--- mozilla-release/python/mozbuild/mozbuild/backend/recursivemake.py 2013-12-05 08:07:53.000000000 -0800
+++ mozilla-release_1/python/mozbuild/mozbuild/backend/recursivemake.py 2013-12-12 23:38:39.697318563 -0800
@@ -421,7 +421,7 @@
def _handle_idl_manager(self, manager):
build_files = self._purge_manifests['xpidl']
- for p in ('Makefile', 'backend.mk', '.deps/.mkdir.done',
+ for p in ('Makefile.in', 'Makefile', 'backend.mk', '.deps/.mkdir.done',
'xpt/.mkdir.done'):
build_files.add(p)

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, intltool, pkgconfig, gtk, GConf, alsaLib }: { stdenv, fetchurl, intltool, pkgconfig, gtk, GConf, alsaLib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gmtk-1.0.5"; name = "gmtk-1.0.8";
src = fetchurl { src = fetchurl {
url = "http://gmtk.googlecode.com/files/${name}.tar.gz"; url = "http://gmtk.googlecode.com/files/${name}.tar.gz";
sha256 = "a07130d62719e8c1244f8405dd97445798df5204fc0f3f2f2b669b125114b468"; sha256 = "034b02nplb2bp01yn4p19345jh3yibhn4lcxznrzcsmsyj2vlzq0";
}; };
buildInputs = [ intltool pkgconfig gtk GConf alsaLib ]; buildInputs = [ intltool pkgconfig gtk GConf alsaLib ];

View file

@ -1,10 +1,10 @@
{stdenv, fetchurl, which, tcl, tk, x11, libpng, libjpeg, makeWrapper}: {stdenv, fetchurl, which, tcl, tk, x11, libpng, libjpeg, makeWrapper}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "amsn-0.98.4"; name = "amsn-0.98.9";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/amsn/amsn-0.98.4-src.tar.gz; url = mirror://sourceforge/amsn/amsn-0.98.9-src.tar.gz;
sha256 = "1kcn1hc6bvgy4svf5l3j5psdrvsmy0p3r33fn7gzcinqdf3xfgqx"; sha256 = "0b8ir7spxnsz8f7kvr9f1k91nsy8cb65q6jv2l55b04fl20x4z7r";
}; };
configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib --enable-static"; configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib --enable-static";

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, telepathy_glib, libxslt }: { stdenv, fetchurl, pkgconfig, telepathy_glib, libxslt }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-5.14.0"; name = "${pname}-5.14.1";
pname = "telepathy-mission-control"; pname = "telepathy-mission-control";
src = fetchurl { src = fetchurl {
url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
sha256 = "0c4asjgk7pk39i8njf0q1df0mhisif83lq716ln6r0wja9zh9q2q"; sha256 = "1jqzby5sr09bprp3fyr8w65rcv9ljc045rp7lm9ik89wkhcw05jb";
}; };
buildInputs = [ telepathy_glib ]; buildInputs = [ telepathy_glib ];

View file

@ -1,11 +1,11 @@
{stdenv, fetchurl}: {stdenv, fetchurl}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ii-1.6"; name = "ii-1.7";
src = fetchurl { src = fetchurl {
url = "http://dl.suckless.org/tools/${name}.tar.gz"; url = "http://dl.suckless.org/tools/${name}.tar.gz";
sha256 = "0afccbcm7i9lfch5mwzs3l1ax79dg3g6rrw0z8rb7d2kn8wsckvr"; sha256 = "176cqwnn6h7w4kbfd66hzqa243l26pqp2b06bii0nmnm0rkaqwis";
}; };
installPhase = '' installPhase = ''

View file

@ -4,6 +4,7 @@
, withKDE ? stdenv.isLinux # enable KDE integration , withKDE ? stdenv.isLinux # enable KDE integration
, ssl ? true # enable SSL support , ssl ? true # enable SSL support
, previews ? false # enable webpage previews on hovering over URLs , previews ? false # enable webpage previews on hovering over URLs
, tag ? "" # tag added to the package name
, stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon }: , stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon }:
let let
@ -11,13 +12,16 @@ let
in with stdenv; mkDerivation rec { in with stdenv; mkDerivation rec {
name = "quassel-0.9.0"; version = "0.9.2";
name = "quassel${tag}-${version}";
src = fetchurl { src = fetchurl {
url = "http://quassel-irc.org/pub/${name}.tar.bz2"; url = "http://quassel-irc.org/pub/quassel-${version}.tar.bz2";
sha256 = "09v0igjkzan3hllk47w39hkav6v1419vpxn2lfd8473kwdmf0grf"; sha256 = "1h2kzi4pgfv3qmvhxix9fffdjixs3bsya0i5c18dkh894mh02kgh";
}; };
enableParallelBuilding = true;
buildInputs = [ cmake qt4 ] buildInputs = [ cmake qt4 ]
++ lib.optional withKDE kdelibs ++ lib.optional withKDE kdelibs
++ lib.optional withKDE automoc4 ++ lib.optional withKDE automoc4

View file

@ -1,9 +1,9 @@
{ stdenv, fetchurl, ruby, rake, rubygems, makeWrapper, ncursesw_sup { stdenv, fetchgit, ruby, rake, rubygems, makeWrapper, ncursesw_sup
, xapian_ruby, gpgme, libiconvOrEmpty, mime_types, chronic, trollop, lockfile , xapian_ruby, gpgme, libiconvOrEmpty, mime_types, chronic, trollop, lockfile
, gettext, iconv, locale, text, highline, rmail_sup, unicode, gnupg, which }: , gettext, iconv, locale, text, highline, rmail_sup, unicode, gnupg, which }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "f27661b1656ae1f0d28fd89595b5a16f268d8d3d"; version = "20131130";
name = "sup-${version}"; name = "sup-${version}";
meta = { meta = {
@ -16,9 +16,10 @@ stdenv.mkDerivation rec {
dontStrip = true; dontStrip = true;
src = fetchurl { src = fetchgit {
url = "https://github.com/sup-heliotrope/sup/archive/${version}.tar.gz"; url = git://github.com/sup-heliotrope/sup.git;
sha256 = "08fxf1knji3260d0mrp86x6yayp43iq7kc5rfay3hga8i2sckdia"; rev = "a5a1e39034204ac4b05c9171a71164712690b010";
sha256 = "0w2w7dcif1ri1qq81csz7gj45rqd9z7hjd6x29awibybyyqyvj5s";
}; };
buildInputs = buildInputs =

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, qt4, libvorbis, boost, speechd, protobuf, libsndfile, { stdenv, fetchurl, qt4, boost, speechd, protobuf, libsndfile,
avahi, dbus, libcap, pkgconfig, speex, libopus, avahi, pkgconfig,
jackSupport ? false, jackSupport ? false,
jackaudio ? null }: jackaudio ? null }:
@ -18,16 +18,18 @@ stdenv.mkDerivation rec {
''; '';
configurePhase = '' configurePhase = ''
qmake CONFIG+=no-g15 CONFIG+=no-update \ qmake CONFIG+=no-g15 CONFIG+=no-update CONFIG+=no-server \
CONFIG+=no-embed-qt-translations CONFIG+=no-ice \ CONFIG+=no-embed-qt-translations CONFIG+=packaged \
CONFIG+=bundled-celt CONFIG+=no-bundled-opus \
CONFIG+=no-bundled-speex
'' ''
+ stdenv.lib.optionalString jackSupport '' + stdenv.lib.optionalString jackSupport ''
CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio
''; '';
buildInputs = [ qt4 libvorbis boost speechd protobuf libsndfile avahi dbus buildInputs = [ qt4 boost speechd protobuf libsndfile speex
libcap pkgconfig ] libopus avahi pkgconfig ]
++ (stdenv.lib.optional jackSupport jackaudio); ++ (stdenv.lib.optional jackSupport jackaudio);
installPhase = '' installPhase = ''

View file

@ -0,0 +1,30 @@
{ stdenv, fetchurl, qt4, boost, protobuf, avahi, libcap, pkgconfig }:
stdenv.mkDerivation rec {
name = "murmur-" + version;
version = "1.2.4";
src = fetchurl {
url = "mirror://sourceforge/mumble/mumble-${version}.tar.gz";
sha256 = "16wwj6gwcnyjlnzh7wk0l255ldxmbwx0wi652sdp20lsv61q7kx1";
};
configurePhase = ''
qmake CONFIG+=no-client CONFIG+=no-ice CONFIG+=no-embed-qt
'';
buildInputs = [ qt4 boost protobuf avahi libcap pkgconfig ];
installPhase = ''
mkdir -p $out
cp -r ./release $out/bin
'';
meta = {
homepage = http://mumble.sourceforge.net/;
description = "Low-latency, high quality voice chat software";
license = "BSD";
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [viric];
};
}

View file

@ -2,11 +2,11 @@
, pkgconfig }: , pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qbittorrent-3.1.2"; name = "qbittorrent-3.1.3";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/qbittorrent/${name}.tar.xz"; url = "mirror://sourceforge/qbittorrent/${name}.tar.xz";
sha256 = "1viia11qixp1qqxcyiw1x4if63cfyqk4rscpzp1vnhnzm06irv7y"; sha256 = "16m3l8qjcj63brzrdn82cbijvz8fcxfgpibi4g5g6sbissjkwsww";
}; };
buildInputs = [ qt4 which dbus_libs boost libtorrentRasterbar buildInputs = [ qt4 which dbus_libs boost libtorrentRasterbar

View file

@ -2,10 +2,10 @@
, gnomedocutils, scrollkeeper, libxslt }: , gnomedocutils, scrollkeeper, libxslt }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "etherape-0.9.12"; name = "etherape-0.9.13";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/etherape/${name}.tar.gz"; url = "mirror://sourceforge/etherape/${name}.tar.gz";
sha256 = "0ici0aqw2r221lc3rhrdcnvavbhcj0ybwawgrhh399i74w7wf14k"; sha256 = "1xq93k1slyak8mgwrw5kymq0xn0kl8chvfcvaablgki4p0l2lg9a";
}; };
configureFlags = [ "--disable-scrollkeeper" ]; configureFlags = [ "--disable-scrollkeeper" ];

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "hledger-irr"; pname = "hledger-irr";
version = "0.1.1.2"; version = "0.1.1.3";
sha256 = "1mh1lzhnxc8ps8n5j37wrmbqafwdyap60j8rqr6xdfa2syfyq8i2"; sha256 = "0vjf478b9msmgr1nxyy8pgc9mvn61i768ypcr5gbinsnsr9kxqsm";
isLibrary = false; isLibrary = false;
isExecutable = true; isExecutable = true;
buildDepends = [ Cabal hledgerLib statistics time ]; buildDepends = [ Cabal hledgerLib statistics time ];

View file

@ -1,14 +1,11 @@
{stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl, libiconv}: { stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl, libiconv }:
let stdenv.mkDerivation rec {
name = "stellarium-0.12.1"; name = "stellarium-0.12.4";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/stellarium/${name}.tar.gz"; url = "mirror://sourceforge/stellarium/${name}.tar.gz";
sha256 = "02qfp56mkg3bqggv3ndx8v6zfswg51gkczwiqy5c9y4rw28hazla"; sha256 = "11367hv9niyz9v47lf31vjsqkgc8da0vy2nhiyxgmk1i49p1pbhg";
}; };
buildInputs = [ cmake freetype libpng mesa gettext openssl qt4 perl libiconv ]; buildInputs = [ cmake freetype libpng mesa gettext openssl qt4 perl libiconv ];

View file

@ -2,15 +2,17 @@
, libjpeg, netpbm}: , libjpeg, netpbm}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xplanet-1.2.2"; name = "xplanet-1.3.0";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/xplanet/${name}.tar.gz"; url = "mirror://sourceforge/xplanet/${name}.tar.gz";
sha256 = "1jnkrly9njkibxqbg5im4pq9cqjzwmki6jzd318dvlfmnicqr3vg"; sha256 = "0hml2v228wi2r61m1pgka7h96rl92b6apk0iigm62miyp4mp9ys4";
}; };
buildInputs = [ pkgconfig freetype pango libpng libtiff giflib libjpeg netpbm ]; buildInputs = [ pkgconfig freetype pango libpng libtiff giflib libjpeg netpbm ];
patches = [ ./giflib.patch ];
meta = { meta = {
description = "Renders an image of the earth or other planets into the X root window"; description = "Renders an image of the earth or other planets into the X root window";
homepage = http://xplanet.sourceforge.net; homepage = http://xplanet.sourceforge.net;

View file

@ -0,0 +1,130 @@
diff -wbBur xplanet-1.3.0/src/libimage/gif.c /home/sergej/tmp/BUILD/staging-i686/sergej/build/xplanet/src/xplanet-1.3.0/src/libimage/gif.c
--- xplanet-1.3.0/src/libimage/gif.c 2006-03-26 01:50:51.000000000 +0300
+++ /home/sergej/tmp/BUILD/staging-i686/sergej/build/xplanet/src/xplanet-1.3.0/src/libimage/gif.c 2013-07-30 18:21:17.412474692 +0400
@@ -20,7 +20,7 @@
#include <stdio.h>
#include <stdlib.h>
-
+#define FALSE 0
#include <gif_lib.h>
/*
@@ -42,11 +42,11 @@
int color_index;
unsigned char *ptr = NULL;
- infile = DGifOpenFileName(filename);
+ infile = DGifOpenFileName(filename, NULL);
if (infile == NULL)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
@@ -54,7 +54,7 @@
{
if (DGifGetRecordType(infile, &record_type) == GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
@@ -63,7 +63,7 @@
case IMAGE_DESC_RECORD_TYPE:
if (DGifGetImageDesc(infile) == GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
@@ -107,14 +107,14 @@
GifByteType *ext;
if (DGifGetExtension(infile, &ext_code, &ext) == GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
while (ext != NULL)
{
if (DGifGetExtensionNext(infile, &ext) == GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
}
@@ -178,7 +178,7 @@
return(0);
}
- colormap = MakeMapObject(colormap_size, NULL);
+ colormap = GifMakeMapObject(colormap_size, NULL);
for (i = 0; i < width * height; i++)
{
@@ -187,10 +187,10 @@
blue[i] = (GifByteType) rgb[3*i+2];
}
- if (QuantizeBuffer(width, height, &colormap_size, red, green, blue,
+ if (GifQuantizeBuffer(width, height, &colormap_size, red, green, blue,
buffer, colormap->Colors) == GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
@@ -198,24 +198,24 @@
free(green);
free(blue);
- outfile = EGifOpenFileName((char *) filename, FALSE);
+ outfile = EGifOpenFileName((char *) filename, FALSE, NULL);
if (outfile == NULL)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
if (EGifPutScreenDesc(outfile, width, height, colormap_size, 0, colormap)
== GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
if (EGifPutImageDesc(outfile, 0, 0, width, height, FALSE, NULL)
== GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
@@ -224,7 +224,7 @@
{
if (EGifPutLine(outfile, ptr, width) == GIF_ERROR)
{
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
return(0);
}
ptr += width;
@@ -233,7 +233,7 @@
EGifSpew(outfile);
if (EGifCloseFile(outfile) == GIF_ERROR)
- PrintGifError();
+ printf("%s\n", GifErrorString(GIF_ERROR));
free(buffer);

View file

@ -1,11 +1,11 @@
{stdenv, fetchurl}: {stdenv, fetchurl}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "archimedes-2.0.0"; name = "archimedes-2.0.1";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/archimedes/${name}.tar.gz"; url = "mirror://gnu/archimedes/${name}.tar.gz";
sha256 = "1ajg4xvk5slv05fsbikrina9g4bmhx8gykk249yz21pir67sdk4x"; sha256 = "0jfpnd3pns5wxcxbiw49v5sgpmm5b4v8s4q1a5292hxxk2hzmb3z";
}; };
meta = { meta = {

View file

@ -1,17 +1,18 @@
{stdenv, fetchurl, gperf, flex, bison}: {stdenv, fetchurl, gperf, flex, bison}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "verilog-0.9.3"; name = "verilog-0.9.7";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/iverilog/${name}.tar.gz"; url = "mirror://sourceforge/iverilog/${name}.tar.gz";
sha256 = "dd68c8ab874a93805d1e93fa76ee1e91fc0c7b20822ded3e57b6536cd8c0d1ba"; sha256 = "0m3liqw7kq24vn7k8wvi630ljz0awz23r3sd4rcklk7vgghp4pks";
}; };
buildInputs = [ gperf flex bison ]; buildInputs = [ gperf flex bison ];
meta = { meta = {
description = "Icarus Verilog compiler"; description = "Icarus Verilog compiler";
repositories.git = https://github.com/steveicarus/iverilog.git;
homepage = http://www.icarus.com; homepage = http://www.icarus.com;
license = "GPLv2+"; license = "GPLv2+";
maintainers = with stdenv.lib.maintainers; [winden]; maintainers = with stdenv.lib.maintainers; [winden];

View file

@ -83,7 +83,7 @@ rec {
}; };
svn2git = import ./svn2git { svn2git = import ./svn2git {
inherit stdenv fetchgit ruby makeWrapper; inherit stdenv fetchurl ruby makeWrapper;
git = gitSVN; git = gitSVN;
}; };

View file

@ -4,18 +4,18 @@
, extensibleExceptions, feed, filepath, git, gnupg1, gnutls, hamlet , extensibleExceptions, feed, filepath, git, gnupg1, gnutls, hamlet
, hinotify, hS3, hslogger, HTTP, httpConduit, httpTypes, IfElse , hinotify, hS3, hslogger, HTTP, httpConduit, httpTypes, IfElse
, json, lsof, MissingH, MonadCatchIOTransformers, monadControl, mtl , json, lsof, MissingH, MonadCatchIOTransformers, monadControl, mtl
, network, networkInfo, networkMulticast, networkProtocolXmpp , network, networkConduit, networkInfo, networkMulticast
, openssh, perl, QuickCheck, random, regexTdfa, rsync , networkProtocolXmpp, openssh, perl, QuickCheck, random, regexTdfa
, SafeSemaphore, SHA, stm, tasty, tastyHunit, tastyQuickcheck, text , rsync, SafeSemaphore, SHA, stm, tasty, tastyHunit
, time, transformers, unixCompat, utf8String, uuid, wai, waiLogger , tastyQuickcheck, text, time, transformers, unixCompat, utf8String
, warp, which, xmlConduit, xmlTypes, yesod, yesodCore, yesodDefault , uuid, wai, waiLogger, warp, which, xmlConduit, xmlTypes, yesod
, yesodForm, yesodStatic , yesodCore, yesodDefault, yesodForm, yesodStatic
}: }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "git-annex"; pname = "git-annex";
version = "5.20131130"; version = "5.20131213";
sha256 = "0px918wzv9zqxz7wc6rx2ay8rizbckw79yinhisjvp3y5lldyjj1"; sha256 = "0mwslkz0kklp4phlsf8hibh97sabdnigls7hr9725wb0ncfa85yn";
isLibrary = false; isLibrary = false;
isExecutable = true; isExecutable = true;
buildDepends = [ buildDepends = [
@ -24,11 +24,11 @@ cabal.mkDerivation (self: {
editDistance extensibleExceptions feed filepath gnutls hamlet editDistance extensibleExceptions feed filepath gnutls hamlet
hinotify hS3 hslogger HTTP httpConduit httpTypes IfElse json hinotify hS3 hslogger HTTP httpConduit httpTypes IfElse json
MissingH MonadCatchIOTransformers monadControl mtl network MissingH MonadCatchIOTransformers monadControl mtl network
networkInfo networkMulticast networkProtocolXmpp QuickCheck random networkConduit networkInfo networkMulticast networkProtocolXmpp
regexTdfa SafeSemaphore SHA stm tasty tastyHunit tastyQuickcheck QuickCheck random regexTdfa SafeSemaphore SHA stm tasty tastyHunit
text time transformers unixCompat utf8String uuid wai waiLogger tastyQuickcheck text time transformers unixCompat utf8String uuid
warp xmlConduit xmlTypes yesod yesodCore yesodDefault yesodForm wai waiLogger warp xmlConduit xmlTypes yesod yesodCore yesodDefault
yesodStatic yesodForm yesodStatic
]; ];
buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ]; buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ];
configureFlags = "-fS3 configureFlags = "-fS3
@ -47,8 +47,6 @@ cabal.mkDerivation (self: {
checkPhase = '' checkPhase = ''
export HOME="$NIX_BUILD_TOP/tmp" export HOME="$NIX_BUILD_TOP/tmp"
mkdir "$HOME" mkdir "$HOME"
cp dist/build/git-annex/git-annex git-annex
./git-annex test
''; '';
meta = { meta = {
homepage = "http://git-annex.branchable.com/"; homepage = "http://git-annex.branchable.com/";

View file

@ -10,7 +10,7 @@
let let
version = "1.8.4.3"; version = "1.8.5.1";
svn = subversionClient.override { perlBindings = true; }; svn = subversionClient.override { perlBindings = true; };
@ -21,7 +21,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "http://git-core.googlecode.com/files/git-${version}.tar.gz"; url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
sha256 = "08fbdxh2cjd4hffm0nydwysh5zh6nrssbi9x01yy0n2y8rqzly0a"; sha256 = "0i7fz0b79f3algs68m15wg4bq99ayg1crpy66cqylxq3mzbw8n8m";
}; };
patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ]; patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ];
@ -140,6 +140,6 @@ stdenv.mkDerivation {
''; '';
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.simons ]; maintainers = with stdenv.lib.maintainers; [ simons the-kenny ];
}; };
} }

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "github-backup"; pname = "github-backup";
version = "1.20131101"; version = "1.20131203";
sha256 = "07l8a3xiy65xicxa5v14li6jnj3niwhndm8gd6q4d7aw14yq8wbn"; sha256 = "0156g7zbqsp58g8hniqsilyc79sam7plwhn3w56wbzf8m380mwba";
isLibrary = false; isLibrary = false;
isExecutable = true; isExecutable = true;
buildDepends = [ buildDepends = [

View file

@ -1,14 +1,14 @@
{ stdenv, fetchurl, python, git }: { stdenv, fetchurl, python, git }:
let let
name = "stgit-0.15"; name = "stgit-0.16";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit name; inherit name;
src = fetchurl { src = fetchurl {
url = "http://download.gna.org/stgit/${name}.tar.gz"; url = "http://download.gna.org/stgit/${name}.tar.gz";
sha256 = "0kgq9x0i7riwcl1lmmm40z0jiz5agr1kqxm2byv1qsf0q1ny47v9"; sha256 = "0hla6401g2kicaakz4awk67yf8fhqbw1shn1p9ma5x6ca29s3w82";
}; };
buildInputs = [ python git ]; buildInputs = [ python git ];
@ -28,7 +28,7 @@ stdenv.mkDerivation {
description = "StGit is a patch manager implemented on top of Git"; description = "StGit is a patch manager implemented on top of Git";
license = "GPL"; license = "GPL";
maintainers = [ stdenv.lib.maintainers.simons ]; maintainers = with stdenv.lib.maintainers; [ simons the-kenny ];
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
}; };
} }

View file

@ -1,12 +1,14 @@
{ stdenv, fetchgit, ruby, makeWrapper, git }: { stdenv, fetchurl, ruby, makeWrapper, git }:
stdenv.mkDerivation rec { let
name = "svn2git-2.1.0-20111206"; version = "2.2.2";
in
stdenv.mkDerivation {
name = "svn2git-${version}";
src = fetchgit { src = fetchurl {
url = https://github.com/nirvdrum/svn2git; url = "https://github.com/nirvdrum/svn2git/archive/v${version}.tar.gz";
rev = "5cd8d4b509affb66eb2dad50d7298c52b3b0d848"; sha256 = "14zinkpgybz15jvbfw0sb432w6f5w4sa5pdqycjwva8v8lxqn9mh";
sha256 = "26aa17f68f605e958b623d803b4bd405e12d6c5d51056635873a2c59e4c7b9ca";
}; };
buildInputs = [ ruby makeWrapper ]; buildInputs = [ ruby makeWrapper ];
@ -27,4 +29,12 @@ stdenv.mkDerivation rec {
--set RUBYLIB $out/lib \ --set RUBYLIB $out/lib \
--prefix PATH : ${git}/bin --prefix PATH : ${git}/bin
''; '';
meta = {
homepage = https://github.com/nirvdrum/svn2git;
description = "Ruby tool for importing existing svn projects into git";
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.the-kenny ];
};
} }

View file

@ -2,7 +2,7 @@
, guiSupport ? false, tk ? null, curses }: , guiSupport ? false, tk ? null, curses }:
let let
name = "mercurial-2.6.1"; name = "mercurial-2.8.1";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -10,7 +10,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "http://mercurial.selenic.com/release/${name}.tar.gz"; url = "http://mercurial.selenic.com/release/${name}.tar.gz";
sha256 = "0r4fg269xnqgacc82ppm3wxl9wwvvgwz8z6zi1iai4gx76iklhdn"; sha256 = "0riksf6p07yxfq1xlraqhl8cacsgb1gg7si185mlbdknrh2a4ffj";
}; };
inherit python; # pass it so that the same version can be used in hg2git inherit python; # pass it so that the same version can be used in hg2git

View file

@ -21,13 +21,13 @@ assert compressionSupport -> neon.compressionSupport;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.7.13"; version = "1.7.14";
name = "subversion-${version}"; name = "subversion-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://apache/subversion//${name}.tar.bz2"; url = "mirror://apache/subversion//${name}.tar.bz2";
sha1 = "844bb756ec505edaa12b9610832bcd21567139f1"; sha256 = "038jbcpwm083abp0rvk0fhnx65kp9mz1qvzs3f83ig8fxcvqzb64";
}; };
buildInputs = [ zlib apr aprutil sqlite ] buildInputs = [ zlib apr aprutil sqlite ]

View file

@ -3,12 +3,12 @@
buildPythonPackage rec { buildPythonPackage rec {
name = "key-mon-${version}"; name = "key-mon-${version}";
version = "1.13"; version = "1.16";
namePrefix = ""; namePrefix = "";
src = fetchurl { src = fetchurl {
url = "http://key-mon.googlecode.com/files/${name}.tar.gz"; url = "http://key-mon.googlecode.com/files/${name}.tar.gz";
sha256 = "02h7lcnyqwyqsycd1vlvl11ms81v0zmr9p0pfyl5gmzry9dj7imj"; sha256 = "1pfki1fyh3q29sj6kq1chhi1h2v9ki6sp09qyww59rjraypvzsis";
}; };
propagatedBuildInputs = propagatedBuildInputs =

View file

@ -0,0 +1,129 @@
{ stdenv, fetchurl, fetchgit, freetype, pkgconfig, freefont_ttf, ffmpeg, libass
, lua5, perl, libpthreadstubs
, python3, docutils, which
, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null, libXxf86vm ? null
, xineramaSupport ? true, libXinerama ? null
, xvSupport ? true, libXv ? null
, sdl2Support? true, SDL2 ? null
, alsaSupport ? true, alsaLib ? null
, screenSaverSupport ? true, libXScrnSaver ? null
, vdpauSupport ? true, libvdpau ? null
, dvdreadSupport? true, libdvdread ? null
, dvdnavSupport ? true, libdvdnav ? null
, bluraySupport ? true, libbluray ? null
, speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null
, jackaudioSupport ? true, jackaudio ? null
, pulseSupport ? true, pulseaudio ? null
, bs2bSupport ? false, libbs2b ? null
# For screenshots
, libpngSupport ? true, libpng ? null
# for Youtube support
, quviSupport? false, libquvi ? null
, cacaSupport? false, libcaca ? null
}:
assert x11Support -> (libX11 != null && libXext != null && mesa != null && libXxf86vm != null);
assert xineramaSupport -> (libXinerama != null && x11Support);
assert xvSupport -> (libXv != null && x11Support);
assert sdl2Support -> SDL2 != null;
assert alsaSupport -> alsaLib != null;
assert screenSaverSupport -> libXScrnSaver != null;
assert vdpauSupport -> libvdpau != null;
assert dvdreadSupport -> libdvdread != null;
assert dvdnavSupport -> libdvdnav != null;
assert bluraySupport -> libbluray != null;
assert speexSupport -> speex != null;
assert theoraSupport -> libtheora != null;
assert jackaudioSupport -> jackaudio != null;
assert pulseSupport -> pulseaudio != null;
assert bs2bSupport -> libbs2b != null;
assert libpngSupport -> libpng != null;
assert quviSupport -> libquvi != null;
assert cacaSupport -> libcaca != null;
# Purity problem: Waf needed to be is downloaded by bootstrap.py
# but by purity reasons it should be avoided; thanks the-kenny to point it out!
# Now, it will just download and package Waf, mimetizing bootstrap.py behaviour
let
waf = fetchurl {
url = https://waf.googlecode.com/files/waf-1.7.13;
sha256 = "03cc750049350ee01cdbc584b70924e333fcc17ba4a2d04648dab1535538a873";
};
in
stdenv.mkDerivation rec {
name = "mpv-20130812";
src = fetchgit {
url = "https://github.com/mpv-player/mpv.git";
rev = "62925a5c15a76568c155259bafa1361ec139c66b";
};
buildInputs = with stdenv.lib;
[ waf freetype pkgconfig ffmpeg libass docutils which libpthreadstubs ]
++ optionals x11Support [ libX11 libXext mesa libXxf86vm ]
++ optional alsaSupport alsaLib
++ optional xvSupport libXv
++ optional theoraSupport libtheora
++ optional xineramaSupport libXinerama
++ optional dvdreadSupport libdvdread
++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
++ optional bluraySupport libbluray
++ optional jackaudioSupport jackaudio
++ optional pulseSupport pulseaudio
++ optional screenSaverSupport libXScrnSaver
++ optional vdpauSupport libvdpau
++ optional speexSupport speex
++ optional bs2bSupport libbs2b
++ optional libpngSupport libpng
++ optional quviSupport libquvi
++ optional sdl2Support SDL2
++ optional cacaSupport libcaca
;
nativeBuildInputs = [ python3 lua5 perl ];
# There are almost no need of "configure flags", but some libraries
# weren't detected; see the TODO comments below
NIX_LDFLAGS = stdenv.lib.optionalString x11Support "-lX11 -lXext";
enableParallelBuilding = true;
configurePhase = ''
python3 ${waf} configure --prefix=$out
patchShebangs TOOLS
'';
buildPhase = ''
python3 ${waf} build
'';
installPhase = ''
python3 ${waf} install
# Maybe not needed, but it doesn't hurt anyway: a standard font
mkdir -p $out/share/mpv
ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf
'';
meta = {
description = "A movie player that supports many video formats (MPlayer and mplayer2 fork)";
longDescription = ''
mpv is a free and open-source general-purpose video player, based on the MPlayer and mplayer2 projects, with great improvements above both.
'';
homepage = "http://mpv.io";
license = "GPLv2+";
platforms = stdenv.lib.platforms.linux;
};
}
# Heavily based on mplayer2 expression
# TODO: Wayland support
# TODO: investigate libquvi support: it isn't detected by Waf script!
# TODO: investigate caca support: it isn't detected by Waf script!
# TODO: a more systematic way to test this package

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, xz, bzip2, perl, xlibs, libdvdnav, libbluray { stdenv, fetchurl, xz, bzip2, perl, xlibs, libdvdnav, libbluray
, zlib, a52dec, libmad, faad2, ffmpeg, alsaLib , zlib, a52dec, libmad, faad2, ffmpeg, alsaLib
, pkgconfig, dbus, fribidi, qt4, freefont_ttf , pkgconfig, dbus, fribidi, qt4, freefont_ttf, libebml, libmatroska
, libvorbis, libtheora, speex, lua5, libgcrypt, libupnp , libvorbis, libtheora, speex, lua5, libgcrypt, libupnp
, libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg , libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg
, mpeg2dec, udev, gnutls, avahi, libcddb, jackaudio, SDL, SDL_image , mpeg2dec, udev, gnutls, avahi, libcddb, jackaudio, SDL, SDL_image
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib
libkate libtiger libv4l samba liboggz libass libdvbpsi libva libkate libtiger libv4l samba liboggz libass libdvbpsi libva
xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms
libdc1394 libraw1394 libopus libdc1394 libraw1394 libopus libebml libmatroska
]; ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
@ -45,8 +45,9 @@ stdenv.mkDerivation rec {
${freefont_ttf}/share/fonts/truetype/FreeSerifBold.ttf ${freefont_ttf}/share/fonts/truetype/FreeSerifBold.ttf
''; '';
meta = { meta = with stdenv.lib; {
description = "Cross-platform media player and streaming server"; description = "Cross-platform media player and streaming server";
homepage = http://www.videolan.org/vlc/; homepage = http://www.videolan.org/vlc/;
platforms = platforms.linux;
}; };
} }

View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, makeWrapper { stdenv, lib, fetchurl, makeWrapper
, pkgconfig, cmake, gnumake, yasm, python , pkgconfig, cmake, gnumake, yasm, pythonFull
, boost, avahi, libdvdcss, lame , boost, avahi, libdvdcss, lame
, gettext, pcre, yajl, fribidi , gettext, pcre, yajl, fribidi
, openssl, gperf, tinyxml2, taglib, libssh, swig, jre , openssl, gperf, tinyxml2, taglib, libssh, swig, jre
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
makeWrapper makeWrapper
pkgconfig cmake gnumake yasm python pkgconfig cmake gnumake yasm pythonFull
boost libmicrohttpd boost libmicrohttpd
gettext pcre yajl fribidi gettext pcre yajl fribidi
openssl gperf tinyxml2 taglib libssh swig jre openssl gperf tinyxml2 taglib libssh swig jre
@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
for p in $(ls $out/bin/) ; do for p in $(ls $out/bin/) ; do
wrapProgram $out/bin/$p \ wrapProgram $out/bin/$p \
--prefix PATH ":" "${python}/bin" \ --prefix PATH ":" "${pythonFull}/bin" \
--prefix PATH ":" "${glxinfo}/bin" \ --prefix PATH ":" "${glxinfo}/bin" \
--prefix PATH ":" "${xdpyinfo}/bin" \ --prefix PATH ":" "${xdpyinfo}/bin" \
--prefix LD_LIBRARY_PATH ":" "${curl}/lib" \ --prefix LD_LIBRARY_PATH ":" "${curl}/lib" \

View file

@ -0,0 +1,36 @@
{ stdenv, fetchurl, pkgconfig, libX11, libXft, libXinerama, libXpm }:
stdenv.mkDerivation rec {
name = "dzen2-0.9.5";
buildInputs = [ pkgconfig libX11 libXft libXinerama libXpm ];
src = fetchurl {
url = "https://github.com/robm/dzen/tarball/master/dzen2-0.9.5git.tar.gz";
sha256 = "d4f7943cd39dc23fd825eb684b49dc3484860fa8443d30b06ee38af72a53b556";
};
patchPhase = ''
CFLAGS=" -Wall -Os ''${INCS} -DVERSION=\"''${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM -DDZEN_XFT `pkg-config --cflags xft`"
LIBS=" -L/usr/lib -lc -lXft -lXpm -lXinerama -lX11"
echo "CFLAGS=$CFLAGS" >>config.mk
echo "LIBS=$LIBS" >>config.mk
echo "LDFLAGS=$LIBS" >>config.mk
substituteInPlace config.mk --replace /usr/local "$out"
substituteInPlace gadgets/config.mk --replace /usr/local "$out"
'';
buildPhase = ''
mkdir -p $out/bin $out/man/man1
make clean install
cd gadgets
make clean install
'';
meta = {
homepage = https://github.com/robm/dzen;
license = stdenv.lib.licenses.mit;
description = "X notification utility";
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -11,10 +11,10 @@ let
(builtins.attrNames (builtins.removeAttrs x helperArgNames)); (builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec { sourceInfo = rec {
baseName="stalonetray"; baseName="stalonetray";
version="0.8.0"; version="0.8.1";
name="${baseName}-${version}"; name="${baseName}-${version}";
url="mirror://sourceforge/${baseName}/${name}.tar.bz2"; url="mirror://sourceforge/${baseName}/${name}.tar.bz2";
hash="0ccllmpsmilns6xxl174vgcjf8kfakcrhg3psc4cg0yynqbi2mka"; hash="1wp8pnlv34w7xizj1vivnc3fkwqq4qgb9dbrsg15598iw85gi8ll";
}; };
in in
rec { rec {

View file

@ -2,12 +2,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "windowmaker-${version}"; name = "windowmaker-${version}";
version = "0.95.4"; version = "0.95.5";
src = fetchurl { src = fetchurl {
url = "http://windowmaker.org/pub/source/release/" url = "http://windowmaker.org/pub/source/release/"
+ "WindowMaker-${version}.tar.gz"; + "WindowMaker-${version}.tar.gz";
sha256 = "0icffqnmkkjjf412m27wljbf9vxb2ry4aiyi2pqmzw3h0pq9gsib"; sha256 = "1l3hmx4jzf6vp0zclqx9gsqrlwh4rvqm1g1zr5ha0cp0zmsg89ab";
}; };
buildInputs = [ pkgconfig libX11 libXft libXmu ]; buildInputs = [ pkgconfig libX11 libXft libXmu ];

View file

@ -4,6 +4,7 @@
, enableLibraryProfiling ? false , enableLibraryProfiling ? false
, enableSharedLibraries ? false , enableSharedLibraries ? false
, enableSharedExecutables ? false , enableSharedExecutables ? false
, enableStaticLibraries ? true
, enableCheckPhase ? stdenv.lib.versionOlder "7.4" ghc.version , enableCheckPhase ? stdenv.lib.versionOlder "7.4" ghc.version
}: }:
@ -25,6 +26,9 @@ assert enableSharedExecutables -> versionOlder "7.4" ghc.version;
# Our GHC 6.10.x builds do not provide sharable versions of their core libraries. # Our GHC 6.10.x builds do not provide sharable versions of their core libraries.
assert enableSharedLibraries -> versionOlder "6.12" ghc.version; assert enableSharedLibraries -> versionOlder "6.12" ghc.version;
# Our GHC 6.10.x builds do not provide sharable versions of their core libraries.
assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
{ {
mkDerivation = mkDerivation =
args : # arguments for the individual package, can modify the defaults args : # arguments for the individual package, can modify the defaults
@ -42,6 +46,7 @@ assert enableSharedLibraries -> versionOlder "6.12" ghc.version;
x : (removeAttrs x internalAttrs) // { x : (removeAttrs x internalAttrs) // {
buildInputs = filter (y : ! (y == null)) x.buildInputs; buildInputs = filter (y : ! (y == null)) x.buildInputs;
propagatedBuildInputs = filter (y : ! (y == null)) x.propagatedBuildInputs; propagatedBuildInputs = filter (y : ! (y == null)) x.propagatedBuildInputs;
propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs;
doCheck = enableCheckPhase && x.doCheck; doCheck = enableCheckPhase && x.doCheck;
}; };
@ -92,6 +97,10 @@ assert enableSharedLibraries -> versionOlder "6.12" ghc.version;
# have to check for its existence # have to check for its existence
propagatedBuildInputs = if self.isLibrary then self.buildDepends ++ self.extraLibraries ++ self.pkgconfigDepends else []; propagatedBuildInputs = if self.isLibrary then self.buildDepends ++ self.extraLibraries ++ self.pkgconfigDepends else [];
# By default, also propagate all dependencies to the user environment. This is required, otherwise packages would be broken, because
# GHC also needs all dependencies to be available.
propagatedUserEnvPkgs = if self.isLibrary then self.buildDepends else [];
# library directories that have to be added to the Cabal files # library directories that have to be added to the Cabal files
extraLibDirs = []; extraLibDirs = [];
@ -128,6 +137,10 @@ assert enableSharedLibraries -> versionOlder "6.12" ghc.version;
# and run any regression test suites the package might have # and run any regression test suites the package might have
doCheck = enableCheckPhase; doCheck = enableCheckPhase;
# pass the '--enable-library-vanilla' flag to cabal in the
# configure stage to enable building shared libraries
inherit enableStaticLibraries;
# pass the '--enable-shared' flag to cabal in the configure # pass the '--enable-shared' flag to cabal in the configure
# stage to enable building shared libraries # stage to enable building shared libraries
inherit enableSharedLibraries; inherit enableSharedLibraries;
@ -140,9 +153,10 @@ assert enableSharedLibraries -> versionOlder "6.12" ghc.version;
(enableFeature self.enableSplitObjs "split-objs") (enableFeature self.enableSplitObjs "split-objs")
(enableFeature enableLibraryProfiling "library-profiling") (enableFeature enableLibraryProfiling "library-profiling")
(enableFeature self.enableSharedLibraries "shared") (enableFeature self.enableSharedLibraries "shared")
(optional (versionOlder "7" ghc.version) (enableFeature self.enableStaticLibraries "library-vanilla"))
(optional (versionOlder "7.4" ghc.version) (enableFeature self.enableSharedExecutables "executable-dynamic")) (optional (versionOlder "7.4" ghc.version) (enableFeature self.enableSharedExecutables "executable-dynamic"))
(optional (versionOlder "7" ghc.version) (enableFeature self.doCheck "tests")) (optional (versionOlder "7" ghc.version) (enableFeature self.doCheck "tests"))
]; ] ++ optional self.enableSharedExecutables "--ghc-option=-optl=-Wl,-rpath=$ORIGIN/../lib/${ghc.ghc.name}/${self.pname}-${self.version}";
# GHC needs the locale configured during the Haddock phase. # GHC needs the locale configured during the Haddock phase.
LANG = "en_US.UTF-8"; LANG = "en_US.UTF-8";

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "cantarell-fonts-0.0.7"; name = "cantarell-fonts-0.0.15";
src = fetchurl { src = fetchurl {
url = mirror://gnome/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.7.tar.xz; url = mirror://gnome/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.15.tar.xz;
sha256 = "1410ywvi951ngmx58g339phzsaf1rgjja6i0xvg49r4ds90zh8ba"; sha256 = "0zmwzzfjrlpkdjb475ann11m53a2idm76ydd2rw1hjmdr74dq72j";
}; };
meta = { meta = {

View file

@ -2,11 +2,11 @@
, libxml2, glib}: , libxml2, glib}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "shared-mime-info-1.1"; name = "shared-mime-info-1.2";
src = fetchurl { src = fetchurl {
url = "http://freedesktop.org/~hadess/${name}.tar.xz"; url = "http://freedesktop.org/~hadess/${name}.tar.xz";
sha256 = "0v70z5b6340jsjvdhf7brczpzq766wc1lsnjg9hc57ks2m5hjk8q"; sha256 = "0y5vi0vr6rbhvfzcfg57cfskn362bpvcpca9cy598nmr87i6lld5";
}; };
buildInputs = [ buildInputs = [

View file

@ -0,0 +1,29 @@
{ stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "cinnamon-translations";
version="2.0.3";
src = fetchurl {
url = "http://github.com/linuxmint/cinnamon-translations/archive/${version}.tar.gz";
sha256 = "07w3v118xrfp8r4dkbdiyd1vr9ah7f3bm2zw9wag9s8l8x0zfxgc";
};
installPhase =
''
mkdir -pv $out/usr/share/cinnamon/locale
cp -av mo-export/* $out/usr/share/cinnamon/locale/
'';
meta = {
homepage = "http://cinnamon.linuxmint.com";
description = "Translations files for the Cinnamon desktop" ;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.roelof ];
};
}

View file

@ -3,11 +3,11 @@
, udev, avahi, libxslt, docbook_xsl }: , udev, avahi, libxslt, docbook_xsl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gvfs-1.14.1"; name = "gvfs-1.14.2";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gvfs/1.14/${name}.tar.xz"; url = "mirror://gnome/sources/gvfs/1.14/${name}.tar.xz";
sha256 = "0af86cd7ee7b6daca144776bdf12f2f30d3e18fdd70b4da58e1a68cea4f6716a"; sha256 = "1g4ghyf45jg2ajdkv2d972hbckyjh3d9jdrppai85pl9pk2dmfy3";
}; };
buildInputs = buildInputs =

View file

@ -0,0 +1,23 @@
{ stdenv, fetchurl, intltool, pkgconfig, glib }:
let
version = "3.10.1";
in
stdenv.mkDerivation {
name = "gnome-menus-${version}";
src = fetchurl {
url = "http://ftp.gnome.org/pub/gnome/sources/gnome-menus/3.10/gnome-menus-3.10.1.tar.xz";
sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6";
};
preBuild = "patchShebangs ./scripts";
buildInputs=[ intltool pkgconfig glib ];
meta = {
homepage = "http://www.gnome.org";
description = "Gnome menu specification";
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -24,6 +24,8 @@ rec {
gnome_icon_theme = callPackage ./core/gnome-icon-theme { }; gnome_icon_theme = callPackage ./core/gnome-icon-theme { };
gnome-menus = callPackage ./core/gnome-menus { };
gnome_keyring = callPackage ./core/gnome-keyring { }; gnome_keyring = callPackage ./core/gnome-keyring { };
libgnome_keyring = callPackage ./core/libgnome-keyring { }; libgnome_keyring = callPackage ./core/libgnome-keyring { };

View file

@ -0,0 +1,70 @@
Index: b/kopete/protocols/wlm/wlmchatsession.cpp
===================================================================
--- a/kopete/protocols/wlm/wlmchatsession.cpp
+++ b/kopete/protocols/wlm/wlmchatsession.cpp
@@ -63,10 +63,14 @@
#include "wlmprotocol.h"
#include "wlmaccount.h"
#include "wlmchatsessioninkaction.h"
#ifdef HAVE_GIFLIB
#include <gif_lib.h>
+/* old giflib has no GIFLIB_MAJOR, define to avoid cpp warnings */
+#ifndef GIFLIB_MAJOR
+#define GIFLIB_MAJOR 4
+#endif
#endif
WlmChatSession::WlmChatSession (Kopete::Protocol * protocol,
const Kopete::Contact * user,
Kopete::ContactPtrList others,
@@ -465,15 +469,19 @@ WlmChatSession::slotInviteContact (Kopet
static void
printGifErrorMessage()
{
#ifdef HAVE_GIFLIB
#ifdef HAVE_GIF_ERROR_STRING // giflib 4.2.0+
+#if GIFLIB_MAJOR >= 5
+ fprintf(stderr, "GIF-LIB error (exact reporting not implemented)\n");
+#else
const char * errorString = GifErrorString();
if (errorString)
fprintf(stderr, "GIF-LIB error: %s\n", errorString);
else
fprintf(stderr, "GIF-LIB undefined error: %d\n", GifError());
+#endif
#else // older giflib versions, libungif
PrintGifError();
#endif // HAVE_GIF_ERROR_STRING
#endif // HAVE_GIFLIB
}
@@ -481,10 +489,14 @@ printGifErrorMessage()
/* stolen from kpaint write_to_gif() */
void
WlmChatSession::convertToGif( const QPixmap & ink, QString filename)
{
#ifdef HAVE_GIFLIB
+#if GIFLIB_MAJOR >= 5
+#define FreeMapObject GifFreeMapObject
+#define MakeMapObject GifMakeMapObject
+#endif
int i, status;
GifFileType *GifFile;
ColorMapObject *screenColourmap;
ColorMapObject *imageColourmap;
QImage img = ink.toImage().convertToFormat(QImage::Format_Indexed8);
@@ -523,11 +535,15 @@ WlmChatSession::convertToGif( const QPix
screenColourmap->Colors[i].Green= 0;
screenColourmap->Colors[i].Blue= 0;
}
}
+#if GIFLIB_MAJOR >= 5
+ GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0, NULL);
+#else
GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0);
+#endif
if (!GifFile) {
FreeMapObject(imageColourmap);
FreeMapObject(screenColourmap);
return;
}

View file

@ -20,6 +20,7 @@ kde {
cp -v ${./FindmsiLBC.cmake} kopete/cmake/modules/FindmsiLBC.cmake cp -v ${./FindmsiLBC.cmake} kopete/cmake/modules/FindmsiLBC.cmake
patch -p1 < ${./kopete-4.10.4-kopete-linphonemediaengine.patch} patch -p1 < ${./kopete-4.10.4-kopete-linphonemediaengine.patch}
patch -p1 < ${./kopete-4.10.4-kopete-stun.patch} patch -p1 < ${./kopete-4.10.4-kopete-stun.patch}
patch -p1 < ${./kopete-giflib5.patch}
''; '';
cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ]; cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ];

View file

@ -1,4 +1,4 @@
{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.11.2" }: { callPackage, callPackageOrig, stdenv, qt48, release ? "4.11.4" }:
let let
# Need callPackageOrig to avoid infinite cycle # Need callPackageOrig to avoid infinite cycle

View file

@ -0,0 +1,444 @@
{stable=true;
hashes=builtins.listToAttrs[
{name="amor";value="1ljcsrvd2pdy0swvlc0rpjh39bvash5qwszx0lpc9v083jg9cwym";}
{name="analitza";value="1h2bcllpzlkbgxi72g8g143zk06kywgy00rcn5mypsy35b3ka70d";}
{name="ark";value="0q1g5kab6147pdw1mdwr2rkmggrg1x3plw9y0bny1xfvdlkmm1aq";}
{name="audiocd-kio";value="05a56m059awii6gk60dphb3hwi9zq5gd38i0gdx2fq9ns8a5k1qd";}
{name="blinken";value="0fhfy2yvpgcfjdjqq85ws2vddhbv0ljp5gda3x7i7lv730vmhvcq";}
{name="bomber";value="1bgpvd3kib6p7vwkkw9al1qd2mcxl8rv2lzw30d3a0mjka0a31x8";}
{name="bovo";value="0yb1fds74c803l932nmhs00gxqa80rcmnx5js43r60xjca8i97bf";}
{name="cantor";value="154dxff6yki487hy4xy301swm2j9wiv9ql6fhm399cr54yx595ix";}
{name="cervisia";value="1v2h0awmlnvjzyaaqkix4mzv3i63qf21y65nxxfvhzv29imqbx29";}
{name="dolphin-plugins";value="0jpmc93w8z1mg5cxxppqzkkr9mz5lsd1nsaflvmpyyrgvf81x2d7";}
{name="dragon";value="0q2b6f36yaqlbrpjq5h89d8igi270fxipbhj7dy8f31jbyiyrqk1";}
{name="ffmpegthumbs";value="175r16jk0sps6144a5d1yan3m6fyargcpa5pk05g3j6fm9z5il6n";}
{name="filelight";value="1wgzpcq11znw7gxqf6dv0zhiyyljax9cjglsg7hldrpmpcv36ry2";}
{name="granatier";value="1830bp4wb2dsqrh5wlw5si5k9aihv2sgv76flpksdywzgp35nsp6";}
{name="gwenview";value="02i8zkb93ribn2kb2f9yqr2ldgr5qzc9lsfw4iyzjbnsdssww0y5";}
{name="jovie";value="1qi602477f796wf27b9arhkl4lxcwl3zdr3d5ma38x1zqy422zcx";}
{name="juk";value="195wa7qzhadal8pqy98lsxivjkazms9bg5vig89q281p5gf675rj";}
{name="kaccessible";value="0mj1zfrkq14yi1sxg3xyq234rfq8ykjmalkbn4a1fb5prvr4x9zp";}
{name="kactivities";value="0xhmmam62pgw1f2sdgp7yhf8pxpblcaf1jrclfr0h3pjigghvixi";}
{name="kajongg";value="1ag5xs842923y347k92x2phbj6rjmzfpy8wxsqhkygw5bi12n7sd";}
{name="kalgebra";value="1c66ad47m94lb2qrn3cas8g194sri79xzx8dzprj7avc3659n3jh";}
{name="kalzium";value="0li8dip02hr22p0xrnhqlgjqrqmanyv48cpfd2q6q9hjhqjasf85";}
{name="kamera";value="0dcpypb1xzwn2qj2bfcz0dr2ck3falhqa5cgv0sa1lkizndsr9gw";}
{name="kanagram";value="1gmk1ncw8sappzz5hr5im4n23fiy628k9wjrf2fhdlrfin1qwhrn";}
{name="kapman";value="0pnxnql2vc88rjbgz2zmacwxv8nipfdqlaldllnnx0nzzv8y5fky";}
{name="kapptemplate";value="19n4dsdnsk0rm7xci43jmxxczf699nbslk5sqgx7ymrhqwjad647";}
{name="kate";value="137r2snggr4lckqdpck9m9lxa97ldhdqm5y1hs7gfnpnhkjhb1nm";}
{name="katomic";value="12096dnqyz41sf94w0ywpmwj1w5idrk7mbi0k18qjgbm9rqmapc7";}
{name="kblackbox";value="1qjp86lvbjy1chxik3v5m6c90wp86qa8vvpxiz87yryb3zzzrhmc";}
{name="kblocks";value="0vwmv5m2zhdagc5vhdvp8jkfnq3r6ls02a5r5k6m2vl5n5a9mi9k";}
{name="kbounce";value="1cy7lmx1viqwf62mpi137wsx2haqclgxccsdp5gk8xa3s9r9s08d";}
{name="kbreakout";value="1zf6bpdyq5qzzz2xgmprcfkx7jdg153skb24vr44x137sj8mhmb9";}
{name="kbruch";value="07w1isaddxs2vv5c92nskwfybh78naqgc84wzrfcand3h6bl1s6y";}
{name="kcachegrind";value="08c17i6mk50n7nw9b5n7hc6kgxr6k30lr79jxyh96q861ynlhsqm";}
{name="kcalc";value="0lj33rxcj4zb4bmdhz4gwmmakj8kz66bf97rdid4r82cdd1hyjj8";}
{name="kcharselect";value="1ghpnwv47yybviygrz3adjzrkmdwnl0qbljm41d0s6x5583p1dvd";}
{name="kcolorchooser";value="0951nnc3xlp45qh2im91xhnl7w241667bnpnr6xk4p9pn9h979ys";}
{name="kcron";value="1rlfyxqg15r7naqbcwgma7z2vwd6dn95fr4sr3pb460bk9pbpgvi";}
{name="kdeartwork";value="0rpipr6zvywr6fipz8m0bw7iik9vrxslbnnfjy7rf45ywkbz7rnz";}
{name="kde-baseapps";value="15j335pnswjmwcgcgsdxpkmdw6a6pskkk290j9h8pjrcf1fnwbfn";}
{name="kde-base-artwork";value="0ics2inh6vc5k06rfgx8nw3xr782s5r9fj9w2xvd4ynj87mswr0l";}
{name="kde-dev-scripts";value="0fkk70c1q7icsds4b99kk4bwxhldy8m7k829d2n659vi3mn0pw98";}
{name="kde-dev-utils";value="016899rkw5imqlr1n25jzyl7bm6pg7hfdc13i81ghglfwrzqcwsv";}
{name="kdegraphics-mobipocket";value="1x0h9hli509a7fqwy8zvccw8cnxfmaw1grnf6c8iy4fzjik1kimv";}
{name="kdegraphics-strigi-analyzer";value="1qpiydbqxs6xvwdad6w5k2kjx22ldy3lz3fl3afahgi038a246a1";}
{name="kdegraphics-thumbnailers";value="18pn0r7s334jy93ln42r0ny52nynlrbqxr65z1gqfxxh6bmf1z67";}
{name="kdelibs";value="1v9d0r5a07fsyrnrikwgwvh64p1gqx3ch2makl55qqqyzyg16lnx";}
{name="kdenetwork-filesharing";value="1y5n2bvx3p5zcr1615avzlcj2jwjw9g3ah6na99anyk14j1x8pnr";}
{name="kdenetwork-strigi-analyzers";value="1zymkbs4hd9lxck8fylbdkvlcfdm37g3a42gnfi7pcyqc7mv8az9";}
{name="kdepim";value="1rk35yzf0pm6bmnx4fjd2mw6wrn1fvllnqqrg5s2afz6v4shc9b4";}
{name="kdepimlibs";value="1lc5ly08drsaa198il44cbnbwrpzk9ci6nwks2gc8p93rrqd4siv";}
{name="kdepim-runtime";value="0bxjh2xcp46xnsk71zv22as7qyz393ri5mvshg2nam1jfs3fw38r";}
{name="kdeplasma-addons";value="1zdya555q7ljpabsggw23l008fy1q5sjpaphcr9jb4ycyhk879fc";}
{name="kde-runtime";value="05nd0ir5x6i2lkh4xhkmdvqs5rfy2bcj6ib6a9nd1v6j2v6h90dj";}
{name="kdesdk-kioslaves";value="0bdzm70gw64yab3wi35xri6nkkx4vf5b20r3056z6gys932wzfnp";}
{name="kdesdk-strigi-analyzers";value="026swm6mq4dzsq5a38kd6ijwm18gvwqq87k58z8yxc8xwj12cf4d";}
{name="kdesdk-thumbnailers";value="1zpakq07zgv1z6imfzpin180nyda1wdaiqjvd8wdl61c444byagp";}
{name="kde-wallpapers";value="0mrdgjqyw0l960f6gr6ggjgdw9fhnkv9xl5pf6sxla6jfz3w28lc";}
{name="kdewebdev";value="1zk4nnllan06l712scs5pxsy1awb962h1i5l4sf91d9plczdldli";}
{name="kde-workspace";value="0vzi0xy17n1r24gflcxfc8ld2qkg77k8isbz94zi9q56qpm0lhhk";}
{name="kdf";value="0sagjckmnlfh3mbfrvwxgcmngay6nc3wl3wf5jc5agyhpnac55wb";}
{name="kdiamond";value="17xkadf2ycsrd35j83gh2awmf9a5sm814cyz18pcgwjrp6k95dkg";}
{name="kdnssd";value="0vwqj5dzzjm4i780d3glnqkl5adn388y48nwazr4dz3kz1ay43hb";}
{name="kfloppy";value="0nybxrvki28j01bwdas9ys7m6a549190mai4s5sfnsz1sz3h0glh";}
{name="kfourinline";value="043xl0dby94b1v7hbnpsahd5ihgrzp3616zcf7af0icjmwxyqk8w";}
{name="kgamma";value="1l1j81zxl2v063wwbvalbvpsjbiq4zvpqfhpfrnp8gsp7s1sn0y9";}
{name="kgeography";value="1da95fq7437wiqy77v15k7b9y32d627ghfn16dbfpn1gl2srl6md";}
{name="kget";value="0g0yx6mkmz97j7kv9a5y8n4aqrrnr05k42d5jql74s0f1c32f8cr";}
{name="kgoldrunner";value="0dy0hx9ksfwyhsz160jlzks5m9y75nffgg53j4bcrzfakhbjiqfx";}
{name="kgpg";value="0qh8l99gpk71mag6zy86wjhm9mswy4sx7glxrwbbcqz67zag7ky3";}
{name="khangman";value="0452a4di9kbh36spvfaa66sgwfdrj6838h7h7k1g9bay9i7zw1vq";}
{name="kig";value="1yf8x2r1qmarqpsqzraf8xxamlgpynhdrl1afl74ay4npngc3dlp";}
{name="kigo";value="04jbhy55yb72nqsy9cblj813z33zddbmxv6fgxr8i2avr378d79c";}
{name="killbots";value="0sqislgqb8lkqq1gshx7m499nvwwcl5wfn5b6bpvg12azshzffs8";}
{name="kimono";value="0bjk8nq4avh0df1i5yz4y6ibgaas7503827dwf8klzns17if54mq";}
{name="kiriki";value="0209cjsiz8db4nlb9n77zdj25bi71xfl75b7l2wd64pgwlp4k0f6";}
{name="kiten";value="0hb0d5rcwl68vr0ca2vkqxmjx1iz6xjddyxd7fshggv1jbpybcy7";}
{name="kjumpingcube";value="0qxaagxg5cd12jjx4sm7mhh2x5xrgl5vsj0h7400x61j3wbr8npb";}
{name="klettres";value="04a5vy0qw70lm9wsh6qs3lvbadsa8d3blba9c7xxyxhy8l7zmp0h";}
{name="klickety";value="05csnzkb9c396b6gp3iij8m5cjgw68hw8bxqg6sv4gj66iyrymbr";}
{name="klines";value="09cl1cyc2mjqsf4p9ws749v2gpailj6kww2wph1iz4l3sgnavi1p";}
{name="kmag";value="0mna9a46140qa3y3p19gpif83qik4jgl3705mm8s06qh6ryan753";}
{name="kmahjongg";value="0k38vq5r4hr3pfqd37bvb08h7xm54l4kljgyfy3wrx565mq7n5xh";}
{name="kmines";value="04fwfsnj1a1cfr6c3h8cq9anvi4nh4kr5xbcc9l74zvmnnl8j1cw";}
{name="kmix";value="0wqiqgvf1hyinymwn5crqsa3bd7xv934qniyp8pwhlxk1k2ix6x0";}
{name="kmousetool";value="1g643dm8111jk4zq7smlp6hdz42qcmsar2v7y9c9i2a1169r5n1z";}
{name="kmouth";value="1ccibpnw09qm6r9nfb2jchrjwg8i5k3shq6g41i80sgpja6ir8h8";}
{name="kmplot";value="0kx3ccznqydqyc50sn27b6dswwyalhdhxrd789ac9xx6gpn1vcid";}
{name="knavalbattle";value="1lm4393jl45f90zbyvsznln4n7qccl3qw8a1d984ghmqvnx576jr";}
{name="knetwalk";value="0v91z2sd3pyrwsqwxhwz4rhm6lc3lr2y8kkpbyqmf8sf4pchfnkl";}
{name="kolf";value="00s9p9pxkd3insjs0fxnqcnhycy27wm5isyp4bnaa11i79i4zl3g";}
{name="kollision";value="0sf5pzrk10ad6x86wvbmf61jmnpb29hzc21z6l84cbq8iwqpms6x";}
{name="kolourpaint";value="1icagd88zvp138dr9l2g5cp7cisry0jmja5qh8mxpidk3ax94d7s";}
{name="kompare";value="02y3rlr4v5p6x9x2i0h39x0g1fql893hhyizb05ici2a61ddbs94";}
{name="konquest";value="0dg183wmz8b551g3j5rnd591y2sb8ksi0a3cnf8jm8wf3fwfa3zd";}
{name="konsole";value="15n68fihdi6fc0hgrk36q668x653y3z8zqfb5zzawpgd2pmnfkma";}
{name="kopete";value="1658mlfxaxl67zwd7gl0z83jnp8a8lwgvknxgpaa1nyyn2ygflkv";}
{name="korundum";value="1r0dk8hb54wwqk464rwaz3160mc32i7f06ar7k5cg4n9wkqrn9bk";}
{name="kpat";value="082kldxd0pnwdcayaww6dkal0imfnsnwdbcsdlcapzjp51i978q6";}
{name="kppp";value="1adsa7x8i8xc51a6k9fkqwkrv3rz0iwg1xkjfagslgm8s4iac8ki";}
{name="krdc";value="1ddvf4ls6mwmljg5szwqcwn3lsvvpx3pgrx7f0ml5hiymw87mhrr";}
{name="kremotecontrol";value="18imhmss3f5azcj4qnrx4jib2y0xx7rdjd4a6s4h8pqmigln6bin";}
{name="kreversi";value="0qhfpr7j7v8349kj0avk6qrsaiqj5q8bc4pf58abfsgv205gp3rj";}
{name="krfb";value="00z2hrbsfg461dky454xf8ipjp9phfxm8pb6kk0lzakkfzh59zzl";}
{name="kross-interpreters";value="1pz5isyb69cal9qyrhih7s5k6p2l2wwk5qiwczhc3h0ynmk2wssv";}
{name="kruler";value="03d48bv94l9ff7nli7k5q16xl92b38ih90v1bgxkq8pxl7gq493i";}
{name="ksaneplugin";value="0vwzkxqbha1qy6z965s8r1w183ipjz6vqfcxndjdrarzs7mw9ans";}
{name="kscd";value="1ari082m0bhn8ws8wl2kps94s7vhxkrmhlzpzggvl6fssa5fssya";}
{name="kshisen";value="18pliigc2wg1iypf9r8imqp5ih35vbdd4fac7fsac9mzmdvr8pib";}
{name="ksirk";value="1is01dzsd2x6m6vn71i552q0z3qshhgfmlqkvl9g3vsjlz9a811j";}
{name="ksnakeduel";value="0bnaxvzgf7bml483xdvpv1axfi39gxpbykcj8p4vcmkyaqlg9xc6";}
{name="ksnapshot";value="11s5ika5fbh9rhkfbpg9qiyrbd698z17aqqi44qmwn7w7hmd51si";}
{name="kspaceduel";value="058x1j3nv5g77zjkvkzwr0nwfy43gyaqc180mk8xidkzk6w8ncdf";}
{name="ksquares";value="1si68d370k69dd70dvc5s3ny0q3lm1qp0xkyrlzphvfr9ivyb6dj";}
{name="kstars";value="0dxdqgbayh2mdqdjx88prsm5bplsj73xy6zjz4lml99pqz5h24wa";}
{name="ksudoku";value="1b3csnl43i5xfwxnc10qb8aypx8ci5x6lia9qwppcv9w0gqqpmdn";}
{name="ksystemlog";value="1spkyqn0ywi0nbbrcmnkmh88z6525ppshw9wnrzm2ncs9ypsy45s";}
{name="kteatime";value="00nwbw5509g0iz80bg1jljj07kwl9z8zxkvq27qkzx1h0bm9593n";}
{name="ktimer";value="0v9pfbd2hbp7wa01y13845360p7r2bdzpf9h2vc4xb9nifzva9gj";}
{name="ktouch";value="11shkrmw1cbn19j4k167d4qjanh5b6jdqhp65dn24zxbs9prk1y9";}
{name="ktuberling";value="0axx1slrk7142gm9sc61amixzabphdfp2m6zkdw4zi67ly2w15vf";}
{name="kturtle";value="1cm6g8n2qy779cgmvfxvmg49fssrggd1hr87pz1xakd2xkz2qbid";}
{name="ktux";value="039ip37bw0bxc7haz3a9b5ks9hy4k0nyyrqq7n6wdhkg0m4ji5l1";}
{name="kubrick";value="1fmr7w7f8p54892icbvmhd439adg5b04ddfln9ky34akbw8jiap7";}
{name="kuser";value="14dszc4nxgmsm1q6cigh18b97ds4ixsfqp1l717lj39makz7r6jd";}
{name="kwallet";value="1s2w3zqbaml3i3p0s3znka7kwcwib76p0zpfbfzjaxzgxwmb4nwm";}
{name="kwordquiz";value="1a6chbc4hpybxa7w50jlasp5nzrz9z4qk766cxflpf532s6mv9yl";}
{name="libkcddb";value="0h7kg4wnjn2j1wjm758jyf0qiwllzm39zxwkvyd4r744ra88ym6a";}
{name="libkcompactdisc";value="18nwbjgviyqd6pvaq4l7hsihask54knfwsk6z4rpk25ln74ls7rs";}
{name="libkdcraw";value="1b7yzv25dp55mqkj8ap3qy97ddhdagbsfv8kanswln33k8phjvn7";}
{name="libkdeedu";value="1y2iwivgqsg1bb34bif99pa58cqlamfv727h8p69b5r3x0kj1mkk";}
{name="libkdegames";value="0k29wf6zcqvpf9xzrxbizn4pi8mijq8rbr01vck9wx8glj3306gj";}
{name="libkexiv2";value="048rx25n64fyyms9wjdsnlngh5j7650gzxpszf683jgf70x9paj5";}
{name="libkipi";value="0i8k2x68n88v0jwp0yqwbgx6n13vrspb66p3dckwkh4nfsrmnpwn";}
{name="libkmahjongg";value="0b5gfqqk0jjkbhdvh55njlci1k18icijq8a0m987x92dlhyn6hf2";}
{name="libksane";value="13ghwcssd6zp731lcqa3z8q974g5sv48nlp38crpni83jz7wqyl8";}
{name="lokalize";value="1i09brs8v71xhyn3fw69asfvz95gw5iblrnqzf1iybh858fz3sg8";}
{name="lskat";value="11754yxbabhps0w521rzcsqjpkxdk53ikqjchhr91syiymf556as";}
{name="marble";value="07d6hgb65r6aa9h4ikxnssfiq5a0qqbvlq68mp9qib7hhl38qrcx";}
{name="mplayerthumbs";value="1z7f4ibs8jms61kary73p0v4myxsxsag299zp1h3ldfbfshv73yv";}
{name="nepomuk-core";value="08cqvw42zzq981vs9gdix5jjsfgn2i4x0hi7q5ajd2rqyjxngh3s";}
{name="nepomuk-widgets";value="0ncvza1zlk203q57741rx1cj6gqy009ygqpcnlnfbd6xpqyphqq7";}
{name="okteta";value="0b1y8r6fa8dy3xjyiyzj4iy4shwgqff4lv9hrw2dvm3knfvjiyzz";}
{name="okular";value="0wlk1rwgif1qbk7f2v26bgg27vhbjfr4pgbdvncmms43839n9zqq";}
{name="oxygen-icons";value="1w5yn2xyp5kadg5rf2zxb88apgj13c055if3fj5w70mxir1z8nzq";}
{name="pairs";value="00ygnr0r064z33z19mirz79b9dj0wfk6yp38n2rmj1z2568pq9gq";}
{name="palapeli";value="0gbp50aph2ckjj6bw7f5p2xfxw6x8qnypk45c4ys2bfj3xs3kzp9";}
{name="parley";value="0s1iv864ijrlp9wcj13lvy68133dq7spvrmf2xnspn98ba7dydc0";}
{name="perlkde";value="131dipnns5rmncrxh7wmpqxnwxkvnh11rhb7dx76gc9mvgr6k3kg";}
{name="perlqt";value="1rkjv0xmn7v8mgmlfvzfa5ix18xl62hcbgrjg800hrvj43cj7ixj";}
{name="picmi";value="18im6q18zsahx4y75d21ihnmpn00ml8y99xgcwf061jknf3l9rfa";}
{name="poxml";value="0l9zarf51p10hqdnfzks4q7vhm1lkjh1cyi3bqn097jncsv3c0pi";}
{name="print-manager";value="1csnbl0q50g7b0yc681pgf88vvw7f4vzqpq493nn1n6gr8i46l6v";}
{name="pykde4";value="0mwvs209d75s3smsb9wbvcp5n94a9rxh8nvh8d1wyvlkn60kfpr5";}
{name="qtruby";value="1d89h83is86szy4bqa9rb9xcc3iwjgl3kxldcy64cls44cif9vkx";}
{name="qyoto";value="063m9a8b7qc1hxii2w3zyf69b84129zppbrxm83i4q4s0v5y63in";}
{name="rocs";value="02f9cnzkq18fiblih384v3ngaps9lhgqjmzqv2k8k09bxm6pyiz5";}
{name="smokegen";value="17bgshfmxa8iyp65fss3g74wdjdy4rnq7wsf223ls38jk6fjnkmi";}
{name="smokekde";value="0dl24czf5rspgqwm5i8f0a6y911alirnz2vdjywa2j2nimi690il";}
{name="smokeqt";value="1j0qpqr5zjffr8hfkyav50jpxj8xj8n9jk24gahvjnkk9wpyqbjc";}
{name="step";value="1xz074h5hwmacf4v4ca2m580h1sppvvgcwbym142vr55pd3yd2f3";}
{name="superkaramba";value="16xijicbqj771mdy9l91ml8ikm0qjs9ykj8nz6az2xzw6q8izz2g";}
{name="svgpart";value="1d6si3w4kpbxgzyi044cr1ch9b0jrl23fyzabdzxgb2qkcfxifng";}
{name="sweeper";value="1snjprdkzgf80z6waclhibzwcky6k4qam9bkgfd9lkaf9hba5x88";}
{name="umbrello";value="08h82pizkkgqqdgfs2jinwzjb6bc2nr4zyh50fkr0bk0xlspp87f";}
];
modules=[
{
module="kdemultimedia";
split=true;
pkgs=[
{ name="audiocd-kio"; sane="audiocd_kio"; }
{ name="dragon"; }
{ name="ffmpegthumbs"; }
{ name="juk"; }
{ name="kmix"; }
{ name="kscd"; }
{ name="libkcddb"; }
{ name="libkcompactdisc"; }
{ name="mplayerthumbs"; }
];
}
{
module="kdegraphics";
split=true;
pkgs=[
{ name="gwenview"; }
{ name="kamera"; }
{ name="kcolorchooser"; }
{ name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
{ name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
{ name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
{ name="kgamma"; }
{ name="kolourpaint"; }
{ name="kruler"; }
{ name="ksaneplugin"; }
{ name="ksnapshot"; }
{ name="libkdcraw"; }
{ name="libkexiv2"; }
{ name="libkipi"; }
{ name="libksane"; }
{ name="okular"; }
{ name="svgpart"; }
];
}
{
module="kdelibs";
split=true;
pkgs=[
{ name="kdelibs"; }
{ name="nepomuk-core"; sane="nepomuk_core"; }
{ name="nepomuk-widgets"; sane="nepomuk_widgets"; }
];
}
{
module="kdenetwork";
split=true;
pkgs=[
{ name="kdenetwork-filesharing"; sane="kdenetwork_filesharing"; }
{ name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers"; }
{ name="kdnssd"; }
{ name="kget"; }
{ name="kopete"; }
{ name="kppp"; }
{ name="krdc"; }
{ name="krfb"; }
];
}
{
module="kdeutils";
split=true;
pkgs=[
{ name="ark"; }
{ name="filelight"; }
{ name="kcalc"; }
{ name="kcharselect"; }
{ name="kdf"; }
{ name="kfloppy"; }
{ name="kgpg"; }
{ name="kremotecontrol"; }
{ name="ktimer"; }
{ name="kwallet"; }
{ name="print-manager"; sane="print_manager"; }
{ name="superkaramba"; }
{ name="sweeper"; }
];
}
{
module="applications";
split=true;
pkgs=[
{ name="kate"; }
{ name="konsole"; }
];
}
{
module="kdetoys";
split=true;
pkgs=[
{ name="amor"; }
{ name="kteatime"; }
{ name="ktux"; }
];
}
{
module="kdesdk";
split=true;
pkgs=[
{ name="cervisia"; }
{ name="dolphin-plugins"; sane="dolphin_plugins"; }
{ name="kapptemplate"; }
{ name="kcachegrind"; }
{ name="kde-dev-scripts"; sane="kde_dev_scripts"; }
{ name="kde-dev-utils"; sane="kde_dev_utils"; }
{ name="kdesdk-kioslaves"; sane="kdesdk_kioslaves"; }
{ name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers"; }
{ name="kdesdk-thumbnailers"; sane="kdesdk_thumbnailers"; }
{ name="kompare"; }
{ name="lokalize"; }
{ name="okteta"; }
{ name="poxml"; }
{ name="umbrello"; }
];
}
{
module="kdegames";
split=true;
pkgs=[
{ name="bomber"; }
{ name="bovo"; }
{ name="granatier"; }
{ name="kajongg"; }
{ name="kapman"; }
{ name="katomic"; }
{ name="kblackbox"; }
{ name="kblocks"; }
{ name="kbounce"; }
{ name="kbreakout"; }
{ name="kdiamond"; }
{ name="kfourinline"; }
{ name="kgoldrunner"; }
{ name="kigo"; }
{ name="killbots"; }
{ name="kiriki"; }
{ name="kjumpingcube"; }
{ name="klickety"; }
{ name="klines"; }
{ name="kmahjongg"; }
{ name="kmines"; }
{ name="knavalbattle"; }
{ name="knetwalk"; }
{ name="kolf"; }
{ name="kollision"; }
{ name="konquest"; }
{ name="kpat"; }
{ name="kreversi"; }
{ name="kshisen"; }
{ name="ksirk"; }
{ name="ksnakeduel"; }
{ name="kspaceduel"; }
{ name="ksquares"; }
{ name="ksudoku"; }
{ name="ktuberling"; }
{ name="kubrick"; }
{ name="libkdegames"; }
{ name="libkmahjongg"; }
{ name="lskat"; }
{ name="palapeli"; }
{ name="picmi"; }
];
}
{
module="kdeedu";
split=true;
pkgs=[
{ name="analitza"; }
{ name="blinken"; }
{ name="cantor"; }
{ name="kalgebra"; }
{ name="kalzium"; }
{ name="kanagram"; }
{ name="kbruch"; }
{ name="kgeography"; }
{ name="khangman"; }
{ name="kig"; }
{ name="kiten"; }
{ name="klettres"; }
{ name="kmplot"; }
{ name="kstars"; }
{ name="ktouch"; }
{ name="kturtle"; }
{ name="kwordquiz"; }
{ name="libkdeedu"; }
{ name="marble"; }
{ name="pairs"; }
{ name="parley"; }
{ name="rocs"; }
{ name="step"; }
];
}
{
module="kdeadmin";
split=true;
pkgs=[
{ name="kcron"; }
{ name="ksystemlog"; }
{ name="kuser"; }
];
}
{
module="kdebindings";
split=true;
pkgs=[
{ name="kimono"; }
{ name="korundum"; }
{ name="kross-interpreters"; sane="kross_interpreters"; }
{ name="perlkde"; }
{ name="perlqt"; }
{ name="pykde4"; }
{ name="qtruby"; }
{ name="qyoto"; }
{ name="smokegen"; }
{ name="smokekde"; }
{ name="smokeqt"; }
];
}
{
module="kdeaccessibility";
split=true;
pkgs=[
{ name="jovie"; }
{ name="kaccessible"; }
{ name="kmag"; }
{ name="kmousetool"; }
{ name="kmouth"; }
];
}
{
module="kde-baseapps";
sane="kde_baseapps"; split=true;
pkgs=[
{ name="kde-baseapps"; sane="kde_baseapps"; }
];
}
{ module="kactivities"; split=false;}
{ module="kdeartwork"; split=false;
pkgs=[
{ name="ColorSchemes"; }
{ name="IconThemes"; }
{ name="emoticons"; }
{ name="kscreensaver"; }
{ name="kwin-styles"; sane="kwin_styles";}
{ name="sounds"; }
{ name="styles"; }
{ name="wallpapers"; }
{ name="HighResolutionWallpapers"; }
{ name="WeatherWallpapers"; }
{ name="desktopthemes"; }
];
}
{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
{ module="kdelibs"; split=false;}
{ module="kdepim"; split=false;}
{ module="kdepimlibs"; split=false;}
{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
{ module="kde-runtime"; sane="kde_runtime"; split=false;}
{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
{ module="kdewebdev"; split=false;
pkgs=[
{ name="klinkstatus"; }
{ name="kfilereplace"; }
{ name="kimagemapeditor"; }
{ name="kommander"; }
];
}
{ module="kde-workspace"; sane="kde_workspace"; split=false;}
{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
];
}

View file

@ -0,0 +1,272 @@
[
{
lang = "ar";
saneName = "ar";
sha256 = "11dzsk6kvqpvpi77414hyis5s0kp4l0xplyyhvkp28shnbzx3cab";
}
{
lang = "bg";
saneName = "bg";
sha256 = "0f4j7s31gw9g183wsxh27dvqkckhrlh1yr4dmd6cjiabpnk5avr5";
}
{
lang = "bs";
saneName = "bs";
sha256 = "09f8dayah2gb4j70pljih8rvk6fiprfvmagii72ymfjw5p609msh";
}
{
lang = "ca";
saneName = "ca";
sha256 = "08jlsy3ak9c5jbwan5wsq4y66sz6pam5mym1hmjfwp1dzknd8lxn";
}
{
lang = "ca@valencia";
saneName = "ca_valencia";
sha256 = "0lwk1qf6xnvxd6lmdif9126i4bna7cwk8dj0dd3s2qm4613gyjdz";
}
{
lang = "cs";
saneName = "cs";
sha256 = "16lm4k45rrxvc228bjzl57a39aybkh6kizm960znkfg8dslxvhnr";
}
{
lang = "da";
saneName = "da";
sha256 = "1z0mkh7sqsblhar3fjind0m63mlx817fhw1r9f0jrijkwmv163cx";
}
{
lang = "de";
saneName = "de";
sha256 = "15611y569bk17ss62ic56ai6lwpqhg9apsqcnkdlh1iwk2wkzg8x";
}
{
lang = "el";
saneName = "el";
sha256 = "1p75mfw2rs9qb0m2zybscrv2jhj7aq8w5a1rxs3hrddr2wc2k0g1";
}
{
lang = "en_GB";
saneName = "en_GB";
sha256 = "0zj9qn2k160184x9lypxyl6d5r8drxz585lagsvd7l0ckx3maqxn";
}
{
lang = "es";
saneName = "es";
sha256 = "0bc11cxjf8672mch30asn34pnn53a3xhz9wb4jly9bxy3bjs93m6";
}
{
lang = "et";
saneName = "et";
sha256 = "1l1h1q65qsmrzgcvralpdmmmnpricbiyc5bhrd1valvgvwys2rj2";
}
{
lang = "eu";
saneName = "eu";
sha256 = "1wsgvmacix0vd7qr029lsgnksw3hnx57aczigcf7m5dy1mi2jk1j";
}
{
lang = "fa";
saneName = "fa";
sha256 = "1j7f32wsbnpzdhfki9wnb18mq26la61f6ksmad33cikq3pwn1qvf";
}
{
lang = "fi";
saneName = "fi";
sha256 = "1l5cvnbkgv9kxn2b67ycmkyqkdpjzq3a8ggsmn4397bj9vlplcdy";
}
{
lang = "fr";
saneName = "fr";
sha256 = "1lnayg8j76gzhxl21x5z92q3g8gc791c4hlgr3ifg54s8rknbbf6";
}
{
lang = "ga";
saneName = "ga";
sha256 = "0z8ncf32qpp9538kb5l41qhvk0c05j168x5q72cfliigs77m9jya";
}
{
lang = "gl";
saneName = "gl";
sha256 = "10pjjkp4nhlrjlv38w3srl5x3fi8713qsbp4i92bksas6p1n6pnw";
}
{
lang = "he";
saneName = "he";
sha256 = "1d4094ql7nzw5gvhgvdw9j8pacpnlbq76j9670wj5z5mxaggm5n4";
}
{
lang = "hi";
saneName = "hi";
sha256 = "18s7h8bldkhl55akglmdaq1kx1z8171g96ysxvljy3aqnv400cpd";
}
{
lang = "hr";
saneName = "hr";
sha256 = "14insp30nb18dva5rpd1mgixhbm6rrkbbs7wl796jqzxlxin1bbg";
}
{
lang = "hu";
saneName = "hu";
sha256 = "02mwbsg8cvnrqizcggpsq6r9hp26z4r5sg62iksknl4fahzi9jwa";
}
{
lang = "ia";
saneName = "ia";
sha256 = "0w3yncz364rd7jby39cqmmswh5p7i7hn08yfn038pj9k2wvg3nli";
}
{
lang = "is";
saneName = "is";
sha256 = "09ja8vnl8ykh9j0wdrmlwhjj71dsl0kl1mlsbi0c95dphbj58m0q";
}
{
lang = "it";
saneName = "it";
sha256 = "145r6lcf7mbnfv0kk0kxmd7aq80y5dlkxpp2fy31rigpkz8syiaz";
}
{
lang = "ja";
saneName = "ja";
sha256 = "1s11lqac8j1qbp0fq67zq7jss7j60pwgprjki73s77icir5sijpv";
}
{
lang = "kk";
saneName = "kk";
sha256 = "1y27ax3viixbhh6yrib9k4px0y4aj6fzpnyxd9j6yibh4gmkxa49";
}
{
lang = "km";
saneName = "km";
sha256 = "08nb4fv4hafxyhdxsdf29yh3nv5c0hb3ar0329xlw5kvkvfckgza";
}
{
lang = "ko";
saneName = "ko";
sha256 = "1qzzbphcjl506wha4i9drzc0hrlrc4cicmw37vl1hylbkw7lfrdf";
}
{
lang = "lt";
saneName = "lt";
sha256 = "1rqjv25y8s0g5mr47fasybcfvw36i9z41l8gpi3rdvv52b4s0n4c";
}
{
lang = "lv";
saneName = "lv";
sha256 = "1cfdvbq40fk9f6xqz27bzy4shrh0i7sqbaf3l54f0zpgnqmk6c8a";
}
{
lang = "mr";
saneName = "mr";
sha256 = "1jz355nz34f15gic4hl09qdd648gjl3ybinbf5kpy0nj5d052lwj";
}
{
lang = "nb";
saneName = "nb";
sha256 = "1v1f42cipx39i9as0k2arb51a4qizh65vdld35dlkfxnkkwl5gb2";
}
{
lang = "nds";
saneName = "nds";
sha256 = "1mwrwwclds1fkwgak1fl148qpxblkk5jxbnjfl7lgc2a28c4w4y8";
}
{
lang = "nl";
saneName = "nl";
sha256 = "0x9jqq4jbf6664m201pjf0bk5m7kziqpc59ai6n3amq7ihg5zbyj";
}
{
lang = "nn";
saneName = "nn";
sha256 = "1x8hr1sb36jnw9g897dww3c72hqrxhpjgnzm6x8xcqjb93rrjqnz";
}
{
lang = "pa";
saneName = "pa";
sha256 = "1lvdz8hi5y6sia6il8x47k607dl11abmgpa07gvplv5g6gshm27q";
}
{
lang = "pl";
saneName = "pl";
sha256 = "0pnzdz0ms85cqjd2aav2cm1w5rb3v0q96nz7b70dz9mnyxrnjiha";
}
{
lang = "pt";
saneName = "pt";
sha256 = "1jgadk819ws6zcvkqrvjyx7kn0sgsdvmg15hi03mn4nijf8mzzlb";
}
{
lang = "pt_BR";
saneName = "pt_BR";
sha256 = "06yyrv21g0fyvisj45r9iqiclydj0y5lb4bkykd28f0g6nrcjlzv";
}
{
lang = "ro";
saneName = "ro";
sha256 = "040fnm9rmj156mn033axx6isa9fvaskw5dqzh40mjchqz4bgw6vx";
}
{
lang = "ru";
saneName = "ru";
sha256 = "1p5glmm7a495b1avv9n9y1im04z8nxps13pf0crvzdwplkiin8id";
}
{
lang = "sk";
saneName = "sk";
sha256 = "19d10b807kg50jq03xgc84dksfcfmp1vimqjbfd53qgdxdfxa9c0";
}
{
lang = "sl";
saneName = "sl";
sha256 = "1lpgyar5hq39463dsgwlmym5rgivyqyipls8l0km6sy24kmh43g6";
}
{
lang = "sr";
saneName = "sr";
sha256 = "0600x4vgflbyg0vr97vqpd405j311780d983xrf22awbyqg3hiqa";
}
{
lang = "sv";
saneName = "sv";
sha256 = "1zi3s9g4nykxrrpqm2fq8didip1jzv8iyscrg7fc8mls7ikz51bp";
}
{
lang = "tg";
saneName = "tg";
sha256 = "15zm9p0g4qrb2wz761gvpd05yz2pz8lpcsmdqx8lclvlqr58xl8v";
}
{
lang = "tr";
saneName = "tr";
sha256 = "039jmlljc3fdynsa27whmx50jb8jx3x7k1l6xdrijdk4j43j047p";
}
{
lang = "ug";
saneName = "ug";
sha256 = "05krj1b7z1rirr7141pyaxssnbgf74v8bcxhb2m9yb944nx2z1wx";
}
{
lang = "uk";
saneName = "uk";
sha256 = "19bkp5hsxd5zfgdwyc6bx1425phd8d9kd43xin13cdcikdq5nh6z";
}
{
lang = "vi";
saneName = "vi";
sha256 = "1fy0v0zd8mq59f3wlpn855ff8q8x6yy8a17vjnwfw69qmar0x4g8";
}
{
lang = "wa";
saneName = "wa";
sha256 = "0h8kycdjg8cglb7sn5m4v8djwb4smhzmws2khr309nv4930vqf14";
}
{
lang = "zh_CN";
saneName = "zh_CN";
sha256 = "0aaybsbbf19js8bxmj7kqqjnqp68fzkqdrbhjlh5c1jdxqvlr2w8";
}
{
lang = "zh_TW";
saneName = "zh_TW";
sha256 = "1xgndbjqhgw5pnws8qbb4xvrcnbr96m275hrhd3rb99q5xd4br20";
}
]

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano, sqlite }: { stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano, sqlite }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "akonadi-1.10.2"; name = "akonadi-1.11.0";
src = fetchurl { src = fetchurl {
url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2"; url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2";
sha256 = "1jij7vmrxg4kzqcq4ci73q3m3927bym5xb34kvmpq3h7p1d0vmgk"; sha256 = "0k96i8xq3xkm5rrxrj3zqgppcmqbzcpc918xnx0p54jkkm85gchc";
}; };
buildInputs = [ qt4 soprano libxslt boost sqlite ]; buildInputs = [ qt4 soprano libxslt boost sqlite ];
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
description = "KDE PIM Storage Service"; description = "KDE PIM Storage Service";
license = "LGPL"; license = "LGPL";
homepage = http://pim.kde.org/akonadi; homepage = http://pim.kde.org/akonadi;
maintainers = [ maintainers.sander maintainers.urkud ]; maintainers = [ maintainers.sander maintainers.urkud maintainers.phreedom ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

View file

@ -1,15 +1,15 @@
{ stdenv, fetchurl, ghc, perl, gmp, ncurses }: { stdenv, fetchurl, ghc, perl, gmp, ncurses, happy, alex }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "7.7.20130828"; version = "7.7.20131202";
name = "ghc-${version}"; name = "ghc-${version}";
src = fetchurl { src = fetchurl {
url = "http://darcs.haskell.org/ghcBuilder/uploads/tn23/${name}-src.tar.bz2"; url = "http://cryp.to/${name}.tar.xz";
sha256 = "180nkd77kz3mv4g7yq8ipx34p5q8k714l0z2527y49lghy118jzv"; sha256 = "1gnp5c3x7dbaz7s2yvkw2fmvqh5by2gpp0zlcyj8p2gv13gxi2cb";
}; };
buildInputs = [ ghc perl gmp ncurses ]; buildInputs = [ ghc perl gmp ncurses happy alex ];
enableParallelBuilding = true; enableParallelBuilding = true;

View file

@ -7,8 +7,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "idris"; pname = "idris";
version = "0.9.10"; version = "0.9.10.1";
sha256 = "0sbadjc4kj59f5240036pryxr4b6k6y2zkmszv99wq660mm7a3d3"; sha256 = "194gbpk8fy64maj9lcwj9hkbndc3287bh9mz2jm09vd11i23iyg1";
isLibrary = false; isLibrary = false;
isExecutable = true; isExecutable = true;
buildDepends = [ buildDepends = [

View file

@ -0,0 +1,134 @@
{ swingSupport ? true
, stdenv
, requireFile
, unzip
, xlibs ? null
, installjdk ? true
, pluginSupport ? true
, installjce ? false
}:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
assert swingSupport -> xlibs != null;
let
/**
* The JRE libraries are in directories that depend on the CPU.
*/
architecture =
if stdenv.system == "i686-linux" then
"i386"
else if stdenv.system == "x86_64-linux" then
"amd64"
else
abort "jdk requires i686-linux or x86_64 linux";
jce =
if installjce then
requireFile {
name = "UnlimitedJCEPolicyJDK7.zip";
url = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html;
sha256 = "0qljzfxbikm8br5k7rkamibp1vkyjrf6blbxpx6hn4k46f62bhnh";
}
else
null;
in
stdenv.mkDerivation {
name =
if installjdk then "jdk-1.7.0_45" else "jre-1.7.0_45";
src =
if stdenv.system == "i686-linux" then
requireFile {
name = "jdk-7u45-linux-i586.tar.gz";
url = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html;
sha256 = "1q0nw2rwmavcrssyigq76p1h00hm8kd3rhb5bdv7rbdcs0jxrjsa";
}
else if stdenv.system == "x86_64-linux" then
requireFile {
name = "jdk-7u45-linux-x64.tar.gz";
url = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html;
sha256 = "06jbz536zycqkdpc7zriay0jidmj9nriqva60afsgpv93kcf9spj";
}
else
abort "jdk requires i686-linux or x86_64 linux";
buildInputs = if installjce then [ unzip ] else [];
installPhase = ''
cd ..
if test -z "$installjdk"; then
mv $sourceRoot/jre $out
else
mv $sourceRoot $out
fi
for file in $out/*
do
if test -f $file ; then
rm $file
fi
done
if test -n "$installjdk"; then
for file in $out/jre/*
do
if test -f $file ; then
rm $file
fi
done
fi
# construct the rpath
rpath=
for i in $libraries; do
rpath=$rpath''${rpath:+:}$i/lib
done
if test -z "$installjdk"; then
jrePath=$out
else
jrePath=$out/jre
fi
if test -n "$jce"; then
unzip $jce
cp -v jce/*.jar $jrePath/lib/security
fi
rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/jli
# set all the dynamic linkers
find $out -type f -perm +100 \
-exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
--set-rpath "$rpath" {} \;
find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
if test -z "$pluginSupport"; then
rm -f $out/bin/javaws
if test -n "$installjdk"; then
rm -f $out/jre/bin/javaws
fi
fi
mkdir $jrePath/lib/${architecture}/plugins
ln -s $jrePath/lib/${architecture}/libnpjp2.so $jrePath/lib/${architecture}/plugins
'';
inherit installjdk pluginSupport;
/**
* libXt is only needed on amd64
*/
libraries =
[stdenv.gcc.libc] ++
(if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt] else []);
passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins";
meta.license = "unfree";
}

View file

@ -1,12 +1,12 @@
{stdenv, fetchurl, llvm, gmp, mpfr, mpc}: {stdenv, fetchurl, llvm, gmp, mpfr, mpc}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.2"; version = "3.3";
name = "dragonegg-${version}"; name = "dragonegg-${version}";
src = fetchurl { src = fetchurl {
url = "http://llvm.org/releases/${version}/${name}.src.tar.gz"; url = "http://llvm.org/releases/${version}/${name}.src.tar.gz";
sha256 = "0jfxhqy3177drlvzgp6m0kwnbfyzrd4vzidnxjhck8a7a69a26bg"; sha256 = "1kfryjaz5hxh3q6m50qjrwnyjb3smg2zyh025lhz9km3x4kshlri";
}; };
# The gcc the plugin will be built for (the same used building dragonegg) # The gcc the plugin will be built for (the same used building dragonegg)

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