From bff9f2720f36ff1f3ac3ac86a3c0adb9d572c7e7 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 8 Aug 2012 02:30:25 +0400 Subject: [PATCH 001/116] Revert "xen: update to version 4.1.2" This reverts commit af32fd6ce3ce2ae138c2fc2bc5c6067216f8b828. --- .../virtualization/xen/default.nix | 19 +++------ .../virtualization/xen/gcc-4.5.patch | 39 +++++++++++++++++++ 2 files changed, 45 insertions(+), 13 deletions(-) create mode 100644 pkgs/applications/virtualization/xen/gcc-4.5.patch diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix index d898daad2a7..ce799242e12 100644 --- a/pkgs/applications/virtualization/xen/default.nix +++ b/pkgs/applications/virtualization/xen/default.nix @@ -6,7 +6,7 @@ with stdenv.lib; let - version = "4.1.2"; + version = "4.0.3"; libDir = if stdenv.is64bit then "lib64" else "lib"; @@ -30,24 +30,23 @@ let } ]; - ipxeSrc = - { url = http://xenbits.xensource.com/xen-extfiles/ipxe-git-v1.0.0.tar.gz; - sha256 = "d3128bfda9a1542049c278755f85bbcbb8441da7bfd702d511ce237fcf86a723"; - }; -in +in stdenv.mkDerivation { name = "xen-${version}"; src = fetchurl { url = "http://bits.xensource.com/oss-xen/release/${version}/xen-${version}.tar.gz"; - sha256 = "7d9c93057cf480d3f1efa792b19285a84fa3c06060ea5c5c453be00887389b0d"; + sha256 = "0p4i7mm8cdsr8i9z3dij6nriyvz6la2rhm7jkyk2n8h62nnxi1b5"; }; patches = [ # Xen looks for headers in /usr/include and for libraries using # ldconfig. Don't do that. ./has-header.patch + + # GCC 4.5 compatibility. + ./gcc-4.5.patch ]; buildInputs = @@ -103,18 +102,12 @@ stdenv.mkDerivation { --replace 'XENDOM_CONFIG=/etc/sysconfig/xendomains' "" \ --replace /bin/ls ls - grep -rl /etc/xen * | xargs sed -i 's|/etc/xen|$out/etc/xen|g' - # Xen's stubdoms need various sources that it usually fetches at # build time using wget. We can't have that. ${flip concatMapStrings stubdomSrcs (x: let src = fetchurl x; in '' cp ${src} stubdom/${src.name} '')} - ${let src = fetchurl ipxeSrc; in '' - cp ${src} tools/firmware/etherboot/ipxe.tar.gz - ''} - # Hack to get `gcc -m32' to work without having 32-bit Glibc headers. mkdir -p tools/include/gnu touch tools/include/gnu/stubs-32.h diff --git a/pkgs/applications/virtualization/xen/gcc-4.5.patch b/pkgs/applications/virtualization/xen/gcc-4.5.patch new file mode 100644 index 00000000000..a8412d69fd3 --- /dev/null +++ b/pkgs/applications/virtualization/xen/gcc-4.5.patch @@ -0,0 +1,39 @@ +http://lists.xensource.com/archives/html/xen-devel/2010-07/msg01276.html + +diff -ru -x '*~' xen-4.0.1-orig//extras/mini-os/arch/x86/mm.c xen-4.0.1//extras/mini-os/arch/x86/mm.c +--- xen-4.0.1-orig//extras/mini-os/arch/x86/mm.c 2010-08-25 12:22:07.000000000 +0200 ++++ xen-4.0.1//extras/mini-os/arch/x86/mm.c 2010-12-22 20:10:05.000000000 +0100 +@@ -281,7 +281,7 @@ + /* + * Mark portion of the address space read only. + */ +-extern void shared_info; ++extern char shared_info[PAGE_SIZE]; + static void set_readonly(void *text, void *etext) + { + unsigned long start_address = +diff -ru -x '*~' xen-4.0.1-orig//extras/mini-os/minios.mk xen-4.0.1//extras/mini-os/minios.mk +--- xen-4.0.1-orig//extras/mini-os/minios.mk 2010-08-25 12:22:07.000000000 +0200 ++++ xen-4.0.1//extras/mini-os/minios.mk 2010-12-22 20:03:11.000000000 +0100 +@@ -10,6 +10,7 @@ + DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,) + DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline) + DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline ++DEF_CFLAGS += -Wno-uninitialized + DEF_CPPFLAGS += -D__XEN_INTERFACE_VERSION__=$(XEN_INTERFACE_VERSION) + + DEF_ASFLAGS += -D__ASSEMBLY__ +diff -ru -x '*~' xen-4.0.1-orig//extras/mini-os/netfront.c xen-4.0.1//extras/mini-os/netfront.c +--- xen-4.0.1-orig//extras/mini-os/netfront.c 2010-08-25 12:22:07.000000000 +0200 ++++ xen-4.0.1//extras/mini-os/netfront.c 2010-12-22 19:56:59.000000000 +0100 +@@ -25,8 +25,8 @@ + + + +-#define NET_TX_RING_SIZE __RING_SIZE((struct netif_tx_sring *)0, PAGE_SIZE) +-#define NET_RX_RING_SIZE __RING_SIZE((struct netif_rx_sring *)0, PAGE_SIZE) ++#define NET_TX_RING_SIZE __CONST_RING_SIZE(netif_tx, PAGE_SIZE) ++#define NET_RX_RING_SIZE __CONST_RING_SIZE(netif_rx, PAGE_SIZE) + #define GRANT_INVALID_REF 0 + + From da7408e105d605596ac926dd990d2c2e7aee2bc8 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 8 Aug 2012 02:33:06 +0400 Subject: [PATCH 002/116] xen: Support PCI passthrough. Previous commit reverted Xen back to 4.0.3 because xend from 4.1.* and newer hangs for unknown reasons. The new "xl" toolstack from 4.1.* and unstable works, yet PCI passthrough is not supported by xl in 4.1.* and is broken in the unstable. With this patch I was able to passthrough ATI Radeon HD 6950 without 3D acceleration, though, to both Linux and Windows guests. Which is the best archived result with Xen PCI passthrough on NixOS after trying out all possible Xen versions. Same VGA card works fine if passed through into a guest with KVM (acceleration, GPGPU, everything works). I should have tried KVM from the start. --- pkgs/applications/virtualization/xen/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix index ce799242e12..3cb16a6b442 100644 --- a/pkgs/applications/virtualization/xen/default.nix +++ b/pkgs/applications/virtualization/xen/default.nix @@ -79,6 +79,9 @@ stdenv.mkDerivation { substituteInPlace tools/xenstat/Makefile \ --replace /usr/include/curses.h ${ncurses}/include/curses.h + substituteInPlace tools/ioemu-qemu-xen/xen-hooks.mak \ + --replace /usr/include/pci ${pciutils}/include/pci + # Work around a bug in our GCC wrapper: `gcc -MF foo -v' doesn't # print the GCC version number properly. substituteInPlace xen/Makefile \ From 179b1bd2943edb2be18c67813e1f4af7dd21cf87 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 8 Aug 2012 03:58:17 +0400 Subject: [PATCH 003/116] Add package enca 1.13 to tools/text --- pkgs/tools/text/enca/default.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/text/enca/default.nix diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/tools/text/enca/default.nix new file mode 100644 index 00000000000..ce1c7401a4e --- /dev/null +++ b/pkgs/tools/text/enca/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, libiconv ? null }: + +stdenv.mkDerivation rec { + name = "enca-1.13"; + + src = fetchurl { + url = "http://dl.cihar.com/enca/${name}.tar.bz2"; + sha256 = "6c091455d524b3ddae3533fe9bb375092f60ad6fe252e0777c873bd7869c7432"; + }; + + buildInputs = (stdenv.lib.optional (libiconv != null) libiconv); + + meta = { + homepage = http://freecode.com/projects/enca; + description = "Detects the encoding of text files and reencodes them"; + + longDescription = '' + Enca detects the encoding of text files, on the basis of knowledge + of their language. It can also convert them to other encodings, + allowing you to recode files without knowing their current encoding. + It supports most of Central and East European languages, and a few + Unicode variants, independently on language. + ''; + + license = "GPLv2"; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79bd7583317..356384e95cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -447,6 +447,8 @@ let eggdrop = callPackage ../tools/networking/eggdrop { }; + enca = callPackage ../tools/text/enca { }; + mcrl = callPackage ../tools/misc/mcrl { }; mcrl2 = callPackage ../tools/misc/mcrl2 { }; From d339184bbf05fe6ee93369625dd2c9e5e69005e5 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Tue, 15 May 2012 01:43:46 +0400 Subject: [PATCH 004/116] zathura: version 0.1.2 with plugins Expression handles new modular structure of zathura and adds support for djvu, pdf and ps plugins. --- pkgs/applications/misc/girara/default.nix | 26 ++++++++ pkgs/applications/misc/zathura/builder.sh | 11 ++++ .../misc/zathura/core/default.nix | 29 +++++++++ pkgs/applications/misc/zathura/default.nix | 60 ++++++++++++------- .../misc/zathura/djvu/default.nix | 28 +++++++++ .../misc/zathura/djvu/gtkflags.patch | 23 +++++++ .../misc/zathura/pdf-poppler/default.nix | 25 ++++++++ pkgs/applications/misc/zathura/ps/default.nix | 28 +++++++++ .../misc/zathura/ps/gtkflags.patch | 25 ++++++++ pkgs/top-level/all-packages.nix | 8 ++- 10 files changed, 239 insertions(+), 24 deletions(-) create mode 100644 pkgs/applications/misc/girara/default.nix create mode 100644 pkgs/applications/misc/zathura/builder.sh create mode 100644 pkgs/applications/misc/zathura/core/default.nix create mode 100644 pkgs/applications/misc/zathura/djvu/default.nix create mode 100644 pkgs/applications/misc/zathura/djvu/gtkflags.patch create mode 100644 pkgs/applications/misc/zathura/pdf-poppler/default.nix create mode 100644 pkgs/applications/misc/zathura/ps/default.nix create mode 100644 pkgs/applications/misc/zathura/ps/gtkflags.patch diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix new file mode 100644 index 00000000000..074f70448cd --- /dev/null +++ b/pkgs/applications/misc/girara/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, pkgconfig, gtk, gettext }: + +stdenv.mkDerivation rec { + name = "girara-0.1.2"; + + src = fetchurl { + url = "http://pwmt.org/projects/girara/download/${name}.tar.gz"; + sha256 = "89231d0da3c790e0765ad85d74f64cf50051b8bafe6065882e34e378ab14ec99"; + }; + + buildInputs = [ pkgconfig gtk gettext ]; + + makeFlags = "PREFIX=$(out)"; + + meta = { + homepage = https://pwmt.org/girara/; + description = "User interface library"; + longDescription = '' + girara is a library that implements a GTK+ based VIM-like user interface + that focuses on simplicity and minimalism. + ''; + license = "free"; + platforms = stdenv.lib.platforms.linux; + }; +} + diff --git a/pkgs/applications/misc/zathura/builder.sh b/pkgs/applications/misc/zathura/builder.sh new file mode 100644 index 00000000000..9ca45b2cc99 --- /dev/null +++ b/pkgs/applications/misc/zathura/builder.sh @@ -0,0 +1,11 @@ +source $stdenv/setup + +mkdir -pv $out/bin/ + +cat > $out/bin/zathura < Date: Thu, 16 Aug 2012 18:33:25 +0400 Subject: [PATCH 005/116] zathura: fix broken links in meta information --- pkgs/applications/misc/girara/default.nix | 2 +- pkgs/applications/misc/zathura/core/default.nix | 4 ++-- pkgs/applications/misc/zathura/default.nix | 2 +- pkgs/applications/misc/zathura/djvu/default.nix | 2 +- pkgs/applications/misc/zathura/pdf-poppler/default.nix | 2 +- pkgs/applications/misc/zathura/ps/default.nix | 8 ++++---- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 074f70448cd..2fa36b33eb0 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = "PREFIX=$(out)"; meta = { - homepage = https://pwmt.org/girara/; + homepage = http://pwmt.org/projects/girara/; description = "User interface library"; longDescription = '' girara is a library that implements a GTK+ based VIM-like user interface diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 8b23fba5e27..0c58965fc19 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { makeFlags = "PREFIX=$(out)"; meta = { - homepage = https://pwmt.org/zathura/; - description = "A core component for zathura PDF viewer"; + homepage = http://pwmt.org/projects/zathura/; + description = "A core component for zathura PDF viewer"; license = "free"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix index 17ce88a8203..b5ba4f9ada7 100644 --- a/pkgs/applications/misc/zathura/default.nix +++ b/pkgs/applications/misc/zathura/default.nix @@ -26,7 +26,7 @@ rec { builder = ./builder.sh; meta = { - homepage = https://pwmt.org/zathura/; + homepage = http://pwmt.org/projects/zathura/; description = "A highly customizable and functional PDF viewer"; longDescription = '' Zathura is a highly customizable and functional PDF viewer based on the diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix index 9d3ff5da482..c4656e73236 100644 --- a/pkgs/applications/misc/zathura/djvu/default.nix +++ b/pkgs/applications/misc/zathura/djvu/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = "PREFIX=$(out) PLUGINDIR=$(out)/lib"; meta = { - homepage = https://pwmt.org/zathura/; + homepage = http://pwmt.org/projects/zathura/; description = "A zathura DJVU plugin"; longDescription = '' The zathura-djvu plugin adds DjVu support to zathura by using the diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index 0d7b4cc830f..17e00b4e622 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = "PREFIX=$(out) PLUGINDIR=$(out)/lib"; meta = { - homepage = https://pwmt.org/zathura/; + homepage = http://pwmt.org/projects/zathura/; description = "A zathura PDF plugin"; longDescription = '' The zathura-pdf-poppler plugin adds PDF support to zathura by diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix index 7c733e5380d..ae9aeee7715 100644 --- a/pkgs/applications/misc/zathura/ps/default.nix +++ b/pkgs/applications/misc/zathura/ps/default.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { makeFlags = "PREFIX=$(out) PLUGINDIR=$(out)/lib"; meta = { - homepage = https://pwmt.org/zathura/; + homepage = http://pwmt.org/projects/zathura/; description = "A zathura PS plugin"; longDescription = '' - The zathura-ps plugin adds PS support to zathura by using the - libspectre library. - ''; + The zathura-ps plugin adds PS support to zathura by using the + libspectre library. + ''; license = "free"; platforms = stdenv.lib.platforms.linux; }; From c89a0d6c4f875fe4a3340b017b66057caec1ab6f Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Sun, 26 Aug 2012 14:43:25 +0200 Subject: [PATCH 006/116] Add package: plowshare-git20120807 --- pkgs/tools/misc/plowshare/default.nix | 31 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/misc/plowshare/default.nix diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix new file mode 100644 index 00000000000..0e7d688670f --- /dev/null +++ b/pkgs/tools/misc/plowshare/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, bash }: + +let + + v = "20120807"; + +in stdenv.mkDerivation { + + name = "plowshare-git${v}"; + + src = fetchurl { + url = "http://plowshare.googlecode.com/files/plowshare-snapshot-git${v}.tar.gz"; + sha256 = "0clryfssaa4rjvsy760p51ppq1275lwvhm9jh3g4mi973xv4n8si"; + }; + + phases = [ "unpackPhase" "installPhase" "postInstallPhase" ]; + + installPhase = ''make PREFIX="$out" install''; + + postInstallPhase = '' + find "$out" -name "*.sh" -exec \ + sed -i "s@#!/bin/bash@#!${bash}/bin/bash@" '{}' \; + ''; + + meta = { + description = '' + A command-line download/upload tool for popular file sharing websites + ''; + license = stdenv.lib.licenses.gpl3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 466be2abbac..30d8410cad9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1295,6 +1295,8 @@ let plotutils = callPackage ../tools/graphics/plotutils { }; + plowshare = callPackage ../tools/misc/plowshare { }; + pngcrush = callPackage ../tools/graphics/pngcrush { }; pngnq = callPackage ../tools/graphics/pngnq { }; From 395718e927029cf18f77e4a63970890eb8a6931b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 27 Aug 2012 12:22:41 -0400 Subject: [PATCH 007/116] Create /dev/random and /dev/urandom in VMs WWW::Curl needs this to prevent "Fatal: no entropy gathering module detected". --- pkgs/build-support/vm/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 777cc72aa0b..9b1c36a788d 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -73,9 +73,11 @@ rec { createDeviceNodes = dev: '' - mknod ${dev}/null c 1 3 - mknod ${dev}/zero c 1 5 - mknod ${dev}/tty c 5 0 + mknod ${dev}/null c 1 3 + mknod ${dev}/zero c 1 5 + mknod ${dev}/random c 1 8 + mknod ${dev}/urandom c 1 9 + mknod ${dev}/tty c 5 0 . /sys/class/block/${hd}/uevent mknod ${dev}/${hd} b $MAJOR $MINOR ''; From bacc6ab790cd05c7fa1360b87be321602e87a69d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 27 Aug 2012 13:39:13 -0400 Subject: [PATCH 008/116] Remove trailing whitespace --- pkgs/build-support/vm/deb/deb-closure.pl | 11 +- pkgs/build-support/vm/default.nix | 138 +++++++++++------------ 2 files changed, 74 insertions(+), 75 deletions(-) diff --git a/pkgs/build-support/vm/deb/deb-closure.pl b/pkgs/build-support/vm/deb/deb-closure.pl index 5e4ea54c43f..f5b764783b4 100644 --- a/pkgs/build-support/vm/deb/deb-closure.pl +++ b/pkgs/build-support/vm/deb/deb-closure.pl @@ -67,7 +67,7 @@ sub closePackage { my $pkgName = shift; print STDERR ">>> $pkgName\n"; my $cdata = $packages{$pkgName}; - + if (!defined $cdata) { die "unknown (virtual) package $pkgName" unless defined $provides{$pkgName}; @@ -75,7 +75,7 @@ sub closePackage { $pkgName = $provides{$pkgName}; $cdata = $packages{$pkgName}; } - + die "unknown package $pkgName" unless defined $cdata; return if defined $donePkgs{$pkgName}; $donePkgs{$pkgName} = 1; @@ -85,9 +85,9 @@ sub closePackage { $provides{$name} = $cdata->{Package}; } } - + my @depNames = (); - + if (defined $cdata->{Depends}) { print STDERR " $pkgName: $cdata->{Depends}\n"; my $deps = Dpkg::Deps::parse($cdata->{Depends}); @@ -141,7 +141,7 @@ foreach my $pkgName (@order) { my $origName = basename $cdata->{Filename}; my $cleanedName = $origName; $cleanedName =~ s/~//g; - + print " (fetchurl {\n"; print " url = $urlPrefix/$cdata->{Filename};\n"; print " sha256 = \"$cdata->{SHA256}\";\n"; @@ -165,4 +165,3 @@ if ($newComponent != 1) { print STDERR "argh: ", keys %forward, "\n"; exit 1; } - diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 9b1c36a788d..5ec551fc718 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -34,7 +34,7 @@ rec { '' mkdir -p $out/bin mkdir -p $out/lib - + # Copy what we need from Glibc. cp -p ${pkgs.stdenv.glibc}/lib/ld-linux*.so.? $out/lib cp -p ${pkgs.stdenv.glibc}/lib/libc.so.* $out/lib @@ -60,7 +60,7 @@ rec { cp ${module_init_tools}/sbin/insmod $out/bin/insmod cp ${nettools}/sbin/ifconfig $out/bin cp ${sysvinit}/sbin/halt $out/bin - + # Run patchelf to make the programs refer to the copied libraries. for i in $out/bin/* $out/lib/*; do if ! test -L $i; then nuke-refs $i; fi; done @@ -70,7 +70,7 @@ rec { done ''; # */ - + createDeviceNodes = dev: '' mknod ${dev}/null c 1 3 @@ -82,7 +82,7 @@ rec { mknod ${dev}/${hd} b $MAJOR $MINOR ''; - + stage1Init = writeScript "vm-run-stage1" '' #! ${initrdUtils}/bin/bash -e echo START @@ -124,7 +124,7 @@ rec { mount -t tmpfs none /dev ${createDeviceNodes "/dev"} - + ifconfig eth0 up 10.0.2.15 mkdir /fs @@ -157,7 +157,7 @@ rec { mkdir -p /fs/etc ln -sf /proc/mounts /fs/etc/mtab - + echo "Now running: $command" test -n "$command" @@ -171,7 +171,7 @@ rec { halt -d -p -f ''; - + initrd = makeInitrd { contents = [ { object = stage1Init; @@ -180,11 +180,11 @@ rec { ]; }; - + stage2Init = writeScript "vm-run-stage2" '' #! ${bash}/bin/sh source /tmp/xchg/saved-env - + export NIX_STORE=/nix/store export NIX_BUILD_TOP=/tmp export TMPDIR=/tmp @@ -288,12 +288,12 @@ rec { chmod +x ./run-vm source ./run-vm - + if ! test -e xchg/in-vm-exit; then echo "Virtual machine didn't produce an exit code." exit 1 fi - + eval "$postVM" exit $(cat xchg/in-vm-exit) @@ -345,7 +345,7 @@ rec { If the build fails and Nix is run with the `-K' option, a script `run-vm' will be left behind in the temporary build directory that allows you to boot into the VM and debug it interactively. */ - + runInLinuxVM = drv: lib.overrideDerivation drv (attrs: { requiredSystemFeatures = [ "kvm" ]; builder = "${bash}/bin/sh"; @@ -355,7 +355,7 @@ rec { QEMU_OPTS = "-m ${toString (if attrs ? memSize then attrs.memSize else 256)}"; }); - + extractFs = {file, fs ? null} : with pkgs; runInLinuxVM ( stdenv.mkDerivation { @@ -381,7 +381,7 @@ rec { ''; }); - + extractMTDfs = {file, fs ? null} : with pkgs; runInLinuxVM ( stdenv.mkDerivation { @@ -408,7 +408,7 @@ rec { ''; }); - + qemuCommandGeneric = '' PATH="${samba}/sbin:$PATH" \ ${kvm}/bin/qemu-kvm \ @@ -417,7 +417,7 @@ rec { $QEMU_OPTS ''; - + /* Run a command in an x86 virtual machine image containing an arbitrary OS. The VM should be configured to do the following: @@ -462,7 +462,7 @@ rec { the Nix store, but using the tools provided by /bin, /usr/bin etc. from the specified filesystem image, which typically is a filesystem containing a non-NixOS Linux distribution. */ - + runInLinuxImage = attrs: runInLinuxVM (attrs // { mountDisk = true; @@ -493,12 +493,12 @@ rec { /* Create a filesystem image of the specified size and fill it with a set of RPM packages. */ - + fillDiskWithRPMs = { size ? 4096, rpms, name, fullName, preInstall ? "", postInstall ? "" , runScripts ? true, createRootFS ? defaultCreateRootFS }: - + runInLinuxVM (stdenv.mkDerivation { inherit name preInstall postInstall rpms; memSize = 512; @@ -508,7 +508,7 @@ rec { ${createRootFS} chroot=$(type -tP chroot) - + echo "unpacking RPMs..." for i in $rpms; do echo "$i..." @@ -527,19 +527,19 @@ rec { mkdir -p /mnt/nix/store ${utillinux}/bin/mount -o bind /nix/store /mnt/nix/store ${utillinux}/bin/mount -o bind /tmp /mnt/tmp - + echo "installing RPMs..." PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \ rpm -iv ${if runScripts then "" else "--noscripts"} $rpms echo "running post-install script..." eval "$postInstall" - + rm /mnt/.debug - ${utillinux}/bin/umount /mnt/nix/store - ${utillinux}/bin/umount /mnt/tmp - ${utillinux}/bin/umount /mnt + ${utillinux}/bin/umount /mnt/nix/store + ${utillinux}/bin/umount /mnt/tmp + ${utillinux}/bin/umount /mnt ''; passthru = { inherit fullName; }; @@ -548,7 +548,7 @@ rec { /* Generate a script that can be used to run an interactive session in the given image. */ - + makeImageTestScript = image: writeScript "image-test" '' #! ${bash}/bin/sh if test -z "$1"; then @@ -573,7 +573,7 @@ rec { /* Build RPM packages from the tarball `src' in the Linux distribution installed in the filesystem `diskImage'. The tarball must contain an RPM specfile. */ - + buildRPM = attrs: runInLinuxImage (stdenv.mkDerivation ({ phases = "prepareImagePhase sysInfoPhase buildPhase installPhase"; @@ -586,7 +586,7 @@ rec { done fi ''; - + sysInfoPhase = '' echo "System/kernel: $(uname -a)" if test -e /etc/fedora-release; then echo "Fedora release: $(cat /etc/fedora-release)"; fi @@ -595,7 +595,7 @@ rec { rpm -qa --qf "%{Name}-%{Version}-%{Release} (%{Arch}; %{Distribution}; %{Vendor})\n" stopNest ''; - + buildPhase = '' eval "$preBuild" @@ -612,7 +612,7 @@ rec { mkdir $rpmout $rpmout/SPECS $rpmout/BUILD $rpmout/RPMS $rpmout/SRPMS echo "%_topdir $rpmout" >> $HOME/.rpmmacros - + rpmbuild -vv -ta "$srcName" eval "$postBuild" @@ -642,7 +642,7 @@ rec { fillDiskWithDebs = { size ? 4096, debs, name, fullName, postInstall ? null, createRootFS ? defaultCreateRootFS }: - + runInLinuxVM (stdenv.mkDerivation { inherit name postInstall; @@ -658,7 +658,7 @@ rec { # Unpack the .debs. We do this to prevent pre-install scripts # (which have lots of circular dependencies) from barfing. echo "unpacking Debs..." - + for deb in $debs; do if test "$deb" != "|"; then echo "$deb..." @@ -671,7 +671,7 @@ rec { ${utillinux}/bin/mount -o bind /nix/store /mnt/inst/nix/store ${utillinux}/bin/mount -o bind /proc /mnt/proc ${utillinux}/bin/mount -o bind /dev /mnt/dev - + # Misc. files/directories assumed by various packages. echo "initialising Dpkg DB..." touch /mnt/etc/shells @@ -685,7 +685,7 @@ rec { echo "installing Debs..." export DEBIAN_FRONTEND=noninteractive - + oldIFS="$IFS" IFS="|" for component in $debs; do @@ -700,13 +700,13 @@ rec { PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \ /usr/bin/dpkg --install --force-all $debs < /dev/null || true done - + echo "running post-install script..." eval "$postInstall" ln -sf dash /mnt/bin/sh rm /mnt/.debug - + ${utillinux}/bin/umount /mnt/inst/nix/store ${utillinux}/bin/umount /mnt/proc ${utillinux}/bin/umount /mnt/dev @@ -720,7 +720,7 @@ rec { /* Generate a Nix expression containing fetchurl calls for the closure of a set of top-level RPM packages from the `primary.xml.gz' file of a Fedora or openSUSE distribution. */ - + rpmClosureGenerator = {name, packagesLists, urlPrefixes, packages, archs ? []}: assert (builtins.length packagesLists) == (builtins.length urlPrefixes) ; @@ -737,7 +737,7 @@ rec { /* Helper function that combines rpmClosureGenerator and fillDiskWithRPMs to generate a disk image from a set of package names. */ - + makeImageFromRPMDist = { name, fullName, size ? 4096 , urlPrefix ? "", urlPrefixes ? [urlPrefix] @@ -760,7 +760,7 @@ rec { debClosureGenerator = {name, packagesList, urlPrefix, packages}: - + runCommand "${name}.nix" {} '' bunzip2 < ${packagesList} > ./Packages @@ -770,12 +770,12 @@ rec { ${perl}/bin/perl -I${dpkg} -w ${deb/deb-closure.pl} \ ./Packages ${urlPrefix} ${toString packages} > $out ''; - + /* Helper function that combines debClosureGenerator and fillDiskWithDebs to generate a disk image from a set of package names. */ - + makeImageFromDebDist = { name, fullName, size ? 4096, urlPrefix, packagesList , packages, extraPackages ? [], postInstall ? "" }: @@ -793,7 +793,7 @@ rec { /* The set of supported RPM-based distributions. */ - + rpmDistros = { fedora2i386 = { @@ -820,7 +820,7 @@ rec { runScripts = false; packages = commonFedoraPackages; }; - + fedora5i386 = { name = "fedora-core-5-i386"; fullName = "Fedora Core 5 (i386)"; @@ -831,7 +831,7 @@ rec { urlPrefix = mirror://fedora/linux/core/5/i386/os; packages = commonFedoraPackages ++ [ "util-linux" ]; }; - + fedora7i386 = { name = "fedora-7-i386"; fullName = "Fedora 7 (i386)"; @@ -842,7 +842,7 @@ rec { urlPrefix = mirror://fedora/linux/releases/7/Everything/i386/os; packages = commonFedoraPackages; }; - + fedora8i386 = { name = "fedora-8-i386"; fullName = "Fedora 8 (i386)"; @@ -1060,9 +1060,9 @@ rec { /* The set of supported Dpkg-based distributions. */ - + debDistros = { - + # Interestingly, the SHA-256 hashes provided by Ubuntu in # http://nl.archive.ubuntu.com/ubuntu/dists/{gutsy,hardy}/Release are # wrong, but the SHA-1 and MD5 hashes are correct. Intrepid is fine. @@ -1077,7 +1077,7 @@ rec { urlPrefix = mirror://ubuntu; packages = commonDebianPackages; }; - + ubuntu804i386 = { name = "ubuntu-8.04-hardy-i386"; fullName = "Ubuntu 8.04 Hardy (i386)"; @@ -1088,7 +1088,7 @@ rec { urlPrefix = mirror://ubuntu; packages = commonDebianPackages; }; - + ubuntu804x86_64 = { name = "ubuntu-8.04-hardy-amd64"; fullName = "Ubuntu 8.04 Hardy (amd64)"; @@ -1099,7 +1099,7 @@ rec { urlPrefix = mirror://ubuntu; packages = commonDebianPackages; }; - + ubuntu810i386 = { name = "ubuntu-8.10-intrepid-i386"; fullName = "Ubuntu 8.10 Intrepid (i386)"; @@ -1110,7 +1110,7 @@ rec { urlPrefix = mirror://ubuntu; packages = commonDebianPackages; }; - + ubuntu810x86_64 = { name = "ubuntu-8.10-intrepid-amd64"; fullName = "Ubuntu 8.10 Intrepid (amd64)"; @@ -1132,7 +1132,7 @@ rec { urlPrefix = mirror://ubuntu; packages = commonDebianPackages; }; - + ubuntu904x86_64 = { name = "ubuntu-9.04-jaunty-amd64"; fullName = "Ubuntu 9.04 Jaunty (amd64)"; @@ -1154,7 +1154,7 @@ rec { urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diff" "mktemp" ]; }; - + ubuntu910x86_64 = { name = "ubuntu-9.10-karmic-amd64"; fullName = "Ubuntu 9.10 Karmic (amd64)"; @@ -1176,7 +1176,7 @@ rec { urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diffutils" "mktemp" ]; }; - + ubuntu1004x86_64 = { name = "ubuntu-10.04-lucid-amd64"; fullName = "Ubuntu 10.04 Lucid (amd64)"; @@ -1198,7 +1198,7 @@ rec { urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diffutils" ]; }; - + ubuntu1010x86_64 = { name = "ubuntu-10.04-maverick-amd64"; fullName = "Ubuntu 10.04 Maverick (amd64)"; @@ -1220,7 +1220,7 @@ rec { urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diffutils" ]; }; - + ubuntu1110x86_64 = { name = "ubuntu-11.10-oneiric-amd64"; fullName = "Ubuntu 11.10 Oneiric (amd64)"; @@ -1242,7 +1242,7 @@ rec { urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diffutils" ]; }; - + ubuntu1204x86_64 = { name = "ubuntu-12.04-oneiric-amd64"; fullName = "Ubuntu 12.04 Precise (amd64)"; @@ -1264,7 +1264,7 @@ rec { urlPrefix = mirror://debian; packages = commonDebianPackages; }; - + debian40x86_64 = { name = "debian-4.0r9-etch-amd64"; fullName = "Debian 4.0r9 Etch (amd64)"; @@ -1308,7 +1308,7 @@ rec { urlPrefix = mirror://debian; packages = commonDebianPackages; }; - + debian60x86_64 = { name = "debian-6.0.4-squeeze-amd64"; fullName = "Debian 6.0.4 Squeeze (amd64)"; @@ -1346,7 +1346,7 @@ rec { "unzip" ]; - + /* Common packages for openSUSE images. */ commonOpenSUSEPackages = [ "aaa_base" @@ -1390,7 +1390,7 @@ rec { "patch" "locales" # Needed by checkinstall: - "util-linux" + "util-linux" "file" "dpkg-dev" "pkg-config" @@ -1400,7 +1400,7 @@ rec { ]; commonDebianPackages = commonDebPackages ++ [ "sysvinit" "diff" "mktemp" ]; - + /* A set of functions that build the Linux distributions specified in `rpmDistros' and `debDistros'. For instance, @@ -1414,29 +1414,29 @@ rec { `diskImageFuns.ubuntu1004x86_64 { extraPackages = ["firefox"]; size = 8192; }' builds an 8 GiB image containing Firefox in addition to the default packages. */ - diskImageFuns = + diskImageFuns = (lib.mapAttrs (name: as: as2: makeImageFromRPMDist (as // as2)) rpmDistros) // (lib.mapAttrs (name: as: as2: makeImageFromDebDist (as // as2)) debDistros); - + /* Shorthand for `diskImageFuns. { extraPackages = ... }'. */ diskImageExtraFuns = lib.mapAttrs (name: f: extraPackages: f { inherit extraPackages; }) diskImageFuns; - + /* Default disk images generated from the `rpmDistros' and `debDistros' sets (along with Red Hat 9 and SuSE 9.0 images). */ diskImages = lib.mapAttrs (name: f: f {}) diskImageFuns // - + { redhat9i386 = fillDiskWithRPMs { name = "redhat-9-i386"; fullName = "Red Hat Linux 9 (i386)"; size = 1024; rpms = import ./rpm/redhat-9-i386.nix {inherit fetchurl;}; }; - + suse90i386 = fillDiskWithRPMs { name = "suse-9.0-i386"; fullName = "SUSE Linux 9.0 (i386)"; @@ -1456,7 +1456,7 @@ rec { echo 'video:x:33:' >> /mnt/etc/group ''; }; - + }; - + } From 20de8c808658154a838d6519ecfa32f260b25fd7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 27 Aug 2012 13:46:51 -0400 Subject: [PATCH 009/116] Make the "universe" repository available to the Ubuntu image generator Also fix Ubuntu 12.04 name from "oneiric" to "precise". --- pkgs/build-support/vm/deb/deb-closure.pl | 2 + pkgs/build-support/vm/default.nix | 48 ++++++++++++++++-------- 2 files changed, 34 insertions(+), 16 deletions(-) diff --git a/pkgs/build-support/vm/deb/deb-closure.pl b/pkgs/build-support/vm/deb/deb-closure.pl index f5b764783b4..1d41f89218b 100644 --- a/pkgs/build-support/vm/deb/deb-closure.pl +++ b/pkgs/build-support/vm/deb/deb-closure.pl @@ -53,6 +53,8 @@ foreach my $cdata (values %packages) { my @provides = getDeps(Dpkg::Deps::parse($cdata->{Provides})); foreach my $name (@provides) { #die "conflicting provide: $name\n" if defined $provides{$name}; + #warn "provide by $cdata->{Package} conflicts with package with the same name: $name\n"; + next if defined $packages{$name}; $provides{$name} = $cdata->{Package}; } } diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 5ec551fc718..8781fbf2d10 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -723,7 +723,7 @@ rec { rpmClosureGenerator = {name, packagesLists, urlPrefixes, packages, archs ? []}: - assert (builtins.length packagesLists) == (builtins.length urlPrefixes) ; + assert (builtins.length packagesLists) == (builtins.length urlPrefixes); runCommand "${name}.nix" {buildInputs = [perl perlPackages.XMLSimple]; inherit archs;} '' ${lib.concatImapStrings (i: pl: '' gunzip < ${pl} > ./packages_${toString i}.xml @@ -759,10 +759,13 @@ rec { (i.e. generate a closure from a Packages.bz2 file). */ debClosureGenerator = - {name, packagesList, urlPrefix, packages}: + {name, packagesLists, urlPrefix, packages}: runCommand "${name}.nix" {} '' - bunzip2 < ${packagesList} > ./Packages + for i in ${toString packagesLists}; do + echo "adding $i..." + bunzip2 < $i >> ./Packages + done # Work around this bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=452279 sed -i ./Packages -e s/x86_64-linux-gnu/x86-64-linux-gnu/g @@ -777,12 +780,13 @@ rec { names. */ makeImageFromDebDist = - { name, fullName, size ? 4096, urlPrefix, packagesList + { name, fullName, size ? 4096, urlPrefix + , packagesList ? "", packagesLists ? [packagesList] , packages, extraPackages ? [], postInstall ? "" }: let expr = debClosureGenerator { - inherit name packagesList urlPrefix; + inherit name packagesLists urlPrefix; packages = packages ++ extraPackages; }; in @@ -1158,7 +1162,7 @@ rec { ubuntu910x86_64 = { name = "ubuntu-9.10-karmic-amd64"; fullName = "Ubuntu 9.10 Karmic (amd64)"; - packagesList = fetchurl { + packagesList = fetchurl { url = mirror://ubuntu/dists/karmic/main/binary-amd64/Packages.bz2; sha256 = "3a604fcb0c135eeb8b95da3e90a8fd4cfeff519b858cd3c9e62ea808cb9fec40"; }; @@ -1233,23 +1237,35 @@ rec { }; ubuntu1204i386 = { - name = "ubuntu-12.04-oneiric-i386"; + name = "ubuntu-12.04-precise-i386"; fullName = "Ubuntu 12.04 Precise (i386)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/precise/main/binary-i386/Packages.bz2; - sha256 = "18ns9h4qhvjfcip9z55grzi371racxavgqkp6b5kfkdq2wwwax2d"; - }; + packagesLists = + [ (fetchurl { + url = mirror://ubuntu/dists/precise/main/binary-i386/Packages.bz2; + sha256 = "18ns9h4qhvjfcip9z55grzi371racxavgqkp6b5kfkdq2wwwax2d"; + }) + (fetchurl { + url = mirror://ubuntu/dists/precise/universe/binary-i386/Packages.bz2; + sha256 = "085lkzbnzkc74kfdmwdc32sfqyfz8dr0rbiifk8kx9jih3xjw2jk"; + }) + ]; urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diffutils" ]; }; ubuntu1204x86_64 = { - name = "ubuntu-12.04-oneiric-amd64"; + name = "ubuntu-12.04-precise-amd64"; fullName = "Ubuntu 12.04 Precise (amd64)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/precise/main/binary-amd64/Packages.bz2; - sha256 = "1aabpn0hdih6cbabyn87yvhccqj44q9k03mqmjsb920iqlckl3fc"; - }; + packagesList = + [ (fetchurl { + url = mirror://ubuntu/dists/precise/main/binary-amd64/Packages.bz2; + sha256 = "1aabpn0hdih6cbabyn87yvhccqj44q9k03mqmjsb920iqlckl3fc"; + }) + (fetchurl { + url = mirror://ubuntu/dists/precise/universe/binary-amd64/Packages.bz2; + sha256 = "0x4hz5aplximgb7gnpvrhkw8m7a40s80rkm5b8hil0afblwlg4vr"; + }) + ]; urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diffutils" ]; }; From bc8b1376dae0f751a15f56e10cc8a4ef5bec124c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 27 Aug 2012 14:02:39 -0400 Subject: [PATCH 010/116] postgresql-jdbc: Update to 9.1-902 --- pkgs/servers/sql/postgresql/jdbc/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/sql/postgresql/jdbc/default.nix b/pkgs/servers/sql/postgresql/jdbc/default.nix index e173a270e88..e490a14bea6 100644 --- a/pkgs/servers/sql/postgresql/jdbc/default.nix +++ b/pkgs/servers/sql/postgresql/jdbc/default.nix @@ -1,13 +1,19 @@ -{stdenv, fetchurl, ant}: +{ stdenv, fetchurl, ant }: -stdenv.mkDerivation { - name = "postgresql-jdbc-8.2"; +stdenv.mkDerivation rec { + name = "postgresql-jdbc-9.1-902"; builder = ./builder.sh; src = fetchurl { - url = http://jdbc.postgresql.org/download/postgresql-jdbc-8.2-504.src.tar.gz; - sha256 = "1fkza5j4b9pzm69cw1zv35bqk062d92l4l0zhz3qn0g64r08ccm4"; + url = "http://jdbc.postgresql.org/download/${name}.src.tar.gz"; + sha256 = "0sgwbiw5vfxcl0g1yzsndgxdha74cr8ag6y65i0jhgg5g8qc56bz"; }; buildInputs = [ant]; + + meta = { + homepage = http://jdbc.postgresql.org/; + description = "JDBC driver for PostgreSQL allowing Java programs to connect to a PostgreSQL database"; + license = "bsd"; + }; } From 8c128db32e473115669a9955f16093f7ff605558 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 27 Aug 2012 14:15:57 -0400 Subject: [PATCH 011/116] Add oraclejdk and oraclejre attributes for packages that want to use them --- pkgs/top-level/all-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f01ae4a9c0b..02a8565a83d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2366,6 +2366,10 @@ let then openjre else jdkdistro false false; + oraclejdk = jdkdistro true false; + + oraclejre = jdkdistro false false; + jrePlugin = lowPrio (jdkdistro false true); supportsJDK = From 602fde4ad48d3ed21c245a804b4f64477d4126f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 27 Aug 2012 19:42:05 +0200 Subject: [PATCH 012/116] Adding espeakedit, phoneme editor for espeak. I've no idea how to use it still. --- pkgs/applications/audio/espeak/edit.nix | 31 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/audio/espeak/edit.nix diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix new file mode 100644 index 00000000000..eb34335721f --- /dev/null +++ b/pkgs/applications/audio/espeak/edit.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, unzip, portaudio, wxGTK}: + +stdenv.mkDerivation { + name = "espeakedit-1.46.02"; + src = fetchurl { + url = mirror://sourceforge/espeak/espeakedit-1.46.02.zip; + sha256 = "1cc5r89sn8zz7b8wj4grx9xb7aqyi0ybj0li9hpy7hd67r56kqkl"; + }; + + buildInputs = [ unzip portaudio wxGTK ]; + + patchPhase = if portaudio.api_version == 19 then '' + cp src/portaudio19.h src/portaudio.h + '' else ""; + + buildPhase = '' + cd src + gcc -o espeakedit *.cpp `wx-config --cxxflags --libs` + ''; + + installPhase = '' + ensureDir $out/bin + cp espeakedit $out/bin + ''; + + meta = { + description = "Phoneme editor for espeak"; + homepage = http://espeak.sourceforge.net/; + license = "GPLv3+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02a8565a83d..7cd66bbe7cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6791,6 +6791,8 @@ let espeak = callPackage ../applications/audio/espeak { }; + espeakedit = callPackage ../applications/audio/espeak/edit.nix { }; + esniper = callPackage ../applications/networking/esniper { }; etherape = callPackage ../applications/networking/sniffers/etherape { From 0f1326cde9cc8cae509a4d225f37f072b0314601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 27 Aug 2012 20:25:54 +0200 Subject: [PATCH 013/116] Adding praat. --- pkgs/applications/audio/praat/default.nix | 26 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/applications/audio/praat/default.nix diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix new file mode 100644 index 00000000000..f2f196acdd8 --- /dev/null +++ b/pkgs/applications/audio/praat/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchurl, alsaLib, gtk, pkgconfig }: + +stdenv.mkDerivation { + name = "praat-5323"; + src = fetchurl { + url = http://www.fon.hum.uva.nl/praat/praat5323_sources.tar.gz; + sha256 = "1m0m5165h74mw5xhmnnyzh5ans3cn78w5rs9572sa1512cams203"; + }; + + configurePhase = '' + cp makefiles/makefile.defs.linux makefile.defs + ''; + + installPhase = '' + ensureDir $out/bin + cp praat $out/bin + ''; + + buildInputs = [ alsaLib gtk pkgconfig ]; + + meta = { + description = "Doing phonetics by computer"; + homepage = http://www.fon.hum.uva.nl/praat/; + license = "GPLv2+"; # Has some 3rd-party code in it though + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7cd66bbe7cb..3922e569a3a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6960,6 +6960,8 @@ let libquvi = callPackage ../applications/video/quvi/library.nix { }; + praat = callPackage ../applications/audio/praat { }; + quvi = callPackage ../applications/video/quvi/tool.nix { }; quvi_scripts = callPackage ../applications/video/quvi/scripts.nix { }; From 0a6c7e432b44375dc1d1b6ad60b2ca8435fd7a4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Mon, 27 Aug 2012 23:48:44 +0200 Subject: [PATCH 014/116] Patch linuxsampler so that it can load SFZ state when used as an LV2 plugin: http://tracker.ardour.org/view.php?id=4462 --- .../audio/linuxsampler/default.nix | 10 ++-- .../linuxsampler_lv2_sfz_fix.diff | 50 +++++++++++++++++++ 2 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/audio/linuxsampler/linuxsampler_lv2_sfz_fix.diff diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix index 1ef081c84d0..c74cd2b0d7d 100644 --- a/pkgs/applications/audio/linuxsampler/default.nix +++ b/pkgs/applications/audio/linuxsampler/default.nix @@ -11,9 +11,12 @@ stdenv.mkDerivation rec { sha256 = "0zsrvs9dwwhjx733m45vfi11yjkqv33z8qxn2i9qriq5zs1f0kd7"; }; - patchPhase = "sed -e 's/which/type -P/g' -i scripts/generate_parser.sh"; + patches = ./linuxsampler_lv2_sfz_fix.diff; - preConfigure = "make -f Makefile.cvs"; + preConfigure = '' + sed -e 's/which/type -P/g' -i scripts/generate_parser.sh + make -f Makefile.cvs + ''; buildInputs = [ alsaLib asio autoconf automake bison jackaudio libgig libsndfile @@ -34,7 +37,8 @@ stdenv.mkDerivation rec { have questions on the subject, that are not yet covered by the FAQ, please contact us. ''; - license = licenses.gpl2; + license = licenses.proprietary; maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/linuxsampler/linuxsampler_lv2_sfz_fix.diff b/pkgs/applications/audio/linuxsampler/linuxsampler_lv2_sfz_fix.diff new file mode 100644 index 00000000000..114726db19d --- /dev/null +++ b/pkgs/applications/audio/linuxsampler/linuxsampler_lv2_sfz_fix.diff @@ -0,0 +1,50 @@ +Index: linuxsampler-r2359/src/hostplugins/lv2/PluginLv2.cpp +=================================================================== +--- linuxsampler-r2359/src/hostplugins/lv2/PluginLv2.cpp (revision 2359) ++++ linuxsampler-r2359/src/hostplugins/lv2/PluginLv2.cpp (working copy) +@@ -18,6 +18,8 @@ + * MA 02110-1301 USA * + ***************************************************************************/ + ++#define _BSD_SOURCE 1 /* for realpath() */ ++ + #include + #include + #include +@@ -118,6 +120,23 @@ + dmsg(2, ("linuxsampler: Deactivate\n")); + } + ++ static String RealPath(const String& path) ++ { ++ String out = path; ++ char* cpath = NULL; ++#ifdef _WIN32 ++ cpath = (char*)malloc(MAX_PATH); ++ GetFullPathName(path.c_str(), MAX_PATH, cpath, NULL); ++#else ++ cpath = realpath(path.c_str(), NULL); ++#endif ++ if (cpath) { ++ out = cpath; ++ free(cpath); ++ } ++ return out; ++ } ++ + String PluginLv2::PathToState(const String& path) { + if (MapPath) { + char* cstr = MapPath->abstract_path(MapPath->handle, path.c_str()); +@@ -131,9 +150,10 @@ + String PluginLv2::PathFromState(const String& path) { + if (MapPath) { + char* cstr = MapPath->absolute_path(MapPath->handle, path.c_str()); +- const String abstract_path(cstr); ++ // Resolve symbolic links so SFZ sample paths load correctly ++ const String absolute_path(RealPath(cstr)); + free(cstr); +- return abstract_path; ++ return absolute_path; + } + return path; + } From 824b62a61a79a08fea6f31de6ceca67d2091faa4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:18:10 +0200 Subject: [PATCH 015/116] haskell-cipher-aes: add version 0.1.1 --- .../libraries/haskell/cipher-aes/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/cipher-aes/default.nix diff --git a/pkgs/development/libraries/haskell/cipher-aes/default.nix b/pkgs/development/libraries/haskell/cipher-aes/default.nix new file mode 100644 index 00000000000..e89fc1d6faf --- /dev/null +++ b/pkgs/development/libraries/haskell/cipher-aes/default.nix @@ -0,0 +1,15 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "cipher-aes"; + version = "0.1.1"; + sha256 = "0pyiqsdvvq0qhlin17rijqjq0sc0i9nl9rdwbql01fr4pw46cwwg"; + isLibrary = true; + isExecutable = true; + meta = { + homepage = "http://github.com/vincenthz/hs-cipher-aes"; + description = "Fast AES cipher implementation with advanced mode of operations"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c2e457bfe45..87a6b8a2049 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -522,6 +522,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); citeprocHs = callPackage ../development/libraries/haskell/citeproc-hs {}; + cipherAes = callPackage ../development/libraries/haskell/cipher-aes {}; + clientsession = callPackage ../development/libraries/haskell/clientsession {}; cmdargs = callPackage ../development/libraries/haskell/cmdargs {}; From bf188b3fd290f56c3c87ae7126eda90eb881f6c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:28:51 +0200 Subject: [PATCH 016/116] haskell-http-conduit: patch to support recent versions of base64-bytestring and asn1-data --- pkgs/development/libraries/haskell/http-conduit/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 9c0efe3f05c..ee9d43966af 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -17,6 +17,9 @@ cabal.mkDerivation (self: { monadControl mtl network regexCompat resourcet socks text time tls tlsExtra transformers transformersBase utf8String void zlibConduit ]; + patchPhase = '' + sed -i http-conduit.cabal -e 's|, base64-bytestring.*|, base64-bytestring|' -e 's|, asn1-data.*|, asn1-data|' + ''; meta = { homepage = "http://www.yesodweb.com/book/http-conduit"; description = "HTTP client package with conduit interface and HTTPS support"; From 7d889c6dfaefbb7631757773d04e0471b4a40ca4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:31:19 +0200 Subject: [PATCH 017/116] haskell-yesod-static: patch to support recent versions of base64-bytestring --- pkgs/development/libraries/haskell/yesod-static/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index d7e9498c968..8fffccd649a 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -12,6 +12,9 @@ cabal.mkDerivation (self: { httpTypes systemFilepath text transformers unixCompat wai waiAppStatic yesodCore ]; + patchPhase = '' + sed -i yesod-static.cabal -e 's|, base64-bytestring.*|, base64-bytestring|' + ''; meta = { homepage = "http://www.yesodweb.com/"; description = "Static file serving subsite for Yesod Web Framework"; From 9bce51f6ec0730eb1160edcc51c4901061f8f0dd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:34:15 +0200 Subject: [PATCH 018/116] haskell-gitit: patch to support recent versions of base64-bytestring --- pkgs/development/libraries/haskell/gitit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index 148750e9ddc..41d521805ce 100644 --- a/pkgs/development/libraries/haskell/gitit/default.nix +++ b/pkgs/development/libraries/haskell/gitit/default.nix @@ -19,7 +19,7 @@ cabal.mkDerivation (self: { zlib ]; patchPhase = '' - sed -i -e 's|hslogger.*,|hslogger,|' gitit.cabal + sed -i -e 's|hslogger.*,|hslogger,|' -e 's|base64-bytestring.*,|base64-bytestring,|' gitit.cabal ''; meta = { homepage = "http://gitit.net"; From dbe1ee0921832c000c81d5e22ca36d2ba9e92d88 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:37:14 +0200 Subject: [PATCH 019/116] haskell-HsOpenSSL: update to version 0.10.3.3 --- pkgs/development/libraries/haskell/HsOpenSSL/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix index 3a4c94e33a2..9eefaaef84a 100644 --- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix +++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HsOpenSSL"; - version = "0.10.3.2"; - sha256 = "15mlllzw8ahvrx259bz5vwisdig7bvkany1qjhmz6y8v2rcplr7f"; + version = "0.10.3.3"; + sha256 = "04d2nd2hcbglw8blwhi3d32vazdxnvs9s52788qyllgm7gmay6a5"; buildDepends = [ network time ]; extraLibraries = [ openssl ]; meta = { From b61ed4a580adc1e26ff91cbeaccc925a00dc6c1c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:37:14 +0200 Subject: [PATCH 020/116] haskell-abstract-deque: update to version 0.1.6 --- .../libraries/haskell/abstract-deque/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/abstract-deque/default.nix b/pkgs/development/libraries/haskell/abstract-deque/default.nix index 90d6f4c274e..a6219a4b2a0 100644 --- a/pkgs/development/libraries/haskell/abstract-deque/default.nix +++ b/pkgs/development/libraries/haskell/abstract-deque/default.nix @@ -1,11 +1,12 @@ -{ cabal, HUnit, IORefCAS }: +{ cabal, HUnit }: cabal.mkDerivation (self: { pname = "abstract-deque"; - version = "0.1.5"; - sha256 = "1zp19kq3m72nx7rr00yyq8iwia4abg4x9kw4d5s5k0srp5f9fn3q"; - buildDepends = [ HUnit IORefCAS ]; + version = "0.1.6"; + sha256 = "13s8xbr31sqj8n3bh4xp82fqw5d5g1a27fpfqw69jfmr5xc9s1za"; + buildDepends = [ HUnit ]; meta = { + homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki"; description = "Abstract, parameterized interface to mutable Deques"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 77cd02f766695843b2b703489e667ad824228192 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:37:14 +0200 Subject: [PATCH 021/116] haskell-asn1-data: update to version 0.7.1 --- .../libraries/haskell/asn1-data/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/asn1-data/default.nix b/pkgs/development/libraries/haskell/asn1-data/default.nix index 60e795f6e2e..a90e8e769e2 100644 --- a/pkgs/development/libraries/haskell/asn1-data/default.nix +++ b/pkgs/development/libraries/haskell/asn1-data/default.nix @@ -1,17 +1,15 @@ -{ cabal, attoparsec, attoparsecEnumerator, enumerator, mtl, text }: +{ cabal, cereal, mtl, text }: cabal.mkDerivation (self: { pname = "asn1-data"; - version = "0.6.1.3"; - sha256 = "0vly55dpqrm9vb8ayp72na1nf2rr5ini3d81qqvxflmjgpksrgwq"; + version = "0.7.1"; + sha256 = "10s7mxygw6w8a8mx090msvbl8pji8m68lsxxyr5bp7p887naia7r"; isLibrary = true; isExecutable = true; - buildDepends = [ - attoparsec attoparsecEnumerator enumerator mtl text - ]; + buildDepends = [ cereal mtl text ]; meta = { homepage = "http://github.com/vincenthz/hs-asn1-data"; - description = "ASN1 data reader and writer in RAW, BER, DER and CER forms"; + description = "ASN1 data reader and writer in RAW, BER and DER forms"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; From c7a7caf7ab21660ae936d23f27a8955b40f12508 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:37:14 +0200 Subject: [PATCH 022/116] haskell-base64-bytestring: update to version 1.0.0.0 --- .../libraries/haskell/base64-bytestring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/base64-bytestring/default.nix b/pkgs/development/libraries/haskell/base64-bytestring/default.nix index 5fd552d6272..bc3eca3050d 100644 --- a/pkgs/development/libraries/haskell/base64-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/base64-bytestring/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "base64-bytestring"; - version = "0.1.2.0"; - sha256 = "039naasb3z8q42zl067paylxb9i1m1pkp4w6b5yqsc38sbmikv1z"; + version = "1.0.0.0"; + sha256 = "0z0r0lrpka3qrq45ajzyxsjc2as7zp6bq7z7sd56rwiziw7vp7vm"; meta = { homepage = "https://github.com/bos/base64-bytestring"; description = "Fast base64 encoding and deconding for ByteStrings"; From cf4076daba72e39781dbc8ae2a316729b7427c38 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:37:14 +0200 Subject: [PATCH 023/116] haskell-certificate: update to version 1.2.6 --- pkgs/development/libraries/haskell/certificate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix index 6581ddf0e1a..d79f6faa3ef 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "certificate"; - version = "1.2.5"; - sha256 = "1zxi1hflq973m7a1c9wvxdx8aqapx1kqy8j7nn7k67l9gpjb1jbc"; + version = "1.2.6"; + sha256 = "1li65r4zbff7r7p533p5xw2z3rd0xnlb2bbwqdldrnswy4mvlakx"; isLibrary = true; isExecutable = true; buildDepends = [ asn1Data cryptoPubkeyTypes mtl pem time ]; From e01aa340f6896ab5553397eb4b290b4069bd4f2f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:37:14 +0200 Subject: [PATCH 024/116] haskell-configurator: update to version 0.2.0.1 --- pkgs/development/libraries/haskell/configurator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/configurator/default.nix b/pkgs/development/libraries/haskell/configurator/default.nix index 0c4c610106e..3618f598055 100644 --- a/pkgs/development/libraries/haskell/configurator/default.nix +++ b/pkgs/development/libraries/haskell/configurator/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "configurator"; - version = "0.2.0.0"; - sha256 = "0zkcmziyfq2sm9i75ysi5nxd21fynp88m0safhmn3jld7plj03la"; + version = "0.2.0.1"; + sha256 = "02w6f5q2xkpc3kgqz6a58g7yr0q4xd8ck1b6lr64ahvqwsjbxy6p"; buildDepends = [ attoparsec hashable text unixCompat unorderedContainers ]; From 5bddcc2f21513b48e5a6f7a7b679798de284d61d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:37:14 +0200 Subject: [PATCH 025/116] haskell-cprng-aes: update to version 0.2.4 --- .../libraries/haskell/cprng-aes/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/cprng-aes/default.nix b/pkgs/development/libraries/haskell/cprng-aes/default.nix index 881d4519a53..1feb21a8b63 100644 --- a/pkgs/development/libraries/haskell/cprng-aes/default.nix +++ b/pkgs/development/libraries/haskell/cprng-aes/default.nix @@ -1,10 +1,14 @@ -{ cabal, cereal, cryptoApi, cryptocipher, entropy, random }: +{ cabal, cereal, cipherAes, cryptoApi, cryptocipher, entropy +, random +}: cabal.mkDerivation (self: { pname = "cprng-aes"; - version = "0.2.3"; - sha256 = "1xyphzb3afvw7kpgq3b0c86b45rp5a8s870gag1lp7h686lhfnn3"; - buildDepends = [ cereal cryptoApi cryptocipher entropy random ]; + version = "0.2.4"; + sha256 = "0rk14yj76p5a1h6jlz4q2fgijjid430lwcr57zkkda8mdibqqs5j"; + buildDepends = [ + cereal cipherAes cryptoApi cryptocipher entropy random + ]; meta = { homepage = "http://github.com/vincenthz/hs-cprng-aes"; description = "Crypto Pseudo Random Number Generator using AES in counter mode"; From 49a3481f5d6af2147ec500ee9ac0057cd12d9f1d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:37:14 +0200 Subject: [PATCH 026/116] haskell-http-types: update to version 0.7.3.0.1 --- pkgs/development/libraries/haskell/http-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix index 14d347f39f5..242f73e9b21 100644 --- a/pkgs/development/libraries/haskell/http-types/default.nix +++ b/pkgs/development/libraries/haskell/http-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "http-types"; - version = "0.7.3"; - sha256 = "1s2y2fl9l75xd6fls9ajasn37i7cqxfw772rkw50d3vxvk2fdxjh"; + version = "0.7.3.0.1"; + sha256 = "1s2dh75jpf2yllw503hjw0x2anhc4c71vz5yylri8nxzx1zs18rq"; buildDepends = [ blazeBuilder caseInsensitive text ]; meta = { homepage = "https://github.com/aristidb/http-types"; From fda535b52defe398a182806dd7b90cfe1b31fed7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:37:14 +0200 Subject: [PATCH 027/116] haskell-reactive-banana: update to version 0.7.0.1 --- .../libraries/haskell/reactive-banana/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix index 98438bbb3d2..a80e911eefa 100644 --- a/pkgs/development/libraries/haskell/reactive-banana/default.nix +++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix @@ -1,13 +1,13 @@ -{ cabal, fclabels, hashable, QuickCheck, transformers -, unorderedContainers, vault +{ cabal, hashable, QuickCheck, transformers, unorderedContainers +, vault }: cabal.mkDerivation (self: { pname = "reactive-banana"; - version = "0.7.0.0"; - sha256 = "0f25zr4l2v73yr3mww0ri9n0kq97sakd0mifvll0kmsh0cz124xz"; + version = "0.7.0.1"; + sha256 = "0nd6j2782x7i12xw480qgk42jkya9qi0xdas15ik6cmg4c9z1dyk"; buildDepends = [ - fclabels hashable QuickCheck transformers unorderedContainers vault + hashable QuickCheck transformers unorderedContainers vault ]; meta = { homepage = "http://haskell.org/haskellwiki/Reactive-banana"; From da00b344cf16b76c8d55cf62826917cd15933cc2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:37:14 +0200 Subject: [PATCH 028/116] haskell-yesod-core: update to version 1.1.1.1 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 219a83e1e96..66432d02f59 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.1.1"; - sha256 = "1rq0zdn9d6f34s7wnnr32hnbz23z8bvz3j2ylv8sz5h3nwmbfz99"; + version = "1.1.1.1"; + sha256 = "1sx8bn48r8l9qkqlg2rab6b2xz5dkvw8whm3df7rviw9lymgcrdk"; buildDepends = [ aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie failure fastLogger hamlet httpTypes From def452861da8470fd7cd268bda67be1870301cc2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:59:20 +0200 Subject: [PATCH 029/116] Delete obsolete Haskell packages: * comonad 1.1.1.6 * comonad-transformers 2.1.2 * semigroupoids 1.3.4 * split 0.1 * tagsoup 0.10.1 * texmath 0.4 --- .../haskell/comonad-transformers/2.1.2.nix | 19 -------------- .../{3.0.nix => default.nix} | 0 .../libraries/haskell/comonad/1.1.1.6.nix | 14 ---------- .../comonad/{3.0.0.2.nix => default.nix} | 0 .../libraries/haskell/semigroupoids/1.3.4.nix | 14 ---------- .../semigroupoids/{3.0.nix => default.nix} | 0 .../libraries/haskell/split/0.1.nix | 13 ---------- .../libraries/haskell/tagsoup/0.10.1nix | 16 ------------ .../libraries/haskell/texmath/0.4.nix | 17 ------------ pkgs/top-level/haskell-packages.nix | 26 +++---------------- 10 files changed, 4 insertions(+), 115 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/comonad-transformers/2.1.2.nix rename pkgs/development/libraries/haskell/comonad-transformers/{3.0.nix => default.nix} (100%) delete mode 100644 pkgs/development/libraries/haskell/comonad/1.1.1.6.nix rename pkgs/development/libraries/haskell/comonad/{3.0.0.2.nix => default.nix} (100%) delete mode 100644 pkgs/development/libraries/haskell/semigroupoids/1.3.4.nix rename pkgs/development/libraries/haskell/semigroupoids/{3.0.nix => default.nix} (100%) delete mode 100644 pkgs/development/libraries/haskell/split/0.1.nix delete mode 100644 pkgs/development/libraries/haskell/tagsoup/0.10.1nix delete mode 100644 pkgs/development/libraries/haskell/texmath/0.4.nix diff --git a/pkgs/development/libraries/haskell/comonad-transformers/2.1.2.nix b/pkgs/development/libraries/haskell/comonad-transformers/2.1.2.nix deleted file mode 100644 index 1dd7c212c71..00000000000 --- a/pkgs/development/libraries/haskell/comonad-transformers/2.1.2.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ cabal, comonad, contravariant, distributive, semigroupoids -, semigroups, transformers -}: - -cabal.mkDerivation (self: { - pname = "comonad-transformers"; - version = "2.1.2"; - sha256 = "0yhpsifnqxrg1p8f9hjslwkrakiaxa2kk9726q923a5sj225cvis"; - buildDepends = [ - comonad contravariant distributive semigroupoids semigroups - transformers - ]; - meta = { - homepage = "http://github.com/ekmett/comonad-transformers/"; - description = "Comonad transformers"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/comonad-transformers/3.0.nix b/pkgs/development/libraries/haskell/comonad-transformers/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/comonad-transformers/3.0.nix rename to pkgs/development/libraries/haskell/comonad-transformers/default.nix diff --git a/pkgs/development/libraries/haskell/comonad/1.1.1.6.nix b/pkgs/development/libraries/haskell/comonad/1.1.1.6.nix deleted file mode 100644 index 53e014fb8ac..00000000000 --- a/pkgs/development/libraries/haskell/comonad/1.1.1.6.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ cabal, semigroups, transformers }: - -cabal.mkDerivation (self: { - pname = "comonad"; - version = "1.1.1.6"; - sha256 = "1sg0pa7393mzfm27pl52nchplhkls3k0f4ff8vzk76wzrgvhysg5"; - buildDepends = [ semigroups transformers ]; - meta = { - homepage = "http://github.com/ekmett/comonad/"; - description = "Haskell 98 compatible comonads"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/comonad/3.0.0.2.nix b/pkgs/development/libraries/haskell/comonad/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/comonad/3.0.0.2.nix rename to pkgs/development/libraries/haskell/comonad/default.nix diff --git a/pkgs/development/libraries/haskell/semigroupoids/1.3.4.nix b/pkgs/development/libraries/haskell/semigroupoids/1.3.4.nix deleted file mode 100644 index 776e452eafe..00000000000 --- a/pkgs/development/libraries/haskell/semigroupoids/1.3.4.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ cabal, comonad, contravariant, semigroups, transformers }: - -cabal.mkDerivation (self: { - pname = "semigroupoids"; - version = "1.3.4"; - sha256 = "0vnipjndbsldk5w1qw35i2zrd418rq13y10g0i33ylg1gwnsrqph"; - buildDepends = [ comonad contravariant semigroups transformers ]; - meta = { - homepage = "http://github.com/ekmett/semigroupoids"; - description = "Haskell 98 semigroupoids: Category sans id"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/semigroupoids/3.0.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/semigroupoids/3.0.nix rename to pkgs/development/libraries/haskell/semigroupoids/default.nix diff --git a/pkgs/development/libraries/haskell/split/0.1.nix b/pkgs/development/libraries/haskell/split/0.1.nix deleted file mode 100644 index ad0df5c2cb0..00000000000 --- a/pkgs/development/libraries/haskell/split/0.1.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "split"; - version = "0.1.4.3"; - sha256 = "1i9vmb0zvmhqj6qcbnsapsk9lhsyzznz336c8s7v4sz20s99hsby"; - meta = { - homepage = "http://code.haskell.org/~byorgey/code/split"; - description = "Combinator library for splitting lists"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/tagsoup/0.10.1nix b/pkgs/development/libraries/haskell/tagsoup/0.10.1nix deleted file mode 100644 index 462ee658fd2..00000000000 --- a/pkgs/development/libraries/haskell/tagsoup/0.10.1nix +++ /dev/null @@ -1,16 +0,0 @@ -{ cabal, mtl, network }: - -cabal.mkDerivation (self: { - pname = "tagsoup"; - version = "0.10.1"; - sha256 = "0bssfj5r790yj33q23i0lbj83xahzd9rf4jhqs21vgrpn9fqsynl"; - isLibrary = true; - isExecutable = true; - buildDepends = [ mtl network ]; - meta = { - homepage = "http://community.haskell.org/~ndm/tagsoup/"; - description = "Parsing and extracting information from (possibly malformed) HTML/XML documents"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/texmath/0.4.nix b/pkgs/development/libraries/haskell/texmath/0.4.nix deleted file mode 100644 index 9d9a4f07586..00000000000 --- a/pkgs/development/libraries/haskell/texmath/0.4.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, parsec, syb, xml }: - -cabal.mkDerivation (self: { - pname = "texmath"; - version = "0.4"; - sha256 = "1rvnhqljxkljy8ncpaj8p7b14nvvm6zmiixv13m1zxlcr457j2ai"; - isLibrary = true; - isExecutable = true; - buildDepends = [ parsec syb xml ]; - meta = { - homepage = "http://github.com/jgm/texmath"; - description = "Conversion of LaTeX math formulas to MathML"; - license = "GPL"; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 87a6b8a2049..1f06a00b64f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -534,16 +534,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); colour = callPackage ../development/libraries/haskell/colour {}; - comonad_1_1_1_6 = callPackage ../development/libraries/haskell/comonad/1.1.1.6.nix {}; - comonad_3_0_0_2 = callPackage ../development/libraries/haskell/comonad/3.0.0.2.nix {}; - comonad = self.comonad_3_0_0_2; + comonad = callPackage ../development/libraries/haskell/comonad {}; - comonadTransformers_2_1_2 = callPackage ../development/libraries/haskell/comonad-transformers/2.1.2.nix { - comonad = self.comonad_1_1_1_6; - semigroupoids = self.semigroupoids_1_3_4; - }; - comonadTransformers_3_0 = callPackage ../development/libraries/haskell/comonad-transformers/3.0.nix {}; - comonadTransformers = self.comonadTransformers_3_0; + comonadTransformers = callPackage ../development/libraries/haskell/comonad-transformers {}; compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {}; @@ -605,10 +598,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); dataInttrie = callPackage ../development/libraries/haskell/data-inttrie {}; - dataLens = callPackage ../development/libraries/haskell/data-lens { - comonadTransformers = self.comonadTransformers_2_1_2; - semigroupoids = self.semigroupoids_1_3_4; - }; + dataLens = callPackage ../development/libraries/haskell/data-lens {}; dataLensTemplate = callPackage ../development/libraries/haskell/data-lens-template {}; @@ -1329,11 +1319,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); semigroups = callPackage ../development/libraries/haskell/semigroups {}; - semigroupoids_1_3_4 = callPackage ../development/libraries/haskell/semigroupoids/1.3.4.nix { - comonad = self.comonad_1_1_1_6; - }; - semigroupoids_3_0 = callPackage ../development/libraries/haskell/semigroupoids/3.0.nix {}; - semigroupoids = self.semigroupoids_3_0; + semigroupoids = callPackage ../development/libraries/haskell/semigroupoids {}; shelly = callPackage ../development/libraries/haskell/shelly {}; @@ -1412,7 +1398,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {}; - split_0_1 = callPackage ../development/libraries/haskell/split/0.1.nix {}; split = callPackage ../development/libraries/haskell/split {}; stbImage = callPackage ../development/libraries/haskell/stb-image {}; @@ -1450,8 +1435,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); tagsoup = callPackage ../development/libraries/haskell/tagsoup {}; - tagsoup_0_10_1 = callPackage ../development/libraries/haskell/tagsoup/0.10.1nix {}; - temporary = callPackage ../development/libraries/haskell/temporary {}; Tensor = callPackage ../development/libraries/haskell/Tensor {}; @@ -1775,7 +1758,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); xmonadExtras = callPackage ../applications/window-managers/xmonad/xmonad-extras.nix { X11 = self.X11_1_5_0_1; - split = self.split_0_1; }; # Tools. From aa583c8cf4702f8c071b89bb514d4caf453122f8 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Tue, 28 Aug 2012 14:40:24 +0200 Subject: [PATCH 030/116] experimental/lib-fold-attr adding useful function foldAttr which behave like fold on attr values grouped by name (without assertions now) Signed-off-by: Marc Weber --- pkgs/lib/attrsets.nix | 13 ++++++++++++- pkgs/lib/tests.nix | 7 +++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/pkgs/lib/attrsets.nix b/pkgs/lib/attrsets.nix index de6eccbec1f..63448847a15 100644 --- a/pkgs/lib/attrsets.nix +++ b/pkgs/lib/attrsets.nix @@ -5,7 +5,8 @@ with { inherit (import ./trivial.nix) or; inherit (import ./default.nix) fold; inherit (import ./strings.nix) concatStringsSep; - inherit (import ./lists.nix) concatMap concatLists; + inherit (import ./lists.nix) concatMap concatLists all; + inherit (import ./misc.nix) maybeAttr; }; rec { @@ -78,6 +79,16 @@ rec { filterAttrs = pred: set: listToAttrs (fold (n: ys: let v = getAttr n set; in if pred n v then [(nameValuePair n v)] ++ ys else ys) [] (attrNames set)); + /* foldAttrs: apply fold functions to values grouped by key. Eg accumulate values as list: + foldAttrs (n: a: [n] ++ a) [] [{ a = 2; } { a = 3; }] + => { a = [ 2 3 ]; } + */ + foldAttrs = op: nul: list_of_attrs: + fold (n: a: + fold (name: o: + o // (listToAttrs [{inherit name; value = op (getAttr name n) (maybeAttr name nul a); }]) + ) a (attrNames n) + ) {} list_of_attrs; /* Recursively collect sets that verify a given predicate named `pred' from the set `attrs'. The recursion is stopped when the predicate is diff --git a/pkgs/lib/tests.nix b/pkgs/lib/tests.nix index 835298ddb9e..04acb7632ea 100644 --- a/pkgs/lib/tests.nix +++ b/pkgs/lib/tests.nix @@ -58,6 +58,13 @@ runTests { ([ 1 2 3 ] == (take 4 [ 1 2 3 ])) ]; + testFoldAttrs = { + expr = foldAttrs (n: a: [n] ++ a) [] [ + { a = 2; b = 7; } + { a = 3; c = 8; } + ]; + expected = { a = [ 2 3 ]; b = [7]; c = [8];}; + }; testOverridableDelayableArgsTest = { expr = From b920bd538ae381f01ffe5baecac6c3dbdbe9bfa2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 15:13:21 +0200 Subject: [PATCH 031/116] postfix: strip trailing whitespace --- pkgs/servers/mail/postfix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 16d9127e556..6319a60cedb 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -6,7 +6,7 @@ assert stdenv.isLinux; stdenv.mkDerivation { name = "postfix-2.8.6"; - + src = fetchurl { url = ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/postfix-2.8.6.tar.gz; sha256 = "1rfsfhna5hy5lc6hkg1zc2862pdc5c1y9z6aiy8rinlmzrfplhlb"; @@ -47,7 +47,7 @@ stdenv.mkDerivation { ''; buildInputs = [db4 openssl cyrus_sasl bison perl]; - + patches = [ ./postfix-2.2.9-db.patch ./postfix-2.2.9-lib.patch ./db-linux3.patch ]; postPatch = '' @@ -55,6 +55,6 @@ stdenv.mkDerivation { -e s,/usr/sbin,/var/run/current-system/sw/sbin, \ -e s,:/sbin,, src/util/sys_defs.h ''; - + inherit glibc; } From 919b35725521789e8f8606f4e711559453354b03 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 15:13:34 +0200 Subject: [PATCH 032/116] postfix: add meta section --- pkgs/servers/mail/postfix/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 6319a60cedb..155d534c747 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -54,6 +54,14 @@ stdenv.mkDerivation { sed -i -e s,/usr/bin,/var/run/current-system/sw/bin, \ -e s,/usr/sbin,/var/run/current-system/sw/sbin, \ -e s,:/sbin,, src/util/sys_defs.h + + meta = { + homepage = "http://www.postfix.org/"; + description = "a fast, easy to administer, and secure mail server"; + license = stdenv.lib.licenses.bsdOriginal; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; ''; inherit glibc; From 40fe2d03b5e294ba5456f34d55e1efd427ef942c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 15:14:03 +0200 Subject: [PATCH 033/116] postfix: re-use $name in src URL --- pkgs/servers/mail/postfix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 155d534c747..37a3869a733 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -4,11 +4,11 @@ assert stdenv.isLinux; -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "postfix-2.8.6"; src = fetchurl { - url = ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/postfix-2.8.6.tar.gz; + url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz"; sha256 = "1rfsfhna5hy5lc6hkg1zc2862pdc5c1y9z6aiy8rinlmzrfplhlb"; }; From 85350ca2d44fc272d893e566be3044920524d4e5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 15:17:06 +0200 Subject: [PATCH 034/116] postfix: clean-up install phase Passing install_root=$out isn't a good idea because the install script is going to pre-pend that prefix to all other paths even though these have the $out prefix already. The resulting installation is a mess. Instead, we use the "fake" install prefix "out" and then move all files and directories into the right place afterward. --- pkgs/servers/mail/postfix/default.nix | 47 +++++++++++++-------------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 37a3869a733..d505f459b9e 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -12,23 +12,14 @@ stdenv.mkDerivation rec { sha256 = "1rfsfhna5hy5lc6hkg1zc2862pdc5c1y9z6aiy8rinlmzrfplhlb"; }; - installTargets = ["non-interactive-package"]; - - installFlags = [" install_root=$out "]; - - preInstall = '' - sed -e '/^PATH=/d' -i postfix-install - ''; - - postInstall = '' - mkdir -p $out - mv ut/$out/* $out/ + buildInputs = [db4 openssl cyrus_sasl bison perl]; - mkdir $out/share/postfix/conf - cp conf/* $out/share/postfix/conf - sed -e 's@PATH=.*@PATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:'$out'/sbin@' -i $out/share/postfix/conf/post-install $out/libexec/postfix/post-install - sed -e '2aPATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:'$out'/sbin' -i $out/share/postfix/conf/postfix-script $out/libexec/postfix/postfix-script - chmod a+x $out/share/postfix/conf/{postfix-script,post-install} + patches = [ ./postfix-2.2.9-db.patch ./postfix-2.2.9-lib.patch ./db-linux3.patch ]; + + postPatch = '' + sed -i -e s,/usr/bin,/var/run/current-system/sw/bin, \ + -e s,/usr/sbin,/var/run/current-system/sw/sbin, \ + -e s,:/sbin,, src/util/sys_defs.h ''; preBuild = '' @@ -46,14 +37,23 @@ stdenv.mkDerivation rec { make makefiles CCARGS='-DUSE_TLS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${cyrus_sasl}/include/sasl' AUXLIBS='-lssl -lcrypto -lsasl2 -ldb -lnsl' ''; - buildInputs = [db4 openssl cyrus_sasl bison perl]; + installPhase = '' + sed -e '/^PATH=/d' -i postfix-install + $SHELL postfix-install install_root=out -non-interactive -package - patches = [ ./postfix-2.2.9-db.patch ./postfix-2.2.9-lib.patch ./db-linux3.patch ]; + mkdir -p $out + mv -v "out$out/"* $out/ - postPatch = '' - sed -i -e s,/usr/bin,/var/run/current-system/sw/bin, \ - -e s,/usr/sbin,/var/run/current-system/sw/sbin, \ - -e s,:/sbin,, src/util/sys_defs.h + mkdir -p $out/share/postfix + mv conf $out/share/postfix/ + mv LICENSE TLS_LICENSE $out/share/postfix/ + + sed -e 's@^PATH=.*@PATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:'$out'/sbin@' -i $out/share/postfix/conf/post-install $out/libexec/postfix/post-install + sed -e '2aPATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:'$out'/sbin' -i $out/share/postfix/conf/postfix-script $out/libexec/postfix/postfix-script + chmod a+x $out/share/postfix/conf/{postfix-script,post-install} + ''; + + inherit glibc; meta = { homepage = "http://www.postfix.org/"; @@ -62,7 +62,4 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; }; - ''; - - inherit glibc; } From d7470b6c689b7384c30e20c87d0e81c857943c6f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 15:18:17 +0200 Subject: [PATCH 035/116] postfix: update to version 2.8.12 --- pkgs/servers/mail/postfix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index d505f459b9e..a435eea8663 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -5,11 +5,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "postfix-2.8.6"; + name = "postfix-2.8.12"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz"; - sha256 = "1rfsfhna5hy5lc6hkg1zc2862pdc5c1y9z6aiy8rinlmzrfplhlb"; + sha256 = "11z07mjy53l1fnl7k4101yk4ilibgqr1164628mqcbmmr8bh2szl"; }; buildInputs = [db4 openssl cyrus_sasl bison perl]; From 58e282b907778ec9f244f4b0de1cd6d6e817b098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Wed, 29 Aug 2012 00:48:44 +0200 Subject: [PATCH 036/116] Update the download URL for ncmpcpp The old URL for ncmpcpp was broken (reported by nobdraisentone on IRC) --- pkgs/applications/audio/ncmpcpp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index b9d30409711..3af9bc7690f 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "ncmpcpp-${version}"; src = fetchurl { - url = "http://unkart.ovh.org/ncmpcpp/ncmpcpp-${version}.tar.bz2"; + url = "http://ncmpcpp.rybczak.net/stable/ncmpcpp-${version}.tar.bz2"; sha256 = "1kbkngs4fhf9z53awskqiwdl94i5slvxmjiajkrayi99373fallx"; }; From aed5c366944b98624411c5551f2d43becafdf44d Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Wed, 29 Aug 2012 15:16:03 +0200 Subject: [PATCH 037/116] Use makeWrapper --- pkgs/tools/misc/plowshare/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix index 0e7d688670f..b29d4300e71 100644 --- a/pkgs/tools/misc/plowshare/default.nix +++ b/pkgs/tools/misc/plowshare/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash }: +{ stdenv, fetchurl, makeWrapper, curl }: let @@ -13,13 +13,16 @@ in stdenv.mkDerivation { sha256 = "0clryfssaa4rjvsy760p51ppq1275lwvhm9jh3g4mi973xv4n8si"; }; - phases = [ "unpackPhase" "installPhase" "postInstallPhase" ]; + buildInputs = [ makeWrapper curl ]; - installPhase = ''make PREFIX="$out" install''; + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - postInstallPhase = '' - find "$out" -name "*.sh" -exec \ - sed -i "s@#!/bin/bash@#!${bash}/bin/bash@" '{}' \; + installPhase = '' + make PREFIX="$out" install + + for fn in plow{del,down,list,up}; do + wrapProgram "$out/bin/$fn" --prefix PATH + done ''; meta = { From af6265e66dd24e12587157c01e9c9e1bad953f09 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 28 Aug 2012 00:35:29 +0200 Subject: [PATCH 038/116] add celt-0.5.1 --- pkgs/development/libraries/celt/0.5.1.nix | 46 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/libraries/celt/0.5.1.nix diff --git a/pkgs/development/libraries/celt/0.5.1.nix b/pkgs/development/libraries/celt/0.5.1.nix new file mode 100644 index 00000000000..0f42e7cd040 --- /dev/null +++ b/pkgs/development/libraries/celt/0.5.1.nix @@ -0,0 +1,46 @@ +x@{builderDefsPackage + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="celt"; + version="0.5.1.3"; + name="${baseName}-${version}"; + url="http://downloads.xiph.org/releases/${baseName}/${name}.tar.gz"; + hash="0bkam9z5vnrxpbxkkh9kw6yzjka9di56h11iijikdd1f71l5nbpw"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doConfigure" "doMakeInstall"]; + + meta = { + description = "CELT - low-delay audio codec"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + license = "free"; + }; + passthru = { + updateInfo = { + downloadPage = "http://www.celt-codec.org/downloads/"; + }; + }; +}) x diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3922e569a3a..fda096dc487 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3331,6 +3331,7 @@ let celt = callPackage ../development/libraries/celt {}; celt_0_7 = callPackage ../development/libraries/celt/0.7.nix {}; + celt_0_5_1 = callPackage ../development/libraries/celt/0.5.1.nix {}; cgal = callPackage ../development/libraries/CGAL {}; From 30514a53469c206677cff3313c2edf352bd5b2c4 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 28 Aug 2012 00:36:16 +0200 Subject: [PATCH 039/116] add spice-protocol-0.10.1 --- .../libraries/spice-protocol/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/spice-protocol/default.nix diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix new file mode 100644 index 00000000000..a7541932c6c --- /dev/null +++ b/pkgs/development/libraries/spice-protocol/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "spice-protocol-0.10.1"; + + src = fetchurl { + url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; + sha256 = "0drmy2ws7qwmvjxfynhssbvh1y954rfik99hnl789g7yg6vcpxp5"; + }; + + meta = { + description = "Protocol headers for the SPICE protocol."; + homepage = http://www.spice-space.org; + license = stdenv.lib.licenses.bsd3; + + maintainers = [ stdenv.lib.maintainers.bluescreen303.nl ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fda096dc487..e94767297d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4795,6 +4795,8 @@ let sphinxbase = callPackage ../development/libraries/sphinxbase { }; + spiceProtocol = callPackage ../development/libraries/spice-protocol { }; + sratom = callPackage ../development/libraries/audio/sratom { }; srtp = callPackage ../development/libraries/srtp {}; From cb4443ef260926290184f8952070fab45b55a6dc Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 28 Aug 2012 00:47:00 +0200 Subject: [PATCH 040/116] add spice-0.10.1 spice is a next-generation remote desktop protocol, aimed at virtual machines. focus is not just on display/input devices, but clipboard, audio, video, opengl, smartcards, usb devices as well, no matter if the virtual machine runs locally or on a remote host. not everything is implemented yet, and I didn't enable all available features yet. Currently, spice is able to make qemu-kvm virtual machines very usable for workstation guests, with good 2d video support, clipboard sharing, full resolutions, auto-mouse-grab/ungrab, xinerama / multiple guest monitors. Good drivers for windows 7 guests are available, as well as linux Xorg drivers / agents. Basically, kvm was already the best-performing VM solution (using virtio drivers), but virtualbox, while slower, had better desktop-integration support (still wins if you want opengl). Spice fixes this, making the choice very easy. --- pkgs/development/libraries/spice/default.nix | 46 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++ 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/libraries/spice/default.nix diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix new file mode 100644 index 00000000000..f14214f5a88 --- /dev/null +++ b/pkgs/development/libraries/spice/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, pkgconfig, pixman, celt, alsaLib, openssl +, libXrandr, libXfixes, libXext, libXrender, libXinerama, libjpeg, zlib +, spiceProtocol }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "spice-0.10.1"; + + src = fetchurl { + url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; + sha256 = "105p5fh6hhhzvz0fh1x52lzi41rpvajf390xbbw3da4417lf5pqk"; + }; + + buildInputs = [ pixman celt alsaLib openssl libjpeg zlib + libXrandr libXfixes libXrender libXext libXinerama + ]; + + buildNativeInputs = [ pkgconfig spiceProtocol ]; + + # NIX_CFLAGS_COMPILE = "-fno-stack-protector"; + + configureFlags = [ + "--with-sasl=no" + ]; + + postInstall = '' + ln -s spice-server $out/include/spice + ''; + + meta = { + description = "Complete open source solution for interaction with virtualized desktop devices"; + longDescription = '' + The Spice project aims to provide a complete open source solution for interaction + with virtualized desktop devices.The Spice project deals with both the virtualized + devices and the front-end. Interaction between front-end and back-end is done using + VD-Interfaces. The VD-Interfaces (VDI) enable both ends of the solution to be easily + utilized by a third-party component. + ''; + homepage = http://www.spice-space.org/; + license = licenses.lgpl21; + + maintainers = [ maintainers.bluescreen303 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e94767297d5..9c7f687e527 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4795,6 +4795,11 @@ let sphinxbase = callPackage ../development/libraries/sphinxbase { }; + spice = callPackage ../development/libraries/spice { + celt = celt_0_5_1; + inherit (xlibs) libXrandr libXfixes libXext libXrender libXinerama; + }; + spiceProtocol = callPackage ../development/libraries/spice-protocol { }; sratom = callPackage ../development/libraries/audio/sratom { }; From fadaad6f89cf7448088930473ac00ee53949dc63 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 28 Aug 2012 00:55:43 +0200 Subject: [PATCH 041/116] qemu-kvm: add (optional) spice support --- pkgs/os-specific/linux/qemu-kvm/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix index f6709bb439f..39b7074e299 100644 --- a/pkgs/os-specific/linux/qemu-kvm/default.nix +++ b/pkgs/os-specific/linux/qemu-kvm/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, attr, zlib, SDL, alsaLib, pkgconfig, pciutils, libuuid, vde2 -, libjpeg, libpng, ncurses, python, glib, libaio, mesa }: +, libjpeg, libpng, ncurses, python, glib, libaio, mesa +, spice, spiceProtocol, spiceSupport ? false }: assert stdenv.isLinux; @@ -23,19 +24,24 @@ stdenv.mkDerivation rec { s|/usr/bin/python|${python}/bin/python|g ; s|/bin/rm|rm|g' done + '' + stdenv.lib.optionalString spiceSupport '' + for i in configure spice-qemu-char.c ui/spice-input.c ui/spice-core.c ui/qemu-spice.h + do + substituteInPlace $i --replace '#include ' '#include ' + done ''; configureFlags = [ "--audio-drv-list=alsa" "--smbd=smbd" # use `smbd' from $PATH - ]; + ] ++ stdenv.lib.optional spiceSupport "--enable-spice"; enableParallelBuilding = true; buildInputs = [ attr zlib SDL alsaLib pkgconfig pciutils libuuid vde2 libjpeg libpng ncurses python glib libaio mesa - ]; + ] ++ stdenv.lib.optionals spiceSupport [ spiceProtocol spice ]; postInstall = '' From 23f20dcdfeca29cf4d1a1b226d2ddc42fcf2975e Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 29 Aug 2012 22:57:57 +0200 Subject: [PATCH 042/116] emacs/sunrise-commander: change to github source previous source replaces itself every now and then and doesn't do versioning --- .../emacs-modes/sunrise-commander/default.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix index c15ff6afcb2..a253e25cad4 100644 --- a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix +++ b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix @@ -1,25 +1,23 @@ -{stdenv, fetchurl, emacs}: +{stdenv, fetchgit, emacs}: stdenv.mkDerivation rec { - name = "sunrise-commander-6"; + name = "sunrise-commander-6r435"; - src = fetchurl { - url = "http://www.emacswiki.org/emacs/download/sunrise-commander.el"; - sha256 = "1bbpm00nc7ry0f2k4zaqbvp6w9py31asfcr9hddggc138pnfajvq"; + src = fetchgit { + url = https://github.com/escherdragon/sunrise-commander.git; + rev = "7a44ca7abd9fe79f87934c78d00dc2a91419a4f1"; + sha256 = "2909beccc9daaa79e70876ac6547088c2459b624c364dda1886fe4d7adc7708b"; }; - phases = [ "buildPhase" "installPhase"]; - buildInputs = [ emacs ]; buildPhase = '' - cp $src sunrise-commander.el - emacs --batch -f batch-byte-compile sunrise-commander.el + emacs -L . --batch -f batch-byte-compile *.el ''; installPhase = '' - install -d $out/share/emacs/site-lisp - install sunrise-commander.el* $out/share/emacs/site-lisp + mkdir -p $out/share/emacs/site-lisp + install *.el* $out/share/emacs/site-lisp ''; meta = { From 280fb5585d783f30c03049f5e01fee8c4e7d7e5b Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 29 Aug 2012 23:35:39 +0200 Subject: [PATCH 043/116] spice seems really just for linux at the moment --- pkgs/development/libraries/spice-protocol/default.nix | 2 +- pkgs/development/libraries/spice/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix index a7541932c6c..bc7a8c893f8 100644 --- a/pkgs/development/libraries/spice-protocol/default.nix +++ b/pkgs/development/libraries/spice-protocol/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.bluescreen303.nl ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index f14214f5a88..cba5d910783 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; maintainers = [ maintainers.bluescreen303 ]; - platforms = platforms.all; + platforms = platforms.linux; }; } From 3f887534becf017261e19b5110090f312ef32d0b Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 30 Aug 2012 10:18:24 +0400 Subject: [PATCH 044/116] Meshlib: update to 1.3.2, it now builds and runs --- pkgs/applications/graphics/meshlab/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 9b39d8e8f1f..a811d759f7e 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, qt, bzip2, lib3ds, levmar, muparser, unzip}: stdenv.mkDerivation rec { - name = "meshlab-1.2.3a"; + name = "meshlab-1.3.2"; src = fetchurl { - url = mirror://sourceforge/meshlab/MeshLabSrc_AllInc_v123a.tgz; - sha256 = "09w42q0x1yjr7l9ng952lic7vkb1arsvqg1fld5s297zwzfmsl9v"; + url = "mirror://sourceforge/meshlab/meshlab/MeshLab%20v1.3.2/MeshLabSrc_AllInc_v132.tgz"; + sha256 = "d57f0a99a55421aac54a66e2475d48f00f7b1752f9587cd69cf9b5b9c1a519b1"; }; # I don't know why I need this; without this, the rpath set at the beginning of the @@ -13,13 +13,16 @@ stdenv.mkDerivation rec { dontPatchELF = true; buildPhase = '' + mkdir -p "$out/include" + cp -r vcglib "$out/include" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$out/include/vcglib" export NIX_LDFLAGS="-rpath $out/opt/meshlab $NIX_LDFLAGS" cd meshlab/src pushd external qmake -recursive external.pro make popd - qmake -recursive meshlabv12.pro + qmake -recursive meshlab_full.pro make ''; @@ -31,6 +34,8 @@ stdenv.mkDerivation rec { ln -s $out/opt/meshlab/meshlab $out/bin/meshlab ''; + sourceRoot = "."; + buildInputs = [ qt unzip ]; meta = { From b54e608807b25e0c388f07276a9a7a7a0e24bd7a Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 30 Aug 2012 08:33:10 +0200 Subject: [PATCH 045/116] spice-protocol: fix maintainer --- pkgs/development/libraries/spice-protocol/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix index bc7a8c893f8..c1b6d0e67e7 100644 --- a/pkgs/development/libraries/spice-protocol/default.nix +++ b/pkgs/development/libraries/spice-protocol/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { homepage = http://www.spice-space.org; license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.bluescreen303.nl ]; + maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; platforms = stdenv.lib.platforms.linux; }; } From 7e8240d71ba9087033773da09fa6077ff144bdb3 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 30 Aug 2012 10:11:23 +0200 Subject: [PATCH 046/116] haskell: add stylish-haskell --- .../haskell/stylish-haskell/default.nix | 20 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/libraries/haskell/stylish-haskell/default.nix diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix new file mode 100644 index 00000000000..eca99a8c440 --- /dev/null +++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix @@ -0,0 +1,20 @@ +{ cabal, aeson, cmdargs, filepath, haskellSrcExts, mtl, strict, syb +, yaml +}: + +cabal.mkDerivation (self: { + pname = "stylish-haskell"; + version = "0.4.0.0"; + sha256 = "1d5a7a5f1lbyf7if0sb9vhmnbi5ry28wakhsgh75hvgzd999vbhx"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + aeson cmdargs filepath haskellSrcExts mtl strict syb yaml + ]; + meta = { + homepage = "https://github.com/jaspervdj/stylish-haskell"; + description = "Haskell code prettifier"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1f06a00b64f..20466090324 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1357,6 +1357,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); stringsearch = callPackage ../development/libraries/haskell/stringsearch {}; + stylishHaskell = callPackage ../development/libraries/haskell/stylish-haskell {}; + syb_0_2_2 = callPackage ../development/libraries/haskell/syb/0.2.2.nix {}; syb_0_3 = callPackage ../development/libraries/haskell/syb/0.3.nix {}; syb_0_3_3 = callPackage ../development/libraries/haskell/syb/0.3.3.nix {}; From 59180564d58d8c0cc9c019b9f51ad153878f2f9f Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Thu, 30 Aug 2012 11:07:45 +0200 Subject: [PATCH 047/116] dev86: Update to 0.16.19 (old sources disappeared) --- pkgs/development/compilers/dev86/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/dev86/default.nix b/pkgs/development/compilers/dev86/default.nix index 0dfb0be96f9..539588ac3ad 100644 --- a/pkgs/development/compilers/dev86/default.nix +++ b/pkgs/development/compilers/dev86/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "dev86-0.16.18"; + name = "dev86-0.16.19"; src = fetchurl { - url = http://www.debath.co.uk/dev86/Dev86src-0.16.18.tar.gz; - sha256 = "1wcg2x8i2fq7kqgazx2il3qfmikyi4kfb23vm45yxlwq72l55604"; + url = http://www.debath.co.uk/dev86/Dev86src-0.16.19.tar.gz; + sha256 = "33398b87ca85e2b69e4062cf59f2f7354af46da5edcba036c6f97bae17b8d00e"; }; makeFlags = "PREFIX=$(out)"; From 69e307a2e3df07e82d60d695798929d090323517 Mon Sep 17 00:00:00 2001 From: Andres Loeh Date: Thu, 30 Aug 2012 11:56:33 +0200 Subject: [PATCH 048/116] Change default version of parallel for GHC 7.5 and above. --- pkgs/top-level/haskell-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 20466090324..908d6857794 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -130,7 +130,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); mtl = self.mtl_2_1_2; # 7.5 ok network = self.network_2_3_1_0; # 7.5 ok OpenGL = self.OpenGL_2_2_3_1; # 7.5 fail - parallel = self.parallel_3_2_0_2; # 7.5 fail + parallel = self.parallel_3_2_0_3; # 7.5 ok parsec = self.parsec_3_1_3; # 7.5 ok QuickCheck = self.QuickCheck_2_5; # 7.5 fail random = self.random_1_0_1_1; # 7.5 ok From 70acc59794a2b59d1e4f5c992f7b1490846dbd0f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Aug 2012 13:02:00 +0200 Subject: [PATCH 049/116] haskell-Graphalyze: update to version 0.13.0.1 --- pkgs/development/libraries/haskell/Graphalyze/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Graphalyze/default.nix b/pkgs/development/libraries/haskell/Graphalyze/default.nix index d0258fd2698..90bcb9f8605 100644 --- a/pkgs/development/libraries/haskell/Graphalyze/default.nix +++ b/pkgs/development/libraries/haskell/Graphalyze/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "Graphalyze"; - version = "0.13.0.0"; - sha256 = "1xh6xg2rw43cbi83rmpb0c2yib9cfj0pwg66nx5x5a0al2c9pdsr"; + version = "0.13.0.1"; + sha256 = "1yk7iglsspbj0kxh5rhjkc6q65vz07vpygiig07w86g2s6gad8am"; buildDepends = [ bktrees fgl filepath graphviz pandoc random text time ]; From 60ae16e0aa26350bef58754744ad589635e9a6fa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Aug 2012 13:02:00 +0200 Subject: [PATCH 050/116] haskell-graphviz: update to version 2999.14.1.0 --- pkgs/development/libraries/haskell/graphviz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix index 4e6c7298b86..7986ef07c1e 100644 --- a/pkgs/development/libraries/haskell/graphviz/default.nix +++ b/pkgs/development/libraries/haskell/graphviz/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "graphviz"; - version = "2999.14.0.0"; - sha256 = "1dnjw7r2zg2qhjxnmdryi0839ggrb3l3bpx8asfpr0bza70kjdf3"; + version = "2999.14.1.0"; + sha256 = "13fni5sf6cdfvgyh7kqjjdhmjxkhbgl3gbi0cbq90n8blzg4q1ql"; buildDepends = [ colour dlist fgl filepath polyparse text transformers wlPprintText ]; From 45485db6239440ebefdfabb9ec8a0697df0e26e1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Aug 2012 13:02:00 +0200 Subject: [PATCH 051/116] haskell-hoauth: update to version 0.3.5 --- pkgs/development/libraries/haskell/hoauth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hoauth/default.nix b/pkgs/development/libraries/haskell/hoauth/default.nix index e118f765097..c568b292c3c 100644 --- a/pkgs/development/libraries/haskell/hoauth/default.nix +++ b/pkgs/development/libraries/haskell/hoauth/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hoauth"; - version = "0.3.4"; - sha256 = "0a8a77smzhxmynfi0ayvsgibpw9aav2f7pi9j3dxjas14zg9qv2k"; + version = "0.3.5"; + sha256 = "06vk3dv2dby7wadxg4qq2bzy10hl8ix2x4vpxggwd13xy3kpzjqp"; buildDepends = [ binary cryptoPubkeyTypes curl dataenc entropy mtl random RSA SHA time utf8String From d11f3d5551b613b4e6c87749c69a8bcd15c2c1e4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Aug 2012 13:02:00 +0200 Subject: [PATCH 052/116] haskell-http-conduit: update to version 1.6.0.1 --- .../development/libraries/haskell/http-conduit/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index ee9d43966af..eef0a2b5259 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.6.0"; - sha256 = "1vr4kglmlqn6s31ks231qx4b8034p6yi0501h3zswpqyf5cimhl7"; + version = "1.6.0.1"; + sha256 = "0v6r57pliaam3i69826bf07iqmkm2s2x6f19mk0amh7fvdfjhgyb"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie @@ -17,9 +17,6 @@ cabal.mkDerivation (self: { monadControl mtl network regexCompat resourcet socks text time tls tlsExtra transformers transformersBase utf8String void zlibConduit ]; - patchPhase = '' - sed -i http-conduit.cabal -e 's|, base64-bytestring.*|, base64-bytestring|' -e 's|, asn1-data.*|, asn1-data|' - ''; meta = { homepage = "http://www.yesodweb.com/book/http-conduit"; description = "HTTP client package with conduit interface and HTTPS support"; From 9ffc9076dcf2a4f486989a62227855bf3f4b0cac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Aug 2012 13:02:00 +0200 Subject: [PATCH 053/116] haskell-postgresql-simple: update to version 0.2.4.1 --- .../libraries/haskell/postgresql-simple/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix index 28b5c0dec85..3e3a1b7dbfd 100644 --- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "postgresql-simple"; - version = "0.2.4.0"; - sha256 = "1n1s650j4z82cz34rq9qgj805yc9x852snnqjaa1iwrg9i3r150f"; + version = "0.2.4.1"; + sha256 = "09yszkiahfyidaq9yfk4mda5sf1m8bcqqag51vasybln9k9hhws3"; buildDepends = [ attoparsec blazeBuilder blazeTextual postgresqlLibpq text time transformers vector From 7638637b68c58dbbec1434711dd7b1d809a0a351 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Aug 2012 13:02:00 +0200 Subject: [PATCH 054/116] haskell-test-framework-quickcheck2: update to version 0.2.12.3 --- .../libraries/haskell/test-framework-quickcheck2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix index 1f1a45d4245..e0615469ab7 100644 --- a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "test-framework-quickcheck2"; - version = "0.2.12.2"; - sha256 = "08m8y78qy23imcwyqdqla7syxdf91iqrb0j8g6g7gwsg5asjq6ip"; + version = "0.2.12.3"; + sha256 = "17pj6b1cclihy203zpb75rkx2djldc9kcj10wqkf5fjmf9vvi0ks"; buildDepends = [ extensibleExceptions QuickCheck random testFramework ]; From 410ba4ee200ae7e3aafafe6a02f0bbd779f920d7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Aug 2012 13:02:00 +0200 Subject: [PATCH 055/116] haskell-SourceGraph: update to version 0.7.0.3 --- pkgs/development/tools/haskell/SourceGraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/SourceGraph/default.nix b/pkgs/development/tools/haskell/SourceGraph/default.nix index 731722126ca..382a940408f 100644 --- a/pkgs/development/tools/haskell/SourceGraph/default.nix +++ b/pkgs/development/tools/haskell/SourceGraph/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "SourceGraph"; - version = "0.7.0.2"; - sha256 = "0cdspzsz15r83fjry9467z67h6vvnjh31fip6gf64k74gdjkfisl"; + version = "0.7.0.3"; + sha256 = "04bx7przxha38n9vckcxz3mbcxcws5ifbc1xfm0rg6bn8rym78yb"; isLibrary = false; isExecutable = true; buildDepends = [ From 50400e345c130d223c1671483f7838445f2c72db Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Thu, 30 Aug 2012 14:07:47 +0200 Subject: [PATCH 056/116] Give correct PATH to wrapProgram --- pkgs/tools/misc/plowshare/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix index b29d4300e71..83f7c62c426 100644 --- a/pkgs/tools/misc/plowshare/default.nix +++ b/pkgs/tools/misc/plowshare/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation { make PREFIX="$out" install for fn in plow{del,down,list,up}; do - wrapProgram "$out/bin/$fn" --prefix PATH + wrapProgram "$out/bin/$fn" --prefix PATH : ${curl}/bin done ''; From a23f6dc4c47d1427f307b1d7459c724b2d675eec Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Thu, 30 Aug 2012 14:27:03 +0200 Subject: [PATCH 057/116] Add quotes to wrapProgram's arguments --- pkgs/tools/misc/plowshare/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix index 83f7c62c426..e3463c6a1d4 100644 --- a/pkgs/tools/misc/plowshare/default.nix +++ b/pkgs/tools/misc/plowshare/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation { make PREFIX="$out" install for fn in plow{del,down,list,up}; do - wrapProgram "$out/bin/$fn" --prefix PATH : ${curl}/bin + wrapProgram "$out/bin/$fn" --prefix PATH : "${curl}/bin" done ''; From 96f76db3960445fcbf99484304e22b2b7810d95c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 30 Aug 2012 18:07:11 +0200 Subject: [PATCH 058/116] gnutls: Pass `--with-libnettle-prefix' on OpenIndiana. Suggested by Mats Erik Andersson . --- pkgs/development/libraries/gnutls/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index b8f88c6f5b8..961387012c6 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation (rec { sha256 = "1pp90fm27qi5cd0pq18xcmnl79xcbfwxc54bg1xi1wv0vryqdpcr"; }; + # FIXME: Turn into a Nix list. configurePhase = '' ./configure --prefix="$out" \ --disable-dependency-tracking --enable-fast-install \ @@ -19,6 +20,8 @@ stdenv.mkDerivation (rec { --with-lzo --with-libtasn1-prefix="${libtasn1}" \ ${if guileBindings then "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\"" + else ""}${if stdenv.isSunOS # TODO: this for all platforms + then " --with-libnettle-prefix=${nettle}" else ""} ''; From 8f1a34e2282cf4fe69c7bd5f111fdc2ac34c0440 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 30 Aug 2012 17:39:01 +0200 Subject: [PATCH 059/116] linux-3.5: upgrade to 3.5.3 --- pkgs/os-specific/linux/kernel/linux-3.5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.5.nix b/pkgs/os-specific/linux/kernel/linux-3.5.nix index 8e347595f22..62cf4998536 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.5.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.5.nix @@ -240,7 +240,7 @@ in import ./generic.nix ( rec { - version = "3.5.2"; + version = "3.5.3"; testing = false; preConfigure = '' @@ -249,7 +249,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "13dzx7gqm0n7s73bq87ibhmydrfsngyps9sczkcy1sh56rrkv0x6"; + sha256 = "1p8imlvka3mjm74k09535lyqgdrl1jxrldzd7c8k4qlh5s8fz13w"; }; config = configWithPlatform stdenv.platform; From 6fabe047c6acdfbfad50808970d72850a47b8724 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 30 Aug 2012 17:39:18 +0200 Subject: [PATCH 060/116] linux-3.4: upgrade to 3.4.10 --- pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 7d421af4917..c57a409810e 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -239,7 +239,7 @@ in import ./generic.nix ( rec { - version = "3.4.9"; + version = "3.4.10"; testing = false; preConfigure = '' @@ -248,7 +248,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "02rnzpnfs7hfsglrgwr1450ssj47da1w079rmvzh1k0apy7qdpzm"; + sha256 = "03xfiyhv6zl3wn78bgm7a30w4hs2p328s447slilp0z2w09jqn4q"; }; config = configWithPlatform stdenv.platform; From 50dca38b26b00a0e88cbaa2929c9f7c0db04d389 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 30 Aug 2012 17:39:50 +0200 Subject: [PATCH 061/116] cifs-utils: upgrade to 5.6 --- pkgs/os-specific/linux/cifs-utils/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index 63eafb93e30..9e761b90a05 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: - + stdenv.mkDerivation rec { - name = "cifs-utils-5.3"; - + name = "cifs-utils-5.6"; + src = fetchurl { url = "ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/${name}.tar.bz2"; - sha256 = "68e969c4107a872e2848992732dc11eafc7bdf084bec894c0ba677572de49b32"; + sha256 = "0f619nw1163bcmfc83mmqj31qdkl68wfm81vynx3d8q0m0k1ll7i"; }; makeFlags = "root_sbindir=$(out)/sbin"; @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.samba.org/linux-cifs/cifs-utils/; description = "Tools for managing Linux CIFS client filesystems"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; }; } From d37b642769023232787f217f64d6c594ed49618d Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 30 Aug 2012 18:04:55 +0200 Subject: [PATCH 062/116] newer kernels need cifs-utils to mount CIFS filesystems the kernel itself (and busybox's cifs mount code) are no longer able to do this in some/most cases and will error out saying: "CIFS VFS: connecting to DFS root not implemented yet"" Nixos' qemu-vm target is hurt by this, as it wants to mount /nix/store via cifs very early in the boot process. this commit just marks the problematic kernels. An associated commit in nixos will use this info to fix the problem. --- pkgs/os-specific/linux/kernel/linux-3.4.nix | 1 + pkgs/os-specific/linux/kernel/linux-3.5.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index c57a409810e..8b0e3e0d8a2 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -256,6 +256,7 @@ import ./generic.nix ( features.iwlwifi = true; features.efiBootStub = true; + features.needsCifsUtils = true; } // removeAttrs args ["extraConfig"] diff --git a/pkgs/os-specific/linux/kernel/linux-3.5.nix b/pkgs/os-specific/linux/kernel/linux-3.5.nix index 62cf4998536..61d6b0aeba5 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.5.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.5.nix @@ -257,6 +257,7 @@ import ./generic.nix ( features.iwlwifi = true; features.efiBootStub = true; + features.needsCifsUtils = true; } // removeAttrs args ["extraConfig"] From 953eadbfc3e5b720a811855e867338ffea8a7b42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 30 Aug 2012 22:54:18 +0200 Subject: [PATCH 063/116] gnutls: Pass CPPFLAGS to help find GMP on OpenIndiana. Suggested by Mats Erik Andersson . --- pkgs/development/libraries/gnutls/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 961387012c6..93f5dab537e 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, zlib, lzo, libtasn1, nettle -, guileBindings, guile, perl }: +, guileBindings, guile, perl, gmp }: assert guileBindings -> guile != null; @@ -20,8 +20,11 @@ stdenv.mkDerivation (rec { --with-lzo --with-libtasn1-prefix="${libtasn1}" \ ${if guileBindings then "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\"" - else ""}${if stdenv.isSunOS # TODO: this for all platforms - then " --with-libnettle-prefix=${nettle}" + else ""}${if stdenv.isSunOS + # TODO: Use `--with-libnettle-prefix' on all platforms + # Note: GMP is a dependency of Nettle, whose public headers include + # GMP headers, hence the hack. + then " --with-libnettle-prefix=${nettle} CPPFLAGS=-I${gmp}/include" else ""} ''; From 702854cb5dd1d4a6ee3c3a2251a59b6c481e15f8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 31 Aug 2012 09:10:18 +0200 Subject: [PATCH 064/116] haskell-Ebnf2ps: update to version 1.0.11 --- pkgs/development/tools/parsing/Ebnf2ps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/Ebnf2ps/default.nix b/pkgs/development/tools/parsing/Ebnf2ps/default.nix index 81815500c61..f1964e815f6 100644 --- a/pkgs/development/tools/parsing/Ebnf2ps/default.nix +++ b/pkgs/development/tools/parsing/Ebnf2ps/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Ebnf2ps"; - version = "1.0.10"; - sha256 = "0xim32bnfapfs53lvmdz2af08rqd15lp5b0rh6yjqm7n1g2061zs"; + version = "1.0.11"; + sha256 = "0n0maihalnrks3l7ay1i16p6i7f69xv33jxhlsyshzck0v64qivb"; isLibrary = false; isExecutable = true; buildTools = [ happy ]; From 30ba367d5a9450f57c71085061651abeac1dd191 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 30 Aug 2012 00:21:13 +0400 Subject: [PATCH 065/116] Add libvisio (libreoffice dependency) --- .../libraries/libvisio/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/libvisio/default.nix diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/development/libraries/libvisio/default.nix new file mode 100644 index 00000000000..99146cd02cc --- /dev/null +++ b/pkgs/development/libraries/libvisio/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, boost, libwpd, libwpg, pkgconfig }: + +stdenv.mkDerivation rec { + name = "libvisio-0.0.19"; + + src = fetchurl { + url = "http://dev-www.libreoffice.org/src/${name}.tar.xz"; + sha256 = "1iqkz280mi066bdccyxagkqm41i270nx01cacvgjq2pflgd3njd1"; + }; + + buildNativeInputs = [ pkgconfig ]; + buildInputs = [ boost libwpd libwpg ]; + + configureFlags = "--disable-werror"; + + meta = { + description = "A library providing ability to interpret and import visio diagrams into various applications"; + homepage = http://www.freedesktop.org/wiki/Software/libvisio; + platforms = stdenv.lib.platforms.gnu; # random choice + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c7f687e527..4b28b19053f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4335,6 +4335,8 @@ let libvirt = callPackage ../development/libraries/libvirt { }; + libvisio = callPackage ../development/libraries/libvisio { }; + libvncserver = builderDefsPackage (import ../development/libraries/libvncserver) { inherit libtool libjpeg openssl zlib; inherit (xlibs) xproto libX11 damageproto libXdamage From d41c08ee5410f0e7435c85c4fb24113ac41c02cf Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 30 Aug 2012 00:25:30 +0400 Subject: [PATCH 066/116] Add mdds (libreoffice dependency) --- pkgs/development/libraries/mdds/default.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/mdds/default.nix diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix new file mode 100644 index 00000000000..484f878a55e --- /dev/null +++ b/pkgs/development/libraries/mdds/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "mdds-0.6.0"; + + src = fetchurl { + url = http://multidimalgorithm.googlecode.com/files/mdds_0.6.0.tar.bz2; + sha256 = "0yx6cx2cxk9wpmfpv6k3agkr1sjzxdgxrm3zfj34zwyxr3sh0ql4"; + }; + + meta = { + homepage = https://code.google.com/p/multidimalgorithm/; + description = "A collection of multi-dimensional data structure and indexing algorithm"; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b28b19053f..74f7b0a1236 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4423,6 +4423,8 @@ let lzo = callPackage ../development/libraries/lzo { }; + mdds = callPackage ../development/libraries/mdds { }; + # failed to build mediastreamer = callPackage ../development/libraries/mediastreamer { }; From 34bafa4893df4aaf18538155711b24ce191400a6 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 30 Aug 2012 00:30:15 +0400 Subject: [PATCH 067/116] Add libcdr (libreoffice dependency) --- pkgs/development/libraries/libcdr/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/libcdr/default.nix diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix new file mode 100644 index 00000000000..823a4839e80 --- /dev/null +++ b/pkgs/development/libraries/libcdr/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, libwpg, libwpd, lcms2, pkgconfig }: + +stdenv.mkDerivation rec { + name = "libcdr-0.0.8"; + + src = fetchurl { + url = "http://dev-www.libreoffice.org/src/${name}.tar.xz"; + sha256 = "117a8gp29xs3kin6kaisb3frsx8dwrsjgs4wq4y5hjqprzy6lwz0"; + }; + + buildInputs = [ libwpg libwpd lcms2 ]; + + buildNativeInputs = [ pkgconfig ]; + + CXXFLAGS="--std=gnu++0x"; # For c++11 constants in lcms2.h + + meta = { + description = "A library providing ability to interpret and import Corel Draw drawings into various applications"; + homepage = http://www.freedesktop.org/wiki/Software/libcdr; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74f7b0a1236..099261ab5b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3990,6 +3990,8 @@ let libcdio = callPackage ../development/libraries/libcdio { }; + libcdr = callPackage ../development/libraries/libcdr { }; + libchamplain = callPackage ../development/libraries/libchamplain { inherit (gnome) libsoup; }; From 28f0597bd60378b9b323d0b31799bf07f64d0a4e Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 30 Aug 2012 00:31:26 +0400 Subject: [PATCH 068/116] Add clucene-core.2.x --- .../libraries/clucene-core/2.x.nix | 27 ++++++++++ ...ile-by-adding-clucene-shared-library.patch | 19 +++++++ ...B_configuration_in_shared_CMakeLists.patch | 20 ++++++++ .../clucene-core/Install-contribs-lib.patch | 49 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 117 insertions(+) create mode 100644 pkgs/development/libraries/clucene-core/2.x.nix create mode 100644 pkgs/development/libraries/clucene-core/Fix-pkgconfig-file-by-adding-clucene-shared-library.patch create mode 100644 pkgs/development/libraries/clucene-core/Fixing_ZLIB_configuration_in_shared_CMakeLists.patch create mode 100644 pkgs/development/libraries/clucene-core/Install-contribs-lib.patch diff --git a/pkgs/development/libraries/clucene-core/2.x.nix b/pkgs/development/libraries/clucene-core/2.x.nix new file mode 100644 index 00000000000..72460184df2 --- /dev/null +++ b/pkgs/development/libraries/clucene-core/2.x.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl, cmake, boost, zlib}: + +stdenv.mkDerivation rec { + name = "clucene-core-2.3.3.4"; + + src = fetchurl { + url = "mirror://sourceforge/clucene/${name}.tar.gz"; + sha256 = "1arffdwivig88kkx685pldr784njm0249k0rb1f1plwavlrw9zfx"; + }; + + buildNativeInputs = [ cmake ]; + + buildInputs = [ boost zlib ]; + + cmakeFlags = [ "-DBUILD_CONTRIBS=ON" "-DBUILD_CONTRIBS_LIB=ON" ]; + + patches = # From debian + [ ./Fix-pkgconfig-file-by-adding-clucene-shared-library.patch + ./Fixing_ZLIB_configuration_in_shared_CMakeLists.patch + ./Install-contribs-lib.patch + ]; + + meta = { + description = "CLucene is a port of the very popular Java Lucene text search engine API. Core package, 2.x branch."; + homepage = http://clucene.sourceforge.net; + }; +} diff --git a/pkgs/development/libraries/clucene-core/Fix-pkgconfig-file-by-adding-clucene-shared-library.patch b/pkgs/development/libraries/clucene-core/Fix-pkgconfig-file-by-adding-clucene-shared-library.patch new file mode 100644 index 00000000000..80e49a8e712 --- /dev/null +++ b/pkgs/development/libraries/clucene-core/Fix-pkgconfig-file-by-adding-clucene-shared-library.patch @@ -0,0 +1,19 @@ +From 7be4a19b76d98260cf95040a47935f854a4ba7a4 Mon Sep 17 00:00:00 2001 +From: Valentin Rusu +Date: Sat, 17 Dec 2011 13:47:58 +0100 +Subject: [PATCH] Fix .pc file by adding clucene-shared library + +--- + src/core/libclucene-core.pc.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/core/libclucene-core.pc.cmake ++++ b/src/core/libclucene-core.pc.cmake +@@ -6,6 +6,6 @@ includedir=${prefix}/include:${prefix}/i + Name: libclucene + Description: CLucene - a C++ search engine, ported from the popular Apache Lucene + Version: @CLUCENE_VERSION_MAJOR@.@CLUCENE_VERSION_MINOR@.@CLUCENE_VERSION_REVISION@.@CLUCENE_VERSION_PATCH@ +-Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core ++Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core -lclucene-shared + Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext + ~ diff --git a/pkgs/development/libraries/clucene-core/Fixing_ZLIB_configuration_in_shared_CMakeLists.patch b/pkgs/development/libraries/clucene-core/Fixing_ZLIB_configuration_in_shared_CMakeLists.patch new file mode 100644 index 00000000000..f5f44a7fa2c --- /dev/null +++ b/pkgs/development/libraries/clucene-core/Fixing_ZLIB_configuration_in_shared_CMakeLists.patch @@ -0,0 +1,20 @@ +From 772481ca94071ddfe65102a451926e4f9aeb4d2c Mon Sep 17 00:00:00 2001 +From: Veit Jahns +Date: Thu, 26 May 2011 13:35:28 +0200 +Subject: [PATCH] Fixing ZLIB configuration in shared's CMakeLists + +--- + src/shared/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/shared/CMakeLists.txt ++++ b/src/shared/CMakeLists.txt +@@ -42,7 +42,7 @@ INCLUDE (CheckAtomicFunctions) + find_package(ZLIB) + IF ( ZLIB_FOUND ) + SET ( EXTRA_LIBS ${EXTRA_LIBS} ${ZLIB_LIBRARY} ) +-ELSEIF ( ZLIB_FOUND ) ++ELSE ( ZLIB_FOUND ) + MESSAGE( "ZLIB not found, using local: ${clucene-ext_SOURCE_DIR}/zlib" ) + SET(ZLIB_INCLUDE_DIR ${clucene-ext_SOURCE_DIR}/zlib ) + SET(ZLIB_LIBRARY ${clucene-ext_BINARY_DIR}) diff --git a/pkgs/development/libraries/clucene-core/Install-contribs-lib.patch b/pkgs/development/libraries/clucene-core/Install-contribs-lib.patch new file mode 100644 index 00000000000..899411fe02b --- /dev/null +++ b/pkgs/development/libraries/clucene-core/Install-contribs-lib.patch @@ -0,0 +1,49 @@ +Description: contribs-lib is not built and installed even with config +Author: Vitaliy Filippov +Bug: https://sourceforge.net/tracker/index.php?func=detail&aid=3392466&group_id=80013&atid=558446 + +--- + CMakeLists.txt | 2 +- + src/contribs-lib/CMakeLists.txt | 17 +++++++++++++++++ + 2 files changed, 18 insertions(+), 1 deletion(-) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -163,7 +163,7 @@ IF ( BUILD_CONTRIBS ) + SET(BUILD_CONTRIBS_LIB 1) + ENDIF ( BUILD_CONTRIBS ) + IF ( BUILD_CONTRIBS_LIB ) +- ADD_SUBDIRECTORY (src/contribs-lib EXCLUDE_FROM_ALL) ++ ADD_SUBDIRECTORY (src/contribs-lib) + ENDIF ( BUILD_CONTRIBS_LIB ) + + +--- a/src/contribs-lib/CMakeLists.txt ++++ b/src/contribs-lib/CMakeLists.txt +@@ -106,9 +106,26 @@ add_library(clucene-contribs-lib SHARED + ) + TARGET_LINK_LIBRARIES(clucene-contribs-lib ${clucene_contrib_extra_libs}) + ++#install public headers. ++FOREACH(file ${HEADERS}) ++ get_filename_component(apath ${file} PATH) ++ get_filename_component(aname ${file} NAME) ++ file(RELATIVE_PATH relpath ${CMAKE_SOURCE_DIR}/src/contribs-lib ${apath}) ++ IF ( NOT aname MATCHES "^_.*" ) ++ install(FILES ${file} ++ DESTINATION include/${relpath} ++ COMPONENT development) ++ ENDIF ( NOT aname MATCHES "^_.*" ) ++ENDFOREACH(file) ++ + #set properties on the libraries + SET_TARGET_PROPERTIES(clucene-contribs-lib PROPERTIES + VERSION ${CLUCENE_VERSION} + SOVERSION ${CLUCENE_SOVERSION} + COMPILE_DEFINITIONS_DEBUG _DEBUG + ) ++ ++#and install library ++install(TARGETS clucene-contribs-lib ++ DESTINATION ${LIB_DESTINATION} ++ COMPONENT runtime ) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 099261ab5b4..75c286b965b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3368,6 +3368,8 @@ let clppcre = builderDefsPackage (import ../development/libraries/cl-ppcre) { }; + clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { }; + clucene_core = callPackage ../development/libraries/clucene-core { }; cluceneCore = clucene_core; # !!! remove this From 38d07f50183afbe49d1fcb953413c252807fd1b5 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 30 Aug 2012 00:35:30 +0400 Subject: [PATCH 069/116] Add MyThes --- pkgs/development/libraries/mythes/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/mythes/default.nix diff --git a/pkgs/development/libraries/mythes/default.nix b/pkgs/development/libraries/mythes/default.nix new file mode 100644 index 00000000000..ff06f2a0050 --- /dev/null +++ b/pkgs/development/libraries/mythes/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, hunspell, pkgconfig, perl }: + +stdenv.mkDerivation rec { + name = "mythes-1.2.3"; + + src = fetchurl { + url = "mirror://sourceforge/hunspell/${name}.tar.gz"; + sha256 = "0f5q7yiwg9bw4a5zxg0dapqdfc2grfb4ss34ifir3mhhy4q3jf4j"; + }; + + buildInputs = [ hunspell ]; + buildNativeInputs = [ pkgconfig perl ]; + + meta = { + homepage = http://hunspell.sourceforge.net/; + description = "Thesaurus library from Hunspell project"; + inherit (hunspell.meta) platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 75c286b965b..7a0b578eb58 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4485,6 +4485,8 @@ let mysocketw = callPackage ../development/libraries/mysocketw { }; + mythes = callPackage ../development/libraries/mythes { }; + ncurses = makeOverridable (import ../development/libraries/ncurses) { inherit fetchurl; unicode = system != "i686-cygwin"; From c5f9ee33259fd94ef81c672e50a2f69999cb9a29 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 31 Aug 2012 12:01:57 +0400 Subject: [PATCH 070/116] Add libexttextcat (part of LibreOffice) --- .../libraries/libexttextcat/default.nix | 18 +++++++++ .../libexttextcat/memory-leaks.patch | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 57 insertions(+) create mode 100644 pkgs/development/libraries/libexttextcat/default.nix create mode 100644 pkgs/development/libraries/libexttextcat/memory-leaks.patch diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/development/libraries/libexttextcat/default.nix new file mode 100644 index 00000000000..a75fada7484 --- /dev/null +++ b/pkgs/development/libraries/libexttextcat/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libexttextcat-3.3.1"; + + src = fetchurl { + url = "http://dev-www.libreoffice.org/src/libexttextcat/${name}.tar.xz"; + sha256 = "1a7ablpipfbiyhl6wsraj5z8pj3qkqgnrms73wzsqhpbyww334h4"; + }; + + patches = [ ./memory-leaks.patch ]; + + meta = { + description = "An N-Gram-Based Text Categorization library primarily intended for language guessing"; + homepage = http://www.freedesktop.org/wiki/Software/libexttextcat; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/libexttextcat/memory-leaks.patch b/pkgs/development/libraries/libexttextcat/memory-leaks.patch new file mode 100644 index 00000000000..0be4ffdc93a --- /dev/null +++ b/pkgs/development/libraries/libexttextcat/memory-leaks.patch @@ -0,0 +1,37 @@ +Combined upstream commits 980592386f23db8b0dc84c434805cb167d0cc091 and +5ef4ad86ec934282cba891922ec2d13784da3354. +diff -u b/src/textcat.c b/src/textcat.c +--- b/src/textcat.c ++++ b/src/textcat.c +@@ -212,8 +212,6 @@ + sizeof(char) * (tmp_size + 1)); + if (tmp == NULL) + { +- free(finger_print_file_name); +- finger_print_file_name_size = 0; + goto BAILOUT; + } + else +@@ -226,10 +224,7 @@ + strcat(finger_print_file_name, segment[0]); + + if (fp_Read(h->fprint[h->size], finger_print_file_name, 400) == 0) +- { +- textcat_Done(h); + goto BAILOUT; +- } + h->fprint_disable[h->size] = 0xF0; /* 0xF0 is the code for enabled + languages, 0x0F is for disabled + */ +@@ -242,9 +237,10 @@ + return h; + + BAILOUT: ++ free(finger_print_file_name); + fclose(fp); ++ textcat_Done(h); + return NULL; +- + } + + extern candidate_t *textcat_GetClassifyFullOutput(void *handle) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a0b578eb58..9bc56479723 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4097,6 +4097,8 @@ let libmpeg2 = mpeg2dec; }; + libexttextcat = callPackage ../development/libraries/libexttextcat {}; + libf2c = callPackage ../development/libraries/libf2c {}; libfixposix = callPackage ../development/libraries/libfixposix {}; From f15e95a8913ee4b57dad2d2c65fe5e16ea593aae Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 26 Aug 2012 23:05:40 +0400 Subject: [PATCH 071/116] libjpeg-8d It fixes some crashes (e.g., KDE workspace crashed when I tried to configure webcam in Skype). --- pkgs/development/libraries/libjpeg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix index f598482f830..63d698dda18 100644 --- a/pkgs/development/libraries/libjpeg/default.nix +++ b/pkgs/development/libraries/libjpeg/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "libjpeg-8c"; + name = "libjpeg-8d"; src = fetchurl { - url = http://www.ijg.org/files/jpegsrc.v8c.tar.gz; - sha256 = "16kwrjhziv81gl9fq9b7qir8khm3wfb9zj7fzs7yabsb00z0pz7d"; + url = http://www.ijg.org/files/jpegsrc.v8d.tar.gz; + sha256 = "1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0"; }; meta = { From dd45319df1a6a9699b20aeed587b51a96c39558e Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 31 Aug 2012 12:05:47 +0400 Subject: [PATCH 072/116] amarok-2.6.0 --- pkgs/applications/audio/amarok/default.nix | 10 ++-- .../audio/amarok/find-mysql.patch | 46 +++++++++++++++++++ 2 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/audio/amarok/find-mysql.patch diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index ad553c9db34..a60ecdcb866 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -1,28 +1,30 @@ { stdenv, fetchurl, lib, qtscriptgenerator, perl, gettext, curl , libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs , qca2, libmtp, liblastfm, libgpod, pkgconfig, automoc4, phonon -, strigi, soprano }: +, strigi, soprano, qjson, ffmpeg, libofa }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "amarok"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2"; - sha256 = "0jc8fsrhshgfv441b2dgqk0wz3ms5bzjqchcj5ydxphg57dr3l8y"; + sha256 = "1h6jzl0jnn8g05pz4mw01kz20wjjxwwz6iki7lvgj70qi3jq04m9"; }; QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins"; + patches = ./find-mysql.patch; buildInputs = [ qtscriptgenerator stdenv.gcc.libc gettext curl libxml2 mysql taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi - soprano qca2 libmtp liblastfm libgpod pkgconfig ]; + soprano qca2 libmtp liblastfm libgpod pkgconfig qjson ffmpeg libofa ]; postInstall = '' mkdir -p $out/nix-support echo ${qtscriptgenerator} > $out/nix-support/propagated-user-env-packages ''; + meta = { description = "Popular music player for KDE"; license = "GPL"; diff --git a/pkgs/applications/audio/amarok/find-mysql.patch b/pkgs/applications/audio/amarok/find-mysql.patch new file mode 100644 index 00000000000..57a5ec46b84 --- /dev/null +++ b/pkgs/applications/audio/amarok/find-mysql.patch @@ -0,0 +1,46 @@ +commit 9979970f05f25329100168d85a5c4cdc8c084b7a +Author: Yury G. Kudryashov +Date: Thu Aug 30 12:32:53 2012 +0400 + + FindMySQLAmarok.cmake: use PATH_SUFFIXES + +diff --git a/cmake/modules/FindMySQLAmarok.cmake b/cmake/modules/FindMySQLAmarok.cmake +index 910b434..4c8b8e8 100644 +--- a/cmake/modules/FindMySQLAmarok.cmake ++++ b/cmake/modules/FindMySQLAmarok.cmake +@@ -13,18 +13,17 @@ + # For details see the accompanying COPYING-CMAKE-SCRIPTS file. + + if(NOT WIN32) +- find_program(MYSQLCONFIG_EXECUTABLE NAMES mysql_config mysql_config5 PATHS ${BIN_INSTALL_DIR} ~/usr/bin /usr/local/bin) ++ find_program(MYSQLCONFIG_EXECUTABLE NAMES mysql_config mysql_config5 HINTS ${BIN_INSTALL_DIR}) + endif(NOT WIN32) + + find_path(MYSQL_INCLUDE_DIR mysql.h +- /opt/local/include/mysql5/mysql ++ PATHS ++ /opt/local/include + /opt/mysql/mysql/include +- /opt/mysqle/include/mysql +- /opt/ports/include/mysql5/mysql +- /usr/include/mysql +- /usr/local/include/mysql +- /usr/mysql/include/mysql +- ~/usr/include/mysql ++ /opt/mysqle/include ++ /opt/ports/include ++ /usr/mysql/include ++ PATH_SUFFIXES mysql mysql5/mysql + ) + + if(MYSQLCONFIG_EXECUTABLE) +@@ -40,8 +39,7 @@ if(MYSQLCONFIG_EXECUTABLE) + + find_library(MYSQLD_PIC_SEPARATE + mysqld_pic +- PATHS +- /usr/lib/mysql ++ PATH_SUFFIXES mysql + ) + + if(MYSQLD_PIC_SEPARATE) From 7d8aa35a0703e493dc7f1bc0ff71730248c463e2 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 31 Aug 2012 12:06:48 +0400 Subject: [PATCH 073/116] rekonq-1.1 --- .../networking/browsers/rekonq/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/rekonq/default.nix b/pkgs/applications/networking/browsers/rekonq/default.nix index 791b73c9c78..4a46de14f9b 100644 --- a/pkgs/applications/networking/browsers/rekonq/default.nix +++ b/pkgs/applications/networking/browsers/rekonq/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, kdelibs, gettext, pkgconfig }: +{ stdenv, fetchurl, kdelibs, gettext, pkgconfig, shared_desktop_ontologies, qca2, qoauth }: stdenv.mkDerivation rec { - name = "rekonq-0.9.0-1"; + name = "rekonq-1.1"; src = fetchurl { - url = "mirror://sf/rekonq/${name}.tar.bz2"; - sha256 = "0vri6wdxxi7qkcjpgvscwa7m3ysy62jns924d07arvy8bmg5whc5"; + url = "mirror://sourceforge/rekonq/${name}.tar.bz2"; + sha256 = "1bs733mwyfb7bxnial8n49b82ip04sark2mxwlq7ixxsbgq7972l"; }; - buildInputs = [ kdelibs ]; + buildInputs = [ kdelibs qca2 qoauth ]; - buildNativeInputs = [ gettext pkgconfig ]; + buildNativeInputs = [ gettext pkgconfig shared_desktop_ontologies ]; meta = with stdenv.lib; { platforms = platforms.linux; From f1a2d031e56c03d746736454c4df9a86d3ba9922 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 31 Aug 2012 12:07:09 +0400 Subject: [PATCH 074/116] konversation-1.4 --- pkgs/applications/networking/irc/konversation/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix index 938a26fd785..c4d2f4b3782 100644 --- a/pkgs/applications/networking/irc/konversation/default.nix +++ b/pkgs/applications/networking/irc/konversation/default.nix @@ -3,15 +3,15 @@ let pn = "konversation"; - v = "1.3.1"; + v = "1.4"; in stdenv.mkDerivation rec { name = "${pn}-${v}"; src = fetchurl { - url = "mirror://kde/stable/${pn}/${v}/src/${name}.tar.bz2"; - sha256 = "0wigcvi6lscy14dhm5nh1mkhfx7xxdq9g163pwpd0xndvybrfhfl"; + url = "mirror://kde/stable/${pn}/${v}/src/${name}.tar.xz"; + sha256 = "030vsbb18dlzsnjl3fzyd1m9wvvksiyc1lm45abi4q6x4xd60knv"; }; buildInputs = [ cmake qt4 perl gettext libXScrnSaver kdelibs kdepimlibs From c2ad9f873d6ac0d59dd826166185fa1f096a15b2 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 31 Aug 2012 12:07:22 +0400 Subject: [PATCH 075/116] mr-1.13, more verbose install --- .../version-management/mr/default.nix | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix index ca272504517..9e8024d7b19 100644 --- a/pkgs/applications/version-management/mr/default.nix +++ b/pkgs/applications/version-management/mr/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchgit, fetchgitrevision, perl }: +{ stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - version = "1.12"; + version = "1.13"; name = "mr-" + version; - src = fetchgit { - url = "git://git.kitenet.net/mr.git"; - rev = "353f63c968368edea9b14261f510c34ce4e0c97f"; + src = fetchurl { + url = "http://ftp.de.debian.org/debian/pool/main/m/mr/mr_${version}.tar.gz"; + sha256 = "1q3qxk8dwbv30v2xxh852wnwl1msgkvk5cgxyicpqj8kh5b96zlz"; }; buildInputs = [perl]; @@ -17,12 +17,11 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin - ensureDir $out/share/man/man1 - cp mr $out/bin - cp webcheckout $out/bin - cp mr.1 $out/share/man/man1 - cp webcheckout.1 $out/share/man/man1 + mkdir -pv $out/bin $out/share/man/man1 + cp -v mr $out/bin + cp -v webcheckout $out/bin + cp -v mr.1 $out/share/man/man1 + cp -v webcheckout.1 $out/share/man/man1 ''; meta = { From 97c6a2fd4ff73f9ab33ae748bdbd98a5e692ff6d Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 31 Aug 2012 12:08:04 +0400 Subject: [PATCH 076/116] skrooge-1.3.2 --- pkgs/applications/office/skrooge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index 9b27a3e2379..44ffdf57db5 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, kdelibs, grantlee, qca2, libofx, gettext }: stdenv.mkDerivation rec { - name = "skrooge-1.3.0"; + name = "skrooge-1.3.2"; src = fetchurl { url = "http://skrooge.org/files/${name}.tar.bz2"; - sha256 = "1sfzzn9xz01c0095w4scckiiwv2gfbaxx05h7ds5n02a113w53kz"; + sha256 = "18j36yamxzfwpnnnjiach22q9088c2nlcilzh2p24gjhgnnd0v6r"; }; buildInputs = [ kdelibs grantlee qca2 libofx ]; From ebf190e793e17d8b9ee81bba1cadd10adbc39312 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 31 Aug 2012 12:08:31 +0400 Subject: [PATCH 077/116] calligra-2.5.0 --- pkgs/applications/office/calligra/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index b64338adaf1..152246ee58f 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, cmake, kdelibs, attica, perl, zlib, libpng, boost, mesa , kdepimlibs, createresources ? null, eigen, qca2, exiv2, soprano, marble, lcms2 , fontconfig, freetype, sqlite, icu, libwpd, libwpg, pkgconfig, popplerQt4 -, libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies }: +, libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies, okular }: stdenv.mkDerivation rec { - name = "calligra-2.4.2"; + name = "calligra-2.5.0"; src = fetchurl { url = "mirror://kde/stable/${name}/${name}.tar.bz2"; - sha256 = "14wi8mr87aas12f75qi6p8x0pij365sbz4c737qhh4302fh8fsqg"; + sha256 = "0q6ydi7hzrzwqzb38gikdh1l2zf8qp4i3nkgyb01148bjwrhvf21"; }; buildNativeInputs = [ cmake perl pkgconfig ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ kdelibs attica zlib libpng boost mesa kdepimlibs createresources eigen qca2 exiv2 soprano marble lcms2 fontconfig freetype sqlite icu libwpd libwpg popplerQt4 libkdcraw libxslt fftw glew gsl - shared_desktop_ontologies ]; + shared_desktop_ontologies okular ]; meta = { description = "A Qt/KDE office suite, formely known as koffice"; From 834884ae7b50e0d753ee009c27227fbf5f43f6ca Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 31 Aug 2012 12:09:11 +0400 Subject: [PATCH 078/116] Explicitly pass SDO --- pkgs/applications/video/kdenlive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kdenlive/default.nix b/pkgs/applications/video/kdenlive/default.nix index d8620eb33cd..b518e9c7456 100644 --- a/pkgs/applications/video/kdenlive/default.nix +++ b/pkgs/applications/video/kdenlive/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, automoc4, phonon , mlt, gettext , qimageblitz, qjson, shared_mime_info, soprano -, pkgconfig }: +, pkgconfig, shared_desktop_ontologies }: stdenv.mkDerivation rec { name = "kdenlive-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon mlt gettext qimageblitz - qjson shared_mime_info soprano pkgconfig + qjson shared_mime_info soprano pkgconfig shared_desktop_ontologies ]; meta = { From db81ec42420ce143719ee96ee988d7dc34919fc8 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 31 Aug 2012 12:09:38 +0400 Subject: [PATCH 079/116] bangarang-2.1 --- pkgs/applications/video/bangarang/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/bangarang/default.nix b/pkgs/applications/video/bangarang/default.nix index 2fe4b4d0bdc..0bc7476dc82 100644 --- a/pkgs/applications/video/bangarang/default.nix +++ b/pkgs/applications/video/bangarang/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, soprano, shared_desktop_ontologies, kdemultimedia, taglib, glibc, gettext }: stdenv.mkDerivation rec { - name = "bangarang-2.0"; + name = "bangarang-2.1"; src = fetchurl { url = "http://bangarangissuetracking.googlecode.com/files/${name}.tar.gz"; - sha256 = "1fixqx56k0mk0faz35rzpdg6zaa0mvm4548rg0g7fhafl35fxzlz"; + sha256 = "1g4pap79k8qaqi0py34xqvisxln1nc5hbvph692ah3af06n6cly1"; }; - buildInputs = [ cmake qt4 kdelibs automoc4 phonon soprano shared_desktop_ontologies kdemultimedia taglib glibc gettext ]; + buildInputs = [ kdelibs phonon soprano shared_desktop_ontologies kdemultimedia taglib gettext ]; + buildNativeInputs = [ cmake ]; meta = with stdenv.lib; { description = "A media player for KDE based on Nepomuk and Phonon"; @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { ''; homepage = http://bangarangkde.wordpress.com/; license = "GPLv3"; - maintainers = [ maintainers.phreedom ]; + maintainers = [ maintainers.phreedom maintainers.urkud ]; platforms = platforms.linux; }; } From 7a9def28299abcbeb03161abfba53f71ca486944 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 31 Aug 2012 12:11:41 +0400 Subject: [PATCH 080/116] LibreOffice-3.6.0.4 * Use more system libraries * Enable KDE4 desktop integration * Split preparation between postUnpack, patchPhase and preConfigure Viric, feel free to revert (parts of) this commit. --- .../openoffice/generate-libreoffice-srcs.sh | 22 +- .../office/openoffice/libreoffice-srcs.nix | 588 +++++++++--------- .../office/openoffice/libreoffice.nix | 154 ++--- 3 files changed, 390 insertions(+), 374 deletions(-) diff --git a/pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh b/pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh index 1d751ec7049..fb8cc816114 100644 --- a/pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh +++ b/pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh @@ -2,17 +2,19 @@ # Take the list of files from the main package, ooo.lst.in -echo '{fetchurl} : [' +cat < Date: Wed, 8 Aug 2012 13:45:40 +0400 Subject: [PATCH 081/116] KDevelop-4.3.1 --- pkgs/applications/editors/kdevelop/default.nix | 12 ++++++++++-- pkgs/development/libraries/kdevplatform/default.nix | 6 +++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/kdevelop/default.nix b/pkgs/applications/editors/kdevelop/default.nix index 92b4da5280a..249ede5ebd0 100644 --- a/pkgs/applications/editors/kdevelop/default.nix +++ b/pkgs/applications/editors/kdevelop/default.nix @@ -3,18 +3,26 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "4.3.0"; + version = "4.3.1"; pname = "kdevelop"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2"; - sha256 = "0vb2f5922r1da4va8sx2qn2i1lf2gqg7nfg594kncy98a9b1avnr"; + sha256 = "0015hv39rqhyq1w6jw65lx7ls4l5pc3a2asvd5zsd65831vrfxxs"; }; buildInputs = [ kdevplatform kdebase_workspace okteta ]; buildNativeInputs = [ cmake pkgconfig automoc4 shared_mime_info gettext perl ]; + patches = + [ ( fetchurl { + url = https://git.reviewboard.kde.org/r/105211/diff/raw/; + name = "okteta-0.9.patch"; # fixes build with KDE-4.9.x + sha256 = "1mvqhw7jr1vi66l3jgam3slyfafcvwy4g3iapfi69dpfnzhmcxl0"; + } ) + ]; + NIX_CFLAGS_COMPILE = "-I${okteta}/include/KDE"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/kdevplatform/default.nix b/pkgs/development/libraries/kdevplatform/default.nix index 10aa4c02028..367987d5dee 100644 --- a/pkgs/development/libraries/kdevplatform/default.nix +++ b/pkgs/development/libraries/kdevplatform/default.nix @@ -2,11 +2,11 @@ gettext, pkgconfig, apr, aprutil, boost, qjson }: stdenv.mkDerivation rec { - name = "kdevplatform-1.3.0"; + name = "kdevplatform-1.3.1"; src = fetchurl { - url = "mirror://kde/stable/kdevelop/4.3.0/src/${name}.tar.bz2"; - sha256 = "0afka8999csyj8hbgmcsbn8h2by04v7n8k4mrwkl0b79crdvwbcd"; + url = "mirror://kde/stable/kdevelop/4.3.1/src/${name}.tar.bz2"; + sha256 = "1fiqwabw5ilhw1jwvvr743dym12y3kxrs3zlqahz57yncdsglcl6"; }; propagatedBuildInputs = [ kdelibs qt4 phonon ]; From 1de042802022f15c6a359ad5fff9411022f4854f Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 8 Aug 2012 13:47:10 +0400 Subject: [PATCH 082/116] KTorrent-4.2.1 --- .../networking/p2p/ktorrent/default.nix | 6 +- .../drop-taskmanager-dependency.patch | 175 ------------------ .../libraries/libktorrent/default.nix | 6 +- 3 files changed, 6 insertions(+), 181 deletions(-) delete mode 100644 pkgs/applications/networking/p2p/ktorrent/drop-taskmanager-dependency.patch diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix index 5f15cbc495f..b408f20b711 100644 --- a/pkgs/applications/networking/p2p/ktorrent/default.nix +++ b/pkgs/applications/networking/p2p/ktorrent/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "ktorrent"; - version = "4.1.3"; + version = "4.2.1"; src = fetchurl { url = "${meta.homepage}/downloads/${version}/${name}.tar.bz2"; - sha256 = "0ih68bml6ic3mxk5l4ypgmxwyg9mglp57gw5igrnm5yszm7jz19g"; + sha256 = "1b6w7i1vvq8mlw9yrlxvb51hvaj6rpl8lv9b9zagyl3wcanz73zd"; }; - patches = [ ./find-workspace.diff ./drop-taskmanager-dependency.patch ]; + patches = [ ./find-workspace.diff ]; KDEDIRS = libktorrent; diff --git a/pkgs/applications/networking/p2p/ktorrent/drop-taskmanager-dependency.patch b/pkgs/applications/networking/p2p/ktorrent/drop-taskmanager-dependency.patch deleted file mode 100644 index 2998b392679..00000000000 --- a/pkgs/applications/networking/p2p/ktorrent/drop-taskmanager-dependency.patch +++ /dev/null @@ -1,175 +0,0 @@ -commit 6d4a6ae51692966862ccb20d17cb217717519d40 -Author: Joris Guisson -Date: Wed Nov 23 20:17:08 2011 +0100 - - Use dbus to show ktorrent window from plasma applet. This removes the dependency on libtaskmanager. - - BUG: 287309 -Changelog removed by Yury G. Kudryashov - -diff --git a/plasma/applet/CMakeLists.txt b/plasma/applet/CMakeLists.txt -index 3a72241..4307cf2 100644 ---- a/plasma/applet/CMakeLists.txt -+++ b/plasma/applet/CMakeLists.txt -@@ -5,25 +5,15 @@ if(NOT QT_VERSION_OK) - - else(NOT QT_VERSION_OK) - -- set(TASKMANAGER_FOUND FALSE) -- FIND_PATH(TASKMANAGER_INCLUDE_DIR NAMES taskmanager.h PATHS ${KDE4_INCLUDE_DIR}/taskmanager ${INCLUDE_INSTALL_DIR}/taskmanager.h) -- FIND_LIBRARY(TASKMANAGER_LIBRARY NAMES taskmanager PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR}) -- -- if(TASKMANAGER_INCLUDE_DIR AND TASKMANAGER_LIBRARY) -- set(TASKMANAGER_FOUND TRUE) -- message(STATUS "Found libtaskmanager: ${TASKMANAGER_LIBRARY} ") -- include_directories(${TASKMANAGER_INCLUDE_DIR}) -- set(ktapplet_SRCS applet.cpp chunkbar.cpp fadingitem.cpp fadingnavigationwidget.cpp) -- -- kde4_add_ui_files(ktapplet_SRCS appletconfig.ui) -- -- kde4_add_plugin(plasma_applet_ktorrent ${ktapplet_SRCS}) -- target_link_libraries(plasma_applet_ktorrent ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${TASKMANAGER_LIBRARY} ${LIBKTORRENT_LIBRARIES} ktcore) -- -- install(TARGETS plasma_applet_ktorrent DESTINATION ${PLUGIN_INSTALL_DIR}) -- install(FILES plasma-applet-ktorrent.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -- endif(TASKMANAGER_INCLUDE_DIR AND TASKMANAGER_LIBRARY) -- -- macro_log_feature(TASKMANAGER_FOUND "libtaskmanager" "libtaskmanager library and header files" "http://www.kde.org/" FALSE "" "libtaskmanager is needed for KTorrent Plasmoid") -+ -+ set(ktapplet_SRCS applet.cpp chunkbar.cpp fadingitem.cpp fadingnavigationwidget.cpp) -+ -+ kde4_add_ui_files(ktapplet_SRCS appletconfig.ui) -+ -+ kde4_add_plugin(plasma_applet_ktorrent ${ktapplet_SRCS}) -+ target_link_libraries(plasma_applet_ktorrent ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${LIBKTORRENT_LIBRARIES} ktcore) -+ -+ install(TARGETS plasma_applet_ktorrent DESTINATION ${PLUGIN_INSTALL_DIR}) -+ install(FILES plasma-applet-ktorrent.desktop DESTINATION ${SERVICES_INSTALL_DIR}) - - endif(NOT QT_VERSION_OK) -diff --git a/plasma/applet/applet.cpp b/plasma/applet/applet.cpp -index 59e7191..bf09479 100644 ---- a/plasma/applet/applet.cpp -+++ b/plasma/applet/applet.cpp -@@ -21,6 +21,9 @@ - #include "applet.h" - #include - #include -+#include -+#include -+#include - #include - #include - #include -@@ -31,12 +34,11 @@ - #include - #endif - #include --#include --#include - #include - #include "chunkbar.h" - #include "fadingnavigationwidget.h" - -+ - using namespace bt; - - namespace ktplasma -@@ -174,7 +176,8 @@ namespace ktplasma - } - } - -- void Applet::updateNavigation() { -+ void Applet::updateNavigation() -+ { - navigation->setEnabled(connected_to_app && !sources.empty() - && (sources.count() > 1 || !sources.contains(current_source))); - } -@@ -193,12 +196,14 @@ namespace ktplasma - } - } - -- void Applet::updateSources() { -+ void Applet::updateSources() -+ { - sources = engine->sources(); - sources.removeOne("core"); - } - -- void Applet::setSource(QString source) { -+ void Applet::setSource(QString source) -+ { - if (!current_source.isEmpty()) - engine->disconnectSource(current_source,this); - clearData(); -@@ -340,20 +345,39 @@ namespace ktplasma - - void Applet::iconClicked() - { -- TaskManager::TaskDict tasks = TaskManager::TaskManager::self()->tasks(); -- for (TaskManager::TaskDict::iterator i = tasks.begin();i != tasks.end();i ++) -+ QDBusConnection session_bus = QDBusConnection::sessionBus(); -+ QDBusConnectionInterface* dbus_service = session_bus.interface(); -+ if (!session_bus.isConnected() || !dbus_service || !dbus_service->isServiceRegistered("org.ktorrent.ktorrent")) - { -- if (i.value()->className() == "ktorrent") -- { -- KWindowSystem::activateWindow(i.key()); -- return; -- } -+ // can't find the window, try launching it -+ KUrl::List empty; -+ KRun::run("ktorrent", empty, 0); -+ } -+ else -+ { -+ QDBusMessage msg = QDBusMessage::createMethodCall("org.ktorrent.ktorrent", "/ktorrent/MainWindow_1", "org.kde.KMainWindow", "winId"); -+ QDBusPendingCall call = session_bus.asyncCall(msg, 5000); -+ QDBusPendingCallWatcher* watcher = new QDBusPendingCallWatcher(call ,this); -+ connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)), this, SLOT(dbusCallFinished(QDBusPendingCallWatcher*))); - } -- -- // can't find the window, try launching it -- KUrl::List empty; -- KRun::run("ktorrent", empty, 0); - } -+ -+ void Applet::dbusCallFinished(QDBusPendingCallWatcher* self) -+ { -+ if (self->isError()) -+ { -+ // call failed, try launching it -+ KUrl::List empty; -+ KRun::run("ktorrent", empty, 0); -+ } -+ else -+ { -+ QDBusPendingReply reply = *self; -+ KWindowSystem::activateWindow(reply.value()); -+ } -+ self->deleteLater(); -+ } -+ - - void Applet::clearData() - { -diff --git a/plasma/applet/applet.h b/plasma/applet/applet.h -index 29b3265..d396118 100644 ---- a/plasma/applet/applet.h -+++ b/plasma/applet/applet.h -@@ -27,6 +27,7 @@ - #include "fadingnavigationwidget.h" - - class QGraphicsLinearLayout; -+class QDBusPendingCallWatcher; - - namespace Plasma - { -@@ -68,6 +69,7 @@ namespace ktplasma - void iconClicked(); - void selectPrev(); - void selectNext(); -+ void dbusCallFinished(QDBusPendingCallWatcher* self); - - private: - void updateTorrentCombo(); diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix index 1f50f1b976b..083fbf13c81 100644 --- a/pkgs/development/libraries/libktorrent/default.nix +++ b/pkgs/development/libraries/libktorrent/default.nix @@ -2,8 +2,8 @@ , phonon, libgcrypt }: let - mp_ = "1.3"; - version = "1.${mp_}"; + mp_ = "2.1"; + version = "1.${mp_}-2"; version4 = "4.${mp_}"; in stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://ktorrent.org/downloads/${version4}/${name}.tar.bz2"; - sha256 = "0mvvx6mdfy0pyhk6lwwmmbd3pd2ai6n2rf5kdjqhpkm9wbrck85n"; + sha256 = "1b4ibkba27ivvjsh5s93xwlcgzvvwsgl6mcd8g96d1al05n2ccw9"; }; buildNativeInputs = [ cmake automoc4 gettext ]; From abf6366f87efa94138c034a4e138a78ed01127e0 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Fri, 31 Aug 2012 10:55:23 +0200 Subject: [PATCH 083/116] Add surfraw 2.2.8 --- pkgs/tools/networking/surfraw/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/networking/surfraw/default.nix diff --git a/pkgs/tools/networking/surfraw/default.nix b/pkgs/tools/networking/surfraw/default.nix new file mode 100644 index 00000000000..6fcc031aab4 --- /dev/null +++ b/pkgs/tools/networking/surfraw/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, perl}: + +stdenv.mkDerivation rec { + name = "surfraw-2.2.8"; + + src = fetchurl { + url = "http://surfraw.alioth.debian.org/dist/surfraw-2.2.8.tar.gz"; + sha256 = "925075e05637e39458b00e859193aacde306aafd9a962f44f5114f81713539ec"; + }; + + configureFlags = [ + "--disable-opensearch" + ]; + + buildNativeInputs = [ perl ]; + + meta = { + description = "Provides a fast unix command line interface to a variety of popular WWW search engines and other artifacts of power"; + homepage = "http://surfraw.alioth.debian.org"; + maintainers = []; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9bc56479723..90d526a929d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1493,6 +1493,8 @@ let su = shadow; + surfraw = callPackage ../tools/networking/surfraw { }; + swec = callPackage ../tools/networking/swec { inherit (perlPackages) LWP URI HTMLParser HTTPServerSimple Parent; }; From 04f242e2812f4af24630806084b154ea329ce187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 31 Aug 2012 11:50:04 +0200 Subject: [PATCH 084/116] Set `noSysDirs' to `false' on non-GNU/Linux platforms. --- pkgs/top-level/all-packages.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90d526a929d..473c6a00393 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21,10 +21,12 @@ # null, the default standard environment is used. bootStdenv ? null -, # Darwin is an "impure" platform, with its libc outside of the store. - # Thus, GCC, GFortran, & co. must always look for files in standard system - # directories (/usr/include, etc.) - noSysDirs ? (system != "x86_64-darwin" && system != "i686-darwin") +, # Non-GNU/Linux OSes are currently "impure" platforms, with their libc + # outside of the store. Thus, GCC, GFortran, & co. must always look for + # files in standard system directories (/usr/include, etc.) + noSysDirs ? (system != "x86_64-darwin" && system != "i686-darwin" + && system != "x86_64-freebsd" && system != "i686-freebsd" + && system != "x86_64-kfreebsd-gnu") # More flags for the bootstrapping of stdenv. , gccWithCC ? true From 66bb38cce3c8498ff9135a46566f7b645953e53d Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 31 Aug 2012 12:25:53 +0200 Subject: [PATCH 085/116] Add area53 --- pkgs/top-level/python-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 637d53b06f7..d76215961f2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -138,6 +138,20 @@ let pythonPackages = python.modules // rec { }; + area53 = buildPythonPackage (rec { + name = "area53-b2c9cdcabd"; + + src = fetchgit { + url = git://github.com/mariusv/Area53.git; + rev = "b2c9cdcabd"; + sha256 = "b0c12b8c48ed9180c7475fab18de50d63e1b517cfb46da4d2c66fc406fe902bc"; + }; + installCommand = "python setup.py install --prefix=$out"; + doCheck = false; + propagatedBuildInputs = [ boto ]; + }); + + argparse = buildPythonPackage (rec { name = "argparse-1.1"; @@ -169,6 +183,7 @@ let pythonPackages = python.modules // rec { }; }); + astng = buildPythonPackage rec { name = "logilab-astng-0.21.1"; From addbf658e5d793e23da7935c6e8a7ed448a3bfa4 Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Fri, 31 Aug 2012 16:01:19 +0200 Subject: [PATCH 086/116] Add maintainer --- pkgs/tools/misc/plowshare/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix index e3463c6a1d4..4ee6a84548b 100644 --- a/pkgs/tools/misc/plowshare/default.nix +++ b/pkgs/tools/misc/plowshare/default.nix @@ -30,5 +30,6 @@ in stdenv.mkDerivation { A command-line download/upload tool for popular file sharing websites ''; license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.aforemny ]; }; } From c98559a6fc7012cc556c0bca32f23ec01f16dd1f Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Fri, 31 Aug 2012 16:02:10 +0200 Subject: [PATCH 087/116] Remove curl from buildInputs --- pkgs/tools/misc/plowshare/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix index 4ee6a84548b..5e684cfa377 100644 --- a/pkgs/tools/misc/plowshare/default.nix +++ b/pkgs/tools/misc/plowshare/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation { sha256 = "0clryfssaa4rjvsy760p51ppq1275lwvhm9jh3g4mi973xv4n8si"; }; - buildInputs = [ makeWrapper curl ]; + buildInputs = [ makeWrapper ]; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; From fbbaf6759d869216d7c1eccf7dffd93378734e16 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 31 Aug 2012 23:22:04 +0200 Subject: [PATCH 088/116] Update google talk plugin --- .../google-talk-plugin/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index ff199791bba..5e9724b939c 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, rpm, cpio, mesa, xorg, cairo , libpng12, gtk, glib, gdk_pixbuf, fontconfig, freetype, curl -, dbus_glib, alsaLib, pulseaudio, udev +, dbus_glib, alsaLib, pulseaudio, udev, pango }: with stdenv.lib; let - baseURL = "http://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin"; + baseURL = "http://dl.google.com/linux/direct/"; rpathPlugin = makeLibraryPath [ mesa @@ -37,24 +37,26 @@ let dbus_glib udev curl + pango + cairo ]; in stdenv.mkDerivation rec { name = "google-talk-plugin-${version}"; - version = "3.2.4.0"; + version = "3.5.1.0"; src = if stdenv.system == "x86_64-linux" then fetchurl { - url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb"; - sha256 = "0hd8iyv092fr4bz760xjawiad581hphddv608d0dvzy2bhnl17g1"; + url = "${baseURL}/google-talkplugin_current_amd64.deb"; + sha256 = "0ml4yirzdcladw11fq5d8lwqfqgb1fh9vpbzbzmhplvyj6mvkqrj"; } else if stdenv.system == "i686-linux" then fetchurl { - url = "${baseURL}/google-talkplugin_${version}-1_i386.deb"; - sha256 = "13vqs4k16a6bzc5i4zpnakh31nkdqp7m9cv7p16r1sq5smv1331i"; + url = "${baseURL}/google-talkplugin_current_i386.deb"; + sha256 = "1kfd26zygb76iqnr8n3f7k7n9h5bz0rf716n80crqzyasv51mn57"; } else throw "Google Talk does not support your platform."; From fcfa8908ca768113728b137ccaccaba9e0ff8ebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 1 Sep 2012 00:10:43 +0200 Subject: [PATCH 089/116] miniupnpc: update to 1.7. --- pkgs/tools/networking/miniupnpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 34ec8eed90e..3cd35073be6 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "miniupnpc-1.6"; + name = "miniupnpc-1.7"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "151rh46axl44y7bbflb43pnj52gvlfnkxfgrn2jvai5gwrbbgmmv"; + sha256 = "0dv3mz4yikngmlnrnmh747mlgbbpijryw03wcs8g4jwvprb29p8n"; }; installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)"; From 4add07db0c7feb62c76c071a7c5260e19137b90f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 1 Sep 2012 09:55:59 +0400 Subject: [PATCH 090/116] Firefox: add 15.0 version --- .../networking/browsers/firefox/15.0.nix | 179 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 + 2 files changed, 186 insertions(+) create mode 100644 pkgs/applications/networking/browsers/firefox/15.0.nix diff --git a/pkgs/applications/networking/browsers/firefox/15.0.nix b/pkgs/applications/networking/browsers/firefox/15.0.nix new file mode 100644 index 00000000000..54903496391 --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/15.0.nix @@ -0,0 +1,179 @@ +{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL +, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs +, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify +, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite + +, # If you want the resulting program to call itself "Firefox" instead + # of "Shiretoko" or whatever, enable this option. However, those + # binaries may not be distributed without permission from the + # Mozilla Foundation, see + # http://www.mozilla.org/foundation/trademarks/. + enableOfficialBranding ? false +}: + +assert stdenv.gcc ? libc && stdenv.gcc.libc != null; + +rec { + + firefoxVersion = "15.0"; + + xulVersion = "15.0"; # this attribute is used by other packages + + + src = fetchurl { + url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; + sha256 = "12f7dgcksb9d79hj0a8lxn3s81id6l2gd1pb7ls4d60kmgbg05jl"; + }; + + commonConfigureFlags = + [ "--enable-optimize" + "--disable-debug" + "--enable-strip" + "--with-system-jpeg" + "--with-system-zlib" + "--with-system-bz2" + "--with-system-nspr" + "--with-system-nss" + # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" + # "--enable-system-cairo" # disabled for the moment because our Cairo is too old + "--enable-system-sqlite" + "--disable-crashreporter" + "--disable-tests" + "--disable-necko-wifi" # maybe we want to enable this at some point + "--disable-installer" + "--disable-updater" + ]; + + + xulrunner = stdenv.mkDerivation rec { + name = "xulrunner-${xulVersion}"; + + inherit src; + + buildInputs = + [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 + python dbus dbus_glib pango freetype fontconfig xlibs.libXi + xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file + alsaLib nspr nss libnotify xlibs.pixman yasm mesa + xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite + xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper + ]; + + configureFlags = + [ "--enable-application=xulrunner" + "--disable-javaxpcom" + ] ++ commonConfigureFlags; + + enableParallelBuilding = true; + + preConfigure = + '' + export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}" + + mkdir ../objdir + cd ../objdir + configureScript=../mozilla-release/configure + ''; # */ + + #installFlags = "SKIP_GRE_REGISTRATION=1"; + + postInstall = '' + # Fix run-mozilla.sh search + libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) + echo libDir: $libDir + test -n "$libDir" + cd $out/bin + rm xulrunner + + for i in $out/lib/$libDir/*; do + file $i; + if file $i | grep executable &>/dev/null; then + echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")"; + chmod a+x "$out/bin/$(basename "$i")"; + fi; + done + for i in $out/lib/$libDir/*.so; do + patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true + done + for i in $out/lib/$libDir/{plugin-container,xulrunner,xulrunner-stub}; do + wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir" + done + rm -f $out/bin/run-mozilla.sh + ''; # */ + + meta = { + description = "Mozilla Firefox XUL runner"; + homepage = http://www.mozilla.com/en-US/firefox/; + }; + + passthru = { inherit gtk; version = xulVersion; }; + }; + + + firefox = stdenv.mkDerivation rec { + name = "firefox-${firefoxVersion}"; + + inherit src; + + enableParallelBuilding = true; + + buildInputs = + [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python + dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify + xlibs.pixman yasm mesa sqlite file unzip pysqlite + ]; + + propagatedBuildInputs = [xulrunner]; + + configureFlags = + [ "--enable-application=browser" + "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" + "--enable-chrome-format=jar" + "--disable-elf-hack" + ] + ++ commonConfigureFlags + ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; + + makeFlags = [ + "SYSTEM_LIBXUL=1" + ]; + + # Hack to work around make's idea of -lbz2 dependency + preConfigure = + '' + find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ + stdenv.lib.concatStringsSep ":" + (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) + }' ';' + ''; + + postInstall = + '' + ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner + for j in $out/bin/*; do + i="$(readlink "$j")"; + file $i; + if file $i | grep executable &>/dev/null; then + rm "$out/bin/$(basename "$i")" + echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")" + chmod a+x "$out/bin/$(basename "$i")" + fi; + done; + cd "$out/lib/"firefox-* + rm firefox + echo -e '#!${stdenv.shell}\n${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox + chmod a+x firefox + ''; # */ + + meta = { + description = "Mozilla Firefox - the browser, reloaded"; + homepage = http://www.mozilla.com/en-US/firefox/; + maintainers = [ stdenv.lib.maintainers.eelco ]; + }; + + passthru = { + inherit gtk xulrunner nspr; + isFirefox3Like = true; + }; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a027d3dffe..7994649cfe4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6909,6 +6909,13 @@ let firefox13Wrapper = lowPrio (wrapFirefox { browser = firefox13Pkgs.firefox; }); + firefox15Pkgs = callPackage ../applications/networking/browsers/firefox/15.0.nix { + inherit (gnome) libIDL; + inherit (pythonPackages) pysqlite; + }; + + firefox15Wrapper = lowPrio (wrapFirefox { browser = firefox15Pkgs.firefox; }); + flac = callPackage ../applications/audio/flac { }; flashplayer = flashplayer11; From fdf82b66e76e87e074c9a70b5efcff2a477797c6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 1 Sep 2012 10:27:41 +0400 Subject: [PATCH 091/116] Falling Sand Game: use a mirror --- pkgs/games/fsg/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix index ba6b65d602b..b2210141f57 100644 --- a/pkgs/games/fsg/default.nix +++ b/pkgs/games/fsg/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation { name = "fsg-4.4"; src = fetchurl { - url = http://www.piettes.com/fallingsandgame/fsg-src-4.4.tar.gz; + #url = http://www.piettes.com/fallingsandgame/fsg-src-4.4.tar.gz; + url = http://www.sourcefiles.org/Games/Simulation/Other/fsg-src-4.4.tar.gz; sha256 = "1756y01rkvd3f1pkj88jqh83fqcfl2fy0c48mcq53pjzln9ycv8c"; }; From 36619822a1545d4eff59b8de9670ba7821d64069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 1 Sep 2012 16:39:13 +0200 Subject: [PATCH 092/116] firefox15: Telling hydra to build it --- pkgs/applications/networking/browsers/firefox/15.0.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/browsers/firefox/15.0.nix b/pkgs/applications/networking/browsers/firefox/15.0.nix index 54903496391..186f9602f0a 100644 --- a/pkgs/applications/networking/browsers/firefox/15.0.nix +++ b/pkgs/applications/networking/browsers/firefox/15.0.nix @@ -169,6 +169,7 @@ rec { description = "Mozilla Firefox - the browser, reloaded"; homepage = http://www.mozilla.com/en-US/firefox/; maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = with stdenv.lib.platforms; linux; }; passthru = { From ac8dd727d077120099db60a40d768c32de74a6f7 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Sat, 1 Sep 2012 21:36:46 +0200 Subject: [PATCH 093/116] Restore google talk plugin versioned url, now it seems to work again. --- .../browsers/mozilla-plugins/google-talk-plugin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 5e9724b939c..a3f255b5d3e 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; let - baseURL = "http://dl.google.com/linux/direct/"; + baseURL = "http://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin"; rpathPlugin = makeLibraryPath [ mesa @@ -50,12 +50,12 @@ stdenv.mkDerivation rec { src = if stdenv.system == "x86_64-linux" then fetchurl { - url = "${baseURL}/google-talkplugin_current_amd64.deb"; + url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb"; sha256 = "0ml4yirzdcladw11fq5d8lwqfqgb1fh9vpbzbzmhplvyj6mvkqrj"; } else if stdenv.system == "i686-linux" then fetchurl { - url = "${baseURL}/google-talkplugin_current_i386.deb"; + url = "${baseURL}/google-talkplugin_${version}-1_i386.deb"; sha256 = "1kfd26zygb76iqnr8n3f7k7n9h5bz0rf716n80crqzyasv51mn57"; } else throw "Google Talk does not support your platform."; From 6bff8651552a1155645e452b6392e6e129360e8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 2 Sep 2012 09:06:14 +0200 Subject: [PATCH 094/116] mono: fixing build it looks like it doesn't like parallel builds. --- pkgs/development/compilers/mono/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix index 2f257fccc52..f59bb2cac40 100644 --- a/pkgs/development/compilers/mono/default.nix +++ b/pkgs/development/compilers/mono/default.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation { # The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image dontStrip = true; - enableParallelBuilding = true; + # Parallel building doesn't work, as shows http://hydra.nixos.org/build/2983601 + enableParallelBuilding = false; preBuild = " makeFlagsArray=(INSTALL=`type -tp install`) From 724451668c33530cce944bfb336566b6ab59979d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 2 Sep 2012 10:45:16 +0200 Subject: [PATCH 095/116] firefox15: trying another way of telling hydra to build it --- pkgs/applications/networking/browsers/firefox/15.0.nix | 1 - pkgs/top-level/release.nix | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/15.0.nix b/pkgs/applications/networking/browsers/firefox/15.0.nix index 186f9602f0a..54903496391 100644 --- a/pkgs/applications/networking/browsers/firefox/15.0.nix +++ b/pkgs/applications/networking/browsers/firefox/15.0.nix @@ -169,7 +169,6 @@ rec { description = "Mozilla Firefox - the browser, reloaded"; homepage = http://www.mozilla.com/en-US/firefox/; maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = with stdenv.lib.platforms; linux; }; passthru = { diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index d8e192a6e55..68c387d2a55 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -361,6 +361,7 @@ with (import ./release-lib.nix); firefox36Pkgs.firefox = linux; firefox12Pkgs.firefox = linux; firefox13Pkgs.firefox = linux; + firefox15Pkgs.firefox = linux; gnome = { gnome_panel = linux; From 7672f20121383656e1950c49af8960f8e4fd72d8 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 1 Sep 2012 21:23:38 +0200 Subject: [PATCH 096/116] gogoclient: fix url and lower default metric this allows other routes to take precedence over gogonet --- pkgs/os-specific/linux/gogoclient/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/gogoclient/default.nix b/pkgs/os-specific/linux/gogoclient/default.nix index d1a4bf9feb6..4328eb36b6d 100644 --- a/pkgs/os-specific/linux/gogoclient/default.nix +++ b/pkgs/os-specific/linux/gogoclient/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { name = "${baseName}-${version}"; src = fetchurl { - url = http://gogo6.com/downloads/gogoc-1_2-RELEASE.tar.gz; + #url = http://gogo6.com/downloads/gogoc-1_2-RELEASE.tar.gz; + url = http://pkgs.fedoraproject.org/repo/pkgs/gogoc/gogoc-1_2-RELEASE.tar.gz/41177ed683cf511cc206c7782c37baa9/gogoc-1_2-RELEASE.tar.gz; sha256 = "a0ef45c0bd1fc9964dc8ac059b7d78c12674bf67ef641740554e166fa99a2f49"; }; patches = [./gcc46-include-fix.patch ./config-paths.patch ]; @@ -28,6 +29,7 @@ stdenv.mkDerivation rec { --replace "/sbin/route" "${nettools}/sbin/route" \ --replace "/sbin/ip" "${iproute}/sbin/ip" \ --replace "/sbin/sysctl" "${procps}/sbin/sysctl" + sed -i -e 's/^.*Exec \$route -A.*$/& metric 128/' $out/template/linux.sh ''; meta = { From 8277c18b5395a0a3329230d63a67746a96665917 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 1 Sep 2012 21:53:58 +0200 Subject: [PATCH 097/116] vnstat: upgrade to 1.11 --- pkgs/applications/networking/vnstat/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index 69a0a7efde8..57afefd7dcd 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ncurses}: stdenv.mkDerivation rec { - name = "vnstat-1.9"; - + name = "vnstat-1.11"; + src = fetchurl { - url = http://humdi.net/vnstat/vnstat-1.9.tar.gz; - sha256 = "1migym0wig1s3b7d22ipxkd1p78sqc89dwx82qbf5hsb5q2fk4q1"; + url = "http://humdi.net/vnstat/${name}.tar.gz"; + sha256 = "09p0mlf49zzmh6jzwyvzd9k3jv7bl8i6w8xl65ns3dmv2zc7c65p"; }; installPhase = '' From 14c808baa782aac052ebf62dc35ca6e7250af19a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Sep 2012 14:18:13 +0200 Subject: [PATCH 098/116] haskell-haskeline: add version 0.7.0.2 --- .../haskeline/{default.nix => 0.6.4.7.nix} | 0 .../libraries/haskell/haskeline/0.7.0.2.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 10 ++++++++-- 3 files changed, 24 insertions(+), 2 deletions(-) rename pkgs/development/libraries/haskell/haskeline/{default.nix => 0.6.4.7.nix} (100%) create mode 100644 pkgs/development/libraries/haskell/haskeline/0.7.0.2.nix diff --git a/pkgs/development/libraries/haskell/haskeline/default.nix b/pkgs/development/libraries/haskell/haskeline/0.6.4.7.nix similarity index 100% rename from pkgs/development/libraries/haskell/haskeline/default.nix rename to pkgs/development/libraries/haskell/haskeline/0.6.4.7.nix diff --git a/pkgs/development/libraries/haskell/haskeline/0.7.0.2.nix b/pkgs/development/libraries/haskell/haskeline/0.7.0.2.nix new file mode 100644 index 00000000000..b58152f7c24 --- /dev/null +++ b/pkgs/development/libraries/haskell/haskeline/0.7.0.2.nix @@ -0,0 +1,16 @@ +{ cabal, filepath, terminfo, transformers }: + +cabal.mkDerivation (self: { + pname = "haskeline"; + version = "0.7.0.2"; + sha256 = "0mmflw8mslvif8w1app4zwrlpynpfvzqdb9srs6bgicawwgkb2r0"; + buildDepends = [ filepath terminfo transformers ]; + configureFlags = "-fterminfo"; + meta = { + homepage = "http://trac.haskell.org/haskeline"; + description = "A command-line interface for user input, written in Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 908d6857794..eea0ea7adb0 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -386,6 +386,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Agda = callPackage ../development/libraries/haskell/Agda { haskellSrcExts = self.haskellSrcExts_1_11_1; + haskeline = self.haskeline_0_6_4_7; }; accelerate = callPackage ../development/libraries/haskell/accelerate {}; @@ -811,7 +812,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hashtables = callPackage ../development/libraries/haskell/hashtables {}; - haskeline = callPackage ../development/libraries/haskell/haskeline {}; + haskeline_0_6_4_7 = callPackage ../development/libraries/haskell/haskeline/0.6.4.7.nix {}; + haskeline_0_7_0_2 = callPackage ../development/libraries/haskell/haskeline/0.7.0.2.nix {}; + haskeline = self.haskeline_0_7_0_2; haskelineClass = callPackage ../development/libraries/haskell/haskeline-class {}; @@ -879,7 +882,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hjsmin = callPackage ../development/libraries/haskell/hjsmin {}; - hledger = callPackage ../development/libraries/haskell/hledger {}; + hledger = callPackage ../development/libraries/haskell/hledger { + haskeline = self.haskeline_0_6_4_7; + }; hledgerLib = callPackage ../development/libraries/haskell/hledger-lib {}; hledgerInterest = callPackage ../applications/office/hledger-interest {}; hledgerWeb = callPackage ../development/libraries/haskell/hledger-web {}; @@ -1739,6 +1744,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); darcs = callPackage ../applications/version-management/darcs { tar = self.tar_0_3_2_0; + haskeline = self.haskeline_0_6_4_7; }; leksah = callPackage ../applications/editors/leksah { From 267e268a31afae7d23dd93579374fa8f28eaf719 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Sep 2012 14:19:16 +0200 Subject: [PATCH 099/116] haskell-HTTP: add version 4000.2.4 --- .../libraries/haskell/HTTP/4000.2.4.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 +++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/HTTP/4000.2.4.nix diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.4.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.4.nix new file mode 100644 index 00000000000..6f7b57ba64c --- /dev/null +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.4.nix @@ -0,0 +1,15 @@ +{ cabal, mtl, network, parsec }: + +cabal.mkDerivation (self: { + pname = "HTTP"; + version = "4000.2.4"; + sha256 = "1riqz69mnzl2xnbkk8s798xkizvcly3hcpigshbhpa57q016labi"; + buildDepends = [ mtl network parsec ]; + meta = { + homepage = "https://github.com/haskell/HTTP"; + description = "A library for client-side HTTP"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index eea0ea7adb0..cce03161d4e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -125,7 +125,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); GLUT = self.GLUT_2_1_2_1; # 7.5 fail haskellSrc = self.haskellSrc_1_0_1_5; # 7.5 ok html = self.html_1_0_1_2; # 7.5 ok - HTTP = self.HTTP_4000_2_3; # 7.5 ok + HTTP = self.HTTP_4000_2_4; # 7.5 ok HUnit = self.HUnit_1_2_5_1; # 7.5 ok mtl = self.mtl_2_1_2; # 7.5 ok network = self.network_2_3_1_0; # 7.5 ok @@ -844,7 +844,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HTTP_4000_2_1 = callPackage ../development/libraries/haskell/HTTP/4000.2.1.nix {}; HTTP_4000_2_2 = callPackage ../development/libraries/haskell/HTTP/4000.2.2.nix {}; HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {}; - HTTP = self.HTTP_4000_2_3; + HTTP_4000_2_4 = callPackage ../development/libraries/haskell/HTTP/4000.2.4.nix {}; + HTTP = self.HTTP_4000_2_4; hackageDb = callPackage ../development/libraries/haskell/hackage-db {}; From 1637d95fffc6411cefdc9ed1faba088cce09a7ac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Sep 2012 14:19:35 +0200 Subject: [PATCH 100/116] haskell-date-cache: add version 0.3.0 --- .../libraries/haskell/date-cache/default.nix | 12 ++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/libraries/haskell/date-cache/default.nix diff --git a/pkgs/development/libraries/haskell/date-cache/default.nix b/pkgs/development/libraries/haskell/date-cache/default.nix new file mode 100644 index 00000000000..a460dcbdafc --- /dev/null +++ b/pkgs/development/libraries/haskell/date-cache/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "date-cache"; + version = "0.3.0"; + sha256 = "0grhcbd0rhdn0cf1fz82x8pv8cmxfhndlcwyrax4mnnr3pql9kmb"; + meta = { + description = "Date cacher"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index cce03161d4e..f90e16abe02 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -607,6 +607,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); dataReify = callPackage ../development/libraries/haskell/data-reify {}; + dateCache = callPackage ../development/libraries/haskell/date-cache {}; + datetime = callPackage ../development/libraries/haskell/datetime {}; deepseq_1_1_0_0 = callPackage ../development/libraries/haskell/deepseq/1.1.0.0.nix {}; From e9abf1899a70b3c9420b57edf1779a29cbc2bc37 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Sep 2012 14:20:10 +0200 Subject: [PATCH 101/116] haskell-hledger: patch to support recent versions of cmdargs --- pkgs/development/libraries/haskell/hledger-lib/default.nix | 2 +- pkgs/development/libraries/haskell/hledger/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix index 644406ae1ec..de2e40a03d5 100644 --- a/pkgs/development/libraries/haskell/hledger-lib/default.nix +++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix @@ -11,7 +11,7 @@ cabal.mkDerivation (self: { split time transformers utf8String ]; patchPhase = '' - sed -i -e 's|,split.*|,split|' hledger-lib.cabal + sed -i -e 's|,split.*|,split|' -e 's|,cmdargs.*|,cmdargs|' hledger-lib.cabal ''; meta = { homepage = "http://hledger.org"; diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix index efc2936f406..a02697be7c2 100644 --- a/pkgs/development/libraries/haskell/hledger/default.nix +++ b/pkgs/development/libraries/haskell/hledger/default.nix @@ -14,7 +14,7 @@ cabal.mkDerivation (self: { regexpr safe shakespeareText split text time utf8String ]; patchPhase = '' - sed -i -e 's|,split.*|,split|' hledger.cabal + sed -i -e 's|,split.*|,split|' -e 's|,cmdargs.*|,cmdargs|' hledger.cabal ''; meta = { homepage = "http://hledger.org"; From f11475eaa8c33068139e73e62f6d3e0bf4753e08 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Sep 2012 14:20:15 +0200 Subject: [PATCH 102/116] haskell-cmdargs: update to version 0.10 --- pkgs/development/libraries/haskell/cmdargs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix index 38b0bf24bcb..0719bf5a03c 100644 --- a/pkgs/development/libraries/haskell/cmdargs/default.nix +++ b/pkgs/development/libraries/haskell/cmdargs/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cmdargs"; - version = "0.9.7"; - sha256 = "0w3y94hjq5w1i2vcj45jfdbi1iadib2nsv0pa3w9dmqvn9wxlvz4"; + version = "0.10"; + sha256 = "1xx4cks3hr2ldb0hd5hnc53dpns2zm4gc1dw25gs1vc977kga3hz"; isLibrary = true; isExecutable = true; buildDepends = [ filepath transformers ]; From 1505130da1cbe6a2a4088ead5ba784858bfebf12 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Sep 2012 14:20:15 +0200 Subject: [PATCH 103/116] haskell-fingertree: update to version 0.0.1.1 --- pkgs/development/libraries/haskell/fingertree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/fingertree/default.nix b/pkgs/development/libraries/haskell/fingertree/default.nix index 71afad2cdbc..299b2e926db 100644 --- a/pkgs/development/libraries/haskell/fingertree/default.nix +++ b/pkgs/development/libraries/haskell/fingertree/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "fingertree"; - version = "0.0.1.0"; - sha256 = "e80bf256506290c8f4fb44222920ae7d8405fd22e453c7a08dba49297d49328b"; + version = "0.0.1.1"; + sha256 = "00llr24b2r539250fangl0jj39gf26gjwvhjpy5qg8l920hrjn78"; meta = { description = "Generic finger-tree structure, with example instances"; license = self.stdenv.lib.licenses.bsd3; From 02d27b8a026b86a9bf2fcf5432830f27dc180696 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Sep 2012 14:20:15 +0200 Subject: [PATCH 104/116] haskell-iteratee: update to version 0.8.9.3 --- pkgs/development/libraries/haskell/iteratee/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix index 14c125121bd..bc99a88895b 100644 --- a/pkgs/development/libraries/haskell/iteratee/default.nix +++ b/pkgs/development/libraries/haskell/iteratee/default.nix @@ -4,10 +4,8 @@ cabal.mkDerivation (self: { pname = "iteratee"; - version = "0.8.9.1"; - sha256 = "1yk7jvabmabf0qjcd00imbg7vx84yjf71h7x3zbv4a51ykfy5hax"; - isLibrary = true; - isExecutable = true; + version = "0.8.9.3"; + sha256 = "1abm7f7ymzw9sa625f40sj4510sbpyplybpgb5a229sq8118dbh0"; buildDepends = [ ListLike MonadCatchIOTransformers monadControl parallel transformers transformersBase From 40431dfcd4631a2d9ab364a98af4118fec215ff3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Sep 2012 14:20:15 +0200 Subject: [PATCH 105/116] haskell-tls: update to version 0.9.10 --- pkgs/development/libraries/haskell/tls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index d440d942277..2154aa347d2 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tls"; - version = "0.9.9"; - sha256 = "0l29ja7mcyykj4dh7awjbrb9aswgarxls71vk68pdfaz047jsvx6"; + version = "0.9.10"; + sha256 = "1kiwb5skirdla32gjicgmjyk09p8f701jgs6krxbi38gmmfj1dxf"; isLibrary = true; isExecutable = true; buildDepends = [ From a683b2f6b4a8e3a13e9edc3257472339c81afc83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 3 Sep 2012 15:10:11 +0200 Subject: [PATCH 106/116] libreoffice: update to 3.6.1.2 I've not tried if it works; I'll revert it if it fails. --- .../office/openoffice/libreoffice-srcs.nix | 4 ++++ pkgs/applications/office/openoffice/libreoffice.nix | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/office/openoffice/libreoffice-srcs.nix b/pkgs/applications/office/openoffice/libreoffice-srcs.nix index 8cbaa37553e..47630e5cfdf 100644 --- a/pkgs/applications/office/openoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/openoffice/libreoffice-srcs.nix @@ -367,4 +367,8 @@ name = "lcms2-2.3.tar.gz"; md5 = "327348d67c979c88c2dec59a23a17d85"; } +{ + name = "libvisio-0.0.19.tar.bz2"; + md5 = "94e7f271e38c976462558b4278590178"; +} ] diff --git a/pkgs/applications/office/openoffice/libreoffice.nix b/pkgs/applications/office/openoffice/libreoffice.nix index 6df0c3a7d25..b45ac5dd309 100644 --- a/pkgs/applications/office/openoffice/libreoffice.nix +++ b/pkgs/applications/office/openoffice/libreoffice.nix @@ -16,8 +16,8 @@ let langsSpaces = stdenv.lib.concatStringsSep " " langs; major = "3"; minor = "6"; - patch = "0"; - tweak = "4"; + patch = "1"; + tweak = "2"; subdir = "${major}.${minor}.${patch}"; version = "${subdir}.${tweak}"; fetchThirdParty = {name, md5}: fetchurl { @@ -36,17 +36,17 @@ let }) ] ++ (map fetchThirdParty (import ./libreoffice-srcs.nix)); translations = fetchSrc { name = "translations"; - sha256 = "e1603dbaa90ef027ea73e81a9ffa1ec86d311a40fd7aee6b08edd3fa86a19edb"; + sha256 = "0id4ad8h3fl4s2ax6r4w4af74xvagkv0qwy50f483lqq3a3pl7fl"; }; help = fetchSrc { name = "help"; - sha256 = "30b79e3b4cb5b2167d1f3c17b8781e8940665f861197ee9021a6ac8c64d508f8"; + sha256 = "0jd3l3rkhmdvrvgklkmrh9zsg9hlv3vhy6s97fnzhpzr90sjqrs1"; }; core = fetchSrc { name = "core"; - sha256 = "b301eac605830ed6423cbab49d99ff5ca3999ed8ad53f51766c715d49d09cd4d"; + sha256 = "12zc0zviy1p3gk1v5nm4ks4rzscn68lpnl3kis4q693zhsk8jyh3"; }; }; in From 510b86f38786569119a9cd8388fcb5126a22718e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 3 Sep 2012 15:53:07 +0200 Subject: [PATCH 107/116] libreoffice: trying to enable parallel building I use the nix approach about the number of cores, as enableParallelBuilding. --- pkgs/applications/office/openoffice/libreoffice.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/openoffice/libreoffice.nix b/pkgs/applications/office/openoffice/libreoffice.nix index b45ac5dd309..d336266ccaf 100644 --- a/pkgs/applications/office/openoffice/libreoffice.nix +++ b/pkgs/applications/office/openoffice/libreoffice.nix @@ -83,11 +83,13 @@ stdenv.mkDerivation rec { QT4DIR = qt4; KDE4DIR = kde4.kdelibs; + # I set --with-num-cpus=$NIX_BUILD_CORES, as it's the equivalent of + # enableParallelBuilding=true in this build system. preConfigure = '' # Needed to find genccode PATH=$PATH:${icu}/sbin - configureFlagsArray=("--with-lang=${langsSpaces}") + configureFlagsArray=("--with-lang=${langsSpaces}" "--with-num-cpus=$NIX_BUILD_CORES") ''; makeFlags = "SHELL=${bash}/bin/bash"; @@ -117,7 +119,6 @@ stdenv.mkDerivation rec { configureFlags = [ #"--enable-verbose" - "--with-max-jobs=1" "--with-num-cpus=1" # Without these, configure does not finish "--without-junit" From da01cdaa8270e0f788faed6d41bebc659eb2c6b4 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 4 Sep 2012 09:32:59 +0400 Subject: [PATCH 108/116] Update Julia to latest revision, include zlib in dependencies --- pkgs/development/compilers/julia/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 2484be9ae1f..c1b607b725b 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre +{ stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl , ncurses, libunistring, lighttpd, patchelf, openblas, liblapack } : @@ -7,7 +7,7 @@ let in stdenv.mkDerivation rec { pname = "julia"; - date = "20120818"; + date = "20120904"; name = "${pname}-git-${date}"; grisu_ver = "1.1.1"; @@ -54,17 +54,17 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://github.com/JuliaLang/julia.git"; - rev = "4f692899688f500c77d768f67748f4b7335c90eb"; - sha256 = "a60e684a5283e80619f28ec8ff16fdc76c549e8463059507b0819db09dae6688"; + rev = "b842bf4ae4d80f28803ec54f3da412a0248046a9"; + sha256 = "4d67f4f4d35c76ea8981198e42feb1c30a50ac7e1e15b752fa41b26ebadcd828"; }; - buildInputs = [ gfortran perl m4 gmp pcre llvm readline + buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf openblas liblapack ]; configurePhase = '' - for i in GMP LLVM PCRE LAPACK OPENBLAS BLAS READLINE FFTW LIBUNWIND SUITESPARSE GLPK LIGHTTPD; + for i in GMP LLVM PCRE LAPACK OPENBLAS BLAS READLINE FFTW LIBUNWIND SUITESPARSE GLPK LIGHTTPD ZLIB; do sed -e "s@USE_SYSTEM_$i=0@USE_SYSTEM_$i=1@" -i Make.inc; done @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { copy_kill_hash "${dsfmt_src}" deps/random ${if realGcc ==null then "" else - ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring "''} + ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring -lz "''} sed -e 's@ cpp @ gcc -E @g' -i base/Makefile From 449230335dff460184887b784ee3e751194fc6a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 4 Sep 2012 09:59:26 +0200 Subject: [PATCH 109/116] sipwitch: update to 1.2.4 --- pkgs/servers/sip/sipwitch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix index 7fa9a62e5e3..097dde325f1 100644 --- a/pkgs/servers/sip/sipwitch/default.nix +++ b/pkgs/servers/sip/sipwitch/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pkgconfig, ucommon, libosip, libexosip, gnutls, zlib }: stdenv.mkDerivation rec { - name = "sipwitch-1.2.3"; + name = "sipwitch-1.2.4"; src = fetchurl { url = "mirror://gnu/sipwitch/${name}.tar.gz"; - sha256 = "0vc7x061m2jdj8hwpw56yiz8ij07x058vm1rm1dz7w98slpkcj6d"; + sha256 = "1c826832xi9p85l7c9va33xx8hx01m3jq49s0d1xl4c8kvri7bsj"; }; buildInputs = [ pkgconfig ucommon libosip libexosip gnutls zlib ]; From 6cdb98a140263e36cd1127fe524aa65b815023d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 4 Sep 2012 15:50:47 +0200 Subject: [PATCH 110/116] valgrind: update to 3.8.0 --- pkgs/development/tools/analysis/valgrind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index a625de6ffdc..a5042ffc7d4 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, gdb }: stdenv.mkDerivation (rec { - name = "valgrind-3.7.0"; + name = "valgrind-3.8.0"; src = fetchurl { url = "http://valgrind.org/downloads/${name}.tar.bz2"; - sha256 = "1xnb4jiimscwriw3jd1lkk0m9x4glqpijj9jb4ngx08l1wrw0qjx"; + sha256 = "1310lxmzidrbv0l3hrf45ampkf61gv2vb8msnqm684lp41gmh5px"; }; # Perl is needed for `cg_annotate'. From b3c63a98f079fbcad2fa44b57c8edc8916362ba4 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 4 Sep 2012 16:14:01 +0200 Subject: [PATCH 111/116] Remove all svn references --- doc/language-support.xml | 8 ++++---- doc/meta.xml | 2 +- doc/package-notes.xml | 6 +++--- doc/quick-start.xml | 41 ++++++++++++++++++++-------------------- 4 files changed, 28 insertions(+), 29 deletions(-) diff --git a/doc/language-support.xml b/doc/language-support.xml index dc63dd68503..47729a1b4ba 100644 --- a/doc/language-support.xml +++ b/doc/language-support.xml @@ -18,10 +18,10 @@ such as Perl or Haskell. These are described in this chapter. Nixpkgs provides a function buildPerlPackage, a generic package builder function for any Perl package that has a standard Makefile.PL. It’s implemented in pkgs/development/perl-modules/generic. +xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/perl-modules/generic">pkgs/development/perl-modules/generic. Perl packages from CPAN are defined in pkgs/perl-packages.nix, +xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix">pkgs/perl-packages.nix, rather than pkgs/all-packages.nix. Most Perl packages are so straight-forward to build that they are defined here directly, rather than having a separate function for each package @@ -162,7 +162,7 @@ ClassC3Componentised = buildPerlPackage rec { which many Python packages do nowadays, can be built very simply using the buildPythonPackage function. This function is implemented - in pkgs/development/python-modules/generic/default.nix + in pkgs/development/python-modules/generic/default.nix and works similarly to buildPerlPackage. (See for details.) @@ -170,7 +170,7 @@ ClassC3Componentised = buildPerlPackage rec { Python packages that use buildPythonPackage are defined - in pkgs/top-level/python-packages.nix. + in pkgs/top-level/python-packages.nix. Most of them are simple. For example: diff --git a/doc/meta.xml b/doc/meta.xml index 8ed91d9a8c8..30b5ad247d1 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -103,7 +103,7 @@ interpretation: <alice@example.org>" "Bob <bob@example.com>"]. If you are the maintainer of multiple packages, you may want to add yourself to pkgs/lib/maintainers.nix + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/lib/maintainers.nix">pkgs/lib/maintainers.nix and write something like [stdenv.lib.maintainers.alice stdenv.lib.maintainers.bob]. diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 9d2cd0ef16b..6dae036b338 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -16,7 +16,7 @@ Linux kernel or X.org. Linux kernel The Nix expressions to build the Linux kernel are in pkgs/os-specific/linux/kernel. +xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/linux/kernel">pkgs/os-specific/linux/kernel. The function that builds the kernel has an argument kernelPatches which should be a list of @@ -49,7 +49,7 @@ modulesTree = [kernel] - Copy (svn cp) the old Nix expression + Copy the old Nix expression (e.g. linux-2.6.21.nix) to the new one (e.g. linux-2.6.22.nix) and update it. @@ -69,7 +69,7 @@ modulesTree = [kernel] - Make an svn copy from the old + Make an copy from the old config (e.g. config-2.6.21-i686-smp) to the new one (e.g. config-2.6.22-i686-smp). diff --git a/doc/quick-start.xml b/doc/quick-start.xml index 2651e2a1eee..dddbbb4a19e 100644 --- a/doc/quick-start.xml +++ b/doc/quick-start.xml @@ -12,7 +12,7 @@ Checkout the Nixpkgs source tree: -$ svn checkout https://svn.nixos.org/repos/nix/nixpkgs/trunk nixpkgs +$ git clone git://github.com/NixOS/nixpkgs.git $ cd nixpkgs @@ -29,7 +29,7 @@ $ cd nixpkgs organisation. Create a directory for your package, e.g. -$ svn mkdir pkgs/development/libraries/libfoo +$ mkdir pkgs/development/libraries/libfoo @@ -44,7 +44,7 @@ $ svn mkdir pkgs/development/libraries/libfoo $ emacs pkgs/development/libraries/libfoo/default.nix -$ svn add pkgs/development/libraries/libfoo/default.nix +$ git add pkgs/development/libraries/libfoo/default.nix @@ -56,7 +56,7 @@ $ svn add pkgs/development/libraries/libfoo/default.nix GNU cpio: pkgs/tools/archivers/cpio/default.nix. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/archivers/cpio/default.nix">pkgs/tools/archivers/cpio/default.nix. The simplest possible package. The generic builder in stdenv does everything for you. It has no dependencies beyond stdenv. @@ -64,21 +64,21 @@ $ svn add pkgs/development/libraries/libfoo/default.nix GNU Hello: pkgs/applications/misc/hello/ex-2/default.nix. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/hello/ex-2/default.nix">pkgs/applications/misc/hello/ex-2/default.nix. Also trivial, but it specifies some meta attributes which is good practice. GNU Multiple Precision arithmetic library (GMP): pkgs/development/libraries/gmp/default.nix. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/gmp/default.nix">pkgs/development/libraries/gmp/default.nix. Also done by the generic builder, but has a dependency on m4. Pan, a GTK-based newsreader: pkgs/applications/networking/newsreaders/pan/default.nix. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/newsreaders/pan/default.nix">pkgs/applications/networking/newsreaders/pan/default.nix. Has an optional dependency on gtkspell, which is only built if spellCheck is true. @@ -86,7 +86,7 @@ $ svn add pkgs/development/libraries/libfoo/default.nix Apache HTTPD: pkgs/servers/http/apache-httpd/default.nix. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/http/apache-httpd/default.nix">pkgs/servers/http/apache-httpd/default.nix. A bunch of optional features, variable substitutions in the configure flags, a post-install hook, and miscellaneous hackery. @@ -94,9 +94,9 @@ $ svn add pkgs/development/libraries/libfoo/default.nix BitTorrent (wxPython-based): pkgs/tools/networking/p2p/bittorrent/default.nix. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/networking/p2p/bittorrent/default.nix">pkgs/tools/networking/p2p/bittorrent/default.nix. Uses an external build + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/networking/p2p/bittorrent/builder.sh">build script, which can be useful if you have lots of code that you don’t want cluttering up the Nix expression. But external builders are mostly obsolete. @@ -105,22 +105,22 @@ $ svn add pkgs/development/libraries/libfoo/default.nix Thunderbird: pkgs/applications/networking/mailreaders/thunderbird/3.x.nix. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix">pkgs/applications/networking/mailreaders/thunderbird/3.x.nix. Lots of dependencies. JDiskReport, a Java utility: pkgs/tools/misc/jdiskreport/default.nix + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/default.nix">pkgs/tools/misc/jdiskreport/default.nix (and the builder). + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/builder.sh">builder). Nixpkgs doesn’t have a decent stdenv for Java yet so this is pretty ad-hoc. XML::Simple, a Perl module: pkgs/top-level/perl-packages.nix + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix">pkgs/top-level/perl-packages.nix (search for the XMLSimple attribute). Most Perl modules are so simple to build that they are defined directly in perl-packages.nix; @@ -129,10 +129,10 @@ $ svn add pkgs/development/libraries/libfoo/default.nix Adobe Reader: pkgs/applications/misc/adobe-reader/default.nix. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/adobe-reader/default.nix">pkgs/applications/misc/adobe-reader/default.nix. Shows how binary-only packages can be supported. In particular the builder + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/adobe-reader/builder.sh">builder uses patchelf to set the RUNPATH and ELF interpreter of the executables so that the right libraries are found at runtime. @@ -163,7 +163,7 @@ $ svn add pkgs/development/libraries/libfoo/default.nix A list of schemes for mirror:// URLs can be found in pkgs/build-support/fetchurl/mirrors.nix. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/fetchurl/mirrors.nix">pkgs/build-support/fetchurl/mirrors.nix. @@ -181,7 +181,7 @@ $ svn add pkgs/development/libraries/libfoo/default.nix Add a call to the function defined in the previous step to pkgs/top-level/all-packages.nix + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/all-packages.nix">pkgs/top-level/all-packages.nix with some descriptive name for the variable, e.g. libfoo. @@ -220,8 +220,7 @@ $ nix-env -f . -iA libfoo - Optionally commit the new package (svn - ci) or send a patch to + Optionally commit the new package, or send a patch to nix-dev@cs.uu.nl. @@ -230,7 +229,7 @@ $ nix-env -f . -iA libfoo package and make them available in the nixpkgs channel, add it to pkgs/top-level/release.nix. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/release.nix">pkgs/top-level/release.nix. From 2b8d80d22d28393f0bc743b266bad9b3a9dc2cc5 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 4 Sep 2012 00:40:05 +0200 Subject: [PATCH 112/116] org-mode: upgrade to 7.9.1 --- .../editors/emacs-modes/org/default.nix | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix index fb4de650ee0..d3829bc9d11 100644 --- a/pkgs/applications/editors/emacs-modes/org/default.nix +++ b/pkgs/applications/editors/emacs-modes/org/default.nix @@ -1,30 +1,24 @@ -{ fetchurl, stdenv, emacs, texinfo, which }: +{ fetchurl, stdenv, emacs, texinfo, which, texLive }: stdenv.mkDerivation rec { - name = "org-7.8.03"; + name = "org-7.9.1"; src = fetchurl { url = "http://orgmode.org/${name}.tar.gz"; - sha256 = "49357cca7d892e70cd2dfcc0b5d96d9fd164ef5a1f251ace3865ecb27dc1e958"; + sha256 = "0kz1dnzfpmmslwal150z9rxrnddjpaw2glx26qihpxzs0zzpw201"; }; - buildInputs = [ emacs texinfo ]; - - patchPhase = - '' sed -i "lisp/org-clock.el" -e's|"which"|"${which}/bin/which"|g' - ''; + buildInputs = [ emacs ]; + buildNativeInputs = [ texinfo texLive ]; configurePhase = - '' sed -i Makefile \ - -e "s|^prefix=.*$|prefix=$out|g" + '' sed -i mk/default.mk \ + -e "s|^prefix\t=.*$|prefix=$out|g" ''; - #XXX: fails because of missing UTILITIES/manfull.pl, currently not - # included in the release tarball, but git. - - #postBuild = - # '' make doc - # ''; + postBuild = + '' make doc + ''; installPhase = '' make install install-info From 39760a2ad6cdb5a6ad9d657b6c64e3f349dc9fb5 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 4 Sep 2012 00:45:17 +0200 Subject: [PATCH 113/116] davfs2: upgrade to 1.4.7 - add option to disable the default user/group in the config file. If you only want to mount filesystems as root (don't use setuid root), the default is not very useful. This setting is not overridable from an external config file, so this needs to be done here. Perhaps it's possible to tell the package to look in system /etc, but that makes the install-phase try to put files there too. Would take quite some patching. --- pkgs/tools/filesystems/davfs2/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index 8cc212deee4..ce4421f9ca7 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -1,16 +1,21 @@ -{ stdenv, fetchurl, neon, zlib }: +{ stdenv, fetchurl, neon, zlib, noDavsUser ? false}: stdenv.mkDerivation rec { - name = "davfs2-1.4.5"; + name = "davfs2-1.4.7"; src = fetchurl { url = "mirror://savannah/davfs2/${name}.tar.gz"; - sha256 = "1pkl2braggp2qg4c68dwfv399l9jz7cvi7gkm4xbj6mgvl0cxw18"; + sha256 = "0i7hrwlfzisb4l2mza1kjj9q9xxixggjplsjm339zl7828mfxh2h"; }; + prePatch = stdenv.lib.optional noDavsUser '' + echo "dav_user root" >> etc/davfs2.conf + echo "dav_group root" >> etc/davfs2.conf + ''; + buildInputs = [ neon zlib ]; - - patches = [ ./davfs2-install.patch ./isdir.patch ]; + + patches = [ ./davfs2-install.patch ./isdir.patch ]; meta = { longDescription = "Web Distributed Authoring and Versioning (WebDAV), an extension to the HTTP-protocol, allows authoring of resources on a remote web server. davfs2 provides the ability to access such resources like a typical filesystem, allowing for use by standard applications with no built-in support for WebDAV."; From df82c942635c045658ea618438d8b433f79348c9 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 4 Sep 2012 13:46:54 +0200 Subject: [PATCH 114/116] node-packages: introduced alphabet --- pkgs/top-level/node-packages.nix | 524 +++++++++++++++---------------- 1 file changed, 262 insertions(+), 262 deletions(-) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 0ab4306cca0..ae468d95eac 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -5,221 +5,6 @@ let self = { inherit stdenv nodejs; }; - "coffee-script" = self."coffee-script-1.3.3"; - - "coffee-script-1.3.3" = self.buildNodePackage rec { - name = "coffee-script-1.3.3"; - src = fetchurl { - url = "http://registry.npmjs.org/coffee-script/-/${name}.tgz"; - sha256 = "deedd2cf9d5abe2bad724e6809bec40efa07215dae85f44d78cd37736bb50bc5"; - }; - deps = [ - - ]; - }; - - "semver" = self."semver-1"; - - "semver-1" = self.buildNodePackage rec { - name = "semver-1.0.14"; - src = fetchurl { - url = "http://registry.npmjs.org/semver/-/${name}.tgz"; - sha256 = "560df522ae0e8834d8b07f6ca9c60bd8836e844642361abde108018cbe9ca82f"; - }; - deps = [ - - ]; - }; - - "npm2nix" = self."npm2nix-0.1.2"; - - "npm2nix-0.1.2" = self.buildNodePackage rec { - name = "npm2nix-0.1.2"; - src = fetchurl { - url = https://bitbucket.org/shlevy/npm2nix/get/0.1.2.tar.gz; - sha256 = "0wmgdbjvvwqv47113xdipzkmdafsca9av1s0fq605jf97wrpvbw3"; - name = "${name}.tgz"; - }; - deps = [ - self."semver-1" - ]; - }; - - "mkdirp" = self."mkdirp-0.3"; - - "mkdirp-0.3" = self.buildNodePackage rec { - name = "mkdirp-0.3.4"; - src = fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/${name}.tgz"; - sha256 = "f87444f2376c56bf47846f3b885aae926c5d9504328923b166794b78c0e08425"; - }; - deps = [ - - ]; - }; - - "nopt" = self."nopt-2"; - - "nopt-2" = self.buildNodePackage rec { - name = "nopt-2.0.0"; - src = fetchurl { - url = "http://registry.npmjs.org/nopt/-/${name}.tgz"; - sha256 = "112e9bea8b745a2e5a59d239e6f6f02e720e080ab8cdca89b6b8f0143ae718b5"; - }; - deps = [ - self."abbrev-1" - ]; - }; - - "graceful-fs" = self."graceful-fs-1"; - - "graceful-fs-1" = self.buildNodePackage rec { - name = "graceful-fs-1.1.10"; - src = fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/${name}.tgz"; - sha256 = "1f9b7da8b0c75db49e0e5d2aaecc6f1dd3fca2bdbb2aecf95d1dbdec7f0cee24"; - }; - deps = [ - - ]; - }; - - "fstream" = self."fstream-~0.1.13"; - - "fstream-~0.1.13" = self.buildNodePackage rec { - name = "fstream-0.1.18"; - src = fetchurl { - url = "http://registry.npmjs.org/fstream/-/${name}.tgz"; - sha256 = "fd5791dd0ce8d7b707fa171ac5bd482e09f80cd09ec8176b45d547416893372d"; - }; - deps = [ - self."rimraf-2" - self."mkdirp-0.3" - self."graceful-fs-~1.1.2" - self."inherits-~1.0.0" - ]; - }; - - "npmlog" = self."npmlog-0"; - - "npmlog-0" = self.buildNodePackage rec { - name = "npmlog-0.0.2"; - src = fetchurl { - url = "http://registry.npmjs.org/npmlog/-/${name}.tgz"; - sha256 = "ce98d4d3380390c0259695cce407e2e96d2970c5caee1461a62ecbd38e8caed4"; - }; - deps = [ - self."ansi-~0.1.2" - ]; - }; - - "osenv" = self."osenv-0"; - - "osenv-0" = self.buildNodePackage rec { - name = "osenv-0.0.3"; - src = fetchurl { - url = "http://registry.npmjs.org/osenv/-/${name}.tgz"; - sha256 = "aafbb23637b7338c9025f9da336f31f96674d7926c30f209e4d93ce16d5251c4"; - }; - deps = [ - - ]; - }; - - "node-gyp" = self."node-gyp-*"; - - "node-gyp-*" = self.buildNodePackage rec { - name = "node-gyp-0.6.8"; - src = fetchurl { - url = "http://registry.npmjs.org/node-gyp/-/${name}.tgz"; - sha256 = "b40064d825c492c544389812ecea2089606c31cbe4f3ee9e68048ea56a9aed4d"; - }; - deps = [ - self."glob-3" - self."graceful-fs-1" - self."fstream-~0.1.13" - self."minimatch-0.2" - self."mkdirp-0.3" - self."nopt-2" - self."npmlog-0" - self."osenv-0" - self."request-2.9" - self."rimraf-2" - self."semver-1" - self."tar-~0.1.12" - self."which-1" - ]; - }; - - "rimraf" = self."rimraf-2"; - - "rimraf-2" = self.buildNodePackage rec { - name = "rimraf-2.0.2"; - src = fetchurl { - url = "http://registry.npmjs.org/rimraf/-/${name}.tgz"; - sha256 = "3efcc60c9f6715a8746f3e0b82770468247f3e256778ef20733f334377392ab0"; - }; - deps = [ - self."graceful-fs-~1.1" - ]; - }; - - "minimatch" = self."minimatch-0.2"; - - "minimatch-0.2" = self.buildNodePackage rec { - name = "minimatch-0.2.6"; - src = fetchurl { - url = "http://registry.npmjs.org/minimatch/-/${name}.tgz"; - sha256 = "f0030112575a815ff304fa3bc64ee7e60ab8bfddb281602bc37eca0cddd48350"; - }; - deps = [ - self."lru-cache-~2.0.0" - ]; - }; - - "glob" = self."glob-3"; - - "glob-3" = self.buildNodePackage rec { - name = "glob-3.1.12"; - src = fetchurl { - url = "http://registry.npmjs.org/glob/-/${name}.tgz"; - sha256 = "a37c02e9a91915fe4e3232229676e842803151dde831d1046620ec96118f6036"; - }; - deps = [ - self."minimatch-0.2" - self."graceful-fs-~1.1.2" - self."inherits-1" - ]; - }; - - "tar" = self."tar-~0.1.12"; - - "tar-~0.1.12" = self.buildNodePackage rec { - name = "tar-0.1.13"; - src = fetchurl { - url = "http://registry.npmjs.org/tar/-/${name}.tgz"; - sha256 = "fdf79b5e172badf924a12b501686e5cbf33c3ec7631eccc29c0e3e9fdcbb5ffe"; - }; - deps = [ - self."inherits-1.x" - self."block-stream" - self."fstream-~0.1.8" - ]; - }; - - "which" = self."which-1"; - - "which-1" = self.buildNodePackage rec { - name = "which-1.0.5"; - src = fetchurl { - url = "http://registry.npmjs.org/which/-/${name}.tgz"; - sha256 = "e26f39d7b152c700636472ab4da57bfb9af17972c49a9e2a06f9ff347d8fad42"; - }; - deps = [ - - ]; - }; - "abbrev" = self."abbrev-1"; "abbrev-1" = self.buildNodePackage rec { @@ -233,41 +18,6 @@ let self = { ]; }; - "graceful-fs-~1.1.2" = self.buildNodePackage rec { - name = "graceful-fs-1.1.10"; - src = fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/${name}.tgz"; - sha256 = "1f9b7da8b0c75db49e0e5d2aaecc6f1dd3fca2bdbb2aecf95d1dbdec7f0cee24"; - }; - deps = [ - - ]; - }; - - "request" = self."request-2.9"; - - "request-2.9" = self.buildNodePackage rec { - name = "request-2.9.203"; - src = fetchurl { - url = "http://registry.npmjs.org/request/-/${name}.tgz"; - sha256 = "2af8f83a63c7227383fbdd6114e470e0921af86a037c4e82f42883120f35f836"; - }; - deps = [ - - ]; - }; - - "inherits-~1.0.0" = self.buildNodePackage rec { - name = "inherits-1.0.0"; - src = fetchurl { - url = "http://registry.npmjs.org/inherits/-/${name}.tgz"; - sha256 = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186"; - }; - deps = [ - - ]; - }; - "ansi" = self."ansi-~0.1.2"; "ansi-~0.1.2" = self.buildNodePackage rec { @@ -294,13 +44,71 @@ let self = { ]; }; - "lru-cache" = self."lru-cache-~2.0.0"; + "coffee-script" = self."coffee-script-1.3.3"; - "lru-cache-~2.0.0" = self.buildNodePackage rec { - name = "lru-cache-2.0.1"; + "coffee-script-1.3.3" = self.buildNodePackage rec { + name = "coffee-script-1.3.3"; src = fetchurl { - url = "http://registry.npmjs.org/lru-cache/-/${name}.tgz"; - sha256 = "3b4fd68f0bd75f5abf69e349b6ffa918bfe4990ff36d2d88dc74f334a9ed627e"; + url = "http://registry.npmjs.org/coffee-script/-/${name}.tgz"; + sha256 = "deedd2cf9d5abe2bad724e6809bec40efa07215dae85f44d78cd37736bb50bc5"; + }; + deps = [ + + ]; + }; + + "fstream" = self."fstream-~0.1.13"; + + "fstream-~0.1.8" = self.buildNodePackage rec { + name = "fstream-0.1.18"; + src = fetchurl { + url = "http://registry.npmjs.org/fstream/-/${name}.tgz"; + sha256 = "fd5791dd0ce8d7b707fa171ac5bd482e09f80cd09ec8176b45d547416893372d"; + }; + deps = [ + self."rimraf-2" + self."mkdirp-0.3" + self."graceful-fs-~1.1.2" + self."inherits-~1.0.0" + ]; + }; + + "fstream-~0.1.13" = self.buildNodePackage rec { + name = "fstream-0.1.18"; + src = fetchurl { + url = "http://registry.npmjs.org/fstream/-/${name}.tgz"; + sha256 = "fd5791dd0ce8d7b707fa171ac5bd482e09f80cd09ec8176b45d547416893372d"; + }; + deps = [ + self."rimraf-2" + self."mkdirp-0.3" + self."graceful-fs-~1.1.2" + self."inherits-~1.0.0" + ]; + }; + + "glob" = self."glob-3"; + + "glob-3" = self.buildNodePackage rec { + name = "glob-3.1.12"; + src = fetchurl { + url = "http://registry.npmjs.org/glob/-/${name}.tgz"; + sha256 = "a37c02e9a91915fe4e3232229676e842803151dde831d1046620ec96118f6036"; + }; + deps = [ + self."minimatch-0.2" + self."graceful-fs-~1.1.2" + self."inherits-1" + ]; + }; + + "graceful-fs" = self."graceful-fs-1"; + + "graceful-fs-1" = self.buildNodePackage rec { + name = "graceful-fs-1.1.10"; + src = fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/${name}.tgz"; + sha256 = "1f9b7da8b0c75db49e0e5d2aaecc6f1dd3fca2bdbb2aecf95d1dbdec7f0cee24"; }; deps = [ @@ -318,6 +126,17 @@ let self = { ]; }; + "graceful-fs-~1.1.2" = self.buildNodePackage rec { + name = "graceful-fs-1.1.10"; + src = fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/${name}.tgz"; + sha256 = "1f9b7da8b0c75db49e0e5d2aaecc6f1dd3fca2bdbb2aecf95d1dbdec7f0cee24"; + }; + deps = [ + + ]; + }; + "inherits" = self."inherits-1"; "inherits-1" = self.buildNodePackage rec { @@ -342,17 +161,198 @@ let self = { ]; }; - "fstream-~0.1.8" = self.buildNodePackage rec { - name = "fstream-0.1.18"; + "inherits-~1.0.0" = self.buildNodePackage rec { + name = "inherits-1.0.0"; src = fetchurl { - url = "http://registry.npmjs.org/fstream/-/${name}.tgz"; - sha256 = "fd5791dd0ce8d7b707fa171ac5bd482e09f80cd09ec8176b45d547416893372d"; + url = "http://registry.npmjs.org/inherits/-/${name}.tgz"; + sha256 = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186"; }; deps = [ - self."rimraf-2" + + ]; + }; + + "lru-cache" = self."lru-cache-~2.0.0"; + + "lru-cache-~2.0.0" = self.buildNodePackage rec { + name = "lru-cache-2.0.1"; + src = fetchurl { + url = "http://registry.npmjs.org/lru-cache/-/${name}.tgz"; + sha256 = "3b4fd68f0bd75f5abf69e349b6ffa918bfe4990ff36d2d88dc74f334a9ed627e"; + }; + deps = [ + + ]; + }; + + "mkdirp" = self."mkdirp-0.3"; + + "mkdirp-0.3" = self.buildNodePackage rec { + name = "mkdirp-0.3.4"; + src = fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/${name}.tgz"; + sha256 = "f87444f2376c56bf47846f3b885aae926c5d9504328923b166794b78c0e08425"; + }; + deps = [ + + ]; + }; + + "minimatch" = self."minimatch-0.2"; + + "minimatch-0.2" = self.buildNodePackage rec { + name = "minimatch-0.2.6"; + src = fetchurl { + url = "http://registry.npmjs.org/minimatch/-/${name}.tgz"; + sha256 = "f0030112575a815ff304fa3bc64ee7e60ab8bfddb281602bc37eca0cddd48350"; + }; + deps = [ + self."lru-cache-~2.0.0" + ]; + }; + + "node-gyp" = self."node-gyp-*"; + + "node-gyp-*" = self.buildNodePackage rec { + name = "node-gyp-0.6.8"; + src = fetchurl { + url = "http://registry.npmjs.org/node-gyp/-/${name}.tgz"; + sha256 = "b40064d825c492c544389812ecea2089606c31cbe4f3ee9e68048ea56a9aed4d"; + }; + deps = [ + self."glob-3" + self."graceful-fs-1" + self."fstream-~0.1.13" + self."minimatch-0.2" self."mkdirp-0.3" - self."graceful-fs-~1.1.2" - self."inherits-~1.0.0" + self."nopt-2" + self."npmlog-0" + self."osenv-0" + self."request-2.9" + self."rimraf-2" + self."semver-1" + self."tar-~0.1.12" + self."which-1" + ]; + }; + + "nopt" = self."nopt-2"; + + "nopt-2" = self.buildNodePackage rec { + name = "nopt-2.0.0"; + src = fetchurl { + url = "http://registry.npmjs.org/nopt/-/${name}.tgz"; + sha256 = "112e9bea8b745a2e5a59d239e6f6f02e720e080ab8cdca89b6b8f0143ae718b5"; + }; + deps = [ + self."abbrev-1" + ]; + }; + + "npm2nix" = self."npm2nix-0.1.2"; + + "npm2nix-0.1.2" = self.buildNodePackage rec { + name = "npm2nix-0.1.2"; + src = fetchurl { + url = https://bitbucket.org/shlevy/npm2nix/get/0.1.2.tar.gz; + sha256 = "0wmgdbjvvwqv47113xdipzkmdafsca9av1s0fq605jf97wrpvbw3"; + name = "${name}.tgz"; + }; + deps = [ + self."semver-1" + ]; + }; + + "npmlog" = self."npmlog-0"; + + "npmlog-0" = self.buildNodePackage rec { + name = "npmlog-0.0.2"; + src = fetchurl { + url = "http://registry.npmjs.org/npmlog/-/${name}.tgz"; + sha256 = "ce98d4d3380390c0259695cce407e2e96d2970c5caee1461a62ecbd38e8caed4"; + }; + deps = [ + self."ansi-~0.1.2" + ]; + }; + + "osenv" = self."osenv-0"; + + "osenv-0" = self.buildNodePackage rec { + name = "osenv-0.0.3"; + src = fetchurl { + url = "http://registry.npmjs.org/osenv/-/${name}.tgz"; + sha256 = "aafbb23637b7338c9025f9da336f31f96674d7926c30f209e4d93ce16d5251c4"; + }; + deps = [ + + ]; + }; + + "request" = self."request-2.9"; + + "request-2.9" = self.buildNodePackage rec { + name = "request-2.9.203"; + src = fetchurl { + url = "http://registry.npmjs.org/request/-/${name}.tgz"; + sha256 = "2af8f83a63c7227383fbdd6114e470e0921af86a037c4e82f42883120f35f836"; + }; + deps = [ + + ]; + }; + + "rimraf" = self."rimraf-2"; + + "rimraf-2" = self.buildNodePackage rec { + name = "rimraf-2.0.2"; + src = fetchurl { + url = "http://registry.npmjs.org/rimraf/-/${name}.tgz"; + sha256 = "3efcc60c9f6715a8746f3e0b82770468247f3e256778ef20733f334377392ab0"; + }; + deps = [ + self."graceful-fs-~1.1" + ]; + }; + + "semver" = self."semver-1"; + + "semver-1" = self.buildNodePackage rec { + name = "semver-1.0.14"; + src = fetchurl { + url = "http://registry.npmjs.org/semver/-/${name}.tgz"; + sha256 = "560df522ae0e8834d8b07f6ca9c60bd8836e844642361abde108018cbe9ca82f"; + }; + deps = [ + + ]; + }; + + "tar" = self."tar-~0.1.12"; + + "tar-~0.1.12" = self.buildNodePackage rec { + name = "tar-0.1.13"; + src = fetchurl { + url = "http://registry.npmjs.org/tar/-/${name}.tgz"; + sha256 = "fdf79b5e172badf924a12b501686e5cbf33c3ec7631eccc29c0e3e9fdcbb5ffe"; + }; + deps = [ + self."inherits-1.x" + self."block-stream" + self."fstream-~0.1.8" + ]; + }; + + "which" = self."which-1"; + + "which-1" = self.buildNodePackage rec { + name = "which-1.0.5"; + src = fetchurl { + url = "http://registry.npmjs.org/which/-/${name}.tgz"; + sha256 = "e26f39d7b152c700636472ab4da57bfb9af17972c49a9e2a06f9ff347d8fad42"; + }; + deps = [ + ]; }; }; From 278312a38cdf0735957eefb8354627fd5191f9b4 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 4 Sep 2012 17:46:32 +0200 Subject: [PATCH 115/116] node-packages: ability to fix sources that use the impure "latest" dependency --- pkgs/top-level/node-packages.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index ae468d95eac..ee05b92a255 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -5,6 +5,14 @@ let self = { inherit stdenv nodejs; }; + patchLatest = srcAttrs: + let src = fetchurl srcAttrs; in + pkgs.runCommand src.name {} '' + tar xf ${src} + sed -i -e "s/: \"latest\"/: \"*\"/" package/package.json + tar cf $out package + ''; + "abbrev" = self."abbrev-1"; "abbrev-1" = self.buildNodePackage rec { From b78b5b3f3630856180fe2ba7c39eb364cc0ce602 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 4 Sep 2012 17:47:42 +0200 Subject: [PATCH 116/116] node-packages: add a lot of packages --- pkgs/top-level/node-packages.nix | 658 +++++++++++++++++++++++++++++-- 1 file changed, 616 insertions(+), 42 deletions(-) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index ee05b92a255..82d6b65ee48 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -26,6 +26,19 @@ let self = { ]; }; + "active-x-obfuscator" = self."active-x-obfuscator-0.0.1"; + + "active-x-obfuscator-0.0.1" = self.buildNodePackage rec { + name = "active-x-obfuscator-0.0.1"; + src = fetchurl { + url = "http://registry.npmjs.org/active-x-obfuscator/-/${name}.tgz"; + sha256 = "069cc18a0e7790ec106b267d28b47c691220f119a8daec925dd47f06866ce1c6"; + }; + deps = [ + self."zeparser-0.0.5" + ]; + }; + "ansi" = self."ansi-~0.1.2"; "ansi-~0.1.2" = self.buildNodePackage rec { @@ -39,6 +52,19 @@ let self = { ]; }; + "backbone" = self."backbone-0.9.2"; + + "backbone-0.9.2" = self.buildNodePackage rec { + name = "backbone-0.9.2"; + src = fetchurl { + url = "http://registry.npmjs.org/backbone/-/${name}.tgz"; + sha256 = "0a5ebc8d32949ea2870a684e8430a8b4dec75a163ecf2740eb5fb4865393bb32"; + }; + deps = [ + self."underscore->=1.3.1" + ]; + }; + "block-stream" = self."block-stream-*"; "block-stream-*" = self.buildNodePackage rec { @@ -52,7 +78,62 @@ let self = { ]; }; + "browserchannel" = self."browserchannel-0.4.1"; + + "browserchannel-0.4.1" = self.buildNodePackage rec { + name = "browserchannel-0.4.1"; + src = fetchurl { + url = "http://registry.npmjs.org/browserchannel/-/${name}.tgz"; + sha256 = "f5d038347cee6802bb6f30f53bcf2adf196d241505b77ffca3d5f8a76a109c5f"; + }; + deps = [ + self."coffee-script-~1" + self."hat" + self."connect-~1.7" + self."timerstub" + self."request-~2" + ]; + }; + + "bson" = self."bson-0.1.0"; + + "bson-0.1.0" = self.buildNodePackage rec { + name = "bson-0.1.0"; + src = fetchurl { + url = "http://registry.npmjs.org/bson/-/${name}.tgz"; + sha256 = "32618266420f4d2688e957a6a145aab6a1402c950b7b7c7c1d0520cbd08251c9"; + }; + deps = [ + + ]; + }; + + "bytes" = self."bytes-0.1.0"; + + "bytes-0.1.0" = self.buildNodePackage rec { + name = "bytes-0.1.0"; + src = fetchurl { + url = "http://registry.npmjs.org/bytes/-/${name}.tgz"; + sha256 = "32954618600f6566ecd95aec0ea0ae3318a1b4a29bf6a7970462c29a843bf701"; + }; + deps = [ + + ]; + }; + "coffee-script" = self."coffee-script-1.3.3"; + "coffee-script-~1" = self."coffee-script-1.3.3"; + + "coffee-script-~1.1.2" = self.buildNodePackage rec { + name = "coffee-script-1.1.3"; + src = fetchurl { + url = "http://registry.npmjs.org/coffee-script/-/${name}.tgz"; + sha256 = "3b431da901f753bde0ab26245c7111e1e4b8be1bba0086cf4a7470d739acae87"; + }; + deps = [ + + ]; + }; "coffee-script-1.3.3" = self.buildNodePackage rec { name = "coffee-script-1.3.3"; @@ -65,23 +146,174 @@ let self = { ]; }; - "fstream" = self."fstream-~0.1.13"; + "commander" = self."commander-~0.6.1"; - "fstream-~0.1.8" = self.buildNodePackage rec { - name = "fstream-0.1.18"; + "commander-~0.6.1" = self.buildNodePackage rec { + name = "commander-0.6.1"; src = fetchurl { - url = "http://registry.npmjs.org/fstream/-/${name}.tgz"; - sha256 = "fd5791dd0ce8d7b707fa171ac5bd482e09f80cd09ec8176b45d547416893372d"; + url = "http://registry.npmjs.org/commander/-/${name}.tgz"; + sha256 = "7b7fdd1bc4d16f6776169a64f133d629efe2e3a7cd338b1d0884ee909abbd729"; }; deps = [ - self."rimraf-2" - self."mkdirp-0.3" - self."graceful-fs-~1.1.2" - self."inherits-~1.0.0" + ]; }; - "fstream-~0.1.13" = self.buildNodePackage rec { + "connect" = self."connect-2.4.4"; + + "connect-~1.7" = self.buildNodePackage rec { + name = "connect-1.7.3"; + src = fetchurl { + url = "http://registry.npmjs.org/connect/-/${name}.tgz"; + sha256 = "773fd6ca8c90e33cc28d012fb3d72d66eb99114b20d88228330458628f030d12"; + }; + deps = [ + self."qs->= 0.3.1" + self."mime->= 0.0.1" + ]; + }; + + "connect-2.4.4" = self.buildNodePackage rec { + name = "connect-2.4.4"; + src = fetchurl { + url = "http://registry.npmjs.org/connect/-/${name}.tgz"; + sha256 = "1f474ca9db05b9d58f3469ad4932722e49bec1f6ec35665ddea09155382914e9"; + }; + deps = [ + self."qs-0.4.2" + self."formidable-1.0.11" + self."crc-0.2.0" + self."cookie-0.0.4" + self."bytes-0.1.0" + self."send-0.0.4" + self."fresh-0.1.0" + self."pause-0.0.1" + self."debug" + ]; + }; + + "cookie" = self."cookie-0.0.4"; + + "cookie-0.0.4" = self.buildNodePackage rec { + name = "cookie-0.0.4"; + src = fetchurl { + url = "http://registry.npmjs.org/cookie/-/${name}.tgz"; + sha256 = "a917477c448a6a91ef73d550d8d8a6d4864e8fbd247b6f73baaca66c9bfc3b0b"; + }; + deps = [ + + ]; + }; + + "crc" = self."crc-0.2.0"; + + "crc-0.2.0" = self.buildNodePackage rec { + name = "crc-0.2.0"; + src = fetchurl { + url = "http://registry.npmjs.org/crc/-/${name}.tgz"; + sha256 = "027c180bbbddd0960e6000f7ef60623997dfa61b3c2ef141acf00c29a1763b5d"; + }; + deps = [ + + ]; + }; + + "cssmin" = self."cssmin-0.3.1"; + + "cssmin-0.3.1" = self.buildNodePackage rec { + name = "cssmin-0.3.1"; + src = fetchurl { + url = "http://registry.npmjs.org/cssmin/-/${name}.tgz"; + sha256 = "56f1854fd0c6cb4cf78cea861e7b617ccf1daf91b47fba5bc80abdf2529b3102"; + }; + deps = [ + + ]; + }; + + "datetime" = self."datetime-0.0.3"; + + "datetime-0.0.3" = self.buildNodePackage rec { + name = "datetime-0.0.3"; + src = fetchurl { + url = "http://registry.npmjs.org/datetime/-/${name}.tgz"; + sha256 = "d584a5b140ced7bd44199fc5e1b6cd55ec2d3c946dc990ced42f6ab2687747f0"; + }; + deps = [ + self."vows->=0.5.4" + ]; + }; + + "debug" = self."debug-*"; + + "debug-*" = self.buildNodePackage rec { + name = "debug-0.7.0"; + src = fetchurl { + url = "http://registry.npmjs.org/debug/-/${name}.tgz"; + sha256 = "113c041fb01fd8db2a1b83320529849ccbb23794a4c3799a0154312de2a5d618"; + }; + deps = [ + + ]; + }; + + "diff" = self."diff-~1.0.3"; + + "diff-~1.0.3" = self.buildNodePackage rec { + name = "diff-1.0.3"; + src = fetchurl { + url = "http://registry.npmjs.org/diff/-/${name}.tgz"; + sha256 = "88e1bb04e3707c5601ec0841e170f8892a3b929bf8c4030f826cd32c1fa21472"; + }; + deps = [ + + ]; + }; + + "eyes" = self."eyes->=0.1.6"; + + "eyes->=0.1.6" = self.buildNodePackage rec { + name = "eyes-0.1.8"; + src = fetchurl { + url = "http://registry.npmjs.org/eyes/-/${name}.tgz"; + sha256 = "4fa6db8f2c9926fb39a211c622d7eb3a76efbc4878559f9bd155d647a6963735"; + }; + deps = [ + + ]; + }; + + "formidable" = self."formidable-1.0.11"; + + "formidable-1.0.11" = self.buildNodePackage rec { + name = "formidable-1.0.11"; + src = fetchurl { + url = "http://registry.npmjs.org/formidable/-/${name}.tgz"; + sha256 = "39b345d14d69c27fe262e12f16900cef6be220510788866e0a12c9fedd03766e"; + }; + deps = [ + + ]; + }; + + "fresh" = self."fresh-0.1.0"; + + "fresh-0.1.0" = self.buildNodePackage rec { + name = "fresh-0.1.0"; + src = fetchurl { + url = "http://registry.npmjs.org/fresh/-/${name}.tgz"; + sha256 = "c402fbd25e26c0167bf288e1ba791716808bfaa5de32b76ae68e8e8a3d7e2b33"; + }; + deps = [ + + ]; + }; + + "fstream" = self."fstream-0.1.18"; + "fstream-~0.1.8" = self."fstream-0.1.18"; + "fstream-~0.1.13" = self."fstream-0.1.18"; + + "fstream-0.1.18" = self.buildNodePackage rec { name = "fstream-0.1.18"; src = fetchurl { url = "http://registry.npmjs.org/fstream/-/${name}.tgz"; @@ -110,9 +342,12 @@ let self = { ]; }; - "graceful-fs" = self."graceful-fs-1"; + "graceful-fs" = self."graceful-fs-1.1.10"; + "graceful-fs-1" = self."graceful-fs-1.1.10"; + "graceful-fs-~1.1" = self."graceful-fs-1.1.10"; + "graceful-fs-~1.1.2" = self."graceful-fs-1.1.10"; - "graceful-fs-1" = self.buildNodePackage rec { + "graceful-fs-1.1.10" = self.buildNodePackage rec { name = "graceful-fs-1.1.10"; src = fetchurl { url = "http://registry.npmjs.org/graceful-fs/-/${name}.tgz"; @@ -123,31 +358,38 @@ let self = { ]; }; - "graceful-fs-~1.1" = self.buildNodePackage rec { - name = "graceful-fs-1.1.10"; + "hat" = self."hat-0.0.3"; + + "hat-0.0.3" = self.buildNodePackage rec { + name = "hat-0.0.3"; src = fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/${name}.tgz"; - sha256 = "1f9b7da8b0c75db49e0e5d2aaecc6f1dd3fca2bdbb2aecf95d1dbdec7f0cee24"; + url = "http://registry.npmjs.org/hat/-/${name}.tgz"; + sha256 = "7bf52b3b020ca333a42eb67411090912b21abb6ac746d587022a0955b16e5f5c"; }; deps = [ ]; }; - "graceful-fs-~1.1.2" = self.buildNodePackage rec { - name = "graceful-fs-1.1.10"; + "hiredis" = self."hiredis-*"; + + "hiredis-*" = self.buildNodePackage rec { + name = "hiredis-0.1.14"; src = fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/${name}.tgz"; - sha256 = "1f9b7da8b0c75db49e0e5d2aaecc6f1dd3fca2bdbb2aecf95d1dbdec7f0cee24"; + url = "http://registry.npmjs.org/hiredis/-/${name}.tgz"; + sha256 = "9d7ce0a7ae81cf465a0c26c07fb618b6ffd98ca344f14369114abf548d75637a"; }; deps = [ ]; }; - "inherits" = self."inherits-1"; + "inherits" = self."inherits-1.0.0"; + "inherits-1" = self."inherits-1.0.0"; + "inherits-1.x" = self."inherits-1.0.0"; + "inherits-~1.0.0" = self."inherits-1.0.0"; - "inherits-1" = self.buildNodePackage rec { + "inherits-1.0.0" = self.buildNodePackage rec { name = "inherits-1.0.0"; src = fetchurl { url = "http://registry.npmjs.org/inherits/-/${name}.tgz"; @@ -158,22 +400,13 @@ let self = { ]; }; - "inherits-1.x" = self.buildNodePackage rec { - name = "inherits-1.0.0"; - src = fetchurl { - url = "http://registry.npmjs.org/inherits/-/${name}.tgz"; - sha256 = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186"; - }; - deps = [ + "less" = self."less-1.3.0"; - ]; - }; - - "inherits-~1.0.0" = self.buildNodePackage rec { - name = "inherits-1.0.0"; + "less-1.3.0" = self.buildNodePackage rec { + name = "less-1.3.0"; src = fetchurl { - url = "http://registry.npmjs.org/inherits/-/${name}.tgz"; - sha256 = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186"; + url = "http://registry.npmjs.org/less/-/${name}.tgz"; + sha256 = "a182824764d5feefe8a66c5f9c7fe8b92d24a7677942fd650b9092bbd3f63d1b"; }; deps = [ @@ -193,13 +426,24 @@ let self = { ]; }; - "mkdirp" = self."mkdirp-0.3"; + "mime" = self."mime-1.2.6"; - "mkdirp-0.3" = self.buildNodePackage rec { - name = "mkdirp-0.3.4"; + "mime->= 0.0.1" = self.buildNodePackage rec { + name = "mime-1.2.7"; src = fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/${name}.tgz"; - sha256 = "f87444f2376c56bf47846f3b885aae926c5d9504328923b166794b78c0e08425"; + url = "http://registry.npmjs.org/mime/-/${name}.tgz"; + sha256 = "a80244918c9c75fa4d0b37f311920c7d5270aab9a05aca9a74783764ad152df6"; + }; + deps = [ + + ]; + }; + + "mime-1.2.6" = self.buildNodePackage rec { + name = "mime-1.2.6"; + src = fetchurl { + url = "http://registry.npmjs.org/mime/-/${name}.tgz"; + sha256 = "7460134d6b4686d64fd1e7b878d34e2bdd258ad29b6665cf62e6d92659e81591"; }; deps = [ @@ -219,6 +463,45 @@ let self = { ]; }; + "mkdirp" = self."mkdirp-0.3"; + + "mkdirp-0.3" = self.buildNodePackage rec { + name = "mkdirp-0.3.4"; + src = fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/${name}.tgz"; + sha256 = "f87444f2376c56bf47846f3b885aae926c5d9504328923b166794b78c0e08425"; + }; + deps = [ + + ]; + }; + + "mongodb" = self."mongodb-1.1.0-beta"; + + "mongodb-1.1.0-beta" = self.buildNodePackage rec { + name = "mongodb-1.1.0-beta"; + src = fetchurl { + url = "http://registry.npmjs.org/mongodb/-/${name}.tgz"; + sha256 = "05e5a798d4c3a499af1e77a33eb13a31d4fb688a63e97b3fe970a3bccea39ab3"; + }; + deps = [ + self."bson-0.1.0" + ]; + }; + + "mrclean" = self."mrclean-0.1.0"; + + "mrclean-0.1.0" = self.buildNodePackage rec { + name = "mrclean-0.1.0"; + src = fetchurl { + url = "http://registry.npmjs.org/mrclean/-/${name}.tgz"; + sha256 = "5a8921007d8d3db990d41924d220f90efc8cbeb1f425c52fe0fe28be22223705"; + }; + deps = [ + + ]; + }; + "node-gyp" = self."node-gyp-*"; "node-gyp-*" = self.buildNodePackage rec { @@ -284,6 +567,19 @@ let self = { ]; }; + "options" = self."options-*"; + + "options-*" = self.buildNodePackage rec { + name = "options-0.0.3"; + src = fetchurl { + url = "http://registry.npmjs.org/options/-/${name}.tgz"; + sha256 = "06cfe21b54b45f8cf7bb0a184d6ea6de3adb2dc471bf0663d06c791b4d48536d"; + }; + deps = [ + + ]; + }; + "osenv" = self."osenv-0"; "osenv-0" = self.buildNodePackage rec { @@ -297,7 +593,95 @@ let self = { ]; }; - "request" = self."request-2.9"; + "pause" = self."pause-0.0.1"; + + "pause-0.0.1" = self.buildNodePackage rec { + name = "pause-0.0.1"; + src = fetchurl { + url = "http://registry.npmjs.org/pause/-/${name}.tgz"; + sha256 = "d37b84046db0c28c9768be649e8f02bd991ede34b276b5dba7bade23b523235e"; + }; + deps = [ + + ]; + }; + + "policyfile" = self."policyfile-0.0.4"; + + "policyfile-0.0.4" = self.buildNodePackage rec { + name = "policyfile-0.0.4"; + src = fetchurl { + url = "http://registry.npmjs.org/policyfile/-/${name}.tgz"; + sha256 = "e19e9e57d6262ab7965212ec5456eae2c07438de3b09fd8f3cba36a61a14c43f"; + }; + deps = [ + + ]; + }; + + "qs" = self."qs-0.5.0"; + "qs->= 0.3.1" = self."qs-0.5.0"; + + "qs-0.4.2" = self.buildNodePackage rec { + name = "qs-0.4.2"; + src = fetchurl { + url = "http://registry.npmjs.org/qs/-/${name}.tgz"; + sha256 = "c44875d3aa882693cf73185b46fed63c1a89c34dce600b191b41dd90fb019b86"; + }; + deps = [ + + ]; + }; + + "qs-0.5.0" = self.buildNodePackage rec { + name = "qs-0.5.0"; + src = fetchurl { + url = "http://registry.npmjs.org/qs/-/${name}.tgz"; + sha256 = "229a99fc833d50307833a13d898f3de137f2823593220273295e7e1dc81ab993"; + }; + deps = [ + + ]; + }; + + "range-parser" = self."range-parser-0.0.4"; + + "range-parser-0.0.4" = self.buildNodePackage rec { + name = "range-parser-0.0.4"; + src = fetchurl { + url = "http://registry.npmjs.org/range-parser/-/${name}.tgz"; + sha256 = "8e1bcce3544330b51644ea0cb4d25f0daa4b43008a75da27e285635f4ac4b1ce"; + }; + deps = [ + + ]; + }; + + "redis" = self."redis-0.7.2"; + + "redis-0.6.7" = self.buildNodePackage rec { + name = "redis-0.6.7"; + src = fetchurl { + url = "http://registry.npmjs.org/redis/-/${name}.tgz"; + sha256 = "6a65c0204a773ca4adec0635d747c80a7565ba5e2028775c7d0e95d23df088bb"; + }; + deps = [ + + ]; + }; + + "redis-0.7.2" = self.buildNodePackage rec { + name = "redis-0.7.2"; + src = fetchurl { + url = "http://registry.npmjs.org/redis/-/${name}.tgz"; + sha256 = "d56d99e15dd35f6fabf545d9e91545553d60eaeb32ecf5caa1f357458df161ab"; + }; + deps = [ + self."hiredis" + ]; + }; + + "request" = self."request-~2"; "request-2.9" = self.buildNodePackage rec { name = "request-2.9.203"; @@ -310,6 +694,17 @@ let self = { ]; }; + "request-~2" = self.buildNodePackage rec { + name = "request-2.11.0"; + src = fetchurl { + url = "http://registry.npmjs.org/request/-/${name}.tgz"; + sha256 = "01e5c144c755c8ee1a1ec93077b684bd63efb8df32d54675e20737e8e1c1afa6"; + }; + deps = [ + + ]; + }; + "rimraf" = self."rimraf-2"; "rimraf-2" = self.buildNodePackage rec { @@ -336,6 +731,66 @@ let self = { ]; }; + "send" = self."send-0.0.4"; + + "send-0.0.4" = self.buildNodePackage rec { + name = "send-0.0.4"; + src = fetchurl { + url = "http://registry.npmjs.org/send/-/${name}.tgz"; + sha256 = "7e028fa3760884d8103414f079dc4bcc99d0b72bc21bcaa9d66a319d59010d6c"; + }; + deps = [ + self."debug" + self."mime-1.2.6" + self."fresh-0.1.0" + self."range-parser-0.0.4" + ]; + }; + + "showdown" = self."showdown-0.0.1"; + + "showdown-0.0.1" = self.buildNodePackage rec { + name = "showdown-0.0.1"; + src = fetchurl { + url = "http://registry.npmjs.org/showdown/-/${name}.tgz"; + sha256 = "669a3284344a4cb51b0327af8d84b9e35c895ef1cedbafada5284a31f4d4783d"; + }; + deps = [ + + ]; + }; + + "socket.io" = self."socket.io-0.9.6"; + + "socket.io-0.9.6" = self.buildNodePackage rec { + name = "socket.io-0.9.6"; + src = fetchurl { + url = "http://registry.npmjs.org/socket.io/-/${name}.tgz"; + sha256 = "444e346e2701e2212590461a1fcf656f5d685ceb209e473517603286f09e743c"; + }; + deps = [ + self."socket.io-client-0.9.6" + self."policyfile-0.0.4" + self."redis-0.6.7" + ]; + }; + + "socket.io-client" = self."socket.io-client-0.9.6"; + + "socket.io-client-0.9.6" = self.buildNodePackage rec { + name = "socket.io-client-0.9.6"; + src = fetchurl { + url = "http://registry.npmjs.org/socket.io-client/-/${name}.tgz"; + sha256 = "eab65186515d5206fe18b9ced75aae8c803dbcd18295a9a1cb71e5ae772ba399"; + }; + deps = [ + self."uglify-js-1.2.5" + self."ws-0.4.x" + self."xmlhttprequest-1.2.2" + self."active-x-obfuscator-0.0.1" + ]; + }; + "tar" = self."tar-~0.1.12"; "tar-~0.1.12" = self.buildNodePackage rec { @@ -351,6 +806,84 @@ let self = { ]; }; + "timerstub" = self."timerstub-*"; + + "timerstub-*" = self.buildNodePackage rec { + name = "timerstub-0.1.3"; + src = fetchurl { + url = "http://registry.npmjs.org/timerstub/-/${name}.tgz"; + sha256 = "0ecbd05a10e0db1d628505c8a3b6ae07246bb8cf1074c435ddc26f22fcb5e153"; + }; + deps = [ + self."coffee-script-~1.1.2" + ]; + }; + + "tinycolor" = self."tinycolor-0.x"; + + "tinycolor-0.x" = self.buildNodePackage rec { + name = "tinycolor-0.0.1"; + src = fetchurl { + url = "http://registry.npmjs.org/tinycolor/-/${name}.tgz"; + sha256 = "f5aaf5df002750c4af19181988c8789c9e230445747e511dde7c660424f286a0"; + }; + deps = [ + + ]; + }; + + "uglify-js" = self."uglify-js-1.2.6"; + + "uglify-js-1.2.5" = self.buildNodePackage rec { + name = "uglify-js-1.2.5"; + src = fetchurl { + url = "http://registry.npmjs.org/uglify-js/-/${name}.tgz"; + sha256 = "111fa1b844885b94df8cd73eb864bd96ff2e9173e8eb7045cc778fa237304a74"; + }; + deps = [ + + ]; + }; + + "uglify-js-1.2.6" = self.buildNodePackage rec { + name = "uglify-js-1.2.6"; + src = fetchurl { + url = "http://registry.npmjs.org/uglify-js/-/${name}.tgz"; + sha256 = "6d9202c8332e78868510a5441de4d54d8c2e08901ea7945eb332be8d7670788d"; + }; + deps = [ + + ]; + }; + + "underscore" = self."underscore-1.3.3"; + "underscore->=1.3.1" = self."underscore-1.3.3"; + + "underscore-1.3.3" = self.buildNodePackage rec { + name = "underscore-1.3.3"; + src = fetchurl { + url = "http://registry.npmjs.org/underscore/-/${name}.tgz"; + sha256 = "e710644e53f5a6d75a41a3e19d8c35eedbce0db1e886e470daf9f909c9d1ea8a"; + }; + deps = [ + + ]; + }; + + "vows" = self."vows->=0.5.4"; + + "vows->=0.5.4" = self.buildNodePackage rec { + name = "vows-0.6.4"; + src = fetchurl { + url = "http://registry.npmjs.org/vows/-/${name}.tgz"; + sha256 = "017586c2fbdd5cd15aacdc870ea0c1b1ab60558306457ddc9b0aa4dae8290597"; + }; + deps = [ + self."eyes->=0.1.6" + self."diff-~1.0.3" + ]; + }; + "which" = self."which-1"; "which-1" = self.buildNodePackage rec { @@ -363,6 +896,47 @@ let self = { ]; }; + + "ws" = self."ws-0.4.x"; + + "ws-0.4.x" = self.buildNodePackage rec { + name = "ws-0.4.21"; + src = self.patchLatest { + url = "http://registry.npmjs.org/ws/-/${name}.tgz"; + sha256 = "f21bc0058730355e1ff9d6ccf84a4cb56a2fc28e939edd15395770ea9e87fa0e"; + }; + deps = [ + self."commander-~0.6.1" + self."tinycolor-0.x" + self."options" + ]; + }; + + "xmlhttprequest" = self."xmlhttprequest-1.2.2"; + + "xmlhttprequest-1.2.2" = self.buildNodePackage rec { + name = "xmlhttprequest-1.2.2"; + src = fetchurl { + url = "http://registry.npmjs.org/xmlhttprequest/-/${name}.tgz"; + sha256 = "44ce4ed6e5f7b5df84f27590fa142ecd175f53da4807b9f06c0c4733e23bd95d"; + }; + deps = [ + + ]; + }; + + "zeparser" = self."zeparser-0.0.5"; + + "zeparser-0.0.5" = self.buildNodePackage rec { + name = "zeparser-0.0.5"; + src = fetchurl { + url = "http://registry.npmjs.org/zeparser/-/${name}.tgz"; + sha256 = "8b5a57ae84a7b7adf8827d1469c8f66d08d1660bd1375a07381877cd1bb9ed0b"; + }; + deps = [ + + ]; + }; }; in self