From a87c8d9beeab11a5a3bfbb96a490763cf89f3607 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 28 Mar 2012 19:23:42 +0000 Subject: Add telepathy-logger svn path=/nixpkgs/trunk/; revision=33457 --- .../telepathy/logger/default.nix | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix new file mode 100644 index 0000000000000..2f06e633b1a8d --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, dbus_glib, libxml2, sqlite, telepathy_glib, pkgconfig +, intltool, libxslt }: + +stdenv.mkDerivation rec { + project = "telepathy-logger"; + name = "${project}-0.2.12"; + + src = fetchurl { + url = "http://telepathy.freedesktop.org/releases/${project}/${name}.tar.bz2"; + sha256 = "1681m1j6vqzy089fnbfpz9i8jsg64fq6x6kf25b9p2090dnqrkj3"; + }; + + buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool ]; + + buildNativeInputs = [ libxslt ]; + + configureFlags = "--enable-call"; + + meta = { + description = "Logger service for Telepathy framework"; + homepage = http://telepathy.freedesktop.org/wiki/Logger ; + maintainers = [ stdenv.lib.mainrainers.urkud ]; + platforms = stdenv.lib.platforms.gnu; # Arbitrary choice + }; +} -- cgit 1.4.1 From 3c72ac97eb0cb2b50239eb5e3833e0cc691f8e5c Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 29 Mar 2012 10:17:40 +0000 Subject: Fix typo svn path=/nixpkgs/trunk/; revision=33466 --- .../networking/instant-messengers/telepathy/logger/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 2f06e633b1a8d..27d41140be0cd 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Logger service for Telepathy framework"; homepage = http://telepathy.freedesktop.org/wiki/Logger ; - maintainers = [ stdenv.lib.mainrainers.urkud ]; + maintainers = [ stdenv.lib.maintainers.urkud ]; platforms = stdenv.lib.platforms.gnu; # Arbitrary choice }; } -- cgit 1.4.1 From c6c798df43fd4e8eaf73a0338cf6907360ee915d Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 29 Mar 2012 19:01:42 +0000 Subject: Add nut-2.6.3 without HAL support I'm not a nut user, so I didn't touch the default nut expression, and set meta.priority to 10. svn path=/nixpkgs/trunk/; revision=33477 --- pkgs/applications/misc/nut/2.6.3.nix | 34 ++++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/misc/nut/2.6.3.nix (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/nut/2.6.3.nix b/pkgs/applications/misc/nut/2.6.3.nix new file mode 100644 index 0000000000000..7ddb2c547cf4d --- /dev/null +++ b/pkgs/applications/misc/nut/2.6.3.nix @@ -0,0 +1,34 @@ +{stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi}: + +stdenv.mkDerivation { + name = "nut-2.6.3"; + src = fetchurl { + url = http://www.networkupstools.org/source/2.6/nut-2.6.3.tar.gz; + sha256 = "0fk3bcivv26kw1psxb6sykqp9n5w02j01s1idypzlci0kmr3p49l"; + }; + + buildInputs = [pkgconfig neon libusb openssl udev avahi]; + + configureFlags = [ + "--with-all" + "--without-snmp" # Until we have it ... + "--without-powerman" # Until we have it ... + "--without-cgi" + "--without-freeipmi" + "--without-ipmi" + "--without-hal" + ]; + + meta = { + description = "Network UPS Tools"; + longDescription = '' + Network UPS Tools is a collection of programs which provide a common + interface for monitoring and administering UPS, PDU and SCD hardware. + It uses a layered approach to connect all of the parts. + ''; + homepage = http://www.networkupstools.org/; + platforms = with stdenv.lib.platforms; linux; + maintainers = with stdenv.lib.maintainers; [ pierron ]; + priority = 10; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6784c373aa95c..f3983f0ac9cac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8421,6 +8421,8 @@ let nut = callPackage ../applications/misc/nut { }; + nut_2_6_3 = callPackage ../applications/misc/nut/2.6.3.nix { }; + disnix = callPackage ../tools/package-management/disnix { }; disnix_activation_scripts = callPackage ../tools/package-management/disnix/activation-scripts { -- cgit 1.4.1 From f943cf8d8109d465334c68342d5337a7c0e6e8cb Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 29 Mar 2012 20:44:20 +0000 Subject: nut-2.6.3: add freeipmi support svn path=/nixpkgs/trunk/; revision=33478 --- pkgs/applications/misc/nut/2.6.3.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/nut/2.6.3.nix b/pkgs/applications/misc/nut/2.6.3.nix index 7ddb2c547cf4d..471529675dbf6 100644 --- a/pkgs/applications/misc/nut/2.6.3.nix +++ b/pkgs/applications/misc/nut/2.6.3.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi}: +{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi }: stdenv.mkDerivation { name = "nut-2.6.3"; @@ -7,15 +7,15 @@ stdenv.mkDerivation { sha256 = "0fk3bcivv26kw1psxb6sykqp9n5w02j01s1idypzlci0kmr3p49l"; }; - buildInputs = [pkgconfig neon libusb openssl udev avahi]; + buildInputs = [ neon libusb openssl udev avahi freeipmi ]; + buildNativeInputs = [ pkgconfig ]; configureFlags = [ "--with-all" + "--with-ssl" "--without-snmp" # Until we have it ... "--without-powerman" # Until we have it ... "--without-cgi" - "--without-freeipmi" - "--without-ipmi" "--without-hal" ]; -- cgit 1.4.1 From cbb7aef23ca1c504585c28235e2fe718ec4ee0ff Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Fri, 30 Mar 2012 10:38:07 +0000 Subject: Fixing the url (Thanks to Shea Levy) svn path=/nixpkgs/trunk/; revision=33490 --- pkgs/applications/misc/mupdf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 8127fa23115cc..20ded9486f772 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "mupdf-0.7"; src = fetchurl { - url = "http://mupdf.com/download/${name}.tar.gz"; + url = "http://mupdf.com/download/archive/${name}.tar.gz"; sha256 = "e7f6307fa472575d27fe893e787ddb3fc927f03ba4ae23105f917189e81960a6"; }; -- cgit 1.4.1 From 45b546c83d3eff2ea19d58c9e1d62c3e86968a5c Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Sat, 31 Mar 2012 13:53:34 +0000 Subject: It looks like libreoffice was still providing a catalan interface for en_US locale users. I was told en_US was always included, but it seems like not so. svn path=/nixpkgs/trunk/; revision=33496 --- pkgs/applications/office/openoffice/libreoffice.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/office/openoffice/libreoffice.nix b/pkgs/applications/office/openoffice/libreoffice.nix index 0febf2dcbad87..fb577be039074 100644 --- a/pkgs/applications/office/openoffice/libreoffice.nix +++ b/pkgs/applications/office/openoffice/libreoffice.nix @@ -7,7 +7,7 @@ , librsvg, gnome_vfs, gstreamer, gst_plugins_base, mesa , autoconf, automake, openldap, bash , fontsConf -, langs ? [ "en-GB" "ca" "ru" "eo" "fr" "nl" "de" ] +, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" ] }: let -- cgit 1.4.1 From 5f01a1d8b68541863e3281296e4fe112f124fc30 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 31 Mar 2012 15:57:35 +0000 Subject: Let virtualbox build on linux 3.3+ svn path=/nixpkgs/trunk/; revision=33498 --- pkgs/applications/virtualization/virtualbox/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/applications') diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 9fa26eba4ab0b..350b73e339f59 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -13,6 +13,8 @@ let version = "4.1.10"; in stdenv.mkDerivation { name = "virtualbox-${version}-${kernel.version}"; + NIX_CFLAGS_COMPILE="-I${kernel}/lib/modules/${kernel.modDirVersion}/build/include/generated"; + src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; sha256 = "1gsp3arp79x6gmh403sayh4lzr3l8fc3anp664fyl1dl0ykgmqs7"; -- cgit 1.4.1