gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into x-updates

Browse Source 
Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix
This commit is contained in:
Vladimír Čunát
2013-12-18 23:21:29 +01:00
parent e8394e3f8c 43498628e8
commit 4c5a71f777
431 changed files with 2365 additions and 1307 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/lists.nix
+1
View File
@@ -225,4 +225,5 @@ in rec {
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];
}
nixos/doc/manual/development.xml
+1 -1
View File
@@ -494,7 +494,7 @@ module writers.</para>
<variablelist>
<varlistentry>
<term><option>etc.environment</option></term>
<term><option>environment.etc</option></term>
<listitem>
<para>This set defines files in <filename>/etc</filename>. A
typical use is:
nixos/modules/misc/ids.nix
+1
View File
@@ -108,6 +108,7 @@
haproxy = 97;
mongodb = 98;
openldap = 99;
memcached = 100;
# When adding a uid, make sure it doesn't match an existing gid.
nixos/modules/module-list.nix
+1
View File
@@ -170,6 +170,7 @@
./services/networking/minidlna.nix
./services/networking/nat.nix
./services/networking/networkmanager.nix
./services/networking/ntopng.nix
./services/networking/ntpd.nix
./services/networking/oidentd.nix
./services/networking/openfire.nix
nixos/modules/services/databases/memcached.nix
+2 -1
View File
@@ -68,8 +68,9 @@ in
config = mkIf config.services.memcached.enable {
users.extraUsers = singleton
users.extraUsers.memcached =
{ name = cfg.user;
uid = config.ids.uids.memcached;
description = "Memcached server user";
};
nixos/modules/services/networking/ddclient.nix
+1 -1
View File
@@ -86,7 +86,7 @@ in
};
web = mkOption {
default = "web, web=checkip.dyndns.com/, web-skip='IP Address'" ;
default = "web, web=checkip.dyndns.com/, web-skip='Current IP Address: '" ;
description = "";
};
nixos/modules/services/networking/ntopng.nix
+116
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.
};
}
nixos/modules/services/security/fail2ban.nix
+1 -1
View File
@@ -106,7 +106,7 @@ in
serviceConfig =
{ ExecStart = "${pkgs.fail2ban}/bin/fail2ban-server -f";
ReadOnlyDirectories = "/";
ReadWriteDirectories = "/run/fail2ban /var/tmp";
ReadWriteDirectories = "/run /var/tmp";
CapabilityBoundingSet = "CAP_DAC_READ_SEARCH CAP_NET_ADMIN CAP_NET_RAW";
};
nixos/modules/services/x11/window-managers/default.nix
+1
View File
@@ -17,6 +17,7 @@ in
./xmonad.nix
./i3.nix
./xbmc.nix
./herbstluftwm.nix
];
options = {
nixos/modules/services/x11/window-managers/herbstluftwm.nix
+28
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 ];
};
}
nixos/modules/virtualisation/google-compute-config.nix
+5
View File
@@ -0,0 +1,5 @@
{ config, pkgs, modulesPath, ... }:
{
imports = [ "${modulesPath}/virtualisation/google-compute-image.nix" ];
}
nixos/modules/virtualisation/google-compute-image.nix
+155
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;
};
}
pkgs/applications/audio/a2jmidid/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "a2jmidid-${version}";
version = "7";
version = "8";
src = fetchurl {
url = "http://download.gna.org/a2jmidid/${name}.tar.bz2";
sha256 = "1pl91y7npirhmikzlizpbyx2vkfvdkvc6qvc2lv4capj3cp6ypx7";
sha256 = "0pzm0qk5ilqhwz74pydg1jwrds27vm47185dakdrxidb5bv3b5ia";
};
buildInputs = [ alsaLib dbus jackaudio pkgconfig python ];
pkgs/applications/audio/bristol/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "bristol-${version}";
version = "0.60.10";
version = "0.60.11";
src = fetchurl {
url = "mirror://sourceforge/bristol/${name}.tar.gz";
sha256 = "070rn5zdx6vrqmq7w1rrpxig3bxlylbsw82nlmkjnhjrgm6yx753";
sha256 = "1fi2m4gmvxdi260821y09lxsimq82yv4k5bbgk3kyc3x1nyhn7vx";
};
buildInputs = [
pkgs/applications/audio/csound/default.nix
+3 -3
View File
@@ -12,13 +12,13 @@
}:
stdenv.mkDerivation {
name = "csound-5.18.02";
name = "csound-5.19.01";
enableParallelBuilding = true;
src = fetchurl {
url = mirror://sourceforge/csound/Csound5.18.02.tar.gz;
sha256 = "4c461cf3bf60b83671224949dd33805379b7121bf2c0ad6af5e191e7f6f8adc8";
url = mirror://sourceforge/csound/Csound5.19.01.tar.gz;
sha256 = "078i69jwgadmxwa5ffn8h1py7cmd9asa8swnh38fyp56lzgzn669";
};
buildInputs = [ cmake libsndfile flex bison alsaLib pulseaudio tcltk ];
pkgs/applications/audio/jackmeter/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, jackaudio, pkgconfig }:
stdenv.mkDerivation rec {
name = "jackmeter-0.3";
name = "jackmeter-0.4";
src = fetchurl {
url = "http://www.aelius.com/njh/jackmeter/${name}.tar.gz";
sha256 = "03siznnq3f0nnqyighgw9qdq1y4bfrrxs0mk6394pza3sz4b6sgp";
sha256 = "1cnvgx3jv0yvxlqy0l9k285zgvazmh5k8m4l7lxckjfm5bn6hm1r";
};
buildInputs = [ jackaudio pkgconfig ];
pkgs/applications/audio/lingot/default.nix
+3 -3
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk, alsaLib, libglade }:
stdenv.mkDerivation {
name = "lingot-0.9.0";
name = "lingot-0.9.1";
src = fetchurl {
url = mirror://savannah/lingot/lingot-0.9.0.tar.gz;
sha256 = "07z129lp8m4sz608q409wb11c639w7cbn497r7bscgg08p6c07xb";
url = mirror://savannah/lingot/lingot-0.9.1.tar.gz;
sha256 = "0ygras6ndw2fylwxx86ac11pcr2y2bcfvvgiwrh92z6zncx254gc";
};
buildInputs = [ pkgconfig intltool gtk alsaLib libglade ];
pkgs/applications/audio/moc/default.nix
+21
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;
};
}
pkgs/applications/audio/mpg123/default.nix
+3 -3
View File
@@ -1,11 +1,11 @@
{stdenv, fetchurl, alsaLib }:
stdenv.mkDerivation {
name = "mpg123-1.15.4";
name = "mpg123-1.16.0";
src = fetchurl {
url = mirror://sourceforge/mpg123/mpg123-1.15.4.tar.bz2;
sha256 = "05aizspky9mp1bq2lfrkjzrsnjykl7gkbrhn93xcarj5b2izv1b8";
url = mirror://sourceforge/mpg123/mpg123-1.16.0.tar.bz2;
sha256 = "1lznnfdvg69a9qbbhvhfc9i86hxdmdqx67lvbkqbh8mmhpip43zh";
};
buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
pkgs/applications/editors/flpsed/default.nix
+3 -3
View File
@@ -1,11 +1,11 @@
{stdenv, fetchurl, fltk13, ghostscript}:
stdenv.mkDerivation {
name = "flpsed-0.7.0";
name = "flpsed-0.7.1";
src = fetchurl {
url = "http://www.ecademix.com/JohannesHofmann/flpsed-0.7.0.tar.gz";
sha1 = "7966fd3b6fb3aa2a376386533ed4421ebb66ad62";
url = "http://www.ecademix.com/JohannesHofmann/flpsed-0.7.1.tar.gz";
sha256 = "16i3mjc1cdx2wiwfhnv3z2ywmjma9785vwl3l31izx9l51w7ngj3";
};
buildInputs = [ fltk13 ghostscript ];
pkgs/applications/editors/geany/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, gtk2, which, pkgconfig, intltool }:
let
version = "1.23";
version = "1.23.1";
in
stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://download.geany.org/${name}.tar.bz2";
sha256 = "1c78rggjaz9fa8gj25wka1sa3argvixnzrarmqvwh0s8d5ragm6d";
sha256 = "1bcgjxywggsljs9kq22kr9xpzrq5xr7pb9d1b71rwryqb5pb25c8";
};
buildInputs = [ gtk2 which pkgconfig intltool ];
pkgs/applications/editors/hexedit/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "hexedit-${version}";
version = "1.2.12";
version = "1.2.13";
src = fetchurl {
url = "http://rigaux.org/${name}.src.tgz";
sha256 = "bcffbf3d128516cc4e1da64485866fbb5f62754f2af8327e7a527855186ba10f";
sha256 = "1mwdp1ikk64cqmagnrrps5jkn3li3n47maiqh2qc1xbp1ains4ka";
};
buildInputs = [ ncurses ];
pkgs/applications/editors/nano/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation (rec {
pname = "nano";
version = "2.2.6";
version = "2.3.2";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnu/nano/${name}.tar.gz";
sha256 = "0yp6pid67k8h7394spzw0067fl2r7rxm2b6kfccg87g8nlry2s5y";
sha256 = "1s3b21h5p7r8xafw0gahswj16ai6k2vnjhmd15b491hl0x494c7z";
};
buildInputs = [ ncurses gettext ];
pkgs/applications/graphics/ImageMagick/default.nix
+2 -2
View File
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
export DVIDecodeDelegate=${tetex}/bin/dvips
'' 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-gslib
'' + ''
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs =
[ bzip2 fontconfig freetype libjpeg libpng libtiff libxml2 zlib librsvg
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 ];
pkgs/applications/graphics/autopanosiftc/default.nix
+3 -3
View File
@@ -1,11 +1,11 @@
{stdenv, fetchurl, cmake, libpng, libtiff, libjpeg, panotools, libxml2 }:
stdenv.mkDerivation {
name = "autopano-sift-C-2.5.0";
name = "autopano-sift-C-2.5.1";
src = fetchurl {
url = mirror://sourceforge/hugin/autopano-sift-C-2.5.0.tar.gz;
sha256 = "0pvkapjg7qdkjg151wjc7islly9ag8fg6bj0g5nbllv981ixjql3";
url = mirror://sourceforge/hugin/autopano-sift-C-2.5.1.tar.gz;
sha256 = "0dqk8ff82gmy4v5ns5nr9gpzkc1p7c2y8c8fkid102r47wsjk44s";
};
buildInputs = [ cmake libpng libtiff libjpeg panotools libxml2 ];
pkgs/applications/graphics/cinepaint/default.nix
+2 -2
View File
@@ -5,11 +5,11 @@
mesa, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } :
stdenv.mkDerivation rec {
name = "cinepaint-1.0";
name = "cinepaint-1.1";
src = fetchurl {
url = "mirror://sourceforge/cinepaint/${name}.tgz";
sha256 = "02mbpsykd7sfr9h6c6gxld6i3bdwnsgvm70b5yff01gwi69w2wi7";
sha256 = "0b5g4bkq62yiz1cnb2vfij0a8fw5w5z202v5dm4dh89k7cj0yq4w";
};
buildInputs = [ libpng gtk freetype fontconfig lcms flex libtiff libjpeg
pkgs/applications/graphics/digikam/default.nix
+2 -2
View File
@@ -4,11 +4,11 @@ liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost
shared_desktop_ontologies, marble, mysql }:
stdenv.mkDerivation rec {
name = "digikam-3.2.0";
name = "digikam-3.5.0";
src = fetchurl {
url = "http://download.kde.org/stable/digikam/${name}.tar.bz2";
sha256 = "06j858d2nvbqh0bw6m60rh1bsws06fm5vfjpwwi3zxsf5ka08wmx";
sha256 = "0an4awlg0b8pwl6v8p5zfl3aghgnxck2pc322cyk6i6yznj2mgap";
};
nativeBuildInputs = [ cmake automoc4 pkgconfig ];
pkgs/applications/graphics/freecad/default.nix
+6 -4
View File
@@ -1,6 +1,6 @@
{ fetchurl, stdenv, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts,
boost, zlib,
python, swig, gfortran, soqt, libf2c, pyqt4, makeWrapper }:
{ stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts
, boost, zlib, python, swig, gfortran, soqt, libf2c , pyqt4, makeWrapper
, matplotlib, pycollada }:
stdenv.mkDerivation rec {
name = "freecad-${version}";
@@ -12,7 +12,9 @@ stdenv.mkDerivation rec {
};
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;
pkgs/applications/graphics/gimp/2.8.nix
+2 -2
View File
@@ -4,11 +4,11 @@
, python, pygtk, libart_lgpl, libexif, gettext, xlibs }:
stdenv.mkDerivation rec {
name = "gimp-2.8.8";
name = "gimp-2.8.10";
src = fetchurl {
url = "ftp://ftp.gimp.org/pub/gimp/v2.8/${name}.tar.bz2";
md5 = "ef2547c3514a1096931637bd6250635a";
sha256 = "1rha8yx0pplfjziqczjrxxp16vsvpmb5ziq3c218s4w9z4cqpzg7";
};
buildInputs =
pkgs/applications/graphics/graphicsmagick/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript
, libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz
, libX11}:
, libX11, quantumdepth ? 8}:
let version = "1.3.18"; in
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
sha256 = "1axh4j2jr3l92dan15b2nmx9da4l7i0rcz9b5bvfd4q742zfwj7x";
};
configureFlags = "--enable-shared";
configureFlags = "--enable-shared --with-quantum-depth=" + toString quantumdepth;
buildInputs =
[ bzip2 freetype ghostscript graphviz libjpeg libpng libtiff libX11 libxml2
pkgs/applications/graphics/k3d/debian-patches.nix
+2 -2
View File
@@ -1,6 +1,6 @@
# Generated by debian-patches.sh from debian-patches.txt
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
[
{
@@ -9,6 +9,6 @@ in
}
{
url = "${prefix}/k3d_gtkmm224.patch";
sha256 = "0a81fg96zby6kidqwj6n8mhbrh0j5fpnmfh7lr6havz5r2is9ks5";
sha256 = "1c7z2zkqs9qw185q7bhz6vvzl6vlf1zpg9vlhc1f0cz9rgak3gji";
}
]
pkgs/applications/graphics/photivo/default.nix
+16
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 ];
}
pkgs/applications/graphics/xaos/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@ a :
let
fetchurl = a.fetchurl;
version = a.lib.attrByPath ["version"] "3.5" a;
version = a.lib.attrByPath ["version"] "3.6" a;
buildInputs = with a; [
aalib gsl libpng libX11 xproto libXext xextproto
libXt zlib gettext intltool perl
@@ -11,7 +11,7 @@ in
rec {
src = fetchurl {
url = "mirror://sourceforge/xaos/xaos-${version}.tar.gz";
sha256 = "0hj8sxya4s9rc1m4xvxj00jgiczi3ljf2zvrhx34r3ja2m9af7s7";
sha256 = "15cd1cx1dyygw6g2nhjqq3bsfdj8sj8m4va9n75i0f3ryww3x7wq";
};
inherit buildInputs;
pkgs/applications/misc/bibletime/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
version = "2.9.1";
version = "2.9.2";
name = "bibletime-${version}";
src = fetchurl {
url = "mirror://sourceforge/bibletime/${name}.tar.bz2";
sha256 = "1d8kh213rpx4d63sxl5mk1s94xv363l5prrq2kh06cpnl7a8d2ih";
sha256 = "1j4kc24qvhqlbqspczmkxvw09mnvgg9m4zs1y9f68505kd0pfg1r";
};
prePatch = ''
pkgs/applications/misc/bitcoin/default.nix
+2 -2
View File
@@ -1,12 +1,12 @@
{ fetchurl, stdenv, openssl, db4, boost, zlib, miniupnpc, qt4 }:
stdenv.mkDerivation rec {
version = "0.8.5";
version = "0.8.6";
name = "bitcoin-${version}";
src = fetchurl {
url = "mirror://sourceforge/bitcoin/${name}-linux.tar.gz";
sha256 = "0qqzwx1lihlrj7r08alsyznjfqvwncfm0nnxi1pcx0jyvq83ym44";
sha256 = "036xx06gyrfh65rpdapff3viz1f38vzkj7lnhil6fc0s7pjmsjbk";
};
buildInputs = [ openssl db4 boost zlib miniupnpc qt4 ];
pkgs/applications/misc/calibre/default.nix
+2 -2
View File
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
name = "calibre-1.13.0";
name = "calibre-1.15.0";
src = fetchurl {
url = "mirror://sourceforge/calibre/${name}.tar.xz";
sha256 = "0j0l81jkjzd8n3ciqwxh8zxz945y594xjfsizp3cxjjfhj90aagj";
sha256 = "0kisdrvsbdpfkirg0p8ifzcm7fjidx74xsw4bdb96gry2wmpjwf7";
};
inherit python;
pkgs/applications/misc/cgminer/default.nix
+10 -7
View File
@@ -1,19 +1,22 @@
{ fetchgit, stdenv, pkgconfig, libtool, autoconf, automake,
curl, ncurses, amdappsdk, amdadlsdk, xorg }:
curl, ncurses, amdappsdk, amdadlsdk, xorg, jansson }:
stdenv.mkDerivation rec {
version = "2.11.4";
version = "3.7.2";
name = "cgminer-${version}";
src = fetchgit {
url = "https://github.com/ckolivas/cgminer.git";
rev = "96c8ff5f10f2d8f0cf4d1bd889e8eeac2e4aa715";
sha256 = "1vf9agy4vw50cap03qig2y65hdrsdy7cknkzyagv89w5xb230r9a";
rev = "refs/tags/v3.7.2";
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";
configureFlags = "--enable-scrypt";
configureFlags = "--enable-scrypt --enable-opencl";
NIX_LDFLAGS = "-lgcc_s -lX11 -lXext -lXinerama";
preConfigure = ''
@@ -21,7 +24,7 @@ stdenv.mkDerivation rec {
'';
postBuild = ''
gcc api-example.c -I compat/jansson -o cgminer-api
gcc api-example.c -o cgminer-api
'';
postInstall = ''
pkgs/applications/misc/gkrellm/default.nix
+2 -2
View File
@@ -1,10 +1,10 @@
{ fetchurl, stdenv, gettext, pkgconfig, glib, gtk, libX11, libSM, libICE }:
stdenv.mkDerivation rec {
name = "gkrellm-2.3.4";
name = "gkrellm-2.3.5";
src = fetchurl {
url = "http://members.dslextreme.com/users/billw/gkrellm/${name}.tar.bz2";
sha256 = "0mjg2pxpiqms7d6dvxzxvpa420cakhpjxvrclhq0y8jd2dlv2irl";
sha256 = "12rc6zaa7kb60b9744lbrlfkxxfniprm6x0mispv63h4kh75navh";
};
buildInputs = [gettext pkgconfig glib gtk libX11 libSM libICE];
pkgs/applications/misc/hello/ex-2/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "hello-2.8";
name = "hello-2.9";
src = fetchurl {
url = "mirror://gnu/hello/${name}.tar.gz";
sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6";
sha256 = "19qy37gkasc4csb1d3bdiz9snn8mir2p3aj0jgzmfv0r2hi7mfzc";
};
doCheck = true;
pkgs/applications/misc/ranger/default.nix
+22
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 ];
}
pkgs/applications/misc/xlsfonts/default.nix
+2 -2
View File
@@ -4,11 +4,11 @@
{stdenv, fetchurl, libX11, pkgconfig}:
stdenv.mkDerivation rec {
name = "xlsfonts-1.0.2";
name = "xlsfonts-1.0.4";
src = fetchurl {
url = "mirror://xorg/individual/app/${name}.tar.bz2";
sha256 = "070iym754g3mf9x6xczl4gdnpvlk6rdyl1ndwhpjl21vg2dm2vnc";
sha256 = "1lhcx600z9v65nk93xaxfzi79bm4naynabb52gz1vy1bxj2r25r8";
};
buildInputs = [libX11 pkgconfig];
pkgs/applications/networking/browsers/firefox/default.nix
+4 -3
View File
@@ -17,9 +17,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
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 {
@@ -29,7 +29,7 @@ rec {
# 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"
];
sha1 = "592ebd242c4839ef0e18707a7e959d8bed2a98f3";
sha1 = "f7c6642d6f62aea8d4eced48dd27aba0634edcd5";
};
commonConfigureFlags =
@@ -143,6 +143,7 @@ rec {
patches = [
./disable-reporter.patch # fixes "search box not working when built on xulrunner"
./xpidl.patch
];
propagatedBuildInputs = [xulrunner];
pkgs/applications/networking/browsers/firefox/xpidl.patch
+11
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)
pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, intltool, pkgconfig, gtk, GConf, alsaLib }:
stdenv.mkDerivation rec {
name = "gmtk-1.0.5";
name = "gmtk-1.0.8";
src = fetchurl {
url = "http://gmtk.googlecode.com/files/${name}.tar.gz";
sha256 = "a07130d62719e8c1244f8405dd97445798df5204fc0f3f2f2b669b125114b468";
sha256 = "034b02nplb2bp01yn4p19345jh3yibhn4lcxznrzcsmsyj2vlzq0";
};
buildInputs = [ intltool pkgconfig gtk GConf alsaLib ];
pkgs/applications/networking/browsers/rekonq/default.nix
+2 -2
View File
@@ -3,11 +3,11 @@
assert builtins.compareVersions "4.8.3" kde4.release != 1; # https://bugs.kde.org/show_bug.cgi?id=306077
stdenv.mkDerivation rec {
name = "rekonq-1.70"; # >=1.80 need kde >=4.9.0
name = "rekonq-1.80"; # >=1.80 need kde >=4.9.0
src = fetchurl {
url = "mirror://sourceforge/rekonq/${name}.tar.bz2";
sha256 = "05zqm329vajsn32l5b5nlbw92gl3irdcx8kifr4y921i9bkzigad";
sha256 = "1lzmg8psy1j1v8vrmsyw609jv9scgnigdivx97fb4spb7x6sxn4g";
};
buildInputs = [ kde4.kdelibs qca2 qoauth ];
pkgs/applications/networking/instant-messengers/amsn/default.nix
+3 -3
View File
@@ -1,10 +1,10 @@
{stdenv, fetchurl, which, tcl, tk, x11, libpng, libjpeg, makeWrapper}:
stdenv.mkDerivation {
name = "amsn-0.98.4";
name = "amsn-0.98.9";
src = fetchurl {
url = mirror://sourceforge/amsn/amsn-0.98.4-src.tar.gz;
sha256 = "1kcn1hc6bvgy4svf5l3j5psdrvsmy0p3r33fn7gzcinqdf3xfgqx";
url = mirror://sourceforge/amsn/amsn-0.98.9-src.tar.gz;
sha256 = "0b8ir7spxnsz8f7kvr9f1k91nsy8cb65q6jv2l55b04fl20x4z7r";
};
configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib --enable-static";
pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
+2 -2
View File
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, telepathy_glib, libxslt }:
stdenv.mkDerivation rec {
name = "${pname}-5.14.0";
name = "${pname}-5.14.1";
pname = "telepathy-mission-control";
src = fetchurl {
url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
sha256 = "0c4asjgk7pk39i8njf0q1df0mhisif83lq716ln6r0wja9zh9q2q";
sha256 = "1jqzby5sr09bprp3fyr8w65rcv9ljc045rp7lm9ik89wkhcw05jb";
};
buildInputs = [ telepathy_glib ];
pkgs/applications/networking/irc/ii/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "ii-1.6";
name = "ii-1.7";
src = fetchurl {
url = "http://dl.suckless.org/tools/${name}.tar.gz";
sha256 = "0afccbcm7i9lfch5mwzs3l1ax79dg3g6rrw0z8rb7d2kn8wsckvr";
sha256 = "176cqwnn6h7w4kbfd66hzqa243l26pqp2b06bii0nmnm0rkaqwis";
};
installPhase = ''
pkgs/applications/networking/newsreaders/kwooty/default.nix
+2 -2
View File
@@ -5,14 +5,14 @@
, unrar, p7zip, par2cmdline, coreutils
}:
let version = "0.8.1";
let version = "0.8.4";
name = "kwooty-${version}";
in stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "mirror://sourceforge/kwooty/${name}.tar.gz";
sha256 = "746ed50ec3c067711932c89dc3ee5527c126f37c6922b3eda49535eb83c245e4";
sha256 = "0i3zmh7y52n5k0yn3xc6zjpjz75f48nly40n394i6sxy89psgfc2";
};
patches = [ ./searchPath.patch ];
pkgs/applications/networking/p2p/qbittorrent/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
, pkgconfig }:
stdenv.mkDerivation rec {
name = "qbittorrent-3.1.2";
name = "qbittorrent-3.1.3";
src = fetchurl {
url = "mirror://sourceforge/qbittorrent/${name}.tar.xz";
sha256 = "1viia11qixp1qqxcyiw1x4if63cfyqk4rscpzp1vnhnzm06irv7y";
sha256 = "16m3l8qjcj63brzrdn82cbijvz8fcxfgpibi4g5g6sbissjkwsww";
};
buildInputs = [ qt4 which dbus_libs boost libtorrentRasterbar
pkgs/applications/networking/sniffers/etherape/default.nix
+2 -2
View File
@@ -2,10 +2,10 @@
, gnomedocutils, scrollkeeper, libxslt }:
stdenv.mkDerivation rec {
name = "etherape-0.9.12";
name = "etherape-0.9.13";
src = fetchurl {
url = "mirror://sourceforge/etherape/${name}.tar.gz";
sha256 = "0ici0aqw2r221lc3rhrdcnvavbhcj0ybwawgrhh399i74w7wf14k";
sha256 = "1xq93k1slyak8mgwrw5kymq0xn0kl8chvfcvaablgki4p0l2lg9a";
};
configureFlags = [ "--disable-scrollkeeper" ];
pkgs/applications/office/hledger-irr/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hledger-irr";
version = "0.1.1.2";
sha256 = "1mh1lzhnxc8ps8n5j37wrmbqafwdyap60j8rqr6xdfa2syfyq8i2";
version = "0.1.1.3";
sha256 = "0vjf478b9msmgr1nxyy8pgc9mvn61i768ypcr5gbinsnsr9kxqsm";
isLibrary = false;
isExecutable = true;
buildDepends = [ Cabal hledgerLib statistics time ];
pkgs/applications/office/impressive/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
, xpdf, pil, pyopengl, pygame
, setuptools, mesa, freeglut }:
let version = "0.10.2";
let version = "0.10.3";
in
stdenv.mkDerivation {
# This project was formerly known as KeyJNote.
@@ -12,7 +12,7 @@ in
src = fetchurl {
url = "mirror://sourceforge/impressive/Impressive-${version}.tar.gz";
sha256 = "1py36h9085ycxj3qnmqdps0dfghlr5qb2i62l0ynzngn55dgz950";
sha256 = "0ppr9bckswpi3gav56dhrk91ibxvqbfhpxmm0zikzpxhdlvnaj5v";
};
# Note: We need to have `setuptools' in the path to be able to use
pkgs/applications/science/chemistry/avogadro/default.nix
+4 -4
View File
@@ -1,16 +1,16 @@
{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, mesa, libX11 }:
{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, mesa, libX11, doxygen }:
stdenv.mkDerivation rec {
name = "avogadro-1.0.3";
name = "avogadro-1.1.1";
src = fetchurl {
url = "mirror://sourceforge/avogadro/${name}.tar.bz2";
sha256 = "0s44r78vm7hf4cs13d2qki3gf178gjj1ihph6rs04g6s4figvdpg";
sha256 = "050ag9p4vg7jg8hj1wqfv7lsm6ar2isxjw2vw85s49vsl7g7nvzy";
};
buildInputs = [ qt4 eigen zlib openbabel mesa libX11 ];
nativeBuildInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkgconfig doxygen ];
NIX_CFLAGS_COMPILE = "-include ${mesa}/include/GL/glu.h";
pkgs/applications/science/electronics/archimedes/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "archimedes-2.0.0";
name = "archimedes-2.0.1";
src = fetchurl {
url = "mirror://gnu/archimedes/${name}.tar.gz";
sha256 = "1ajg4xvk5slv05fsbikrina9g4bmhx8gykk249yz21pir67sdk4x";
sha256 = "0jfpnd3pns5wxcxbiw49v5sgpmm5b4v8s4q1a5292hxxk2hzmb3z";
};
meta = {
pkgs/applications/science/electronics/gtkwave/default.nix
+2 -2
View File
@@ -1,10 +1,10 @@
{stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}:
stdenv.mkDerivation rec {
name = "gtkwave-3.3.39";
name = "gtkwave-3.3.53";
src = fetchurl {
url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
sha256 = "1va506anlbpbha7l6h94s44xjdy6ch22iv629swn4bh5m3qi33bg";
sha256 = "1jmrk2p2azjca250h2bi4c8v0cp1gqd3c027dx18sxy3cgw1fsp1";
};
buildInputs = [ gtk gperf pkgconfig bzip2 tcl tk judy xz ];
pkgs/applications/science/logic/cvc3/default.nix
+2 -2
View File
@@ -12,10 +12,10 @@ let
++ [(a.lib.overrideDerivation x.gmp (y: {dontDisableStatic=true;}))];
sourceInfo = rec {
baseName="cvc3";
version="2.2";
version="2.4.1";
name="${baseName}-${version}";
url="http://www.cs.nyu.edu/acsys/cvc3/releases/${version}/${name}.tar.gz";
hash="1dw12d5vrixfr6l9j6j7026vrr22zb433xyl6n5yxx4hgfywi0ji";
hash="1xxcwhz3y6djrycw8sm6xz83wb4hb12rd1n0skvc7fng0rh1snym";
};
in
rec {
pkgs/applications/science/math/jags/default.nix
+2 -2
View File
@@ -1,10 +1,10 @@
{stdenv, fetchurl, gfortran, liblapack, blas}:
stdenv.mkDerivation rec {
name = "JAGS-2.2.0";
name = "JAGS-3.4.0";
src = fetchurl {
url = "mirror://sourceforge/mcmc-jags/${name}.tar.gz";
sha256 = "016xml4k99lmdwwjiabxin95k9p3q2zh4pcci8wwcqwlq5y205b6";
sha256 = "0ayqsz9kkmbss7mxlwr34ch2z1vsb65lryjzqpprab1ccyiaksib";
};
buildInputs = [gfortran liblapack blas];
pkgs/applications/science/molecular-dynamics/gromacs/default.nix
+3 -3
View File
@@ -6,11 +6,11 @@
stdenv.mkDerivation {
name = "gromacs-4.5.5";
name = "gromacs-4.6.5";
src = fetchurl {
url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.5.5.tar.gz";
md5 = "6a87e7cdfb25d81afa9fea073eb28468";
url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.5.tar.gz";
sha256 = "02ggrplh8fppqib86y3rfk4qm08yddlrb1yjgzl138b3b4qjy957";
};
buildInputs = [cmake fftw];
pkgs/applications/version-management/bazaar/tools.nix
+2 -2
View File
@@ -1,10 +1,10 @@
args : with args;
rec {
version = "2.2.0";
version = "2.5";
src = fetchurl {
url = "http://launchpad.net/bzrtools/stable/${version}/+download/bzrtools-${version}.tar.gz";
sha256 = "835e0dc2b3b798d3c88b960bf719fe3b4cec7ae241908aafeb6aafe4c83f591b";
sha256 = "0gzh63vl9006cpklszwmsymrq5ddxxrnxwbv5bwi740jlvxzdkxw";
};
buildInputs = [];
pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+13 -15
View File
@@ -4,18 +4,18 @@
, extensibleExceptions, feed, filepath, git, gnupg1, gnutls, hamlet
, hinotify, hS3, hslogger, HTTP, httpConduit, httpTypes, IfElse
, json, lsof, MissingH, MonadCatchIOTransformers, monadControl, mtl
, network, networkInfo, networkMulticast, networkProtocolXmpp
, openssh, perl, QuickCheck, random, regexTdfa, rsync
, SafeSemaphore, SHA, stm, tasty, tastyHunit, tastyQuickcheck, text
, time, transformers, unixCompat, utf8String, uuid, wai, waiLogger
, warp, which, xmlConduit, xmlTypes, yesod, yesodCore, yesodDefault
, yesodForm, yesodStatic
, network, networkConduit, networkInfo, networkMulticast
, networkProtocolXmpp, openssh, perl, QuickCheck, random, regexTdfa
, rsync, SafeSemaphore, SHA, stm, tasty, tastyHunit
, tastyQuickcheck, text, time, transformers, unixCompat, utf8String
, uuid, wai, waiLogger, warp, which, xmlConduit, xmlTypes, yesod
, yesodCore, yesodDefault, yesodForm, yesodStatic
}:
cabal.mkDerivation (self: {
pname = "git-annex";
version = "5.20131130";
sha256 = "0px918wzv9zqxz7wc6rx2ay8rizbckw79yinhisjvp3y5lldyjj1";
version = "5.20131213";
sha256 = "0mwslkz0kklp4phlsf8hibh97sabdnigls7hr9725wb0ncfa85yn";
isLibrary = false;
isExecutable = true;
buildDepends = [
@@ -24,11 +24,11 @@ cabal.mkDerivation (self: {
editDistance extensibleExceptions feed filepath gnutls hamlet
hinotify hS3 hslogger HTTP httpConduit httpTypes IfElse json
MissingH MonadCatchIOTransformers monadControl mtl network
networkInfo networkMulticast networkProtocolXmpp QuickCheck random
regexTdfa SafeSemaphore SHA stm tasty tastyHunit tastyQuickcheck
text time transformers unixCompat utf8String uuid wai waiLogger
warp xmlConduit xmlTypes yesod yesodCore yesodDefault yesodForm
yesodStatic
networkConduit networkInfo networkMulticast networkProtocolXmpp
QuickCheck random regexTdfa SafeSemaphore SHA stm tasty tastyHunit
tastyQuickcheck text time transformers unixCompat utf8String uuid
wai waiLogger warp xmlConduit xmlTypes yesod yesodCore yesodDefault
yesodForm yesodStatic
];
buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ];
configureFlags = "-fS3
@@ -47,8 +47,6 @@ cabal.mkDerivation (self: {
checkPhase = ''
export HOME="$NIX_BUILD_TOP/tmp"
mkdir "$HOME"
cp dist/build/git-annex/git-annex git-annex
./git-annex test
'';
meta = {
homepage = "http://git-annex.branchable.com/";
pkgs/applications/version-management/git-and-tools/git/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
let
version = "1.8.5.1";
version = "1.8.5.2";
svn = subversionClient.override { perlBindings = true; };
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
sha256 = "0i7fz0b79f3algs68m15wg4bq99ayg1crpy66cqylxq3mzbw8n8m";
sha256 = "12iyj6f89dmb1cn2pvym5lrf23g4m71mp9pwkbi1zscb9d998ih2";
};
patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ];
pkgs/applications/version-management/git-and-tools/github-backup/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "github-backup";
version = "1.20131101";
sha256 = "07l8a3xiy65xicxa5v14li6jnj3niwhndm8gd6q4d7aw14yq8wbn";
version = "1.20131203";
sha256 = "0156g7zbqsp58g8hniqsilyc79sam7plwhn3w56wbzf8m380mwba";
isLibrary = false;
isExecutable = true;
buildDepends = [
pkgs/applications/version-management/subversion/default.nix
+2 -2
View File
@@ -21,13 +21,13 @@ assert compressionSupport -> neon.compressionSupport;
stdenv.mkDerivation rec {
version = "1.7.13";
version = "1.7.14";
name = "subversion-${version}";
src = fetchurl {
url = "mirror://apache/subversion//${name}.tar.bz2";
sha1 = "844bb756ec505edaa12b9610832bcd21567139f1";
sha256 = "038jbcpwm083abp0rvk0fhnx65kp9mz1qvzs3f83ig8fxcvqzb64";
};
buildInputs = [ zlib apr aprutil sqlite ]
pkgs/applications/video/mpv/default.nix
+129
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
pkgs/applications/video/xbmc/default.nix
+3 -3
View File
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, makeWrapper
, pkgconfig, cmake, gnumake, yasm, python
, pkgconfig, cmake, gnumake, yasm, pythonFull
, boost, avahi, libdvdcss, lame
, gettext, pcre, yajl, fribidi
, openssl, gperf, tinyxml2, taglib, libssh, swig, jre
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
buildInputs = [
makeWrapper
pkgconfig cmake gnumake yasm python
pkgconfig cmake gnumake yasm pythonFull
boost libmicrohttpd
gettext pcre yajl fribidi
openssl gperf tinyxml2 taglib libssh swig jre
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
postInstall = ''
for p in $(ls $out/bin/) ; do
wrapProgram $out/bin/$p \
--prefix PATH ":" "${python}/bin" \
--prefix PATH ":" "${pythonFull}/bin" \
--prefix PATH ":" "${glxinfo}/bin" \
--prefix PATH ":" "${xdpyinfo}/bin" \
--prefix LD_LIBRARY_PATH ":" "${curl}/lib" \
pkgs/applications/window-managers/dzen2/default.nix
+36
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;
};
}
pkgs/applications/window-managers/stalonetray/default.nix
+2 -2
View File
@@ -11,10 +11,10 @@ let
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="stalonetray";
version="0.8.0";
version="0.8.1";
name="${baseName}-${version}";
url="mirror://sourceforge/${baseName}/${name}.tar.bz2";
hash="0ccllmpsmilns6xxl174vgcjf8kfakcrhg3psc4cg0yynqbi2mka";
hash="1wp8pnlv34w7xizj1vivnc3fkwqq4qgb9dbrsg15598iw85gi8ll";
};
in
rec {
pkgs/applications/window-managers/windowmaker/default.nix
+2 -2
View File
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "windowmaker-${version}";
version = "0.95.4";
version = "0.95.5";
src = fetchurl {
url = "http://windowmaker.org/pub/source/release/"
+ "WindowMaker-${version}.tar.gz";
sha256 = "0icffqnmkkjjf412m27wljbf9vxb2ry4aiyi2pqmzw3h0pq9gsib";
sha256 = "1l3hmx4jzf6vp0zclqx9gsqrlwh4rvqm1g1zr5ha0cp0zmsg89ab";
};
buildInputs = [ pkgconfig libX11 libXft libXmu ];
pkgs/build-support/cabal/default.nix
+15 -1
View File
@@ -4,6 +4,7 @@
, enableLibraryProfiling ? false
, enableSharedLibraries ? false
, enableSharedExecutables ? false
, enableStaticLibraries ? true
, 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.
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 =
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) // {
buildInputs = filter (y : ! (y == null)) x.buildInputs;
propagatedBuildInputs = filter (y : ! (y == null)) x.propagatedBuildInputs;
propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs;
doCheck = enableCheckPhase && x.doCheck;
};
@@ -92,6 +97,10 @@ assert enableSharedLibraries -> versionOlder "6.12" ghc.version;
# have to check for its existence
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
extraLibDirs = [];
@@ -128,6 +137,10 @@ assert enableSharedLibraries -> versionOlder "6.12" ghc.version;
# and run any regression test suites the package might have
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
# stage to enable building shared libraries
inherit enableSharedLibraries;
@@ -140,9 +153,10 @@ assert enableSharedLibraries -> versionOlder "6.12" ghc.version;
(enableFeature self.enableSplitObjs "split-objs")
(enableFeature enableLibraryProfiling "library-profiling")
(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" 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.
LANG = "en_US.UTF-8";
pkgs/data/fonts/lmodern/default.nix
+3 -3
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "lmodern-2.004.1";
name = "lmodern-2.004.4";
src = fetchurl {
url = mirror://debian/pool/main/l/lmodern/lmodern_2.004.1.orig.tar.gz;
sha256 = "1bvlf8p39667q58pvyfzy3yl0mylf0ak96flwp8vj01vqbi3rfaz";
url = mirror://debian/pool/main/l/lmodern/lmodern_2.004.4.orig.tar.gz;
sha256 = "1g1fmi9asw6x9arm5sy3r4jwz7zrrbcw6q4waj3iqs0iq525i1rw";
};
installPhase = ''
pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
+3 -3
View File
@@ -1,11 +1,11 @@
{stdenv, fetchurl, pkgconfig, gtk, gettext, intltool, libgnomecanvas, libgnomeprint, gnomeicontheme}:
stdenv.mkDerivation {
name = "libgnomeprintui-2.18.4";
name = "libgnomeprintui-2.18.6";
src = fetchurl {
url = mirror://gnome/sources/libgnomeprintui/2.18/libgnomeprintui-2.18.4.tar.bz2;
sha256 = "19d2aa95c9cb85f1ddd13464500217a76e2abce59281ec5d210e139c14dd7490";
url = mirror://gnome/sources/libgnomeprintui/2.18/libgnomeprintui-2.18.6.tar.bz2;
sha256 = "0spl8vinb5n6n1krnfnr61dwaxidg67h8j94z9p59k2xdsvfashm";
};
buildInputs = [ pkgconfig gtk gettext intltool libgnomecanvas libgnomeprint gnomeicontheme];
pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
, gtk3, intltool, gconf, libgnome_keyring, pango, gcr, gdk_pixbuf, atk, p11_kit }:
stdenv.mkDerivation rec {
name = "gnome-keyring-3.6.2";
name = "gnome-keyring-3.6.3";
src = fetchurl {
url = "mirror://gnome/sources/gnome-keyring/3.6/${name}.tar.xz";
sha256 = "1mhc2c0qswfjqi2spdvh19b7npfkjf1k40q6v7fja4qpc26maq5f";
sha256 = "0la107v75vh8v165lk391xg820h8hxa209766wr98pm22qzkl5g0";
};
buildInputs = [
pkgs/development/compilers/llvm/dragonegg.nix
+2 -2
View File
@@ -1,12 +1,12 @@
{stdenv, fetchurl, llvm, gmp, mpfr, mpc}:
stdenv.mkDerivation rec {
version = "3.2";
version = "3.3";
name = "dragonegg-${version}";
src = fetchurl {
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)
pkgs/development/guile-modules/guile-lib/default.nix
+2 -2
View File
@@ -3,11 +3,11 @@
assert stdenv ? gcc && stdenv.gcc ? gcc && stdenv.gcc.gcc != null;
stdenv.mkDerivation rec {
name = "guile-lib-0.2.1";
name = "guile-lib-0.2.2";
src = fetchurl {
url = "mirror://savannah/guile-lib/${name}.tar.gz";
sha256 = "0ag18l7f9cpv4l577ln3f106xiggl7ndxhrqqiz7cg0w38s3cjvl";
sha256 = "1f9n2b5b5r75lzjinyk6zp6g20g60msa0jpfrk5hhg4j8cy0ih4b";
};
buildInputs = [guile texinfo];
pkgs/development/guile-modules/guile-ncurses/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, guile, ncurses, libffi }:
stdenv.mkDerivation rec {
name = "guile-ncurses-1.3";
name = "guile-ncurses-1.4";
src = fetchurl {
url = "mirror://gnu/guile-ncurses/${name}.tar.gz";
sha256 = "0chvfjrlmg99db98ra9vzwjmbypqx7d4ssm8q0kvzi0n0p9irszi";
sha256 = "070wl664lsm14hb6y9ch97x9q6cns4k6nxgdzbdzi5byixn74899";
};
buildInputs = [ guile ncurses libffi ];
pkgs/development/interpreters/clojure/binary.nix
+2 -2
View File
@@ -1,12 +1,12 @@
{stdenv, fetchurl, unzip}:
stdenv.mkDerivation rec {
version = "1.4.0";
version = "1.5.1";
name = "clojure-binary-${version}";
src = fetchurl {
url = "http://repo1.maven.org/maven2/org/clojure/clojure/${version}/clojure-${version}.zip";
sha256 = "27a5a151d5cc1bc3e52dff47c66111e637fefeb42d9bedfa1284a1a31d080171";
sha256 = "1qgiji6ddvv40khp3qb3xfz09g7p4nnsh3pywqglb9f16v534yzy";
};
pkgs/development/interpreters/love/0.9.nix
+31
View File
@@ -0,0 +1,31 @@
{ stdenv, fetchurl, pkgconfig
, SDL2, mesa, openal, luajit
, libdevil, freetype, physfs
, libmodplug, mpg123, libvorbis, libogg
}:
stdenv.mkDerivation rec {
name = "love-0.9.0";
src = fetchurl {
url = "https://bitbucket.org/rude/love/downloads/${name}-linux-src.tar.gz";
sha256 = "048n94584cnmdaf2rshakdzbj1lz2yd7k08aiykkpz13aaa283ag";
};
buildInputs = [
pkgconfig SDL2 mesa openal luajit
libdevil freetype physfs libmodplug mpg123 libvorbis libogg
];
configureFlags = [
"--with-lua=luajit"
];
meta = {
homepage = "http://love2d.org";
description = "A Lua-based 2D game engine/scripting language";
license = "zlib";
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.raskin ];
};
}
pkgs/development/interpreters/luajit/default.nix
+8 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl} :
{ stdenv, fetchurl }:
stdenv.mkDerivation rec{
version = "2.0.2";
@@ -9,8 +9,13 @@ stdenv.mkDerivation rec{
sha256="0f3cykihfdn3gi6na9p0xjd4jnv26z18m441n5vyg42q9abh4ln0";
};
patchPhase = stdenv.lib.optionalString (stdenv.gcc.libc != null)
''
substituteInPlace Makefile \
--replace ldconfig ${stdenv.gcc.libc}/sbin/ldconfig
'';
installPhase = ''
mkdir -p $out
make install PREFIX=$out
'';
@@ -18,5 +23,6 @@ stdenv.mkDerivation rec{
description= "Just-in-time compiler and interpreter for lua 5.1.";
homepage = http://luajit.org;
license = stdenv.lib.licenses.mit;
platorms = stdenv.lib.platforms.linux;
};
}
pkgs/development/interpreters/php/5.3.nix
+2 -2
View File
@@ -10,7 +10,7 @@ in
composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
version = "5.3.27";
version = "5.3.28";
name = "php-${version}";
@@ -224,7 +224,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
src = fetchurl {
url = "http://nl1.php.net/get/php-${version}.tar.bz2/from/this/mirror";
sha256 = "11xj6v65m6l2lq2s2j5pq5l0iwjsnxmv1nad9hja50ivc8fb4bg1";
sha256 = "04w53nn6qacpkd1x381mzd41kqh6k8kjnbyg44yvnkqwcl69db0c";
name = "php-${version}.tar.bz2";
};
pkgs/development/interpreters/php/5.4.nix
+2 -2
View File
@@ -9,7 +9,7 @@ in
composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
version = "5.4.21";
version = "5.4.23";
name = "php-${version}";
@@ -235,7 +235,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
"http://nl1.php.net/get/php-${version}.tar.bz2/from/this/mirror"
"http://se1.php.net/get/php-${version}.tar.bz2/from/this/mirror"
];
sha256 = "1v2nqvgb0lvja4as5361ja3ry8ja7ib38wzia34g7inw3bp7r3za";
sha256 = "1k4iplqqcaqkmyq10h6a5qcpkfpkd05r2kclxw9n9qdrm47hfz5f";
name = "php-${version}.tar.bz2";
};
pkgs/development/interpreters/renpy/default.nix
+11 -11
View File
@@ -3,11 +3,19 @@
}:
stdenv.mkDerivation {
name = "renpy-6.15.5";
name = "renpy-6.16.3";
meta = {
description = "Ren'Py Visual Novel Engine";
homepage = "http://renpy.org/";
license = "MIT";
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ iyzsong ];
};
src = fetchurl {
url = "http://www.renpy.org/dl/6.15.5/renpy-6.15.5-source.tar.bz2";
sha256 = "1k57dak1yk5iyxripqn2syhwwkh70y00pnnb9i1qf19lmiirxa60";
url = "http://www.renpy.org/dl/6.16.3/renpy-6.16.3-source.tar.bz2";
sha256 = "0yd7wj85kp0hlaqlrhl40irhkmcng89vcxypyx40pqmk87gjagqn";
};
buildInputs = [
@@ -34,16 +42,8 @@ stdenv.mkDerivation {
makeWrapper ${python}/bin/python $out/bin/renpy \
--set PYTHONPATH $program_PYTHONPATH \
--set RENPY_BASE $out/share/renpy \
--set RENPY_LESS_UPDATES 1 \
--add-flags "-O $out/share/renpy/renpy.py"
'';
NIX_CFLAGS_COMPILE = "-I${pygame}/include/${python.libPrefix}";
meta = {
description = "Ren'Py Visual Novel Engine";
homepage = "http://renpy.org/";
license = "MIT";
platforms = stdenv.lib.platforms.linux;
};
}
pkgs/development/libraries/CGAL/default.nix
+1 -1
View File
@@ -2,7 +2,7 @@
}:
stdenv.mkDerivation rec {
version = "3.9";
version = "4.3";
name = "cgal-${version}";
src = fetchurl {
url = "https://gforge.inria.fr/frs/download.php/29125/CGAL-${version}.tar.gz";
pkgs/development/libraries/SDL_gfx/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{stdenv, fetchurl, SDL} :
stdenv.mkDerivation rec {
name = "SDL_gfx-2.0.22";
name = "SDL_gfx-2.0.25";
src = fetchurl {
url = "http://www.ferzkopp.net/Software/SDL_gfx-2.0/${name}.tar.gz";
sha256 = "1w1bdpyypvqg1nmbjwkqnjhmngvpjmhc0zanwgq7z4pxffzffx8m";
sha256 = "1h2rj34dxi5xlwpvm293v2d91gsirhnpzlmnjns9xwkcdg0fsvjm";
};
buildInputs = [ SDL ] ;
pkgs/development/libraries/SDL_net/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "SDL_net";
version = "1.2.7";
version = "1.2.8";
name = "${pname}-${version}";
src = fetchurl {
url = "http://www.libsdl.org/projects/SDL_net/release/${name}.tar.gz";
sha256 = "2ce7c84e62ff8117b9f205758bcce68ea603e08bc9d6936ded343735b8b77c53";
sha256 = "1d5c9xqlf4s1c01gzv6cxmg0r621pq9kfgxcg3197xw4p25pljjz";
};
propagatedBuildInputs = [SDL];
pkgs/development/libraries/aalib/builder.sh
-5
View File
@@ -1,5 +0,0 @@
source $stdenv/setup
configureFlags="--without-x --with-ncurses=$ncurses"
genericBuild
pkgs/development/libraries/aalib/default.nix
+7 -6
View File
@@ -1,11 +1,11 @@
{stdenv, fetchurl, ncurses, automake}:
stdenv.mkDerivation {
name = "aalib-1.4rc4";
builder = ./builder.sh;
name = "aalib-1.4rc5";
src = fetchurl {
url = mirror://sourceforge/aa-project/aalib-1.4rc4.tar.gz;
md5 = "d5aa8e9eae07b7441298b5c30490f6a6";
url = mirror://sourceforge/aa-project/aalib-1.4rc5.tar.gz;
sha256 = "1vkh19gb76agvh4h87ysbrgy82hrw88lnsvhynjf4vng629dmpgv";
};
# The fuloong2f is not supported by aalib still
@@ -13,8 +13,9 @@ stdenv.mkDerivation {
cp ${automake}/share/automake*/config.{sub,guess} .
'';
buildInputs = [ncurses];
inherit ncurses;
buildInputs = [ ncurses ];
configureFlags = "--without-x --with-ncurses=${ncurses}";
meta = {
description = "ASCII art graphics library";
pkgs/development/libraries/allegro/5.nix
+3 -3
View File
@@ -3,7 +3,7 @@ x@{builderDefsPackage
, texinfo, libXext, xextproto, libX11, xproto, libXpm, libXt, libXcursor
, alsaLib, cmake, zlib, libpng, libvorbis, libXxf86dga, libXxf86misc
, xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal, mesa
, kbproto
, kbproto, libjpeg, flac
, ...}:
builderDefsPackage
(a :
@@ -15,11 +15,11 @@ let
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="allegro";
version="5.0.4";
version="5.0.10";
name="${baseName}-${version}";
project="alleg";
url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz";
hash="0vm93kqvvw4rw2zx4l64c2i86xl5giwbqbyki4b2b83z0acpmc1n";
hash="18fdppaqaf3g3rcqwhyvsmkzk3y14clz4l8cvmg4hvjgyf011f3i";
};
in
rec {
pkgs/development/libraries/apr/default.nix
+7 -7
View File
@@ -1,26 +1,26 @@
{ stdenv, fetchurl }:
let
inherit (stdenv.lib) optionals;
in
stdenv.mkDerivation rec {
name = "apr-1.4.8";
name = "apr-1.5.0";
src = fetchurl {
url = "mirror://apache/apr/${name}.tar.bz2";
md5 = "ce2ab01a0c3cdb71cf0a6326b8654f41";
md5 = "cc93bd2c12d0d037f68e21cc6385dc31";
};
patches = optionals stdenv.isDarwin [ ./darwin_fix_configure.patch ];
patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin_fix_configure.patch ];
configureFlags =
# Including the Windows headers breaks unistd.h.
# Based on ftp://sourceware.org/pub/cygwin/release/libapr1/libapr1-1.3.8-2-src.tar.bz2
stdenv.lib.optional (stdenv.system == "i686-cygwin") "ac_cv_header_windows_h=no";
enableParallelBuilding = true;
meta = {
homepage = http://apr.apache.org/;
description = "The Apache Portable Runtime library";
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
pkgs/development/libraries/asio/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{stdenv, fetchurl, boost, openssl}:
stdenv.mkDerivation rec {
name = "asio-1.5.3";
name = "asio-1.10.1";
src = fetchurl {
url = "mirror://sourceforge/asio/${name}.tar.bz2";
sha256 = "08fdsv1zhwbfwlx3r3dzl1371lxy5gw92ms0kqcscxqn0ycf3rlj";
sha256 = "16dxzkra0wmhm2vp2p9lb1h6qsdjk82sxfgj6zlz792n7jnms2l2";
};
propagatedBuildInputs = [ boost ];
pkgs/development/libraries/audiofile/default.nix
+2 -2
View File
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, alsaLib }:
stdenv.mkDerivation rec {
name = "audiofile-0.3.3";
name = "audiofile-0.3.6";
buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
src = fetchurl {
url = "http://audiofile.68k.org/${name}.tar.gz";
sha256 = "1qm7z0g1d9rcxi1m87slgdi0rhl94g13dx3d2b05dilghwpgjjgq";
sha256 = "0rb927zknk9kmhprd8rdr4azql4gn2dp75a36iazx2xhkbqhvind";
};
meta = with stdenv.lib; {
pkgs/development/libraries/beecrypt/default.nix
+3 -3
View File
@@ -1,10 +1,10 @@
{stdenv, fetchurl, m4}:
stdenv.mkDerivation {
name = "beecrypt-4.1.2";
name = "beecrypt-4.2.1";
src = fetchurl {
url = mirror://sourceforge/beecrypt/beecrypt-4.1.2.tar.gz;
md5 = "820d26437843ab0a6a8a5151a73a657c";
url = mirror://sourceforge/beecrypt/beecrypt-4.2.1.tar.gz;
sha256 = "0pf5k1c4nsj77jfq5ip0ra1gzx2q47xaa0s008fnn6hd11b1yvr8";
};
buildInputs = [m4];
configureFlags = "--disable-optimized --enable-static";
pkgs/development/libraries/boolstuff/default.nix
+2 -2
View File
@@ -3,11 +3,11 @@
let baseurl = "http://perso.b2b2c.ca/sarrazip/dev"; in
stdenv.mkDerivation rec {
name = "boolstuff-0.1.13";
name = "boolstuff-0.1.14";
src = fetchurl {
url = "${baseurl}/${name}.tar.gz";
sha256 = "0akwb57lnzq1ak32k6mdxbma2gj0pqhj8y9m6hq79djb9s3mxvmn";
sha256 = "1ccn9v3kxz44pv3mr8q0l2i9769jiigw1gfv47ia50mbspwb87r6";
};
nativeBuildInputs = [ pkgconfig ];
pkgs/development/libraries/bwidget/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "bwidget-${version}";
version = "1.9.5";
version = "1.9.7";
src = fetchurl {
url = "mirror://sourceforge/tcllib/bwidget-${version}.tar.gz";
sha256 = "1njssjjvfalsfh37prkxwqi4hf0zj1d54qzggvjwpzkm424jjcii";
sha256 = "1z2z77l41g01ra7v716c0q3x8s2kx30l4p1kf21ma8bdqa98arp6";
};
dontBuild = true;
pkgs/development/libraries/ccrtp/default.nix
+3 -3
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, openssl, pkgconfig, libgcrypt, ucommon }:
stdenv.mkDerivation {
name = "ccrtp-2.0.3";
name = "ccrtp-2.0.6";
src = fetchurl {
url = mirror://gnu/ccrtp/ccrtp-2.0.3.tar.gz;
sha256 = "1p4zzqn02zvnyjy84khiq8v65pl422fb6ni946h9sxh4yw2lgn01";
url = mirror://gnu/ccrtp/ccrtp-2.0.6.tar.gz;
sha256 = "06rqwk2w5sikfb3l5bcpxszhq4g7ra840gqx1f011xrmhvclrzir";
};
buildInputs = [ openssl pkgconfig libgcrypt ];
pkgs/development/libraries/celt/default.nix
+2 -2
View File
@@ -10,10 +10,10 @@ let
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="celt";
version="0.11.1";
version="0.11.3";
name="${baseName}-${version}";
url="http://downloads.xiph.org/releases/${baseName}/${name}.tar.gz";
hash="1gsc3pxydyzzra8w0r6hrrsalm76lrq4lw6bd283qa4bpagmghh1";
hash="0dh893wqbh0q4a0x1xyqryykmnhpv7mkblpch019s04a99fq2r3y";
};
in
rec {
pkgs/development/libraries/check/default.nix
+2 -2
View File
@@ -1,12 +1,12 @@
{ fetchurl, stdenv }:
let version = "0.9.8"; in
let version = "0.9.11"; in
stdenv.mkDerivation {
name = "check-${version}";
src = fetchurl {
url = "mirror://sourceforge/check/${version}/check-${version}.tar.gz";
sha256 = "0zvak7vx0zq344x174yg9vkw6fg9kycda15zlbz4yn07pdbgkb42";
sha256 = "0dk9jx9hjjwsgly0iwvr5hhw870zlx21gwar7zxlzfq0zdzqqkpa";
};
doCheck = true;
pkgs/development/libraries/chipmunk/default.nix
+4 -4
View File
@@ -4,17 +4,17 @@ let
fetchurl = args.fetchurl;
fullDepEntry = args.fullDepEntry;
version = lib.attrByPath ["version"] "6.0.3" args;
majorVersion = lib.attrByPath ["majorVersion"] "6" args;
version = lib.attrByPath ["version"] "6.1.5" args;
majorVersion = lib.attrByPath ["majorVersion"] "6" args;
buildInputs = with args; [
cmake freeglut mesa
cmake freeglut mesa
libX11 xproto inputproto libXi libXmu
];
in
rec {
src = fetchurl {
url = "http://files.slembcke.net/chipmunk/release/Chipmunk-${majorVersion}.x/Chipmunk-${version}.tgz";
sha256 = "c6f550454bc1c63a2a63e0ff8febecb4781a528ab6d6b657a17933a6f567541a";
sha256 = "0rhsgl32k6bja2ipzprf7iv3lscbl8h8s9il625rp966jvq6phy7";
};
inherit buildInputs;
pkgs/development/libraries/chromaprint/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "chromaprint-${version}";
version = "0.7";
version = "1.1";
src = fetchurl {
url = "http://bitbucket.org/acoustid/chromaprint/downloads/${name}.tar.gz";
sha256 = "00amjzrr4230v3014141hg8k379zpba56xsm572ab49w8kyw6ljf";
sha256 = "04nd8xmy4kgnpfffj6hw893f80bwhp43i01zpmrinn3497mdf53b";
};
buildInputs = [ cmake fftw boost ];
pkgs/development/libraries/classads/default.nix
+5 -3
View File
@@ -1,15 +1,17 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, pcre }:
let version = "1.0.4"; in
let version = "1.0.10"; in
stdenv.mkDerivation {
name = "classads-${version}";
src = fetchurl {
url = "ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-${version}.tar.gz";
sha256 = "80b11c6d383891c90e04e403b2f282e91177940c3fe536082899fbfb9e854d24";
sha256 = "1czgj53gnfkq3ncwlsrwnr4y91wgz35sbicgkp4npfrajqizxqnd";
};
buildInputs = [ pcre ];
configureFlags = ''
--enable-namespace --enable-flexible-member
'';

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