Author: urkud
Date: Sat Mar 31 20:01:40 2012
New Revision: 33500
URL: https://nixos.org/websvn/nix/?rev=33500&sc=1
Log:
svn merge ^/nixpkgs/trunk
- 1 conflict (gnome-doc-utils)
- final merge before --reintegrate
Added:
nixpkgs/branches/glib-2.30-take2/pkgs/applications/misc/nut/2.6.3.nix
- copied unchanged from r33499,
nixpkgs/trunk/pkgs/applications/misc/nut/2.6.3.nix
nixpkgs/branches/glib-2.30-take2/pkgs/applications/networking/instant-messengers/telepathy/logger/
- copied from r33499,
nixpkgs/trunk/pkgs/applications/networking/instant-messengers/telepathy/logger/
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/attempt/default.nix
- copied unchanged from r33499,
nixpkgs/trunk/pkgs/development/libraries/haskell/attempt/default.nix
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/failure/default.nix
- copied unchanged from r33499,
nixpkgs/trunk/pkgs/development/libraries/haskell/failure/default.nix
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/zlib-bindings/0.1.0.1.nix
- copied unchanged from r33499,
nixpkgs/trunk/pkgs/development/libraries/haskell/zlib-bindings/0.1.0.1.nix
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/libicns/
- copied from r33499, nixpkgs/trunk/pkgs/development/libraries/libicns/
nixpkgs/branches/glib-2.30-take2/pkgs/os-specific/linux/tp_smapi/
- copied from r33499, nixpkgs/trunk/pkgs/os-specific/linux/tp_smapi/
nixpkgs/branches/glib-2.30-take2/pkgs/servers/memcached/
- copied from r33499, nixpkgs/trunk/pkgs/servers/memcached/
nixpkgs/branches/glib-2.30-take2/pkgs/tools/misc/fortune/
- copied from r33499, nixpkgs/trunk/pkgs/tools/misc/fortune/
nixpkgs/branches/glib-2.30-take2/pkgs/tools/misc/refind/
- copied from r33499, nixpkgs/trunk/pkgs/tools/misc/refind/
Deleted:
nixpkgs/branches/glib-2.30-take2/pkgs/build-support/usernixos/
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/attempt/0.3.1.1.nix
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/attempt/0.4.0.nix
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/convertible-text/
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/failure/0.1.2.nix
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/failure/0.2.0.nix
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/zlib-bindings/0.1.0.nix
Modified:
nixpkgs/branches/glib-2.30-take2/ (props changed)
nixpkgs/branches/glib-2.30-take2/pkgs/applications/misc/mupdf/default.nix
nixpkgs/branches/glib-2.30-take2/pkgs/applications/office/openoffice/libreoffice.nix
nixpkgs/branches/glib-2.30-take2/pkgs/applications/virtualization/virtualbox/default.nix
nixpkgs/branches/glib-2.30-take2/pkgs/data/documentation/man-pages/default.nix
nixpkgs/branches/glib-2.30-take2/pkgs/development/compilers/idris/default.nix
nixpkgs/branches/glib-2.30-take2/pkgs/development/compilers/jdk/jdk6-linux.nix
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/RSA/default.nix
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/SHA/default.nix
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/blaze-html/default.nix
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/bmp/default.nix
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/derive/default.nix
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/hakyll/default.nix
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/resourcet/default.nix
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/openjpeg/default.nix
nixpkgs/branches/glib-2.30-take2/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
nixpkgs/branches/glib-2.30-take2/pkgs/lib/maintainers.nix
nixpkgs/branches/glib-2.30-take2/pkgs/lib/strings.nix
nixpkgs/branches/glib-2.30-take2/pkgs/os-specific/linux/pam_usb/default.nix
nixpkgs/branches/glib-2.30-take2/pkgs/tools/filesystems/btrfsprogs/default.nix
nixpkgs/branches/glib-2.30-take2/pkgs/tools/package-management/nix/unstable.nix
nixpkgs/branches/glib-2.30-take2/pkgs/top-level/all-packages.nix
nixpkgs/branches/glib-2.30-take2/pkgs/top-level/haskell-packages.nix
Modified:
nixpkgs/branches/glib-2.30-take2/pkgs/applications/misc/mupdf/default.nix
==============================================================================
--- nixpkgs/branches/glib-2.30-take2/pkgs/applications/misc/mupdf/default.nix
Sat Mar 31 19:50:54 2012 (r33499)
+++ nixpkgs/branches/glib-2.30-take2/pkgs/applications/misc/mupdf/default.nix
Sat Mar 31 20:01:40 2012 (r33500)
@@ -4,7 +4,7 @@
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";
};
Copied: nixpkgs/branches/glib-2.30-take2/pkgs/applications/misc/nut/2.6.3.nix
(from r33499, nixpkgs/trunk/pkgs/applications/misc/nut/2.6.3.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/glib-2.30-take2/pkgs/applications/misc/nut/2.6.3.nix
Sat Mar 31 20:01:40 2012 (r33500, copy of r33499,
nixpkgs/trunk/pkgs/applications/misc/nut/2.6.3.nix)
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi }:
+
+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 = [ 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-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;
+ };
+}
Modified:
nixpkgs/branches/glib-2.30-take2/pkgs/applications/office/openoffice/libreoffice.nix
==============================================================================
---
nixpkgs/branches/glib-2.30-take2/pkgs/applications/office/openoffice/libreoffice.nix
Sat Mar 31 19:50:54 2012 (r33499)
+++
nixpkgs/branches/glib-2.30-take2/pkgs/applications/office/openoffice/libreoffice.nix
Sat Mar 31 20:01:40 2012 (r33500)
@@ -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
Modified:
nixpkgs/branches/glib-2.30-take2/pkgs/applications/virtualization/virtualbox/default.nix
==============================================================================
---
nixpkgs/branches/glib-2.30-take2/pkgs/applications/virtualization/virtualbox/default.nix
Sat Mar 31 19:50:54 2012 (r33499)
+++
nixpkgs/branches/glib-2.30-take2/pkgs/applications/virtualization/virtualbox/default.nix
Sat Mar 31 20:01:40 2012 (r33500)
@@ -13,6 +13,8 @@
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";
Modified:
nixpkgs/branches/glib-2.30-take2/pkgs/data/documentation/man-pages/default.nix
==============================================================================
---
nixpkgs/branches/glib-2.30-take2/pkgs/data/documentation/man-pages/default.nix
Sat Mar 31 19:50:54 2012 (r33499)
+++
nixpkgs/branches/glib-2.30-take2/pkgs/data/documentation/man-pages/default.nix
Sat Mar 31 20:01:40 2012 (r33500)
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "man-pages-3.35";
+ name = "man-pages-3.38";
src = fetchurl {
- url = "mirror://kernel/linux/docs/man-pages/Archive/${name}.tar.bz2";
- sha256 = "186zn80k10jg1m4jp5x5x73f7cczydsjcw5zxc5d9lls5wvafp66";
+ url = "mirror://kernel/linux/docs/man-pages/Archive/${name}.tar.xz";
+ sha256 = "10ha41yj5v3rjy73x8kpn65srbcy0iz399vv149bh12lvyv67kvy";
};
preBuild =
Modified:
nixpkgs/branches/glib-2.30-take2/pkgs/development/compilers/idris/default.nix
==============================================================================
---
nixpkgs/branches/glib-2.30-take2/pkgs/development/compilers/idris/default.nix
Sat Mar 31 19:50:54 2012 (r33499)
+++
nixpkgs/branches/glib-2.30-take2/pkgs/development/compilers/idris/default.nix
Sat Mar 31 20:01:40 2012 (r33500)
@@ -4,15 +4,14 @@
cabal.mkDerivation (self: {
pname = "idris";
- version = "0.9.2";
- sha256 = "0n4dh3vxkjvw8rb5iqm8lvi21q2ljw2pzn453wfcisdadkpv4fh5";
+ version = "0.9.2.1";
+ sha256 = "16jbmyza57066s3wmkvgwn11kqn0nzkjrrvsinh9xd69a79h2iiy";
isLibrary = false;
isExecutable = true;
buildDepends = [
binary Cabal epic filepath haskeline mtl parsec transformers
];
buildTools = [ happy ];
- noHaddock = true;
meta = {
homepage = "http://www.idris-lang.org/";;
description = "Functional Programming Language with Dependent Types";
Modified:
nixpkgs/branches/glib-2.30-take2/pkgs/development/compilers/jdk/jdk6-linux.nix
==============================================================================
---
nixpkgs/branches/glib-2.30-take2/pkgs/development/compilers/jdk/jdk6-linux.nix
Sat Mar 31 19:50:54 2012 (r33499)
+++
nixpkgs/branches/glib-2.30-take2/pkgs/development/compilers/jdk/jdk6-linux.nix
Sat Mar 31 20:01:40 2012 (r33500)
@@ -28,18 +28,18 @@
stdenv.mkDerivation {
name =
- if installjdk then "jdk-1.6.0_24" else "jre-1.6.0_24";
+ if installjdk then "jdk-1.6.0_32b03" else "jre-1.6.0_32b03";
src =
if stdenv.system == "i686-linux" then
fetchurl {
- url =
http://download.java.net/dlj/binaries/jdk-6u24-dlj-linux-i586.bin;
- sha256 = "003vf5dhizwd1pcvv6jazx59d1dwws1m87fjbjagbnnra7bka89p";
+ url =
http://www.java.net/download/jdk6/6u32/promoted/b03/binaries/jdk-6u32-ea-bin-b03-linux-i586-29_feb_2012.bin;
+ md5 = "7c009afa399476c7d2791386235b8e3b";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
- url =
http://download.java.net/dlj/binaries/jdk-6u24-dlj-linux-amd64.bin;
- sha256 = "17r1rv82q2zlhkillkgkxsirnkzpbsi6f2qg4sjrg0154sk6iflq";
+ url =
http://www.java.net/download/jdk6/6u32/promoted/b03/binaries/jdk-6u32-ea-bin-b03-linux-amd64-29_feb_2012.bin;
+ md5 = "7f1a45531a04c372e5660a55c2dfdad8";
}
else
abort "jdk requires i686-linux or x86_64 linux";
Modified:
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/RSA/default.nix
==============================================================================
---
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/RSA/default.nix
Sat Mar 31 19:50:54 2012 (r33499)
+++
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/RSA/default.nix
Sat Mar 31 20:01:40 2012 (r33500)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "RSA";
- version = "1.0.6.2";
- sha256 = "0sabvwzgjg6nv5m3x9cjpk5q62r8vhi3kn858ask15frsi7lzhwk";
+ version = "1.0.6.3";
+ sha256 = "0lk3nsh6nvacv1xzrg2pxxhd5gglmy40dkb8a47c9r9px0q6yjpj";
isLibrary = true;
isExecutable = true;
buildDepends = [ binary pureMD5 random SHA ];
Modified:
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/SHA/default.nix
==============================================================================
---
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/SHA/default.nix
Sat Mar 31 19:50:54 2012 (r33499)
+++
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/SHA/default.nix
Sat Mar 31 20:01:40 2012 (r33500)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "SHA";
- version = "1.5.0.0";
- sha256 = "12sz1dblmpiy8bg45fwndp1g9gf7494vqqbvbd1hwr5qzyfwyqck";
+ version = "1.5.0.1";
+ sha256 = "1nyj50hyka2fnk9nnidygl8d52xgvmj9m8aywjzbzdaxxrmdab8g";
isLibrary = true;
isExecutable = true;
buildDepends = [ binary ];
Copied:
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/attempt/default.nix
(from r33499,
nixpkgs/trunk/pkgs/development/libraries/haskell/attempt/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/attempt/default.nix
Sat Mar 31 20:01:40 2012 (r33500, copy of r33499,
nixpkgs/trunk/pkgs/development/libraries/haskell/attempt/default.nix)
@@ -0,0 +1,15 @@
+{ cabal, failure }:
+
+cabal.mkDerivation (self: {
+ pname = "attempt";
+ version = "0.4.0";
+ sha256 = "0n7srd1gy1fa0q1qzizvdgmrc078jyx47115aw85vvl74vh9qyjy";
+ buildDepends = [ failure ];
+ meta = {
+ homepage = "http://github.com/snoyberg/attempt/tree/master";;
+ description = "Concrete data type for handling extensible exceptions as
failures";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
Modified:
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/blaze-html/default.nix
==============================================================================
---
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/blaze-html/default.nix
Sat Mar 31 19:50:54 2012 (r33499)
+++
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/blaze-html/default.nix
Sat Mar 31 20:01:40 2012 (r33500)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "blaze-html";
- version = "0.4.3.2";
- sha256 = "1mqfvkmjfqy777h4skvgm9nxjgyi12k8alg7mvsk0aj1i80gvkki";
+ version = "0.4.3.3";
+ sha256 = "0a3g4s4k85h2qvs2kcalv83ma4z5arqdydla64q5d1qlk9c99mzg";
buildDepends = [ blazeBuilder text ];
meta = {
homepage = "http://jaspervdj.be/blaze";;
Modified:
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/bmp/default.nix
==============================================================================
---
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/bmp/default.nix
Sat Mar 31 19:50:54 2012 (r33499)
+++
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/bmp/default.nix
Sat Mar 31 20:01:40 2012 (r33500)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "bmp";
- version = "1.2.0.2";
- sha256 = "0y1fjbhk73dj260wd1jhcf12fkh4maba4iwkzdg2087s9saxvljk";
+ version = "1.2.1.1";
+ sha256 = "0s5srqkaccrwh9gsxn9kmyh4jf0qf40ix8ipi0b70fbbffr97hmk";
buildDepends = [ binary ];
meta = {
homepage = "http://code.ouroborus.net/bmp";;
Modified:
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/derive/default.nix
==============================================================================
---
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/derive/default.nix
Sat Mar 31 19:50:54 2012 (r33499)
+++
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/derive/default.nix
Sat Mar 31 20:01:40 2012 (r33500)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "derive";
- version = "2.5.6";
- sha256 = "1ckxm6s2y9dvlj1785b27a2zvah4radypxjpq7sxn970r6m5dv0h";
+ version = "2.5.7";
+ sha256 = "1a6nz0a7axgdghljcb87h4bhisjfsnpxpdbqlrxymw4zqislg9p3";
isLibrary = true;
isExecutable = true;
buildDepends = [
Copied:
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/failure/default.nix
(from r33499,
nixpkgs/trunk/pkgs/development/libraries/haskell/failure/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/failure/default.nix
Sat Mar 31 20:01:40 2012 (r33500, copy of r33499,
nixpkgs/trunk/pkgs/development/libraries/haskell/failure/default.nix)
@@ -0,0 +1,15 @@
+{ cabal, transformers }:
+
+cabal.mkDerivation (self: {
+ pname = "failure";
+ version = "0.2.0.1";
+ sha256 = "05k62sb2xj4ddjwsbfldxkap7v5kmv04qzic4sszx5i3ykbf20fd";
+ buildDepends = [ transformers ];
+ meta = {
+ homepage = "http://www.haskell.org/haskellwiki/Failure";;
+ description = "A simple type class for success/failure computations";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
Modified:
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/hakyll/default.nix
==============================================================================
---
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/hakyll/default.nix
Sat Mar 31 19:50:54 2012 (r33499)
+++
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/hakyll/default.nix
Sat Mar 31 20:01:40 2012 (r33500)
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "hakyll";
- version = "3.2.6.2";
- sha256 = "07l2igpmr4kd47zk88hz2salzzc92dh7wpny6xr5pw5xf95lpx7p";
+ version = "3.2.7.0";
+ sha256 = "1jx4csfdr7icjrg9hvlw5pyi29qf3yyx0sjaw7nchz8jk43ikr2b";
buildDepends = [
binary blazeHtml citeprocHs cryptohash filepath hamlet mtl pandoc
parsec regexBase regexTdfa snapCore snapServer tagsoup time
Modified:
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
==============================================================================
---
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
Sat Mar 31 19:50:54 2012 (r33499)
+++
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
Sat Mar 31 20:01:40 2012 (r33500)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "happstack-hamlet";
- version = "6.2.4";
- sha256 = "1m03r1wk34lx9b2bmcrakcaaq701vcdkw2shxmqwk6fsbgh7qjp0";
+ version = "7.0.0";
+ sha256 = "15r6xpyg193iwqin96mn7c9x5w7l8q9m3vbgiwv7bxvhdrl1dp7j";
buildDepends = [ hamlet happstackServer text ];
meta = {
homepage = "http://www.happstack.com/";;
Modified:
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/resourcet/default.nix
==============================================================================
---
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/resourcet/default.nix
Sat Mar 31 19:50:54 2012 (r33499)
+++
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/resourcet/default.nix
Sat Mar 31 20:01:40 2012 (r33500)
@@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = "resourcet";
- version = "0.3.1";
- sha256 = "0nz1rz0nrs693hfav687rci3rhrhsmnjb93949mxgyd0ka5pw90l";
+ version = "0.3.2";
+ sha256 = "0vaygw17cfx2y2lv32lmr7x0vch58dh19jmh8j7mcj11qy5v0nz8";
buildDepends = [
liftedBase monadControl transformers transformersBase
];
Copied:
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/zlib-bindings/0.1.0.1.nix
(from r33499,
nixpkgs/trunk/pkgs/development/libraries/haskell/zlib-bindings/0.1.0.1.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/haskell/zlib-bindings/0.1.0.1.nix
Sat Mar 31 20:01:40 2012 (r33500, copy of r33499,
nixpkgs/trunk/pkgs/development/libraries/haskell/zlib-bindings/0.1.0.1.nix)
@@ -0,0 +1,15 @@
+{ cabal, zlib }:
+
+cabal.mkDerivation (self: {
+ pname = "zlib-bindings";
+ version = "0.1.0.1";
+ sha256 = "0r1hjmmxb9kz5fvfrjvzjd0pnhb87vyldqvb73yjq35s16bj4vlc";
+ buildDepends = [ zlib ];
+ meta = {
+ homepage = "http://github.com/snoyberg/zlib-bindings";;
+ description = "Low-level bindings to the zlib package";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
Modified:
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/openjpeg/default.nix
==============================================================================
---
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/openjpeg/default.nix
Sat Mar 31 19:50:54 2012 (r33499)
+++
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/openjpeg/default.nix
Sat Mar 31 20:01:40 2012 (r33500)
@@ -1,21 +1,13 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
- name = "openjpeg-1.2";
+ name = "openjpeg-1.5.0";
src = fetchurl {
- url = http://www.openjpeg.org/openjpeg_v1_2.tar.gz;
- sha256 = "1i72i0hhssgg6vfkaw3gpwf5ld65g9s77ay8pxd4any1xy54qa90";
+ url = http://openjpeg.googlecode.com/files/openjpeg-1.5.0.tar.gz;
+ sha256 = "1kja6s9dk0hh7p9064kg69y6vninwyvpqi8cap92waj38jmqz469";
};
- patchPhase = ''
- sed -i -e 's/-o root -g [^ ]\+//' Makefile Makefile.osx
- '';
-
- preInstall = ''
- export installFlags="PREFIX=$out"
- '';
-
meta = {
homepage = http://www.openjpeg.org/;
description = "Open-source JPEG 2000 codec written in C language";
Modified:
nixpkgs/branches/glib-2.30-take2/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
==============================================================================
---
nixpkgs/branches/glib-2.30-take2/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
Sat Mar 31 19:50:54 2012 (r33499)
+++
nixpkgs/branches/glib-2.30-take2/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
Sat Mar 31 20:01:40 2012 (r33500)
@@ -11,6 +11,7 @@
configureFlags = "--disable-scrollkeeper";
buildInputs = [ python libxml2Python libxslt ];
+ pythonPath = [ libxml2Python ];
postInstall = "wrapPythonPrograms";
buildNativeInputs = [ pkgconfig intltool pythonPackages.wrapPython ];
Modified: nixpkgs/branches/glib-2.30-take2/pkgs/lib/maintainers.nix
==============================================================================
--- nixpkgs/branches/glib-2.30-take2/pkgs/lib/maintainers.nix Sat Mar 31
19:50:54 2012 (r33499)
+++ nixpkgs/branches/glib-2.30-take2/pkgs/lib/maintainers.nix Sat Mar 31
20:01:40 2012 (r33500)
@@ -10,7 +10,9 @@
bjg = "Brian Gough <[email protected]>";
bluescreen303 = "Mathijs Kwik <[email protected]>";
chaoflow = "Florian Friesdorf <[email protected]>";
+ coconnor = "Corey O'Connor <[email protected]>";
eelco = "Eelco Dolstra <[email protected]>";
+ garbas = "Rok Garbas <[email protected]>";
goibhniu = "Cillian de Róiste <[email protected]>";
guibert = "David Guibert <[email protected]>";
kkallio = "Karn Kallio <[email protected]>";
Modified: nixpkgs/branches/glib-2.30-take2/pkgs/lib/strings.nix
==============================================================================
--- nixpkgs/branches/glib-2.30-take2/pkgs/lib/strings.nix Sat Mar 31
19:50:54 2012 (r33499)
+++ nixpkgs/branches/glib-2.30-take2/pkgs/lib/strings.nix Sat Mar 31
20:01:40 2012 (r33500)
@@ -17,7 +17,7 @@
# Map a function over a list and concatenate the resulting strings.
concatMapStrings = f: list: concatStrings (map f list);
concatImapStrings = f: list: concatStrings (lib.imap f list);
-
+
# Place an element between each element of a list, e.g.,
# `intersperse "," ["a" "b" "c"]' returns ["a" "," "b" "," "c"].
@@ -37,7 +37,7 @@
# Construct a Unix-style search path consisting of each `subDir"
# directory of the given list of packages. For example,
# `makeSearchPath "bin" ["x" "y" "z"]' returns "x/bin:y/bin:z/bin".
- makeSearchPath = subDir: packages:
+ makeSearchPath = subDir: packages:
concatStringsSep ":" (map (path: path + "/" + subDir) packages);
@@ -48,13 +48,13 @@
# Idem for Perl search paths.
makePerlPath = makeSearchPath "lib/perl5/site_perl";
-
+
# Dependening on the boolean `cond', return either the given string
# or the empty string.
optionalString = cond: string: if cond then string else "";
-
+
# Determine whether a filename ends in the given suffix.
hasSuffix = ext: fileName:
let lenFileName = stringLength fileName;
@@ -74,7 +74,7 @@
then []
else map (p: substring p 1 s) (lib.range 0 (sub l 1));
-
+
# Manipulate a string charcater by character and replace them by strings
# before concatenating the results.
stringAsChars = f: s:
@@ -82,18 +82,18 @@
map f (stringToCharacters s)
);
-
+
# same as vim escape function.
# Each character contained in list is prefixed by "\"
escape = list : string :
stringAsChars (c: if lib.elem c list then "\\${c}" else c) string;
-
+
# still ugly slow. But more correct now
# [] for zsh
escapeShellArg = lib.escape (stringToCharacters "\\ ';$`()|<>\t*[]");
-
+
# replace characters by their substitutes. This function is equivalent to
# the `tr' command except that one character can be replace by multiple
# ones. e.g.,
@@ -108,12 +108,12 @@
in
stringAsChars subst s;
-
+
# Compares strings not requiring context equality
# Obviously, a workaround but works on all Nix versions
eqStrings = a: b: (a+(substring 0 0 b)) == ((substring 0 0 a)+b);
-
+
# Cut a string with a separator and produces a list of strings which were
# separated by this separator. e.g.,
# `splitString "." "foo.bar.baz"' returns ["foo" "bar" "baz"].
@@ -138,7 +138,7 @@
in
recurse 0 0;
-
+
# return the suffix of the second argument if the first argument match its
# prefix. e.g.,
# `removePrefix "foo." "foo.bar.baz"' returns "bar.baz".
@@ -152,9 +152,7 @@
else
s;
-
# Return true iff string v1 denotes a version older than v2.
versionOlder = v1: v2: builtins.compareVersions v2 v1 == 1;
-
}
Modified:
nixpkgs/branches/glib-2.30-take2/pkgs/os-specific/linux/pam_usb/default.nix
==============================================================================
--- nixpkgs/branches/glib-2.30-take2/pkgs/os-specific/linux/pam_usb/default.nix
Sat Mar 31 19:50:54 2012 (r33499)
+++ nixpkgs/branches/glib-2.30-take2/pkgs/os-specific/linux/pam_usb/default.nix
Sat Mar 31 20:01:40 2012 (r33500)
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, makeWrapper, useSetUID, dbus, libxml2, pam, hal, pkgconfig,
pmount, python, pythonDBus}:
+{stdenv, fetchurl, makeWrapper, useSetUID, dbus, libxml2, pam, pkgconfig,
pmount, python, pythonDBus}:
let
pmountBin = useSetUID pmount "/bin/pmount";
@@ -16,7 +16,7 @@
buildInputs = [
makeWrapper
# pam_usb dependencies
- dbus libxml2 pam hal pmount pkgconfig
+ dbus libxml2 pam pmount pkgconfig
# pam_usb's tools dependencies
python
# cElementTree is included with python 2.5 and later.
Modified:
nixpkgs/branches/glib-2.30-take2/pkgs/tools/filesystems/btrfsprogs/default.nix
==============================================================================
---
nixpkgs/branches/glib-2.30-take2/pkgs/tools/filesystems/btrfsprogs/default.nix
Sat Mar 31 19:50:54 2012 (r33499)
+++
nixpkgs/branches/glib-2.30-take2/pkgs/tools/filesystems/btrfsprogs/default.nix
Sat Mar 31 20:01:40 2012 (r33500)
@@ -3,9 +3,9 @@
fetchurl = a.fetchurl;
fetchgit = a.fetchgit;
- version = a.lib.attrByPath ["version"] "0.19" a;
+ version = a.lib.attrByPath ["version"] "0.19-20120328" a;
buildInputs = with a; [
- zlib libuuid acl attr
+ zlib libuuid acl attr e2fsprogs
];
in
@@ -14,8 +14,8 @@
rec {
srcDrv = fetchgit {
url="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git" ;
- rev="fdb6c0402337d9607c7a39155088eaf033742752" ;
- sha256="de7f9e04401bd747a831c48d312106e188adb32f32b6d64078ae6d2aab45b1f8" ;
+ rev="1957076ab4fefa47b6efed3da541bc974c83eed7";
+ sha256="566d863c5500652e999d0d6b823365fb06f2f8f9523e65e69eaa3e993e9b26e1";
};
src = srcDrv + "/";
Modified:
nixpkgs/branches/glib-2.30-take2/pkgs/tools/package-management/nix/unstable.nix
==============================================================================
---
nixpkgs/branches/glib-2.30-take2/pkgs/tools/package-management/nix/unstable.nix
Sat Mar 31 19:50:54 2012 (r33499)
+++
nixpkgs/branches/glib-2.30-take2/pkgs/tools/package-management/nix/unstable.nix
Sat Mar 31 20:01:40 2012 (r33500)
@@ -5,20 +5,19 @@
}:
stdenv.mkDerivation rec {
- name = "nix-1.0pre2614_005d1e4";
+ name = "nix-1.0pre2632_b8fb0ce";
src = fetchurl {
- url = "http://hydra.nixos.org/build/2230618/download/4/${name}.tar.bz2";;
- sha256 =
"47a4ff811f0d23d1c0176bc1fbb828edf16906568b0cbf5942b912ed2d2c1b44";
+ url = "http://hydra.nixos.org/build/2337744/download/4/${name}.tar.bz2";;
+ sha256 =
"5f965a54ac4ef949b1531d21c3bc1c920552ea3103a39669a3b8a4f3187bd6da";
};
buildNativeInputs = [ perl pkgconfig ];
- buildInputs = [ curl openssl boehmgc ];
+ buildInputs = [ curl openssl boehmgc bzip2 sqlite ];
configureFlags =
''
--with-store-dir=${storeDir} --localstatedir=${stateDir}
- --with-bzip2=${bzip2} --with-sqlite=${sqlite}
--with-dbi=${perlPackages.DBI}/lib/perl5/site_perl
--with-dbd-sqlite=${perlPackages.DBDSQLite}/lib/perl5/site_perl
--disable-init-state
@@ -30,11 +29,10 @@
configureFlags =
''
--with-store-dir=${storeDir} --localstatedir=${stateDir}
- --with-bzip2=${bzip2.hostDrv} --with-sqlite=${sqlite.hostDrv}
- --enable-gc
--with-dbi=${perlPackages.DBI}/lib/perl5/site_perl
--with-dbd-sqlite=${perlPackages.DBDSQLite}/lib/perl5/site_perl
--disable-init-state
+ --enable-gc
CFLAGS=-O3 CXXFLAGS=-O3
'' + stdenv.lib.optionalString (
stdenv.cross ? nix && stdenv.cross.nix ? system
@@ -44,11 +42,9 @@
enableParallelBuilding = true;
- doCheck = true;
+ installCheckPhase = "make installcheck";
- # Hack to get the check to succeed on Darwin.
- phases = stdenv.lib.optionalString stdenv.isDarwin
- "$prePhases unpackPhase patchPhase $preConfigurePhases configurePhase
$preBuildPhases buildPhase $preInstallPhases installPhase checkPhase fixupPhase
$preDistPhases distPhase $postPhases";
+ postPhases = [ "installCheckPhase" ];
meta = {
description = "The Nix Deployment System";
Modified: nixpkgs/branches/glib-2.30-take2/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/glib-2.30-take2/pkgs/top-level/all-packages.nix Sat Mar
31 19:50:54 2012 (r33499)
+++ nixpkgs/branches/glib-2.30-take2/pkgs/top-level/all-packages.nix Sat Mar
31 20:01:40 2012 (r33500)
@@ -353,16 +353,6 @@
inherit pkgs lib;
};
- usernixos = let
- configmodule = getConfig [ "usernixos" ] null;
- eval = (import ../build-support/usernixos/eval-config.nix) {
- inherit pkgs system;
- modules = [ configmodule ];
- };
- in
- assert configmodule != null;
- eval.config.activation.toplevel;
-
platforms = import ./platforms.nix;
@@ -442,7 +432,7 @@
bootchart = callPackage ../tools/system/bootchart { };
btrfsProgs = builderDefsPackage (import ../tools/filesystems/btrfsprogs) {
- inherit libuuid zlib acl attr fetchgit;
+ inherit (pkgs) libuuid zlib acl attr fetchgit e2fsprogs;
};
catdoc = callPackage ../tools/text/catdoc { };
@@ -704,6 +694,8 @@
withX11 = true;
};
+ fortune = callPackage ../tools/misc/fortune { };
+
freeipmi = callPackage ../tools/system/freeipmi {};
freetalk = callPackage
../applications/networking/instant-messengers/freetalk {
@@ -1288,6 +1280,8 @@
recutils = callPackage ../tools/misc/recutils { };
+ refind = callPackage ../tools/misc/refind { };
+
reiser4progs = callPackage ../tools/filesystems/reiser4progs { };
reiserfsprogs = callPackage ../tools/filesystems/reiserfsprogs { };
@@ -1950,17 +1944,26 @@
})));
gccApple =
- wrapGCC ( (if stdenv.system == "i686-darwin" then import
../development/compilers/gcc/4.2-apple32 else import
../development/compilers/gcc/4.2-apple64) {
- inherit fetchurl stdenv noSysDirs;
- profiledCompiler = true;
- });
+ wrapGCC (makeOverridable
+ (if stdenv.system == "i686-darwin"
+ then import ../development/compilers/gcc/4.2-apple32
+ else import ../development/compilers/gcc/4.2-apple64) {
+ inherit fetchurl stdenv noSysDirs;
+ profiledCompiler = true;
+ });
gccupc40 = wrapGCCUPC (import ../development/compilers/gcc-upc-4.0 {
inherit fetchurl stdenv bison autoconf gnum4 noSysDirs;
texinfo = texinfo49;
});
- gfortran = gfortran46;
+ gfortran =
+ if stdenv.isDarwin
+ then wrapGCC (gccApple.gcc.override {
+ langF77 = true;
+ inherit gmp mpfr bison flex;
+ })
+ else gfortran46;
gfortran40 = wrapGCC (gcc40.gcc.override {
langFortran = true;
@@ -4047,6 +4050,8 @@
libical = callPackage ../development/libraries/libical { };
+ libicns = callPackage ../development/libraries/libicns { };
+
libimobiledevice = callPackage ../development/libraries/libimobiledevice { };
libiodbc = callPackage ../development/libraries/libiodbc {
@@ -5145,6 +5150,8 @@
ffmpeg = ffmpeg_0_6_90;
};
+ memcached = callPackage ../servers/memcached {};
+
mod_python = callPackage ../servers/http/apache-modules/mod_python { };
mod_fastcgi = callPackage ../servers/http/apache-modules/mod_fastcgi { };
@@ -5798,6 +5805,8 @@
inherit (gnome) libglademm;
};
+ tp_smapi = callPackage ../os-specific/linux/tp_smapi { };
+
v86d = callPackage ../os-specific/linux/v86d { };
virtualbox = callPackage ../applications/virtualization/virtualbox {
@@ -7433,6 +7442,8 @@
inherit (pkgs.gnome) libsoup;
};
+ telepathy_logger = callPackage
../applications/networking/instant-messengers/telepathy/logger {};
+
telepathy_mission_control = callPackage
../applications/networking/instant-messengers/telepathy/mission-control { };
telepathy_rakia = callPackage
../applications/networking/instant-messengers/telepathy/rakia { };
@@ -8452,6 +8463,8 @@
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 {
Modified: nixpkgs/branches/glib-2.30-take2/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/branches/glib-2.30-take2/pkgs/top-level/haskell-packages.nix
Sat Mar 31 19:50:54 2012 (r33499)
+++ nixpkgs/branches/glib-2.30-take2/pkgs/top-level/haskell-packages.nix
Sat Mar 31 20:01:40 2012 (r33500)
@@ -442,11 +442,7 @@
async = callPackage ../development/libraries/haskell/async {};
- attempt_0_3_1_1 = callPackage
../development/libraries/haskell/attempt/0.3.1.1.nix {
- failure = self.failure_0_1_2;
- };
- attempt_0_4_0 = callPackage
../development/libraries/haskell/attempt/0.4.0.nix {};
- attempt = self.attempt_0_4_0;
+ attempt = callPackage ../development/libraries/haskell/attempt {};
attoparsec = callPackage ../development/libraries/haskell/attoparsec {};
@@ -558,10 +554,6 @@
time = self.time_1_1_3;
};
- convertibleText = callPackage
../development/libraries/haskell/convertible-text {
- attempt = self.attempt_0_3_1_1;
- };
-
continuedFractions = callPackage
../development/libraries/haskell/continued-fractions {};
converge = callPackage ../development/libraries/haskell/converge {};
@@ -664,9 +656,7 @@
extensibleExceptions_0_1_1_4 = callPackage
../development/libraries/haskell/extensible-exceptions/0.1.1.4.nix {};
extensibleExceptions = null; # a core package in recent GHCs
- failure_0_1_2 = callPackage
../development/libraries/haskell/failure/0.1.2.nix {};
- failure_0_2_0 = callPackage
../development/libraries/haskell/failure/0.2.0.nix {};
- failure = self.failure_0_2_0;
+ failure = callPackage ../development/libraries/haskell/failure {};
fastLogger = callPackage ../development/libraries/haskell/fast-logger {};
@@ -1536,7 +1526,7 @@
zlib = self.zlib_0_5_3_3;
zlibBindings_0_0_3_2 = callPackage
../development/libraries/haskell/zlib-bindings/0.0.3.2.nix {};
- zlibBindings_0_1_0 = callPackage
../development/libraries/haskell/zlib-bindings/0.1.0.nix {};
+ zlibBindings_0_1_0_1 = callPackage
../development/libraries/haskell/zlib-bindings/0.1.0.1.nix {};
zlibBindings = self.zlibBindings_0_0_3_2;
zlibConduit = callPackage ../development/libraries/haskell/zlib-conduit {};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
