From ad943dbbe3a34d7e7e026ecc769064f8f9b51c26 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 21 May 2012 23:31:28 +0000 Subject: * OpenSSL 1.0.0j (CVE-2012-2333). svn path=/nixpkgs/branches/stdenv-updates/; revision=34205 --- pkgs/development/libraries/openssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index cd164b13f8e3..f8d2b32542c9 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl }: let - name = "openssl-1.0.0i"; + name = "openssl-1.0.0j"; opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] (throw "openssl needs its platform name cross building" null) @@ -35,7 +35,7 @@ stdenv.mkDerivation { "http://www.openssl.org/source/${name}.tar.gz" "http://openssl.linux-mirror.org/source/${name}.tar.gz" ]; - sha1 = "b7aa11cbd7d264c2b1f44e3d55b334fb33f7b674"; + sha1 = "31e6e8bbf1de2f59fbd53382c34214887ccc1318"; }; patches = patchesCross false; -- cgit 1.4.1 From 3694b0f892867a7b5d714eb7efa6532683a4bdc4 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Sun, 19 Aug 2012 13:22:54 +0200 Subject: glibc: setting --enable-kernel=2.6.35 It was taking 2.4.0 as default, therefore, not using syscalls over 2.4.0 We may see performance improvements (openat, ...) --- pkgs/development/libraries/glibc/2.13/common.nix | 2 ++ pkgs/os-specific/linux/kernel-headers/default.nix | 4 ++++ 2 files changed, 6 insertions(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/glibc/2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix index 535fb373e04e..5db9e08e3f92 100644 --- a/pkgs/development/libraries/glibc/2.13/common.nix +++ b/pkgs/development/libraries/glibc/2.13/common.nix @@ -110,6 +110,8 @@ stdenv.mkDerivation ({ (if profilingLibraries then "--enable-profile" else "--disable-profile") + ] ++ stdenv.lib.optionals (cross == null) [ + "--enable-kernel=${kernelHeaders.versionForGlibc}" ] ++ stdenv.lib.optionals (cross != null) [ (if cross.withTLS then "--with-tls" else "--without-tls") (if cross.float == "soft" then "--without-fp" else "--with-fp") diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index 3fb5ef8ef2df..f6004ccb1513 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -59,4 +59,8 @@ stdenv.mkDerivation { ln -s asm $out/include/asm-x86 fi ''; + + passthru = { + versionForGlibc = "2.6.35"; + }; } -- cgit 1.4.1 From 93a7450c6a3987cee67a28efc3e1e51318a8d166 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Mon, 20 Aug 2012 10:04:07 +0200 Subject: glibc: fixing the glibcLocales build It was stopping hydra from evaluating further, I think. I broke it in my previous commit. --- pkgs/development/libraries/glibc/2.13/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/glibc/2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix index 5db9e08e3f92..6e409158f0b8 100644 --- a/pkgs/development/libraries/glibc/2.13/common.nix +++ b/pkgs/development/libraries/glibc/2.13/common.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation ({ (if profilingLibraries then "--enable-profile" else "--disable-profile") - ] ++ stdenv.lib.optionals (cross == null) [ + ] ++ stdenv.lib.optionals (cross == null && kernelHeaders != null) [ "--enable-kernel=${kernelHeaders.versionForGlibc}" ] ++ stdenv.lib.optionals (cross != null) [ (if cross.withTLS then "--with-tls" else "--without-tls") -- cgit 1.4.1 From 375341bd73fb01b7451af750c7e0e86e78fc2b08 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Sep 2012 11:13:54 -0400 Subject: Remove obsolete Glibc versions --- .../libraries/glibc/2.5/binutils-ld.patch | 27 - pkgs/development/libraries/glibc/2.5/builder.sh | 57 - pkgs/development/libraries/glibc/2.5/default.nix | 40 - .../glibc/2.5/glibc-getcwd-param-MAX.patch | 14 - .../libraries/glibc/2.5/glibc-inline.patch | 1822 -------------------- .../libraries/glibc/2.5/glibc-pwd.patch | 74 - .../libraries/glibc/2.5/make-3-82-fix.patch | 14 - .../libraries/glibc/2.5/x86-fnstsw.patch | 32 - pkgs/development/libraries/glibc/2.7/builder.sh | 60 - pkgs/development/libraries/glibc/2.7/default.nix | 57 - .../libraries/glibc/2.7/nss-skip-unavail.patch | 25 - .../libraries/glibc/2.9/binutils-2.20.patch | 42 - .../libraries/glibc/2.9/binutils-ld.patch | 33 - pkgs/development/libraries/glibc/2.9/builder.sh | 85 - pkgs/development/libraries/glibc/2.9/default.nix | 103 -- pkgs/development/libraries/glibc/2.9/headers.nix | 63 - .../libraries/glibc/2.9/headersbuilder.sh | 38 - pkgs/development/libraries/glibc/2.9/info.nix | 47 - .../libraries/glibc/2.9/locale-override.patch | 72 - pkgs/development/libraries/glibc/2.9/locales.nix | 67 - .../libraries/glibc/2.9/localesbuilder.sh | 50 - .../libraries/glibc/2.9/nss-skip-unavail.patch | 25 - .../libraries/glibc/2.9/rpcgen-path.patch | 72 - pkgs/top-level/all-packages.nix | 22 - 24 files changed, 2941 deletions(-) delete mode 100644 pkgs/development/libraries/glibc/2.5/binutils-ld.patch delete mode 100644 pkgs/development/libraries/glibc/2.5/builder.sh delete mode 100644 pkgs/development/libraries/glibc/2.5/default.nix delete mode 100644 pkgs/development/libraries/glibc/2.5/glibc-getcwd-param-MAX.patch delete mode 100644 pkgs/development/libraries/glibc/2.5/glibc-inline.patch delete mode 100644 pkgs/development/libraries/glibc/2.5/glibc-pwd.patch delete mode 100644 pkgs/development/libraries/glibc/2.5/make-3-82-fix.patch delete mode 100644 pkgs/development/libraries/glibc/2.5/x86-fnstsw.patch delete mode 100644 pkgs/development/libraries/glibc/2.7/builder.sh delete mode 100644 pkgs/development/libraries/glibc/2.7/default.nix delete mode 100644 pkgs/development/libraries/glibc/2.7/nss-skip-unavail.patch delete mode 100644 pkgs/development/libraries/glibc/2.9/binutils-2.20.patch delete mode 100644 pkgs/development/libraries/glibc/2.9/binutils-ld.patch delete mode 100644 pkgs/development/libraries/glibc/2.9/builder.sh delete mode 100644 pkgs/development/libraries/glibc/2.9/default.nix delete mode 100644 pkgs/development/libraries/glibc/2.9/headers.nix delete mode 100644 pkgs/development/libraries/glibc/2.9/headersbuilder.sh delete mode 100644 pkgs/development/libraries/glibc/2.9/info.nix delete mode 100644 pkgs/development/libraries/glibc/2.9/locale-override.patch delete mode 100644 pkgs/development/libraries/glibc/2.9/locales.nix delete mode 100644 pkgs/development/libraries/glibc/2.9/localesbuilder.sh delete mode 100644 pkgs/development/libraries/glibc/2.9/nss-skip-unavail.patch delete mode 100644 pkgs/development/libraries/glibc/2.9/rpcgen-path.patch (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/glibc/2.5/binutils-ld.patch b/pkgs/development/libraries/glibc/2.5/binutils-ld.patch deleted file mode 100644 index 4cd7ab3cec34..000000000000 --- a/pkgs/development/libraries/glibc/2.5/binutils-ld.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7c8a67320e26b8c11108bf0a3410d3aef9cf3486 Mon Sep 17 00:00:00 2001 -From: Ulrich Drepper -Date: Sat, 31 Jan 2009 00:21:15 +0000 -Subject: [PATCH] * elf/Makefile (ld.so): Adjust the sed script to insert _begin in to - - newer linker scripts. ---- - ChangeLog | 5 +++++ - elf/Makefile | 4 ++-- - 2 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/elf/Makefile b/elf/Makefile -index 8079fe9..e44ff1d 100644 ---- a/elf/Makefile -+++ b/elf/Makefile -@@ -304,7 +304,7 @@ $(objpfx)ld.so: $(objpfx)librtld.os $(ld-map) - $(LDFLAGS-rtld) -Wl,-z,defs -Wl,--verbose 2>&1 | \ - LC_ALL=C \ - sed -e '/^=========/,/^=========/!d;/^=========/d' \ -- -e 's/\. = 0 + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' \ -+ -e 's/\. = .* + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' \ - > $@.lds - $(LINK.o) -nostdlib -nostartfiles -shared -o $@ \ - $(LDFLAGS-rtld) -Wl,-z,defs $(z-now-$(bind-now)) \ --- -1.6.4 - diff --git a/pkgs/development/libraries/glibc/2.5/builder.sh b/pkgs/development/libraries/glibc/2.5/builder.sh deleted file mode 100644 index bc80af83b926..000000000000 --- a/pkgs/development/libraries/glibc/2.5/builder.sh +++ /dev/null @@ -1,57 +0,0 @@ -# glibc cannot have itself in its rpath. -export NIX_NO_SELF_RPATH=1 - -source $stdenv/setup - -# Explicitly tell glibc to use our pwd, not /bin/pwd. -export PWD_P=$(type -tP pwd) - - -postUnpack() { - cd $sourceRoot/.. -} - - -preConfigure() { - - for i in configure io/ftwtest-sh; do - substituteInPlace "$i" \ - --replace "@PWD@" "pwd" - done - - # Fix shell code that tries to determine whether GNU ld is recent enough. - substituteInPlace configure --replace '2.1[3-9]*)' '2.1[3-9]*|2.[2-9][0-9]*)' - - mkdir ../build - cd ../build - - configureScript=../$sourceRoot/configure -} - - -postConfigure() { - # Hack: get rid of the `-static' flag set by the bootstrap stdenv. - # This has to be done *after* `configure' because it builds some - # test binaries. - export NIX_CFLAGS_LINK= - export NIX_LDFLAGS_BEFORE= - export NIX_DONT_SET_RPATH=1 -} - - -postInstall() { - if test -n "$installLocales"; then - make -j${NIX_BUILD_CORES:-1} -l${NIX_BUILD_CORES:-1} localedata/install-locales - fi - rm $out/etc/ld.so.cache - (cd $out/include && ln -s $kernelHeaders/include/* .) || exit 1 - - # Fix for NIXOS-54 (ldd not working on x86_64). Make a symlink - # "lib64" to "lib". - if test -n "$is64bit"; then - ln -s lib $out/lib64 - fi -} - - -genericBuild diff --git a/pkgs/development/libraries/glibc/2.5/default.nix b/pkgs/development/libraries/glibc/2.5/default.nix deleted file mode 100644 index 8b8c204a4803..000000000000 --- a/pkgs/development/libraries/glibc/2.5/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, kernelHeaders -, installLocales ? true -, profilingLibraries ? false -}: - -stdenv.mkDerivation { - name = "glibc-2.5"; - builder = ./builder.sh; - - src = fetchurl { - url = http://ftp.gnu.org/gnu/glibc/glibc-2.5.tar.bz2; - md5 = "1fb29764a6a650a4d5b409dda227ac9f"; - }; - - patches = [ ./glibc-pwd.patch ./glibc-getcwd-param-MAX.patch ./glibc-inline.patch - ./x86-fnstsw.patch ./binutils-ld.patch ./make-3-82-fix.patch ]; - - inherit kernelHeaders installLocales; - - inherit (stdenv) is64bit; - - configureFlags="--enable-add-ons - --with-headers=${kernelHeaders}/include - --disable-sanity-checks - ${if profilingLibraries then "--enable-profile" else "--disable-profile"}"; - - # Workaround for this bug: - # http://sourceware.org/bugzilla/show_bug.cgi?id=411 - # I.e. when gcc is compiled with --with-arch=i686, then the - # preprocessor symbol `__i686' will be defined to `1'. This causes - # the symbol __i686.get_pc_thunk.dx to be mangled. - NIX_CFLAGS_COMPILE = "-U__i686"; - - enableParallelBuilding = true; - - meta = { - homepage = http://www.gnu.org/software/libc/; - description = "The GNU C Library"; - }; -} diff --git a/pkgs/development/libraries/glibc/2.5/glibc-getcwd-param-MAX.patch b/pkgs/development/libraries/glibc/2.5/glibc-getcwd-param-MAX.patch deleted file mode 100644 index 8543dbbf1d76..000000000000 --- a/pkgs/development/libraries/glibc/2.5/glibc-getcwd-param-MAX.patch +++ /dev/null @@ -1,14 +0,0 @@ -2006-06-18 Mike Frysinger - - * sysdeps/unix/sysv/linux/getcwd.c: Include sys/param.h. - ---- glibc-old/sysdeps/unix/sysv/linux/getcwd.c -+++ glibc-new/sysdeps/unix/sysv/linux/getcwd.c -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - - #include - #include diff --git a/pkgs/development/libraries/glibc/2.5/glibc-inline.patch b/pkgs/development/libraries/glibc/2.5/glibc-inline.patch deleted file mode 100644 index 19e400e0d50f..000000000000 --- a/pkgs/development/libraries/glibc/2.5/glibc-inline.patch +++ /dev/null @@ -1,1822 +0,0 @@ ---- libc/mach/mach/mig_support.h.jj 2001-07-06 06:55:35.000000000 +0200 -+++ libc/mach/mach/mig_support.h 2006-11-07 11:18:32.000000000 +0100 -@@ -1,4 +1,4 @@ --/* Copyright (C) 1993,94,97,99,2001 Free Software Foundation, Inc. -+/* Copyright (C) 1993,94,97,99,2001,2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -67,12 +67,12 @@ extern void mig_reply_setup (const mach_ - /* Idiocy support function. */ - extern vm_size_t mig_strncpy (char *__dst, const char *__src, vm_size_t __len); - extern vm_size_t __mig_strncpy (char *__dst, const char *__src, vm_size_t); --extern __inline vm_size_t -+__extern_inline vm_size_t - __mig_strncpy (char *__dst, const char *__src, vm_size_t __len) - { - return __stpncpy (__dst, __src, __len) - __dst; - } --extern __inline vm_size_t -+__extern_inline vm_size_t - mig_strncpy (char *__dst, const char *__src, vm_size_t __len) - { - return __mig_strncpy (__dst, __src, __len); ---- libc/mach/lock-intern.h.jj 2001-07-06 06:55:34.000000000 +0200 -+++ libc/mach/lock-intern.h 2006-11-06 21:05:34.000000000 +0100 -@@ -1,4 +1,4 @@ --/* Copyright (C) 1994, 1996 Free Software Foundation, Inc. -+/* Copyright (C) 1994, 1996, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -22,7 +22,7 @@ - #include - - #ifndef _EXTERN_INLINE --#define _EXTERN_INLINE extern __inline -+#define _EXTERN_INLINE __extern_inline - #endif - - ---- libc/include/stdlib.h.jj 2006-01-14 13:08:56.000000000 +0100 -+++ libc/include/stdlib.h 2006-11-06 21:08:02.000000000 +0100 -@@ -139,43 +139,43 @@ libc_hidden_proto (____strtoll_l_interna - libc_hidden_proto (____strtoul_l_internal) - libc_hidden_proto (____strtoull_l_internal) - --extern __inline double -+__extern_inline double - __NTH (__strtod_l (__const char *__restrict __nptr, char **__restrict __endptr, - __locale_t __loc)) - { - return ____strtod_l_internal (__nptr, __endptr, 0, __loc); - } --extern __inline long int -+__extern_inline long int - __NTH (__strtol_l (__const char *__restrict __nptr, char **__restrict __endptr, - int __base, __locale_t __loc)) - { - return ____strtol_l_internal (__nptr, __endptr, __base, 0, __loc); - } --extern __inline unsigned long int -+__extern_inline unsigned long int - __NTH (__strtoul_l (__const char *__restrict __nptr, - char **__restrict __endptr, int __base, __locale_t __loc)) - { - return ____strtoul_l_internal (__nptr, __endptr, __base, 0, __loc); - } --extern __inline float -+__extern_inline float - __NTH (__strtof_l (__const char *__restrict __nptr, char **__restrict __endptr, - __locale_t __loc)) - { - return ____strtof_l_internal (__nptr, __endptr, 0, __loc); - } --extern __inline long double -+__extern_inline long double - __NTH (__strtold_l (__const char *__restrict __nptr, - char **__restrict __endptr, __locale_t __loc)) - { - return ____strtold_l_internal (__nptr, __endptr, 0, __loc); - } --__extension__ extern __inline long long int -+__extension__ __extern_inline long long int - __NTH (__strtoll_l (__const char *__restrict __nptr, - char **__restrict __endptr, int __base, __locale_t __loc)) - { - return ____strtoll_l_internal (__nptr, __endptr, __base, 0, __loc); - } --__extension__ extern __inline unsigned long long int -+__extension__ __extern_inline unsigned long long int - __NTH (__strtoull_l (__const char * __restrict __nptr, - char **__restrict __endptr, int __base, __locale_t __loc)) - { ---- libc/include/ctype.h.jj 2004-03-16 11:09:04.000000000 +0100 -+++ libc/include/ctype.h 2006-11-06 21:06:24.000000000 +0100 -@@ -15,7 +15,7 @@ extern int __isctype (int __c, int __mas - # include - - # ifndef CTYPE_EXTERN_INLINE /* Used by ctype/ctype-info.c, which see. */ --# define CTYPE_EXTERN_INLINE extern inline -+# define CTYPE_EXTERN_INLINE __extern_inline - # endif - - __libc_tsd_define (extern, CTYPE_B) ---- libc/include/sys/stat.h.jj 2006-02-12 22:29:08.000000000 +0100 -+++ libc/include/sys/stat.h 2006-11-06 21:07:01.000000000 +0100 -@@ -19,13 +19,13 @@ hidden_proto (__lxstat64) - hidden_proto (__xstat) - hidden_proto (__xstat64) - #endif --extern __inline__ int __stat (__const char *__path, struct stat *__statbuf) -+__extern_inline int __stat (__const char *__path, struct stat *__statbuf) - { - return __xstat (_STAT_VER, __path, __statbuf); - } - libc_hidden_proto (__xmknod) --extern __inline__ int __mknod (__const char *__path, __mode_t __mode, -- __dev_t __dev) -+__extern_inline int __mknod (__const char *__path, __mode_t __mode, -+ __dev_t __dev) - { - return __xmknod (_MKNOD_VER, __path, __mode, &__dev); - } ---- libc/stdlib/stdlib.h.jj 2006-10-31 23:05:34.000000000 +0100 -+++ libc/stdlib/stdlib.h 2006-11-06 21:16:09.000000000 +0100 -@@ -324,18 +324,18 @@ extern unsigned long long int __strtoull - /* Define inline functions which call the internal entry points. */ - - __BEGIN_NAMESPACE_STD --extern __inline double -+__extern_inline double - __NTH (strtod (__const char *__restrict __nptr, char **__restrict __endptr)) - { - return __strtod_internal (__nptr, __endptr, 0); - } --extern __inline long int -+__extern_inline long int - __NTH (strtol (__const char *__restrict __nptr, char **__restrict __endptr, - int __base)) - { - return __strtol_internal (__nptr, __endptr, __base, 0); - } --extern __inline unsigned long int -+__extern_inline unsigned long int - __NTH (strtoul (__const char *__restrict __nptr, char **__restrict __endptr, - int __base)) - { -@@ -345,13 +345,13 @@ __END_NAMESPACE_STD - - # ifdef __USE_ISOC99 - __BEGIN_NAMESPACE_C99 --extern __inline float -+__extern_inline float - __NTH (strtof (__const char *__restrict __nptr, char **__restrict __endptr)) - { - return __strtof_internal (__nptr, __endptr, 0); - } - # ifndef __LDBL_COMPAT --extern __inline long double -+__extern_inline long double - __NTH (strtold (__const char *__restrict __nptr, char **__restrict __endptr)) - { - return __strtold_internal (__nptr, __endptr, 0); -@@ -361,13 +361,13 @@ __END_NAMESPACE_C99 - # endif - - # ifdef __USE_BSD --__extension__ extern __inline long long int -+__extension__ __extern_inline long long int - __NTH (strtoq (__const char *__restrict __nptr, char **__restrict __endptr, - int __base)) - { - return __strtoll_internal (__nptr, __endptr, __base, 0); - } --__extension__ extern __inline unsigned long long int -+__extension__ __extern_inline unsigned long long int - __NTH (strtouq (__const char *__restrict __nptr, char **__restrict __endptr, - int __base)) - { -@@ -377,13 +377,13 @@ __NTH (strtouq (__const char *__restrict - - # if defined __USE_MISC || defined __USE_ISOC99 - __BEGIN_NAMESPACE_C99 --__extension__ extern __inline long long int -+__extension__ __extern_inline long long int - __NTH (strtoll (__const char *__restrict __nptr, char **__restrict __endptr, - int __base)) - { - return __strtoll_internal (__nptr, __endptr, __base, 0); - } --__extension__ extern __inline unsigned long long int -+__extension__ __extern_inline unsigned long long int - __NTH (strtoull (__const char * __restrict __nptr, char **__restrict __endptr, - int __base)) - { -@@ -393,17 +393,17 @@ __END_NAMESPACE_C99 - # endif - - __BEGIN_NAMESPACE_STD --extern __inline double -+__extern_inline double - __NTH (atof (__const char *__nptr)) - { - return strtod (__nptr, (char **) NULL); - } --extern __inline int -+__extern_inline int - __NTH (atoi (__const char *__nptr)) - { - return (int) strtol (__nptr, (char **) NULL, 10); - } --extern __inline long int -+__extern_inline long int - __NTH (atol (__const char *__nptr)) - { - return strtol (__nptr, (char **) NULL, 10); -@@ -412,7 +412,7 @@ __END_NAMESPACE_STD - - # if defined __USE_MISC || defined __USE_ISOC99 - __BEGIN_NAMESPACE_C99 --__extension__ extern __inline long long int -+__extension__ __extern_inline long long int - __NTH (atoll (__const char *__nptr)) - { - return strtoll (__nptr, (char **) NULL, 10); ---- libc/stdlib/bits/stdlib.h.jj 2005-08-22 17:06:07.000000000 +0200 -+++ libc/stdlib/bits/stdlib.h 2006-11-07 11:18:39.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Checking macros for stdlib functions. -- Copyright (C) 2005 Free Software Foundation, Inc. -+ Copyright (C) 2005, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -28,7 +28,7 @@ extern char *__REDIRECT_NTH (__realpath_ - (__const char *__restrict __name, - char *__restrict __resolved), realpath) __wur; - --extern __always_inline __wur char * -+__extern_always_inline __wur char * - __NTH (realpath (__const char *__restrict __name, char *__restrict __resolved)) - { - if (__bos (__resolved) != (size_t) -1) -@@ -44,7 +44,7 @@ extern int __REDIRECT_NTH (__ptsname_r_a - size_t __buflen), ptsname_r) - __nonnull ((2)); - --extern __always_inline int -+__extern_always_inline int - __NTH (ptsname_r (int __fd, char *__buf, size_t __buflen)) - { - if (__bos (__buf) != (size_t) -1 -@@ -59,7 +59,7 @@ extern int __wctomb_chk (char *__s, wcha - extern int __REDIRECT_NTH (__wctomb_alias, (char *__s, wchar_t __wchar), - wctomb) __wur; - --extern __always_inline __wur int -+__extern_always_inline __wur int - __NTH (wctomb (char *__s, wchar_t __wchar)) - { - /* We would have to include to get a definition of MB_LEN_MAX. -@@ -83,7 +83,7 @@ extern size_t __REDIRECT_NTH (__mbstowcs - __const char *__restrict __src, - size_t __len), mbstowcs); - --extern __always_inline size_t -+__extern_always_inline size_t - __NTH (mbstowcs (wchar_t *__restrict __dst, __const char *__restrict __src, - size_t __len)) - { -@@ -104,7 +104,7 @@ extern size_t __REDIRECT_NTH (__wcstombs - __const wchar_t *__restrict __src, - size_t __len), wcstombs); - --extern __always_inline size_t -+__extern_always_inline size_t - __NTH (wcstombs (char *__restrict __dst, __const wchar_t *__restrict __src, - size_t __len)) - { - --- libc/stdlib/gmp.h.jj 2002-08-27 00:39:44.000000000 +0200 -+++ libc/stdlib/gmp.h 2006-11-07 15:02:06.000000000 +0100 -@@ -1,6 +1,6 @@ - /* gmp.h -- Definitions for GNU multiple precision functions. - --Copyright (C) 1991, 1993, 1994, 1995, 1996 Free Software Foundation, Inc. -+Copyright (C) 1991, 1993, 1994, 1995, 1996, 2006 Free Software Foundation, Inc. - - This file is part of the GNU MP Library. - -@@ -21,6 +21,8 @@ MA 02111-1307, USA. */ - - #ifndef __GMP_H__ - -+#include -+ - #ifndef __GNU_MP__ - #define __GNU_MP__ 2 - #define __need_size_t -@@ -41,7 +43,7 @@ MA 02111-1307, USA. */ - - #ifndef _EXTERN_INLINE - #ifdef __GNUC__ --#define _EXTERN_INLINE extern __inline__ -+#define _EXTERN_INLINE __extern_inline - #else - #define _EXTERN_INLINE static - #endif ---- libc/ctype/ctype.h.jj 2004-09-08 00:23:45.000000000 +0200 -+++ libc/ctype/ctype.h 2006-11-07 11:18:56.000000000 +0100 -@@ -1,4 +1,4 @@ --/* Copyright (C) 1991,92,93,95,96,97,98,99,2001,2002,2004 -+/* Copyright (C) 1991,92,93,95,96,97,98,99,2001,2002,2004,2006 - Free Software Foundation, Inc. - This file is part of the GNU C Library. - -@@ -187,13 +187,13 @@ __exctype (_tolower); - # endif - - # ifdef __USE_EXTERN_INLINES --extern __inline int -+__extern_inline int - __NTH (tolower (int __c)) - { - return __c >= -128 && __c < 256 ? (*__ctype_tolower_loc ())[__c] : __c; - } - --extern __inline int -+__extern_inline int - __NTH (toupper (int __c)) - { - return __c >= -128 && __c < 256 ? (*__ctype_toupper_loc ())[__c] : __c; ---- libc/nptl/sysdeps/pthread/bits/libc-lock.h.jj 2006-10-24 10:14:03.000000000 +0200 -+++ libc/nptl/sysdeps/pthread/bits/libc-lock.h 2006-11-07 10:45:52.000000000 +0100 -@@ -1,5 +1,6 @@ - /* libc-internal interface for mutex locks. NPTL version. -- Copyright (C) 1996-2001, 2002, 2003, 2005 Free Software Foundation, Inc. -+ Copyright (C) 1996-2001, 2002, 2003, 2005, 2006 -+ Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -408,7 +409,7 @@ extern void _pthread_cleanup_pop_restore - - - /* Normal cleanup handling, based on C cleanup attribute. */ --extern __inline void -+__extern_inline void - __libc_cleanup_routine (struct __pthread_cleanup_frame *f) - { - if (f->__do_it) ---- libc/nptl/sysdeps/pthread/pthread.h.jj 2006-06-05 01:59:07.000000000 +0200 -+++ libc/nptl/sysdeps/pthread/pthread.h 2006-11-07 10:49:27.000000000 +0100 -@@ -572,7 +572,7 @@ class __pthread_cleanup_class - function the compiler is free to decide inlining the change when - needed or fall back on the copy which must exist somewhere - else. */ --extern __inline void -+__extern_inline void - __pthread_cleanup_routine (struct __pthread_cleanup_frame *__frame) - { - if (__frame->__do_it) -@@ -1103,7 +1103,7 @@ extern int pthread_atfork (void (*__prep - - #ifdef __USE_EXTERN_INLINES - /* Optimizations. */ --extern __inline int -+__extern_inline int - __NTH (pthread_equal (pthread_t __thread1, pthread_t __thread2)) - { - return __thread1 == __thread2; ---- libc/nptl/sysdeps/pthread/allocalim.h.jj 2006-05-02 08:16:07.000000000 +0200 -+++ libc/nptl/sysdeps/pthread/allocalim.h 2006-11-07 10:46:28.000000000 +0100 -@@ -21,8 +21,7 @@ - #include - - --extern int --__always_inline -+__extern_always_inline int - __libc_use_alloca (size_t size) - { - return (__builtin_expect (size <= PTHREAD_STACK_MIN / 4, 1) ---- libc/nptl/sysdeps/pthread/gai_misc.h.jj 2006-09-05 17:23:12.000000000 +0200 -+++ libc/nptl/sysdeps/pthread/gai_misc.h 2006-11-06 21:17:39.000000000 +0100 -@@ -76,7 +76,7 @@ - #define gai_start_notify_thread __gai_start_notify_thread - #define gai_create_helper_thread __gai_create_helper_thread - --extern inline void -+__extern_inline void - __gai_start_notify_thread (void) - { - sigset_t ss; -@@ -85,7 +85,7 @@ __gai_start_notify_thread (void) - INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_SETMASK, &ss, NULL, _NSIG / 8); - } - --extern inline int -+__extern_inline int - __gai_create_helper_thread (pthread_t *threadp, void *(*tf) (void *), - void *arg) - { ---- libc/nptl/sysdeps/unix/sysv/linux/aio_misc.h.jj 2006-03-02 18:32:45.000000000 +0100 -+++ libc/nptl/sysdeps/unix/sysv/linux/aio_misc.h 2006-11-06 21:18:34.000000000 +0100 -@@ -27,7 +27,7 @@ - # define aio_start_notify_thread __aio_start_notify_thread - # define aio_create_helper_thread __aio_create_helper_thread - --extern inline void -+__extern_inline void - __aio_start_notify_thread (void) - { - sigset_t ss; -@@ -36,7 +36,7 @@ __aio_start_notify_thread (void) - INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_SETMASK, &ss, NULL, _NSIG / 8); - } - --extern inline int -+__extern_inline int - __aio_create_helper_thread (pthread_t *threadp, void *(*tf) (void *), - void *arg) - { ---- libc/resolv/gai_misc.c.jj 2006-08-03 10:01:53.000000000 +0200 -+++ libc/resolv/gai_misc.c 2006-11-07 10:49:55.000000000 +0100 -@@ -30,7 +30,7 @@ - #ifndef gai_create_helper_thread - # define gai_create_helper_thread __gai_create_helper_thread - --extern inline int -+__extern_inline int - __gai_create_helper_thread (pthread_t *threadp, void *(*tf) (void *), - void *arg) - { ---- libc/bits/mathinline.h.jj 1997-10-13 05:53:18.000000000 +0200 -+++ libc/bits/mathinline.h 2006-11-07 10:51:05.000000000 +0100 -@@ -1,6 +1,6 @@ - /* This file should provide inline versions of math functions. - -- Surround GCC-specific parts with #ifdef __GNUC__, and use `extern __inline'. -+ Surround GCC-specific parts with #ifdef __GNUC__, and use `__extern_inline'. - - This file should define __MATH_INLINES if functions are actually defined as - inlines. */ ---- libc/bits/string.h.jj 1997-10-13 05:53:19.000000000 +0200 -+++ libc/bits/string.h 2006-11-07 10:50:54.000000000 +0100 -@@ -1,6 +1,6 @@ - /* This file should provide inline versions of string functions. - -- Surround GCC-specific parts with #ifdef __GNUC__, and use `extern __inline'. -+ Surround GCC-specific parts with #ifdef __GNUC__, and use `__extern_inline'. - - This file should define __STRING_INLINES if functions are actually defined - as inlines. */ ---- libc/bits/sigset.h.jj 2001-07-06 06:55:50.000000000 +0200 -+++ libc/bits/sigset.h 2006-11-07 11:19:08.000000000 +0100 -@@ -1,5 +1,6 @@ - /* __sig_atomic_t, __sigset_t, and related definitions. Generic/BSD version. -- Copyright (C) 1991, 1992, 1994, 1996, 1997 Free Software Foundation, Inc. -+ Copyright (C) 1991, 1992, 1994, 1996, 1997, 2006 -+ Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -38,7 +39,7 @@ typedef unsigned long int __sigset_t; - #define _SIGSET_H_fns 1 - - #ifndef _EXTERN_INLINE --# define _EXTERN_INLINE extern __inline -+# define _EXTERN_INLINE __extern_inline - #endif - - /* Return a mask that includes SIG only. The cast to `sigset_t' avoids ---- libc/misc/sys/cdefs.h.jj 2006-01-14 21:14:36.000000000 +0100 -+++ libc/misc/sys/cdefs.h 2006-11-06 21:00:45.000000000 +0100 -@@ -279,6 +279,18 @@ - # define __always_inline __inline - #endif - -+/* GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99 -+ inline semantics. */ -+#if __GNUC_PREREQ (4,3) && defined (__STDC_VERSION__) \ -+ && __STDC_VERSION__ >= 199901L -+# define __extern_inline extern __inline __attribute__ ((__gnu_inline__)) -+# define __extern_always_inline \ -+ extern __always_inline __inline __attribute__ ((__gnu_inline__)) -+#else -+# define __extern_inline extern __inline -+# define __extern_always_inline extern __always_inline -+#endif -+ - /* It is possible to compile containing GCC extensions even if GCC is - run in pedantic mode if the uses are carefully marked using the - `__extension__' keyword. But this is not generally available before ---- libc/libio/bits/stdio.h.jj 2004-09-08 00:23:44.000000000 +0200 -+++ libc/libio/bits/stdio.h 2006-11-06 21:23:07.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Optimizing macros and inline functions for stdio functions. -- Copyright (C) 1998, 2000, 2001, 2004 Free Software Foundation, Inc. -+ Copyright (C) 1998, 2000, 2001, 2004, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -24,7 +24,7 @@ - #ifdef __cplusplus - # define __STDIO_INLINE inline - #else --# define __STDIO_INLINE extern __inline -+# define __STDIO_INLINE __extern_inline - #endif - - ---- libc/libio/bits/stdio2.h.jj 2005-03-19 01:14:58.000000000 +0100 -+++ libc/libio/bits/stdio2.h 2006-11-06 21:22:33.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Checking macros for stdio functions. -- Copyright (C) 2004, 2005 Free Software Foundation, Inc. -+ Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -75,7 +75,7 @@ extern int __vprintf_chk (int __flag, __ - extern char *__gets_chk (char *__str, size_t) __wur; - extern char *__REDIRECT (__gets_alias, (char *__str), gets) __wur; - --extern __always_inline __wur char * -+__extern_always_inline __wur char * - gets (char *__str) - { - if (__bos (__str) != (size_t) -1) -@@ -89,7 +89,7 @@ extern char *__REDIRECT (__fgets_alias, - (char *__restrict __s, int __n, - FILE *__restrict __stream), fgets) __wur; - --extern __always_inline __wur char * -+__extern_always_inline __wur char * - fgets (char *__restrict __s, int __n, FILE *__restrict __stream) - { - if (__bos (__s) != (size_t) -1 -@@ -105,7 +105,7 @@ extern char *__REDIRECT (__fgets_unlocke - (char *__restrict __s, int __n, - FILE *__restrict __stream), fgets_unlocked) __wur; - --extern __always_inline __wur char * -+__extern_always_inline __wur char * - fgets_unlocked (char *__restrict __s, int __n, FILE *__restrict __stream) - { - if (__bos (__s) != (size_t) -1 ---- libc/argp/argp.h.jj 2006-04-22 17:08:26.000000000 +0200 -+++ libc/argp/argp.h 2006-11-06 21:24:08.000000000 +0100 -@@ -558,7 +558,7 @@ extern void *__argp_input (__const struc - # endif - - # ifndef ARGP_EI --# define ARGP_EI extern __inline__ -+# define ARGP_EI __extern_inline - # endif - - ARGP_EI void ---- libc/argp/argp-fmtstream.h.jj 2005-09-27 23:45:41.000000000 +0200 -+++ libc/argp/argp-fmtstream.h 2006-11-07 11:19:12.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Word-wrapping and line-truncating streams. -- Copyright (C) 1997 Free Software Foundation, Inc. -+ Copyright (C) 1997, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Written by Miles Bader . - -@@ -203,7 +203,7 @@ extern int __argp_fmtstream_ensure (argp - #endif - - #ifndef ARGP_FS_EI --#define ARGP_FS_EI extern inline -+#define ARGP_FS_EI __extern_inline - #endif - - ARGP_FS_EI size_t ---- libc/locale/programs/locfile.c.jj 2006-05-10 04:12:39.000000000 +0200 -+++ libc/locale/programs/locfile.c 2006-11-07 15:13:20.000000000 +0100 -@@ -33,6 +33,11 @@ - #include "locfile.h" - #include "simple-hash.h" - -+/* This prototype is needed to export locfile_hash from this object -+ when using ISO C99 inline semantics. */ -+struct keyword_t; -+const struct keyword_t *locfile_hash (const char *str, unsigned int len); -+ - #include "locfile-kw.h" - - ---- libc/locale/programs/charmap.c.jj 2006-08-19 19:50:52.000000000 +0200 -+++ libc/locale/programs/charmap.c 2006-11-07 15:11:05.000000000 +0100 -@@ -35,6 +35,10 @@ - - #include - -+/* This prototype is needed to export charmap_hash from this object -+ when using ISO C99 inline semantics. */ -+struct keyword_t; -+const struct keyword_t *charmap_hash (const char *str, unsigned int len); - - /* Define the lookup function. */ - #include "charmap-kw.h" ---- libc/io/sys/stat.h.jj 2006-01-06 13:14:05.000000000 +0100 -+++ libc/io/sys/stat.h 2006-11-06 21:27:03.000000000 +0100 -@@ -430,28 +430,28 @@ extern int __xmknodat (int __ver, int __ - #if defined __GNUC__ && __GNUC__ >= 2 - /* Inlined versions of the real stat and mknod functions. */ - --extern __inline__ int -+__extern_inline int - __NTH (stat (__const char *__path, struct stat *__statbuf)) - { - return __xstat (_STAT_VER, __path, __statbuf); - } - - # if defined __USE_BSD || defined __USE_XOPEN_EXTENDED --extern __inline__ int -+__extern_inline int - __NTH (lstat (__const char *__path, struct stat *__statbuf)) - { - return __lxstat (_STAT_VER, __path, __statbuf); - } - # endif - --extern __inline__ int -+__extern_inline int - __NTH (fstat (int __fd, struct stat *__statbuf)) - { - return __fxstat (_STAT_VER, __fd, __statbuf); - } - - # ifdef __USE_ATFILE --extern __inline__ int -+__extern_inline int - __NTH (fstatat (int __fd, __const char *__filename, struct stat *__statbuf, - int __flag)) - { -@@ -460,7 +460,7 @@ __NTH (fstatat (int __fd, __const char * - # endif - - # if defined __USE_MISC || defined __USE_BSD --extern __inline__ int -+__extern_inline int - __NTH (mknod (__const char *__path, __mode_t __mode, __dev_t __dev)) - { - return __xmknod (_MKNOD_VER, __path, __mode, &__dev); -@@ -468,7 +468,7 @@ __NTH (mknod (__const char *__path, __mo - # endif - - # ifdef __USE_ATFILE --extern __inline__ int -+__extern_inline int - __NTH (mknodat (int __fd, __const char *__path, __mode_t __mode, - __dev_t __dev)) - { -@@ -479,28 +479,28 @@ __NTH (mknodat (int __fd, __const char * - # if defined __USE_LARGEFILE64 \ - && (! defined __USE_FILE_OFFSET64 \ - || (defined __REDIRECT_NTH && defined __OPTIMIZE__)) --extern __inline__ int -+__extern_inline int - __NTH (stat64 (__const char *__path, struct stat64 *__statbuf)) - { - return __xstat64 (_STAT_VER, __path, __statbuf); - } - - # if defined __USE_BSD || defined __USE_XOPEN_EXTENDED --extern __inline__ int -+__extern_inline int - __NTH (lstat64 (__const char *__path, struct stat64 *__statbuf)) - { - return __lxstat64 (_STAT_VER, __path, __statbuf); - } - # endif - --extern __inline__ int -+__extern_inline int - __NTH (fstat64 (int __fd, struct stat64 *__statbuf)) - { - return __fxstat64 (_STAT_VER, __fd, __statbuf); - } - - # ifdef __USE_GNU --extern __inline__ int -+__extern_inline int - __NTH (fstatat64 (int __fd, __const char *__filename, struct stat64 *__statbuf, - int __flag)) - { ---- libc/wcsmbs/wchar.h.jj 2006-09-27 17:56:30.000000000 +0200 -+++ libc/wcsmbs/wchar.h 2006-11-06 21:28:28.000000000 +0100 -@@ -326,19 +326,19 @@ __END_NAMESPACE_C99 - locales must use ASCII encoding for the values in the ASCII range - and because the wchar_t encoding is always ISO 10646. */ - extern wint_t __btowc_alias (int __c) __asm ("btowc"); --extern __inline wint_t -+__extern_inline wint_t - __NTH (btowc (int __c)) - { return (__builtin_constant_p (__c) && __c >= '\0' && __c <= '\x7f' - ? (wint_t) __c : __btowc_alias (__c)); } - - extern int __wctob_alias (wint_t __c) __asm ("wctob"); --extern __inline int -+__extern_inline int - __NTH (wctob (wint_t __wc)) - { return (__builtin_constant_p (__wc) && __wc >= L'\0' && __wc <= L'\x7f' - ? (int) __wc : __wctob_alias (__wc)); } - # endif - --extern __inline size_t -+__extern_inline size_t - __NTH (mbrlen (__const char *__restrict __s, size_t __n, - mbstate_t *__restrict __ps)) - { return (__ps != NULL -@@ -548,38 +548,38 @@ extern unsigned long long int __wcstoull - /* Define inline functions which call the internal entry points. */ - __BEGIN_NAMESPACE_C99 - --extern __inline double -+__extern_inline double - __NTH (wcstod (__const wchar_t *__restrict __nptr, - wchar_t **__restrict __endptr)) - { return __wcstod_internal (__nptr, __endptr, 0); } --extern __inline long int -+__extern_inline long int - __NTH (wcstol (__const wchar_t *__restrict __nptr, - wchar_t **__restrict __endptr, int __base)) - { return __wcstol_internal (__nptr, __endptr, __base, 0); } --extern __inline unsigned long int -+__extern_inline unsigned long int - __NTH (wcstoul (__const wchar_t *__restrict __nptr, - wchar_t **__restrict __endptr, int __base)) - { return __wcstoul_internal (__nptr, __endptr, __base, 0); } - __END_NAMESPACE_C99 - - # ifdef __USE_GNU --extern __inline float -+__extern_inline float - __NTH (wcstof (__const wchar_t *__restrict __nptr, - wchar_t **__restrict __endptr)) - { return __wcstof_internal (__nptr, __endptr, 0); } - # ifndef __LDBL_COMPAT --extern __inline long double -+__extern_inline long double - __NTH (wcstold (__const wchar_t *__restrict __nptr, - wchar_t **__restrict __endptr)) - { return __wcstold_internal (__nptr, __endptr, 0); } - # endif - __extension__ --extern __inline long long int -+__extern_inline long long int - __NTH (wcstoq (__const wchar_t *__restrict __nptr, - wchar_t **__restrict __endptr, int __base)) - { return __wcstoll_internal (__nptr, __endptr, __base, 0); } - __extension__ --extern __inline unsigned long long int -+__extern_inline unsigned long long int - __NTH (wcstouq (__const wchar_t *__restrict __nptr, - wchar_t **__restrict __endptr, int __base)) - { return __wcstoull_internal (__nptr, __endptr, __base, 0); } ---- libc/wcsmbs/bits/wchar2.h.jj 2006-01-14 13:09:47.000000000 +0100 -+++ libc/wcsmbs/bits/wchar2.h 2006-11-06 21:29:19.000000000 +0100 -@@ -30,7 +30,7 @@ extern wchar_t *__REDIRECT_NTH (__wmemcp - __const wchar_t *__restrict __s2, size_t __n), - wmemcpy); - --extern __always_inline wchar_t * -+__extern_always_inline wchar_t * - __NTH (wmemcpy (wchar_t *__restrict __s1, __const wchar_t *__restrict __s2, - size_t __n)) - { -@@ -46,7 +46,7 @@ extern wchar_t *__REDIRECT_NTH (__wmemmo - __const wchar_t *__s2, - size_t __n), wmemmove); - --extern __always_inline wchar_t * -+__extern_always_inline wchar_t * - __NTH (wmemmove (wchar_t *__restrict __s1, __const wchar_t *__restrict __s2, - size_t __n)) - { -@@ -65,7 +65,7 @@ extern wchar_t *__REDIRECT_NTH (__wmempc - __const wchar_t *__restrict __s2, - size_t __n), wmempcpy); - --extern __always_inline wchar_t * -+__extern_always_inline wchar_t * - __NTH (wmempcpy (wchar_t *__restrict __s1, __const wchar_t *__restrict __s2, - size_t __n)) - { -@@ -81,7 +81,7 @@ extern wchar_t *__wmemset_chk (wchar_t * - extern wchar_t *__REDIRECT_NTH (__wmemset_alias, (wchar_t *__s, wchar_t __c, - size_t __n), wmemset); - --extern __always_inline wchar_t * -+__extern_always_inline wchar_t * - __NTH (wmemset (wchar_t *__restrict __s, wchar_t __c, size_t __n)) - { - if (__bos0 (__s) != (size_t) -1) -@@ -97,7 +97,7 @@ extern wchar_t *__REDIRECT_NTH (__wcscpy - (wchar_t *__restrict __dest, - __const wchar_t *__restrict __src), wcscpy); - --extern __always_inline wchar_t * -+__extern_always_inline wchar_t * - __NTH (wcscpy (wchar_t *__dest, __const wchar_t *__src)) - { - if (__bos (__dest) != (size_t) -1) -@@ -112,7 +112,7 @@ extern wchar_t *__REDIRECT_NTH (__wcpcpy - __const wchar_t *__src), - wcpcpy); - --extern __always_inline wchar_t * -+__extern_always_inline wchar_t * - __NTH (wcpcpy (wchar_t *__dest, __const wchar_t *__src)) - { - if (__bos (__dest) != (size_t) -1) -@@ -129,7 +129,7 @@ extern wchar_t *__REDIRECT_NTH (__wcsncp - __const wchar_t *__restrict __src, - size_t __n), wcsncpy); - --extern __always_inline wchar_t * -+__extern_always_inline wchar_t * - __NTH (wcsncpy (wchar_t *__dest, __const wchar_t *__src, size_t __n)) - { - if (__bos (__dest) != (size_t) -1 -@@ -148,7 +148,7 @@ extern wchar_t *__REDIRECT_NTH (__wcpncp - __const wchar_t *__restrict __src, - size_t __n), wcpncpy); - --extern __always_inline wchar_t * -+__extern_always_inline wchar_t * - __NTH (wcpncpy (wchar_t *__dest, __const wchar_t *__src, size_t __n)) - { - if (__bos (__dest) != (size_t) -1 -@@ -166,7 +166,7 @@ extern wchar_t *__REDIRECT_NTH (__wcscat - (wchar_t *__restrict __dest, - __const wchar_t *__restrict __src), wcscat); - --extern __always_inline wchar_t * -+__extern_always_inline wchar_t * - __NTH (wcscat (wchar_t *__dest, __const wchar_t *__src)) - { - if (__bos (__dest) != (size_t) -1) -@@ -183,7 +183,7 @@ extern wchar_t *__REDIRECT_NTH (__wcsnca - __const wchar_t *__restrict __src, - size_t __n), wcsncat); - --extern __always_inline wchar_t * -+__extern_always_inline wchar_t * - __NTH (wcsncat (wchar_t *__dest, __const wchar_t *__src, size_t __n)) - { - if (__bos (__dest) != (size_t) -1) -@@ -246,7 +246,7 @@ extern wchar_t *__REDIRECT (__fgetws_ali - (wchar_t *__restrict __s, int __n, - __FILE *__restrict __stream), fgetws) __wur; - --extern __always_inline __wur wchar_t * -+__extern_always_inline __wur wchar_t * - fgetws (wchar_t *__restrict __s, int __n, __FILE *__restrict __stream) - { - if (__bos (__s) != (size_t) -1 -@@ -264,7 +264,7 @@ extern wchar_t *__REDIRECT (__fgetws_unl - __FILE *__restrict __stream), fgetws_unlocked) - __wur; - --extern __always_inline __wur wchar_t * -+__extern_always_inline __wur wchar_t * - fgetws_unlocked (wchar_t *__restrict __s, int __n, __FILE *__restrict __stream) - { - if (__bos (__s) != (size_t) -1 -@@ -281,7 +281,7 @@ extern size_t __REDIRECT_NTH (__wcrtomb_ - (char *__restrict __s, wchar_t __wchar, - mbstate_t *__restrict __ps), wcrtomb) __wur; - --extern __always_inline __wur size_t -+__extern_always_inline __wur size_t - __NTH (wcrtomb (char *__s, wchar_t __wchar, mbstate_t *__ps)) - { - /* We would have to include to get a definition of MB_LEN_MAX. -@@ -307,7 +307,7 @@ extern size_t __REDIRECT_NTH (__mbsrtowc - size_t __len, mbstate_t *__restrict __ps), - mbsrtowcs); - --extern __always_inline size_t -+__extern_always_inline size_t - __NTH (mbsrtowcs (wchar_t *__restrict __dst, __const char **__restrict __src, - size_t __len, mbstate_t *__restrict __ps)) - { -@@ -330,7 +330,7 @@ extern size_t __REDIRECT_NTH (__wcsrtomb - size_t __len, mbstate_t *__restrict __ps), - wcsrtombs); - --extern __always_inline size_t -+__extern_always_inline size_t - __NTH (wcsrtombs (char *__restrict __dst, __const wchar_t **__restrict __src, - size_t __len, mbstate_t *__restrict __ps)) - { -@@ -352,7 +352,7 @@ extern size_t __REDIRECT_NTH (__mbsnrtow - size_t __len, mbstate_t *__restrict __ps), - mbsnrtowcs); - --extern __always_inline size_t -+__extern_always_inline size_t - __NTH (mbsnrtowcs (wchar_t *__restrict __dst, __const char **__restrict __src, - size_t __nmc, size_t __len, mbstate_t *__restrict __ps)) - { -@@ -376,7 +376,7 @@ extern size_t __REDIRECT_NTH (__wcsnrtom - size_t __nwc, size_t __len, - mbstate_t *__restrict __ps), wcsnrtombs); - --extern __always_inline size_t -+__extern_always_inline size_t - __NTH (wcsnrtombs (char *__restrict __dst, __const wchar_t **__restrict __src, - size_t __nwc, size_t __len, mbstate_t *__restrict __ps)) - { ---- libc/socket/bits/socket2.h.jj 2005-08-08 21:00:53.000000000 +0200 -+++ libc/socket/bits/socket2.h 2006-11-06 21:29:59.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Checking macros for socket functions. -- Copyright (C) 2005 Free Software Foundation, Inc. -+ Copyright (C) 2005, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -26,7 +26,7 @@ extern ssize_t __recv_chk (int __fd, voi - extern ssize_t __REDIRECT (__recv_alias, (int __fd, void *__buf, size_t __n, - int __flags), recv); - --extern __always_inline ssize_t -+__extern_always_inline ssize_t - recv (int __fd, void *__buf, size_t __n, int __flags) - { - if (__bos0 (__buf) != (size_t) -1 -@@ -44,7 +44,7 @@ extern ssize_t __REDIRECT (__recvfrom_al - int __flags, __SOCKADDR_ARG __addr, - socklen_t *__restrict __addr_len), recvfrom); - --extern __always_inline ssize_t -+__extern_always_inline ssize_t - recvfrom (int __fd, void *__restrict __buf, size_t __n, int __flags, - __SOCKADDR_ARG __addr, socklen_t *__restrict __addr_len) - { ---- libc/posix/bits/unistd.h.jj 2006-08-24 08:47:31.000000000 +0200 -+++ libc/posix/bits/unistd.h 2006-11-06 21:30:39.000000000 +0100 -@@ -26,7 +26,7 @@ extern ssize_t __read_chk (int __fd, voi - extern ssize_t __REDIRECT (__read_alias, (int __fd, void *__buf, - size_t __nbytes), read) __wur; - --extern __always_inline __wur ssize_t -+__extern_always_inline __wur ssize_t - read (int __fd, void *__buf, size_t __nbytes) - { - if (__bos0 (__buf) != (size_t) -1 -@@ -48,7 +48,7 @@ extern ssize_t __REDIRECT (__pread64_ali - __off64_t __offset), pread64) __wur; - - # ifndef __USE_FILE_OFFSET64 --extern __always_inline __wur ssize_t -+__extern_always_inline __wur ssize_t - pread (int __fd, void *__buf, size_t __nbytes, __off_t __offset) - { - if (__bos0 (__buf) != (size_t) -1 -@@ -57,7 +57,7 @@ pread (int __fd, void *__buf, size_t __n - return __pread_alias (__fd, __buf, __nbytes, __offset); - } - # else --extern __always_inline __wur ssize_t -+__extern_always_inline __wur ssize_t - pread (int __fd, void *__buf, size_t __nbytes, __off64_t __offset) - { - if (__bos0 (__buf) != (size_t) -1 -@@ -68,7 +68,7 @@ pread (int __fd, void *__buf, size_t __n - # endif - - # ifdef __USE_LARGEFILE64 --extern __always_inline __wur ssize_t -+__extern_always_inline __wur ssize_t - pread64 (int __fd, void *__buf, size_t __nbytes, __off64_t __offset) - { - if (__bos0 (__buf) != (size_t) -1 -@@ -89,7 +89,7 @@ extern ssize_t __REDIRECT_NTH (__readlin - char *__restrict __buf, size_t __len), readlink) - __nonnull ((1, 2)) __wur; - --extern __always_inline __nonnull ((1, 2)) __wur ssize_t -+__extern_always_inline __nonnull ((1, 2)) __wur ssize_t - __NTH (readlink (__const char *__restrict __path, char *__restrict __buf, - size_t __len)) - { -@@ -111,7 +111,7 @@ extern ssize_t __REDIRECT_NTH (__readlin - readlinkat) - __nonnull ((2, 3)) __wur; - --extern __always_inline __nonnull ((2, 3)) __wur ssize_t -+__extern_always_inline __nonnull ((2, 3)) __wur ssize_t - __NTH (readlinkat (int __fd, __const char *__restrict __path, - char *__restrict __buf, size_t __len)) - { -@@ -127,7 +127,7 @@ extern char *__getcwd_chk (char *__buf, - extern char *__REDIRECT_NTH (__getcwd_alias, - (char *__buf, size_t __size), getcwd) __wur; - --extern __always_inline __wur char * -+__extern_always_inline __wur char * - __NTH (getcwd (char *__buf, size_t __size)) - { - if (__bos (__buf) != (size_t) -1 -@@ -142,7 +142,7 @@ extern char *__getwd_chk (char *__buf, s - extern char *__REDIRECT_NTH (__getwd_alias, (char *__buf), getwd) - __nonnull ((1)) __wur; - --extern __always_inline __nonnull ((1)) __attribute_deprecated__ __wur char * -+__extern_always_inline __nonnull ((1)) __attribute_deprecated__ __wur char * - __NTH (getwd (char *__buf)) - { - if (__bos (__buf) != (size_t) -1) -@@ -156,7 +156,7 @@ extern size_t __confstr_chk (int __name, - extern size_t __REDIRECT_NTH (__confstr_alias, (int __name, char *__buf, - size_t __len), confstr); - --extern __always_inline size_t -+__extern_always_inline size_t - __NTH (confstr (int __name, char *__buf, size_t __len)) - { - if (__bos (__buf) != (size_t) -1 -@@ -171,7 +171,7 @@ extern int __getgroups_chk (int __size, - extern int __REDIRECT_NTH (__getgroups_alias, (int __size, __gid_t __list[]), - getgroups) __wur; - --extern __always_inline int -+__extern_always_inline int - __NTH (getgroups (int __size, __gid_t __list[])) - { - if (__bos (__list) != (size_t) -1 -@@ -188,7 +188,7 @@ extern int __REDIRECT_NTH (__ttyname_r_a - size_t __buflen), ttyname_r) - __nonnull ((2)); - --extern __always_inline int -+__extern_always_inline int - __NTH (ttyname_r (int __fd, char *__buf, size_t __buflen)) - { - if (__bos (__buf) != (size_t) -1 -@@ -204,7 +204,7 @@ extern int __getlogin_r_chk (char *__buf - extern int __REDIRECT (__getlogin_r_alias, (char *__buf, size_t __buflen), - getlogin_r) __nonnull ((1)); - --extern __always_inline int -+__extern_always_inline int - getlogin_r (char *__buf, size_t __buflen) - { - if (__bos (__buf) != (size_t) -1 -@@ -221,7 +221,7 @@ extern int __gethostname_chk (char *__bu - extern int __REDIRECT_NTH (__gethostname_alias, (char *__buf, size_t __buflen), - gethostname) __nonnull ((1)); - --extern __always_inline int -+__extern_always_inline int - __NTH (gethostname (char *__buf, size_t __buflen)) - { - if (__bos (__buf) != (size_t) -1 -@@ -239,7 +239,7 @@ extern int __REDIRECT_NTH (__getdomainna - size_t __buflen), - getdomainname) __nonnull ((1)) __wur; - --extern __always_inline int -+__extern_always_inline int - __NTH (getdomainname (char *__buf, size_t __buflen)) - { - if (__bos (__buf) != (size_t) -1 ---- libc/string/bits/string3.h.jj 2005-08-08 21:02:31.000000000 +0200 -+++ libc/string/bits/string3.h 2006-11-07 11:19:17.000000000 +0100 -@@ -1,4 +1,4 @@ --/* Copyright (C) 2004, 2005 Free Software Foundation, Inc. -+/* Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -151,7 +151,7 @@ extern char *__REDIRECT_NTH (__stpncpy_a - __const char *__src, - size_t __n), stpncpy); - --extern __always_inline char * -+__extern_always_inline char * - __NTH (stpncpy (char *__dest, __const char *__src, size_t __n)) - { - if (__bos (__dest) != (size_t) -1 ---- libc/string/bits/string2.h.jj 2004-05-28 08:39:13.000000000 +0200 -+++ libc/string/bits/string2.h 2006-11-07 11:19:24.000000000 +0100 -@@ -0,0 +1,18 @@ -+/* DO NOT EDIT THIS FILE. -+ -+ It has been auto-edited by fixincludes from: -+ -+ "fixinc/tests/inc/bits/string2.h" -+ -+ This had to be done to correct non-standard usages in the -+ original, manufacturer supplied header file. */ -+ -+ -+ -+#if defined( GLIBC_C99_INLINE_3_CHECK ) -+# if defined(__cplusplus) || __STDC_VERSION__ >= 19901L -+# define __STRING_INLINE inline -+# else -+# define __STRING_INLINE extern __inline -+# endif -+#endif /* GLIBC_C99_INLINE_3_CHECK */ -@@ -1,5 +1,5 @@ - /* Machine-independant string function optimizations. -- Copyright (C) 1997-2003, 2004 Free Software Foundation, Inc. -+ Copyright (C) 1997-2003, 2004, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 1997. - -@@ -43,7 +43,7 @@ - # ifdef __cplusplus - # define __STRING_INLINE inline - # else --# define __STRING_INLINE extern __inline -+# define __STRING_INLINE __extern_inline - # endif - #endif - ---- libc/string/argz.h.jj 2004-09-08 00:23:43.000000000 +0200 -+++ libc/string/argz.h 2006-11-07 11:19:33.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Routines for dealing with '\0' separated arg vectors. -- Copyright (C) 1995,96,97,98,99,2000,2004 Free Software Foundation, Inc. -+ Copyright (C) 1995,96,97,98,99,2000,2004,2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -160,7 +160,7 @@ extern char *argz_next (__const char *__ - __const char *__restrict __entry) __THROW; - - #ifdef __USE_EXTERN_INLINES --extern inline char * -+__extern_inline char * - __NTH (__argz_next (__const char *__argz, size_t __argz_len, - __const char *__entry)) - { -@@ -174,7 +174,7 @@ __NTH (__argz_next (__const char *__argz - else - return __argz_len > 0 ? (char *) __argz : 0; - } --extern inline char * -+__extern_inline char * - __NTH (argz_next (__const char *__argz, size_t __argz_len, - __const char *__entry)) - { ---- libc/math/bits/cmathcalls.h.jj 2001-07-06 06:55:35.000000000 +0200 -+++ libc/math/bits/cmathcalls.h 2006-11-07 11:19:39.000000000 +0100 -@@ -1,6 +1,6 @@ - /* Prototype declarations for complex math functions; - helper file for . -- Copyright (C) 1997, 1998, 2001 Free Software Foundation, Inc. -+ Copyright (C) 1997, 1998, 2001, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -135,21 +135,21 @@ __MATHDECL (_Mdouble_,creal, (_Mdouble_c - #if defined __GNUC__ && !__GNUC_PREREQ (2, 97) && defined __OPTIMIZE__ - - /* Imaginary part of Z. */ --extern __inline _Mdouble_ -+__extern_inline _Mdouble_ - __MATH_PRECNAME(cimag) (_Mdouble_complex_ __z) __THROW - { - return __imag__ __z; - } - - /* Real part of Z. */ --extern __inline _Mdouble_ -+__extern_inline _Mdouble_ - __MATH_PRECNAME(creal) (_Mdouble_complex_ __z) __THROW - { - return __real__ __z; - } - - /* Complex conjugate of Z. */ --extern __inline _Mdouble_complex_ -+__extern_inline _Mdouble_complex_ - __MATH_PRECNAME(conj) (_Mdouble_complex_ __z) __THROW - { - return __extension__ ~__z; ---- libc/math/math_private.h.jj 2005-11-21 16:43:03.000000000 +0100 -+++ libc/math/math_private.h 2006-11-06 21:33:45.000000000 +0100 -@@ -192,7 +192,7 @@ extern int __kernel_rem_pio2 (double* - extern double __copysign (double x, double __y); - - #if __GNUC_PREREQ (4, 0) --extern inline double __copysign (double x, double y) -+__extern_inline double __copysign (double x, double y) - { return __builtin_copysign (x, y); } - #endif - -@@ -239,7 +239,7 @@ extern int __kernel_rem_pio2f (float*, - extern float __copysignf (float x, float __y); - - #if __GNUC_PREREQ (4, 0) --extern inline float __copysignf (float x, float y) -+__extern_inline float __copysignf (float x, float y) - { return __builtin_copysignf (x, y); } - #endif - -@@ -307,7 +307,7 @@ extern long double __logbl (long double - extern long double __significandl (long double x); - - #if __GNUC_PREREQ (4, 0) --extern inline long double __copysignl (long double x, long double y) -+__extern_inline long double __copysignl (long double x, long double y) - { return __builtin_copysignl (x, y); } - #endif - ---- libc/hurd/hurd.h.jj 2002-01-02 10:52:20.000000000 +0100 -+++ libc/hurd/hurd.h 2006-11-07 11:19:51.000000000 +0100 -@@ -1,4 +1,5 @@ --/* Copyright (C) 1993,94,95,96,97,98,99,2001,02 Free Software Foundation, Inc. -+/* Copyright (C) 1993,94,95,96,97,98,99,2001,2002,2006 -+ Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -44,7 +45,7 @@ - #include - - #ifndef _HURD_H_EXTERN_INLINE --#define _HURD_H_EXTERN_INLINE extern __inline -+#define _HURD_H_EXTERN_INLINE __extern_inline - #endif - - _HURD_H_EXTERN_INLINE int ---- libc/hurd/hurd/port.h.jj 2001-07-06 06:54:47.000000000 +0200 -+++ libc/hurd/hurd/port.h 2006-11-07 11:19:58.000000000 +0100 -@@ -1,5 +1,6 @@ - /* Lightweight user references for ports. -- Copyright (C) 1993, 1994, 1995, 1997, 1999 Free Software Foundation, Inc. -+ Copyright (C) 1993, 1994, 1995, 1997, 1999, 2006 -+ Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -55,7 +56,7 @@ struct hurd_port - - - #ifndef _HURD_PORT_H_EXTERN_INLINE --#define _HURD_PORT_H_EXTERN_INLINE extern __inline -+#define _HURD_PORT_H_EXTERN_INLINE __extern_inline - #endif - - ---- libc/hurd/hurd/threadvar.h.jj 2002-09-02 09:08:53.000000000 +0200 -+++ libc/hurd/hurd/threadvar.h 2006-11-07 10:54:40.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Internal per-thread variables for the Hurd. -- Copyright (C) 1994,95,97,98,99,2001,02 Free Software Foundation, Inc. -+ Copyright (C) 1994,95,97,98,99,2001,02,06 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -74,7 +74,7 @@ enum __hurd_threadvar_index - - - #ifndef _HURD_THREADVAR_H_EXTERN_INLINE --#define _HURD_THREADVAR_H_EXTERN_INLINE extern __inline -+#define _HURD_THREADVAR_H_EXTERN_INLINE __extern_inline - #endif - - /* Return the location of the value for the per-thread variable with index ---- libc/hurd/hurd/fd.h.jj 2006-03-06 08:59:07.000000000 +0100 -+++ libc/hurd/hurd/fd.h 2006-11-07 10:53:18.000000000 +0100 -@@ -52,7 +52,7 @@ extern struct mutex _hurd_dtable_lock; / - #include - - #ifndef _HURD_FD_H_EXTERN_INLINE --#define _HURD_FD_H_EXTERN_INLINE extern __inline -+#define _HURD_FD_H_EXTERN_INLINE __extern_inline - #endif - - /* Returns the descriptor cell for FD. If FD is invalid or unused, return ---- libc/hurd/hurd/signal.h.jj 2002-02-18 21:57:11.000000000 +0100 -+++ libc/hurd/hurd/signal.h 2006-11-07 10:54:13.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Implementing POSIX.1 signals under the Hurd. -- Copyright (C) 1993,94,95,96,98,99,2002 Free Software Foundation, Inc. -+ Copyright (C) 1993,94,95,96,98,99,2002,2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -126,7 +126,7 @@ extern struct hurd_sigstate *_hurd_self_ - __attribute__ ((__const__)); - - #ifndef _HURD_SIGNAL_H_EXTERN_INLINE --#define _HURD_SIGNAL_H_EXTERN_INLINE extern __inline -+#define _HURD_SIGNAL_H_EXTERN_INLINE __extern_inline - #endif - - _HURD_SIGNAL_H_EXTERN_INLINE struct hurd_sigstate * ---- libc/hurd/hurd/userlink.h.jj 2001-07-06 06:54:47.000000000 +0200 -+++ libc/hurd/hurd/userlink.h 2006-11-07 10:53:37.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Support for chains recording users of a resource; `struct hurd_userlink'. -- Copyright (C) 1994, 1995, 1997, 1999 Free Software Foundation, Inc. -+ Copyright (C) 1994, 1995, 1997, 1999, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -71,7 +71,7 @@ struct hurd_userlink - - - #ifndef _HURD_USERLINK_H_EXTERN_INLINE --#define _HURD_USERLINK_H_EXTERN_INLINE extern __inline -+#define _HURD_USERLINK_H_EXTERN_INLINE __extern_inline - #endif - - ---- libc/sysdeps/mach/alpha/machine-sp.h.jj 2001-07-06 06:55:56.000000000 +0200 -+++ libc/sysdeps/mach/alpha/machine-sp.h 2006-11-07 10:55:42.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Machine-specific function to return the stack pointer. Alpha version. -- Copyright (C) 1994, 1997 Free Software Foundation, Inc. -+ Copyright (C) 1994, 1997, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -23,7 +23,7 @@ - /* Return the current stack pointer. */ - - #ifndef _EXTERN_INLINE --#define _EXTERN_INLINE extern __inline -+#define _EXTERN_INLINE __extern_inline - #endif - - _EXTERN_INLINE void * ---- libc/sysdeps/mach/alpha/machine-lock.h.jj 2003-02-26 01:01:15.000000000 +0100 -+++ libc/sysdeps/mach/alpha/machine-lock.h 2006-11-07 11:20:04.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Machine-specific definition for spin locks. Alpha version. -- Copyright (C) 1994, 1997 Free Software Foundation, Inc. -+ Copyright (C) 1994, 1997, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -30,7 +30,7 @@ typedef __volatile long int __spin_lock_ - - - #ifndef _EXTERN_INLINE --#define _EXTERN_INLINE extern __inline -+#define _EXTERN_INLINE __extern_inline - #endif - - /* Unlock LOCK. */ ---- libc/sysdeps/mach/i386/machine-lock.h.jj 2001-07-06 06:56:00.000000000 +0200 -+++ libc/sysdeps/mach/i386/machine-lock.h 2006-11-07 10:56:10.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Machine-specific definition for spin locks. i386 version. -- Copyright (C) 1994, 1997 Free Software Foundation, Inc. -+ Copyright (C) 1994, 1997, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -30,7 +30,7 @@ typedef __volatile int __spin_lock_t; - - - #ifndef _EXTERN_INLINE --#define _EXTERN_INLINE extern __inline -+#define _EXTERN_INLINE __extern_inline - #endif - - /* Unlock LOCK. */ ---- libc/sysdeps/mach/powerpc/machine-sp.h.jj 2002-08-27 00:39:44.000000000 +0200 -+++ libc/sysdeps/mach/powerpc/machine-sp.h 2006-11-07 10:56:59.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Machine-specific function to return the stack pointer. PowerPC version. -- Copyright (C) 2001 Free Software Foundation, Inc. -+ Copyright (C) 2001, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -27,7 +27,7 @@ - # ifdef _HURD_THREADVAR_H_EXTERN_INLINE - # define _EXTERN_INLINE _HURD_THREADVAR_H_EXTERN_INLINE - # else --# define _EXTERN_INLINE extern __inline -+# define _EXTERN_INLINE __extern_inline - # endif - #endif - ---- libc/sysdeps/mach/powerpc/machine-lock.h.jj 2002-02-17 08:13:25.000000000 +0100 -+++ libc/sysdeps/mach/powerpc/machine-lock.h 2006-11-07 10:56:40.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Machine-specific definition for spin locks. PowerPC version. -- Copyright (C) 1994,97,2002 Free Software Foundation, Inc. -+ Copyright (C) 1994,97,2002,2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -30,7 +30,7 @@ typedef __volatile long int __spin_lock_ - - - #ifndef _EXTERN_INLINE --#define _EXTERN_INLINE extern __inline -+#define _EXTERN_INLINE __extern_inline - #endif - - /* Unlock LOCK. */ ---- libc/sysdeps/alpha/fpu/bits/mathinline.h.jj 2005-02-08 05:37:48.000000000 +0100 -+++ libc/sysdeps/alpha/fpu/bits/mathinline.h 2006-11-07 10:59:08.000000000 +0100 -@@ -1,5 +1,6 @@ - /* Inline math functions for Alpha. -- Copyright (C) 1996, 1997, 1999-2001, 2004 Free Software Foundation, Inc. -+ Copyright (C) 1996, 1997, 1999-2001, 2004, 2006 -+ Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by David Mosberger-Tang. - -@@ -25,7 +26,7 @@ - #ifdef __cplusplus - # define __MATH_INLINE __inline - #else --# define __MATH_INLINE extern __inline -+# define __MATH_INLINE __extern_inline - #endif - - #if defined __USE_ISOC99 && defined __GNUC__ && !__GNUC_PREREQ(3,0) ---- libc/sysdeps/ia64/fpu/bits/mathinline.h.jj 2004-09-08 23:44:02.000000000 +0200 -+++ libc/sysdeps/ia64/fpu/bits/mathinline.h 2006-11-07 10:59:49.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Inline math functions for ia64. -- Copyright (C) 2004 Free Software Foundation, Inc. -+ Copyright (C) 2004, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -24,7 +24,7 @@ - #ifdef __cplusplus - # define __MATH_INLINE __inline - #else --# define __MATH_INLINE extern __inline -+# define __MATH_INLINE __extern_inline - #endif - - #if defined __USE_ISOC99 && defined __GNUC__ && __GNUC__ >= 2 ---- libc/sysdeps/i386/fpu/bits/mathinline.h.jj 2004-09-08 00:23:42.000000000 +0200 -+++ libc/sysdeps/i386/fpu/bits/mathinline.h 2006-11-07 11:00:56.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Inline math functions for i387. -- Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004 -+ Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2006 - Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by John C. Bowman , 1995. -@@ -26,7 +26,7 @@ - #ifdef __cplusplus - # define __MATH_INLINE __inline - #else --# define __MATH_INLINE extern __inline -+# define __MATH_INLINE __extern_inline - #endif - - ---- libc/sysdeps/i386/i486/bits/string.h.jj 2004-12-15 21:30:16.000000000 +0100 -+++ libc/sysdeps/i386/i486/bits/string.h 2006-11-07 11:01:34.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Optimized, inlined string functions. i486 version. -- Copyright (C) 1997,1998,1999,2000,2001,2002,2003,2004 -+ Copyright (C) 1997,1998,1999,2000,2001,2002,2003,2004,2006 - Free Software Foundation, Inc. - This file is part of the GNU C Library. - -@@ -35,7 +35,7 @@ - # ifdef __cplusplus - # define __STRING_INLINE inline - # else --# define __STRING_INLINE extern __inline -+# define __STRING_INLINE __extern_inline - # endif - #endif - ---- libc/sysdeps/generic/inttypes.h.jj 2004-09-08 00:23:42.000000000 +0200 -+++ libc/sysdeps/generic/inttypes.h 2006-11-07 11:02:59.000000000 +0100 -@@ -1,4 +1,4 @@ --/* Copyright (C) 1997-2001, 2004 Free Software Foundation, Inc. -+/* Copyright (C) 1997-2001, 2004, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -330,7 +330,7 @@ extern long int __strtol_internal (__con - int __base, int __group) __THROW; - # define __strtol_internal_defined 1 - # endif --extern __inline intmax_t -+__extern_inline intmax_t - __NTH (strtoimax (__const char *__restrict nptr, char **__restrict endptr, - int base)) - { -@@ -345,7 +345,7 @@ extern unsigned long int __strtoul_inter - int __base, int __group) __THROW; - # define __strtoul_internal_defined 1 - # endif --extern __inline uintmax_t -+__extern_inline uintmax_t - __NTH (strtoumax (__const char *__restrict nptr, char **__restrict endptr, - int base)) - { -@@ -359,7 +359,7 @@ extern long int __wcstol_internal (__con - int __base, int __group) __THROW; - # define __wcstol_internal_defined 1 - # endif --extern __inline intmax_t -+__extern_inline intmax_t - __NTH (wcstoimax (__const __gwchar_t *__restrict nptr, - __gwchar_t **__restrict endptr, int base)) - { -@@ -376,7 +376,7 @@ extern unsigned long int __wcstoul_inter - int __base, int __group) __THROW; - # define __wcstoul_internal_defined 1 - # endif --extern __inline uintmax_t -+__extern_inline uintmax_t - __NTH (wcstoumax (__const __gwchar_t *__restrict nptr, - __gwchar_t **__restrict endptr, int base)) - { -@@ -393,7 +393,7 @@ extern long long int __strtoll_internal - int __base, int __group) __THROW; - # define __strtoll_internal_defined 1 - # endif --extern __inline intmax_t -+__extern_inline intmax_t - __NTH (strtoimax (__const char *__restrict nptr, char **__restrict endptr, - int base)) - { -@@ -411,7 +411,7 @@ extern unsigned long long int __strtoull - int __group) __THROW; - # define __strtoull_internal_defined 1 - # endif --extern __inline uintmax_t -+__extern_inline uintmax_t - __NTH (strtoumax (__const char *__restrict nptr, char **__restrict endptr, - int base)) - { -@@ -427,7 +427,7 @@ extern long long int __wcstoll_internal - int __base, int __group) __THROW; - # define __wcstoll_internal_defined 1 - # endif --extern __inline intmax_t -+__extern_inline intmax_t - __NTH (wcstoimax (__const __gwchar_t *__restrict nptr, - __gwchar_t **__restrict endptr, int base)) - { -@@ -446,7 +446,7 @@ extern unsigned long long int __wcstoull - int __group) __THROW; - # define __wcstoull_internal_defined 1 - # endif --extern __inline uintmax_t -+__extern_inline uintmax_t - __NTH (wcstoumax (__const __gwchar_t *__restrict nptr, - __gwchar_t **__restrict endptr, int base)) - { ---- libc/sysdeps/generic/machine-sp.h.jj 2001-07-06 06:55:49.000000000 +0200 -+++ libc/sysdeps/generic/machine-sp.h 2006-11-07 11:06:02.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Machine-specific function to return the stack pointer. Stub version. -- Copyright (C) 1994, 1997 Free Software Foundation, Inc. -+ Copyright (C) 1994, 1997, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -23,7 +23,7 @@ - /* Return the current stack pointer. */ - - #ifndef _EXTERN_INLINE --#define _EXTERN_INLINE extern __inline -+#define _EXTERN_INLINE __extern_inline - #endif - - _EXTERN_INLINE void * ---- libc/sysdeps/generic/machine-lock.h.jj 2001-07-06 06:55:49.000000000 +0200 -+++ libc/sysdeps/generic/machine-lock.h 2006-11-07 11:02:08.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Machine-specific definition for spin locks. Stub version. -- Copyright (C) 1994, 1997 Free Software Foundation, Inc. -+ Copyright (C) 1994, 1997, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -30,7 +30,7 @@ typedef volatile int __spin_lock_t; - - - #ifndef _EXTERN_INLINE --#define _EXTERN_INLINE extern __inline -+#define _EXTERN_INLINE __extern_inline - #endif - - /* Unlock LOCK. */ ---- libc/sysdeps/generic/allocalim.h.jj 2002-10-09 11:19:59.000000000 +0200 -+++ libc/sysdeps/generic/allocalim.h 2006-11-07 11:03:22.000000000 +0100 -@@ -1,4 +1,4 @@ --extern inline int __libc_use_alloca (size_t size) -+__extern_inline int __libc_use_alloca (size_t size) - { - return size <= __MAX_ALLOCA_CUTOFF; - } ---- libc/sysdeps/pthread/aio_misc.c.jj 2006-01-04 00:12:54.000000000 +0100 -+++ libc/sysdeps/pthread/aio_misc.c 2006-11-07 11:06:31.000000000 +0100 -@@ -33,7 +33,7 @@ - #ifndef aio_create_helper_thread - # define aio_create_helper_thread __aio_create_helper_thread - --extern inline int -+__extern_inline int - __aio_create_helper_thread (pthread_t *threadp, void *(*tf) (void *), void *arg) - { - pthread_attr_t attr; ---- libc/sysdeps/s390/bits/string.h.jj 2005-01-28 22:44:42.000000000 +0100 -+++ libc/sysdeps/s390/bits/string.h 2006-11-07 11:07:05.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Optimized, inlined string functions. S/390 version. -- Copyright (C) 2000, 2001 Free Software Foundation, Inc. -+ Copyright (C) 2000, 2001, 2006 Free Software Foundation, Inc. - Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). - This file is part of the GNU C Library. - -@@ -34,7 +34,7 @@ - # ifdef __cplusplus - # define __STRING_INLINE inline - # else --# define __STRING_INLINE extern __inline -+# define __STRING_INLINE __extern_inline - # endif - #endif - ---- libc/sysdeps/s390/fpu/bits/mathinline.h.jj 2006-02-01 04:00:20.000000000 +0100 -+++ libc/sysdeps/s390/fpu/bits/mathinline.h 2006-11-07 11:07:37.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Inline math functions for s390. -- Copyright (C) 2004 Free Software Foundation, Inc. -+ Copyright (C) 2004, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -24,7 +24,7 @@ - #ifdef __cplusplus - # define __MATH_INLINE __inline - #else --# define __MATH_INLINE extern __inline -+# define __MATH_INLINE __extern_inline - #endif - - #if (!defined __NO_MATH_INLINES || defined __LIBC_INTERNAL_MATH_INLINES) \ ---- libc/sysdeps/powerpc/fpu/bits/mathinline.h.jj 2006-11-06 20:53:15.000000000 +0100 -+++ libc/sysdeps/powerpc/fpu/bits/mathinline.h 2006-11-07 11:08:04.000000000 +0100 -@@ -25,7 +25,7 @@ - #ifdef __cplusplus - # define __MATH_INLINE __inline - #else --# define __MATH_INLINE extern __inline -+# define __MATH_INLINE __extern_inline - #endif /* __cplusplus */ - - #if defined __GNUC__ && !defined _SOFT_FLOAT ---- libc/sysdeps/x86_64/fpu/bits/mathinline.h.jj 2004-09-08 00:18:59.000000000 +0200 -+++ libc/sysdeps/x86_64/fpu/bits/mathinline.h 2006-11-07 11:10:33.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Inline math functions for x86-64. -- Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. -+ Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Andreas Jaeger , 2002. - -@@ -25,7 +25,7 @@ - #ifdef __cplusplus - # define __MATH_INLINE __inline - #else --# define __MATH_INLINE extern __inline -+# define __MATH_INLINE __extern_inline - #endif - - ---- libc/sysdeps/sparc/fpu/bits/mathinline.h.jj 2006-01-14 13:09:02.000000000 +0100 -+++ libc/sysdeps/sparc/fpu/bits/mathinline.h 2006-11-07 11:10:57.000000000 +0100 -@@ -131,7 +131,7 @@ - # ifdef __cplusplus - # define __MATH_INLINE __inline - # else --# define __MATH_INLINE extern __inline -+# define __MATH_INLINE __extern_inline - # endif /* __cplusplus */ - - /* The gcc, version 2.7 or below, has problems with all this inlining ---- libc/sysdeps/unix/bsd/bsd4.4/bits/socket.h.jj 2004-09-11 18:28:10.000000000 +0200 -+++ libc/sysdeps/unix/bsd/bsd4.4/bits/socket.h 2006-11-07 11:12:07.000000000 +0100 -@@ -1,5 +1,5 @@ - /* System-specific socket constants and types. 4.4 BSD version. -- Copyright (C) 1991,92,1994-2002,2004 Free Software Foundation, Inc. -+ Copyright (C) 1991,92,1994-2002,2004,2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -227,7 +227,7 @@ extern struct cmsghdr *__cmsg_nxthdr (st - struct cmsghdr *__cmsg) __THROW; - #ifdef __USE_EXTERN_INLINES - # ifndef _EXTERN_INLINE --# define _EXTERN_INLINE extern __inline -+# define _EXTERN_INLINE __extern_inline - # endif - _EXTERN_INLINE struct cmsghdr * - __NTH (__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg)) ---- libc/sysdeps/unix/sysv/linux/ia64/ioperm.c.jj 2004-03-18 00:17:58.000000000 +0100 -+++ libc/sysdeps/unix/sysv/linux/ia64/ioperm.c 2006-11-07 11:13:23.000000000 +0100 -@@ -1,4 +1,4 @@ --/* Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc. -+/* Copyright (C) 1999, 2000, 2001, 2004, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by David Mosberger-Tang . - -@@ -51,7 +51,7 @@ static struct - } - io; - --__inline__ unsigned long int -+static __always_inline unsigned long int - io_offset (unsigned long int port) - { - return ((port >> 2) << 12) | (port & 0xfff); ---- libc/sysdeps/unix/sysv/linux/bits/socket.h.jj 2006-04-02 19:25:37.000000000 +0200 -+++ libc/sysdeps/unix/sysv/linux/bits/socket.h 2006-11-07 11:15:04.000000000 +0100 -@@ -264,7 +264,7 @@ extern struct cmsghdr *__cmsg_nxthdr (st - struct cmsghdr *__cmsg) __THROW; - #ifdef __USE_EXTERN_INLINES - # ifndef _EXTERN_INLINE --# define _EXTERN_INLINE extern __inline -+# define _EXTERN_INLINE __extern_inline - # endif - _EXTERN_INLINE struct cmsghdr * - __NTH (__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg)) ---- libc/sysdeps/unix/sysv/linux/bits/sigset.h.jj 2001-07-06 06:56:14.000000000 +0200 -+++ libc/sysdeps/unix/sysv/linux/bits/sigset.h 2006-11-07 11:14:48.000000000 +0100 -@@ -1,5 +1,6 @@ - /* __sig_atomic_t, __sigset_t, and related definitions. Linux version. -- Copyright (C) 1991, 1992, 1994, 1996, 1997 Free Software Foundation, Inc. -+ Copyright (C) 1991, 1992, 1994, 1996, 1997, 2006 -+ Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -43,7 +44,7 @@ typedef struct - # define _SIGSET_H_fns 1 - - # ifndef _EXTERN_INLINE --# define _EXTERN_INLINE extern __inline -+# define _EXTERN_INLINE __extern_inline - # endif - - /* Return a mask that includes the bit for SIG only. */ ---- libc/sysdeps/unix/sysv/linux/sys/sysmacros.h.jj 2004-09-08 00:18:59.000000000 +0200 -+++ libc/sysdeps/unix/sysv/linux/sys/sysmacros.h 2006-11-07 11:15:53.000000000 +0100 -@@ -0,0 +1,18 @@ -+/* DO NOT EDIT THIS FILE. -+ -+ It has been auto-edited by fixincludes from: -+ -+ "fixinc/tests/inc/sys/sysmacros.h" -+ -+ This had to be done to correct non-standard usages in the -+ original, manufacturer supplied header file. */ -+ -+ -+ -+#if defined( GLIBC_C99_INLINE_4_CHECK ) -+__extension__ -+#if __STDC_VERSION__ < 19901L -+extern -+#endif -+ __inline unsigned int -+#endif /* GLIBC_C99_INLINE_4_CHECK */ -@@ -1,5 +1,6 @@ - /* Definitions of macros to access `dev_t' values. -- Copyright (C) 1996, 1997, 1999, 2003, 2004 Free Software Foundation, Inc. -+ Copyright (C) 1996, 1997, 1999, 2003, 2004, 2006 -+ Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -27,30 +28,30 @@ - they need. */ - #ifdef __GLIBC_HAVE_LONG_LONG - __extension__ --extern __inline unsigned int gnu_dev_major (unsigned long long int __dev) -+__extern_inline unsigned int gnu_dev_major (unsigned long long int __dev) - __THROW; - __extension__ --extern __inline unsigned int gnu_dev_minor (unsigned long long int __dev) -+__extern_inline unsigned int gnu_dev_minor (unsigned long long int __dev) - __THROW; - __extension__ --extern __inline unsigned long long int gnu_dev_makedev (unsigned int __major, -+__extern_inline unsigned long long int gnu_dev_makedev (unsigned int __major, - unsigned int __minor) - __THROW; - - # if defined __GNUC__ && __GNUC__ >= 2 --__extension__ extern __inline unsigned int -+__extension__ __extern_inline unsigned int - __NTH (gnu_dev_major (unsigned long long int __dev)) - { - return ((__dev >> 8) & 0xfff) | ((unsigned int) (__dev >> 32) & ~0xfff); - } - --__extension__ extern __inline unsigned int -+__extension__ __extern_inline unsigned int - __NTH (gnu_dev_minor (unsigned long long int __dev)) - { - return (__dev & 0xff) | ((unsigned int) (__dev >> 12) & ~0xff); - } - --__extension__ extern __inline unsigned long long int -+__extension__ __extern_inline unsigned long long int - __NTH (gnu_dev_makedev (unsigned int __major, unsigned int __minor)) - { - return ((__minor & 0xff) | ((__major & 0xfff) << 8) diff --git a/pkgs/development/libraries/glibc/2.5/glibc-pwd.patch b/pkgs/development/libraries/glibc/2.5/glibc-pwd.patch deleted file mode 100644 index 07039718477f..000000000000 --- a/pkgs/development/libraries/glibc/2.5/glibc-pwd.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -ruN glibc-20050110/configure glibc-20050110.patched/configure ---- glibc-20050110/configure 2005-01-05 10:39:53.000000000 +0100 -+++ glibc-20050110.patched/configure 2005-01-18 13:33:01.000000000 +0100 -@@ -1393,7 +1393,7 @@ - ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. - - --if test "`cd $srcdir; /bin/pwd`" = "`/bin/pwd`"; then -+if test "`cd $srcdir; @PWD@`" = "`@PWD@`"; then - { { echo "$as_me:$LINENO: error: you must configure in a separate build directory" >&5 - echo "$as_me: error: you must configure in a separate build directory" >&2;} - { (exit 1); exit 1; }; } -diff -ruN glibc-20050110/io/ftwtest-sh glibc-20050110.patched/io/ftwtest-sh ---- glibc-20050110/io/ftwtest-sh 2004-02-09 21:12:23.000000000 +0100 -+++ glibc-20050110.patched/io/ftwtest-sh 2005-01-18 13:33:15.000000000 +0100 -@@ -120,7 +120,7 @@ - sort > $testout - - # perhaps $tmp involves some symlinks... --tmpreal=`cd $tmp; /bin/pwd 2>/dev/null || /usr/bin/pwd` -+tmpreal=`cd $tmp; @PWD@ 2>/dev/null || /usr/bin/pwd` - - cat </dev/null || /usr/bin/pwd` -+curwd=`@PWD@ 2>/dev/null || /usr/bin/pwd` - cd "$tmp" - LD_LIBRARY_PATH=$objpfx $ldso $testprogram --chdir ftwtest.d | - sort > $testout -@@ -160,7 +160,7 @@ - EOF - rm $testout - --curwd=`/bin/pwd 2>/dev/null || /usr/bin/pwd` -+curwd=`@PWD@ 2>/dev/null || /usr/bin/pwd` - cd "$tmp" - LD_LIBRARY_PATH=$objpfx $ldso $testprogram --chdir ftwtest.d/. | - sort > $testout -@@ -182,7 +182,7 @@ - EOF - rm $testout - --curwd=`/bin/pwd 2>/dev/null || /usr/bin/pwd` -+curwd=`@PWD@ 2>/dev/null || /usr/bin/pwd` - cd "$tmp" - LD_LIBRARY_PATH=$objpfx $ldso $testprogram --chdir ftwtest.d/foo/lvl1/link@1 | - sort > $testout -diff -ruN glibc-20050110/scripts/rellns-sh glibc-20050110.patched/scripts/rellns-sh ---- glibc-20050110/scripts/rellns-sh 1999-12-19 00:40:25.000000000 +0100 -+++ glibc-20050110.patched/scripts/rellns-sh 2005-01-18 13:35:53.245937423 +0100 -@@ -22,13 +22,13 @@ - exit 1 - fi - --if test -x /bin/pwd; then -- pwd=/bin/pwd --elif test -x /usr/bin/pwd; then -- pwd=/usr/bin/pwd --else -+#if test -x /bin/pwd; then -+# pwd=/bin/pwd -+#elif test -x /usr/bin/pwd; then -+# pwd=/usr/bin/pwd -+#else - pwd='pwd' --fi -+#fi - - # Make both paths absolute. - if test -d $1; then diff --git a/pkgs/development/libraries/glibc/2.5/make-3-82-fix.patch b/pkgs/development/libraries/glibc/2.5/make-3-82-fix.patch deleted file mode 100644 index 816e0aa528be..000000000000 --- a/pkgs/development/libraries/glibc/2.5/make-3-82-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- glibc-2.5/manual/Makefile.orig 2011-01-26 17:03:14.000000000 +0100 -+++ glibc-2.5/manual/Makefile 2011-01-26 17:04:30.000000000 +0100 -@@ -232,7 +232,10 @@ - .PHONY: stubs - stubs: $(objpfx)stubs - endif --$(objpfx)stubs ../po/manual.pot $(objpfx)stamp%: -+$(objpfx)stubs ../po/manual.pot: -+ $(make-target-directory) -+ touch $@ -+$(objpfx)stamp%: - $(make-target-directory) - touch $@ - diff --git a/pkgs/development/libraries/glibc/2.5/x86-fnstsw.patch b/pkgs/development/libraries/glibc/2.5/x86-fnstsw.patch deleted file mode 100644 index 45deb1d2d719..000000000000 --- a/pkgs/development/libraries/glibc/2.5/x86-fnstsw.patch +++ /dev/null @@ -1,32 +0,0 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../glibc/x86-fnstsw.patch -# Copyright (C) 2008 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- T2-COPYRIGHT-NOTE-END --- - -Fix more strict checking in binutils since 2.18.50.0.3: - sysdeps/i386/fpu/ftestexcept.c:33: Error: suffix or operands invalid for `fnstsw' - - - Rene Rebe - ---- glibc-2.6.1/sysdeps/i386/fpu/ftestexcept.c.vanilla 2008-09-02 12:45:07.000000000 +0200 -+++ glibc-2.6.1/sysdeps/i386/fpu/ftestexcept.c 2008-09-02 12:46:37.000000000 +0200 -@@ -26,7 +26,7 @@ - int - fetestexcept (int excepts) - { -- int temp; -+ short temp; - int xtemp = 0; - - /* Get current exceptions. */ diff --git a/pkgs/development/libraries/glibc/2.7/builder.sh b/pkgs/development/libraries/glibc/2.7/builder.sh deleted file mode 100644 index d5a43229bfaf..000000000000 --- a/pkgs/development/libraries/glibc/2.7/builder.sh +++ /dev/null @@ -1,60 +0,0 @@ -# glibc cannot have itself in its rpath. -export NIX_NO_SELF_RPATH=1 -export NIX_DONT_SET_RPATH=1 - -source $stdenv/setup - -# Explicitly tell glibc to use our pwd, not /bin/pwd. -export PWD_P=$(type -tP pwd) - -# Needed to install share/zoneinfo/zone.tab. -export BASH_SHELL=$SHELL - - -preConfigure() { - - for i in configure io/ftwtest-sh; do - # Can't use substituteInPlace here because replace hasn't been - # built yet in the bootstrap. - sed -i "$i" -e "s^/bin/pwd^$PWD_P^g" - done - - # In the glibc 2.6/2.7 tarballs C-translit.h is a little bit older - # than C-translit.h.in, forcing Make to rebuild it unnecessarily. - # This wouldn't be problem except that it requires Perl, which we - # don't want as a dependency in the Nixpkgs bootstrap. So force - # the output file to be newer. - touch locale/C-translit.h - - mkdir ../build - cd ../build - - configureScript=../$sourceRoot/configure -} - - -postConfigure() { - # Hack: get rid of the `-static' flag set by the bootstrap stdenv. - # This has to be done *after* `configure' because it builds some - # test binaries. - export NIX_CFLAGS_LINK= - export NIX_LDFLAGS_BEFORE= -} - - -postInstall() { - if test -n "$installLocales"; then - make localedata/install-locales - fi - rm $out/etc/ld.so.cache - (cd $out/include && ln -s $kernelHeaders/include/* .) || exit 1 - - # Fix for NIXOS-54 (ldd not working on x86_64). Make a symlink - # "lib64" to "lib". - if test -n "$is64bit"; then - ln -s lib $out/lib64 - fi -} - - -genericBuild diff --git a/pkgs/development/libraries/glibc/2.7/default.nix b/pkgs/development/libraries/glibc/2.7/default.nix deleted file mode 100644 index 7eb34e88899a..000000000000 --- a/pkgs/development/libraries/glibc/2.7/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv, fetchurl, kernelHeaders -, installLocales ? true -, profilingLibraries ? false -}: - -stdenv.mkDerivation { - name = "glibc-2.7"; - builder = ./builder.sh; - - src = fetchurl { - url = mirror://gnu/glibc/glibc-2.7.tar.bz2; - sha256 = "06j5q20l11x8kcrl9bg15xgb1pw0w82pazikxf4zvq2fmhiaa922"; - }; - - inherit kernelHeaders installLocales; - - inherit (stdenv) is64bit; - - patches = [ - /* Fix for NIXPKGS-79: when doing host name lookups, when - nsswitch.conf contains a line like - - hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4 - - don't return an error when mdns4_minimal can't be found. This - is a bug in Glibc: when a service can't be found, NSS should - continue to the next service unless "UNAVAIL=return" is set. - ("NOTFOUND=return" refers to the service returning a NOTFOUND - error, not the service itself not being found.) The reason is - that the "status" variable (while initialised to UNAVAIL) is - outside of the loop that iterates over the services, the - "files" service sets status to NOTFOUND. So when the call to - find "mdns4_minimal" fails, "status" will still be NOTFOUND, - and it will return instead of continuing to "dns". Thus, the - line - - hosts: mdns4_minimal [NOTFOUND=return] dns mdns4 - - does work because "status" will contain UNAVAIL after the - failure to find mdns4_minimal. */ - ./nss-skip-unavail.patch - ]; - - # `--with-tls --without-__thread' enables support for TLS but causes - # it not to be used. Required if we don't want to barf on 2.4 - # kernels. Or something. - configureFlags="--enable-add-ons - --with-headers=${kernelHeaders}/include - ${if profilingLibraries then "--enable-profile" else "--disable-profile"}"; - - # Workaround for this bug: - # http://sourceware.org/bugzilla/show_bug.cgi?id=411 - # I.e. when gcc is compiled with --with-arch=i686, then the - # preprocessor symbol `__i686' will be defined to `1'. This causes - # the symbol __i686.get_pc_thunk.dx to be mangled. - NIX_CFLAGS_COMPILE = "-U__i686"; -} diff --git a/pkgs/development/libraries/glibc/2.7/nss-skip-unavail.patch b/pkgs/development/libraries/glibc/2.7/nss-skip-unavail.patch deleted file mode 100644 index 4d29082f9419..000000000000 --- a/pkgs/development/libraries/glibc/2.7/nss-skip-unavail.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -rc glibc-2.7-orig/sysdeps/posix/getaddrinfo.c glibc-2.7/sysdeps/posix/getaddrinfo.c -*** glibc-2.7-orig/sysdeps/posix/getaddrinfo.c 2007-10-17 18:05:12.000000000 +0200 ---- glibc-2.7/sysdeps/posix/getaddrinfo.c 2008-04-08 12:17:09.000000000 +0200 -*************** -*** 498,505 **** - int no_data = 0; - int no_inet6_data = 0; - service_user *nip = NULL; -- enum nss_status inet6_status = NSS_STATUS_UNAVAIL; -- enum nss_status status = NSS_STATUS_UNAVAIL; - int no_more; - int old_res_options; - ---- 498,503 ---- -*************** -*** 689,694 **** ---- 687,694 ---- - - while (!no_more) - { -+ enum nss_status inet6_status = NSS_STATUS_UNAVAIL; -+ enum nss_status status = NSS_STATUS_UNAVAIL; - nss_gethostbyname3_r fct = NULL; - if (req->ai_flags & AI_CANONNAME) - /* No need to use this function if we do not look for diff --git a/pkgs/development/libraries/glibc/2.9/binutils-2.20.patch b/pkgs/development/libraries/glibc/2.9/binutils-2.20.patch deleted file mode 100644 index ab3d6144d6ee..000000000000 --- a/pkgs/development/libraries/glibc/2.9/binutils-2.20.patch +++ /dev/null @@ -1,42 +0,0 @@ -Support GNU Binutils 2.20 and beyond. Patch from -http://sourceware.org/ml/libc-alpha/2009-09/msg00009.html . - -diff --git a/configure b/configure -index 48e6952..b1d84d7 100755 ---- a/configure -+++ b/configure -@@ -4841,7 +4841,7 @@ $as_echo_n "checking version of $AS... " >&6; } - ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; -- 2.1[3-9]*) -+ 2.1[3-9]*|[2-9].[2-9]*) - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - -@@ -4904,7 +4904,7 @@ $as_echo_n "checking version of $LD... " >&6; } - ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; -- 2.1[3-9]*) -+ 2.1[3-9]*|[2-9].[2-9]*) - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - -diff --git a/configure.in b/configure.in -index 4584afe..7c4f71f 100644 ---- a/configure.in -+++ b/configure.in -@@ -897,10 +897,10 @@ AC_SUBST(MIG)dnl Needed by sysdeps/mach/configure.in - # Accept binutils 2.13 or newer. - AC_CHECK_PROG_VER(AS, $AS, --version, - [GNU assembler.* \([0-9]*\.[0-9.]*\)], -- [2.1[3-9]*], AS=: critic_missing="$critic_missing as") -+ [2.1[3-9]*|[2-9].[2-9]*], AS=: critic_missing="$critic_missing as") - AC_CHECK_PROG_VER(LD, $LD, --version, - [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)], -- [2.1[3-9]*], LD=: critic_missing="$critic_missing ld") -+ [2.1[3-9]*|[2-9].[2-9]*], LD=: critic_missing="$critic_missing ld") - - # We need the physical current working directory. We cannot use the - # "pwd -P" shell builtin since that's not portable. Instead we try to diff --git a/pkgs/development/libraries/glibc/2.9/binutils-ld.patch b/pkgs/development/libraries/glibc/2.9/binutils-ld.patch deleted file mode 100644 index ae70f145ce0d..000000000000 --- a/pkgs/development/libraries/glibc/2.9/binutils-ld.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 7c8a67320e26b8c11108bf0a3410d3aef9cf3486 Mon Sep 17 00:00:00 2001 -From: Ulrich Drepper -Date: Sat, 31 Jan 2009 00:21:15 +0000 -Subject: [PATCH] * elf/Makefile (ld.so): Adjust the sed script to insert _begin in to - - newer linker scripts. ---- - ChangeLog | 5 +++++ - elf/Makefile | 4 ++-- - 2 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/elf/Makefile b/elf/Makefile -index 8079fe9..e44ff1d 100644 ---- a/elf/Makefile -+++ b/elf/Makefile -@@ -1,4 +1,4 @@ --# Copyright (C) 1995-2007, 2008 Free Software Foundation, Inc. -+# Copyright (C) 1995-2007, 2008, 2009 Free Software Foundation, Inc. - # This file is part of the GNU C Library. - - # The GNU C Library is free software; you can redistribute it and/or -@@ -304,7 +304,7 @@ $(objpfx)ld.so: $(objpfx)librtld.os $(ld-map) - $(LDFLAGS-rtld) -Wl,-z,defs -Wl,--verbose 2>&1 | \ - LC_ALL=C \ - sed -e '/^=========/,/^=========/!d;/^=========/d' \ -- -e 's/\. = 0 + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' \ -+ -e 's/\. = .* + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' \ - > $@.lds - $(LINK.o) -nostdlib -nostartfiles -shared -o $@ \ - $(LDFLAGS-rtld) -Wl,-z,defs $(z-now-$(bind-now)) \ --- -1.6.4 - diff --git a/pkgs/development/libraries/glibc/2.9/builder.sh b/pkgs/development/libraries/glibc/2.9/builder.sh deleted file mode 100644 index c81a3ac2a9e9..000000000000 --- a/pkgs/development/libraries/glibc/2.9/builder.sh +++ /dev/null @@ -1,85 +0,0 @@ -# Glibc cannot have itself in its RPATH. -export NIX_NO_SELF_RPATH=1 - -source $stdenv/setup - -# Explicitly tell glibc to use our pwd, not /bin/pwd. -export PWD_P=$(type -tP pwd) - -# Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to -# prevent a retained dependency on the bootstrap tools in the -# stdenv-linux bootstrap. -export BASH_SHELL=/bin/sh - - -preConfigure() { - - for i in configure io/ftwtest-sh; do - # Can't use substituteInPlace here because replace hasn't been - # built yet in the bootstrap. - sed -i "$i" -e "s^/bin/pwd^$PWD_P^g" - done - - # In the glibc 2.6/2.7 tarballs C-translit.h is a little bit older - # than C-translit.h.in, forcing Make to rebuild it unnecessarily. - # This wouldn't be problem except that it requires Perl, which we - # don't want as a dependency in the Nixpkgs bootstrap. So force - # the output file to be newer. - touch locale/C-translit.h - - tar xvjf "$srcPorts" - - if test -n "$crossConfig"; then - sed -i s/-lgcc_eh//g Makeconfig - fi - - mkdir build - cd build - - configureScript=../configure - if test -n "$crossConfig"; then - cat > config.cache << "EOF" -libc_cv_forced_unwind=yes -libc_cv_c_cleanup=yes -libc_cv_gnu89_inline=yes -EOF - export BUILD_CC=gcc - export CC="${crossConfig}-gcc" - export AR="${crossConfig}-ar" - export RANLIB="${crossConfig}-ranlib" - configureFlags="${configureFlags} --cache-file=config.cache" - - # Disable the native stripping, because it breaks libc_nonshared.a - dontStrip=1 - fi -} - - -postConfigure() { - # Hack: get rid of the `-static' flag set by the bootstrap stdenv. - # This has to be done *after* `configure' because it builds some - # test binaries. - export NIX_CFLAGS_LINK= - export NIX_LDFLAGS_BEFORE= - - export NIX_DONT_SET_RPATH=1 - unset CFLAGS -} - - -postInstall() { - if test -n "$installLocales"; then - make localedata/install-locales - fi - test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache - (cd $out/include && ln -s $kernelHeaders/include/* .) || exit 1 - - # Fix for NIXOS-54 (ldd not working on x86_64). Make a symlink - # "lib64" to "lib". - if test -n "$is64bit"; then - ln -s lib $out/lib64 - fi -} - - -genericBuild diff --git a/pkgs/development/libraries/glibc/2.9/default.nix b/pkgs/development/libraries/glibc/2.9/default.nix deleted file mode 100644 index 7d42825206e2..000000000000 --- a/pkgs/development/libraries/glibc/2.9/default.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ stdenv, fetchurl, kernelHeaders -, installLocales ? true -, profilingLibraries ? false -, gccCross ? null -}: -let - cross = if gccCross != null then gccCross.target else null; -in -stdenv.mkDerivation rec { - name = "glibc-2.9" + - stdenv.lib.optionalString (cross != null) "-${cross.config}"; - - builder = ./builder.sh; - - src = fetchurl { - url = http://ftp.gnu.org/gnu/glibc/glibc-2.9.tar.bz2; - sha256 = "0v53m7flx6qcx7cvrvvw6a4dx4x3y6k8nvpc4wfv5xaaqy2am2q9"; - }; - - srcPorts = fetchurl { - url = http://ftp.gnu.org/gnu/glibc/glibc-ports-2.9.tar.bz2; - sha256 = "0r2sn527wxqifi63di7ns9wbjh1cainxn978w178khhy7yw9fk42"; - }; - - inherit kernelHeaders installLocales; - crossConfig = if (cross != null) then cross.config else null; - - inherit (stdenv) is64bit; - - patches = [ - /* Fix for NIXPKGS-79: when doing host name lookups, when - nsswitch.conf contains a line like - - hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4 - - don't return an error when mdns4_minimal can't be found. This - is a bug in Glibc: when a service can't be found, NSS should - continue to the next service unless "UNAVAIL=return" is set. - ("NOTFOUND=return" refers to the service returning a NOTFOUND - error, not the service itself not being found.) The reason is - that the "status" variable (while initialised to UNAVAIL) is - outside of the loop that iterates over the services, the - "files" service sets status to NOTFOUND. So when the call to - find "mdns4_minimal" fails, "status" will still be NOTFOUND, - and it will return instead of continuing to "dns". Thus, the - line - - hosts: mdns4_minimal [NOTFOUND=return] dns mdns4 - - does work because "status" will contain UNAVAIL after the - failure to find mdns4_minimal. */ - ./nss-skip-unavail.patch - - /* Make it possible to override the locale-archive in NixOS. */ - ./locale-override.patch - - /* Have rpcgen(1) look for cpp(1) in $PATH. */ - ./rpcgen-path.patch - - /* Support GNU Binutils 2.20 and above. */ - ./binutils-2.20.patch - - ./binutils-ld.patch - ]; - - configureFlags = [ - "--enable-add-ons" - "--with-headers=${kernelHeaders}/include" - (if profilingLibraries then "--enable-profile" else "--disable-profile") - ] ++ stdenv.lib.optionals (cross != null) [ - "--with-tls" - "--enable-kernel=2.6.0" - "--without-fp" - "--with-__thread" - ] ++ (if stdenv.isArm then [ - "--host=arm-linux-gnueabi" - "--build=arm-linux-gnueabi" - "--without-fp" - ] else []); - - buildNativeInputs = stdenv.lib.optionals (cross != null) [ gccCross ]; - - preInstall = if (cross != null) then '' - mkdir -p $out/lib - ln -s ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 - '' else ""; - - postInstall = if (cross != null) then '' - rm $out/lib/libgcc_s.so.1 - '' else ""; - - # Workaround for this bug: - # http://sourceware.org/bugzilla/show_bug.cgi?id=411 - # I.e. when gcc is compiled with --with-arch=i686, then the - # preprocessor symbol `__i686' will be defined to `1'. This causes - # the symbol __i686.get_pc_thunk.dx to be mangled. - NIX_CFLAGS_COMPILE = "-U__i686"; - - meta = { - homepage = http://www.gnu.org/software/libc/; - description = "The GNU C Library"; - }; -} diff --git a/pkgs/development/libraries/glibc/2.9/headers.nix b/pkgs/development/libraries/glibc/2.9/headers.nix deleted file mode 100644 index 7adeb11c8bc1..000000000000 --- a/pkgs/development/libraries/glibc/2.9/headers.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv, fetchurl, kernelHeaders -, profilingLibraries ? false -}: - -stdenv.mkDerivation rec { - name = "glibc-headers-2.9"; - - builder = ./headersbuilder.sh; - - src = fetchurl { - url = http://ftp.gnu.org/gnu/glibc/glibc-2.9.tar.bz2; - sha256 = "0v53m7flx6qcx7cvrvvw6a4dx4x3y6k8nvpc4wfv5xaaqy2am2q9"; - }; - - srcPorts = fetchurl { - url = http://ftp.gnu.org/gnu/glibc/glibc-ports-2.9.tar.bz2; - sha256 = "0r2sn527wxqifi63di7ns9wbjh1cainxn978w178khhy7yw9fk42"; - }; - - inherit kernelHeaders; - - inherit (stdenv) is64bit; - - patches = [ - /* Support GNU Binutils 2.20 and above. */ - ./binutils-2.20.patch - ]; - - configureFlags = [ - "--enable-add-ons" - "--with-headers=${kernelHeaders}/include" - "--disable-sanity-checks" - "--enable-hacker-mode" - (if profilingLibraries then "--enable-profile" else "--disable-profile") - ] ++ (if stdenv.isArm then [ - "--host=arm-linux-gnueabi" - "--build=arm-linux-gnueabi" - "--without-fp" - ] else []); - - buildPhase = "true"; - - # I took some tricks from crosstool-0.43 - installPhase = '' - make cross-compiling=yes CFLAGS=-DBOOTSTRAP_GCC install-headers - mkdir -p $out/include/gnu - touch $out/include/gnu/stubs.h - cp ../include/features.h $out/include/features.h - (cd $out/include && ln -s $kernelHeaders/include/* .) || exit 1 - ''; - - # Workaround for this bug: - # http://sourceware.org/bugzilla/show_bug.cgi?id=411 - # I.e. when gcc is compiled with --with-arch=i686, then the - # preprocessor symbol `__i686' will be defined to `1'. This causes - # the symbol __i686.get_pc_thunk.dx to be mangled. - NIX_CFLAGS_COMPILE = "-U__i686"; - - meta = { - homepage = http://www.gnu.org/software/libc/; - description = "The GNU C Library"; - }; -} diff --git a/pkgs/development/libraries/glibc/2.9/headersbuilder.sh b/pkgs/development/libraries/glibc/2.9/headersbuilder.sh deleted file mode 100644 index 23f4bd4cc619..000000000000 --- a/pkgs/development/libraries/glibc/2.9/headersbuilder.sh +++ /dev/null @@ -1,38 +0,0 @@ -# Glibc cannot have itself in its RPATH. -export NIX_NO_SELF_RPATH=1 - -source $stdenv/setup - -# Explicitly tell glibc to use our pwd, not /bin/pwd. -export PWD_P=$(type -tP pwd) - -# Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to -# prevent a retained dependency on the bootstrap tools in the -# stdenv-linux bootstrap. -export BASH_SHELL=/bin/sh - - -preConfigure() { - - for i in configure io/ftwtest-sh; do - # Can't use substituteInPlace here because replace hasn't been - # built yet in the bootstrap. - sed -i "$i" -e "s^/bin/pwd^$PWD_P^g" - done - - # In the glibc 2.6/2.7 tarballs C-translit.h is a little bit older - # than C-translit.h.in, forcing Make to rebuild it unnecessarily. - # This wouldn't be problem except that it requires Perl, which we - # don't want as a dependency in the Nixpkgs bootstrap. So force - # the output file to be newer. - touch locale/C-translit.h - - tar xvjf "$srcPorts" - - mkdir build - cd build - - configureScript=../configure -} - -genericBuild diff --git a/pkgs/development/libraries/glibc/2.9/info.nix b/pkgs/development/libraries/glibc/2.9/info.nix deleted file mode 100644 index cc79bbece3d2..000000000000 --- a/pkgs/development/libraries/glibc/2.9/info.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, fetchurl, texinfo, perl }: - -stdenv.mkDerivation rec { - name = "glibc-info-2.9"; - - src = fetchurl { - url = http://nixos.org/tarballs/glibc-2.9-20081208.tar.bz2; - sha256 = "0zhxbgcsl97pf349m0lz8d5ljvvzrcqc23yf08d888xlk4ms8m3h"; - }; - - patches = [ - /* Support GNU Binutils 2.20 and above. */ - ./binutils-2.20.patch - ]; - - preConfigure = '' - export PWD_P=$(type -tP pwd) - for i in configure io/ftwtest-sh; do - # Can't use substituteInPlace here because replace hasn't been - # built yet in the bootstrap. - sed -i "$i" -e "s^/bin/pwd^$PWD_P^g" - done - mkdir ../build - cd ../build - - configureScript=../$sourceRoot/configure - ''; - - configureFlags = [ "--enable-add-ons" ]; - - buildInputs = [ texinfo perl ]; - - buildPhase = "make info"; - - # I don't know why the info is not generated in 'build' - # Somehow building the info still does not work, because the final - # libc.info hasn't a Top node. - installPhase = '' - mkdir -p $out/share/info - cp ../$sourceRoot/manual/*.info $out/share/info - ''; - - meta = { - homepage = http://www.gnu.org/software/libc/; - description = "Locale information for the GNU C Library"; - }; -} diff --git a/pkgs/development/libraries/glibc/2.9/locale-override.patch b/pkgs/development/libraries/glibc/2.9/locale-override.patch deleted file mode 100644 index 108d0e35dacf..000000000000 --- a/pkgs/development/libraries/glibc/2.9/locale-override.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -rc glibc-2.9-20081208-orig/locale/loadarchive.c glibc-2.9-20081208/locale/loadarchive.c -*** glibc-2.9-20081208-orig/locale/loadarchive.c 2005-09-09 18:56:52.000000000 +0200 ---- glibc-2.9-20081208/locale/loadarchive.c 2009-04-19 13:54:26.000000000 +0200 -*************** -*** 124,129 **** ---- 124,142 ---- - } - - -+ static int -+ open_locale_archive () -+ { -+ int fd = -1; -+ char *path = getenv ("LOCALE_ARCHIVE"); -+ if (path) -+ fd = open_not_cancel_2 (path, O_RDONLY|O_LARGEFILE); -+ if (fd < 0) -+ fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE); -+ return fd; -+ } -+ -+ - /* Find the locale *NAMEP in the locale archive, and return the - internalized data structure for its CATEGORY data. If this locale has - already been loaded from the archive, just returns the existing data -*************** -*** 203,209 **** - archmapped = &headmap; - - /* The archive has never been opened. */ -! fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE); - if (fd < 0) - /* Cannot open the archive, for whatever reason. */ - return NULL; ---- 216,222 ---- - archmapped = &headmap; - - /* The archive has never been opened. */ -! fd = open_locale_archive (); - if (fd < 0) - /* Cannot open the archive, for whatever reason. */ - return NULL; -*************** -*** 394,400 **** - if (fd == -1) - { - struct stat64 st; -! fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE); - if (fd == -1) - /* Cannot open the archive, for whatever reason. */ - return NULL; ---- 407,413 ---- - if (fd == -1) - { - struct stat64 st; -! fd = open_locale_archive (); - if (fd == -1) - /* Cannot open the archive, for whatever reason. */ - return NULL; -diff -rc glibc-2.9-20081208-orig/sysdeps/generic/unsecvars.h glibc-2.9-20081208/sysdeps/generic/unsecvars.h -*** glibc-2.9-20081208-orig/sysdeps/generic/unsecvars.h 2006-10-11 18:24:05.000000000 +0200 ---- glibc-2.9-20081208/sysdeps/generic/unsecvars.h 2009-04-19 13:55:34.000000000 +0200 -*************** -*** 16,21 **** ---- 16,22 ---- - "LD_SHOW_AUXV\0" \ - "LD_USE_LOAD_BIAS\0" \ - "LOCALDOMAIN\0" \ -+ "LOCALE_ARCHIVE\0" \ - "LOCPATH\0" \ - "MALLOC_TRACE\0" \ - "NIS_PATH\0" \ diff --git a/pkgs/development/libraries/glibc/2.9/locales.nix b/pkgs/development/libraries/glibc/2.9/locales.nix deleted file mode 100644 index a1fe9f82f143..000000000000 --- a/pkgs/development/libraries/glibc/2.9/locales.nix +++ /dev/null @@ -1,67 +0,0 @@ -/* This function builds just the `lib/locale/locale-archive' file from - Glibc and nothing else. If `allLocales' is true, all supported - locales are included; otherwise, just the locales listed in - `locales'. See localedata/SUPPORTED in the Glibc source tree for - the list of all supported locales: - http://sourceware.org/cgi-bin/cvsweb.cgi/libc/localedata/SUPPORTED?cvsroot=glibc -*/ - -{ stdenv, fetchurl, allLocales ? true, locales ? ["en_US.UTF-8/UTF-8"] }: - -stdenv.mkDerivation rec { - name = "glibc-locales-2.9"; - - builder = ./localesbuilder.sh; - - src = fetchurl { - url = http://ftp.gnu.org/gnu/glibc/glibc-2.9.tar.bz2; - sha256 = "0v53m7flx6qcx7cvrvvw6a4dx4x3y6k8nvpc4wfv5xaaqy2am2q9"; - }; - - srcPorts = fetchurl { - url = http://ftp.gnu.org/gnu/glibc/glibc-ports-2.9.tar.bz2; - sha256 = "0r2sn527wxqifi63di7ns9wbjh1cainxn978w178khhy7yw9fk42"; - }; - - inherit (stdenv) is64bit; - - configureFlags = [ - "--enable-add-ons" - "--without-headers" - "--disable-profile" - ] ++ (if stdenv.isArm then [ - "--host=arm-linux-gnueabi" - "--build=arm-linux-gnueabi" - "--without-fp" - ] else []); - - patches = [ - /* Support GNU Binutils 2.20 and above. */ - ./binutils-2.20.patch - ]; - - # Awful hack: `localedef' doesn't allow the path to `locale-archive' - # to be overriden, but you *can* specify a prefix, i.e. it will use - # //lib/locale/locale-archive. So we use - # $TMPDIR as a prefix, meaning that the locale-archive is placed in - # $TMPDIR/nix/store/...-glibc-.../lib/locale/locale-archive. - buildPhase = - '' - mkdir -p $TMPDIR/"$(dirname $(readlink -f $(type -p localedef)))/../lib/locale" - make localedata/install-locales \ - LOCALEDEF="localedef --prefix=$TMPDIR" \ - localedir=$out/lib/locale \ - ${if allLocales then "" else "SUPPORTED-LOCALES=\"${toString locales}\""} - ''; - - installPhase = - '' - mkdir -p $out/lib/locale - cp $TMPDIR/nix/store/*/lib/locale/locale-archive $out/lib/locale/ - ''; - - meta = { - homepage = http://www.gnu.org/software/libc/; - description = "Locale information for the GNU C Library"; - }; -} diff --git a/pkgs/development/libraries/glibc/2.9/localesbuilder.sh b/pkgs/development/libraries/glibc/2.9/localesbuilder.sh deleted file mode 100644 index a28f6bcbaeb3..000000000000 --- a/pkgs/development/libraries/glibc/2.9/localesbuilder.sh +++ /dev/null @@ -1,50 +0,0 @@ -# Glibc cannot have itself in its RPATH. -export NIX_NO_SELF_RPATH=1 - -source $stdenv/setup - -# Explicitly tell glibc to use our pwd, not /bin/pwd. -export PWD_P=$(type -tP pwd) - -# Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to -# prevent a retained dependency on the bootstrap tools in the -# stdenv-linux bootstrap. -export BASH_SHELL=/bin/sh - - -preConfigure() { - - for i in configure io/ftwtest-sh; do - # Can't use substituteInPlace here because replace hasn't been - # built yet in the bootstrap. - sed -i "$i" -e "s^/bin/pwd^$PWD_P^g" - done - - # In the glibc 2.6/2.7 tarballs C-translit.h is a little bit older - # than C-translit.h.in, forcing Make to rebuild it unnecessarily. - # This wouldn't be problem except that it requires Perl, which we - # don't want as a dependency in the Nixpkgs bootstrap. So force - # the output file to be newer. - touch locale/C-translit.h - - tar xvjf "$srcPorts" - - mkdir build - cd build - - configureScript=../configure -} - - -postConfigure() { - # Hack: get rid of the `-static' flag set by the bootstrap stdenv. - # This has to be done *after* `configure' because it builds some - # test binaries. - export NIX_CFLAGS_LINK= - export NIX_LDFLAGS_BEFORE= - - export NIX_DONT_SET_RPATH=1 - unset CFLAGS -} - -genericBuild diff --git a/pkgs/development/libraries/glibc/2.9/nss-skip-unavail.patch b/pkgs/development/libraries/glibc/2.9/nss-skip-unavail.patch deleted file mode 100644 index dc09b5098707..000000000000 --- a/pkgs/development/libraries/glibc/2.9/nss-skip-unavail.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -rc glibc-2.9-20081208-orig/sysdeps/posix/getaddrinfo.c glibc-2.9-20081208/sysdeps/posix/getaddrinfo.c -*** glibc-2.9-20081208-orig/sysdeps/posix/getaddrinfo.c 2008-07-30 21:14:22.000000000 +0200 ---- glibc-2.9-20081208/sysdeps/posix/getaddrinfo.c 2008-12-10 11:39:32.000000000 +0100 -*************** -*** 505,512 **** - int no_data = 0; - int no_inet6_data = 0; - service_user *nip = NULL; -- enum nss_status inet6_status = NSS_STATUS_UNAVAIL; -- enum nss_status status = NSS_STATUS_UNAVAIL; - int no_more; - int old_res_options; - ---- 505,510 ---- -*************** -*** 702,707 **** ---- 700,707 ---- - - while (!no_more) - { -+ enum nss_status inet6_status = NSS_STATUS_UNAVAIL; -+ enum nss_status status = NSS_STATUS_UNAVAIL; - nss_gethostbyname4_r fct4 - = __nss_lookup_function (nip, "gethostbyname4_r"); - if (fct4 != NULL) diff --git a/pkgs/development/libraries/glibc/2.9/rpcgen-path.patch b/pkgs/development/libraries/glibc/2.9/rpcgen-path.patch deleted file mode 100644 index fbb03dd5fade..000000000000 --- a/pkgs/development/libraries/glibc/2.9/rpcgen-path.patch +++ /dev/null @@ -1,72 +0,0 @@ -By default, rpcgen(1) looks for cpp(1) from a list of fixed absolute paths -(`/lib/cpp', etc.), which may only be overrided with the `-Y' option. This -patch makes it run any `cpp' command found in $PATH. - ---- glibc-2.7/sunrpc/rpc_main.c 2006-11-10 21:54:46.000000000 +0100 -+++ glibc-2.7/sunrpc/rpc_main.c 2009-04-22 14:32:10.000000000 +0200 -@@ -79,7 +79,7 @@ static const char *cmdname; - - static const char *svcclosetime = "120"; - static int cppDefined; /* explicit path for C preprocessor */ --static const char *CPP = SUNOS_CPP; -+static const char *CPP = "cpp"; - static const char CPPFLAGS[] = "-C"; - static char *pathbuf; - static int cpp_pid; -@@ -108,7 +108,6 @@ static char *extendfile (const char *fil - static void open_output (const char *infile, const char *outfile); - static void add_warning (void); - static void clear_args (void); --static void find_cpp (void); - static void open_input (const char *infile, const char *define); - static int check_nettype (const char *name, const char *list_to_check[]); - static void c_output (const char *infile, const char *define, -@@ -327,31 +326,6 @@ clear_args (void) - argcount = FIXEDARGS; - } - --/* make sure that a CPP exists */ --static void --find_cpp (void) --{ -- struct stat buf; -- -- if (stat (CPP, &buf) < 0) -- { /* /lib/cpp or explicit cpp does not exist */ -- if (cppDefined) -- { -- fprintf (stderr, _ ("cannot find C preprocessor: %s \n"), CPP); -- crash (); -- } -- else -- { /* try the other one */ -- CPP = SVR4_CPP; -- if (stat (CPP, &buf) < 0) -- { /* can't find any cpp */ -- fputs (_ ("cannot find any C preprocessor (cpp)\n"), stdout); -- crash (); -- } -- } -- } --} -- - /* - * Open input file with given define for C-preprocessor - */ -@@ -370,7 +344,6 @@ open_input (const char *infile, const ch - switch (cpp_pid) - { - case 0: -- find_cpp (); - putarg (0, CPP); - putarg (1, CPPFLAGS); - addarg (define); -@@ -380,7 +353,7 @@ open_input (const char *infile, const ch - close (1); - dup2 (pd[1], 1); - close (pd[0]); -- execv (arglist[0], (char **) arglist); -+ execvp (arglist[0], (char **) arglist); - perror ("execv"); - exit (1); - case -1: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7f637486589..b120cebd882b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3586,28 +3586,6 @@ let glibcCross = glibc213Cross; - glibc25 = callPackage ../development/libraries/glibc/2.5 { - kernelHeaders = linuxHeaders_2_6_28; - installLocales = false; - }; - - glibc27 = callPackage ../development/libraries/glibc/2.7 { - kernelHeaders = linuxHeaders; - #installLocales = false; - }; - - glibc29 = callPackage ../development/libraries/glibc/2.9 { - kernelHeaders = linuxHeaders; - installLocales = getConfig [ "glibc" "locales" ] false; - }; - - glibc29Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc/2.9) { - inherit stdenv fetchurl; - gccCross = gccCrossStageStatic; - kernelHeaders = linuxHeadersCross; - installLocales = getConfig [ "glibc" "locales" ] false; - }); - glibc213 = (callPackage ../development/libraries/glibc/2.13 { kernelHeaders = linuxHeaders; installLocales = getConfig [ "glibc" "locales" ] false; -- cgit 1.4.1 From aa34058205434abff09fba1875a34482866850e8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Sep 2012 12:38:43 -0400 Subject: glibc: Update to 2.16 --- pkgs/development/libraries/glibc/2.16/builder.sh | 54 ++++++ pkgs/development/libraries/glibc/2.16/common.nix | 209 +++++++++++++++++++++ pkgs/development/libraries/glibc/2.16/default.nix | 99 ++++++++++ .../glibc/2.16/dont-use-system-ld-so-cache.patch | 45 +++++ .../glibc/2.16/glibc-elf-localscope.patch | 82 ++++++++ pkgs/development/libraries/glibc/2.16/info.nix | 26 +++ .../libraries/glibc/2.16/locales-builder.sh | 17 ++ pkgs/development/libraries/glibc/2.16/locales.nix | 47 +++++ .../libraries/glibc/2.16/nix-locale-archive.patch | 114 +++++++++++ .../libraries/glibc/2.16/nss-skip-unavail.patch | 21 +++ .../libraries/glibc/2.16/rpcgen-path.patch | 72 +++++++ pkgs/top-level/all-packages.nix | 11 +- 12 files changed, 796 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/glibc/2.16/builder.sh create mode 100644 pkgs/development/libraries/glibc/2.16/common.nix create mode 100644 pkgs/development/libraries/glibc/2.16/default.nix create mode 100644 pkgs/development/libraries/glibc/2.16/dont-use-system-ld-so-cache.patch create mode 100644 pkgs/development/libraries/glibc/2.16/glibc-elf-localscope.patch create mode 100644 pkgs/development/libraries/glibc/2.16/info.nix create mode 100644 pkgs/development/libraries/glibc/2.16/locales-builder.sh create mode 100644 pkgs/development/libraries/glibc/2.16/locales.nix create mode 100644 pkgs/development/libraries/glibc/2.16/nix-locale-archive.patch create mode 100644 pkgs/development/libraries/glibc/2.16/nss-skip-unavail.patch create mode 100644 pkgs/development/libraries/glibc/2.16/rpcgen-path.patch (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/glibc/2.16/builder.sh b/pkgs/development/libraries/glibc/2.16/builder.sh new file mode 100644 index 000000000000..e68e13f9beca --- /dev/null +++ b/pkgs/development/libraries/glibc/2.16/builder.sh @@ -0,0 +1,54 @@ +# Glibc cannot have itself in its RPATH. +export NIX_NO_SELF_RPATH=1 + +source $stdenv/setup + +postConfigure() { + # Hack: get rid of the `-static' flag set by the bootstrap stdenv. + # This has to be done *after* `configure' because it builds some + # test binaries. + export NIX_CFLAGS_LINK= + export NIX_LDFLAGS_BEFORE= + + export NIX_DONT_SET_RPATH=1 + unset CFLAGS +} + + +postInstall() { + if test -n "$installLocales"; then + make -j${NIX_BUILD_CORES:-1} -l${NIX_BUILD_CORES:-1} localedata/install-locales + fi + + test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache + + # FIXME: Use `test -n $linuxHeaders' when `kernelHeaders' has been + # renamed. + if test -z "$hurdHeaders"; then + # Include the Linux kernel headers in Glibc, except the `scsi' + # subdirectory, which Glibc provides itself. + (cd $out/include && \ + ln -sv $(ls -d $kernelHeaders/include/* | grep -v 'scsi$') .) + fi + + if test -f "$out/lib/libhurduser.so"; then + # libc.so, libhurduser.so, and libmachuser.so depend on each + # other, so add them to libc.so (a RUNPATH on libc.so.0.3 + # would be ignored by the cross-linker.) + echo "adding \`libhurduser.so' and \`libmachuser.so' to the \`libc.so' linker script..." + sed -i "$out/lib/libc.so" \ + -e"s|\(libc\.so\.[^ ]\+\>\)|\1 $out/lib/libhurduser.so $out/lib/libmachuser.so|g" + fi + + # Fix for NIXOS-54 (ldd not working on x86_64). Make a symlink + # "lib64" to "lib". + if test -n "$is64bit"; then + ln -s lib $out/lib64 + fi + + # This file, that should not remain in the glibc derivation, + # may have not been created during the preInstall + rm -f $out/lib/libgcc_s.so.1 +} + +genericBuild diff --git a/pkgs/development/libraries/glibc/2.16/common.nix b/pkgs/development/libraries/glibc/2.16/common.nix new file mode 100644 index 000000000000..5624be5b5495 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.16/common.nix @@ -0,0 +1,209 @@ +/* Build configuration used to build glibc, Info files, and locale + information. */ + +cross: + +{ name, fetchurl, stdenv, installLocales ? false +, gccCross ? null, kernelHeaders ? null +, machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null +, mig ? null +, profilingLibraries ? false, meta +, preConfigure ? "", ... }@args: + +let + version = "2.16.0"; + + needsPortsNative = stdenv.isMips || stdenv.isArm; + needsPortsCross = cross.arch == "mips" || cross.arch == "arm"; + needsPorts = + if stdenv.cross or null != null && hurdHeaders == null then true + else if cross == null then needsPortsNative + else needsPortsCross; + + srcPorts = fetchurl { + url = "mirror://gnu/glibc/glibc-ports-${version}.tar.bz2"; + sha256 = "0qw4n71rqykl83ybq0c92w1n8afsx079sw3hn5nyib5nw6iphrfm"; + }; + +in + +assert cross != null -> gccCross != null; + +assert mig != null -> machHeaders != null; +assert machHeaders != null -> hurdHeaders != null; +assert hurdHeaders != null -> libpthreadHeaders != null; + +stdenv.mkDerivation ({ + inherit kernelHeaders installLocales; + + # The host/target system. + crossConfig = if cross != null then cross.config else null; + + inherit (stdenv) is64bit; + + enableParallelBuilding = true; + + patches = + [ /* Fix for NIXPKGS-79: when doing host name lookups, when + nsswitch.conf contains a line like + + hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4 + + don't return an error when mdns4_minimal can't be found. This + is a bug in Glibc: when a service can't be found, NSS should + continue to the next service unless "UNAVAIL=return" is set. + ("NOTFOUND=return" refers to the service returning a NOTFOUND + error, not the service itself not being found.) The reason is + that the "status" variable (while initialised to UNAVAIL) is + outside of the loop that iterates over the services, the + "files" service sets status to NOTFOUND. So when the call to + find "mdns4_minimal" fails, "status" will still be NOTFOUND, + and it will return instead of continuing to "dns". Thus, the + line + + hosts: mdns4_minimal [NOTFOUND=return] dns mdns4 + + does work because "status" will contain UNAVAIL after the + failure to find mdns4_minimal. */ + ./nss-skip-unavail.patch + + /* Have rpcgen(1) look for cpp(1) in $PATH. */ + ./rpcgen-path.patch + + /* Allow NixOS and Nix to handle the locale-archive. */ + ./nix-locale-archive.patch + + /* Don't use /etc/ld.so.cache, for non-NixOS systems. Currently + disabled on GNU/Hurd, which uses a more recent libc snapshot. */ + ./dont-use-system-ld-so-cache.patch + + /* Without this patch many KDE binaries crash. */ + ./glibc-elf-localscope.patch + ]; + + postPatch = '' + # Needed for glibc to build with the gnumake 3.82 + # http://comments.gmane.org/gmane.linux.lfs.support/31227 + sed -i 's/ot \$/ot:\n\ttouch $@\n$/' manual/Makefile + + # nscd needs libgcc, and we don't want it dynamically linked + # because we don't want it to depend on bootstrap-tools libs. + echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile + ''; + + configureFlags = + [ "-C" + "--enable-add-ons" + "--enable-obsolete-rpc" + "--sysconfdir=/etc" + "--localedir=/var/run/current-system/sw/lib/locale" + "libc_cv_ssp=no" + (if kernelHeaders != null + then "--with-headers=${kernelHeaders}/include" + else "--without-headers") + (if profilingLibraries + then "--enable-profile" + else "--disable-profile") + ] ++ stdenv.lib.optionals (cross == null && kernelHeaders != null) [ + "--enable-kernel=${kernelHeaders.versionForGlibc}" + ] ++ stdenv.lib.optionals (cross != null) [ + (if cross.withTLS then "--with-tls" else "--without-tls") + (if cross.float == "soft" then "--without-fp" else "--with-fp") + ] ++ stdenv.lib.optionals (cross != null + && cross.platform ? kernelMajor + && cross.platform.kernelMajor == "2.6") [ + "--enable-kernel=2.6.0" + "--with-__thread" + ] ++ stdenv.lib.optionals stdenv.isArm [ + "--host=arm-linux-gnueabi" + "--build=arm-linux-gnueabi" + "--without-fp" + # To avoid linking with -lgcc_s (dynamic link) + # so the glibc does not depend on its compiler store path + "libc_cv_as_needed=no" + ]; + + installFlags = [ "sysconfdir=$(out)/etc" ]; + + buildInputs = stdenv.lib.optionals (cross != null) [ gccCross ] + ++ stdenv.lib.optional (mig != null) mig; + + # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to + # prevent a retained dependency on the bootstrap tools in the stdenv-linux + # bootstrap. + BASH_SHELL = "/bin/sh"; + + # Workaround for this bug: + # http://sourceware.org/bugzilla/show_bug.cgi?id=411 + # I.e. when gcc is compiled with --with-arch=i686, then the + # preprocessor symbol `__i686' will be defined to `1'. This causes + # the symbol __i686.get_pc_thunk.dx to be mangled. + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.system == "i686-linux") "-U__i686"; +} + +# Remove the `gccCross' attribute so that the *native* glibc store path +# doesn't depend on whether `gccCross' is null or not. +// (removeAttrs args [ "gccCross" "fetchurl" ]) // + +{ + name = name + "-${version}" + + stdenv.lib.optionalString (cross != null) "-${cross.config}"; + + src = fetchurl { + url = "mirror://gnu/glibc/glibc-${version}.tar.gz"; + sha256 = "0vlz4x6cgz7h54qq4528q526qlhnsjzbsvgc4iizn76cb0bfanx7"; + }; + + # Remove absolute paths from `configure' & co.; build out-of-tree. + preConfigure = '' + export PWD_P=$(type -tP pwd) + for i in configure io/ftwtest-sh; do + # Can't use substituteInPlace here because replace hasn't been + # built yet in the bootstrap. + sed -i "$i" -e "s^/bin/pwd^$PWD_P^g" + done + + ${if needsPorts then "tar xvf ${srcPorts}" else ""} + + mkdir ../build + cd ../build + + configureScript="`pwd`/../$sourceRoot/configure" + + # Needed to build rpcgen. + export LD_LIBRARY_PATH=${stdenv.gcc.libc}/lib + + ${preConfigure} + ''; + + meta = { + homepage = http://www.gnu.org/software/libc/; + description = "The GNU C Library" + + stdenv.lib.optionalString (hurdHeaders != null) ", for GNU/Hurd"; + + longDescription = + '' Any Unix-like operating system needs a C library: the library which + defines the "system calls" and other basic facilities such as + open, malloc, printf, exit... + + The GNU C library is used as the C library in the GNU system and + most systems with the Linux kernel. + ''; + + license = "LGPLv2+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + #platforms = stdenv.lib.platforms.linux; + } // meta; +} + +// stdenv.lib.optionalAttrs (hurdHeaders != null) { + # Work around the fact that the configure snippet that looks for + # does not honor `--with-headers=$sysheaders' and that + # glibc expects Mach, Hurd, and pthread headers to be in the same place. + CPATH = "${hurdHeaders}/include:${machHeaders}/include:${libpthreadHeaders}/include"; + + # Install NSS stuff in the right place. + # XXX: This will be needed for all new glibcs and isn't Hurd-specific. + makeFlags = ''vardbdir="$out/var/db"''; +}) diff --git a/pkgs/development/libraries/glibc/2.16/default.nix b/pkgs/development/libraries/glibc/2.16/default.nix new file mode 100644 index 000000000000..0a0752570f32 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.16/default.nix @@ -0,0 +1,99 @@ +{ stdenv, fetchurl, kernelHeaders +, machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null +, mig ? null +, installLocales ? true +, profilingLibraries ? false +, gccCross ? null +, debugSymbols ? false +}: + +assert stdenv.gcc.gcc != null; + +let + build = import ./common.nix; + cross = if gccCross != null then gccCross.target else null; +in + build cross ({ + name = "glibc" + + stdenv.lib.optionalString (hurdHeaders != null) "-hurd" + + stdenv.lib.optionalString debugSymbols "-debug"; + + inherit fetchurl stdenv kernelHeaders installLocales profilingLibraries + gccCross; + + builder = ./builder.sh; + + # When building glibc from bootstrap-tools, we need libgcc_s at RPATH for + # any program we run, because the gcc will have been placed at a new + # store path than that determined when built (as a source for the + # bootstrap-tools tarball) + # Building from a proper gcc staying in the path where it was installed, + # libgcc_s will not be at {gcc}/lib, and gcc's libgcc will be found without + # any special hack. + preInstall = '' + if [ -f ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 ]; then + mkdir -p $out/lib + ln -s ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 + fi + ''; + + meta.description = "The GNU C Library"; + } + + // + + (if debugSymbols + then { + # Build with debugging symbols, but leave optimizations on and don't + # attempt to keep the build tree. + dontStrip = true; + dontCrossStrip = true; + NIX_STRIP_DEBUG = 0; + } + else {}) + + // + + (if hurdHeaders != null + then rec { + inherit machHeaders hurdHeaders libpthreadHeaders mig; + + propagatedBuildInputs = [ machHeaders hurdHeaders libpthreadHeaders ]; + + passthru = { + # When building GCC itself `propagatedBuildInputs' above is not + # honored, so we pass it here so that the GCC builder can do the right + # thing. + inherit propagatedBuildInputs; + }; + } + else { }) + + // + + (if cross != null + then { + preConfigure = '' + sed -i s/-lgcc_eh//g "../$sourceRoot/Makeconfig" + + cat > config.cache << "EOF" + libc_cv_forced_unwind=yes + libc_cv_c_cleanup=yes + libc_cv_gnu89_inline=yes + # Only due to a problem in gcc configure scripts: + libc_cv_sparc64_tls=${if cross.withTLS then "yes" else "no"} + EOF + export BUILD_CC=gcc + export CC="$crossConfig-gcc" + export AR="$crossConfig-ar" + export RANLIB="$crossConfig-ranlib" + + dontStrip=1 + ''; + + # To avoid a dependency on the build system 'bash'. + preFixup = '' + rm $out/bin/{ldd,tzselect,catchsegv,xtrace} + ''; + } + else {})) diff --git a/pkgs/development/libraries/glibc/2.16/dont-use-system-ld-so-cache.patch b/pkgs/development/libraries/glibc/2.16/dont-use-system-ld-so-cache.patch new file mode 100644 index 000000000000..95f537733204 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.16/dont-use-system-ld-so-cache.patch @@ -0,0 +1,45 @@ +diff -ru glibc-2.16.0-orig/elf/ldconfig.c glibc-2.16.0/elf/ldconfig.c +--- glibc-2.16.0-orig/elf/ldconfig.c 2012-06-30 15:12:34.000000000 -0400 ++++ glibc-2.16.0/elf/ldconfig.c 2012-09-18 11:59:27.463284814 -0400 +@@ -50,7 +50,7 @@ + #endif + + #ifndef LD_SO_CONF +-# define LD_SO_CONF SYSCONFDIR "/ld.so.conf" ++# define LD_SO_CONF PREFIX "/etc/ld.so.conf" + #endif + + /* Get libc version number. */ +diff -ru glibc-2.16.0-orig/elf/Makefile glibc-2.16.0/elf/Makefile +--- glibc-2.16.0-orig/elf/Makefile 2012-06-30 15:12:34.000000000 -0400 ++++ glibc-2.16.0/elf/Makefile 2012-09-18 12:03:30.031955196 -0400 +@@ -415,12 +415,12 @@ + + $(objpfx)pldd: $(pldd-modules:%=$(objpfx)%.o) + +-SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"' +-CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ ++PREFIX-FLAGS := -D'PREFIX="$(prefix)"' ++CFLAGS-ldconfig.c = $(PREFIX-FLAGS) -D'LIBDIR="$(libdir)"' \ + -D'SLIBDIR="$(slibdir)"' -DIS_IN_ldconfig=1 +-CFLAGS-dl-cache.c = $(SYSCONF-FLAGS) +-CFLAGS-cache.c = $(SYSCONF-FLAGS) +-CFLAGS-rtld.c = $(SYSCONF-FLAGS) ++CFLAGS-dl-cache.c = $(PREFIX-FLAGS) ++CFLAGS-cache.c = $(PREFIX-FLAGS) ++CFLAGS-rtld.c = $(PREFIX-FLAGS) + + CPPFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),\ + -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld) +diff -ru glibc-2.16.0-orig/sysdeps/generic/dl-cache.h glibc-2.16.0/sysdeps/generic/dl-cache.h +--- glibc-2.16.0-orig/sysdeps/generic/dl-cache.h 2012-06-30 15:12:34.000000000 -0400 ++++ glibc-2.16.0/sysdeps/generic/dl-cache.h 2012-09-18 11:59:27.465284809 -0400 +@@ -28,7 +28,7 @@ + #endif + + #ifndef LD_SO_CACHE +-# define LD_SO_CACHE SYSCONFDIR "/ld.so.cache" ++# define LD_SO_CACHE PREFIX "/etc/ld.so.cache" + #endif + + #ifndef add_system_dir diff --git a/pkgs/development/libraries/glibc/2.16/glibc-elf-localscope.patch b/pkgs/development/libraries/glibc/2.16/glibc-elf-localscope.patch new file mode 100644 index 000000000000..98f7f81087bb --- /dev/null +++ b/pkgs/development/libraries/glibc/2.16/glibc-elf-localscope.patch @@ -0,0 +1,82 @@ +diff -ru a/elf/dl-close.c b/elf/dl-close.c +--- a/elf/dl-close.c 2011-02-04 00:35:03.000000000 +0100 ++++ b/elf/dl-close.c 2011-02-22 02:16:12.367883000 +0100 +@@ -180,24 +186,28 @@ + /* Signal the object is still needed. */ + l->l_idx = IDX_STILL_USED; + ++#define mark_used(dmap) \ ++ do { \ ++ if ((dmap)->l_idx != IDX_STILL_USED) \ ++ { \ ++ assert ((dmap)->l_idx >= 0 && (dmap)->l_idx < nloaded); \ ++ \ ++ if (!used[(dmap)->l_idx]) \ ++ { \ ++ used[(dmap)->l_idx] = 1; \ ++ if ((dmap)->l_idx - 1 < done_index) \ ++ done_index = (dmap)->l_idx - 1; \ ++ } \ ++ } \ ++ } while (0) ++ + /* Mark all dependencies as used. */ + if (l->l_initfini != NULL) + { + struct link_map **lp = &l->l_initfini[1]; + while (*lp != NULL) + { +- if ((*lp)->l_idx != IDX_STILL_USED) +- { +- assert ((*lp)->l_idx >= 0 && (*lp)->l_idx < nloaded); +- +- if (!used[(*lp)->l_idx]) +- { +- used[(*lp)->l_idx] = 1; +- if ((*lp)->l_idx - 1 < done_index) +- done_index = (*lp)->l_idx - 1; +- } +- } +- ++ mark_used(*lp); + ++lp; + } + } +@@ -206,19 +216,25 @@ + for (unsigned int j = 0; j < l->l_reldeps->act; ++j) + { + struct link_map *jmap = l->l_reldeps->list[j]; +- +- if (jmap->l_idx != IDX_STILL_USED) +- { +- assert (jmap->l_idx >= 0 && jmap->l_idx < nloaded); +- +- if (!used[jmap->l_idx]) +- { +- used[jmap->l_idx] = 1; +- if (jmap->l_idx - 1 < done_index) +- done_index = jmap->l_idx - 1; +- } +- } ++ mark_used(jmap); + } ++ /* And the same for owners of our scopes; normally, our last ++ scope provider would render us unused, but this can be ++ prevented by the NODELETE flag. */ ++ if (__builtin_expect(l->l_type == lt_loaded ++ && (l->l_flags_1 & DF_1_NODELETE), 0)) ++ for (size_t cnt = 0; l->l_scope[cnt] != NULL; ++cnt) ++ /* This relies on l_scope[] entries being always set either ++ to its own l_symbolic_searchlist address, or some map's ++ l_searchlist address. */ ++ if (l->l_scope[cnt] != &l->l_symbolic_searchlist) ++ { ++ struct link_map *ls = (struct link_map *) ++ ((char *) l->l_scope[cnt] ++ - offsetof (struct link_map, l_searchlist)); ++ assert (ls->l_ns == nsid); ++ mark_used(ls); ++ } + } + + /* Sort the entries. */ diff --git a/pkgs/development/libraries/glibc/2.16/info.nix b/pkgs/development/libraries/glibc/2.16/info.nix new file mode 100644 index 000000000000..322f07f02363 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.16/info.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, texinfo, perl }: + +let build = import ./common.nix; in + +/* null cross builder */ +build null { + name = "glibc-info"; + + inherit fetchurl stdenv; + + configureFlags = [ "--enable-add-ons" ]; + + buildInputs = [ texinfo perl ]; + + buildPhase = "make info"; + + # I don't know why the info is not generated in 'build' + # Somehow building the info still does not work, because the final + # libc.info hasn't a Top node. + installPhase = '' + mkdir -p "$out/share/info" + cp -v "../$sourceRoot/manual/"*.info* "$out/share/info" + ''; + + meta.description = "GNU Info manual of the GNU C Library"; +} diff --git a/pkgs/development/libraries/glibc/2.16/locales-builder.sh b/pkgs/development/libraries/glibc/2.16/locales-builder.sh new file mode 100644 index 000000000000..d732e208fa22 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.16/locales-builder.sh @@ -0,0 +1,17 @@ +# Glibc cannot have itself in its RPATH. +export NIX_NO_SELF_RPATH=1 + +source $stdenv/setup + +postConfigure() { + # Hack: get rid of the `-static' flag set by the bootstrap stdenv. + # This has to be done *after* `configure' because it builds some + # test binaries. + export NIX_CFLAGS_LINK= + export NIX_LDFLAGS_BEFORE= + + export NIX_DONT_SET_RPATH=1 + unset CFLAGS +} + +genericBuild diff --git a/pkgs/development/libraries/glibc/2.16/locales.nix b/pkgs/development/libraries/glibc/2.16/locales.nix new file mode 100644 index 000000000000..b7eae50ca385 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.16/locales.nix @@ -0,0 +1,47 @@ +/* This function builds just the `lib/locale/locale-archive' file from + Glibc and nothing else. If `allLocales' is true, all supported + locales are included; otherwise, just the locales listed in + `locales'. See localedata/SUPPORTED in the Glibc source tree for + the list of all supported locales: + http://sourceware.org/cgi-bin/cvsweb.cgi/libc/localedata/SUPPORTED?cvsroot=glibc +*/ + +{ stdenv, fetchurl, allLocales ? true, locales ? ["en_US.UTF-8/UTF-8"] }: + +let build = import ./common.nix; +in + build null { + name = "glibc-locales"; + + inherit fetchurl stdenv; + installLocales = true; + + builder = ./locales-builder.sh; + + # Awful hack: `localedef' doesn't allow the path to `locale-archive' + # to be overriden, but you *can* specify a prefix, i.e. it will use + # //lib/locale/locale-archive. So we use + # $TMPDIR as a prefix, meaning that the locale-archive is placed in + # $TMPDIR/nix/store/...-glibc-.../lib/locale/locale-archive. + buildPhase = + '' + mkdir -p $TMPDIR/"$(dirname $(readlink -f $(type -p localedef)))/../lib/locale" + + # Hack to allow building of the locales (needed since glibc-2.12) + sed -i -e "s,^LOCALEDEF=.*,LOCALEDEF=localedef --prefix=$TMPDIR," -e \ + /library-path/d ../glibc-2*/localedata/Makefile + ${if allLocales then "" else + "echo SUPPORTED-LOCALES=\"${toString locales}\" > ../glibc-2*/localedata/SUPPORTED"} + + make localedata/install-locales \ + localedir=$out/lib/locale \ + ''; + + installPhase = + '' + mkdir -p "$out/lib/locale" + cp -v "$TMPDIR/nix/store/"*"/lib/locale/locale-archive" "$out/lib/locale" + ''; + + meta.description = "Locale information for the GNU C Library"; + } diff --git a/pkgs/development/libraries/glibc/2.16/nix-locale-archive.patch b/pkgs/development/libraries/glibc/2.16/nix-locale-archive.patch new file mode 100644 index 000000000000..88c8adef9226 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.16/nix-locale-archive.patch @@ -0,0 +1,114 @@ +diff -ru glibc-2.16.0-orig/locale/loadarchive.c glibc-2.16.0/locale/loadarchive.c +--- glibc-2.16.0-orig/locale/loadarchive.c 2012-06-30 15:12:34.000000000 -0400 ++++ glibc-2.16.0/locale/loadarchive.c 2012-09-18 11:57:57.277515212 -0400 +@@ -123,6 +123,25 @@ + } + + ++static int ++open_locale_archive () ++{ ++ int fd = -1; ++ char *path = getenv ("LOCALE_ARCHIVE_2_11"); ++ char *path2 = getenv ("LOCALE_ARCHIVE"); ++ const char *usualpath = "/usr/lib/locale/locale-archive"; ++ if (path) ++ fd = open_not_cancel_2 (path, O_RDONLY|O_LARGEFILE|O_CLOEXEC); ++ if (path2 && fd < 0) ++ fd = open_not_cancel_2 (path2, O_RDONLY|O_LARGEFILE|O_CLOEXEC); ++ if (fd < 0) ++ fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE|O_CLOEXEC); ++ if (fd < 0) ++ fd = open_not_cancel_2 (usualpath, O_RDONLY|O_LARGEFILE|O_CLOEXEC); ++ return fd; ++} ++ ++ + /* Find the locale *NAMEP in the locale archive, and return the + internalized data structure for its CATEGORY data. If this locale has + already been loaded from the archive, just returns the existing data +@@ -202,7 +221,7 @@ + archmapped = &headmap; + + /* The archive has never been opened. */ +- fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE|O_CLOEXEC); ++ fd = open_locale_archive (); + if (fd < 0) + /* Cannot open the archive, for whatever reason. */ + return NULL; +@@ -393,8 +412,7 @@ + if (fd == -1) + { + struct stat64 st; +- fd = open_not_cancel_2 (archfname, +- O_RDONLY|O_LARGEFILE|O_CLOEXEC); ++ fd = open_locale_archive (); + if (fd == -1) + /* Cannot open the archive, for whatever reason. */ + return NULL; +diff -ru glibc-2.16.0-orig/locale/programs/locale.c glibc-2.16.0/locale/programs/locale.c +--- glibc-2.16.0-orig/locale/programs/locale.c 2012-06-30 15:12:34.000000000 -0400 ++++ glibc-2.16.0/locale/programs/locale.c 2012-09-18 11:53:03.719920947 -0400 +@@ -628,6 +628,20 @@ + ((const struct nameent *) b)->name); + } + ++static int ++open_nix_locale_archive (const char * fname, int access) ++{ ++ int fd = -1; ++ char *path = getenv ("LOCALE_ARCHIVE_2_11"); ++ char *path2 = getenv ("LOCALE_ARCHIVE"); ++ if (path) ++ fd = open64 (path, access); ++ if (path2 && fd < 0) ++ fd = open64 (path2, access); ++ if (fd < 0) ++ fd = open64 (fname, access); ++ return fd; ++} + + static int + write_archive_locales (void **all_datap, char *linebuf) +@@ -641,7 +655,7 @@ + int fd, ret = 0; + uint32_t cnt; + +- fd = open64 (ARCHIVE_NAME, O_RDONLY); ++ fd = open_nix_locale_archive (ARCHIVE_NAME, O_RDONLY); + if (fd < 0) + return 0; + +diff -ru glibc-2.16.0-orig/locale/programs/locarchive.c glibc-2.16.0/locale/programs/locarchive.c +--- glibc-2.16.0-orig/locale/programs/locarchive.c 2012-06-30 15:12:34.000000000 -0400 ++++ glibc-2.16.0/locale/programs/locarchive.c 2012-09-18 11:53:03.720920942 -0400 +@@ -509,6 +509,20 @@ + *ah = new_ah; + } + ++static int ++open_nix_locale_archive (const char * fname, int access) ++{ ++ int fd = -1; ++ char *path = getenv ("LOCALE_ARCHIVE_2_11"); ++ char *path2 = getenv ("LOCALE_ARCHIVE"); ++ if (path) ++ fd = open64 (path, access); ++ if (path2 && fd < 0) ++ fd = open64 (path2, access); ++ if (fd < 0) ++ fd = open64 (fname, access); ++ return fd; ++} + + void + open_archive (struct locarhandle *ah, bool readonly) +@@ -528,7 +542,7 @@ + while (1) + { + /* Open the archive. We must have exclusive write access. */ +- fd = open64 (archivefname, readonly ? O_RDONLY : O_RDWR); ++ fd = open_nix_locale_archive (archivefname, readonly ? O_RDONLY : O_RDWR); + if (fd == -1) + { + /* Maybe the file does not yet exist. */ diff --git a/pkgs/development/libraries/glibc/2.16/nss-skip-unavail.patch b/pkgs/development/libraries/glibc/2.16/nss-skip-unavail.patch new file mode 100644 index 000000000000..e48dc2bc0a6e --- /dev/null +++ b/pkgs/development/libraries/glibc/2.16/nss-skip-unavail.patch @@ -0,0 +1,21 @@ +diff -ru glibc-2.11.2-orig/sysdeps/posix/getaddrinfo.c glibc-2.11.2/sysdeps/posix/getaddrinfo.c +--- glibc-2.11.2-orig/sysdeps/posix/getaddrinfo.c 2010-05-19 22:38:20.000000000 +0200 ++++ glibc-2.11.2/sysdeps/posix/getaddrinfo.c 2010-08-05 18:39:54.259556327 +0200 +@@ -505,8 +505,6 @@ + int no_data = 0; + int no_inet6_data = 0; + service_user *nip = NULL; +- enum nss_status inet6_status = NSS_STATUS_UNAVAIL; +- enum nss_status status = NSS_STATUS_UNAVAIL; + int no_more; + int old_res_options; + +@@ -702,6 +700,8 @@ + + while (!no_more) + { ++ enum nss_status inet6_status = NSS_STATUS_UNAVAIL; ++ enum nss_status status = NSS_STATUS_UNAVAIL; + no_data = 0; + nss_gethostbyname4_r fct4 + = __nss_lookup_function (nip, "gethostbyname4_r"); diff --git a/pkgs/development/libraries/glibc/2.16/rpcgen-path.patch b/pkgs/development/libraries/glibc/2.16/rpcgen-path.patch new file mode 100644 index 000000000000..fbb03dd5fade --- /dev/null +++ b/pkgs/development/libraries/glibc/2.16/rpcgen-path.patch @@ -0,0 +1,72 @@ +By default, rpcgen(1) looks for cpp(1) from a list of fixed absolute paths +(`/lib/cpp', etc.), which may only be overrided with the `-Y' option. This +patch makes it run any `cpp' command found in $PATH. + +--- glibc-2.7/sunrpc/rpc_main.c 2006-11-10 21:54:46.000000000 +0100 ++++ glibc-2.7/sunrpc/rpc_main.c 2009-04-22 14:32:10.000000000 +0200 +@@ -79,7 +79,7 @@ static const char *cmdname; + + static const char *svcclosetime = "120"; + static int cppDefined; /* explicit path for C preprocessor */ +-static const char *CPP = SUNOS_CPP; ++static const char *CPP = "cpp"; + static const char CPPFLAGS[] = "-C"; + static char *pathbuf; + static int cpp_pid; +@@ -108,7 +108,6 @@ static char *extendfile (const char *fil + static void open_output (const char *infile, const char *outfile); + static void add_warning (void); + static void clear_args (void); +-static void find_cpp (void); + static void open_input (const char *infile, const char *define); + static int check_nettype (const char *name, const char *list_to_check[]); + static void c_output (const char *infile, const char *define, +@@ -327,31 +326,6 @@ clear_args (void) + argcount = FIXEDARGS; + } + +-/* make sure that a CPP exists */ +-static void +-find_cpp (void) +-{ +- struct stat buf; +- +- if (stat (CPP, &buf) < 0) +- { /* /lib/cpp or explicit cpp does not exist */ +- if (cppDefined) +- { +- fprintf (stderr, _ ("cannot find C preprocessor: %s \n"), CPP); +- crash (); +- } +- else +- { /* try the other one */ +- CPP = SVR4_CPP; +- if (stat (CPP, &buf) < 0) +- { /* can't find any cpp */ +- fputs (_ ("cannot find any C preprocessor (cpp)\n"), stdout); +- crash (); +- } +- } +- } +-} +- + /* + * Open input file with given define for C-preprocessor + */ +@@ -370,7 +344,6 @@ open_input (const char *infile, const ch + switch (cpp_pid) + { + case 0: +- find_cpp (); + putarg (0, CPP); + putarg (1, CPPFLAGS); + addarg (define); +@@ -380,7 +353,7 @@ open_input (const char *infile, const ch + close (1); + dup2 (pd[1], 1); + close (pd[0]); +- execv (arglist[0], (char **) arglist); ++ execvp (arglist[0], (char **) arglist); + perror ("execv"); + exit (1); + case -1: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b120cebd882b..da9451b465f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3555,6 +3555,7 @@ let gegl_0_0_22 = callPackage ../development/libraries/gegl/0_0_22.nix { # avocodec avformat librsvg }; + geoclue = callPackage ../development/libraries/geoclue {}; geoip = builderDefsPackage ../development/libraries/geoip { @@ -3582,7 +3583,7 @@ let glfw = callPackage ../development/libraries/glfw { }; - glibc = glibc213; + glibc = glibc216; glibcCross = glibc213Cross; @@ -3628,6 +3629,14 @@ let inherit fetchgit; })); + glibc216 = callPackage ../development/libraries/glibc/2.16 { + kernelHeaders = linuxHeaders; + installLocales = config.glibc.locales or false; + machHeaders = null; + hurdHeaders = null; + gccCross = null; + }; + # We can choose: libcCrossChooser = name : if (name == "glibc") then glibcCross else if (name == "uclibc") then uclibcCross -- cgit 1.4.1 From fcc18aad0a3f24c281a3b046e946378b303dd3fd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Sep 2012 14:05:23 -0400 Subject: Fix some packages that referred to gets() Glibc no longer defines gets() if _GNU_SOURCE is defined. --- pkgs/development/libraries/gettext/default.nix | 2 ++ pkgs/development/libraries/gettext/no-gets.patch | 42 ++++++++++++++++++++++++ pkgs/development/tools/misc/gnum4/default.nix | 2 +- pkgs/development/tools/misc/gnum4/no-gets.patch | 26 +++++++++++++++ 4 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/gettext/no-gets.patch create mode 100644 pkgs/development/tools/misc/gnum4/no-gets.patch (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 73366b2bdc95..9947cf580a0d 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation (rec { sha256 = "1sa3ch12qxa4h3ya6hkz119yclcccmincl9j20dhrdx5mykp3b4k"; }; + patches = [ ./no-gets.patch ]; + configureFlags = [ "--disable-csharp" ] ++ (stdenv.lib.optionals stdenv.isCygwin [ # We have a static libiconv, so we can only build the static lib. diff --git a/pkgs/development/libraries/gettext/no-gets.patch b/pkgs/development/libraries/gettext/no-gets.patch new file mode 100644 index 000000000000..9daa48eae649 --- /dev/null +++ b/pkgs/development/libraries/gettext/no-gets.patch @@ -0,0 +1,42 @@ +hack until gzip pulls a newer gnulib version + +From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001 +From: Eric Blake +Date: Thu, 29 Mar 2012 13:30:41 -0600 +Subject: [PATCH] stdio: don't assume gets any more + +Gnulib intentionally does not have a gets module, and now that C11 +and glibc have dropped it, we should be more proactive about warning +any user on a platform that still has a declaration of this dangerous +interface. + +--- a/gettext-tools/libgettextpo/stdio.in.h ++++ b/gettext-tools/libgettextpo/stdio.in.h +@@ -125,7 +125,6 @@ + so any use of gets warrants an unconditional warning. Assume it is + always declared, since it is required by C89. */ + #undef gets +-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); + + #if @GNULIB_FOPEN@ + # if @REPLACE_FOPEN@ +--- a/gettext-tools/gnulib-lib/stdio.in.h ++++ b/gettext-tools/gnulib-lib/stdio.in.h +@@ -125,7 +125,6 @@ + so any use of gets warrants an unconditional warning. Assume it is + always declared, since it is required by C89. */ + #undef gets +-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); + + #if @GNULIB_FOPEN@ + # if @REPLACE_FOPEN@ +--- a/gettext-runtime/gnulib-lib/stdio.in.h ++++ b/gettext-runtime/gnulib-lib/stdio.in.h +@@ -125,7 +125,6 @@ + so any use of gets warrants an unconditional warning. Assume it is + always declared, since it is required by C89. */ + #undef gets +-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); + + #if @GNULIB_FOPEN@ + # if @REPLACE_FOPEN@ diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index 1f026f12f523..d1b0d0e376ed 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { && !stdenv.isSunOS; # XXX: `test-setlocale2.sh' fails # Upstream is aware of it; it may be in the next release. - patches = [ ./s_isdir.patch ./readlink-EINVAL.patch ]; + patches = [ ./s_isdir.patch ./readlink-EINVAL.patch ./no-gets.patch ]; meta = { homepage = http://www.gnu.org/software/m4/; diff --git a/pkgs/development/tools/misc/gnum4/no-gets.patch b/pkgs/development/tools/misc/gnum4/no-gets.patch new file mode 100644 index 000000000000..456c08b56c34 --- /dev/null +++ b/pkgs/development/tools/misc/gnum4/no-gets.patch @@ -0,0 +1,26 @@ +http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-devel/m4/files/m4-1.4.16-no-gets.patch?revision=1.1 + +https://bugs.gentoo.org/424978 + +hack until m4 pulls a newer gnulib version + +From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001 +From: Eric Blake +Date: Thu, 29 Mar 2012 13:30:41 -0600 +Subject: [PATCH] stdio: don't assume gets any more + +Gnulib intentionally does not have a gets module, and now that C11 +and glibc have dropped it, we should be more proactive about warning +any user on a platform that still has a declaration of this dangerous +interface. + +--- a/lib/stdio.in.h ++++ b/lib/stdio.in.h +@@ -125,7 +125,6 @@ + so any use of gets warrants an unconditional warning. Assume it is + always declared, since it is required by C89. */ + #undef gets +-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); + + #if @GNULIB_FOPEN@ + # if @REPLACE_FOPEN@ -- cgit 1.4.1 From 9b0ed02f9be2bc0b08c56ab71da90fa784a15a44 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Sep 2012 14:59:26 -0400 Subject: Remove Glibc 2.14 --- pkgs/development/libraries/glibc/2.14/builder.sh | 54 ----- pkgs/development/libraries/glibc/2.14/common.nix | 223 --------------------- pkgs/development/libraries/glibc/2.14/default.nix | 97 --------- .../glibc/2.14/dont_use_system_ld_so_cache.patch | 43 ---- .../glibc/2.14/glibc-elf-localscope.patch | 82 -------- pkgs/development/libraries/glibc/2.14/info.nix | 26 --- .../libraries/glibc/2.14/locales-builder.sh | 17 -- pkgs/development/libraries/glibc/2.14/locales.nix | 47 ----- .../libraries/glibc/2.14/nix-locale-archive.patch | 116 ----------- .../libraries/glibc/2.14/nss-skip-unavail.patch | 21 -- .../libraries/glibc/2.14/rpcgen-path.patch | 72 ------- pkgs/top-level/all-packages.nix | 21 -- 12 files changed, 819 deletions(-) delete mode 100644 pkgs/development/libraries/glibc/2.14/builder.sh delete mode 100644 pkgs/development/libraries/glibc/2.14/common.nix delete mode 100644 pkgs/development/libraries/glibc/2.14/default.nix delete mode 100644 pkgs/development/libraries/glibc/2.14/dont_use_system_ld_so_cache.patch delete mode 100644 pkgs/development/libraries/glibc/2.14/glibc-elf-localscope.patch delete mode 100644 pkgs/development/libraries/glibc/2.14/info.nix delete mode 100644 pkgs/development/libraries/glibc/2.14/locales-builder.sh delete mode 100644 pkgs/development/libraries/glibc/2.14/locales.nix delete mode 100644 pkgs/development/libraries/glibc/2.14/nix-locale-archive.patch delete mode 100644 pkgs/development/libraries/glibc/2.14/nss-skip-unavail.patch delete mode 100644 pkgs/development/libraries/glibc/2.14/rpcgen-path.patch (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/glibc/2.14/builder.sh b/pkgs/development/libraries/glibc/2.14/builder.sh deleted file mode 100644 index e68e13f9beca..000000000000 --- a/pkgs/development/libraries/glibc/2.14/builder.sh +++ /dev/null @@ -1,54 +0,0 @@ -# Glibc cannot have itself in its RPATH. -export NIX_NO_SELF_RPATH=1 - -source $stdenv/setup - -postConfigure() { - # Hack: get rid of the `-static' flag set by the bootstrap stdenv. - # This has to be done *after* `configure' because it builds some - # test binaries. - export NIX_CFLAGS_LINK= - export NIX_LDFLAGS_BEFORE= - - export NIX_DONT_SET_RPATH=1 - unset CFLAGS -} - - -postInstall() { - if test -n "$installLocales"; then - make -j${NIX_BUILD_CORES:-1} -l${NIX_BUILD_CORES:-1} localedata/install-locales - fi - - test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache - - # FIXME: Use `test -n $linuxHeaders' when `kernelHeaders' has been - # renamed. - if test -z "$hurdHeaders"; then - # Include the Linux kernel headers in Glibc, except the `scsi' - # subdirectory, which Glibc provides itself. - (cd $out/include && \ - ln -sv $(ls -d $kernelHeaders/include/* | grep -v 'scsi$') .) - fi - - if test -f "$out/lib/libhurduser.so"; then - # libc.so, libhurduser.so, and libmachuser.so depend on each - # other, so add them to libc.so (a RUNPATH on libc.so.0.3 - # would be ignored by the cross-linker.) - echo "adding \`libhurduser.so' and \`libmachuser.so' to the \`libc.so' linker script..." - sed -i "$out/lib/libc.so" \ - -e"s|\(libc\.so\.[^ ]\+\>\)|\1 $out/lib/libhurduser.so $out/lib/libmachuser.so|g" - fi - - # Fix for NIXOS-54 (ldd not working on x86_64). Make a symlink - # "lib64" to "lib". - if test -n "$is64bit"; then - ln -s lib $out/lib64 - fi - - # This file, that should not remain in the glibc derivation, - # may have not been created during the preInstall - rm -f $out/lib/libgcc_s.so.1 -} - -genericBuild diff --git a/pkgs/development/libraries/glibc/2.14/common.nix b/pkgs/development/libraries/glibc/2.14/common.nix deleted file mode 100644 index ab3ef7c42f49..000000000000 --- a/pkgs/development/libraries/glibc/2.14/common.nix +++ /dev/null @@ -1,223 +0,0 @@ -/* Build configuration used to build glibc, Info files, and locale - information. */ - -cross : - -{ name, fetchurl, stdenv, installLocales ? false -, gccCross ? null, kernelHeaders ? null -, machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null -, mig ? null, fetchgit ? null -, profilingLibraries ? false, meta -, preConfigure ? "", ... }@args : - -let - # For GNU/Hurd, see below. - version = if hurdHeaders != null then "20111025" else "2.14.1"; - - needsPortsNative = stdenv.isMips || stdenv.isArm; - needsPortsCross = cross.arch == "mips" || cross.arch == "arm"; - needsPorts = if (stdenv ? cross) && stdenv.cross != null then true - else if cross == null then needsPortsNative - else needsPortsCross; - - srcPorts = fetchurl { - url = "mirror://gnu/glibc/glibc-ports-2.14.1.tar.bz2"; - sha256 = "1acs4sd5mjzmssmd0md6dfqwnziph2am7v09mbnnd8aadpxhm0qw"; - }; - -in - -assert (cross != null) -> (gccCross != null); - -assert (mig != null) -> (machHeaders != null); -assert (machHeaders != null) -> (hurdHeaders != null); -assert (hurdHeaders != null) -> (libpthreadHeaders != null); -assert (hurdHeaders != null) -> (fetchgit != null); - -stdenv.mkDerivation ({ - inherit kernelHeaders installLocales; - - # The host/target system. - crossConfig = if (cross != null) then cross.config else null; - - inherit (stdenv) is64bit; - - enableParallelBuilding = true; - - patches = - stdenv.lib.optional (fetchgit == null) - /* Fix for NIXPKGS-79: when doing host name lookups, when - nsswitch.conf contains a line like - - hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4 - - don't return an error when mdns4_minimal can't be found. This - is a bug in Glibc: when a service can't be found, NSS should - continue to the next service unless "UNAVAIL=return" is set. - ("NOTFOUND=return" refers to the service returning a NOTFOUND - error, not the service itself not being found.) The reason is - that the "status" variable (while initialised to UNAVAIL) is - outside of the loop that iterates over the services, the - "files" service sets status to NOTFOUND. So when the call to - find "mdns4_minimal" fails, "status" will still be NOTFOUND, - and it will return instead of continuing to "dns". Thus, the - line - - hosts: mdns4_minimal [NOTFOUND=return] dns mdns4 - - does work because "status" will contain UNAVAIL after the - failure to find mdns4_minimal. */ - ./nss-skip-unavail.patch - ++ [ - /* Have rpcgen(1) look for cpp(1) in $PATH. */ - ./rpcgen-path.patch - - /* Allow nixos and nix handle the locale-archive. */ - ./nix-locale-archive.patch - - /* don't use /etc/ld.so.cache, for non-nixos systems */ - ./dont_use_system_ld_so_cache.patch - - /* Without this patch many KDE binaries crash. */ - ./glibc-elf-localscope.patch - ]; - - postPatch = '' - # Needed for glibc to build with the gnumake 3.82 - # http://comments.gmane.org/gmane.linux.lfs.support/31227 - sed -i 's/ot \$/ot:\n\ttouch $@\n$/' manual/Makefile - - # nscd needs libgcc, and we don't want it dynamically linked - # because we don't want it to depend on bootstrap-tools libs. - echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile - ''; - - configureFlags = [ - "-C" - "--enable-add-ons" - "--sysconfdir=/etc" - "--localedir=/var/run/current-system/sw/lib/locale" - "libc_cv_ssp=no" - (if kernelHeaders != null - then "--with-headers=${kernelHeaders}/include" - else "--without-headers") - (if profilingLibraries - then "--enable-profile" - else "--disable-profile") - ] ++ stdenv.lib.optionals (cross != null) [ - (if cross.withTLS then "--with-tls" else "--without-tls") - (if cross.float == "soft" then "--without-fp" else "--with-fp") - "--enable-kernel=2.6.0" - "--with-__thread" - ] ++ stdenv.lib.optionals stdenv.isArm [ - "--host=arm-linux-gnueabi" - "--build=arm-linux-gnueabi" - "--without-fp" - - # To avoid linking with -lgcc_s (dynamic link) - # so the glibc does not depend on its compiler store path - "libc_cv_as_needed=no" - ]; - - installFlags = [ "sysconfdir=$(out)/etc" ]; - - buildInputs = stdenv.lib.optionals (cross != null) [ gccCross ] - ++ stdenv.lib.optional (mig != null) mig; - - # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to - # prevent a retained dependency on the bootstrap tools in the stdenv-linux - # bootstrap. - BASH_SHELL = "/bin/sh"; - - # Workaround for this bug: - # http://sourceware.org/bugzilla/show_bug.cgi?id=411 - # I.e. when gcc is compiled with --with-arch=i686, then the - # preprocessor symbol `__i686' will be defined to `1'. This causes - # the symbol __i686.get_pc_thunk.dx to be mangled. - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.system == "i686-linux") "-U__i686"; -} - -# Remove the `gccCross' attribute so that the *native* glibc store path -# doesn't depend on whether `gccCross' is null or not. -// (removeAttrs args [ "gccCross" ]) // - -{ - name = name + "-${version}" + - stdenv.lib.optionalString (cross != null) "-${cross.config}"; - - src = - if hurdHeaders != null - then fetchgit { - # Shamefully the "official" glibc won't build on GNU, so use the one - # maintained by the Hurd folks, `tschwinge/Roger_Whittaker' branch. - # See . - url = "git://git.sv.gnu.org/hurd/glibc.git"; - sha256 = "3fb3dd7030a4b6d3e144fa94c32a0c4f46f17f94e2dfbc6bef41cfc3198725ca"; - rev = "d740cf9d201dc9ecb0335b0a585828dea9cce793"; - } - else fetchurl { - url = "mirror://gnu/glibc/glibc-${version}.tar.bz2"; - sha256 = "0fsvf5d6sib483rp7asdy8hs0dysxqkrvw316c82hsxy7vxa51bf"; - }; - - # `fetchurl' is a function and thus should not be passed to the - # `derivation' primitive. - fetchurl = null; - - # Remove absolute paths from `configure' & co.; build out-of-tree. - preConfigure = '' - export PWD_P=$(type -tP pwd) - for i in configure io/ftwtest-sh; do - # Can't use substituteInPlace here because replace hasn't been - # built yet in the bootstrap. - sed -i "$i" -e "s^/bin/pwd^$PWD_P^g" - done - - ${if needsPorts then "tar xvf ${srcPorts}" else ""} - - mkdir ../build - cd ../build - - configureScript="`pwd`/../$sourceRoot/configure" - - ${preConfigure} - ''; - - meta = { - homepage = http://www.gnu.org/software/libc/; - description = "The GNU C Library"; - - longDescription = - '' Any Unix-like operating system needs a C library: the library which - defines the "system calls" and other basic facilities such as - open, malloc, printf, exit... - - The GNU C library is used as the C library in the GNU system and - most systems with the Linux kernel. - ''; - - license = "LGPLv2+"; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - #platforms = stdenv.lib.platforms.linux; - } // meta; -} - -// - -(if hurdHeaders != null - then { - # Work around the fact that the configure snippet that looks for - # does not honor `--with-headers=$sysheaders' and that - # glibc expects Mach, Hurd, and pthread headers to be in the same place. - CPATH = "${hurdHeaders}/include:${machHeaders}/include:${libpthreadHeaders}/include"; - - # `fetchgit' is a function and thus should not be passed to the - # `derivation' primitive. - fetchgit = null; - - # Install NSS stuff in the right place. - # XXX: This will be needed for all new glibcs and isn't Hurd-specific. - makeFlags = ''vardbdir="$out/var/db"''; - } - else { })) diff --git a/pkgs/development/libraries/glibc/2.14/default.nix b/pkgs/development/libraries/glibc/2.14/default.nix deleted file mode 100644 index 1b4e43b1013a..000000000000 --- a/pkgs/development/libraries/glibc/2.14/default.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ stdenv, fetchurl, kernelHeaders -, machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null -, mig ? null, fetchgit ? null -, installLocales ? true -, profilingLibraries ? false -, gccCross ? null -, debugSymbols ? false -}: - -assert stdenv.gcc.gcc != null; - -let - build = import ./common.nix; - cross = if gccCross != null then gccCross.target else null; -in - build cross ({ - name = "glibc${if debugSymbols then "-debug" else ""}"; - - inherit fetchurl stdenv kernelHeaders installLocales profilingLibraries - gccCross; - - builder = ./builder.sh; - - # When building glibc from bootstrap-tools, we need libgcc_s at RPATH for - # any program we run, because the gcc will have been placed at a new - # store path than that determined when built (as a source for the - # bootstrap-tools tarball) - # Building from a proper gcc staying in the path where it was installed, - # libgcc_s will not be at {gcc}/lib, and gcc's libgcc will be found without - # any special hack. - preInstall = '' - if [ -f ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 ]; then - mkdir -p $out/lib - ln -s ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 - fi - ''; - - meta.description = "The GNU C Library"; - } - - // - - (if debugSymbols - then { - # Build with debugging symbols, but leave optimizations on and don't - # attempt to keep the build tree. - dontStrip = true; - dontCrossStrip = true; - NIX_STRIP_DEBUG = 0; - } - else {}) - - // - - (if hurdHeaders != null - then rec { - inherit machHeaders hurdHeaders libpthreadHeaders mig fetchgit; - - propagatedBuildInputs = [ machHeaders hurdHeaders libpthreadHeaders ]; - - passthru = { - # When building GCC itself `propagatedBuildInputs' above is not - # honored, so we pass it here so that the GCC builder can do the right - # thing. - inherit propagatedBuildInputs; - }; - } - else { }) - - // - - (if cross != null - then { - preConfigure = '' - sed -i s/-lgcc_eh//g "../$sourceRoot/Makeconfig" - - cat > config.cache << "EOF" - libc_cv_forced_unwind=yes - libc_cv_c_cleanup=yes - libc_cv_gnu89_inline=yes - # Only due to a problem in gcc configure scripts: - libc_cv_sparc64_tls=${if cross.withTLS then "yes" else "no"} - EOF - export BUILD_CC=gcc - export CC="$crossConfig-gcc" - export AR="$crossConfig-ar" - export RANLIB="$crossConfig-ranlib" - - dontStrip=1 - ''; - - # To avoid a dependency on the build system 'bash'. - preFixup = '' - rm $out/bin/{ldd,tzselect,catchsegv,xtrace} - ''; - } - else {})) diff --git a/pkgs/development/libraries/glibc/2.14/dont_use_system_ld_so_cache.patch b/pkgs/development/libraries/glibc/2.14/dont_use_system_ld_so_cache.patch deleted file mode 100644 index 444eb8251e49..000000000000 --- a/pkgs/development/libraries/glibc/2.14/dont_use_system_ld_so_cache.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -Naur glibc-2.13-orig/elf/ldconfig.c glibc-2.13/elf/ldconfig.c ---- glibc-2.13-orig/elf/ldconfig.c 2011-01-17 23:34:07.000000000 -0500 -+++ glibc-2.13/elf/ldconfig.c 2012-04-10 23:28:45.957492340 -0400 -@@ -51,7 +51,7 @@ - #endif - - #ifndef LD_SO_CONF --# define LD_SO_CONF SYSCONFDIR "/ld.so.conf" -+# define LD_SO_CONF PREFIX "/etc/ld.so.conf" - #endif - - /* Get libc version number. */ -diff -Naur glibc-2.13-orig/elf/Makefile glibc-2.13/elf/Makefile ---- glibc-2.13-orig/elf/Makefile 2011-01-17 23:34:07.000000000 -0500 -+++ glibc-2.13/elf/Makefile 2012-04-10 23:27:05.666477442 -0400 -@@ -459,11 +459,11 @@ - $(objpfx)sprof: $(libdl) - - $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o) --SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"' --CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ -+PREFIX-FLAGS := -D'PREFIX="$(prefix)"' -+CFLAGS-ldconfig.c = $(PREFIX-FLAGS) -D'LIBDIR="$(libdir)"' \ - -D'SLIBDIR="$(slibdir)"' -DIS_IN_ldconfig=1 --CFLAGS-dl-cache.c = $(SYSCONF-FLAGS) --CFLAGS-cache.c = $(SYSCONF-FLAGS) -+CFLAGS-dl-cache.c = $(PREFIX-FLAGS) -+CFLAGS-cache.c = $(PREFIX-FLAGS) - - CPPFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),-DNOT_IN_libc=1 -DIS_IN_rtld=1) - -diff -Naur glibc-2.13-orig/sysdeps/generic/dl-cache.h glibc-2.13/sysdeps/generic/dl-cache.h ---- glibc-2.13-orig/sysdeps/generic/dl-cache.h 2011-01-17 23:34:07.000000000 -0500 -+++ glibc-2.13/sysdeps/generic/dl-cache.h 2012-04-10 23:28:20.077488815 -0400 -@@ -29,7 +29,7 @@ - #endif - - #ifndef LD_SO_CACHE --# define LD_SO_CACHE SYSCONFDIR "/ld.so.cache" -+# define LD_SO_CACHE PREFIX "/etc/ld.so.cache" - #endif - - #ifndef add_system_dir diff --git a/pkgs/development/libraries/glibc/2.14/glibc-elf-localscope.patch b/pkgs/development/libraries/glibc/2.14/glibc-elf-localscope.patch deleted file mode 100644 index 98f7f81087bb..000000000000 --- a/pkgs/development/libraries/glibc/2.14/glibc-elf-localscope.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff -ru a/elf/dl-close.c b/elf/dl-close.c ---- a/elf/dl-close.c 2011-02-04 00:35:03.000000000 +0100 -+++ b/elf/dl-close.c 2011-02-22 02:16:12.367883000 +0100 -@@ -180,24 +186,28 @@ - /* Signal the object is still needed. */ - l->l_idx = IDX_STILL_USED; - -+#define mark_used(dmap) \ -+ do { \ -+ if ((dmap)->l_idx != IDX_STILL_USED) \ -+ { \ -+ assert ((dmap)->l_idx >= 0 && (dmap)->l_idx < nloaded); \ -+ \ -+ if (!used[(dmap)->l_idx]) \ -+ { \ -+ used[(dmap)->l_idx] = 1; \ -+ if ((dmap)->l_idx - 1 < done_index) \ -+ done_index = (dmap)->l_idx - 1; \ -+ } \ -+ } \ -+ } while (0) -+ - /* Mark all dependencies as used. */ - if (l->l_initfini != NULL) - { - struct link_map **lp = &l->l_initfini[1]; - while (*lp != NULL) - { -- if ((*lp)->l_idx != IDX_STILL_USED) -- { -- assert ((*lp)->l_idx >= 0 && (*lp)->l_idx < nloaded); -- -- if (!used[(*lp)->l_idx]) -- { -- used[(*lp)->l_idx] = 1; -- if ((*lp)->l_idx - 1 < done_index) -- done_index = (*lp)->l_idx - 1; -- } -- } -- -+ mark_used(*lp); - ++lp; - } - } -@@ -206,19 +216,25 @@ - for (unsigned int j = 0; j < l->l_reldeps->act; ++j) - { - struct link_map *jmap = l->l_reldeps->list[j]; -- -- if (jmap->l_idx != IDX_STILL_USED) -- { -- assert (jmap->l_idx >= 0 && jmap->l_idx < nloaded); -- -- if (!used[jmap->l_idx]) -- { -- used[jmap->l_idx] = 1; -- if (jmap->l_idx - 1 < done_index) -- done_index = jmap->l_idx - 1; -- } -- } -+ mark_used(jmap); - } -+ /* And the same for owners of our scopes; normally, our last -+ scope provider would render us unused, but this can be -+ prevented by the NODELETE flag. */ -+ if (__builtin_expect(l->l_type == lt_loaded -+ && (l->l_flags_1 & DF_1_NODELETE), 0)) -+ for (size_t cnt = 0; l->l_scope[cnt] != NULL; ++cnt) -+ /* This relies on l_scope[] entries being always set either -+ to its own l_symbolic_searchlist address, or some map's -+ l_searchlist address. */ -+ if (l->l_scope[cnt] != &l->l_symbolic_searchlist) -+ { -+ struct link_map *ls = (struct link_map *) -+ ((char *) l->l_scope[cnt] -+ - offsetof (struct link_map, l_searchlist)); -+ assert (ls->l_ns == nsid); -+ mark_used(ls); -+ } - } - - /* Sort the entries. */ diff --git a/pkgs/development/libraries/glibc/2.14/info.nix b/pkgs/development/libraries/glibc/2.14/info.nix deleted file mode 100644 index 75bd996d9bc5..000000000000 --- a/pkgs/development/libraries/glibc/2.14/info.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, texinfo, perl }: - -let build = import ./common.nix; -in - /* null cross builder */ - build null { - name = "glibc-info"; - - inherit fetchurl stdenv; - - configureFlags = [ "--enable-add-ons" ]; - - buildInputs = [ texinfo perl ]; - - buildPhase = "make info"; - - # I don't know why the info is not generated in 'build' - # Somehow building the info still does not work, because the final - # libc.info hasn't a Top node. - installPhase = '' - mkdir -p "$out/share/info" - cp -v "../$sourceRoot/manual/"*.info* "$out/share/info" - ''; - - meta.description = "GNU Info manual of the GNU C Library"; - } diff --git a/pkgs/development/libraries/glibc/2.14/locales-builder.sh b/pkgs/development/libraries/glibc/2.14/locales-builder.sh deleted file mode 100644 index d732e208fa22..000000000000 --- a/pkgs/development/libraries/glibc/2.14/locales-builder.sh +++ /dev/null @@ -1,17 +0,0 @@ -# Glibc cannot have itself in its RPATH. -export NIX_NO_SELF_RPATH=1 - -source $stdenv/setup - -postConfigure() { - # Hack: get rid of the `-static' flag set by the bootstrap stdenv. - # This has to be done *after* `configure' because it builds some - # test binaries. - export NIX_CFLAGS_LINK= - export NIX_LDFLAGS_BEFORE= - - export NIX_DONT_SET_RPATH=1 - unset CFLAGS -} - -genericBuild diff --git a/pkgs/development/libraries/glibc/2.14/locales.nix b/pkgs/development/libraries/glibc/2.14/locales.nix deleted file mode 100644 index b7eae50ca385..000000000000 --- a/pkgs/development/libraries/glibc/2.14/locales.nix +++ /dev/null @@ -1,47 +0,0 @@ -/* This function builds just the `lib/locale/locale-archive' file from - Glibc and nothing else. If `allLocales' is true, all supported - locales are included; otherwise, just the locales listed in - `locales'. See localedata/SUPPORTED in the Glibc source tree for - the list of all supported locales: - http://sourceware.org/cgi-bin/cvsweb.cgi/libc/localedata/SUPPORTED?cvsroot=glibc -*/ - -{ stdenv, fetchurl, allLocales ? true, locales ? ["en_US.UTF-8/UTF-8"] }: - -let build = import ./common.nix; -in - build null { - name = "glibc-locales"; - - inherit fetchurl stdenv; - installLocales = true; - - builder = ./locales-builder.sh; - - # Awful hack: `localedef' doesn't allow the path to `locale-archive' - # to be overriden, but you *can* specify a prefix, i.e. it will use - # //lib/locale/locale-archive. So we use - # $TMPDIR as a prefix, meaning that the locale-archive is placed in - # $TMPDIR/nix/store/...-glibc-.../lib/locale/locale-archive. - buildPhase = - '' - mkdir -p $TMPDIR/"$(dirname $(readlink -f $(type -p localedef)))/../lib/locale" - - # Hack to allow building of the locales (needed since glibc-2.12) - sed -i -e "s,^LOCALEDEF=.*,LOCALEDEF=localedef --prefix=$TMPDIR," -e \ - /library-path/d ../glibc-2*/localedata/Makefile - ${if allLocales then "" else - "echo SUPPORTED-LOCALES=\"${toString locales}\" > ../glibc-2*/localedata/SUPPORTED"} - - make localedata/install-locales \ - localedir=$out/lib/locale \ - ''; - - installPhase = - '' - mkdir -p "$out/lib/locale" - cp -v "$TMPDIR/nix/store/"*"/lib/locale/locale-archive" "$out/lib/locale" - ''; - - meta.description = "Locale information for the GNU C Library"; - } diff --git a/pkgs/development/libraries/glibc/2.14/nix-locale-archive.patch b/pkgs/development/libraries/glibc/2.14/nix-locale-archive.patch deleted file mode 100644 index aca904f7ff44..000000000000 --- a/pkgs/development/libraries/glibc/2.14/nix-locale-archive.patch +++ /dev/null @@ -1,116 +0,0 @@ -diff --git a/locale/loadarchive.c b/locale/loadarchive.c -index d545f17..0d8638a 100644 ---- a/locale/loadarchive.c -+++ b/locale/loadarchive.c -@@ -124,6 +124,25 @@ calculate_head_size (const struct locarhead *h) - } - - -+static int -+open_locale_archive () -+{ -+ int fd = -1; -+ char *path = getenv ("LOCALE_ARCHIVE_2_11"); -+ char *path2 = getenv ("LOCALE_ARCHIVE"); -+ const char *usualpath = "/usr/lib/locale/locale-archive"; -+ if (path) -+ fd = open_not_cancel_2 (path, O_RDONLY|O_LARGEFILE); -+ if (path2 && fd < 0) -+ fd = open_not_cancel_2 (path2, O_RDONLY|O_LARGEFILE); -+ if (fd < 0) -+ fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE); -+ if (fd < 0) -+ fd = open_not_cancel_2 (usualpath, O_RDONLY|O_LARGEFILE); -+ return fd; -+} -+ -+ - /* Find the locale *NAMEP in the locale archive, and return the - internalized data structure for its CATEGORY data. If this locale has - already been loaded from the archive, just returns the existing data -@@ -203,7 +222,7 @@ _nl_load_locale_from_archive (int category, const char **namep) - archmapped = &headmap; - - /* The archive has never been opened. */ -- fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE); -+ fd = open_locale_archive (); - if (fd < 0) - /* Cannot open the archive, for whatever reason. */ - return NULL; -@@ -394,7 +413,7 @@ _nl_load_locale_from_archive (int category, const char **namep) - if (fd == -1) - { - struct stat64 st; -- fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE); -+ fd = open_locale_archive (); - if (fd == -1) - /* Cannot open the archive, for whatever reason. */ - return NULL; -diff --git a/locale/programs/locale.c b/locale/programs/locale.c -index 77262b7..fddc00d 100644 ---- a/locale/programs/locale.c -+++ b/locale/programs/locale.c -@@ -628,6 +628,20 @@ nameentcmp (const void *a, const void *b) - ((const struct nameent *) b)->name); - } - -+static int -+open_nix_locale_archive (const char * fname, int access) -+{ -+ int fd = -1; -+ char *path = getenv ("LOCALE_ARCHIVE_2_11"); -+ char *path2 = getenv ("LOCALE_ARCHIVE"); -+ if (path) -+ fd = open64 (path, access); -+ if (path2 && fd < 0) -+ fd = open64 (path2, access); -+ if (fd < 0) -+ fd = open64 (fname, access); -+ return fd; -+} - - static int - write_archive_locales (void **all_datap, char *linebuf) -@@ -641,7 +658,7 @@ write_archive_locales (void **all_datap, char *linebuf) - int fd, ret = 0; - uint32_t cnt; - -- fd = open64 (ARCHIVE_NAME, O_RDONLY); -+ fd = open_nix_locale_archive (ARCHIVE_NAME, O_RDONLY); - if (fd < 0) - return 0; - -diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c -index 85ba77d..3ad2af8 100644 ---- a/locale/programs/locarchive.c -+++ b/locale/programs/locarchive.c -@@ -512,6 +512,20 @@ enlarge_archive (struct locarhandle *ah, const struct locarhead *head) - *ah = new_ah; - } - -+static int -+open_nix_locale_archive (const char * fname, int access) -+{ -+ int fd = -1; -+ char *path = getenv ("LOCALE_ARCHIVE_2_11"); -+ char *path2 = getenv ("LOCALE_ARCHIVE"); -+ if (path) -+ fd = open64 (path, access); -+ if (path2 && fd < 0) -+ fd = open64 (path2, access); -+ if (fd < 0) -+ fd = open64 (fname, access); -+ return fd; -+} - - void - open_archive (struct locarhandle *ah, bool readonly) -@@ -531,7 +548,7 @@ open_archive (struct locarhandle *ah, bool readonly) - while (1) - { - /* Open the archive. We must have exclusive write access. */ -- fd = open64 (archivefname, readonly ? O_RDONLY : O_RDWR); -+ fd = open_nix_locale_archive (archivefname, readonly ? O_RDONLY : O_RDWR); - if (fd == -1) - { - /* Maybe the file does not yet exist. */ diff --git a/pkgs/development/libraries/glibc/2.14/nss-skip-unavail.patch b/pkgs/development/libraries/glibc/2.14/nss-skip-unavail.patch deleted file mode 100644 index e48dc2bc0a6e..000000000000 --- a/pkgs/development/libraries/glibc/2.14/nss-skip-unavail.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ru glibc-2.11.2-orig/sysdeps/posix/getaddrinfo.c glibc-2.11.2/sysdeps/posix/getaddrinfo.c ---- glibc-2.11.2-orig/sysdeps/posix/getaddrinfo.c 2010-05-19 22:38:20.000000000 +0200 -+++ glibc-2.11.2/sysdeps/posix/getaddrinfo.c 2010-08-05 18:39:54.259556327 +0200 -@@ -505,8 +505,6 @@ - int no_data = 0; - int no_inet6_data = 0; - service_user *nip = NULL; -- enum nss_status inet6_status = NSS_STATUS_UNAVAIL; -- enum nss_status status = NSS_STATUS_UNAVAIL; - int no_more; - int old_res_options; - -@@ -702,6 +700,8 @@ - - while (!no_more) - { -+ enum nss_status inet6_status = NSS_STATUS_UNAVAIL; -+ enum nss_status status = NSS_STATUS_UNAVAIL; - no_data = 0; - nss_gethostbyname4_r fct4 - = __nss_lookup_function (nip, "gethostbyname4_r"); diff --git a/pkgs/development/libraries/glibc/2.14/rpcgen-path.patch b/pkgs/development/libraries/glibc/2.14/rpcgen-path.patch deleted file mode 100644 index fbb03dd5fade..000000000000 --- a/pkgs/development/libraries/glibc/2.14/rpcgen-path.patch +++ /dev/null @@ -1,72 +0,0 @@ -By default, rpcgen(1) looks for cpp(1) from a list of fixed absolute paths -(`/lib/cpp', etc.), which may only be overrided with the `-Y' option. This -patch makes it run any `cpp' command found in $PATH. - ---- glibc-2.7/sunrpc/rpc_main.c 2006-11-10 21:54:46.000000000 +0100 -+++ glibc-2.7/sunrpc/rpc_main.c 2009-04-22 14:32:10.000000000 +0200 -@@ -79,7 +79,7 @@ static const char *cmdname; - - static const char *svcclosetime = "120"; - static int cppDefined; /* explicit path for C preprocessor */ --static const char *CPP = SUNOS_CPP; -+static const char *CPP = "cpp"; - static const char CPPFLAGS[] = "-C"; - static char *pathbuf; - static int cpp_pid; -@@ -108,7 +108,6 @@ static char *extendfile (const char *fil - static void open_output (const char *infile, const char *outfile); - static void add_warning (void); - static void clear_args (void); --static void find_cpp (void); - static void open_input (const char *infile, const char *define); - static int check_nettype (const char *name, const char *list_to_check[]); - static void c_output (const char *infile, const char *define, -@@ -327,31 +326,6 @@ clear_args (void) - argcount = FIXEDARGS; - } - --/* make sure that a CPP exists */ --static void --find_cpp (void) --{ -- struct stat buf; -- -- if (stat (CPP, &buf) < 0) -- { /* /lib/cpp or explicit cpp does not exist */ -- if (cppDefined) -- { -- fprintf (stderr, _ ("cannot find C preprocessor: %s \n"), CPP); -- crash (); -- } -- else -- { /* try the other one */ -- CPP = SVR4_CPP; -- if (stat (CPP, &buf) < 0) -- { /* can't find any cpp */ -- fputs (_ ("cannot find any C preprocessor (cpp)\n"), stdout); -- crash (); -- } -- } -- } --} -- - /* - * Open input file with given define for C-preprocessor - */ -@@ -370,7 +344,6 @@ open_input (const char *infile, const ch - switch (cpp_pid) - { - case 0: -- find_cpp (); - putarg (0, CPP); - putarg (1, CPPFLAGS); - addarg (define); -@@ -380,7 +353,7 @@ open_input (const char *infile, const ch - close (1); - dup2 (pd[1], 1); - close (pd[0]); -- execv (arglist[0], (char **) arglist); -+ execvp (arglist[0], (char **) arglist); - perror ("execv"); - exit (1); - case -1: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da9451b465f5..1d0959305c1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3608,27 +3608,6 @@ let inherit fetchgit; })); - glibc214 = (callPackage ../development/libraries/glibc/2.14 { - kernelHeaders = linuxHeaders; - installLocales = getConfig [ "glibc" "locales" ] false; - machHeaders = null; - hurdHeaders = null; - gccCross = null; - }) // (lib.optionalAttrs (crossSystem != null) { hostDrv = glibc214Cross; }); - - glibc214Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc/2.14) - (let crossGNU = (crossSystem != null && crossSystem.config == "i586-pc-gnu"); - in { - inherit stdenv fetchurl; - gccCross = gccCrossStageStatic; - kernelHeaders = if crossGNU then gnu.hurdHeaders else linuxHeadersCross; - installLocales = getConfig [ "glibc" "locales" ] false; - } - // lib.optionalAttrs crossGNU { - inherit (gnu) machHeaders hurdHeaders libpthreadHeaders mig; - inherit fetchgit; - })); - glibc216 = callPackage ../development/libraries/glibc/2.16 { kernelHeaders = linuxHeaders; installLocales = config.glibc.locales or false; -- cgit 1.4.1 From adc0b5254507b321becbf48efc46af46cdd41317 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Sep 2012 10:40:09 -0400 Subject: libidn: Update to 1.25 http://hydra.nixos.org/build/3046837 --- pkgs/development/libraries/libidn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index 6da91d98d13a..94e785ee53b9 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "libidn-1.24"; + name = "libidn-1.25"; src = fetchurl { url = "mirror://gnu/libidn/${name}.tar.gz"; - sha256 = "1zrmbwxvgmv7d37sdnlfn4lf3pxc7vgng3lhl18pkjry0v30h5ys"; + sha256 = "05j7qcj7gb791k6ya2pwr7cq9yxgi0bjqiiwf9yq6pbai8r2brkz"; }; doCheck = ! stdenv.isDarwin; -- cgit 1.4.1 From efbca8426532d64a33d9b4f72fc679a696cdb147 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Sep 2012 13:51:28 -0400 Subject: libtasn1: Update to 2.13 and fix compilation http://hydra.nixos.org/build/3052733 --- pkgs/development/libraries/libtasn1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index f70f7d348016..f5c07f47379f 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libtasn1-2.12"; + name = "libtasn1-2.13"; src = fetchurl { url = "mirror://gnu/libtasn1/${name}.tar.gz"; - sha256 = "0p8w38l04fgm82iqgl1abhb1ajp04v116bi6fd7lc3n80657l98f"; + sha256 = "14asfhi35pwc67v7abbwim344h444237bjaqp92gwhhx7m44cvm5"; }; doCheck = true; -- cgit 1.4.1 From b5a605c26908be611d189e7ea7dc6ec5c0f3aa09 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 26 Sep 2012 12:04:05 -0400 Subject: Fix the Glibc kernel at 2.6.35 rather than whatever the kernel header happen to be --- pkgs/development/libraries/glibc/2.13/common.nix | 2 +- pkgs/development/libraries/glibc/2.16/common.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/glibc/2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix index 6e409158f0b8..2333e42246b0 100644 --- a/pkgs/development/libraries/glibc/2.13/common.nix +++ b/pkgs/development/libraries/glibc/2.13/common.nix @@ -111,7 +111,7 @@ stdenv.mkDerivation ({ then "--enable-profile" else "--disable-profile") ] ++ stdenv.lib.optionals (cross == null && kernelHeaders != null) [ - "--enable-kernel=${kernelHeaders.versionForGlibc}" + "--enable-kernel=2.6.35" ] ++ stdenv.lib.optionals (cross != null) [ (if cross.withTLS then "--with-tls" else "--without-tls") (if cross.float == "soft" then "--without-fp" else "--with-fp") diff --git a/pkgs/development/libraries/glibc/2.16/common.nix b/pkgs/development/libraries/glibc/2.16/common.nix index 5624be5b5495..84bbefee840e 100644 --- a/pkgs/development/libraries/glibc/2.16/common.nix +++ b/pkgs/development/libraries/glibc/2.16/common.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation ({ then "--enable-profile" else "--disable-profile") ] ++ stdenv.lib.optionals (cross == null && kernelHeaders != null) [ - "--enable-kernel=${kernelHeaders.versionForGlibc}" + "--enable-kernel=2.6.35" ] ++ stdenv.lib.optionals (cross != null) [ (if cross.withTLS then "--with-tls" else "--without-tls") (if cross.float == "soft" then "--without-fp" else "--with-fp") -- cgit 1.4.1 From 8d469a5bbc3abd0fc10a11ec03d70d609a2ff504 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Oct 2012 18:35:51 +0200 Subject: openssl: update to version 1.0.1c --- pkgs/development/libraries/openssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index ef6037b7a280..0f1d61672793 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl }: let - name = "openssl-1.0.0j"; + name = "openssl-1.0.1c"; opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] (throw "openssl needs its platform name cross building" null) @@ -40,7 +40,7 @@ stdenv.mkDerivation { "http://www.openssl.org/source/${name}.tar.gz" "http://openssl.linux-mirror.org/source/${name}.tar.gz" ]; - sha1 = "31e6e8bbf1de2f59fbd53382c34214887ccc1318"; + sha256 = "1gjy6a7d8nszi9wq8jdzx3cffn0nss23h3cw2ywlw4cb9v6v77ia"; }; patches = patchesCross false; -- cgit 1.4.1 From 02cd9a906e8b4b140a110b8b3b25f9e77ba5a9b2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Oct 2012 18:36:02 +0200 Subject: openssl: strip trailing whitespace --- pkgs/development/libraries/openssl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 0f1d61672793..3b2f224e6a95 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -29,7 +29,7 @@ let ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch; - + in stdenv.mkDerivation { -- cgit 1.4.1 From 592e4abe2b3a0243ebf247539928734c2f869f29 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 21 Nov 2012 15:57:46 +0100 Subject: pcre: update library to version 8.31 --- pkgs/development/libraries/pcre/8.30.nix | 38 ----------------------------- pkgs/development/libraries/pcre/default.nix | 4 +-- pkgs/top-level/all-packages.nix | 6 ----- 3 files changed, 2 insertions(+), 46 deletions(-) delete mode 100644 pkgs/development/libraries/pcre/8.30.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/pcre/8.30.nix b/pkgs/development/libraries/pcre/8.30.nix deleted file mode 100644 index 2f636492eb61..000000000000 --- a/pkgs/development/libraries/pcre/8.30.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchurl, unicodeSupport ? true, cplusplusSupport ? true }: - -stdenv.mkDerivation rec { - name = "pcre-8.30"; - - src = fetchurl { - url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2"; - sha256 = "c1113fd7db934e97ad8b3917d432e5b642e9eb9afd127eb797804937c965f4ac"; - }; - - # The compiler on Darwin crashes with an internal error while building the - # C++ interface. Disabling optimizations on that platform remedies the - # problem. In case we ever update the Darwin GCC version, the exception for - # that platform ought to be removed. - configureFlags = '' - ${if unicodeSupport then "--enable-unicode-properties" else ""} - ${if !cplusplusSupport then "--disable-cpp" else ""} - '' + stdenv.lib.optionalString stdenv.isDarwin "CXXFLAGS=-O0"; - - doCheck = !stdenv.isCygwin; # XXX: test failure on Cygwin - - meta = { - homepage = "http://www.pcre.org/"; - description = "A library for Perl Compatible Regular Expressions"; - license = "BSD-3"; - - longDescription = '' - The PCRE library is a set of functions that implement regular - expression pattern matching using the same syntax and semantics as - Perl 5. PCRE has its own native API, as well as a set of wrapper - functions that correspond to the POSIX regular expression API. The - PCRE library is free, even for building proprietary software. - ''; - - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.simons ]; - }; -} diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index edfe26740def..e59c249348a8 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unicodeSupport ? true, cplusplusSupport ? true }: stdenv.mkDerivation rec { - name = "pcre-8.21"; + name = "pcre-8.31"; src = fetchurl { url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2"; - sha256 = "1qwrqldbwszbmr4cw4f0xmcl889cmmjbf58l9vxn89zw26fm1f54"; + sha256 = "5778a02535473c7ee7838ea598c19f451e63cf5eec0bf0307a688301c9078c3c"; }; # The compiler on Darwin crashes with an internal error while building the diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94e6f806db9e..d7d9a82d8fb0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2394,7 +2394,6 @@ let julia = callPackage ../development/compilers/julia { llvm = llvm_3_1; - pcre = pcre_8_30; liblapack = liblapack.override {shared = true;}; fftw = fftw.override {pthreads = true;}; fftwSinglePrec = fftwSinglePrec.override {pthreads = true;}; @@ -4563,11 +4562,6 @@ let cplusplusSupport = !stdenv ? isDietLibC; }; - pcre_8_30 = callPackage ../development/libraries/pcre/8.30.nix { - unicodeSupport = getConfig ["pcre" "unicode"] true; - cplusplusSupport = !stdenv ? isDietLibC; - }; - pdf2xml = callPackage ../development/libraries/pdf2xml {} ; phonon = callPackage ../development/libraries/phonon { }; -- cgit 1.4.1 From e5497ca0434e45fef3750213c26922987f53f641 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 23 Nov 2012 17:24:35 +0100 Subject: openssl: Install config files in $out/etc/ssl in $out/ssl --- pkgs/development/libraries/openssl/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 923c24a51ebf..36bb0d662b26 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -55,11 +55,14 @@ stdenv.mkDerivation { configureScript = if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc" else "./config"; - configureFlags = "shared --libdir=lib" + + configureFlags = "shared --libdir=lib --openssldir=etc/ssl" + stdenv.lib.optionalString withCryptodev " -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"; makeFlags = "MANDIR=$(out)/share/man"; + # Parallel building is broken in OpenSSL. + #enableParallelBuilding = true; + postInstall = '' # If we're building dynamic libraries, then don't install static -- cgit 1.4.1 From 88f7000aa431d7e4af96ba759b5fd980ff0549bd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Dec 2012 18:03:26 +0100 Subject: openssl: Fix building on Darwin http://hydra.nixos.org/build/3491716 --- .../libraries/openssl/darwin-arch.patch | 30 ++++++++-------------- pkgs/development/libraries/openssl/default.nix | 2 +- 2 files changed, 12 insertions(+), 20 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/openssl/darwin-arch.patch b/pkgs/development/libraries/openssl/darwin-arch.patch index 5d5a3afdd1d8..63db3efc0846 100644 --- a/pkgs/development/libraries/openssl/darwin-arch.patch +++ b/pkgs/development/libraries/openssl/darwin-arch.patch @@ -1,20 +1,12 @@ -diff -ru openssl-1.0.0g-orig/Configure openssl-1.0.0g/Configure ---- openssl-1.0.0g-orig/Configure 2011-12-19 18:04:38.000000000 +0100 -+++ openssl-1.0.0g/Configure 2012-01-23 13:45:23.644170171 +0100 -@@ -549,11 +549,11 @@ - - ##### MacOS X (a.k.a. Rhapsody or Darwin) setup - "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::", --"darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN -Wa,-force_cpusubtype_ALL::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", --"darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc64_asm}:osx64:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", --"darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", --"debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", --"darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -+"darwin-ppc-cc","cc:-O3 -DB_ENDIAN -Wa,-force_cpusubtype_ALL::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -+"darwin64-ppc-cc","cc:-O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc64_asm}:osx64:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -+"darwin-i386-cc","cc:-O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -+"debug-darwin-i386-cc","cc:-g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -+"darwin64-x86_64-cc","cc:-O3 -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +diff -ru -x '*~' openssl-1.0.1c-orig/Configure openssl-1.0.1c/Configure +--- openssl-1.0.1c-orig/Configure 2012-03-14 23:20:40.000000000 +0100 ++++ openssl-1.0.1c/Configure 2012-12-18 17:29:30.268090633 +0100 +@@ -579,7 +579,7 @@ + "darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc64_asm}:osx64:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + "darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:".eval{my $asm=$x86_asm;$asm=~s/cast\-586\.o//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + "debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +-"darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", ++"darwin64-x86_64-cc","cc:-O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - - ##### A/UX + # iPhoneOS/iOS + "iphoneos-cross","llvm-gcc:-O3 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fomit-frame-pointer -fno-common::-D_REENTRANT:iOS:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 36bb0d662b26..2eb02e084750 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation { '' # If we're building dynamic libraries, then don't install static # libraries. - if [ -n "$(echo $out/lib/*.so)" ]; then + if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib)" ]; then rm $out/lib/*.a fi ''; # */ -- cgit 1.4.1 From 06f6bb05591a80b043cae791e967203285f7f165 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Fri, 21 Dec 2012 10:53:10 +0100 Subject: vxl: fixing build with the new linux headers --- pkgs/development/libraries/vxl/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix index 01ccb23b77cf..5f49c3351fa5 100644 --- a/pkgs/development/libraries/vxl/default.nix +++ b/pkgs/development/libraries/vxl/default.nix @@ -9,7 +9,10 @@ stdenv.mkDerivation { buildInputs = [ cmake unzip libtiff expat zlib libpng libjpeg ]; - cmakeFlags = "-DBUILD_TESTING=OFF " + (if (stdenv.system == "x86_64-linux") then + # BUILD_OUL wants old linux headers for videodev.h, not available + # in stdenv linux headers + cmakeFlags = "-DBUILD_TESTING=OFF -DBUILD_OUL=OFF " + + (if (stdenv.system == "x86_64-linux") then "-DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC" else ""); -- cgit 1.4.1 From 636722eb93699d17c032c8734a2e1eda6453a4ff Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Mon, 24 Dec 2012 13:06:04 +0100 Subject: Less intrussive fix for glibc 2.16 cross-rpcgen build Using LD_LIBRARY_PATH, sets overrides of libs for all binaries run. On mips64, the libz in the bootstrap-tools is a bit incompatible with the libz binutils are built with (ld.so outputs a warning at every program run that uses libz). binutils need to be dynamically linked to the libz they have been linked to. Glibc creates 'shlib.lds' using the gas program output, and it includes the ld.so warning in case of using LD_LIBRARY_PATH. That breaks the glibc build. As Makefile includes BUILD_LDFLAGS for the purpose of cross-rpcgen, I use this instead of the intrusive LD_LIBRARY_PATH. --- pkgs/development/libraries/glibc/2.16/common.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/glibc/2.16/common.nix b/pkgs/development/libraries/glibc/2.16/common.nix index 84bbefee840e..ea54b45a50de 100644 --- a/pkgs/development/libraries/glibc/2.16/common.nix +++ b/pkgs/development/libraries/glibc/2.16/common.nix @@ -170,8 +170,7 @@ stdenv.mkDerivation ({ configureScript="`pwd`/../$sourceRoot/configure" - # Needed to build rpcgen. - export LD_LIBRARY_PATH=${stdenv.gcc.libc}/lib + makeFlags="$makeFlags BUILD_LDFLAGS=-Wl,-rpath,${stdenv.gcc.libc}/lib" ${preConfigure} ''; -- cgit 1.4.1 From 1b29d29c7610402cb278130f12b27900bb5a99f0 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 6 Dec 2012 15:51:52 +0000 Subject: First movement to get the raspberrypi stdenv building. --- pkgs/development/compilers/gcc/4.6/default.nix | 4 +- pkgs/development/libraries/glibc/2.13/common.nix | 18 ++++- pkgs/development/libraries/glibc/2.13/default.nix | 3 +- pkgs/stdenv/default.nix | 1 + pkgs/stdenv/generic/default.nix | 2 + pkgs/stdenv/linux/default.nix | 13 ++- pkgs/top-level/platforms.nix | 98 +++++++++++++++++++++++ 7 files changed, 131 insertions(+), 8 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index e27f1a47f9c1..bcdde3ec8701 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -294,7 +294,9 @@ stdenv.mkDerivation ({ ${if langAda then " --enable-libada" else ""} ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""} ${if cross != null then crossConfigureFlags else ""} - "; + " + (if (cross == null && stdenv.platform.name == "raspberrypi") then + "--with-arch=armv6 --with-fpu=vfp --with-float=hard --with-mode=arm" else ""); + # ^ This above is out of "" because we don't want to rebuild stdenv in other archs targetConfig = if (cross != null) then cross.config else null; diff --git a/pkgs/development/libraries/glibc/2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix index 2333e42246b0..316c66c51900 100644 --- a/pkgs/development/libraries/glibc/2.13/common.nix +++ b/pkgs/development/libraries/glibc/2.13/common.nix @@ -8,7 +8,7 @@ cross : , machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null , mig ? null, fetchgit ? null , profilingLibraries ? false, meta -, preConfigure ? "", ... }@args : +, preConfigure ? "", recentGcc ? true, ... }@args : let # For GNU/Hurd, see below. @@ -120,11 +120,21 @@ stdenv.mkDerivation ({ && cross.platform.kernelMajor == "2.6") [ "--enable-kernel=2.6.0" "--with-__thread" - ] ++ stdenv.lib.optionals stdenv.isArm [ + ] ++ stdenv.lib.optionals (cross == null && + (stdenv.system == "armv5tel-linux") || + (!recentGcc && stdenv.platform.name == "raspberrypi")) [ "--host=arm-linux-gnueabi" "--build=arm-linux-gnueabi" "--without-fp" + # To avoid linking with -lgcc_s (dynamic link) + # so the glibc does not depend on its compiler store path + "libc_cv_as_needed=no" + ] ++ stdenv.lib.optionals (cross == null && recentGcc && stdenv.platform.name == "raspberrypi") [ + "--host=arm-linux-gnueabihf" + "--build=arm-linux-gnueabihf" + "--with-fp" + # To avoid linking with -lgcc_s (dynamic link) # so the glibc does not depend on its compiler store path "libc_cv_as_needed=no" @@ -192,6 +202,10 @@ stdenv.mkDerivation ({ configureScript="`pwd`/../$sourceRoot/configure" ${preConfigure} + '' + stdenv.lib.optionalString (cross == null + && recentGcc + && stdenv.platform.name == "raspberrypi") '' + configureFlagsArray=("CFLAGS=-march=armv6 -mfpu=vfp -mhard-float") ''; meta = { diff --git a/pkgs/development/libraries/glibc/2.13/default.nix b/pkgs/development/libraries/glibc/2.13/default.nix index f80ed9372e63..59f8ca647e6f 100644 --- a/pkgs/development/libraries/glibc/2.13/default.nix +++ b/pkgs/development/libraries/glibc/2.13/default.nix @@ -5,6 +5,7 @@ , profilingLibraries ? false , gccCross ? null , debugSymbols ? false +, recentGcc ? true }: assert stdenv.gcc.gcc != null; @@ -19,7 +20,7 @@ in + stdenv.lib.optionalString debugSymbols "-debug"; inherit fetchurl stdenv kernelHeaders installLocales profilingLibraries - gccCross; + gccCross recentGcc; builder = ./builder.sh; diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 8e0da288eec7..3c75597afca9 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -55,6 +55,7 @@ rec { if stdenvType == "i686-linux" then stdenvLinux else if stdenvType == "x86_64-linux" then stdenvLinux else if stdenvType == "armv5tel-linux" then stdenvLinux else + if stdenvType == "armv6l-linux" then stdenvLinux else if stdenvType == "armv7l-linux" then stdenvLinux else if stdenvType == "mips64el-linux" then stdenvLinux else if stdenvType == "powerpc-linux" then /* stdenvLinux */ stdenvNative else diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 20cbb1b455ca..ea101ddb075c 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -87,6 +87,7 @@ let || result.system == "x86_64-linux" || result.system == "powerpc-linux" || result.system == "armv5tel-linux" + || result.system == "armv6l-linux" || result.system == "armv7l-linux" || result.system == "mips64el-linux"; isGNU = result.system == "i686-gnu"; # GNU/Hurd @@ -120,6 +121,7 @@ let isMips = result.system == "mips-linux" || result.system == "mips64el-linux"; isArm = result.system == "armv5tel-linux" + || result.system == "armv6l-linux" || result.system == "armv7l-linux"; # Utility function: allow stdenv to be easily regenerated with diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 3105e76f8177..6a202951c7c1 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -16,6 +16,7 @@ rec { else if system == "x86_64-linux" then import ./bootstrap/x86_64 else if system == "powerpc-linux" then import ./bootstrap/powerpc else if system == "armv5tel-linux" then import ./bootstrap/armv5tel + else if system == "armv6l-linux" then import ./bootstrap/armv5tel else if system == "armv7l-linux" then import ./bootstrap/armv5tel else if system == "mips64el-linux" then import ./bootstrap/loongson2f else abort "unsupported platform for the pure Linux stdenv"; @@ -57,7 +58,7 @@ rec { builder = bootstrapFiles.sh; args = - if system == "armv5tel-linux" + if (system == "armv5tel-linux" || system == "arm6l-linux") then [ ./scripts/unpack-bootstrap-tools-arm.sh ] else [ ./scripts/unpack-bootstrap-tools.sh ]; @@ -189,7 +190,7 @@ rec { # 5) Build Glibc with the bootstrap tools. The result is the full, # dynamically linked, final Glibc. - stdenvLinuxGlibc = stdenvLinuxBoot2Pkgs.glibc; + stdenvLinuxGlibc = stdenvLinuxBoot2Pkgs.glibc.override { recentGcc = false; }; # 6) Construct a third stdenv identical to the 2nd, except that @@ -201,19 +202,23 @@ rec { coreutils = bootstrapTools; libc = stdenvLinuxGlibc; }; - overrides = pkgs: { + overrides = pkgs: ({ glibc = stdenvLinuxGlibc; inherit (stdenvLinuxBoot1Pkgs) perl; + } // (if (platform ? name && platform.name != "raspberrypi") then { # Link GCC statically against GMP etc. This makes sense because # these builds of the libraries are only used by GCC, so it # reduces the size of the stdenv closure. + + # On raspberry pi we can't do that, because libgcc/libstdc++ are made + # without hardfp, and can't be linked with the new hardfp code in gcc. gmp = pkgs.gmp.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; mpfr = pkgs.mpfr.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; mpc = pkgs.mpc.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; isl = pkgs.isl.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; cloog = pkgs.cloog.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; ppl = pkgs.ppl.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; - }; + } else {})); inherit fetchurl; }; diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index f00ad36f2e47..c53b41958a45 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -126,6 +126,104 @@ rec { ubootConfig = "sheevaplug_config"; }; + raspberrypi = { + name = "raspberrypi"; + kernelMajor = "2.6"; + kernelHeadersBaseConfig = "kirkwood_defconfig"; + kernelBaseConfig = "bcmrpi_defconfig"; + kernelArch = "arm"; + kernelAutoModules = false; + kernelExtraConfig = + '' + BLK_DEV_RAM y + BLK_DEV_INITRD y + BLK_DEV_CRYPTOLOOP m + BLK_DEV_DM m + DM_CRYPT m + MD y + REISERFS_FS m + BTRFS_FS m + XFS_FS m + JFS_FS m + EXT4_FS m + USB_STORAGE_CYPRESS_ATACB m + + # mv cesa requires this sw fallback, for mv-sha1 + CRYPTO_SHA1 y + + IP_PNP y + IP_PNP_DHCP y + NFS_FS y + ROOT_NFS y + TUN m + NFS_V4 y + NFS_V4_1 y + NFS_FSCACHE y + NFSD m + NFSD_V2_ACL y + NFSD_V3 y + NFSD_V3_ACL y + NFSD_V4 y + NETFILTER y + IP_NF_IPTABLES y + IP_NF_FILTER y + IP_NF_MATCH_ADDRTYPE y + IP_NF_TARGET_LOG y + IP_NF_MANGLE y + IPV6 m + VLAN_8021Q m + + CIFS y + CIFS_XATTR y + CIFS_POSIX y + CIFS_FSCACHE y + CIFS_ACL y + + WATCHDOG y + WATCHDOG_CORE y + ORION_WATCHDOG m + + ZRAM m + NETCONSOLE m + + # Fail to build + DRM n + SCSI_ADVANSYS n + USB_ISP1362_HCD n + SND_SOC n + SND_ALI5451 n + FB_SAVAGE n + SCSI_NSP32 n + ATA_SFF n + SUNGEM n + IRDA n + ATM_HE n + SCSI_ACARD n + BLK_DEV_CMD640_ENHANCED n + + FUSE_FS m + + # nixos mounts some cgroup + CGROUPS y + + # Latencytop + LATENCYTOP y + + # Ubi for the mtd + MTD_UBI y + UBIFS_FS y + UBIFS_FS_XATTR y + UBIFS_FS_ADVANCED_COMPR y + UBIFS_FS_LZO y + UBIFS_FS_ZLIB y + UBIFS_FS_DEBUG n + ''; + kernelTarget = "uImage"; + uboot = "sheevaplug"; + # Only for uboot = uboot : + ubootConfig = "sheevaplug_config"; + }; + guruplug = sheevaplug // { # Define `CONFIG_MACH_GURUPLUG' (see # ) -- cgit 1.4.1 From 68a65bcf2a10a63553a3e5a4a6958e7a0ef98cc6 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Sun, 23 Dec 2012 20:16:50 +0100 Subject: Undoing glibc 2.13 work for the pi (previous attempt of bootstrapping from the armv5tel bootstrap tools) --- pkgs/development/libraries/glibc/2.13/common.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/glibc/2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix index 316c66c51900..2c43dd05f526 100644 --- a/pkgs/development/libraries/glibc/2.13/common.nix +++ b/pkgs/development/libraries/glibc/2.13/common.nix @@ -8,7 +8,7 @@ cross : , machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null , mig ? null, fetchgit ? null , profilingLibraries ? false, meta -, preConfigure ? "", recentGcc ? true, ... }@args : +, preConfigure ? "", ... }@args : let # For GNU/Hurd, see below. @@ -121,8 +121,7 @@ stdenv.mkDerivation ({ "--enable-kernel=2.6.0" "--with-__thread" ] ++ stdenv.lib.optionals (cross == null && - (stdenv.system == "armv5tel-linux") || - (!recentGcc && stdenv.platform.name == "raspberrypi")) [ + (stdenv.system == "armv5tel-linux")) [ "--host=arm-linux-gnueabi" "--build=arm-linux-gnueabi" "--without-fp" @@ -130,7 +129,7 @@ stdenv.mkDerivation ({ # To avoid linking with -lgcc_s (dynamic link) # so the glibc does not depend on its compiler store path "libc_cv_as_needed=no" - ] ++ stdenv.lib.optionals (cross == null && recentGcc && stdenv.platform.name == "raspberrypi") [ + ] ++ stdenv.lib.optionals (cross == null && stdenv.platform.name == "raspberrypi") [ "--host=arm-linux-gnueabihf" "--build=arm-linux-gnueabihf" "--with-fp" @@ -202,10 +201,6 @@ stdenv.mkDerivation ({ configureScript="`pwd`/../$sourceRoot/configure" ${preConfigure} - '' + stdenv.lib.optionalString (cross == null - && recentGcc - && stdenv.platform.name == "raspberrypi") '' - configureFlagsArray=("CFLAGS=-march=armv6 -mfpu=vfp -mhard-float") ''; meta = { -- cgit 1.4.1 From 0af1283e977ffbd72681461ab8e75735563a4421 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Sun, 23 Dec 2012 20:17:53 +0100 Subject: Undoing more glibc unneeded changes --- pkgs/development/libraries/glibc/2.13/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/glibc/2.13/default.nix b/pkgs/development/libraries/glibc/2.13/default.nix index 59f8ca647e6f..f80ed9372e63 100644 --- a/pkgs/development/libraries/glibc/2.13/default.nix +++ b/pkgs/development/libraries/glibc/2.13/default.nix @@ -5,7 +5,6 @@ , profilingLibraries ? false , gccCross ? null , debugSymbols ? false -, recentGcc ? true }: assert stdenv.gcc.gcc != null; @@ -20,7 +19,7 @@ in + stdenv.lib.optionalString debugSymbols "-debug"; inherit fetchurl stdenv kernelHeaders installLocales profilingLibraries - gccCross recentGcc; + gccCross; builder = ./builder.sh; -- cgit 1.4.1 From 2717392cbfaa93f3aca55503d1741bc919a5df5d Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Wed, 26 Dec 2012 15:29:49 +0000 Subject: The glibc doesn't like "gnueabihf" in the triplet. I better set "gnueabi". --- pkgs/development/libraries/glibc/2.13/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/glibc/2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix index 2c43dd05f526..10ce4f459e6f 100644 --- a/pkgs/development/libraries/glibc/2.13/common.nix +++ b/pkgs/development/libraries/glibc/2.13/common.nix @@ -130,8 +130,8 @@ stdenv.mkDerivation ({ # so the glibc does not depend on its compiler store path "libc_cv_as_needed=no" ] ++ stdenv.lib.optionals (cross == null && stdenv.platform.name == "raspberrypi") [ - "--host=arm-linux-gnueabihf" - "--build=arm-linux-gnueabihf" + "--host=arm-linux-gnueabi" + "--build=arm-linux-gnueabi" "--with-fp" # To avoid linking with -lgcc_s (dynamic link) -- cgit 1.4.1 From affca4a11cd0b79682398941eec6196df56818e8 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Fri, 28 Dec 2012 16:53:18 +0000 Subject: Making the raspberrypi glibc include hard float. --- pkgs/development/libraries/glibc/2.16/common.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/glibc/2.16/common.nix b/pkgs/development/libraries/glibc/2.16/common.nix index ea54b45a50de..a8cb4f2b1d05 100644 --- a/pkgs/development/libraries/glibc/2.16/common.nix +++ b/pkgs/development/libraries/glibc/2.16/common.nix @@ -114,10 +114,20 @@ stdenv.mkDerivation ({ && cross.platform.kernelMajor == "2.6") [ "--enable-kernel=2.6.0" "--with-__thread" - ] ++ stdenv.lib.optionals stdenv.isArm [ + ] ++ stdenv.lib.optionals (cross == null && + (stdenv.system == "armv5tel-linux")) [ "--host=arm-linux-gnueabi" "--build=arm-linux-gnueabi" "--without-fp" + + # To avoid linking with -lgcc_s (dynamic link) + # so the glibc does not depend on its compiler store path + "libc_cv_as_needed=no" + ] ++ stdenv.lib.optionals (cross == null && stdenv.platform.name == "raspberrypi") [ + "--host=arm-linux-gnueabi" + "--build=arm-linux-gnueabi" + "--with-fp" + # To avoid linking with -lgcc_s (dynamic link) # so the glibc does not depend on its compiler store path "libc_cv_as_needed=no" -- cgit 1.4.1 From 5be0a9acd7b9abe4bff3202a7ac7defc17a37877 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Dec 2012 19:08:19 +0100 Subject: Rename hostDrv -> crossDrv, buildDrv -> nativeDrv This is for consistency with terminology in stdenv (and the terms "hostDrv" and "buildDrv" are not very intuitive, even if they're consistent with GNU terminology). --- .../networking/browsers/elinks/default.nix | 6 +- pkgs/build-support/clang-wrapper/default.nix | 10 +- pkgs/build-support/gcc-wrapper/default.nix | 10 +- pkgs/development/compilers/gcc/4.4/default.nix | 12 +- pkgs/development/compilers/gcc/4.5/default.nix | 16 +-- pkgs/development/compilers/gcc/4.6/default.nix | 14 +- pkgs/development/compilers/gcc/4.7/default.nix | 14 +- pkgs/development/libraries/SDL/default.nix | 2 +- pkgs/development/libraries/boost/1.44.nix | 4 +- pkgs/development/libraries/boost/1.46.nix | 4 +- pkgs/development/libraries/boost/1.47.nix | 4 +- pkgs/development/libraries/boost/1.49.nix | 4 +- pkgs/development/libraries/boost/1.51.nix | 4 +- pkgs/development/libraries/boost/1.52.nix | 4 +- pkgs/development/libraries/cloog-ppl/default.nix | 2 +- pkgs/development/libraries/gettext/default.nix | 2 +- pkgs/development/libraries/libtheora/default.nix | 2 +- pkgs/development/tools/misc/cscope/default.nix | 2 +- pkgs/development/tools/misc/elfutils/default.nix | 2 +- pkgs/development/tools/misc/gdb/default.nix | 8 +- pkgs/games/prboom/default.nix | 2 +- pkgs/lib/customisation.nix | 8 +- pkgs/os-specific/gnu/default.nix | 4 +- pkgs/os-specific/gnu/mig/default.nix | 2 +- pkgs/os-specific/linux/kernel/generic.nix | 4 +- pkgs/os-specific/linux/kernel/perf.nix | 4 +- pkgs/os-specific/linux/pam/default.nix | 4 +- pkgs/os-specific/windows/jom/default.nix | 2 +- pkgs/stdenv/adapters.nix | 22 +-- pkgs/stdenv/generic/setup.sh | 2 +- pkgs/tools/admin/tigervnc/default.nix | 8 +- pkgs/tools/misc/coreutils/default.nix | 8 +- pkgs/tools/networking/curl/default.nix | 2 +- pkgs/tools/package-management/nix/default.nix | 4 +- pkgs/tools/package-management/nix/unstable.nix | 4 +- pkgs/top-level/all-packages.nix | 16 +-- pkgs/top-level/release-cross.nix | 156 ++++++++++----------- pkgs/top-level/release-lib.nix | 2 +- 38 files changed, 190 insertions(+), 190 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 1587a2e34953..9334ff4bd41b 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation rec { ''; crossAttrs = { - propagatedBuildInputs = [ ncurses.hostDrv zlib.hostDrv openssl.hostDrv ]; + propagatedBuildInputs = [ ncurses.crossDrv zlib.crossDrv openssl.crossDrv ]; configureFlags = '' --enable-finger --enable-html-highlight --enable-gopher --enable-cgi --enable-bittorrent --enable-nntp - --with-openssl=${openssl.hostDrv} - --with-bzip2=${bzip2.hostDrv} + --with-openssl=${openssl.crossDrv} + --with-bzip2=${bzip2.crossDrv} ''; }; diff --git a/pkgs/build-support/clang-wrapper/default.nix b/pkgs/build-support/clang-wrapper/default.nix index 165e3bace906..9f560d0d2fba 100644 --- a/pkgs/build-support/clang-wrapper/default.nix +++ b/pkgs/build-support/clang-wrapper/default.nix @@ -47,11 +47,11 @@ stdenv.mkDerivation { else shell; crossAttrs = { - shell = shell.hostDrv + shell.hostDrv.shellPath; - libc = libc.hostDrv; - coreutils = coreutils.hostDrv; - binutils = binutils.hostDrv; - clang = clang.hostDrv; + shell = shell.crossDrv + shell.crossDrv.shellPath; + libc = libc.crossDrv; + coreutils = coreutils.crossDrv; + binutils = binutils.crossDrv; + clang = clang.crossDrv; # # This is not the best way to do this. I think the reference should be # the style in the gcc-cross-wrapper, but to keep a stable stdenv now I diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix index 5e50a5c7dfb5..867a1157a44c 100644 --- a/pkgs/build-support/gcc-wrapper/default.nix +++ b/pkgs/build-support/gcc-wrapper/default.nix @@ -56,11 +56,11 @@ stdenv.mkDerivation ({ else shell; crossAttrs = { - shell = shell.hostDrv + shell.hostDrv.shellPath; - libc = libc.hostDrv; - coreutils = coreutils.hostDrv; - binutils = binutils.hostDrv; - gcc = gcc.hostDrv; + shell = shell.crossDrv + shell.crossDrv.shellPath; + libc = libc.crossDrv; + coreutils = coreutils.crossDrv; + binutils = binutils.crossDrv; + gcc = gcc.crossDrv; # # This is not the best way to do this. I think the reference should be # the style in the gcc-cross-wrapper, but to keep a stable stdenv now I diff --git a/pkgs/development/compilers/gcc/4.4/default.nix b/pkgs/development/compilers/gcc/4.4/default.nix index d962d4ac3471..7bc0d2c26e08 100644 --- a/pkgs/development/compilers/gcc/4.4/default.nix +++ b/pkgs/development/compilers/gcc/4.4/default.nix @@ -189,13 +189,13 @@ stdenv.mkDerivation ({ configureFlags = " ${if enableMultilib then "" else "--disable-multilib"} ${if enableShared then "" else "--disable-shared"} - ${if ppl != null then "--with-ppl=${ppl.hostDrv}" else ""} - ${if cloogppl != null then "--with-cloog=${cloogppl.hostDrv}" else ""} - ${if langJava then "--with-ecj-jar=${javaEcj.hostDrv}" else ""} + ${if ppl != null then "--with-ppl=${ppl.crossDrv}" else ""} + ${if cloogppl != null then "--with-cloog=${cloogppl.crossDrv}" else ""} + ${if langJava then "--with-ecj-jar=${javaEcj.crossDrv}" else ""} ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} - ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.hostDrv}" else ""} - --with-gmp=${gmp.hostDrv} - --with-mpfr=${mpfr.hostDrv} + ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""} + --with-gmp=${gmp.crossDrv} + --with-mpfr=${mpfr.crossDrv} --disable-libstdcxx-pch --without-included-gettext --with-system-zlib diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index 9cf38718a473..38527befe3b3 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -146,7 +146,7 @@ stdenv.mkDerivation ({ postPatch = if (stdenv.system == "i586-pc-gnu" - || (libcCross != null # e.g., building `gcc.hostDrv' + || (libcCross != null # e.g., building `gcc.crossDrv' && libcCross ? crossConfig && libcCross.crossConfig == "i586-pc-gnu") || (cross != null && cross.config == "i586-pc-gnu" @@ -277,13 +277,13 @@ stdenv.mkDerivation ({ configureFlags = '' ${if enableMultilib then "" else "--disable-multilib"} ${if enableShared then "" else "--disable-shared"} - ${if ppl != null then "--with-ppl=${ppl.hostDrv}" else ""} - ${if cloogppl != null then "--with-cloog=${cloogppl.hostDrv}" else ""} - ${if langJava then "--with-ecj-jar=${javaEcj.hostDrv}" else ""} + ${if ppl != null then "--with-ppl=${ppl.crossDrv}" else ""} + ${if cloogppl != null then "--with-cloog=${cloogppl.crossDrv}" else ""} + ${if langJava then "--with-ecj-jar=${javaEcj.crossDrv}" else ""} ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} - ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.hostDrv}" else ""} - --with-gmp=${gmp.hostDrv} - --with-mpfr=${mpfr.hostDrv} + ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""} + --with-gmp=${gmp.crossDrv} + --with-mpfr=${mpfr.crossDrv} --disable-libstdcxx-pch --without-included-gettext --with-system-zlib @@ -391,7 +391,7 @@ stdenv.mkDerivation ({ // optionalAttrs (cross != null || libcCross != null) { # `builder.sh' sets $CPP, which leads configure to use "gcc -E" instead of, - # say, "i586-pc-gnu-gcc -E" when building `gcc.hostDrv'. + # say, "i586-pc-gnu-gcc -E" when building `gcc.crossDrv'. # FIXME: Fix `builder.sh' directly in the next stdenv-update. postUnpack = "unset CPP"; } diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index 9a15faeaf1db..ec15b88bb791 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -174,7 +174,7 @@ stdenv.mkDerivation ({ postPatch = if (stdenv.isGNU - || (libcCross != null # e.g., building `gcc.hostDrv' + || (libcCross != null # e.g., building `gcc.crossDrv' && libcCross ? crossConfig && libcCross.crossConfig == "i586-pc-gnu") || (crossGNU && libcCross != null)) @@ -327,13 +327,13 @@ stdenv.mkDerivation ({ configureFlags = '' ${if enableMultilib then "" else "--disable-multilib"} ${if enableShared then "" else "--disable-shared"} - ${if ppl != null then "--with-ppl=${ppl.hostDrv}" else ""} - ${if cloog != null then "--with-cloog=${cloog.hostDrv} --enable-cloog-backend=isl" else ""} - ${if langJava then "--with-ecj-jar=${javaEcj.hostDrv}" else ""} + ${if ppl != null then "--with-ppl=${ppl.crossDrv}" else ""} + ${if cloog != null then "--with-cloog=${cloog.crossDrv} --enable-cloog-backend=isl" else ""} + ${if langJava then "--with-ecj-jar=${javaEcj.crossDrv}" else ""} ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} - ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.hostDrv}" else ""} - --with-gmp=${gmp.hostDrv} - --with-mpfr=${mpfr.hostDrv} + ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""} + --with-gmp=${gmp.crossDrv} + --with-mpfr=${mpfr.crossDrv} --disable-libstdcxx-pch --without-included-gettext --with-system-zlib diff --git a/pkgs/development/compilers/gcc/4.7/default.nix b/pkgs/development/compilers/gcc/4.7/default.nix index 438760499502..5d29b5c833c6 100644 --- a/pkgs/development/compilers/gcc/4.7/default.nix +++ b/pkgs/development/compilers/gcc/4.7/default.nix @@ -172,7 +172,7 @@ stdenv.mkDerivation ({ postPatch = if (stdenv.isGNU - || (libcCross != null # e.g., building `gcc.hostDrv' + || (libcCross != null # e.g., building `gcc.crossDrv' && libcCross ? crossConfig && libcCross.crossConfig == "i586-pc-gnu") || (crossGNU && libcCross != null)) @@ -328,13 +328,13 @@ stdenv.mkDerivation ({ configureFlags = '' ${if enableMultilib then "" else "--disable-multilib"} ${if enableShared then "" else "--disable-shared"} - ${if ppl != null then "--with-ppl=${ppl.hostDrv}" else ""} - ${if cloog != null then "--with-cloog=${cloog.hostDrv} --enable-cloog-backend=isl" else ""} - ${if langJava then "--with-ecj-jar=${javaEcj.hostDrv}" else ""} + ${if ppl != null then "--with-ppl=${ppl.crossDrv}" else ""} + ${if cloog != null then "--with-cloog=${cloog.crossDrv} --enable-cloog-backend=isl" else ""} + ${if langJava then "--with-ecj-jar=${javaEcj.crossDrv}" else ""} ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} - ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.hostDrv}" else ""} - --with-gmp=${gmp.hostDrv} - --with-mpfr=${mpfr.hostDrv} + ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""} + --with-gmp=${gmp.crossDrv} + --with-mpfr=${mpfr.crossDrv} --disable-libstdcxx-pch --without-included-gettext --with-system-zlib diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 7205e0fa7ea8..8ff643ce5b18 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { configureFlags = configureFlagsFun { inherit alsaLib; }; crossAttrs = { - configureFlags = configureFlagsFun { alsaLib = alsaLib.hostDrv; }; + configureFlags = configureFlagsFun { alsaLib = alsaLib.crossDrv; }; }; passthru = {inherit openglSupport;}; diff --git a/pkgs/development/libraries/boost/1.44.nix b/pkgs/development/libraries/boost/1.44.nix index ad09adc8606c..90b57d6af0ca 100644 --- a/pkgs/development/libraries/boost/1.44.nix +++ b/pkgs/development/libraries/boost/1.44.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation { ]; crossAttrs = rec { - buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ]; + buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ]; # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to # override them. propagatedBuildInputs = buildInputs; @@ -85,7 +85,7 @@ stdenv.mkDerivation { cat << EOF > user-config.jam using gcc : cross : $crossConfig-g++ ; EOF - ./bjam -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install + ./bjam -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.crossDrv}/include -sEXPAT_LIBPATH=${expat.crossDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install ''; }; } diff --git a/pkgs/development/libraries/boost/1.46.nix b/pkgs/development/libraries/boost/1.46.nix index 0a64efdeb3bd..430189ad32b9 100644 --- a/pkgs/development/libraries/boost/1.46.nix +++ b/pkgs/development/libraries/boost/1.46.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation { installPhase = ":"; crossAttrs = rec { - buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ]; + buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ]; # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to # override them. propagatedBuildInputs = buildInputs; @@ -74,7 +74,7 @@ stdenv.mkDerivation { cat << EOF > user-config.jam using gcc : cross : $crossConfig-g++ ; EOF - ./bjam -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install + ./bjam -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.crossDrv}/include -sEXPAT_LIBPATH=${expat.crossDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install ''; }; } diff --git a/pkgs/development/libraries/boost/1.47.nix b/pkgs/development/libraries/boost/1.47.nix index 4b0c4d3f1409..7a2486883f97 100644 --- a/pkgs/development/libraries/boost/1.47.nix +++ b/pkgs/development/libraries/boost/1.47.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation { installPhase = ":"; crossAttrs = rec { - buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ]; + buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ]; # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to # override them. propagatedBuildInputs = buildInputs; @@ -84,7 +84,7 @@ stdenv.mkDerivation { cat << EOF > user-config.jam using gcc : cross : $crossConfig-g++ ; EOF - ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install + ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.crossDrv}/include -sEXPAT_LIBPATH=${expat.crossDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install ''; }; } diff --git a/pkgs/development/libraries/boost/1.49.nix b/pkgs/development/libraries/boost/1.49.nix index a86670927aad..ddda72468ab4 100644 --- a/pkgs/development/libraries/boost/1.49.nix +++ b/pkgs/development/libraries/boost/1.49.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation { installPhase = ":"; crossAttrs = rec { - buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ]; + buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ]; # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to # override them. propagatedBuildInputs = buildInputs; @@ -85,7 +85,7 @@ stdenv.mkDerivation { cat << EOF > user-config.jam using gcc : cross : $crossConfig-g++ ; EOF - ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install + ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.crossDrv}/include -sEXPAT_LIBPATH=${expat.crossDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install ''; }; } diff --git a/pkgs/development/libraries/boost/1.51.nix b/pkgs/development/libraries/boost/1.51.nix index 8b040dd86473..32be8fca191e 100644 --- a/pkgs/development/libraries/boost/1.51.nix +++ b/pkgs/development/libraries/boost/1.51.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation { installPhase = ":"; crossAttrs = rec { - buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ]; + buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ]; # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to # override them. propagatedBuildInputs = buildInputs; @@ -80,7 +80,7 @@ stdenv.mkDerivation { cat << EOF > user-config.jam using gcc : cross : $crossConfig-g++ ; EOF - ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${layout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install + ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.crossDrv}/include -sEXPAT_LIBPATH=${expat.crossDrv}/lib --layout=${layout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install ''; }; } diff --git a/pkgs/development/libraries/boost/1.52.nix b/pkgs/development/libraries/boost/1.52.nix index 367c2426b782..0f8a40888a43 100644 --- a/pkgs/development/libraries/boost/1.52.nix +++ b/pkgs/development/libraries/boost/1.52.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation { ''; crossAttrs = rec { - buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ]; + buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ]; # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to # override them. propagatedBuildInputs = buildInputs; @@ -85,7 +85,7 @@ stdenv.mkDerivation { cat << EOF > user-config.jam using gcc : cross : $crossConfig-g++ ; EOF - ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${layout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install + ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.crossDrv}/include -sEXPAT_LIBPATH=${expat.crossDrv}/lib --layout=${layout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install ''; }; } diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix index d9dae7bfd41f..aa594a8e2bc1 100644 --- a/pkgs/development/libraries/cloog-ppl/default.nix +++ b/pkgs/development/libraries/cloog-ppl/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { configureFlags = "--with-ppl=${ppl}"; crossAttrs = { - configureFlags = "--with-ppl=${ppl.hostDrv}"; + configureFlags = "--with-ppl=${ppl.crossDrv}"; }; doCheck = true; diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 9947cf580a0d..5468c9f2336d 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (rec { crossAttrs = { buildInputs = stdenv.lib.optional (stdenv.gccCross.libc ? libiconv) - stdenv.gccCross.libc.libiconv.hostDrv; + stdenv.gccCross.libc.libiconv.crossDrv; # Gettext fails to guess the cross compiler configureFlags = "CXX=${stdenv.cross.config}-g++"; }; diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index e846b213ee0f..cb9367474173 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation ({ propagatedBuildInputs = [libogg libvorbis]; crossAttrs = { - propagatedBuildInputs = [libogg.hostDrv tremor.hostDrv]; + propagatedBuildInputs = [libogg.crossDrv tremor.crossDrv]; configureFlags = "--disable-examples"; }; } diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix index b9d2c10f5371..00d633c14ae8 100644 --- a/pkgs/development/tools/misc/cscope/default.nix +++ b/pkgs/development/tools/misc/cscope/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { crossAttrs = { postInstall = ""; - propagatedBuildInputs = [ ncurses.hostDrv ]; + propagatedBuildInputs = [ ncurses.crossDrv ]; }; meta = { diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 61b4647552d5..ae8993c80ca3 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { /* Having bzip2 will harm, because anything using elfutils as buildInput cross-building, will not be able to run 'bzip2' */ - propagatedBuildInputs = [ zlib.hostDrv ]; + propagatedBuildInputs = [ zlib.crossDrv ]; # This program does not cross-build fine. So I only cross-build some parts # I need for the linux perf tool. diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 08fde14eb53a..573a233f17c3 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -11,8 +11,8 @@ let basename = "gdb-7.5"; # Whether (cross-)building for GNU/Hurd. This is an approximation since - # having `stdenv ? cross' doesn't tell us if we're building `hostDrv' and - # `buildDrv'. + # having `stdenv ? cross' doesn't tell us if we're building `crossDrv' and + # `nativeDrv'. isGNU = stdenv.system == "i686-gnu" || (stdenv ? cross && stdenv.cross.config == "i586-pc-gnu"); @@ -51,8 +51,8 @@ stdenv.mkDerivation rec { crossAttrs = { # Do not add --with-python here to avoid cross building it. configureFlags = - '' --with-gmp=${gmp.hostDrv} --with-mpfr=${mpfr.hostDrv} --with-system-readline - --with-expat --with-libexpat-prefix=${expat.hostDrv} --without-python + '' --with-gmp=${gmp.crossDrv} --with-mpfr=${mpfr.crossDrv} --with-system-readline + --with-expat --with-libexpat-prefix=${expat.crossDrv} --without-python '' + stdenv.lib.optionalString (target != null) " --target=${target.config}"; }; diff --git a/pkgs/games/prboom/default.nix b/pkgs/games/prboom/default.nix index f66e2295a22c..95ad53cb1ae3 100644 --- a/pkgs/games/prboom/default.nix +++ b/pkgs/games/prboom/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { buildInputs = [ SDL SDL_mixer SDL_net mesa ]; crossAttrs = { - propagatedBuildInputs = [ SDL.hostDrv SDL_mixer.hostDrv SDL_net.hostDrv ]; + propagatedBuildInputs = [ SDL.crossDrv SDL_mixer.crossDrv SDL_net.crossDrv ]; configureFlags = "--disable-gl --disable-cpu-opt --without-x --disable-sdltest ac_cv_type_uid_t=yes ac_cv_type_gid_t=yes"; diff --git a/pkgs/lib/customisation.nix b/pkgs/lib/customisation.nix index 54965ffb5804..18cec3209f97 100644 --- a/pkgs/lib/customisation.nix +++ b/pkgs/lib/customisation.nix @@ -34,7 +34,7 @@ rec { overrideDerivation = drv: f: let # Filter out special attributes. - drop = [ "meta" "passthru" "outPath" "drvPath" "hostDrv" "buildDrv" "type" "override" "deepOverride" "origArgs" "drvAttrs" "outputName" "all" "out" ] + drop = [ "meta" "passthru" "outPath" "drvPath" "crossDrv" "nativeDrv" "type" "override" "deepOverride" "origArgs" "drvAttrs" "outputName" "all" "out" ] # also drop functions such as .merge .override etc ++ lib.filter (n: isFunction (getAttr n drv)) (attrNames drv); attrs = removeAttrs drv drop; @@ -44,10 +44,10 @@ rec { passthru = if drv ? passthru then drv.passthru else {}; } // - (if (drv ? hostDrv && drv ? buildDrv) + (if (drv ? crossDrv && drv ? nativeDrv) then { - hostDrv = overrideDerivation drv.hostDrv f; - buildDrv = overrideDerivation drv.buildDrv f; + crossDrv = overrideDerivation drv.crossDrv f; + nativeDrv = overrideDerivation drv.nativeDrv f; } else { }); diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix index 0a42b83a46f2..ee1ba558a07a 100644 --- a/pkgs/os-specific/gnu/default.nix +++ b/pkgs/os-specific/gnu/default.nix @@ -16,7 +16,7 @@ let inherit fetchgit stdenv autoconf libtool texinfo glibcCross hurdPartedCross; inherit (gnu) machHeaders mig; - libuuid = libuuid.hostDrv; + libuuid = libuuid.crossDrv; automake = automake111x; headersOnly = false; cross = assert crossSystem != null; crossSystem; @@ -85,7 +85,7 @@ let stdenv = (forceSystem "i686-linux").stdenv; }; - # XXX: Use this one for its `.hostDrv'. Using the one above from + # XXX: Use this one for its `.crossDrv'. Using the one above from # `x86_64-linux' leads to building a different cross-toolchain because of # the `forceSystem'. mig_raw = callPackage ./mig {}; diff --git a/pkgs/os-specific/gnu/mig/default.nix b/pkgs/os-specific/gnu/mig/default.nix index f7b798a76240..7db159837fed 100644 --- a/pkgs/os-specific/gnu/mig/default.nix +++ b/pkgs/os-specific/gnu/mig/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { postInstall = # Fix the shebang to point to the cross-built shell. '' sed -i "$out/bin/mig" \ - -e 's|^#!/.*|#!${bash.hostDrv}/bin/sh|g' + -e 's|^#!/.*|#!${bash.crossDrv}/bin/sh|g' ''; }; diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index a58430401c59..48c4679cb3cd 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -119,8 +119,8 @@ stdenv.mkDerivation { # The substitution of crossAttrs happens *after* the stdenv cross adapter sets # the parameters for the usual stdenv. Thus, we need to specify - # the ".hostDrv" in the buildInputs here. - buildInputs = lib.optional (cp.uboot != null) (ubootChooser cp.uboot).hostDrv; + # the ".crossDrv" in the buildInputs here. + buildInputs = lib.optional (cp.uboot != null) (ubootChooser cp.uboot).crossDrv; }; meta = { diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 01d989e75b10..85aa7456df5f 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -27,9 +27,9 @@ stdenv.mkDerivation { crossAttrs = { /* I don't want cross-python or cross-perl - I don't know if cross-python even works */ - propagatedBuildInputs = [ elfutils.hostDrv newt.hostDrv ]; + propagatedBuildInputs = [ elfutils.crossDrv newt.crossDrv ]; makeFlags = "CROSS_COMPILE=${stdenv.cross.config}-"; - elfutils = elfutils.hostDrv; + elfutils = elfutils.crossDrv; }; meta = { diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 8e38d368ec81..31317a939771 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { crossAttrs = { # Skip libxcrypt cross-building, as it fails for mips and arm - propagatedBuildInputs = [ flex.hostDrv cracklib.hostDrv ]; + propagatedBuildInputs = [ flex.crossDrv cracklib.crossDrv ]; preConfigure = preConfigure + '' - ar x ${flex.hostDrv}/lib/libfl.a + ar x ${flex.crossDrv}/lib/libfl.a mv libyywrap.o libyywrap-target.o ar x ${flex}/lib/libfl.a mv libyywrap.o libyywrap-host.o diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix index 2cdd63cc0ebb..ab549d0a0285 100644 --- a/pkgs/os-specific/windows/jom/default.nix +++ b/pkgs/os-specific/windows/jom/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { crossAttrs = { # cmakeFlags = "-DWIN32=1 -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_RC_COMPILER=${stdenv.cross.config}-windres"; - QTDIR = qt48.hostDrv; + QTDIR = qt48.crossDrv; preBuild = '' export NIX_CROSS_CFLAGS_COMPILE=-fpermissive ''; diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index fb0eed51d56d..1ee88a821166 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -133,8 +133,8 @@ rec { # In nixpkgs, sometimes 'null' gets in as a buildInputs element, # and we handle that through isAttrs. - getBuildDrv = drv : if (builtins.isAttrs drv && drv ? buildDrv) then drv.buildDrv else drv; - getHostDrv = drv : if (builtins.isAttrs drv && drv ? hostDrv) then drv.hostDrv else drv; + getBuildDrv = drv : if (builtins.isAttrs drv && drv ? nativeDrv) then drv.nativeDrv else drv; + getHostDrv = drv : if (builtins.isAttrs drv && drv ? crossDrv) then drv.crossDrv else drv; buildNativeInputsDrvs = map (getBuildDrv) buildNativeInputs; buildInputsDrvs = map (getHostDrv) buildInputs; buildInputsDrvsAsBuildInputs = map (getBuildDrv) buildInputs; @@ -145,27 +145,27 @@ rec { # The base stdenv already knows that buildNativeInputs and # buildInputs should be built with the usual gcc-wrapper # And the same for propagatedBuildInputs. - buildDrv = stdenv.mkDerivation args; + nativeDrv = stdenv.mkDerivation args; # Temporary expression until the cross_renaming, to handle the # case of pkgconfig given as buildInput, but to be used as # buildNativeInput. hostAsBuildDrv = drv: builtins.unsafeDiscardStringContext - drv.buildDrv.drvPath == builtins.unsafeDiscardStringContext - drv.hostDrv.drvPath; + drv.nativeDrv.drvPath == builtins.unsafeDiscardStringContext + drv.crossDrv.drvPath; buildInputsNotNull = stdenv.lib.filter - (drv: builtins.isAttrs drv && drv ? buildDrv) buildInputs; + (drv: builtins.isAttrs drv && drv ? nativeDrv) buildInputs; nativeInputsFromBuildInputs = stdenv.lib.filter (hostAsBuildDrv) buildInputsNotNull; - # We should overwrite the input attributes in hostDrv, to overwrite + # We should overwrite the input attributes in crossDrv, to overwrite # the defaults for only-native builds in the base stdenv - hostDrv = if (cross == null) then buildDrv else + crossDrv = if (cross == null) then nativeDrv else stdenv.mkDerivation (args // { name = name + "-" + cross.config; buildNativeInputs = buildNativeInputsDrvs ++ nativeInputsFromBuildInputs ++ [ gccCross binutilsCross ] ++ - stdenv.lib.optional selfBuildNativeInput buildDrv; + stdenv.lib.optional selfBuildNativeInput nativeDrv; # Cross-linking dynamic libraries, every buildInput should # be propagated because ld needs the -rpath-link to find @@ -178,8 +178,8 @@ rec { crossConfig = cross.config; } // (if args ? crossAttrs then args.crossAttrs else {})); - in buildDrv // { - inherit hostDrv buildDrv; + in nativeDrv // { + inherit crossDrv nativeDrv; }; } // { inherit cross gccCross binutilsCross; diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 16b05fc0b294..221254a36ed3 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -197,7 +197,7 @@ addToCrossEnv() { local pkg=$1 # Some programs put important build scripts (freetype-config and similar) - # into their hostDrv bin path. Intentionally these should go after + # into their crossDrv bin path. Intentionally these should go after # the nativePkgs in PATH. if [ -d $1/bin ]; then addToSearchPath _PATH $1/bin diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index f74463b10635..e72ab4f90ca9 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { inherit fontDirectories; patchPhase = '' - sed -i -e 's,$(includedir)/pixman-1,${if stdenv ? cross then pixman.hostDrv else pixman}/include/pixman-1,' unix/xserver/hw/vnc/Makefile.am - sed -i -e '/^$pidFile/a$ENV{XKB_BINDIR}="${if stdenv ? cross then xkbcomp.hostDrv else xkbcomp}/bin";' unix/vncserver - sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${if stdenv ? cross then xkeyboard_config.hostDrv else xkeyboard_config}/etc/X11/xkb";' unix/vncserver + sed -i -e 's,$(includedir)/pixman-1,${if stdenv ? cross then pixman.crossDrv else pixman}/include/pixman-1,' unix/xserver/hw/vnc/Makefile.am + sed -i -e '/^$pidFile/a$ENV{XKB_BINDIR}="${if stdenv ? cross then xkbcomp.crossDrv else xkbcomp}/bin";' unix/vncserver + sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${if stdenv ? cross then xkeyboard_config.crossDrv else xkeyboard_config}/etc/X11/xkb";' unix/vncserver fontPath= for i in $fontDirectories; do @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ''; crossAttrs = { - buildInputs = (map (x : x.hostDrv) (buildInputs ++ [ + buildInputs = (map (x : x.crossDrv) (buildInputs ++ [ fixesproto damageproto xcmiscproto bigreqsproto randrproto renderproto fontsproto videoproto compositeproto scrnsaverproto resourceproto libxkbfile libXfont libpciaccess xineramaproto diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 0fc04d567fd0..a533144dc1e3 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { crossAttrs = ({ buildInputs = [ gmp ] - ++ stdenv.lib.optional aclSupport acl.hostDrv - ++ stdenv.lib.optional selinuxSupport libselinux.hostDrv - ++ stdenv.lib.optional selinuxSupport libsepol.hostDrv + ++ stdenv.lib.optional aclSupport acl.crossDrv + ++ stdenv.lib.optional selinuxSupport libselinux.crossDrv + ++ stdenv.lib.optional selinuxSupport libsepol.crossDrv ++ stdenv.lib.optional (stdenv.gccCross.libc ? libiconv) - stdenv.gccCross.libc.libiconv.hostDrv; + stdenv.gccCross.libc.libiconv.crossDrv; # Needed for fstatfs() # I don't know why it is not properly detected cross building with glibc. diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 028b672380cf..1d08fc7228b2 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { # We should refer to the cross built openssl # For the 'urandom', maybe it should be a cross-system option configureFlags = '' - ${if sslSupport then "--with-ssl=${openssl.hostDrv}" else "--without-ssl"} + ${if sslSupport then "--with-ssl=${openssl.crossDrv}" else "--without-ssl"} ${if linkStatic then "--enable-static --disable-shared" else ""} --with-random /dev/urandom ''; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index e6f15b7a5e5d..ce8650e70f80 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { crossAttrs = { postUnpack = - '' export CPATH="${bzip2.hostDrv}/include" - export NIX_CROSS_LDFLAGS="-L${bzip2.hostDrv}/lib -rpath-link ${bzip2.hostDrv}/lib $NIX_CROSS_LDFLAGS" + '' export CPATH="${bzip2.crossDrv}/include" + export NIX_CROSS_LDFLAGS="-L${bzip2.crossDrv}/lib -rpath-link ${bzip2.crossDrv}/lib $NIX_CROSS_LDFLAGS" ''; configureFlags = diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 30e52da86389..89da0cb0e676 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { crossAttrs = { postUnpack = - '' export CPATH="${bzip2.hostDrv}/include" - export NIX_CROSS_LDFLAGS="-L${bzip2.hostDrv}/lib -rpath-link ${bzip2.hostDrv}/lib $NIX_CROSS_LDFLAGS" + '' export CPATH="${bzip2.crossDrv}/include" + export NIX_CROSS_LDFLAGS="-L${bzip2.crossDrv}/lib -rpath-link ${bzip2.crossDrv}/lib $NIX_CROSS_LDFLAGS" ''; configureFlags = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4001c63258c..8233b59e0b2d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -223,7 +223,7 @@ let defaultStdenv; forceBuildDrv = drv : if (crossSystem == null) then drv else - (drv // { hostDrv = drv.buildDrv; }); + (drv // { crossDrv = drv.nativeDrv; }); # A stdenv capable of building 32-bit binaries. On x86_64-linux, # it uses GCC compiled with multilib support; on i686-linux, it's @@ -1276,7 +1276,7 @@ let gettext = null; readline = null; devicemapper = null; - }).hostDrv) + }).crossDrv) { hurd = gnu.hurdCrossIntermediate; }) else null; @@ -2045,7 +2045,7 @@ let # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944 profiledCompiler = if stdenv.isArm then false else true; - # When building `gcc.hostDrv' (a "Canadian cross", with host == target + # When building `gcc.crossDrv' (a "Canadian cross", with host == target # and host != build), `cross' must be null but the cross-libc must still # be passed. cross = null; @@ -2074,7 +2074,7 @@ let # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944 profiledCompiler = if stdenv.isArm then false else true; - # When building `gcc.hostDrv' (a "Canadian cross", with host == target + # When building `gcc.crossDrv' (a "Canadian cross", with host == target # and host != build), `cross' must be null but the cross-libc must still # be passed. cross = null; @@ -2101,7 +2101,7 @@ let # We can enable it back some day. This makes the *gcc* builds faster now. profiledCompiler = false; - # When building `gcc.hostDrv' (a "Canadian cross", with host == target + # When building `gcc.crossDrv' (a "Canadian cross", with host == target # and host != build), `cross' must be null but the cross-libc must still # be passed. cross = null; @@ -3176,7 +3176,7 @@ let pmccabe = callPackage ../development/tools/misc/pmccabe { }; - /* Make pkgconfig always return a buildDrv, never a proper hostDrv, + /* Make pkgconfig always return a nativeDrv, never a proper crossDrv, because most usage of pkgconfig as buildInput (inheritance of pre-cross nixpkgs) means using it using as buildNativeInput cross_renaming: we should make all programs use pkgconfig as @@ -3634,7 +3634,7 @@ let machHeaders = null; hurdHeaders = null; gccCross = null; - }) // (if crossSystem != null then { hostDrv = glibc213Cross; } else {}); + }) // (if crossSystem != null then { crossDrv = glibc213Cross; } else {}); glibc213Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc/2.13) (let crossGNU = crossSystem != null && crossSystem.config == "i586-pc-gnu"; @@ -5583,7 +5583,7 @@ let libuuid = if crossSystem != null && crossSystem.config == "i586-pc-gnu" then (utillinux // { - hostDrv = lib.overrideDerivation utillinux.hostDrv (args: { + crossDrv = lib.overrideDerivation utillinux.crossDrv (args: { # `libblkid' fails to build on GNU/Hurd. configureFlags = args.configureFlags + " --disable-libblkid --disable-mount --disable-libmount" diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 63fffd7d3161..e8be588b7564 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -5,21 +5,21 @@ let /* Basic list of packages to cross-build */ basicHostDrv = { gccCrossStageFinal = nativePlatforms; - bison.hostDrv = nativePlatforms; - busybox.hostDrv = nativePlatforms; - coreutils.hostDrv = nativePlatforms; - dropbear.hostDrv = nativePlatforms; - tigervnc.hostDrv = nativePlatforms; - #openoffice.hostDrv = nativePlatforms; - wxGTK.hostDrv = nativePlatforms; + bison.crossDrv = nativePlatforms; + busybox.crossDrv = nativePlatforms; + coreutils.crossDrv = nativePlatforms; + dropbear.crossDrv = nativePlatforms; + tigervnc.crossDrv = nativePlatforms; + #openoffice.crossDrv = nativePlatforms; + wxGTK.crossDrv = nativePlatforms; #firefox = nativePlatforms; xorg = { - #xorgserver.hostDrv = nativePlatforms; + #xorgserver.crossDrv = nativePlatforms; }; - nixUnstable.hostDrv = nativePlatforms; - linuxPackages_3_3.kernel.hostDrv = linux; - linuxPackages_3_4.kernel.hostDrv = linux; - linuxPackages_3_6.kernel.hostDrv = linux; + nixUnstable.crossDrv = nativePlatforms; + linuxPackages_3_3.kernel.crossDrv = linux; + linuxPackages_3_4.kernel.crossDrv = linux; + linuxPackages_3_6.kernel.crossDrv = linux; }; /* Basic list of packages to be natively built, @@ -50,7 +50,7 @@ in { crossSheevaplugLinux = mapTestOnCross crossSystem ( basic // { - ubootSheevaplug.hostDrv = nativePlatforms; + ubootSheevaplug.crossDrv = nativePlatforms; }); }) // ( @@ -79,7 +79,7 @@ in { crossSheevaplugLinuxUclibc = mapTestOnCross crossSystem ( basic // { - ubootSheevaplug.hostDrv = nativePlatforms; + ubootSheevaplug.crossDrv = nativePlatforms; }); }) // ( @@ -153,14 +153,14 @@ let }; in { crossMingw32 = mapTestOnCross crossSystem { - coreutils.hostDrv = nativePlatforms; - boehmgc.hostDrv = nativePlatforms; - gmp.hostDrv = nativePlatforms; - guile_1_8.hostDrv = nativePlatforms; - libffi.hostDrv = nativePlatforms; - libtool.hostDrv = nativePlatforms; - libunistring.hostDrv = nativePlatforms; - windows.wxMSW.hostDrv = nativePlatforms; + coreutils.crossDrv = nativePlatforms; + boehmgc.crossDrv = nativePlatforms; + gmp.crossDrv = nativePlatforms; + guile_1_8.crossDrv = nativePlatforms; + libffi.crossDrv = nativePlatforms; + libtool.crossDrv = nativePlatforms; + libunistring.crossDrv = nativePlatforms; + windows.wxMSW.crossDrv = nativePlatforms; }; }) // ( @@ -176,14 +176,14 @@ let }; in { crossMingwW64 = mapTestOnCross crossSystem { - coreutils.hostDrv = nativePlatforms; - boehmgc.hostDrv = nativePlatforms; - gmp.hostDrv = nativePlatforms; - guile_1_8.hostDrv = nativePlatforms; - libffi.hostDrv = nativePlatforms; - libtool.hostDrv = nativePlatforms; - libunistring.hostDrv = nativePlatforms; - windows.wxMSW.hostDrv = nativePlatforms; + coreutils.crossDrv = nativePlatforms; + boehmgc.crossDrv = nativePlatforms; + gmp.crossDrv = nativePlatforms; + guile_1_8.crossDrv = nativePlatforms; + libffi.crossDrv = nativePlatforms; + libtool.crossDrv = nativePlatforms; + libunistring.crossDrv = nativePlatforms; + windows.wxMSW.crossDrv = nativePlatforms; }; }) // ( @@ -202,34 +202,34 @@ let in { crossGNU = mapTestOnCross crossSystem { gnu.hurdCross = nativePlatforms; - gnu.mach.hostDrv = nativePlatforms; + gnu.mach.crossDrv = nativePlatforms; gnu.mig = nativePlatforms; - gnu.smbfs.hostDrv = nativePlatforms; + gnu.smbfs.crossDrv = nativePlatforms; - coreutils.hostDrv = nativePlatforms; - ed.hostDrv = nativePlatforms; - grub2.hostDrv = nativePlatforms; - inetutils.hostDrv = nativePlatforms; - boehmgc.hostDrv = nativePlatforms; - findutils.hostDrv = nativePlatforms; - gcc.hostDrv = nativePlatforms; - gcc46.hostDrv = nativePlatforms; - gdb.hostDrv = nativePlatforms; - gmp.hostDrv = nativePlatforms; - gnugrep.hostDrv = nativePlatforms; - gnumake.hostDrv = nativePlatforms; - gnused.hostDrv = nativePlatforms; - guile_1_8.hostDrv = nativePlatforms; - guile.hostDrv = nativePlatforms; - libffi.hostDrv = nativePlatforms; - libtool.hostDrv = nativePlatforms; - libunistring.hostDrv = nativePlatforms; - lsh.hostDrv = nativePlatforms; - nixUnstable.hostDrv = nativePlatforms; - openssl.hostDrv = nativePlatforms; # dependency of Nix - patch.hostDrv = nativePlatforms; - samba_light.hostDrv = nativePlatforms; # needed for `runInGenericVM' - zile.hostDrv = nativePlatforms; + coreutils.crossDrv = nativePlatforms; + ed.crossDrv = nativePlatforms; + grub2.crossDrv = nativePlatforms; + inetutils.crossDrv = nativePlatforms; + boehmgc.crossDrv = nativePlatforms; + findutils.crossDrv = nativePlatforms; + gcc.crossDrv = nativePlatforms; + gcc46.crossDrv = nativePlatforms; + gdb.crossDrv = nativePlatforms; + gmp.crossDrv = nativePlatforms; + gnugrep.crossDrv = nativePlatforms; + gnumake.crossDrv = nativePlatforms; + gnused.crossDrv = nativePlatforms; + guile_1_8.crossDrv = nativePlatforms; + guile.crossDrv = nativePlatforms; + libffi.crossDrv = nativePlatforms; + libtool.crossDrv = nativePlatforms; + libunistring.crossDrv = nativePlatforms; + lsh.crossDrv = nativePlatforms; + nixUnstable.crossDrv = nativePlatforms; + openssl.crossDrv = nativePlatforms; # dependency of Nix + patch.crossDrv = nativePlatforms; + samba_light.crossDrv = nativePlatforms; # needed for `runInGenericVM' + zile.crossDrv = nativePlatforms; }; }) // ( @@ -261,13 +261,13 @@ let in { fuloongminipc = mapTestOnCross crossSystem { - coreutils.hostDrv = nativePlatforms; - ed.hostDrv = nativePlatforms; - grub2.hostDrv = nativePlatforms; - inetutils.hostDrv = nativePlatforms; - nixUnstable.hostDrv = nativePlatforms; - patch.hostDrv = nativePlatforms; - zile.hostDrv = nativePlatforms; + coreutils.crossDrv = nativePlatforms; + ed.crossDrv = nativePlatforms; + grub2.crossDrv = nativePlatforms; + inetutils.crossDrv = nativePlatforms; + nixUnstable.crossDrv = nativePlatforms; + patch.crossDrv = nativePlatforms; + zile.crossDrv = nativePlatforms; }; }) // ( @@ -321,20 +321,20 @@ let in { nanonote = mapTestOnCross crossSystem { - coreutils.hostDrv = nativePlatforms; - ed.hostDrv = nativePlatforms; - inetutils.hostDrv = nativePlatforms; - nixUnstable.hostDrv = nativePlatforms; - patch.hostDrv = nativePlatforms; - zile.hostDrv = nativePlatforms; - prboom.hostDrv = nativePlatforms; - vim.hostDrv = nativePlatforms; - lynx.hostDrv = nativePlatforms; - patchelf.hostDrv = nativePlatforms; - nix.hostDrv = nativePlatforms; - fossil.hostDrv = nativePlatforms; - binutils.hostDrv = nativePlatforms; - mpg123.hostDrv = nativePlatforms; - yacas.hostDrv = nativePlatforms; + coreutils.crossDrv = nativePlatforms; + ed.crossDrv = nativePlatforms; + inetutils.crossDrv = nativePlatforms; + nixUnstable.crossDrv = nativePlatforms; + patch.crossDrv = nativePlatforms; + zile.crossDrv = nativePlatforms; + prboom.crossDrv = nativePlatforms; + vim.crossDrv = nativePlatforms; + lynx.crossDrv = nativePlatforms; + patchelf.crossDrv = nativePlatforms; + nix.crossDrv = nativePlatforms; + fossil.crossDrv = nativePlatforms; + binutils.crossDrv = nativePlatforms; + mpg123.crossDrv = nativePlatforms; + yacas.crossDrv = nativePlatforms; }; }) diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index 4a5f7602d02d..3509cf7f31f0 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -65,7 +65,7 @@ rec { /* Similar to the testOn function, but with an additional 'crossSystem' * parameter for allPackages, defining the target platform for cross builds, - * and triggering the build of the host derivation (cross built - hostDrv). */ + * and triggering the build of the host derivation (cross built - crossDrv). */ mapTestOnCross = crossSystem: pkgs.lib.mapAttrsRecursiveCond (as: !(as ? type && as.type == "job")) (path: value: -- cgit 1.4.1 From ab3eeabfeddacf3e159e68ee1541a6281a1e9d1b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Dec 2012 19:20:09 +0100 Subject: Rename buildNativeInputs -> nativeBuildInputs Likewise for propagatedBuildNativeInputs, etc. "buildNativeInputs" sounds like an imperative rather than a noun phrase. --- pkgs/applications/audio/audacious/default.nix | 2 +- pkgs/applications/audio/id3v2/default.nix | 2 +- pkgs/applications/audio/yoshimi/default.nix | 2 +- pkgs/applications/audio/zynaddsubfx/default.nix | 2 +- .../editors/emacs-modes/org/default.nix | 2 +- pkgs/applications/editors/kdevelop/default.nix | 2 +- pkgs/applications/editors/kile/default.nix | 2 +- pkgs/applications/editors/vim/configurable.nix | 18 +++++++++--------- pkgs/applications/editors/vim/default.nix | 2 +- pkgs/applications/editors/zile/default.nix | 2 +- pkgs/applications/graphics/cinepaint/default.nix | 2 +- pkgs/applications/graphics/dia/default.nix | 2 +- pkgs/applications/graphics/digikam/default.nix | 2 +- pkgs/applications/graphics/djview/default.nix | 2 +- pkgs/applications/graphics/fbida/default.nix | 2 +- .../applications/graphics/gimp/plugins/default.nix | 18 +++++++++--------- .../graphics/graphicsmagick/default.nix | 2 +- pkgs/applications/graphics/hugin/default.nix | 2 +- .../applications/graphics/kipi-plugins/default.nix | 2 +- pkgs/applications/graphics/kuickshow/default.nix | 2 +- pkgs/applications/graphics/xara/default.nix | 2 +- pkgs/applications/graphics/xfig/default.nix | 2 +- pkgs/applications/graphics/xournal/default.nix | 2 +- pkgs/applications/misc/calibre/default.nix | 2 +- pkgs/applications/misc/googleearth/default.nix | 4 ++-- pkgs/applications/misc/gphoto2/default.nix | 2 +- pkgs/applications/misc/kde-wacomtablet/default.nix | 2 +- pkgs/applications/misc/nut/2.6.3.nix | 2 +- pkgs/applications/misc/qgis/default.nix | 2 +- pkgs/applications/misc/rsibreak/default.nix | 2 +- pkgs/applications/misc/taskwarrior/default.nix | 2 +- pkgs/applications/misc/yakuake/default.nix | 2 +- .../networking/browsers/links2/default.nix | 2 +- .../networking/browsers/lynx/default.nix | 2 +- .../networking/browsers/rekonq/default.nix | 2 +- .../instant-messengers/linphone/default.nix | 2 +- .../instant-messengers/skype/default.nix | 2 +- .../telepathy/gabble/default.nix | 2 +- .../instant-messengers/telepathy/haze/default.nix | 2 +- .../instant-messengers/telepathy/kde/default.nix | 4 ++-- .../telepathy/logger/default.nix | 2 +- .../telepathy/mission-control/default.nix | 2 +- .../instant-messengers/telepathy/rakia/default.nix | 2 +- .../instant-messengers/telepathy/salut/default.nix | 2 +- .../applications/networking/sync/rsync/default.nix | 2 +- pkgs/applications/office/basket/default.nix | 2 +- pkgs/applications/office/calligra/default.nix | 2 +- pkgs/applications/office/kmymoney/default.nix | 2 +- pkgs/applications/office/skrooge/default.nix | 2 +- .../science/chemistry/avogadro/default.nix | 2 +- pkgs/applications/science/math/ginac/default.nix | 2 +- pkgs/applications/science/math/yacas/default.nix | 2 +- pkgs/applications/science/misc/tulip/default.nix | 2 +- .../version-management/fossil/default.nix | 2 +- .../version-management/kdesvn/default.nix | 2 +- pkgs/applications/video/MPlayer/default.nix | 2 +- pkgs/applications/video/bangarang/default.nix | 2 +- pkgs/applications/video/dvdauthor/default.nix | 2 +- pkgs/applications/video/gpac/default.nix | 2 +- pkgs/applications/video/mythtv/default.nix | 2 +- pkgs/applications/video/vlc/default.nix | 2 +- pkgs/applications/video/xine-ui/default.nix | 2 +- .../virtualization/virt-manager/default.nix | 2 +- pkgs/build-support/cabal/default.nix | 6 +++--- pkgs/build-support/fetchmtn/default.nix | 2 +- pkgs/build-support/kernel/make-initrd.nix | 4 ++-- pkgs/build-support/setup-hooks/autoreconf.sh | 2 +- pkgs/build-support/trivial-builders.nix | 2 +- .../data/documentation/gnome-user-docs/default.nix | 2 +- .../misc/gsettings-desktop-schemas/default.nix | 2 +- pkgs/data/misc/xkeyboard-config/default.nix | 2 +- .../gnome-2/desktop/gnome-icon-theme/default.nix | 2 +- .../gnome-2/desktop/gnome-keyring/default.nix | 2 +- .../gnome-2/desktop/gnome-panel/default.nix | 2 +- .../gnome-2/desktop/gnome-session/default.nix | 2 +- .../desktop/gnome-settings-daemon/default.nix | 2 +- pkgs/desktops/gnome-2/desktop/gvfs/default.nix | 2 +- pkgs/desktops/gnome-2/desktop/zenity/default.nix | 2 +- pkgs/desktops/gnome-2/platform/GConf/default.nix | 2 +- pkgs/desktops/gnome-2/platform/ORBit2/default.nix | 2 +- pkgs/desktops/gnome-2/platform/gconfmm/default.nix | 2 +- .../gnome-2/platform/gtkglextmm/default.nix | 2 +- pkgs/desktops/gnome-2/platform/libIDL/default.nix | 2 +- .../gnome-2/platform/libbonobo/default.nix | 2 +- .../gnome-2/platform/libbonoboui/default.nix | 2 +- .../desktops/gnome-2/platform/libgnome/default.nix | 2 +- .../gnome-2/platform/libgnomecanvas/default.nix | 2 +- .../gnome-2/platform/libgnomeui/default.nix | 2 +- .../gnome-2/platform/libunique/default.nix | 2 +- pkgs/desktops/kde-4.7/kde-wallpapers.nix | 2 +- pkgs/desktops/kde-4.7/kde-workspace.nix | 2 +- pkgs/desktops/kde-4.7/kdeartwork/kscreensaver.nix | 2 +- pkgs/desktops/kde-4.7/kdebindings/smokegen.nix | 2 +- pkgs/desktops/kde-4.7/kdebindings/smokeqt.nix | 4 ++-- pkgs/desktops/kde-4.7/kdegames.nix | 2 +- pkgs/desktops/kde-4.7/kdegraphics/gwenview.nix | 2 +- pkgs/desktops/kde-4.7/kdelibs.nix | 2 +- pkgs/desktops/kde-4.7/kdenetwork/kopete.nix | 2 +- pkgs/desktops/kde-4.7/kdeplasma-addons.nix | 2 +- pkgs/desktops/kde-4.7/oxygen-icons.nix | 2 +- pkgs/desktops/kde-4.7/support/akonadi/default.nix | 2 +- pkgs/desktops/kde-4.8/kde-runtime.nix | 2 +- pkgs/desktops/kde-4.8/kde-wallpapers.nix | 2 +- pkgs/desktops/kde-4.8/kde-workspace.nix | 2 +- pkgs/desktops/kde-4.8/kdeartwork/kscreensaver.nix | 2 +- pkgs/desktops/kde-4.8/kdebindings/perlqt.nix | 2 +- pkgs/desktops/kde-4.8/kdebindings/qtruby.nix | 2 +- pkgs/desktops/kde-4.8/kdebindings/smokegen.nix | 2 +- pkgs/desktops/kde-4.8/kdebindings/smokekde.nix | 2 +- pkgs/desktops/kde-4.8/kdebindings/smokeqt.nix | 4 ++-- pkgs/desktops/kde-4.8/kdegames.nix | 2 +- pkgs/desktops/kde-4.8/kdegraphics/gwenview.nix | 2 +- pkgs/desktops/kde-4.8/kdelibs.nix | 2 +- pkgs/desktops/kde-4.8/kdenetwork/kopete.nix | 2 +- pkgs/desktops/kde-4.8/kdeplasma-addons.nix | 2 +- pkgs/desktops/kde-4.8/oxygen-icons.nix | 2 +- pkgs/desktops/kde-4.8/support/akonadi/default.nix | 2 +- pkgs/development/compilers/gcc/4.4/default.nix | 2 +- pkgs/development/compilers/gcc/4.5/default.nix | 2 +- pkgs/development/compilers/gcc/4.6/default.nix | 2 +- pkgs/development/compilers/gcc/4.7/default.nix | 2 +- pkgs/development/compilers/mit-scheme/default.nix | 2 +- pkgs/development/compilers/tinycc/default.nix | 2 +- pkgs/development/compilers/vala/15.2.nix | 2 +- pkgs/development/compilers/vala/16.1.nix | 2 +- pkgs/development/compilers/vala/default.nix | 2 +- pkgs/development/interpreters/guile/1.8.nix | 4 ++-- pkgs/development/interpreters/guile/default.nix | 4 ++-- pkgs/development/libraries/GConf/3.x.nix | 2 +- pkgs/development/libraries/acl/default.nix | 2 +- pkgs/development/libraries/aqbanking/default.nix | 2 +- pkgs/development/libraries/arts/default.nix | 2 +- pkgs/development/libraries/asc-support/default.nix | 2 +- pkgs/development/libraries/asf-support/default.nix | 2 +- pkgs/development/libraries/atk/2.6.x.nix | 2 +- pkgs/development/libraries/atkmm/2.22.x.nix | 2 +- pkgs/development/libraries/attica/default.nix | 2 +- pkgs/development/libraries/attr/default.nix | 2 +- pkgs/development/libraries/avahi/default.nix | 2 +- pkgs/development/libraries/boolstuff/default.nix | 2 +- pkgs/development/libraries/c-library/default.nix | 2 +- pkgs/development/libraries/caelum/default.nix | 2 +- pkgs/development/libraries/clucene-core/2.x.nix | 2 +- pkgs/development/libraries/clutter-gtk/0.10.8.nix | 2 +- pkgs/development/libraries/clutter-gtk/default.nix | 2 +- pkgs/development/libraries/clutter/default.nix | 2 +- pkgs/development/libraries/cogl/default.nix | 2 +- .../libraries/config-support/default.nix | 2 +- pkgs/development/libraries/dbus-glib/default.nix | 2 +- pkgs/development/libraries/dbus/default.nix | 4 ++-- pkgs/development/libraries/directfb/default.nix | 2 +- pkgs/development/libraries/eigen/default.nix | 2 +- .../libraries/error-support/default.nix | 2 +- pkgs/development/libraries/farsight2/default.nix | 2 +- pkgs/development/libraries/farstream/default.nix | 2 +- pkgs/development/libraries/fltk/fltk13.nix | 2 +- pkgs/development/libraries/funambol/default.nix | 2 +- pkgs/development/libraries/gamin/default.nix | 2 +- pkgs/development/libraries/gdk-pixbuf/2.26.x.nix | 2 +- pkgs/development/libraries/gegl/default.nix | 2 +- .../libraries/glib-networking/default.nix | 2 +- pkgs/development/libraries/glib/2.34.x.nix | 2 +- pkgs/development/libraries/glibmm/2.30.x.nix | 2 +- pkgs/development/libraries/gmp/4.3.2.nix | 2 +- pkgs/development/libraries/gmp/5.0.5.nix | 2 +- pkgs/development/libraries/gnutls/default.nix | 2 +- pkgs/development/libraries/gpgme/default.nix | 2 +- .../libraries/gstreamer/qt-gstreamer/default.nix | 2 +- pkgs/development/libraries/gtk+/2.24.x.nix | 2 +- pkgs/development/libraries/gtk+/3.2.x.nix | 2 +- pkgs/development/libraries/gtkmm/2.24.x.nix | 2 +- pkgs/development/libraries/gtkmm/3.2.x.nix | 2 +- pkgs/development/libraries/gupnp-igd/default.nix | 2 +- pkgs/development/libraries/gupnp/default.nix | 2 +- pkgs/development/libraries/gwenhywfar/default.nix | 2 +- .../development/libraries/haskell/cuda/default.nix | 2 +- pkgs/development/libraries/hspell/dicts.nix | 2 +- pkgs/development/libraries/hwloc/default.nix | 2 +- pkgs/development/libraries/ilbc/default.nix | 2 +- pkgs/development/libraries/imlib2/default.nix | 2 +- pkgs/development/libraries/itk/default.nix | 2 +- pkgs/development/libraries/jasper/default.nix | 2 +- pkgs/development/libraries/json-glib/default.nix | 2 +- .../development/libraries/kdevplatform/default.nix | 2 +- pkgs/development/libraries/libbluray/default.nix | 2 +- pkgs/development/libraries/libcdr/default.nix | 2 +- pkgs/development/libraries/libchop/default.nix | 2 +- .../libraries/libdbusmenu-qt/default.nix | 2 +- pkgs/development/libraries/libdevil/default.nix | 2 +- pkgs/development/libraries/libdiscid/default.nix | 2 +- pkgs/development/libraries/libdmtx/default.nix | 2 +- pkgs/development/libraries/libdrm/default.nix | 2 +- .../development/libraries/libgnome-keyring/3.x.nix | 2 +- .../libraries/libgnome-keyring/default.nix | 2 +- pkgs/development/libraries/libgphoto2/default.nix | 2 +- pkgs/development/libraries/libgpod/default.nix | 2 +- pkgs/development/libraries/libgsf/default.nix | 2 +- pkgs/development/libraries/libgtop/default.nix | 2 +- pkgs/development/libraries/libgweather/default.nix | 2 +- pkgs/development/libraries/libharu/default.nix | 2 +- pkgs/development/libraries/libical/default.nix | 2 +- .../libraries/libimobiledevice/default.nix | 2 +- pkgs/development/libraries/libktorrent/default.nix | 2 +- pkgs/development/libraries/liblastfm/default.nix | 2 +- pkgs/development/libraries/libmad/default.nix | 2 +- pkgs/development/libraries/libmms/default.nix | 2 +- pkgs/development/libraries/libmng/default.nix | 2 +- pkgs/development/libraries/libogg/default.nix | 2 +- pkgs/development/libraries/libpcap/default.nix | 2 +- pkgs/development/libraries/libplist/default.nix | 2 +- pkgs/development/libraries/libpng/12.nix | 2 +- pkgs/development/libraries/librdf/rasqal.nix | 2 +- pkgs/development/libraries/librdf/redland.nix | 2 +- pkgs/development/libraries/librsvg/default.nix | 2 +- pkgs/development/libraries/libsoup/default.nix | 2 +- pkgs/development/libraries/libssh/default.nix | 2 +- pkgs/development/libraries/libvisio/default.nix | 2 +- pkgs/development/libraries/libvorbis/default.nix | 2 +- pkgs/development/libraries/libwpd/0.8.nix | 2 +- pkgs/development/libraries/libwpd/default.nix | 2 +- pkgs/development/libraries/libwpg/default.nix | 2 +- pkgs/development/libraries/libxklavier/default.nix | 2 +- .../libraries/mediastreamer/default.nix | 2 +- pkgs/development/libraries/mesa/default.nix | 2 +- pkgs/development/libraries/mythes/default.nix | 2 +- pkgs/development/libraries/ncurses/default.nix | 2 +- pkgs/development/libraries/ntrack/default.nix | 2 +- pkgs/development/libraries/ogrepaged/default.nix | 2 +- pkgs/development/libraries/openbabel/default.nix | 2 +- pkgs/development/libraries/opencv/default.nix | 2 +- pkgs/development/libraries/openssl/default.nix | 2 +- pkgs/development/libraries/pango/1.30.x.nix | 2 +- pkgs/development/libraries/pangomm/2.28.x.nix | 2 +- pkgs/development/libraries/pgen/default.nix | 2 +- .../libraries/phonon-backend-gstreamer/default.nix | 2 +- .../libraries/phonon-backend-vlc/default.nix | 2 +- pkgs/development/libraries/phonon/default.nix | 2 +- pkgs/development/libraries/physfs/default.nix | 2 +- pkgs/development/libraries/podofo/default.nix | 2 +- pkgs/development/libraries/polkit-qt-1/default.nix | 2 +- pkgs/development/libraries/poppler/default.nix | 2 +- pkgs/development/libraries/ppl/default.nix | 2 +- pkgs/development/libraries/prison/default.nix | 2 +- pkgs/development/libraries/pt-support/default.nix | 2 +- .../libraries/ptable-support/default.nix | 2 +- pkgs/development/libraries/qca2/default.nix | 2 +- pkgs/development/libraries/qca2/ossl.nix | 2 +- pkgs/development/libraries/qhull/default.nix | 2 +- pkgs/development/libraries/qt-3/default.nix | 2 +- pkgs/development/libraries/qt-4.x/4.8/default.nix | 2 +- .../libraries/rstore-support/default.nix | 2 +- .../libraries/science/math/liblapack/default.nix | 2 +- pkgs/development/libraries/sdf-support/default.nix | 2 +- pkgs/development/libraries/sglr/default.nix | 2 +- pkgs/development/libraries/sofia-sip/default.nix | 2 +- pkgs/development/libraries/soprano/default.nix | 2 +- pkgs/development/libraries/soqt/default.nix | 2 +- pkgs/development/libraries/spice/default.nix | 2 +- pkgs/development/libraries/sqlite/full.nix | 2 +- pkgs/development/libraries/strigi/default.nix | 2 +- .../libraries/taglib-extras/default.nix | 2 +- pkgs/development/libraries/taglib/default.nix | 2 +- .../libraries/telepathy/farstream/default.nix | 2 +- .../development/libraries/telepathy/qt/default.nix | 2 +- .../development/libraries/tide-support/default.nix | 2 +- .../development/libraries/tokyo-tyrant/default.nix | 2 +- pkgs/development/libraries/toolbuslib/default.nix | 2 +- pkgs/development/libraries/tremor/default.nix | 2 +- pkgs/development/libraries/v8/default.nix | 2 +- pkgs/development/libraries/vcdimager/default.nix | 2 +- pkgs/development/libraries/wxGTK-2.8/default.nix | 2 +- pkgs/development/libraries/wxGTK-2.9/default.nix | 2 +- pkgs/development/libraries/xine-lib/default.nix | 2 +- pkgs/development/perl-modules/generic/builder.sh | 4 ++-- .../development/python-modules/generic/default.nix | 2 +- pkgs/development/python-modules/generic/wrap.sh | 2 +- .../tools/analysis/valgrind/default.nix | 2 +- .../documentation/gnome-doc-utils/default.nix | 2 +- pkgs/development/tools/misc/cscope/default.nix | 2 +- pkgs/development/tools/misc/elfutils/default.nix | 2 +- pkgs/development/tools/misc/gdb/default.nix | 2 +- pkgs/development/tools/misc/libtool/libtool2.nix | 2 +- pkgs/development/tools/misc/strace/default.nix | 2 +- pkgs/development/tools/misc/texinfo/default.nix | 2 +- pkgs/development/tools/misc/xxdiff/default.nix | 2 +- pkgs/development/tools/parsing/bison/default.nix | 2 +- .../development/tools/parsing/flex/flex-2.5.35.nix | 2 +- pkgs/development/web/nodejs/build-node-package.nix | 2 +- pkgs/games/andyetitmoves/default.nix | 2 +- pkgs/games/freeciv/default.nix | 2 +- pkgs/games/naev/default.nix | 2 +- pkgs/games/scorched3d/default.nix | 2 +- pkgs/games/torcs/default.nix | 2 +- pkgs/lib/misc.nix | 4 ++-- pkgs/misc/my-env/default.nix | 6 +++--- pkgs/misc/uboot/default.nix | 2 +- pkgs/misc/uboot/guruplug.nix | 2 +- pkgs/misc/uboot/sheevaplug.nix | 2 +- pkgs/os-specific/gnu/libpthread/default.nix | 2 +- pkgs/os-specific/gnu/mach/default.nix | 2 +- pkgs/os-specific/gnu/mig/default.nix | 2 +- pkgs/os-specific/gnu/unionfs/default.nix | 2 +- pkgs/os-specific/linux/alsa-utils/default.nix | 2 +- pkgs/os-specific/linux/iproute/default.nix | 2 +- pkgs/os-specific/linux/kernel/generic.nix | 2 +- pkgs/os-specific/linux/kernel/manual-config.nix | 2 +- pkgs/os-specific/linux/kernel/perf.nix | 2 +- pkgs/os-specific/linux/klibc/default.nix | 2 +- pkgs/os-specific/linux/libcap/default.nix | 2 +- pkgs/os-specific/linux/libcgroup/default.nix | 2 +- pkgs/os-specific/linux/mdadm/default.nix | 2 +- pkgs/os-specific/linux/pam/default.nix | 2 +- pkgs/os-specific/linux/udisks/default.nix | 2 +- pkgs/os-specific/linux/upower/default.nix | 2 +- pkgs/os-specific/linux/wpa_supplicant/default.nix | 2 +- pkgs/os-specific/linux/wpa_supplicant/gui.nix | 2 +- pkgs/os-specific/windows/jom/default.nix | 2 +- pkgs/os-specific/windows/w32api/default.nix | 2 +- pkgs/servers/gpm/default.nix | 2 +- pkgs/servers/gpsd/default.nix | 2 +- pkgs/servers/nosql/mongodb/default.nix | 2 +- pkgs/servers/prayer/default.nix | 2 +- pkgs/servers/unfs3/default.nix | 2 +- pkgs/servers/x11/xorg/builder.sh | 4 ++-- pkgs/servers/x11/xorg/overrides.nix | 8 ++++---- pkgs/shells/bash/default.nix | 2 +- pkgs/stdenv/adapters.nix | 22 +++++++++++----------- pkgs/stdenv/generic/default.nix | 8 ++++---- pkgs/stdenv/generic/setup.sh | 8 ++++---- pkgs/tools/X11/xpra/default.nix | 2 +- pkgs/tools/admin/tigervnc/default.nix | 6 +++--- pkgs/tools/backup/bup/default.nix | 2 +- pkgs/tools/bluetooth/obexd/default.nix | 2 +- pkgs/tools/filesystems/ntfs-3g/default.nix | 2 +- pkgs/tools/graphics/enblend-enfuse/default.nix | 2 +- pkgs/tools/graphics/pfstools/default.nix | 2 +- pkgs/tools/graphics/qrencode/default.nix | 2 +- pkgs/tools/misc/coreutils/default.nix | 2 +- pkgs/tools/misc/findutils/default.nix | 2 +- pkgs/tools/misc/grub/2.0x.nix | 2 +- pkgs/tools/misc/ttf2pt1/default.nix | 2 +- pkgs/tools/misc/usbmuxd/default.nix | 2 +- pkgs/tools/misc/xburst-tools/default.nix | 2 +- pkgs/tools/networking/modemmanager/default.nix | 2 +- .../networking/network-manager-applet/default.nix | 2 +- pkgs/tools/networking/network-manager/default.nix | 2 +- pkgs/tools/networking/network-manager/pptp.nix | 2 +- .../tools/networking/networkmanagement/default.nix | 2 +- pkgs/tools/networking/ntop/default.nix | 2 +- pkgs/tools/networking/pptp/default.nix | 2 +- pkgs/tools/networking/surfraw/default.nix | 2 +- pkgs/tools/networking/wget/default.nix | 2 +- pkgs/tools/package-management/nix/default.nix | 2 +- pkgs/tools/package-management/nix/unstable.nix | 2 +- pkgs/tools/security/ccrypt/default.nix | 2 +- pkgs/tools/security/pcsclite/default.nix | 2 +- pkgs/tools/security/pinentry/default.nix | 2 +- pkgs/tools/security/polkit-gnome/default.nix | 2 +- pkgs/tools/security/polkit-kde-agent/default.nix | 2 +- pkgs/tools/text/diffutils/default.nix | 2 +- pkgs/tools/text/groff/default.nix | 2 +- pkgs/tools/text/kdiff3/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 ++-- 363 files changed, 416 insertions(+), 416 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 9bd793613c11..9ac62f585703 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { # Then build the plugins. ( - buildNativeInputs="$out $buildNativeInputs" # to find audacious + nativeBuildInputs="$out $nativeBuildInputs" # to find audacious source $stdenv/setup rm -rfv audacious-* src=$pluginsSrc diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/applications/audio/id3v2/default.nix index 8e7f573cc849..8a025ac68430 100644 --- a/pkgs/applications/audio/id3v2/default.nix +++ b/pkgs/applications/audio/id3v2/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { patches = [ ./id3v2-0.1.11-track-bad-free.patch ]; - buildNativeInputs = [ groff ]; + nativeBuildInputs = [ groff ]; buildInputs = [ id3lib ]; configurePhase = '' diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 082f5dd9ab9e..bce7e0ef5ee0 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib boost fftwSinglePrec fltk jackaudio libsndfile mesa minixml zlib ]; - buildNativeInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; preConfigure = "cd src"; diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index 08f0f48011c0..fcec85b7fe57 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ alsaLib fftw fltk13 minixml zlib ]; - buildNativeInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; patches = [ (fetchurl { diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix index d3829bc9d115..e045b83a74de 100644 --- a/pkgs/applications/editors/emacs-modes/org/default.nix +++ b/pkgs/applications/editors/emacs-modes/org/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ emacs ]; - buildNativeInputs = [ texinfo texLive ]; + nativeBuildInputs = [ texinfo texLive ]; configurePhase = '' sed -i mk/default.mk \ diff --git a/pkgs/applications/editors/kdevelop/default.nix b/pkgs/applications/editors/kdevelop/default.nix index 249ede5ebd0e..14f9c1eb0d49 100644 --- a/pkgs/applications/editors/kdevelop/default.nix +++ b/pkgs/applications/editors/kdevelop/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ kdevplatform kdebase_workspace okteta ]; - buildNativeInputs = [ cmake pkgconfig automoc4 shared_mime_info gettext perl ]; + nativeBuildInputs = [ cmake pkgconfig automoc4 shared_mime_info gettext perl ]; patches = [ ( fetchurl { diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix index a24c6b18d8c8..6b14b40a2c9f 100644 --- a/pkgs/applications/editors/kile/default.nix +++ b/pkgs/applications/editors/kile/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0nx5fmjrxrndnzvknxnybd8qh15jzfxzbny2rljq3amjw02y9lc2"; }; - buildNativeInputs = [ cmake gettext ]; + nativeBuildInputs = [ cmake gettext ]; buildInputs = [ kdelibs ]; # for KDE 4.7 the nl translations fail since kile-2.1.2 diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 9e6b700f9efa..fb006afb7c2a 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -13,7 +13,7 @@ composableDerivation {} { configureFlags = ["--enable-gui=auto" "--with-features=${args.features}"]; - buildNativeInputs = [ncurses pkgconfig] + nativeBuildInputs = [ncurses pkgconfig] ++ [ gtk libX11 libXext libSM libXpm libXt libXaw libXau libXmu glib libICE ]; @@ -27,11 +27,11 @@ composableDerivation {} { // edf { name = "xsmp"; } #Disable XSMP session management // edf { name = "xsmp_interact"; } #Disable XSMP interaction // edf { name = "mzscheme"; } #Include MzScheme interpreter. - // edf { name = "perl"; feat = "perlinterp"; enable = { buildNativeInputs = [perl]; };} #Include Perl interpreter. - // edf { name = "python"; feat = "pythoninterp"; enable = { buildNativeInputs = [python]; }; } #Include Python interpreter. - // edf { name = "tcl"; enable = { buildNativeInputs = [tcl]; }; } #Include Tcl interpreter. - // edf { name = "ruby"; feat = "rubyinterp"; enable = { buildNativeInputs = [ruby]; };} #Include Ruby interpreter. - // edf { name = "lua" ; feat = "luainterp"; enable = { buildNativeInputs = [lua]; configureFlags = ["--with-lua-prefix=${args.lua}"];};} + // edf { name = "perl"; feat = "perlinterp"; enable = { nativeBuildInputs = [perl]; };} #Include Perl interpreter. + // edf { name = "python"; feat = "pythoninterp"; enable = { nativeBuildInputs = [python]; }; } #Include Python interpreter. + // edf { name = "tcl"; enable = { nativeBuildInputs = [tcl]; }; } #Include Tcl interpreter. + // edf { name = "ruby"; feat = "rubyinterp"; enable = { nativeBuildInputs = [ruby]; };} #Include Ruby interpreter. + // edf { name = "lua" ; feat = "luainterp"; enable = { nativeBuildInputs = [lua]; configureFlags = ["--with-lua-prefix=${args.lua}"];};} // edf { name = "cscope"; } #Include cscope interface. // edf { name = "workshop"; } #Include Sun Visual Workshop support. // edf { name = "netbeans"; } #Disable NetBeans integration support. @@ -42,7 +42,7 @@ composableDerivation {} { // edf { name = "fontset"; } #Include X fontset output support. // edf { name = "acl"; } #Don't check for ACL support. // edf { name = "gpm"; } #Don't use gpm (Linux mouse daemon). - // edf { name = "nls"; enable = {buildNativeInputs = [gettext];}; } #Don't support NLS (gettext()). + // edf { name = "nls"; enable = {nativeBuildInputs = [gettext];}; } #Don't support NLS (gettext()). ; cfg = { @@ -70,11 +70,11 @@ composableDerivation {} { postInstall = " rpath=`patchelf --print-rpath \$out/bin/vim`; - for i in $\buildNativeInputs; do + for i in $\nativeBuildInputs; do echo adding \$i/lib rpath=\$rpath:\$i/lib done - echo \$buildNativeInputs + echo \$nativeBuildInputs echo \$rpath patchelf --set-rpath \$rpath \$out/bin/{vim,gvim} "; diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index dec933271678..ff8da0e09473 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ncurses pkgconfig ]; - buildNativeInputs = [ gettext ]; + nativeBuildInputs = [ gettext ]; configureFlags = [ "--enable-multibyte" diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index a64561b10996..3880df48da1d 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ncurses boehmgc ]; - buildNativeInputs = [ help2man perl ]; + nativeBuildInputs = [ help2man perl ]; # Tests can't be run because most of them rely on the ability to # fiddle with the terminal. diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix index bea04f6dc2c3..7b1a7f26239f 100644 --- a/pkgs/applications/graphics/cinepaint/default.nix +++ b/pkgs/applications/graphics/cinepaint/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patches = [ ./install.patch ]; - buildNativeInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; NIX_LDFLAGS = "-llcms -ljpeg"; diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index 769acd2a3b6f..ab421cee158a 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { libxslt docbook_xsl libart_lgpl ] ++ stdenv.lib.optional withGNOME libgnomeui; - buildNativeInputs = [ pkgconfig intltool perl ]; + nativeBuildInputs = [ pkgconfig intltool perl ]; configureFlags = stdenv.lib.optionalString withGNOME "--enable-gnome"; diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index a293311e2a43..e64889ff52f0 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1prnaywnbv0xpw6knqagzc4gn1vsj9kw2hvdasjwknc9ljiyl721"; }; - buildNativeInputs = [ cmake automoc4 pkgconfig ]; + nativeBuildInputs = [ cmake automoc4 pkgconfig ]; buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index 0ac499f2681a..f832513a8241 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { buildInputs = [djvulibre qt4]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; patches = [ ./djview4-qt-4.8.patch ]; diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index 2685aad8cf75..927ca2ab6797 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1riia87v5nsx858xnlvc7sspr1p36adjqrdch1255ikr5xbv6h6x"; }; - buildNativeInputs = [ pkgconfig which ]; + nativeBuildInputs = [ pkgconfig which ]; buildInputs = [ libexif libjpeg libpng libungif freetype fontconfig libtiff libwebp imagemagick curl saneBackends diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 70a27030969b..962cb387c736 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -36,7 +36,7 @@ let libLQR = pluginDerivation { name = "liblqr-1-0.4.1"; # required by lqrPlugin, you don't havet to install this lib explicitely - buildInputs = [ gimp ] ++ gimp.buildNativeInputs; + buildInputs = [ gimp ] ++ gimp.nativeBuildInputs; src = fetchurl { url = http://registry.gimp.org/files/liblqr-1-0.4.1.tar.bz2; sha256 = "02g90wag7xi5rjlmwq8h0qs666b1i2sa90s4303hmym40il33nlz"; @@ -50,7 +50,7 @@ rec { Video */ name = "gap-2.6.0"; - buildInputs = [ gimp pkgconfig glib pkgs.intltool gimp.gtk ] ++ gimp.buildNativeInputs; + buildInputs = [ gimp pkgconfig glib pkgs.intltool gimp.gtk ] ++ gimp.nativeBuildInputs; src = fetchurl { url = ftp://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2; sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql"; @@ -74,7 +74,7 @@ rec { Filters/Generic/FFT Inverse */ name = "fourier-0.3.3"; - buildInputs = [ gimp pkgs.fftwSinglePrec pkgconfig glib] ++ gimp.buildNativeInputs; + buildInputs = [ gimp pkgs.fftwSinglePrec pkgconfig glib] ++ gimp.nativeBuildInputs; postInstall = "fail"; installPhase = "installPlugins fourier"; src = fetchurl { @@ -91,7 +91,7 @@ rec { Filters/Enhance/Smart remove selection */ name = "resynthesizer-0.16"; - buildInputs = [ gimp pkgs.fftw ] ++ gimp.buildNativeInputs; + buildInputs = [ gimp pkgs.fftw ] ++ gimp.nativeBuildInputs; src = fetchurl { url = http://www.logarithmic.net/pfh-files/resynthesizer/resynthesizer-0.16.tar.gz; sha256 = "1k90a1jzswxmajn56rdxa4r60v9v34fmqsiwfdxqcvx3yf4yq96x"; @@ -105,7 +105,7 @@ rec { texturize = pluginDerivation { name = "texturize-2.1"; - buildInputs = [ gimp ] ++ gimp.buildNativeInputs; + buildInputs = [ gimp ] ++ gimp.nativeBuildInputs; src = fetchurl { url = http://prdownloads.sourceforge.net/gimp-texturize/texturize-2.1_src.tgz; sha256 = "0cdjq25g3yfxx6bzx6nid21kq659s1vl9id4wxyjs2dhcv229cg3"; @@ -118,7 +118,7 @@ rec { Filters/Enhance/Wavelet sharpen */ name = "wavelet-sharpen-0.1.2"; - buildInputs = [ gimp ] ++ gimp.buildNativeInputs; + buildInputs = [ gimp ] ++ gimp.nativeBuildInputs; src = fetchurl { url = http://registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz; sha256 = "0vql1k67i21g5ivaa1jh56rg427m0icrkpryrhg75nscpirfxxqw"; @@ -131,7 +131,7 @@ rec { Layer/Liquid Rescale */ name = "lqr-plugin-0.6.1"; - buildInputs = [ pkgconfig libLQR gimp ] ++ gimp.buildNativeInputs; + buildInputs = [ pkgconfig libLQR gimp ] ++ gimp.nativeBuildInputs; src = fetchurl { url = http://registry.gimp.org/files/gimp-lqr-plugin-0.6.1.tar.bz2; sha256 = "00hklkpcimcbpjly4rjhfipaw096cpy768g9wixglwrsyqhil7l9"; @@ -146,7 +146,7 @@ rec { let imagemagick = pkgs.imagemagickBig; # maybe the non big version is enough? in pluginDerivation { name = "gmic-1.3.2.0"; - buildInputs = [ imagemagick pkgconfig gimp pkgs.fftwSinglePrec ] ++ gimp.buildNativeInputs; + buildInputs = [ imagemagick pkgconfig gimp pkgs.fftwSinglePrec ] ++ gimp.nativeBuildInputs; src = fetchurl { url = http://dfn.dl.sourceforge.net/sourceforge/gmic/gmic_1.3.2.0.tar.gz; sha256 = "0mxq664vzzc2l6k6sqm9syp34mihhi262i6fixk1g12lmc28797h"; @@ -172,7 +172,7 @@ rec { # or use the binary ufraw = pluginDerivation { name = "ufraw-0.15"; - buildInputs = [pkgs.lcms gimp] ++ gimp.buildNativeInputs; + buildInputs = [pkgs.lcms gimp] ++ gimp.nativeBuildInputs; # --enable-mime - install mime files, see README for more information # --enable-extras - build extra (dcraw, nikon-curve) executables # --enable-dst-correction - enable DST correction for file timestamps. diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 6caf0f05c510..c02bc6024df1 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { zlib libtool ]; - buildNativeInputs = [ xz ]; + nativeBuildInputs = [ xz ]; postInstall = '' sed -i 's/-ltiff.*'\'/\'/ $out/bin/* diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 27b3c0c9b032..a9ff7ef25c32 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ panotools wxGTK libtiff libpng openexr boost tclap exiv2 gettext ilmbase mesa freeglut glew libXmu libXi ]; - buildNativeInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; propagatedUserEnvPackages = [ enblendenfuse autopanosiftc ]; diff --git a/pkgs/applications/graphics/kipi-plugins/default.nix b/pkgs/applications/graphics/kipi-plugins/default.nix index e551b1523904..61a8380b1c58 100644 --- a/pkgs/applications/graphics/kipi-plugins/default.nix +++ b/pkgs/applications/graphics/kipi-plugins/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { libksane libxslt gettext opencv libgpod gdk_pixbuf qjson ]; - buildNativeInputs = [ pkgconfig cmake automoc4 ]; + nativeBuildInputs = [ pkgconfig cmake automoc4 ]; meta = { description = "Photo Management Program"; diff --git a/pkgs/applications/graphics/kuickshow/default.nix b/pkgs/applications/graphics/kuickshow/default.nix index b26ac12300b0..7a4106429585 100644 --- a/pkgs/applications/graphics/kuickshow/default.nix +++ b/pkgs/applications/graphics/kuickshow/default.nix @@ -10,5 +10,5 @@ stdenv.mkDerivation rec { buildInputs = [ kdelibs imlib ]; - buildNativeInputs = [ cmake gettext pkgconfig ]; + nativeBuildInputs = [ cmake gettext pkgconfig ]; } diff --git a/pkgs/applications/graphics/xara/default.nix b/pkgs/applications/graphics/xara/default.nix index 8a6bac4db2b9..cd3a09887d0f 100644 --- a/pkgs/applications/graphics/xara/default.nix +++ b/pkgs/applications/graphics/xara/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "05xbzq1i1vw2mdsv7zjqfpxfv3g1j0g5kks0gq6sh373xd6y8lyh"; }; - buildNativeInputs = [ automake pkgconfig gettext perl zip ]; + nativeBuildInputs = [ automake pkgconfig gettext perl zip ]; buildInputs = [ wxGTK gtk libxml2 freetype pango ]; configureFlags = "--disable-svnversion"; diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix index e4ab57989184..de7e6fd48c21 100644 --- a/pkgs/applications/graphics/xfig/default.nix +++ b/pkgs/applications/graphics/xfig/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [x11 libXpm libXmu libXi libXp Xaw3d libpng libjpeg]; - buildNativeInputs = [ imake makeWrapper ]; + nativeBuildInputs = [ imake makeWrapper ]; NIX_CFLAGS_COMPILE = "-I${libXpm}/include/X11"; diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index 990709c03e50..1f1c26c11520 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pango libX11 xproto zlib poppler poppler_data ]; - buildNativeInputs = [ autoconf automake libtool pkgconfig ]; + nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; # Build with poppler-0.18.x patchFlags = "-p0"; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index b9b148483702..562a9dd52ad4 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { inherit python; - buildNativeInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index 8da4e9de8fd6..08b868bca926 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "0bcpmnlk03382x577qbnbw3i6y08hr3qmg85pqj35scnl6van74c"; }; - buildNativeInputs = [ + nativeBuildInputs = [ glibc glib stdenv.gcc.gcc @@ -55,7 +55,7 @@ stdenv.mkDerivation { chmod +x $out/bin/googleearth fullPath= - for i in $buildNativeInputs; do + for i in $nativeBuildInputs; do fullPath=$fullPath:$i/lib done diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index 022cb437c698..7c732ab677ae 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "08x1p8xhl65r79a6gn1fi63z1lspd5j55l05diiyzcwfxvqwsm47"; }; - buildNativeInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ pkgconfig gettext ]; buildInputs = [ libgphoto2 libexif popt libjpeg readline libtool ]; meta = { diff --git a/pkgs/applications/misc/kde-wacomtablet/default.nix b/pkgs/applications/misc/kde-wacomtablet/default.nix index 467308480243..22587a1bae04 100644 --- a/pkgs/applications/misc/kde-wacomtablet/default.nix +++ b/pkgs/applications/misc/kde-wacomtablet/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ kdelibs ]; - buildNativeInputs = [ gettext ]; + nativeBuildInputs = [ gettext ]; meta = with stdenv.lib; { description = "KDE Wacom graphic tablet configuration tool"; diff --git a/pkgs/applications/misc/nut/2.6.3.nix b/pkgs/applications/misc/nut/2.6.3.nix index 471529675dbf..54dce8fe3c24 100644 --- a/pkgs/applications/misc/nut/2.6.3.nix +++ b/pkgs/applications/misc/nut/2.6.3.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { }; buildInputs = [ neon libusb openssl udev avahi freeipmi ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; configureFlags = [ "--with-all" diff --git a/pkgs/applications/misc/qgis/default.nix b/pkgs/applications/misc/qgis/default.nix index 7e27736ee7e4..834b3f0cfbe3 100644 --- a/pkgs/applications/misc/qgis/default.nix +++ b/pkgs/applications/misc/qgis/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt fcgi ]; - buildNativeInputs = [ cmake python]; + nativeBuildInputs = [ cmake python]; patches = [ ./r14988.diff ]; diff --git a/pkgs/applications/misc/rsibreak/default.nix b/pkgs/applications/misc/rsibreak/default.nix index 8aab11beec3c..fe8118b19763 100644 --- a/pkgs/applications/misc/rsibreak/default.nix +++ b/pkgs/applications/misc/rsibreak/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1yrf73r8mixskh8b531wb8dfs9z7rrw010xsrflhjhjmqh94h8mw"; }; - buildNativeInputs = [ gettext ]; + nativeBuildInputs = [ gettext ]; buildInputs = [ kdelibs kdebase_workspace ]; diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index cab0c2b07de1..dae574804b4d 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0diy72sgiyvfl6bdy7k3qwv3ijx2z1y477smkk6jsbbd9fsp2lfg"; }; - buildNativeInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; meta = { description = "GTD (getting things done) implementation"; diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix index e06f812a18a5..c781a5619ae4 100644 --- a/pkgs/applications/misc/yakuake/default.nix +++ b/pkgs/applications/misc/yakuake/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ kdelibs ]; - buildNativeInputs = [ gettext ]; + nativeBuildInputs = [ gettext ]; meta = { homepage = http://yakuake.kde.org; diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index 49bc93b80d27..7efdf7ed015e 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals enableX11 [ libX11 libXau libXt ] ++ stdenv.lib.optional enableDirectFB [ directfb ]; - buildNativeInputs = [ pkgconfig bzip2 ]; + nativeBuildInputs = [ pkgconfig bzip2 ]; configureFlags = [ "--with-ssl" ] ++ stdenv.lib.optional (enableX11 || enableFB || enableDirectFB) "--enable-graphics" diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index c0175fc6a703..63760c94426d 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { configureFlags = if sslSupport then "--with-ssl" else ""; buildInputs = [ ncurses gzip ] ++ stdenv.lib.optional sslSupport openssl; - buildNativeInputs = [ ncurses ]; + nativeBuildInputs = [ ncurses ]; crossAttrs = { configureFlags = "--enable-widec" + diff --git a/pkgs/applications/networking/browsers/rekonq/default.nix b/pkgs/applications/networking/browsers/rekonq/default.nix index 4a46de14f9bc..fe5735599612 100644 --- a/pkgs/applications/networking/browsers/rekonq/default.nix +++ b/pkgs/applications/networking/browsers/rekonq/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ kdelibs qca2 qoauth ]; - buildNativeInputs = [ gettext pkgconfig shared_desktop_ontologies ]; + nativeBuildInputs = [ gettext pkgconfig shared_desktop_ontologies ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 04e119afdb14..8882a4388b05 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk libglade libosip libexosip readline mediastreamer speex ]; - buildNativeInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkgconfig ]; configureFlags = "--enable-external-ortp --enable-external-mediastreamer"; diff --git a/pkgs/applications/networking/instant-messengers/skype/default.nix b/pkgs/applications/networking/instant-messengers/skype/default.nix index 66a18dbdfe97..715f0e5c2deb 100644 --- a/pkgs/applications/networking/instant-messengers/skype/default.nix +++ b/pkgs/applications/networking/instant-messengers/skype/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { cp -r * $out/libexec/skype/ fullPath= - for i in $buildNativeInputs; do + for i in $nativeBuildInputs; do fullPath=$fullPath''${fullPath:+:}$i/lib done diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 25919875bd19..c7a0401f3ee9 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0fk65f7q75z3wm5h4wad7g5sm2j6r8v2845b74ycl29br78ki2hf"; }; - buildNativeInputs = [pkgconfig libxslt]; + nativeBuildInputs = [pkgconfig libxslt]; buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ]; configureFlags = "--with-ca-certificates=/etc/ca-bundle.crt"; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index 1e2ded5292ab..c8c685196cdf 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib telepathy_glib dbus_glib pidgin ]; - buildNativeInputs = [ pkgconfig libxslt ]; + nativeBuildInputs = [ pkgconfig libxslt ]; meta = { description = "A Telepathy connection manager based on libpurple"; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix index 70e6293c9a30..5c1c399ab49a 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix @@ -20,7 +20,7 @@ let text_ui = [ ktp.telepathy_logger_qt qt_gstreamer telepathy_logger ]; }; - extraBuildNativeInputs = { + extraNativeBuildInputs = { telepathy_logger_qt = [ flex bison ]; }; @@ -37,7 +37,7 @@ let inherit sha256; }; - buildNativeInputs = [ gettext pkgconfig ] ++ (stdenv.lib.attrByPath [ key ] [] extraBuildNativeInputs); + nativeBuildInputs = [ gettext pkgconfig ] ++ (stdenv.lib.attrByPath [ key ] [] extraNativeBuildInputs); buildInputs = [ kdelibs telepathy_qt ] ++ stdenv.lib.optional (name != "ktp-common-internals") ktp.common_internals ++ (stdenv.lib.attrByPath [ key ] [] extraBuildInputs); diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index a820e0f8a99b..4dacdb9f1ed9 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool ]; - buildNativeInputs = [ libxslt ]; + nativeBuildInputs = [ libxslt ]; configureFlags = "--enable-call"; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index 4d79f0c89d88..1b2081c4dd09 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -11,5 +11,5 @@ stdenv.mkDerivation rec { buildInputs = [ telepathy_glib ]; - buildNativeInputs = [ pkgconfig libxslt ]; + nativeBuildInputs = [ pkgconfig libxslt ]; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix index e8b120b93316..a60e207b7527 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "11cmmdq31kivm6nsv61hxy3hxnnmbd8sj55xqwx9hyqzybh70dyf"; }; - buildNativeInputs = [pkgconfigUpstream libxslt python]; + nativeBuildInputs = [pkgconfigUpstream libxslt python]; buildInputs = [ libxml2 dbus_glib telepathy_glib sofia_sip]; meta = { diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index 3c100282aa46..4300ac15c998 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid gnutls sqlite ]; - buildNativeInputs = [ libxslt pkgconfigUpstream ]; + nativeBuildInputs = [ libxslt pkgconfigUpstream ]; configureFlags = "--disable-avahi-tests"; diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 09f85b9edfc8..32b531528d05 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { patches = [] ++ stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff"; buildInputs = stdenv.lib.optional enableACLs acl; - buildNativeInputs = [perl]; + nativeBuildInputs = [perl]; meta = { homepage = http://samba.anu.edu.au/rsync/; diff --git a/pkgs/applications/office/basket/default.nix b/pkgs/applications/office/basket/default.nix index fff93ba99695..023d133b4dd7 100644 --- a/pkgs/applications/office/basket/default.nix +++ b/pkgs/applications/office/basket/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ kdelibs qimageblitz kdepimlibs gpgme ]; - buildNativeInputs = [ cmake gettext ]; + nativeBuildInputs = [ cmake gettext ]; meta = { description = "A multi-purpose note-taking application"; diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 152246ee58f2..0769f324c15d 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0q6ydi7hzrzwqzb38gikdh1l2zf8qp4i3nkgyb01148bjwrhvf21"; }; - buildNativeInputs = [ cmake perl pkgconfig ]; + nativeBuildInputs = [ cmake perl pkgconfig ]; buildInputs = [ kdelibs attica zlib libpng boost mesa kdepimlibs createresources eigen qca2 exiv2 soprano marble lcms2 fontconfig freetype diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index da815c5fb6b4..d55c66a26246 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ kdepimlibs perl boost gpgme gmpxx libalkimia libofx libical ]; - buildNativeInputs = [ cmake automoc4 gettext shared_mime_info pkgconfig ]; + nativeBuildInputs = [ cmake automoc4 gettext shared_mime_info pkgconfig ]; KDEDIRS = libalkimia; diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index 44ffdf57db58..dfb4c243c8cf 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ kdelibs grantlee qca2 libofx ]; - buildNativeInputs = [ gettext ]; + nativeBuildInputs = [ gettext ]; meta = { inherit (kdelibs.meta) platforms; diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix index b444783ba21d..f4b353296fdc 100644 --- a/pkgs/applications/science/chemistry/avogadro/default.nix +++ b/pkgs/applications/science/chemistry/avogadro/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 eigen zlib openbabel mesa libX11 ]; - buildNativeInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; NIX_CFLAGS_COMPILE = "-include ${mesa}/include/GL/glu.h"; diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index 081d2bd62530..9bffc5548dd0 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ cln ]; buildInputs = [ readline ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; configureFlags = "--disable-rpath"; diff --git a/pkgs/applications/science/math/yacas/default.nix b/pkgs/applications/science/math/yacas/default.nix index 7b97e1a82c00..acc4740eb6b4 100644 --- a/pkgs/applications/science/math/yacas/default.nix +++ b/pkgs/applications/science/math/yacas/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; # Perl is only for the documentation - buildNativeInputs = [ perl ]; + nativeBuildInputs = [ perl ]; patches = [ ./gcc43.patch ]; diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index 52b93c8e1742..1402dc9b1824 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 freetype glew mesa qt4 libjpeg ]; - buildNativeInputs = [ cmake makeWrapper ]; + nativeBuildInputs = [ cmake makeWrapper ]; # FIXME: "make check" needs Docbook's DTD 4.4, among other things. doCheck = false; diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 7e842aa72e5f..368557e3c2ce 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; buildInputs = [ zlib openssl readline sqlite ]; - buildNativeInputs = [ tcl ]; + nativeBuildInputs = [ tcl ]; doCheck = true; diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix index 7761c45850ec..29b8b306fe54 100644 --- a/pkgs/applications/version-management/kdesvn/default.nix +++ b/pkgs/applications/version-management/kdesvn/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ apr aprutil subversion db4 kdelibs ]; - buildNativeInputs = [ gettext ]; + nativeBuildInputs = [ gettext ]; meta = { description = "KDE SVN front-end"; diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix index 944af1c26571..d1b444dd2d0b 100644 --- a/pkgs/applications/video/MPlayer/default.nix +++ b/pkgs/applications/video/MPlayer/default.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { ++ optional libpngSupport libpng ; - buildNativeInputs = [ yasm ]; + nativeBuildInputs = [ yasm ]; postConfigure = '' echo CONFIG_MPEGAUDIODSP=yes >> config.mak diff --git a/pkgs/applications/video/bangarang/default.nix b/pkgs/applications/video/bangarang/default.nix index 0bc7476dc820..5dde88076a1e 100644 --- a/pkgs/applications/video/bangarang/default.nix +++ b/pkgs/applications/video/bangarang/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ kdelibs phonon soprano shared_desktop_ontologies kdemultimedia taglib gettext ]; - buildNativeInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { description = "A media player for KDE based on Nepomuk and Phonon"; diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix index 2e115806315c..6889e4d9ef86 100644 --- a/pkgs/applications/video/dvdauthor/default.nix +++ b/pkgs/applications/video/dvdauthor/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec{ }; buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi imagemagick ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta = { description = "Tools for generating DVD files to be played on standalone DVD players"; diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix index 292010a3717c..6a863a5e2c4b 100644 --- a/pkgs/applications/video/gpac/default.nix +++ b/pkgs/applications/video/gpac/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # this is the bare minimum configuration, as I'm only interested in MP4Box # For most other functionality, this should probably be extended - buildNativeInputs = [ pkgconfig zlib ]; + nativeBuildInputs = [ pkgconfig zlib ]; meta = { description = "Open Source multimedia framework for research and academic purposes"; diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 59a2519edb45..a4fe07b2d053 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu ]; - buildNativeInputs = [ pkgconfig which ]; + nativeBuildInputs = [ pkgconfig which ]; patches = [ ./settings.patch ]; } diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 3341a01101c0..74fb14b732ab 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { libdc1394 libraw1394 ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; configureFlags = [ "--enable-alsa" diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 821e1c7bb0c5..9307b9e1d1bd 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1i3byriqav06b55kwzs4dkzrjw7mmmcv0rc7jzb52hn8qp8xz34x"; }; - buildNativeInputs = [ pkgconfig shared_mime_info ]; + nativeBuildInputs = [ pkgconfig shared_mime_info ]; buildInputs = [ xineLib libpng readline ncurses curl lirc libjpeg diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 79ea777eeadd..195ee5d45c01 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { buildPhase = "make"; - buildNativeInputs = [ makeWrapper pythonPackages.wrapPython ]; + nativeBuildInputs = [ makeWrapper pythonPackages.wrapPython ]; # patch the runner script in order to make wrapPythonPrograms work and run the program using a syscall # example code: /etc/nixos/nixpkgs/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix index e3ef829f5cb8..36d5fa0f44ff 100644 --- a/pkgs/build-support/cabal/default.nix +++ b/pkgs/build-support/cabal/default.nix @@ -91,7 +91,7 @@ test -f $i && ghc --make $i done - for p in $extraBuildInputs $propagatedBuildNativeInputs; do + for p in $extraBuildInputs $propagatedNativeBuildInputs; do if [ -d "$p/include" ]; then extraLibDirs="$extraLibDirs --extra-include-dir=$p/include" fi @@ -143,8 +143,8 @@ ''; postFixup = '' - if test -f $out/nix-support/propagated-build-native-inputs; then - ln -s $out/nix-support/propagated-build-native-inputs $out/nix-support/propagated-user-env-packages + if test -f $out/nix-support/propagated-native-build-inputs; then + ln -s $out/nix-support/propagated-native-build-inputs $out/nix-support/propagated-user-env-packages fi ''; diff --git a/pkgs/build-support/fetchmtn/default.nix b/pkgs/build-support/fetchmtn/default.nix index 80d9091e01de..daead9ad6d2d 100644 --- a/pkgs/build-support/fetchmtn/default.nix +++ b/pkgs/build-support/fetchmtn/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { builder = ./builder.sh; - buildNativeInputs = [monotone]; + nativeBuildInputs = [monotone]; outputHashAlgo = "sha256"; outputHashMode = "recursive"; diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index 2c0ca37553df..051989a096ee 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { name = "initrd"; builder = ./make-initrd.sh; - buildNativeInputs = inputsFun stdenv.platform.uboot; + nativeBuildInputs = inputsFun stdenv.platform.uboot; makeUInitrd = makeUInitrdFun stdenv.platform.uboot; @@ -37,7 +37,7 @@ stdenv.mkDerivation { pathsFromGraph = ./paths-from-graph.pl; crossAttrs = { - buildNativeInputs = inputsFun stdenv.cross.platform.uboot; + nativeBuildInputs = inputsFun stdenv.cross.platform.uboot; makeUInitrd = makeUInitrdFun stdenv.cross.platform.uboot; }; } diff --git a/pkgs/build-support/setup-hooks/autoreconf.sh b/pkgs/build-support/setup-hooks/autoreconf.sh index 027c83221633..f70a10870843 100644 --- a/pkgs/build-support/setup-hooks/autoreconf.sh +++ b/pkgs/build-support/setup-hooks/autoreconf.sh @@ -1,7 +1,7 @@ preConfigurePhases+=" autoreconfPhase" for i in @autoconf@ @automake@ @libtool@; do - findInputs $i nativePkgs propagated-build-native-inputs + findInputs $i nativePkgs propagated-native-build-inputs done autoreconfPhase() { diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 474d43c30fff..5ae2e7b4fc9b 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -55,7 +55,7 @@ rec { mkdir -p $out/nix-support cp ${script} $out/nix-support/setup-hook '' + stdenv.lib.optionalString (deps != []) '' - echo ${toString deps} > $out/nix-support/propagated-build-native-inputs + echo ${toString deps} > $out/nix-support/propagated-native-build-inputs '' + stdenv.lib.optionalString (substitutions != {}) '' substituteAll ${script} $out/nix-support/setup-hook ''); diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix index f92882b9a832..9e6639c0a0ad 100644 --- a/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/pkgs/data/documentation/gnome-user-docs/default.nix @@ -8,5 +8,5 @@ stdenv.mkDerivation { sha256 = "1ka0nw2kc85p10y8x31v0wv06a88k7qrgafp4ys04y9fzz0rkcjj"; }; - buildNativeInputs = [ itstool libxml2 gettext ]; + nativeBuildInputs = [ itstool libxml2 gettext ]; } diff --git a/pkgs/data/misc/gsettings-desktop-schemas/default.nix b/pkgs/data/misc/gsettings-desktop-schemas/default.nix index 4527b2fec0b1..c934863d75d7 100644 --- a/pkgs/data/misc/gsettings-desktop-schemas/default.nix +++ b/pkgs/data/misc/gsettings-desktop-schemas/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; buildInputs = [ glib ]; - buildNativeInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool ]; meta = { inherit (glib.meta) maintainers platforms; diff --git a/pkgs/data/misc/xkeyboard-config/default.nix b/pkgs/data/misc/xkeyboard-config/default.nix index 67bb79725fb9..15574a1dc366 100644 --- a/pkgs/data/misc/xkeyboard-config/default.nix +++ b/pkgs/data/misc/xkeyboard-config/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ gettext ]; - buildNativeInputs = [ perl perlXMLParser intltool xkbcomp ]; + nativeBuildInputs = [ perl perlXMLParser intltool xkbcomp ]; patches = [ ./eo.patch ]; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix index a1dbf78bba26..fffffcb0c2d0 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix @@ -10,5 +10,5 @@ stdenv.mkDerivation rec { sha256 = "cc7f15e54e2640697b58c26e74cc3f6ebadeb4ef6622bffe9c1e6874cc3478d6"; }; - buildNativeInputs = [ pkgconfig intltool iconnamingutils gtk ]; + nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ]; } diff --git a/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix index a0c11d1b85e2..f31875bed91c 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix @@ -13,5 +13,5 @@ stdenv.mkDerivation { propagatedBuildInputs = [ glib libtasn1 ]; - buildNativeInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool ]; } diff --git a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix index a1427d822834..6ca2a9142c15 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { libtasn1 libtool libcanberra ]; - buildNativeInputs = [ pkgconfig intltool which ]; + nativeBuildInputs = [ pkgconfig intltool which ]; configureFlags = "--disable-scrollkeeper"; NIX_CFLAGS_COMPILE="-I${GConf}/include/gconf/2"; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix index 8704d22d2f27..ccabff27549f 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix @@ -13,5 +13,5 @@ stdenv.mkDerivation { [ dbus_glib gtk libXau libXtst inputproto libglade startup_notification GConf upower ]; - buildNativeInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool ]; } diff --git a/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix index 47ddde9029f2..dca3b3a16a2e 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix @@ -14,5 +14,5 @@ stdenv.mkDerivation { pulseaudio ]; - buildNativeInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool ]; } diff --git a/pkgs/desktops/gnome-2/desktop/gvfs/default.nix b/pkgs/desktops/gnome-2/desktop/gvfs/default.nix index bae6c19c6ea6..9e7949047c7f 100644 --- a/pkgs/desktops/gnome-2/desktop/gvfs/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gvfs/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { libgnome_keyring libsoup avahi libtool libxslt docbook_xsl ]; - buildNativeInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool ]; enableParallelBuilding = true; } diff --git a/pkgs/desktops/gnome-2/desktop/zenity/default.nix b/pkgs/desktops/gnome-2/desktop/zenity/default.nix index 9e6785146894..3ab8838c97b6 100644 --- a/pkgs/desktops/gnome-2/desktop/zenity/default.nix +++ b/pkgs/desktops/gnome-2/desktop/zenity/default.nix @@ -12,5 +12,5 @@ stdenv.mkDerivation { configureFlags = "--disable-scrollkeeper"; buildInputs = [ gtk libglade libxml2 libxslt libX11 ]; - buildNativeInputs = [ pkgconfig intltool gnome_doc_utils which ]; + nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ]; } diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index a75e089b5080..4769247a5162 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 polkit gtk ]; propagatedBuildInputs = [ glib ]; - buildNativeInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool ]; configureFlags = "--with-gtk=2.0"; } diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix index e58dd38e369e..ec6931724bc2 100644 --- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix +++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix @@ -9,6 +9,6 @@ stdenv.mkDerivation rec { sha256 = "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam"; }; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libIDL ]; } diff --git a/pkgs/desktops/gnome-2/platform/gconfmm/default.nix b/pkgs/desktops/gnome-2/platform/gconfmm/default.nix index 0597da92e68a..8f6075375d6d 100644 --- a/pkgs/desktops/gnome-2/platform/gconfmm/default.nix +++ b/pkgs/desktops/gnome-2/platform/gconfmm/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "a5e0092bb73371a3ca76b2ecae794778f3a9409056fee9b28ec1db072d8e6108"; }; - buildNativeInputs = [pkgconfig]; + nativeBuildInputs = [pkgconfig]; propagatedBuildInputs = [ GConf gtkmm glibmm ]; diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix index 38b816ccc77f..93bb44c54e1e 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./gdk.patch ]; - buildNativeInputs = [pkgconfig]; + nativeBuildInputs = [pkgconfig]; propagatedBuildInputs = [ gtkglext gtkmm gtk mesa gdk_pixbuf ]; diff --git a/pkgs/desktops/gnome-2/platform/libIDL/default.nix b/pkgs/desktops/gnome-2/platform/libIDL/default.nix index 5783976d9a22..64f2b19c3e9f 100644 --- a/pkgs/desktops/gnome-2/platform/libIDL/default.nix +++ b/pkgs/desktops/gnome-2/platform/libIDL/default.nix @@ -11,5 +11,5 @@ stdenv.mkDerivation rec { buildInputs = [ glib gettext ]; - buildNativeInputs = [ flex bison pkgconfig ]; + nativeBuildInputs = [ flex bison pkgconfig ]; } diff --git a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix index bd268e5ec43a..79c41f924d3f 100644 --- a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix +++ b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; preConfigure = "export USER=`whoami`"; - buildNativeInputs = [ flex bison pkgconfig intltool procps ]; + nativeBuildInputs = [ flex bison pkgconfig intltool procps ]; buildInputs = [ libxml2 ]; propagatedBuildInputs = [ popt glib ORBit2 ]; } diff --git a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix index 6eefd42b38db..55a4ecec6959 100644 --- a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1kbgqh7bw0fdx4f1a1aqwpff7gp5mwhbaz60c6c98bc4djng5dgs"; }; - buildNativeInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ bison popt gtk libxml2 GConf libglade libtool ]; propagatedBuildInputs = [ libbonobo libgnomecanvas libgnome ]; } diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix index 76f213b5fa89..37dbfd129611 100644 --- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "197pnq8y0knqjhm2fg4j6hbqqm3qfzfnd0irhwxpk1b4hqb3kimj"; }; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra libtool ]; propagatedBuildInputs = [ glib libbonobo ]; } diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix index bf2c0360aa21..dd6ebbb91745 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix @@ -10,6 +10,6 @@ stdenv.mkDerivation rec { }; buildInputs = [ libglade ]; - buildNativeInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool ]; propagatedBuildInputs = [ libart_lgpl gtk ]; } diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix index 379602c6ea37..cc8db43ad130 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "03rwbli76crkjl6gp422wrc9lqpl174k56cp9i96b7l8jlj2yddf"; }; - buildNativeInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ xlibs.xlibs libxml2 GConf pango glib libgnome_keyring libglade libtool ]; diff --git a/pkgs/desktops/gnome-2/platform/libunique/default.nix b/pkgs/desktops/gnome-2/platform/libunique/default.nix index 2661307c9d2a..6b9cee800429 100644 --- a/pkgs/desktops/gnome-2/platform/libunique/default.nix +++ b/pkgs/desktops/gnome-2/platform/libunique/default.nix @@ -9,6 +9,6 @@ stdenv.mkDerivation rec { sha256 = "1fsgvmncd9caw552lyfg8swmsd6bh4ijjsph69bwacwfxwf09j75"; }; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk ]; } diff --git a/pkgs/desktops/kde-4.7/kde-wallpapers.nix b/pkgs/desktops/kde-4.7/kde-wallpapers.nix index 97773ffadcd5..57f2b643aa4d 100644 --- a/pkgs/desktops/kde-4.7/kde-wallpapers.nix +++ b/pkgs/desktops/kde-4.7/kde-wallpapers.nix @@ -1,7 +1,7 @@ { kde, cmake }: kde { - buildNativeInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; patches = [ ./files/kde-wallpapers-buildsystem.patch ]; diff --git a/pkgs/desktops/kde-4.7/kde-workspace.nix b/pkgs/desktops/kde-4.7/kde-workspace.nix index 8116f4bb6b59..cfc9986ecfab 100644 --- a/pkgs/desktops/kde-4.7/kde-workspace.nix +++ b/pkgs/desktops/kde-4.7/kde-workspace.nix @@ -15,7 +15,7 @@ kde { libusb python libqalculate consolekit kdepimlibs pam prison akonadi ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; preConfigure = '' diff --git a/pkgs/desktops/kde-4.7/kdeartwork/kscreensaver.nix b/pkgs/desktops/kde-4.7/kdeartwork/kscreensaver.nix index 72676e35f715..7028b9db228d 100644 --- a/pkgs/desktops/kde-4.7/kdeartwork/kscreensaver.nix +++ b/pkgs/desktops/kde-4.7/kdeartwork/kscreensaver.nix @@ -3,7 +3,7 @@ kde { buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 libXt ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; preConfigure = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake"; diff --git a/pkgs/desktops/kde-4.7/kdebindings/smokegen.nix b/pkgs/desktops/kde-4.7/kdebindings/smokegen.nix index df26eb2717eb..43f54b552e5a 100644 --- a/pkgs/desktops/kde-4.7/kdebindings/smokegen.nix +++ b/pkgs/desktops/kde-4.7/kdebindings/smokegen.nix @@ -2,7 +2,7 @@ kde { buildInputs = [ qt4 ]; - buildNativeInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; patchPhase = "sed -e /RPATH/d -i CMakeLists.txt"; diff --git a/pkgs/desktops/kde-4.7/kdebindings/smokeqt.nix b/pkgs/desktops/kde-4.7/kdebindings/smokeqt.nix index 0d0aa816a941..29e25093d11b 100644 --- a/pkgs/desktops/kde-4.7/kdebindings/smokeqt.nix +++ b/pkgs/desktops/kde-4.7/kdebindings/smokeqt.nix @@ -2,8 +2,8 @@ kde { propagatedBuildInputs = [ qt4 phonon qimageblitz ]; - buildNativeInputs = [ cmake ]; - propagatedBuildNativeInputs = [ smokegen ]; + nativeBuildInputs = [ cmake ]; + propagatedNativeBuildInputs = [ smokegen ]; meta = { description = "C++ parser used to generate language bindings for Qt/KDE"; diff --git a/pkgs/desktops/kde-4.7/kdegames.nix b/pkgs/desktops/kde-4.7/kdegames.nix index 03ecfbd88b4b..dfca49be12fd 100644 --- a/pkgs/desktops/kde-4.7/kdegames.nix +++ b/pkgs/desktops/kde-4.7/kdegames.nix @@ -7,7 +7,7 @@ kde rec { pythonPath = [ pythonPackages.twisted pykde4 ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; # TODO: ggz diff --git a/pkgs/desktops/kde-4.7/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.7/kdegraphics/gwenview.nix index b6b659c39474..c03c82469e66 100644 --- a/pkgs/desktops/kde-4.7/kdegraphics/gwenview.nix +++ b/pkgs/desktops/kde-4.7/kdegraphics/gwenview.nix @@ -6,7 +6,7 @@ kde { buildInputs = [ kdelibs exiv2 shared_desktop_ontologies kde_baseapps libkipi libjpeg ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta = { description = "Gwenview, the KDE image viewer"; diff --git a/pkgs/desktops/kde-4.7/kdelibs.nix b/pkgs/desktops/kde-4.7/kdelibs.nix index 429fbb2a709c..41a648d10561 100644 --- a/pkgs/desktops/kde-4.7/kdelibs.nix +++ b/pkgs/desktops/kde-4.7/kdelibs.nix @@ -15,7 +15,7 @@ kde { propagatedBuildInputs = [ qt4 soprano strigi phonon ]; - propagatedBuildNativeInputs = [ automoc4 cmake perl shared_mime_info ]; + propagatedNativeBuildInputs = [ automoc4 cmake perl shared_mime_info ]; # TODO: make sonnet plugins (dictionaries) really work. # There are a few hardcoded paths. diff --git a/pkgs/desktops/kde-4.7/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.7/kdenetwork/kopete.nix index 704f6d04dfe2..440e8595704a 100644 --- a/pkgs/desktops/kde-4.7/kdenetwork/kopete.nix +++ b/pkgs/desktops/kde-4.7/kdenetwork/kopete.nix @@ -7,7 +7,7 @@ kde { jasper libidn mediastreamer msilbc libxml2 libxslt giflib libgadu boost qca2 gpgme sqlite ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; KDEDIRS = libktorrent; diff --git a/pkgs/desktops/kde-4.7/kdeplasma-addons.nix b/pkgs/desktops/kde-4.7/kdeplasma-addons.nix index ddffa48dc55b..30a32b465b60 100644 --- a/pkgs/desktops/kde-4.7/kdeplasma-addons.nix +++ b/pkgs/desktops/kde-4.7/kdeplasma-addons.nix @@ -11,7 +11,7 @@ kde { attica python qca2 qimageblitz kdepimlibs libqalculate libXtst shared_desktop_ontologies marble libkexiv2]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta = { description = "KDE Plasma Addons"; diff --git a/pkgs/desktops/kde-4.7/oxygen-icons.nix b/pkgs/desktops/kde-4.7/oxygen-icons.nix index f2a5e666232d..1f7572b4d8ee 100644 --- a/pkgs/desktops/kde-4.7/oxygen-icons.nix +++ b/pkgs/desktops/kde-4.7/oxygen-icons.nix @@ -5,7 +5,7 @@ kde { outputHashMode = "recursive"; outputHash = "0c12c72bcf41cfaf03f85fc1ae27e44d8cecac3deb504ab1de4c30f4fc9e3cd0"; - buildNativeInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; meta = { description = "KDE Oxygen theme icons"; diff --git a/pkgs/desktops/kde-4.7/support/akonadi/default.nix b/pkgs/desktops/kde-4.7/support/akonadi/default.nix index 38ec7f859076..cf5155096027 100644 --- a/pkgs/desktops/kde-4.7/support/akonadi/default.nix +++ b/pkgs/desktops/kde-4.7/support/akonadi/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 soprano libxslt boost ]; - buildNativeInputs = [ cmake automoc4 shared_mime_info ]; + nativeBuildInputs = [ cmake automoc4 shared_mime_info ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/kde-4.8/kde-runtime.nix b/pkgs/desktops/kde-4.8/kde-runtime.nix index b219bd4599af..f8246190462d 100644 --- a/pkgs/desktops/kde-4.8/kde-runtime.nix +++ b/pkgs/desktops/kde-4.8/kde-runtime.nix @@ -9,7 +9,7 @@ kde { samba (libcanberra.override { gtk = null; }) ntrack libjpeg qca2 pulseaudio ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; passthru.propagatedUserEnvPackages = [ virtuoso ]; diff --git a/pkgs/desktops/kde-4.8/kde-wallpapers.nix b/pkgs/desktops/kde-4.8/kde-wallpapers.nix index 803b027668a8..ad4c22c632db 100644 --- a/pkgs/desktops/kde-4.8/kde-wallpapers.nix +++ b/pkgs/desktops/kde-4.8/kde-wallpapers.nix @@ -1,7 +1,7 @@ { kde, cmake }: kde { - buildNativeInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; patches = [ ./files/kde-wallpapers-buildsystem.patch ]; diff --git a/pkgs/desktops/kde-4.8/kde-workspace.nix b/pkgs/desktops/kde-4.8/kde-workspace.nix index 31937d4f1d56..1f1466eeaec4 100644 --- a/pkgs/desktops/kde-4.8/kde-workspace.nix +++ b/pkgs/desktops/kde-4.8/kde-workspace.nix @@ -16,7 +16,7 @@ kde { kactivities ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; preConfigure = '' diff --git a/pkgs/desktops/kde-4.8/kdeartwork/kscreensaver.nix b/pkgs/desktops/kde-4.8/kdeartwork/kscreensaver.nix index 72676e35f715..7028b9db228d 100644 --- a/pkgs/desktops/kde-4.8/kdeartwork/kscreensaver.nix +++ b/pkgs/desktops/kde-4.8/kdeartwork/kscreensaver.nix @@ -3,7 +3,7 @@ kde { buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 libXt ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; preConfigure = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake"; diff --git a/pkgs/desktops/kde-4.8/kdebindings/perlqt.nix b/pkgs/desktops/kde-4.8/kdebindings/perlqt.nix index 2c1378f10496..f2b5462f33e2 100644 --- a/pkgs/desktops/kde-4.8/kdebindings/perlqt.nix +++ b/pkgs/desktops/kde-4.8/kdebindings/perlqt.nix @@ -2,7 +2,7 @@ kde { buildInputs = [ smokeqt perl ]; - buildNativeInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; patches = # The order is important diff --git a/pkgs/desktops/kde-4.8/kdebindings/qtruby.nix b/pkgs/desktops/kde-4.8/kdebindings/qtruby.nix index 5dd25899e74c..723732f6104a 100644 --- a/pkgs/desktops/kde-4.8/kdebindings/qtruby.nix +++ b/pkgs/desktops/kde-4.8/kdebindings/qtruby.nix @@ -2,7 +2,7 @@ kde { buildInputs = [ smokeqt ruby ]; - buildNativeInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; # The second patch is not ready for upstream submmission. I should add an # option() instead. diff --git a/pkgs/desktops/kde-4.8/kdebindings/smokegen.nix b/pkgs/desktops/kde-4.8/kdebindings/smokegen.nix index e32ed57c9074..8b5da2a641dd 100644 --- a/pkgs/desktops/kde-4.8/kdebindings/smokegen.nix +++ b/pkgs/desktops/kde-4.8/kdebindings/smokegen.nix @@ -2,7 +2,7 @@ kde { buildInputs = [ qt4 ]; - buildNativeInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; patches = [ ./smokegen-nix.patch ]; diff --git a/pkgs/desktops/kde-4.8/kdebindings/smokekde.nix b/pkgs/desktops/kde-4.8/kdebindings/smokekde.nix index 6f1b7a0b7081..0e823a95e3b2 100644 --- a/pkgs/desktops/kde-4.8/kdebindings/smokekde.nix +++ b/pkgs/desktops/kde-4.8/kdebindings/smokekde.nix @@ -3,7 +3,7 @@ kde { # attica, akonadi and kdepimlibs are disabled due to smokegen crash buildInputs = [ smokeqt kdelibs shared_desktop_ontologies ]; - buildNativeInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = "-DQTDEFINES_FILE=${smokeqt}/share/smokegen/qtdefines"; meta = { diff --git a/pkgs/desktops/kde-4.8/kdebindings/smokeqt.nix b/pkgs/desktops/kde-4.8/kdebindings/smokeqt.nix index 0d0aa816a941..29e25093d11b 100644 --- a/pkgs/desktops/kde-4.8/kdebindings/smokeqt.nix +++ b/pkgs/desktops/kde-4.8/kdebindings/smokeqt.nix @@ -2,8 +2,8 @@ kde { propagatedBuildInputs = [ qt4 phonon qimageblitz ]; - buildNativeInputs = [ cmake ]; - propagatedBuildNativeInputs = [ smokegen ]; + nativeBuildInputs = [ cmake ]; + propagatedNativeBuildInputs = [ smokegen ]; meta = { description = "C++ parser used to generate language bindings for Qt/KDE"; diff --git a/pkgs/desktops/kde-4.8/kdegames.nix b/pkgs/desktops/kde-4.8/kdegames.nix index 03ecfbd88b4b..dfca49be12fd 100644 --- a/pkgs/desktops/kde-4.8/kdegames.nix +++ b/pkgs/desktops/kde-4.8/kdegames.nix @@ -7,7 +7,7 @@ kde rec { pythonPath = [ pythonPackages.twisted pykde4 ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; # TODO: ggz diff --git a/pkgs/desktops/kde-4.8/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.8/kdegraphics/gwenview.nix index b6b659c39474..c03c82469e66 100644 --- a/pkgs/desktops/kde-4.8/kdegraphics/gwenview.nix +++ b/pkgs/desktops/kde-4.8/kdegraphics/gwenview.nix @@ -6,7 +6,7 @@ kde { buildInputs = [ kdelibs exiv2 shared_desktop_ontologies kde_baseapps libkipi libjpeg ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta = { description = "Gwenview, the KDE image viewer"; diff --git a/pkgs/desktops/kde-4.8/kdelibs.nix b/pkgs/desktops/kde-4.8/kdelibs.nix index 31df83e5ee92..0e7c9cfdbea0 100644 --- a/pkgs/desktops/kde-4.8/kdelibs.nix +++ b/pkgs/desktops/kde-4.8/kdelibs.nix @@ -15,7 +15,7 @@ kde { propagatedBuildInputs = [ qt4 soprano strigi phonon ]; - propagatedBuildNativeInputs = [ automoc4 cmake perl shared_mime_info ]; + propagatedNativeBuildInputs = [ automoc4 cmake perl shared_mime_info ]; # TODO: make sonnet plugins (dictionaries) really work. # There are a few hardcoded paths. diff --git a/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix index ec48b96fe19b..d1d9f0c8e03e 100644 --- a/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix +++ b/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix @@ -7,7 +7,7 @@ kde { jasper libidn mediastreamer msilbc libxml2 libxslt giflib libgadu boost qca2 gpgme sqlite ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; KDEDIRS = libktorrent; diff --git a/pkgs/desktops/kde-4.8/kdeplasma-addons.nix b/pkgs/desktops/kde-4.8/kdeplasma-addons.nix index 9d70579d6d24..a69002bff28b 100644 --- a/pkgs/desktops/kde-4.8/kdeplasma-addons.nix +++ b/pkgs/desktops/kde-4.8/kdeplasma-addons.nix @@ -11,7 +11,7 @@ kde { attica python qca2 qimageblitz kdepimlibs libdbusmenu_qt libqalculate libXtst shared_desktop_ontologies marble libkexiv2]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta = { description = "KDE Plasma Addons"; diff --git a/pkgs/desktops/kde-4.8/oxygen-icons.nix b/pkgs/desktops/kde-4.8/oxygen-icons.nix index c821e2a7aac4..52e5e5f6bb01 100644 --- a/pkgs/desktops/kde-4.8/oxygen-icons.nix +++ b/pkgs/desktops/kde-4.8/oxygen-icons.nix @@ -5,7 +5,7 @@ kde { outputHashMode = "recursive"; outputHash = "3984dac79aa7398578bcd9d69d74988bd992807518d46cd1dabc03867044c8a4"; - buildNativeInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; meta = { description = "KDE Oxygen theme icons"; diff --git a/pkgs/desktops/kde-4.8/support/akonadi/default.nix b/pkgs/desktops/kde-4.8/support/akonadi/default.nix index b939eb19b5e4..9a9e8a870660 100644 --- a/pkgs/desktops/kde-4.8/support/akonadi/default.nix +++ b/pkgs/desktops/kde-4.8/support/akonadi/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 soprano libxslt boost ]; - buildNativeInputs = [ cmake automoc4 shared_mime_info ]; + nativeBuildInputs = [ cmake automoc4 shared_mime_info ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/gcc/4.4/default.nix b/pkgs/development/compilers/gcc/4.4/default.nix index 7bc0d2c26e08..49fbcd3205a7 100644 --- a/pkgs/development/compilers/gcc/4.4/default.nix +++ b/pkgs/development/compilers/gcc/4.4/default.nix @@ -124,7 +124,7 @@ stdenv.mkDerivation ({ inherit noSysDirs profiledCompiler staticCompiler langJava crossStageStatic libcCross; - buildNativeInputs = [ texinfo which ]; + nativeBuildInputs = [ texinfo which ]; buildInputs = [ gmp mpfr gettext ] ++ (optional (ppl != null) ppl) diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index 38527befe3b3..b0916cf52b84 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -205,7 +205,7 @@ stdenv.mkDerivation ({ inherit noSysDirs profiledCompiler staticCompiler langJava crossStageStatic libcCross crossMingw; - buildNativeInputs = [ texinfo which ] + nativeBuildInputs = [ texinfo which ] ++ optional (perl != null) perl; buildInputs = [ gmp mpfr mpc libelf gettext ] diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index ec15b88bb791..d67ee8bef0e9 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -232,7 +232,7 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler langJava crossStageStatic libcCross crossMingw; - buildNativeInputs = [ texinfo which gettext ] + nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) ++ (optional javaAwtGtk pkgconfig); diff --git a/pkgs/development/compilers/gcc/4.7/default.nix b/pkgs/development/compilers/gcc/4.7/default.nix index 5d29b5c833c6..3e45efcf6456 100644 --- a/pkgs/development/compilers/gcc/4.7/default.nix +++ b/pkgs/development/compilers/gcc/4.7/default.nix @@ -227,7 +227,7 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler langJava crossStageStatic libcCross crossMingw; - buildNativeInputs = [ texinfo which gettext ] + nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) ++ (optional javaAwtGtk pkgconfig); diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index ef11c5b3baf2..d7f7282b4b8c 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { make install -C doc ''; - buildNativeInputs = [ gnum4 texinfo texLive automake ]; + nativeBuildInputs = [ gnum4 texinfo texLive automake ]; # XXX: The `check' target doesn't exist. doCheck = false; diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 058d84a12de8..f607edd0f024 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -11,7 +11,7 @@ let version = "0.9.25"; in sha256 = "0dfycf80x73dz67c97j1ry29wrv35393ai5ry46i1x1fzfq6rv8v"; }; - buildNativeInputs = [ perl texinfo ]; + nativeBuildInputs = [ perl texinfo ]; patches = [ (fetchurl { diff --git a/pkgs/development/compilers/vala/15.2.nix b/pkgs/development/compilers/vala/15.2.nix index 822102b7bd4f..529ccea6bc80 100644 --- a/pkgs/development/compilers/vala/15.2.nix +++ b/pkgs/development/compilers/vala/15.2.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0g71zq6dpqrw2f40wfzdf18fdw41ymr17laqniy2kr622hkxdi8w"; }; - buildNativeInputs = [ yacc flex pkgconfig xz ]; + nativeBuildInputs = [ yacc flex pkgconfig xz ]; buildInputs = [ glib ]; diff --git a/pkgs/development/compilers/vala/16.1.nix b/pkgs/development/compilers/vala/16.1.nix index 54e6af8798d5..f054c59d2e4b 100644 --- a/pkgs/development/compilers/vala/16.1.nix +++ b/pkgs/development/compilers/vala/16.1.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1n708n9ixyy9qrzyv1wf4ybvcclx43ib9ki028wwpvkz6kv8zqlb"; }; - buildNativeInputs = [ yacc flex pkgconfig xz ]; + nativeBuildInputs = [ yacc flex pkgconfig xz ]; buildInputs = [ glib ]; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index a60a71e35806..bce86ac59847 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "09i2s0dwmrk147ind2dx7nq845g12fp6fsjqrphhrr0dbi0zzgh3"; }; - buildNativeInputs = [ yacc flex pkgconfig xz ]; + nativeBuildInputs = [ yacc flex pkgconfig xz ]; buildInputs = [ glib ]; diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix index bf1efbbb1a95..f44f71020b4c 100644 --- a/pkgs/development/interpreters/guile/1.8.nix +++ b/pkgs/development/interpreters/guile/1.8.nix @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { # GCC 4.6 raises a number of set-but-unused warnings. configureFlags = [ "--disable-error-on-warning" ]; - buildNativeInputs = [ makeWrapper gawk ]; + nativeBuildInputs = [ makeWrapper gawk ]; propagatedBuildInputs = [ readline gmp libtool ]; - selfBuildNativeInput = true; + selfNativeBuildInput = true; postInstall = '' wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin" diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 421c35997e39..d09e995e95c0 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -14,7 +14,7 @@ sha256 = "0f53pxkia4v17n0avwqlcjpy0n89hkazm2xsa6p84lv8k6k8y9vg"; }; - buildNativeInputs = [ makeWrapper gawk pkgconfig ]; + nativeBuildInputs = [ makeWrapper gawk pkgconfig ]; buildInputs = [ readline libtool libunistring libffi ]; propagatedBuildInputs = [ gmp boehmgc ] @@ -25,7 +25,7 @@ ++ [ libtool libunistring ]; # A native Guile 2.0 is needed to cross-build Guile. - selfBuildNativeInput = true; + selfNativeBuildInput = true; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/GConf/3.x.nix b/pkgs/development/libraries/GConf/3.x.nix index 4f6d5a9a04ac..82c0c1f2c435 100644 --- a/pkgs/development/libraries/GConf/3.x.nix +++ b/pkgs/development/libraries/GConf/3.x.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [ glib dbus_glib ]; buildInputs = [ polkit gtk3 libxml2 ]; - buildNativeInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool ]; configureFlags = "--disable-orbit"; diff --git a/pkgs/development/libraries/acl/default.nix b/pkgs/development/libraries/acl/default.nix index 3ccb56919800..bc0821f39fdd 100644 --- a/pkgs/development/libraries/acl/default.nix +++ b/pkgs/development/libraries/acl/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "09aj30m49ivycl3irram8c3givc0crivjm3ymw0nhfaxrwhlb186"; }; - buildNativeInputs = [ gettext ]; + nativeBuildInputs = [ gettext ]; buildInputs = [ attr ]; # Upstream use C++-style comments in C code. Remove them. diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix index 6c6e30137179..0ddb1aaa7492 100644 --- a/pkgs/development/libraries/aqbanking/default.nix +++ b/pkgs/development/libraries/aqbanking/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ gwenhywfar gmp zlib ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; configureFlags = "--with-gwen-dir=${gwenhywfar}"; diff --git a/pkgs/development/libraries/arts/default.nix b/pkgs/development/libraries/arts/default.nix index 50c270f534e7..8af92cf5eea5 100644 --- a/pkgs/development/libraries/arts/default.nix +++ b/pkgs/development/libraries/arts/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { --enable-final ''; - buildNativeInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkgconfig perl ]; buildInputs = [glib kdelibs libX11 libXext zlib libjpeg libpng qt3]; diff --git a/pkgs/development/libraries/asc-support/default.nix b/pkgs/development/libraries/asc-support/default.nix index a078faaceb12..a2b2588d9cc3 100644 --- a/pkgs/development/libraries/asc-support/default.nix +++ b/pkgs/development/libraries/asc-support/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { patches = if isMingw then [./mingw.patch] else []; buildInputs = [aterm toolbuslib asfSupport errorSupport ptSupport sglr tideSupport cLibrary configSupport ptableSupport rstoreSupport ]; - buildNativeInputs = [pkgconfig]; + nativeBuildInputs = [pkgconfig]; dontStrip = isMingw; } diff --git a/pkgs/development/libraries/asf-support/default.nix b/pkgs/development/libraries/asf-support/default.nix index e2b7a14e8191..9a712a869af7 100644 --- a/pkgs/development/libraries/asf-support/default.nix +++ b/pkgs/development/libraries/asf-support/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; buildInputs = [aterm errorSupport ptSupport]; - buildNativeInputs = [pkgconfig]; + nativeBuildInputs = [pkgconfig]; dontStrip = isMingw; } diff --git a/pkgs/development/libraries/atk/2.6.x.nix b/pkgs/development/libraries/atk/2.6.x.nix index eba56776bd2b..4dd0ae1eeafb 100644 --- a/pkgs/development/libraries/atk/2.6.x.nix +++ b/pkgs/development/libraries/atk/2.6.x.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "eff663f90847620bb68c9c2cbaaf7f45e2ff44163b9ab3f10d15be763680491f"; }; - buildNativeInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkgconfig perl ]; propagatedBuildInputs = [ glib ]; diff --git a/pkgs/development/libraries/atkmm/2.22.x.nix b/pkgs/development/libraries/atkmm/2.22.x.nix index 66237c4c7b99..b25432491fbc 100644 --- a/pkgs/development/libraries/atkmm/2.22.x.nix +++ b/pkgs/development/libraries/atkmm/2.22.x.nix @@ -10,5 +10,5 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ atk glibmm ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; } diff --git a/pkgs/development/libraries/attica/default.nix b/pkgs/development/libraries/attica/default.nix index a719537dd2fb..9a5002551cb8 100644 --- a/pkgs/development/libraries/attica/default.nix +++ b/pkgs/development/libraries/attica/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ qt4 ]; - buildNativeInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { description = "A library to access Open Collaboration Service providers"; diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix index adc530863068..3c5855ea284f 100644 --- a/pkgs/development/libraries/attr/default.nix +++ b/pkgs/development/libraries/attr/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "07qf6kb2zk512az481bbnsk9jycn477xpva1a726n5pzlzf9pmnw"; }; - buildNativeInputs = [ gettext ]; + nativeBuildInputs = [ gettext ]; configureFlags = "MAKE=make MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ECHO=echo SED=sed AWK=gawk"; diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index 0789ef0ea7ca..39a03e0b0029 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ++ (stdenv.lib.optional qt4Support qt4) ++ libiconvOrEmpty; - buildNativeInputs = [ pkgconfig gettext intltool ]; + nativeBuildInputs = [ pkgconfig gettext intltool ]; configureFlags = [ "--disable-qt3" "--disable-gdbm" "--disable-mono" diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/development/libraries/boolstuff/default.nix index c05fddc18cf0..9b5c25d4ca4e 100644 --- a/pkgs/development/libraries/boolstuff/default.nix +++ b/pkgs/development/libraries/boolstuff/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0akwb57lnzq1ak32k6mdxbma2gj0pqhj8y9m6hq79djb9s3mxvmn"; }; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta = { description = "Library for operations on boolean expression binary trees"; diff --git a/pkgs/development/libraries/c-library/default.nix b/pkgs/development/libraries/c-library/default.nix index 96bb82f54be8..714e8b66089c 100644 --- a/pkgs/development/libraries/c-library/default.nix +++ b/pkgs/development/libraries/c-library/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { patches = if isMingw then [./mingw.patch] else []; buildInputs = [aterm]; - buildNativeInputs = [pkgconfig]; + nativeBuildInputs = [pkgconfig]; dontStrip = isMingw; } diff --git a/pkgs/development/libraries/caelum/default.nix b/pkgs/development/libraries/caelum/default.nix index 75eb5109b453..e48ed5a76928 100644 --- a/pkgs/development/libraries/caelum/default.nix +++ b/pkgs/development/libraries/caelum/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ois ogre boost ]; - buildNativeInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/clucene-core/2.x.nix b/pkgs/development/libraries/clucene-core/2.x.nix index 72460184df21..97c7a4c9f53a 100644 --- a/pkgs/development/libraries/clucene-core/2.x.nix +++ b/pkgs/development/libraries/clucene-core/2.x.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1arffdwivig88kkx685pldr784njm0249k0rb1f1plwavlrw9zfx"; }; - buildNativeInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ boost zlib ]; diff --git a/pkgs/development/libraries/clutter-gtk/0.10.8.nix b/pkgs/development/libraries/clutter-gtk/0.10.8.nix index b44801928e90..182040f5c414 100644 --- a/pkgs/development/libraries/clutter-gtk/0.10.8.nix +++ b/pkgs/development/libraries/clutter-gtk/0.10.8.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ clutter gtk ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; postBuild = "rm -rf $out/share/gtk-doc"; diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index a48ff93ce228..3e13ff2da7e3 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ clutter gtk3 ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; postBuild = "rm -rf $out/share/gtk-doc"; diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 52a9eaa98fa1..6c6891fb279c 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0bzsvnharawfg525lpavrp55mq4aih5nb01dwwqwnccg8hk9z2fw"; }; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango atk json_glib diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 11a6e374e2e4..b697ed87edc4 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1ix87hz3qxqysqwx58wbc46lzchlmfs08fjzbf3l6mmsqj8gs9pc"; }; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage ]; diff --git a/pkgs/development/libraries/config-support/default.nix b/pkgs/development/libraries/config-support/default.nix index 72b1bea7b203..d25accd4664e 100644 --- a/pkgs/development/libraries/config-support/default.nix +++ b/pkgs/development/libraries/config-support/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; buildInputs = [aterm]; - buildNativeInputs = [pkgconfig]; + nativeBuildInputs = [pkgconfig]; dontStrip = isMingw; } diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index 5fccc7ad66b7..47e83e7780cc 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "04fiwld5yaxyggxlvdmbaqkngh4fn8gfkkqckcp3274bpgb82z19"; }; - buildNativeInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ pkgconfig gettext ]; buildInputs = [ expat ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 0b8029c94dbf..5716ac6648a0 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -17,7 +17,7 @@ in rec { libs = stdenv.mkDerivation { name = "dbus-library-" + version; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ expat ]; @@ -48,7 +48,7 @@ in rec { configureFlags = "${configureFlags} --with-dbus-daemondir=${daemon}/bin"; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ expat libs ] ++ stdenv.lib.optionals useX11 [ libX11 libICE libSM ]; diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix index 9b4241aa3be5..7092e08ec606 100644 --- a/pkgs/development/libraries/directfb/default.nix +++ b/pkgs/development/libraries/directfb/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { patches = [ ./ftbfs.patch ]; - buildNativeInputs = [ perl ]; + nativeBuildInputs = [ perl ]; buildInputs = [ zlib libjpeg freetype giflib libpng ] ++ stdenv.lib.optional enableSDL SDL diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index 6884aca16fcb..1311be53ab51 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "1akcb4g5hvc664gfc6sxb6f6jrm55fgks6017wg0smyvmm6k09v0"; }; - buildNativeInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { description = "C++ template library for linear algebra: vectors, matrices, and related algorithms"; diff --git a/pkgs/development/libraries/error-support/default.nix b/pkgs/development/libraries/error-support/default.nix index da59c3bb9b46..766a0dbef1d8 100644 --- a/pkgs/development/libraries/error-support/default.nix +++ b/pkgs/development/libraries/error-support/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; buildInputs = [aterm toolbuslib]; - buildNativeInputs = [pkgconfig]; + nativeBuildInputs = [pkgconfig]; dontStrip = isMingw; } diff --git a/pkgs/development/libraries/farsight2/default.nix b/pkgs/development/libraries/farsight2/default.nix index cbb21073685c..3467ac2cc3bc 100644 --- a/pkgs/development/libraries/farsight2/default.nix +++ b/pkgs/development/libraries/farsight2/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libnice python pygobject gst_python gupnp_igd ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ gstreamer gst_plugins_base ]; diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix index 3babcb828337..87764483f47e 100644 --- a/pkgs/development/libraries/farstream/default.nix +++ b/pkgs/development/libraries/farstream/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libnice python pygobject gupnp_igd ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ gstreamer gst_plugins_base gst_python gst_plugins_good gst_plugins_bad gst_ffmpeg diff --git a/pkgs/development/libraries/fltk/fltk13.nix b/pkgs/development/libraries/fltk/fltk13.nix index d3d89e6a9074..3ab267ad6b4a 100644 --- a/pkgs/development/libraries/fltk/fltk13.nix +++ b/pkgs/development/libraries/fltk/fltk13.nix @@ -14,7 +14,7 @@ composableDerivation.composableDerivation {} { propagatedBuildInputs = [ x11 inputproto libXi freeglut ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; flags = # this could be tidied up (?).. eg why does it require freeglut without glSupport? diff --git a/pkgs/development/libraries/funambol/default.nix b/pkgs/development/libraries/funambol/default.nix index 589ffaba3f96..98049e0ca35a 100644 --- a/pkgs/development/libraries/funambol/default.nix +++ b/pkgs/development/libraries/funambol/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib curl ]; - buildNativeInputs = [ automake libtool autoconf unzip ]; + nativeBuildInputs = [ automake libtool autoconf unzip ]; meta = { description = "SyncML client sdk by Funambol project"; diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index a212946c67f3..6d94eee865f3 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "18cr51y5qacvs2fc2p1bqv32rs8bzgs6l67zhasyl45yx055y218"; }; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ python glib ]; diff --git a/pkgs/development/libraries/gdk-pixbuf/2.26.x.nix b/pkgs/development/libraries/gdk-pixbuf/2.26.x.nix index 07e66df33b57..2876c9b94341 100644 --- a/pkgs/development/libraries/gdk-pixbuf/2.26.x.nix +++ b/pkgs/development/libraries/gdk-pixbuf/2.26.x.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. buildInputs = [ libX11 ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ]; diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index 5da6e3e40f4c..a30d5c78e7f2 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 intltool ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta = { description = "Graph-based image processing framework"; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 107a583d1020..2c651980eda8 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { sed -e "s@${glib}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile) ''; - buildNativeInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool ]; propagatedBuildInputs = [ glib libtool gnutls2 libproxy libgcrypt libtasn1 gsettings_desktop_schemas ]; } diff --git a/pkgs/development/libraries/glib/2.34.x.nix b/pkgs/development/libraries/glib/2.34.x.nix index 7fb61ac20e23..69ed44aeccaa 100644 --- a/pkgs/development/libraries/glib/2.34.x.nix +++ b/pkgs/development/libraries/glib/2.34.x.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (rec { # configure script looks for d-bus but it is only needed for tests buildInputs = [ libiconvOrNull ]; - buildNativeInputs = [ perl pkgconfig gettext python ]; + nativeBuildInputs = [ perl pkgconfig gettext python ]; propagatedBuildInputs = [ pcre zlib libffi ]; diff --git a/pkgs/development/libraries/glibmm/2.30.x.nix b/pkgs/development/libraries/glibmm/2.30.x.nix index 4792ae790be6..a544543d7e3c 100644 --- a/pkgs/development/libraries/glibmm/2.30.x.nix +++ b/pkgs/development/libraries/glibmm/2.30.x.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "15zqgx6rashyhxk89qjqq05p6m40akpgzyjk8bfb3jk68rc2nn39"; }; - buildNativeInputs = [pkgconfig]; + nativeBuildInputs = [pkgconfig]; propagatedBuildInputs = [glib libsigcxx]; meta = { diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/development/libraries/gmp/4.3.2.nix index d25b69411538..df7bd0ea3b96 100644 --- a/pkgs/development/libraries/gmp/4.3.2.nix +++ b/pkgs/development/libraries/gmp/4.3.2.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0x8prpqi9amfcmi7r4zrza609ai9529pjaq0h4aw51i867064qck"; }; - buildNativeInputs = [ m4 ]; + nativeBuildInputs = [ m4 ]; # Prevent the build system from using sub-architecture-specific # instructions (e.g., SSE2 on i686). diff --git a/pkgs/development/libraries/gmp/5.0.5.nix b/pkgs/development/libraries/gmp/5.0.5.nix index 98ebe5fcc256..dba5cafdf573 100644 --- a/pkgs/development/libraries/gmp/5.0.5.nix +++ b/pkgs/development/libraries/gmp/5.0.5.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patches = [ ./ignore-bad-cpuid.patch ]; - buildNativeInputs = [ m4 ]; + nativeBuildInputs = [ m4 ]; configureFlags = # Build a "fat binary", with routines for several sub-architectures diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 3e5ba3079f09..8f496c4312e7 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (rec { buildInputs = [ zlib lzo ] ++ stdenv.lib.optional guileBindings guile; - buildNativeInputs = [ perl ]; + nativeBuildInputs = [ perl ]; propagatedBuildInputs = [ nettle libtasn1 ]; diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 2f1411a0bdaa..4ba4cbb33474 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libgpgerror glib libassuan pth ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; configureFlags = "--with-gpg=${gpgPath}"; } diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix index 8bfeb8a4beac..c3510a69a123 100644 --- a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ gstreamer gst_plugins_base glib qt4 ]; propagatedBuildInputs = [ boost ]; - buildNativeInputs = [ cmake automoc4 flex bison pkgconfig ]; + nativeBuildInputs = [ cmake automoc4 flex bison pkgconfig ]; cmakeFlags = "-DUSE_QT_PLUGIN_DIR=OFF -DUSE_GST_PLUGIN_DIR=OFF"; diff --git a/pkgs/development/libraries/gtk+/2.24.x.nix b/pkgs/development/libraries/gtk+/2.24.x.nix index 2bf657e04e77..11584e0fbe75 100644 --- a/pkgs/development/libraries/gtk+/2.24.x.nix +++ b/pkgs/development/libraries/gtk+/2.24.x.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildNativeInputs = [ perl pkgconfig ]; + nativeBuildInputs = [ perl pkgconfig ]; propagatedBuildInputs = [ xlibs.xlibs glib atk pango gdk_pixbuf cairo diff --git a/pkgs/development/libraries/gtk+/3.2.x.nix b/pkgs/development/libraries/gtk+/3.2.x.nix index 9f333c03fabf..cace1b626f49 100644 --- a/pkgs/development/libraries/gtk+/3.2.x.nix +++ b/pkgs/development/libraries/gtk+/3.2.x.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildNativeInputs = [ perl pkgconfig ]; + nativeBuildInputs = [ perl pkgconfig ]; propagatedBuildInputs = [ xlibs.xlibs glib atk pango gdk_pixbuf cairo diff --git a/pkgs/development/libraries/gtkmm/2.24.x.nix b/pkgs/development/libraries/gtkmm/2.24.x.nix index 56d151101c5d..ec7f01a8be5e 100644 --- a/pkgs/development/libraries/gtkmm/2.24.x.nix +++ b/pkgs/development/libraries/gtkmm/2.24.x.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0gcm91sc1a05c56kzh74l370ggj0zz8nmmjvjaaxgmhdq8lpl369"; }; - buildNativeInputs = [pkgconfig]; + nativeBuildInputs = [pkgconfig]; propagatedBuildInputs = [ glibmm gtk atkmm cairomm pangomm ]; diff --git a/pkgs/development/libraries/gtkmm/3.2.x.nix b/pkgs/development/libraries/gtkmm/3.2.x.nix index 890d4a34519d..d3681b4b3867 100644 --- a/pkgs/development/libraries/gtkmm/3.2.x.nix +++ b/pkgs/development/libraries/gtkmm/3.2.x.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1wkljr2vjvjg5mggi4rvk9k4j2kzh8lc106k2yp8gqjlhk2xm5b1"; }; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ]; diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix index a8bb065d7eb8..20a5f2d9c946 100644 --- a/pkgs/development/libraries/gupnp-igd/default.nix +++ b/pkgs/development/libraries/gupnp-igd/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib python pygobject ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta = { homepage = http://www.gupnp.org/; diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index 5679591878a5..c70d8fcb0c26 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [ libxml2 libsoup gssdp ]; buildInputs = [ glib libuuid ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta = { homepage = http://www.gupnp.org/; diff --git a/pkgs/development/libraries/gwenhywfar/default.nix b/pkgs/development/libraries/gwenhywfar/default.nix index 207b81997af5..724524e2b263 100644 --- a/pkgs/development/libraries/gwenhywfar/default.nix +++ b/pkgs/development/libraries/gwenhywfar/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 gtk ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; QTDIR = qt4; } diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix index 3baa02d26747..bb7f0e23fbf1 100644 --- a/pkgs/development/libraries/haskell/cuda/default.nix +++ b/pkgs/development/libraries/haskell/cuda/default.nix @@ -21,7 +21,7 @@ cabal.mkDerivation (self: { test -f $i && ghc --make $i done - for p in $extraBuildInputs $propagatedBuildNativeInputs; do + for p in $extraBuildInputs $propagatedNativeBuildInputs; do if [ -d "$p/include" ]; then extraLibDirs="$extraLibDirs --extra-include-dir=$p/include" fi diff --git a/pkgs/development/libraries/hspell/dicts.nix b/pkgs/development/libraries/hspell/dicts.nix index a7f0d19865cf..fd456ca6209b 100644 --- a/pkgs/development/libraries/hspell/dicts.nix +++ b/pkgs/development/libraries/hspell/dicts.nix @@ -2,7 +2,7 @@ let dict = a: stdenv.mkDerivation ({ - inherit (hspell) src patchPhase buildNativeInputs; + inherit (hspell) src patchPhase nativeBuildInputs; meta = hspell.meta // { description = "${a.buildFlags} Hebrew dictionary"; } // (if a ? meta then a.meta else {}); diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index de4270008f37..3c5f198cea60 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo. - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; # Filter out `null' inputs. This allows users to `.override' the # derivation and set optional dependencies to `null'. diff --git a/pkgs/development/libraries/ilbc/default.nix b/pkgs/development/libraries/ilbc/default.nix index 3ab4e7e738c9..d77b5d46a79e 100644 --- a/pkgs/development/libraries/ilbc/default.nix +++ b/pkgs/development/libraries/ilbc/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0zf4mvi3jzx6zjrfl2rbhl2m68pzbzpf1vbdmn7dqbfpcb67jpdy"; }; - buildNativeInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; unpackPhase = '' mkdir -v ${name} diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 83adb16bbc8d..d77e2052f811 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ x11 libjpeg libtiff libungif libpng bzip2 ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta = { platforms = stdenv.lib.platforms.gnu; # random choice diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index 6be998b691a5..bfe10490fc7f 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildNativeInputs = [ cmake xz ]; + nativeBuildInputs = [ cmake xz ]; buildInputs = [ libX11 libuuid ]; meta = { diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index 8cf4cc7991f0..4046c05f79e5 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "154l7zk7yh3v8l2l6zm5s2alvd2fzkp6c9i18iajfbna5af5m43b"; }; - buildNativeInputs = [unzip]; + nativeBuildInputs = [unzip]; propagatedBuildInputs = [ libjpeg ]; configureFlags = "--enable-shared"; diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index ad3af7778ff3..8ca1445b1f6d 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ glib ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta = { homepage = http://live.gnome.org/JsonGlib; diff --git a/pkgs/development/libraries/kdevplatform/default.nix b/pkgs/development/libraries/kdevplatform/default.nix index 367987d5dee4..2ff2fac296d8 100644 --- a/pkgs/development/libraries/kdevplatform/default.nix +++ b/pkgs/development/libraries/kdevplatform/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ kdelibs qt4 phonon ]; buildInputs = [ apr aprutil subversion boost qjson ]; - buildNativeInputs = [ cmake automoc4 gettext pkgconfig ]; + nativeBuildInputs = [ cmake automoc4 gettext pkgconfig ]; meta = { maintainers = [ stdenv.lib.maintainers.urkud ]; diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index b0252617d7d7..6c139242f3e7 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { sha256 = "551b623e76c2dba44b5490fb42ccdc491b28cd42841de28237b8edbed0f0711c"; }; - buildNativeInputs = [autoconf automake libtool]; + nativeBuildInputs = [autoconf automake libtool]; buildInputs = stdenv.lib.optionals withAACS [jdk ant libaacs]; NIX_LDFLAGS = stdenv.lib.optionalString withAACS "-laacs"; diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index 823a4839e80d..d2d686405604 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ libwpg libwpd lcms2 ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; CXXFLAGS="--std=gnu++0x"; # For c++11 constants in lcms2.h diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix index 4f0c83f2702b..7f3c02573393 100644 --- a/pkgs/development/libraries/libchop/default.nix +++ b/pkgs/development/libraries/libchop/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0fpdyxww41ba52d98blvnf543xvirq1v9xz1i3x1gm9lzlzpmc2g"; }; - buildNativeInputs = [ pkgconfig gperf ]; + nativeBuildInputs = [ pkgconfig gperf ]; buildInputs = [ zlib bzip2 lzo libgcrypt diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix index aeb9331c8ada..6fa6ca4b6f81 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/default.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { }; buildInputs = [ qt4 ]; - buildNativeInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = "-DWITH_DOC=OFF"; diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index 12008bcbccb0..6efb785b6577 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr mesa libX11 ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; configureFlags = [ "--enable-ILU" "--enable-ILUT" ]; diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix index 3ee43ba3bee0..b8f79f2ae695 100644 --- a/pkgs/development/libraries/libdiscid/default.nix +++ b/pkgs/development/libraries/libdiscid/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "libdiscid-0.2.2"; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake ]; src = fetchurl { diff --git a/pkgs/development/libraries/libdmtx/default.nix b/pkgs/development/libraries/libdmtx/default.nix index 97622bb7b24b..970a1cf05e92 100644 --- a/pkgs/development/libraries/libdmtx/default.nix +++ b/pkgs/development/libraries/libdmtx/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0iin2j3ad7ldj32dwc04g28k54iv3lrc5121rgyphm7l9hvigbvk"; }; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ imagemagick ]; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 3a1e101aa431..a2546bf2d69a 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1slgi61n4dlsfli47ql354fd1ppj7n40jd94wvnsdqx0mna9syrd"; }; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libpthreadstubs libpciaccess udev ]; patches = stdenv.lib.optional stdenv.isDarwin ./libdrm-apple.patch; diff --git a/pkgs/development/libraries/libgnome-keyring/3.x.nix b/pkgs/development/libraries/libgnome-keyring/3.x.nix index a8b8e98ced99..54a023a16f8b 100644 --- a/pkgs/development/libraries/libgnome-keyring/3.x.nix +++ b/pkgs/development/libraries/libgnome-keyring/3.x.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; propagatedBuildInputs = [ glib dbus_libs libgcrypt ]; - buildNativeInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool ]; meta = { inherit (glib.meta) platforms maintainers; diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix index 05a21f3c82e2..4aadafff8441 100644 --- a/pkgs/development/libraries/libgnome-keyring/default.nix +++ b/pkgs/development/libraries/libgnome-keyring/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; propagatedBuildInputs = [ glib dbus_libs libgcrypt ]; - buildNativeInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool ]; meta = { inherit (glib.meta) platforms maintainers; diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index b55da62c9fb2..3edc8d0ac6ca 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "14h20s0kwqr1nsj90dgjwzs0r3h7z1cpmnivrikd0rrg4m2jvcsr"; }; - buildNativeInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ pkgconfig gettext ]; buildInputs = [ libtool libjpeg ]; # These are mentioned in the Requires line of libgphoto's pkg-config file. diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index e271e9661809..0ad46e2ed5f4 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib libxml2 sqlite zlib sg3_utils gdk_pixbuf taglib libimobiledevice python pygobject mutagen ]; - buildNativeInputs = [ gettext perlXMLParser intltool pkgconfig perl + nativeBuildInputs = [ gettext perlXMLParser intltool pkgconfig perl libimobiledevice.swig ]; meta = { diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 0acd4a77b46d..147ea283ddac 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "05zvaazf0d584nfirwsz7889lbsl4v781hslv3kda6akiwbwdhdz"; }; - buildNativeInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkgconfig ]; buildInputs = [ perl perlXMLParser gettext bzip2 python ] ++ stdenv.lib.optionals gnomeSupport [ gnome_vfs gdk_pixbuf ]; diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index f214c7acf73d..b592f458c6ce 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -8,5 +8,5 @@ stdenv.mkDerivation { }; propagatedBuildInputs = [ glib ]; - buildNativeInputs = [ pkgconfig perl intltool ]; + nativeBuildInputs = [ pkgconfig perl intltool ]; } diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index 4a4da810ae67..5e7a4cff741f 100644 --- a/pkgs/development/libraries/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -9,5 +9,5 @@ stdenv.mkDerivation { }; configureFlags = if stdenv ? glibc then "--with-zoneinfo-dir=${stdenv.glibc}/share/zoneinfo" else ""; propagatedBuildInputs = [ libxml2 gtk3 libsoup GConf3 ]; - buildNativeInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool ]; } diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/development/libraries/libharu/default.nix index 3b8c4be54e05..db1aa4a7473c 100644 --- a/pkgs/development/libraries/libharu/default.nix +++ b/pkgs/development/libraries/libharu/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { sha256 = "1993vskpycyr43rwdp8f688fc5zvllrqq935r7rhsgbqbipkk73h"; }; - buildNativeInputs = [ patchutils ]; + nativeBuildInputs = [ patchutils ]; buildCommand = "filterdiff -x '*/CHANGES' $src > $out"; }) diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 80f3a1b8e71f..59d352cf730e 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { rev = "1130"; sha256 = "56caf19abdf44807fda75a67ef0886319551e53c4e4ece4da4fc862e34c64e1a"; }; - buildNativeInputs = [ perl cmake ]; + nativeBuildInputs = [ perl cmake ]; patches = [ ./respect-env-tzdir.patch ]; } diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix index b4bb3b47a35e..a21d9bf7b5de 100644 --- a/pkgs/development/libraries/libimobiledevice/default.nix +++ b/pkgs/development/libraries/libimobiledevice/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libimobiledevice-1.0.6"; - buildNativeInputs = [ python libplist.swig pkgconfig ]; + nativeBuildInputs = [ python libplist.swig pkgconfig ]; buildInputs = [ readline ]; propagatedBuildInputs = [ usbmuxd glib gnutls libgcrypt libtasn1 libplist ]; diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix index 083fbf13c817..a452cb7609e1 100644 --- a/pkgs/development/libraries/libktorrent/default.nix +++ b/pkgs/development/libraries/libktorrent/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1b4ibkba27ivvjsh5s93xwlcgzvvwsgl6mcd8g96d1al05n2ccw9"; }; - buildNativeInputs = [ cmake automoc4 gettext ]; + nativeBuildInputs = [ cmake automoc4 gettext ]; buildInputs = [ kdelibs phonon gmp qca2 boost libgcrypt ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 24b93221d11e..b1e8342ca91b 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { prefixKey = "--prefix "; propagatedBuildInputs = [ qt4 libsamplerate fftwSinglePrec ]; - buildNativeInputs = [ ruby pkgconfig which ]; + nativeBuildInputs = [ ruby pkgconfig which ]; configureFlags = "--release"; diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix index 178e65d2506f..6e2e2c949cca 100644 --- a/pkgs/development/libraries/libmad/default.nix +++ b/pkgs/development/libraries/libmad/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { patches = [ ./001-mips_removal_h_constraint.patch ./pkgconfig.patch ]; - buildNativeInputs = [ autoconf ]; + nativeBuildInputs = [ autoconf ]; # The -fforce-mem flag has been removed in GCC 4.3. preConfigure = '' diff --git a/pkgs/development/libraries/libmms/default.nix b/pkgs/development/libraries/libmms/default.nix index 8d24ddbb6300..0f6d220861c5 100644 --- a/pkgs/development/libraries/libmms/default.nix +++ b/pkgs/development/libraries/libmms/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta = { homepage = http://libmms.sourceforge.net; diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix index 5a73fd417f90..fcaf95672e18 100644 --- a/pkgs/development/libraries/libmng/default.nix +++ b/pkgs/development/libraries/libmng/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { preConfigure = "unmaintained/autogen.sh"; - buildNativeInputs = [ automake110x autoconf libtool ]; + nativeBuildInputs = [ automake110x autoconf libtool ]; propagatedBuildInputs = [ zlib libpng libjpeg lcms ]; diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix index e407b75c8bbe..f3c2d3b766df 100644 --- a/pkgs/development/libraries/libogg/default.nix +++ b/pkgs/development/libraries/libogg/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0jy79ffkl34vycnwfsj4svqsdg1lwy2l1rr49y8r4d44kh12a5r3"; }; - buildNativeInputs = [ xz ]; + nativeBuildInputs = [ xz ]; meta = { homepage = http://xiph.org/ogg/; diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 8f786469a555..73a7cd2e4bb5 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1gfy00zv6blplw3405q46khmjhdnp6ylblvygjjjk5skgvpscdd1"; }; - buildNativeInputs = [ flex bison ]; + nativeBuildInputs = [ flex bison ]; configureFlags = "--with-pcap=linux"; diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix index 816269599387..95da6dfb7499 100644 --- a/pkgs/development/libraries/libplist/default.nix +++ b/pkgs/development/libraries/libplist/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "libplist-1.3"; - buildNativeInputs = [ cmake swig2 ]; + nativeBuildInputs = [ cmake swig2 ]; patches = [ ./swig.patch ]; diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix index ebdb9e756aaa..031e2aa1a914 100644 --- a/pkgs/development/libraries/libpng/12.nix +++ b/pkgs/development/libraries/libpng/12.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib ]; - buildNativeInputs = [ xz ]; + nativeBuildInputs = [ xz ]; passthru = { inherit zlib; }; diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix index bcab7e03917f..9b65487ccfb2 100644 --- a/pkgs/development/libraries/librdf/rasqal.nix +++ b/pkgs/development/libraries/librdf/rasqal.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1drjcy1k9g72iis0ghllzn7n0w03bahhrd2p5hs39anbm6mr0yk9"; }; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gmp pcre libxml2 ]; diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix index e825e1d852b2..47e25877be9f 100644 --- a/pkgs/development/libraries/librdf/redland.nix +++ b/pkgs/development/libraries/librdf/redland.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1i460q9gslb7l75hjwc6w2kp2wk7fgp8lr7phamg33c6j013y30k"; }; - buildNativeInputs = [ perl pkgconfig ]; + nativeBuildInputs = [ perl pkgconfig ]; buildInputs = [ openssl libxslt curl pcre libxml2 ] ++ stdenv.lib.optional withMysql mysql diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 3f84a69e3f46..0da302038769 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; buildInputs = [ libxml2 libgsf bzip2 libcroco ]; propagatedBuildInputs = [ glib gtk ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; # It wants to add loaders and update the loaders.cache in gdk-pixbuf # Patching the Makefiles to it creates rsvg specific loaders and the diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 87aaafabcc4b..08784a0f2574 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libxml2 ] ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring sqlite ]; passthru.propagatedUserEnvPackages = [ glib_networking ]; diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index f8621f3b78b2..c2b812744c9a 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib libgcrypt ]; - buildNativeInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = "-DWITH_GCRYPT=ON"; diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/development/libraries/libvisio/default.nix index 99146cd02cc4..77e7e0a56f64 100644 --- a/pkgs/development/libraries/libvisio/default.nix +++ b/pkgs/development/libraries/libvisio/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1iqkz280mi066bdccyxagkqm41i270nx01cacvgjq2pflgd3njd1"; }; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ boost libwpd libwpg ]; configureFlags = "--disable-werror"; diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix index efb210d65762..b1277b87e6a7 100644 --- a/pkgs/development/libraries/libvorbis/default.nix +++ b/pkgs/development/libraries/libvorbis/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1gby6hapz9njx4l9g0pndyk4q83z5fgrgc30mfwfgx7bllspsk43"; }; - buildNativeInputs = [ xz ]; + nativeBuildInputs = [ xz ]; propagatedBuildInputs = [ libogg ]; meta = { diff --git a/pkgs/development/libraries/libwpd/0.8.nix b/pkgs/development/libraries/libwpd/0.8.nix index ceaa0d36d4b5..536db35fb4e9 100644 --- a/pkgs/development/libraries/libwpd/0.8.nix +++ b/pkgs/development/libraries/libwpd/0.8.nix @@ -12,5 +12,5 @@ stdenv.mkDerivation rec { buildInputs = [ glib libgsf libxml2 ]; - buildNativeInputs = [ pkgconfig bzip2 ]; + nativeBuildInputs = [ pkgconfig bzip2 ]; } diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix index d857b6e17ea4..1c56022de580 100644 --- a/pkgs/development/libraries/libwpd/default.nix +++ b/pkgs/development/libraries/libwpd/default.nix @@ -10,5 +10,5 @@ stdenv.mkDerivation rec { buildInputs = [ glib libgsf libxml2 ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; } diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix index d140b8b8a0cd..a97b8fc2fd85 100644 --- a/pkgs/development/libraries/libwpg/default.nix +++ b/pkgs/development/libraries/libwpg/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libwpd ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta = { homepage = http://libwpg.sourceforge.net; diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index 419f9a497c08..e28f4b394700 100644 --- a/pkgs/development/libraries/libxklavier/default.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # TODO: enable xmodmap support, needs xmodmap DB propagatedBuildInputs = [ libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; configureFlags = '' --with-xkb-base=${xkeyboard_config}/etc/X11/xkb diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 3d5dff53ff4e..f7f8514a3967 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; # TODO: make it load plugins from *_PLUGIN_PATH - buildNativeInputs = [pkgconfig intltool]; + nativeBuildInputs = [pkgconfig intltool]; propagatedBuildInputs = [alsaLib ffmpeg speex ortp pulseaudio xorg.libX11 xorg.libXv xorg.libXext libv4l libtheora libvpx gsm ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index f72638677d1c..d3f7afbd3084 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { buildInputs = [ expat libdrm libXxf86vm libXfixes libXdamage glproto dri2proto libxml2Python libX11 libXext libxcb libXt udev ]; - buildNativeInputs = [ pkgconfig python makedepend file flex bison ]; + nativeBuildInputs = [ pkgconfig python makedepend file flex bison ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/mythes/default.nix b/pkgs/development/libraries/mythes/default.nix index ff06f2a00506..8fc160ae11d5 100644 --- a/pkgs/development/libraries/mythes/default.nix +++ b/pkgs/development/libraries/mythes/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ hunspell ]; - buildNativeInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkgconfig perl ]; meta = { homepage = http://hunspell.sourceforge.net/; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index a6b9a69e6e1f..569d7fe2a328 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (rec { ${if unicode then "--enable-widec" else ""}${if cxx then "" else "--without-cxx-binding"} ''; - selfBuildNativeInput = true; + selfNativeBuildInput = true; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index 95bde495c0ef..13ab00e41be6 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ libnl qt4 ]; - buildNativeInputs = [ pkgconfig python ]; + nativeBuildInputs = [ pkgconfig python ]; configureFlags = "--without-gobject CFLAGS=--std=gnu99"; diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/pkgs/development/libraries/ogrepaged/default.nix index 6b2b9c9e4a65..f508637dfefb 100644 --- a/pkgs/development/libraries/ogrepaged/default.nix +++ b/pkgs/development/libraries/ogrepaged/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ois ogre libX11 boost ]; - buildNativeInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; cmakeFlags = "-DPAGEDGEOMETRY_BUILD_SAMPLES=OFF"; diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix index 455dbceff23c..e6df13eed34e 100644 --- a/pkgs/development/libraries/openbabel/default.nix +++ b/pkgs/development/libraries/openbabel/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # TODO : separate lib and apps buildInputs = [ zlib libxml2 eigen python cairo ]; - buildNativeInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; meta = { platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 207c14bdce05..09a36247348d 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk glib libjpeg libpng libtiff jasper ffmpeg xineLib gstreamer ]; - buildNativeInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 2eb02e084750..1e4b7d2e0091 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders; - buildNativeInputs = [ perl ]; + nativeBuildInputs = [ perl ]; # On x86_64-darwin, "./config" misdetects the system as # "darwin-i386-cc". So specify the system type explicitly. diff --git a/pkgs/development/libraries/pango/1.30.x.nix b/pkgs/development/libraries/pango/1.30.x.nix index 7168c1b6c9d6..2fd828a8737f 100644 --- a/pkgs/development/libraries/pango/1.30.x.nix +++ b/pkgs/development/libraries/pango/1.30.x.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional stdenv.isDarwin gettext; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ x11 glib cairo libpng ]; diff --git a/pkgs/development/libraries/pangomm/2.28.x.nix b/pkgs/development/libraries/pangomm/2.28.x.nix index 5cd4744fed38..7f4d14dfbacf 100644 --- a/pkgs/development/libraries/pangomm/2.28.x.nix +++ b/pkgs/development/libraries/pangomm/2.28.x.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "10kcdpg080m393f1vz0km41kd3483fkyabprm59gvjwklxkcp3bp"; }; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pango glibmm cairomm libpng ]; meta = { diff --git a/pkgs/development/libraries/pgen/default.nix b/pkgs/development/libraries/pgen/default.nix index 91c9f16f5c87..53dc7a768ee3 100644 --- a/pkgs/development/libraries/pgen/default.nix +++ b/pkgs/development/libraries/pgen/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation ( rec { }; buildInputs = [aterm toolbuslib cLibrary configSupport ptSupport ptableSupport errorSupport tideSupport sdfSupport sglr ascSupport asfSupport]; - buildNativeInputs = [pkgconfig]; + nativeBuildInputs = [pkgconfig]; dontStrip = isMingw; } // ( if isMingw then { NIX_CFLAGS_COMPILE = "-O2 -Wl,--stack=0x2300000"; } else {} ) ) diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix index b2677eb1e7a5..24a261065ebd 100644 --- a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix +++ b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ phonon qt4 gstreamer gst_plugins_base ]; - buildNativeInputs = [ cmake automoc4 pkgconfig ]; + nativeBuildInputs = [ cmake automoc4 pkgconfig ]; meta = { homepage = http://phonon.kde.org/; diff --git a/pkgs/development/libraries/phonon-backend-vlc/default.nix b/pkgs/development/libraries/phonon-backend-vlc/default.nix index faa88f8854f9..97e778cc1f58 100644 --- a/pkgs/development/libraries/phonon-backend-vlc/default.nix +++ b/pkgs/development/libraries/phonon-backend-vlc/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "1233szd05ahaxyk1sjis374n90m40svfks2aq9jx3g3lxygzwmi2"; }; - buildNativeInputs = [ cmake automoc4 xz ]; + nativeBuildInputs = [ cmake automoc4 xz ]; buildInputs = [ qt4 vlc_ phonon ]; diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 2c70957746d2..bd74b9372764 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 pulseaudio ]; - buildNativeInputs = [ cmake automoc4 ]; + nativeBuildInputs = [ cmake automoc4 ]; meta = { homepage = http://phonon.kde.org/; diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix index fef902fec035..501516e8a5b5 100644 --- a/pkgs/development/libraries/physfs/default.nix +++ b/pkgs/development/libraries/physfs/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "02dwy0vsn2dp31f15vxd3yxxr1rgy25ab7ncavyh73i290qnsadf"; }; - buildNativeInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; patchPhase = '' sed s,-Werror,, -i CMakeLists.txt diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index 44ae11a6317b..6b79482c330e 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0icpxh1l1dpviq2zwy764dhg8y03zwyf4pgw4s7kb165nvh9v5kv"; }; propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng ]; - buildNativeInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ lua5 stdenv.gcc.libc ]; cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF"; diff --git a/pkgs/development/libraries/polkit-qt-1/default.nix b/pkgs/development/libraries/polkit-qt-1/default.nix index 0c1a0a79584b..13bc992d0263 100644 --- a/pkgs/development/libraries/polkit-qt-1/default.nix +++ b/pkgs/development/libraries/polkit-qt-1/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patches = [ ./polkit-install.patch ]; - buildNativeInputs = [ cmake automoc4 ]; + nativeBuildInputs = [ cmake automoc4 ]; propagatedBuildInputs = [ polkit glib qt4 ]; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index d2ad40615672..2512979bfa3d 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals gtkSupport [ glib gtk ] ++ stdenv.lib.optional qt4Support qt4; - buildNativeInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkgconfig cmake ]; cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON"; diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix index 8cad9022d911..b24b4e06cb94 100644 --- a/pkgs/development/libraries/ppl/default.nix +++ b/pkgs/development/libraries/ppl/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1sxviip4yk6gp453pid5scy1ba66dzdpr02i1416yk7lkv0x3yz3"; }; - buildNativeInputs = [ perl gnum4 ]; + nativeBuildInputs = [ perl gnum4 ]; propagatedBuildInputs = [ gmpxx ]; configureFlags = "--disable-watchdog"; diff --git a/pkgs/development/libraries/prison/default.nix b/pkgs/development/libraries/prison/default.nix index ca8ba46d7dcb..7beb93eb4620 100644 --- a/pkgs/development/libraries/prison/default.nix +++ b/pkgs/development/libraries/prison/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 qrencode libdmtx ]; - buildNativeInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; meta = { description = "Qt4 library for QR-codes"; diff --git a/pkgs/development/libraries/pt-support/default.nix b/pkgs/development/libraries/pt-support/default.nix index c2264eebddc7..063fdd7cc049 100644 --- a/pkgs/development/libraries/pt-support/default.nix +++ b/pkgs/development/libraries/pt-support/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation ( rec { }; buildInputs = [aterm toolbuslib errorSupport]; - buildNativeInputs = [pkgconfig]; + nativeBuildInputs = [pkgconfig]; dontStrip = isMingw; } // ( if isMingw then { NIX_CFLAGS_COMPILE = "-O2 -Wl,--stack=0x2300000"; } else {} ) ) diff --git a/pkgs/development/libraries/ptable-support/default.nix b/pkgs/development/libraries/ptable-support/default.nix index c95a82d42876..357d288c7320 100644 --- a/pkgs/development/libraries/ptable-support/default.nix +++ b/pkgs/development/libraries/ptable-support/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; buildInputs = [aterm ptSupport]; - buildNativeInputs = [pkgconfig]; + nativeBuildInputs = [pkgconfig]; dontStrip = isMingw; } diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix index 6af622c0a15b..1da9ef193b5f 100644 --- a/pkgs/development/libraries/qca2/default.nix +++ b/pkgs/development/libraries/qca2/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 ]; - buildNativeInputs = [ which ]; + nativeBuildInputs = [ which ]; preBuild = '' diff --git a/pkgs/development/libraries/qca2/ossl.nix b/pkgs/development/libraries/qca2/ossl.nix index 1e0c583b7a5d..153d3ba57467 100644 --- a/pkgs/development/libraries/qca2/ossl.nix +++ b/pkgs/development/libraries/qca2/ossl.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "ef2c0307e8834e1e7cb23b6fea1cc22486328a37186301a6c11161b1c93d834b"; }; buildInputs = [ qt4 qca2 openssl ]; - buildNativeInputs = [ which ]; + nativeBuildInputs = [ which ]; dontAddPrefix = true; configureFlags="--no-separate-debug-info --with-qca=${qca2} --with-openssl-inc=${openssl}/include --with-openssl-lib=${openssl}/lib"; diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix index 6d15ce576ff8..b81dbda15860 100644 --- a/pkgs/development/libraries/qhull/default.nix +++ b/pkgs/development/libraries/qhull/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "127zpjp6sm8c101hz239k82lpxqcqf4ksdyfqc2py2sm22kclpm3"; }; - buildNativeInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = "-DMAN_INSTALL_DIR=share/man/man1 -DDOC_INSTALL_DIR=share/doc/qhull"; diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index ba796259f703..91eec5fcd315 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { sha256 = "0jd4g3bwkgk2s4flbmgisyihm7cam964gzb3pawjlkhas01zghz8"; }; - buildNativeInputs = [ which ]; + nativeBuildInputs = [ which ]; propagatedBuildInputs = [x11 libXft libXrender zlib libjpeg libpng]; configureFlags = " diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 0acf5c07bbde..ee449f6471b7 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { mysql postgresql sqlite libjpeg libmng libtiff icu ] ++ optionals gtkStyle [ gtk gdk_pixbuf ]; - buildNativeInputs = [ perl pkgconfig which ]; + nativeBuildInputs = [ perl pkgconfig which ]; prefixKey = "-prefix "; diff --git a/pkgs/development/libraries/rstore-support/default.nix b/pkgs/development/libraries/rstore-support/default.nix index 95c6d0a0b52d..c18f52e84d7c 100644 --- a/pkgs/development/libraries/rstore-support/default.nix +++ b/pkgs/development/libraries/rstore-support/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; buildInputs = [aterm toolbuslib]; - buildNativeInputs = [pkgconfig]; + nativeBuildInputs = [pkgconfig]; dontStrip = isMingw; } diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index 9f25011b76f8..029deecb93a7 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [ atlasMaybeShared ]; buildInputs = [ gfortran cmake ]; - buildNativeInputs = [ python ]; + nativeBuildInputs = [ python ]; cmakeFlags = [ "-DUSE_OPTIMIZED_BLAS=ON" diff --git a/pkgs/development/libraries/sdf-support/default.nix b/pkgs/development/libraries/sdf-support/default.nix index 0604a099d3ce..8095650b12ff 100644 --- a/pkgs/development/libraries/sdf-support/default.nix +++ b/pkgs/development/libraries/sdf-support/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { patches = if isMingw then [./mingw.patch] else []; buildInputs = [aterm toolbuslib errorSupport ptSupport]; - buildNativeInputs = [pkgconfig]; + nativeBuildInputs = [pkgconfig]; dontStrip = isMingw; } diff --git a/pkgs/development/libraries/sglr/default.nix b/pkgs/development/libraries/sglr/default.nix index 449667c6b527..f6c14eae464d 100644 --- a/pkgs/development/libraries/sglr/default.nix +++ b/pkgs/development/libraries/sglr/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }; buildInputs = [aterm toolbuslib cLibrary configSupport ptSupport ptableSupport errorSupport]; - buildNativeInputs = [pkgconfig]; + nativeBuildInputs = [pkgconfig]; dontStrip = isMingw; } diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix index 3ce49e8ffaff..950d1302dad1 100644 --- a/pkgs/development/libraries/sofia-sip/default.nix +++ b/pkgs/development/libraries/sofia-sip/default.nix @@ -9,5 +9,5 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib openssl ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; } diff --git a/pkgs/development/libraries/soprano/default.nix b/pkgs/development/libraries/soprano/default.nix index 7705ee1893d9..7a3d6eacde57 100644 --- a/pkgs/development/libraries/soprano/default.nix +++ b/pkgs/development/libraries/soprano/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { # We disable the Java backend, since we do not need them and they make the closure size much bigger buildInputs = [ qt4 clucene_core librdf_redland libiodbc ]; - buildNativeInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; meta = { homepage = http://soprano.sourceforge.net/; diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix index 60b148f870e5..80fbb53953a1 100644 --- a/pkgs/development/libraries/soqt/default.nix +++ b/pkgs/development/libraries/soqt/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ coin3d qt4 ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta = { homepage = http://www.coin3d.org/; diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index fc2e5bb72c5f..2bcb9e593b86 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { libXrandr libXfixes libXrender libXext libXinerama python pyparsing ]; - buildNativeInputs = [ pkgconfig spice_protocol ]; + nativeBuildInputs = [ pkgconfig spice_protocol ]; NIX_CFLAGS_COMPILE = "-fno-stack-protector"; diff --git a/pkgs/development/libraries/sqlite/full.nix b/pkgs/development/libraries/sqlite/full.nix index ccb960643bd0..c6ef448ea122 100644 --- a/pkgs/development/libraries/sqlite/full.nix +++ b/pkgs/development/libraries/sqlite/full.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; buildInputs = [ readline ncurses ]; - buildNativeInputs = [ tcl ]; + nativeBuildInputs = [ tcl ]; doCheck = true; checkTarget = "test"; diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix index 6d7212f5c5c6..465a5d80ae04 100644 --- a/pkgs/development/libraries/strigi/default.nix +++ b/pkgs/development/libraries/strigi/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib bzip2 stdenv.gcc.libc libxml2 qt4 exiv2 clucene_core fam dbus_tools ]; - buildNativeInputs = [ cmake pkgconfig perl ]; + nativeBuildInputs = [ cmake pkgconfig perl ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/taglib-extras/default.nix b/pkgs/development/libraries/taglib-extras/default.nix index de0c7ba2b754..05fe67eb9d7b 100644 --- a/pkgs/development/libraries/taglib-extras/default.nix +++ b/pkgs/development/libraries/taglib-extras/default.nix @@ -7,5 +7,5 @@ stdenv.mkDerivation rec { sha256 = "0cln49ws9svvvals5fzxjxlzqm0fzjfymn7yfp4jfcjz655nnm7y"; }; buildInputs = [ taglib ]; - buildNativeInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; } diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix index 8157ca269aa3..0842836ccec8 100644 --- a/pkgs/development/libraries/taglib/default.nix +++ b/pkgs/development/libraries/taglib/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { cmakeFlags = "-DWITH_ASF=ON -DWITH_MP4=ON"; buildInputs = [zlib]; - buildNativeInputs = [cmake]; + nativeBuildInputs = [cmake]; meta = { homepage = http://developer.kde.org/~wheeler/taglib.html; diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix index a183737dc9b2..b6b96a2439f1 100644 --- a/pkgs/development/libraries/telepathy/farstream/default.nix +++ b/pkgs/development/libraries/telepathy/farstream/default.nix @@ -13,5 +13,5 @@ stdenv.mkDerivation rec { buildInputs = [ gst_plugins_base gst_python pygobject ]; propagatedBuildInputs = [ dbus_glib farstream telepathy_glib gstreamer ]; - buildNativeInputs = [ pkgconfig python libxslt]; + nativeBuildInputs = [ pkgconfig python libxslt]; } diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index 64067a61e3e1..a4c90cd1c61f 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0rwyxjk6646r43mvsg01q7rfsah0ni05fa8gxzlx1zhj76db95yh"; }; - buildNativeInputs = [ cmake pkgconfig python libxslt ]; + nativeBuildInputs = [ cmake pkgconfig python libxslt ]; propagatedBuildInputs = [ qt4 dbus_glib telepathy_farstream telepathy_glib ]; preBuild = '' NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`" diff --git a/pkgs/development/libraries/tide-support/default.nix b/pkgs/development/libraries/tide-support/default.nix index a778535f362c..d30d316c0dc0 100644 --- a/pkgs/development/libraries/tide-support/default.nix +++ b/pkgs/development/libraries/tide-support/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; buildInputs = [aterm toolbuslib]; - buildNativeInputs = [pkgconfig]; + nativeBuildInputs = [pkgconfig]; dontStrip = isMingw; } diff --git a/pkgs/development/libraries/tokyo-tyrant/default.nix b/pkgs/development/libraries/tokyo-tyrant/default.nix index 633192133122..b623c7731423 100644 --- a/pkgs/development/libraries/tokyo-tyrant/default.nix +++ b/pkgs/development/libraries/tokyo-tyrant/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "13xqcinhydqmh7231qlir6pymacjwcf98drybkhd9597kzxp1bs2"; }; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ tokyocabinet ]; doCheck = false; # FIXME diff --git a/pkgs/development/libraries/toolbuslib/default.nix b/pkgs/development/libraries/toolbuslib/default.nix index 4d184b11abd4..16680f0134c3 100644 --- a/pkgs/development/libraries/toolbuslib/default.nix +++ b/pkgs/development/libraries/toolbuslib/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { patches = if isMingw then [./mingw.patch] else []; buildInputs = [aterm] ++ (if isMingw then [w32api] else []); - buildNativeInputs = [pkgconfig]; + nativeBuildInputs = [pkgconfig]; dontStrip = isMingw; } diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix index 2770fadf0044..d55ea6166e8b 100644 --- a/pkgs/development/libraries/tremor/default.nix +++ b/pkgs/development/libraries/tremor/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "161411cbefa1527da7a8fc087e78d8e21d19143d3a6eb42fb281e5026aad7568"; }; - buildNativeInputs = [ autoconf automake libtool pkgconfig ]; + nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; propagatedBuildInputs = [ libogg ]; preConfigure = '' diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 5cd083a7e330..f9a611e4d4ce 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ln -sv ${gyp}/bin/gyp build/gyp/gyp ''; - buildNativeInputs = stdenv.lib.optional (system == "i686-linux") which; + nativeBuildInputs = stdenv.lib.optional (system == "i686-linux") which; buildInputs = [ readline python ]; buildFlags = [ diff --git a/pkgs/development/libraries/vcdimager/default.nix b/pkgs/development/libraries/vcdimager/default.nix index 6940f88ffbea..58b9d2f25735 100644 --- a/pkgs/development/libraries/vcdimager/default.nix +++ b/pkgs/development/libraries/vcdimager/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1526jxynslg07i50v3c3afhc8swbd4si8y6s8m3h1wrz6mkplp87"; }; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxml2 popt ]; diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix index 43bcfea4f2e3..109077269544 100644 --- a/pkgs/development/libraries/wxGTK-2.8/default.nix +++ b/pkgs/development/libraries/wxGTK-2.8/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ] ++ optional withMesa mesa; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; configureFlags = [ "--enable-gtk2" diff --git a/pkgs/development/libraries/wxGTK-2.9/default.nix b/pkgs/development/libraries/wxGTK-2.9/default.nix index a0e69bff0fea..c5546cbc229f 100644 --- a/pkgs/development/libraries/wxGTK-2.9/default.nix +++ b/pkgs/development/libraries/wxGTK-2.9/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ] ++ optional withMesa mesa; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; configureFlags = [ "--enable-gtk2" diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index 4ae48a4c04e1..45c60acfa898 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1mjk686h1qzqj51h4xs4xvagfgnnhm8czbzzjvr5w034pr8n8rg1"; }; - buildNativeInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkgconfig perl ]; buildInputs = [ xorg.libX11 xorg.libXv xorg.libXinerama xorg.libxcb xorg.libXext diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh index df2fe853b4af..7c51bf1b5917 100644 --- a/pkgs/development/perl-modules/generic/builder.sh +++ b/pkgs/development/perl-modules/generic/builder.sh @@ -33,8 +33,8 @@ postFixup() { # dependencies in the user environment (since Perl modules don't # have something like an RPATH, so the only way to find the # dependencies is to have them in the PERL5LIB variable). - if test -e $out/nix-support/propagated-build-native-inputs; then - ln -s $out/nix-support/propagated-build-native-inputs $out/nix-support/propagated-user-env-packages + if test -e $out/nix-support/propagated-native-build-inputs; then + ln -s $out/nix-support/propagated-native-build-inputs $out/nix-support/propagated-user-env-packages fi } diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 8da833b0dc1a..e5f57ec9d368 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -102,7 +102,7 @@ python.stdenv.mkDerivation (attrs // { fi createBuildInputsPth build-inputs "$buildInputStrings" - for inputsfile in propagated-build-inputs propagated-build-native-inputs; do + for inputsfile in propagated-build-inputs propagated-native-build-inputs; do if test -e $out/nix-support/$inputsfile; then createBuildInputsPth $inputsfile "$(cat $out/nix-support/$inputsfile)" fi diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index 71269945d6f4..2165c48893ec 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -37,7 +37,7 @@ _addToPythonPath() { pythonPathsSeen[$dir]=1 addToSearchPath program_PYTHONPATH $dir/lib/@libPrefix@/site-packages addToSearchPath program_PATH $dir/bin - local prop="$dir/nix-support/propagated-build-native-inputs" + local prop="$dir/nix-support/propagated-native-build-inputs" if [ -e $prop ]; then local i for i in $(cat $prop); do diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index c437d171aa91..84e1000f6b9c 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (rec { # Perl is needed for `cg_annotate'. # GDB is needed to provide a sane default for `--db-command'. - buildNativeInputs = [ perl ]; + nativeBuildInputs = [ perl ]; buildInputs = stdenv.lib.optional (!stdenv.isDarwin) gdb; configureFlags = diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix index ad1be7265782..374002e8d6ca 100644 --- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix +++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix @@ -14,5 +14,5 @@ stdenv.mkDerivation { pythonPath = [ libxml2Python ]; postInstall = "wrapPythonPrograms"; - buildNativeInputs = [ pkgconfig intltool pythonPackages.wrapPython ]; + nativeBuildInputs = [ pkgconfig intltool pythonPackages.wrapPython ]; } diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix index 00d633c14ae8..3a83b1ba3251 100644 --- a/pkgs/development/tools/misc/cscope/default.nix +++ b/pkgs/development/tools/misc/cscope/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { configureFlags = "--with-ncurses=${ncurses}"; buildInputs = [ ncurses ]; - buildNativeInputs = [ pkgconfig emacs ]; + nativeBuildInputs = [ pkgconfig emacs ]; postInstall = '' # Install Emacs mode. diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index ae8993c80ca3..5a1a19068a7e 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # We need bzip2 in NativeInputs because otherwise we can't unpack the src, # as the host-bzip2 will be in the path. - buildNativeInputs = [m4 bison flex gettext bzip2]; + nativeBuildInputs = [m4 bison flex gettext bzip2]; buildInputs = [zlib bzip2]; crossAttrs = { diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 573a233f17c3..a220f653abfd 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # I think python is not a native input, but I leave it # here while I will not need it cross building - buildNativeInputs = [ texinfo python ] + nativeBuildInputs = [ texinfo python ] ++ stdenv.lib.optional isGNU mig; buildInputs = [ ncurses readline gmp mpfr expat ] diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index 403381af4851..4c3500c65a24 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (rec { sha256 = "0649qfpzkswgcj9vqkkr9rn4nlcx80faxpyqscy2k1x9c94f93dk"; }; - buildNativeInputs = [ lzma m4 perl ]; + nativeBuildInputs = [ lzma m4 perl ]; # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the # "fixed" path in generated files! diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 3589ffb5a070..d5bb2b06e12c 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "158iwk0pl2mfw93m1843xb7a2zb8p6lh0qim07rca6f1ff4dk764"; }; - buildNativeInputs = [ perl ]; + nativeBuildInputs = [ perl ]; meta = { homepage = http://strace.sourceforge.net/; diff --git a/pkgs/development/tools/misc/texinfo/default.nix b/pkgs/development/tools/misc/texinfo/default.nix index 111f2d142008..9a41d2963424 100644 --- a/pkgs/development/tools/misc/texinfo/default.nix +++ b/pkgs/development/tools/misc/texinfo/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ncurses ]; - buildNativeInputs = [ lzma ]; + nativeBuildInputs = [ lzma ]; # Disabled because we don't have zdiff in the stdenv bootstrap. #doCheck = true; diff --git a/pkgs/development/tools/misc/xxdiff/default.nix b/pkgs/development/tools/misc/xxdiff/default.nix index 1a44cd4bcbf7..461c602a8866 100644 --- a/pkgs/development/tools/misc/xxdiff/default.nix +++ b/pkgs/development/tools/misc/xxdiff/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "7ae7d81becc25b1adabc9383bb5b9005dddb31510cdc404ce8a0d6ff6c3dc47e"; }; - buildNativeInputs = [ flex bison qt4 ]; + nativeBuildInputs = [ flex bison qt4 ]; buildInputs = [ qt4 ]; diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix index c699d815eb68..b397a22443a7 100644 --- a/pkgs/development/tools/parsing/bison/default.nix +++ b/pkgs/development/tools/parsing/bison/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "8640d5b51aad462db6863711f333a9159836853e0b1e79fdef708c6efb5cd52b"; }; - buildNativeInputs = [ m4 ] ++ stdenv.lib.optional doCheck perl; + nativeBuildInputs = [ m4 ] ++ stdenv.lib.optional doCheck perl; propagatedBuildInputs = [ m4 ]; doCheck = true; diff --git a/pkgs/development/tools/parsing/flex/flex-2.5.35.nix b/pkgs/development/tools/parsing/flex/flex-2.5.35.nix index 66ece227c924..21180e7d185e 100644 --- a/pkgs/development/tools/parsing/flex/flex-2.5.35.nix +++ b/pkgs/development/tools/parsing/flex/flex-2.5.35.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0ysff249mwhq0053bw3hxh58djc0gy7vjan2z1krrf9n5d5vvv0b"; }; buildInputs = [yacc]; - propagatedBuildNativeInputs = [m4]; + propagatedNativeBuildInputs = [m4]; crossAttrs = { preConfigure = '' diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index 95d10db167f1..e90e9446846c 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation ({ runHook postBuild ''; - buildNativeInputs = neededNatives; + nativeBuildInputs = neededNatives; installPhase = '' runHook preInstall diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix index 6234d3702f7c..cf3f6e1563b8 100644 --- a/pkgs/games/andyetitmoves/default.nix +++ b/pkgs/games/andyetitmoves/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { cp -r * $out/opt/andyetitmoves/ fullPath=${stdenv.gcc.gcc}/lib64 - for i in $buildNativeInputs; do + for i in $nativeBuildInputs; do fullPath=$fullPath''${fullPath:+:}$i/lib done diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index 7aaf32383081..049f10ad15b2 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1n3ak0y9hj9kha0r3cdbi8zb47vrgal1jsbblamqgwwwgzy8cri3"; }; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib bzip2 ] ++ optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype ] diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix index 36ccbf98274f..a04d7cfbfcfa 100644 --- a/pkgs/games/naev/default.nix +++ b/pkgs/games/naev/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { buildInputs = [ SDL SDL_mixer openal libxml2 libvorbis libpng mesa zlib ]; - buildNativeInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkgconfig makeWrapper ]; NIX_CFLAGS_COMPILE="-include ${zlib}/include/zlib.h"; diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix index 63fae5df0fcd..3848f22ed204 100644 --- a/pkgs/games/scorched3d/default.nix +++ b/pkgs/games/scorched3d/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { [ mesa openal freealut wxGTK freetype fftwSinglePrec SDL_net zlib libpng libjpeg libogg libvorbis ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; patches = [ ./file-existence.patch ]; diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index cf740def5116..441fa6dc461e 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ mesa freeglut libX11 plib openal freealut libXrandr xproto libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib libvorbis ]; - buildNativeInputs = [ bash ]; + nativeBuildInputs = [ bash ]; installTargets = "install datainstall"; diff --git a/pkgs/lib/misc.nix b/pkgs/lib/misc.nix index 39a3ad258b04..b6f86d45dd84 100644 --- a/pkgs/lib/misc.nix +++ b/pkgs/lib/misc.nix @@ -226,7 +226,7 @@ rec { in innerClosePropagation acc' (uniqList { inputList = (maybeAttrNullable "propagatedBuildInputs" [] y) - ++ (maybeAttrNullable "propagatedBuildNativeInputs" [] y) + ++ (maybeAttrNullable "propagatedNativeBuildInputs" [] y) ++ ys; acc = acc'; } @@ -317,7 +317,7 @@ rec { mergeAttrsByFuncDefaults = foldl mergeAttrByFunc { inherit mergeAttrBy; }; # sane defaults (same name as attr name so that inherit can be used) mergeAttrBy = # { buildInputs = concatList; [...]; passthru = mergeAttr; [..]; } - listToAttrs (map (n : nameValuePair n lib.concat) [ "buildNativeInputs" "buildInputs" "propagatedBuildInputs" "configureFlags" "prePhases" "postAll" ]) + listToAttrs (map (n : nameValuePair n lib.concat) [ "nativeBuildInputs" "buildInputs" "propagatedBuildInputs" "configureFlags" "prePhases" "postAll" ]) // listToAttrs (map (n : nameValuePair n lib.mergeAttrs) [ "passthru" "meta" "cfg" "flags" ]) // listToAttrs (map (n : nameValuePair n (a: b: "${a}\n${b}") ) [ "preConfigure" "postInstall" ]) ; diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index 19c105bf4f02..85499e893f8e 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -63,8 +63,8 @@ mkDerivation { # The setup.sh script from stdenv will expect the native build inputs in - # the buildNativeInputs environment variable. - buildNativeInputs = [ ] ++ buildInputs; + # the nativeBuildInputs environment variable. + nativeBuildInputs = [ ] ++ buildInputs; # Trick to bypass the stdenv usual change of propagatedBuildInputs => propagatedNativeBuildInputs propagatedBuildInputs2 = propagatedBuildInputs; @@ -87,7 +87,7 @@ mkDerivation { -e 's@trap.*@@' \ -i "$s" cat >> "$out/dev-envs/''${name/env-/}" << EOF - buildNativeInputs="$buildNativeInputs" + nativeBuildInputs="$nativeBuildInputs" propagatedBuildInputs="$propagatedBuildInputs2" # the setup-new script wants to write some data to a temp file.. so just let it do that and tidy up afterwards tmp="\$("${pkgs.coreutils}/bin/mktemp" -d)" diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 7525c28e740e..74379880706f 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { sha256 = "1rld7q3ww89si84g80hqskd1z995lni5r5xc4d4322n99wqiarh6"; }; - buildNativeInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; dontStrip = true; diff --git a/pkgs/misc/uboot/guruplug.nix b/pkgs/misc/uboot/guruplug.nix index 0e63a56073b6..b1f4cab7b735 100644 --- a/pkgs/misc/uboot/guruplug.nix +++ b/pkgs/misc/uboot/guruplug.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { fi ''; - buildNativeInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; dontStrip = true; diff --git a/pkgs/misc/uboot/sheevaplug.nix b/pkgs/misc/uboot/sheevaplug.nix index ad8029d90203..4d4f61c40a70 100644 --- a/pkgs/misc/uboot/sheevaplug.nix +++ b/pkgs/misc/uboot/sheevaplug.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { fi ''; - buildNativeInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; dontStrip = true; diff --git a/pkgs/os-specific/gnu/libpthread/default.nix b/pkgs/os-specific/gnu/libpthread/default.nix index 08838f17affc..3eaa6336ec27 100644 --- a/pkgs/os-specific/gnu/libpthread/default.nix +++ b/pkgs/os-specific/gnu/libpthread/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation ({ inherit rev; }; - buildNativeInputs = [ autoconf automake libtool ]; + nativeBuildInputs = [ autoconf automake libtool ]; buildInputs = [ machHeaders hurdHeaders ] ++ stdenv.lib.optional (!headersOnly) hurd ++ stdenv.lib.optional (gccCross != null) gccCross; diff --git a/pkgs/os-specific/gnu/mach/default.nix b/pkgs/os-specific/gnu/mach/default.nix index f5120fca478a..54c6429955bb 100644 --- a/pkgs/os-specific/gnu/mach/default.nix +++ b/pkgs/os-specific/gnu/mach/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation ({ # . ++ [ "--enable-dependency-tracking" ]; - buildNativeInputs = [ autoconf automake texinfo ] + nativeBuildInputs = [ autoconf automake texinfo ] ++ stdenv.lib.optional (mig != null) mig; preConfigure = "autoreconf -vfi"; diff --git a/pkgs/os-specific/gnu/mig/default.nix b/pkgs/os-specific/gnu/mig/default.nix index 7db159837fed..9ee188b0c8c6 100644 --- a/pkgs/os-specific/gnu/mig/default.nix +++ b/pkgs/os-specific/gnu/mig/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { patches = [ ./noyywrap.patch ]; - buildNativeInputs = [ autoconf automake flex bison machHeaders ]; + nativeBuildInputs = [ autoconf automake flex bison machHeaders ]; preConfigure = "autoreconf -vfi"; diff --git a/pkgs/os-specific/gnu/unionfs/default.nix b/pkgs/os-specific/gnu/unionfs/default.nix index f35fed282b68..946e4c0c109c 100644 --- a/pkgs/os-specific/gnu/unionfs/default.nix +++ b/pkgs/os-specific/gnu/unionfs/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { makeFlags = [ "CC=i586-pc-gnu-gcc" ]; buildInputs = [ hurd machHeaders ]; - buildNativeInputs = [ mig ]; + nativeBuildInputs = [ mig ]; installPhase = '' mkdir -p "$out/hurd" diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index ebaef323491e..08df6fe64c25 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ alsaLib ncurses ]; - buildNativeInputs = [ gettext ]; + nativeBuildInputs = [ gettext ]; configureFlags = "--disable-xmlto --with-udev-rules-dir=$(out)/lib/udev/rules.d"; diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index c97c7416de1e..2b22f4a2881b 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { + " MANDIR=$(out)/share/man"; buildInputs = [ db4 iptables ]; - buildNativeInputs = [ bison flex pkgconfig ]; + nativeBuildInputs = [ bison flex pkgconfig ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 48c4679cb3cd..eecf52b1ddfe 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation { # For UML and non-PC, just ignore all options that don't apply (We are lazy). ignoreConfigErrors = stdenv.platform.name != "pc"; - buildNativeInputs = [ perl mktemp ]; + nativeBuildInputs = [ perl mktemp ]; buildInputs = lib.optional (stdenv.platform.uboot != null) (ubootChooser stdenv.platform.uboot); diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 52e284827d02..70d5c809dba8 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -125,7 +125,7 @@ stdenv.mkDerivation { runHook postConfigure ''; - buildNativeInputs = [ perl nettools ]; + nativeBuildInputs = [ perl nettools ]; makeFlags = commonMakeFlags ++ [ "INSTALLKERNEL=${installkernel stdenv.platform.kernelTarget}" diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 85aa7456df5f..8f2db1b15bd2 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { ''; # perf refers both to newt and slang - buildNativeInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt flex bison ]; + nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt flex bison ]; buildInputs = [ elfutils python perl newt slang pkgconfig] ++ stdenv.lib.optional withGtk gtk; diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index 781bb67edca5..42fd6097da0b 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -70,5 +70,5 @@ stdenv.mkDerivation { cp usr/dash/sh $dir/ ''; - buildNativeInputs = [ perl bison mktemp ]; + nativeBuildInputs = [ perl bison mktemp ]; } diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 667fe63bba78..92f15c1ade3d 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "03q50j6bg65cc501q87qh328ncav1i8qw2bjig99vxmmfx4bvsvk"; }; - buildNativeInputs = [ perl ]; + nativeBuildInputs = [ perl ]; propagatedBuildInputs = [ attr ]; preConfigure = "cd libcap"; diff --git a/pkgs/os-specific/linux/libcgroup/default.nix b/pkgs/os-specific/linux/libcgroup/default.nix index 0246f6729b10..6323d8c4f23a 100644 --- a/pkgs/os-specific/linux/libcgroup/default.nix +++ b/pkgs/os-specific/linux/libcgroup/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ pam ]; - buildNativeInputs = [ yacc flex ]; + nativeBuildInputs = [ yacc flex ]; meta = { description = "Library and tools to manage Linux's cgroup resource management system"; diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index a88107ae73d6..1653c018ce14 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # Enable incremental activation of swraid arrays from udev. patches = [ ./udev.patch ]; - buildNativeInputs = [ groff ]; + nativeBuildInputs = [ groff ]; preConfigure = "sed -e 's@/lib/udev@\${out}/lib/udev@' -e 's@ -Werror @ @' -i Makefile"; diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 31317a939771..112c82d1ea08 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1hlz2kqvbjisvwyicdincq7nz897b9rrafyzccwzqiqg53b8gf5s"; }; - buildNativeInputs = [ flex ]; + nativeBuildInputs = [ flex ]; buildInputs = [ cracklib ] ++ stdenv.lib.optional diff --git a/pkgs/os-specific/linux/udisks/default.nix b/pkgs/os-specific/linux/udisks/default.nix index 4987e90429ce..ea4fd1ca2cb3 100644 --- a/pkgs/os-specific/linux/udisks/default.nix +++ b/pkgs/os-specific/linux/udisks/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { lvm2 libatasmart intltool libuuid libxslt docbook_xsl ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; configureFlags = "--localstatedir=/var --enable-lvm2"; diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 2f870e5d9994..c31dae1fdfaa 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 ] ++ stdenv.lib.optional useSystemd systemd; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; configureFlags = [ "--with-backend=linux" "--localstatedir=/var" ] diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index f947bc9a1e73..c6846b8fd136 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl dbus_libs libnl ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; patches = [ (fetchurl { diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix index 12ec08361a67..29591bf0335c 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { buildInputs = [ qt4 ]; - buildNativeInputs = [ inkscape ]; + nativeBuildInputs = [ inkscape ]; prePatch = "cd wpa_supplicant/wpa_gui-qt4"; diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix index ab549d0a0285..8f8477d1864a 100644 --- a/pkgs/os-specific/windows/jom/default.nix +++ b/pkgs/os-specific/windows/jom/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; buildInputs = [ qt48 ]; - buildNativeInputs = [ flex /*cmake*/ ]; + nativeBuildInputs = [ flex /*cmake*/ ]; QTDIR = qt48; configurePhase = '' diff --git a/pkgs/os-specific/windows/w32api/default.nix b/pkgs/os-specific/windows/w32api/default.nix index a4f4245125d9..2a5af71b5eca 100644 --- a/pkgs/os-specific/windows/w32api/default.nix +++ b/pkgs/os-specific/windows/w32api/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation ({ sha256 = "09rhnl6zikmdyb960im55jck0rdy5z9nlg3akx68ixn7khf3j8wb"; }; - buildNativeInputs = [ xz ]; + nativeBuildInputs = [ xz ]; } // (if onlyHeaders then { diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix index cb664eac253c..7c16153e9b53 100644 --- a/pkgs/servers/gpm/default.nix +++ b/pkgs/servers/gpm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1990i19ddzn8gg5xwm53yn7d0mya885f48sd2hyvr7dvzyaw7ch8"; }; - buildNativeInputs = [ flex bison ]; + nativeBuildInputs = [ flex bison ]; buildInputs = [ ncurses ]; preConfigure = diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index 31c9deaf3af0..25051167ca51 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1bjhyjg561kwp6zc2wg58njdvpnsj5yaa2slz8g3ga1176jl68w3"; }; - buildNativeInputs = [ makeWrapper pkgconfig docbook_xml_dtd_412 docbook_xsl + nativeBuildInputs = [ makeWrapper pkgconfig docbook_xml_dtd_412 docbook_xsl xmlto bc pythonPackages.wrapPython ]; pythonPath = [ pythonPackages.curses ]; diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index ce664972037e..345234ba25e8 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "12v0cpq9j2gmagr9pbw08karqwqgl4j9r223w7x7sx5cfvj2cih8"; }; - buildNativeInputs = [ scons which ]; + nativeBuildInputs = [ scons which ]; patches = [ installerPatch ]; diff --git a/pkgs/servers/prayer/default.nix b/pkgs/servers/prayer/default.nix index c67d2c8a010a..f105920ab81e 100644 --- a/pkgs/servers/prayer/default.nix +++ b/pkgs/servers/prayer/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ openssl db4 zlib uwimap htmlTidy pam ]; - buildNativeInputs = [ perl ]; + nativeBuildInputs = [ perl ]; NIX_LDFLAGS = "-lpam"; diff --git a/pkgs/servers/unfs3/default.nix b/pkgs/servers/unfs3/default.nix index e59023c905e9..96073645cc1c 100644 --- a/pkgs/servers/unfs3/default.nix +++ b/pkgs/servers/unfs3/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "076zkyqkn56q0a8n3h65n1a68fknk4hrrp6mbhajq5s1wp5248j8"; }; - buildNativeInputs = [ flex bison ]; + nativeBuildInputs = [ flex bison ]; configureFlags = [ "--disable-shared" ]; diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh index bb776a5051bd..6ba50d245075 100644 --- a/pkgs/servers/x11/xorg/builder.sh +++ b/pkgs/servers/x11/xorg/builder.sh @@ -26,7 +26,7 @@ postInstall() { for p in $nativePkgs; do if test -e $p/lib/pkgconfig/$r.pc; then echo " found requisite $r in $p" - propagatedBuildNativeInputs="$propagatedBuildNativeInputs $p" + propagatedNativeBuildInputs="$propagatedNativeBuildInputs $p" fi done fi @@ -34,7 +34,7 @@ postInstall() { mkdir -p "$out/nix-support" echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs" - echo "$propagatedBuildNativeInputs" > "$out/nix-support/propagated-build-native-inputs" + echo "$propagatedNativeBuildInputs" > "$out/nix-support/propagated-native-build-inputs" } diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 6d231e2083e2..cf8c47374710 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -37,18 +37,18 @@ in # I should use: builtins.unsafeDiscardStringContext buildInputs = [args.pkgconfig args.libxslt xorg.libpthreadstubs /*xorg.python*/ xorg.libXau xorg.xcbproto xorg.libXdmcp ] ++ [ xorg.xproto ]; - buildNativeInputs = [ args.python ]; + nativeBuildInputs = [ args.python ]; }; xcbproto = attrs : attrs // { # I only remove python from the original. buildInputs = [args.pkgconfig /*xorg.python*/ ]; - buildNativeInputs = [ args.python ]; + nativeBuildInputs = [ args.python ]; }; pixman = attrs : attrs // { buildInputs = [ args.pkgconfig ]; - buildNativeInputs = [ args.perl ]; + nativeBuildInputs = [ args.perl ]; }; libpciaccess = attrs : attrs // { @@ -261,7 +261,7 @@ in }; twm = attrs: attrs // { - buildNativeInputs = [args.bison args.flex]; + nativeBuildInputs = [args.bison args.flex]; }; xbacklight = attrs: attrs // { diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index 98fe43b0122a..6191bb0f148e 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { configureFlags = baseConfigureFlags; # Note: Bison is needed because the patches above modify parse.y. - buildNativeInputs = [bison] + nativeBuildInputs = [bison] ++ stdenv.lib.optional (texinfo != null) texinfo ++ stdenv.lib.optional interactive readline; diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 1ee88a821166..a354c1b6bd48 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -124,9 +124,9 @@ rec { # Return a modified stdenv that adds a cross compiler to the # builds. makeStdenvCross = stdenv: cross: binutilsCross: gccCross: stdenv // - { mkDerivation = {name ? "", buildInputs ? [], buildNativeInputs ? [], - propagatedBuildInputs ? [], propagatedBuildNativeInputs ? [], - selfBuildNativeInput ? false, ...}@args: let + { mkDerivation = {name ? "", buildInputs ? [], nativeBuildInputs ? [], + propagatedBuildInputs ? [], propagatedNativeBuildInputs ? [], + selfNativeBuildInput ? false, ...}@args: let # *BuildInputs exists temporarily as another name for # *HostInputs. @@ -135,21 +135,21 @@ rec { # and we handle that through isAttrs. getBuildDrv = drv : if (builtins.isAttrs drv && drv ? nativeDrv) then drv.nativeDrv else drv; getHostDrv = drv : if (builtins.isAttrs drv && drv ? crossDrv) then drv.crossDrv else drv; - buildNativeInputsDrvs = map (getBuildDrv) buildNativeInputs; + nativeBuildInputsDrvs = map (getBuildDrv) nativeBuildInputs; buildInputsDrvs = map (getHostDrv) buildInputs; buildInputsDrvsAsBuildInputs = map (getBuildDrv) buildInputs; propagatedBuildInputsDrvs = map (getHostDrv) (propagatedBuildInputs); - propagatedBuildNativeInputsDrvs = map (getBuildDrv) - (propagatedBuildNativeInputs); + propagatedNativeBuildInputsDrvs = map (getBuildDrv) + (propagatedNativeBuildInputs); - # The base stdenv already knows that buildNativeInputs and + # The base stdenv already knows that nativeBuildInputs and # buildInputs should be built with the usual gcc-wrapper # And the same for propagatedBuildInputs. nativeDrv = stdenv.mkDerivation args; # Temporary expression until the cross_renaming, to handle the # case of pkgconfig given as buildInput, but to be used as - # buildNativeInput. + # nativeBuildInput. hostAsBuildDrv = drv: builtins.unsafeDiscardStringContext drv.nativeDrv.drvPath == builtins.unsafeDiscardStringContext drv.crossDrv.drvPath; @@ -162,10 +162,10 @@ rec { crossDrv = if (cross == null) then nativeDrv else stdenv.mkDerivation (args // { name = name + "-" + cross.config; - buildNativeInputs = buildNativeInputsDrvs + nativeBuildInputs = nativeBuildInputsDrvs ++ nativeInputsFromBuildInputs ++ [ gccCross binutilsCross ] ++ - stdenv.lib.optional selfBuildNativeInput nativeDrv; + stdenv.lib.optional selfNativeBuildInput nativeDrv; # Cross-linking dynamic libraries, every buildInput should # be propagated because ld needs the -rpath-link to find @@ -174,7 +174,7 @@ rec { buildInputs = []; propagatedBuildInputs = propagatedBuildInputsDrvs ++ buildInputsDrvs; - propagatedBuildNativeInputs = propagatedBuildNativeInputsDrvs; + propagatedNativeBuildInputs = propagatedNativeBuildInputsDrvs; crossConfig = cross.config; } // (if args ? crossAttrs then args.crossAttrs else {})); diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 311f66241c82..e64543ede62c 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -48,9 +48,9 @@ let (removeAttrs attrs ["meta" "passthru" "crossAttrs"]) // (let buildInputs = attrs.buildInputs or []; - buildNativeInputs = attrs.buildNativeInputs or []; + nativeBuildInputs = attrs.nativeBuildInputs or []; propagatedBuildInputs = attrs.propagatedBuildInputs or []; - propagatedBuildNativeInputs = attrs.propagatedBuildNativeInputs or []; + propagatedNativeBuildInputs = attrs.propagatedNativeBuildInputs or []; crossConfig = attrs.crossConfig or null; in { @@ -65,9 +65,9 @@ let propagatedBuildInputs = lib.optionals (crossConfig != null) propagatedBuildInputs; # Inputs built by the usual native compiler. - buildNativeInputs = buildNativeInputs ++ lib.optionals + nativeBuildInputs = nativeBuildInputs ++ lib.optionals (crossConfig == null) buildInputs; - propagatedBuildNativeInputs = propagatedBuildNativeInputs ++ + propagatedNativeBuildInputs = propagatedNativeBuildInputs ++ lib.optionals (crossConfig == null) propagatedBuildInputs; })) ) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 221254a36ed3..c5722c3e8749 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -169,8 +169,8 @@ for i in $buildInputs $propagatedBuildInputs; do done nativePkgs="" -for i in $buildNativeInputs $propagatedBuildNativeInputs; do - findInputs $i nativePkgs propagated-build-native-inputs +for i in $nativeBuildInputs $propagatedNativeBuildInputs; do + findInputs $i nativePkgs propagated-native-build-inputs done @@ -748,9 +748,9 @@ fixupPhase() { echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs" fi - if [ -n "$propagatedBuildNativeInputs" ]; then + if [ -n "$propagatedNativeBuildInputs" ]; then mkdir -p "$out/nix-support" - echo "$propagatedBuildNativeInputs" > "$out/nix-support/propagated-build-native-inputs" + echo "$propagatedNativeBuildInputs" > "$out/nix-support/propagated-native-build-inputs" fi if [ -n "$propagatedUserEnvPkgs" ]; then diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 3fbb350e0ab0..929332275fc1 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1s1z6r0r78qvf59ci3vxammjz7lj5m64jyk0bfn7yxd5jl3sy41y"; }; - buildNativeInputs = [ cython ]; + nativeBuildInputs = [ cython ]; buildInputs = [ pkgconfig python pygtk gtk ffmpeg x264 libvpx makeWrapper diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index e72ab4f90ca9..c6fbff30afa6 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -82,13 +82,13 @@ stdenv.mkDerivation rec { libXinerama libXcursor libxcrypt ]; - buildNativeInputs = + nativeBuildInputs = [ autoconf automake cvs utilmacros fontutil libtool flex bison cmake ] - ++ xorgserver.buildNativeInputs; + ++ xorgserver.nativeBuildInputs; - propagatedBuildNativeInputs = xorgserver.propagatedBuildNativeInputs; + propagatedNativeBuildInputs = xorgserver.propagatedNativeBuildInputs; meta = { homepage = http://www.tigervnc.org/; diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index 586fc514ba65..6bc828bc60fe 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { rev = "02bd2b566ea5eec2fd656e0ae572b4c7b6b9550a"; }; - buildNativeInputs = [ pandoc perl makeWrapper ]; + nativeBuildInputs = [ pandoc perl makeWrapper ]; buildInputs = [ python git ]; diff --git a/pkgs/tools/bluetooth/obexd/default.nix b/pkgs/tools/bluetooth/obexd/default.nix index 1cf3918c21fc..47db0877dd20 100644 --- a/pkgs/tools/bluetooth/obexd/default.nix +++ b/pkgs/tools/bluetooth/obexd/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib dbus.libs openobex bluez libical ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta = { homepage = http://www.bluez.org/; diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index cedb8df39d14..a306a424ee1e 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; buildInputs = [libuuid] ++ stdenv.lib.optionals crypto [gnutls libgcrypt]; - buildNativeInputs = stdenv.lib.optional crypto pkgconfig; + nativeBuildInputs = stdenv.lib.optional crypto pkgconfig; src = fetchurl { url = "http://tuxera.com/opensource/${name}.tgz"; diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index f1759d7a7820..b77d63d510df 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtiff libpng lcms libxmi boost mesa freeglut glew ]; - buildNativeInputs = [ perl pkgconfig ]; + nativeBuildInputs = [ perl pkgconfig ]; patches = let diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index 0c829eab1309..9b0a83725eaa 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtiff openexr imagemagick libjpeg qt4 mesa freeglut bzip2 libX11 libpng expat ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta = { homepage = http://pfstools.sourceforge.net/; diff --git a/pkgs/tools/graphics/qrencode/default.nix b/pkgs/tools/graphics/qrencode/default.nix index 866b121f76ba..3b83a18fd36e 100644 --- a/pkgs/tools/graphics/qrencode/default.nix +++ b/pkgs/tools/graphics/qrencode/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libpng ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta = { homepage = http://fukuchi.org/works/qrencode/; diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index a533144dc1e3..f3bee5519600 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1rx9x3fp848w4nny7irdkcpkan9fcx24d99v5dkwgkyq7wc76f5d"; }; - buildNativeInputs = [ perl ]; + nativeBuildInputs = [ perl ]; buildInputs = [ gmp ] ++ stdenv.lib.optional aclSupport acl ++ stdenv.lib.optional selinuxSupport libselinux diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index eeb6b852e61f..88cb2c313c0a 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0amn0bbwqvsvvsh6drfwz20ydc2czk374lzw5kksbh6bf78k4ks3"; }; - buildNativeInputs = [coreutils]; + nativeBuildInputs = [coreutils]; patches = [ ./findutils-path.patch ./change_echo_path.patch ]; diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index fae10a10a2ea..d824d76a8649 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "0n64hpmsccvicagvr0c6v0kgp2yw0kgnd3jvsyd26cnwgs7c6kkq"; }; - buildNativeInputs = [ flex bison ]; + nativeBuildInputs = [ flex bison ]; buildInputs = [ ncurses libusb freetype gettext devicemapper ] ++ stdenv.lib.optional doCheck qemu; diff --git a/pkgs/tools/misc/ttf2pt1/default.nix b/pkgs/tools/misc/ttf2pt1/default.nix index 379db7d533f0..659b04a62386 100644 --- a/pkgs/tools/misc/ttf2pt1/default.nix +++ b/pkgs/tools/misc/ttf2pt1/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; buildInputs = [ freetype ]; - buildNativeInputs = [ perl ]; + nativeBuildInputs = [ perl ]; patches = ./gentoo-makefile.patch; # also contains the freetype patch diff --git a/pkgs/tools/misc/usbmuxd/default.nix b/pkgs/tools/misc/usbmuxd/default.nix index c4b412493558..b95dfde98500 100644 --- a/pkgs/tools/misc/usbmuxd/default.nix +++ b/pkgs/tools/misc/usbmuxd/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "09swwr6x46qxmwylrylnyqh4pznr0swla9gijggwxxw8dw82r840"; }; - buildNativeInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; propagatedBuildInputs = [ libusb1 libplist ]; patchPhase = diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix index 563406e430b8..cc9f98a94f60 100644 --- a/pkgs/tools/misc/xburst-tools/default.nix +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { # Not to strip cross build binaries (this is for the gcc-cross-wrapper) dontCrossStrip = true; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libusb libusb1 autoconf automake confuse ] ++ stdenv.lib.optional (gccCross != null) gccCross; diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index d3198cee32c7..bfa673eff09f 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1fdf5d5cc494825afe9f551248e00a2d91e220e88435b47f109ca2a707a40f1f"; }; - buildNativeInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkgconfig ]; buildInputs = [ udev polkit dbus_glib ppp ]; diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 1a9b94857495..e6ef30930541 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { polkit isocodes ]; - buildNativeInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkgconfig ]; makeFlags = [ ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index eec7361f6a29..443e4182a777 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ]; - buildNativeInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkgconfig ]; patches = [ ( substituteAll { diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix index 8d2acfe9b316..b71e41c8b56a 100644 --- a/pkgs/tools/networking/network-manager/pptp.nix +++ b/pkgs/tools/networking/network-manager/pptp.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ networkmanager pptp ppp ] ++ stdenv.lib.optionals withGnome [ gtk libgnome_keyring ]; - buildNativeInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkgconfig ]; configureFlags = if withGnome then "--with-gnome --with-gtkver=2" else "--without-gnome"; diff --git a/pkgs/tools/networking/networkmanagement/default.nix b/pkgs/tools/networking/networkmanagement/default.nix index 1919186586a6..474a46387588 100644 --- a/pkgs/tools/networking/networkmanagement/default.nix +++ b/pkgs/tools/networking/networkmanagement/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { }; buildInputs = [ kdelibs kde_workspace networkmanager ]; - buildNativeInputs = [ gettext pkgconfig ]; + nativeBuildInputs = [ gettext pkgconfig ]; NIX_CFLAGS_COMPILE="-I${kde_workspace}/include/solid/control"; diff --git a/pkgs/tools/networking/ntop/default.nix b/pkgs/tools/networking/ntop/default.nix index 945effabcfbd..48f2c9f08938 100644 --- a/pkgs/tools/networking/ntop/default.nix +++ b/pkgs/tools/networking/ntop/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { cp ${libtool}/share/aclocal/libtool.m4 libtool.m4.in ''; - buildNativeInputs = [ autoconf automake libtool wget libpcap gdbm zlib openssl rrdtool + nativeBuildInputs = [ autoconf automake libtool wget libpcap gdbm zlib openssl rrdtool python geoip ]; meta = { diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/tools/networking/pptp/default.nix index 88f1a86a2edc..5bfb6f58bea2 100644 --- a/pkgs/tools/networking/pptp/default.nix +++ b/pkgs/tools/networking/pptp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { MANDIR=$out/share/man/man8 PPPDIR=$out/etc/ppp ) ''; - buildNativeInputs = [ perl ]; + nativeBuildInputs = [ perl ]; meta = { description = "PPTP client for Linux"; diff --git a/pkgs/tools/networking/surfraw/default.nix b/pkgs/tools/networking/surfraw/default.nix index 6fcc031aab4b..bd3a1135a845 100644 --- a/pkgs/tools/networking/surfraw/default.nix +++ b/pkgs/tools/networking/surfraw/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { "--disable-opensearch" ]; - buildNativeInputs = [ perl ]; + nativeBuildInputs = [ perl ]; meta = { description = "Provides a fast unix command line interface to a variety of popular WWW search engines and other artifacts of power"; diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index ebc97414a384..f52b344aeac8 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { done ''; - buildNativeInputs = [ gettext ]; + nativeBuildInputs = [ gettext ]; buildInputs = stdenv.lib.optionals doCheck [ perl LWP ] ++ stdenv.lib.optional (gnutls != null) gnutls; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index ce8650e70f80..45e761b8963b 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "2f7c2d27e240b6a43ebfba330127072e3fb1473c17dbfc5e9662ea589dfd16e5"; }; - buildNativeInputs = [ perl pkgconfig ]; + nativeBuildInputs = [ perl pkgconfig ]; buildInputs = [ curl openssl boehmgc sqlite ]; diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 89da0cb0e676..2b961e5a7f22 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "b767c2b75a0036edfc6be209dcaab23643887b192e3788640380ac27298b08d0"; }; - buildNativeInputs = [ perl pkgconfig ]; + nativeBuildInputs = [ perl pkgconfig ]; buildInputs = [ curl openssl boehmgc sqlite ]; diff --git a/pkgs/tools/security/ccrypt/default.nix b/pkgs/tools/security/ccrypt/default.nix index a134f45c988e..5653af424d1e 100644 --- a/pkgs/tools/security/ccrypt/default.nix +++ b/pkgs/tools/security/ccrypt/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1bzbfq19jnnlp221kilzxpy0l6w3hk9b1iqjz4haypzlyxswnf35"; }; - buildNativeInputs = [ perl ]; + nativeBuildInputs = [ perl ]; meta = { homepage = http://ccrypt.sourceforge.net/; diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 28a673d03eff..a6f8b2dc0646 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ udev dbus_libs ]; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta = { description = "Middleware to access a smart card using SCard API (PC/SC)"; diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index ba4ce8a3e220..543c5d81ba1a 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ++ (if useGtk then ["--enable-pinentry-gtk2"] else ["--disable-pinentry-gtk"]) ++ (if useQt4 then ["--enable-pinentry-qt4"] else ["--disable-pinentry-qt4"]); - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; meta = { homepage = "http://gnupg.org/aegypten2/"; diff --git a/pkgs/tools/security/polkit-gnome/default.nix b/pkgs/tools/security/polkit-gnome/default.nix index b70aa427031e..c06aac204a1c 100644 --- a/pkgs/tools/security/polkit-gnome/default.nix +++ b/pkgs/tools/security/polkit-gnome/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; buildInputs = [ polkit gtk3 ]; - buildNativeInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool ]; configureFlags = "--disable-introspection"; diff --git a/pkgs/tools/security/polkit-kde-agent/default.nix b/pkgs/tools/security/polkit-kde-agent/default.nix index 10836366b187..7696ee93bce0 100644 --- a/pkgs/tools/security/polkit-kde-agent/default.nix +++ b/pkgs/tools/security/polkit-kde-agent/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ kdelibs polkit_qt_1 ]; - buildNativeInputs = [ gettext ]; + nativeBuildInputs = [ gettext ]; patchPhase = "sed -e s/KDE4_AUTOSTART/AUTOSTART/ -i CMakeLists.txt"; diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index 9ffccc0bffd5..fc4293ad7cff 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { patches = [ ./gets-undeclared.patch ]; /* If no explicit coreutils is given, use the one from stdenv. */ - buildNativeInputs = [ coreutils ]; + nativeBuildInputs = [ coreutils ]; meta = { homepage = http://www.gnu.org/software/diffutils/diffutils.html; diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index 243fe8dcab81..3cf5dcfca7b3 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ghostscript ]; - buildNativeInputs = [ perl ]; + nativeBuildInputs = [ perl ]; doCheck = true; diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index d8807bda08bc..fc8813e7cec7 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ kdelibs ]; - buildNativeInputs = [ cmake gettext ]; + nativeBuildInputs = [ cmake gettext ]; meta = { homepage = http://kdiff3.sourceforge.net/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8233b59e0b2d..00c52b1abefb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3178,9 +3178,9 @@ let /* Make pkgconfig always return a nativeDrv, never a proper crossDrv, because most usage of pkgconfig as buildInput (inheritance of - pre-cross nixpkgs) means using it using as buildNativeInput + pre-cross nixpkgs) means using it using as nativeBuildInput cross_renaming: we should make all programs use pkgconfig as - buildNativeInput after the renaming. + nativeBuildInput after the renaming. */ pkgconfig = forceBuildDrv (callPackage ../development/tools/misc/pkgconfig { }); pkgconfigUpstream = lowPrio (pkgconfig.override { vanilla = true; }); -- cgit 1.4.1 From 84779a6f7da93bd6325f478c62c82cc0a1a2e341 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Dec 2012 19:54:15 +0100 Subject: Remove unnecessary parentheses around if conditions Pet peeve... --- pkgs/applications/graphics/sane/frontends.nix | 2 +- pkgs/applications/graphics/sane/xsane.nix | 2 +- pkgs/applications/misc/truecrypt/default.nix | 2 +- pkgs/build-support/builder-defs/builder-defs.nix | 26 ++++++------ pkgs/build-support/checker/default.nix | 4 +- pkgs/build-support/fetchhg/default.nix | 6 +-- pkgs/build-support/gcc-cross-wrapper/default.nix | 2 +- pkgs/build-support/gcc-wrapper/default.nix | 2 +- pkgs/development/androidenv/build-app.nix | 2 +- pkgs/development/compilers/gcc/4.3/default.nix | 6 +-- pkgs/development/compilers/gcc/4.4/default.nix | 10 ++--- pkgs/development/compilers/gcc/4.5/default.nix | 16 ++++---- pkgs/development/compilers/gcc/4.6/default.nix | 16 ++++---- pkgs/development/compilers/gcc/4.7/default.nix | 16 ++++---- pkgs/development/compilers/gnatboot/default.nix | 4 +- pkgs/development/compilers/go/default.nix | 8 ++-- pkgs/development/interpreters/octave/hg.nix | 2 +- pkgs/development/libraries/boost/1.44.nix | 2 +- pkgs/development/libraries/boost/1.46.nix | 2 +- pkgs/development/libraries/boost/1.47.nix | 6 +-- pkgs/development/libraries/boost/1.49.nix | 6 +-- pkgs/development/libraries/boost/1.51.nix | 6 +-- pkgs/development/libraries/boost/1.52.nix | 6 +-- pkgs/development/libraries/fmod/default.nix | 4 +- pkgs/development/libraries/glibc/2.13/common.nix | 2 +- .../libraries/libopensc-dnie/default.nix | 4 +- pkgs/development/libraries/plib/default.nix | 2 +- pkgs/development/libraries/vxl/default.nix | 2 +- .../tools/documentation/doxygen/1.7.nix | 2 +- .../tools/documentation/doxygen/default.nix | 2 +- pkgs/lib/debug.nix | 2 +- pkgs/lib/misc.nix | 16 ++++---- pkgs/misc/source-and-tags/default.nix | 4 +- pkgs/os-specific/linux/busybox/default.nix | 2 +- pkgs/os-specific/linux/cryptodev/default.nix | 2 +- pkgs/os-specific/linux/kernel-headers/2.4.nix | 4 +- pkgs/os-specific/linux/kernel-headers/2.6.28.nix | 2 +- pkgs/os-specific/linux/kernel-headers/2.6.32.nix | 4 +- pkgs/os-specific/linux/uclibc/default.nix | 6 +-- pkgs/top-level/all-packages.nix | 46 +++++++++++----------- 40 files changed, 130 insertions(+), 130 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix index 1c768e29873e..9e73a08e0967 100644 --- a/pkgs/applications/graphics/sane/frontends.nix +++ b/pkgs/applications/graphics/sane/frontends.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [saneBackends libX11 gtk pkgconfig] ++ - (if (libusb != null) then [libusb] else []); + (if libusb != null then [libusb] else []); meta = { homepage = "http://www.sane-project.org/"; diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index c4fdf3a00440..de8d4c336521 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [libpng saneBackends saneFrontends libX11 gtk pkgconfig ] ++ - (if (libusb != null) then [libusb] else []); + (if libusb != null then [libusb] else []); meta = { homepage = http://www.sane-project.org/; diff --git a/pkgs/applications/misc/truecrypt/default.nix b/pkgs/applications/misc/truecrypt/default.nix index 40a4f8412667..19fa85b279c6 100644 --- a/pkgs/applications/misc/truecrypt/default.nix +++ b/pkgs/applications/misc/truecrypt/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation { }; buildInputs = [ pkgconfig fuse devicemapper wxGTK nasm ]; - makeFlags = if (wxGUI) then "" else "NOGUI=1"; + makeFlags = if wxGUI then "" else "NOGUI=1"; meta = { description = "Free Open-Source filesystem on-the-fly encryption"; diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix index 7d0f138880dc..3c5d7af621c8 100644 --- a/pkgs/build-support/builder-defs/builder-defs.nix +++ b/pkgs/build-support/builder-defs/builder-defs.nix @@ -20,21 +20,21 @@ let inherit (builtins) head tail trace; in else if (hasSuffixHack ".tar.gz" s) || (hasSuffixHack ".tgz" s) then "tgz" else if (hasSuffixHack ".tar.bz2" s) || (hasSuffixHack ".tbz2" s) || (hasSuffixHack ".tbz" s) then "tbz2" - else if (hasSuffixHack ".tar.Z" s) then "tZ" - else if (hasSuffixHack ".tar.lzma" s) then "tar.lzma" - else if (hasSuffixHack ".tar.xz" s) then "tar.xz" + else if hasSuffixHack ".tar.Z" s then "tZ" + else if hasSuffixHack ".tar.lzma" s then "tar.lzma" + else if hasSuffixHack ".tar.xz" s then "tar.xz" else if (hasSuffixHack ".zip" s) || (hasSuffixHack ".ZIP" s) then "zip" - else if (hasSuffixHack "-cvs-export" s) then "cvs-dir" - else if (hasSuffixHack "-git-export" s) then "git-dir" - else if (hasSuffixHack ".nar.bz2" s) then "narbz2" - else if (hasSuffixHack ".rpm" s) then "rpm" + else if hasSuffixHack "-cvs-export" s then "cvs-dir" + else if hasSuffixHack "-git-export" s then "git-dir" + else if hasSuffixHack ".nar.bz2" s then "narbz2" + else if hasSuffixHack ".rpm" s then "rpm" # Mostly for manually specified directories.. - else if (hasSuffixHack "/" s) then "dir" + else if hasSuffixHack "/" s then "dir" # Last block - for single files!! It should be always after .tar.* - else if (hasSuffixHack ".bz2" s) then "plain-bz2" - else if (hasSuffixHack ".gz" s) then "plain-gz" + else if hasSuffixHack ".bz2" s then "plain-bz2" + else if hasSuffixHack ".gz" s then "plain-gz" # For bootstrap calls else if (s ==("" + (substring 0 0 s))) then "empty" @@ -391,7 +391,7 @@ let inherit (builtins) head tail trace; in cmakeFlags = attrByPath ["cmakeFlags"] [] args; - cmakeRPathFlag = if (attrByPath ["cmakeSkipRpath "] true args) then " -DCMAKE_SKIP_BUILD_RPATH=ON " else ""; + cmakeRPathFlag = if attrByPath ["cmakeSkipRpath "] true args then " -DCMAKE_SKIP_BUILD_RPATH=ON " else ""; cmakeBuildDir = attrByPath ["cmakeBuildDir"] "build" args; @@ -508,7 +508,7 @@ let inherit (builtins) head tail trace; in ); builderDefsPackage = bd: func: - if (builtins.isFunction func) then + if builtins.isFunction func then (foldArgs (x: y: ((func (bd // x // y)) // y)) (innerBuilderDefsPackage bd) @@ -588,7 +588,7 @@ let inherit (builtins) head tail trace; in url = srcInfo.url; sha256 = srcInfo.hash; } // - (if (srcInfo ? downloadName) then {name = srcInfo.downloadName;} else {})); + (if srcInfo ? downloadName then {name = srcInfo.downloadName;} else {})); fetchGitFromSrcInfo = srcInfo: fetchgit { url = srcInfo.url; diff --git a/pkgs/build-support/checker/default.nix b/pkgs/build-support/checker/default.nix index 4f95c3b95eeb..66f8c45e37bc 100644 --- a/pkgs/build-support/checker/default.nix +++ b/pkgs/build-support/checker/default.nix @@ -8,14 +8,14 @@ with lib; let findInList = p: list: default: - if (list == []) then default else + if list == [] then default else if (p (head list)) then (head list) else findInList p (tail list) default; checkAttrInclusion = s: a: b: ( - if (! isAttrs b) then s else + if ! isAttrs b then s else if (lib.attrByPath ["_type"] "" b) == "option" then "" else findInList (x : x != "") ( map (x: if (x == "servicesProposal") # this attr will be checked at another place ( -> upstart-jobs/default.nix ) diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix index 537867f215ba..1aebb7ecc877 100644 --- a/pkgs/build-support/fetchhg/default.nix +++ b/pkgs/build-support/fetchhg/default.nix @@ -2,16 +2,16 @@ # TODO: statically check if mercurial as the https support if the url starts woth https. stdenv.mkDerivation { - name = "hg-archive" + (if (name != null) then "-${name}" else ""); + name = "hg-archive" + (if name != null then "-${name}" else ""); builder = ./builder.sh; buildInputs = [mercurial]; # Nix <= 0.7 compatibility. id = md5; - outputHashAlgo = if (md5 != null) then "md5" else "sha256"; + outputHashAlgo = if md5 != null then "md5" else "sha256"; outputHashMode = "recursive"; - outputHash = if (md5 != null) then md5 else sha256; + outputHash = if md5 != null then md5 else sha256; inherit url tag; preferLocalBuild = true; diff --git a/pkgs/build-support/gcc-cross-wrapper/default.nix b/pkgs/build-support/gcc-cross-wrapper/default.nix index be071607d8bd..b2e30be10ef7 100644 --- a/pkgs/build-support/gcc-cross-wrapper/default.nix +++ b/pkgs/build-support/gcc-cross-wrapper/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { utils = ./utils.sh; addFlags = ./add-flags; inherit nativeTools nativeLibc nativePrefix gcc libc binutils; - crossConfig = if (cross != null) then cross.config else null; + crossConfig = if cross != null then cross.config else null; gccLibs = if gcc != null then gccLibs else null; name = chosenName; langC = if nativeTools then true else gcc.langC; diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix index 867a1157a44c..5a4ccba5eb38 100644 --- a/pkgs/build-support/gcc-wrapper/default.nix +++ b/pkgs/build-support/gcc-wrapper/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation ({ langFortran = if nativeTools then false else gcc ? langFortran; langAda = if nativeTools then false else gcc ? langAda && gcc.langAda; langVhdl = if nativeTools then false else gcc ? langVhdl && gcc.langVhdl; - zlib = if (gcc != null && gcc ? langVhdl) then zlib else null; + zlib = if gcc != null && gcc ? langVhdl then zlib else null; shell = if shell == "" then stdenv.shell else if builtins.isAttrs shell then (shell + shell.shellPath) else shell; diff --git a/pkgs/development/androidenv/build-app.nix b/pkgs/development/androidenv/build-app.nix index 571cd2be6232..d4df64e79c06 100644 --- a/pkgs/development/androidenv/build-app.nix +++ b/pkgs/development/androidenv/build-app.nix @@ -6,7 +6,7 @@ assert release -> keyStore != null && keyAlias != null && keyStorePassword != null && keyAliasPassword != null; let - platformName = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then "linux" + platformName = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then "linux" else if stdenv.system == "x86_64-darwin" then "macosx" else throw "Platform: ${stdenv.system} is not supported!"; diff --git a/pkgs/development/compilers/gcc/4.3/default.nix b/pkgs/development/compilers/gcc/4.3/default.nix index 4b9fd616d849..04e9f25fedfd 100644 --- a/pkgs/development/compilers/gcc/4.3/default.nix +++ b/pkgs/development/compilers/gcc/4.3/default.nix @@ -47,9 +47,9 @@ let " --enable-threads=posix" + " --enable-nls" ); - stageNameAddon = if (crossStageStatic) then "-stage-static" else + stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; - crossNameAddon = if (cross != null) then "-${cross.config}" + stageNameAddon else ""; + crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; in stdenv.mkDerivation ({ @@ -85,7 +85,7 @@ stdenv.mkDerivation ({ inherit noSysDirs profiledCompiler staticCompiler crossStageStatic binutilsCross libcCross; - targetConfig = if (cross != null) then cross.config else null; + targetConfig = if cross != null then cross.config else null; buildInputs = [texinfo gmp mpfr] ++ (optionals langTreelang [bison flex]) diff --git a/pkgs/development/compilers/gcc/4.4/default.nix b/pkgs/development/compilers/gcc/4.4/default.nix index 49fbcd3205a7..09609894ac67 100644 --- a/pkgs/development/compilers/gcc/4.4/default.nix +++ b/pkgs/development/compilers/gcc/4.4/default.nix @@ -84,9 +84,9 @@ let version = "4.4.6"; " --enable-nls" + " --disable-decimal-float" # No final libdecnumber (it may work only in 386) ); - stageNameAddon = if (crossStageStatic) then "-stage-static" else + stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; - crossNameAddon = if (cross != null) then "-${cross.config}" + stageNameAddon else ""; + crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; in @@ -163,11 +163,11 @@ stdenv.mkDerivation ({ ) } ${if langAda then " --enable-libada" else ""} - ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""} + ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} ${if cross != null then crossConfigureFlags else ""} "; - targetConfig = if (cross != null) then cross.config else null; + targetConfig = if cross != null then cross.config else null; # Needed for the cross compilation to work AR = "ar"; @@ -211,7 +211,7 @@ stdenv.mkDerivation ({ ) } ${if langAda then " --enable-libada" else ""} - ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""} + ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} ${if cross != null then crossConfigureFlags else ""} --target=${stdenv.cross.config} "; diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index b0916cf52b84..cb0432b66728 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -78,7 +78,7 @@ let version = "4.5.4"; withArch + withCpu + withAbi + - (if (crossMingw && crossStageStatic) then + (if crossMingw && crossStageStatic then " --with-headers=${libcCross}/include" + " --with-gcc" + " --with-gnu-as" + @@ -115,9 +115,9 @@ let version = "4.5.4"; " --enable-nls" + " --disable-decimal-float") # No final libdecnumber (it may work only in 386) ); - stageNameAddon = if (crossStageStatic) then "-stage-static" else + stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; - crossNameAddon = if (cross != null) then "-${cross.config}" + stageNameAddon else ""; + crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; in @@ -189,7 +189,7 @@ stdenv.mkDerivation ({ # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let - libc = if (libcCross != null) then libcCross else stdenv.gcc.libc; + libc = if libcCross != null then libcCross else stdenv.gcc.libc; in '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..." for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h @@ -237,7 +237,7 @@ stdenv.mkDerivation ({ --with-gmp=${gmp} --with-mpfr=${mpfr} --with-mpc=${mpc} - ${if (libelf != null) then "--with-libelf=${libelf}" else ""} + ${if libelf != null then "--with-libelf=${libelf}" else ""} --disable-libstdcxx-pch --without-included-gettext --with-system-zlib @@ -255,11 +255,11 @@ stdenv.mkDerivation ({ ${ # Trick that should be taken out once we have a mips64el-linux not loongson2f if cross == null && stdenv.system == "mips64el-linux" then "--with-arch=loongson2f" else ""} ${if langAda then " --enable-libada" else ""} - ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""} + ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} ${if cross != null then crossConfigureFlags else ""} "; - targetConfig = if (cross != null) then cross.config else null; + targetConfig = if cross != null then cross.config else null; crossAttrs = { AR = "${stdenv.cross.config}-ar"; @@ -299,7 +299,7 @@ stdenv.mkDerivation ({ ) } ${if langAda then " --enable-libada" else ""} - ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""} + ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} ${if cross != null then crossConfigureFlags else ""} --target=${stdenv.cross.config} ''; diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index d67ee8bef0e9..38c3282b7c4f 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -101,7 +101,7 @@ let version = "4.6.3"; withArch + withCpu + withAbi + - (if (crossMingw && crossStageStatic) then + (if crossMingw && crossStageStatic then " --with-headers=${libcCross}/include" + " --with-gcc" + " --with-gnu-as" + @@ -149,9 +149,9 @@ let version = "4.6.3"; " --enable-nls" + " --disable-decimal-float") # No final libdecnumber (it may work only in 386) ); - stageNameAddon = if (crossStageStatic) then "-stage-static" else + stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; - crossNameAddon = if (cross != null) then "-${cross.config}" + stageNameAddon else ""; + crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips; @@ -216,7 +216,7 @@ stdenv.mkDerivation ({ # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let - libc = if (libcCross != null) then libcCross else stdenv.gcc.libc; + libc = if libcCross != null then libcCross else stdenv.gcc.libc; in '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..." for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h @@ -275,7 +275,7 @@ stdenv.mkDerivation ({ --with-gmp=${gmp} --with-mpfr=${mpfr} --with-mpc=${mpc} - ${if (libelf != null) then "--with-libelf=${libelf}" else ""} + ${if libelf != null then "--with-libelf=${libelf}" else ""} --disable-libstdcxx-pch --without-included-gettext --with-system-zlib @@ -294,12 +294,12 @@ stdenv.mkDerivation ({ ${ # Trick that should be taken out once we have a mips64el-linux not loongson2f if cross == null && stdenv.system == "mips64el-linux" then "--with-arch=loongson2f" else ""} ${if langAda then " --enable-libada" else ""} - ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""} + ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} ${if cross != null then crossConfigureFlags else ""} ${if !bootstrap then "--disable-bootstrap" else ""} "; - targetConfig = if (cross != null) then cross.config else null; + targetConfig = if cross != null then cross.config else null; buildFlags = if bootstrap then (if profiledCompiler then "profiledbootstrap" else "bootstrap") @@ -350,7 +350,7 @@ stdenv.mkDerivation ({ ) } ${if langAda then " --enable-libada" else ""} - ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""} + ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} ${if cross != null then crossConfigureFlags else ""} --target=${stdenv.cross.config} ''; diff --git a/pkgs/development/compilers/gcc/4.7/default.nix b/pkgs/development/compilers/gcc/4.7/default.nix index 3e45efcf6456..05e7568a8033 100644 --- a/pkgs/development/compilers/gcc/4.7/default.nix +++ b/pkgs/development/compilers/gcc/4.7/default.nix @@ -99,7 +99,7 @@ let version = "4.7.2"; withArch + withCpu + withAbi + - (if (crossMingw && crossStageStatic) then + (if crossMingw && crossStageStatic then " --with-headers=${libcCross}/include" + " --with-gcc" + " --with-gnu-as" + @@ -147,9 +147,9 @@ let version = "4.7.2"; " --enable-nls" + " --disable-decimal-float") # No final libdecnumber (it may work only in 386) ); - stageNameAddon = if (crossStageStatic) then "-stage-static" else + stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; - crossNameAddon = if (cross != null) then "-${cross.config}" + stageNameAddon else ""; + crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips; @@ -211,7 +211,7 @@ stdenv.mkDerivation ({ # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let - libc = if (libcCross != null) then libcCross else stdenv.gcc.libc; + libc = if libcCross != null then libcCross else stdenv.gcc.libc; in '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..." for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h @@ -274,7 +274,7 @@ stdenv.mkDerivation ({ --with-gmp=${gmp} --with-mpfr=${mpfr} --with-mpc=${mpc} - ${if (libelf != null) then "--with-libelf=${libelf}" else ""} + ${if libelf != null then "--with-libelf=${libelf}" else ""} --disable-libstdcxx-pch --without-included-gettext --with-system-zlib @@ -296,12 +296,12 @@ stdenv.mkDerivation ({ ${ # Trick that should be taken out once we have a mips64el-linux not loongson2f if cross == null && stdenv.system == "mips64el-linux" then "--with-arch=loongson2f" else ""} ${if langAda then " --enable-libada" else ""} - ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""} + ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} ${if cross != null then crossConfigureFlags else ""} ${if !bootstrap then "--disable-bootstrap" else ""} "; - targetConfig = if (cross != null) then cross.config else null; + targetConfig = if cross != null then cross.config else null; buildFlags = if bootstrap then (if profiledCompiler then "profiledbootstrap" else "bootstrap") @@ -351,7 +351,7 @@ stdenv.mkDerivation ({ ) } ${if langAda then " --enable-libada" else ""} - ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""} + ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} ${if cross != null then crossConfigureFlags else ""} --target=${stdenv.cross.config} ''; diff --git a/pkgs/development/compilers/gnatboot/default.nix b/pkgs/development/compilers/gnatboot/default.nix index 79208743ae42..1de0c88a6bc7 100644 --- a/pkgs/development/compilers/gnatboot/default.nix +++ b/pkgs/development/compilers/gnatboot/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation { name = "gentoo-gnatboot-4.1"; - src = if (stdenv.system == "i686-linux") then + src = if stdenv.system == "i686-linux" then fetchurl { url = "mirror://gentoo/distfiles/gnatboot-4.1-i386.tar.bz2"; sha256 = "0665zk71598204bf521vw68i5y6ccqarq9fcxsqp7ccgycb4lysr"; } - else if (stdenv.system == "x86_64-linux") then + else if stdenv.system == "x86_64-linux" then fetchurl { url = "mirror://gentoo/distfiles/gnatboot-4.1-amd64.tar.bz2"; sha256 = "1li4d52lmbnfs6llcshlbqyik2q2q4bvpir0f7n38nagp0h6j0d4"; diff --git a/pkgs/development/compilers/go/default.nix b/pkgs/development/compilers/go/default.nix index 60ea7981931d..955daa0ad9fc 100644 --- a/pkgs/development/compilers/go/default.nix +++ b/pkgs/development/compilers/go/default.nix @@ -54,9 +54,9 @@ stdenv.mkDerivation { patches = [ ./cacert.patch ]; GOOS = "linux"; - GOARCH = if (stdenv.system == "i686-linux") then "386" - else if (stdenv.system == "x86_64-linux") then "amd64" - else if (stdenv.system == "armv5tel-linux") then "arm" + GOARCH = if stdenv.system == "i686-linux" then "386" + else if stdenv.system == "x86_64-linux" then "amd64" + else if stdenv.system == "armv5tel-linux" then "arm" else throw "Unsupported system"; GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; @@ -74,7 +74,7 @@ stdenv.mkDerivation { for a in go gofmt godoc; do wrapProgram "$out/bin/$a" \ --set "GOROOT" $out/share/go \ - ${if (stdenv.system == "armv5tel-linux") then "--set GOARM $GOARM" else ""} + ${if stdenv.system == "armv5tel-linux" then "--set GOARM $GOARM" else ""} done # Copy the emacs configuration for Go files. diff --git a/pkgs/development/interpreters/octave/hg.nix b/pkgs/development/interpreters/octave/hg.nix index f414dd719654..f44efb943587 100644 --- a/pkgs/development/interpreters/octave/hg.nix +++ b/pkgs/development/interpreters/octave/hg.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation ({ license = "GPL-3"; }; } // ( - if (config.octave.devVersion or false) then { + if config.octave.devVersion or false then { name = "octave-hg"; # developement version mercurial repo # REGION AUTO UPDATE: { name="octave"; type = "hg"; url = "http://www.octave.org/hg/octave"; } src = sourceFromHead "octave-03b414516dd8.tar.gz" diff --git a/pkgs/development/libraries/boost/1.44.nix b/pkgs/development/libraries/boost/1.44.nix index 90b57d6af0ca..e0235cd8b39f 100644 --- a/pkgs/development/libraries/boost/1.44.nix +++ b/pkgs/development/libraries/boost/1.44.nix @@ -29,7 +29,7 @@ let (enableShared && enableStatic)) then "tagged" else "system"; - cflags = if (enablePIC) then "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" else ""; + cflags = if enablePIC then "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" else ""; in diff --git a/pkgs/development/libraries/boost/1.46.nix b/pkgs/development/libraries/boost/1.46.nix index 430189ad32b9..54a9d8d6c566 100644 --- a/pkgs/development/libraries/boost/1.46.nix +++ b/pkgs/development/libraries/boost/1.46.nix @@ -28,7 +28,7 @@ let (enableShared && enableStatic)) then "tagged" else "system"; - cflags = if (enablePIC) then "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" else ""; + cflags = if enablePIC then "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" else ""; in diff --git a/pkgs/development/libraries/boost/1.47.nix b/pkgs/development/libraries/boost/1.47.nix index 7a2486883f97..c63ee94fa9bd 100644 --- a/pkgs/development/libraries/boost/1.47.nix +++ b/pkgs/development/libraries/boost/1.47.nix @@ -29,11 +29,11 @@ let (enableShared && enableStatic)) then "tagged" else "system"; - cflags = if (enablePIC && enableExceptions) then + cflags = if enablePIC && enableExceptions then "cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC" - else if (enablePIC) then + else if enablePIC then "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" - else if (enableExceptions) then + else if enableExceptions then "cflags=-fexceptions" else ""; diff --git a/pkgs/development/libraries/boost/1.49.nix b/pkgs/development/libraries/boost/1.49.nix index ddda72468ab4..dfad38b30a5a 100644 --- a/pkgs/development/libraries/boost/1.49.nix +++ b/pkgs/development/libraries/boost/1.49.nix @@ -29,11 +29,11 @@ let (enableShared && enableStatic)) then "tagged" else "system"; - cflags = if (enablePIC && enableExceptions) then + cflags = if enablePIC && enableExceptions then "cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC" - else if (enablePIC) then + else if enablePIC then "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" - else if (enableExceptions) then + else if enableExceptions then "cflags=-fexceptions" else ""; diff --git a/pkgs/development/libraries/boost/1.51.nix b/pkgs/development/libraries/boost/1.51.nix index 32be8fca191e..d5e5c5f931d5 100644 --- a/pkgs/development/libraries/boost/1.51.nix +++ b/pkgs/development/libraries/boost/1.51.nix @@ -27,11 +27,11 @@ let # To avoid library name collisions layout = if taggedLayout then "tagged" else "system"; - cflags = if (enablePIC && enableExceptions) then + cflags = if enablePIC && enableExceptions then "cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC" - else if (enablePIC) then + else if enablePIC then "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" - else if (enableExceptions) then + else if enableExceptions then "cflags=-fexceptions" else ""; diff --git a/pkgs/development/libraries/boost/1.52.nix b/pkgs/development/libraries/boost/1.52.nix index 0f8a40888a43..352a2d4aac96 100644 --- a/pkgs/development/libraries/boost/1.52.nix +++ b/pkgs/development/libraries/boost/1.52.nix @@ -27,11 +27,11 @@ let # To avoid library name collisions layout = if taggedLayout then "tagged" else "system"; - cflags = if (enablePIC && enableExceptions) then + cflags = if enablePIC && enableExceptions then "cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC" - else if (enablePIC) then + else if enablePIC then "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" - else if (enableExceptions) then + else if enableExceptions then "cflags=-fexceptions" else ""; diff --git a/pkgs/development/libraries/fmod/default.nix b/pkgs/development/libraries/fmod/default.nix index f73480b3ce46..d85a24fa63ad 100644 --- a/pkgs/development/libraries/fmod/default.nix +++ b/pkgs/development/libraries/fmod/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { name = "fmod-42204"; - src = if (stdenv.system == "i686-linux") then + src = if stdenv.system == "i686-linux" then fetchurl { url = http://www.fmod.org/index.php/release/version/fmodapi42204linux.tar.gz; sha256 = "64eedc5b37c597eb925de446106d75cab0b5a79697d5ec048d34702812c08563"; - } else if (stdenv.system == "x86_64-linux") then + } else if stdenv.system == "x86_64-linux" then fetchurl { url = http://www.fmod.org/index.php/release/version/fmodapi42204linux64.tar.gz; sha256 = "3f2eec8265838a1005febe07c4971660e85010e4622911890642dc438746edf3"; diff --git a/pkgs/development/libraries/glibc/2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix index 2333e42246b0..6395b7ffc44e 100644 --- a/pkgs/development/libraries/glibc/2.13/common.nix +++ b/pkgs/development/libraries/glibc/2.13/common.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation ({ inherit kernelHeaders installLocales; # The host/target system. - crossConfig = if (cross != null) then cross.config else null; + crossConfig = if cross != null then cross.config else null; inherit (stdenv) is64bit; diff --git a/pkgs/development/libraries/libopensc-dnie/default.nix b/pkgs/development/libraries/libopensc-dnie/default.nix index ad524c21ff10..d229933111e8 100644 --- a/pkgs/development/libraries/libopensc-dnie/default.nix +++ b/pkgs/development/libraries/libopensc-dnie/default.nix @@ -7,11 +7,11 @@ assert opensc.name == "opensc-0.11.7"; stdenv.mkDerivation rec { name = "libopensc-dnie-1.4.6-2"; - src = if (stdenv.system == "i686-linux") then (fetchurl { + src = if stdenv.system == "i686-linux" then (fetchurl { url = http://www.dnielectronico.es/descargas/PKCS11_para_Sistemas_Unix/1.4.6.Ubuntu_Jaunty_32/Ubuntu_Jaunty_opensc-dnie_1.4.6-2_i386.deb.tar; sha256 = "1i6r9ahjr0rkcxjfzkg2rrib1rjsjd5raxswvvfiya98q8rlv39i"; }) - else if (stdenv.system == "x86_64-linux") then (fetchurl { url = http://www.dnielectronico.es/descargas/PKCS11_para_Sistemas_Unix/1.4.6.Ubuntu_Jaunty_64/Ubuntu_Jaunty_opensc-dnie_1.4.6-2_amd64.deb.tar; + else if stdenv.system == "x86_64-linux" then (fetchurl { url = http://www.dnielectronico.es/descargas/PKCS11_para_Sistemas_Unix/1.4.6.Ubuntu_Jaunty_64/Ubuntu_Jaunty_opensc-dnie_1.4.6-2_amd64.deb.tar; sha256 = "1py2bxavdcj0crhk1lwqzjgya5lvyhdfdbr4g04iysj56amxb7f9"; }) else throw "Architecture not supported"; diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix index 679db72802c6..5e15a63735ee 100644 --- a/pkgs/development/libraries/plib/default.nix +++ b/pkgs/development/libraries/plib/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0cha71mflpa10vh2l7ipyqk67dq2y0k5xbafwdks03fwdyzj4ns8"; }; - NIX_CFLAGS_COMPILE = if (enablePIC) then "-fPIC" else ""; + NIX_CFLAGS_COMPILE = if enablePIC then "-fPIC" else ""; propagatedBuildInputs = [ mesa freeglut SDL diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix index 5f49c3351fa5..2f169f3f25dd 100644 --- a/pkgs/development/libraries/vxl/default.nix +++ b/pkgs/development/libraries/vxl/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { # BUILD_OUL wants old linux headers for videodev.h, not available # in stdenv linux headers cmakeFlags = "-DBUILD_TESTING=OFF -DBUILD_OUL=OFF " - + (if (stdenv.system == "x86_64-linux") then + + (if stdenv.system == "x86_64-linux" then "-DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC" else ""); diff --git a/pkgs/development/tools/documentation/doxygen/1.7.nix b/pkgs/development/tools/documentation/doxygen/1.7.nix index 86f2e8cf2b2e..f530ed70e37f 100644 --- a/pkgs/development/tools/documentation/doxygen/1.7.nix +++ b/pkgs/development/tools/documentation/doxygen/1.7.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation { ''; maintainers = [stdenv.lib.maintainers.simons]; - platforms = if (qt4 != null) then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix; + platforms = if qt4 != null then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 07893987bbf8..047da44a7937 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation { ''; maintainers = [stdenv.lib.maintainers.simons]; - platforms = if (qt4 != null) then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix; + platforms = if qt4 != null then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix; }; } diff --git a/pkgs/lib/debug.nix b/pkgs/lib/debug.nix index b78f946c5d44..d627bc861abb 100644 --- a/pkgs/lib/debug.nix +++ b/pkgs/lib/debug.nix @@ -95,7 +95,7 @@ rec { else if isInt x then true else if x == null then true else true; # a (store) path? - in if (traverse x) then x else throw "else never reached"; + in if traverse x then x else throw "else never reached"; # example: (traceCallXml "myfun" id 3) will output something like # calling myfun arg 1: 3 result: 3 diff --git a/pkgs/lib/misc.nix b/pkgs/lib/misc.nix index b6f86d45dd84..79504f7d8860 100644 --- a/pkgs/lib/misc.nix +++ b/pkgs/lib/misc.nix @@ -53,7 +53,7 @@ rec { f : # the function applied to the arguments initial : # you pass attrs, the functions below are passing a function taking the fix argument let - takeFixed = if (isFunction initial) then initial else (fixed : initial); # transform initial to an expression always taking the fixed argument + takeFixed = if isFunction initial then initial else (fixed : initial); # transform initial to an expression always taking the fixed argument tidy = args : let # apply all functions given in "applyPreTidy" in sequence applyPreTidyFun = fold ( n : a : x : n ( a x ) ) lib.id (maybeAttr "applyPreTidy" [] args); @@ -106,11 +106,11 @@ rec { # shortcut for attrByPath ["name"] default attrs maybeAttrNullable = name: default: attrs: if attrs == null then default else - if (__hasAttr name attrs) then (__getAttr name attrs) else default; + if __hasAttr name attrs then (__getAttr name attrs) else default; # shortcut for attrByPath ["name"] default attrs maybeAttr = name: default: attrs: - if (__hasAttr name attrs) then (__getAttr name attrs) else default; + if __hasAttr name attrs then (__getAttr name attrs) else default; # Return the second argument if the first one is true or the empty version @@ -120,14 +120,14 @@ rec { else if builtins.isList val then [] else if builtins.isAttrs val then {} # else if builtins.isString val then "" - else if (val == true || val == false) then false + else if val == true || val == false then false else null; # Return true only if there is an attribute and it is true. checkFlag = attrSet: name: - if (name == "true") then true else - if (name == "false") then false else + if name == "true" then true else + if name == "false" then false else if (elem name (attrByPath ["flags"] [] attrSet)) then true else attrByPath [name] false attrSet ; @@ -170,7 +170,7 @@ rec { uniqListExt = {inputList, outputList ? [], getter ? (x : x), compare ? (x: y: x==y)}: - if (inputList == []) then outputList else + if inputList == [] then outputList else let x=head inputList; isX = y: (compare (getter y) (getter x)); newOutputList = outputList ++ @@ -362,7 +362,7 @@ rec { cfgWithDefaults = (listToAttrs (map (n : nameValuePair (flagName n) false) (attrNames args2.flags))) // args2.cfg; opts = attrValues (mapAttrs (a : v : - let v2 = if (v ? set || v ? unset) then v else { set = v; }; + let v2 = if v ? set || v ? unset then v else { set = v; }; n = if (getAttr (flagName a) cfgWithDefaults) then "set" else "unset"; attr = maybeAttr n {} v2; in if (maybeAttr "assertion" true attr) diff --git a/pkgs/misc/source-and-tags/default.nix b/pkgs/misc/source-and-tags/default.nix index e3993d0daeac..ece31bbaa74f 100644 --- a/pkgs/misc/source-and-tags/default.nix +++ b/pkgs/misc/source-and-tags/default.nix @@ -4,8 +4,8 @@ args: with args; { || x ? meta && x.meta ? sourceWithTags ); # hack because passthru doesn't work the way I'd expect. Don't have time to spend on this right now # that's why I'm abusing meta for the same purpose in ghcsAndLibs - sourceWithTagsFromDerivation = x : if (x ? passthru && x.passthru ? sourceWithTags ) then x.passthru.sourceWithTags - else if (x ? meta && x.meta ? sourceWithTags ) then x.meta.sourceWithTags + sourceWithTagsFromDerivation = x : if x ? passthru && x.passthru ? sourceWithTags then x.passthru.sourceWithTags + else if x ? meta && x.meta ? sourceWithTags then x.meta.sourceWithTags else null; # createTagFiles = [ { name = "my_tag_name_without_suffix", tagCmd = "ctags -R . -o \$TAG_FILE"; } ] diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 30f7341257bd..a24e0fd2307b 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { extraCrossConfig = '' CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cross.config}-" '' + - (if (stdenv.cross.platform.kernelMajor == "2.4") then '' + (if stdenv.cross.platform.kernelMajor == "2.4" then '' CONFIG_IONICE n '' else ""); }; diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix index cb797f07aa33..b9e5690e80e9 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "13hybl5p0ck0vgi2gxmiwa2810gcfk78kdy17ai8nczj8il15mn0"; }; - buildPhase = if (!onlyHeaders) then '' + buildPhase = if !onlyHeaders then '' make -C ${kernel}/lib/modules/${kernel.modDirVersion}/build \ SUBDIRS=`pwd` INSTALL_PATH=$out '' else ":"; diff --git a/pkgs/os-specific/linux/kernel-headers/2.4.nix b/pkgs/os-specific/linux/kernel-headers/2.4.nix index c5926ff2e477..9457769f5efb 100644 --- a/pkgs/os-specific/linux/kernel-headers/2.4.nix +++ b/pkgs/os-specific/linux/kernel-headers/2.4.nix @@ -4,7 +4,7 @@ assert cross == null -> stdenv.isLinux; let version = "2.4.37.9"; - kernelHeadersBaseConfig = if (cross == null) then + kernelHeadersBaseConfig = if cross == null then stdenv.platform.kernelHeadersBaseConfig else cross.platform.kernelHeadersBaseConfig; @@ -18,7 +18,7 @@ stdenv.mkDerivation { sha256 = "08rca9lcb5l5w483hgaqk8pi2njd7cmwpkifjqxwlb3g8liz4r5g"; }; - targetConfig = if (cross != null) then cross.config else null; + targetConfig = if cross != null then cross.config else null; platform = if cross != null then cross.platform.kernelArch else diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.28.nix b/pkgs/os-specific/linux/kernel-headers/2.6.28.nix index b576b68773c8..1ba03010f8ab 100644 --- a/pkgs/os-specific/linux/kernel-headers/2.6.28.nix +++ b/pkgs/os-specific/linux/kernel-headers/2.6.28.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "0hifjh75sinifr5138v22zwbpqln6lhn65k8b57a1dyzlqca7cl9"; }; - targetConfig = if (cross != null) then cross.config else null; + targetConfig = if cross != null then cross.config else null; platform = if cross != null then cross.arch else diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.32.nix b/pkgs/os-specific/linux/kernel-headers/2.6.32.nix index a2fc597eaac7..100dd0c611b3 100644 --- a/pkgs/os-specific/linux/kernel-headers/2.6.32.nix +++ b/pkgs/os-specific/linux/kernel-headers/2.6.32.nix @@ -4,7 +4,7 @@ assert cross == null -> stdenv.isLinux; let version = "2.6.32.16"; - kernelHeadersBaseConfig = if (cross == null) then + kernelHeadersBaseConfig = if cross == null then stdenv.platform.kernelHeadersBaseConfig else cross.platform.kernelHeadersBaseConfig; @@ -18,7 +18,7 @@ stdenv.mkDerivation { sha256 = "1ndvqvfaxachsklzzr5db1bzvfhnzz8diddrm1zlv7171fzmn13j"; }; - targetConfig = if (cross != null) then cross.config else null; + targetConfig = if cross != null then cross.config else null; platform = if cross != null then cross.platform.kernelArch else diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index 1ad392ad6fab..0e6467ed184b 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -33,8 +33,8 @@ let } ''; - archMakeFlag = if (cross != null) then "ARCH=${cross.arch}" else ""; - crossMakeFlag = if (cross != null) then "CROSS=${cross.config}-" else ""; + archMakeFlag = if cross != null then "ARCH=${cross.arch}" else ""; + crossMakeFlag = if cross != null then "CROSS=${cross.config}-" else ""; # UCLIBC_SUSV4_LEGACY defines 'tmpnam', needed for gcc libstdc++ builds. nixConfig = '' @@ -74,7 +74,7 @@ stdenv.mkDerivation { ''; # Cross stripping hurts. - dontStrip = if (cross != null) then true else false; + dontStrip = if cross != null then true else false; makeFlags = [ crossMakeFlag "VERBOSE=1" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d1b9f8601e7..c13072a99fcc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -222,7 +222,7 @@ let else defaultStdenv; - forceNativeDrv = drv : if (crossSystem == null) then drv else + forceNativeDrv = drv : if crossSystem == null then drv else (drv // { crossDrv = drv.nativeDrv; }); # A stdenv capable of building 32-bit binaries. On x86_64-linux, @@ -2422,10 +2422,10 @@ let jreOnly = true; }; - jdk = if (stdenv.isDarwin || stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") + jdk = if stdenv.isDarwin || stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then pkgs.openjdk else pkgs.oraclejdk; - jre = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") + jre = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then pkgs.openjre else pkgs.oraclejre; @@ -3658,11 +3658,11 @@ let }; # We can choose: - libcCrossChooser = name : if (name == "glibc") then glibcCross - else if (name == "uclibc") then uclibcCross - else if (name == "msvcrt" && stdenv.cross.config == "x86_64-w64-mingw32") then + libcCrossChooser = name : if name == "glibc" then glibcCross + else if name == "uclibc" then uclibcCross + else if name == "msvcrt" && stdenv.cross.config == "x86_64-w64-mingw32" then windows.mingw_w64 - else if (name == "msvcrt") then windows.mingw_headers3 + else if name == "msvcrt" then windows.mingw_headers3 else throw "Unknown libc"; libcCross = assert crossSystem != null; libcCrossChooser crossSystem.libc; @@ -4184,14 +4184,14 @@ let libiconv = callPackage ../development/libraries/libiconv { }; - libiconvOrEmpty = if (libiconvOrNull == null) then [] else [libiconv]; + libiconvOrEmpty = if libiconvOrNull == null then [] else [libiconv]; libiconvOrNull = - if ((gcc ? libc && (gcc.libc != null)) || stdenv.isGlibc) + if gcc.libc or null != null || stdenv.isGlibc then null else libiconv; - libiconvOrLibc = if (libiconvOrNull == null) then gcc.libc else libiconv; + libiconvOrLibc = if libiconvOrNull == null then gcc.libc else libiconv; libid3tag = callPackage ../development/libraries/libid3tag { }; @@ -5699,8 +5699,8 @@ let }); # We can choose: - linuxHeadersCrossChooser = ver : if (ver == "2.4") then linuxHeaders24Cross - else if (ver == "2.6") then linuxHeaders26Cross + linuxHeadersCrossChooser = ver : if ver == "2.4" then linuxHeaders24Cross + else if ver == "2.6" then linuxHeaders26Cross else throw "Unknown linux kernel version"; linuxHeadersCross = assert crossSystem != null; @@ -5905,10 +5905,10 @@ let iwlwifi = callPackage ../os-specific/linux/iwlwifi { }; iwlwifi4965ucode = - (if (builtins.compareVersions kernel.version "2.6.27" == 0) - || (builtins.compareVersions kernel.version "2.6.27" == 1) - then iwlwifi4965ucodeV2 - else iwlwifi4965ucodeV1); + if (builtins.compareVersions kernel.version "2.6.27" == 0) + || (builtins.compareVersions kernel.version "2.6.27" == 1) + then iwlwifi4965ucodeV2 + else iwlwifi4965ucodeV1; atheros = callPackage ../os-specific/linux/atheros/0.9.4.nix { }; @@ -6188,10 +6188,10 @@ let tunctl = callPackage ../os-specific/linux/tunctl { }; - ubootChooser = name : if (name == "upstream") then ubootUpstream - else if (name == "sheevaplug") then ubootSheevaplug - else if (name == "guruplug") then ubootGuruplug - else if (name == "nanonote") then ubootNanonote + ubootChooser = name : if name == "upstream" then ubootUpstream + else if name == "sheevaplug" then ubootSheevaplug + else if name == "guruplug" then ubootGuruplug + else if name == "nanonote" then ubootNanonote else throw "Unknown uboot"; ubootUpstream = callPackage ../misc/uboot { }; @@ -7515,9 +7515,9 @@ let picocom = callPackage ../tools/misc/picocom { }; pidgin = callPackage ../applications/networking/instant-messengers/pidgin { - openssl = if (config.pidgin.openssl or true) then openssl else null; - gnutls = if (config.pidgin.gnutls or false) then gnutls else null; - libgcrypt = if (config.pidgin.gnutls or false) then libgcrypt else null; + openssl = if config.pidgin.openssl or true then openssl else null; + gnutls = if config.pidgin.gnutls or false then gnutls else null; + libgcrypt = if config.pidgin.gnutls or false then libgcrypt else null; inherit (gnome) startupnotification; }; -- cgit 1.4.1 From 88b11196c130b6bda5fd2e57729e876527c63377 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Dec 2012 19:57:47 +0100 Subject: Clean up redundant "if condition then true else false" --- pkgs/applications/networking/sync/unison/default.nix | 2 +- pkgs/development/compilers/gcc/4.3/default.nix | 2 +- pkgs/development/compilers/gcc/4.4/default.nix | 2 +- pkgs/development/libraries/zlib/default.nix | 2 +- pkgs/os-specific/linux/uclibc/default.nix | 2 +- pkgs/tools/networking/curl/default.nix | 2 +- pkgs/top-level/all-packages.nix | 10 +++++----- 7 files changed, 11 insertions(+), 11 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index ea30903fb383..35dd2d2a7d02 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (rec { done '' else ""; - dontStrip = if ! ocaml.nativeCompilers then true else false; + dontStrip = !ocaml.nativeCompilers; meta = { homepage = http://www.cis.upenn.edu/~bcpierce/unison/; diff --git a/pkgs/development/compilers/gcc/4.3/default.nix b/pkgs/development/compilers/gcc/4.3/default.nix index 04e9f25fedfd..73680996a837 100644 --- a/pkgs/development/compilers/gcc/4.3/default.nix +++ b/pkgs/development/compilers/gcc/4.3/default.nix @@ -129,7 +129,7 @@ stdenv.mkDerivation ({ enableMultilib; }; # ghdl does not build fine with parallel building - enableParallelBuilding = if langVhdl then false else true; + enableParallelBuilding = !langVhdl; meta = { homepage = "http://gcc.gnu.org/"; diff --git a/pkgs/development/compilers/gcc/4.4/default.nix b/pkgs/development/compilers/gcc/4.4/default.nix index 09609894ac67..804a797bac12 100644 --- a/pkgs/development/compilers/gcc/4.4/default.nix +++ b/pkgs/development/compilers/gcc/4.4/default.nix @@ -243,7 +243,7 @@ stdenv.mkDerivation ({ enableMultilib version; }; # ghdl does not build fine with parallel building - enableParallelBuilding = if langVhdl then false else true; + enableParallelBuilding = !langVhdl; meta = { homepage = http://gcc.gnu.org/; diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 5e1ddf839516..ec47c35c1530 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-static-libgcc"; crossAttrs = { - dontStrip = if static then true else false; + dontStrip = static; } // stdenv.lib.optionalAttrs (stdenv.cross.libc == "msvcrt") { configurePhase='' installFlags="BINARY_PATH=$out/bin INCLUDE_PATH=$out/include LIBRARY_PATH=$out/lib" diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index 0e6467ed184b..e7cce315e8c6 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation { ''; # Cross stripping hurts. - dontStrip = if cross != null then true else false; + dontStrip = cross != null; makeFlags = [ crossMakeFlag "VERBOSE=1" ]; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 1d08fc7228b2..c6e7ccd1fa2d 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ${if linkStatic then "--enable-static --disable-shared" else ""} ''; - dontDisableStatic = if linkStatic then true else false; + dontDisableStatic = linkStatic; CFLAGS = if stdenv ? isDietLibC then "-DHAVE_INET_NTOA_R_2_ARGS=1" else ""; LDFLAGS = if linkStatic then "-static" else ""; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c13072a99fcc..968418af9289 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2043,7 +2043,7 @@ let gettext which noSysDirs; # bootstrapping a profiled compiler does not work in the sheevaplug: # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944 - profiledCompiler = if stdenv.isArm then false else true; + profiledCompiler = !stdenv.isArm; # When building `gcc.crossDrv' (a "Canadian cross", with host == target # and host != build), `cross' must be null but the cross-libc must still @@ -2064,7 +2064,7 @@ let # bootstrapping a profiled compiler does not work in the sheevaplug: # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944 - profiledCompiler = if stdenv.system == "armv5tel-linux" then false else true; + profiledCompiler = !stdenv.system == "armv5tel-linux"; })); gcc46_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.6 { @@ -2072,7 +2072,7 @@ let # bootstrapping a profiled compiler does not work in the sheevaplug: # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944 - profiledCompiler = if stdenv.isArm then false else true; + profiledCompiler = !stdenv.isArm; # When building `gcc.crossDrv' (a "Canadian cross", with host == target # and host != build), `cross' must be null but the cross-libc must still @@ -8254,14 +8254,14 @@ let speed_dreams = callPackage ../games/speed-dreams { # Torcs wants to make shared libraries linked with plib libraries (it provides static). # i686 is the only platform I know than can do that linking without plib built with -fPIC - plib = plib.override { enablePIC = if stdenv.isi686 then false else true; }; + plib = plib.override { enablePIC = !stdenv.isi686; }; libpng = libpng12; }; torcs = callPackage ../games/torcs { # Torcs wants to make shared libraries linked with plib libraries (it provides static). # i686 is the only platform I know than can do that linking without plib built with -fPIC - plib = plib.override { enablePIC = if stdenv.isi686 then false else true; }; + plib = plib.override { enablePIC = !stdenv.isi686; }; }; trigger = callPackage ../games/trigger { }; -- cgit 1.4.1 From 4485ee59166a25106136b3e77f6e731fd39d82fd Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Fri, 28 Dec 2012 21:16:25 +0100 Subject: glibc: removing raspberrypi specific code I think its --with-fp or --without-fp makes nothing, for arm. --- pkgs/development/libraries/glibc/2.16/common.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/glibc/2.16/common.nix b/pkgs/development/libraries/glibc/2.16/common.nix index a8cb4f2b1d05..3876cf237c8c 100644 --- a/pkgs/development/libraries/glibc/2.16/common.nix +++ b/pkgs/development/libraries/glibc/2.16/common.nix @@ -114,19 +114,9 @@ stdenv.mkDerivation ({ && cross.platform.kernelMajor == "2.6") [ "--enable-kernel=2.6.0" "--with-__thread" - ] ++ stdenv.lib.optionals (cross == null && - (stdenv.system == "armv5tel-linux")) [ + ] ++ stdenv.lib.optionals (cross == null && stdenv.isArm) [ "--host=arm-linux-gnueabi" "--build=arm-linux-gnueabi" - "--without-fp" - - # To avoid linking with -lgcc_s (dynamic link) - # so the glibc does not depend on its compiler store path - "libc_cv_as_needed=no" - ] ++ stdenv.lib.optionals (cross == null && stdenv.platform.name == "raspberrypi") [ - "--host=arm-linux-gnueabi" - "--build=arm-linux-gnueabi" - "--with-fp" # To avoid linking with -lgcc_s (dynamic link) # so the glibc does not depend on its compiler store path -- cgit 1.4.1 From db418fce3d159391a7f2baf2b765e5798908c696 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 29 Dec 2012 00:48:14 +0100 Subject: glibc: Update to 2.17 Note that glibc-ports is now part of the main glibc tarball. --- pkgs/development/libraries/glibc/2.16/builder.sh | 54 ------ pkgs/development/libraries/glibc/2.16/common.nix | 208 --------------------- pkgs/development/libraries/glibc/2.16/default.nix | 99 ---------- .../glibc/2.16/dont-use-system-ld-so-cache.patch | 45 ----- .../glibc/2.16/glibc-elf-localscope.patch | 82 -------- pkgs/development/libraries/glibc/2.16/info.nix | 26 --- .../libraries/glibc/2.16/locales-builder.sh | 17 -- pkgs/development/libraries/glibc/2.16/locales.nix | 47 ----- .../libraries/glibc/2.16/nix-locale-archive.patch | 114 ----------- .../libraries/glibc/2.16/nss-skip-unavail.patch | 21 --- .../libraries/glibc/2.16/rpcgen-path.patch | 72 ------- pkgs/development/libraries/glibc/2.17/builder.sh | 54 ++++++ pkgs/development/libraries/glibc/2.17/common.nix | 194 +++++++++++++++++++ pkgs/development/libraries/glibc/2.17/default.nix | 99 ++++++++++ .../glibc/2.17/dont-use-system-ld-so-cache.patch | 45 +++++ .../glibc/2.17/glibc-elf-localscope.patch | 82 ++++++++ pkgs/development/libraries/glibc/2.17/info.nix | 26 +++ .../libraries/glibc/2.17/locales-builder.sh | 17 ++ pkgs/development/libraries/glibc/2.17/locales.nix | 47 +++++ .../libraries/glibc/2.17/nix-locale-archive.patch | 114 +++++++++++ .../libraries/glibc/2.17/nss-skip-unavail.patch | 21 +++ .../libraries/glibc/2.17/rpcgen-path.patch | 72 +++++++ pkgs/top-level/all-packages.nix | 4 +- 23 files changed, 773 insertions(+), 787 deletions(-) delete mode 100644 pkgs/development/libraries/glibc/2.16/builder.sh delete mode 100644 pkgs/development/libraries/glibc/2.16/common.nix delete mode 100644 pkgs/development/libraries/glibc/2.16/default.nix delete mode 100644 pkgs/development/libraries/glibc/2.16/dont-use-system-ld-so-cache.patch delete mode 100644 pkgs/development/libraries/glibc/2.16/glibc-elf-localscope.patch delete mode 100644 pkgs/development/libraries/glibc/2.16/info.nix delete mode 100644 pkgs/development/libraries/glibc/2.16/locales-builder.sh delete mode 100644 pkgs/development/libraries/glibc/2.16/locales.nix delete mode 100644 pkgs/development/libraries/glibc/2.16/nix-locale-archive.patch delete mode 100644 pkgs/development/libraries/glibc/2.16/nss-skip-unavail.patch delete mode 100644 pkgs/development/libraries/glibc/2.16/rpcgen-path.patch create mode 100644 pkgs/development/libraries/glibc/2.17/builder.sh create mode 100644 pkgs/development/libraries/glibc/2.17/common.nix create mode 100644 pkgs/development/libraries/glibc/2.17/default.nix create mode 100644 pkgs/development/libraries/glibc/2.17/dont-use-system-ld-so-cache.patch create mode 100644 pkgs/development/libraries/glibc/2.17/glibc-elf-localscope.patch create mode 100644 pkgs/development/libraries/glibc/2.17/info.nix create mode 100644 pkgs/development/libraries/glibc/2.17/locales-builder.sh create mode 100644 pkgs/development/libraries/glibc/2.17/locales.nix create mode 100644 pkgs/development/libraries/glibc/2.17/nix-locale-archive.patch create mode 100644 pkgs/development/libraries/glibc/2.17/nss-skip-unavail.patch create mode 100644 pkgs/development/libraries/glibc/2.17/rpcgen-path.patch (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/glibc/2.16/builder.sh b/pkgs/development/libraries/glibc/2.16/builder.sh deleted file mode 100644 index e68e13f9beca..000000000000 --- a/pkgs/development/libraries/glibc/2.16/builder.sh +++ /dev/null @@ -1,54 +0,0 @@ -# Glibc cannot have itself in its RPATH. -export NIX_NO_SELF_RPATH=1 - -source $stdenv/setup - -postConfigure() { - # Hack: get rid of the `-static' flag set by the bootstrap stdenv. - # This has to be done *after* `configure' because it builds some - # test binaries. - export NIX_CFLAGS_LINK= - export NIX_LDFLAGS_BEFORE= - - export NIX_DONT_SET_RPATH=1 - unset CFLAGS -} - - -postInstall() { - if test -n "$installLocales"; then - make -j${NIX_BUILD_CORES:-1} -l${NIX_BUILD_CORES:-1} localedata/install-locales - fi - - test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache - - # FIXME: Use `test -n $linuxHeaders' when `kernelHeaders' has been - # renamed. - if test -z "$hurdHeaders"; then - # Include the Linux kernel headers in Glibc, except the `scsi' - # subdirectory, which Glibc provides itself. - (cd $out/include && \ - ln -sv $(ls -d $kernelHeaders/include/* | grep -v 'scsi$') .) - fi - - if test -f "$out/lib/libhurduser.so"; then - # libc.so, libhurduser.so, and libmachuser.so depend on each - # other, so add them to libc.so (a RUNPATH on libc.so.0.3 - # would be ignored by the cross-linker.) - echo "adding \`libhurduser.so' and \`libmachuser.so' to the \`libc.so' linker script..." - sed -i "$out/lib/libc.so" \ - -e"s|\(libc\.so\.[^ ]\+\>\)|\1 $out/lib/libhurduser.so $out/lib/libmachuser.so|g" - fi - - # Fix for NIXOS-54 (ldd not working on x86_64). Make a symlink - # "lib64" to "lib". - if test -n "$is64bit"; then - ln -s lib $out/lib64 - fi - - # This file, that should not remain in the glibc derivation, - # may have not been created during the preInstall - rm -f $out/lib/libgcc_s.so.1 -} - -genericBuild diff --git a/pkgs/development/libraries/glibc/2.16/common.nix b/pkgs/development/libraries/glibc/2.16/common.nix deleted file mode 100644 index ea54b45a50de..000000000000 --- a/pkgs/development/libraries/glibc/2.16/common.nix +++ /dev/null @@ -1,208 +0,0 @@ -/* Build configuration used to build glibc, Info files, and locale - information. */ - -cross: - -{ name, fetchurl, stdenv, installLocales ? false -, gccCross ? null, kernelHeaders ? null -, machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null -, mig ? null -, profilingLibraries ? false, meta -, preConfigure ? "", ... }@args: - -let - version = "2.16.0"; - - needsPortsNative = stdenv.isMips || stdenv.isArm; - needsPortsCross = cross.arch == "mips" || cross.arch == "arm"; - needsPorts = - if stdenv.cross or null != null && hurdHeaders == null then true - else if cross == null then needsPortsNative - else needsPortsCross; - - srcPorts = fetchurl { - url = "mirror://gnu/glibc/glibc-ports-${version}.tar.bz2"; - sha256 = "0qw4n71rqykl83ybq0c92w1n8afsx079sw3hn5nyib5nw6iphrfm"; - }; - -in - -assert cross != null -> gccCross != null; - -assert mig != null -> machHeaders != null; -assert machHeaders != null -> hurdHeaders != null; -assert hurdHeaders != null -> libpthreadHeaders != null; - -stdenv.mkDerivation ({ - inherit kernelHeaders installLocales; - - # The host/target system. - crossConfig = if cross != null then cross.config else null; - - inherit (stdenv) is64bit; - - enableParallelBuilding = true; - - patches = - [ /* Fix for NIXPKGS-79: when doing host name lookups, when - nsswitch.conf contains a line like - - hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4 - - don't return an error when mdns4_minimal can't be found. This - is a bug in Glibc: when a service can't be found, NSS should - continue to the next service unless "UNAVAIL=return" is set. - ("NOTFOUND=return" refers to the service returning a NOTFOUND - error, not the service itself not being found.) The reason is - that the "status" variable (while initialised to UNAVAIL) is - outside of the loop that iterates over the services, the - "files" service sets status to NOTFOUND. So when the call to - find "mdns4_minimal" fails, "status" will still be NOTFOUND, - and it will return instead of continuing to "dns". Thus, the - line - - hosts: mdns4_minimal [NOTFOUND=return] dns mdns4 - - does work because "status" will contain UNAVAIL after the - failure to find mdns4_minimal. */ - ./nss-skip-unavail.patch - - /* Have rpcgen(1) look for cpp(1) in $PATH. */ - ./rpcgen-path.patch - - /* Allow NixOS and Nix to handle the locale-archive. */ - ./nix-locale-archive.patch - - /* Don't use /etc/ld.so.cache, for non-NixOS systems. Currently - disabled on GNU/Hurd, which uses a more recent libc snapshot. */ - ./dont-use-system-ld-so-cache.patch - - /* Without this patch many KDE binaries crash. */ - ./glibc-elf-localscope.patch - ]; - - postPatch = '' - # Needed for glibc to build with the gnumake 3.82 - # http://comments.gmane.org/gmane.linux.lfs.support/31227 - sed -i 's/ot \$/ot:\n\ttouch $@\n$/' manual/Makefile - - # nscd needs libgcc, and we don't want it dynamically linked - # because we don't want it to depend on bootstrap-tools libs. - echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile - ''; - - configureFlags = - [ "-C" - "--enable-add-ons" - "--enable-obsolete-rpc" - "--sysconfdir=/etc" - "--localedir=/var/run/current-system/sw/lib/locale" - "libc_cv_ssp=no" - (if kernelHeaders != null - then "--with-headers=${kernelHeaders}/include" - else "--without-headers") - (if profilingLibraries - then "--enable-profile" - else "--disable-profile") - ] ++ stdenv.lib.optionals (cross == null && kernelHeaders != null) [ - "--enable-kernel=2.6.35" - ] ++ stdenv.lib.optionals (cross != null) [ - (if cross.withTLS then "--with-tls" else "--without-tls") - (if cross.float == "soft" then "--without-fp" else "--with-fp") - ] ++ stdenv.lib.optionals (cross != null - && cross.platform ? kernelMajor - && cross.platform.kernelMajor == "2.6") [ - "--enable-kernel=2.6.0" - "--with-__thread" - ] ++ stdenv.lib.optionals stdenv.isArm [ - "--host=arm-linux-gnueabi" - "--build=arm-linux-gnueabi" - "--without-fp" - # To avoid linking with -lgcc_s (dynamic link) - # so the glibc does not depend on its compiler store path - "libc_cv_as_needed=no" - ]; - - installFlags = [ "sysconfdir=$(out)/etc" ]; - - buildInputs = stdenv.lib.optionals (cross != null) [ gccCross ] - ++ stdenv.lib.optional (mig != null) mig; - - # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to - # prevent a retained dependency on the bootstrap tools in the stdenv-linux - # bootstrap. - BASH_SHELL = "/bin/sh"; - - # Workaround for this bug: - # http://sourceware.org/bugzilla/show_bug.cgi?id=411 - # I.e. when gcc is compiled with --with-arch=i686, then the - # preprocessor symbol `__i686' will be defined to `1'. This causes - # the symbol __i686.get_pc_thunk.dx to be mangled. - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.system == "i686-linux") "-U__i686"; -} - -# Remove the `gccCross' attribute so that the *native* glibc store path -# doesn't depend on whether `gccCross' is null or not. -// (removeAttrs args [ "gccCross" "fetchurl" ]) // - -{ - name = name + "-${version}" + - stdenv.lib.optionalString (cross != null) "-${cross.config}"; - - src = fetchurl { - url = "mirror://gnu/glibc/glibc-${version}.tar.gz"; - sha256 = "0vlz4x6cgz7h54qq4528q526qlhnsjzbsvgc4iizn76cb0bfanx7"; - }; - - # Remove absolute paths from `configure' & co.; build out-of-tree. - preConfigure = '' - export PWD_P=$(type -tP pwd) - for i in configure io/ftwtest-sh; do - # Can't use substituteInPlace here because replace hasn't been - # built yet in the bootstrap. - sed -i "$i" -e "s^/bin/pwd^$PWD_P^g" - done - - ${if needsPorts then "tar xvf ${srcPorts}" else ""} - - mkdir ../build - cd ../build - - configureScript="`pwd`/../$sourceRoot/configure" - - makeFlags="$makeFlags BUILD_LDFLAGS=-Wl,-rpath,${stdenv.gcc.libc}/lib" - - ${preConfigure} - ''; - - meta = { - homepage = http://www.gnu.org/software/libc/; - description = "The GNU C Library" - + stdenv.lib.optionalString (hurdHeaders != null) ", for GNU/Hurd"; - - longDescription = - '' Any Unix-like operating system needs a C library: the library which - defines the "system calls" and other basic facilities such as - open, malloc, printf, exit... - - The GNU C library is used as the C library in the GNU system and - most systems with the Linux kernel. - ''; - - license = "LGPLv2+"; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - #platforms = stdenv.lib.platforms.linux; - } // meta; -} - -// stdenv.lib.optionalAttrs (hurdHeaders != null) { - # Work around the fact that the configure snippet that looks for - # does not honor `--with-headers=$sysheaders' and that - # glibc expects Mach, Hurd, and pthread headers to be in the same place. - CPATH = "${hurdHeaders}/include:${machHeaders}/include:${libpthreadHeaders}/include"; - - # Install NSS stuff in the right place. - # XXX: This will be needed for all new glibcs and isn't Hurd-specific. - makeFlags = ''vardbdir="$out/var/db"''; -}) diff --git a/pkgs/development/libraries/glibc/2.16/default.nix b/pkgs/development/libraries/glibc/2.16/default.nix deleted file mode 100644 index 0a0752570f32..000000000000 --- a/pkgs/development/libraries/glibc/2.16/default.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ stdenv, fetchurl, kernelHeaders -, machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null -, mig ? null -, installLocales ? true -, profilingLibraries ? false -, gccCross ? null -, debugSymbols ? false -}: - -assert stdenv.gcc.gcc != null; - -let - build = import ./common.nix; - cross = if gccCross != null then gccCross.target else null; -in - build cross ({ - name = "glibc" - + stdenv.lib.optionalString (hurdHeaders != null) "-hurd" - + stdenv.lib.optionalString debugSymbols "-debug"; - - inherit fetchurl stdenv kernelHeaders installLocales profilingLibraries - gccCross; - - builder = ./builder.sh; - - # When building glibc from bootstrap-tools, we need libgcc_s at RPATH for - # any program we run, because the gcc will have been placed at a new - # store path than that determined when built (as a source for the - # bootstrap-tools tarball) - # Building from a proper gcc staying in the path where it was installed, - # libgcc_s will not be at {gcc}/lib, and gcc's libgcc will be found without - # any special hack. - preInstall = '' - if [ -f ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 ]; then - mkdir -p $out/lib - ln -s ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 - fi - ''; - - meta.description = "The GNU C Library"; - } - - // - - (if debugSymbols - then { - # Build with debugging symbols, but leave optimizations on and don't - # attempt to keep the build tree. - dontStrip = true; - dontCrossStrip = true; - NIX_STRIP_DEBUG = 0; - } - else {}) - - // - - (if hurdHeaders != null - then rec { - inherit machHeaders hurdHeaders libpthreadHeaders mig; - - propagatedBuildInputs = [ machHeaders hurdHeaders libpthreadHeaders ]; - - passthru = { - # When building GCC itself `propagatedBuildInputs' above is not - # honored, so we pass it here so that the GCC builder can do the right - # thing. - inherit propagatedBuildInputs; - }; - } - else { }) - - // - - (if cross != null - then { - preConfigure = '' - sed -i s/-lgcc_eh//g "../$sourceRoot/Makeconfig" - - cat > config.cache << "EOF" - libc_cv_forced_unwind=yes - libc_cv_c_cleanup=yes - libc_cv_gnu89_inline=yes - # Only due to a problem in gcc configure scripts: - libc_cv_sparc64_tls=${if cross.withTLS then "yes" else "no"} - EOF - export BUILD_CC=gcc - export CC="$crossConfig-gcc" - export AR="$crossConfig-ar" - export RANLIB="$crossConfig-ranlib" - - dontStrip=1 - ''; - - # To avoid a dependency on the build system 'bash'. - preFixup = '' - rm $out/bin/{ldd,tzselect,catchsegv,xtrace} - ''; - } - else {})) diff --git a/pkgs/development/libraries/glibc/2.16/dont-use-system-ld-so-cache.patch b/pkgs/development/libraries/glibc/2.16/dont-use-system-ld-so-cache.patch deleted file mode 100644 index 95f537733204..000000000000 --- a/pkgs/development/libraries/glibc/2.16/dont-use-system-ld-so-cache.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -ru glibc-2.16.0-orig/elf/ldconfig.c glibc-2.16.0/elf/ldconfig.c ---- glibc-2.16.0-orig/elf/ldconfig.c 2012-06-30 15:12:34.000000000 -0400 -+++ glibc-2.16.0/elf/ldconfig.c 2012-09-18 11:59:27.463284814 -0400 -@@ -50,7 +50,7 @@ - #endif - - #ifndef LD_SO_CONF --# define LD_SO_CONF SYSCONFDIR "/ld.so.conf" -+# define LD_SO_CONF PREFIX "/etc/ld.so.conf" - #endif - - /* Get libc version number. */ -diff -ru glibc-2.16.0-orig/elf/Makefile glibc-2.16.0/elf/Makefile ---- glibc-2.16.0-orig/elf/Makefile 2012-06-30 15:12:34.000000000 -0400 -+++ glibc-2.16.0/elf/Makefile 2012-09-18 12:03:30.031955196 -0400 -@@ -415,12 +415,12 @@ - - $(objpfx)pldd: $(pldd-modules:%=$(objpfx)%.o) - --SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"' --CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ -+PREFIX-FLAGS := -D'PREFIX="$(prefix)"' -+CFLAGS-ldconfig.c = $(PREFIX-FLAGS) -D'LIBDIR="$(libdir)"' \ - -D'SLIBDIR="$(slibdir)"' -DIS_IN_ldconfig=1 --CFLAGS-dl-cache.c = $(SYSCONF-FLAGS) --CFLAGS-cache.c = $(SYSCONF-FLAGS) --CFLAGS-rtld.c = $(SYSCONF-FLAGS) -+CFLAGS-dl-cache.c = $(PREFIX-FLAGS) -+CFLAGS-cache.c = $(PREFIX-FLAGS) -+CFLAGS-rtld.c = $(PREFIX-FLAGS) - - CPPFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),\ - -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld) -diff -ru glibc-2.16.0-orig/sysdeps/generic/dl-cache.h glibc-2.16.0/sysdeps/generic/dl-cache.h ---- glibc-2.16.0-orig/sysdeps/generic/dl-cache.h 2012-06-30 15:12:34.000000000 -0400 -+++ glibc-2.16.0/sysdeps/generic/dl-cache.h 2012-09-18 11:59:27.465284809 -0400 -@@ -28,7 +28,7 @@ - #endif - - #ifndef LD_SO_CACHE --# define LD_SO_CACHE SYSCONFDIR "/ld.so.cache" -+# define LD_SO_CACHE PREFIX "/etc/ld.so.cache" - #endif - - #ifndef add_system_dir diff --git a/pkgs/development/libraries/glibc/2.16/glibc-elf-localscope.patch b/pkgs/development/libraries/glibc/2.16/glibc-elf-localscope.patch deleted file mode 100644 index 98f7f81087bb..000000000000 --- a/pkgs/development/libraries/glibc/2.16/glibc-elf-localscope.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff -ru a/elf/dl-close.c b/elf/dl-close.c ---- a/elf/dl-close.c 2011-02-04 00:35:03.000000000 +0100 -+++ b/elf/dl-close.c 2011-02-22 02:16:12.367883000 +0100 -@@ -180,24 +186,28 @@ - /* Signal the object is still needed. */ - l->l_idx = IDX_STILL_USED; - -+#define mark_used(dmap) \ -+ do { \ -+ if ((dmap)->l_idx != IDX_STILL_USED) \ -+ { \ -+ assert ((dmap)->l_idx >= 0 && (dmap)->l_idx < nloaded); \ -+ \ -+ if (!used[(dmap)->l_idx]) \ -+ { \ -+ used[(dmap)->l_idx] = 1; \ -+ if ((dmap)->l_idx - 1 < done_index) \ -+ done_index = (dmap)->l_idx - 1; \ -+ } \ -+ } \ -+ } while (0) -+ - /* Mark all dependencies as used. */ - if (l->l_initfini != NULL) - { - struct link_map **lp = &l->l_initfini[1]; - while (*lp != NULL) - { -- if ((*lp)->l_idx != IDX_STILL_USED) -- { -- assert ((*lp)->l_idx >= 0 && (*lp)->l_idx < nloaded); -- -- if (!used[(*lp)->l_idx]) -- { -- used[(*lp)->l_idx] = 1; -- if ((*lp)->l_idx - 1 < done_index) -- done_index = (*lp)->l_idx - 1; -- } -- } -- -+ mark_used(*lp); - ++lp; - } - } -@@ -206,19 +216,25 @@ - for (unsigned int j = 0; j < l->l_reldeps->act; ++j) - { - struct link_map *jmap = l->l_reldeps->list[j]; -- -- if (jmap->l_idx != IDX_STILL_USED) -- { -- assert (jmap->l_idx >= 0 && jmap->l_idx < nloaded); -- -- if (!used[jmap->l_idx]) -- { -- used[jmap->l_idx] = 1; -- if (jmap->l_idx - 1 < done_index) -- done_index = jmap->l_idx - 1; -- } -- } -+ mark_used(jmap); - } -+ /* And the same for owners of our scopes; normally, our last -+ scope provider would render us unused, but this can be -+ prevented by the NODELETE flag. */ -+ if (__builtin_expect(l->l_type == lt_loaded -+ && (l->l_flags_1 & DF_1_NODELETE), 0)) -+ for (size_t cnt = 0; l->l_scope[cnt] != NULL; ++cnt) -+ /* This relies on l_scope[] entries being always set either -+ to its own l_symbolic_searchlist address, or some map's -+ l_searchlist address. */ -+ if (l->l_scope[cnt] != &l->l_symbolic_searchlist) -+ { -+ struct link_map *ls = (struct link_map *) -+ ((char *) l->l_scope[cnt] -+ - offsetof (struct link_map, l_searchlist)); -+ assert (ls->l_ns == nsid); -+ mark_used(ls); -+ } - } - - /* Sort the entries. */ diff --git a/pkgs/development/libraries/glibc/2.16/info.nix b/pkgs/development/libraries/glibc/2.16/info.nix deleted file mode 100644 index 322f07f02363..000000000000 --- a/pkgs/development/libraries/glibc/2.16/info.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, texinfo, perl }: - -let build = import ./common.nix; in - -/* null cross builder */ -build null { - name = "glibc-info"; - - inherit fetchurl stdenv; - - configureFlags = [ "--enable-add-ons" ]; - - buildInputs = [ texinfo perl ]; - - buildPhase = "make info"; - - # I don't know why the info is not generated in 'build' - # Somehow building the info still does not work, because the final - # libc.info hasn't a Top node. - installPhase = '' - mkdir -p "$out/share/info" - cp -v "../$sourceRoot/manual/"*.info* "$out/share/info" - ''; - - meta.description = "GNU Info manual of the GNU C Library"; -} diff --git a/pkgs/development/libraries/glibc/2.16/locales-builder.sh b/pkgs/development/libraries/glibc/2.16/locales-builder.sh deleted file mode 100644 index d732e208fa22..000000000000 --- a/pkgs/development/libraries/glibc/2.16/locales-builder.sh +++ /dev/null @@ -1,17 +0,0 @@ -# Glibc cannot have itself in its RPATH. -export NIX_NO_SELF_RPATH=1 - -source $stdenv/setup - -postConfigure() { - # Hack: get rid of the `-static' flag set by the bootstrap stdenv. - # This has to be done *after* `configure' because it builds some - # test binaries. - export NIX_CFLAGS_LINK= - export NIX_LDFLAGS_BEFORE= - - export NIX_DONT_SET_RPATH=1 - unset CFLAGS -} - -genericBuild diff --git a/pkgs/development/libraries/glibc/2.16/locales.nix b/pkgs/development/libraries/glibc/2.16/locales.nix deleted file mode 100644 index b7eae50ca385..000000000000 --- a/pkgs/development/libraries/glibc/2.16/locales.nix +++ /dev/null @@ -1,47 +0,0 @@ -/* This function builds just the `lib/locale/locale-archive' file from - Glibc and nothing else. If `allLocales' is true, all supported - locales are included; otherwise, just the locales listed in - `locales'. See localedata/SUPPORTED in the Glibc source tree for - the list of all supported locales: - http://sourceware.org/cgi-bin/cvsweb.cgi/libc/localedata/SUPPORTED?cvsroot=glibc -*/ - -{ stdenv, fetchurl, allLocales ? true, locales ? ["en_US.UTF-8/UTF-8"] }: - -let build = import ./common.nix; -in - build null { - name = "glibc-locales"; - - inherit fetchurl stdenv; - installLocales = true; - - builder = ./locales-builder.sh; - - # Awful hack: `localedef' doesn't allow the path to `locale-archive' - # to be overriden, but you *can* specify a prefix, i.e. it will use - # //lib/locale/locale-archive. So we use - # $TMPDIR as a prefix, meaning that the locale-archive is placed in - # $TMPDIR/nix/store/...-glibc-.../lib/locale/locale-archive. - buildPhase = - '' - mkdir -p $TMPDIR/"$(dirname $(readlink -f $(type -p localedef)))/../lib/locale" - - # Hack to allow building of the locales (needed since glibc-2.12) - sed -i -e "s,^LOCALEDEF=.*,LOCALEDEF=localedef --prefix=$TMPDIR," -e \ - /library-path/d ../glibc-2*/localedata/Makefile - ${if allLocales then "" else - "echo SUPPORTED-LOCALES=\"${toString locales}\" > ../glibc-2*/localedata/SUPPORTED"} - - make localedata/install-locales \ - localedir=$out/lib/locale \ - ''; - - installPhase = - '' - mkdir -p "$out/lib/locale" - cp -v "$TMPDIR/nix/store/"*"/lib/locale/locale-archive" "$out/lib/locale" - ''; - - meta.description = "Locale information for the GNU C Library"; - } diff --git a/pkgs/development/libraries/glibc/2.16/nix-locale-archive.patch b/pkgs/development/libraries/glibc/2.16/nix-locale-archive.patch deleted file mode 100644 index 88c8adef9226..000000000000 --- a/pkgs/development/libraries/glibc/2.16/nix-locale-archive.patch +++ /dev/null @@ -1,114 +0,0 @@ -diff -ru glibc-2.16.0-orig/locale/loadarchive.c glibc-2.16.0/locale/loadarchive.c ---- glibc-2.16.0-orig/locale/loadarchive.c 2012-06-30 15:12:34.000000000 -0400 -+++ glibc-2.16.0/locale/loadarchive.c 2012-09-18 11:57:57.277515212 -0400 -@@ -123,6 +123,25 @@ - } - - -+static int -+open_locale_archive () -+{ -+ int fd = -1; -+ char *path = getenv ("LOCALE_ARCHIVE_2_11"); -+ char *path2 = getenv ("LOCALE_ARCHIVE"); -+ const char *usualpath = "/usr/lib/locale/locale-archive"; -+ if (path) -+ fd = open_not_cancel_2 (path, O_RDONLY|O_LARGEFILE|O_CLOEXEC); -+ if (path2 && fd < 0) -+ fd = open_not_cancel_2 (path2, O_RDONLY|O_LARGEFILE|O_CLOEXEC); -+ if (fd < 0) -+ fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE|O_CLOEXEC); -+ if (fd < 0) -+ fd = open_not_cancel_2 (usualpath, O_RDONLY|O_LARGEFILE|O_CLOEXEC); -+ return fd; -+} -+ -+ - /* Find the locale *NAMEP in the locale archive, and return the - internalized data structure for its CATEGORY data. If this locale has - already been loaded from the archive, just returns the existing data -@@ -202,7 +221,7 @@ - archmapped = &headmap; - - /* The archive has never been opened. */ -- fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE|O_CLOEXEC); -+ fd = open_locale_archive (); - if (fd < 0) - /* Cannot open the archive, for whatever reason. */ - return NULL; -@@ -393,8 +412,7 @@ - if (fd == -1) - { - struct stat64 st; -- fd = open_not_cancel_2 (archfname, -- O_RDONLY|O_LARGEFILE|O_CLOEXEC); -+ fd = open_locale_archive (); - if (fd == -1) - /* Cannot open the archive, for whatever reason. */ - return NULL; -diff -ru glibc-2.16.0-orig/locale/programs/locale.c glibc-2.16.0/locale/programs/locale.c ---- glibc-2.16.0-orig/locale/programs/locale.c 2012-06-30 15:12:34.000000000 -0400 -+++ glibc-2.16.0/locale/programs/locale.c 2012-09-18 11:53:03.719920947 -0400 -@@ -628,6 +628,20 @@ - ((const struct nameent *) b)->name); - } - -+static int -+open_nix_locale_archive (const char * fname, int access) -+{ -+ int fd = -1; -+ char *path = getenv ("LOCALE_ARCHIVE_2_11"); -+ char *path2 = getenv ("LOCALE_ARCHIVE"); -+ if (path) -+ fd = open64 (path, access); -+ if (path2 && fd < 0) -+ fd = open64 (path2, access); -+ if (fd < 0) -+ fd = open64 (fname, access); -+ return fd; -+} - - static int - write_archive_locales (void **all_datap, char *linebuf) -@@ -641,7 +655,7 @@ - int fd, ret = 0; - uint32_t cnt; - -- fd = open64 (ARCHIVE_NAME, O_RDONLY); -+ fd = open_nix_locale_archive (ARCHIVE_NAME, O_RDONLY); - if (fd < 0) - return 0; - -diff -ru glibc-2.16.0-orig/locale/programs/locarchive.c glibc-2.16.0/locale/programs/locarchive.c ---- glibc-2.16.0-orig/locale/programs/locarchive.c 2012-06-30 15:12:34.000000000 -0400 -+++ glibc-2.16.0/locale/programs/locarchive.c 2012-09-18 11:53:03.720920942 -0400 -@@ -509,6 +509,20 @@ - *ah = new_ah; - } - -+static int -+open_nix_locale_archive (const char * fname, int access) -+{ -+ int fd = -1; -+ char *path = getenv ("LOCALE_ARCHIVE_2_11"); -+ char *path2 = getenv ("LOCALE_ARCHIVE"); -+ if (path) -+ fd = open64 (path, access); -+ if (path2 && fd < 0) -+ fd = open64 (path2, access); -+ if (fd < 0) -+ fd = open64 (fname, access); -+ return fd; -+} - - void - open_archive (struct locarhandle *ah, bool readonly) -@@ -528,7 +542,7 @@ - while (1) - { - /* Open the archive. We must have exclusive write access. */ -- fd = open64 (archivefname, readonly ? O_RDONLY : O_RDWR); -+ fd = open_nix_locale_archive (archivefname, readonly ? O_RDONLY : O_RDWR); - if (fd == -1) - { - /* Maybe the file does not yet exist. */ diff --git a/pkgs/development/libraries/glibc/2.16/nss-skip-unavail.patch b/pkgs/development/libraries/glibc/2.16/nss-skip-unavail.patch deleted file mode 100644 index e48dc2bc0a6e..000000000000 --- a/pkgs/development/libraries/glibc/2.16/nss-skip-unavail.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ru glibc-2.11.2-orig/sysdeps/posix/getaddrinfo.c glibc-2.11.2/sysdeps/posix/getaddrinfo.c ---- glibc-2.11.2-orig/sysdeps/posix/getaddrinfo.c 2010-05-19 22:38:20.000000000 +0200 -+++ glibc-2.11.2/sysdeps/posix/getaddrinfo.c 2010-08-05 18:39:54.259556327 +0200 -@@ -505,8 +505,6 @@ - int no_data = 0; - int no_inet6_data = 0; - service_user *nip = NULL; -- enum nss_status inet6_status = NSS_STATUS_UNAVAIL; -- enum nss_status status = NSS_STATUS_UNAVAIL; - int no_more; - int old_res_options; - -@@ -702,6 +700,8 @@ - - while (!no_more) - { -+ enum nss_status inet6_status = NSS_STATUS_UNAVAIL; -+ enum nss_status status = NSS_STATUS_UNAVAIL; - no_data = 0; - nss_gethostbyname4_r fct4 - = __nss_lookup_function (nip, "gethostbyname4_r"); diff --git a/pkgs/development/libraries/glibc/2.16/rpcgen-path.patch b/pkgs/development/libraries/glibc/2.16/rpcgen-path.patch deleted file mode 100644 index fbb03dd5fade..000000000000 --- a/pkgs/development/libraries/glibc/2.16/rpcgen-path.patch +++ /dev/null @@ -1,72 +0,0 @@ -By default, rpcgen(1) looks for cpp(1) from a list of fixed absolute paths -(`/lib/cpp', etc.), which may only be overrided with the `-Y' option. This -patch makes it run any `cpp' command found in $PATH. - ---- glibc-2.7/sunrpc/rpc_main.c 2006-11-10 21:54:46.000000000 +0100 -+++ glibc-2.7/sunrpc/rpc_main.c 2009-04-22 14:32:10.000000000 +0200 -@@ -79,7 +79,7 @@ static const char *cmdname; - - static const char *svcclosetime = "120"; - static int cppDefined; /* explicit path for C preprocessor */ --static const char *CPP = SUNOS_CPP; -+static const char *CPP = "cpp"; - static const char CPPFLAGS[] = "-C"; - static char *pathbuf; - static int cpp_pid; -@@ -108,7 +108,6 @@ static char *extendfile (const char *fil - static void open_output (const char *infile, const char *outfile); - static void add_warning (void); - static void clear_args (void); --static void find_cpp (void); - static void open_input (const char *infile, const char *define); - static int check_nettype (const char *name, const char *list_to_check[]); - static void c_output (const char *infile, const char *define, -@@ -327,31 +326,6 @@ clear_args (void) - argcount = FIXEDARGS; - } - --/* make sure that a CPP exists */ --static void --find_cpp (void) --{ -- struct stat buf; -- -- if (stat (CPP, &buf) < 0) -- { /* /lib/cpp or explicit cpp does not exist */ -- if (cppDefined) -- { -- fprintf (stderr, _ ("cannot find C preprocessor: %s \n"), CPP); -- crash (); -- } -- else -- { /* try the other one */ -- CPP = SVR4_CPP; -- if (stat (CPP, &buf) < 0) -- { /* can't find any cpp */ -- fputs (_ ("cannot find any C preprocessor (cpp)\n"), stdout); -- crash (); -- } -- } -- } --} -- - /* - * Open input file with given define for C-preprocessor - */ -@@ -370,7 +344,6 @@ open_input (const char *infile, const ch - switch (cpp_pid) - { - case 0: -- find_cpp (); - putarg (0, CPP); - putarg (1, CPPFLAGS); - addarg (define); -@@ -380,7 +353,7 @@ open_input (const char *infile, const ch - close (1); - dup2 (pd[1], 1); - close (pd[0]); -- execv (arglist[0], (char **) arglist); -+ execvp (arglist[0], (char **) arglist); - perror ("execv"); - exit (1); - case -1: diff --git a/pkgs/development/libraries/glibc/2.17/builder.sh b/pkgs/development/libraries/glibc/2.17/builder.sh new file mode 100644 index 000000000000..e68e13f9beca --- /dev/null +++ b/pkgs/development/libraries/glibc/2.17/builder.sh @@ -0,0 +1,54 @@ +# Glibc cannot have itself in its RPATH. +export NIX_NO_SELF_RPATH=1 + +source $stdenv/setup + +postConfigure() { + # Hack: get rid of the `-static' flag set by the bootstrap stdenv. + # This has to be done *after* `configure' because it builds some + # test binaries. + export NIX_CFLAGS_LINK= + export NIX_LDFLAGS_BEFORE= + + export NIX_DONT_SET_RPATH=1 + unset CFLAGS +} + + +postInstall() { + if test -n "$installLocales"; then + make -j${NIX_BUILD_CORES:-1} -l${NIX_BUILD_CORES:-1} localedata/install-locales + fi + + test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache + + # FIXME: Use `test -n $linuxHeaders' when `kernelHeaders' has been + # renamed. + if test -z "$hurdHeaders"; then + # Include the Linux kernel headers in Glibc, except the `scsi' + # subdirectory, which Glibc provides itself. + (cd $out/include && \ + ln -sv $(ls -d $kernelHeaders/include/* | grep -v 'scsi$') .) + fi + + if test -f "$out/lib/libhurduser.so"; then + # libc.so, libhurduser.so, and libmachuser.so depend on each + # other, so add them to libc.so (a RUNPATH on libc.so.0.3 + # would be ignored by the cross-linker.) + echo "adding \`libhurduser.so' and \`libmachuser.so' to the \`libc.so' linker script..." + sed -i "$out/lib/libc.so" \ + -e"s|\(libc\.so\.[^ ]\+\>\)|\1 $out/lib/libhurduser.so $out/lib/libmachuser.so|g" + fi + + # Fix for NIXOS-54 (ldd not working on x86_64). Make a symlink + # "lib64" to "lib". + if test -n "$is64bit"; then + ln -s lib $out/lib64 + fi + + # This file, that should not remain in the glibc derivation, + # may have not been created during the preInstall + rm -f $out/lib/libgcc_s.so.1 +} + +genericBuild diff --git a/pkgs/development/libraries/glibc/2.17/common.nix b/pkgs/development/libraries/glibc/2.17/common.nix new file mode 100644 index 000000000000..ccdae6200e53 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.17/common.nix @@ -0,0 +1,194 @@ +/* Build configuration used to build glibc, Info files, and locale + information. */ + +cross: + +{ name, fetchurl, stdenv, installLocales ? false +, gccCross ? null, kernelHeaders ? null +, machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null +, mig ? null +, profilingLibraries ? false, meta +, preConfigure ? "", ... }@args: + +let + + version = "2.17"; + +in + +assert cross != null -> gccCross != null; +assert mig != null -> machHeaders != null; +assert machHeaders != null -> hurdHeaders != null; +assert hurdHeaders != null -> libpthreadHeaders != null; + +stdenv.mkDerivation ({ + inherit kernelHeaders installLocales; + + # The host/target system. + crossConfig = if cross != null then cross.config else null; + + inherit (stdenv) is64bit; + + enableParallelBuilding = true; + + patches = + [ /* Fix for NIXPKGS-79: when doing host name lookups, when + nsswitch.conf contains a line like + + hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4 + + don't return an error when mdns4_minimal can't be found. This + is a bug in Glibc: when a service can't be found, NSS should + continue to the next service unless "UNAVAIL=return" is set. + ("NOTFOUND=return" refers to the service returning a NOTFOUND + error, not the service itself not being found.) The reason is + that the "status" variable (while initialised to UNAVAIL) is + outside of the loop that iterates over the services, the + "files" service sets status to NOTFOUND. So when the call to + find "mdns4_minimal" fails, "status" will still be NOTFOUND, + and it will return instead of continuing to "dns". Thus, the + line + + hosts: mdns4_minimal [NOTFOUND=return] dns mdns4 + + does work because "status" will contain UNAVAIL after the + failure to find mdns4_minimal. */ + ./nss-skip-unavail.patch + + /* Have rpcgen(1) look for cpp(1) in $PATH. */ + ./rpcgen-path.patch + + /* Allow NixOS and Nix to handle the locale-archive. */ + ./nix-locale-archive.patch + + /* Don't use /etc/ld.so.cache, for non-NixOS systems. Currently + disabled on GNU/Hurd, which uses a more recent libc snapshot. */ + ./dont-use-system-ld-so-cache.patch + + /* Without this patch many KDE binaries crash. */ + ./glibc-elf-localscope.patch + ]; + + postPatch = '' + # Needed for glibc to build with the gnumake 3.82 + # http://comments.gmane.org/gmane.linux.lfs.support/31227 + sed -i 's/ot \$/ot:\n\ttouch $@\n$/' manual/Makefile + + # nscd needs libgcc, and we don't want it dynamically linked + # because we don't want it to depend on bootstrap-tools libs. + echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile + ''; + + configureFlags = + [ "-C" + "--enable-add-ons" + "--enable-obsolete-rpc" + "--sysconfdir=/etc" + "--localedir=/var/run/current-system/sw/lib/locale" + "libc_cv_ssp=no" + (if kernelHeaders != null + then "--with-headers=${kernelHeaders}/include" + else "--without-headers") + (if profilingLibraries + then "--enable-profile" + else "--disable-profile") + ] ++ stdenv.lib.optionals (cross == null && kernelHeaders != null) [ + "--enable-kernel=2.6.35" + ] ++ stdenv.lib.optionals (cross != null) [ + (if cross.withTLS then "--with-tls" else "--without-tls") + (if cross.float == "soft" then "--without-fp" else "--with-fp") + ] ++ stdenv.lib.optionals (cross != null + && cross.platform ? kernelMajor + && cross.platform.kernelMajor == "2.6") [ + "--enable-kernel=2.6.0" + "--with-__thread" + ] ++ stdenv.lib.optionals stdenv.isArm [ + "--host=arm-linux-gnueabi" + "--build=arm-linux-gnueabi" + "--without-fp" + # To avoid linking with -lgcc_s (dynamic link) + # so the glibc does not depend on its compiler store path + "libc_cv_as_needed=no" + ]; + + installFlags = [ "sysconfdir=$(out)/etc" ]; + + buildInputs = stdenv.lib.optionals (cross != null) [ gccCross ] + ++ stdenv.lib.optional (mig != null) mig; + + # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to + # prevent a retained dependency on the bootstrap tools in the stdenv-linux + # bootstrap. + BASH_SHELL = "/bin/sh"; + + # Workaround for this bug: + # http://sourceware.org/bugzilla/show_bug.cgi?id=411 + # I.e. when gcc is compiled with --with-arch=i686, then the + # preprocessor symbol `__i686' will be defined to `1'. This causes + # the symbol __i686.get_pc_thunk.dx to be mangled. + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.system == "i686-linux") "-U__i686"; +} + +# Remove the `gccCross' attribute so that the *native* glibc store path +# doesn't depend on whether `gccCross' is null or not. +// (removeAttrs args [ "gccCross" "fetchurl" ]) // + +{ + name = name + "-${version}" + + stdenv.lib.optionalString (cross != null) "-${cross.config}"; + + src = fetchurl { + url = "mirror://gnu/glibc/glibc-${version}.tar.gz"; + sha256 = "0ym3zk9ii64279wgw7pw9xkbxczy2ci7ka6mnfs05rhlainhicm3"; + }; + + # Remove absolute paths from `configure' & co.; build out-of-tree. + preConfigure = '' + export PWD_P=$(type -tP pwd) + for i in configure io/ftwtest-sh; do + # Can't use substituteInPlace here because replace hasn't been + # built yet in the bootstrap. + sed -i "$i" -e "s^/bin/pwd^$PWD_P^g" + done + + mkdir ../build + cd ../build + + configureScript="`pwd`/../$sourceRoot/configure" + + makeFlags="$makeFlags BUILD_LDFLAGS=-Wl,-rpath,${stdenv.gcc.libc}/lib" + + ${preConfigure} + ''; + + meta = { + homepage = http://www.gnu.org/software/libc/; + description = "The GNU C Library" + + stdenv.lib.optionalString (hurdHeaders != null) ", for GNU/Hurd"; + + longDescription = + '' Any Unix-like operating system needs a C library: the library which + defines the "system calls" and other basic facilities such as + open, malloc, printf, exit... + + The GNU C library is used as the C library in the GNU system and + most systems with the Linux kernel. + ''; + + license = "LGPLv2+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + #platforms = stdenv.lib.platforms.linux; + } // meta; +} + +// stdenv.lib.optionalAttrs (hurdHeaders != null) { + # Work around the fact that the configure snippet that looks for + # does not honor `--with-headers=$sysheaders' and that + # glibc expects Mach, Hurd, and pthread headers to be in the same place. + CPATH = "${hurdHeaders}/include:${machHeaders}/include:${libpthreadHeaders}/include"; + + # Install NSS stuff in the right place. + # XXX: This will be needed for all new glibcs and isn't Hurd-specific. + makeFlags = ''vardbdir="$out/var/db"''; +}) diff --git a/pkgs/development/libraries/glibc/2.17/default.nix b/pkgs/development/libraries/glibc/2.17/default.nix new file mode 100644 index 000000000000..0a0752570f32 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.17/default.nix @@ -0,0 +1,99 @@ +{ stdenv, fetchurl, kernelHeaders +, machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null +, mig ? null +, installLocales ? true +, profilingLibraries ? false +, gccCross ? null +, debugSymbols ? false +}: + +assert stdenv.gcc.gcc != null; + +let + build = import ./common.nix; + cross = if gccCross != null then gccCross.target else null; +in + build cross ({ + name = "glibc" + + stdenv.lib.optionalString (hurdHeaders != null) "-hurd" + + stdenv.lib.optionalString debugSymbols "-debug"; + + inherit fetchurl stdenv kernelHeaders installLocales profilingLibraries + gccCross; + + builder = ./builder.sh; + + # When building glibc from bootstrap-tools, we need libgcc_s at RPATH for + # any program we run, because the gcc will have been placed at a new + # store path than that determined when built (as a source for the + # bootstrap-tools tarball) + # Building from a proper gcc staying in the path where it was installed, + # libgcc_s will not be at {gcc}/lib, and gcc's libgcc will be found without + # any special hack. + preInstall = '' + if [ -f ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 ]; then + mkdir -p $out/lib + ln -s ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 + fi + ''; + + meta.description = "The GNU C Library"; + } + + // + + (if debugSymbols + then { + # Build with debugging symbols, but leave optimizations on and don't + # attempt to keep the build tree. + dontStrip = true; + dontCrossStrip = true; + NIX_STRIP_DEBUG = 0; + } + else {}) + + // + + (if hurdHeaders != null + then rec { + inherit machHeaders hurdHeaders libpthreadHeaders mig; + + propagatedBuildInputs = [ machHeaders hurdHeaders libpthreadHeaders ]; + + passthru = { + # When building GCC itself `propagatedBuildInputs' above is not + # honored, so we pass it here so that the GCC builder can do the right + # thing. + inherit propagatedBuildInputs; + }; + } + else { }) + + // + + (if cross != null + then { + preConfigure = '' + sed -i s/-lgcc_eh//g "../$sourceRoot/Makeconfig" + + cat > config.cache << "EOF" + libc_cv_forced_unwind=yes + libc_cv_c_cleanup=yes + libc_cv_gnu89_inline=yes + # Only due to a problem in gcc configure scripts: + libc_cv_sparc64_tls=${if cross.withTLS then "yes" else "no"} + EOF + export BUILD_CC=gcc + export CC="$crossConfig-gcc" + export AR="$crossConfig-ar" + export RANLIB="$crossConfig-ranlib" + + dontStrip=1 + ''; + + # To avoid a dependency on the build system 'bash'. + preFixup = '' + rm $out/bin/{ldd,tzselect,catchsegv,xtrace} + ''; + } + else {})) diff --git a/pkgs/development/libraries/glibc/2.17/dont-use-system-ld-so-cache.patch b/pkgs/development/libraries/glibc/2.17/dont-use-system-ld-so-cache.patch new file mode 100644 index 000000000000..95f537733204 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.17/dont-use-system-ld-so-cache.patch @@ -0,0 +1,45 @@ +diff -ru glibc-2.16.0-orig/elf/ldconfig.c glibc-2.16.0/elf/ldconfig.c +--- glibc-2.16.0-orig/elf/ldconfig.c 2012-06-30 15:12:34.000000000 -0400 ++++ glibc-2.16.0/elf/ldconfig.c 2012-09-18 11:59:27.463284814 -0400 +@@ -50,7 +50,7 @@ + #endif + + #ifndef LD_SO_CONF +-# define LD_SO_CONF SYSCONFDIR "/ld.so.conf" ++# define LD_SO_CONF PREFIX "/etc/ld.so.conf" + #endif + + /* Get libc version number. */ +diff -ru glibc-2.16.0-orig/elf/Makefile glibc-2.16.0/elf/Makefile +--- glibc-2.16.0-orig/elf/Makefile 2012-06-30 15:12:34.000000000 -0400 ++++ glibc-2.16.0/elf/Makefile 2012-09-18 12:03:30.031955196 -0400 +@@ -415,12 +415,12 @@ + + $(objpfx)pldd: $(pldd-modules:%=$(objpfx)%.o) + +-SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"' +-CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ ++PREFIX-FLAGS := -D'PREFIX="$(prefix)"' ++CFLAGS-ldconfig.c = $(PREFIX-FLAGS) -D'LIBDIR="$(libdir)"' \ + -D'SLIBDIR="$(slibdir)"' -DIS_IN_ldconfig=1 +-CFLAGS-dl-cache.c = $(SYSCONF-FLAGS) +-CFLAGS-cache.c = $(SYSCONF-FLAGS) +-CFLAGS-rtld.c = $(SYSCONF-FLAGS) ++CFLAGS-dl-cache.c = $(PREFIX-FLAGS) ++CFLAGS-cache.c = $(PREFIX-FLAGS) ++CFLAGS-rtld.c = $(PREFIX-FLAGS) + + CPPFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),\ + -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld) +diff -ru glibc-2.16.0-orig/sysdeps/generic/dl-cache.h glibc-2.16.0/sysdeps/generic/dl-cache.h +--- glibc-2.16.0-orig/sysdeps/generic/dl-cache.h 2012-06-30 15:12:34.000000000 -0400 ++++ glibc-2.16.0/sysdeps/generic/dl-cache.h 2012-09-18 11:59:27.465284809 -0400 +@@ -28,7 +28,7 @@ + #endif + + #ifndef LD_SO_CACHE +-# define LD_SO_CACHE SYSCONFDIR "/ld.so.cache" ++# define LD_SO_CACHE PREFIX "/etc/ld.so.cache" + #endif + + #ifndef add_system_dir diff --git a/pkgs/development/libraries/glibc/2.17/glibc-elf-localscope.patch b/pkgs/development/libraries/glibc/2.17/glibc-elf-localscope.patch new file mode 100644 index 000000000000..98f7f81087bb --- /dev/null +++ b/pkgs/development/libraries/glibc/2.17/glibc-elf-localscope.patch @@ -0,0 +1,82 @@ +diff -ru a/elf/dl-close.c b/elf/dl-close.c +--- a/elf/dl-close.c 2011-02-04 00:35:03.000000000 +0100 ++++ b/elf/dl-close.c 2011-02-22 02:16:12.367883000 +0100 +@@ -180,24 +186,28 @@ + /* Signal the object is still needed. */ + l->l_idx = IDX_STILL_USED; + ++#define mark_used(dmap) \ ++ do { \ ++ if ((dmap)->l_idx != IDX_STILL_USED) \ ++ { \ ++ assert ((dmap)->l_idx >= 0 && (dmap)->l_idx < nloaded); \ ++ \ ++ if (!used[(dmap)->l_idx]) \ ++ { \ ++ used[(dmap)->l_idx] = 1; \ ++ if ((dmap)->l_idx - 1 < done_index) \ ++ done_index = (dmap)->l_idx - 1; \ ++ } \ ++ } \ ++ } while (0) ++ + /* Mark all dependencies as used. */ + if (l->l_initfini != NULL) + { + struct link_map **lp = &l->l_initfini[1]; + while (*lp != NULL) + { +- if ((*lp)->l_idx != IDX_STILL_USED) +- { +- assert ((*lp)->l_idx >= 0 && (*lp)->l_idx < nloaded); +- +- if (!used[(*lp)->l_idx]) +- { +- used[(*lp)->l_idx] = 1; +- if ((*lp)->l_idx - 1 < done_index) +- done_index = (*lp)->l_idx - 1; +- } +- } +- ++ mark_used(*lp); + ++lp; + } + } +@@ -206,19 +216,25 @@ + for (unsigned int j = 0; j < l->l_reldeps->act; ++j) + { + struct link_map *jmap = l->l_reldeps->list[j]; +- +- if (jmap->l_idx != IDX_STILL_USED) +- { +- assert (jmap->l_idx >= 0 && jmap->l_idx < nloaded); +- +- if (!used[jmap->l_idx]) +- { +- used[jmap->l_idx] = 1; +- if (jmap->l_idx - 1 < done_index) +- done_index = jmap->l_idx - 1; +- } +- } ++ mark_used(jmap); + } ++ /* And the same for owners of our scopes; normally, our last ++ scope provider would render us unused, but this can be ++ prevented by the NODELETE flag. */ ++ if (__builtin_expect(l->l_type == lt_loaded ++ && (l->l_flags_1 & DF_1_NODELETE), 0)) ++ for (size_t cnt = 0; l->l_scope[cnt] != NULL; ++cnt) ++ /* This relies on l_scope[] entries being always set either ++ to its own l_symbolic_searchlist address, or some map's ++ l_searchlist address. */ ++ if (l->l_scope[cnt] != &l->l_symbolic_searchlist) ++ { ++ struct link_map *ls = (struct link_map *) ++ ((char *) l->l_scope[cnt] ++ - offsetof (struct link_map, l_searchlist)); ++ assert (ls->l_ns == nsid); ++ mark_used(ls); ++ } + } + + /* Sort the entries. */ diff --git a/pkgs/development/libraries/glibc/2.17/info.nix b/pkgs/development/libraries/glibc/2.17/info.nix new file mode 100644 index 000000000000..322f07f02363 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.17/info.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, texinfo, perl }: + +let build = import ./common.nix; in + +/* null cross builder */ +build null { + name = "glibc-info"; + + inherit fetchurl stdenv; + + configureFlags = [ "--enable-add-ons" ]; + + buildInputs = [ texinfo perl ]; + + buildPhase = "make info"; + + # I don't know why the info is not generated in 'build' + # Somehow building the info still does not work, because the final + # libc.info hasn't a Top node. + installPhase = '' + mkdir -p "$out/share/info" + cp -v "../$sourceRoot/manual/"*.info* "$out/share/info" + ''; + + meta.description = "GNU Info manual of the GNU C Library"; +} diff --git a/pkgs/development/libraries/glibc/2.17/locales-builder.sh b/pkgs/development/libraries/glibc/2.17/locales-builder.sh new file mode 100644 index 000000000000..d732e208fa22 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.17/locales-builder.sh @@ -0,0 +1,17 @@ +# Glibc cannot have itself in its RPATH. +export NIX_NO_SELF_RPATH=1 + +source $stdenv/setup + +postConfigure() { + # Hack: get rid of the `-static' flag set by the bootstrap stdenv. + # This has to be done *after* `configure' because it builds some + # test binaries. + export NIX_CFLAGS_LINK= + export NIX_LDFLAGS_BEFORE= + + export NIX_DONT_SET_RPATH=1 + unset CFLAGS +} + +genericBuild diff --git a/pkgs/development/libraries/glibc/2.17/locales.nix b/pkgs/development/libraries/glibc/2.17/locales.nix new file mode 100644 index 000000000000..b7eae50ca385 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.17/locales.nix @@ -0,0 +1,47 @@ +/* This function builds just the `lib/locale/locale-archive' file from + Glibc and nothing else. If `allLocales' is true, all supported + locales are included; otherwise, just the locales listed in + `locales'. See localedata/SUPPORTED in the Glibc source tree for + the list of all supported locales: + http://sourceware.org/cgi-bin/cvsweb.cgi/libc/localedata/SUPPORTED?cvsroot=glibc +*/ + +{ stdenv, fetchurl, allLocales ? true, locales ? ["en_US.UTF-8/UTF-8"] }: + +let build = import ./common.nix; +in + build null { + name = "glibc-locales"; + + inherit fetchurl stdenv; + installLocales = true; + + builder = ./locales-builder.sh; + + # Awful hack: `localedef' doesn't allow the path to `locale-archive' + # to be overriden, but you *can* specify a prefix, i.e. it will use + # //lib/locale/locale-archive. So we use + # $TMPDIR as a prefix, meaning that the locale-archive is placed in + # $TMPDIR/nix/store/...-glibc-.../lib/locale/locale-archive. + buildPhase = + '' + mkdir -p $TMPDIR/"$(dirname $(readlink -f $(type -p localedef)))/../lib/locale" + + # Hack to allow building of the locales (needed since glibc-2.12) + sed -i -e "s,^LOCALEDEF=.*,LOCALEDEF=localedef --prefix=$TMPDIR," -e \ + /library-path/d ../glibc-2*/localedata/Makefile + ${if allLocales then "" else + "echo SUPPORTED-LOCALES=\"${toString locales}\" > ../glibc-2*/localedata/SUPPORTED"} + + make localedata/install-locales \ + localedir=$out/lib/locale \ + ''; + + installPhase = + '' + mkdir -p "$out/lib/locale" + cp -v "$TMPDIR/nix/store/"*"/lib/locale/locale-archive" "$out/lib/locale" + ''; + + meta.description = "Locale information for the GNU C Library"; + } diff --git a/pkgs/development/libraries/glibc/2.17/nix-locale-archive.patch b/pkgs/development/libraries/glibc/2.17/nix-locale-archive.patch new file mode 100644 index 000000000000..88c8adef9226 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.17/nix-locale-archive.patch @@ -0,0 +1,114 @@ +diff -ru glibc-2.16.0-orig/locale/loadarchive.c glibc-2.16.0/locale/loadarchive.c +--- glibc-2.16.0-orig/locale/loadarchive.c 2012-06-30 15:12:34.000000000 -0400 ++++ glibc-2.16.0/locale/loadarchive.c 2012-09-18 11:57:57.277515212 -0400 +@@ -123,6 +123,25 @@ + } + + ++static int ++open_locale_archive () ++{ ++ int fd = -1; ++ char *path = getenv ("LOCALE_ARCHIVE_2_11"); ++ char *path2 = getenv ("LOCALE_ARCHIVE"); ++ const char *usualpath = "/usr/lib/locale/locale-archive"; ++ if (path) ++ fd = open_not_cancel_2 (path, O_RDONLY|O_LARGEFILE|O_CLOEXEC); ++ if (path2 && fd < 0) ++ fd = open_not_cancel_2 (path2, O_RDONLY|O_LARGEFILE|O_CLOEXEC); ++ if (fd < 0) ++ fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE|O_CLOEXEC); ++ if (fd < 0) ++ fd = open_not_cancel_2 (usualpath, O_RDONLY|O_LARGEFILE|O_CLOEXEC); ++ return fd; ++} ++ ++ + /* Find the locale *NAMEP in the locale archive, and return the + internalized data structure for its CATEGORY data. If this locale has + already been loaded from the archive, just returns the existing data +@@ -202,7 +221,7 @@ + archmapped = &headmap; + + /* The archive has never been opened. */ +- fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE|O_CLOEXEC); ++ fd = open_locale_archive (); + if (fd < 0) + /* Cannot open the archive, for whatever reason. */ + return NULL; +@@ -393,8 +412,7 @@ + if (fd == -1) + { + struct stat64 st; +- fd = open_not_cancel_2 (archfname, +- O_RDONLY|O_LARGEFILE|O_CLOEXEC); ++ fd = open_locale_archive (); + if (fd == -1) + /* Cannot open the archive, for whatever reason. */ + return NULL; +diff -ru glibc-2.16.0-orig/locale/programs/locale.c glibc-2.16.0/locale/programs/locale.c +--- glibc-2.16.0-orig/locale/programs/locale.c 2012-06-30 15:12:34.000000000 -0400 ++++ glibc-2.16.0/locale/programs/locale.c 2012-09-18 11:53:03.719920947 -0400 +@@ -628,6 +628,20 @@ + ((const struct nameent *) b)->name); + } + ++static int ++open_nix_locale_archive (const char * fname, int access) ++{ ++ int fd = -1; ++ char *path = getenv ("LOCALE_ARCHIVE_2_11"); ++ char *path2 = getenv ("LOCALE_ARCHIVE"); ++ if (path) ++ fd = open64 (path, access); ++ if (path2 && fd < 0) ++ fd = open64 (path2, access); ++ if (fd < 0) ++ fd = open64 (fname, access); ++ return fd; ++} + + static int + write_archive_locales (void **all_datap, char *linebuf) +@@ -641,7 +655,7 @@ + int fd, ret = 0; + uint32_t cnt; + +- fd = open64 (ARCHIVE_NAME, O_RDONLY); ++ fd = open_nix_locale_archive (ARCHIVE_NAME, O_RDONLY); + if (fd < 0) + return 0; + +diff -ru glibc-2.16.0-orig/locale/programs/locarchive.c glibc-2.16.0/locale/programs/locarchive.c +--- glibc-2.16.0-orig/locale/programs/locarchive.c 2012-06-30 15:12:34.000000000 -0400 ++++ glibc-2.16.0/locale/programs/locarchive.c 2012-09-18 11:53:03.720920942 -0400 +@@ -509,6 +509,20 @@ + *ah = new_ah; + } + ++static int ++open_nix_locale_archive (const char * fname, int access) ++{ ++ int fd = -1; ++ char *path = getenv ("LOCALE_ARCHIVE_2_11"); ++ char *path2 = getenv ("LOCALE_ARCHIVE"); ++ if (path) ++ fd = open64 (path, access); ++ if (path2 && fd < 0) ++ fd = open64 (path2, access); ++ if (fd < 0) ++ fd = open64 (fname, access); ++ return fd; ++} + + void + open_archive (struct locarhandle *ah, bool readonly) +@@ -528,7 +542,7 @@ + while (1) + { + /* Open the archive. We must have exclusive write access. */ +- fd = open64 (archivefname, readonly ? O_RDONLY : O_RDWR); ++ fd = open_nix_locale_archive (archivefname, readonly ? O_RDONLY : O_RDWR); + if (fd == -1) + { + /* Maybe the file does not yet exist. */ diff --git a/pkgs/development/libraries/glibc/2.17/nss-skip-unavail.patch b/pkgs/development/libraries/glibc/2.17/nss-skip-unavail.patch new file mode 100644 index 000000000000..e48dc2bc0a6e --- /dev/null +++ b/pkgs/development/libraries/glibc/2.17/nss-skip-unavail.patch @@ -0,0 +1,21 @@ +diff -ru glibc-2.11.2-orig/sysdeps/posix/getaddrinfo.c glibc-2.11.2/sysdeps/posix/getaddrinfo.c +--- glibc-2.11.2-orig/sysdeps/posix/getaddrinfo.c 2010-05-19 22:38:20.000000000 +0200 ++++ glibc-2.11.2/sysdeps/posix/getaddrinfo.c 2010-08-05 18:39:54.259556327 +0200 +@@ -505,8 +505,6 @@ + int no_data = 0; + int no_inet6_data = 0; + service_user *nip = NULL; +- enum nss_status inet6_status = NSS_STATUS_UNAVAIL; +- enum nss_status status = NSS_STATUS_UNAVAIL; + int no_more; + int old_res_options; + +@@ -702,6 +700,8 @@ + + while (!no_more) + { ++ enum nss_status inet6_status = NSS_STATUS_UNAVAIL; ++ enum nss_status status = NSS_STATUS_UNAVAIL; + no_data = 0; + nss_gethostbyname4_r fct4 + = __nss_lookup_function (nip, "gethostbyname4_r"); diff --git a/pkgs/development/libraries/glibc/2.17/rpcgen-path.patch b/pkgs/development/libraries/glibc/2.17/rpcgen-path.patch new file mode 100644 index 000000000000..fbb03dd5fade --- /dev/null +++ b/pkgs/development/libraries/glibc/2.17/rpcgen-path.patch @@ -0,0 +1,72 @@ +By default, rpcgen(1) looks for cpp(1) from a list of fixed absolute paths +(`/lib/cpp', etc.), which may only be overrided with the `-Y' option. This +patch makes it run any `cpp' command found in $PATH. + +--- glibc-2.7/sunrpc/rpc_main.c 2006-11-10 21:54:46.000000000 +0100 ++++ glibc-2.7/sunrpc/rpc_main.c 2009-04-22 14:32:10.000000000 +0200 +@@ -79,7 +79,7 @@ static const char *cmdname; + + static const char *svcclosetime = "120"; + static int cppDefined; /* explicit path for C preprocessor */ +-static const char *CPP = SUNOS_CPP; ++static const char *CPP = "cpp"; + static const char CPPFLAGS[] = "-C"; + static char *pathbuf; + static int cpp_pid; +@@ -108,7 +108,6 @@ static char *extendfile (const char *fil + static void open_output (const char *infile, const char *outfile); + static void add_warning (void); + static void clear_args (void); +-static void find_cpp (void); + static void open_input (const char *infile, const char *define); + static int check_nettype (const char *name, const char *list_to_check[]); + static void c_output (const char *infile, const char *define, +@@ -327,31 +326,6 @@ clear_args (void) + argcount = FIXEDARGS; + } + +-/* make sure that a CPP exists */ +-static void +-find_cpp (void) +-{ +- struct stat buf; +- +- if (stat (CPP, &buf) < 0) +- { /* /lib/cpp or explicit cpp does not exist */ +- if (cppDefined) +- { +- fprintf (stderr, _ ("cannot find C preprocessor: %s \n"), CPP); +- crash (); +- } +- else +- { /* try the other one */ +- CPP = SVR4_CPP; +- if (stat (CPP, &buf) < 0) +- { /* can't find any cpp */ +- fputs (_ ("cannot find any C preprocessor (cpp)\n"), stdout); +- crash (); +- } +- } +- } +-} +- + /* + * Open input file with given define for C-preprocessor + */ +@@ -370,7 +344,6 @@ open_input (const char *infile, const ch + switch (cpp_pid) + { + case 0: +- find_cpp (); + putarg (0, CPP); + putarg (1, CPPFLAGS); + addarg (define); +@@ -380,7 +353,7 @@ open_input (const char *infile, const ch + close (1); + dup2 (pd[1], 1); + close (pd[0]); +- execv (arglist[0], (char **) arglist); ++ execvp (arglist[0], (char **) arglist); + perror ("execv"); + exit (1); + case -1: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 968418af9289..9216f446e0af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3624,7 +3624,7 @@ let glfw = callPackage ../development/libraries/glfw { }; - glibc = glibc216; + glibc = glibc217; glibcCross = glibc213Cross; @@ -3649,7 +3649,7 @@ let inherit fetchgit; })); - glibc216 = callPackage ../development/libraries/glibc/2.16 { + glibc217 = callPackage ../development/libraries/glibc/2.17 { kernelHeaders = linuxHeaders; installLocales = config.glibc.locales or false; machHeaders = null; -- cgit 1.4.1 From d3d3cea6bdd53b48fcb09c97f09b56f24d505566 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 29 Dec 2012 00:49:21 +0100 Subject: glibc: Update rpcgen-path.patch --- .../libraries/glibc/2.17/rpcgen-path.patch | 54 ++++++++-------------- 1 file changed, 18 insertions(+), 36 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/glibc/2.17/rpcgen-path.patch b/pkgs/development/libraries/glibc/2.17/rpcgen-path.patch index fbb03dd5fade..fd81ab5324e3 100644 --- a/pkgs/development/libraries/glibc/2.17/rpcgen-path.patch +++ b/pkgs/development/libraries/glibc/2.17/rpcgen-path.patch @@ -1,19 +1,16 @@ -By default, rpcgen(1) looks for cpp(1) from a list of fixed absolute paths -(`/lib/cpp', etc.), which may only be overrided with the `-Y' option. This -patch makes it run any `cpp' command found in $PATH. - ---- glibc-2.7/sunrpc/rpc_main.c 2006-11-10 21:54:46.000000000 +0100 -+++ glibc-2.7/sunrpc/rpc_main.c 2009-04-22 14:32:10.000000000 +0200 -@@ -79,7 +79,7 @@ static const char *cmdname; +diff -ru glibc-2.17-orig/sunrpc/rpc_main.c glibc-2.17/sunrpc/rpc_main.c +--- glibc-2.17-orig/sunrpc/rpc_main.c 2012-12-25 04:02:13.000000000 +0100 ++++ glibc-2.17/sunrpc/rpc_main.c 2012-12-29 00:21:04.124698455 +0100 +@@ -77,7 +77,7 @@ static const char *svcclosetime = "120"; static int cppDefined; /* explicit path for C preprocessor */ --static const char *CPP = SUNOS_CPP; +-static const char *CPP = "/lib/cpp"; +static const char *CPP = "cpp"; static const char CPPFLAGS[] = "-C"; static char *pathbuf; static int cpp_pid; -@@ -108,7 +108,6 @@ static char *extendfile (const char *fil +@@ -106,7 +106,6 @@ static void open_output (const char *infile, const char *outfile); static void add_warning (void); static void clear_args (void); @@ -21,7 +18,7 @@ patch makes it run any `cpp' command found in $PATH. static void open_input (const char *infile, const char *define); static int check_nettype (const char *name, const char *list_to_check[]); static void c_output (const char *infile, const char *define, -@@ -327,31 +326,6 @@ clear_args (void) +@@ -318,25 +317,6 @@ argcount = FIXEDARGS; } @@ -31,29 +28,23 @@ patch makes it run any `cpp' command found in $PATH. -{ - struct stat buf; - -- if (stat (CPP, &buf) < 0) -- { /* /lib/cpp or explicit cpp does not exist */ -- if (cppDefined) -- { -- fprintf (stderr, _ ("cannot find C preprocessor: %s \n"), CPP); -- crash (); -- } -- else -- { /* try the other one */ -- CPP = SVR4_CPP; -- if (stat (CPP, &buf) < 0) -- { /* can't find any cpp */ -- fputs (_ ("cannot find any C preprocessor (cpp)\n"), stdout); -- crash (); -- } -- } +- if (stat (CPP, &buf) == 0) +- return; +- +- if (cppDefined) /* user specified cpp but it does not exist */ +- { +- fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP); +- crash (); - } +- +- /* fall back to system CPP */ +- CPP = "cpp"; -} - /* * Open input file with given define for C-preprocessor */ -@@ -370,7 +344,6 @@ open_input (const char *infile, const ch +@@ -355,7 +335,6 @@ switch (cpp_pid) { case 0: @@ -61,12 +52,3 @@ patch makes it run any `cpp' command found in $PATH. putarg (0, CPP); putarg (1, CPPFLAGS); addarg (define); -@@ -380,7 +353,7 @@ open_input (const char *infile, const ch - close (1); - dup2 (pd[1], 1); - close (pd[0]); -- execv (arglist[0], (char **) arglist); -+ execvp (arglist[0], (char **) arglist); - perror ("execv"); - exit (1); - case -1: -- cgit 1.4.1 From 291527a6d9acb707a1a25c0f40d9472260345ee7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 29 Dec 2012 01:01:31 +0100 Subject: glibc: Drop nss-skip-unavail.patch From a quick look at the 1063-line monstrosity that is gaih_inet(), I *think* that this patch is no longer needed. But I could be wrong. --- pkgs/development/libraries/glibc/2.17/common.nix | 25 +--------------------- .../libraries/glibc/2.17/nss-skip-unavail.patch | 21 ------------------ 2 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 pkgs/development/libraries/glibc/2.17/nss-skip-unavail.patch (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/glibc/2.17/common.nix b/pkgs/development/libraries/glibc/2.17/common.nix index ccdae6200e53..a3c6466c8302 100644 --- a/pkgs/development/libraries/glibc/2.17/common.nix +++ b/pkgs/development/libraries/glibc/2.17/common.nix @@ -32,30 +32,7 @@ stdenv.mkDerivation ({ enableParallelBuilding = true; patches = - [ /* Fix for NIXPKGS-79: when doing host name lookups, when - nsswitch.conf contains a line like - - hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4 - - don't return an error when mdns4_minimal can't be found. This - is a bug in Glibc: when a service can't be found, NSS should - continue to the next service unless "UNAVAIL=return" is set. - ("NOTFOUND=return" refers to the service returning a NOTFOUND - error, not the service itself not being found.) The reason is - that the "status" variable (while initialised to UNAVAIL) is - outside of the loop that iterates over the services, the - "files" service sets status to NOTFOUND. So when the call to - find "mdns4_minimal" fails, "status" will still be NOTFOUND, - and it will return instead of continuing to "dns". Thus, the - line - - hosts: mdns4_minimal [NOTFOUND=return] dns mdns4 - - does work because "status" will contain UNAVAIL after the - failure to find mdns4_minimal. */ - ./nss-skip-unavail.patch - - /* Have rpcgen(1) look for cpp(1) in $PATH. */ + [ /* Have rpcgen(1) look for cpp(1) in $PATH. */ ./rpcgen-path.patch /* Allow NixOS and Nix to handle the locale-archive. */ diff --git a/pkgs/development/libraries/glibc/2.17/nss-skip-unavail.patch b/pkgs/development/libraries/glibc/2.17/nss-skip-unavail.patch deleted file mode 100644 index e48dc2bc0a6e..000000000000 --- a/pkgs/development/libraries/glibc/2.17/nss-skip-unavail.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ru glibc-2.11.2-orig/sysdeps/posix/getaddrinfo.c glibc-2.11.2/sysdeps/posix/getaddrinfo.c ---- glibc-2.11.2-orig/sysdeps/posix/getaddrinfo.c 2010-05-19 22:38:20.000000000 +0200 -+++ glibc-2.11.2/sysdeps/posix/getaddrinfo.c 2010-08-05 18:39:54.259556327 +0200 -@@ -505,8 +505,6 @@ - int no_data = 0; - int no_inet6_data = 0; - service_user *nip = NULL; -- enum nss_status inet6_status = NSS_STATUS_UNAVAIL; -- enum nss_status status = NSS_STATUS_UNAVAIL; - int no_more; - int old_res_options; - -@@ -702,6 +700,8 @@ - - while (!no_more) - { -+ enum nss_status inet6_status = NSS_STATUS_UNAVAIL; -+ enum nss_status status = NSS_STATUS_UNAVAIL; - no_data = 0; - nss_gethostbyname4_r fct4 - = __nss_lookup_function (nip, "gethostbyname4_r"); -- cgit 1.4.1 From 796b5e3c9f0378d0e9416f27045607a3afc655cc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Jan 2013 20:38:11 +0100 Subject: gmp-5.x: update from 5.0.5 to 5.1.0 --- pkgs/development/libraries/gmp/5.0.5.nix | 57 -------------------------------- pkgs/development/libraries/gmp/5.1.0.nix | 57 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 58 insertions(+), 58 deletions(-) delete mode 100644 pkgs/development/libraries/gmp/5.0.5.nix create mode 100644 pkgs/development/libraries/gmp/5.1.0.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/gmp/5.0.5.nix b/pkgs/development/libraries/gmp/5.0.5.nix deleted file mode 100644 index dba5cafdf573..000000000000 --- a/pkgs/development/libraries/gmp/5.0.5.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv, fetchurl, m4, cxx ? true }: - -stdenv.mkDerivation rec { - name = "gmp-5.0.5"; - - src = fetchurl { - url = "mirror://gnu/gmp/${name}.tar.bz2"; - sha256 = "1jfymbr90mpn0zw5sg001llqnvf2462y77vgjknrmfs1rjn8ln0z"; - }; - - patches = [ ./ignore-bad-cpuid.patch ]; - - nativeBuildInputs = [ m4 ]; - - configureFlags = - # Build a "fat binary", with routines for several sub-architectures - # (x86), except on Solaris where some tests crash with "Memory fault". - # See , for instance. - (stdenv.lib.optional (!stdenv.isSunOS) "--enable-fat") - ++ (if cxx then [ "--enable-cxx" ] else [ "--disable-cxx" ]); - - doCheck = true; - - enableParallelBuilding = true; - - meta = { - description = "GMP, the GNU multiple precision arithmetic library"; - - longDescription = - '' GMP is a free library for arbitrary precision arithmetic, operating - on signed integers, rational numbers, and floating point numbers. - There is no practical limit to the precision except the ones implied - by the available memory in the machine GMP runs on. GMP has a rich - set of functions, and the functions have a regular interface. - - The main target applications for GMP are cryptography applications - and research, Internet security applications, algebra systems, - computational algebra research, etc. - - GMP is carefully designed to be as fast as possible, both for small - operands and for huge operands. The speed is achieved by using - fullwords as the basic arithmetic type, by using fast algorithms, - with highly optimised assembly code for the most common inner loops - for a lot of CPUs, and by a general emphasis on speed. - - GMP is faster than any other bignum library. The advantage for GMP - increases with the operand sizes for many operations, since GMP uses - asymptotically faster algorithms. - ''; - - homepage = http://gmplib.org/; - license = "LGPLv3+"; - - maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ]; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/gmp/5.1.0.nix b/pkgs/development/libraries/gmp/5.1.0.nix new file mode 100644 index 000000000000..c480ea4f4598 --- /dev/null +++ b/pkgs/development/libraries/gmp/5.1.0.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchurl, m4, cxx ? true }: + +stdenv.mkDerivation rec { + name = "gmp-5.1.0"; + + src = fetchurl { + url = "mirror://gnu/gmp/${name}.tar.bz2"; + sha256 = "15n7xxgasbxdch8ii8z9ic6fxc2ysk3q8iavf55abjp5iylspnfz"; + }; + + patches = [ ./ignore-bad-cpuid.patch ]; + + nativeBuildInputs = [ m4 ]; + + configureFlags = + # Build a "fat binary", with routines for several sub-architectures + # (x86), except on Solaris where some tests crash with "Memory fault". + # See , for instance. + (stdenv.lib.optional (!stdenv.isSunOS) "--enable-fat") + ++ (if cxx then [ "--enable-cxx" ] else [ "--disable-cxx" ]); + + doCheck = true; + + enableParallelBuilding = true; + + meta = { + description = "GMP, the GNU multiple precision arithmetic library"; + + longDescription = + '' GMP is a free library for arbitrary precision arithmetic, operating + on signed integers, rational numbers, and floating point numbers. + There is no practical limit to the precision except the ones implied + by the available memory in the machine GMP runs on. GMP has a rich + set of functions, and the functions have a regular interface. + + The main target applications for GMP are cryptography applications + and research, Internet security applications, algebra systems, + computational algebra research, etc. + + GMP is carefully designed to be as fast as possible, both for small + operands and for huge operands. The speed is achieved by using + fullwords as the basic arithmetic type, by using fast algorithms, + with highly optimised assembly code for the most common inner loops + for a lot of CPUs, and by a general emphasis on speed. + + GMP is faster than any other bignum library. The advantage for GMP + increases with the operand sizes for many operations, since GMP uses + asymptotically faster algorithms. + ''; + + homepage = http://gmplib.org/; + license = "LGPLv3+"; + + maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b798c47ba35..30264e50c004 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3754,7 +3754,7 @@ let # The GHC bootstrap binaries link against libgmp.so.3, which is in GMP 4.x. gmp4 = callPackage ../development/libraries/gmp/4.3.2.nix { }; - gmp5 = callPackage ../development/libraries/gmp/5.0.5.nix { }; + gmp5 = callPackage ../development/libraries/gmp/5.1.0.nix { }; gobjectIntrospection = callPackage ../development/libraries/gobject-introspection { }; -- cgit 1.4.1 From 33ea74f9b695ba7c2f07a68d561de0c9a645a58a Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 5 Jan 2013 21:05:34 +0000 Subject: ffmpeg: show vdpauSupport to the world --- pkgs/development/libraries/ffmpeg/default.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index 3b5e28a2ee7f..b37fcdf4436c 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -74,6 +74,10 @@ stdenv.mkDerivation rec { ]; }; + passthru = { + inherit vdpauSupport; + }; + meta = { homepage = http://www.ffmpeg.org/; description = "A complete, cross-platform solution to record, convert and stream audio and video"; -- cgit 1.4.1 From 2839c45d9786ccdac422b8d84e4ce7124abd735d Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Sun, 6 Jan 2013 14:00:27 +0000 Subject: gmp: Adding more urls for 5.1.0 It worked some days ago, but gnu mirrors seem to have removed gmp 5.1.0 --- pkgs/development/libraries/gmp/5.1.0.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/gmp/5.1.0.nix b/pkgs/development/libraries/gmp/5.1.0.nix index c480ea4f4598..88d639e621b9 100644 --- a/pkgs/development/libraries/gmp/5.1.0.nix +++ b/pkgs/development/libraries/gmp/5.1.0.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { name = "gmp-5.1.0"; src = fetchurl { - url = "mirror://gnu/gmp/${name}.tar.bz2"; + urls = [ "mirror://gnu/gmp/${name}.tar.bz2" + "ftp://ftp.gmplib.org/pub/${name}/${name}.tar.bz2" ]; sha256 = "15n7xxgasbxdch8ii8z9ic6fxc2ysk3q8iavf55abjp5iylspnfz"; }; -- cgit 1.4.1 From 56c7b9684409248df7c023c097e7f22c7ce9b787 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Thu, 10 Jan 2013 22:51:36 +0100 Subject: gtk2: a minor update --- pkgs/development/libraries/gtk+/2.24.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/gtk+/2.24.x.nix b/pkgs/development/libraries/gtk+/2.24.x.nix index 11584e0fbe75..c259f7005730 100644 --- a/pkgs/development/libraries/gtk+/2.24.x.nix +++ b/pkgs/development/libraries/gtk+/2.24.x.nix @@ -8,11 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; stdenv.mkDerivation rec { - name = "gtk+-2.24.13"; + name = "gtk+-2.24.14"; src = fetchurl { url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz"; - sha256 = "35e1a01e46b02970b02ee9f299390d0aa57c1215ad2667bcd584b72f4ea6513d"; + sha256 = "8bd1b8b511a3004e8972badf467ce829e6855cdff15540b9344dc934c68008ac"; }; enableParallelBuilding = true; -- cgit 1.4.1 From 3b4bf9cee3d7d651c3a512a550d72a9279c01b2c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 11 Jan 2013 15:52:42 +0100 Subject: gmp: version 5.1.0 has the cpu-id patch applied already --- pkgs/development/libraries/gmp/5.1.0.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/gmp/5.1.0.nix b/pkgs/development/libraries/gmp/5.1.0.nix index 88d639e621b9..270788198f6d 100644 --- a/pkgs/development/libraries/gmp/5.1.0.nix +++ b/pkgs/development/libraries/gmp/5.1.0.nix @@ -4,13 +4,10 @@ stdenv.mkDerivation rec { name = "gmp-5.1.0"; src = fetchurl { - urls = [ "mirror://gnu/gmp/${name}.tar.bz2" - "ftp://ftp.gmplib.org/pub/${name}/${name}.tar.bz2" ]; + urls = [ "mirror://gnu/gmp/${name}.tar.bz2" "ftp://ftp.gmplib.org/pub/${name}/${name}.tar.bz2" ]; sha256 = "15n7xxgasbxdch8ii8z9ic6fxc2ysk3q8iavf55abjp5iylspnfz"; }; - patches = [ ./ignore-bad-cpuid.patch ]; - nativeBuildInputs = [ m4 ]; configureFlags = -- cgit 1.4.1 From 4db9419a5c26dbd3ff0c04b159726553d7de2cd7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 11 Jan 2013 16:15:16 +0100 Subject: gmp: switch default version back to 5.0.5 The 5.1.0 version breaks the build of virtually every package that uses the C++ wrappers for gmp (such as mpfr, ppl, etc). --- pkgs/development/libraries/gmp/5.0.5.nix | 55 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/gmp/5.0.5.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/gmp/5.0.5.nix b/pkgs/development/libraries/gmp/5.0.5.nix new file mode 100644 index 000000000000..62acc974caaf --- /dev/null +++ b/pkgs/development/libraries/gmp/5.0.5.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchurl, m4, cxx ? true }: + +stdenv.mkDerivation rec { + name = "gmp-5.0.5"; + + src = fetchurl { + url = "mirror://gnu/gmp/${name}.tar.bz2"; + sha256 = "1jfymbr90mpn0zw5sg001llqnvf2462y77vgjknrmfs1rjn8ln0z"; + }; + + nativeBuildInputs = [ m4 ]; + + configureFlags = + # Build a "fat binary", with routines for several sub-architectures + # (x86), except on Solaris where some tests crash with "Memory fault". + # See , for instance. + (stdenv.lib.optional (!stdenv.isSunOS) "--enable-fat") + ++ (if cxx then [ "--enable-cxx" ] else [ "--disable-cxx" ]); + + doCheck = true; + + enableParallelBuilding = true; + + meta = { + description = "GMP, the GNU multiple precision arithmetic library"; + + longDescription = + '' GMP is a free library for arbitrary precision arithmetic, operating + on signed integers, rational numbers, and floating point numbers. + There is no practical limit to the precision except the ones implied + by the available memory in the machine GMP runs on. GMP has a rich + set of functions, and the functions have a regular interface. + + The main target applications for GMP are cryptography applications + and research, Internet security applications, algebra systems, + computational algebra research, etc. + + GMP is carefully designed to be as fast as possible, both for small + operands and for huge operands. The speed is achieved by using + fullwords as the basic arithmetic type, by using fast algorithms, + with highly optimised assembly code for the most common inner loops + for a lot of CPUs, and by a general emphasis on speed. + + GMP is faster than any other bignum library. The advantage for GMP + increases with the operand sizes for many operations, since GMP uses + asymptotically faster algorithms. + ''; + + homepage = http://gmplib.org/; + license = "LGPLv3+"; + + maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0c00ef02ea9..d374c727987f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3768,7 +3768,9 @@ let # The GHC bootstrap binaries link against libgmp.so.3, which is in GMP 4.x. gmp4 = callPackage ../development/libraries/gmp/4.3.2.nix { }; - gmp5 = callPackage ../development/libraries/gmp/5.1.0.nix { }; + gmp5 = callPackage ../development/libraries/gmp/5.0.5.nix { }; + + gmp51 = callPackage ../development/libraries/gmp/5.1.0.nix { }; gobjectIntrospection = callPackage ../development/libraries/gobject-introspection { }; -- cgit 1.4.1 From 418f6a536f077c7c72d51092efd544e99123c313 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 13 Jan 2013 11:27:29 +0100 Subject: gmp: add back the cpuid patch to 5.0.5 it was lost during 5.0.5 -> 5.1.0 -> 5.1.0 w/o patch -> 5.0.5 w/o patch --- pkgs/development/libraries/gmp/5.0.5.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/gmp/5.0.5.nix b/pkgs/development/libraries/gmp/5.0.5.nix index 62acc974caaf..dba5cafdf573 100644 --- a/pkgs/development/libraries/gmp/5.0.5.nix +++ b/pkgs/development/libraries/gmp/5.0.5.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1jfymbr90mpn0zw5sg001llqnvf2462y77vgjknrmfs1rjn8ln0z"; }; + patches = [ ./ignore-bad-cpuid.patch ]; + nativeBuildInputs = [ m4 ]; configureFlags = -- cgit 1.4.1 From 0890c454986993a262a31aa2779e9269b7d58952 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 13 Jan 2013 11:33:45 +0100 Subject: buildNativeInputs -> nativeBuildInputs --- pkgs/applications/editors/zile/default.nix | 2 +- pkgs/development/libraries/eigen/2.0.nix | 8 ++++---- pkgs/development/tools/phantomjs/default.nix | 2 +- pkgs/tools/graphics/argyllcms/default.nix | 2 +- pkgs/tools/misc/youtube-dl/default.nix | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index ea2000b57db2..5929f4c76c89 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ help2man perl ]; # `help2man' wants to run Zile, which fails when cross-compiling. - crossAttrs.buildNativeInputs = []; + crossAttrs.nativeBuildInputs = []; # Tests can't be run because most of them rely on the ability to # fiddle with the terminal. diff --git a/pkgs/development/libraries/eigen/2.0.nix b/pkgs/development/libraries/eigen/2.0.nix index 6884aca16fcb..9cf0a3c350cc 100644 --- a/pkgs/development/libraries/eigen/2.0.nix +++ b/pkgs/development/libraries/eigen/2.0.nix @@ -5,15 +5,15 @@ let in stdenv.mkDerivation { name = "eigen-${v}"; - + src = fetchurl { url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2"; name = "eigen-${v}.tar.bz2"; sha256 = "1akcb4g5hvc664gfc6sxb6f6jrm55fgks6017wg0smyvmm6k09v0"; }; - - buildNativeInputs = [ cmake ]; - + + nativeBuildInputs = [ cmake ]; + meta = with stdenv.lib; { description = "C++ template library for linear algebra: vectors, matrices, and related algorithms"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix index 33b99e12de55..5d9433cc5ca6 100644 --- a/pkgs/development/tools/phantomjs/default.nix +++ b/pkgs/development/tools/phantomjs/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { sha256 = "1m14czhi3b388didn0a881glsx8bnsg9gnxgj5lghr4l5mgqyrd7"; }; - buildNativeInputs = stdenv.lib.optional (stdenv.system == "x86_64-linux") upx; + nativeBuildInputs = stdenv.lib.optional (stdenv.system == "x86_64-linux") upx; buildPhase = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") '' upx -d bin/phantomjs diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index 08cd012e0797..934a27ef25b7 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { -ljpeg -ltiff ; ''; - buildNativeInputs = [ jam unzip ]; + nativeBuildInputs = [ jam unzip ]; preConfigure = '' cp ${jamTop} Jamtop diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 52c8e493fdcc..40f19dc89e06 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; buildInputs = [ python ]; - buildNativeInputs = [ pandoc zip ]; + nativeBuildInputs = [ pandoc zip ]; patchPhase = '' rm youtube-dl -- cgit 1.4.1 From 8a4ac2b92ac8b0c49267d190bb19b35daba474c9 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 21 Jan 2013 19:06:22 +0100 Subject: lirc: Build devinput driver, which doesn't require any special modules --- pkgs/development/libraries/lirc/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 20ef82401e65..75f175a5b2da 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -10,5 +10,9 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib ]; - configureFlags = "--with-driver=none --enable-sandboxed"; + configureFlags = [ + "--with-driver=devinput" + "--sysconfdir=$(out)/etc" + "--enable-sandboxed" + ]; } -- cgit 1.4.1 From daa53f5200be24ee3fa86d6331647f2ab31cffac Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 22 Jan 2013 23:39:29 +0100 Subject: glibc: Support Blowfish passwords --- pkgs/development/libraries/glibc/2.17/common.nix | 5 + .../glibc/2.17/glibc-crypt-blowfish.patch | 795 +++++++++++++++++++++ 2 files changed, 800 insertions(+) create mode 100644 pkgs/development/libraries/glibc/2.17/glibc-crypt-blowfish.patch (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/glibc/2.17/common.nix b/pkgs/development/libraries/glibc/2.17/common.nix index 18077510f947..eed512887073 100644 --- a/pkgs/development/libraries/glibc/2.17/common.nix +++ b/pkgs/development/libraries/glibc/2.17/common.nix @@ -44,6 +44,11 @@ stdenv.mkDerivation ({ /* Without this patch many KDE binaries crash. */ ./glibc-elf-localscope.patch + + /* Add blowfish password hashing support. This is needed for + compatibility with old NixOS installations (since NixOS used + to default to blowfish). */ + ./glibc-crypt-blowfish.patch ]; postPatch = '' diff --git a/pkgs/development/libraries/glibc/2.17/glibc-crypt-blowfish.patch b/pkgs/development/libraries/glibc/2.17/glibc-crypt-blowfish.patch new file mode 100644 index 000000000000..a0a8acdab63d --- /dev/null +++ b/pkgs/development/libraries/glibc/2.17/glibc-crypt-blowfish.patch @@ -0,0 +1,795 @@ +From http://cvs.pld-linux.org/cgi-bin/viewvc.cgi/cvs/packages/glibc/glibc-crypt-blowfish.patch?revision=1.7&view=markup + +diff -ru -N glibc-2.17-orig/crypt/crypt_blowfish.c glibc-2.17/crypt/crypt_blowfish.c +--- glibc-2.17-orig/crypt/crypt_blowfish.c 1970-01-01 01:00:00.000000000 +0100 ++++ glibc-2.17/crypt/crypt_blowfish.c 2013-01-22 23:30:12.340353965 +0100 +@@ -0,0 +1,743 @@ ++/* ++ * This code comes from John the Ripper password cracker, with reentrant ++ * and crypt(3) interfaces added, but optimizations specific to password ++ * cracking removed. ++ * ++ * Written by Solar Designer in 1998-2002 and ++ * placed in the public domain. ++ * ++ * There's absolutely no warranty. ++ * ++ * It is my intent that you should be able to use this on your system, ++ * as a part of a software package, or anywhere else to improve security, ++ * ensure compatibility, or for any other purpose. I would appreciate ++ * it if you give credit where it is due and keep your modifications in ++ * the public domain as well, but I don't require that in order to let ++ * you place this code and any modifications you make under a license ++ * of your choice. ++ * ++ * This implementation is compatible with OpenBSD bcrypt.c (version 2a) ++ * by Niels Provos , and uses some of his ++ * ideas. The password hashing algorithm was designed by David Mazieres ++ * . ++ * ++ * There's a paper on the algorithm that explains its design decisions: ++ * ++ * http://www.usenix.org/events/usenix99/provos.html ++ * ++ * Some of the tricks in BF_ROUND might be inspired by Eric Young's ++ * Blowfish library (I can't be sure if I would think of something if I ++ * hadn't seen his code). ++ */ ++ ++#include ++ ++#include ++#ifndef __set_errno ++#define __set_errno(val) errno = (val) ++#endif ++ ++#undef __CONST ++#ifdef __GNUC__ ++#define __CONST __const ++#else ++#define __CONST ++#endif ++ ++#ifdef __i386__ ++#define BF_ASM 0 /* original OW patch has 1 */ ++#define BF_SCALE 1 ++#elif defined(__alpha__) || defined(__hppa__) || defined(__x86_64__) ++#define BF_ASM 0 ++#define BF_SCALE 1 ++#else ++#define BF_ASM 0 ++#define BF_SCALE 0 ++#endif ++ ++typedef unsigned int BF_word; ++ ++/* Number of Blowfish rounds, this is also hardcoded into a few places */ ++#define BF_N 16 ++ ++typedef BF_word BF_key[BF_N + 2]; ++ ++typedef struct { ++ BF_word S[4][0x100]; ++ BF_key P; ++} BF_ctx; ++ ++/* ++ * Magic IV for 64 Blowfish encryptions that we do at the end. ++ * The string is "OrpheanBeholderScryDoubt" on big-endian. ++ */ ++static BF_word BF_magic_w[6] = { ++ 0x4F727068, 0x65616E42, 0x65686F6C, ++ 0x64657253, 0x63727944, 0x6F756274 ++}; ++ ++/* ++ * P-box and S-box tables initialized with digits of Pi. ++ */ ++static BF_ctx BF_init_state = { ++ { ++ { ++ 0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7, ++ 0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99, ++ 0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16, ++ 0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e, ++ 0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee, ++ 0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013, ++ 0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef, ++ 0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e, ++ 0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60, ++ 0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440, ++ 0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce, ++ 0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a, ++ 0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e, ++ 0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677, ++ 0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193, ++ 0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032, ++ 0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88, ++ 0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239, ++ 0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e, ++ 0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0, ++ 0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3, ++ 0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98, ++ 0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88, ++ 0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe, ++ 0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6, ++ 0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d, ++ 0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b, ++ 0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7, ++ 0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba, ++ 0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463, ++ 0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f, ++ 0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09, ++ 0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3, ++ 0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb, ++ 0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279, ++ 0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8, ++ 0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab, ++ 0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82, ++ 0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db, ++ 0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573, ++ 0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0, ++ 0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b, ++ 0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790, ++ 0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8, ++ 0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4, ++ 0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0, ++ 0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7, ++ 0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c, ++ 0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad, ++ 0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1, ++ 0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299, ++ 0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9, ++ 0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477, ++ 0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf, ++ 0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49, ++ 0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af, ++ 0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa, ++ 0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5, ++ 0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41, ++ 0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915, ++ 0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400, ++ 0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915, ++ 0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664, ++ 0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a ++ }, { ++ 0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623, ++ 0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266, ++ 0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1, ++ 0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e, ++ 0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6, ++ 0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1, ++ 0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e, ++ 0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1, ++ 0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737, ++ 0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8, ++ 0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff, ++ 0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd, ++ 0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701, ++ 0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7, ++ 0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41, ++ 0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331, ++ 0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf, ++ 0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af, ++ 0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e, ++ 0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87, ++ 0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c, ++ 0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2, ++ 0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16, ++ 0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd, ++ 0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b, ++ 0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509, ++ 0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e, ++ 0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3, ++ 0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f, ++ 0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a, ++ 0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4, ++ 0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960, ++ 0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66, ++ 0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28, ++ 0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802, ++ 0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84, ++ 0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510, ++ 0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf, ++ 0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14, ++ 0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e, ++ 0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50, ++ 0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7, ++ 0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8, ++ 0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281, ++ 0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99, ++ 0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696, ++ 0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128, ++ 0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73, ++ 0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0, ++ 0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0, ++ 0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105, ++ 0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250, ++ 0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3, ++ 0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285, ++ 0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00, ++ 0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061, ++ 0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb, ++ 0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e, ++ 0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735, ++ 0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc, ++ 0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9, ++ 0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340, ++ 0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20, ++ 0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7 ++ }, { ++ 0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934, ++ 0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068, ++ 0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af, ++ 0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840, ++ 0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45, ++ 0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504, ++ 0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a, ++ 0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb, ++ 0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee, ++ 0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6, ++ 0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42, ++ 0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b, ++ 0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2, ++ 0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb, ++ 0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527, ++ 0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b, ++ 0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33, ++ 0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c, ++ 0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3, ++ 0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc, ++ 0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17, ++ 0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564, ++ 0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b, ++ 0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115, ++ 0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922, ++ 0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728, ++ 0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0, ++ 0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e, ++ 0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37, ++ 0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d, ++ 0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804, ++ 0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b, ++ 0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3, ++ 0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb, ++ 0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d, ++ 0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c, ++ 0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350, ++ 0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9, ++ 0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a, ++ 0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe, ++ 0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d, ++ 0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc, ++ 0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f, ++ 0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61, ++ 0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2, ++ 0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9, ++ 0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2, ++ 0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c, ++ 0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e, ++ 0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633, ++ 0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10, ++ 0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169, ++ 0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52, ++ 0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027, ++ 0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5, ++ 0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62, ++ 0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634, ++ 0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76, ++ 0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24, ++ 0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc, ++ 0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4, ++ 0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c, ++ 0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837, ++ 0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0 ++ }, { ++ 0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b, ++ 0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe, ++ 0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b, ++ 0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4, ++ 0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8, ++ 0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6, ++ 0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304, ++ 0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22, ++ 0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4, ++ 0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6, ++ 0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9, ++ 0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59, ++ 0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593, ++ 0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51, ++ 0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28, ++ 0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c, ++ 0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b, ++ 0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28, ++ 0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c, ++ 0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd, ++ 0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a, ++ 0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319, ++ 0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb, ++ 0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f, ++ 0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991, ++ 0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32, ++ 0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680, ++ 0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166, ++ 0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae, ++ 0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb, ++ 0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5, ++ 0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47, ++ 0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370, ++ 0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d, ++ 0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84, ++ 0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048, ++ 0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8, ++ 0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd, ++ 0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9, ++ 0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7, ++ 0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38, ++ 0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f, ++ 0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c, ++ 0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525, ++ 0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1, ++ 0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442, ++ 0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964, ++ 0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e, ++ 0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8, ++ 0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d, ++ 0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f, ++ 0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299, ++ 0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02, ++ 0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc, ++ 0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614, ++ 0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a, ++ 0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6, ++ 0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b, ++ 0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0, ++ 0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060, ++ 0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e, ++ 0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9, ++ 0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f, ++ 0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6 ++ } ++ }, { ++ 0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344, ++ 0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89, ++ 0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c, ++ 0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917, ++ 0x9216d5d9, 0x8979fb1b ++ } ++}; ++ ++static unsigned char BF_itoa64[64 + 1] = ++ "./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; ++ ++static unsigned char BF_atoi64[0x60] = { ++ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 0, 1, ++ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 64, 64, 64, 64, 64, ++ 64, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, ++ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 64, 64, 64, 64, 64, ++ 64, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, ++ 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 64, 64, 64, 64, 64 ++}; ++ ++/* ++ * This may be optimized out if built with function inlining and no BF_ASM. ++ */ ++static void clean(void *data, int size) ++{ ++#if BF_ASM ++ extern void _BF_clean(void *data); ++#endif ++ memset(data, 0, size); ++#if BF_ASM ++ _BF_clean(data); ++#endif ++} ++ ++#define BF_safe_atoi64(dst, src) \ ++{ \ ++ tmp = (unsigned char)(src); \ ++ if ((unsigned int)(tmp -= 0x20) >= 0x60) return -1; \ ++ tmp = BF_atoi64[tmp]; \ ++ if (tmp > 63) return -1; \ ++ (dst) = tmp; \ ++} ++ ++static int BF_decode(BF_word *dst, __CONST char *src, int size) ++{ ++ unsigned char *dptr = (unsigned char *)dst; ++ unsigned char *end = dptr + size; ++ unsigned char *sptr = (unsigned char *)src; ++ unsigned int tmp, c1, c2, c3, c4; ++ ++ do { ++ BF_safe_atoi64(c1, *sptr++); ++ BF_safe_atoi64(c2, *sptr++); ++ *dptr++ = (c1 << 2) | ((c2 & 0x30) >> 4); ++ if (dptr >= end) break; ++ ++ BF_safe_atoi64(c3, *sptr++); ++ *dptr++ = ((c2 & 0x0F) << 4) | ((c3 & 0x3C) >> 2); ++ if (dptr >= end) break; ++ ++ BF_safe_atoi64(c4, *sptr++); ++ *dptr++ = ((c3 & 0x03) << 6) | c4; ++ } while (dptr < end); ++ ++ return 0; ++} ++ ++static void BF_encode(char *dst, __CONST BF_word *src, int size) ++{ ++ unsigned char *sptr = (unsigned char *)src; ++ unsigned char *end = sptr + size; ++ unsigned char *dptr = (unsigned char *)dst; ++ unsigned int c1, c2; ++ ++ do { ++ c1 = *sptr++; ++ *dptr++ = BF_itoa64[c1 >> 2]; ++ c1 = (c1 & 0x03) << 4; ++ if (sptr >= end) { ++ *dptr++ = BF_itoa64[c1]; ++ break; ++ } ++ ++ c2 = *sptr++; ++ c1 |= c2 >> 4; ++ *dptr++ = BF_itoa64[c1]; ++ c1 = (c2 & 0x0f) << 2; ++ if (sptr >= end) { ++ *dptr++ = BF_itoa64[c1]; ++ break; ++ } ++ ++ c2 = *sptr++; ++ c1 |= c2 >> 6; ++ *dptr++ = BF_itoa64[c1]; ++ *dptr++ = BF_itoa64[c2 & 0x3f]; ++ } while (sptr < end); ++} ++ ++static void BF_swap(BF_word *x, int count) ++{ ++ static int endianness_check = 1; ++ char *is_little_endian = (char *)&endianness_check; ++ BF_word tmp; ++ ++ if (*is_little_endian) ++ do { ++ tmp = *x; ++ tmp = (tmp << 16) | (tmp >> 16); ++ *x++ = ((tmp & 0x00FF00FF) << 8) | ((tmp >> 8) & 0x00FF00FF); ++ } while (--count); ++} ++ ++#if BF_SCALE ++/* Architectures which can shift addresses left by 2 bits with no extra cost */ ++#define BF_ROUND(L, R, N) \ ++ tmp1 = L & 0xFF; \ ++ tmp2 = L >> 8; \ ++ tmp2 &= 0xFF; \ ++ tmp3 = L >> 16; \ ++ tmp3 &= 0xFF; \ ++ tmp4 = L >> 24; \ ++ tmp1 = data.ctx.S[3][tmp1]; \ ++ tmp2 = data.ctx.S[2][tmp2]; \ ++ tmp3 = data.ctx.S[1][tmp3]; \ ++ tmp3 += data.ctx.S[0][tmp4]; \ ++ tmp3 ^= tmp2; \ ++ R ^= data.ctx.P[N + 1]; \ ++ tmp3 += tmp1; \ ++ R ^= tmp3; ++#else ++/* Architectures with no complicated addressing modes supported */ ++#define BF_INDEX(S, i) \ ++ (*((BF_word *)(((unsigned char *)S) + (i)))) ++#define BF_ROUND(L, R, N) \ ++ tmp1 = L & 0xFF; \ ++ tmp1 <<= 2; \ ++ tmp2 = L >> 6; \ ++ tmp2 &= 0x3FC; \ ++ tmp3 = L >> 14; \ ++ tmp3 &= 0x3FC; \ ++ tmp4 = L >> 22; \ ++ tmp4 &= 0x3FC; \ ++ tmp1 = BF_INDEX(data.ctx.S[3], tmp1); \ ++ tmp2 = BF_INDEX(data.ctx.S[2], tmp2); \ ++ tmp3 = BF_INDEX(data.ctx.S[1], tmp3); \ ++ tmp3 += BF_INDEX(data.ctx.S[0], tmp4); \ ++ tmp3 ^= tmp2; \ ++ R ^= data.ctx.P[N + 1]; \ ++ tmp3 += tmp1; \ ++ R ^= tmp3; ++#endif ++ ++/* ++ * Encrypt one block, BF_N is hardcoded here. ++ */ ++#define BF_ENCRYPT \ ++ L ^= data.ctx.P[0]; \ ++ BF_ROUND(L, R, 0); \ ++ BF_ROUND(R, L, 1); \ ++ BF_ROUND(L, R, 2); \ ++ BF_ROUND(R, L, 3); \ ++ BF_ROUND(L, R, 4); \ ++ BF_ROUND(R, L, 5); \ ++ BF_ROUND(L, R, 6); \ ++ BF_ROUND(R, L, 7); \ ++ BF_ROUND(L, R, 8); \ ++ BF_ROUND(R, L, 9); \ ++ BF_ROUND(L, R, 10); \ ++ BF_ROUND(R, L, 11); \ ++ BF_ROUND(L, R, 12); \ ++ BF_ROUND(R, L, 13); \ ++ BF_ROUND(L, R, 14); \ ++ BF_ROUND(R, L, 15); \ ++ tmp4 = R; \ ++ R = L; \ ++ L = tmp4 ^ data.ctx.P[BF_N + 1]; ++ ++#if BF_ASM ++#define BF_body() \ ++ _BF_body_r(&data.ctx); ++#else ++#define BF_body() \ ++ L = R = 0; \ ++ ptr = data.ctx.P; \ ++ do { \ ++ ptr += 2; \ ++ BF_ENCRYPT; \ ++ *(ptr - 2) = L; \ ++ *(ptr - 1) = R; \ ++ } while (ptr < &data.ctx.P[BF_N + 2]); \ ++\ ++ ptr = data.ctx.S[0]; \ ++ do { \ ++ ptr += 2; \ ++ BF_ENCRYPT; \ ++ *(ptr - 2) = L; \ ++ *(ptr - 1) = R; \ ++ } while (ptr < &data.ctx.S[3][0xFF]); ++#endif ++ ++static void BF_set_key(__CONST char *key, BF_key expanded, BF_key initial) ++{ ++ __CONST char *ptr = key; ++ int i, j; ++ BF_word tmp; ++ ++ for (i = 0; i < BF_N + 2; i++) { ++ tmp = 0; ++ for (j = 0; j < 4; j++) { ++ tmp <<= 8; ++ tmp |= (unsigned char)*ptr; ++ ++ if (!*ptr) ptr = key; else ptr++; ++ } ++ ++ expanded[i] = tmp; ++ initial[i] = BF_init_state.P[i] ^ tmp; ++ } ++} ++ ++char *_crypt_blowfish_rn(__CONST char *key, __CONST char *setting, ++ char *output, int size) ++{ ++#if BF_ASM ++ extern void _BF_body_r(BF_ctx *ctx); ++#endif ++ struct { ++ BF_ctx ctx; ++ BF_key expanded_key; ++ union { ++ BF_word salt[4]; ++ BF_word output[6]; ++ } binary; ++ } data; ++ BF_word L, R; ++ BF_word tmp1, tmp2, tmp3, tmp4; ++ BF_word *ptr; ++ BF_word count; ++ int i; ++ ++ if (size < 7 + 22 + 31 + 1) { ++ __set_errno(ERANGE); ++ return NULL; ++ } ++ ++ if (setting[0] != '$' || ++ setting[1] != '2' || ++ setting[2] != 'a' || ++ setting[3] != '$' || ++ setting[4] < '0' || setting[4] > '3' || ++ setting[5] < '0' || setting[5] > '9' || ++ setting[6] != '$') { ++ __set_errno(EINVAL); ++ return NULL; ++ } ++ ++ count = (BF_word)1 << ((setting[4] - '0') * 10 + (setting[5] - '0')); ++ if (count < 16 || BF_decode(data.binary.salt, &setting[7], 16)) { ++ clean(data.binary.salt, sizeof(data.binary.salt)); ++ __set_errno(EINVAL); ++ return NULL; ++ } ++ BF_swap(data.binary.salt, 4); ++ ++ BF_set_key(key, data.expanded_key, data.ctx.P); ++ ++ memcpy(data.ctx.S, BF_init_state.S, sizeof(data.ctx.S)); ++ ++ L = R = 0; ++ for (i = 0; i < BF_N + 2; i += 2) { ++ L ^= data.binary.salt[i & 2]; ++ R ^= data.binary.salt[(i & 2) + 1]; ++ BF_ENCRYPT; ++ data.ctx.P[i] = L; ++ data.ctx.P[i + 1] = R; ++ } ++ ++ ptr = data.ctx.S[0]; ++ do { ++ ptr += 4; ++ L ^= data.binary.salt[(BF_N + 2) & 3]; ++ R ^= data.binary.salt[(BF_N + 3) & 3]; ++ BF_ENCRYPT; ++ *(ptr - 4) = L; ++ *(ptr - 3) = R; ++ ++ L ^= data.binary.salt[(BF_N + 4) & 3]; ++ R ^= data.binary.salt[(BF_N + 5) & 3]; ++ BF_ENCRYPT; ++ *(ptr - 2) = L; ++ *(ptr - 1) = R; ++ } while (ptr < &data.ctx.S[3][0xFF]); ++ ++ do { ++ data.ctx.P[0] ^= data.expanded_key[0]; ++ data.ctx.P[1] ^= data.expanded_key[1]; ++ data.ctx.P[2] ^= data.expanded_key[2]; ++ data.ctx.P[3] ^= data.expanded_key[3]; ++ data.ctx.P[4] ^= data.expanded_key[4]; ++ data.ctx.P[5] ^= data.expanded_key[5]; ++ data.ctx.P[6] ^= data.expanded_key[6]; ++ data.ctx.P[7] ^= data.expanded_key[7]; ++ data.ctx.P[8] ^= data.expanded_key[8]; ++ data.ctx.P[9] ^= data.expanded_key[9]; ++ data.ctx.P[10] ^= data.expanded_key[10]; ++ data.ctx.P[11] ^= data.expanded_key[11]; ++ data.ctx.P[12] ^= data.expanded_key[12]; ++ data.ctx.P[13] ^= data.expanded_key[13]; ++ data.ctx.P[14] ^= data.expanded_key[14]; ++ data.ctx.P[15] ^= data.expanded_key[15]; ++ data.ctx.P[16] ^= data.expanded_key[16]; ++ data.ctx.P[17] ^= data.expanded_key[17]; ++ ++ BF_body(); ++ ++ tmp1 = data.binary.salt[0]; ++ tmp2 = data.binary.salt[1]; ++ tmp3 = data.binary.salt[2]; ++ tmp4 = data.binary.salt[3]; ++ data.ctx.P[0] ^= tmp1; ++ data.ctx.P[1] ^= tmp2; ++ data.ctx.P[2] ^= tmp3; ++ data.ctx.P[3] ^= tmp4; ++ data.ctx.P[4] ^= tmp1; ++ data.ctx.P[5] ^= tmp2; ++ data.ctx.P[6] ^= tmp3; ++ data.ctx.P[7] ^= tmp4; ++ data.ctx.P[8] ^= tmp1; ++ data.ctx.P[9] ^= tmp2; ++ data.ctx.P[10] ^= tmp3; ++ data.ctx.P[11] ^= tmp4; ++ data.ctx.P[12] ^= tmp1; ++ data.ctx.P[13] ^= tmp2; ++ data.ctx.P[14] ^= tmp3; ++ data.ctx.P[15] ^= tmp4; ++ data.ctx.P[16] ^= tmp1; ++ data.ctx.P[17] ^= tmp2; ++ ++ BF_body(); ++ } while (--count); ++ ++ for (i = 0; i < 6; i += 2) { ++ L = BF_magic_w[i]; ++ R = BF_magic_w[i + 1]; ++ ++ count = 64; ++ do { ++ BF_ENCRYPT; ++ } while (--count); ++ ++ data.binary.output[i] = L; ++ data.binary.output[i + 1] = R; ++ } ++ ++ memcpy(output, setting, 7 + 22 - 1); ++ output[7 + 22 - 1] = BF_itoa64[(int) ++ BF_atoi64[(int)setting[7 + 22 - 1] - 0x20] & 0x30]; ++ ++/* This has to be bug-compatible with the original implementation, so ++ * only encode 23 of the 24 bytes. :-) */ ++ BF_swap(data.binary.output, 6); ++ BF_encode(&output[7 + 22], data.binary.output, 23); ++ output[7 + 22 + 31] = '\0'; ++ ++/* Overwrite the most obvious sensitive data we have on the stack. Note ++ * that this does not guarantee there's no sensitive data left on the ++ * stack and/or in registers; I'm not aware of portable code that does. */ ++ clean(&data, sizeof(data)); ++ ++ return output; ++} ++ ++char *_crypt_gensalt_blowfish_rn(unsigned long count, ++ __CONST char *input, int size, char *output, int output_size) ++{ ++ if (size < 16 || output_size < 7 + 22 + 1 || ++ (count && (count < 4 || count > 31))) { ++ if (output_size > 0) output[0] = '\0'; ++ __set_errno((output_size < 7 + 22 + 1) ? ERANGE : EINVAL); ++ return NULL; ++ } ++ ++ if (!count) count = 5; ++ ++ output[0] = '$'; ++ output[1] = '2'; ++ output[2] = 'a'; ++ output[3] = '$'; ++ output[4] = '0' + count / 10; ++ output[5] = '0' + count % 10; ++ output[6] = '$'; ++ ++ BF_encode(&output[7], (BF_word *)input, 16); ++ output[7 + 22] = '\0'; ++ ++ return output; ++} +diff -ru -N glibc-2.17-orig/crypt/crypt-entry.c glibc-2.17/crypt/crypt-entry.c +--- glibc-2.17-orig/crypt/crypt-entry.c 2012-12-25 04:02:13.000000000 +0100 ++++ glibc-2.17/crypt/crypt-entry.c 2013-01-22 23:30:12.342353955 +0100 +@@ -61,6 +61,8 @@ + extern char *__sha512_crypt_r (const char *key, const char *salt, + char *buffer, int buflen); + extern char *__sha512_crypt (const char *key, const char *salt); ++extern char *_crypt_blowfish_rn (const char *key, const char *setting, ++ char *output, int size); + + /* Define our magic string to mark salt for MD5 encryption + replacement. This is meant to be the same as for other MD5 based +@@ -73,6 +75,9 @@ + /* Magic string for SHA512 encryption. */ + static const char sha512_salt_prefix[] = "$6$"; + ++/* Magic string for Blowfish encryption. */ ++static const char blowfish_salt_prefix[] = "$2a$"; ++ + /* For use by the old, non-reentrant routines (crypt/encrypt/setkey) */ + extern struct crypt_data _ufc_foobar; + +@@ -113,6 +118,11 @@ + if (strncmp (sha512_salt_prefix, salt, sizeof (sha512_salt_prefix) - 1) == 0) + return __sha512_crypt_r (key, salt, (char *) data, + sizeof (struct crypt_data)); ++ ++ /* Try to find out whether we have to use Blowfish encryption replacement. */ ++ if (strncmp (blowfish_salt_prefix, salt, sizeof (blowfish_salt_prefix) - 1) == 0) ++ return _crypt_blowfish_rn (key, salt, (char *) data, ++ sizeof (struct crypt_data)); + #endif + + /* +diff -ru -N glibc-2.17-orig/crypt/Makefile glibc-2.17/crypt/Makefile +--- glibc-2.17-orig/crypt/Makefile 2012-12-25 04:02:13.000000000 +0100 ++++ glibc-2.17/crypt/Makefile 2013-01-22 23:30:12.341353960 +0100 +@@ -26,7 +26,7 @@ + extra-libs-others := $(extra-libs) + + libcrypt-routines := crypt-entry md5-crypt sha256-crypt sha512-crypt crypt \ +- crypt_util ++ crypt_util crypt_blowfish + + tests := cert md5c-test sha256c-test sha512c-test badsalttest + -- cgit 1.4.1 From 35af62f99899132c2a83cbec9baaf2f012ee8429 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 28 Jan 2013 13:48:35 +0100 Subject: gperftools: Update to 2.0 and fix build http://hydra.nixos.org/build/3875478 --- pkgs/development/interpreters/hiphopvm/default.nix | 4 ++-- .../libraries/google-perftools/default.nix | 14 -------------- pkgs/development/libraries/gperftools/default.nix | 22 ++++++++++++++++++++++ .../libraries/gperftools/glibc-2.16.patch | 13 +++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 38 insertions(+), 17 deletions(-) delete mode 100644 pkgs/development/libraries/google-perftools/default.nix create mode 100644 pkgs/development/libraries/gperftools/default.nix create mode 100644 pkgs/development/libraries/gperftools/glibc-2.16.patch (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/interpreters/hiphopvm/default.nix b/pkgs/development/interpreters/hiphopvm/default.nix index d2cdf06f1385..57e3e93c6466 100644 --- a/pkgs/development/interpreters/hiphopvm/default.nix +++ b/pkgs/development/interpreters/hiphopvm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchgit, cmake, boost, libunwind, mysql, libmemcached, pcre , libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php, re2c -, expat, libcap, oniguruma, libdwarf, libmcrypt, inteltbb, google_perftools +, expat, libcap, oniguruma, libdwarf, libmcrypt, inteltbb, gperftools , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam }: assert stdenv.system == "x86_64-linux"; @@ -45,7 +45,7 @@ stdenv.mkDerivation { buildInputs = [ cmake boost libunwind mysql libmemcached pcre libeventFB gd curlFB libxml2_280 icu flex bison openssl zlib php expat libcap oniguruma - libdwarf libmcrypt inteltbb google_perftools bzip2 openldap readline + libdwarf libmcrypt inteltbb gperftools bzip2 openldap readline libelf uwimap binutils cyrus_sasl pam ]; installPhase = '' diff --git a/pkgs/development/libraries/google-perftools/default.nix b/pkgs/development/libraries/google-perftools/default.nix deleted file mode 100644 index 7935a794a2ff..000000000000 --- a/pkgs/development/libraries/google-perftools/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{stdenv, fetchurl, libunwind}: - -stdenv.mkDerivation rec { - name = "google-perftools-1.8.3"; - src = fetchurl { - url = "http://google-perftools.googlecode.com/files/${name}.tar.gz"; - sha256 = "0ncx3a8jl6n38q9bjnaz5sq96yb6yh99j3bl64k3295v9arl9mva"; - }; - buildInputs = [libunwind]; - meta = { - description = "Fast, multi-threaded malloc() and nifty performance analysis tools."; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix new file mode 100644 index 000000000000..76d1d8c41f75 --- /dev/null +++ b/pkgs/development/libraries/gperftools/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, libunwind }: + +stdenv.mkDerivation rec { + name = "gperftools-2.0"; + + src = fetchurl { + url = "https://gperftools.googlecode.com/files/${name}.tar.gz"; + sha1 = "da7181a7ba9b5ee7302daf6c16e886c179fe8d1b"; + }; + + patches = [ ./glibc-2.16.patch ]; + + buildInputs = [ libunwind ]; + + enableParallelBuilding = true; + + meta = { + homepage = https://code.google.com/p/gperftools/; + description = "Fast, multi-threaded malloc() and nifty performance analysis tools"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gperftools/glibc-2.16.patch b/pkgs/development/libraries/gperftools/glibc-2.16.patch new file mode 100644 index 000000000000..b17e0d57f5fb --- /dev/null +++ b/pkgs/development/libraries/gperftools/glibc-2.16.patch @@ -0,0 +1,13 @@ +Index: gperftools-2.0/src/base/linuxthreads.cc +=================================================================== +--- gperftools-2.0.orig/src/base/linuxthreads.cc ++++ gperftools-2.0/src/base/linuxthreads.cc +@@ -193,7 +193,7 @@ static volatile int *sig_pids, sig_num_t + /* Signal handler to help us recover from dying while we are attached to + * other threads. + */ +-static void SignalHandler(int signum, siginfo_t *si, void *data) { ++static void SignalHandler(int signum, struct siginfo *si, void *data) { + if (sig_pids != NULL) { + if (signum == SIGABRT) { + while (sig_num_threads-- > 0) { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bfab267a2abf..ed7d4fb886e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3807,7 +3807,7 @@ let goocanvas = callPackage ../development/libraries/goocanvas { }; - google_perftools = callPackage ../development/libraries/google-perftools { }; + gperftools = callPackage ../development/libraries/gperftools { }; #GMP ex-satellite, so better keep it near gmp mpfr = callPackage ../development/libraries/mpfr { }; -- cgit 1.4.1 From 84adcc22412c5c2d9fe1177dc5840189c3c41b70 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 28 Jan 2013 14:23:48 +0100 Subject: boost-1.49: Fix build http://hydra.nixos.org/build/3890924 --- pkgs/development/libraries/boost/1.49.nix | 2 +- pkgs/development/libraries/boost/time_utc.patch | 320 ++++++++++++++++++++++++ 2 files changed, 321 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/boost/time_utc.patch (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/boost/1.49.nix b/pkgs/development/libraries/boost/1.49.nix index dfad38b30a5a..e0ba0630cd06 100644 --- a/pkgs/development/libraries/boost/1.49.nix +++ b/pkgs/development/libraries/boost/1.49.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation { }; # See . - patches = [ ./boost_filesystem_post_1_49_0.patch ]; + patches = [ ./boost_filesystem_post_1_49_0.patch ./time_utc.patch ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/boost/time_utc.patch b/pkgs/development/libraries/boost/time_utc.patch new file mode 100644 index 000000000000..3585d0bfc6dd --- /dev/null +++ b/pkgs/development/libraries/boost/time_utc.patch @@ -0,0 +1,320 @@ +From: https://build.opensuse.org/package/view_file?file=boost-time_utc.patch&package=boost&project=Application%3AGeo + +From: https://svn.boost.org/trac/boost/changeset/78802 + +Message: + Thread: fix TIME_UTC, WINVER, constexpr for tags, and don't use local files + +Only the TIME_UTC_ change is taken + +Index: boost_1_49_0/boost/thread/xtime.hpp +=================================================================== +--- boost_1_49_0.orig/boost/thread/xtime.hpp ++++ boost_1_49_0/boost/thread/xtime.hpp +@@ -2,7 +2,7 @@ + // William E. Kempf + // Copyright (C) 2007-8 Anthony Williams + // +-// Distributed under the Boost Software License, Version 1.0. (See accompanying ++// Distributed under the Boost Software License, Version 1.0. (See accompanying + // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) + + #ifndef BOOST_XTIME_WEK070601_HPP +@@ -20,7 +20,7 @@ namespace boost { + + enum xtime_clock_types + { +- TIME_UTC=1 ++ TIME_UTC_=1 + // TIME_TAI, + // TIME_MONOTONIC, + // TIME_PROCESS, +@@ -53,14 +53,14 @@ struct xtime + boost::posix_time::microseconds((nsec+500)/1000); + #endif + } +- ++ + }; + + inline xtime get_xtime(boost::system_time const& abs_time) + { + xtime res; + boost::posix_time::time_duration const time_since_epoch=abs_time-boost::posix_time::from_time_t(0); +- ++ + res.sec=static_cast(time_since_epoch.total_seconds()); + res.nsec=static_cast(time_since_epoch.fractional_seconds()*(1000000000/time_since_epoch.ticks_per_second())); + return res; +@@ -68,7 +68,7 @@ inline xtime get_xtime(boost::system_tim + + inline int xtime_get(struct xtime* xtp, int clock_type) + { +- if (clock_type == TIME_UTC) ++ if (clock_type == TIME_UTC_) + { + *xtp=get_xtime(get_system_time()); + return clock_type; +@@ -81,7 +81,7 @@ inline int xtime_cmp(const xtime& xt1, c + { + if (xt1.sec == xt2.sec) + return (int)(xt1.nsec - xt2.nsec); +- else ++ else + return (xt1.sec > xt2.sec) ? 1 : -1; + } + +Index: boost_1_49_0/libs/thread/example/starvephil.cpp +=================================================================== +--- boost_1_49_0.orig/libs/thread/example/starvephil.cpp ++++ boost_1_49_0/libs/thread/example/starvephil.cpp +@@ -50,7 +50,7 @@ public: + << "very hot ..." << std::endl; + } + boost::xtime xt; +- boost::xtime_get(&xt, boost::TIME_UTC); ++ boost::xtime_get(&xt, boost::TIME_UTC_); + xt.sec += 3; + boost::thread::sleep(xt); + m_chickens += value; +@@ -85,7 +85,7 @@ void chef() + std::cout << "(" << clock() << ") Chef: cooking ..." << std::endl; + } + boost::xtime xt; +- boost::xtime_get(&xt, boost::TIME_UTC); ++ boost::xtime_get(&xt, boost::TIME_UTC_); + xt.sec += 2; + boost::thread::sleep(xt); + { +@@ -111,7 +111,7 @@ struct phil + if (m_id > 0) + { + boost::xtime xt; +- boost::xtime_get(&xt, boost::TIME_UTC); ++ boost::xtime_get(&xt, boost::TIME_UTC_); + xt.sec += 3; + boost::thread::sleep(xt); + } +Index: boost_1_49_0/libs/thread/example/tennis.cpp +=================================================================== +--- boost_1_49_0.orig/libs/thread/example/tennis.cpp ++++ boost_1_49_0/libs/thread/example/tennis.cpp +@@ -1,7 +1,7 @@ + // Copyright (C) 2001-2003 + // William E. Kempf + // +-// Distributed under the Boost Software License, Version 1.0. (See accompanying ++// Distributed under the Boost Software License, Version 1.0. (See accompanying + // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) + + #include +@@ -104,7 +104,7 @@ int main(int argc, char* argv[]) + boost::thread thrdb(thread_adapter(&player, (void*)PLAYER_B)); + + boost::xtime xt; +- boost::xtime_get(&xt, boost::TIME_UTC); ++ boost::xtime_get(&xt, boost::TIME_UTC_); + xt.sec += 1; + boost::thread::sleep(xt); + { +Index: boost_1_49_0/libs/thread/example/thread.cpp +=================================================================== +--- boost_1_49_0.orig/libs/thread/example/thread.cpp ++++ boost_1_49_0/libs/thread/example/thread.cpp +@@ -14,7 +14,7 @@ struct thread_alarm + void operator()() + { + boost::xtime xt; +- boost::xtime_get(&xt, boost::TIME_UTC); ++ boost::xtime_get(&xt, boost::TIME_UTC_); + xt.sec += m_secs; + + boost::thread::sleep(xt); +Index: boost_1_49_0/libs/thread/example/xtime.cpp +=================================================================== +--- boost_1_49_0.orig/libs/thread/example/xtime.cpp ++++ boost_1_49_0/libs/thread/example/xtime.cpp +@@ -10,7 +10,7 @@ + int main(int argc, char* argv[]) + { + boost::xtime xt; +- boost::xtime_get(&xt, boost::TIME_UTC); ++ boost::xtime_get(&xt, boost::TIME_UTC_); + xt.sec += 1; + boost::thread::sleep(xt); // Sleep for 1 second + } +Index: boost_1_49_0/libs/thread/src/pthread/thread.cpp +=================================================================== +--- boost_1_49_0.orig/libs/thread/src/pthread/thread.cpp ++++ boost_1_49_0/libs/thread/src/pthread/thread.cpp +@@ -23,7 +23,7 @@ + #include + #endif + +-#include "timeconv.inl" ++#include + + namespace boost + { +@@ -354,7 +354,7 @@ namespace boost + cond.timed_wait(lock, xt); + # endif + xtime cur; +- xtime_get(&cur, TIME_UTC); ++ xtime_get(&cur, TIME_UTC_); + if (xtime_cmp(xt, cur) <= 0) + return; + } +@@ -369,7 +369,7 @@ namespace boost + BOOST_VERIFY(!pthread_yield()); + # else + xtime xt; +- xtime_get(&xt, TIME_UTC); ++ xtime_get(&xt, TIME_UTC_); + sleep(xt); + # endif + } +Index: boost_1_49_0/libs/thread/src/pthread/timeconv.inl +=================================================================== +--- boost_1_49_0.orig/libs/thread/src/pthread/timeconv.inl ++++ boost_1_49_0/libs/thread/src/pthread/timeconv.inl +@@ -20,8 +20,8 @@ const int NANOSECONDS_PER_MICROSECOND = + inline void to_time(int milliseconds, boost::xtime& xt) + { + int res = 0; +- res = boost::xtime_get(&xt, boost::TIME_UTC); +- BOOST_ASSERT(res == boost::TIME_UTC); (void)res; ++ res = boost::xtime_get(&xt, boost::TIME_UTC_); ++ BOOST_ASSERT(res == boost::TIME_UTC_); (void)res; + + xt.sec += (milliseconds / MILLISECONDS_PER_SECOND); + xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) * +@@ -56,8 +56,8 @@ inline void to_timespec_duration(const b + { + boost::xtime cur; + int res = 0; +- res = boost::xtime_get(&cur, boost::TIME_UTC); +- BOOST_ASSERT(res == boost::TIME_UTC); (void)res; ++ res = boost::xtime_get(&cur, boost::TIME_UTC_); ++ BOOST_ASSERT(res == boost::TIME_UTC_); (void)res; + + if (boost::xtime_cmp(xt, cur) <= 0) + { +@@ -87,8 +87,8 @@ inline void to_duration(boost::xtime xt, + { + boost::xtime cur; + int res = 0; +- res = boost::xtime_get(&cur, boost::TIME_UTC); +- BOOST_ASSERT(res == boost::TIME_UTC); (void)res; ++ res = boost::xtime_get(&cur, boost::TIME_UTC_); ++ BOOST_ASSERT(res == boost::TIME_UTC_); (void)res; + + if (boost::xtime_cmp(xt, cur) <= 0) + milliseconds = 0; +@@ -109,8 +109,8 @@ inline void to_microduration(boost::xtim + { + boost::xtime cur; + int res = 0; +- res = boost::xtime_get(&cur, boost::TIME_UTC); +- BOOST_ASSERT(res == boost::TIME_UTC); (void)res; ++ res = boost::xtime_get(&cur, boost::TIME_UTC_); ++ BOOST_ASSERT(res == boost::TIME_UTC_); (void)res; + + if (boost::xtime_cmp(xt, cur) <= 0) + microseconds = 0; +Index: boost_1_49_0/libs/thread/src/win32/timeconv.inl +=================================================================== +--- boost_1_49_0.orig/libs/thread/src/win32/timeconv.inl ++++ boost_1_49_0/libs/thread/src/win32/timeconv.inl +@@ -17,8 +17,8 @@ const int NANOSECONDS_PER_MICROSECOND = + inline void to_time(int milliseconds, boost::xtime& xt) + { + int res = 0; +- res = boost::xtime_get(&xt, boost::TIME_UTC); +- assert(res == boost::TIME_UTC); ++ res = boost::xtime_get(&xt, boost::TIME_UTC_); ++ assert(res == boost::TIME_UTC_); + + xt.sec += (milliseconds / MILLISECONDS_PER_SECOND); + xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) * +@@ -54,8 +54,8 @@ inline void to_timespec_duration(const b + { + boost::xtime cur; + int res = 0; +- res = boost::xtime_get(&cur, boost::TIME_UTC); +- assert(res == boost::TIME_UTC); ++ res = boost::xtime_get(&cur, boost::TIME_UTC_); ++ assert(res == boost::TIME_UTC_); + + if (boost::xtime_cmp(xt, cur) <= 0) + { +@@ -85,8 +85,8 @@ inline void to_duration(boost::xtime xt, + { + boost::xtime cur; + int res = 0; +- res = boost::xtime_get(&cur, boost::TIME_UTC); +- assert(res == boost::TIME_UTC); ++ res = boost::xtime_get(&cur, boost::TIME_UTC_); ++ assert(res == boost::TIME_UTC_); + + if (boost::xtime_cmp(xt, cur) <= 0) + milliseconds = 0; +@@ -107,8 +107,8 @@ inline void to_microduration(boost::xtim + { + boost::xtime cur; + int res = 0; +- res = boost::xtime_get(&cur, boost::TIME_UTC); +- assert(res == boost::TIME_UTC); ++ res = boost::xtime_get(&cur, boost::TIME_UTC_); ++ assert(res == boost::TIME_UTC_); + + if (boost::xtime_cmp(xt, cur) <= 0) + microseconds = 0; +Index: boost_1_49_0/libs/thread/test/test_xtime.cpp +=================================================================== +--- boost_1_49_0.orig/libs/thread/test/test_xtime.cpp ++++ boost_1_49_0/libs/thread/test/test_xtime.cpp +@@ -17,8 +17,8 @@ void test_xtime_cmp() + { + boost::xtime xt1, xt2, cur; + BOOST_CHECK_EQUAL( +- boost::xtime_get(&cur, boost::TIME_UTC), +- static_cast(boost::TIME_UTC)); ++ boost::xtime_get(&cur, boost::TIME_UTC_), ++ static_cast(boost::TIME_UTC_)); + + xt1 = xt2 = cur; + xt1.nsec -= 1; +@@ -42,14 +42,14 @@ void test_xtime_get() + boost::xtime orig, cur, old; + BOOST_CHECK_EQUAL( + boost::xtime_get(&orig, +- boost::TIME_UTC), static_cast(boost::TIME_UTC)); ++ boost::TIME_UTC_), static_cast(boost::TIME_UTC_)); + old = orig; + + for (int x=0; x < 100; ++x) + { + BOOST_CHECK_EQUAL( +- boost::xtime_get(&cur, boost::TIME_UTC), +- static_cast(boost::TIME_UTC)); ++ boost::xtime_get(&cur, boost::TIME_UTC_), ++ static_cast(boost::TIME_UTC_)); + BOOST_CHECK(boost::xtime_cmp(cur, orig) >= 0); + BOOST_CHECK(boost::xtime_cmp(cur, old) >= 0); + old = cur; +Index: boost_1_49_0/libs/thread/test/util.inl +=================================================================== +--- boost_1_49_0.orig/libs/thread/test/util.inl ++++ boost_1_49_0/libs/thread/test/util.inl +@@ -28,8 +28,8 @@ inline boost::xtime delay(int secs, int + const int NANOSECONDS_PER_MILLISECOND = 1000000; + + boost::xtime xt; +- if (boost::TIME_UTC != boost::xtime_get (&xt, boost::TIME_UTC)) +- BOOST_ERROR ("boost::xtime_get != boost::TIME_UTC"); ++ if (boost::TIME_UTC_ != boost::xtime_get (&xt, boost::TIME_UTC_)) ++ BOOST_ERROR ("boost::xtime_get != boost::TIME_UTC_"); + + nsecs += xt.nsec; + msecs += nsecs / NANOSECONDS_PER_MILLISECOND; -- cgit 1.4.1 From f6e012591f501abd5938258cddbcd55e4274293b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 28 Jan 2013 14:34:14 +0100 Subject: Rename boost => boost-headers Suffixes like "-headers" should go *before* the version part; otherwise nix-env will think boost and boost-*-headers are the same package. --- pkgs/development/libraries/boost/1.49-headers.nix | 2 +- pkgs/development/libraries/boost/1.51-headers.nix | 2 +- pkgs/development/libraries/boost/1.52-headers.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/boost/1.49-headers.nix b/pkgs/development/libraries/boost/1.49-headers.nix index 58c0c19a17bc..afb094a3cad5 100644 --- a/pkgs/development/libraries/boost/1.49-headers.nix +++ b/pkgs/development/libraries/boost/1.49-headers.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "boost-1.49.0-headers"; + name = "boost-headers-1.49.0"; src = fetchurl { url = "mirror://sourceforge/boost/boost_1_49_0.tar.bz2"; diff --git a/pkgs/development/libraries/boost/1.51-headers.nix b/pkgs/development/libraries/boost/1.51-headers.nix index 4b1c1f80c541..6004eb799c01 100644 --- a/pkgs/development/libraries/boost/1.51-headers.nix +++ b/pkgs/development/libraries/boost/1.51-headers.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "boost-1.51.0-headers"; + name = "boost-headers-1.51.0"; src = fetchurl { url = "mirror://sourceforge/boost/boost_1_51_0.tar.bz2"; diff --git a/pkgs/development/libraries/boost/1.52-headers.nix b/pkgs/development/libraries/boost/1.52-headers.nix index 72a4b419f2d5..b9e594cf5f91 100644 --- a/pkgs/development/libraries/boost/1.52-headers.nix +++ b/pkgs/development/libraries/boost/1.52-headers.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "boost-1.52.0-headers"; + name = "boost-headers-1.52.0"; src = fetchurl { url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2"; -- cgit 1.4.1 From 1b7c5d37174b79a37568093a5ca813a3bc432367 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 28 Jan 2013 14:39:42 +0100 Subject: Remove some unused Boost versions --- pkgs/development/libraries/boost/1.46.nix | 80 --------------------- pkgs/development/libraries/boost/1.51-headers.nix | 26 ------- pkgs/development/libraries/boost/1.51.nix | 86 ----------------------- pkgs/top-level/all-packages.nix | 3 - pkgs/top-level/release-python.nix | 2 - 5 files changed, 197 deletions(-) delete mode 100644 pkgs/development/libraries/boost/1.46.nix delete mode 100644 pkgs/development/libraries/boost/1.51-headers.nix delete mode 100644 pkgs/development/libraries/boost/1.51.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/boost/1.46.nix b/pkgs/development/libraries/boost/1.46.nix deleted file mode 100644 index 54a9d8d6c566..000000000000 --- a/pkgs/development/libraries/boost/1.46.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ stdenv, fetchurl, icu, expat, zlib, bzip2, python -, enableRelease ? true -, enableDebug ? false -, enableSingleThreaded ? false -, enableMultiThreaded ? true -, enableShared ? true -, enableStatic ? false -, enablePIC ? false -}: - -let - - variant = stdenv.lib.concatStringsSep "," - (stdenv.lib.optional enableRelease "release" ++ - stdenv.lib.optional enableDebug "debug"); - - threading = stdenv.lib.concatStringsSep "," - (stdenv.lib.optional enableSingleThreaded "single" ++ - stdenv.lib.optional enableMultiThreaded "multi"); - - link = stdenv.lib.concatStringsSep "," - (stdenv.lib.optional enableShared "shared" ++ - stdenv.lib.optional enableStatic "static"); - - # To avoid library name collisions - finalLayout = if ((enableRelease && enableDebug) || - (enableSingleThreaded && enableMultiThreaded) || - (enableShared && enableStatic)) then - "tagged" else "system"; - - cflags = if enablePIC then "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" else ""; - -in - -stdenv.mkDerivation { - name = "boost-1.46.0"; - - meta = { - homepage = "http://boost.org/"; - description = "Boost C++ Library Collection"; - license = "boost-license"; - - maintainers = [ stdenv.lib.maintainers.simons ]; - }; - - src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_46_0.tar.bz2"; - sha256 = "0ndsiv06332gbh6wj68pcnci3l5qrc5pm1ca9dkmxhpxj83zd41g"; - }; - - enableParallelBuilding = true; - - buildInputs = [icu expat zlib bzip2 python]; - - configureScript = "./bootstrap.sh"; - configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python"; - - buildPhase = "./bjam -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} ${cflags} install"; - - installPhase = ":"; - - crossAttrs = rec { - buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ]; - # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to - # override them. - propagatedBuildInputs = buildInputs; - # We want to substitute the contents of configureFlags, removing thus the - # usual --build and --host added on cross building. - preConfigure = '' - export configureFlags="--prefix=$out --without-icu" - ''; - buildPhase = '' - set -x - cat << EOF > user-config.jam - using gcc : cross : $crossConfig-g++ ; - EOF - ./bjam -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.crossDrv}/include -sEXPAT_LIBPATH=${expat.crossDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install - ''; - }; -} diff --git a/pkgs/development/libraries/boost/1.51-headers.nix b/pkgs/development/libraries/boost/1.51-headers.nix deleted file mode 100644 index 6004eb799c01..000000000000 --- a/pkgs/development/libraries/boost/1.51-headers.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "boost-headers-1.51.0"; - - src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_51_0.tar.bz2"; - sha256 = "fb2d2335a29ee7fe040a197292bfce982af84a645c81688a915c84c925b69696"; - }; - - phases = [ "installPhase" ]; - - installPhase = '' - mkdir -p $out/include - tar xf $src -C $out/include --strip-components=1 ./boost_1_51_0/boost - ''; - - meta = { - homepage = "http://boost.org/"; - description = "Boost C++ Library Collection"; - license = "boost-license"; - - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.viric stdenv.lib.maintainers.simons ]; - }; -} diff --git a/pkgs/development/libraries/boost/1.51.nix b/pkgs/development/libraries/boost/1.51.nix deleted file mode 100644 index d5e5c5f931d5..000000000000 --- a/pkgs/development/libraries/boost/1.51.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ stdenv, fetchurl, icu, expat, zlib, bzip2, python -, enableRelease ? true -, enableDebug ? false -, enableSingleThreaded ? false -, enableMultiThreaded ? true -, enableShared ? true -, enableStatic ? false -, enablePIC ? false -, enableExceptions ? false -, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) -}: - -let - - variant = stdenv.lib.concatStringsSep "," - (stdenv.lib.optional enableRelease "release" ++ - stdenv.lib.optional enableDebug "debug"); - - threading = stdenv.lib.concatStringsSep "," - (stdenv.lib.optional enableSingleThreaded "single" ++ - stdenv.lib.optional enableMultiThreaded "multi"); - - link = stdenv.lib.concatStringsSep "," - (stdenv.lib.optional enableShared "shared" ++ - stdenv.lib.optional enableStatic "static"); - - # To avoid library name collisions - layout = if taggedLayout then "tagged" else "system"; - - cflags = if enablePIC && enableExceptions then - "cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC" - else if enablePIC then - "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" - else if enableExceptions then - "cflags=-fexceptions" - else - ""; -in - -stdenv.mkDerivation { - name = "boost-1.51.0"; - - meta = { - homepage = "http://boost.org/"; - description = "Boost C++ Library Collection"; - license = "boost-license"; - - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.simons ]; - }; - - src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_51_0.tar.bz2"; - sha256 = "fb2d2335a29ee7fe040a197292bfce982af84a645c81688a915c84c925b69696"; - }; - - enableParallelBuilding = true; - - buildInputs = [icu expat zlib bzip2 python]; - - configureScript = "./bootstrap.sh"; - configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python"; - - buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install"; - - installPhase = ":"; - - crossAttrs = rec { - buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ]; - # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to - # override them. - propagatedBuildInputs = buildInputs; - # We want to substitute the contents of configureFlags, removing thus the - # usual --build and --host added on cross building. - preConfigure = '' - export configureFlags="--prefix=$out --without-icu" - ''; - buildPhase = '' - set -x - cat << EOF > user-config.jam - using gcc : cross : $crossConfig-g++ ; - EOF - ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.crossDrv}/include -sEXPAT_LIBPATH=${expat.crossDrv}/lib --layout=${layout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install - ''; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed7d4fb886e2..0a25c22e8679 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3408,15 +3408,12 @@ let boolstuff = callPackage ../development/libraries/boolstuff { }; boost144 = callPackage ../development/libraries/boost/1.44.nix { }; - boost146 = callPackage ../development/libraries/boost/1.46.nix { }; boost147 = callPackage ../development/libraries/boost/1.47.nix { }; boost149 = callPackage ../development/libraries/boost/1.49.nix { }; - boost151 = callPackage ../development/libraries/boost/1.51.nix { }; boost152 = callPackage ../development/libraries/boost/1.52.nix { }; boost = boost152; boostHeaders149 = callPackage ../development/libraries/boost/1.49-headers.nix { }; - boostHeaders151 = callPackage ../development/libraries/boost/1.51-headers.nix { }; boostHeaders152 = callPackage ../development/libraries/boost/1.52-headers.nix { }; boostHeaders = boostHeaders152; diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index e21b4fa59643..2f5b9bffc336 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -116,9 +116,7 @@ in boost = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; boost144 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; boost146 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - boost147 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; boost149 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - boost151 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; botan = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; box2d = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; box2d_2_0_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; -- cgit 1.4.1 From 5200c92aa0219b5c8fff31f82488a37e865782f7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 28 Jan 2013 15:56:41 +0100 Subject: libxcrypt: Remove --- pkgs/development/libraries/libxcrypt/default.nix | 17 ----------------- pkgs/development/libraries/libxcrypt/gcc46.patch | 18 ------------------ pkgs/os-specific/linux/pam/default.nix | 8 ++------ pkgs/top-level/all-packages.nix | 6 +----- 4 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 pkgs/development/libraries/libxcrypt/default.nix delete mode 100644 pkgs/development/libraries/libxcrypt/gcc46.patch (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/libxcrypt/default.nix b/pkgs/development/libraries/libxcrypt/default.nix deleted file mode 100644 index 536d30992bbd..000000000000 --- a/pkgs/development/libraries/libxcrypt/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{stdenv, fetchurl}: - -# I could not build it in armv5tel-linux or the fuloon2f -assert !stdenv.isArm; -assert stdenv.system != "mips64el-linux"; - -stdenv.mkDerivation { - name = "libxcrypt-3.0.2"; - - src = fetchurl { - url = ftp://ftp.suse.com/pub/people/kukuk/libxcrypt/libxcrypt-3.0.2.tar.bz2; - sha256 = "15l2xvhi3r3b40x4665c101ikylh5xsbpw03gnszypfjgn1jkcii"; - }; - - patches = [ ./gcc46.patch ]; - -} diff --git a/pkgs/development/libraries/libxcrypt/gcc46.patch b/pkgs/development/libraries/libxcrypt/gcc46.patch deleted file mode 100644 index 0664f96aa688..000000000000 --- a/pkgs/development/libraries/libxcrypt/gcc46.patch +++ /dev/null @@ -1,18 +0,0 @@ -For gcc 4.6 to build this. Otherwise it says 's unused variable', and it's built -with -Werror. - -diff --git a/src/cert.c b/src/cert.c -index 28c7b11..34570a4 100644 ---- a/src/cert.c -+++ b/src/cert.c -@@ -87,9 +87,7 @@ char *cp; - int i,j,t; - - for(i=0;i<8;i++){ -- int s; -- -- s = scanf("%2x",&t); -+ scanf("%2x",&t); - if(feof(stdin)) - good_bye(); - for(j=0; j<8 ; j++) { diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 112c82d1ea08..43300425c004 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, cracklib, libxcrypt }: +{ stdenv, fetchurl, flex, cracklib }: stdenv.mkDerivation rec { name = "linux-pam-1.1.6"; @@ -10,13 +10,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ flex ]; - buildInputs = [ cracklib ] - ++ stdenv.lib.optional - (!stdenv.isArm && stdenv.system != "mips64el-linux") - libxcrypt; + buildInputs = [ cracklib ]; crossAttrs = { - # Skip libxcrypt cross-building, as it fails for mips and arm propagatedBuildInputs = [ flex.crossDrv cracklib.crossDrv ]; preConfigure = preConfigure + '' ar x ${flex.crossDrv}/lib/libfl.a diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e35707ba5ac..b4c88597b8b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4474,8 +4474,6 @@ let libx86 = builderDefsPackage ../development/libraries/libx86 {}; - libxcrypt = callPackage ../development/libraries/libxcrypt { }; - libxdg_basedir = callPackage ../development/libraries/libxdg-basedir { }; libxklavier = callPackage ../development/libraries/libxklavier { }; @@ -6166,9 +6164,7 @@ let nss_ldap = callPackage ../os-specific/linux/nss_ldap { }; - pam = callPackage ../os-specific/linux/pam { - libxcrypt = null; - }; + pam = callPackage ../os-specific/linux/pam { }; # pam_bioapi ( see http://www.thinkwiki.org/wiki/How_to_enable_the_fingerprint_reader ) -- cgit 1.4.1 From 163c1d3acfe68fd4b1879bdb1507d0227b1dbc2b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 28 Jan 2013 17:43:05 +0100 Subject: gst-plugins-good: Fix build http://hydra.nixos.org/build/3891290 --- .../libraries/gstreamer/gst-plugins-good/default.nix | 6 ++++-- .../libraries/gstreamer/gst-plugins-good/v4l.patch | 11 +++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/gstreamer/gst-plugins-good/v4l.patch (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix index 4298a88f65e8..85468b309c55 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix @@ -5,16 +5,18 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-good-0.10.30"; + name = "gst-plugins-good-0.10.31"; src = fetchurl { urls = [ "${meta.homepage}/src/gst-plugins-good/${name}.tar.bz2" "mirror://gentoo/distfiles/${name}.tar.bz2" ]; - sha256 = "1xlmw211fcn60y2m5gxrryb3knqril4kk2c01b6j713xna8blb5i"; + sha256 = "1ijswgcrdp243mfsyza31fpzq6plz40p4b83vkr2x4x7807889vy"; }; + patches = [ ./v4l.patch ]; + configureFlags = "--disable-oss"; buildInputs = diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/v4l.patch b/pkgs/development/libraries/gstreamer/gst-plugins-good/v4l.patch new file mode 100644 index 000000000000..22cff574134f --- /dev/null +++ b/pkgs/development/libraries/gstreamer/gst-plugins-good/v4l.patch @@ -0,0 +1,11 @@ +diff -ru -x '*~' gst-plugins-good-0.10.31-orig/sys/v4l2/gstv4l2bufferpool.c gst-plugins-good-0.10.31/sys/v4l2/gstv4l2bufferpool.c +--- gst-plugins-good-0.10.31-orig/sys/v4l2/gstv4l2bufferpool.c 2011-12-30 14:59:13.000000000 +0100 ++++ gst-plugins-good-0.10.31/sys/v4l2/gstv4l2bufferpool.c 2013-01-28 17:41:25.549523708 +0100 +@@ -181,7 +181,6 @@ + GST_LOG_OBJECT (pool->v4l2elem, " MMAP offset: %u", + ret->vbuffer.m.offset); + GST_LOG_OBJECT (pool->v4l2elem, " length: %u", ret->vbuffer.length); +- GST_LOG_OBJECT (pool->v4l2elem, " input: %u", ret->vbuffer.input); + + data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length, + PROT_READ | PROT_WRITE, MAP_SHARED, pool->video_fd, -- cgit 1.4.1 From e259e52a7dab1cd71ddc47496cf612ac102123c3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:53:57 +0100 Subject: openssl: update to version 1.0.1e --- pkgs/development/libraries/openssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 1e4b7d2e0091..640b99df5473 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -2,7 +2,7 @@ , withCryptodev ? false, cryptodevHeaders }: let - name = "openssl-1.0.1c"; + name = "openssl-1.0.1e"; opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] (throw "openssl needs its platform name cross building" null) @@ -41,7 +41,7 @@ stdenv.mkDerivation { "http://www.openssl.org/source/${name}.tar.gz" "http://openssl.linux-mirror.org/source/${name}.tar.gz" ]; - sha256 = "1gjy6a7d8nszi9wq8jdzx3cffn0nss23h3cw2ywlw4cb9v6v77ia"; + sha256 = "1qqskk39jh85fvdn3ycmdqjdf67c0b97dwmmbcysl4gzr3l1akzp"; }; patches = patchesCross false; -- cgit 1.4.1 From 499451850110a54648ed12d3b790ebc23664c815 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 12:01:49 +0100 Subject: gmp: update to version 5.1.1 --- pkgs/development/libraries/gmp/5.1.0.nix | 55 -------------------------------- pkgs/development/libraries/gmp/5.1.1.nix | 54 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 55 insertions(+), 56 deletions(-) delete mode 100644 pkgs/development/libraries/gmp/5.1.0.nix create mode 100644 pkgs/development/libraries/gmp/5.1.1.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/gmp/5.1.0.nix b/pkgs/development/libraries/gmp/5.1.0.nix deleted file mode 100644 index 270788198f6d..000000000000 --- a/pkgs/development/libraries/gmp/5.1.0.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv, fetchurl, m4, cxx ? true }: - -stdenv.mkDerivation rec { - name = "gmp-5.1.0"; - - src = fetchurl { - urls = [ "mirror://gnu/gmp/${name}.tar.bz2" "ftp://ftp.gmplib.org/pub/${name}/${name}.tar.bz2" ]; - sha256 = "15n7xxgasbxdch8ii8z9ic6fxc2ysk3q8iavf55abjp5iylspnfz"; - }; - - nativeBuildInputs = [ m4 ]; - - configureFlags = - # Build a "fat binary", with routines for several sub-architectures - # (x86), except on Solaris where some tests crash with "Memory fault". - # See , for instance. - (stdenv.lib.optional (!stdenv.isSunOS) "--enable-fat") - ++ (if cxx then [ "--enable-cxx" ] else [ "--disable-cxx" ]); - - doCheck = true; - - enableParallelBuilding = true; - - meta = { - description = "GMP, the GNU multiple precision arithmetic library"; - - longDescription = - '' GMP is a free library for arbitrary precision arithmetic, operating - on signed integers, rational numbers, and floating point numbers. - There is no practical limit to the precision except the ones implied - by the available memory in the machine GMP runs on. GMP has a rich - set of functions, and the functions have a regular interface. - - The main target applications for GMP are cryptography applications - and research, Internet security applications, algebra systems, - computational algebra research, etc. - - GMP is carefully designed to be as fast as possible, both for small - operands and for huge operands. The speed is achieved by using - fullwords as the basic arithmetic type, by using fast algorithms, - with highly optimised assembly code for the most common inner loops - for a lot of CPUs, and by a general emphasis on speed. - - GMP is faster than any other bignum library. The advantage for GMP - increases with the operand sizes for many operations, since GMP uses - asymptotically faster algorithms. - ''; - - homepage = http://gmplib.org/; - license = "LGPLv3+"; - - maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ]; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/gmp/5.1.1.nix b/pkgs/development/libraries/gmp/5.1.1.nix new file mode 100644 index 000000000000..0261f833962e --- /dev/null +++ b/pkgs/development/libraries/gmp/5.1.1.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchurl, m4, cxx ? true }: + +stdenv.mkDerivation rec { + name = "gmp-5.1.1"; + + src = fetchurl { + urls = [ "mirror://gnu/gmp/${name}.tar.bz2" "ftp://ftp.gmplib.org/pub/${name}/${name}.tar.bz2" ]; + sha256 = "1bdgf04k2i12pfivxgjq68iarz3ngix9hpzbmkgijrdk92gpgm50"; + }; + + nativeBuildInputs = [ m4 ]; + + configureFlags = + # Build a "fat binary", with routines for several sub-architectures + # (x86), except on Solaris where some tests crash with "Memory fault". + # See , for instance. + (stdenv.lib.optional (!stdenv.isSunOS) "--enable-fat") + ++ (if cxx then [ "--enable-cxx" ] else [ "--disable-cxx" ]); + + doCheck = true; + + enableParallelBuilding = true; + + meta = { + homepage = "http://gmplib.org/"; + description = "GMP, the GNU multiple precision arithmetic library"; + license = stdenv.lib.licenses.gpl3Plus; + + longDescription = + '' GMP is a free library for arbitrary precision arithmetic, operating + on signed integers, rational numbers, and floating point numbers. + There is no practical limit to the precision except the ones implied + by the available memory in the machine GMP runs on. GMP has a rich + set of functions, and the functions have a regular interface. + + The main target applications for GMP are cryptography applications + and research, Internet security applications, algebra systems, + computational algebra research, etc. + + GMP is carefully designed to be as fast as possible, both for small + operands and for huge operands. The speed is achieved by using + fullwords as the basic arithmetic type, by using fast algorithms, + with highly optimised assembly code for the most common inner loops + for a lot of CPUs, and by a general emphasis on speed. + + GMP is faster than any other bignum library. The advantage for GMP + increases with the operand sizes for many operations, since GMP uses + asymptotically faster algorithms. + ''; + + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25f9c521fee2..841b3fe337d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3765,7 +3765,7 @@ let gmp5 = callPackage ../development/libraries/gmp/5.0.5.nix { }; - gmp51 = callPackage ../development/libraries/gmp/5.1.0.nix { }; + gmp51 = callPackage ../development/libraries/gmp/5.1.1.nix { }; gobjectIntrospection = callPackage ../development/libraries/gobject-introspection { }; -- cgit 1.4.1 From b6c71e6eb3ddd36073516de29c571efab6914613 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 19 Feb 2013 13:26:49 +0100 Subject: libvirt: Update to 1.0.2 http://hydra.nixos.org/build/4127697 --- pkgs/development/libraries/libvirt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index de6ef510e16d..ce714fd59ffc 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -3,14 +3,14 @@ , libtasn1, ebtables, libgcrypt, yajl }: -let version = "0.9.11"; in +let version = "1.0.2"; in stdenv.mkDerivation { name = "libvirt-${version}"; src = fetchurl { url = "http://libvirt.org/sources/libvirt-${version}.tar.gz"; - sha256 = "0qk0fsc5rxwwjp7801vdanmw61p89xqiy6q279i0kqc3bx1zx66f"; + sha256 = "0yf104r1377pg0kmx6sshmh8v5z0bdvv6266y5gbcn46yx92g34v"; }; buildInputs = -- cgit 1.4.1 From 0cddd5787f834fab1dda943cf47d2f129c4d8499 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Tue, 19 Feb 2013 17:08:31 +0100 Subject: gtk2: bugfix update --- pkgs/development/libraries/gtk+/2.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index f35031fa071d..18f36563f17b 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -8,11 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; stdenv.mkDerivation rec { - name = "gtk+-2.24.15"; + name = "gtk+-2.24.16"; src = fetchurl { url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz"; - sha256 = "06vpryqaz6q4kganfj34cf3h1dhg7fvm5zj1hk44iakbmvbcdqfp"; + sha256 = "1lq2jdpxy2diczlplllclhl6jakm4i5ay35566ma7ygc5k66kkck"; }; enableParallelBuilding = true; -- cgit 1.4.1 From e979d7ad2f6fb2e5e7235be3100eb369572fcba5 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Thu, 21 Feb 2013 12:16:51 +0100 Subject: vlada/xfce MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Major Xfce refactoring, also adding versions 4.10.* Signed-off-by: Vladimír Čunát --- pkgs/build-support/fetchurl/mirrors.nix | 14 ++ pkgs/desktops/xfce-4.8/applications/gigolo.nix | 22 ---- pkgs/desktops/xfce-4.8/applications/mousepad.nix | 20 --- pkgs/desktops/xfce-4.8/applications/ristretto.nix | 24 ---- pkgs/desktops/xfce-4.8/applications/terminal.nix | 25 ---- .../desktops/xfce-4.8/applications/xfce4-mixer.nix | 40 ------ .../xfce-4.8/applications/xfce4-notifyd.nix | 18 --- .../xfce-4.8/applications/xfce4-power-manager.nix | 24 ---- .../xfce-4.8/applications/xfce4-taskmanager.nix | 18 --- pkgs/desktops/xfce-4.8/art/xfce4-icon-theme.nix | 19 --- pkgs/desktops/xfce-4.8/core/exo.nix | 19 --- pkgs/desktops/xfce-4.8/core/garcon.nix | 18 --- pkgs/desktops/xfce-4.8/core/gtk-xfce-engine.nix | 21 --- pkgs/desktops/xfce-4.8/core/libxfce4ui.nix | 24 ---- pkgs/desktops/xfce-4.8/core/libxfce4util.nix | 18 --- pkgs/desktops/xfce-4.8/core/libxfcegui4.nix | 31 ----- pkgs/desktops/xfce-4.8/core/thunar-volman.nix | 26 ---- pkgs/desktops/xfce-4.8/core/thunar.nix | 27 ---- pkgs/desktops/xfce-4.8/core/xfce-utils.nix | 22 ---- pkgs/desktops/xfce-4.8/core/xfce4-appfinder.nix | 24 ---- .../xfce-4.8/core/xfce4-panel-datadir.patch | 24 ---- pkgs/desktops/xfce-4.8/core/xfce4-panel.nix | 29 ----- pkgs/desktops/xfce-4.8/core/xfce4-session.nix | 24 ---- pkgs/desktops/xfce-4.8/core/xfce4-settings.nix | 26 ---- pkgs/desktops/xfce-4.8/core/xfconf.nix | 20 --- pkgs/desktops/xfce-4.8/core/xfdesktop.nix | 26 ---- pkgs/desktops/xfce-4.8/core/xfwm4.nix | 27 ---- pkgs/desktops/xfce-4.8/default.nix | 94 -------------- .../panel-plugins/xfce4-cpufreq-plugin.nix | 18 --- .../panel-plugins/xfce4-systemload-plugin.nix | 18 --- pkgs/desktops/xfce-4.8/support/gvfs.nix | 22 ---- pkgs/desktops/xfce-4.8/support/libgdu-only.patch | 144 --------------------- pkgs/desktops/xfce-4.8/support/libgdu.nix | 34 ----- pkgs/desktops/xfce/applications/gigolo.nix | 25 ++++ pkgs/desktops/xfce/applications/mousepad.nix | 25 ++++ pkgs/desktops/xfce/applications/ristretto.nix | 28 ++++ pkgs/desktops/xfce/applications/terminal.nix | 23 ++++ pkgs/desktops/xfce/applications/xfce4-mixer.nix | 42 ++++++ pkgs/desktops/xfce/applications/xfce4-notifyd.nix | 28 ++++ .../xfce/applications/xfce4-taskmanager.nix | 21 +++ pkgs/desktops/xfce/art/xfce4-icon-theme.nix | 22 ++++ pkgs/desktops/xfce/core/exo.nix | 23 ++++ pkgs/desktops/xfce/core/garcon.nix | 21 +++ pkgs/desktops/xfce/core/gtk-xfce-engine.nix | 24 ++++ pkgs/desktops/xfce/core/libxfce4ui.nix | 34 +++++ pkgs/desktops/xfce/core/libxfce4util.nix | 21 +++ pkgs/desktops/xfce/core/libxfcegui4.nix | 35 +++++ pkgs/desktops/xfce/core/thunar-volman.nix | 30 +++++ pkgs/desktops/xfce/core/thunar.nix | 35 +++++ pkgs/desktops/xfce/core/tumbler.nix | 21 +++ pkgs/desktops/xfce/core/xfce-utils.nix | 20 +++ pkgs/desktops/xfce/core/xfce4-appfinder.nix | 27 ++++ pkgs/desktops/xfce/core/xfce4-panel-datadir.patch | 24 ++++ pkgs/desktops/xfce/core/xfce4-panel.nix | 35 +++++ pkgs/desktops/xfce/core/xfce4-power-manager.nix | 28 ++++ pkgs/desktops/xfce/core/xfce4-session.nix | 33 +++++ pkgs/desktops/xfce/core/xfce4-settings.nix | 31 +++++ pkgs/desktops/xfce/core/xfconf.nix | 23 ++++ pkgs/desktops/xfce/core/xfdesktop.nix | 30 +++++ pkgs/desktops/xfce/core/xfwm4.nix | 31 +++++ pkgs/desktops/xfce/default.nix | 71 ++++++++++ .../xfce/panel-plugins/xfce4-cpufreq-plugin.nix | 22 ++++ .../xfce/panel-plugins/xfce4-systemload-plugin.nix | 21 +++ pkgs/desktops/xfce/support/gvfs.nix | 22 ++++ pkgs/desktops/xfce/support/libgdu-only.patch | 144 +++++++++++++++++++++ pkgs/desktops/xfce/support/libgdu.nix | 34 +++++ .../libraries/libunique/1.1.6-G_CONST_RETURN.patch | 143 ++++++++++++++++++++ .../libunique/1.1.6-compiler-warnings.patch | 50 +++++++ .../libraries/libunique/1.1.6-fix-test.patch | 26 ++++ .../libunique/1.1.6-include-terminator.patch | 37 ++++++ pkgs/development/libraries/libunique/default.nix | 31 +++++ pkgs/top-level/all-packages.nix | 10 +- pkgs/top-level/release.nix | 1 - 73 files changed, 1359 insertions(+), 953 deletions(-) delete mode 100644 pkgs/desktops/xfce-4.8/applications/gigolo.nix delete mode 100644 pkgs/desktops/xfce-4.8/applications/mousepad.nix delete mode 100644 pkgs/desktops/xfce-4.8/applications/ristretto.nix delete mode 100644 pkgs/desktops/xfce-4.8/applications/terminal.nix delete mode 100644 pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix delete mode 100644 pkgs/desktops/xfce-4.8/applications/xfce4-notifyd.nix delete mode 100644 pkgs/desktops/xfce-4.8/applications/xfce4-power-manager.nix delete mode 100644 pkgs/desktops/xfce-4.8/applications/xfce4-taskmanager.nix delete mode 100644 pkgs/desktops/xfce-4.8/art/xfce4-icon-theme.nix delete mode 100644 pkgs/desktops/xfce-4.8/core/exo.nix delete mode 100644 pkgs/desktops/xfce-4.8/core/garcon.nix delete mode 100644 pkgs/desktops/xfce-4.8/core/gtk-xfce-engine.nix delete mode 100644 pkgs/desktops/xfce-4.8/core/libxfce4ui.nix delete mode 100644 pkgs/desktops/xfce-4.8/core/libxfce4util.nix delete mode 100644 pkgs/desktops/xfce-4.8/core/libxfcegui4.nix delete mode 100644 pkgs/desktops/xfce-4.8/core/thunar-volman.nix delete mode 100644 pkgs/desktops/xfce-4.8/core/thunar.nix delete mode 100644 pkgs/desktops/xfce-4.8/core/xfce-utils.nix delete mode 100644 pkgs/desktops/xfce-4.8/core/xfce4-appfinder.nix delete mode 100644 pkgs/desktops/xfce-4.8/core/xfce4-panel-datadir.patch delete mode 100644 pkgs/desktops/xfce-4.8/core/xfce4-panel.nix delete mode 100644 pkgs/desktops/xfce-4.8/core/xfce4-session.nix delete mode 100644 pkgs/desktops/xfce-4.8/core/xfce4-settings.nix delete mode 100644 pkgs/desktops/xfce-4.8/core/xfconf.nix delete mode 100644 pkgs/desktops/xfce-4.8/core/xfdesktop.nix delete mode 100644 pkgs/desktops/xfce-4.8/core/xfwm4.nix delete mode 100644 pkgs/desktops/xfce-4.8/default.nix delete mode 100644 pkgs/desktops/xfce-4.8/panel-plugins/xfce4-cpufreq-plugin.nix delete mode 100644 pkgs/desktops/xfce-4.8/panel-plugins/xfce4-systemload-plugin.nix delete mode 100644 pkgs/desktops/xfce-4.8/support/gvfs.nix delete mode 100644 pkgs/desktops/xfce-4.8/support/libgdu-only.patch delete mode 100644 pkgs/desktops/xfce-4.8/support/libgdu.nix create mode 100644 pkgs/desktops/xfce/applications/gigolo.nix create mode 100644 pkgs/desktops/xfce/applications/mousepad.nix create mode 100644 pkgs/desktops/xfce/applications/ristretto.nix create mode 100644 pkgs/desktops/xfce/applications/terminal.nix create mode 100644 pkgs/desktops/xfce/applications/xfce4-mixer.nix create mode 100644 pkgs/desktops/xfce/applications/xfce4-notifyd.nix create mode 100644 pkgs/desktops/xfce/applications/xfce4-taskmanager.nix create mode 100644 pkgs/desktops/xfce/art/xfce4-icon-theme.nix create mode 100644 pkgs/desktops/xfce/core/exo.nix create mode 100644 pkgs/desktops/xfce/core/garcon.nix create mode 100644 pkgs/desktops/xfce/core/gtk-xfce-engine.nix create mode 100644 pkgs/desktops/xfce/core/libxfce4ui.nix create mode 100644 pkgs/desktops/xfce/core/libxfce4util.nix create mode 100644 pkgs/desktops/xfce/core/libxfcegui4.nix create mode 100644 pkgs/desktops/xfce/core/thunar-volman.nix create mode 100644 pkgs/desktops/xfce/core/thunar.nix create mode 100644 pkgs/desktops/xfce/core/tumbler.nix create mode 100644 pkgs/desktops/xfce/core/xfce-utils.nix create mode 100644 pkgs/desktops/xfce/core/xfce4-appfinder.nix create mode 100644 pkgs/desktops/xfce/core/xfce4-panel-datadir.patch create mode 100644 pkgs/desktops/xfce/core/xfce4-panel.nix create mode 100644 pkgs/desktops/xfce/core/xfce4-power-manager.nix create mode 100644 pkgs/desktops/xfce/core/xfce4-session.nix create mode 100644 pkgs/desktops/xfce/core/xfce4-settings.nix create mode 100644 pkgs/desktops/xfce/core/xfconf.nix create mode 100644 pkgs/desktops/xfce/core/xfdesktop.nix create mode 100644 pkgs/desktops/xfce/core/xfwm4.nix create mode 100644 pkgs/desktops/xfce/default.nix create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix create mode 100644 pkgs/desktops/xfce/support/gvfs.nix create mode 100644 pkgs/desktops/xfce/support/libgdu-only.patch create mode 100644 pkgs/desktops/xfce/support/libgdu.nix create mode 100644 pkgs/development/libraries/libunique/1.1.6-G_CONST_RETURN.patch create mode 100644 pkgs/development/libraries/libunique/1.1.6-compiler-warnings.patch create mode 100644 pkgs/development/libraries/libunique/1.1.6-fix-test.patch create mode 100644 pkgs/development/libraries/libunique/1.1.6-include-terminator.patch create mode 100644 pkgs/development/libraries/libunique/default.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 98dd7d8fb8ea..9c91ad80d6da 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -224,6 +224,20 @@ rec { ftp://ftp.nara.wide.ad.jp/pub/X11/GNOME/ ]; + xfce = [ + http://archive.xfce.org/ + http://mirror.netcologne.de/xfce/ + http://archive.se.xfce.org/xfce/ + http://archive.be.xfce.org/xfce/ + http://mirror.perldude.de/archive.xfce.org/ + http://archive.be2.xfce.org/ + http://ftp.udc.es/xfce/ + http://archive.al-us.xfce.org/ + http://mirror.yongbok.net/X11/xfce-mirror/ + http://mirrors.tummy.com/pub/archive.xfce.org/ + http://xfce.mirror.uber.com.au/ + ]; + # X.org. xorg = [ http://xorg.freedesktop.org/releases/ diff --git a/pkgs/desktops/xfce-4.8/applications/gigolo.nix b/pkgs/desktops/xfce-4.8/applications/gigolo.nix deleted file mode 100644 index 5215697bbca9..000000000000 --- a/pkgs/desktops/xfce-4.8/applications/gigolo.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, python, gettext, intltool, pkgconfig, gtk, gvfs}: - -stdenv.mkDerivation rec { - name = "gigolo-0.4.1"; - - src = fetchurl { - url = "http://archive.xfce.org/src/apps/gigolo/0.4/${name}.tar.bz2"; - sha256 = "1y8p9bbv1a4qgbxl4vn6zbag3gb7gl8qj75cmhgrrw9zrvqbbww2"; - }; - - buildInputs = [ python gettext intltool gtk pkgconfig gvfs]; - - preConfigure = '' - sed -i "waf" -e "1 s^.*/env[ ]*python^#!${python}/bin/python^"; - ''; - - meta = { - homepage = http://goodies.xfce.org/projects/applications/gigolo; - description = "Gigolo is a frontend to easily manage connections to remote filesystems"; - platforms = stdenv.lib.platforms.linux; - }; -} \ No newline at end of file diff --git a/pkgs/desktops/xfce-4.8/applications/mousepad.nix b/pkgs/desktops/xfce-4.8/applications/mousepad.nix deleted file mode 100644 index 395a5c9f0848..000000000000 --- a/pkgs/desktops/xfce-4.8/applications/mousepad.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfcegui4, gtk }: - -stdenv.mkDerivation rec { - name = "mousepad-0.2.16"; - - src = fetchurl { - url = "http://archive.xfce.org/src/apps/mousepad/0.2/${name}.tar.bz2"; - sha1 = "4e63033e0a71578f3ec9a0d2e6a505efd0424ef9"; - }; - - buildInputs = [ pkgconfig intltool libxfce4util libxfcegui4 gtk ]; - - meta = { - homepage = http://www.xfce.org/projects/mousepad/; - description = "A simple text editor for Xfce"; - license = "GPLv2+"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; - }; -} diff --git a/pkgs/desktops/xfce-4.8/applications/ristretto.nix b/pkgs/desktops/xfce-4.8/applications/ristretto.nix deleted file mode 100644 index ce90891bb0ba..000000000000 --- a/pkgs/desktops/xfce-4.8/applications/ristretto.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libexif, gtk, thunar -, exo, dbus_glib, libxfce4util, libxfce4ui, xfconf }: - -stdenv.mkDerivation rec { - name = "ristretto-0.2.3"; - - src = fetchurl { - url = "http://archive.xfce.org/src/apps/ristretto/0.2/${name}.tar.bz2"; - sha1 = "5a34b865cb9013b67467b0e8d51970f0a1e977d1"; - }; - - buildInputs = - [ pkgconfig intltool libexif gtk dbus_glib libxfce4util - libxfce4ui xfconf - ]; - - meta = { - homepage = http://goodies.xfce.org/projects/applications/ristretto; - description = "A fast and lightweight picture-viewer for the Xfce desktop environment"; - license = "GPLv2+"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; - }; -} diff --git a/pkgs/desktops/xfce-4.8/applications/terminal.nix b/pkgs/desktops/xfce-4.8/applications/terminal.nix deleted file mode 100644 index f03a940679a6..000000000000 --- a/pkgs/desktops/xfce-4.8/applications/terminal.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl -, pkgconfig, ncurses -, intltool, vte -, exo, libxfce4util -, gtk -}: - -stdenv.mkDerivation { - name = "xfce-terminal-0.4.8"; - - src = fetchurl { - url = http://archive.xfce.org/src/apps/xfce4-terminal/0.4/Terminal-0.4.8.tar.bz2; - sha1 = "2f12c3a0fffad18976d47e531d404ee308cb2f05"; - }; - - buildInputs = [ pkgconfig intltool exo gtk vte libxfce4util ncurses ]; - - meta = { - homepage = http://www.xfce.org/projects/terminal; - description = "A modern terminal emulator primarily for the Xfce desktop environment"; - license = "GPLv2+"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; - }; -} diff --git a/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix b/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix deleted file mode 100644 index 2f1ab8a8e93c..000000000000 --- a/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, gstreamer, gst_plugins_base -, gtk, libxfce4util, libxfce4ui, xfce4panel, xfconf }: - -let - - # The usual Gstreamer plugins package has a zillion dependencies - # that we don't need for a simple mixer, so build a minimal package. - gst_plugins_minimal = gst_plugins_base.override { - minimalDeps = true; - }; - -in - -stdenv.mkDerivation rec { - name = "xfce4-mixer-4.8.0"; - - src = fetchurl { - url = "http://archive.xfce.org/src/apps/xfce4-mixer/4.8/${name}.tar.bz2"; - sha1 = "24f3401a68f10d2c620e354a6de98e09fe808665"; - }; - - buildInputs = - [ pkgconfig intltool glib gstreamer gst_plugins_minimal gtk - libxfce4util libxfce4ui xfce4panel xfconf - ]; - - postInstall = - '' - mkdir -p $out/nix-support - echo ${gst_plugins_minimal} > $out/nix-support/propagated-user-env-packages - ''; - - meta = { - homepage = http://www.xfce.org/projects/xfce4-mixer; - description = "A volume control application for the Xfce desktop environment"; - license = "GPLv2+"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; - }; -} diff --git a/pkgs/desktops/xfce-4.8/applications/xfce4-notifyd.nix b/pkgs/desktops/xfce-4.8/applications/xfce4-notifyd.nix deleted file mode 100644 index 598e6eb414d1..000000000000 --- a/pkgs/desktops/xfce-4.8/applications/xfce4-notifyd.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk, xfce }: - -stdenv.mkDerivation rec { - name = "xfce4-notifyd-0.2.2"; - - src = fetchurl { - url = "http://archive.xfce.org/src/apps/xfce4-notifyd/0.2/${name}.tar.bz2"; - sha256 = "0s4ilc36sl5k5mg5727rmqims1l3dy5pwg6dk93wyjqnqbgnhvmn"; - }; - - buildInputs = [ intltool pkgconfig gtk xfce.libxfce4util xfce.libxfce4ui xfce.xfconf ]; - - meta = { - homepage = http://goodies.xfce.org/projects/applications/xfce4-notifyd; - description = "The Xfce Notify Daemon"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/desktops/xfce-4.8/applications/xfce4-power-manager.nix b/pkgs/desktops/xfce-4.8/applications/xfce4-power-manager.nix deleted file mode 100644 index bad3b52a6bbc..000000000000 --- a/pkgs/desktops/xfce-4.8/applications/xfce4-power-manager.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk, dbus_glib, xfconf -, libxfce4ui, libxfce4util, libnotify, xfce4panel }: - -stdenv.mkDerivation rec { - name = "xfce4-power-manager-1.0.10"; - - src = fetchurl { - url = "http://archive.xfce.org/src/apps/xfce4-power-manager/1.0/${name}.tar.bz2"; - sha1 = "64dd7a8fae9cd1cbcf6403d2f51f2281f38cca05"; - }; - - buildInputs = - [ pkgconfig intltool gtk dbus_glib xfconf libxfce4ui libxfce4util - libnotify xfce4panel - ]; - - meta = { - homepage = http://goodies.xfce.org/projects/applications/xfce4-power-manager; - description = "A power manager for the Xfce Desktop Environment"; - license = "GPLv2+"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; - }; -} diff --git a/pkgs/desktops/xfce-4.8/applications/xfce4-taskmanager.nix b/pkgs/desktops/xfce-4.8/applications/xfce4-taskmanager.nix deleted file mode 100644 index cffaa6bfe09b..000000000000 --- a/pkgs/desktops/xfce-4.8/applications/xfce4-taskmanager.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk }: - -stdenv.mkDerivation rec { - name = "xfce4-taskmanager-1.0.0"; - - src = fetchurl { - url = "http://archive.xfce.org/src/apps/xfce4-taskmanager/1.0/${name}.tar.bz2"; - sha256 = "1vm9gw7j4ngjlpdhnwdf7ifx6xrrn21011almx2vwidhk2f9zvy0"; - }; - - buildInputs = [ intltool pkgconfig gtk ]; - - meta = { - homepage = http://goodies.xfce.org/projects/applications/xfce4-taskmanager; - description = "Easy to use task manager for XFCE"; - platforms = stdenv.lib.platforms.linux; - }; -} \ No newline at end of file diff --git a/pkgs/desktops/xfce-4.8/art/xfce4-icon-theme.nix b/pkgs/desktops/xfce-4.8/art/xfce4-icon-theme.nix deleted file mode 100644 index afa934b60316..000000000000 --- a/pkgs/desktops/xfce-4.8/art/xfce4-icon-theme.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk }: - -stdenv.mkDerivation rec { - name = "xfce4-icon-theme-4.4.3"; - - src = fetchurl { - url = "http://archive.xfce.org/src/art/xfce4-icon-theme/4.4/${name}.tar.bz2"; - sha1 = "0c0d0c45cd4a7f609310db8e9d17c1c4a131a6e7"; - }; - - buildInputs = [ pkgconfig intltool gtk ]; - - meta = { - homepage = http://www.xfce.org/; - description = "Icons for Xfce"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; - }; -} diff --git a/pkgs/desktops/xfce-4.8/core/exo.nix b/pkgs/desktops/xfce-4.8/core/exo.nix deleted file mode 100644 index 468132a2a81e..000000000000 --- a/pkgs/desktops/xfce-4.8/core/exo.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, URI, glib, gtk, libxfce4util }: - -stdenv.mkDerivation rec { - name = "exo-0.6.2"; - - src = fetchurl { - url = "http://archive.xfce.org/src/xfce/exo/0.6/${name}.tar.bz2"; - sha1 = "2486f12c814630068665e22cdf417f0f0f05dab1"; - }; - - buildInputs = - [ pkgconfig intltool URI glib gtk libxfce4util ]; - - meta = { - homepage = http://www.xfce.org/projects/exo; - description = "Application library for the Xfce desktop environment"; - license = "GPLv2+"; - }; -} diff --git a/pkgs/desktops/xfce-4.8/core/garcon.nix b/pkgs/desktops/xfce-4.8/core/garcon.nix deleted file mode 100644 index 7f5f18173b26..000000000000 --- a/pkgs/desktops/xfce-4.8/core/garcon.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util }: - -stdenv.mkDerivation rec { - name = "garcon-0.1.9"; - - src = fetchurl { - url = "http://archive.xfce.org/src/xfce/garcon/0.1/${name}.tar.bz2"; - sha1 = "2eeab19bc10747a40b44afd4598a2f555eb69952"; - }; - - buildInputs = [ pkgconfig intltool glib libxfce4util ]; - - meta = { - homepage = http://www.xfce.org/; - description = "Xfce menu support library"; - license = "GPLv2+"; - }; -} diff --git a/pkgs/desktops/xfce-4.8/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce-4.8/core/gtk-xfce-engine.nix deleted file mode 100644 index 4518897cc2fc..000000000000 --- a/pkgs/desktops/xfce-4.8/core/gtk-xfce-engine.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk }: - -stdenv.mkDerivation rec { - name = "gtk-xfce-engine-2.8.1"; - - src = fetchurl { - url = "http://archive.xfce.org/src/xfce/gtk-xfce-engine/2.8/${name}.tar.bz2"; - sha1 = "d7779f07cc76585be063bc25fa91e660e1fd9c97"; - }; - - buildInputs = - [ pkgconfig intltool gtk ]; - - meta = { - homepage = http://www.xfce.org/; - description = "GTK+ theme engine for Xfce"; - license = "GPLv2+"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; - }; -} diff --git a/pkgs/desktops/xfce-4.8/core/libxfce4ui.nix b/pkgs/desktops/xfce-4.8/core/libxfce4ui.nix deleted file mode 100644 index 76c285ae599a..000000000000 --- a/pkgs/desktops/xfce-4.8/core/libxfce4ui.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, xfconf -, libstartup_notification }: - -stdenv.mkDerivation rec { - name = "libxfce4ui-4.8.1"; - - src = fetchurl { - url = "http://archive.xfce.org/src/xfce/libxfce4ui/4.8/${name}.tar.bz2"; - sha1 = "408645581e589135aa03d2e9b84f4eede68596b2"; - }; - - buildInputs = - [ pkgconfig intltool gtk libxfce4util xfconf - libstartup_notification - ]; - - enableParallelBuilding = true; - - meta = { - homepage = http://www.xfce.org/; - description = "Basic GUI library for Xfce"; - license = "LGPLv2+"; - }; -} diff --git a/pkgs/desktops/xfce-4.8/core/libxfce4util.nix b/pkgs/desktops/xfce-4.8/core/libxfce4util.nix deleted file mode 100644 index 7a567d629358..000000000000 --- a/pkgs/desktops/xfce-4.8/core/libxfce4util.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, intltool }: - -stdenv.mkDerivation rec { - name = "libxfce4util-4.8.2"; - - src = fetchurl { - url = "http://archive.xfce.org/src/xfce/libxfce4util/4.8/${name}.tar.bz2"; - sha1 = "e7498c2e5fca2c89dfef89e0788f10eebbd020c3"; - }; - - buildInputs = [ pkgconfig glib intltool ]; - - meta = { - homepage = http://www.xfce.org/; - description = "Basic utility non-GUI functions for Xfce"; - license = "bsd"; - }; -} diff --git a/pkgs/desktops/xfce-4.8/core/libxfcegui4.nix b/pkgs/desktops/xfce-4.8/core/libxfcegui4.nix deleted file mode 100644 index 20e82a2c92f8..000000000000 --- a/pkgs/desktops/xfce-4.8/core/libxfcegui4.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, xfconf -, libglade, libstartup_notification }: - -stdenv.mkDerivation rec { - name = "libxfcegui4-4.8.1"; - - src = fetchurl { - url = "http://archive.xfce.org/src/xfce/libxfcegui4/4.8/${name}.tar.bz2"; - sha1 = "246fcaa71fc8cf44dae0b4c919411231eedd662f"; - }; - - # By default, libxfcegui4 tries to install into libglade's prefix. - # Install into our own prefix instead. - preConfigure = - '' - configureFlags="--with-libglade-module-path=$out/lib/libglade/2.0" - ''; - - buildInputs = - [ pkgconfig intltool gtk libxfce4util libglade - libstartup_notification - ]; - - enableParallelBuilding = true; - - meta = { - homepage = http://www.xfce.org/; - description = "Basic GUI library for Xfce"; - license = "LGPLv2+"; - }; -} diff --git a/pkgs/desktops/xfce-4.8/core/thunar-volman.nix b/pkgs/desktops/xfce-4.8/core/thunar-volman.nix deleted file mode 100644 index 490390d1bac3..000000000000 --- a/pkgs/desktops/xfce-4.8/core/thunar-volman.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui -, xfconf, udev, libnotify }: - -stdenv.mkDerivation rec { - name = "thunar-volman-0.6.0"; - - src = fetchurl { - url = "http://archive.xfce.org/src/xfce/thunar-volman/0.6/${name}.tar.bz2"; - sha1 = "dcda936948623b342b290a78c294f71c038e832e"; - }; - - buildInputs = - [ pkgconfig intltool exo gtk udev libxfce4ui libxfce4util - xfconf libnotify - ]; - - enableParallelBuilding = true; - - meta = { - homepage = http://thunar.xfce.org/; - description = "Thunar extension for automatic management of removable drives and media"; - license = "GPLv2+"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; - }; -} diff --git a/pkgs/desktops/xfce-4.8/core/thunar.nix b/pkgs/desktops/xfce-4.8/core/thunar.nix deleted file mode 100644 index 07fd734a1f2e..000000000000 --- a/pkgs/desktops/xfce-4.8/core/thunar.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui -, dbus_glib, libstartup_notification, xfconf, xfce4panel, udev, libnotify }: - -stdenv.mkDerivation rec { - version = "1.2.3"; - name = "thunar-${version}"; - - src = fetchurl { - url = "http://archive.xfce.org/src/xfce/thunar/1.2/Thunar-${version}.tar.bz2"; - sha1 = "a05d0e14515d70c5ad94cca881822a707d366863"; - }; - - buildInputs = - [ pkgconfig intltool gtk exo libxfce4util libxfce4ui - dbus_glib libstartup_notification xfconf xfce4panel udev libnotify - ]; - - enableParallelBuilding = true; - - meta = { - homepage = http://thunar.xfce.org/; - description = "Xfce file manager"; - license = "GPLv2+"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; - }; -} diff --git a/pkgs/desktops/xfce-4.8/core/xfce-utils.nix b/pkgs/desktops/xfce-4.8/core/xfce-utils.nix deleted file mode 100644 index fde8a2c3953a..000000000000 --- a/pkgs/desktops/xfce-4.8/core/xfce-utils.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui }: - -stdenv.mkDerivation rec { - name = "xfce-utils-4.8.3"; - - src = fetchurl { - url = "http://archive.xfce.org/src/xfce/xfce-utils/4.8/${name}.tar.bz2"; - sha1 = "159d445b689ebbf73462a4b4baf5cce4e04afaab"; - }; - - configureFlags = "--with-xsession-prefix=$(out)/share/xsessions --with-vendor-info=NixOS.org"; - - buildInputs = [ pkgconfig intltool gtk libxfce4util libxfce4ui ]; - - meta = { - homepage = http://www.xfce.org/; - description = "Utilities and scripts for Xfce"; - license = "GPLv2+"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; - }; -} diff --git a/pkgs/desktops/xfce-4.8/core/xfce4-appfinder.nix b/pkgs/desktops/xfce-4.8/core/xfce4-appfinder.nix deleted file mode 100644 index b8165ebb1783..000000000000 --- a/pkgs/desktops/xfce-4.8/core/xfce4-appfinder.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, gtk, libxfce4util -, libxfce4ui, garcon, xfconf }: - -stdenv.mkDerivation rec { - name = "xfce4-appfinder-4.8.0"; - - src = fetchurl { - url = "http://archive.xfce.org/src/xfce/xfce4-appfinder/4.8/${name}.tar.bz2"; - sha1 = "444bbcbded8d2346f9b9beb57ec7adaf556811c9"; - }; - - buildInputs = - [ pkgconfig intltool glib gtk libxfce4util libxfce4ui garcon xfconf ]; - - enableParallelBuilding = true; - - meta = { - homepage = http://www.xfce.org/; - description = "Xfce application finder, a tool to locate and launch programs on your system"; - license = "GPLv2+"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; - }; -} diff --git a/pkgs/desktops/xfce-4.8/core/xfce4-panel-datadir.patch b/pkgs/desktops/xfce-4.8/core/xfce4-panel-datadir.patch deleted file mode 100644 index ed9df9ef36f3..000000000000 --- a/pkgs/desktops/xfce-4.8/core/xfce4-panel-datadir.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/panel/panel-module-factory.c b/panel/panel-module-factory.c -index 529fe85..8c792b7 100644 ---- a/panel/panel-module-factory.c -+++ b/panel/panel-module-factory.c -@@ -39,6 +39,7 @@ - #include - #include - -+#define DATADIR "/run/current-system/sw/share/xfce4" - #define PANEL_PLUGINS_DATA_DIR (DATADIR G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S "plugins") - #define PANEL_PLUGINS_DATA_DIR_OLD (DATADIR G_DIR_SEPARATOR_S "panel-plugins") - -diff --git a/panel/panel-module.c b/panel/panel-module.c -index ba39320..519440b 100644 ---- a/panel/panel-module.c -+++ b/panel/panel-module.c -@@ -35,6 +35,7 @@ - #include - #include - -+#define LIBDIR "/run/current-system/sw/lib/xfce4" - #define PANEL_PLUGINS_LIB_DIR (LIBDIR G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S "plugins") - #define PANEL_PLUGINS_LIB_DIR_OLD (LIBDIR G_DIR_SEPARATOR_S "panel-plugins") - diff --git a/pkgs/desktops/xfce-4.8/core/xfce4-panel.nix b/pkgs/desktops/xfce-4.8/core/xfce4-panel.nix deleted file mode 100644 index e14d1acf33da..000000000000 --- a/pkgs/desktops/xfce-4.8/core/xfce4-panel.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, garcon -, libxfce4ui, xfconf, libwnck, exo }: - -stdenv.mkDerivation rec { - name = "xfce4-panel-4.8.6"; - - src = fetchurl { - url = "http://archive.xfce.org/src/xfce/xfce4-panel/4.8/${name}.tar.bz2"; - sha1 = "332fc968332e6271e1bb65d6de8de2524b0440ec"; - }; - - patches = [ ./xfce4-panel-datadir.patch ]; - patchFlags = "-p1"; - - buildInputs = - [ pkgconfig intltool gtk libxfce4util garcon libxfce4ui xfconf - exo libwnck - ]; - - enableParallelBuilding = true; - - meta = { - homepage = http://www.xfce.org/; - description = "Xfce panel"; - license = "GPLv2+"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; - }; -} diff --git a/pkgs/desktops/xfce-4.8/core/xfce4-session.nix b/pkgs/desktops/xfce-4.8/core/xfce4-session.nix deleted file mode 100644 index 0e0f1a86939d..000000000000 --- a/pkgs/desktops/xfce-4.8/core/xfce4-session.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui -, libwnck, dbus_glib, xfconf, xorg, xfce4panel }: - -stdenv.mkDerivation rec { - name = "xfce4-session-4.8.2"; - - src = fetchurl { - url = "http://archive.xfce.org/src/xfce/xfce4-session/4.8/${name}.tar.bz2"; - sha1 = "636c2983552861a959225e554898675152a4d812"; - }; - - buildInputs = - [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus_glib - xfconf xorg.iceauth xfce4panel - ]; - - meta = { - homepage = http://www.xfce.org/; - description = "Session manager for Xfce"; - license = "GPLv2+"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; - }; -} diff --git a/pkgs/desktops/xfce-4.8/core/xfce4-settings.nix b/pkgs/desktops/xfce-4.8/core/xfce4-settings.nix deleted file mode 100644 index dc6e8e555b21..000000000000 --- a/pkgs/desktops/xfce-4.8/core/xfce4-settings.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui -, xfconf, xorg, libnotify, libxklavier }: - -stdenv.mkDerivation rec { - name = "xfce4-settings-4.8.3"; - - src = fetchurl { - url = "http://archive.xfce.org/src/xfce/xfce4-settings/4.8/${name}.tar.bz2"; - sha1 = "98431633ba3ec2a4a10182bc7266904d9256949b"; - }; - - buildInputs = - [ pkgconfig intltool exo gtk libxfce4util libxfce4ui - xfconf libnotify xorg.libXcursor libxklavier - ]; - - configureFlags = "--enable-pluggable-dialogs --enable-sound-settings"; - - meta = { - homepage = http://www.xfce.org/; - description = "Settings manager for Xfce"; - license = "GPLv2+"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; - }; -} diff --git a/pkgs/desktops/xfce-4.8/core/xfconf.nix b/pkgs/desktops/xfce-4.8/core/xfconf.nix deleted file mode 100644 index e0c61d3a1f59..000000000000 --- a/pkgs/desktops/xfce-4.8/core/xfconf.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, dbus_glib }: - -stdenv.mkDerivation rec { - name = "xfconf-4.8.1"; - - src = fetchurl { - url = "http://archive.xfce.org/src/xfce/xfconf/4.8/${name}.tar.bz2"; - sha1 = "aeab124f7c548e387b37a5476e594ef559515533"; - }; - - buildInputs = [ pkgconfig intltool glib libxfce4util ]; - - propagatedBuildInputs = [ dbus_glib ]; - - meta = { - homepage = http://www.xfce.org/; - description = "Simple client-server configuration storage and query system for Xfce"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/xfce-4.8/core/xfdesktop.nix b/pkgs/desktops/xfce-4.8/core/xfdesktop.nix deleted file mode 100644 index 45c82f1ec025..000000000000 --- a/pkgs/desktops/xfce-4.8/core/xfdesktop.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk, dbus_glib, libxfce4util -, libxfce4ui, libwnck, xfconf, garcon, libnotify, exo }: - -stdenv.mkDerivation rec { - name = "xfdesktop-4.8.3"; - - src = fetchurl { - url = "http://archive.xfce.org/src/xfce/xfdesktop/4.8/${name}.tar.bz2"; - sha1 = "b3af72a69627f860f22b37d021efd81e4e37eb55"; - }; - - buildInputs = - [ pkgconfig intltool gtk dbus_glib libxfce4util libxfce4ui libwnck xfconf - garcon libnotify exo - ]; - - enableParallelBuilding = true; - - meta = { - homepage = http://www.xfce.org/; - description = "Xfce desktop manager"; - license = "GPLv2+"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; - }; -} diff --git a/pkgs/desktops/xfce-4.8/core/xfwm4.nix b/pkgs/desktops/xfce-4.8/core/xfwm4.nix deleted file mode 100644 index c0f89784bfbc..000000000000 --- a/pkgs/desktops/xfce-4.8/core/xfwm4.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, intltool, libxfce4util -, libxfce4ui, xfconf, libwnck, libstartup_notification, xorg }: - -stdenv.mkDerivation rec { - name = "xfwm4-4.8.3"; - - src = fetchurl { - url = "http://archive.xfce.org/src/xfce/xfwm4/4.8/${name}.tar.bz2"; - sha1 = "6d27deca383e0c2fba0cede0bbe0e9aee18e9257"; - }; - - buildInputs = - [ pkgconfig intltool gtk libxfce4util libxfce4ui xfconf - libwnck libstartup_notification - xorg.libXcomposite xorg.libXfixes xorg.libXdamage - ]; - - enableParallelBuilding = true; - - meta = { - homepage = http://www.xfce.org/; - description = "Window manager for Xfce"; - license = "GPLv2+"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; - }; -} diff --git a/pkgs/desktops/xfce-4.8/default.nix b/pkgs/desktops/xfce-4.8/default.nix deleted file mode 100644 index bfe7fddd7381..000000000000 --- a/pkgs/desktops/xfce-4.8/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ callPackage, pkgs }: - -rec { - inherit (pkgs) gtk glib; - - #### SUPPORT - - # The useful bits from ‘gnome-disk-utility’. - libgdu = callPackage ./support/libgdu.nix { }; - - # Gvfs is required by Thunar for the trash feature and for volume - # mounting. Should use the one from Gnome, but I don't want to mess - # with the Gnome packages (or pull in a zillion Gnome dependencies). - gvfs = callPackage ./support/gvfs.nix { }; - - - #### CORE - - libxfce4util = callPackage ./core/libxfce4util.nix { }; - - exo = callPackage ./core/exo.nix { - inherit (pkgs.perlPackages) URI; - }; - - xfconf = callPackage ./core/xfconf.nix { }; - - libxfcegui4 = callPackage ./core/libxfcegui4.nix { - inherit (pkgs.gnome) libglade; - }; - - libxfce4ui = callPackage ./core/libxfce4ui.nix { }; - - xfwm4 = callPackage ./core/xfwm4.nix { - inherit (pkgs.gnome) libwnck; - }; - - xfceutils = callPackage ./core/xfce-utils.nix { }; - - garcon = callPackage ./core/garcon.nix { }; - - xfce4panel = callPackage ./core/xfce4-panel.nix { - inherit (pkgs.gnome) libwnck; - }; - - xfce4session = callPackage ./core/xfce4-session.nix { - inherit (pkgs.gnome) libwnck; - }; - - xfce4settings = callPackage ./core/xfce4-settings.nix { }; - - xfdesktop = callPackage ./core/xfdesktop.nix { - inherit (pkgs.gnome) libwnck; - }; - - thunar = callPackage ./core/thunar.nix { }; - - thunar_volman = callPackage ./core/thunar-volman.nix { }; - - gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix { }; - - xfce4_appfinder = callPackage ./core/xfce4-appfinder.nix { }; - - - #### APPLICATIONS - - terminal = callPackage ./applications/terminal.nix { - inherit (pkgs.gnome) vte; - }; - - gigolo = callPackage ./applications/gigolo.nix { }; - - mousepad = callPackage ./applications/mousepad.nix { }; - - ristretto = callPackage ./applications/ristretto.nix { }; - - xfce4_notifyd = callPackage ./applications/xfce4-notifyd.nix { }; - - xfce4_power_manager = callPackage ./applications/xfce4-power-manager.nix { }; - - xfce4mixer = callPackage ./applications/xfce4-mixer.nix { }; - - xfce4_taskmanager = callPackage ./applications/xfce4-taskmanager.nix { }; - - - #### ART - - xfce4icontheme = callPackage ./art/xfce4-icon-theme.nix { }; - - #### PANEL PLUGINS - - xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix {}; - xfce4_cpufreq_plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix {}; - -} diff --git a/pkgs/desktops/xfce-4.8/panel-plugins/xfce4-cpufreq-plugin.nix b/pkgs/desktops/xfce-4.8/panel-plugins/xfce4-cpufreq-plugin.nix deleted file mode 100644 index c3f342194646..000000000000 --- a/pkgs/desktops/xfce-4.8/panel-plugins/xfce4-cpufreq-plugin.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: - -stdenv.mkDerivation rec { - name = "xfce4-cpufreq-plugin-1.0.0"; - - src = fetchurl { - url = "http://archive.xfce.org/src/panel-plugins/xfce4-cpufreq-plugin/1.0/${name}.tar.bz2"; - sha256 = "0q2lj8a25iq9w3dynh6qvsmh19y1v7i82g46yza6gvw7fjcrmcz1"; - }; - - buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; - - meta = { - homepage = http://www.xfce.org/; - description = "CPU Freq load panel plugin for Xfce"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/desktops/xfce-4.8/panel-plugins/xfce4-systemload-plugin.nix b/pkgs/desktops/xfce-4.8/panel-plugins/xfce4-systemload-plugin.nix deleted file mode 100644 index 6d0f997500cd..000000000000 --- a/pkgs/desktops/xfce-4.8/panel-plugins/xfce4-systemload-plugin.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, gtk}: - -stdenv.mkDerivation rec { - name = "xfce4-systemload-plugin-1.1.1"; - - src = fetchurl { - url = "http://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/1.1/${name}.tar.bz2"; - sha256 = "1bnrr30h6kgb37ixcq7frx2gvj2p99bpa1jyzppwjxp5x7xkxh8s"; - }; - - buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel gtk ]; - - meta = { - homepage = http://www.xfce.org/; - description = "System load panel plugin for Xfce"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/desktops/xfce-4.8/support/gvfs.nix b/pkgs/desktops/xfce-4.8/support/gvfs.nix deleted file mode 100644 index f922b194f877..000000000000 --- a/pkgs/desktops/xfce-4.8/support/gvfs.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus, intltool, udev, libgdu, fuse -, libxml2, libxslt, docbook_xsl, libgphoto2, libtool }: - -stdenv.mkDerivation rec { - name = "gvfs-1.14.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gvfs/1.14/${name}.tar.xz"; - sha256 = "0af86cd7ee7b6daca144776bdf12f2f30d3e18fdd70b4da58e1a68cea4f6716a"; - }; - - buildInputs = - [ pkgconfig glib dbus.libs intltool udev libgdu fuse libxml2 libxslt - docbook_xsl libgphoto2 libtool - ]; - - meta = { - description = "Virtual Filesystem support library (for Xfce)"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; - }; -} diff --git a/pkgs/desktops/xfce-4.8/support/libgdu-only.patch b/pkgs/desktops/xfce-4.8/support/libgdu-only.patch deleted file mode 100644 index c5873c716811..000000000000 --- a/pkgs/desktops/xfce-4.8/support/libgdu-only.patch +++ /dev/null @@ -1,144 +0,0 @@ -diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/configure.ac gnome-disk-utility-2.30.1/configure.ac ---- gnome-disk-utility-2.30.1-orig/configure.ac 2010-03-22 16:54:09.000000000 +0100 -+++ gnome-disk-utility-2.30.1/configure.ac 2011-09-06 02:52:09.000000000 +0200 -@@ -106,17 +106,6 @@ - # GNOME - # ***** - --GNOME_COMMON_INIT --GNOME_DOC_INIT --GNOME_DEBUG_CHECK --GNOME_COMPILE_WARNINGS([maximum]) --GNOME_MAINTAINER_MODE_DEFINES -- --AC_ARG_ENABLE(gtk-doc, AS_HELP_STRING([--enable-gtk-doc], -- [use gtk-doc to build documentation [default=yes]]),, -- enable_gtk_doc=yes) --GTK_DOC_CHECK([1.3]) -- - # *************************** - # Check for required packages - # *************************** -@@ -130,7 +119,6 @@ - UNIQUE_REQUIRED=1.0 - LIBNOTIFY_REQUIRED=0.3.0 - NAUTILUS_REQUIRED=2.24.0 --AVAHI_UI_REQUIRED=0.6.25 - - UDISKS_REQUIRED=1.0.0 - UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION=1.1.0 -@@ -144,13 +132,7 @@ - PKG_CHECK_MODULES(GIO_UNIX2, [gio-unix-2.0 >= $GIO2_REQUIRED]) - PKG_CHECK_MODULES(GTHREAD2, [gthread-2.0 >= $GLIB2_REQUIRED]) - PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= $DBUS_GLIB_REQUIRED]) --PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= $GTK2_REQUIRED]) --PKG_CHECK_MODULES(UNIQUE, [unique-1.0 >= $UNIQUE_REQUIRED]) --PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= $LIBNOTIFY_REQUIRED]) - PKG_CHECK_MODULES(UDISKS, [udisks >= $UDISKS_REQUIRED udisks < $UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION]) --PKG_CHECK_MODULES(X11, [x11]) --PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14]) --PKG_CHECK_MODULES(AVAHI_UI, [avahi-ui >= $AVAHI_UI_REQUIRED]) - - # ************* - # Remote Access -@@ -183,21 +165,10 @@ - AC_SUBST(GNOME_KEYRING_CFLAGS) - AM_CONDITIONAL(ENABLE_GNOME_KEYRING, [test "$have_gnome_keyring" = "yes"]) - --# ************* --# Documentation --# ************* -- --AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no) --if test x$SCROLLKEEPER_CONFIG = xno; then -- AC_MSG_ERROR(Couldn't find scrollkeeper-config, please install the scrollkeeper package) --fi -- - # ******************** - # Internationalization - # ******************** - --IT_PROG_INTLTOOL([$INTLTOOL_REQUIRED]) -- - GETTEXT_PACKAGE=gnome-disk-utility - AC_SUBST([GETTEXT_PACKAGE]) - AM_GLIB_GNU_GETTEXT -diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/doc/Makefile.am gnome-disk-utility-2.30.1/doc/Makefile.am ---- gnome-disk-utility-2.30.1-orig/doc/Makefile.am 2009-12-02 20:52:38.000000000 +0100 -+++ gnome-disk-utility-2.30.1/doc/Makefile.am 2011-09-06 02:17:15.000000000 +0200 -@@ -70,9 +70,7 @@ - Makefile.in \ - $(NULL) - --include $(top_srcdir)/gtk-doc.make -- --CLEANFILES += *~ \ -+CLEANFILES = *~ \ - gnome-disk-utility-scan* \ - gnome-disk-utility.args \ - gnome-disk-utility.hierarchy \ -@@ -91,4 +89,4 @@ - $(NULL) - - # Version information for marking the documentation --EXTRA_DIST += version.xml.in -+EXTRA_DIST = version.xml.in -diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/gtk-doc.make gnome-disk-utility-2.30.1/gtk-doc.make ---- gnome-disk-utility-2.30.1-orig/gtk-doc.make 2010-03-16 00:08:20.000000000 +0100 -+++ gnome-disk-utility-2.30.1/gtk-doc.make 2011-09-06 02:15:33.000000000 +0200 -@@ -4,15 +4,9 @@ - # Everything below here is generic # - #################################### - --if GTK_DOC_USE_LIBTOOL --GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) --GTKDOC_RUN = $(LIBTOOL) --mode=execute --else - GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) - GTKDOC_RUN = --endif - - # We set GPATH here; this gives us semantics for GNU make - # which are more like other make's VPATH, when it comes to -@@ -49,22 +43,7 @@ - - CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) - --if ENABLE_GTK_DOC --if GTK_DOC_BUILD_HTML --HTML_BUILD_STAMP=html-build.stamp --else --HTML_BUILD_STAMP= --endif --if GTK_DOC_BUILD_PDF --PDF_BUILD_STAMP=pdf-build.stamp --else --PDF_BUILD_STAMP= --endif -- --all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) --else - all-local: --endif - - docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) - -diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/help/Makefile.am gnome-disk-utility-2.30.1/help/Makefile.am ---- gnome-disk-utility-2.30.1-orig/help/Makefile.am 2009-09-23 20:35:01.000000000 +0200 -+++ gnome-disk-utility-2.30.1/help/Makefile.am 2011-09-06 02:18:13.000000000 +0200 -@@ -1,4 +1,3 @@ --include $(top_srcdir)/gnome-doc-utils.make - dist-hook: doc-dist-hook - - DOC_MODULE = palimpsest -diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/Makefile.am gnome-disk-utility-2.30.1/Makefile.am ---- gnome-disk-utility-2.30.1-orig/Makefile.am 2010-03-16 00:12:39.000000000 +0100 -+++ gnome-disk-utility-2.30.1/Makefile.am 2011-09-06 02:17:34.000000000 +0200 -@@ -1,4 +1,4 @@ --SUBDIRS = src data doc help po -+SUBDIRS = src data - - EXTRA_DIST = \ - autogen.sh \ diff --git a/pkgs/desktops/xfce-4.8/support/libgdu.nix b/pkgs/desktops/xfce-4.8/support/libgdu.nix deleted file mode 100644 index 32835f0434ab..000000000000 --- a/pkgs/desktops/xfce-4.8/support/libgdu.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchurl, gnome, pkgconfig, glib, dbus_glib, intltool, udev, gtk -, libnotify, udisks, libatasmart, avahi -, autoconf, automake, libtool }: - -let version = "2.30.1"; in - -stdenv.mkDerivation rec { - name = "libgdu-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-disk-utility/2.30/gnome-disk-utility-${version}.tar.bz2"; - sha256 = "df9b336c780b5d77ceda54e96f7c37c67645f5e73d48754ba0a8efba7c1836d7"; - }; - - # Only build libgdu, not all that Gnome crap. - patches = [ ./libgdu-only.patch ]; - - buildInputs = - [ pkgconfig glib dbus_glib udisks - autoconf automake libtool - ]; - - preConfigure = - '' - substituteInPlace src/gdu/Makefile.am --replace /usr/share/dbus-1/interfaces ${udisks}/share/dbus-1/interfaces - autoreconf -f -i - ''; - - postConfigure = "cd src/gdu"; - - meta = { - description = "Xfce/Gvfs support library for mounting filesystems"; - }; -} diff --git a/pkgs/desktops/xfce/applications/gigolo.nix b/pkgs/desktops/xfce/applications/gigolo.nix new file mode 100644 index 000000000000..b54ea8cc623f --- /dev/null +++ b/pkgs/desktops/xfce/applications/gigolo.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, python, gettext, intltool, pkgconfig, gtk, gvfs }: + +stdenv.mkDerivation rec { + p_name = "gigolo"; + ver_maj = "0.4"; + ver_min = "1"; + + src = fetchurl { + url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "1y8p9bbv1a4qgbxl4vn6zbag3gb7gl8qj75cmhgrrw9zrvqbbww2"; + }; + name = "${p_name}-${ver_maj}.${ver_min}"; + + buildInputs = [ python gettext intltool gtk pkgconfig gvfs]; + + preConfigure = '' + sed -i "waf" -e "1 s^.*/env[ ]*python^#!${python}/bin/python^"; + ''; + + meta = { + homepage = "http://goodies.xfce.org/projects/applications/${p_name}"; + description = "A frontend to easily manage connections to remote filesystems"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/desktops/xfce/applications/mousepad.nix b/pkgs/desktops/xfce/applications/mousepad.nix new file mode 100644 index 000000000000..9bc9634469c7 --- /dev/null +++ b/pkgs/desktops/xfce/applications/mousepad.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfcegui4 +, gtk, gtksourceview, dbus, dbus_glib }: + +stdenv.mkDerivation rec { + p_name = "mousepad"; + ver_maj = "0.3"; + ver_min = "0"; + + src = fetchurl { + url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "0v84zwhjv2xynvisn5vmp7dbxfj4l4258m82ks7hn3adk437bwhh"; + }; + name = "${p_name}-${ver_maj}.${ver_min}"; + + buildInputs = [ + pkgconfig intltool libxfce4util libxfcegui4 + gtk gtksourceview dbus dbus_glib + ]; + + meta = { + homepage = http://www.xfce.org/; + description = "A simple text editor for Xfce"; + license = "GPLv2+"; + }; +} diff --git a/pkgs/desktops/xfce/applications/ristretto.nix b/pkgs/desktops/xfce/applications/ristretto.nix new file mode 100644 index 000000000000..a42e882710a7 --- /dev/null +++ b/pkgs/desktops/xfce/applications/ristretto.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pkgconfig, intltool, libexif, gtk +, exo, dbus_glib, libxfce4util, libxfce4ui, xfconf }: + +stdenv.mkDerivation rec { + p_name = "ristretto"; + ver_maj = "0.6"; + ver_min = "3"; + + src = fetchurl { + url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "0y9d8w1plwp4vmxs44y8k8x15i0k0xln89k6jndhv6lf57g1cs1b"; + }; + name = "${p_name}-${ver_maj}.${ver_min}"; + + buildInputs = + [ pkgconfig intltool libexif gtk dbus_glib exo libxfce4util + libxfce4ui xfconf + ]; + preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; + + meta = { + homepage = "http://goodies.xfce.org/projects/applications/${p_name}"; + description = "A fast and lightweight picture-viewer for the Xfce desktop environment"; + license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; + }; +} diff --git a/pkgs/desktops/xfce/applications/terminal.nix b/pkgs/desktops/xfce/applications/terminal.nix new file mode 100644 index 000000000000..0a61e027356d --- /dev/null +++ b/pkgs/desktops/xfce/applications/terminal.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pkgconfig, intltool, ncurses, gtk, vte, dbus_glib +, exo, libxfce4util, libxfce4ui +}: + +stdenv.mkDerivation rec { + p_name = "xfce4-terminal"; + ver_maj = "0.6"; + ver_min = "1"; + + src = fetchurl { + url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "1j6lpkq952mrl5p24y88f89wn9g0namvywhma639xxsswlkn8d31"; + }; + name = "${p_name}-${ver_maj}.${ver_min}"; + + buildInputs = [ pkgconfig intltool exo gtk vte libxfce4util ncurses dbus_glib libxfce4ui ]; + + meta = { + homepage = http://www.xfce.org/projects/terminal; + description = "A modern terminal emulator primarily for the Xfce desktop environment"; + license = "GPLv2+"; + }; +} diff --git a/pkgs/desktops/xfce/applications/xfce4-mixer.nix b/pkgs/desktops/xfce/applications/xfce4-mixer.nix new file mode 100644 index 000000000000..972442dc56bb --- /dev/null +++ b/pkgs/desktops/xfce/applications/xfce4-mixer.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, pkgconfig, intltool, glib, gstreamer, gst_plugins_base, gtk +, libxfce4util, libxfce4ui, xfce4panel, xfconf, libunique?null }: + +let + # The usual Gstreamer plugins package has a zillion dependencies + # that we don't need for a simple mixer, so build a minimal package. + gst_plugins_minimal = gst_plugins_base.override { + minimalDeps = true; + }; + +in + +stdenv.mkDerivation rec { + p_name = "xfce4-mixer"; + ver_maj = "4.10"; + ver_min = "0"; + + src = fetchurl { + url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "1pnsd00583l7p5d80rxbh58brzy3jnccwikbbbm730a33c08kid8"; + }; + name = "${p_name}-${ver_maj}.${ver_min}"; + + buildInputs = + [ pkgconfig intltool glib gstreamer gst_plugins_minimal gtk + libxfce4util libxfce4ui xfce4panel xfconf libunique + ]; + + postInstall = + '' + mkdir -p $out/nix-support + echo ${gst_plugins_minimal} > $out/nix-support/propagated-user-env-packages + ''; + + meta = { + homepage = http://www.xfce.org/projects/xfce4-mixer; # referenced but inactive + description = "A volume control application for the Xfce desktop environment"; + license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; + }; +} diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix new file mode 100644 index 000000000000..62c5bbe52205 --- /dev/null +++ b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pkgconfig, intltool +, gtk , libxfce4util, libxfce4ui, xfconf }: + +stdenv.mkDerivation rec { + p_name = "xfce4-notifyd"; + ver_maj = "0.2"; + ver_min = "2"; + + src = fetchurl { + url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "0s4ilc36sl5k5mg5727rmqims1l3dy5pwg6dk93wyjqnqbgnhvmn"; + }; + name = "${p_name}-${ver_maj}.${ver_min}"; + + buildInputs = [ pkgconfig intltool gtk libxfce4util libxfce4ui xfconf ]; + + preFixup = '' + rm $out/share/icons/hicolor/icon-theme.cache + # to be able to run the daemon we need it in PATH + cp -l $out/lib/xfce4/notifyd/xfce4-notifyd $out/bin + ''; + + meta = { + homepage = "http://goodies.xfce.org/projects/applications/${p_name}"; + description = "Notification daemon for Xfce"; + license = "GPLv2+"; + }; +} diff --git a/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix b/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix new file mode 100644 index 000000000000..baef68728487 --- /dev/null +++ b/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, intltool, pkgconfig, gtk, libwnck }: + +stdenv.mkDerivation rec { + p_name = "xfce4-taskmanager"; + ver_maj = "1.0"; + ver_min = "0"; + + src = fetchurl { + url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "1vm9gw7j4ngjlpdhnwdf7ifx6xrrn21011almx2vwidhk2f9zvy0"; + }; + name = "${p_name}-${ver_maj}.${ver_min}"; + + buildInputs = [ intltool pkgconfig gtk libwnck ]; + + meta = { + homepage = "http://goodies.xfce.org/projects/applications/${p_name}"; + description = "Easy to use task manager for Xfce"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix b/pkgs/desktops/xfce/art/xfce4-icon-theme.nix new file mode 100644 index 000000000000..1bd257991c97 --- /dev/null +++ b/pkgs/desktops/xfce/art/xfce4-icon-theme.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk }: + +stdenv.mkDerivation rec { + p_name = "xfce4-icon-theme"; + ver_maj = "4.4"; + ver_min = "3"; + + src = fetchurl { + url = "mirror://xfce/src/art/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "1yk6rx3zr9grm4jwpjvqdkl13pisy7qn1wm5cqzmd2kbsn96cy6l"; + }; + name = "${p_name}-${ver_maj}.${ver_min}"; + + buildInputs = [ pkgconfig intltool gtk ]; + + meta = { + homepage = http://www.xfce.org/; + description = "Icons for Xfce"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; + }; +} diff --git a/pkgs/desktops/xfce/core/exo.nix b/pkgs/desktops/xfce/core/exo.nix new file mode 100644 index 000000000000..3131ea679b01 --- /dev/null +++ b/pkgs/desktops/xfce/core/exo.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pkgconfig, intltool, URI, glib, gtk, libxfce4ui, libxfce4util }: + +stdenv.mkDerivation rec { + p_name = "exo"; + ver_maj = "0.10"; + ver_min = "2"; + + src = fetchurl { + url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "1kknxiz703q4snmry65ajm26jwjslbgpzdal6bd090m3z25q51dk"; + }; + name = "${p_name}-${ver_maj}.${ver_min}"; + + buildInputs = [ pkgconfig intltool URI glib gtk libxfce4ui libxfce4util ]; + + preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; + + meta = { + homepage = "http://www.xfce.org/projects/${p_name}"; + description = "Application library for the Xfce desktop environment"; + license = "GPLv2+"; + }; +} diff --git a/pkgs/desktops/xfce/core/garcon.nix b/pkgs/desktops/xfce/core/garcon.nix new file mode 100644 index 000000000000..8e87212c7f7d --- /dev/null +++ b/pkgs/desktops/xfce/core/garcon.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util }: + +stdenv.mkDerivation rec { + p_name = "garcon"; + ver_maj = "0.2"; + ver_min = "0"; + + src = fetchurl { + url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "0v7pkvxcayi86z4f173z5l7w270f3g369sa88z59w0y0p7ns7ph2"; + }; + name = "${p_name}-${ver_maj}.${ver_min}"; + + buildInputs = [ pkgconfig intltool glib libxfce4util ]; + + meta = { + homepage = http://www.xfce.org/; + description = "Xfce menu support library"; + license = "GPLv2+"; + }; +} diff --git a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix new file mode 100644 index 000000000000..a97a11c6f123 --- /dev/null +++ b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk }: + +stdenv.mkDerivation rec { + p_name = "gtk-xfce-engine"; + ver_maj = "3.0"; + ver_min = "1"; + + src = fetchurl { + url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "0vd0ly81540f9133abza56mlqqx1swp0j70ll8kf948sva0wy0zb"; + }; + name = "${p_name}-${ver_maj}.${ver_min}"; + + #TODO: gtk3 + buildInputs = [ pkgconfig intltool gtk ]; + + meta = { + homepage = http://www.xfce.org/; + description = "GTK+ theme engine for Xfce"; + license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; + }; +} diff --git a/pkgs/desktops/xfce/core/libxfce4ui.nix b/pkgs/desktops/xfce/core/libxfce4ui.nix new file mode 100644 index 000000000000..4f0e7062e459 --- /dev/null +++ b/pkgs/desktops/xfce/core/libxfce4ui.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, xfconf +, libglade, libstartup_notification }: + +stdenv.mkDerivation rec { + p_name = "libxfce4ui"; + ver_maj = "4.10"; + ver_min = "0"; + + src = fetchurl { + url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "1qm31s6568cz4c8rl9fsfq0xmf7pldxm0ki62gx1cpybihlgmfd2"; + }; + name = "${p_name}-${ver_maj}.${ver_min}"; + + #TODO: gladeui + # Install into our own prefix instead. + preConfigure = + '' + configureFlags="--with-libglade-module-path=$out/lib/libglade/2.0" + ''; + + buildInputs = + [ pkgconfig intltool gtk libxfce4util xfconf libglade + libstartup_notification + ]; + + enableParallelBuilding = true; + + meta = { + homepage = http://www.xfce.org/; + description = "Basic GUI library for Xfce"; + license = "LGPLv2+"; + }; +} diff --git a/pkgs/desktops/xfce/core/libxfce4util.nix b/pkgs/desktops/xfce/core/libxfce4util.nix new file mode 100644 index 000000000000..88874722b7d0 --- /dev/null +++ b/pkgs/desktops/xfce/core/libxfce4util.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, glib, intltool }: + +stdenv.mkDerivation rec { + p_name = "libxfce4util"; + ver_maj = "4.10"; + ver_min = "0"; + + src = fetchurl { + url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "13k0wwbbqvdmbj4xmk4nxdlgvrdgr5y6r3dk380mzfw053hzwy89"; + }; + name = "${p_name}-${ver_maj}.${ver_min}"; + + buildInputs = [ pkgconfig glib intltool ]; + + meta = { + homepage = http://www.xfce.org/; + description = "Basic utility non-GUI functions for Xfce"; + license = "bsd"; + }; +} diff --git a/pkgs/desktops/xfce/core/libxfcegui4.nix b/pkgs/desktops/xfce/core/libxfcegui4.nix new file mode 100644 index 000000000000..e30fcf223571 --- /dev/null +++ b/pkgs/desktops/xfce/core/libxfcegui4.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk +, libxfce4util, xfconf, libglade, libstartup_notification }: + +stdenv.mkDerivation rec { + p_name = "libxfcegui4"; + ver_maj = "4.10"; + ver_min = "0"; + + src = fetchurl { + url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "0cs5im0ib0cmr1lhr5765yliqjfyxvk4kwy8h1l8bn3mj6bzk0ib"; + }; + name = "${p_name}-${ver_maj}.${ver_min}"; + + #TODO: gladeui + # By default, libxfcegui4 tries to install into libglade's prefix. + # Install into our own prefix instead. + preConfigure = + '' + configureFlags="--with-libglade-module-path=$out/lib/libglade/2.0" + ''; + #NOTE: missing keyboard library support is OK according to the mailing-list + + buildInputs = + [ pkgconfig intltool gtk libxfce4util xfconf libglade + libstartup_notification + ]; + preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; + + meta = { + homepage = http://www.xfce.org/; + description = "Basic GUI library for Xfce"; + license = "LGPLv2+"; + }; +} diff --git a/pkgs/desktops/xfce/core/thunar-volman.nix b/pkgs/desktops/xfce/core/thunar-volman.nix new file mode 100644 index 000000000000..94fc0e369e5c --- /dev/null +++ b/pkgs/desktops/xfce/core/thunar-volman.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui +, xfconf, udev, libnotify }: + +stdenv.mkDerivation rec { + p_name = "thunar-volman"; + ver_maj = "0.8"; + ver_min = "0"; + + src = fetchurl { + url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "1sxw09fwyn5sr6ipxk7r8gqjyf41c2v7vkgl0l6mhy5mcb48f27z"; + }; + name = "${p_name}-${ver_maj}.${ver_min}"; + + buildInputs = + [ pkgconfig intltool exo gtk udev libxfce4ui libxfce4util + xfconf libnotify + ]; + preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; + + enableParallelBuilding = true; + + meta = { + homepage = http://goodies.xfce.org/projects/thunar-plugins/thunar-volman; + description = "Thunar extension for automatic management of removable drives and media"; + license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; + }; +} diff --git a/pkgs/desktops/xfce/core/thunar.nix b/pkgs/desktops/xfce/core/thunar.nix new file mode 100644 index 000000000000..848fca345c5e --- /dev/null +++ b/pkgs/desktops/xfce/core/thunar.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, pkgconfig, intltool +, gtk, dbus_glib, libstartup_notification, libnotify, libexif, pcre, udev +, exo, libxfce4util, xfconf, xfce4panel +}: + +stdenv.mkDerivation rec { + p_name = "thunar"; + ver_maj = "1.6"; + ver_min = "2"; + + src = fetchurl { + url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/Thunar-${ver_maj}.${ver_min}.tar.bz2"; + sha256 = "11dx38rvkfbp91pxrprymxhimsm90gvizp277x9s5rwnwcm1ggbx"; + }; + name = "${p_name}-${ver_maj}.${ver_min}"; + + buildInputs = [ + pkgconfig intltool + gtk dbus_glib libstartup_notification libnotify libexif pcre udev + exo libxfce4util xfconf xfce4panel + ]; + # TODO: optionality? + + enableParallelBuilding = true; + + preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; + + meta = { + homepage = http://thunar.xfce.org/; + description = "Xfce file manager"; + license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; + }; +} diff --git a/pkgs/desktops/xfce/core/tumbler.nix b/pkgs/desktops/xfce/core/tumbler.nix new file mode 100644 index 000000000000..a1da730b35b4 --- /dev/null +++ b/pkgs/desktops/xfce/core/tumbler.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, intltool, dbus_glib, gdk_pixbuf }: + +stdenv.mkDerivation rec { + p_name = "tumbler"; + ver_maj = "0.1"; + ver_min = "27"; + + src = fetchurl { + url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "0s9qj99b81asmlqa823nzykq8g6p9azcp2niak67y9bp52wv6q2c"; + }; + name = "${p_name}-${ver_maj}.${ver_min}"; + + buildInputs = [ pkgconfig intltool dbus_glib gdk_pixbuf ]; + + meta = { + homepage = http://git.xfce.org/xfce/tumbler/; + description = "A D-Bus thumbnailer service"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/xfce/core/xfce-utils.nix b/pkgs/desktops/xfce/core/xfce-utils.nix new file mode 100644 index 000000000000..625780adb313 --- /dev/null +++ b/pkgs/desktops/xfce/core/xfce-utils.nix @@ -0,0 +1,20 @@ +{ v, h, stdenv, fetchXfce, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui, dbus_glib }: + +stdenv.mkDerivation rec { + name = "xfce-utils-${v}"; + src = fetchXfce.core name h; + + configureFlags = "--with-xsession-prefix=$(out)/share/xsessions --with-vendor-info=NixOS.org"; + + buildInputs = [ pkgconfig intltool gtk libxfce4util libxfce4ui dbus_glib ]; + + preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; + + meta = { + homepage = http://www.xfce.org/projects/xfce-utils; + description = "Utilities and scripts for Xfce"; + license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; + }; +} diff --git a/pkgs/desktops/xfce/core/xfce4-appfinder.nix b/pkgs/desktops/xfce/core/xfce4-appfinder.nix new file mode 100644 index 000000000000..b4c9c790ac1b --- /dev/null +++ b/pkgs/desktops/xfce/core/xfce4-appfinder.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pkgconfig, intltool, glib, gtk, libxfce4util +, libxfce4ui, garcon, xfconf }: + +stdenv.mkDerivation rec { + p_name = "xfce4-appfinder"; + ver_maj = "4.9"; # no 4.10 (stable) release yet + ver_min = "4"; + + src = fetchurl { + url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "12lgrbd1n50w9n8xkpai98s2aw8vmjasrgypc57sp0x0qafsqaxq"; + }; + name = "${p_name}-${ver_maj}.${ver_min}"; + + buildInputs = + [ pkgconfig intltool glib gtk libxfce4util libxfce4ui garcon xfconf ]; + + enableParallelBuilding = true; + + meta = { + homepage = http://docs.xfce.org/xfce/xfce4-appfinder/; + description = "Xfce application finder, a tool to locate and launch programs on your system"; + license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; + }; +} diff --git a/pkgs/desktops/xfce/core/xfce4-panel-datadir.patch b/pkgs/desktops/xfce/core/xfce4-panel-datadir.patch new file mode 100644 index 000000000000..ed9df9ef36f3 --- /dev/null +++ b/pkgs/desktops/xfce/core/xfce4-panel-datadir.patch @@ -0,0 +1,24 @@ +diff --git a/panel/panel-module-factory.c b/panel/panel-module-factory.c +index 529fe85..8c792b7 100644 +--- a/panel/panel-module-factory.c ++++ b/panel/panel-module-factory.c +@@ -39,6 +39,7 @@ + #include + #include + ++#define DATADIR "/run/current-system/sw/share/xfce4" + #define PANEL_PLUGINS_DATA_DIR (DATADIR G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S "plugins") + #define PANEL_PLUGINS_DATA_DIR_OLD (DATADIR G_DIR_SEPARATOR_S "panel-plugins") + +diff --git a/panel/panel-module.c b/panel/panel-module.c +index ba39320..519440b 100644 +--- a/panel/panel-module.c ++++ b/panel/panel-module.c +@@ -35,6 +35,7 @@ + #include + #include + ++#define LIBDIR "/run/current-system/sw/lib/xfce4" + #define PANEL_PLUGINS_LIB_DIR (LIBDIR G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S "plugins") + #define PANEL_PLUGINS_LIB_DIR_OLD (LIBDIR G_DIR_SEPARATOR_S "panel-plugins") + diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix new file mode 100644 index 000000000000..a026c4664f18 --- /dev/null +++ b/pkgs/desktops/xfce/core/xfce4-panel.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui +, libwnck, exo, garcon, xfconf, libstartup_notification }: + +stdenv.mkDerivation rec { + p_name = "xfce4-panel"; + ver_maj = "4.10"; + ver_min = "0"; + + src = fetchurl { + url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "1f8903nx6ivzircl8d8s9zna4vjgfy0qhjk5d2x19g9bmycgj89k"; + }; + name = "${p_name}-${ver_maj}.${ver_min}"; + + patches = [ ./xfce4-panel-datadir.patch ]; + patchFlags = "-p1"; + + buildInputs = + [ pkgconfig intltool gtk libxfce4util exo libwnck + garcon xfconf libstartup_notification + ]; + propagatedBuildInputs = [ libxfce4ui ]; + + preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; + + enableParallelBuilding = true; + + meta = { + homepage = http://www.xfce.org/projects/xfce4-panel; + description = "Xfce panel"; + license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; + }; +} diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/pkgs/desktops/xfce/core/xfce4-power-manager.nix new file mode 100644 index 000000000000..7a9b2596e755 --- /dev/null +++ b/pkgs/desktops/xfce/core/xfce4-power-manager.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk, dbus_glib, xfconf +, libxfce4ui, libxfce4util, libnotify, xfce4panel }: + +stdenv.mkDerivation rec { + p_name = "xfce4-power-manager"; + ver_maj = "1.0"; + ver_min = "10"; + + src = fetchurl { + url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "1w120k1sl4s459ijaxkqkba6g1p2sqrf9paljv05wj0wz12bpr40"; + }; + name = "${p_name}-${ver_maj}.${ver_min}"; + + buildInputs = + [ pkgconfig intltool gtk dbus_glib xfconf libxfce4ui libxfce4util + libnotify xfce4panel + ]; + preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; + + meta = { + homepage = http://goodies.xfce.org/projects/applications/xfce4-power-manager; + description = "A power manager for the Xfce Desktop Environment"; + license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; + }; +} diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/pkgs/desktops/xfce/core/xfce4-session.nix new file mode 100644 index 000000000000..a8e7e66c7051 --- /dev/null +++ b/pkgs/desktops/xfce/core/xfce4-session.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui, xfce4panel +, libwnck, dbus_glib, xfconf, libglade, xorg }: + +#TODO: gnome stuff: gconf (assistive?), keyring + +stdenv.mkDerivation rec { + p_name = "xfce4-session"; + ver_maj = "4.10"; + ver_min = "0"; + + src = fetchurl { + url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "1kj65jkjhd0ysf0yxsf88wzpyv6n8i8qgd3gb502hf1x9jksk2mv"; + }; + name = "${p_name}-${ver_maj}.${ver_min}"; + + buildInputs = + [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus_glib + xfconf xfce4panel libglade xorg.iceauth + ]; + + configureFlags = [ "--with-xsession-prefix=$$out" ]; + + preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; + + meta = { + homepage = http://www.xfce.org/projects/xfce4-session; + description = "Session manager for Xfce"; + license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; + }; +} diff --git a/pkgs/desktops/xfce/core/xfce4-settings.nix b/pkgs/desktops/xfce/core/xfce4-settings.nix new file mode 100644 index 000000000000..4cbadaeb54ae --- /dev/null +++ b/pkgs/desktops/xfce/core/xfce4-settings.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui +, libglade, xfconf, xorg, libwnck, libnotify, libxklavier, garcon }: + +#TODO: optional packages +stdenv.mkDerivation rec { + p_name = "xfce4-settings"; + ver_maj = "4.10"; + ver_min = "0"; + + src = fetchurl { + url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "0zppq747z9lrxyv5zrrvpalq7hb3gfhy9p7qbldisgv7m6dz0hq8"; + }; + name = "${p_name}-${ver_maj}.${ver_min}"; + + buildInputs = + [ pkgconfig intltool exo gtk libxfce4util libxfce4ui libglade + xfconf xorg.libXi xorg.libXcursor libwnck libnotify libxklavier garcon + #gtk libxfce4util libxfcegui4 libwnck dbus_glib + #xfconf libglade xorg.iceauth + ]; + configureFlags = "--enable-pluggable-dialogs --enable-sound-settings"; + + meta = { + homepage = http://www.xfce.org/projects/xfce4-settings; + description = "Settings manager for Xfce"; + license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; + }; +} diff --git a/pkgs/desktops/xfce/core/xfconf.nix b/pkgs/desktops/xfce/core/xfconf.nix new file mode 100644 index 000000000000..e608d4591069 --- /dev/null +++ b/pkgs/desktops/xfce/core/xfconf.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, dbus_glib }: + +stdenv.mkDerivation rec { + p_name = "xfconf"; + ver_maj = "4.10"; + ver_min = "0"; + + src = fetchurl { + url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "0xh520z0qh0ib0ijgnyrgii9h5d4pc53n6mx1chhyzfc86j1jlhp"; + }; + name = "${p_name}-${ver_maj}.${ver_min}"; + + #TODO: no perl bingings yet (ExtUtils::Depends, ExtUtils::PkgConfig, Glib) + buildInputs = [ pkgconfig intltool glib libxfce4util ]; + propagatedBuildInputs = [ dbus_glib ]; + + meta = { + homepage = http://docs.xfce.org/xfce/xfconf/start; + description = "Simple client-server configuration storage and query system for Xfce"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/xfce/core/xfdesktop.nix b/pkgs/desktops/xfce/core/xfdesktop.nix new file mode 100644 index 000000000000..4f287af6437f --- /dev/null +++ b/pkgs/desktops/xfce/core/xfdesktop.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui +, libwnck, xfconf, libglade, xfce4panel, thunar, exo, garcon, libnotify }: + +stdenv.mkDerivation rec { + p_name = "xfdesktop"; + ver_maj = "4.10"; + ver_min = "0"; + + src = fetchurl { + url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "0yrddj1lgk3xn4w340y89z7x2isks72ia36pka08kk2x8gpfcyl9"; + }; + name = "${p_name}-${ver_maj}.${ver_min}"; + + buildInputs = + [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck xfconf + libglade xfce4panel thunar exo garcon libnotify + ]; + preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; + + enableParallelBuilding = true; + + meta = { + homepage = http://www.xfce.org/projects/xfdesktop; + description = "Xfce desktop manager"; + license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; + }; +} diff --git a/pkgs/desktops/xfce/core/xfwm4.nix b/pkgs/desktops/xfce/core/xfwm4.nix new file mode 100644 index 000000000000..e2fea73eaeb4 --- /dev/null +++ b/pkgs/desktops/xfce/core/xfwm4.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, pkgconfig, gtk, intltool, libglade, libxfce4util +, libxfce4ui, xfconf, libwnck, libstartup_notification, xorg }: + +stdenv.mkDerivation rec { + p_name = "xfwm4"; + ver_maj = "4.10"; + ver_min = "0"; + + src = fetchurl { + url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "170zzs7adj47srsi2cl723w9pl8k8awd7w1bpzxby7hj92zmf8s9"; + }; + name = "${p_name}-${ver_maj}.${ver_min}"; + + #TODO: kde systray, docs + buildInputs = + [ pkgconfig intltool gtk libglade libxfce4util libxfce4ui xfconf + libwnck libstartup_notification + xorg.libXcomposite xorg.libXfixes xorg.libXdamage + ]; + + enableParallelBuilding = true; + + meta = { + homepage = http://www.xfce.org/projects/xfwm4; + description = "Window manager for Xfce"; + license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; + }; +} diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix new file mode 100644 index 000000000000..07a3ffc6bafd --- /dev/null +++ b/pkgs/desktops/xfce/default.nix @@ -0,0 +1,71 @@ +{ pkgs, newScope }: let + +callPackage = newScope (deps // xfce_self); + +deps = rec { # xfce-global dependency overrides should be here + inherit (pkgs.gnome) libglade libwnck vte gtksourceview; + inherit (pkgs.perlPackages) URI; + + # The useful bits from ‘gnome-disk-utility’. + libgdu = callPackage ./support/libgdu.nix { }; + + # Gvfs is required by Thunar for the trash feature and for volume + # mounting. Should use the one from Gnome, but I don't want to mess + # with the Gnome packages (or pull in a zillion Gnome dependencies). + gvfs = callPackage ./support/gvfs.nix { }; +}; + +xfce_self = rec { # the lines are very long but it seems better than the even-odd line approach + + #### CORE from "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2" + + exo = callPackage ./core/exo.nix { }; + garcon = callPackage ./core/garcon.nix { }; + gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix { }; # ToDo: when should be used? + libxfce4ui = callPackage ./core/libxfce4ui.nix { }; + libxfce4util = callPackage ./core/libxfce4util.nix { }; + libxfcegui4 = callPackage ./core/libxfcegui4.nix { }; + thunar = callPackage ./core/thunar.nix { }; + thunar_volman = callPackage ./core/thunar-volman.nix { }; # ToDo: probably inside Thunar now + tumbler = callPackage ./core/tumbler.nix { }; # ToDo: segfaults after some work + xfce4panel = callPackage ./core/xfce4-panel.nix { }; # ToDo: impure plugins from /run/current-system/sw/lib/xfce4 + xfce4session = callPackage ./core/xfce4-session.nix { }; + xfce4settings = callPackage ./core/xfce4-settings.nix { }; + xfce4_power_manager = callPackage ./core/xfce4-power-manager.nix { }; + xfceutils = null; # removed in 4.10 + xfconf = callPackage ./core/xfconf.nix { }; + xfdesktop = callPackage ./core/xfdesktop.nix { }; + xfwm4 = callPackage ./core/xfwm4.nix { }; + + xfce4_appfinder = callPackage ./core/xfce4-appfinder.nix { }; + + + #### APPLICATIONS from "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2" + + gigolo = callPackage ./applications/gigolo.nix { }; + mousepad = callPackage ./applications/mousepad.nix { }; + ristretto = callPackage ./applications/ristretto.nix { }; + terminal = xfce4terminal; # it has changed its name + xfce4mixer = callPackage ./applications/xfce4-mixer.nix { }; + xfce4notifyd = callPackage ./applications/xfce4-notifyd.nix { }; + xfce4taskmanager= callPackage ./applications/xfce4-taskmanager.nix { }; + xfce4terminal = callPackage ./applications/terminal.nix { }; + + + #### ART from "mirror://xfce/src/art/${p_name}/${ver_maj}/${name}.tar.bz2" + + xfce4icontheme = callPackage ./art/xfce4-icon-theme.nix { }; + + + #### PANEL PLUGINS from "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2" + + xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { }; + xfce4_cpufreq_plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix { }; + +}; # xfce_self + +in xfce_self + + + + diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix new file mode 100644 index 000000000000..18d043c51fde --- /dev/null +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: + +stdenv.mkDerivation rec { + p_name = "xfce4-cpufreq-plugin"; + ver_maj = "1.0"; + ver_min = "0"; + + src = fetchurl { + url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "0q2lj8a25iq9w3dynh6qvsmh19y1v7i82g46yza6gvw7fjcrmcz1"; + }; + name = "${p_name}-${ver_maj}.${ver_min}"; + + buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; + + meta = { + homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; + description = "CPU Freq load plugin for Xfce panel"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix new file mode 100644 index 000000000000..dda5dc89defd --- /dev/null +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, gtk}: + +stdenv.mkDerivation rec { + p_name = "xfce4-systemload-plugin"; + ver_maj = "1.1"; + ver_min = "1"; + + src = fetchurl { + url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "1bnrr30h6kgb37ixcq7frx2gvj2p99bpa1jyzppwjxp5x7xkxh8s"; + }; + name = "${p_name}-${ver_maj}.${ver_min}"; + + buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel gtk ]; + + meta = { + homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; + description = "System load plugin for Xfce panel"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/desktops/xfce/support/gvfs.nix b/pkgs/desktops/xfce/support/gvfs.nix new file mode 100644 index 000000000000..af70aea755af --- /dev/null +++ b/pkgs/desktops/xfce/support/gvfs.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, glib, dbus, intltool, udev, libgdu, fuse +, libxml2, libxslt, docbook_xsl, libgphoto2, libtool }: + +stdenv.mkDerivation rec { + name = "gvfs-1.14.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gvfs/1.14/${name}.tar.xz"; + sha256 = "1g4ghyf45jg2ajdkv2d972hbckyjh3d9jdrppai85pl9pk2dmfy3"; + }; + + buildInputs = + [ pkgconfig glib dbus.libs intltool udev libgdu fuse libxml2 libxslt + docbook_xsl libgphoto2 libtool + ]; + + meta = { + description = "Virtual Filesystem support library (for Xfce)"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; + }; +} diff --git a/pkgs/desktops/xfce/support/libgdu-only.patch b/pkgs/desktops/xfce/support/libgdu-only.patch new file mode 100644 index 000000000000..c5873c716811 --- /dev/null +++ b/pkgs/desktops/xfce/support/libgdu-only.patch @@ -0,0 +1,144 @@ +diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/configure.ac gnome-disk-utility-2.30.1/configure.ac +--- gnome-disk-utility-2.30.1-orig/configure.ac 2010-03-22 16:54:09.000000000 +0100 ++++ gnome-disk-utility-2.30.1/configure.ac 2011-09-06 02:52:09.000000000 +0200 +@@ -106,17 +106,6 @@ + # GNOME + # ***** + +-GNOME_COMMON_INIT +-GNOME_DOC_INIT +-GNOME_DEBUG_CHECK +-GNOME_COMPILE_WARNINGS([maximum]) +-GNOME_MAINTAINER_MODE_DEFINES +- +-AC_ARG_ENABLE(gtk-doc, AS_HELP_STRING([--enable-gtk-doc], +- [use gtk-doc to build documentation [default=yes]]),, +- enable_gtk_doc=yes) +-GTK_DOC_CHECK([1.3]) +- + # *************************** + # Check for required packages + # *************************** +@@ -130,7 +119,6 @@ + UNIQUE_REQUIRED=1.0 + LIBNOTIFY_REQUIRED=0.3.0 + NAUTILUS_REQUIRED=2.24.0 +-AVAHI_UI_REQUIRED=0.6.25 + + UDISKS_REQUIRED=1.0.0 + UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION=1.1.0 +@@ -144,13 +132,7 @@ + PKG_CHECK_MODULES(GIO_UNIX2, [gio-unix-2.0 >= $GIO2_REQUIRED]) + PKG_CHECK_MODULES(GTHREAD2, [gthread-2.0 >= $GLIB2_REQUIRED]) + PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= $DBUS_GLIB_REQUIRED]) +-PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= $GTK2_REQUIRED]) +-PKG_CHECK_MODULES(UNIQUE, [unique-1.0 >= $UNIQUE_REQUIRED]) +-PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= $LIBNOTIFY_REQUIRED]) + PKG_CHECK_MODULES(UDISKS, [udisks >= $UDISKS_REQUIRED udisks < $UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION]) +-PKG_CHECK_MODULES(X11, [x11]) +-PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14]) +-PKG_CHECK_MODULES(AVAHI_UI, [avahi-ui >= $AVAHI_UI_REQUIRED]) + + # ************* + # Remote Access +@@ -183,21 +165,10 @@ + AC_SUBST(GNOME_KEYRING_CFLAGS) + AM_CONDITIONAL(ENABLE_GNOME_KEYRING, [test "$have_gnome_keyring" = "yes"]) + +-# ************* +-# Documentation +-# ************* +- +-AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no) +-if test x$SCROLLKEEPER_CONFIG = xno; then +- AC_MSG_ERROR(Couldn't find scrollkeeper-config, please install the scrollkeeper package) +-fi +- + # ******************** + # Internationalization + # ******************** + +-IT_PROG_INTLTOOL([$INTLTOOL_REQUIRED]) +- + GETTEXT_PACKAGE=gnome-disk-utility + AC_SUBST([GETTEXT_PACKAGE]) + AM_GLIB_GNU_GETTEXT +diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/doc/Makefile.am gnome-disk-utility-2.30.1/doc/Makefile.am +--- gnome-disk-utility-2.30.1-orig/doc/Makefile.am 2009-12-02 20:52:38.000000000 +0100 ++++ gnome-disk-utility-2.30.1/doc/Makefile.am 2011-09-06 02:17:15.000000000 +0200 +@@ -70,9 +70,7 @@ + Makefile.in \ + $(NULL) + +-include $(top_srcdir)/gtk-doc.make +- +-CLEANFILES += *~ \ ++CLEANFILES = *~ \ + gnome-disk-utility-scan* \ + gnome-disk-utility.args \ + gnome-disk-utility.hierarchy \ +@@ -91,4 +89,4 @@ + $(NULL) + + # Version information for marking the documentation +-EXTRA_DIST += version.xml.in ++EXTRA_DIST = version.xml.in +diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/gtk-doc.make gnome-disk-utility-2.30.1/gtk-doc.make +--- gnome-disk-utility-2.30.1-orig/gtk-doc.make 2010-03-16 00:08:20.000000000 +0100 ++++ gnome-disk-utility-2.30.1/gtk-doc.make 2011-09-06 02:15:33.000000000 +0200 +@@ -4,15 +4,9 @@ + # Everything below here is generic # + #################################### + +-if GTK_DOC_USE_LIBTOOL +-GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +-GTKDOC_RUN = $(LIBTOOL) --mode=execute +-else + GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) + GTKDOC_RUN = +-endif + + # We set GPATH here; this gives us semantics for GNU make + # which are more like other make's VPATH, when it comes to +@@ -49,22 +43,7 @@ + + CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) + +-if ENABLE_GTK_DOC +-if GTK_DOC_BUILD_HTML +-HTML_BUILD_STAMP=html-build.stamp +-else +-HTML_BUILD_STAMP= +-endif +-if GTK_DOC_BUILD_PDF +-PDF_BUILD_STAMP=pdf-build.stamp +-else +-PDF_BUILD_STAMP= +-endif +- +-all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) +-else + all-local: +-endif + + docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) + +diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/help/Makefile.am gnome-disk-utility-2.30.1/help/Makefile.am +--- gnome-disk-utility-2.30.1-orig/help/Makefile.am 2009-09-23 20:35:01.000000000 +0200 ++++ gnome-disk-utility-2.30.1/help/Makefile.am 2011-09-06 02:18:13.000000000 +0200 +@@ -1,4 +1,3 @@ +-include $(top_srcdir)/gnome-doc-utils.make + dist-hook: doc-dist-hook + + DOC_MODULE = palimpsest +diff -ru -x '*~' gnome-disk-utility-2.30.1-orig/Makefile.am gnome-disk-utility-2.30.1/Makefile.am +--- gnome-disk-utility-2.30.1-orig/Makefile.am 2010-03-16 00:12:39.000000000 +0100 ++++ gnome-disk-utility-2.30.1/Makefile.am 2011-09-06 02:17:34.000000000 +0200 +@@ -1,4 +1,4 @@ +-SUBDIRS = src data doc help po ++SUBDIRS = src data + + EXTRA_DIST = \ + autogen.sh \ diff --git a/pkgs/desktops/xfce/support/libgdu.nix b/pkgs/desktops/xfce/support/libgdu.nix new file mode 100644 index 000000000000..32835f0434ab --- /dev/null +++ b/pkgs/desktops/xfce/support/libgdu.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, gnome, pkgconfig, glib, dbus_glib, intltool, udev, gtk +, libnotify, udisks, libatasmart, avahi +, autoconf, automake, libtool }: + +let version = "2.30.1"; in + +stdenv.mkDerivation rec { + name = "libgdu-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-disk-utility/2.30/gnome-disk-utility-${version}.tar.bz2"; + sha256 = "df9b336c780b5d77ceda54e96f7c37c67645f5e73d48754ba0a8efba7c1836d7"; + }; + + # Only build libgdu, not all that Gnome crap. + patches = [ ./libgdu-only.patch ]; + + buildInputs = + [ pkgconfig glib dbus_glib udisks + autoconf automake libtool + ]; + + preConfigure = + '' + substituteInPlace src/gdu/Makefile.am --replace /usr/share/dbus-1/interfaces ${udisks}/share/dbus-1/interfaces + autoreconf -f -i + ''; + + postConfigure = "cd src/gdu"; + + meta = { + description = "Xfce/Gvfs support library for mounting filesystems"; + }; +} diff --git a/pkgs/development/libraries/libunique/1.1.6-G_CONST_RETURN.patch b/pkgs/development/libraries/libunique/1.1.6-G_CONST_RETURN.patch new file mode 100644 index 000000000000..1cc5b6e01be4 --- /dev/null +++ b/pkgs/development/libraries/libunique/1.1.6-G_CONST_RETURN.patch @@ -0,0 +1,143 @@ +From 557b0e5045c9eadb556ce11e16965cf0d0787438 Mon Sep 17 00:00:00 2001 +From: Stef Walter +Date: Tue, 14 Jun 2011 12:33:45 +0100 +Subject: [PATCH] Remove G_CONST_RETURN usage, now that its gone in glib. + +https://bugzilla.gnome.org/show_bug.cgi?id=652545 + +[Alexandre Rostovtsev : backported to unique-1.1] +--- + unique/uniqueapp.c | 4 ++-- + unique/uniquebackend.c | 4 ++-- + unique/uniquebackend.h | 4 ++-- + unique/uniqueinternals.h | 4 ++-- + unique/uniquemessage.c | 4 ++-- + unique/uniquemessage.h | 4 ++-- + 6 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/unique/uniqueapp.c b/unique/uniqueapp.c +index b40a86c..e8edc94 100644 +--- a/unique/uniqueapp.c ++++ b/unique/uniqueapp.c +@@ -781,7 +781,7 @@ unique_app_watch_window (UniqueApp *app, + } + + +-G_CONST_RETURN gchar * ++const gchar * + unique_command_to_string (UniqueApp *app, + gint command) + { +@@ -863,7 +863,7 @@ unique_command_from_string (UniqueApp *app, + return retval; + } + +-G_CONST_RETURN gchar * ++const gchar * + unique_response_to_string (UniqueResponse response) + { + GEnumClass *enum_class; +diff --git a/unique/uniquebackend.c b/unique/uniquebackend.c +index a76e42e..68e2735 100644 +--- a/unique/uniquebackend.c ++++ b/unique/uniquebackend.c +@@ -111,7 +111,7 @@ unique_backend_set_name (UniqueBackend *backend, + * + * Return value: FIXME + */ +-G_CONST_RETURN gchar * ++const gchar * + unique_backend_get_name (UniqueBackend *backend) + { + g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL); +@@ -154,7 +154,7 @@ unique_backend_set_startup_id (UniqueBackend *backend, + * + * Return value: FIXME + */ +-G_CONST_RETURN gchar * ++const gchar * + unique_backend_get_startup_id (UniqueBackend *backend) + { + g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL); +diff --git a/unique/uniquebackend.h b/unique/uniquebackend.h +index a50ce4e..b19ad3e 100644 +--- a/unique/uniquebackend.h ++++ b/unique/uniquebackend.h +@@ -94,10 +94,10 @@ GType unique_backend_get_type (void) G_GNUC_CONST; + + UniqueBackend * unique_backend_create (void); + +-G_CONST_RETURN gchar *unique_backend_get_name (UniqueBackend *backend); ++const gchar * unique_backend_get_name (UniqueBackend *backend); + void unique_backend_set_name (UniqueBackend *backend, + const gchar *name); +-G_CONST_RETURN gchar *unique_backend_get_startup_id (UniqueBackend *backend); ++const gchar * unique_backend_get_startup_id (UniqueBackend *backend); + void unique_backend_set_startup_id (UniqueBackend *backend, + const gchar *startup_id); + GdkScreen * unique_backend_get_screen (UniqueBackend *backend); +diff --git a/unique/uniqueinternals.h b/unique/uniqueinternals.h +index 3cec152..ccae0cd 100644 +--- a/unique/uniqueinternals.h ++++ b/unique/uniqueinternals.h +@@ -44,11 +44,11 @@ UniqueResponse unique_app_emit_message_received (UniqueApp *app, + * and then back into an id + */ + UniqueResponse unique_response_from_string (const gchar *response); +-G_CONST_RETURN gchar *unique_response_to_string (UniqueResponse response); ++const gchar * unique_response_to_string (UniqueResponse response); + + gint unique_command_from_string (UniqueApp *app, + const gchar *command); +-G_CONST_RETURN gchar *unique_command_to_string (UniqueApp *app, ++const gchar * unique_command_to_string (UniqueApp *app, + gint command); + + G_END_DECLS +diff --git a/unique/uniquemessage.c b/unique/uniquemessage.c +index c74392d..2b2a9fc 100644 +--- a/unique/uniquemessage.c ++++ b/unique/uniquemessage.c +@@ -185,7 +185,7 @@ unique_message_data_set (UniqueMessageData *message_data, + * + * Since: 1.0.2 + */ +-G_CONST_RETURN guchar * ++const guchar * + unique_message_data_get (UniqueMessageData *message_data, + gsize *length) + { +@@ -525,7 +525,7 @@ unique_message_data_get_screen (UniqueMessageData *message_data) + * owned by the #UniqueMessageData structure and should not be + * modified or freed + */ +-G_CONST_RETURN gchar * ++const gchar * + unique_message_data_get_startup_id (UniqueMessageData *message_data) + { + g_return_val_if_fail (message_data != NULL, NULL); +diff --git a/unique/uniquemessage.h b/unique/uniquemessage.h +index d3e9c3c..93eee21 100644 +--- a/unique/uniquemessage.h ++++ b/unique/uniquemessage.h +@@ -48,7 +48,7 @@ void unique_message_data_free (UniqueMessageData *me + void unique_message_data_set (UniqueMessageData *message_data, + const guchar *data, + gsize length); +-G_CONST_RETURN guchar *unique_message_data_get (UniqueMessageData *message_data, ++const guchar * unique_message_data_get (UniqueMessageData *message_data, + gsize *length); + + gboolean unique_message_data_set_text (UniqueMessageData *message_data, +@@ -63,7 +63,7 @@ void unique_message_data_set_filename (UniqueMessageData *me + gchar * unique_message_data_get_filename (UniqueMessageData *message_data); + + GdkScreen * unique_message_data_get_screen (UniqueMessageData *message_data); +-G_CONST_RETURN gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data); ++const gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data); + guint unique_message_data_get_workspace (UniqueMessageData *message_data); + + G_END_DECLS +-- +1.7.6 + diff --git a/pkgs/development/libraries/libunique/1.1.6-compiler-warnings.patch b/pkgs/development/libraries/libunique/1.1.6-compiler-warnings.patch new file mode 100644 index 000000000000..f47e66267d50 --- /dev/null +++ b/pkgs/development/libraries/libunique/1.1.6-compiler-warnings.patch @@ -0,0 +1,50 @@ +From 9df132a70d54b768a8e1d0335d24b85ac9b3fb76 Mon Sep 17 00:00:00 2001 +From: Emmanuele Bassi +Date: Sun, 27 Mar 2011 08:42:22 +0000 +Subject: Remove compiler warnings + +(cherry picked from commit f791ed16b19dddc7fbaf90d8f797520e67883021) + +Signed-off-by: Emmanuele Bassi +--- +diff --git a/unique/dbus/uniquebackend-dbus.c b/unique/dbus/uniquebackend-dbus.c +index 3ae1bed..69faa00 100644 +--- a/unique/dbus/uniquebackend-dbus.c ++++ b/unique/dbus/uniquebackend-dbus.c +@@ -84,7 +84,6 @@ unique_backend_dbus_register_proxy (UniqueBackendDBus *backend_dbus) + static gboolean + unique_backend_dbus_request_name (UniqueBackend *backend) + { +- UniqueBackendDBus *backend_dbus; + const gchar *name; + DBusGConnection *connection; + DBusGProxy *proxy; +@@ -97,8 +96,6 @@ unique_backend_dbus_request_name (UniqueBackend *backend) + if (!connection) + return FALSE; + +- backend_dbus = UNIQUE_BACKEND_DBUS (backend); +- + retval = TRUE; + name = unique_backend_get_name (backend); + g_assert (name != NULL); +@@ -207,10 +204,14 @@ unique_backend_dbus_send_message (UniqueBackend *backend, + cmd, data, time_, + &resp, + &error); +- if (error) ++ if (!res) + { +- g_warning ("Error while sending message: %s", error->message); +- g_error_free (error); ++ if (error) ++ { ++ g_warning ("Error while sending message: %s", error->message); ++ g_error_free (error); ++ } ++ + g_free (cmd); + + return UNIQUE_RESPONSE_INVALID; +-- +cgit v0.9 diff --git a/pkgs/development/libraries/libunique/1.1.6-fix-test.patch b/pkgs/development/libraries/libunique/1.1.6-fix-test.patch new file mode 100644 index 000000000000..b2e85e4d71a5 --- /dev/null +++ b/pkgs/development/libraries/libunique/1.1.6-fix-test.patch @@ -0,0 +1,26 @@ +From caf736f4b84808393b0d7030ae6128a3322a71e2 Mon Sep 17 00:00:00 2001 +From: Tobias Mueller +Date: Mon, 12 Apr 2010 13:01:42 +0000 +Subject: test-unique: Resolve format string issues + +Provide a proper literal format string to not expose potential vulnerabilites. +Fixes bug 615522. +--- +diff --git a/tests/test-unique.c b/tests/test-unique.c +index b7cde45..c9958c9 100644 +--- a/tests/test-unique.c ++++ b/tests/test-unique.c +@@ -82,9 +82,11 @@ app_message_cb (UniqueApp *app, + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_INFO, + GTK_BUTTONS_CLOSE, ++ "%s", + title); + if (message) + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), ++ "%s", + message); + + gtk_window_set_urgency_hint (GTK_WINDOW (dialog), TRUE); +-- +cgit v0.9 diff --git a/pkgs/development/libraries/libunique/1.1.6-include-terminator.patch b/pkgs/development/libraries/libunique/1.1.6-include-terminator.patch new file mode 100644 index 000000000000..927771e7311b --- /dev/null +++ b/pkgs/development/libraries/libunique/1.1.6-include-terminator.patch @@ -0,0 +1,37 @@ +From 30ca2903a8ed4eed974ea744e4b9bd96198c425d Mon Sep 17 00:00:00 2001 +From: Rodney Lorrimar +Date: Mon, 21 Dec 2009 02:07:46 +0000 +Subject: Include NUL terminator in unique_message_data_get_filename() + +https://bugzilla.gnome.org/show_bug.cgi?id=605104 + +Signed-off-by: Emmanuele Bassi +--- +diff --git a/unique/uniqueinternals.h b/unique/uniqueinternals.h +index ace40ed..3cec152 100644 +--- a/unique/uniqueinternals.h ++++ b/unique/uniqueinternals.h +@@ -13,7 +13,7 @@ G_BEGIN_DECLS + struct _UniqueMessageData + { + guchar *data; +- gint length; ++ gint length; /* length of data not including NUL terminator */ + + GdkScreen *screen; + gchar *startup_id; +diff --git a/unique/uniquemessage.c b/unique/uniquemessage.c +index 10f6df5..c74392d 100644 +--- a/unique/uniquemessage.c ++++ b/unique/uniquemessage.c +@@ -493,7 +493,7 @@ unique_message_data_get_filename (UniqueMessageData *message_data) + { + g_return_val_if_fail (message_data != NULL, NULL); + +- return g_memdup (message_data->data, message_data->length); ++ return g_memdup (message_data->data, message_data->length + 1); + } + + /** +-- +cgit v0.9 diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix new file mode 100644 index 000000000000..603759d47c06 --- /dev/null +++ b/pkgs/development/libraries/libunique/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, pkgconfig, glib, gtk, dbus_glib }: + +stdenv.mkDerivation rec { + name = "libunique-1.1.6"; + src = fetchurl { + url = "mirror://gnome/sources/libunique/1.1/${name}.tar.bz2"; + sha256 = "1fsgvmncd9caw552lyfg8swmsd6bh4ijjsph69bwacwfxwf09j75"; + }; + + # patches from Gentoo portage + patches = [ + ./1.1.6-compiler-warnings.patch + ./1.1.6-fix-test.patch + ./1.1.6-G_CONST_RETURN.patch + ./1.1.6-include-terminator.patch + ]; + + buildInputs = [ pkgconfig glib gtk dbus_glib ]; + + # don't make deprecated usages hard errors + preBuildPhases = "preBuild"; + preBuild = ''substituteInPlace unique/dbus/Makefile --replace -Werror ""''; + + doCheck = true; + + meta = { + homepage = http://live.gnome.org/LibUnique; + description = "A library for writing single instance applications"; + license = "LGPLv2.1"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98891a260480..075f8fae7232 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4491,6 +4491,8 @@ let libungif = callPackage ../development/libraries/giflib/libungif.nix { }; + libunique = callPackage ../development/libraries/libunique/default.nix { }; + libusb = callPackage ../development/libraries/libusb { }; libusb1 = callPackage ../development/libraries/libusb1 { }; @@ -8591,12 +8593,8 @@ let oxygen_gtk = callPackage ../misc/themes/gtk2/oxygen-gtk { }; - xfce = xfce48; - - xfce48 = recurseIntoAttrs - (let callPackage = newScope pkgs.xfce48; in - import ../desktops/xfce-4.8 { inherit callPackage pkgs; }); - + xfce = xfce4_10; + xfce4_10 = recurseIntoAttrs (import ../desktops/xfce { inherit pkgs newScope; }); ### SCIENCE diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index b3b58f43e1b9..4341a225febb 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -457,7 +457,6 @@ with (import ./release-lib.nix); xfce4panel = linux; xfce4session = linux; xfce4settings = linux; - xfceutils = linux; xfdesktop = linux; xfwm4 = linux; }; -- cgit 1.4.1 From ed740f4c95e5b806623198db1ee674adbf083c31 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Thu, 21 Feb 2013 15:38:27 +0100 Subject: mesa: add some missing buildInputs (failed in new stdenv) --- pkgs/development/libraries/mesa/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 374fd7ffbc9a..4516f1aa977e 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -30,8 +30,10 @@ stdenv.mkDerivation { # Texture floats are patented, see docs/patents.txt + stdenv.lib.optionalString enableTextureFloats " --enable-texture-float"; - buildInputs = [ expat libdrm libXxf86vm libXfixes libXdamage glproto dri2proto - libxml2Python libX11 libXext libxcb libXt udev llvm ]; + buildInputs = [ + autoconf automake libtool expat libxml2Python udev llvm + libdrm libXxf86vm libXfixes libXdamage glproto dri2proto libX11 libXext libxcb libXt + ]; nativeBuildInputs = [ pkgconfig python makedepend file flex bison ]; -- cgit 1.4.1 From 811605c3a47e04d837cc5b15a184522c3ab6d1c4 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Thu, 21 Feb 2013 17:46:50 +0100 Subject: gtk3: major update to 3.6.4 --- pkgs/development/libraries/gtk+/3-default.nix | 50 ++++++++++++++++++++++++++ pkgs/development/libraries/gtk+/3.2.x.nix | 52 --------------------------- pkgs/top-level/all-packages.nix | 4 ++- 3 files changed, 53 insertions(+), 53 deletions(-) create mode 100644 pkgs/development/libraries/gtk+/3-default.nix delete mode 100644 pkgs/development/libraries/gtk+/3.2.x.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/gtk+/3-default.nix b/pkgs/development/libraries/gtk+/3-default.nix new file mode 100644 index 000000000000..3b7361835e23 --- /dev/null +++ b/pkgs/development/libraries/gtk+/3-default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchurl, pkgconfig, glib, atk, pango, cairo, perl, xlibs +, gdk_pixbuf, xz, at_spi2_atk +, xineramaSupport ? true +, cupsSupport ? true, cups ? null +}: + +assert xineramaSupport -> xlibs.libXinerama != null; +assert cupsSupport -> cups != null; + +stdenv.mkDerivation rec { + name = "gtk+-3.6.4"; + + src = fetchurl { + url = "mirror://gnome/sources/gtk+/3.6/${name}.tar.xz"; + sha256 = "18gijn9ghzv7d6np10q9bhp7lwgjb462n3xj1dn9hkwkdyc3gnnv"; + }; + + enableParallelBuilding = true; + + buildInputs = with xlibs; [ + pkgconfig glib atk pango gdk_pixbuf at_spi2_atk + libXrandr libXrender libXcomposite libXi + ] + ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama + ++ stdenv.lib.optionals cupsSupport [ cups ]; + + postInstall = "rm -rf $out/share/gtk-doc"; + + meta = { + description = "A multi-platform toolkit for creating graphical user interfaces"; + + longDescription = '' + GTK+ is a highly usable, feature rich toolkit for creating + graphical user interfaces which boasts cross platform + compatibility and an easy to use API. GTK+ it is written in C, + but has bindings to many other popular programming languages + such as C++, Python and C# among others. GTK+ is licensed + under the GNU LGPL 2.1 allowing development of both free and + proprietary software with GTK+ without any license fees or + royalties. + ''; + + homepage = http://www.gtk.org/; + + license = "LGPLv2+"; + + maintainers = with stdenv.lib.maintainers; [urkud raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gtk+/3.2.x.nix b/pkgs/development/libraries/gtk+/3.2.x.nix deleted file mode 100644 index cace1b626f49..000000000000 --- a/pkgs/development/libraries/gtk+/3.2.x.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, atk, pango, cairo, perl, xlibs -, gdk_pixbuf, xz -, xineramaSupport ? true -, cupsSupport ? true, cups ? null -}: - -assert xineramaSupport -> xlibs.libXinerama != null; -assert cupsSupport -> cups != null; - -stdenv.mkDerivation rec { - name = "gtk+-3.2.4"; - - src = fetchurl { - url = "mirror://gnome/sources/gtk+/3.2/${name}.tar.xz"; - sha256 = "f981bf514858c00d7084bd6f6c34b3c60b8aebdb959e7aca6faa59ed67c136bd"; - }; - - enableParallelBuilding = true; - - nativeBuildInputs = [ perl pkgconfig ]; - - propagatedBuildInputs = - [ xlibs.xlibs glib atk pango gdk_pixbuf cairo - xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi - ] - ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama - ++ stdenv.lib.optionals cupsSupport [ cups ]; - - postInstall = "rm -rf $out/share/gtk-doc"; - - meta = { - description = "A multi-platform toolkit for creating graphical user interfaces"; - - longDescription = '' - GTK+ is a highly usable, feature rich toolkit for creating - graphical user interfaces which boasts cross platform - compatibility and an easy to use API. GTK+ it is written in C, - but has bindings to many other popular programming languages - such as C++, Python and C# among others. GTK+ is licensed - under the GNU LGPL 2.1 allowing development of both free and - proprietary software with GTK+ without any license fees or - royalties. - ''; - - homepage = http://www.gtk.org/; - - license = "LGPLv2+"; - - maintainers = with stdenv.lib.maintainers; [urkud raskin]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e260ec13ea4b..c6458b72e4c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3894,7 +3894,9 @@ let gtkmm = callPackage ../development/libraries/gtkmm/2.24.x.nix { }; gtkmm3 = callPackage ../development/libraries/gtkmm/3.2.x.nix { }; - gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.2.x.nix { }); + gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3-default.nix { + inherit (gnome3) at_spi2_atk; + }); gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp { gtksharp = gtksharp2; -- cgit 1.4.1 From d13851c6a00350c83e589c6a11f4d29ee641c495 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Thu, 21 Feb 2013 19:39:51 +0100 Subject: webkit: hot-fix the build, use default libpng and perl --- pkgs/development/libraries/webkit/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix index d229228b94f7..1ba90e67d85f 100644 --- a/pkgs/development/libraries/webkit/default.nix +++ b/pkgs/development/libraries/webkit/default.nix @@ -9,7 +9,7 @@ rec { sha256 = s.hash; }; - buildInputs = [gtk glib atk cairo curl fontconfig freetype + buildInputs = [gtk gtk2 glib atk cairo curl fontconfig freetype gettext libjpeg libpng libtiff libxml2 libxslt pango sqlite icu gperf bison flex autoconf automake libtool perl intltool pkgconfig libsoup gtkdoc libXt libproxy @@ -91,6 +91,6 @@ rec { maintainers = [stdenv.lib.maintainers.raskin]; }; passthru = { - inherit gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg; + inherit gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg libsoup; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 271022d8e7f4..a5ecbfd6e3a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5015,7 +5015,7 @@ let webkit = builderDefsPackage ../development/libraries/webkit { inherit (gnome) gtkdoc libsoup; - inherit atk pango glib; + inherit atk pango glib gtk2 /*for plugins etc. even with gtk3, see Gentoo ebuild*/; gtk = gtk3; inherit freetype fontconfig gettext gperf curl libjpeg libtiff libxml2 libxslt sqlite @@ -5025,8 +5025,7 @@ let inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good; inherit (xlibs) libXt renderproto libXrender kbproto; - libpng = libpng12; - perl = perl510; + inherit libpng perl; }; webkit_gtk2 = @@ -5041,8 +5040,7 @@ let inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good; inherit (xlibs) libXt renderproto libXrender; - libpng = libpng12; - perl = perl510; + inherit libpng perl; }; webkitSVN = @@ -5057,7 +5055,7 @@ let inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good; inherit (xlibs) libXt renderproto libXrender; - libpng = libpng12; + inherit libpng; }; wvstreams = callPackage ../development/libraries/wvstreams { }; -- cgit 1.4.1 From 99bc034a04fa91a6c52ea54197297e31bb5bbf7d Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Thu, 21 Feb 2013 20:09:10 +0100 Subject: gnome3.gconf: migrate --- pkgs/desktops/gnome-3/core/gconf/default.nix | 19 ++++++++++++------ .../gnome-3/core/gnome-terminal/default.nix | 4 ++-- pkgs/development/libraries/GConf/3.x.nix | 23 ---------------------- pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/release-python.nix | 1 - 5 files changed, 15 insertions(+), 34 deletions(-) delete mode 100644 pkgs/development/libraries/GConf/3.x.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/desktops/gnome-3/core/gconf/default.nix b/pkgs/desktops/gnome-3/core/gconf/default.nix index cfe2b2e44659..9ca9c227d586 100644 --- a/pkgs/desktops/gnome-3/core/gconf/default.nix +++ b/pkgs/desktops/gnome-3/core/gconf/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3, libxml2 -, intltool, dbus_libs, polkit }: +{ stdenv, fetchurl, pkgconfig, dbus_glib, gtk, glib, libxml2 +, intltool, polkit, orbit }: stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { moduleName = "GConf"; origName = "${moduleName}-${versionMajor}.${versionMinor}"; - + name = "gconf-${versionMajor}.${versionMinor}"; src = fetchurl { @@ -16,7 +16,14 @@ stdenv.mkDerivation rec { sha256 = "1ijqks0jxc4dyfxg4vnbqds4aj6miyahlsmlqlkf2bi1798akpjd"; }; - buildInputs = [ dbus_libs dbus_glib libxml2 polkit gnome3.gtk ]; - propagatedBuildInputs = [ gnome3.glib ]; - buildNativeInputs = [ pkgconfig intltool ]; + buildInputs = [ libxml2 polkit gtk orbit ]; + propagatedBuildInputs = [ glib dbus_glib ]; + nativeBuildInputs = [ pkgconfig intltool ]; + + # ToDo: ldap reported as not found but afterwards reported as supported + + meta = { + homepage = http://projects.gnome.org/gconf/; + description = "A system for storing application preferences"; + }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index ccd827b8d5db..9d2ecdba476b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango -, gnome_doc_utils, intltool, libX11, which, GConf3 }: +, gnome_doc_utils, intltool, libX11, which, gconf }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; configureFlags = "--disable-scrollkeeper"; - buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte GConf3 ]; + buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte gconf ]; buildNativeInputs = [ pkgconfig intltool gnome_doc_utils which ]; } diff --git a/pkgs/development/libraries/GConf/3.x.nix b/pkgs/development/libraries/GConf/3.x.nix deleted file mode 100644 index 82c0c1f2c435..000000000000 --- a/pkgs/development/libraries/GConf/3.x.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, glib, dbus_glib, pkgconfig, libxml2, gtk3, intltool, polkit }: - -stdenv.mkDerivation { - name = "GConf-3.2.3"; - - src = fetchurl { - url = mirror://gnome/sources/GConf/3.2/GConf-3.2.3.tar.xz; - sha256 = "0jd1z9gb1b7mv4g07qm554va6idasf3swgrfqflypdh9s38mvdcy"; - }; - - propagatedBuildInputs = [ glib dbus_glib ]; - buildInputs = [ polkit gtk3 libxml2 ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - configureFlags = "--disable-orbit"; - - meta = { - homepage = http://projects.gnome.org/gconf/; - description = "A system for storing application preferences"; - maintainers = [ stdenv.lib.maintainers.urkud ]; - inherit (gtk3.meta) platforms; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6458b72e4c2..0b7668877812 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3636,8 +3636,6 @@ let gav = callPackage ../games/gav { }; - GConf3 = callPackage ../development/libraries/GConf/3.x.nix { }; - gdome2 = callPackage ../development/libraries/gdome2 { inherit (gnome) gtkdoc; }; diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 05a78a099f75..3641005dc74b 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -374,7 +374,6 @@ in gcj44 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; gcj46 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; gcl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - GConf3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; gdb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; gdbCross = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; gdk_pixbuf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; -- cgit 1.4.1 From b8a44440e48d8b4ebbef0b218e9ceddaa4e3b97a Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Thu, 21 Feb 2013 20:36:20 +0100 Subject: gnome3: port and update (lib)gnome-keyring --- .../gnome-3/core/gnome-keyring/default.nix | 26 ++++++++++++++++++++++ .../gnome-3/core/libgnome-keyring/default.nix | 17 ++++++++++++++ pkgs/desktops/gnome-3/default.nix | 3 +++ .../development/libraries/libgnome-keyring/3.x.nix | 18 --------------- pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 47 insertions(+), 19 deletions(-) create mode 100644 pkgs/desktops/gnome-3/core/gnome-keyring/default.nix create mode 100644 pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix delete mode 100644 pkgs/development/libraries/libgnome-keyring/3.x.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix new file mode 100644 index 000000000000..5983b74c0f45 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib +, gtk3, intltool, gconf, libgnome_keyring, pango, gcr, gdk_pixbuf, atk, p11_kit }: + +stdenv.mkDerivation rec { + name = "gnome-keyring-3.6.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-keyring/3.6/${name}.tar.xz"; + sha256 = "1mhc2c0qswfjqi2spdvh19b7npfkjf1k40q6v7fja4qpc26maq5f"; + }; + + buildInputs = [ + dbus libgcrypt pam python gtk3 gconf libgnome_keyring + pango gcr gdk_pixbuf atk p11_kit + ]; + + propagatedBuildInputs = [ glib libtasn1 ]; + + nativeBuildInputs = [ pkgconfig intltool ]; + + configureFlags = [ + "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt" # NixOS hardcoded path + "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories + "--with-pkcs11-modules=$$out/lib/pkcs11/" + ]; +} diff --git a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix new file mode 100644 index 000000000000..a5d196ae1e32 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool }: + +stdenv.mkDerivation rec { + name = "libgnome-keyring-3.6.0"; + + src = fetchurl { + url = "mirror://gnome/sources/libgnome-keyring/3.6/${name}.tar.xz"; + sha256 = "0c4qrjpmv1hqga3xv6wsq2z10x2n78qgw7q3k3s01y1pggxkgjkd"; + }; + + propagatedBuildInputs = [ glib dbus_libs libgcrypt ]; + nativeBuildInputs = [ pkgconfig intltool ]; + + meta = { + inherit (glib.meta) platforms maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 5be532874372..f2adac8d97a8 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -19,6 +19,9 @@ rec { gcr = callPackage ./core/gcr { }; # ToDo: tests fail + gnome_keyring = callPackage ./core/gnome-keyring { }; + libgnome_keyring = callPackage ./core/libgnome-keyring { }; + gnome_terminal = callPackage ./core/gnome-terminal { }; gsettings_desktop_schemas = lib.lowPrio (callPackage ./core/gsettings-desktop-schemas { }); diff --git a/pkgs/development/libraries/libgnome-keyring/3.x.nix b/pkgs/development/libraries/libgnome-keyring/3.x.nix deleted file mode 100644 index 54a023a16f8b..000000000000 --- a/pkgs/development/libraries/libgnome-keyring/3.x.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, -intltool }: - -stdenv.mkDerivation { - name = "libgnome-keyring-3.2.2"; - - src = fetchurl { - url = mirror://gnome/sources/libgnome-keyring/3.2/libgnome-keyring-3.2.2.tar.xz; - sha256 = "1cxd2vb1lzm8smq1q45dsn13s6kdqdb60lashdk7hwv035xy9jrb"; - }; - - propagatedBuildInputs = [ glib dbus_libs libgcrypt ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - meta = { - inherit (glib.meta) platforms maintainers; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b7668877812..e7fd31644b34 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4146,7 +4146,7 @@ let libgig = callPackage ../development/libraries/libgig { }; libgnome_keyring = callPackage ../development/libraries/libgnome-keyring { }; - libgnome_keyring3 = callPackage ../development/libraries/libgnome-keyring/3.x.nix { }; + libgnome_keyring3 = gnome3.libgnome_keyring; libgtop = callPackage ../development/libraries/libgtop {}; -- cgit 1.4.1 From 4e5fe00a1f29fd17b1a8caf0b3315dd1576ef634 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Fri, 1 Feb 2013 02:46:04 +0100 Subject: gnome3.libgweather: update --- pkgs/desktops/gnome-3/core/libgweather/default.nix | 14 ++++++++++++++ pkgs/desktops/gnome-3/default.nix | 2 ++ pkgs/development/libraries/libgweather/default.nix | 13 ------------- pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/release-python.nix | 1 - 5 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 pkgs/desktops/gnome-3/core/libgweather/default.nix delete mode 100644 pkgs/development/libraries/libgweather/default.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/desktops/gnome-3/core/libgweather/default.nix b/pkgs/desktops/gnome-3/core/libgweather/default.nix new file mode 100644 index 000000000000..78ae94c1a33a --- /dev/null +++ b/pkgs/desktops/gnome-3/core/libgweather/default.nix @@ -0,0 +1,14 @@ +{ stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, libsoup, gconf +, pango, gdk_pixbuf, atk }: + +stdenv.mkDerivation rec { + name = "libgweather-3.6.2"; + + src = fetchurl { + url = "mirror://gnome/sources/libgweather/3.6/${name}.tar.xz"; + sha256 = "1c50m0zrnfh4g58rzf33dfw8ggslj38c61p8a75905bmj3rfyahg"; + }; + configureFlags = if stdenv ? glibc then "--with-zoneinfo-dir=${stdenv.glibc}/share/zoneinfo" else ""; + propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk ]; + nativeBuildInputs = [ pkgconfig intltool ]; +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 9f9ca123fa19..ce22aa0b8503 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -32,6 +32,8 @@ rec { gvfs = callPackage ./core/gvfs { }; + libgweather = callPackage ./core/libgweather { }; + vte = callPackage ./core/vte { }; zenity = callPackage ./core/zenity { }; diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix deleted file mode 100644 index 5e7a4cff741f..000000000000 --- a/pkgs/development/libraries/libgweather/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, intltool, libsoup, GConf3 }: - -stdenv.mkDerivation { - name = "libgweather-3.4.1"; - - src = fetchurl { - url = mirror://gnome/sources/libgweather/3.4/libgweather-3.4.1.tar.xz; - sha256 = "0q0vkggrbvy2ihwcsfynlv5qk9l3wjinls8yvmkb1qisyc4lv77f"; - }; - configureFlags = if stdenv ? glibc then "--with-zoneinfo-dir=${stdenv.glibc}/share/zoneinfo" else ""; - propagatedBuildInputs = [ libxml2 gtk3 libsoup GConf3 ]; - nativeBuildInputs = [ pkgconfig intltool ]; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fcfb7ffa65c6..d5f75d98d73e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4150,8 +4150,6 @@ let libgtop = callPackage ../development/libraries/libgtop {}; - libgweather = callPackage ../development/libraries/libgweather {}; - liblo = callPackage ../development/libraries/liblo { }; liblrdf = librdf; diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 3641005dc74b..ce6d40c42467 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -1033,7 +1033,6 @@ in libgpod = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; libgsf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; libgtop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libgweather = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; libimobiledevice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; libinfinity = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; liblapack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; -- cgit 1.4.1 From 74e0c25ec887be4f3594a489e73603c8def9bf6e Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Mon, 4 Feb 2013 22:23:54 +0100 Subject: libcanberra: update, streamline dependencies Still some ToDos but should be OK, tested building some reverse-dependencies. --- pkgs/development/libraries/libcanberra/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index 691294d4a85d..b57ea63fde75 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchurl, pkgconfig, libtool, gtk ? null -, alsaLib, pulseaudio, gstreamer ? null, libvorbis, libcap }: +, alsaLib, pulseaudio, gstreamer, gst_plugins_base, libvorbis }: stdenv.mkDerivation rec { - name = "libcanberra-0.28"; + name = "libcanberra-0.30"; src = fetchurl { - url = "http://0pointer.de/lennart/projects/libcanberra/${name}.tar.gz"; - sha256 = "1346d2y24wiyanyr5bvdnjjgq7iysy8nlq2dwjv0fzxdmcn8n7zb"; + url = "http://0pointer.de/lennart/projects/libcanberra/${name}.tar.xz"; + sha256 = "0wps39h8rx2b00vyvkia5j40fkak3dpipp1kzilqla0cgvk73dn2"; }; - buildInputs = - [ pkgconfig libtool alsaLib pulseaudio gstreamer libvorbis libcap gtk ]; + buildInputs = # ToDo: gstreamer not found (why?), add (g)udev? + [ pkgconfig libtool alsaLib pulseaudio /*gstreamer gst_plugins_base*/ libvorbis gtk ]; - configureFlags = "--disable-oss --disable-schemas-install"; + configureFlags = "--disable-oss"; meta = { - description = "libcanberra, an implementation of the XDG Sound Theme and Name Specifications"; + description = "An implementation of the XDG Sound Theme and Name Specifications"; longDescription = '' libcanberra is an implementation of the XDG Sound Theme and Name -- cgit 1.4.1 From dbe8a69a362a13cf3b097a699cb34c9e8f3a6ad5 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Mon, 4 Feb 2013 23:26:28 +0100 Subject: libcroco: move to gnome-3, minor update --- pkgs/desktops/gnome-3/core/libcroco/default.nix | 11 +++++++++++ pkgs/desktops/gnome-3/default.nix | 2 ++ pkgs/development/libraries/libcroco/default.nix | 11 ----------- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 14 insertions(+), 12 deletions(-) create mode 100644 pkgs/desktops/gnome-3/core/libcroco/default.nix delete mode 100644 pkgs/development/libraries/libcroco/default.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/desktops/gnome-3/core/libcroco/default.nix b/pkgs/desktops/gnome-3/core/libcroco/default.nix new file mode 100644 index 000000000000..70c1db8c0275 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/libcroco/default.nix @@ -0,0 +1,11 @@ +{stdenv, fetchurl, pkgconfig, libxml2, glib}: + +stdenv.mkDerivation rec { + name = "libcroco-0.6.6"; # 3.6.2 release + + src = fetchurl { + url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz"; + sha256 = "1nbb12420v1zacn6jwa1x4ixikkcqw66sg4j5dgs45nhygiarv3j"; + }; + buildInputs = [ pkgconfig libxml2 glib ]; +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index ce22aa0b8503..5d517da82b39 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -32,6 +32,8 @@ rec { gvfs = callPackage ./core/gvfs { }; + libcroco = callPackage ./core/libcroco {}; + libgweather = callPackage ./core/libgweather { }; vte = callPackage ./core/vte { }; diff --git a/pkgs/development/libraries/libcroco/default.nix b/pkgs/development/libraries/libcroco/default.nix deleted file mode 100644 index 99604475e625..000000000000 --- a/pkgs/development/libraries/libcroco/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{stdenv, fetchurl, pkgconfig, libxml2, glib}: - -stdenv.mkDerivation { - name = "libcroco-0.6.4"; - - src = fetchurl { - url = mirror://gnome/sources/libcroco/0.6/libcroco-0.6.4.tar.xz; - sha256 = "1sij88na1skd4d5dx75l803fww3v9872q8m2hj6sjlkc839vl5n8"; - }; - buildInputs = [ pkgconfig libxml2 glib ]; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5f75d98d73e..6327afb73239 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4076,7 +4076,7 @@ let libcm = callPackage ../development/libraries/libcm { }; - libcroco = callPackage ../development/libraries/libcroco {}; + inherit (gnome3) libcroco; libctemplate = callPackage ../development/libraries/libctemplate { }; -- cgit 1.4.1 From bc1e83aa1c2d12c23b6939ae3cfc0ba75a988fd3 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Mon, 4 Feb 2013 23:31:10 +0100 Subject: libgsf: update, streamline dependencies, drop obsolete patch Tried to build some affected packages, seems OK. Conflicts (buildNativeInputs): pkgs/development/libraries/libgsf/default.nix --- pkgs/development/libraries/libgsf/default.nix | 21 ++++++++------------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 9 insertions(+), 16 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 56f6242c09e8..c6d46643ba97 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,26 +1,21 @@ -{ fetchurl, stdenv, perl, perlXMLParser, pkgconfig, libxml2 -, gettext, intltool, bzip2, glib, python -, gnomeSupport ? true, gdk_pixbuf ? null -, gnome_vfs ? null, libbonobo ? null }: +{ fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2 +, python +}: -assert gnomeSupport -> gdk_pixbuf != null && gnome_vfs != null && libbonobo != null - && glib != null; +with { inherit (stdenv.lib) optionals; }; stdenv.mkDerivation rec { name = "libgsf-1.14.25"; src = fetchurl { url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz"; - sha256 = "127548f07e07951984fb139c3f89d65b9e471aefe6555387de03e1113944d1a2"; + sha256 = "18ni8hwi3q83vs3m6mg6xwd4g7jvss4kz70kzf21k587gvq4hx8j"; }; - nativeBuildInputs = [ intltool pkgconfig ]; - buildInputs = - [ perl perlXMLParser gettext bzip2 python ] - ++ stdenv.lib.optionals gnomeSupport [ gnome_vfs gdk_pixbuf ]; + nativeBuildInputs = [ pkgconfig intltool ]; + buildInputs = [ gettext bzip2 zlib python ]; - propagatedBuildInputs = [ libxml2 glib ] - ++ stdenv.lib.optionals gnomeSupport [ libbonobo ]; + propagatedBuildInputs = [ libxml2 glib ]; doCheck = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6327afb73239..b6a1feff6bd3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4240,9 +4240,7 @@ let libspectre = callPackage ../development/libraries/libspectre { }; - libgsf = callPackage ../development/libraries/libgsf { - inherit (gnome) gnome_vfs libbonobo; - }; + libgsf = callPackage ../development/libraries/libgsf { }; libiconv = callPackage ../development/libraries/libiconv { }; -- cgit 1.4.1 From 2c700f3b4ac402853f9c743b5c1f22050e0245af Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Mon, 4 Feb 2013 23:35:20 +0100 Subject: librsvg: drop gtk2 dep. by default, add optional gtk3 dep. Tried to build some affected packages, seems OK. --- pkgs/development/libraries/librsvg/default.nix | 12 +++++++----- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 1ac47f890ab9..13385dfb65c0 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, libgsf, bzip2, glib, gtk, libcroco -, gdk_pixbuf, gobjectIntrospection?null, enableIntrospection?false }: +{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo +, libxml2, libgsf, bzip2, libcroco +, gtk2 ? null, gtk3 ? null +, gobjectIntrospection ? null, enableIntrospection ? false }: # no introspection by default, it's too big @@ -10,9 +12,9 @@ stdenv.mkDerivation rec { url = "mirror://gnome/sources/librsvg/2.36/${name}.tar.xz"; sha256 = "1hp6325gdkzx8yqn2d2r915ak3k6hfshjjh0sc54z3vr0i99688h"; }; - buildInputs = [ libxml2 libgsf bzip2 libcroco gdk_pixbuf ] - ++ stdenv.lib.optional enableIntrospection [gobjectIntrospection]; - propagatedBuildInputs = [ glib gtk ]; + buildInputs = [ libxml2 libgsf bzip2 libcroco pango cairo ] + ++ stdenv.lib.optional enableIntrospection [ gobjectIntrospection ]; + propagatedBuildInputs = [ glib gdk_pixbuf gtk2 gtk3 ]; nativeBuildInputs = [ pkgconfig ]; configureFlags = ["--enable-introspection=auto"]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6a1feff6bd3..0006a629e4a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4368,7 +4368,9 @@ let libqalculate = callPackage ../development/libraries/libqalculate { }; - librsvg = callPackage ../development/libraries/librsvg { }; + librsvg = callPackage ../development/libraries/librsvg { + gtk2 = null; gtk3 = null; # neither gtk version by default + }; librsync = callPackage ../development/libraries/librsync { }; -- cgit 1.4.1 From 9747a3fb3b37809660c7e193ce9bfea9216cd66b Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Thu, 21 Feb 2013 23:36:13 +0100 Subject: gtk bindings: update --- pkgs/development/libraries/atkmm/2.22.x.nix | 14 ----------- pkgs/development/libraries/atkmm/default.nix | 14 +++++++++++ pkgs/development/libraries/glibmm/2.30.x.nix | 24 ------------------ pkgs/development/libraries/glibmm/default.nix | 24 ++++++++++++++++++ pkgs/development/libraries/gtkmm/2.24.x.nix | 36 --------------------------- pkgs/development/libraries/gtkmm/2.x.nix | 36 +++++++++++++++++++++++++++ pkgs/development/libraries/gtkmm/3.2.x.nix | 35 -------------------------- pkgs/development/libraries/gtkmm/3.x.nix | 35 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 14 +++++------ 9 files changed, 115 insertions(+), 117 deletions(-) delete mode 100644 pkgs/development/libraries/atkmm/2.22.x.nix create mode 100644 pkgs/development/libraries/atkmm/default.nix delete mode 100644 pkgs/development/libraries/glibmm/2.30.x.nix create mode 100644 pkgs/development/libraries/glibmm/default.nix delete mode 100644 pkgs/development/libraries/gtkmm/2.24.x.nix create mode 100644 pkgs/development/libraries/gtkmm/2.x.nix delete mode 100644 pkgs/development/libraries/gtkmm/3.2.x.nix create mode 100644 pkgs/development/libraries/gtkmm/3.x.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/atkmm/2.22.x.nix b/pkgs/development/libraries/atkmm/2.22.x.nix deleted file mode 100644 index b25432491fbc..000000000000 --- a/pkgs/development/libraries/atkmm/2.22.x.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ stdenv, fetchurl, atk, glibmm, pkgconfig }: - -stdenv.mkDerivation rec { - name = "atkmm-2.22.6"; - - src = fetchurl { - url = mirror://gnome/sources/atkmm/2.22/atkmm-2.22.6.tar.xz; - sha256 = "1dmf72i7jv2a2gavjiah2722bf5qk3hb97hn5dasxqxr0r8jjx0a"; - }; - - propagatedBuildInputs = [ atk glibmm ]; - - nativeBuildInputs = [ pkgconfig ]; -} diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix new file mode 100644 index 000000000000..b25432491fbc --- /dev/null +++ b/pkgs/development/libraries/atkmm/default.nix @@ -0,0 +1,14 @@ +{ stdenv, fetchurl, atk, glibmm, pkgconfig }: + +stdenv.mkDerivation rec { + name = "atkmm-2.22.6"; + + src = fetchurl { + url = mirror://gnome/sources/atkmm/2.22/atkmm-2.22.6.tar.xz; + sha256 = "1dmf72i7jv2a2gavjiah2722bf5qk3hb97hn5dasxqxr0r8jjx0a"; + }; + + propagatedBuildInputs = [ atk glibmm ]; + + nativeBuildInputs = [ pkgconfig ]; +} diff --git a/pkgs/development/libraries/glibmm/2.30.x.nix b/pkgs/development/libraries/glibmm/2.30.x.nix deleted file mode 100644 index a544543d7e3c..000000000000 --- a/pkgs/development/libraries/glibmm/2.30.x.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, libsigcxx }: - -stdenv.mkDerivation rec { - name = "glibmm-2.30.1"; - - src = fetchurl { - url = mirror://gnome/sources/glibmm/2.30/glibmm-2.30.1.tar.xz; - sha256 = "15zqgx6rashyhxk89qjqq05p6m40akpgzyjk8bfb3jk68rc2nn39"; - }; - - nativeBuildInputs = [pkgconfig]; - propagatedBuildInputs = [glib libsigcxx]; - - meta = { - description = "C++ interface to the GLib library"; - - homepage = http://gtkmm.org/; - - license = "LGPLv2+"; - - maintainers = with stdenv.lib.maintainers; [urkud raskin]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix new file mode 100644 index 000000000000..962b14bc7888 --- /dev/null +++ b/pkgs/development/libraries/glibmm/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, libsigcxx }: + +stdenv.mkDerivation rec { + name = "glibmm-2.34.1"; + + src = fetchurl { + url = "mirror://gnome/sources/glibmm/2.34/${name}.tar.xz"; + sha256 = "1i4jsvahva2q0mig7kjnpsw0r3fnpybm8b6hzymfm2hpgqnaa9dl"; + }; + + nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ glib gdk_pixbuf libsigcxx ]; + + meta = { + description = "C++ interface to the GLib library"; + + homepage = http://gtkmm.org/; + + license = "LGPLv2+"; + + maintainers = with stdenv.lib.maintainers; [urkud raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gtkmm/2.24.x.nix b/pkgs/development/libraries/gtkmm/2.24.x.nix deleted file mode 100644 index ec7f01a8be5e..000000000000 --- a/pkgs/development/libraries/gtkmm/2.24.x.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl_gnome, pkgconfig, gtk, glibmm, cairomm, pangomm, atkmm }: - -stdenv.mkDerivation rec { - name = src.pkgname; - - src = fetchurl_gnome { - project = "gtkmm"; - major = "2"; minor = "24"; patchlevel = "2"; extension = "xz"; - sha256 = "0gcm91sc1a05c56kzh74l370ggj0zz8nmmjvjaaxgmhdq8lpl369"; - }; - - nativeBuildInputs = [pkgconfig]; - - propagatedBuildInputs = [ glibmm gtk atkmm cairomm pangomm ]; - - meta = { - description = "C++ interface to the GTK+ graphical user interface library"; - - longDescription = '' - gtkmm is the official C++ interface for the popular GUI library - GTK+. Highlights include typesafe callbacks, and a - comprehensive set of widgets that are easily extensible via - inheritance. You can create user interfaces either in code or - with the Glade User Interface designer, using libglademm. - There's extensive documentation, including API reference and a - tutorial. - ''; - - homepage = http://gtkmm.org/; - - license = "LGPLv2+"; - - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix new file mode 100644 index 000000000000..ec7f01a8be5e --- /dev/null +++ b/pkgs/development/libraries/gtkmm/2.x.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl_gnome, pkgconfig, gtk, glibmm, cairomm, pangomm, atkmm }: + +stdenv.mkDerivation rec { + name = src.pkgname; + + src = fetchurl_gnome { + project = "gtkmm"; + major = "2"; minor = "24"; patchlevel = "2"; extension = "xz"; + sha256 = "0gcm91sc1a05c56kzh74l370ggj0zz8nmmjvjaaxgmhdq8lpl369"; + }; + + nativeBuildInputs = [pkgconfig]; + + propagatedBuildInputs = [ glibmm gtk atkmm cairomm pangomm ]; + + meta = { + description = "C++ interface to the GTK+ graphical user interface library"; + + longDescription = '' + gtkmm is the official C++ interface for the popular GUI library + GTK+. Highlights include typesafe callbacks, and a + comprehensive set of widgets that are easily extensible via + inheritance. You can create user interfaces either in code or + with the Glade User Interface designer, using libglademm. + There's extensive documentation, including API reference and a + tutorial. + ''; + + homepage = http://gtkmm.org/; + + license = "LGPLv2+"; + + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gtkmm/3.2.x.nix b/pkgs/development/libraries/gtkmm/3.2.x.nix deleted file mode 100644 index d3681b4b3867..000000000000 --- a/pkgs/development/libraries/gtkmm/3.2.x.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm }: - -stdenv.mkDerivation { - name = "gtkmm-3.2.0"; - - src = fetchurl { - url = mirror://gnome/sources/gtkmm/3.2/gtkmm-3.2.0.tar.xz; - sha256 = "1wkljr2vjvjg5mggi4rvk9k4j2kzh8lc106k2yp8gqjlhk2xm5b1"; - }; - - nativeBuildInputs = [ pkgconfig ]; - - propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ]; - - meta = { - description = "C++ interface to the GTK+ graphical user interface library"; - - longDescription = '' - gtkmm is the official C++ interface for the popular GUI library - GTK+. Highlights include typesafe callbacks, and a - comprehensive set of widgets that are easily extensible via - inheritance. You can create user interfaces either in code or - with the Glade User Interface designer, using libglademm. - There's extensive documentation, including API reference and a - tutorial. - ''; - - homepage = http://gtkmm.org/; - - license = "LGPLv2+"; - - maintainers = with stdenv.lib.maintainers; [ raskin urkud ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix new file mode 100644 index 000000000000..37c885bf630c --- /dev/null +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm }: + +stdenv.mkDerivation rec { + name = "gtkmm-3.6.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gtkmm/3.6/${name}.tar.xz"; + sha256 = "0n93z8is5afgpqq0czr5wynr78vpv5lap3ayl4x0iv5cr3am90c8"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ]; + + meta = { + description = "C++ interface to the GTK+ graphical user interface library"; + + longDescription = '' + gtkmm is the official C++ interface for the popular GUI library + GTK+. Highlights include typesafe callbacks, and a + comprehensive set of widgets that are easily extensible via + inheritance. You can create user interfaces either in code or + with the Glade User Interface designer, using libglademm. + There's extensive documentation, including API reference and a + tutorial. + ''; + + homepage = http://gtkmm.org/; + + license = "LGPLv2+"; + + maintainers = with stdenv.lib.maintainers; [ raskin urkud ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0006a629e4a5..90452bf98c8b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3864,13 +3864,13 @@ let glib = callPackage ../development/libraries/glib { }; - glibmm = callPackage ../development/libraries/glibmm/2.30.x.nix { }; + glibmm = callPackage ../development/libraries/glibmm { }; glib_networking = callPackage ../development/libraries/glib-networking {}; atk = callPackage ../development/libraries/atk { }; - atkmm = callPackage ../development/libraries/atkmm/2.22.x.nix { }; + atkmm = callPackage ../development/libraries/atkmm { }; cairo = callPackage ../development/libraries/cairo { pixman = pixman_cairo; # it's recommended to be in sync @@ -3886,15 +3886,13 @@ let gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { }; gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { }; - - gtk = pkgs.gtk2; - - gtkmm = callPackage ../development/libraries/gtkmm/2.24.x.nix { }; - gtkmm3 = callPackage ../development/libraries/gtkmm/3.2.x.nix { }; - gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3-default.nix { inherit (gnome3) at_spi2_atk; }); + gtk = pkgs.gtk2; + + gtkmm = callPackage ../development/libraries/gtkmm/2.x.nix { }; + gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { }; gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp { gtksharp = gtksharp2; -- cgit 1.4.1 From d53899dfcaaa50b44707481fc4453e72184089a0 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Fri, 22 Feb 2013 00:05:23 +0100 Subject: mesa: bugfix update --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 4516f1aa977e..9a1e7216948d 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -8,14 +8,14 @@ if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then else let - version = "9.0.2"; + version = "9.0.3"; in stdenv.mkDerivation { name = "mesa-${version}"; src = fetchurl { url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2"; - sha256="0knnb8srr1xbin25js4y5kmpw7xys5gh1h8hwqamayvfdkr33gvm"; + sha256="1986av3pl8v9hhxxqqdm2wn3qlwwnrznvfmm4wszhyf3n82h157a"; }; prePatch = "patchShebangs ."; -- cgit 1.4.1 From b7ca8c801b6a74c2f19a567e188f7f3ad964508c Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 23 Feb 2013 09:12:04 +0100 Subject: poppler_0_18: fix buildNativeInputs --- pkgs/development/libraries/poppler/0.18.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/poppler/0.18.nix b/pkgs/development/libraries/poppler/0.18.nix index f4b9e4015b11..2f962224187a 100644 --- a/pkgs/development/libraries/poppler/0.18.nix +++ b/pkgs/development/libraries/poppler/0.18.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals gtkSupport [ glib /*gtk3*/ ] ++ stdenv.lib.optional qt4Support qt4; - buildNativeInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkgconfig cmake ]; cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON"; -- cgit 1.4.1 From 3130d127f73aad2e0760a1232329b37475a46074 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Thu, 21 Feb 2013 19:39:51 +0100 Subject: webkit: hot-fix the build, use default libpng and perl --- pkgs/development/libraries/webkit/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix index d229228b94f7..1ba90e67d85f 100644 --- a/pkgs/development/libraries/webkit/default.nix +++ b/pkgs/development/libraries/webkit/default.nix @@ -9,7 +9,7 @@ rec { sha256 = s.hash; }; - buildInputs = [gtk glib atk cairo curl fontconfig freetype + buildInputs = [gtk gtk2 glib atk cairo curl fontconfig freetype gettext libjpeg libpng libtiff libxml2 libxslt pango sqlite icu gperf bison flex autoconf automake libtool perl intltool pkgconfig libsoup gtkdoc libXt libproxy @@ -91,6 +91,6 @@ rec { maintainers = [stdenv.lib.maintainers.raskin]; }; passthru = { - inherit gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg; + inherit gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg libsoup; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90452bf98c8b..eb1296eae4c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5032,7 +5032,7 @@ let webkit = builderDefsPackage ../development/libraries/webkit { inherit (gnome) gtkdoc libsoup; - inherit atk pango glib; + inherit atk pango glib gtk2 /*for plugins etc. even with gtk3, see Gentoo ebuild*/; gtk = gtk3; inherit freetype fontconfig gettext gperf curl libjpeg libtiff libxml2 libxslt sqlite @@ -5042,8 +5042,7 @@ let inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good; inherit (xlibs) libXt renderproto libXrender kbproto; - libpng = libpng12; - perl = perl510; + inherit libpng perl; }; webkit_gtk2 = @@ -5058,8 +5057,7 @@ let inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good; inherit (xlibs) libXt renderproto libXrender; - libpng = libpng12; - perl = perl510; + inherit libpng perl; }; webkitSVN = @@ -5074,7 +5072,7 @@ let inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good; inherit (xlibs) libXt renderproto libXrender; - libpng = libpng12; + inherit libpng; }; wvstreams = callPackage ../development/libraries/wvstreams { }; -- cgit 1.4.1 From 937fa72d4fc7f19bd8f74182b634760563eb5c8a Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 23 Feb 2013 10:25:52 +0100 Subject: taglib: update --- pkgs/development/libraries/taglib/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix index 0842836ccec8..cd083f0d80ad 100644 --- a/pkgs/development/libraries/taglib/default.nix +++ b/pkgs/development/libraries/taglib/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, zlib, cmake}: stdenv.mkDerivation rec { - name = "taglib-1.7.1"; - + name = "taglib-1.8"; + src = fetchurl { url = "https://github.com/downloads/taglib/taglib/${name}.tar.gz"; - sha256 = "1nc7zd9jxx5gw4n6zqgvjh0wxlm89ihcyyrzk2rbf15njw4lgpjj"; + sha256 = "16i0zjpxqqslbwi4kl6y15qwm15mh7ykh74x19m2741wf20k9lv6"; }; - + cmakeFlags = "-DWITH_ASF=ON -DWITH_MP4=ON"; buildInputs = [zlib]; -- cgit 1.4.1 From e6b245a3eefa4cb78870773a82526689a469743c Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 23 Feb 2013 10:54:35 +0100 Subject: cryptopp: fix via minor update --- pkgs/development/libraries/crypto++/default.nix | 18 +++---- pkgs/development/libraries/crypto++/pic.patch | 22 -------- .../libraries/crypto++/salsa-gcc4.6.patch | 62 ---------------------- 3 files changed, 7 insertions(+), 95 deletions(-) delete mode 100644 pkgs/development/libraries/crypto++/pic.patch delete mode 100644 pkgs/development/libraries/crypto++/salsa-gcc4.6.patch (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index 43d1011ec0a1..e9efcfaf7f00 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -1,20 +1,16 @@ { fetchurl, stdenv, unzip, libtool }: stdenv.mkDerivation rec { - name = "crypto++-5.6.1"; + name = "crypto++-5.6.2"; src = fetchurl { - url = "mirror://sourceforge/cryptopp/cryptopp561.zip"; - sha256 = "0s7jhvnfihikqp1iwpdz03fad62xkjxci6jiahrh6f3sn664vrwq"; + url = "mirror://sourceforge/cryptopp/cryptopp562.zip"; + sha256 = "0x1mqpz1v071cfrw4grbw7z734cxnpry1qh2b6rsmcx6nkyd5gsw"; }; - patches = [ - ./pic.patch - ./salsa-gcc4.6.patch - ] ++ stdenv.lib.optional (stdenv.system != "i686-cygwin") ./dll.patch; + patches = stdenv.lib.optional (stdenv.system != "i686-cygwin") ./dll.patch; - - buildInputs = [ unzip ]; + buildInputs = [ unzip libtool ]; # Unpack the thing in a subdirectory. unpackPhase = '' @@ -37,7 +33,7 @@ stdenv.mkDerivation rec { # I add what 'enableParallelBuilding' would add to the make call, # if we were using the generic build phase. buildPhase = '' - make PREFIX="$out" all libcryptopp.so -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES + make PREFIX="$out" all -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES ''; # TODO: Installing cryptotest.exe doesn't seem to be necessary. We run @@ -53,7 +49,7 @@ stdenv.mkDerivation rec { meta = { description = "Crypto++, a free C++ class library of cryptographic schemes"; homepage = http://cryptopp.com/; - license = "Public Domain"; + license = "Boost 1.0"; maintainers = [ stdenv.lib.maintainers.ludo ]; }; } diff --git a/pkgs/development/libraries/crypto++/pic.patch b/pkgs/development/libraries/crypto++/pic.patch deleted file mode 100644 index c01550b132ac..000000000000 --- a/pkgs/development/libraries/crypto++/pic.patch +++ /dev/null @@ -1,22 +0,0 @@ -Build position-independent code, for shared libraries. Fix $(DLLSRCS) -while we're at it (it lacks `pssr.cpp', for instance). - ---- a/GNUmakefile 2009-03-15 02:48:02.000000000 +0100 -+++ b/GNUmakefile 2009-08-11 00:13:43.000000000 +0200 -@@ -104,6 +104,7 @@ TESTOBJS = bench.o bench2.o test.o valid - LIBOBJS = $(filter-out $(TESTOBJS),$(OBJS)) - - DLLSRCS = algebra.cpp algparam.cpp asn.cpp basecode.cpp cbcmac.cpp channels.cpp cryptlib.cpp des.cpp dessp.cpp dh.cpp dll.cpp dsa.cpp ec2n.cpp eccrypto.cpp ecp.cpp eprecomp.cpp files.cpp filters.cpp fips140.cpp fipstest.cpp gf2n.cpp gfpcrypt.cpp hex.cpp hmac.cpp integer.cpp iterhash.cpp misc.cpp modes.cpp modexppc.cpp mqueue.cpp nbtheory.cpp oaep.cpp osrng.cpp pch.cpp pkcspad.cpp pubkey.cpp queue.cpp randpool.cpp rdtables.cpp rijndael.cpp rng.cpp rsa.cpp sha.cpp simple.cpp skipjack.cpp strciphr.cpp trdlocal.cpp -+DLLSRCS = $(SRCS) - DLLOBJS = $(DLLSRCS:.cpp=.export.o) - LIBIMPORTOBJS = $(LIBOBJS:.o=.import.o) - TESTIMPORTOBJS = $(TESTOBJS:.o=.import.o) -@@ -162,7 +162,7 @@ endif - $(CXX) $(CXXFLAGS) -DCRYPTOPP_IMPORTS -c $< -o $@ - - %.export.o : %.cpp -- $(CXX) $(CXXFLAGS) -DCRYPTOPP_EXPORTS -c $< -o $@ -+ $(CXX) $(CXXFLAGS) -fPIC -DCRYPTOPP_EXPORTS -c $< -o $@ - - %.o : %.cpp - $(CXX) $(CXXFLAGS) -c $< diff --git a/pkgs/development/libraries/crypto++/salsa-gcc4.6.patch b/pkgs/development/libraries/crypto++/salsa-gcc4.6.patch deleted file mode 100644 index 609d2f55d223..000000000000 --- a/pkgs/development/libraries/crypto++/salsa-gcc4.6.patch +++ /dev/null @@ -1,62 +0,0 @@ -From fbccde3578feddb16f07be981da1d0f26209fd04 Mon Sep 17 00:00:00 2001 -From: weidai -Date: Sun, 5 Jun 2011 21:07:11 +0000 -Subject: [PATCH 1/4] fix Salsa validation failure when compiling with GCC 4.6 - (https://sourceforge.net/apps/trac/cryptopp/ticket/12) - -git-svn-id: https://cryptopp.svn.sourceforge.net/svnroot/cryptopp/trunk@529 57ff6487-cd31-0410-9ec3-f628ee90f5f0 ---- - c5/salsa.cpp | 21 +++++++++++---------- - 1 file changed, 11 insertions(+), 10 deletions(-) - -# NOTE: remove the c5 path component - -diff --git a/salsa.cpp b/salsa.cpp -index bd216ee..bdc5d75 100755 ---- a/salsa.cpp -+++ b/salsa.cpp -@@ -122,17 +122,17 @@ void Salsa20_Policy::OperateKeystream(KeystreamOperation operation, byte *output - if (HasSSE2()) - { - #if CRYPTOPP_BOOL_X64 -- #define REG_output %4 -- #define REG_input %1 -+ #define REG_output %1 -+ #define REG_input %0 - #define REG_iterationCount %2 -- #define REG_state %3 -- #define REG_rounds %0 -+ #define REG_state %4 /* constant */ -+ #define REG_rounds %3 /* constant */ - #define REG_roundsLeft eax - #define REG_temp32 edx - #define REG_temp rdx -- #define SSE2_WORKSPACE %5 -+ #define SSE2_WORKSPACE %5 /* constant */ - -- FixedSizeAlignedSecBlock workspace; -+ CRYPTOPP_ALIGN_DATA(16) byte workspace[16*32]; - #else - #define REG_output edi - #define REG_input eax -@@ -457,12 +457,13 @@ void Salsa20_Policy::OperateKeystream(KeystreamOperation operation, byte *output - #ifdef __GNUC__ - AS_POP_IF86( bx) - ".att_syntax prefix;" -- : - #if CRYPTOPP_BOOL_X64 -- : "r" (m_rounds), "r" (input), "r" (iterationCount), "r" (m_state.data()), "r" (output), "r" (workspace.m_ptr) -- : "%eax", "%edx", "memory", "cc", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7", "%xmm8", "%xmm9", "%xmm10", "%xmm11", "%xmm12", "%xmm13", "%xmm14", "%xmm15" -+ : "+r" (input), "+r" (output), "+r" (iterationCount) -+ : "r" (m_rounds), "r" (m_state.m_ptr), "r" (workspace) -+ : "%eax", "%rdx", "memory", "cc", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7", "%xmm8", "%xmm9", "%xmm10", "%xmm11", "%xmm12", "%xmm13", "%xmm14", "%xmm15" - #else -- : "d" (m_rounds), "a" (input), "c" (iterationCount), "S" (m_state.data()), "D" (output) -+ : "+a" (input), "+D" (output), "+c" (iterationCount) -+ : "d" (m_rounds), "S" (m_state.m_ptr) - : "memory", "cc" - #endif - ); --- -1.7.9.2 - -- cgit 1.4.1 From aa06b2b427169776b25702f4f3bf9e29a4aaae6c Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 23 Feb 2013 12:07:19 +0100 Subject: libdrm: update because of mesa-9.1 --- pkgs/development/libraries/libdrm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index b3f25a629871..4e0038d4c34c 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }: stdenv.mkDerivation rec { - name = "libdrm-2.4.40"; - + name = "libdrm-2.4.42"; + src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "07xazz6flzc2khvks2cxls36sbsx0ns3x2cj499dw3za0134xha8"; + sha256 = "1qbnpi64hyqzd650hj6jki1d50pzypdhj3rw9m3whwbqly110rz0"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit 1.4.1 From c3203cfc3b1423942743906271794cb9ebc87441 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 23 Feb 2013 12:07:42 +0100 Subject: mesa: another update; 9.1 released now --- pkgs/development/libraries/mesa/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 9a1e7216948d..78d9805eb3fb 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison, pkgconfig, libdrm, file, expat, makedepend +{ stdenv, fetchurl, flex, bison, pkgconfig, intltool, libdrm, file, expat, makedepend , libXxf86vm, libXfixes, libXdamage, glproto, dri2proto, libX11, libxcb, libXext , libXt, udev, enableTextureFloats ? false, enableR600LlvmCompiler ? false , python, libxml2Python, autoconf, automake, libtool, llvm, writeText }: @@ -8,14 +8,14 @@ if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then else let - version = "9.0.3"; + version = "9.1"; in stdenv.mkDerivation { name = "mesa-${version}"; src = fetchurl { url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2"; - sha256="1986av3pl8v9hhxxqqdm2wn3qlwwnrznvfmm4wszhyf3n82h157a"; + sha256="0yvhl0vdg32h0xr4xi348gkp0hlcc16j1cfxn4pyc9pywyzlqj5g"; }; prePatch = "patchShebangs ."; @@ -31,7 +31,7 @@ stdenv.mkDerivation { + stdenv.lib.optionalString enableTextureFloats " --enable-texture-float"; buildInputs = [ - autoconf automake libtool expat libxml2Python udev llvm + autoconf automake libtool intltool expat libxml2Python udev llvm libdrm libXxf86vm libXfixes libXdamage glproto dri2proto libX11 libXext libxcb libXt ]; -- cgit 1.4.1 From 40b7ecf930610b06f413640b5f4ed95fcea74937 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 23 Feb 2013 13:25:48 +0100 Subject: gnutls2: fix via a minor update --- pkgs/development/libraries/gnutls/2.12.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/gnutls/2.12.nix b/pkgs/development/libraries/gnutls/2.12.nix index cbb72754b1bf..85a676a05b1f 100644 --- a/pkgs/development/libraries/gnutls/2.12.nix +++ b/pkgs/development/libraries/gnutls/2.12.nix @@ -5,11 +5,11 @@ assert guileBindings -> guile != null; stdenv.mkDerivation rec { - name = "gnutls-2.12.11"; + name = "gnutls-2.12.23"; - src = fetchurl { - url = "mirror://gnu/gnutls/${name}.tar.bz2"; - sha256 = "0q0kk69y1vpdxdz0mxqw603zi2y5kkgz3rvinc6bv6z9mwd8xd80"; + src = fetchurl { # missing on standard mirrors + url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v2.12/${name}.tar.bz2"; + sha256 = "1lkys703z4yxfgzarmgas5ccvn6m254w9wvm7s8v0zkj81z7m9nz"; }; configurePhase = '' -- cgit 1.4.1 From c5561a8e7657dd13eb7aa5864d58c9fa1cc205fa Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 23 Feb 2013 14:49:23 +0100 Subject: gsasl: fix via a major update --- pkgs/development/libraries/gsasl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index 9f71bc5e202a..3b52133058f1 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, gss, libidn }: stdenv.mkDerivation rec { - name = "gsasl-1.6.1"; + name = "gsasl-1.8.0"; src = fetchurl { url = "mirror://gnu/gsasl/${name}.tar.gz"; - sha256 = "02dmras3kqik08p14mpq0lj678w7wmmaxpcvdrx116wkcgspv2z6"; + sha256 = "1rci64cxvcfr8xcjpqc4inpfq7aw4snnsbf5xz7d30nhvv8n40ii"; }; buildInputs = [ gss libidn ]; -- cgit 1.4.1 From 691147f4524c6641139ef8f4d5f07fa4b2378395 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 23 Feb 2013 18:27:12 +0100 Subject: agg: fix for new automake --- pkgs/development/libraries/agg/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix index 9ef13735b084..8c24ae6fdbee 100644 --- a/pkgs/development/libraries/agg/default.nix +++ b/pkgs/development/libraries/agg/default.nix @@ -8,7 +8,12 @@ stdenv.mkDerivation rec { sha256 = "07wii4i824vy9qsvjsgqxppgqmfdxq0xa87i5yk53fijriadq7mb"; }; buildInputs = [ autoconf automake libtool pkgconfig freetype SDL libX11 ]; - preConfigure = "sh autogen.sh"; + + # fix build with new automake, from Gentoo ebuild + preConfigure = '' + sed -i '/^AM_C_PROTOTYPES/d' configure.in + sh autogen.sh + ''; configureFlags = "--x-includes=${libX11}/include --x-libraries=${libX11}/lib"; -- cgit 1.4.1 From 06cd4df3b1dbd404f0008029c4c1195f5855a65e Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 23 Feb 2013 19:16:42 +0100 Subject: goffice_0_8: finally fix --- pkgs/development/libraries/goffice/default.nix | 3 +++ pkgs/development/libraries/goffice/pcre_info.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/goffice/pcre_info.patch (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index 1eaa1baf86d6..14da5f3468b4 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -10,6 +10,9 @@ stdenv.mkDerivation rec { sha256 = "165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15"; }; + # fix linking error: undefined reference to pcre_info + patches = [ ./pcre_info.patch ]; # inspired by https://bugs.php.net/bug.php?id=60986 + buildInputs = [ pkgconfig libglade bzip2 libart intltool gettext gconf libgnomeui pcre diff --git a/pkgs/development/libraries/goffice/pcre_info.patch b/pkgs/development/libraries/goffice/pcre_info.patch new file mode 100644 index 000000000000..cd4ef3c9fed7 --- /dev/null +++ b/pkgs/development/libraries/goffice/pcre_info.patch @@ -0,0 +1,13 @@ +diff --git a/goffice/utils/regutf8.c b/goffice/utils/regutf8.c +index bc4aae4..3adb696 100644 +--- a/goffice/utils/regutf8.c ++++ b/goffice/utils/regutf8.c +@@ -155,7 +155,7 @@ go_regcomp (GORegexp *gor, const char *pat, int cflags) + default: return GO_REG_BADPAT; + } + } else { +- gor->re_nsub = pcre_info (r, NULL, NULL); ++ gor->re_nsub = pcre_fullinfo (r, NULL, NULL, NULL); + gor->nosub = (cflags & GO_REG_NOSUB) != 0; + return 0; + } -- cgit 1.4.1 From c173ddecbbfe6cb0677273467800d6483e735bce Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 23 Feb 2013 19:23:58 +0100 Subject: kdePackages.libalkimia: fix build --- pkgs/development/libraries/libalkimia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/libalkimia/default.nix b/pkgs/development/libraries/libalkimia/default.nix index 7a37c61c4955..d372c5cf8fc9 100644 --- a/pkgs/development/libraries/libalkimia/default.nix +++ b/pkgs/development/libraries/libalkimia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kdelibs, gmpxx }: +{ stdenv, fetchurl, pkgconfig, kdelibs, gmpxx }: stdenv.mkDerivation rec { name = "libalkimia-4.3.2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; patchPhase = "sed -e 's/KDE4_DATA_DIR/DATA_INSTALL_DIR/' -i CMakeLists.txt"; - buildInputs = [ kdelibs gmpxx ]; + buildInputs = [ pkgconfig kdelibs gmpxx ]; meta = { maintainers = [ stdenv.lib.maintainers.urkud ]; -- cgit 1.4.1 From 5e8747300eea9bca1b8bae945fe61e2918a7f560 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 23 Feb 2013 20:09:11 +0100 Subject: openscenegraph: update and fix --- pkgs/development/libraries/openscenegraph/default.nix | 16 +++++++++------- pkgs/development/libraries/openscenegraph/xine.patch | 18 ++++++++++++++++++ 2 files changed, 27 insertions(+), 7 deletions(-) create mode 100644 pkgs/development/libraries/openscenegraph/xine.patch (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index 08e08b876b66..01993fa1cd87 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -2,22 +2,22 @@ x@{builderDefsPackage , cmake, giflib, libjpeg, libtiff, lib3ds, freetype, libpng , coin3d, jasper, gdal, xproto, libX11, libXmu, freeglut, mesa , doxygen, ffmpeg, xineLib, unzip, zlib, openal, libxml2 - , curl + , curl, a52dec, faad2, gdk_pixbuf , ...}: builderDefsPackage (a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="OpenSceneGraph"; - version="2.8.3"; + version="3.0.1"; name="${baseName}-${version}"; url="http://www.openscenegraph.org/downloads/stable_releases/${name}/source/${name}.zip"; - hash="0phihxs7zgir9n1z54xsrsha8wa0xll7xl6lvqvrrczf0bm80yrs"; + hash="15l23mxv93mw6wkc90x52jhwxh7r3d7lahwdsv3jfnha9dbh648c"; }; in rec { @@ -30,7 +30,9 @@ rec { inherit buildInputs; /* doConfigure should be removed if not needed */ - phaseNames = ["setVars" "addInputs" "doUnpack" "doCmake" "doMakeInstall"]; + phaseNames = ["setVars" "addInputs" "doUnpack" "doPatch" "doCmake" "doMakeInstall"]; + + patches = [ ./xine.patch ]; # http://forum.openscenegraph.org/viewtopic.php?t=9659 cmakeFlags = [ "-D MATH_LIBRARY=" @@ -39,7 +41,7 @@ rec { setVars = a.noDepEntry '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D__STDC_CONSTANT_MACROS=1" ''; - + meta = { description = "A 3D graphics toolkit"; maintainers = with a.lib.maintainers; diff --git a/pkgs/development/libraries/openscenegraph/xine.patch b/pkgs/development/libraries/openscenegraph/xine.patch new file mode 100644 index 000000000000..8fbc8ceec52e --- /dev/null +++ b/pkgs/development/libraries/openscenegraph/xine.patch @@ -0,0 +1,18 @@ +--- OpenSceneGraph-3.0.1.orig/src/osgPlugins/xine/video_out_rgb.c ++++ OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c +@@ -2769,8 +2769,14 @@ init_class(xine_t* xine, void* vo_visual + clear(rgb_class, sizeof(rgbout_class_t)); + + rgb_class->driver_class.open_plugin = open_plugin; ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + rgb_class->driver_class.get_identifier = get_identifier; + rgb_class->driver_class.get_description = get_description; ++#else ++ rgb_class->driver_class.identifier = get_identifier(NULL); ++ rgb_class->driver_class.description = get_description(NULL); ++#endif ++ + rgb_class->driver_class.dispose = dispose_class; + + return(rgb_class); + -- cgit 1.4.1 From 871c9ff726792cf093f72aec9ffd35d91f66a1d1 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 23 Feb 2013 20:10:15 +0100 Subject: simgear: fix via update --- pkgs/development/libraries/simgear/default.nix | 22 +++++++++++----------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index 961d14753335..de8e1d1df1da 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -1,23 +1,23 @@ x@{builderDefsPackage , plib, freeglut, xproto, libX11, libXext, xextproto, libXi , inputproto , libICE, libSM, libXt, libXmu, mesa, boost, zlib, libjpeg , freealut - , openscenegraph, openal + , openscenegraph, openal, expat, cmake , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { - baseName="SimGear"; - version="2.0.0"; + baseName="simgear"; + version="2.10.0"; name="${baseName}-${version}"; - extension="tar.gz"; - url="ftp://ftp.goflyflightgear.com/simgear/Source/${name}.${extension}"; - hash="08fia5rjrlvw45i3v09fn90vhdhb54wjl6kn3d8vpspxmsw4fn55"; + extension="tar.bz2"; + url="http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${name}.${extension}"; + hash="0pb148hb35p1c5iz0kpiclmswjl9bax9xfm087ldpxsqg9a0sb2q"; }; in rec { @@ -30,8 +30,8 @@ rec { inherit buildInputs; /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; - + phaseNames = [ "doCmake" "doMakeInstall" ]; + meta = { description = "Simulation construction toolkit"; maintainers = with a.lib.maintainers; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10926f299d3e..c7fe618bce63 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4848,7 +4848,7 @@ let silgraphite = callPackage ../development/libraries/silgraphite {}; - simgear = callPackage ../development/libraries/simgear {}; + simgear = callPackage ../development/libraries/simgear { }; sfml_git = callPackage ../development/libraries/sfml { }; -- cgit 1.4.1 From c9d3702c9742b08a99701c18048dea04192db23d Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 23 Feb 2013 22:20:42 +0100 Subject: telepathy-related: fix via update Some updates were restricted by gstreamer being <1.0 --- .../instant-messengers/telepathy/gabble/default.nix | 6 +++--- .../instant-messengers/telepathy/haze/default.nix | 4 ++-- .../instant-messengers/telepathy/kde/0.4.0.nix | 16 ---------------- .../instant-messengers/telepathy/kde/0.5.3.nix | 16 ++++++++++++++++ .../instant-messengers/telepathy/kde/default.nix | 2 +- .../instant-messengers/telepathy/logger/default.nix | 4 ++-- .../telepathy/mission-control/default.nix | 4 ++-- pkgs/development/libraries/farstream/default.nix | 4 ++-- pkgs/development/libraries/libnice/default.nix | 6 +++--- pkgs/development/libraries/qjson/default.nix | 4 ++-- .../libraries/telepathy/farstream/default.nix | 6 +++--- pkgs/development/libraries/telepathy/glib/default.nix | 6 +++--- pkgs/development/libraries/telepathy/qt/default.nix | 8 ++++---- 13 files changed, 43 insertions(+), 43 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/telepathy/kde/0.4.0.nix create mode 100644 pkgs/applications/networking/instant-messengers/telepathy/kde/0.5.3.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index c7a0401f3ee9..8863af259842 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -2,18 +2,18 @@ , sqlite, libsoup, libnice, gnutls }: stdenv.mkDerivation rec { - name = "telepathy-gabble-0.16.0"; + name = "telepathy-gabble-0.17.2"; src = fetchurl { url = "${meta.homepage}/releases/telepathy-gabble/${name}.tar.gz"; - sha256 = "0fk65f7q75z3wm5h4wad7g5sm2j6r8v2845b74ycl29br78ki2hf"; + sha256 = "137sslbgh0326lmwihcr2ybljgq9mzsx5wnciilpx884si22wpk8"; }; nativeBuildInputs = [pkgconfig libxslt]; buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ]; configureFlags = "--with-ca-certificates=/etc/ca-bundle.crt"; - + meta = { homepage = http://telepathy.freedesktop.org; }; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index c8c685196cdf..b2fd13837d79 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "telepathy-haze"; - name = "${pname}-0.6.0"; + name = "${pname}-0.7.0"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; - sha256 = "1qrgmcr8ga6nvaz9hhn0mv0p7v799wsawrg3k5l791cgxx5carz2"; + sha256 = "1gaj8518ilm3gnzqf3lmiqgnwkay8wfbsqngcz15whzji8sl608b"; }; buildInputs = [ glib telepathy_glib dbus_glib pidgin ]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/0.4.0.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/0.4.0.nix deleted file mode 100644 index aadeb3e2a675..000000000000 --- a/pkgs/applications/networking/instant-messengers/telepathy/kde/0.4.0.nix +++ /dev/null @@ -1,16 +0,0 @@ -[ -{name="ktp-accounts-kcm";key="accounts_kcm";sha256="1a312cfm1i8ipqp0r09zfhlk7vacp006pbhwwvyf0sgracizr0cp";} -{name="ktp-approver";key="approver";sha256="0wfpwlk5f3n37xl619jzjxmgrq81qnr9kg9m955zbcad2jsx3z35";} -{name="ktp-auth-handler";key="auth_handler";sha256="1q5jjj3np3kg7py28jb74q8lpi6camw7907950igpnwzbzmacxwa";} -{name="ktp-call-ui";key="call_ui";sha256="08k59q0gf6fq0mmz72akiqkldqy6grw1gs7jz44gzmr82jvaqjb3";} -{name="ktp-common-internals";key="common_internals";sha256="1cmil7wp6rgqzl0bciphqmvdzipm856c45kx2mzrk6n1vnl9l500";} -{name="ktp-contact-applet";key="contact_applet";sha256="1j42yqq06bkpfb4jgm88qqbwnz9538ys5aghyfg147jr50h9pk8k";} -{name="ktp-contact-list";key="contact_list";sha256="1ndpr2z99clmy8f7l8l6ws7bljmmqvfrb5f0nrym91lyvcdz7sb2";} -{name="ktp-contact-runner";key="contact_runner";sha256="1v8mcp8q1cfmxdg65qqh159q9pynz3pc3y0ycr6hn1nrgxncs48k";} -{name="ktp-filetransfer-handler";key="filetransfer_handler";sha256="0dj2if34wxajwylgfxwd5chvxk63lxmsq52sc039dsj9p174cp3y";} -{name="ktp-kded-integration-module";key="kded_integration_module";sha256="0p873h6cjdinfinfz1cggyw611v2gllmkvzczszxnl8q2hcprx96";} -{name="ktp-presence-applet";key="presence_applet";sha256="1y8yhbbjp9qgycn93lqd6ss7jln1hpxa0dnqgirijfjn15c20nfl";} -{name="ktp-send-file";key="send_file";sha256="0sacvda2xs5g7w2xca9p6z61f2w69sgw0g3sj2fazrsm0x7a0z0d";} -{name="ktp-text-ui";key="text_ui";sha256="1xsslwaisk90wa45rgps3500wl1fbxq4qp6njljf4qbysyw4wfdb";} -{name="telepathy-logger-qt";key="telepathy_logger_qt";sha256="1398iyb72grhwwi0idxdwj1qdi2s02cp2wvjv72wvv3vyfwb51kn";} -] diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/0.5.3.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/0.5.3.nix new file mode 100644 index 000000000000..eb0543aa5b0f --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/0.5.3.nix @@ -0,0 +1,16 @@ +[ +{name="ktp-accounts-kcm";key="accounts_kcm";sha256="0nmjwbm7ycy5awwlx359889am7qbvs64gk0bd1800a9jl2lhvw56";} +{name="ktp-approver";key="approver";sha256="0n0a2abbz7xvzp3p4l6khgbhbjylppvskcyma440fmfv3j3jdc12";} +{name="ktp-auth-handler";key="auth_handler";sha256="11vfim3ck60cy22x84bz6cw0267kf884qa00nbm033kpwjbx4zr6";} +{name="ktp-call-ui";key="call_ui";sha256="0gmppn4f5a9yd3pnzga3sdwz37c7qpmx586914r64jbkii196xg4";} +{name="ktp-common-internals";key="common_internals";sha256="1lkmaym8bv5ijy7sksbihr63qify9b9vrhrikck6q23n8sk112n9";} +{name="ktp-contact-applet";key="contact_applet";sha256="0gsf1m276mhvysy30qqw1h7ssdipyyjh43jbf2lx4bb934by9wby";} +{name="ktp-contact-list";key="contact_list";sha256="19nlzs650lwmzr30lrviv0qw1xd061pdrk17cm512ldvzibc70ab";} +{name="ktp-contact-runner";key="contact_runner";sha256="0x3zkk11x9npx30w330s8n49ybqlyhgcndvqizg4sbj1lfbrmhn1";} +{name="ktp-filetransfer-handler";key="filetransfer_handler";sha256="0w90hsypzgakqx96xkf0wk2qqns6v5ji814gvc3rf9ajcwh0d024";} +{name="ktp-kded-integration-module";key="kded_integration_module";sha256="0sz0d1yfj35q5r1gc4m6v2c8r0cik2vzvkqfx9pqy8g97d7q1nmj";} +{name="ktp-presence-applet";key="presence_applet";sha256="081jas1vzh6nwj3w60bw3w95gpdbi74pdi9rdxv0wvra5w76s4i6";} +{name="ktp-send-file";key="send_file";sha256="19nlm4sfa0m0y856nzs3hrncbznc35zwbsxavssd9wrbb8p9cns6";} +{name="ktp-text-ui";key="text_ui";sha256="0g8114adqyvzsdm8ldhidf2gyxkv0bnky71zg70gmhkdmzcfssyn";} +{name="telepathy-logger-qt";key="telepathy_logger_qt";sha256="17bfkbxc7gfcspmjd5w6vn9a75f36qinj7illqafb7k0jqqz2nq6";} +] diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix index 5c1c399ab49a..d41db2e44983 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix @@ -3,7 +3,7 @@ let pkgconfig = pkgconfigUpstream; - version = "0.4.0"; + version = "0.5.3"; manifest = import (./. + "/${version}.nix"); overrides = { diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 4dacdb9f1ed9..527642348d25 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { project = "telepathy-logger"; - name = "${project}-0.4.0"; + name = "${project}-0.8.0"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/${project}/${name}.tar.bz2"; - sha256 = "1rb58ipz56c9bac8b31md5gk1fw7jim8x9dx3cm5gmxg2q3apd86"; + sha256 = "18i00l8lnp5dghqmgmpxnn0is2a20pkisxy0sb78hnd2dz0z6xnl"; }; buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool ]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index 1b2081c4dd09..56abf34e1b39 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, telepathy_glib, libxslt }: stdenv.mkDerivation rec { - name = "${pname}-5.12.0"; + name = "${pname}-5.14.0"; pname = "telepathy-mission-control"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; - sha256 = "0xsycjk2l19h026adqms8ik7c2xj9j9rba76znfh46ryaijyn2k6"; + sha256 = "0c4asjgk7pk39i8njf0q1df0mhisif83lq716ln6r0wja9zh9q2q"; }; buildInputs = [ telepathy_glib ]; diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix index 87764483f47e..7d84cf889932 100644 --- a/pkgs/development/libraries/farstream/default.nix +++ b/pkgs/development/libraries/farstream/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { sha256 = "1nbkbvq959f70zhr03fwdibhs0sbf1k7zmbz9w99vda7gdcl0nps"; }; - buildInputs = [ libnice python pygobject gupnp_igd ]; + buildInputs = [ libnice python pygobject gupnp_igd libnice ]; nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ gstreamer gst_plugins_base gst_python + propagatedBuildInputs = [ gstreamer gst_plugins_base gst_python gst_plugins_good gst_plugins_bad gst_ffmpeg ]; diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index 5a3cb9d041b5..4ccb7d4df8ba 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, gupnp_igd, gstreamer, gst_plugins_base }: stdenv.mkDerivation rec { - name = "libnice-0.1.1"; - + name = "libnice-0.1.4"; + src = fetchurl { url = "http://nice.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "0jcpb953jn7c3ng2vbkljybzh63x6mg4m6rjxj1s1iccm3fi6qki"; + sha256 = "0mxzr3y91hkjxdz1mzhxwi59la86hw2rzmd3y9c32801kkg1gra4"; }; buildInputs = [ pkgconfig glib gupnp_igd gstreamer gst_plugins_base ]; diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix index af960c1b9933..e69ae5f98f7b 100644 --- a/pkgs/development/libraries/qjson/default.nix +++ b/pkgs/development/libraries/qjson/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, qt4 }: stdenv.mkDerivation rec { - name = "qjson-0.7.1"; + name = "qjson-0.8.1"; src = fetchurl { url = "mirror://sourceforge/qjson/${name}.tar.bz2"; - sha256 = "155r7nypgnsvjc6w3q51zmjchpqxi4c3azad9cf1fip8bws993iv"; + sha256 = "1n8lr2ph08yhcgimf4q1pnkd4z15v895bsf3m68ljz14aswvakfd"; }; buildInputs = [ cmake qt4 ]; diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix index b6b96a2439f1..a6a624c0a878 100644 --- a/pkgs/development/libraries/telepathy/farstream/default.nix +++ b/pkgs/development/libraries/telepathy/farstream/default.nix @@ -2,16 +2,16 @@ , pkgconfig, libxslt, python, gstreamer, gst_python, pygobject }: stdenv.mkDerivation rec { - name = "${pname}-0.2.3"; + name = "${pname}-0.4.0"; pname = "telepathy-farstream"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; - sha256 = "1a163gk9y3ckabm4a43lxc5a7j2s42hykbwr6r7b5mlfyqq8myx1"; + sha256 = "13mllgfx4b1hh1vpzq8lk5qfr3ivkkkmwbxgi6d47avgk746kznd"; }; buildInputs = [ gst_plugins_base gst_python pygobject ]; - propagatedBuildInputs = [ dbus_glib farstream telepathy_glib gstreamer ]; + propagatedBuildInputs = [ dbus_glib telepathy_glib gstreamer farstream ]; nativeBuildInputs = [ pkgconfig python libxslt]; } diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index b31338a65951..46aba67702df 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt }: stdenv.mkDerivation rec { - name = "telepathy-glib-0.18.1"; + name = "telepathy-glib-0.20.1"; src = fetchurl { url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz"; - sha256 = "0vac5wk9rpaniqxwa50szcc5ql779ks37sy4z7fj4k73i5k2af1p"; + sha256 = "1dk1s977zv8c935jsiv7ll51a52rlwd7a6f8v7z8klzvc4zk9801"; }; propagatedBuildInputs = [dbus_glib glib python]; - + buildInputs = [pkgconfig libxslt]; meta = { diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index a4c90cd1c61f..b535961357b0 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, cmake, qt4, pkgconfig, python, libxslt, dbus_glib -, telepathy_farstream, telepathy_glib }: +, telepathy_farstream, telepathy_glib, pythonDBus }: stdenv.mkDerivation rec { - name = "telepathy-qt-0.9.1"; + name = "telepathy-qt-0.9.3"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz"; - sha256 = "0rwyxjk6646r43mvsg01q7rfsah0ni05fa8gxzlx1zhj76db95yh"; + sha256 = "1yabyhsikw828ns7cf6hvzbxdxh53na1ck0q7qsav1lvlyz5gzy0"; }; nativeBuildInputs = [ cmake pkgconfig python libxslt ]; - propagatedBuildInputs = [ qt4 dbus_glib telepathy_farstream telepathy_glib ]; + propagatedBuildInputs = [ qt4 dbus_glib telepathy_farstream telepathy_glib pythonDBus ]; preBuild = '' NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`" ''; -- cgit 1.4.1 From df0e2bbf4de28b728c7959cf34ca9625fb864aa4 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sun, 24 Feb 2013 00:14:58 +0100 Subject: gtk-sharp-2: fix for new glib --- pkgs/development/libraries/gtk-sharp-2/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/gtk-sharp-2/default.nix b/pkgs/development/libraries/gtk-sharp-2/default.nix index 7ffc918f678d..9baac518ff76 100644 --- a/pkgs/development/libraries/gtk-sharp-2/default.nix +++ b/pkgs/development/libraries/gtk-sharp-2/default.nix @@ -26,6 +26,13 @@ stdenv.mkDerivation { # patches = [ ./dllmap-glue.patch ]; + # patch bad usage of glib, which wasn't tolerated anymore + prePatch = '' + for f in glib/glue/{thread,list,slist}.c; do + sed -i 's,#include ,#include ,g' "$f" + done + ''; + buildInputs = [ pkgconfig mono glib pango gtk GConf libglade libgnomecanvas libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 -- cgit 1.4.1 From fa42471a2f0732ddf923522a75727a530f64deaf Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sun, 24 Feb 2013 09:42:26 +0100 Subject: boost147: remove, seemed unneeded --- pkgs/development/libraries/boost/1.47.nix | 90 ---------------------- .../libraries/boost/boost_filesystem_1_47_0.patch | 24 ------ pkgs/top-level/all-packages.nix | 3 +- 3 files changed, 1 insertion(+), 116 deletions(-) delete mode 100644 pkgs/development/libraries/boost/1.47.nix delete mode 100644 pkgs/development/libraries/boost/boost_filesystem_1_47_0.patch (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/boost/1.47.nix b/pkgs/development/libraries/boost/1.47.nix deleted file mode 100644 index 195cb469051f..000000000000 --- a/pkgs/development/libraries/boost/1.47.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ stdenv, fetchurl, icu, expat, zlib, bzip2, python -, enableRelease ? true -, enableDebug ? false -, enableSingleThreaded ? false -, enableMultiThreaded ? true -, enableShared ? true -, enableStatic ? false -, enablePIC ? false -, enableExceptions ? false -}: - -let - - variant = stdenv.lib.concatStringsSep "," - (stdenv.lib.optional enableRelease "release" ++ - stdenv.lib.optional enableDebug "debug"); - - threading = stdenv.lib.concatStringsSep "," - (stdenv.lib.optional enableSingleThreaded "single" ++ - stdenv.lib.optional enableMultiThreaded "multi"); - - link = stdenv.lib.concatStringsSep "," - (stdenv.lib.optional enableShared "shared" ++ - stdenv.lib.optional enableStatic "static"); - - # To avoid library name collisions - finalLayout = if ((enableRelease && enableDebug) || - (enableSingleThreaded && enableMultiThreaded) || - (enableShared && enableStatic)) then - "tagged" else "system"; - - cflags = if enablePIC && enableExceptions then - "cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC" - else if enablePIC then - "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" - else if enableExceptions then - "cflags=-fexceptions" - else - ""; -in - -stdenv.mkDerivation { - name = "boost-1.47.0"; - - meta = { - homepage = "http://boost.org/"; - description = "Boost C++ Library Collection"; - license = "boost-license"; - - maintainers = [ stdenv.lib.maintainers.simons ]; - }; - - src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_47_0.tar.bz2"; - sha256 = "815a5d9faac4dbd523fbcf3fe1065e443c0bbf43427c44aa423422c6ec4c2e31"; - }; - - # See . - patches = [ ./boost_filesystem_1_47_0.patch ]; - - enableParallelBuilding = true; - - buildInputs = [icu expat zlib bzip2 python]; - - configureScript = "./bootstrap.sh"; - configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python"; - - buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} ${cflags} install"; - - installPhase = ":"; - - crossAttrs = rec { - buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ]; - # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to - # override them. - propagatedBuildInputs = buildInputs; - # We want to substitute the contents of configureFlags, removing thus the - # usual --build and --host added on cross building. - preConfigure = '' - export configureFlags="--prefix=$out --without-icu" - ''; - buildPhase = '' - set -x - cat << EOF > user-config.jam - using gcc : cross : $crossConfig-g++ ; - EOF - ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.crossDrv}/include -sEXPAT_LIBPATH=${expat.crossDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install - ''; - }; -} diff --git a/pkgs/development/libraries/boost/boost_filesystem_1_47_0.patch b/pkgs/development/libraries/boost/boost_filesystem_1_47_0.patch deleted file mode 100644 index f32e9ed572d3..000000000000 --- a/pkgs/development/libraries/boost/boost_filesystem_1_47_0.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ubr boost_1_47_0/libs/filesystem/v2/src/v2_path.cpp boost_1_47_0-patched/libs/filesystem/v2/src/v2_path.cpp ---- boost_1_47_0/libs/filesystem/v2/src/v2_path.cpp 2011-01-11 22:39:33.000000000 +0100 -+++ boost_1_47_0-patched/libs/filesystem/v2/src/v2_path.cpp 2011-07-21 01:06:26.000000000 +0200 -@@ -45,7 +45,7 @@ - { - #if !defined(macintosh) && !defined(__APPLE__) && !defined(__APPLE_CC__) - // ISO C calls this "the locale-specific native environment": -- static std::locale lc(""); -+ static std::locale lc; - #else // Mac OS - // "All BSD system functions expect their string parameters to be in UTF-8 encoding - // and nothing else." -diff -ubr boost_1_47_0/libs/filesystem/v3/src/path.cpp boost_1_47_0-patched/libs/filesystem/v3/src/path.cpp ---- boost_1_47_0/libs/filesystem/v3/src/path.cpp 2011-07-05 16:49:42.000000000 +0200 -+++ boost_1_47_0-patched/libs/filesystem/v3/src/path.cpp 2011-07-21 01:06:26.000000000 +0200 -@@ -767,7 +767,7 @@ - // or LANG are wrong, for example), so dynamic initialization is used to ensure - // that exceptions can be caught. - -- return std::locale(""); -+ return std::locale(); - - # endif - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 290b841553e3..8a786c82e4ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3395,7 +3395,6 @@ let boolstuff = callPackage ../development/libraries/boolstuff { }; boost144 = callPackage ../development/libraries/boost/1.44.nix { }; - boost147 = callPackage ../development/libraries/boost/1.47.nix { }; boost149 = callPackage ../development/libraries/boost/1.49.nix { }; boost153 = callPackage ../development/libraries/boost/1.53.nix { }; boost = boost153; @@ -8423,7 +8422,7 @@ let kipi_plugins = callPackage ../applications/graphics/kipi-plugins { }; koffice = callPackage ../applications/office/koffice { - boost = boost147; + boost = boost149; }; konq_plugins = callPackage ../applications/networking/browsers/konq-plugins { }; -- cgit 1.4.1 From de70e3739d2e69806ddfd47efa8b21aa1864b15e Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sun, 24 Feb 2013 13:25:53 +0100 Subject: SELinux fixes and updates to 2012-09-24 --- pkgs/development/libraries/ustr/default.nix | 5 ++- pkgs/development/libraries/ustr/va_args.patch | 23 ++++++++++++++ pkgs/os-specific/linux/checkpolicy/default.nix | 13 ++++---- pkgs/os-specific/linux/libselinux/default.nix | 31 +++++++++++++++---- pkgs/os-specific/linux/libselinux/fPIC.patch | 13 ++++++++ pkgs/os-specific/linux/libsemanage/default.nix | 18 +++++------ pkgs/os-specific/linux/libsepol/default.nix | 19 +++++++++--- pkgs/os-specific/linux/policycoreutils/default.nix | 36 +++++++++++++++------- pkgs/os-specific/linux/sepolgen/default.nix | 22 +++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 10 files changed, 144 insertions(+), 38 deletions(-) create mode 100644 pkgs/development/libraries/ustr/va_args.patch create mode 100644 pkgs/os-specific/linux/libselinux/fPIC.patch create mode 100644 pkgs/os-specific/linux/sepolgen/default.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/ustr/default.nix b/pkgs/development/libraries/ustr/default.nix index ebf9628126e2..b016a6f715c1 100644 --- a/pkgs/development/libraries/ustr/default.nix +++ b/pkgs/development/libraries/ustr/default.nix @@ -8,8 +8,11 @@ stdenv.mkDerivation rec { url = "http://www.and.org/ustr/${version}/${name}.tar.bz2"; sha256 = "1i623ygdj7rkizj7985q9d6vj5amwg686aqb5j3ixpkqkyp6xbrx"; }; + prePatch = "substituteInPlace Makefile --replace /usr/include/ ${glibc}/include/"; + patches = [ ./va_args.patch ]; # fixes bogus warnings that failed libsemanage + makeFlags = "DESTDIR=$(out) prefix= LDCONFIG=echo"; configurePhase = "make ustr-import"; @@ -21,4 +24,4 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = [ maintainers.phreedom ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/libraries/ustr/va_args.patch b/pkgs/development/libraries/ustr/va_args.patch new file mode 100644 index 000000000000..f75b537485d8 --- /dev/null +++ b/pkgs/development/libraries/ustr/va_args.patch @@ -0,0 +1,23 @@ +diff --git a/ustr-compiler.h b/ustr-compiler.h +index 9e71276..c5f847a 100644 +--- a/ustr-compiler.h ++++ b/ustr-compiler.h +@@ -11,17 +11,11 @@ + #define USTR_CONF_HAVE_ATTR_FMT 1 + #endif + ++#include + /* We assume this is enough, + * C99 specifies that va_copy() exists and is a macro */ +-#ifdef va_copy + # define USTR_CONF_HAVE_VA_COPY 1 + # define USTR__VA_COPY(x, y) va_copy(x, y) +-#elif __va_copy +-# define USTR_CONF_HAVE_VA_COPY 1 +-# define USTR__VA_COPY(x, y) __va_copy(x, y) +-#else +-# define USTR_CONF_HAVE_VA_COPY 0 +-#endif + + #ifndef USTR_CONF_HAVE_ATTR_NONNULL + #if defined(__GNUC__) && (__GNUC__ > 3) /* not sure */ diff --git a/pkgs/os-specific/linux/checkpolicy/default.nix b/pkgs/os-specific/linux/checkpolicy/default.nix index a69249b216d3..9125c84bd7a1 100644 --- a/pkgs/os-specific/linux/checkpolicy/default.nix +++ b/pkgs/os-specific/linux/checkpolicy/default.nix @@ -2,11 +2,12 @@ stdenv.mkDerivation rec { name = "checkpolicy-${version}"; - version = "2.0.23"; + version = "2.1.11"; + inherit (libsepol) se_release se_url; src = fetchurl { - url = "http://userspace.selinuxproject.org/releases/20101221/devel/checkpolicy-2.0.23.tar.gz"; - sha256 = "1n34ggacds7xap039r6hqkxmkd4g2wgfkxjdnv3lirq3cqqi8cnd"; + url = "${se_url}/${se_release}/checkpolicy-${version}.tar.gz"; + sha256 = "1wahs32l4jjlg0s3lyihdhvwmsy7yyvq5pk96q9lsiilc5vvrb06"; }; buildInputs = [ libsepol libselinux bison flex ]; @@ -14,10 +15,8 @@ stdenv.mkDerivation rec { preBuild = '' makeFlags="$makeFlags LEX=flex LIBDIR=${libsepol}/lib PREFIX=$out" ''; meta = with stdenv.lib; { - homepage = http://userspace.selinuxproject.org/; description = "SELinux policy compiler"; license = licenses.gpl2; - maintainers = [ maintainers.phreedom ]; - platforms = platforms.linux; + inherit (libsepol.meta) homepage platforms maintainers; }; -} \ No newline at end of file +} diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index 4be88a20e24a..873065d54244 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -1,15 +1,34 @@ -{stdenv, fetchurl, libsepol}: +{ stdenv, fetchurl, pkgconfig, libsepol, pcre }: stdenv.mkDerivation rec { name = "libselinux-${version}"; - version = "2.0.98"; + version = "2.1.12"; + inherit (libsepol) se_release se_url; src = fetchurl { - url = "http://userspace.selinuxproject.org/releases/20101221/devel/${name}.tar.gz"; - sha256 = "00irm7nyakgi4z8d6dlm6c70fkbl6rzk5w1w0ny2c564yw0d0dlz"; + url = "${se_url}/${se_release}/libselinux-${version}.tar.gz"; + sha256 = "17navgvljgq35bljzcdwjdj3khajc27s15binr51xkp0h29qgbcd"; }; - buildInputs = [ libsepol ]; + patch_src = fetchurl { + url = "http://dev.gentoo.org/~swift/patches/libselinux/patchbundle-${name}-r2.tar.gz"; + sha256 = "08zaas8iwyf4w9ll1ylyv4gril1nfarckd5h1l53563sxzyf7dqh"; + }; + + patches = [ ./fPIC.patch ]; # libsemanage seems to need -fPIC everywhere + + buildInputs = [ pkgconfig libsepol pcre ]; - preBuild = '' makeFlags="$makeFlags PREFIX=$out DESTDIR=$out" ''; + prePatch = '' + tar xvf ${patch_src} + for p in gentoo-patches/*.patch; do + patch -p1 < "$p" + done + ''; + + preInstall = '' makeFlags="$makeFlags PREFIX=$out DESTDIR=$out" ''; + + meta = { + inherit (libsepol.meta) homepage platforms maintainers; + }; } diff --git a/pkgs/os-specific/linux/libselinux/fPIC.patch b/pkgs/os-specific/linux/libselinux/fPIC.patch new file mode 100644 index 000000000000..fdc1fa41a335 --- /dev/null +++ b/pkgs/os-specific/linux/libselinux/fPIC.patch @@ -0,0 +1,13 @@ +diff --git a/src/Makefile b/src/Makefile +index ac019df..00432b9 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -132,7 +132,7 @@ $(AUDIT2WHYSO): $(AUDIT2WHYLOBJ) + $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux $(LIBDIR)/libsepol.a -L$(LIBDIR) + + %.o: %.c policy.h +- $(CC) $(CFLAGS) $(TLSFLAGS) -c -o $@ $< ++ $(CC) $(CFLAGS) $(TLSFLAGS) -fPIC -c -o $@ $< + + %.lo: %.c policy.h + $(CC) $(CFLAGS) -fPIC -DSHARED -c -o $@ $< diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix index 22e177191a57..28908189cf32 100644 --- a/pkgs/os-specific/linux/libsemanage/default.nix +++ b/pkgs/os-specific/linux/libsemanage/default.nix @@ -2,24 +2,24 @@ stdenv.mkDerivation rec { name = "libsemanage-${version}"; - version = "2.0.46"; + version = "2.1.9"; + inherit (libsepol) se_release se_url; src = fetchurl { - url = "http://userspace.selinuxproject.org/releases/20101221/devel/${name}.tar.gz"; - sha256 = "03ljdw48pn8vlk4h26w8z247c9wykp2198s1ksmxrai3avyz87wf"; + url = "${se_url}/${se_release}/libsemanage-${version}.tar.gz"; + sha256 = "1k1my3n1pj30c5887spykcdk1brgxfpxmrz6frxjyhaijxzx20bg"; }; - NIX_LDFLAGS = "-lsepol"; - makeFlags = "PREFIX=$(out) DESTDIR=$(out)"; + NIX_CFLAGS_COMPILE = "-fstack-protector-all"; + NIX_CFLAGS_LINK = "-lsepol"; + buildInputs = [ libsepol libselinux ustr bzip2 bison flex ]; meta = with stdenv.lib; { - homepage = http://userspace.selinuxproject.org/; + inherit (libsepol.meta) homepage platforms maintainers; description = "Policy management tools for SELinux"; license = licenses.lgpl21; - maintainers = [ maintainers.phreedom ]; - platforms = platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index 1751994e3de3..d41d1cbe7522 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -1,13 +1,24 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libsepol-${version}"; - version = "2.0.42"; + version = "2.1.8"; + se_release = "20120924"; + se_url = "${meta.homepage}/releases"; src = fetchurl { - url = "http://userspace.selinuxproject.org/releases/20101221/devel/${name}.tar.gz"; - sha256 = "0sg61mb9qhyh4vplasar6nwd6j123v453zss93qws3h95fhrfc08"; + url = "${se_url}/${se_release}/libsepol-${version}.tar.gz"; + sha256 = "1w38q3lmha5m9aps9w844i51yw4b8q1vhpng2kdywn2n8cpdvvk3"; }; preBuild = '' makeFlags="$makeFlags PREFIX=$out DESTDIR=$out" ''; + + passthru = { inherit se_release se_url meta; }; + + meta = with stdenv.lib; { + homepage = http://userspace.selinuxproject.org; + platforms = platforms.linux; + maintainers = [ maintainers.phreedom ]; + license = "GPLv2"; + }; } diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix index b75405b42727..e49525a42bfc 100644 --- a/pkgs/os-specific/linux/policycoreutils/default.nix +++ b/pkgs/os-specific/linux/policycoreutils/default.nix @@ -1,25 +1,39 @@ -{ stdenv, fetchurl, libsepol, libselinux }: +{ stdenv, fetchurl, intltool, pcre, libcap_ng, libcgroup +, libsepol, libselinux, libsemanage +, python, sepolgen }: stdenv.mkDerivation rec { name = "policycoreutils-${version}"; - version = "2.0.85"; + version = "2.1.13"; + inherit (libsepol) se_release se_url; src = fetchurl { - url = http://userspace.selinuxproject.org/releases/20101221/devel/policycoreutils-2.0.85.tar.gz; - sha256 = "01q5ifacg24k9jdz85j9m17ps2l1p7abvh8pzy6qz55y68rycifb"; + url = "${se_url}/${se_release}/policycoreutils-${version}.tar.gz"; + sha256 = "1145nbpwndmhma08vvj1j75bjd8xhjal0vjpazlrw78iyc30y11l"; }; - buildInputs = [ libsepol libselinux ]; + patchPhase = '' + substituteInPlace po/Makefile --replace /usr/bin/install install + ''; - NIX_LDFLAGS = "-lsepol"; + buildInputs = [ intltool pcre libcap_ng libcgroup + libsepol libselinux libsemanage + python sepolgen # ToDo? these are optional + ]; - makeFlags = "LOCALEDIR=$(out)/share/locale"; + preBuild = '' + mkdir -p "$out/lib" && cp -s "${libsepol}/lib/libsepol.a" "$out/lib" + ''; + + NIX_CFLAGS_COMPILE = "-fstack-protector-all"; + NIX_LDFLAGS = "-lsepol -lpcre"; + + makeFlags = "PREFIX=$(out) DESTDIR=$(out) LOCALEDIR=$(out)/share/locale"; meta = with stdenv.lib; { - homepage = http://userspace.selinuxproject.org/; description = "SELinux policy core utilities"; license = licenses.gpl2; - maintainers = [ maintainers.phreedom ]; - platforms = platforms.linux; + inherit (libsepol.meta) homepage platforms maintainers; }; -} \ No newline at end of file +} + diff --git a/pkgs/os-specific/linux/sepolgen/default.nix b/pkgs/os-specific/linux/sepolgen/default.nix new file mode 100644 index 000000000000..7139ec98c285 --- /dev/null +++ b/pkgs/os-specific/linux/sepolgen/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, libsepol, python }: + +stdenv.mkDerivation rec { + name = "sepolgen-${version}"; + version = "1.1.8"; + inherit (libsepol) se_release se_url; + + src = fetchurl { + url = "${se_url}/${se_release}/sepolgen-${version}.tar.gz"; + sha256 = "1sssc9d4wz7l23yczlzplsmdr891sqr9w34ccn1bfwlnc4q63xdm"; + }; + + makeFlags = "PREFIX=$(out) DESTDIR=$(out) PYTHONLIBDIR=lib/${python.libPrefix}/site-packages"; + + buildInputs = [ python ]; + + meta = with stdenv.lib; { + inherit (libsepol.meta) homepage platforms maintainers; + description = "SELinux policy generation library"; + license = licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f70045f2f66d..069d52d8ac6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6174,6 +6174,8 @@ let sdparm = callPackage ../os-specific/linux/sdparm { }; + sepolgen = callPackage ../os-specific/linux/sepolgen { }; + shadow = callPackage ../os-specific/linux/shadow { }; splashutils = callPackage ../os-specific/linux/splashutils/default.nix { }; -- cgit 1.4.1 From 7165babaf12b48ae5ddfc92d500c4016acae45c7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:09:07 +0100 Subject: Re-generate all Haskell packages with the latest version of cabal2nix. This change brings support for building and running the regressions test suites. --- pkgs/applications/editors/leksah/default.nix | 1 + pkgs/development/libraries/haskell/Cabal/1.14.0.nix | 8 +++++++- pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix | 8 +++++++- pkgs/development/libraries/haskell/CouchDB/default.nix | 3 ++- pkgs/development/libraries/haskell/HTTP/4000.2.1.nix | 7 ++++++- pkgs/development/libraries/haskell/HTTP/4000.2.2.nix | 7 ++++++- pkgs/development/libraries/haskell/HTTP/4000.2.3.nix | 7 ++++++- pkgs/development/libraries/haskell/HTTP/4000.2.5.nix | 9 ++++++++- pkgs/development/libraries/haskell/HTTP/4000.2.8.nix | 9 ++++++++- .../development/libraries/haskell/IORefCAS/default.nix | 3 ++- .../development/libraries/haskell/ReadArgs/default.nix | 3 ++- .../libraries/haskell/SafeSemaphore/default.nix | 3 ++- pkgs/development/libraries/haskell/active/default.nix | 7 ++++++- pkgs/development/libraries/haskell/aeson/default.nix | 7 ++++++- pkgs/development/libraries/haskell/async/2.0.1.3.nix | 3 ++- pkgs/development/libraries/haskell/async/2.0.1.4.nix | 3 ++- .../libraries/haskell/attoparsec-conduit/default.nix | 4 +++- .../libraries/haskell/attoparsec/default.nix | 7 ++++++- .../libraries/haskell/base64-bytestring/default.nix | 8 +++++++- .../libraries/haskell/base64-conduit/default.nix | 6 +++++- pkgs/development/libraries/haskell/binary/default.nix | 7 ++++++- .../haskell/blaze-builder-conduit/default.nix | 7 ++++++- .../libraries/haskell/blaze-html/default.nix | 8 +++++++- .../libraries/haskell/blaze-markup/default.nix | 8 +++++++- .../libraries/haskell/blaze-textual/default.nix | 8 +++++++- pkgs/development/libraries/haskell/bson/default.nix | 8 ++++++-- .../libraries/haskell/case-insensitive/default.nix | 5 ++++- .../libraries/haskell/cipher-aes/default.nix | 5 ++++- .../libraries/haskell/cipher-rc4/default.nix | 5 ++++- .../haskell/classy-prelude-conduit/default.nix | 5 +++-- .../libraries/haskell/classy-prelude/default.nix | 5 +++-- .../libraries/haskell/clientsession/default.nix | 3 ++- pkgs/development/libraries/haskell/conduit/default.nix | 7 +++++-- .../libraries/haskell/crypto-conduit/default.nix | 8 +++++++- .../libraries/haskell/crypto-numbers/default.nix | 8 +++++++- .../libraries/haskell/crypto-pubkey/default.nix | 7 ++++++- .../libraries/haskell/cryptocipher/default.nix | 9 +++++++-- .../libraries/haskell/cryptohash/default.nix | 8 +++++++- .../development/libraries/haskell/css-text/default.nix | 3 ++- pkgs/development/libraries/haskell/cuda/default.nix | 2 +- .../libraries/haskell/deepseq-th/default.nix | 1 + .../development/libraries/haskell/diagrams/contrib.nix | 9 +++++++-- .../libraries/haskell/digestive-functors/default.nix | 3 ++- .../libraries/haskell/distributed-process/default.nix | 12 +++++++++--- .../libraries/haskell/distributive/default.nix | 3 ++- pkgs/development/libraries/haskell/doctest/default.nix | 8 +++++++- .../libraries/haskell/double-conversion/default.nix | 3 ++- .../libraries/haskell/email-validate/default.nix | 8 +++++++- .../haskell/exception-transformers/default.nix | 3 ++- .../libraries/haskell/fast-logger/default.nix | 4 +++- .../libraries/haskell/file-embed/default.nix | 3 ++- .../libraries/haskell/filesystem-conduit/default.nix | 6 +++++- .../development/libraries/haskell/fsnotify/default.nix | 8 +++++++- .../libraries/haskell/ghc-events/default.nix | 1 + .../development/libraries/haskell/graphviz/default.nix | 8 ++++++-- pkgs/development/libraries/haskell/hakyll/default.nix | 13 ++++++++++--- pkgs/development/libraries/haskell/hamlet/default.nix | 5 +++-- .../libraries/haskell/happstack/happstack-server.nix | 8 +++++--- .../development/libraries/haskell/hashable/1.1.2.5.nix | 7 ++++++- .../development/libraries/haskell/hastache/default.nix | 3 ++- pkgs/development/libraries/haskell/hjsmin/default.nix | 8 +++++++- pkgs/development/libraries/haskell/hsemail/default.nix | 3 ++- .../libraries/haskell/hspec-expectations/default.nix | 3 ++- pkgs/development/libraries/haskell/hspec/default.nix | 9 +++++++-- .../libraries/haskell/html-conduit/default.nix | 6 ++++-- .../libraries/haskell/http-conduit/default.nix | 16 ++++++++++++---- .../libraries/haskell/http-date/default.nix | 3 ++- .../libraries/haskell/http-reverse-proxy/default.nix | 9 +++++++-- .../libraries/haskell/http-types/default.nix | 3 ++- .../libraries/haskell/io-choice/default.nix | 4 +++- pkgs/development/libraries/haskell/iproute/default.nix | 7 ++++++- .../libraries/haskell/language-c-quote/default.nix | 6 +++++- .../libraries/haskell/language-javascript/default.nix | 8 +++++++- .../libraries/haskell/largeword/default.nix | 8 +++++++- .../libraries/haskell/leksah/leksah-server.nix | 5 +++-- pkgs/development/libraries/haskell/lens/default.nix | 18 +++++++++++++----- pkgs/development/libraries/haskell/libmpd/default.nix | 7 ++++++- .../libraries/haskell/lifted-base/default.nix | 8 +++++++- .../libraries/haskell/math-functions/default.nix | 8 +++++++- .../libraries/haskell/minimorph/default.nix | 3 ++- .../libraries/haskell/miniutter/default.nix | 4 +++- pkgs/development/libraries/haskell/monad-par/0.3.4.nix | 11 +++++++++-- .../libraries/haskell/mwc-random/default.nix | 8 +++++++- .../libraries/haskell/network-conduit/default.nix | 1 + .../haskell/network-transport-tcp/default.nix | 12 +++++++++++- .../development/libraries/haskell/network/2.3.0.13.nix | 3 ++- pkgs/development/libraries/haskell/network/2.3.1.0.nix | 3 ++- pkgs/development/libraries/haskell/network/2.4.1.2.nix | 7 ++++++- pkgs/development/libraries/haskell/numbers/default.nix | 5 ++++- .../libraries/haskell/optparse-applicative/default.nix | 7 ++++++- .../libraries/haskell/path-pieces/default.nix | 3 ++- pkgs/development/libraries/haskell/pem/default.nix | 7 ++++++- .../libraries/haskell/persistent-template/default.nix | 5 ++++- .../libraries/haskell/persistent/default.nix | 8 +++++--- .../libraries/haskell/postgresql-simple/default.nix | 6 ++++-- .../libraries/haskell/project-template/default.nix | 7 ++++++- .../libraries/haskell/publicsuffixlist/default.nix | 3 ++- .../libraries/haskell/reactive-banana/default.nix | 8 +++++++- .../libraries/haskell/resourcet/default.nix | 3 ++- pkgs/development/libraries/haskell/setenv/default.nix | 3 ++- .../libraries/haskell/shakespeare-css/default.nix | 3 ++- .../libraries/haskell/shakespeare-js/default.nix | 3 ++- .../libraries/haskell/shakespeare-text/default.nix | 3 ++- .../libraries/haskell/shakespeare/default.nix | 3 ++- pkgs/development/libraries/haskell/shelly/default.nix | 6 +++++- .../development/libraries/haskell/silently/default.nix | 3 ++- .../libraries/haskell/simple-sendfile/default.nix | 3 ++- pkgs/development/libraries/haskell/skein/default.nix | 3 ++- pkgs/development/libraries/haskell/split/0.2.1.1.nix | 3 ++- pkgs/development/libraries/haskell/split/0.2.1.2.nix | 3 ++- .../libraries/haskell/statistics/default.nix | 10 ++++++++-- .../libraries/haskell/stylish-haskell/default.nix | 8 ++++++-- .../libraries/haskell/tagstream-conduit/default.nix | 4 +++- pkgs/development/libraries/haskell/text/0.11.1.13.nix | 8 +++++++- pkgs/development/libraries/haskell/text/0.11.2.0.nix | 8 +++++++- pkgs/development/libraries/haskell/text/0.11.2.3.nix | 8 +++++++- pkgs/development/libraries/haskell/threads/default.nix | 8 +++++++- pkgs/development/libraries/haskell/time/1.4.0.2.nix | 7 ++++++- pkgs/development/libraries/haskell/tls/default.nix | 9 +++++++-- .../libraries/haskell/unix-time/default.nix | 3 ++- .../libraries/haskell/unordered-containers/default.nix | 8 +++++++- .../libraries/haskell/utility-ht/default.nix | 3 ++- pkgs/development/libraries/haskell/uuid/default.nix | 7 ++++++- pkgs/development/libraries/haskell/vty/default.nix | 8 ++++++-- .../libraries/haskell/wai-app-static/default.nix | 10 +++++++--- .../libraries/haskell/wai-extra/default.nix | 9 +++++++-- pkgs/development/libraries/haskell/warp/default.nix | 10 ++++++++-- pkgs/development/libraries/haskell/word8/default.nix | 3 ++- .../libraries/haskell/xml-conduit/default.nix | 7 +++++-- .../libraries/haskell/xml-hamlet/default.nix | 3 ++- .../libraries/haskell/xss-sanitize/default.nix | 7 ++++++- pkgs/development/libraries/haskell/yaml/default.nix | 7 +++++-- .../libraries/haskell/yesod-core/default.nix | 14 +++++++++----- .../libraries/haskell/yesod-form/default.nix | 3 ++- .../libraries/haskell/yesod-routes/default.nix | 3 ++- .../libraries/haskell/yesod-static/default.nix | 7 ++++++- .../libraries/haskell/yesod-test/default.nix | 1 + .../libraries/haskell/zeromq-haskell/default.nix | 7 ++++++- .../libraries/haskell/zeromq3-haskell/default.nix | 7 ++++++- .../libraries/haskell/zip-archive/default.nix | 5 ++++- .../libraries/haskell/zlib-bindings/default.nix | 3 ++- .../libraries/haskell/zlib-conduit/default.nix | 5 ++++- .../development/tools/documentation/haddock/2.10.0.nix | 1 + .../development/tools/documentation/haddock/2.11.0.nix | 1 + .../development/tools/documentation/haddock/2.12.0.nix | 1 + .../development/tools/documentation/haddock/2.13.1.nix | 1 + pkgs/development/tools/documentation/haddock/2.9.4.nix | 4 +++- 147 files changed, 681 insertions(+), 181 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/applications/editors/leksah/default.nix b/pkgs/applications/editors/leksah/default.nix index 81fbf5ad98a1..86f0106ed050 100644 --- a/pkgs/applications/editors/leksah/default.nix +++ b/pkgs/applications/editors/leksah/default.nix @@ -16,6 +16,7 @@ cabal.mkDerivation (self: { QuickCheck regexBase regexTdfa strict text time transformers utf8String ]; + testDepends = [ Cabal QuickCheck ]; noHaddock = true; meta = { homepage = "http://www.leksah.org"; diff --git a/pkgs/development/libraries/haskell/Cabal/1.14.0.nix b/pkgs/development/libraries/haskell/Cabal/1.14.0.nix index b424551a2f95..09171ab25706 100644 --- a/pkgs/development/libraries/haskell/Cabal/1.14.0.nix +++ b/pkgs/development/libraries/haskell/Cabal/1.14.0.nix @@ -1,10 +1,16 @@ -{ cabal, filepath }: +{ cabal, extensibleExceptions, filepath, HUnit, QuickCheck +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 +}: cabal.mkDerivation (self: { pname = "Cabal"; version = "1.14.0"; sha256 = "1r5b4x1ham5gdg9m9l8idpvr9czlk1q21vqmg0di4adkp2fhlm3j"; buildDepends = [ filepath ]; + testDepends = [ + extensibleExceptions filepath HUnit QuickCheck testFramework + testFrameworkHunit testFrameworkQuickcheck2 + ]; meta = { homepage = "http://www.haskell.org/cabal/"; description = "A framework for packaging Haskell software"; diff --git a/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix b/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix index 68b985507b6f..2814eae845f2 100644 --- a/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix +++ b/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix @@ -1,10 +1,16 @@ -{ cabal, filepath }: +{ cabal, extensibleExceptions, filepath, HUnit, QuickCheck +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 +}: cabal.mkDerivation (self: { pname = "Cabal"; version = "1.16.0.3"; sha256 = "11lzqgdjaix8n7nabmafl3jf9gisb04c025cmdycfihfajfn49zg"; buildDepends = [ filepath ]; + testDepends = [ + extensibleExceptions filepath HUnit QuickCheck testFramework + testFrameworkHunit testFrameworkQuickcheck2 + ]; meta = { homepage = "http://www.haskell.org/cabal/"; description = "A framework for packaging Haskell software"; diff --git a/pkgs/development/libraries/haskell/CouchDB/default.nix b/pkgs/development/libraries/haskell/CouchDB/default.nix index 705a0a5fdea4..4a413e2e7b85 100644 --- a/pkgs/development/libraries/haskell/CouchDB/default.nix +++ b/pkgs/development/libraries/haskell/CouchDB/default.nix @@ -1,10 +1,11 @@ -{ cabal, HTTP, json, mtl, network, utf8String }: +{ cabal, HTTP, HUnit, json, mtl, network, utf8String }: cabal.mkDerivation (self: { pname = "CouchDB"; version = "1.2"; sha256 = "0a9g0iblfyqppcy1ni3ac8f3yv5km95bfblhwqlsk6khydi5ka98"; buildDepends = [ HTTP json mtl network utf8String ]; + testDepends = [ HTTP HUnit json mtl network utf8String ]; meta = { homepage = "http://github.com/arjunguha/haskell-couchdb/"; description = "CouchDB interface"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix index 5c6057ace9e9..0c7fa0bfa789 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix @@ -1,10 +1,15 @@ -{ cabal, mtl, network, parsec }: +{ cabal, httpdShed, HUnit, mtl, network, parsec, split +, testFramework, testFrameworkHunit +}: cabal.mkDerivation (self: { pname = "HTTP"; version = "4000.2.1"; sha256 = "01076rk7ly5228pszn54x4nqc6rqq1xw11ij9ajvhzf419islh0a"; buildDepends = [ mtl network parsec ]; + testDepends = [ + httpdShed HUnit network split testFramework testFrameworkHunit + ]; meta = { homepage = "https://github.com/haskell/HTTP"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix index 5fbb2ed8a843..805bf36f5df8 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix @@ -1,10 +1,15 @@ -{ cabal, mtl, network, parsec }: +{ cabal, httpdShed, HUnit, mtl, network, parsec, split +, testFramework, testFrameworkHunit +}: cabal.mkDerivation (self: { pname = "HTTP"; version = "4000.2.2"; sha256 = "0qrr9wdj25sdfxifppmw0w14g8skpgf42ic4iqcqylxxzfa8v7vh"; buildDepends = [ mtl network parsec ]; + testDepends = [ + httpdShed HUnit network split testFramework testFrameworkHunit + ]; meta = { homepage = "https://github.com/haskell/HTTP"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix index cff762864bc6..a0b328d702cc 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix @@ -1,10 +1,15 @@ -{ cabal, mtl, network, parsec }: +{ cabal, httpdShed, HUnit, mtl, network, parsec, split +, testFramework, testFrameworkHunit +}: cabal.mkDerivation (self: { pname = "HTTP"; version = "4000.2.3"; sha256 = "1z7s5rkyljwdl95cwqbqg64i207wjwxgpksrdmvcv82k39srzx80"; buildDepends = [ mtl network parsec ]; + testDepends = [ + httpdShed HUnit network split testFramework testFrameworkHunit + ]; meta = { homepage = "https://github.com/haskell/HTTP"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix index f345e7c98e1c..4adae562476e 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix @@ -1,10 +1,17 @@ -{ cabal, mtl, network, parsec }: +{ cabal, caseInsensitive, conduit, deepseq, httpdShed, httpTypes +, HUnit, mtl, network, parsec, pureMD5, split, testFramework +, testFrameworkHunit, wai, warp +}: cabal.mkDerivation (self: { pname = "HTTP"; version = "4000.2.5"; sha256 = "03ij1zkykc438x2r1szz6ddvfhrjywlx61nrz377srcpbdmhxpb7"; buildDepends = [ mtl network parsec ]; + testDepends = [ + caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl + network pureMD5 split testFramework testFrameworkHunit wai warp + ]; meta = { homepage = "https://github.com/haskell/HTTP"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix index 6cb7ed57b4c4..f0c103622a9e 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix @@ -1,10 +1,17 @@ -{ cabal, mtl, network, parsec }: +{ cabal, caseInsensitive, conduit, deepseq, httpdShed, httpTypes +, HUnit, mtl, network, parsec, pureMD5, split, testFramework +, testFrameworkHunit, wai, warp +}: cabal.mkDerivation (self: { pname = "HTTP"; version = "4000.2.8"; sha256 = "0p0cwzjw2102bsyfaga6m8b53s6qnhd6byg2j2qla653f6kjlsh8"; buildDepends = [ mtl network parsec ]; + testDepends = [ + caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl + network pureMD5 split testFramework testFrameworkHunit wai warp + ]; meta = { homepage = "https://github.com/haskell/HTTP"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/IORefCAS/default.nix b/pkgs/development/libraries/haskell/IORefCAS/default.nix index fc9b09bd0d74..beec7ded7893 100644 --- a/pkgs/development/libraries/haskell/IORefCAS/default.nix +++ b/pkgs/development/libraries/haskell/IORefCAS/default.nix @@ -1,10 +1,11 @@ -{ cabal, bitsAtomic }: +{ cabal, bitsAtomic, HUnit, QuickCheck }: cabal.mkDerivation (self: { pname = "IORefCAS"; version = "0.2"; sha256 = "18hyy3jqr9yky5r873816fqnywrwba90sq6zx61i2vkqlfbll1k9"; buildDepends = [ bitsAtomic ]; + testDepends = [ bitsAtomic HUnit QuickCheck ]; meta = { description = "Atomic compare and swap for IORefs and STRefs"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/ReadArgs/default.nix b/pkgs/development/libraries/haskell/ReadArgs/default.nix index 4b8a513914a1..12c3e34571e8 100644 --- a/pkgs/development/libraries/haskell/ReadArgs/default.nix +++ b/pkgs/development/libraries/haskell/ReadArgs/default.nix @@ -1,4 +1,4 @@ -{ cabal, systemFilepath, text }: +{ cabal, hspec, systemFilepath, text }: cabal.mkDerivation (self: { pname = "ReadArgs"; @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ systemFilepath text ]; + testDepends = [ hspec systemFilepath text ]; meta = { homepage = "http://github.com/rampion/ReadArgs"; description = "Simple command line argument parsing"; diff --git a/pkgs/development/libraries/haskell/SafeSemaphore/default.nix b/pkgs/development/libraries/haskell/SafeSemaphore/default.nix index ad161f971024..d4cc74902776 100644 --- a/pkgs/development/libraries/haskell/SafeSemaphore/default.nix +++ b/pkgs/development/libraries/haskell/SafeSemaphore/default.nix @@ -1,10 +1,11 @@ -{ cabal, stm }: +{ cabal, HUnit, stm }: cabal.mkDerivation (self: { pname = "SafeSemaphore"; version = "0.9.0"; sha256 = "1xa30cciw8wmri675kdsz4pb5qwrh592pzylbhawqsvsarf80gz4"; buildDepends = [ stm ]; + testDepends = [ HUnit ]; meta = { homepage = "https://github.com/ChrisKuklewicz/SafeSemaphore"; description = "Much safer replacement for QSemN, QSem, and SampleVar"; diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix index d3307d0a30d3..19afa5ab75e6 100644 --- a/pkgs/development/libraries/haskell/active/default.nix +++ b/pkgs/development/libraries/haskell/active/default.nix @@ -1,10 +1,15 @@ -{ cabal, newtype, semigroupoids, semigroups, vectorSpace }: +{ cabal, newtype, QuickCheck, semigroupoids, semigroups +, vectorSpace +}: cabal.mkDerivation (self: { pname = "active"; version = "0.1.0.3"; sha256 = "0jarc270z6raak1vz30jy2gl0pkj9a2x3ib5hq7vsl2ljbvbgyqi"; buildDepends = [ newtype semigroupoids semigroups vectorSpace ]; + testDepends = [ + newtype QuickCheck semigroupoids semigroups vectorSpace + ]; jailbreak = true; meta = { description = "Abstractions for animation"; diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix index b0f89619b1c5..515cec37a995 100644 --- a/pkgs/development/libraries/haskell/aeson/default.nix +++ b/pkgs/development/libraries/haskell/aeson/default.nix @@ -1,5 +1,6 @@ { cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, mtl -, syb, text, time, unorderedContainers, vector +, QuickCheck, syb, testFramework, testFrameworkQuickcheck2, text +, time, unorderedContainers, vector }: cabal.mkDerivation (self: { @@ -10,6 +11,10 @@ cabal.mkDerivation (self: { attoparsec blazeBuilder deepseq dlist hashable mtl syb text time unorderedContainers vector ]; + testDepends = [ + attoparsec QuickCheck testFramework testFrameworkQuickcheck2 text + time + ]; meta = { homepage = "https://github.com/bos/aeson"; description = "Fast JSON parsing and encoding"; diff --git a/pkgs/development/libraries/haskell/async/2.0.1.3.nix b/pkgs/development/libraries/haskell/async/2.0.1.3.nix index a0da6384e958..1b943208dea4 100644 --- a/pkgs/development/libraries/haskell/async/2.0.1.3.nix +++ b/pkgs/development/libraries/haskell/async/2.0.1.3.nix @@ -1,10 +1,11 @@ -{ cabal, stm }: +{ cabal, HUnit, stm, testFramework, testFrameworkHunit }: cabal.mkDerivation (self: { pname = "async"; version = "2.0.1.3"; sha256 = "1rbjr6xw5sp8npw17fxg0942kikssv2hyci2sy26r0na98483mkh"; buildDepends = [ stm ]; + testDepends = [ HUnit testFramework testFrameworkHunit ]; meta = { homepage = "https://github.com/simonmar/async"; description = "Run IO operations asynchronously and wait for their results"; diff --git a/pkgs/development/libraries/haskell/async/2.0.1.4.nix b/pkgs/development/libraries/haskell/async/2.0.1.4.nix index c5caa55e97f0..5dd76b4d6e00 100644 --- a/pkgs/development/libraries/haskell/async/2.0.1.4.nix +++ b/pkgs/development/libraries/haskell/async/2.0.1.4.nix @@ -1,10 +1,11 @@ -{ cabal, stm }: +{ cabal, HUnit, stm, testFramework, testFrameworkHunit }: cabal.mkDerivation (self: { pname = "async"; version = "2.0.1.4"; sha256 = "1hi40bjwpl65mz7zj0sgh16bp9dwafbm5ysi2q8fzwwq5l0zxpa1"; buildDepends = [ stm ]; + testDepends = [ HUnit testFramework testFrameworkHunit ]; meta = { homepage = "https://github.com/simonmar/async"; description = "Run IO operations asynchronously and wait for their results"; diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix index 916f38f66c57..37af5eec0af5 100644 --- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix @@ -1,10 +1,12 @@ -{ cabal, attoparsec, conduit, text, transformers }: +{ cabal, attoparsec, conduit, hspec, resourcet, text, transformers +}: cabal.mkDerivation (self: { pname = "attoparsec-conduit"; version = "1.0.0"; sha256 = "1aw071qcwhxwpd6azhgaiia97rhj50rms4pysbc19iihmdih3ib8"; buildDepends = [ attoparsec conduit text transformers ]; + testDepends = [ attoparsec conduit hspec resourcet text ]; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Consume attoparsec parsers via conduit"; diff --git a/pkgs/development/libraries/haskell/attoparsec/default.nix b/pkgs/development/libraries/haskell/attoparsec/default.nix index fda3ae1474b2..c352ce7ca8ec 100644 --- a/pkgs/development/libraries/haskell/attoparsec/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec/default.nix @@ -1,10 +1,15 @@ -{ cabal, deepseq, text }: +{ cabal, deepseq, QuickCheck, testFramework +, testFrameworkQuickcheck2, text +}: cabal.mkDerivation (self: { pname = "attoparsec"; version = "0.10.4.0"; sha256 = "0inkcrl40j9kgcmmi0xkcszayqjd5yn7i9fyvv0ywfqwpl6lxf5n"; buildDepends = [ deepseq text ]; + testDepends = [ + QuickCheck testFramework testFrameworkQuickcheck2 text + ]; meta = { homepage = "https://github.com/bos/attoparsec"; description = "Fast combinator parsing for bytestrings and text"; diff --git a/pkgs/development/libraries/haskell/base64-bytestring/default.nix b/pkgs/development/libraries/haskell/base64-bytestring/default.nix index 5891131d7e85..67450dc88874 100644 --- a/pkgs/development/libraries/haskell/base64-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/base64-bytestring/default.nix @@ -1,9 +1,15 @@ -{ cabal }: +{ cabal, HUnit, QuickCheck, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2 +}: cabal.mkDerivation (self: { pname = "base64-bytestring"; version = "1.0.0.1"; sha256 = "0l1v4ddjdsgi9nqzyzcxxj76rwar3lzx8gmwf2r54bqan3san9db"; + testDepends = [ + HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; meta = { homepage = "https://github.com/bos/base64-bytestring"; description = "Fast base64 encoding and decoding for ByteStrings"; diff --git a/pkgs/development/libraries/haskell/base64-conduit/default.nix b/pkgs/development/libraries/haskell/base64-conduit/default.nix index c6d25384be22..3a2d044de64d 100644 --- a/pkgs/development/libraries/haskell/base64-conduit/default.nix +++ b/pkgs/development/libraries/haskell/base64-conduit/default.nix @@ -1,10 +1,14 @@ -{ cabal, base64Bytestring, conduit }: +{ cabal, base64Bytestring, conduit, hspec, QuickCheck, transformers +}: cabal.mkDerivation (self: { pname = "base64-conduit"; version = "1.0.0"; sha256 = "10wjgdixk5da48jpm2i91vy3ckdqpbpgba6hzn7ak6d3qac22m9q"; buildDepends = [ base64Bytestring conduit ]; + testDepends = [ + base64Bytestring conduit hspec QuickCheck transformers + ]; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Base64-encode and decode streams of bytes"; diff --git a/pkgs/development/libraries/haskell/binary/default.nix b/pkgs/development/libraries/haskell/binary/default.nix index ef95d13809f1..b4f205e41b21 100644 --- a/pkgs/development/libraries/haskell/binary/default.nix +++ b/pkgs/development/libraries/haskell/binary/default.nix @@ -1,9 +1,14 @@ -{ cabal }: +{ cabal, QuickCheck, random, testFramework +, testFrameworkQuickcheck2 +}: cabal.mkDerivation (self: { pname = "binary"; version = "0.6.4.0"; sha256 = "0vq80fzhwil5bx4a2vbd3jvfh1awhg1pwxgvq3lvbi37yzl0ydgh"; + testDepends = [ + QuickCheck random testFramework testFrameworkQuickcheck2 + ]; meta = { homepage = "https://github.com/kolmodin/binary"; description = "Binary serialisation for Haskell values using lazy ByteStrings"; diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix index 89ff67fac37c..16c352b7a332 100644 --- a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix @@ -1,10 +1,15 @@ -{ cabal, blazeBuilder, conduit, text, transformers }: +{ cabal, blazeBuilder, conduit, hspec, QuickCheck, text +, transformers +}: cabal.mkDerivation (self: { pname = "blaze-builder-conduit"; version = "1.0.0"; sha256 = "15q0b0k5dxrp9cw2b4qf9mmjwz1mmxrn3890df5rc9z6yajajrc6"; buildDepends = [ blazeBuilder conduit text transformers ]; + testDepends = [ + blazeBuilder conduit hspec QuickCheck transformers + ]; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Convert streams of builders to streams of bytestrings"; diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix index 44f0e0b0e236..59e0f7187515 100644 --- a/pkgs/development/libraries/haskell/blaze-html/default.nix +++ b/pkgs/development/libraries/haskell/blaze-html/default.nix @@ -1,10 +1,16 @@ -{ cabal, blazeBuilder, blazeMarkup, text }: +{ cabal, blazeBuilder, blazeMarkup, HUnit, QuickCheck +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text +}: cabal.mkDerivation (self: { pname = "blaze-html"; version = "0.6.0.0"; sha256 = "0n8jpmslcs29pfyb8jhp43dg4058ahd9y3kf2p2wr3r6b9yr5dll"; buildDepends = [ blazeBuilder blazeMarkup text ]; + testDepends = [ + blazeBuilder blazeMarkup HUnit QuickCheck testFramework + testFrameworkHunit testFrameworkQuickcheck2 text + ]; meta = { homepage = "http://jaspervdj.be/blaze"; description = "A blazingly fast HTML combinator library for Haskell"; diff --git a/pkgs/development/libraries/haskell/blaze-markup/default.nix b/pkgs/development/libraries/haskell/blaze-markup/default.nix index becd1a24ec60..afd607fe5e82 100644 --- a/pkgs/development/libraries/haskell/blaze-markup/default.nix +++ b/pkgs/development/libraries/haskell/blaze-markup/default.nix @@ -1,10 +1,16 @@ -{ cabal, blazeBuilder, text }: +{ cabal, blazeBuilder, HUnit, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, text +}: cabal.mkDerivation (self: { pname = "blaze-markup"; version = "0.5.1.4"; sha256 = "0g316qhk7yv6y680w93613apfhm458a01g3jmq42yv4ndydkv4rr"; buildDepends = [ blazeBuilder text ]; + testDepends = [ + blazeBuilder HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 text + ]; meta = { homepage = "http://jaspervdj.be/blaze"; description = "A blazingly fast markup combinator library for Haskell"; diff --git a/pkgs/development/libraries/haskell/blaze-textual/default.nix b/pkgs/development/libraries/haskell/blaze-textual/default.nix index 65f39c8cc081..ede82e5c2ed3 100644 --- a/pkgs/development/libraries/haskell/blaze-textual/default.nix +++ b/pkgs/development/libraries/haskell/blaze-textual/default.nix @@ -1,10 +1,16 @@ -{ cabal, blazeBuilder, text, time, vector }: +{ cabal, blazeBuilder, doubleConversion, QuickCheck, testFramework +, testFrameworkQuickcheck2, text, time, vector +}: cabal.mkDerivation (self: { pname = "blaze-textual"; version = "0.2.0.8"; sha256 = "0zzqh53ywzz8ss58glp3i8is8gry5yqzvdjw4xh95fbbzcz4cgc7"; buildDepends = [ blazeBuilder text time vector ]; + testDepends = [ + blazeBuilder doubleConversion QuickCheck testFramework + testFrameworkQuickcheck2 + ]; meta = { homepage = "http://github.com/bos/blaze-textual"; description = "Fast rendering of common datatypes"; diff --git a/pkgs/development/libraries/haskell/bson/default.nix b/pkgs/development/libraries/haskell/bson/default.nix index 20107eb17844..6b76aee47a1e 100644 --- a/pkgs/development/libraries/haskell/bson/default.nix +++ b/pkgs/development/libraries/haskell/bson/default.nix @@ -1,5 +1,5 @@ -{ cabal, binary, cryptohash, dataBinaryIeee754, mtl, network, text -, time +{ cabal, binary, cryptohash, dataBinaryIeee754, mtl, network +, QuickCheck, testFramework, testFrameworkQuickcheck2, text, time }: cabal.mkDerivation (self: { @@ -9,6 +9,10 @@ cabal.mkDerivation (self: { buildDepends = [ binary cryptohash dataBinaryIeee754 mtl network text time ]; + testDepends = [ + binary cryptohash dataBinaryIeee754 mtl network QuickCheck + testFramework testFrameworkQuickcheck2 text time + ]; meta = { homepage = "http://github.com/selectel/bson-haskell"; description = "BSON documents are JSON-like objects with a standard binary encoding"; diff --git a/pkgs/development/libraries/haskell/case-insensitive/default.nix b/pkgs/development/libraries/haskell/case-insensitive/default.nix index 58e0ebbbe000..51425084e1c3 100644 --- a/pkgs/development/libraries/haskell/case-insensitive/default.nix +++ b/pkgs/development/libraries/haskell/case-insensitive/default.nix @@ -1,10 +1,13 @@ -{ cabal, deepseq, hashable, text }: +{ cabal, deepseq, hashable, HUnit, testFramework +, testFrameworkHunit, text +}: cabal.mkDerivation (self: { pname = "case-insensitive"; version = "1.0"; sha256 = "1x437b5yyh930a5dr642lvfdgpx12w4ms70whiw1ffjjhssb88zk"; buildDepends = [ deepseq hashable text ]; + testDepends = [ HUnit testFramework testFrameworkHunit text ]; meta = { homepage = "https://github.com/basvandijk/case-insensitive"; description = "Case insensitive string comparison"; diff --git a/pkgs/development/libraries/haskell/cipher-aes/default.nix b/pkgs/development/libraries/haskell/cipher-aes/default.nix index bae237375854..ca2f36159292 100644 --- a/pkgs/development/libraries/haskell/cipher-aes/default.nix +++ b/pkgs/development/libraries/haskell/cipher-aes/default.nix @@ -1,9 +1,12 @@ -{ cabal }: +{ cabal, QuickCheck, testFramework, testFrameworkQuickcheck2 }: cabal.mkDerivation (self: { pname = "cipher-aes"; version = "0.1.7"; sha256 = "1iai9c4rvxframylvc0xwx2nk6s0rsj4dc42wi334xyinilvfyng"; + testDepends = [ + QuickCheck testFramework testFrameworkQuickcheck2 + ]; meta = { homepage = "http://github.com/vincenthz/hs-cipher-aes"; description = "Fast AES cipher implementation with advanced mode of operations"; diff --git a/pkgs/development/libraries/haskell/cipher-rc4/default.nix b/pkgs/development/libraries/haskell/cipher-rc4/default.nix index 234491cde368..7d3cacdd67a9 100644 --- a/pkgs/development/libraries/haskell/cipher-rc4/default.nix +++ b/pkgs/development/libraries/haskell/cipher-rc4/default.nix @@ -1,9 +1,12 @@ -{ cabal }: +{ cabal, QuickCheck, testFramework, testFrameworkQuickcheck2 }: cabal.mkDerivation (self: { pname = "cipher-rc4"; version = "0.1.2"; sha256 = "0nyrqms7h3hq236h03sjjjqdcxn3iz3fg4ifqj43f4nb8gv0ifb1"; + testDepends = [ + QuickCheck testFramework testFrameworkQuickcheck2 + ]; meta = { homepage = "http://github.com/vincenthz/hs-cipher-rc4"; description = "Fast RC4 cipher implementation"; diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix index 85a1fb7bdef5..6af68223834b 100644 --- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix @@ -1,5 +1,5 @@ -{ cabal, classyPrelude, conduit, monadControl, resourcet -, transformers, void, xmlConduit +{ cabal, classyPrelude, conduit, hspec, monadControl, QuickCheck +, resourcet, transformers, void, xmlConduit }: cabal.mkDerivation (self: { @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { classyPrelude conduit monadControl resourcet transformers void xmlConduit ]; + testDepends = [ conduit hspec QuickCheck transformers ]; meta = { homepage = "https://github.com/snoyberg/classy-prelude"; description = "conduit instances for classy-prelude"; diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix index 01c26aab79f3..4c2f076039ee 100644 --- a/pkgs/development/libraries/haskell/classy-prelude/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix @@ -1,5 +1,5 @@ -{ cabal, basicPrelude, hashable, liftedBase, systemFilepath, text -, transformers, unorderedContainers, vector +{ cabal, basicPrelude, hashable, hspec, liftedBase, QuickCheck +, systemFilepath, text, transformers, unorderedContainers, vector }: cabal.mkDerivation (self: { @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { basicPrelude hashable liftedBase systemFilepath text transformers unorderedContainers vector ]; + testDepends = [ hspec QuickCheck transformers ]; meta = { homepage = "https://github.com/snoyberg/classy-prelude"; description = "A typeclass-based Prelude"; diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index 81ae5ebddb09..edbb079eec42 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -1,5 +1,5 @@ { cabal, base64Bytestring, cereal, cipherAes, cprngAes, cryptoApi -, entropy, skein, tagged +, entropy, hspec, HUnit, QuickCheck, skein, tagged, transformers }: cabal.mkDerivation (self: { @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { base64Bytestring cereal cipherAes cprngAes cryptoApi entropy skein tagged ]; + testDepends = [ cereal hspec HUnit QuickCheck transformers ]; meta = { homepage = "http://github.com/yesodweb/clientsession/tree/master"; description = "Securely store session data in a client-side cookie"; diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 3ea60db5fb56..4dada2457914 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -1,5 +1,5 @@ -{ cabal, liftedBase, monadControl, resourcet, text, transformers -, transformersBase, void +{ cabal, doctest, hspec, liftedBase, monadControl, QuickCheck +, resourcet, text, transformers, transformersBase, void }: cabal.mkDerivation (self: { @@ -10,6 +10,9 @@ cabal.mkDerivation (self: { liftedBase monadControl resourcet text transformers transformersBase void ]; + testDepends = [ + doctest hspec QuickCheck resourcet text transformers void + ]; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Streaming data processing library"; diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix index 29163f897370..69351a2a5aa3 100644 --- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix +++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix @@ -1,10 +1,16 @@ -{ cabal, cereal, conduit, cryptoApi, transformers }: +{ cabal, cereal, conduit, cryptoApi, cryptocipher, cryptohash +, hspec, skein, transformers +}: cabal.mkDerivation (self: { pname = "crypto-conduit"; version = "0.5.0"; sha256 = "0mlf2l784w0wyfjqsxzfdwmn1wb0z1s6mb8kdhw8x1z4a8gy9a92"; buildDepends = [ cereal conduit cryptoApi transformers ]; + testDepends = [ + cereal conduit cryptoApi cryptocipher cryptohash hspec skein + transformers + ]; meta = { homepage = "https://github.com/meteficha/crypto-conduit"; description = "Conduit interface for cryptographic operations (from crypto-api)"; diff --git a/pkgs/development/libraries/haskell/crypto-numbers/default.nix b/pkgs/development/libraries/haskell/crypto-numbers/default.nix index 70cd3f44252a..af6985cd9ede 100644 --- a/pkgs/development/libraries/haskell/crypto-numbers/default.nix +++ b/pkgs/development/libraries/haskell/crypto-numbers/default.nix @@ -1,10 +1,16 @@ -{ cabal, cryptoRandomApi, vector }: +{ cabal, cryptoRandomApi, HUnit, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, vector +}: cabal.mkDerivation (self: { pname = "crypto-numbers"; version = "0.1.3"; sha256 = "115lgnay3ly5r53flh3v5jygqks0rg1i8qmbvrqf9nkmnmw6a5x1"; buildDepends = [ cryptoRandomApi vector ]; + testDepends = [ + cryptoRandomApi HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 vector + ]; meta = { homepage = "http://github.com/vincenthz/hs-crypto-numbers"; description = "Cryptographic numbers: functions and algorithms"; diff --git a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix index dc6d83a765de..b095b1ea5f4e 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix @@ -1,5 +1,6 @@ { cabal, cryptohash, cryptoNumbers, cryptoPubkeyTypes -, cryptoRandomApi +, cryptoRandomApi, HUnit, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2 }: cabal.mkDerivation (self: { @@ -9,6 +10,10 @@ cabal.mkDerivation (self: { buildDepends = [ cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandomApi ]; + testDepends = [ + cryptohash cryptoNumbers cryptoRandomApi HUnit QuickCheck + testFramework testFrameworkHunit testFrameworkQuickcheck2 + ]; meta = { homepage = "http://github.com/vincenthz/hs-crypto-pubkey"; description = "Public Key cryptography"; diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix index 275622d3cad8..dba34752611e 100644 --- a/pkgs/development/libraries/haskell/cryptocipher/default.nix +++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix @@ -1,5 +1,6 @@ -{ cabal, cereal, cipherAes, cipherRc4, cpu, cryptoApi -, cryptoPubkeyTypes, primitive, tagged, vector +{ cabal, cereal, cipherAes, cipherRc4, cpu, cryptoApi, cryptohash +, cryptoPubkeyTypes, entropy, primitive, QuickCheck, tagged +, testFramework, testFrameworkQuickcheck2, vector }: cabal.mkDerivation (self: { @@ -12,6 +13,10 @@ cabal.mkDerivation (self: { cereal cipherAes cipherRc4 cpu cryptoApi cryptoPubkeyTypes primitive tagged vector ]; + testDepends = [ + cryptoApi cryptohash entropy QuickCheck testFramework + testFrameworkQuickcheck2 vector + ]; meta = { homepage = "http://github.com/vincenthz/hs-cryptocipher"; description = "Symmetrical block and stream ciphers"; diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix index 2dc0cad97729..81b361a24779 100644 --- a/pkgs/development/libraries/haskell/cryptohash/default.nix +++ b/pkgs/development/libraries/haskell/cryptohash/default.nix @@ -1,10 +1,16 @@ -{ cabal, cereal, cryptoApi, tagged }: +{ cabal, cereal, cryptoApi, HUnit, QuickCheck, tagged +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 +}: cabal.mkDerivation (self: { pname = "cryptohash"; version = "0.8.3"; sha256 = "1fcqbbclii2hmbhi7h64v0nnbc34zzs107m3lqq38iiyy5fvqqv2"; buildDepends = [ cereal cryptoApi tagged ]; + testDepends = [ + HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; meta = { homepage = "http://github.com/vincenthz/hs-cryptohash"; description = "collection of crypto hashes, fast, pure and practical"; diff --git a/pkgs/development/libraries/haskell/css-text/default.nix b/pkgs/development/libraries/haskell/css-text/default.nix index 9970d87fbe04..f59a80b2b65a 100644 --- a/pkgs/development/libraries/haskell/css-text/default.nix +++ b/pkgs/development/libraries/haskell/css-text/default.nix @@ -1,10 +1,11 @@ -{ cabal, attoparsec, text }: +{ cabal, attoparsec, hspec, HUnit, QuickCheck, text }: cabal.mkDerivation (self: { pname = "css-text"; version = "0.1.1"; sha256 = "10vb08rnfq987w7wrirw8ib1kzafxaaancswm4xpw46ha3rq1m0y"; buildDepends = [ attoparsec text ]; + testDepends = [ attoparsec hspec HUnit QuickCheck text ]; meta = { homepage = "http://www.yesodweb.com/"; description = "CSS parser and renderer"; diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix index bb7f0e23fbf1..3baa02d26747 100644 --- a/pkgs/development/libraries/haskell/cuda/default.nix +++ b/pkgs/development/libraries/haskell/cuda/default.nix @@ -21,7 +21,7 @@ cabal.mkDerivation (self: { test -f $i && ghc --make $i done - for p in $extraBuildInputs $propagatedNativeBuildInputs; do + for p in $extraBuildInputs $propagatedBuildNativeInputs; do if [ -d "$p/include" ]; then extraLibDirs="$extraLibDirs --extra-include-dir=$p/include" fi diff --git a/pkgs/development/libraries/haskell/deepseq-th/default.nix b/pkgs/development/libraries/haskell/deepseq-th/default.nix index 2af4bb9f3f1b..228fcd28c785 100644 --- a/pkgs/development/libraries/haskell/deepseq-th/default.nix +++ b/pkgs/development/libraries/haskell/deepseq-th/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.1.0.4"; sha256 = "12wk8higrp12b22zzz1b4ar1q5h7flk22bp2rvswsqri2zkbi965"; buildDepends = [ deepseq ]; + testDepends = [ deepseq ]; meta = { description = "Template Haskell based deriver for optimised NFData instances"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix index a25603453a75..3ecfe2db8527 100644 --- a/pkgs/development/libraries/haskell/diagrams/contrib.nix +++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix @@ -1,5 +1,6 @@ -{ cabal, colour, dataDefault, diagramsLib, forceLayout, lens, mtl -, vectorSpace +{ cabal, colour, dataDefault, diagramsLib, forceLayout, HUnit, lens +, mtl, QuickCheck, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2, vectorSpace }: cabal.mkDerivation (self: { @@ -9,6 +10,10 @@ cabal.mkDerivation (self: { buildDepends = [ colour dataDefault diagramsLib forceLayout lens mtl vectorSpace ]; + testDepends = [ + diagramsLib HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; meta = { homepage = "http://projects.haskell.org/diagrams/"; description = "Collection of user contributions to diagrams EDSL"; diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix index 4ba8b16ec46e..0b956680a84f 100644 --- a/pkgs/development/libraries/haskell/digestive-functors/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors/default.nix @@ -1,10 +1,11 @@ -{ cabal, mtl, text }: +{ cabal, HUnit, mtl, testFramework, testFrameworkHunit, text }: cabal.mkDerivation (self: { pname = "digestive-functors"; version = "0.6.0.1"; sha256 = "1ni1hfmpz14yvgjphwz64hqhg7xbhvvqbdnapspipplvnl0rcmhi"; buildDepends = [ mtl text ]; + testDepends = [ HUnit mtl testFramework testFrameworkHunit text ]; meta = { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "A practical formlet library"; diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix index 1e83cbaa8d95..0427a937f840 100644 --- a/pkgs/development/libraries/haskell/distributed-process/default.nix +++ b/pkgs/development/libraries/haskell/distributed-process/default.nix @@ -1,6 +1,7 @@ -{ cabal, binary, dataAccessor, distributedStatic, mtl -, networkTransport, random, rank1dynamic, stm, syb, time -, transformers +{ cabal, ansiTerminal, binary, dataAccessor, distributedStatic +, HUnit, mtl, network, networkTransport, networkTransportTcp +, random, rank1dynamic, stm, syb, testFramework, testFrameworkHunit +, time, transformers }: cabal.mkDerivation (self: { @@ -13,6 +14,11 @@ cabal.mkDerivation (self: { binary dataAccessor distributedStatic mtl networkTransport random rank1dynamic stm syb time transformers ]; + testDepends = [ + ansiTerminal binary distributedStatic HUnit network + networkTransport networkTransportTcp random stm testFramework + testFrameworkHunit + ]; noHaddock = true; meta = { homepage = "http://github.com/haskell-distributed/distributed-process"; diff --git a/pkgs/development/libraries/haskell/distributive/default.nix b/pkgs/development/libraries/haskell/distributive/default.nix index 6709569b0540..bd8b64aa509a 100644 --- a/pkgs/development/libraries/haskell/distributive/default.nix +++ b/pkgs/development/libraries/haskell/distributive/default.nix @@ -1,10 +1,11 @@ -{ cabal, transformers, transformersCompat }: +{ cabal, doctest, filepath, transformers, transformersCompat }: cabal.mkDerivation (self: { pname = "distributive"; version = "0.3"; sha256 = "0z6vwak2n91vpx9ps9j1pbiw0zlh9jmds84yx1yqssbqx8npi32f"; buildDepends = [ transformers transformersCompat ]; + testDepends = [ doctest filepath ]; meta = { homepage = "http://github.com/ekmett/distributive/"; description = "Haskell 98 Distributive functors -- Dual to Traversable"; diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix index df92c4a6cf50..5dffb52ce1ed 100644 --- a/pkgs/development/libraries/haskell/doctest/default.nix +++ b/pkgs/development/libraries/haskell/doctest/default.nix @@ -1,4 +1,6 @@ -{ cabal, deepseq, filepath, ghcPaths, syb, transformers }: +{ cabal, baseCompat, deepseq, filepath, ghcPaths, hspec, HUnit +, QuickCheck, setenv, silently, stringbuilder, syb, transformers +}: cabal.mkDerivation (self: { pname = "doctest"; @@ -7,6 +9,10 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ deepseq filepath ghcPaths syb transformers ]; + testDepends = [ + baseCompat deepseq filepath ghcPaths hspec HUnit QuickCheck setenv + silently stringbuilder syb transformers + ]; meta = { homepage = "https://github.com/sol/doctest-haskell#readme"; description = "Test interactive Haskell examples"; diff --git a/pkgs/development/libraries/haskell/double-conversion/default.nix b/pkgs/development/libraries/haskell/double-conversion/default.nix index 878eba660a06..cad61e52ee0c 100644 --- a/pkgs/development/libraries/haskell/double-conversion/default.nix +++ b/pkgs/development/libraries/haskell/double-conversion/default.nix @@ -1,10 +1,11 @@ -{ cabal, text }: +{ cabal, testFramework, testFrameworkQuickcheck2, text }: cabal.mkDerivation (self: { pname = "double-conversion"; version = "0.2.0.6"; sha256 = "1c6hy0ghdqf44fvhdpdxjbcr0ahimw283x5fnvjxja36i71qshjp"; buildDepends = [ text ]; + testDepends = [ testFramework testFrameworkQuickcheck2 text ]; meta = { homepage = "https://github.com/bos/double-conversion"; description = "Fast conversion between double precision floating point and text"; diff --git a/pkgs/development/libraries/haskell/email-validate/default.nix b/pkgs/development/libraries/haskell/email-validate/default.nix index 482fd766487f..3ba059261794 100644 --- a/pkgs/development/libraries/haskell/email-validate/default.nix +++ b/pkgs/development/libraries/haskell/email-validate/default.nix @@ -1,10 +1,16 @@ -{ cabal, attoparsec }: +{ cabal, attoparsec, HUnit, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2 +}: cabal.mkDerivation (self: { pname = "email-validate"; version = "1.0.0"; sha256 = "0sj1cvn9ap0m8d4cg4cqavvmkd74vp86lyyra9g6f17815sxdbsg"; buildDepends = [ attoparsec ]; + testDepends = [ + HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; meta = { homepage = "http://porg.es/blog/email-address-validation-simpler-faster-more-correct"; description = "Validating an email address string against RFC 5322"; diff --git a/pkgs/development/libraries/haskell/exception-transformers/default.nix b/pkgs/development/libraries/haskell/exception-transformers/default.nix index 5c4a9402020b..a4d0cfd247a1 100644 --- a/pkgs/development/libraries/haskell/exception-transformers/default.nix +++ b/pkgs/development/libraries/haskell/exception-transformers/default.nix @@ -1,10 +1,11 @@ -{ cabal, stm, transformers }: +{ cabal, HUnit, stm, transformers }: cabal.mkDerivation (self: { pname = "exception-transformers"; version = "0.3.0.3"; sha256 = "0z3z5pppaqqbndd4fgv1czr8f9f4a8r86bwc3bcv88yf7y8cfbwz"; buildDepends = [ stm transformers ]; + testDepends = [ HUnit transformers ]; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; description = "Type classes and monads for unchecked extensible exceptions"; diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix index e266aa15ff87..c9544b2c1f69 100644 --- a/pkgs/development/libraries/haskell/fast-logger/default.nix +++ b/pkgs/development/libraries/haskell/fast-logger/default.nix @@ -1,10 +1,12 @@ -{ cabal, blazeBuilder, dateCache, filepath, text, unixTime }: +{ cabal, blazeBuilder, dateCache, filepath, hspec, text, unixTime +}: cabal.mkDerivation (self: { pname = "fast-logger"; version = "0.3.1"; sha256 = "0sjn3vad0fbchv1fhap71wfnihlwnfhk6p9h9hpnbr0i4b32f1ks"; buildDepends = [ blazeBuilder dateCache filepath text unixTime ]; + testDepends = [ hspec ]; meta = { description = "A fast logging system"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/file-embed/default.nix b/pkgs/development/libraries/haskell/file-embed/default.nix index 119d9d185e55..145d3c1c203d 100644 --- a/pkgs/development/libraries/haskell/file-embed/default.nix +++ b/pkgs/development/libraries/haskell/file-embed/default.nix @@ -1,10 +1,11 @@ -{ cabal, filepath }: +{ cabal, filepath, HUnit }: cabal.mkDerivation (self: { pname = "file-embed"; version = "0.0.4.7"; sha256 = "1hn08499kay0y6ik5z1s58s8r9h1nzf116avgi6ia4b565wpzkvi"; buildDepends = [ filepath ]; + testDepends = [ filepath HUnit ]; meta = { homepage = "https://github.com/snoyberg/file-embed"; description = "Use Template Haskell to embed file contents directly"; diff --git a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix index 681ee6820739..46ae27fc0901 100644 --- a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix +++ b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix @@ -1,4 +1,5 @@ -{ cabal, conduit, systemFileio, systemFilepath, text, transformers +{ cabal, blazeBuilder, conduit, hspec, QuickCheck, systemFileio +, systemFilepath, text, transformers }: cabal.mkDerivation (self: { @@ -8,6 +9,9 @@ cabal.mkDerivation (self: { buildDepends = [ conduit systemFileio systemFilepath text transformers ]; + testDepends = [ + blazeBuilder conduit hspec QuickCheck text transformers + ]; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Use system-filepath data types with conduits"; diff --git a/pkgs/development/libraries/haskell/fsnotify/default.nix b/pkgs/development/libraries/haskell/fsnotify/default.nix index 80b6760a3b7b..142b513e5924 100644 --- a/pkgs/development/libraries/haskell/fsnotify/default.nix +++ b/pkgs/development/libraries/haskell/fsnotify/default.nix @@ -1,10 +1,16 @@ -{ cabal, hinotify, systemFileio, systemFilepath, text, time }: +{ cabal, Cabal, Glob, hinotify, hspec, QuickCheck, random +, systemFileio, systemFilepath, text, time, uniqueid +}: cabal.mkDerivation (self: { pname = "fsnotify"; version = "0.0.6"; sha256 = "0ib6ansj3vaq9hxxbsq5jw14w2b61wp4jfahzb3c3x46mdb1bqw5"; buildDepends = [ hinotify systemFileio systemFilepath text time ]; + testDepends = [ + Cabal Glob hinotify hspec QuickCheck random systemFileio + systemFilepath text time uniqueid + ]; meta = { description = "Cross platform library for file creation, modification, and deletion notification"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix index 7eb49668e3cb..1c12e5dbb0b0 100644 --- a/pkgs/development/libraries/haskell/ghc-events/default.nix +++ b/pkgs/development/libraries/haskell/ghc-events/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ binary mtl ]; + testDepends = [ binary mtl ]; meta = { description = "Library and tool for parsing .eventlog files from GHC"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix index 609863e808fa..9d370993a22c 100644 --- a/pkgs/development/libraries/haskell/graphviz/default.nix +++ b/pkgs/development/libraries/haskell/graphviz/default.nix @@ -1,5 +1,5 @@ -{ cabal, colour, dlist, fgl, filepath, polyparse, temporary, text -, transformers, wlPprintText +{ cabal, colour, dlist, fgl, filepath, polyparse, QuickCheck +, temporary, text, transformers, wlPprintText }: cabal.mkDerivation (self: { @@ -10,6 +10,10 @@ cabal.mkDerivation (self: { colour dlist fgl filepath polyparse temporary text transformers wlPprintText ]; + testDepends = [ + colour dlist fgl filepath polyparse QuickCheck temporary text + transformers wlPprintText + ]; meta = { homepage = "http://projects.haskell.org/graphviz/"; description = "Bindings to Graphviz for graph visualisation"; diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 68b79bdcc3b5..59a32b0d290b 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -1,7 +1,8 @@ { cabal, binary, blazeHtml, blazeMarkup, citeprocHs, cmdargs -, cryptohash, deepseq, filepath, httpConduit, httpTypes, lrucache -, mtl, pandoc, parsec, random, regexBase, regexTdfa, snapCore -, snapServer, tagsoup, text, time +, cryptohash, deepseq, filepath, httpConduit, httpTypes, HUnit +, lrucache, mtl, pandoc, parsec, QuickCheck, random, regexBase +, regexTdfa, snapCore, snapServer, tagsoup, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, text, time }: cabal.mkDerivation (self: { @@ -15,6 +16,12 @@ cabal.mkDerivation (self: { filepath httpConduit httpTypes lrucache mtl pandoc parsec random regexBase regexTdfa snapCore snapServer tagsoup text time ]; + testDepends = [ + binary blazeHtml blazeMarkup citeprocHs cmdargs cryptohash deepseq + filepath httpConduit httpTypes HUnit lrucache mtl pandoc parsec + QuickCheck random regexBase regexTdfa tagsoup testFramework + testFrameworkHunit testFrameworkQuickcheck2 text time + ]; jailbreak = true; meta = { homepage = "http://jaspervdj.be/hakyll"; diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index 28881da84c38..7b61aee26dfa 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -1,5 +1,5 @@ -{ cabal, blazeBuilder, blazeHtml, blazeMarkup, failure, parsec -, shakespeare, text +{ cabal, blazeBuilder, blazeHtml, blazeMarkup, failure, hspec +, HUnit, parsec, shakespeare, text }: cabal.mkDerivation (self: { @@ -9,6 +9,7 @@ cabal.mkDerivation (self: { buildDepends = [ blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text ]; + testDepends = [ blazeHtml blazeMarkup hspec HUnit parsec text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "Haml-like template files that are compile-time checked"; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index 3a0b9ab59b92..dba052a0fc1e 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -1,7 +1,8 @@ { cabal, base64Bytestring, blazeHtml, extensibleExceptions -, filepath, hslogger, html, monadControl, mtl, network, parsec -, sendfile, syb, systemFilepath, text, threads, time, timeCompat -, transformers, transformersBase, utf8String, xhtml, zlib +, filepath, hslogger, html, HUnit, monadControl, mtl, network +, parsec, sendfile, syb, systemFilepath, text, threads, time +, timeCompat, transformers, transformersBase, utf8String, xhtml +, zlib }: cabal.mkDerivation (self: { @@ -14,6 +15,7 @@ cabal.mkDerivation (self: { text threads time timeCompat transformers transformersBase utf8String xhtml zlib ]; + testDepends = [ HUnit parsec zlib ]; meta = { homepage = "http://happstack.com"; description = "Web related tools and services"; diff --git a/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix b/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix index 96fe7ae0eb13..ffb3f98e8b33 100644 --- a/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix +++ b/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix @@ -1,10 +1,15 @@ -{ cabal, text }: +{ cabal, QuickCheck, random, testFramework +, testFrameworkQuickcheck2, text +}: cabal.mkDerivation (self: { pname = "hashable"; version = "1.1.2.5"; sha256 = "0gbiaj5ck2bvvinndp2pg7qsm2h2izbnz9wi97dbm7i8r4qd9d9z"; buildDepends = [ text ]; + testDepends = [ + QuickCheck random testFramework testFrameworkQuickcheck2 text + ]; meta = { homepage = "http://github.com/tibbe/hashable"; description = "A class for types that can be converted to a hash value"; diff --git a/pkgs/development/libraries/haskell/hastache/default.nix b/pkgs/development/libraries/haskell/hastache/default.nix index ff8aa25bd2d2..15d32de346df 100644 --- a/pkgs/development/libraries/haskell/hastache/default.nix +++ b/pkgs/development/libraries/haskell/hastache/default.nix @@ -1,4 +1,4 @@ -{ cabal, blazeBuilder, filepath, ieee754, mtl, syb, text +{ cabal, blazeBuilder, filepath, HUnit, ieee754, mtl, syb, text , transformers, utf8String }: @@ -9,6 +9,7 @@ cabal.mkDerivation (self: { buildDepends = [ blazeBuilder filepath ieee754 mtl syb text transformers utf8String ]; + testDepends = [ HUnit mtl syb text ]; meta = { homepage = "http://github.com/lymar/hastache"; description = "Haskell implementation of Mustache templates"; diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix index 6538e17c41ab..9551581dadf6 100644 --- a/pkgs/development/libraries/haskell/hjsmin/default.nix +++ b/pkgs/development/libraries/haskell/hjsmin/default.nix @@ -1,10 +1,16 @@ -{ cabal, blazeBuilder, languageJavascript, text }: +{ cabal, blazeBuilder, Cabal, HUnit, languageJavascript, QuickCheck +, testFramework, testFrameworkHunit, text +}: cabal.mkDerivation (self: { pname = "hjsmin"; version = "0.1.4.1"; sha256 = "0r73hd6kn37mdbm2i3g6v3qqm696kyflqs6ajq68qr5sr62sjb1a"; buildDepends = [ blazeBuilder languageJavascript text ]; + testDepends = [ + blazeBuilder Cabal HUnit languageJavascript QuickCheck + testFramework testFrameworkHunit text + ]; meta = { homepage = "http://github.com/alanz/hjsmin"; description = "Haskell implementation of a javascript minifier"; diff --git a/pkgs/development/libraries/haskell/hsemail/default.nix b/pkgs/development/libraries/haskell/hsemail/default.nix index bffe1ad58096..3880537e7eaf 100644 --- a/pkgs/development/libraries/haskell/hsemail/default.nix +++ b/pkgs/development/libraries/haskell/hsemail/default.nix @@ -1,10 +1,11 @@ -{ cabal, mtl, parsec }: +{ cabal, doctest, hspec, mtl, parsec }: cabal.mkDerivation (self: { pname = "hsemail"; version = "1.7.5"; sha256 = "0ls6y48bndwgb7ng29wxim4h36rs6b07dqi6ic4hqgbb7lg6fma4"; buildDepends = [ mtl parsec ]; + testDepends = [ doctest hspec parsec ]; meta = { homepage = "http://gitorious.org/hsemail"; description = "Internet Message Parsers"; diff --git a/pkgs/development/libraries/haskell/hspec-expectations/default.nix b/pkgs/development/libraries/haskell/hspec-expectations/default.nix index e7d5756b7599..4b84ad627840 100644 --- a/pkgs/development/libraries/haskell/hspec-expectations/default.nix +++ b/pkgs/development/libraries/haskell/hspec-expectations/default.nix @@ -1,10 +1,11 @@ -{ cabal, HUnit }: +{ cabal, hspec, HUnit, markdownUnlit, silently }: cabal.mkDerivation (self: { pname = "hspec-expectations"; version = "0.3.0.3"; sha256 = "1ppcbfmcgrd1lwswa293fxwny6khhg4blygfbcsawrvgc5ji0q74"; buildDepends = [ HUnit ]; + testDepends = [ hspec HUnit markdownUnlit silently ]; meta = { homepage = "https://github.com/sol/hspec-expectations#readme"; description = "Catchy combinators for HUnit"; diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index 4c897f20ef7e..949874bfa910 100644 --- a/pkgs/development/libraries/haskell/hspec/default.nix +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -1,5 +1,6 @@ -{ cabal, ansiTerminal, filepath, hspecExpectations, HUnit -, QuickCheck, setenv, silently, time, transformers +{ cabal, ansiTerminal, doctest, filepath, ghcPaths +, hspecExpectations, hspecMeta, HUnit, QuickCheck, setenv, silently +, time, transformers }: cabal.mkDerivation (self: { @@ -12,6 +13,10 @@ cabal.mkDerivation (self: { ansiTerminal filepath hspecExpectations HUnit QuickCheck setenv silently time transformers ]; + testDepends = [ + ansiTerminal doctest filepath ghcPaths hspecExpectations hspecMeta + HUnit QuickCheck setenv silently time transformers + ]; meta = { homepage = "http://hspec.github.com/"; description = "Behavior-Driven Development for Haskell"; diff --git a/pkgs/development/libraries/haskell/html-conduit/default.nix b/pkgs/development/libraries/haskell/html-conduit/default.nix index ff4b03c1e6ab..eaf1754b6223 100644 --- a/pkgs/development/libraries/haskell/html-conduit/default.nix +++ b/pkgs/development/libraries/haskell/html-conduit/default.nix @@ -1,5 +1,6 @@ -{ cabal, conduit, filesystemConduit, resourcet, systemFilepath -, tagstreamConduit, text, transformers, xmlConduit, xmlTypes +{ cabal, conduit, filesystemConduit, hspec, HUnit, resourcet +, systemFilepath, tagstreamConduit, text, transformers, xmlConduit +, xmlTypes }: cabal.mkDerivation (self: { @@ -10,6 +11,7 @@ cabal.mkDerivation (self: { conduit filesystemConduit resourcet systemFilepath tagstreamConduit text transformers xmlConduit xmlTypes ]; + testDepends = [ hspec HUnit xmlConduit ]; meta = { homepage = "https://github.com/snoyberg/xml"; description = "Parse HTML documents using xml-conduit datatypes"; diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index ebb44f1512b3..5ff4b4cd95ed 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -1,10 +1,10 @@ { cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring , blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate , conduit, cookie, cprngAes, dataDefault, deepseq, failure -, filepath, httpTypes, liftedBase, mimeTypes, monadControl, mtl -, network, random, regexCompat, resourcet, socks, text, time, tls -, tlsExtra, transformers, transformersBase, utf8String, void -, zlibConduit +, filepath, hspec, httpTypes, HUnit, liftedBase, mimeTypes +, monadControl, mtl, network, networkConduit, random, regexCompat +, resourcet, socks, text, time, tls, tlsExtra, transformers +, transformersBase, utf8String, void, wai, warp, zlibConduit }: cabal.mkDerivation (self: { @@ -19,6 +19,14 @@ cabal.mkDerivation (self: { socks text time tls tlsExtra transformers transformersBase utf8String void zlibConduit ]; + testDepends = [ + asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder + blazeBuilderConduit caseInsensitive certificate conduit cookie + cprngAes dataDefault deepseq failure filepath hspec httpTypes HUnit + liftedBase mimeTypes monadControl mtl network networkConduit random + regexCompat resourcet socks text time tls tlsExtra transformers + transformersBase utf8String void wai warp zlibConduit + ]; meta = { homepage = "http://www.yesodweb.com/book/http-conduit"; description = "HTTP client package with conduit interface and HTTPS support"; diff --git a/pkgs/development/libraries/haskell/http-date/default.nix b/pkgs/development/libraries/haskell/http-date/default.nix index 58d4dd7ecbfd..3571c160f6b7 100644 --- a/pkgs/development/libraries/haskell/http-date/default.nix +++ b/pkgs/development/libraries/haskell/http-date/default.nix @@ -1,10 +1,11 @@ -{ cabal, attoparsec }: +{ cabal, attoparsec, doctest, hspec, time }: cabal.mkDerivation (self: { pname = "http-date"; version = "0.0.4"; sha256 = "1pbm066i1cpa3z2kfsqpva0qixnx87s76dpafz3wf6dkaqj8n8i5"; buildDepends = [ attoparsec ]; + testDepends = [ doctest hspec time ]; meta = { description = "HTTP Date parser/formatter"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index 618438e927f6..39091256ec0f 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -1,6 +1,7 @@ { cabal, blazeBuilder, caseInsensitive, classyPrelude, conduit -, dataDefault, httpConduit, httpTypes, liftedBase, monadControl -, network, networkConduit, text, wai, warp, word8 +, dataDefault, hspec, httpConduit, httpTypes, liftedBase +, monadControl, network, networkConduit, text, transformers, wai +, warp, word8 }: cabal.mkDerivation (self: { @@ -12,6 +13,10 @@ cabal.mkDerivation (self: { httpConduit httpTypes liftedBase monadControl network networkConduit text wai warp word8 ]; + testDepends = [ + blazeBuilder conduit hspec httpConduit httpTypes liftedBase network + networkConduit transformers wai warp + ]; meta = { homepage = "https://github.com/fpco/http-reverse-proxy"; description = "Reverse proxy HTTP requests, either over raw sockets or with WAI"; diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix index d0837d21bff4..c4c064fbf811 100644 --- a/pkgs/development/libraries/haskell/http-types/default.nix +++ b/pkgs/development/libraries/haskell/http-types/default.nix @@ -1,10 +1,11 @@ -{ cabal, blazeBuilder, caseInsensitive, text }: +{ cabal, blazeBuilder, caseInsensitive, hspec, QuickCheck, text }: cabal.mkDerivation (self: { pname = "http-types"; version = "0.8.0"; sha256 = "14d1gzgwhinkwx3lmc6hvqj6ivjrvy4m6fm2walnyk1zv24zli75"; buildDepends = [ blazeBuilder caseInsensitive text ]; + testDepends = [ blazeBuilder hspec QuickCheck text ]; meta = { homepage = "https://github.com/aristidb/http-types"; description = "Generic HTTP types for Haskell (for both client and server code)"; diff --git a/pkgs/development/libraries/haskell/io-choice/default.nix b/pkgs/development/libraries/haskell/io-choice/default.nix index f8b1f1d51a42..cdf269b0d3c3 100644 --- a/pkgs/development/libraries/haskell/io-choice/default.nix +++ b/pkgs/development/libraries/haskell/io-choice/default.nix @@ -1,4 +1,5 @@ -{ cabal, liftedBase, monadControl, transformers, transformersBase +{ cabal, hspec, liftedBase, monadControl, transformers +, transformersBase }: cabal.mkDerivation (self: { @@ -8,6 +9,7 @@ cabal.mkDerivation (self: { buildDepends = [ liftedBase monadControl transformers transformersBase ]; + testDepends = [ hspec liftedBase monadControl transformers ]; meta = { description = "Choice for IO and lifted IO"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/iproute/default.nix b/pkgs/development/libraries/haskell/iproute/default.nix index c342f80a6c25..1ec2b659f0c5 100644 --- a/pkgs/development/libraries/haskell/iproute/default.nix +++ b/pkgs/development/libraries/haskell/iproute/default.nix @@ -1,10 +1,15 @@ -{ cabal, appar, byteorder, network }: +{ cabal, appar, byteorder, doctest, hspec, network, QuickCheck +, Safe +}: cabal.mkDerivation (self: { pname = "iproute"; version = "1.2.10"; sha256 = "1ni91llvq1mfdsjmw1laqhk964y4vlpyk5s25j8klsfn27mq6c68"; buildDepends = [ appar byteorder network ]; + testDepends = [ + appar byteorder doctest hspec network QuickCheck Safe + ]; meta = { homepage = "http://www.mew.org/~kazu/proj/iproute/"; description = "IP Routing Table"; diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix index fc569f996a89..fc8c15edf570 100644 --- a/pkgs/development/libraries/haskell/language-c-quote/default.nix +++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix @@ -1,5 +1,6 @@ { cabal, alex, exceptionMtl, exceptionTransformers, filepath, happy -, haskellSrcMeta, mainlandPretty, mtl, srcloc, syb, symbol +, haskellSrcMeta, HUnit, mainlandPretty, mtl, srcloc, syb, symbol +, testFramework, testFrameworkHunit }: cabal.mkDerivation (self: { @@ -10,6 +11,9 @@ cabal.mkDerivation (self: { exceptionMtl exceptionTransformers filepath haskellSrcMeta mainlandPretty mtl srcloc syb symbol ]; + testDepends = [ + HUnit srcloc symbol testFramework testFrameworkHunit + ]; buildTools = [ alex happy ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix index e05b93655e41..4571b869e3bd 100644 --- a/pkgs/development/libraries/haskell/language-javascript/default.nix +++ b/pkgs/development/libraries/haskell/language-javascript/default.nix @@ -1,10 +1,16 @@ -{ cabal, blazeBuilder, happy, mtl, utf8Light, utf8String }: +{ cabal, blazeBuilder, Cabal, happy, HUnit, mtl, QuickCheck +, testFramework, testFrameworkHunit, utf8Light, utf8String +}: cabal.mkDerivation (self: { pname = "language-javascript"; version = "0.5.7"; sha256 = "0mndz0bqxkayzm7g92cvai9ahb9msr99syp9djhaya1d45595ad3"; buildDepends = [ blazeBuilder mtl utf8Light utf8String ]; + testDepends = [ + blazeBuilder Cabal HUnit mtl QuickCheck testFramework + testFrameworkHunit utf8Light utf8String + ]; buildTools = [ happy ]; meta = { homepage = "http://github.com/alanz/language-javascript"; diff --git a/pkgs/development/libraries/haskell/largeword/default.nix b/pkgs/development/libraries/haskell/largeword/default.nix index 991213067f65..aa3cd5fcdf60 100644 --- a/pkgs/development/libraries/haskell/largeword/default.nix +++ b/pkgs/development/libraries/haskell/largeword/default.nix @@ -1,9 +1,15 @@ -{ cabal }: +{ cabal, HUnit, QuickCheck, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2 +}: cabal.mkDerivation (self: { pname = "largeword"; version = "1.0.4"; sha256 = "19nrzbbbmsvxdhfhh6wc53lbk0xyjvbcwvjw0snym666j1w2b2l5"; + testDepends = [ + HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; meta = { homepage = "https://github.com/idontgetoutmuch/largeword"; description = "Provides Word128, Word192 and Word256 and a way of producing other large words if required"; diff --git a/pkgs/development/libraries/haskell/leksah/leksah-server.nix b/pkgs/development/libraries/haskell/leksah/leksah-server.nix index cfcc69641b5d..1a907a384f1f 100644 --- a/pkgs/development/libraries/haskell/leksah/leksah-server.nix +++ b/pkgs/development/libraries/haskell/leksah/leksah-server.nix @@ -1,6 +1,6 @@ { cabal, attoparsec, attoparsecEnumerator, binary, binaryShared -, Cabal, deepseq, enumerator, filepath, haddock, hslogger, ltk -, network, parsec, processLeksah, strict, time, transformers +, Cabal, deepseq, enumerator, filepath, haddock, hslogger, HUnit +, ltk, network, parsec, processLeksah, strict, time, transformers }: cabal.mkDerivation (self: { @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { enumerator filepath haddock hslogger ltk network parsec processLeksah strict time transformers ]; + testDepends = [ enumerator hslogger HUnit transformers ]; meta = { homepage = "http://leksah.org"; description = "Metadata collection for leksah"; diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index b5f8851796e7..bba846689584 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -1,9 +1,11 @@ { cabal, bifunctors, comonad, comonadsFd, comonadTransformers -, contravariant, distributive, filepath, genericDeriving, hashable -, MonadCatchIOTransformers, mtl, parallel, profunctorExtras -, profunctors, reflection, semigroupoids, semigroups, split, tagged -, text, transformers, transformersCompat, unorderedContainers -, vector, void +, contravariant, deepseq, distributive, doctest, filepath +, genericDeriving, hashable, HUnit, MonadCatchIOTransformers, mtl +, nats, parallel, profunctorExtras, profunctors, QuickCheck +, reflection, semigroupoids, semigroups, simpleReflect, split +, tagged, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2, testFrameworkTh, text, transformers +, transformersCompat, unorderedContainers, vector, void }: cabal.mkDerivation (self: { @@ -17,6 +19,12 @@ cabal.mkDerivation (self: { reflection semigroupoids semigroups split tagged text transformers transformersCompat unorderedContainers vector void ]; + testDepends = [ + deepseq doctest filepath genericDeriving HUnit mtl nats parallel + QuickCheck semigroups simpleReflect split testFramework + testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh text + transformers unorderedContainers vector + ]; meta = { homepage = "http://github.com/ekmett/lens/"; description = "Lenses, Folds and Traversals"; diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix index fc77388727fd..7402d6f31db3 100644 --- a/pkgs/development/libraries/haskell/libmpd/default.nix +++ b/pkgs/development/libraries/haskell/libmpd/default.nix @@ -1,10 +1,15 @@ -{ cabal, filepath, mtl, network, text, time, utf8String }: +{ cabal, dataDefault, filepath, hspec, HUnit, mtl, network +, QuickCheck, text, time, utf8String +}: cabal.mkDerivation (self: { pname = "libmpd"; version = "0.8.0.2"; sha256 = "1phlbb5lsapw2hb0db7906ddlmvnpyk1xbgxvl9zp9zfd0sn40aj"; buildDepends = [ filepath mtl network text time utf8String ]; + testDepends = [ + dataDefault hspec HUnit mtl network QuickCheck text time utf8String + ]; meta = { homepage = "http://github.com/joachifm/libmpd-haskell"; description = "An MPD client library"; diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix index fbb09db9bb87..1d675e88d874 100644 --- a/pkgs/development/libraries/haskell/lifted-base/default.nix +++ b/pkgs/development/libraries/haskell/lifted-base/default.nix @@ -1,4 +1,6 @@ -{ cabal, baseUnicodeSymbols, monadControl, transformersBase }: +{ cabal, baseUnicodeSymbols, HUnit, monadControl, testFramework +, testFrameworkHunit, transformers, transformersBase +}: cabal.mkDerivation (self: { pname = "lifted-base"; @@ -7,6 +9,10 @@ cabal.mkDerivation (self: { buildDepends = [ baseUnicodeSymbols monadControl transformersBase ]; + testDepends = [ + HUnit monadControl testFramework testFrameworkHunit transformers + transformersBase + ]; meta = { homepage = "https://github.com/basvandijk/lifted-base"; description = "lifted IO operations from the base library"; diff --git a/pkgs/development/libraries/haskell/math-functions/default.nix b/pkgs/development/libraries/haskell/math-functions/default.nix index 158feeee18a7..2e29269a9fdf 100644 --- a/pkgs/development/libraries/haskell/math-functions/default.nix +++ b/pkgs/development/libraries/haskell/math-functions/default.nix @@ -1,10 +1,16 @@ -{ cabal, erf, vector }: +{ cabal, erf, HUnit, ieee754, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, vector +}: cabal.mkDerivation (self: { pname = "math-functions"; version = "0.1.3.0"; sha256 = "06wxr8fbhmsgkpyx2vimx9l6apk0p27mwrxrvbjk0b7m9vsg3ay5"; buildDepends = [ erf vector ]; + testDepends = [ + HUnit ieee754 QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 vector + ]; meta = { homepage = "https://github.com/bos/math-functions"; description = "Special functions and Chebyshev polynomials"; diff --git a/pkgs/development/libraries/haskell/minimorph/default.nix b/pkgs/development/libraries/haskell/minimorph/default.nix index 54fc100b7dd8..06dcfaa11390 100644 --- a/pkgs/development/libraries/haskell/minimorph/default.nix +++ b/pkgs/development/libraries/haskell/minimorph/default.nix @@ -1,10 +1,11 @@ -{ cabal, text }: +{ cabal, HUnit, testFramework, testFrameworkHunit, text }: cabal.mkDerivation (self: { pname = "minimorph"; version = "0.1.4.0"; sha256 = "16ri9hfriszrgqcm111b1pp5x65s034hrc35kjz5qax32mnc9rn6"; buildDepends = [ text ]; + testDepends = [ HUnit testFramework testFrameworkHunit text ]; meta = { homepage = "http://darcsden.com/kowey/minimorph"; description = "English spelling functions with an emphasis on simplicity"; diff --git a/pkgs/development/libraries/haskell/miniutter/default.nix b/pkgs/development/libraries/haskell/miniutter/default.nix index b06ee1363c87..22018087226e 100644 --- a/pkgs/development/libraries/haskell/miniutter/default.nix +++ b/pkgs/development/libraries/haskell/miniutter/default.nix @@ -1,10 +1,12 @@ -{ cabal, minimorph, text }: +{ cabal, HUnit, minimorph, testFramework, testFrameworkHunit, text +}: cabal.mkDerivation (self: { pname = "miniutter"; version = "0.4.0"; sha256 = "1l275aad8svrqp22jv9s0mmlam7wbdlf6m4m97658rm8ks4j2mbx"; buildDepends = [ minimorph text ]; + testDepends = [ HUnit testFramework testFrameworkHunit text ]; meta = { homepage = "https://github.com/Mikolaj/miniutter"; description = "Simple English clause creation from arbitrary words"; diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.nix index 8407daef6423..f22ae9e106fc 100644 --- a/pkgs/development/libraries/haskell/monad-par/0.3.4.nix +++ b/pkgs/development/libraries/haskell/monad-par/0.3.4.nix @@ -1,5 +1,7 @@ -{ cabal, abstractDeque, abstractPar, deepseq, monadParExtras, mtl -, mwcRandom, parallel +{ cabal, abstractDeque, abstractPar, deepseq, HUnit, monadParExtras +, mtl, mwcRandom, parallel, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, testFrameworkTh +, time }: cabal.mkDerivation (self: { @@ -10,6 +12,11 @@ cabal.mkDerivation (self: { abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom parallel ]; + testDepends = [ + abstractDeque abstractPar deepseq HUnit monadParExtras mtl + mwcRandom QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 testFrameworkTh time + ]; meta = { homepage = "https://github.com/simonmar/monad-par"; description = "A library for parallel programming based on a monad"; diff --git a/pkgs/development/libraries/haskell/mwc-random/default.nix b/pkgs/development/libraries/haskell/mwc-random/default.nix index 1e2d56147c33..d20f4f061e4e 100644 --- a/pkgs/development/libraries/haskell/mwc-random/default.nix +++ b/pkgs/development/libraries/haskell/mwc-random/default.nix @@ -1,10 +1,16 @@ -{ cabal, primitive, time, vector }: +{ cabal, HUnit, primitive, QuickCheck, statistics, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, time, vector +}: cabal.mkDerivation (self: { pname = "mwc-random"; version = "0.12.0.1"; sha256 = "1sq4yxi231ka8rzwsihqziibs7amvl27ycr018wymm3yz36vsy7c"; buildDepends = [ primitive time vector ]; + testDepends = [ + HUnit QuickCheck statistics testFramework testFrameworkHunit + testFrameworkQuickcheck2 vector + ]; meta = { homepage = "https://github.com/bos/mwc-random"; description = "Fast, high quality pseudo random number generation"; diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix index 67d44bd1ebb5..032592f974ba 100644 --- a/pkgs/development/libraries/haskell/network-conduit/default.nix +++ b/pkgs/development/libraries/haskell/network-conduit/default.nix @@ -8,6 +8,7 @@ cabal.mkDerivation (self: { buildDepends = [ conduit liftedBase monadControl network transformers ]; + testDepends = [ conduit ]; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Stream socket data using conduits"; diff --git a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix index fb313005bdaf..840712e34160 100644 --- a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix +++ b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix @@ -1,10 +1,20 @@ -{ cabal, dataAccessor, network, networkTransport }: +{ cabal, dataAccessor, dataAccessorTransformers, HUnit +, lockfreeQueue, mtl, network, networkTransport +, networkTransportTests, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, transformers +}: cabal.mkDerivation (self: { pname = "network-transport-tcp"; version = "0.3.1"; sha256 = "15i4qbx1s3dxaixn6kd2z1hsymfvpqzf4jpqd3mcbpjlgrn6craf"; buildDepends = [ dataAccessor network networkTransport ]; + testDepends = [ + dataAccessor dataAccessorTransformers HUnit lockfreeQueue mtl + network networkTransport networkTransportTests QuickCheck + testFramework testFrameworkHunit testFrameworkQuickcheck2 + transformers + ]; meta = { homepage = "http://github.com/haskell-distributed/distributed-process"; description = "TCP instantiation of Network.Transport"; diff --git a/pkgs/development/libraries/haskell/network/2.3.0.13.nix b/pkgs/development/libraries/haskell/network/2.3.0.13.nix index 29452da7b2e7..557dea081fdb 100644 --- a/pkgs/development/libraries/haskell/network/2.3.0.13.nix +++ b/pkgs/development/libraries/haskell/network/2.3.0.13.nix @@ -1,10 +1,11 @@ -{ cabal, parsec }: +{ cabal, HUnit, parsec, testFramework, testFrameworkHunit }: cabal.mkDerivation (self: { pname = "network"; version = "2.3.0.13"; sha256 = "0xw53czvcw8k49aqxmchc1rcd6pyxp4icwgp64625fnm3l4yjiq7"; buildDepends = [ parsec ]; + testDepends = [ HUnit testFramework testFrameworkHunit ]; meta = { homepage = "http://github.com/haskell/network"; description = "Low-level networking interface"; diff --git a/pkgs/development/libraries/haskell/network/2.3.1.0.nix b/pkgs/development/libraries/haskell/network/2.3.1.0.nix index 28fa50d83424..dc0c1811e591 100644 --- a/pkgs/development/libraries/haskell/network/2.3.1.0.nix +++ b/pkgs/development/libraries/haskell/network/2.3.1.0.nix @@ -1,10 +1,11 @@ -{ cabal, parsec }: +{ cabal, HUnit, parsec, testFramework, testFrameworkHunit }: cabal.mkDerivation (self: { pname = "network"; version = "2.3.1.0"; sha256 = "1fp25wkl5cc4kx0jv5w02b7pzgqadjg1yrknzzwsqxc5s3cpyz6l"; buildDepends = [ parsec ]; + testDepends = [ HUnit testFramework testFrameworkHunit ]; meta = { homepage = "http://github.com/haskell/network"; description = "Low-level networking interface"; diff --git a/pkgs/development/libraries/haskell/network/2.4.1.2.nix b/pkgs/development/libraries/haskell/network/2.4.1.2.nix index 4009bbd94641..6f245cf18400 100644 --- a/pkgs/development/libraries/haskell/network/2.4.1.2.nix +++ b/pkgs/development/libraries/haskell/network/2.4.1.2.nix @@ -1,10 +1,15 @@ -{ cabal, parsec }: +{ cabal, HUnit, parsec, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2 +}: cabal.mkDerivation (self: { pname = "network"; version = "2.4.1.2"; sha256 = "0f7ykdv7xbsr5m3h2ml0hw3nlbnq785m0gr624pwk2s289jwakdh"; buildDepends = [ parsec ]; + testDepends = [ + HUnit testFramework testFrameworkHunit testFrameworkQuickcheck2 + ]; meta = { homepage = "https://github.com/haskell/network"; description = "Low-level networking interface"; diff --git a/pkgs/development/libraries/haskell/numbers/default.nix b/pkgs/development/libraries/haskell/numbers/default.nix index d1485b7cf1f1..002f68eded7c 100644 --- a/pkgs/development/libraries/haskell/numbers/default.nix +++ b/pkgs/development/libraries/haskell/numbers/default.nix @@ -1,9 +1,12 @@ -{ cabal }: +{ cabal, QuickCheck, testFramework, testFrameworkQuickcheck2 }: cabal.mkDerivation (self: { pname = "numbers"; version = "3000.1.0.1"; sha256 = "0r2s47nfdxasnp8j7giwpxls9v48f6ld0gc2hg2p7y2ar5xfrcc4"; + testDepends = [ + QuickCheck testFramework testFrameworkQuickcheck2 + ]; meta = { homepage = "https://github.com/DanBurton/numbers"; description = "Various number types"; diff --git a/pkgs/development/libraries/haskell/optparse-applicative/default.nix b/pkgs/development/libraries/haskell/optparse-applicative/default.nix index 3e04a33990e3..46f530b8cd4f 100644 --- a/pkgs/development/libraries/haskell/optparse-applicative/default.nix +++ b/pkgs/development/libraries/haskell/optparse-applicative/default.nix @@ -1,10 +1,15 @@ -{ cabal, transformers }: +{ cabal, HUnit, testFramework, testFrameworkHunit +, testFrameworkThPrime, transformers +}: cabal.mkDerivation (self: { pname = "optparse-applicative"; version = "0.5.2.1"; sha256 = "0w4mk851mx8dch8lnck0g82asmzrsc47xrf34jygh0f6v4kbj40i"; buildDepends = [ transformers ]; + testDepends = [ + HUnit testFramework testFrameworkHunit testFrameworkThPrime + ]; meta = { homepage = "https://github.com/pcapriotti/optparse-applicative"; description = "Utilities and combinators for parsing command line options"; diff --git a/pkgs/development/libraries/haskell/path-pieces/default.nix b/pkgs/development/libraries/haskell/path-pieces/default.nix index 5abc63091464..14b9f8d70813 100644 --- a/pkgs/development/libraries/haskell/path-pieces/default.nix +++ b/pkgs/development/libraries/haskell/path-pieces/default.nix @@ -1,10 +1,11 @@ -{ cabal, text, time }: +{ cabal, fileLocation, hspec, HUnit, QuickCheck, text, time }: cabal.mkDerivation (self: { pname = "path-pieces"; version = "0.1.2"; sha256 = "1cxsa8lq1f2jf86iv6f17nraiav8k2vzjxln1y7z45qhcp1sbbaa"; buildDepends = [ text time ]; + testDepends = [ fileLocation hspec HUnit QuickCheck text ]; meta = { description = "Components of paths"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/pem/default.nix b/pkgs/development/libraries/haskell/pem/default.nix index b82dc4ed83df..16b47a9c8ae0 100644 --- a/pkgs/development/libraries/haskell/pem/default.nix +++ b/pkgs/development/libraries/haskell/pem/default.nix @@ -1,10 +1,15 @@ -{ cabal, attoparsec, base64Bytestring, cereal, mtl }: +{ cabal, attoparsec, base64Bytestring, cereal, mtl, QuickCheck +, testFramework, testFrameworkQuickcheck2 +}: cabal.mkDerivation (self: { pname = "pem"; version = "0.1.2"; sha256 = "1p2sw36b9w6lf53jzj86ibyy9a48fjd786mx3x8mvc5lczx8v78m"; buildDepends = [ attoparsec base64Bytestring cereal mtl ]; + testDepends = [ + QuickCheck testFramework testFrameworkQuickcheck2 + ]; meta = { homepage = "http://github.com/vincenthz/hs-pem"; description = "Privacy Enhanced Mail (PEM) format reader and writer"; diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index 2816a38c4130..117a63618d4a 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -1,10 +1,13 @@ -{ cabal, aeson, monadControl, persistent, text, transformers }: +{ cabal, aeson, hspec, monadControl, persistent, QuickCheck, text +, transformers +}: cabal.mkDerivation (self: { pname = "persistent-template"; version = "1.1.2.4"; sha256 = "0fsqyv5r6h356shmah6bs75fzds0fsmyizbnvj5ywzhc003jv5h9"; buildDepends = [ aeson monadControl persistent text transformers ]; + testDepends = [ aeson hspec persistent QuickCheck text ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, non-relational, multi-backend persistence"; diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index f7812a2692da..036deebae20d 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -1,7 +1,8 @@ { cabal, aeson, attoparsec, base64Bytestring, blazeHtml -, blazeMarkup, conduit, liftedBase, monadControl, monadLogger -, pathPieces, poolConduit, resourcet, silently, sqlite, text, time -, transformers, transformersBase, unorderedContainers, vector +, blazeMarkup, conduit, hspec, liftedBase, monadControl +, monadLogger, pathPieces, poolConduit, resourcet, silently, sqlite +, text, time, transformers, transformersBase, unorderedContainers +, vector }: cabal.mkDerivation (self: { @@ -14,6 +15,7 @@ cabal.mkDerivation (self: { resourcet silently text time transformers transformersBase unorderedContainers vector ]; + testDepends = [ hspec text ]; extraLibraries = [ sqlite ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix index 3e3a1b7dbfd6..29c74d84015f 100644 --- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix @@ -1,5 +1,6 @@ -{ cabal, attoparsec, blazeBuilder, blazeTextual, postgresqlLibpq -, text, time, transformers, vector +{ cabal, attoparsec, base16Bytestring, blazeBuilder, blazeTextual +, cryptohash, HUnit, postgresqlLibpq, text, time, transformers +, vector }: cabal.mkDerivation (self: { @@ -10,6 +11,7 @@ cabal.mkDerivation (self: { attoparsec blazeBuilder blazeTextual postgresqlLibpq text time transformers vector ]; + testDepends = [ base16Bytestring cryptohash HUnit text time ]; meta = { description = "Mid-Level PostgreSQL client library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/project-template/default.nix b/pkgs/development/libraries/haskell/project-template/default.nix index 541fa2026d98..fa60370f1f5e 100644 --- a/pkgs/development/libraries/haskell/project-template/default.nix +++ b/pkgs/development/libraries/haskell/project-template/default.nix @@ -1,5 +1,6 @@ { cabal, base64Bytestring, base64Conduit, classyPrelude, conduit -, mtl, resourcet, systemFileio, systemFilepath, text, transformers +, hspec, mtl, QuickCheck, resourcet, systemFileio, systemFilepath +, text, transformers }: cabal.mkDerivation (self: { @@ -10,6 +11,10 @@ cabal.mkDerivation (self: { base64Bytestring base64Conduit classyPrelude conduit mtl resourcet systemFileio systemFilepath text transformers ]; + testDepends = [ + base64Bytestring classyPrelude conduit hspec QuickCheck + transformers + ]; meta = { homepage = "https://github.com/fpco/haskell-ide"; description = "Specify Haskell project templates and generate files"; diff --git a/pkgs/development/libraries/haskell/publicsuffixlist/default.nix b/pkgs/development/libraries/haskell/publicsuffixlist/default.nix index 53b7062cd0d8..1f38962ddd3a 100644 --- a/pkgs/development/libraries/haskell/publicsuffixlist/default.nix +++ b/pkgs/development/libraries/haskell/publicsuffixlist/default.nix @@ -1,10 +1,11 @@ -{ cabal, cereal, dataDefault, text, utf8String }: +{ cabal, cereal, dataDefault, HUnit, idna, text, utf8String }: cabal.mkDerivation (self: { pname = "publicsuffixlist"; version = "0.0.3"; sha256 = "1drsm1zp30629rzy0693ggzcx46b7ydzzafmf07mjanmn1kyyqci"; buildDepends = [ cereal dataDefault text utf8String ]; + testDepends = [ cereal dataDefault HUnit idna text utf8String ]; meta = { homepage = "https://github.com/litherum/publicsuffixlist"; description = "Is a given string a domain suffix?"; diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix index ef4016d003d5..8d62f67a1281 100644 --- a/pkgs/development/libraries/haskell/reactive-banana/default.nix +++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix @@ -1,10 +1,16 @@ -{ cabal, hashable, transformers, unorderedContainers, vault }: +{ cabal, hashable, HUnit, testFramework, testFrameworkHunit +, transformers, unorderedContainers, vault +}: cabal.mkDerivation (self: { pname = "reactive-banana"; version = "0.7.1.1"; sha256 = "0d4dqpzglzkygy2hhn1j1c7vk2782mk66f8aqaadkyhijn7kc6i5"; buildDepends = [ hashable transformers unorderedContainers vault ]; + testDepends = [ + hashable HUnit testFramework testFrameworkHunit transformers + unorderedContainers vault + ]; meta = { homepage = "http://haskell.org/haskellwiki/Reactive-banana"; description = "Practical library for functional reactive programming (FRP)"; diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index f657f4e0ca52..35b7fec32765 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -1,4 +1,4 @@ -{ cabal, liftedBase, monadControl, mtl, transformers +{ cabal, hspec, liftedBase, monadControl, mtl, transformers , transformersBase }: @@ -9,6 +9,7 @@ cabal.mkDerivation (self: { buildDepends = [ liftedBase monadControl mtl transformers transformersBase ]; + testDepends = [ hspec liftedBase transformers ]; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Deterministic allocation and freeing of scarce resources"; diff --git a/pkgs/development/libraries/haskell/setenv/default.nix b/pkgs/development/libraries/haskell/setenv/default.nix index 8ce0b1254166..fd94874e3642 100644 --- a/pkgs/development/libraries/haskell/setenv/default.nix +++ b/pkgs/development/libraries/haskell/setenv/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, hspec, QuickCheck }: cabal.mkDerivation (self: { pname = "setenv"; version = "0.1.0"; sha256 = "04w42bpfbrs5crjp19zzi9dg61xpz4wvmjs2vc7q7qxblyhdfdsy"; + testDepends = [ hspec QuickCheck ]; meta = { description = "A cross-platform library for setting environment variables"; license = self.stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 5016b816ff73..56174254c219 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -1,10 +1,11 @@ -{ cabal, parsec, shakespeare, text, transformers }: +{ cabal, hspec, HUnit, parsec, shakespeare, text, transformers }: cabal.mkDerivation (self: { pname = "shakespeare-css"; version = "1.0.3"; sha256 = "0zk4nb4v9x04vkkgbzqanfpqgw9pqinf76l7d85fzclfgwacd0bz"; buildDepends = [ parsec shakespeare text transformers ]; + testDepends = [ hspec HUnit shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "Stick your haskell variables into css at compile time"; diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index 01bf73fd5013..55bf276d1f82 100644 --- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix @@ -1,10 +1,11 @@ -{ cabal, aeson, shakespeare, text }: +{ cabal, aeson, hspec, HUnit, shakespeare, text }: cabal.mkDerivation (self: { pname = "shakespeare-js"; version = "1.1.2"; sha256 = "0iwajn0d0yngzp10j9qbb2gpq1g7r390yqd7pj5dri35rjc6mr8n"; buildDepends = [ aeson shakespeare text ]; + testDepends = [ aeson hspec HUnit shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "Stick your haskell variables into javascript/coffeescript at compile time"; diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix index 4e9516d107cb..d4cc135cc62a 100644 --- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix @@ -1,10 +1,11 @@ -{ cabal, shakespeare, text }: +{ cabal, hspec, HUnit, shakespeare, text }: cabal.mkDerivation (self: { pname = "shakespeare-text"; version = "1.0.0.5"; sha256 = "176yzx43sh0fnxpszn8kximd6i96yf2s374z55kvc1kspf7jk736"; buildDepends = [ shakespeare text ]; + testDepends = [ hspec HUnit text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "Interpolation with quasi-quotation: put variables strings"; diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index 0e04ff4fd448..d38002eebdaa 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -1,10 +1,11 @@ -{ cabal, parsec, text }: +{ cabal, hspec, parsec, text }: cabal.mkDerivation (self: { pname = "shakespeare"; version = "1.0.3.1"; sha256 = "08w1g19k9v9dvdy45j32kdic8vjhc10ad4g20q5ya0id4cd13qfs"; buildDepends = [ parsec text ]; + testDepends = [ hspec parsec text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "A toolkit for making compile-time interpolated templates"; diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index 15245bfe0bcd..325021c1cca3 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -1,4 +1,5 @@ -{ cabal, mtl, systemFileio, systemFilepath, text, time, unixCompat +{ cabal, hspec, HUnit, mtl, systemFileio, systemFilepath, text +, time, unixCompat }: cabal.mkDerivation (self: { @@ -8,6 +9,9 @@ cabal.mkDerivation (self: { buildDepends = [ mtl systemFileio systemFilepath text time unixCompat ]; + testDepends = [ + hspec HUnit mtl systemFileio systemFilepath text time unixCompat + ]; meta = { homepage = "https://github.com/yesodweb/Shelly.hs"; description = "shell-like (systems) programming in Haskell"; diff --git a/pkgs/development/libraries/haskell/silently/default.nix b/pkgs/development/libraries/haskell/silently/default.nix index c8223cecac4f..fcd7a0a872a5 100644 --- a/pkgs/development/libraries/haskell/silently/default.nix +++ b/pkgs/development/libraries/haskell/silently/default.nix @@ -1,10 +1,11 @@ -{ cabal, deepseq }: +{ cabal, deepseq, nanospec }: cabal.mkDerivation (self: { pname = "silently"; version = "1.2.4.1"; sha256 = "035dw3zg680ykyz5rqkkrjn51wkznbc4jb45a8l2gh3vgqzgbf52"; buildDepends = [ deepseq ]; + testDepends = [ deepseq nanospec ]; meta = { homepage = "https://github.com/trystan/silently"; description = "Prevent or capture writing to stdout and other handles"; diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix index 7ecd70f25f7f..9ad2bd4405b1 100644 --- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix +++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix @@ -1,10 +1,11 @@ -{ cabal, network }: +{ cabal, conduit, hspec, HUnit, network, networkConduit }: cabal.mkDerivation (self: { pname = "simple-sendfile"; version = "0.2.11"; sha256 = "1q9m9lxv9jfkn6a1lf07jcl4li3n5996df1qrfkfjq2n0bvn4qfj"; buildDepends = [ network ]; + testDepends = [ conduit hspec HUnit network networkConduit ]; meta = { description = "Cross platform library for the sendfile system call"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix index cc910711768b..7fdb7e3a1dcc 100644 --- a/pkgs/development/libraries/haskell/skein/default.nix +++ b/pkgs/development/libraries/haskell/skein/default.nix @@ -1,10 +1,11 @@ -{ cabal, cereal, cryptoApi, tagged }: +{ cabal, cereal, cryptoApi, filepath, hspec, tagged }: cabal.mkDerivation (self: { pname = "skein"; version = "0.1.0.12"; sha256 = "1nx0ad0y7zmljc7phwin2aph6frs70hvz3di8q52kzpi5m1h3g3a"; buildDepends = [ cereal cryptoApi tagged ]; + testDepends = [ cereal cryptoApi filepath hspec tagged ]; meta = { homepage = "https://github.com/meteficha/skein"; description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well."; diff --git a/pkgs/development/libraries/haskell/split/0.2.1.1.nix b/pkgs/development/libraries/haskell/split/0.2.1.1.nix index e106b2687f53..0fb28b53ac94 100644 --- a/pkgs/development/libraries/haskell/split/0.2.1.1.nix +++ b/pkgs/development/libraries/haskell/split/0.2.1.1.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, QuickCheck }: cabal.mkDerivation (self: { pname = "split"; version = "0.2.1.1"; sha256 = "1zzp4dwf846s74a4lhw2gf4awsk9iblhl5zcg2zccgv1lr4w2dmz"; + testDepends = [ QuickCheck ]; meta = { description = "Combinator library for splitting lists"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/split/0.2.1.2.nix b/pkgs/development/libraries/haskell/split/0.2.1.2.nix index e88f478f9762..e98e36fe6558 100644 --- a/pkgs/development/libraries/haskell/split/0.2.1.2.nix +++ b/pkgs/development/libraries/haskell/split/0.2.1.2.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, QuickCheck }: cabal.mkDerivation (self: { pname = "split"; version = "0.2.1.2"; sha256 = "0wjw4j9wgk66h7filzfh0py9b0wwmaynvwqvd6kinxgms86fpvyi"; + testDepends = [ QuickCheck ]; meta = { description = "Combinator library for splitting lists"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix index de1fd4533ef4..923cdf879a5c 100644 --- a/pkgs/development/libraries/haskell/statistics/default.nix +++ b/pkgs/development/libraries/haskell/statistics/default.nix @@ -1,5 +1,7 @@ -{ cabal, deepseq, erf, mathFunctions, monadPar, mwcRandom -, primitive, vector, vectorAlgorithms +{ cabal, deepseq, erf, HUnit, ieee754, mathFunctions, monadPar +, mwcRandom, primitive, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, vector +, vectorAlgorithms }: cabal.mkDerivation (self: { @@ -10,6 +12,10 @@ cabal.mkDerivation (self: { deepseq erf mathFunctions monadPar mwcRandom primitive vector vectorAlgorithms ]; + testDepends = [ + erf HUnit ieee754 mathFunctions primitive QuickCheck testFramework + testFrameworkHunit testFrameworkQuickcheck2 vector vectorAlgorithms + ]; meta = { homepage = "https://github.com/bos/statistics"; description = "A library of statistical types, data, and functions"; diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix index 1ca325cbf172..181051249625 100644 --- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix +++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix @@ -1,5 +1,5 @@ -{ cabal, aeson, cmdargs, filepath, haskellSrcExts, mtl, strict, syb -, yaml +{ cabal, aeson, cmdargs, filepath, haskellSrcExts, HUnit, mtl +, strict, syb, testFramework, testFrameworkHunit, yaml }: cabal.mkDerivation (self: { @@ -11,6 +11,10 @@ cabal.mkDerivation (self: { buildDepends = [ aeson cmdargs filepath haskellSrcExts mtl strict syb yaml ]; + testDepends = [ + aeson cmdargs filepath haskellSrcExts HUnit mtl syb testFramework + testFrameworkHunit yaml + ]; meta = { homepage = "https://github.com/jaspervdj/stylish-haskell"; description = "Haskell code prettifier"; diff --git a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix index 38f4375becdf..1b290bd310ba 100644 --- a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix +++ b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix @@ -1,5 +1,6 @@ { cabal, attoparsec, attoparsecConduit, blazeBuilder -, blazeBuilderConduit, caseInsensitive, conduit, text, transformers +, blazeBuilderConduit, caseInsensitive, conduit, hspec, HUnit +, QuickCheck, text, transformers }: cabal.mkDerivation (self: { @@ -10,6 +11,7 @@ cabal.mkDerivation (self: { attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit caseInsensitive conduit text transformers ]; + testDepends = [ conduit hspec HUnit QuickCheck text ]; meta = { homepage = "http://github.com/yihuang/tagstream-conduit"; description = "streamlined html tag parser"; diff --git a/pkgs/development/libraries/haskell/text/0.11.1.13.nix b/pkgs/development/libraries/haskell/text/0.11.1.13.nix index edf109a79cfe..aaf278a0a694 100644 --- a/pkgs/development/libraries/haskell/text/0.11.1.13.nix +++ b/pkgs/development/libraries/haskell/text/0.11.1.13.nix @@ -1,10 +1,16 @@ -{ cabal, deepseq }: +{ cabal, deepseq, HUnit, QuickCheck, random, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2 +}: cabal.mkDerivation (self: { pname = "text"; version = "0.11.1.13"; sha256 = "0lbc4yfqpydps0rd1qjymnnhp87sl9w7n1f5vd5lsixby93zjv2f"; buildDepends = [ deepseq ]; + testDepends = [ + deepseq HUnit QuickCheck random testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; meta = { homepage = "https://github.com/bos/text"; description = "An efficient packed Unicode text type"; diff --git a/pkgs/development/libraries/haskell/text/0.11.2.0.nix b/pkgs/development/libraries/haskell/text/0.11.2.0.nix index 213464f3f19e..870438ea31f3 100644 --- a/pkgs/development/libraries/haskell/text/0.11.2.0.nix +++ b/pkgs/development/libraries/haskell/text/0.11.2.0.nix @@ -1,10 +1,16 @@ -{ cabal, deepseq }: +{ cabal, deepseq, HUnit, QuickCheck, random, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2 +}: cabal.mkDerivation (self: { pname = "text"; version = "0.11.2.0"; sha256 = "1fx5302m41awzbms410x3gcixsck36rl7i1ma7pz6l5d1pmi538p"; buildDepends = [ deepseq ]; + testDepends = [ + deepseq HUnit QuickCheck random testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; meta = { homepage = "https://github.com/bos/text"; description = "An efficient packed Unicode text type"; diff --git a/pkgs/development/libraries/haskell/text/0.11.2.3.nix b/pkgs/development/libraries/haskell/text/0.11.2.3.nix index e1f0c6ea72d3..a7089c94cfbc 100644 --- a/pkgs/development/libraries/haskell/text/0.11.2.3.nix +++ b/pkgs/development/libraries/haskell/text/0.11.2.3.nix @@ -1,10 +1,16 @@ -{ cabal, deepseq }: +{ cabal, deepseq, HUnit, QuickCheck, random, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2 +}: cabal.mkDerivation (self: { pname = "text"; version = "0.11.2.3"; sha256 = "0jrl3qbi91gkcnws9crsa59jsmmbjy91fwvl07qka9m48nq3f9rm"; buildDepends = [ deepseq ]; + testDepends = [ + deepseq HUnit QuickCheck random testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; meta = { homepage = "https://github.com/bos/text"; description = "An efficient packed Unicode text type"; diff --git a/pkgs/development/libraries/haskell/threads/default.nix b/pkgs/development/libraries/haskell/threads/default.nix index 8f5008032f6b..a3327e88ba6c 100644 --- a/pkgs/development/libraries/haskell/threads/default.nix +++ b/pkgs/development/libraries/haskell/threads/default.nix @@ -1,10 +1,16 @@ -{ cabal, baseUnicodeSymbols, stm }: +{ cabal, baseUnicodeSymbols, concurrentExtra, HUnit, stm +, testFramework, testFrameworkHunit +}: cabal.mkDerivation (self: { pname = "threads"; version = "0.5.0.1"; sha256 = "0amyaxa70q6v021nab6v3cfqc40mwj5dr2fwla9d4bm6ppmq6lyy"; buildDepends = [ baseUnicodeSymbols stm ]; + testDepends = [ + baseUnicodeSymbols concurrentExtra HUnit stm testFramework + testFrameworkHunit + ]; meta = { homepage = "https://github.com/basvandijk/threads"; description = "Fork threads and wait for their result"; diff --git a/pkgs/development/libraries/haskell/time/1.4.0.2.nix b/pkgs/development/libraries/haskell/time/1.4.0.2.nix index ce429c8d602b..62232d1aa5a7 100644 --- a/pkgs/development/libraries/haskell/time/1.4.0.2.nix +++ b/pkgs/development/libraries/haskell/time/1.4.0.2.nix @@ -1,10 +1,15 @@ -{ cabal, deepseq }: +{ cabal, Cabal, deepseq, QuickCheck, testFramework +, testFrameworkQuickcheck2 +}: cabal.mkDerivation (self: { pname = "time"; version = "1.4.0.2"; sha256 = "0p4ncankr9968lp4fnbq6pc5xwv2198gxhbds656da9jbv74w7j8"; buildDepends = [ deepseq ]; + testDepends = [ + Cabal deepseq QuickCheck testFramework testFrameworkQuickcheck2 + ]; meta = { homepage = "http://semantic.org/TimeLib/"; description = "A time library"; diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index af7b4c57bb76..a935b8ad4d56 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -1,5 +1,6 @@ -{ cabal, cereal, certificate, cryptohash, cryptoPubkey -, cryptoRandomApi, mtl, network +{ cabal, cereal, certificate, cprngAes, cryptohash, cryptoPubkey +, cryptoRandomApi, mtl, network, QuickCheck, testFramework +, testFrameworkQuickcheck2, time }: cabal.mkDerivation (self: { @@ -10,6 +11,10 @@ cabal.mkDerivation (self: { cereal certificate cryptohash cryptoPubkey cryptoRandomApi mtl network ]; + testDepends = [ + cereal certificate cprngAes cryptoPubkey cryptoRandomApi mtl + QuickCheck testFramework testFrameworkQuickcheck2 time + ]; meta = { homepage = "http://github.com/vincenthz/hs-tls"; description = "TLS/SSL protocol native implementation (Server and Client)"; diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix index 24edaf806268..ddb24e46f4de 100644 --- a/pkgs/development/libraries/haskell/unix-time/default.nix +++ b/pkgs/development/libraries/haskell/unix-time/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, doctest, hspec, QuickCheck, time }: cabal.mkDerivation (self: { pname = "unix-time"; version = "0.1.5"; sha256 = "13xks5kshr51mbs112j8vvhirzhbi3fq6zjw7l4z2iwn8chh4hwg"; + testDepends = [ doctest hspec QuickCheck time ]; meta = { description = "Unix time parser/formatter and utilities"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/unordered-containers/default.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix index 786eb59ec104..2f786eba949e 100644 --- a/pkgs/development/libraries/haskell/unordered-containers/default.nix +++ b/pkgs/development/libraries/haskell/unordered-containers/default.nix @@ -1,10 +1,16 @@ -{ cabal, deepseq, hashable }: +{ cabal, ChasingBottoms, deepseq, hashable, HUnit, QuickCheck +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 +}: cabal.mkDerivation (self: { pname = "unordered-containers"; version = "0.2.3.0"; sha256 = "1vzgjr9jxdkmgq970ng9zi2j60awvx8iv1v6kzjlrkwzxx1a9dpd"; buildDepends = [ deepseq hashable ]; + testDepends = [ + ChasingBottoms hashable HUnit QuickCheck testFramework + testFrameworkHunit testFrameworkQuickcheck2 + ]; meta = { homepage = "https://github.com/tibbe/unordered-containers"; description = "Efficient hashing-based container types"; diff --git a/pkgs/development/libraries/haskell/utility-ht/default.nix b/pkgs/development/libraries/haskell/utility-ht/default.nix index 93b4cc1480e5..c921b4198ed2 100644 --- a/pkgs/development/libraries/haskell/utility-ht/default.nix +++ b/pkgs/development/libraries/haskell/utility-ht/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, QuickCheck }: cabal.mkDerivation (self: { pname = "utility-ht"; version = "0.0.8"; sha256 = "02sm1xj5xa65hpkvl2yk89d9dlg3c2ap8qcviq9zj10asmsbzyd8"; + testDepends = [ QuickCheck ]; meta = { description = "Various small helper functions for Lists, Maybes, Tuples, Functions"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/uuid/default.nix b/pkgs/development/libraries/haskell/uuid/default.nix index 5b939ccb6cc6..55ac6cf9e683 100644 --- a/pkgs/development/libraries/haskell/uuid/default.nix +++ b/pkgs/development/libraries/haskell/uuid/default.nix @@ -1,10 +1,15 @@ -{ cabal, binary, cryptohash, maccatcher, random, time }: +{ cabal, binary, criterion, cryptohash, deepseq, HUnit, maccatcher +, mersenneRandomPure64, QuickCheck, random, time +}: cabal.mkDerivation (self: { pname = "uuid"; version = "1.2.9"; sha256 = "088wbhf21w91774icddbm3a8p8jikwjqgg8zdad0pdv8zbi7flsi"; buildDepends = [ binary cryptohash maccatcher random time ]; + testDepends = [ + criterion deepseq HUnit mersenneRandomPure64 QuickCheck random + ]; meta = { homepage = "http://projects.haskell.org/uuid/"; description = "For creating, comparing, parsing and printing Universally Unique Identifiers"; diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix index e475ca7e8560..9adc35b1bdf8 100644 --- a/pkgs/development/libraries/haskell/vty/default.nix +++ b/pkgs/development/libraries/haskell/vty/default.nix @@ -1,5 +1,5 @@ -{ cabal, deepseq, mtl, parallel, parsec, stringQq, terminfo -, utf8String, vector +{ cabal, Cabal, deepseq, mtl, parallel, parsec, QuickCheck, random +, stringQq, terminfo, utf8String, vector }: cabal.mkDerivation (self: { @@ -11,6 +11,10 @@ cabal.mkDerivation (self: { buildDepends = [ deepseq mtl parallel parsec stringQq terminfo utf8String vector ]; + testDepends = [ + Cabal deepseq mtl parallel parsec QuickCheck random terminfo + utf8String vector + ]; meta = { homepage = "https://github.com/coreyoconnor/vty"; description = "A simple terminal UI library"; diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index 36ec82d88c39..7feed2df4bc4 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -1,7 +1,7 @@ { cabal, base64Bytestring, blazeBuilder, blazeHtml, blazeMarkup -, cereal, cryptoConduit, cryptohash, fileEmbed, httpDate, httpTypes -, mimeTypes, systemFileio, systemFilepath, text, time, transformers -, unixCompat, wai +, cereal, cryptoConduit, cryptohash, fileEmbed, hspec, httpDate +, httpTypes, mimeTypes, network, systemFileio, systemFilepath, text +, time, transformers, unixCompat, wai, waiTest }: cabal.mkDerivation (self: { @@ -13,6 +13,10 @@ cabal.mkDerivation (self: { cryptoConduit cryptohash fileEmbed httpDate httpTypes mimeTypes systemFileio systemFilepath text time transformers unixCompat wai ]; + testDepends = [ + hspec httpDate httpTypes mimeTypes network text time transformers + unixCompat wai waiTest + ]; meta = { homepage = "http://www.yesodweb.com/book/web-application-interface"; description = "WAI application for static serving"; diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 7a4e18b32956..53a1ccaf55a6 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -1,7 +1,8 @@ { cabal, ansiTerminal, blazeBuilder, blazeBuilderConduit , caseInsensitive, conduit, dataDefault, dateCache, fastLogger -, httpTypes, network, resourcet, stringsearch, text, time -, transformers, void, wai, waiLogger, zlibConduit +, hspec, httpTypes, HUnit, network, resourcet, stringsearch, text +, time, transformers, void, wai, waiLogger, waiTest, zlib +, zlibBindings, zlibConduit }: cabal.mkDerivation (self: { @@ -14,6 +15,10 @@ cabal.mkDerivation (self: { resourcet stringsearch text time transformers void wai waiLogger zlibConduit ]; + testDepends = [ + blazeBuilder conduit dataDefault fastLogger hspec httpTypes HUnit + text transformers wai waiTest zlib zlibBindings + ]; meta = { homepage = "http://github.com/yesodweb/wai"; description = "Provides some basic WAI handlers and middleware"; diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 290e60ff3b71..d924d4f38b07 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -1,6 +1,7 @@ { cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive -, conduit, hashable, httpTypes, liftedBase, network, networkConduit -, simpleSendfile, transformers, unixCompat, void, wai +, conduit, hashable, hspec, httpTypes, HUnit, liftedBase, network +, networkConduit, QuickCheck, simpleSendfile, transformers +, unixCompat, void, wai }: cabal.mkDerivation (self: { @@ -12,6 +13,11 @@ cabal.mkDerivation (self: { httpTypes liftedBase network networkConduit simpleSendfile transformers unixCompat void wai ]; + testDepends = [ + blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable + hspec httpTypes HUnit liftedBase network networkConduit QuickCheck + simpleSendfile transformers unixCompat void wai + ]; meta = { homepage = "http://github.com/yesodweb/wai"; description = "A fast, light-weight web server for WAI applications"; diff --git a/pkgs/development/libraries/haskell/word8/default.nix b/pkgs/development/libraries/haskell/word8/default.nix index 4b05c0b70d01..e8abded24381 100644 --- a/pkgs/development/libraries/haskell/word8/default.nix +++ b/pkgs/development/libraries/haskell/word8/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, hspec }: cabal.mkDerivation (self: { pname = "word8"; version = "0.0.3"; sha256 = "1k5sq91pidgw7w8fc62k9gl8iynb65pcza6mjx8pa3n2lslp7125"; + testDepends = [ hspec ]; meta = { description = "Word8 library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index 39bcc63248e5..7ebc0b003e55 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -1,7 +1,7 @@ { cabal, attoparsec, attoparsecConduit, blazeBuilder , blazeBuilderConduit, blazeHtml, blazeMarkup, conduit, dataDefault -, failure, monadControl, resourcet, systemFilepath, text -, transformers, xmlTypes +, failure, hspec, HUnit, monadControl, resourcet, systemFilepath +, text, transformers, xmlTypes }: cabal.mkDerivation (self: { @@ -13,6 +13,9 @@ cabal.mkDerivation (self: { blazeHtml blazeMarkup conduit dataDefault failure monadControl resourcet systemFilepath text transformers xmlTypes ]; + testDepends = [ + blazeMarkup conduit hspec HUnit text transformers xmlTypes + ]; meta = { homepage = "http://github.com/snoyberg/xml"; description = "Pure-Haskell utilities for dealing with XML with the conduit package"; diff --git a/pkgs/development/libraries/haskell/xml-hamlet/default.nix b/pkgs/development/libraries/haskell/xml-hamlet/default.nix index 1be00fa0c0f3..9c85223d654b 100644 --- a/pkgs/development/libraries/haskell/xml-hamlet/default.nix +++ b/pkgs/development/libraries/haskell/xml-hamlet/default.nix @@ -1,10 +1,11 @@ -{ cabal, parsec, shakespeare, text, xmlConduit }: +{ cabal, hspec, HUnit, parsec, shakespeare, text, xmlConduit }: cabal.mkDerivation (self: { pname = "xml-hamlet"; version = "0.4.0.4"; sha256 = "1s4s5z1xir9zmcbfz8mrznf2byclmg0qjjhwmpal2r9ly9g3na98"; buildDepends = [ parsec shakespeare text xmlConduit ]; + testDepends = [ hspec HUnit parsec shakespeare text xmlConduit ]; meta = { homepage = "http://www.yesodweb.com/"; description = "Hamlet-style quasiquoter for XML content"; diff --git a/pkgs/development/libraries/haskell/xss-sanitize/default.nix b/pkgs/development/libraries/haskell/xss-sanitize/default.nix index f592568cb324..89bdab65b17d 100644 --- a/pkgs/development/libraries/haskell/xss-sanitize/default.nix +++ b/pkgs/development/libraries/haskell/xss-sanitize/default.nix @@ -1,4 +1,6 @@ -{ cabal, attoparsec, cssText, network, tagsoup, text, utf8String }: +{ cabal, attoparsec, cssText, hspec, HUnit, network, tagsoup, text +, utf8String +}: cabal.mkDerivation (self: { pname = "xss-sanitize"; @@ -7,6 +9,9 @@ cabal.mkDerivation (self: { buildDepends = [ attoparsec cssText network tagsoup text utf8String ]; + testDepends = [ + attoparsec cssText hspec HUnit network tagsoup text utf8String + ]; meta = { homepage = "http://github.com/yesodweb/haskell-xss-sanitize"; description = "sanitize untrusted HTML to prevent XSS attacks"; diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index 9641cef56aa2..f1cbb7ee7b8b 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -1,5 +1,5 @@ -{ cabal, aeson, attoparsec, conduit, resourcet, text, transformers -, unorderedContainers, vector +{ cabal, aeson, attoparsec, conduit, hspec, HUnit, resourcet, text +, transformers, unorderedContainers, vector }: cabal.mkDerivation (self: { @@ -10,6 +10,9 @@ cabal.mkDerivation (self: { aeson attoparsec conduit resourcet text transformers unorderedContainers vector ]; + testDepends = [ + conduit hspec HUnit text transformers unorderedContainers + ]; meta = { homepage = "http://github.com/snoyberg/yaml/"; description = "Support for parsing and rendering YAML documents"; diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index e2a36c2f1843..a25916316de8 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -1,10 +1,10 @@ { cabal, aeson, blazeBuilder, blazeHtml, blazeMarkup , caseInsensitive, cereal, clientsession, conduit, cookie, failure -, fastLogger, hamlet, httpTypes, liftedBase, monadControl -, monadLogger, parsec, pathPieces, random, resourcet, shakespeare -, shakespeareCss, shakespeareI18n, shakespeareJs, text, time -, transformers, transformersBase, vector, wai, waiExtra -, yesodRoutes +, fastLogger, hamlet, hspec, httpTypes, HUnit, liftedBase +, monadControl, monadLogger, parsec, pathPieces, QuickCheck, random +, resourcet, shakespeare, shakespeareCss, shakespeareI18n +, shakespeareJs, text, time, transformers, transformersBase, vector +, wai, waiExtra, waiTest, yesodRoutes }: cabal.mkDerivation (self: { @@ -19,6 +19,10 @@ cabal.mkDerivation (self: { text time transformers transformersBase vector wai waiExtra yesodRoutes ]; + testDepends = [ + blazeBuilder conduit hamlet hspec httpTypes HUnit QuickCheck random + shakespeareCss shakespeareJs text transformers wai waiTest + ]; meta = { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index d853e217a7f8..adf11916b90d 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -1,5 +1,5 @@ { cabal, aeson, attoparsec, blazeBuilder, blazeHtml, blazeMarkup -, cryptoApi, dataDefault, emailValidate, hamlet, network +, cryptoApi, dataDefault, emailValidate, hamlet, hspec, network , persistent, shakespeareCss, shakespeareJs, text, time , transformers, wai, xssSanitize, yesodCore, yesodPersistent }: @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { shakespeareJs text time transformers wai xssSanitize yesodCore yesodPersistent ]; + testDepends = [ hspec text time ]; meta = { homepage = "http://www.yesodweb.com/"; description = "Form handling support for Yesod Web Framework"; diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index c1dd27e377d7..0ebfeb92bf10 100644 --- a/pkgs/development/libraries/haskell/yesod-routes/default.nix +++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix @@ -1,10 +1,11 @@ -{ cabal, pathPieces, text, vector }: +{ cabal, hspec, HUnit, pathPieces, text, vector }: cabal.mkDerivation (self: { pname = "yesod-routes"; version = "1.1.2"; sha256 = "17yv2z7k1s958xyn552wpk0cwpivsnkvia8477yhgbp4n2d1i5jv"; buildDepends = [ pathPieces text vector ]; + testDepends = [ hspec HUnit pathPieces text ]; meta = { homepage = "http://www.yesodweb.com/"; description = "Efficient routing for Yesod"; diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index a661a83c7318..a7e90de2990a 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -1,5 +1,5 @@ { cabal, base64Bytestring, cereal, conduit, cryptoConduit -, cryptohash, fileEmbed, httpTypes, systemFilepath, text +, cryptohash, fileEmbed, hspec, httpTypes, systemFilepath, text , transformers, unixCompat, wai, waiAppStatic, yesodCore }: @@ -12,6 +12,11 @@ cabal.mkDerivation (self: { httpTypes systemFilepath text transformers unixCompat wai waiAppStatic yesodCore ]; + testDepends = [ + base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed + hspec httpTypes systemFilepath text transformers unixCompat wai + waiAppStatic yesodCore + ]; meta = { homepage = "http://www.yesodweb.com/"; description = "Static file serving subsite for Yesod Web Framework"; diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix index b11c88534b28..3753067d958c 100644 --- a/pkgs/development/libraries/haskell/yesod-test/default.nix +++ b/pkgs/development/libraries/haskell/yesod-test/default.nix @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { persistent poolConduit text time transformers wai waiTest xmlConduit xmlTypes ]; + testDepends = [ hspec htmlConduit HUnit xmlConduit ]; meta = { homepage = "http://www.yesodweb.com"; description = "integration testing for WAI/Yesod Applications"; diff --git a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix index f5166f0f1f09..20d414ac6b14 100644 --- a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix +++ b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix @@ -1,9 +1,14 @@ -{ cabal, zeromq }: +{ cabal, QuickCheck, testFramework, testFrameworkQuickcheck2 +, zeromq +}: cabal.mkDerivation (self: { pname = "zeromq-haskell"; version = "0.8.4"; sha256 = "0lvjszi08r5wm5ch03153y7lir6cdgqr2gnhq45j4b0kid6gkpv3"; + testDepends = [ + QuickCheck testFramework testFrameworkQuickcheck2 + ]; extraLibraries = [ zeromq ]; meta = { homepage = "http://github.com/twittner/zeromq-haskell/"; diff --git a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix index 4db350f93b52..3a3e700cfbbb 100644 --- a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix +++ b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix @@ -1,9 +1,14 @@ -{ cabal, zeromq }: +{ cabal, QuickCheck, testFramework, testFrameworkQuickcheck2 +, zeromq +}: cabal.mkDerivation (self: { pname = "zeromq3-haskell"; version = "0.2"; sha256 = "12qljfkcd4l9h3l80jibxgw2an6v782w0sxwvzxqmma29jv6hvky"; + testDepends = [ + QuickCheck testFramework testFrameworkQuickcheck2 + ]; extraLibraries = [ zeromq ]; meta = { homepage = "http://github.com/twittner/zeromq-haskell/"; diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix index 300de9df4c96..6bbe28446127 100644 --- a/pkgs/development/libraries/haskell/zip-archive/default.nix +++ b/pkgs/development/libraries/haskell/zip-archive/default.nix @@ -1,4 +1,6 @@ -{ cabal, binary, digest, filepath, mtl, time, utf8String, zlib }: +{ cabal, binary, digest, filepath, HUnit, mtl, time, utf8String +, zlib +}: cabal.mkDerivation (self: { pname = "zip-archive"; @@ -7,6 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ binary digest filepath mtl time utf8String zlib ]; + testDepends = [ HUnit time ]; meta = { homepage = "http://github.com/jgm/zip-archive"; description = "Library for creating and modifying zip archives"; diff --git a/pkgs/development/libraries/haskell/zlib-bindings/default.nix b/pkgs/development/libraries/haskell/zlib-bindings/default.nix index d2c3a838adfb..f69be8ae99e2 100644 --- a/pkgs/development/libraries/haskell/zlib-bindings/default.nix +++ b/pkgs/development/libraries/haskell/zlib-bindings/default.nix @@ -1,10 +1,11 @@ -{ cabal, zlib }: +{ cabal, hspec, QuickCheck, zlib }: cabal.mkDerivation (self: { pname = "zlib-bindings"; version = "0.1.1.3"; sha256 = "18jhav7chbapakm9mwn7bn9lgvip7qaz61dw5gwv2nyalvm96qfr"; buildDepends = [ zlib ]; + testDepends = [ hspec QuickCheck zlib ]; meta = { homepage = "http://github.com/snoyberg/zlib-bindings"; description = "Low-level bindings to the zlib package"; diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix index cf62afc6c013..b283c496a299 100644 --- a/pkgs/development/libraries/haskell/zlib-conduit/default.nix +++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix @@ -1,10 +1,13 @@ -{ cabal, conduit, transformers, void, zlibBindings }: +{ cabal, conduit, hspec, QuickCheck, resourcet, transformers, void +, zlibBindings +}: cabal.mkDerivation (self: { pname = "zlib-conduit"; version = "1.0.0"; sha256 = "0q0l4qw1f2cwjj71n4i082ba47x1xba695q8xk0ky2vw5s8cg0bv"; buildDepends = [ conduit transformers void zlibBindings ]; + testDepends = [ conduit hspec QuickCheck resourcet transformers ]; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Streaming compression/decompression via conduits"; diff --git a/pkgs/development/tools/documentation/haddock/2.10.0.nix b/pkgs/development/tools/documentation/haddock/2.10.0.nix index 5c608c440aaa..8f16c6c65c4f 100644 --- a/pkgs/development/tools/documentation/haddock/2.10.0.nix +++ b/pkgs/development/tools/documentation/haddock/2.10.0.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ Cabal filepath ghcPaths xhtml ]; + testDepends = [ Cabal filepath ]; buildTools = [ alex happy ]; meta = { homepage = "http://www.haskell.org/haddock/"; diff --git a/pkgs/development/tools/documentation/haddock/2.11.0.nix b/pkgs/development/tools/documentation/haddock/2.11.0.nix index 92dccbf05a6b..32b3a5ec8b51 100644 --- a/pkgs/development/tools/documentation/haddock/2.11.0.nix +++ b/pkgs/development/tools/documentation/haddock/2.11.0.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ Cabal filepath ghcPaths xhtml ]; + testDepends = [ Cabal filepath ]; buildTools = [ alex happy ]; meta = { homepage = "http://www.haskell.org/haddock/"; diff --git a/pkgs/development/tools/documentation/haddock/2.12.0.nix b/pkgs/development/tools/documentation/haddock/2.12.0.nix index 39610f9a08c2..b1228dab18a2 100644 --- a/pkgs/development/tools/documentation/haddock/2.12.0.nix +++ b/pkgs/development/tools/documentation/haddock/2.12.0.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; + testDepends = [ Cabal filepath ]; buildTools = [ alex happy ]; meta = { homepage = "http://www.haskell.org/haddock/"; diff --git a/pkgs/development/tools/documentation/haddock/2.13.1.nix b/pkgs/development/tools/documentation/haddock/2.13.1.nix index 1eed852f5370..5b6ddfc1610a 100644 --- a/pkgs/development/tools/documentation/haddock/2.13.1.nix +++ b/pkgs/development/tools/documentation/haddock/2.13.1.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; + testDepends = [ Cabal filepath ]; buildTools = [ alex happy ]; meta = { homepage = "http://www.haskell.org/haddock/"; diff --git a/pkgs/development/tools/documentation/haddock/2.9.4.nix b/pkgs/development/tools/documentation/haddock/2.9.4.nix index 15ed35f5758c..2a29ee950a84 100644 --- a/pkgs/development/tools/documentation/haddock/2.9.4.nix +++ b/pkgs/development/tools/documentation/haddock/2.9.4.nix @@ -1,4 +1,5 @@ -{ cabal, alex, Cabal, filepath, ghcPaths, happy, xhtml }: +{ cabal, alex, Cabal, filepath, ghcPaths, happy, regexCompat, xhtml +}: cabal.mkDerivation (self: { pname = "haddock"; @@ -7,6 +8,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ Cabal filepath ghcPaths xhtml ]; + testDepends = [ Cabal filepath regexCompat ]; buildTools = [ alex happy ]; meta = { homepage = "http://www.haskell.org/haddock/"; -- cgit 1.4.1 From fbb1665cec6fccf4f2ebbf9609ee306f931f54c7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:09:56 +0100 Subject: haskell-base-compat: add version 0.2.1 --- pkgs/development/libraries/haskell/base-compat/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/base-compat/default.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/base-compat/default.nix b/pkgs/development/libraries/haskell/base-compat/default.nix new file mode 100644 index 000000000000..ca208b7c1a34 --- /dev/null +++ b/pkgs/development/libraries/haskell/base-compat/default.nix @@ -0,0 +1,13 @@ +{ cabal, hspec, setenv }: + +cabal.mkDerivation (self: { + pname = "base-compat"; + version = "0.2.1"; + sha256 = "1yssx3nww89dmkw8i55bp1vinbczbxhhh0kh4f3b9fyw5ylnai43"; + testDepends = [ hspec setenv ]; + meta = { + description = "A compatibility layer for base"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4f3cd1b5363b..fbb8b94396da 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -485,6 +485,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); base64Conduit = callPackage ../development/libraries/haskell/base64-conduit {}; + baseCompat = callPackage ../development/libraries/haskell/base-compat {}; + baseUnicodeSymbols = callPackage ../development/libraries/haskell/base-unicode-symbols {}; basicPrelude = callPackage ../development/libraries/haskell/basic-prelude {}; -- cgit 1.4.1 From 23d73151354f14e46fec3bd861756107ed31d048 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:10:08 +0100 Subject: haskell-ChasingBottoms: add version 1.3.0.5 --- .../libraries/haskell/ChasingBottoms/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/ChasingBottoms/default.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/ChasingBottoms/default.nix b/pkgs/development/libraries/haskell/ChasingBottoms/default.nix new file mode 100644 index 000000000000..48231a1b6d2b --- /dev/null +++ b/pkgs/development/libraries/haskell/ChasingBottoms/default.nix @@ -0,0 +1,15 @@ +{ cabal, mtl, QuickCheck, random, syb }: + +cabal.mkDerivation (self: { + pname = "ChasingBottoms"; + version = "1.3.0.5"; + sha256 = "0g3c52c8gpm0xlnxxdgazz0f7zpnjvdx5vffsv1zr3vcn3kp1xy0"; + isLibrary = true; + isExecutable = true; + buildDepends = [ mtl QuickCheck random syb ]; + meta = { + description = "For testing partial and infinite values"; + license = "unknown"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index fbb8b94396da..efd401f37644 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -582,6 +582,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Chart = callPackage ../development/libraries/haskell/Chart {}; + ChasingBottoms = callPackage ../development/libraries/haskell/ChasingBottoms {}; + citeprocHs = callPackage ../development/libraries/haskell/citeproc-hs {}; cipherAes = callPackage ../development/libraries/haskell/cipher-aes {}; -- cgit 1.4.1 From d4aa0c77f02de51c32414f502b740ac916a7f08b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:10:20 +0100 Subject: haskell-concurrent-extra: add version 0.7.0.5 --- .../libraries/haskell/concurrent-extra/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/libraries/haskell/concurrent-extra/default.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/concurrent-extra/default.nix b/pkgs/development/libraries/haskell/concurrent-extra/default.nix new file mode 100644 index 000000000000..db380f03b5bd --- /dev/null +++ b/pkgs/development/libraries/haskell/concurrent-extra/default.nix @@ -0,0 +1,20 @@ +{ cabal, baseUnicodeSymbols, HUnit, stm, testFramework +, testFrameworkHunit, unboundedDelays +}: + +cabal.mkDerivation (self: { + pname = "concurrent-extra"; + version = "0.7.0.5"; + sha256 = "0g1ckrwgdyrlp1m352ivplajqzqhw5ymlkb4miiv7c5i9xyyyqnc"; + buildDepends = [ baseUnicodeSymbols stm unboundedDelays ]; + testDepends = [ + baseUnicodeSymbols HUnit stm testFramework testFrameworkHunit + unboundedDelays + ]; + meta = { + homepage = "https://github.com/basvandijk/concurrent-extra"; + description = "Extra concurrency primitives"; + 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 efd401f37644..69f2f4cecef9 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -624,6 +624,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); contravariant = callPackage ../development/libraries/haskell/contravariant {}; + concurrentExtra = callPackage ../development/libraries/haskell/concurrent-extra {}; + converge = callPackage ../development/libraries/haskell/converge {}; cookie = callPackage ../development/libraries/haskell/cookie {}; -- cgit 1.4.1 From b0fb01de00531298ac71464ae981fa83a69f37a2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:10:30 +0100 Subject: haskell-data-accessor-transformers: add version 0.2.1.4 --- .../haskell/data-accessor/data-accessor-transformers.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix new file mode 100644 index 000000000000..83712b858c25 --- /dev/null +++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix @@ -0,0 +1,14 @@ +{ cabal, dataAccessor, transformers }: + +cabal.mkDerivation (self: { + pname = "data-accessor-transformers"; + version = "0.2.1.4"; + sha256 = "1bf1j8g5q81zw51bri89hj3i9jnlmhdggw8rhw3n2v103399pf7d"; + buildDepends = [ dataAccessor transformers ]; + meta = { + homepage = "http://www.haskell.org/haskellwiki/Record_access"; + description = "Use Accessor to access state in transformers State monad"; + 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 69f2f4cecef9..cd4d09095ea8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -668,6 +668,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); dataAccessorTemplate = callPackage ../development/libraries/haskell/data-accessor/data-accessor-template.nix {}; + dataAccessorTransformers = callPackage ../development/libraries/haskell/data-accessor/data-accessor-transformers.nix {}; + dataBinaryIeee754 = callPackage ../development/libraries/haskell/data-binary-ieee754 {}; dataDefault = callPackage ../development/libraries/haskell/data-default {}; -- cgit 1.4.1 From a831ca8a4c805c27e5b4edfff5a7966c46680855 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:10:41 +0100 Subject: haskell-encoding: add version 0.6.7.2 --- pkgs/development/libraries/haskell/encoding/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/encoding/default.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/encoding/default.nix b/pkgs/development/libraries/haskell/encoding/default.nix new file mode 100644 index 000000000000..1b7ef1bcd1dc --- /dev/null +++ b/pkgs/development/libraries/haskell/encoding/default.nix @@ -0,0 +1,16 @@ +{ cabal, binary, extensibleExceptions, HaXml, mtl, regexCompat }: + +cabal.mkDerivation (self: { + pname = "encoding"; + version = "0.6.7.2"; + sha256 = "0b1z5824vdkcc51bd1vgcbaniw3fv9dmd5qczjc89b5lhrl7qq0d"; + buildDepends = [ + binary extensibleExceptions HaXml mtl regexCompat + ]; + meta = { + homepage = "http://code.haskell.org/encoding/"; + description = "A library for various character encodings"; + 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 cd4d09095ea8..68d7d4cee23e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -769,6 +769,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); emailValidate = callPackage ../development/libraries/haskell/email-validate {}; + encoding = callPackage ../development/libraries/haskell/encoding {}; + enumerator = callPackage ../development/libraries/haskell/enumerator {}; entropy = callPackage ../development/libraries/haskell/entropy {}; -- cgit 1.4.1 From 52c8f2a8f6b4567efb4de476ebe5d4285daced26 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:10:49 +0100 Subject: haskell-file-location: add version 0.4.5.2 --- .../libraries/haskell/file-location/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/file-location/default.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/file-location/default.nix b/pkgs/development/libraries/haskell/file-location/default.nix new file mode 100644 index 000000000000..8a28d0b27fb1 --- /dev/null +++ b/pkgs/development/libraries/haskell/file-location/default.nix @@ -0,0 +1,15 @@ +{ cabal, liftedBase, transformers }: + +cabal.mkDerivation (self: { + pname = "file-location"; + version = "0.4.5.2"; + sha256 = "0dyzf2lhh0n4hwbh44qfh6bw9snl4hha9sv76c4ndi7v1rvnx197"; + buildDepends = [ liftedBase transformers ]; + testDepends = [ liftedBase transformers ]; + meta = { + homepage = "https://github.com/gregwebs/FileLocation.hs"; + description = "common functions that show file location information"; + 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 68d7d4cee23e..8d9a2d80899b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -792,6 +792,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); filepath_1_3_0_0 = callPackage ../development/libraries/haskell/filepath {}; filepath = null; # a core package in recent GHCs + fileLocation = callPackage ../development/libraries/haskell/file-location {}; + extensibleExceptions_0_1_1_0 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.0.nix {}; extensibleExceptions_0_1_1_2 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.2.nix {}; extensibleExceptions_0_1_1_3 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.3.nix {}; -- cgit 1.4.1 From cc4339006599be47a4052ed76b07a2b0dff1a642 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:11:11 +0100 Subject: haskell-hspec-meta: add version 1.4.4 --- .../libraries/haskell/hspec-meta/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/haskell/hspec-meta/default.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix new file mode 100644 index 000000000000..c86db3bf0d72 --- /dev/null +++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix @@ -0,0 +1,22 @@ +{ cabal, ansiTerminal, filepath, hspecExpectations, HUnit +, QuickCheck, setenv, silently, time, transformers +}: + +cabal.mkDerivation (self: { + pname = "hspec-meta"; + version = "1.4.4"; + sha256 = "1p1miiaa38rd92bz695znlwd6wyvs8zpp2idyw5pkzvhqi8w10a1"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + ansiTerminal filepath hspecExpectations HUnit QuickCheck setenv + silently time transformers + ]; + doCheck = false; + meta = { + homepage = "http://hspec.github.com/"; + description = "A version of Hspec which is used to test Hspec itself"; + 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 8d9a2d80899b..df71e01d0f2f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1079,6 +1079,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hspecExpectations = callPackage ../development/libraries/haskell/hspec-expectations {}; + hspecMeta = callPackage ../development/libraries/haskell/hspec-meta {}; + hsyslog = callPackage ../development/libraries/haskell/hsyslog {}; html_1_0_1_2 = callPackage ../development/libraries/haskell/html/1.0.1.2.nix {}; -- cgit 1.4.1 From 9bf8e18584514746db4f5970d37f3e1d2208953d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:16:16 +0100 Subject: haskell-idna: add version 0.2 --- pkgs/development/libraries/haskell/idna/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/idna/default.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/idna/default.nix b/pkgs/development/libraries/haskell/idna/default.nix new file mode 100644 index 000000000000..1d5bc92bf6f1 --- /dev/null +++ b/pkgs/development/libraries/haskell/idna/default.nix @@ -0,0 +1,13 @@ +{ cabal, punycode, stringprep, text }: + +cabal.mkDerivation (self: { + pname = "idna"; + version = "0.2"; + sha256 = "0gl1mn2fjyxdpzl024imspf7hk4xvj9r8mvisqnlkdsng8i5jnyz"; + buildDepends = [ punycode stringprep text ]; + meta = { + description = "Implements IDNA (RFC 3490)"; + 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 df71e01d0f2f..62036e55e80b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1112,6 +1112,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hxtUnicode = callPackage ../development/libraries/haskell/hxt-unicode {}; + idna = callPackage ../development/libraries/haskell/idna {}; + IfElse = callPackage ../development/libraries/haskell/IfElse {}; ieee754 = callPackage ../development/libraries/haskell/ieee754 {}; -- cgit 1.4.1 From 0a18c04e95172e54298501b270b690fbcd303a76 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:16:25 +0100 Subject: haskell-lockfree-queue: add version 0.2 --- .../libraries/haskell/lockfree-queue/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/lockfree-queue/default.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/lockfree-queue/default.nix b/pkgs/development/libraries/haskell/lockfree-queue/default.nix new file mode 100644 index 000000000000..7efe6b25b391 --- /dev/null +++ b/pkgs/development/libraries/haskell/lockfree-queue/default.nix @@ -0,0 +1,19 @@ +{ cabal, abstractDeque, HUnit, IORefCAS, testFramework +, testFrameworkHunit +}: + +cabal.mkDerivation (self: { + pname = "lockfree-queue"; + version = "0.2"; + sha256 = "0m76wjw13nyj2mpz1dv2crg9sk66nlf62qgk2hbsa7ymydkq797c"; + buildDepends = [ abstractDeque IORefCAS ]; + testDepends = [ + abstractDeque HUnit IORefCAS testFramework testFrameworkHunit + ]; + meta = { + homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki"; + description = "Michael and Scott lock-free queues"; + 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 62036e55e80b..b3686cd26374 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1195,6 +1195,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ltk = callPackage ../development/libraries/haskell/ltk {}; + lockfreeQueue = callPackage ../development/libraries/haskell/lockfree-queue {}; + logfloat = callPackage ../development/libraries/haskell/logfloat {}; logict = callPackage ../development/libraries/haskell/logict {}; -- cgit 1.4.1 From a123d5704c39c42155a513f9c8c69b92c7578552 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:16:38 +0100 Subject: haskell-markdown-unlit: add version 0.2.0.1 --- .../libraries/haskell/markdown-unlit/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/markdown-unlit/default.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/markdown-unlit/default.nix b/pkgs/development/libraries/haskell/markdown-unlit/default.nix new file mode 100644 index 000000000000..06c1b9e2fcae --- /dev/null +++ b/pkgs/development/libraries/haskell/markdown-unlit/default.nix @@ -0,0 +1,15 @@ +{ cabal, hspec, QuickCheck, silently, stringbuilder }: + +cabal.mkDerivation (self: { + pname = "markdown-unlit"; + version = "0.2.0.1"; + sha256 = "1bc3vcifv2xcddh8liq380c6sxarrs5pf21pfs9i4dx9rfl3hvhq"; + isLibrary = true; + isExecutable = true; + testDepends = [ hspec QuickCheck silently stringbuilder ]; + meta = { + description = "Literate Haskell support for Markdown"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b3686cd26374..cbd62d80f249 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1203,6 +1203,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); maccatcher = callPackage ../development/libraries/haskell/maccatcher {}; + markdownUnlit = callPackage ../development/libraries/haskell/markdown-unlit {}; + mathFunctions = callPackage ../development/libraries/haskell/math-functions {}; mainlandPretty = callPackage ../development/libraries/haskell/mainland-pretty {}; -- cgit 1.4.1 From b27fd14fb07b52f97314324c9d1a10faaa747cff Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:16:46 +0100 Subject: haskell-nanospec: add version 0.1.0 --- pkgs/development/libraries/haskell/nanospec/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/nanospec/default.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/nanospec/default.nix b/pkgs/development/libraries/haskell/nanospec/default.nix new file mode 100644 index 000000000000..b7f498a35c83 --- /dev/null +++ b/pkgs/development/libraries/haskell/nanospec/default.nix @@ -0,0 +1,14 @@ +{ cabal, hspec, silently }: + +cabal.mkDerivation (self: { + pname = "nanospec"; + version = "0.1.0"; + sha256 = "16qpn199p8nrllg800zryhb8795jgk78znng5fjq1raj8l3snjk0"; + testDepends = [ hspec silently ]; + doCheck = false; + meta = { + description = "A lightweight implementation of a subset of Hspec's API"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index cbd62d80f249..531a81db7829 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1290,6 +1290,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); NanoProlog = callPackage ../development/libraries/haskell/NanoProlog {}; + nanospec = callPackage ../development/libraries/haskell/nanospec {}; + nat = callPackage ../development/libraries/haskell/nat {}; nats = callPackage ../development/libraries/haskell/nats {}; -- cgit 1.4.1 From 0b0905be3b6644d4f39f59d1f66f646ae9e0fae9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:16:53 +0100 Subject: haskell-network-transport-tests: add version 0.1.0.1 --- .../libraries/haskell/network-transport-tests/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/network-transport-tests/default.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/network-transport-tests/default.nix b/pkgs/development/libraries/haskell/network-transport-tests/default.nix new file mode 100644 index 000000000000..7aedea7995b7 --- /dev/null +++ b/pkgs/development/libraries/haskell/network-transport-tests/default.nix @@ -0,0 +1,14 @@ +{ cabal, ansiTerminal, mtl, networkTransport, random }: + +cabal.mkDerivation (self: { + pname = "network-transport-tests"; + version = "0.1.0.1"; + sha256 = "15vdkjq10mm378iyci1lpj6b77m7sil5mk3yhzf6vcbfj54pwca6"; + buildDepends = [ ansiTerminal mtl networkTransport random ]; + meta = { + homepage = "http://github.com/haskell-distributed/distributed-process"; + description = "Unit tests for Network.Transport implementations"; + 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 531a81db7829..1029d47918e1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1323,6 +1323,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); networkTransportTcp = callPackage ../development/libraries/haskell/network-transport-tcp {}; + networkTransportTests = callPackage ../development/libraries/haskell/network-transport-tests {}; + newtype = callPackage ../development/libraries/haskell/newtype {}; nonNegative = callPackage ../development/libraries/haskell/non-negative {}; -- cgit 1.4.1 From 1dfe6d4e6b99d3b372f188f11c144c4c97835dbd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:17:01 +0100 Subject: haskell-punycode: add version 2.0 --- pkgs/development/libraries/haskell/punycode/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/punycode/default.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/punycode/default.nix b/pkgs/development/libraries/haskell/punycode/default.nix new file mode 100644 index 000000000000..ade7685be6e6 --- /dev/null +++ b/pkgs/development/libraries/haskell/punycode/default.nix @@ -0,0 +1,15 @@ +{ cabal, cereal, encoding, HUnit, mtl, QuickCheck, text }: + +cabal.mkDerivation (self: { + pname = "punycode"; + version = "2.0"; + sha256 = "192jgfixnpxdj6jiiz92kx5bi6ij3c389b76q9f4vyfmvcajj1sr"; + buildDepends = [ cereal mtl text ]; + testDepends = [ cereal encoding HUnit mtl QuickCheck text ]; + meta = { + homepage = "https://github.com/litherum/punycode"; + description = "Encode unicode strings to ascii forms according to RFC 3492"; + 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 1029d47918e1..791678ab55c8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1426,6 +1426,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); prettyShow = callPackage ../development/libraries/haskell/pretty-show {}; + punycode = callPackage ../development/libraries/haskell/punycode {}; + primitive_0_4_1 = callPackage ../development/libraries/haskell/primitive/0.4.1.nix {}; primitive_0_5 = callPackage ../development/libraries/haskell/primitive/0.5.nix {}; primitive_0_5_0_1 = callPackage ../development/libraries/haskell/primitive/0.5.0.1.nix {}; -- cgit 1.4.1 From 15ff301d63f72808fd5662d878e8c99f282b2081 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:17:13 +0100 Subject: haskell-stringbuilder: add version 0.4.0 --- .../development/libraries/haskell/stringbuilder/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/stringbuilder/default.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/stringbuilder/default.nix b/pkgs/development/libraries/haskell/stringbuilder/default.nix new file mode 100644 index 000000000000..efe0956afc0f --- /dev/null +++ b/pkgs/development/libraries/haskell/stringbuilder/default.nix @@ -0,0 +1,13 @@ +{ cabal, hspec, QuickCheck }: + +cabal.mkDerivation (self: { + pname = "stringbuilder"; + version = "0.4.0"; + sha256 = "0v0lpb13khpiygfdkyzzsf64anxjykwvjsrkds836whm1bv86lhl"; + testDepends = [ hspec QuickCheck ]; + meta = { + description = "A writer monad for multi-line string literals"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 791678ab55c8..1c988362d726 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1677,6 +1677,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); libc = pkgs.stdenv.gcc.libc; }; + stringbuilder = callPackage ../development/libraries/haskell/stringbuilder {}; + symbol = callPackage ../development/libraries/haskell/symbol {}; systemFilepath = callPackage ../development/libraries/haskell/system-filepath {}; -- cgit 1.4.1 From e82f5c750e6d64d68a89ac0d15466bddf7eafcda Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:17:30 +0100 Subject: haskell-stringprep: add version 0.1.5 --- pkgs/development/libraries/haskell/stringprep/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/stringprep/default.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/stringprep/default.nix b/pkgs/development/libraries/haskell/stringprep/default.nix new file mode 100644 index 000000000000..f1654751f753 --- /dev/null +++ b/pkgs/development/libraries/haskell/stringprep/default.nix @@ -0,0 +1,13 @@ +{ cabal, ranges, text, textIcu }: + +cabal.mkDerivation (self: { + pname = "stringprep"; + version = "0.1.5"; + sha256 = "1a25b18kd1zx06gi677g3xvsm49izhhf26z2dfljkjfykf05kqmp"; + buildDepends = [ ranges text textIcu ]; + meta = { + description = "Implements the \"StringPrep\" algorithm"; + 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 1c988362d726..38ca6684f02e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1604,6 +1604,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); stringQq = callPackage ../development/libraries/haskell/string-qq {}; + stringprep = callPackage ../development/libraries/haskell/stringprep {}; + stringsearch = callPackage ../development/libraries/haskell/stringsearch {}; strptime = callPackage ../development/libraries/haskell/strptime {}; -- cgit 1.4.1 From 5b4b656e514136d15043c2244102a64ede609936 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:17:41 +0100 Subject: haskell-Safe: add version 0.1 --- pkgs/development/libraries/haskell/Safe/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/Safe/default.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/Safe/default.nix b/pkgs/development/libraries/haskell/Safe/default.nix new file mode 100644 index 000000000000..f35877cd6568 --- /dev/null +++ b/pkgs/development/libraries/haskell/Safe/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "Safe"; + version = "0.1"; + sha256 = "0ybi5r4635yjx41ig54bm426fbdzrivc5kn8fwqxmzm62ai0v623"; + meta = { + homepage = "http://www-users.cs.york.ac.uk/~ndm/projects/libraries.php"; + description = "Library for safe (pattern match free) functions"; + 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 38ca6684f02e..686c406f00d8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1550,6 +1550,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); safe = callPackage ../development/libraries/haskell/safe {}; + Safe = callPackage ../development/libraries/haskell/Safe {}; + SafeSemaphore = callPackage ../development/libraries/haskell/SafeSemaphore {}; sendfile = callPackage ../development/libraries/haskell/sendfile {}; -- cgit 1.4.1 From c1227815797f16745acfcef37f56578c07e1ca7b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:17:49 +0100 Subject: haskell-text-icu: add version 0.6.3.5 --- pkgs/development/libraries/haskell/text-icu/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/text-icu/default.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/text-icu/default.nix b/pkgs/development/libraries/haskell/text-icu/default.nix new file mode 100644 index 000000000000..16115809f5b1 --- /dev/null +++ b/pkgs/development/libraries/haskell/text-icu/default.nix @@ -0,0 +1,15 @@ +{ cabal, icu, text }: + +cabal.mkDerivation (self: { + pname = "text-icu"; + version = "0.6.3.5"; + sha256 = "1blfw9377yl732ypbjhkvi3vfg6c1f1rkxcsvwmqyhkdzb2agg0a"; + buildDepends = [ text ]; + extraLibraries = [ icu ]; + meta = { + homepage = "https://bitbucket.org/bos/text-icu"; + description = "Bindings to the ICU library"; + 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 686c406f00d8..c3ecfc4290ec 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1731,6 +1731,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); text_0_11_2_3 = callPackage ../development/libraries/haskell/text/0.11.2.3.nix {}; text = self.text_0_11_2_3; + textIcu = callPackage ../development/libraries/haskell/text-icu {}; + thespian = callPackage ../development/libraries/haskell/thespian {}; thExtras = callPackage ../development/libraries/haskell/th-extras {}; -- cgit 1.4.1 From 4846709d5004fdf4a280efdf6d83a091c4cc297f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:17:56 +0100 Subject: haskell-unbounded-delays: add version 0.1.0.5 --- .../libraries/haskell/unbounded-delays/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/unbounded-delays/default.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/unbounded-delays/default.nix b/pkgs/development/libraries/haskell/unbounded-delays/default.nix new file mode 100644 index 000000000000..ccccf9d95d38 --- /dev/null +++ b/pkgs/development/libraries/haskell/unbounded-delays/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "unbounded-delays"; + version = "0.1.0.5"; + sha256 = "109swgxlv3ywf5g0wgm3gp2y7azd6mqf2lfb9sk21dfzcz28aq4k"; + meta = { + homepage = "https://github.com/basvandijk/unbounded-delays"; + description = "Unbounded thread delays and timeouts"; + 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 c3ecfc4290ec..b35e728f6b4d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1773,6 +1773,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); unbound = callPackage ../development/libraries/haskell/unbound {}; + unboundedDelays = callPackage ../development/libraries/haskell/unbounded-delays {}; + uniplate = callPackage ../development/libraries/haskell/uniplate {}; uniqueid = callPackage ../development/libraries/haskell/uniqueid {}; -- cgit 1.4.1 From fa5babd47dab5487176cb61cbb4c1d200579004a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:20:01 +0100 Subject: haskell-ghc-events: disable 'doCheck' because of test suite failure Running 1 test suites... Test suite test-versions: RUNNING... test-versions: test/queens-ghc-6.12.1.eventlog: openBinaryFile: does not exist (No such file or directory) Test suite test-versions: FAIL Test suite logged to: dist/test/ghc-events-0.4.2.0-test-versions.log 0 of 1 test suites (0 of 1 test cases) passed. --- pkgs/development/libraries/haskell/ghc-events/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix index 1c12e5dbb0b0..5b7decf9416b 100644 --- a/pkgs/development/libraries/haskell/ghc-events/default.nix +++ b/pkgs/development/libraries/haskell/ghc-events/default.nix @@ -8,6 +8,7 @@ cabal.mkDerivation (self: { isExecutable = true; buildDepends = [ binary mtl ]; testDepends = [ binary mtl ]; + doCheck = false; meta = { description = "Library and tool for parsing .eventlog files from GHC"; license = self.stdenv.lib.licenses.bsd3; -- cgit 1.4.1 From ea34b78ea60cbcf06c4cf5ef8f5ef0b2db82bf27 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:23:26 +0100 Subject: haskell-text: disable 'doCheck' to avoid infinite evaluation loop Some of the 'testDepends' of these packages end up depending on 'text' again. --- pkgs/development/libraries/haskell/text/0.11.0.5.nix | 1 + pkgs/development/libraries/haskell/text/0.11.0.6.nix | 1 + pkgs/development/libraries/haskell/text/0.11.1.13.nix | 1 + pkgs/development/libraries/haskell/text/0.11.1.5.nix | 1 + pkgs/development/libraries/haskell/text/0.11.2.0.nix | 1 + pkgs/development/libraries/haskell/text/0.11.2.3.nix | 1 + 6 files changed, 6 insertions(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/text/0.11.0.5.nix b/pkgs/development/libraries/haskell/text/0.11.0.5.nix index 0b415d28aead..59644d057201 100644 --- a/pkgs/development/libraries/haskell/text/0.11.0.5.nix +++ b/pkgs/development/libraries/haskell/text/0.11.0.5.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.11.0.5"; sha256 = "1a5y2i7qrkyyvm112q44rhd7jbqxvfxssz2g5ngbx11yypl3hcdv"; buildDepends = [ deepseq ]; + doCheck = false; meta = { homepage = "http://bitbucket.org/bos/text"; description = "An efficient packed Unicode text type"; diff --git a/pkgs/development/libraries/haskell/text/0.11.0.6.nix b/pkgs/development/libraries/haskell/text/0.11.0.6.nix index 354621fd5cd4..04fd250dfe9f 100644 --- a/pkgs/development/libraries/haskell/text/0.11.0.6.nix +++ b/pkgs/development/libraries/haskell/text/0.11.0.6.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.11.0.6"; sha256 = "103l1c8jfwpddsqzwj9jqh89vay8ax1znxqgjqprv2fvr7s0zvkp"; buildDepends = [ deepseq ]; + doCheck = false; meta = { homepage = "http://bitbucket.org/bos/text"; description = "An efficient packed Unicode text type"; diff --git a/pkgs/development/libraries/haskell/text/0.11.1.13.nix b/pkgs/development/libraries/haskell/text/0.11.1.13.nix index aaf278a0a694..71d0c28e48d7 100644 --- a/pkgs/development/libraries/haskell/text/0.11.1.13.nix +++ b/pkgs/development/libraries/haskell/text/0.11.1.13.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { deepseq HUnit QuickCheck random testFramework testFrameworkHunit testFrameworkQuickcheck2 ]; + doCheck = false; meta = { homepage = "https://github.com/bos/text"; description = "An efficient packed Unicode text type"; diff --git a/pkgs/development/libraries/haskell/text/0.11.1.5.nix b/pkgs/development/libraries/haskell/text/0.11.1.5.nix index 3f4132a87a23..03c2d90ff8da 100644 --- a/pkgs/development/libraries/haskell/text/0.11.1.5.nix +++ b/pkgs/development/libraries/haskell/text/0.11.1.5.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.11.1.5"; sha256 = "0fxxhw932gdvaqafsbw7dfzccc43hv92yhxppzp6jrg0npbyz04l"; buildDepends = [ deepseq ]; + doCheck = false; meta = { homepage = "https://bitbucket.org/bos/text"; description = "An efficient packed Unicode text type"; diff --git a/pkgs/development/libraries/haskell/text/0.11.2.0.nix b/pkgs/development/libraries/haskell/text/0.11.2.0.nix index 870438ea31f3..ab784807bfa2 100644 --- a/pkgs/development/libraries/haskell/text/0.11.2.0.nix +++ b/pkgs/development/libraries/haskell/text/0.11.2.0.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { deepseq HUnit QuickCheck random testFramework testFrameworkHunit testFrameworkQuickcheck2 ]; + doCheck = false; meta = { homepage = "https://github.com/bos/text"; description = "An efficient packed Unicode text type"; diff --git a/pkgs/development/libraries/haskell/text/0.11.2.3.nix b/pkgs/development/libraries/haskell/text/0.11.2.3.nix index a7089c94cfbc..afa0e7eb5d3d 100644 --- a/pkgs/development/libraries/haskell/text/0.11.2.3.nix +++ b/pkgs/development/libraries/haskell/text/0.11.2.3.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { deepseq HUnit QuickCheck random testFramework testFrameworkHunit testFrameworkQuickcheck2 ]; + doCheck = false; meta = { homepage = "https://github.com/bos/text"; description = "An efficient packed Unicode text type"; -- cgit 1.4.1 From 66097c6025da11c2154da6d9a7db307227de3f86 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:24:55 +0100 Subject: Disable 'doCheck' in more packages to avoid infinite evaluation loops. --- pkgs/development/libraries/haskell/doctest/default.nix | 1 + pkgs/development/libraries/haskell/hspec-expectations/default.nix | 1 + pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix | 1 + pkgs/development/libraries/haskell/monad-par/0.3.4.nix | 1 + pkgs/development/libraries/haskell/mwc-random/default.nix | 1 + pkgs/development/libraries/haskell/setenv/default.nix | 1 + pkgs/development/libraries/haskell/uuid/default.nix | 1 + 7 files changed, 7 insertions(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix index 5dffb52ce1ed..3c8988400bcb 100644 --- a/pkgs/development/libraries/haskell/doctest/default.nix +++ b/pkgs/development/libraries/haskell/doctest/default.nix @@ -13,6 +13,7 @@ cabal.mkDerivation (self: { baseCompat deepseq filepath ghcPaths hspec HUnit QuickCheck setenv silently stringbuilder syb transformers ]; + doCheck = false; meta = { homepage = "https://github.com/sol/doctest-haskell#readme"; description = "Test interactive Haskell examples"; diff --git a/pkgs/development/libraries/haskell/hspec-expectations/default.nix b/pkgs/development/libraries/haskell/hspec-expectations/default.nix index 4b84ad627840..8c9885d4378f 100644 --- a/pkgs/development/libraries/haskell/hspec-expectations/default.nix +++ b/pkgs/development/libraries/haskell/hspec-expectations/default.nix @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1ppcbfmcgrd1lwswa293fxwny6khhg4blygfbcsawrvgc5ji0q74"; buildDepends = [ HUnit ]; testDepends = [ hspec HUnit markdownUnlit silently ]; + doCheck = false; meta = { homepage = "https://github.com/sol/hspec-expectations#readme"; description = "Catchy combinators for HUnit"; diff --git a/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix b/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix index 1bfac2b13d2a..8692d6267cbe 100644 --- a/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix +++ b/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.1.0.3"; sha256 = "1c0yclil152hv06c2sbgam9amd63nnzh7a4xsnxb05wgy93qs2mg"; buildDepends = [ deepseq HUnit ]; + doCheck = false; meta = { homepage = "https://github.com/simonmar/monad-par"; description = "A library for parallel programming based on a monad"; diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.nix index f22ae9e106fc..342bea47f6b1 100644 --- a/pkgs/development/libraries/haskell/monad-par/0.3.4.nix +++ b/pkgs/development/libraries/haskell/monad-par/0.3.4.nix @@ -17,6 +17,7 @@ cabal.mkDerivation (self: { mwcRandom QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh time ]; + doCheck = false; meta = { homepage = "https://github.com/simonmar/monad-par"; description = "A library for parallel programming based on a monad"; diff --git a/pkgs/development/libraries/haskell/mwc-random/default.nix b/pkgs/development/libraries/haskell/mwc-random/default.nix index d20f4f061e4e..3e9be2c5e587 100644 --- a/pkgs/development/libraries/haskell/mwc-random/default.nix +++ b/pkgs/development/libraries/haskell/mwc-random/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { HUnit QuickCheck statistics testFramework testFrameworkHunit testFrameworkQuickcheck2 vector ]; + doCheck = false; meta = { homepage = "https://github.com/bos/mwc-random"; description = "Fast, high quality pseudo random number generation"; diff --git a/pkgs/development/libraries/haskell/setenv/default.nix b/pkgs/development/libraries/haskell/setenv/default.nix index fd94874e3642..b19728820aad 100644 --- a/pkgs/development/libraries/haskell/setenv/default.nix +++ b/pkgs/development/libraries/haskell/setenv/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.1.0"; sha256 = "04w42bpfbrs5crjp19zzi9dg61xpz4wvmjs2vc7q7qxblyhdfdsy"; testDepends = [ hspec QuickCheck ]; + doCheck = false; meta = { description = "A cross-platform library for setting environment variables"; license = self.stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/haskell/uuid/default.nix b/pkgs/development/libraries/haskell/uuid/default.nix index 55ac6cf9e683..ed7e23f6c219 100644 --- a/pkgs/development/libraries/haskell/uuid/default.nix +++ b/pkgs/development/libraries/haskell/uuid/default.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { testDepends = [ criterion deepseq HUnit mersenneRandomPure64 QuickCheck random ]; + doCheck = false; meta = { homepage = "http://projects.haskell.org/uuid/"; description = "For creating, comparing, parsing and printing Universally Unique Identifiers"; -- cgit 1.4.1 From 1e5df990dbdb76d16420bd98f059f19343c10fc7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:36:44 +0100 Subject: haskell-simple-sendfile: disable 'doCheck' because of test suite failure Running 1 test suites... Test suite spec: RUNNING... Sendfile sendfile spec: test/inputFile: openFd: does not exist (No such file or directory) - sends an entire file FAILED [1] spec: test/inputFile: openFd: does not exist (No such file or directory) - sends a part of file FAILED [2] spec: test/inputFile: openFd: does not exist (No such file or directory) - terminates even if length is over spec: test/inputFile: openFd: does not exist (No such file or directory) - terminates even if offset is over - terminates even if the file is truncated FAILED [3] sendfileWithHeader spec: test/inputFile: openFd: does not exist (No such file or directory) - sends an header and an entire file FAILED [4] spec: test/inputFile: openFd: does not exist (No such file or directory) - sends an header and a part of file FAILED [5] spec: test/inputFile: openFd: does not exist (No such file or directory) - sends a large header and an entire file FAILED [6] spec: test/inputFile: openFd: does not exist (No such file or directory) - sends a large header and a part of file FAILED [7] spec: test/inputFile: openFd: does not exist (No such file or directory) - terminates even if length is over spec: test/inputFile: openFd: does not exist (No such file or directory) - terminates even if offset is over - terminates even if the file is truncated FAILED [8] 1) Sendfile.sendfile sends an entire file FAILED (uncaught exception) IOException (test/inputFile: openBinaryFile: does not exist (No such file or directory)) 2) Sendfile.sendfile sends a part of file FAILED (uncaught exception) IOException (test/inputFile: openBinaryFile: does not exist (No such file or directory)) 3) Sendfile.sendfile terminates even if the file is truncated FAILED (uncaught exception) IOException (test/inputFile: openBinaryFile: does not exist (No such file or directory)) 4) Sendfile.sendfileWithHeader sends an header and an entire file FAILED (uncaught exception) IOException (test/inputFile: openBinaryFile: does not exist (No such file or directory)) 5) Sendfile.sendfileWithHeader sends an header and a part of file FAILED (uncaught exception) IOException (test/inputFile: openBinaryFile: does not exist (No such file or directory)) 6) Sendfile.sendfileWithHeader sends a large header and an entire file FAILED (uncaught exception) IOException (test/inputFile: openBinaryFile: does not exist (No such file or directory)) 7) Sendfile.sendfileWithHeader sends a large header and a part of file FAILED (uncaught exception) IOException (test/inputFile: openBinaryFile: does not exist (No such file or directory)) 8) Sendfile.sendfileWithHeader terminates even if the file is truncated FAILED (uncaught exception) IOException (test/inputFile: openBinaryFile: does not exist (No such file or directory)) --- pkgs/development/libraries/haskell/simple-sendfile/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix index 9ad2bd4405b1..9e8f638c65cf 100644 --- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix +++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1q9m9lxv9jfkn6a1lf07jcl4li3n5996df1qrfkfjq2n0bvn4qfj"; buildDepends = [ network ]; testDepends = [ conduit hspec HUnit network networkConduit ]; + doCheck = false; meta = { description = "Cross platform library for the sendfile system call"; license = self.stdenv.lib.licenses.bsd3; -- cgit 1.4.1 From 5e495dcff25b69d87eb16db1ede17d1cbdefa7da Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:41:52 +0100 Subject: haskell-HTTP: disable 'doCheck' to avoid compilation errors Setup: At least the following dependencies are missing: case-insensitive ==0.4.*, conduit >=0.4 && <0.6, http-types >=0.6 && <0.8, wai >=1.2 && <1.4 --- pkgs/development/libraries/haskell/HTTP/4000.0.6.nix | 1 + pkgs/development/libraries/haskell/HTTP/4000.0.9.nix | 1 + pkgs/development/libraries/haskell/HTTP/4000.1.1.nix | 1 + pkgs/development/libraries/haskell/HTTP/4000.1.2.nix | 1 + pkgs/development/libraries/haskell/HTTP/4000.2.1.nix | 1 + pkgs/development/libraries/haskell/HTTP/4000.2.2.nix | 1 + pkgs/development/libraries/haskell/HTTP/4000.2.3.nix | 1 + pkgs/development/libraries/haskell/HTTP/4000.2.5.nix | 1 + pkgs/development/libraries/haskell/HTTP/4000.2.8.nix | 1 + 9 files changed, 9 insertions(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix index c87b38af4523..ac4ac232edf8 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "4000.0.6"; sha256 = "75af1ac4dc21b10c8a1a54a33179ea822e591887bab7278360a3d6b38304d39b"; buildDepends = [ mtl network parsec ]; + doCheck = false; meta = { homepage = "http://projects.haskell.org/http/"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix index 493da3337b91..0beebbfe2944 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "4000.0.9"; sha256 = "1e2b4a8b782ad1417c8755bb0d248851bc142b351366ed460e07f2945a5e95ba"; buildDepends = [ mtl network parsec ]; + doCheck = false; meta = { homepage = "http://projects.haskell.org/http/"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix index 28a3bd5fe956..31cfdddac79e 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "4000.1.1"; sha256 = "09khx5fb673a0d7m3bl39xjdxvc60m52rmm4865cha2mby0zidy3"; buildDepends = [ mtl network parsec ]; + doCheck = false; meta = { homepage = "http://projects.haskell.org/http/"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix index a75c72f6a285..8d4a39526b2a 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "4000.1.2"; sha256 = "19vcy8xinrvn01caly6sg1p1yvbbf7nwq10kxmnwqssnl4h5cwn8"; buildDepends = [ mtl network parsec ]; + doCheck = false; meta = { homepage = "http://projects.haskell.org/http/"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix index 0c7fa0bfa789..f3da4a5ccf22 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { testDepends = [ httpdShed HUnit network split testFramework testFrameworkHunit ]; + doCheck = false; meta = { homepage = "https://github.com/haskell/HTTP"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix index 805bf36f5df8..e6238a5e738f 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { testDepends = [ httpdShed HUnit network split testFramework testFrameworkHunit ]; + doCheck = false; meta = { homepage = "https://github.com/haskell/HTTP"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix index a0b328d702cc..d9e422f9e895 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { testDepends = [ httpdShed HUnit network split testFramework testFrameworkHunit ]; + doCheck = false; meta = { homepage = "https://github.com/haskell/HTTP"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix index 4adae562476e..93ba5e949db8 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl network pureMD5 split testFramework testFrameworkHunit wai warp ]; + doCheck = false; meta = { homepage = "https://github.com/haskell/HTTP"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix index f0c103622a9e..1b52261dea08 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl network pureMD5 split testFramework testFrameworkHunit wai warp ]; + doCheck = false; meta = { homepage = "https://github.com/haskell/HTTP"; description = "A library for client-side HTTP"; -- cgit 1.4.1 From 01b02925e448b5025de25c20d50620bdc83597ae Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:42:15 +0100 Subject: haskell-cautious-file: disable 'doCheck' because of test suite failure --- pkgs/development/libraries/haskell/cautious-file/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/cautious-file/default.nix b/pkgs/development/libraries/haskell/cautious-file/default.nix index aa6e87565aee..44ed255bb634 100644 --- a/pkgs/development/libraries/haskell/cautious-file/default.nix +++ b/pkgs/development/libraries/haskell/cautious-file/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "1.0.2"; sha256 = "1sw5ngwrarq1lsd4c6v2wdmgbhkkq6kpybb62r8ccm11ddgn3yiq"; buildDepends = [ filepath ]; + doCheck = false; meta = { description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures"; license = self.stdenv.lib.licenses.bsd3; -- cgit 1.4.1 From fb97adb2440228ab4faa97d68bedff49a0f91a1b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:44:48 +0100 Subject: zeromq3-haskell: disable 'doCheck' because of build errors in test program --- pkgs/development/libraries/haskell/zeromq3-haskell/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix index 3a3e700cfbbb..82dae54839ff 100644 --- a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix +++ b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { QuickCheck testFramework testFrameworkQuickcheck2 ]; extraLibraries = [ zeromq ]; + doCheck = false; meta = { homepage = "http://github.com/twittner/zeromq-haskell/"; description = "Bindings to ZeroMQ 3.x"; -- cgit 1.4.1 From 9f37804f364389201223c4f287805276287c9f46 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 22:54:36 +0100 Subject: haskell-filestore: disable 'doCheck' because of test suite failures running tests /bin/sh: ./dist/build/test-filestore/test-filestore: No such file or directory --- pkgs/development/libraries/haskell/filestore/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index d114a5aa3afd..468a9f711e1e 100644 --- a/pkgs/development/libraries/haskell/filestore/default.nix +++ b/pkgs/development/libraries/haskell/filestore/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { buildDepends = [ Diff filepath HUnit mtl parsec split time utf8String xml ]; + doCheck = false; jailbreak = true; meta = { description = "Interface for versioning file stores"; -- cgit 1.4.1 From e2c5dfc3ee16a6faec681faefe01192f3c56a992 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 23:10:17 +0100 Subject: haskell-src-exts: disable 'doCheck' because of test suite build errors Test/Runner.hs:5:8: Could not find module `Language.Haskell.Exts.Annotated' Use -v to see a list of the files searched for. Setup: Pattern match failure in do expression at Setup.hs:6:5-15 --- pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix | 1 + pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix | 1 + 2 files changed, 2 insertions(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix index 9df67a70c6c5..1918260cc62f 100644 --- a/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix +++ b/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1jqf8l81zw7x5ryf8h2n0b2636yhxkfp3j4ndbqw6hc7i5q581m6"; buildDepends = [ cpphs ]; buildTools = [ happy ]; + doCheck = false; meta = { homepage = "http://code.haskell.org/haskell-src-exts"; description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix index 16f6d6362a1e..5521e037b4eb 100644 --- a/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix +++ b/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "03bzhfp7l9f5hh61qdrr83331nbfgj3jfsfylwmnmcknpisdqnkw"; buildDepends = [ cpphs ]; buildTools = [ happy ]; + doCheck = false; meta = { homepage = "http://code.haskell.org/haskell-src-exts"; description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; -- cgit 1.4.1 From 2083fbb03e4a0a40e8dc15a30c136b87577ff6a4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 23:10:34 +0100 Subject: haskell-filestore: cosmetic --- pkgs/development/libraries/haskell/filestore/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index 468a9f711e1e..5e93300b23cb 100644 --- a/pkgs/development/libraries/haskell/filestore/default.nix +++ b/pkgs/development/libraries/haskell/filestore/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { buildDepends = [ Diff filepath HUnit mtl parsec split time utf8String xml ]; - doCheck = false; jailbreak = true; + doCheck = false; meta = { description = "Interface for versioning file stores"; license = self.stdenv.lib.licenses.bsd3; -- cgit 1.4.1 From b1010d50b5595e98e275511a591c56771d44a9e7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 23:20:53 +0100 Subject: haskell-vty: disable 'doCheck' because of build errors Setup: At least the following dependencies are missing: Cabal ==1.17.* --- pkgs/development/libraries/haskell/vty/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix index 9adc35b1bdf8..3121399b3a90 100644 --- a/pkgs/development/libraries/haskell/vty/default.nix +++ b/pkgs/development/libraries/haskell/vty/default.nix @@ -15,6 +15,7 @@ cabal.mkDerivation (self: { Cabal deepseq mtl parallel parsec QuickCheck random terminfo utf8String vector ]; + doCheck = false; meta = { homepage = "https://github.com/coreyoconnor/vty"; description = "A simple terminal UI library"; -- cgit 1.4.1 From a4f092a276198b95e2692125919a567aa7d37ab2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 23:24:48 +0100 Subject: haskell-hashed-storage: disable 'doCheck' because of test suite errors running tests /bin/sh: dist/build/hashed-storage-test/hashed-storage-test: No such file or directory --- pkgs/development/libraries/haskell/hashed-storage/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/hashed-storage/default.nix b/pkgs/development/libraries/haskell/hashed-storage/default.nix index 161e81eb3754..77a4251259d3 100644 --- a/pkgs/development/libraries/haskell/hashed-storage/default.nix +++ b/pkgs/development/libraries/haskell/hashed-storage/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { buildDepends = [ binary dataenc extensibleExceptions filepath mmap mtl zlib ]; + doCheck = false; meta = { description = "Hashed file storage support code"; license = self.stdenv.lib.licenses.bsd3; -- cgit 1.4.1 From 81da0c5194006e5a9383b7097fdb8433966eba6d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 23:25:00 +0100 Subject: haskell-sendfile: update to version 0.7.9 --- pkgs/development/libraries/haskell/sendfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/sendfile/default.nix b/pkgs/development/libraries/haskell/sendfile/default.nix index 455328ec9cb2..dc1f24757af2 100644 --- a/pkgs/development/libraries/haskell/sendfile/default.nix +++ b/pkgs/development/libraries/haskell/sendfile/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "sendfile"; - version = "0.7.8"; - sha256 = "0xy9ciikr444gblh3r8z3w4h4rcrfjfciw3dvxgzbygqs5dy6yxl"; + version = "0.7.9"; + sha256 = "0hnw1ym81cff49dwww19kgbs4s0kpandbvn6h5cml3y0p1nxybqh"; buildDepends = [ network ]; meta = { homepage = "http://hub.darcs.net/stepcut/sendfile"; -- cgit 1.4.1 From 36700ed68fda6ddeb6c9ea1a1bbbcd46037ddf4b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 23:31:32 +0100 Subject: haskell-numbers: disable 'doCheck' to avoid build errors Setup: At least the following dependencies are missing: test-framework ==0.6.*, test-framework-quickcheck2 ==0.2.* --- pkgs/development/libraries/haskell/numbers/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/numbers/default.nix b/pkgs/development/libraries/haskell/numbers/default.nix index 002f68eded7c..e0136ad5d45d 100644 --- a/pkgs/development/libraries/haskell/numbers/default.nix +++ b/pkgs/development/libraries/haskell/numbers/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { testDepends = [ QuickCheck testFramework testFrameworkQuickcheck2 ]; + doCheck = false; meta = { homepage = "https://github.com/DanBurton/numbers"; description = "Various number types"; -- cgit 1.4.1 From 924efa3aaadc21726694fc70bb1ff225d5fd29be Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 23:33:12 +0100 Subject: haskell-tls: disable 'doCheck' to avoid build errors Tests/Tests.hs:41:0: error: missing binary operator before token "(" --- pkgs/development/libraries/haskell/tls/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index a935b8ad4d56..72e0976ceaff 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -15,6 +15,7 @@ cabal.mkDerivation (self: { cereal certificate cprngAes cryptoPubkey cryptoRandomApi mtl QuickCheck testFramework testFrameworkQuickcheck2 time ]; + doCheck = false; meta = { homepage = "http://github.com/vincenthz/hs-tls"; description = "TLS/SSL protocol native implementation (Server and Client)"; -- cgit 1.4.1 From 539659248e3c5474de6aeb53d6c8833b850a33d0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 23:34:35 +0100 Subject: haskell-zip-archive: disable 'doCheck' to avoid test suite failures Test suite test-zip-archive: RUNNING... Cases: 7 Tried: 1 Errors: 0 Failures: 0/bin/sh: /usr/bin/zip: No such file or directory ### Error in: 1 test-temp/test4.zip: openBinaryFile: does not exist (No such file or directory) Cases: 7 Tried: 4 Errors: 1 Failures: 0 adding: LICENSE (deflated 46%) adding: Codec/ (stored 0%) adding: LICENSE (deflated 46%) adding: Codec/ (stored 0%) adding: Codec/Archive/ (stored 0%) adding: Codec/Archive/Zip.hs (deflated 74%) Cases: 7 Tried: 6 Errors: 1 Failures: 0 creating: test-temp/dir1 extracting: test-temp/dir1/hi creating: test-temp/dir1/dir2 inflating: test-temp/dir1/dir2/hello Cases: 7 Tried: 7 Errors: 1 Failures: 0 Test suite test-zip-archive: FAIL Test suite logged to: dist/test/zip-archive-0.1.3.3-test-zip-archive.log 0 of 1 test suites (0 of 1 test cases) passed. --- pkgs/development/libraries/haskell/zip-archive/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix index 6bbe28446127..45f2ac96319d 100644 --- a/pkgs/development/libraries/haskell/zip-archive/default.nix +++ b/pkgs/development/libraries/haskell/zip-archive/default.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { isExecutable = true; buildDepends = [ binary digest filepath mtl time utf8String zlib ]; testDepends = [ HUnit time ]; + doCheck = false; meta = { homepage = "http://github.com/jgm/zip-archive"; description = "Library for creating and modifying zip archives"; -- cgit 1.4.1 From ed9cb3942c5291ec19373dd5dc113bd4eab2bfb7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 23:39:43 +0100 Subject: haskell-permutation: disable 'doCheck' to avoid build errors Test/Permute.hs:20:8: Could not find module `Test.QuickCheck' Use -v to see a list of the files searched for. --- pkgs/development/libraries/haskell/permutation/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/permutation/default.nix b/pkgs/development/libraries/haskell/permutation/default.nix index 5903cb27f715..4f38dfcaa12f 100644 --- a/pkgs/development/libraries/haskell/permutation/default.nix +++ b/pkgs/development/libraries/haskell/permutation/default.nix @@ -4,6 +4,7 @@ cabal.mkDerivation (self: { pname = "permutation"; version = "0.4.1"; sha256 = "0fgw4ivs8sa18fyphwr3mzp2v7ha2nz2yf3a7jmz9ymqdf2xws97"; + doCheck = false; meta = { homepage = "http://stat.stanford.edu/~patperry/code/permutation"; description = "A library for permutations and combinations"; -- cgit 1.4.1 From 80d5273cc6af0c9e3d75a8a5e0009d80f29a12f9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Feb 2013 23:48:22 +0100 Subject: haskell-distributed-process: disable 'doCheck' to avoid build errors Setup: At least the following dependencies are missing: ansi-terminal ==0.5.* --- pkgs/development/libraries/haskell/distributed-process/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix index 0427a937f840..d23a5ef0228d 100644 --- a/pkgs/development/libraries/haskell/distributed-process/default.nix +++ b/pkgs/development/libraries/haskell/distributed-process/default.nix @@ -20,6 +20,7 @@ cabal.mkDerivation (self: { testFrameworkHunit ]; noHaddock = true; + doCheck = false; meta = { homepage = "http://github.com/haskell-distributed/distributed-process"; description = "Cloud Haskell: Erlang-style concurrency in Haskell"; -- cgit 1.4.1 From 1cea746589367a5f9db7fa461b790bf0341d890b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Feb 2013 00:06:11 +0100 Subject: haskell-statistics: disable 'doCheck' to avoid test suite failures Running 1 test suites... Test suite tests: RUNNING... Tests for all distributions: Tests for: BetaDistribution: C.D.F. sanity: [OK, passed 100 tests] CDF limit at +tests: : commitBuffer: invalid argument (invalid character) Test suite tests: FAIL Test suite logged to: dist/test/statistics-0.10.2.0-tests.log --- pkgs/development/libraries/haskell/statistics/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix index 923cdf879a5c..f53e7a341d6e 100644 --- a/pkgs/development/libraries/haskell/statistics/default.nix +++ b/pkgs/development/libraries/haskell/statistics/default.nix @@ -16,6 +16,7 @@ cabal.mkDerivation (self: { erf HUnit ieee754 mathFunctions primitive QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 vector vectorAlgorithms ]; + doCheck = false; meta = { homepage = "https://github.com/bos/statistics"; description = "A library of statistical types, data, and functions"; -- cgit 1.4.1 From 2ae0ca058010e9c387a34e05cf622c3fe78eedcc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Feb 2013 00:11:16 +0100 Subject: haskell-threads: disable 'doCheck' to avoid test suite build errors Setup: At least the following dependencies are missing: test-framework >=0.2.4 && <0.7, test-framework-hunit >=0.2.4 && <0.3 --- pkgs/development/libraries/haskell/threads/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/threads/default.nix b/pkgs/development/libraries/haskell/threads/default.nix index a3327e88ba6c..533a67c99c82 100644 --- a/pkgs/development/libraries/haskell/threads/default.nix +++ b/pkgs/development/libraries/haskell/threads/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { baseUnicodeSymbols concurrentExtra HUnit stm testFramework testFrameworkHunit ]; + doCheck = false; meta = { homepage = "https://github.com/basvandijk/threads"; description = "Fork threads and wait for their result"; -- cgit 1.4.1 From cf1df3a9e934a4ed8f0b68182551bd698d09d32f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Feb 2013 00:13:30 +0100 Subject: haskell-happstack-server: disable 'doCheck' to avoid test suite build errors tests/Test.hs:3:8: Could not find module `Happstack.Server.Tests' Perhaps you meant Happstack.Server.Types (from happstack-server-7.1.6) Happstack.Server.Auth (from happstack-server-7.1.6) Happstack.Server.Client (from happstack-server-7.1.6) Use -v to see a list of the files searched for. --- pkgs/development/libraries/haskell/happstack/happstack-server.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index dba052a0fc1e..8d8261df97e3 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -16,6 +16,7 @@ cabal.mkDerivation (self: { utf8String xhtml zlib ]; testDepends = [ HUnit parsec zlib ]; + doCheck = false; meta = { homepage = "http://happstack.com"; description = "Web related tools and services"; -- cgit 1.4.1 From ab79e29846f8270d7634eb57a66da57ebebd39ed Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Feb 2013 00:23:57 +0100 Subject: haskell-pandoc: disable 'doCheck' to avoid test suite build errors Configuring pandoc-1.10.1... Setup: At least the following dependencies are missing: Diff ==0.2.*, HUnit ==1.2.*, QuickCheck >=2.4 && <2.6, ansi-terminal >=0.5 && <0.7, test-framework >=0.3 && <0.9, test-framework-hunit >=0.2 && <0.4, test-framework-quickcheck2 >=0.2.9 && <0.4 --- pkgs/development/libraries/haskell/pandoc/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index df24b4ac0222..93f7e8add429 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -20,6 +20,7 @@ cabal.mkDerivation (self: { patchPhase = '' sed -r -i -e 's|blaze-html >= 0.5 && < 0.6,|blaze-html >= 0.5,|' pandoc.cabal ''; + doCheck = false; meta = { homepage = "http://johnmacfarlane.net/pandoc"; description = "Conversion between markup formats"; -- cgit 1.4.1 From 6495bf019cc195a8e83b45e302c343eac1bbd312 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Feb 2013 00:26:18 +0100 Subject: haskell-fsnotify: disable 'doCheck' to avoid test suite failures Test suite test: RUNNING... canonicalizeDirPath - Absolute path keeps trailing slash FAILED [1] - Absolute path gains trailing slash FAILED [2] - Relative path keeps trailing slash - Relative path gains trailing slash canonicalizePath - Absolute path keeps trailing slash FAILED [3] - Relative path keeps trailing slash findFiles - Non-recursive - Recursive findDirs - Non-recursive - Recursive watchDir - Create file - Modify file - Remove file - Rename file - Debounce watchDirChan - Create file - Modify file - Remove file - Rename file watchTree - Create file (pre-existing directory) - Create file (create directory) - Modify file - Remove file - Rename file watchTreeChan - Create file (pre-existing directory) - Create file (create directory) - Modify file - Remove file - Rename file 1) canonicalizeDirPath Absolute path keeps trailing slash FAILED (uncaught exception) IOException (/home/: canonicalizePath: does not exist (No such file or directory)) 2) canonicalizeDirPath Absolute path gains trailing slash FAILED (uncaught exception) IOException (/home: canonicalizePath: does not exist (No such file or directory)) 3) canonicalizePath Absolute path keeps trailing slash FAILED (uncaught exception) IOException (/home/: canonicalizePath: does not exist (No such file or directory)) Finished in 37.1526 seconds 29 examples, 3 failures Test suite test: FAIL Test suite logged to: dist/test/fsnotify-0.0.6-test.log --- pkgs/development/libraries/haskell/fsnotify/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/fsnotify/default.nix b/pkgs/development/libraries/haskell/fsnotify/default.nix index 142b513e5924..cfc80c4d547a 100644 --- a/pkgs/development/libraries/haskell/fsnotify/default.nix +++ b/pkgs/development/libraries/haskell/fsnotify/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { Cabal Glob hinotify hspec QuickCheck random systemFileio systemFilepath text time uniqueid ]; + doCheck = false; meta = { description = "Cross platform library for file creation, modification, and deletion notification"; license = self.stdenv.lib.licenses.bsd3; -- cgit 1.4.1 From 45d6e82c4878542a72f7b07494746244dedbf013 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Feb 2013 00:34:56 +0100 Subject: haskell-postgresql-simple: disable 'doCheck' to avoid test suite failure Test suite test: RUNNING... test: SqlError {sqlState = "", sqlNativeError = -1, sqlErrorMsg = "could not connect to server: No such file or directory\n\tIs the server running locally and accepting\n\tconnections on Unix domain socket \"/tmp/.s.PGSQL.5432\"?\n"} Test suite test: FAIL Test suite logged to: dist/test/postgresql-simple-0.2.4.1-test.log 0 of 1 test suites (0 of 1 test cases) passed. --- pkgs/development/libraries/haskell/postgresql-simple/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix index 29c74d84015f..81a5f67c45b9 100644 --- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { transformers vector ]; testDepends = [ base16Bytestring cryptohash HUnit text time ]; + doCheck = false; meta = { description = "Mid-Level PostgreSQL client library"; license = self.stdenv.lib.licenses.bsd3; -- cgit 1.4.1 From 2a5028bcc4448e9ed4a73a7468f121da910eb7c6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Feb 2013 00:49:27 +0100 Subject: haskell-crypto-conduit: disable 'doCheck' to avoid test suite build errors --- pkgs/development/libraries/haskell/crypto-conduit/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix index 69351a2a5aa3..2b967a5b5649 100644 --- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix +++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { cereal conduit cryptoApi cryptocipher cryptohash hspec skein transformers ]; + doCheck = false; meta = { homepage = "https://github.com/meteficha/crypto-conduit"; description = "Conduit interface for cryptographic operations (from crypto-api)"; -- cgit 1.4.1 From aacbdfab6bab78871f9d492eca46306e79346e95 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Feb 2013 00:50:31 +0100 Subject: haskell-unordered-containers: disable 'doCheck' to avoid test suite build errors tests/HashSetProperties.hs:76:0: error: missing binary operator before token "(" tests/HashSetProperties.hs:86:0: error: missing binary operator before token "(" --- pkgs/development/libraries/haskell/unordered-containers/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/unordered-containers/default.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix index 2f786eba949e..288e559ce980 100644 --- a/pkgs/development/libraries/haskell/unordered-containers/default.nix +++ b/pkgs/development/libraries/haskell/unordered-containers/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { ChasingBottoms hashable HUnit QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 ]; + doCheck = false; meta = { homepage = "https://github.com/tibbe/unordered-containers"; description = "Efficient hashing-based container types"; -- cgit 1.4.1 From 6dff123e86fe079cb62a5a1bf8d69067c0978635 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Feb 2013 00:57:13 +0100 Subject: haskell-lens: disable 'doCheck' to avoid test suite failures Running 4 test suites... Test suite doctests: RUNNING... ### Error in src/Data/Complex/Lens.hs:33: expression `let { a doctests: : hPutChar: invalid argument (invalid character) Test suite doctests: FAIL Test suite logged to: dist/test/lens-3.8.7.3-doctests.log Test suite hunit: RUNNING... Test suite hunit: PASS Test suite logged to: dist/test/lens-3.8.7.3-hunit.log Test suite properties: RUNNING... Test suite properties: PASS Test suite logged to: dist/test/lens-3.8.7.3-properties.log Test suite templates: RUNNING... Test suite templates: PASS Test suite logged to: dist/test/lens-3.8.7.3-templates.log 3 of 4 test suites (3 of 4 test cases) passed. --- pkgs/development/libraries/haskell/lens/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index bba846689584..84a66d019dcc 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -25,6 +25,7 @@ cabal.mkDerivation (self: { testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh text transformers unorderedContainers vector ]; + doCheck = false; meta = { homepage = "http://github.com/ekmett/lens/"; description = "Lenses, Folds and Traversals"; -- cgit 1.4.1 From cd5f4eefa63cbdd640f1f112be57d69e574d38ff Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Feb 2013 00:58:28 +0100 Subject: haskell-graphviz: disable 'doCheck' to avoid test suite failures Test suite graphviz-testsuite: RUNNING... This is the test suite for the graphviz library. If any of these tests fail, please inform the maintainer, including full output of this test suite. ====================================================================== Running test: "Printing and parsing of Attributes". The most common source of errors in printing and parsing are for Attributes. +++ OK, passed 200 tests. All tests for "Printing and parsing of Attributes" were successful! ====================================================================== Running test: "Printing generalised Dot code". When generalising "DotGraph" values to other "DotRepr" values, the generated Dot code should be identical. +++ OK, passed 200 tests. All tests for "Printing generalised Dot code" were successful! ====================================================================== Running test: "Printing and Parsing DotReprs". The graphviz library should be able to parse back in its own generated Dot code for any "DotRepr" instance +++ OK, passed 200 tests. +++ OK, passed 200 tests. +++ OK, passed 200 tests. All tests for "Printing and Parsing DotReprs" were successful! ====================================================================== Running test: "Pre-processing Dot code". When parsing Dot code, some pre-processing is done to remove items such as comments and to join together multi-line strings. This test verifies that this pre-processing doesn't affect actual Dot code by running the pre-processor on generated Dot code. This test is not run on generalised Dot graphs as if it works for normal dot graphs then it should also work for generalised ones. +++ OK, passed 200 tests. All tests for "Pre-processing Dot code" were successful! ====================================================================== Running test: "Augmenting FGL Graphs". The various Graph to Graph functions in Data.GraphViz should only _augment_ the graph labels and not change the graphs themselves. This test compares the original graphs to these augmented graphs and verifies that they are the same. *** Failed! (after 1 test): Exception: Error running utility program: Error messages from neato: -1:']'->[] The tests for "Augmenting FGL Graphs" failed! Not attempting any further tests. Test suite graphviz-testsuite: FAIL Test suite logged to: dist/test/graphviz-2999.16.0.0-graphviz-testsuite.log 0 of 1 test suites (0 of 1 test cases) passed. --- pkgs/development/libraries/haskell/graphviz/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix index 9d370993a22c..77245ec8c91b 100644 --- a/pkgs/development/libraries/haskell/graphviz/default.nix +++ b/pkgs/development/libraries/haskell/graphviz/default.nix @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { colour dlist fgl filepath polyparse QuickCheck temporary text transformers wlPprintText ]; + doCheck = false; meta = { homepage = "http://projects.haskell.org/graphviz/"; description = "Bindings to Graphviz for graph visualisation"; -- cgit 1.4.1 From 90f53a7be1c456f272082d2e87e8022a4c431419 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Feb 2013 01:41:49 +0100 Subject: haskell-hakyll: disable 'doCheck' to avoid test suite failures Test suite hakyll-tests: RUNNING... Hakyll.Core.Dependencies.Tests: [ 1] analyze: [OK] [ 2] analyze: [OK] [ 3] analyze: [OK] Hakyll.Core.Identifier.Tests: [ 1] capture: [OK] [ 2] capture: [OK] [ 3] capture: [OK] [ 4] capture: [OK] [ 5] capture: [OK] [ 6] capture: [OK] [ 7] capture: [OK] [ 8] capture: [OK] [ 9] capture: [OK] [10] capture: [OK] [11] capture: [OK] [12] capture: [OK] [13] capture: [OK] [14] capture: [OK] [15] capture: [OK] [ 1] matches: [OK] [ 2] matches: [OK] [ 3] matches: [OK] [ 4] matches: [OK] [ 5] matches: [OK] [ 6] matches: [OK] [ 7] matches: [OK] [ 8] matches: [OK] [ 9] matches: [OK] Hakyll.Core.Provider.Tests: case01: [OK] Hakyll.Core.Routes.Tests: [ 1] runRoutes: [OK] [ 2] runRoutes: [OK] [ 3] runRoutes: [OK] [ 4] runRoutes: [OK] [ 5] runRoutes: [OK] [ 6] runRoutes: [OK] [ 7] runRoutes: [OK] [ 8] runRoutes: [OK] Hakyll.Core.Rules.Tests: runRules: [OK] Hakyll.Core.Runtime.Tests: [ERROR] tests/data/russian.md: hGetContents: invalid argument (invalid byte sequence) [ 1] run: [Failed] ERROR: _testsite/bodies.txt: openFile: does not exist (No such file or directory) Hakyll.Core.Store.Tests: simple get . set: [OK, passed 100 tests] persistent get . set: [OK, passed 100 tests] WrongType get . set: [OK] Hakyll.Core.UnixFilter.Tests: hakyll-tests: tests/data/russian.md: hGetContents: invalid argument (invalid byte sequence) unixFilter rev: [Failed] ERROR: tests/data/russian.md: hGetContents: invalid argument (invalid byte sequence) Hakyll.Core.Util.String.Tests: [ 1] trim: [OK] [ 1] replaceAll: [OK] [ 1] splitAll: [OK] Hakyll.Web.Html.RelativizeUrls.Tests: [ 1] relativizeUrls: [OK] [ 2] relativizeUrls: [OK] [ 3] relativizeUrls: [OK] [ 4] relativizeUrls: [OK] [ 5] relativizeUrls: [OK] Hakyll.Web.Html.Tests: [ 1] demoteHeaders: [OK] [ 1] withUrls: [OK] [ 2] withUrls: [OK] [ 3] withUrls: [OK] [ 4] withUrls: [OK] [ 5] withUrls: [OK] [ 6] withUrls: [OK] [ 1] toUrl: [OK] [ 2] toUrl: [OK] [ 3] toUrl: [OK] [ 1] toSiteRoot: [OK] [ 2] toSiteRoot: [OK] [ 3] toSiteRoot: [OK] [ 4] toSiteRoot: [OK] [ 1] isExternal: [OK] [ 2] isExternal: [OK] [ 3] isExternal: [OK] [ 4] isExternal: [OK] [ 1] stripTags: [OK] [ 2] stripTags: [OK] [ 3] stripTags: [OK] [ 1] escapeHtml: [OK] [ 2] escapeHtml: [OK] Hakyll.Core.Template.Context.Tests: testDateField: [OK] Hakyll.Core.Template.Tests: case01: [OK] applyJoinTemplateList: [OK] Properties Test Cases Total Passed 2 72 74 Failed 0 2 2 Total 2 74 76 Test suite hakyll-tests: FAIL Test suite logged to: dist/test/hakyll-4.1.4.0-hakyll-tests.log --- pkgs/development/libraries/haskell/hakyll/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 59a32b0d290b..2ca90094bb81 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -23,6 +23,7 @@ cabal.mkDerivation (self: { testFrameworkHunit testFrameworkQuickcheck2 text time ]; jailbreak = true; + doCheck = false; meta = { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; -- cgit 1.4.1 From f5b6a52f0ed6b359188c4e1938265312c3f9f957 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Feb 2013 01:44:44 +0100 Subject: haskell-hledger-web: re-generate with recent version of cabal2nix --- pkgs/development/libraries/haskell/hledger-web/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix index 67adcb0fbdd6..4a2d7ef7a95a 100644 --- a/pkgs/development/libraries/haskell/hledger-web/default.nix +++ b/pkgs/development/libraries/haskell/hledger-web/default.nix @@ -4,6 +4,7 @@ , parsec, regexpr, safe, shakespeareCss, shakespeareJs , shakespeareText, text, time, transformers, wai, waiExtra, warp , yaml, yesod, yesodCore, yesodDefault, yesodForm, yesodStatic +, yesodTest }: cabal.mkDerivation (self: { @@ -19,6 +20,7 @@ cabal.mkDerivation (self: { shakespeareJs shakespeareText text time transformers wai waiExtra warp yaml yesod yesodCore yesodDefault yesodForm yesodStatic ]; + testDepends = [ yesodCore yesodDefault yesodTest ]; patchPhase = '' sed -r -i -e 's|blaze-html * >= 0.5 *&& < 0.6|blaze-html >= 0.5|' hledger-web.cabal ''; @@ -28,6 +30,5 @@ cabal.mkDerivation (self: { description = "A web interface for the hledger accounting tool"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) -- cgit 1.4.1 From f8e282254407ca074e6c43c8f9514c6a12ee117c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Feb 2013 01:58:19 +0100 Subject: haskell-cuda: $propagatedBuildNativeInputs is now called $propagatedNativeBuildInputs --- pkgs/development/libraries/haskell/cuda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix index 3baa02d26747..2c174b85f639 100644 --- a/pkgs/development/libraries/haskell/cuda/default.nix +++ b/pkgs/development/libraries/haskell/cuda/default.nix @@ -20,8 +20,8 @@ cabal.mkDerivation (self: { for i in Setup.hs Setup.lhs; do test -f $i && ghc --make $i done - - for p in $extraBuildInputs $propagatedBuildNativeInputs; do + + for p in $extraBuildInputs $propagatedNativeBuildInputs; do if [ -d "$p/include" ]; then extraLibDirs="$extraLibDirs --extra-include-dir=$p/include" fi -- cgit 1.4.1 From 32d641d55f2475384a78631e3223ce9bccaf76b0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Feb 2013 01:59:05 +0100 Subject: haskell-cuda: disable 'doCheck' because this package does a mad override of the 'configurePhase' anyway --- pkgs/development/libraries/haskell/cuda/default.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix index 2c174b85f639..d915904b05e1 100644 --- a/pkgs/development/libraries/haskell/cuda/default.nix +++ b/pkgs/development/libraries/haskell/cuda/default.nix @@ -34,6 +34,9 @@ cabal.mkDerivation (self: { ./Setup configure --verbose --prefix="$out" $libraryProfiling $extraLibDirs $configureFlags ''; + + doCheck = false; + meta = { description = "FFI binding to the CUDA interface for programming NVIDIA GPUs"; license = self.stdenv.lib.licenses.bsd3; -- cgit 1.4.1 From 6a0c5a2da2e12ed28574aeac27cc44525ac755a5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Feb 2013 01:59:21 +0100 Subject: haskell-cuda: strip trailing whitespace --- pkgs/development/libraries/haskell/cuda/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix index d915904b05e1..a90efcdf4cab 100644 --- a/pkgs/development/libraries/haskell/cuda/default.nix +++ b/pkgs/development/libraries/haskell/cuda/default.nix @@ -13,9 +13,9 @@ cabal.mkDerivation (self: { # library. GHC's linker fails if the wrong version is found first. # We solve this by eliminating lib64 from the path on 32-bit # platforms and putting lib64 first on 64-bit platforms. - + libPaths = if self.stdenv.is64bit then "lib64 lib" else "lib"; - + configurePhase = '' for i in Setup.hs Setup.lhs; do test -f $i && ghc --make $i @@ -31,7 +31,7 @@ cabal.mkDerivation (self: { fi done done - + ./Setup configure --verbose --prefix="$out" $libraryProfiling $extraLibDirs $configureFlags ''; -- cgit 1.4.1 From 4417ffa2b50efd50fd79077dd924af7bc667eda9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Feb 2013 02:01:23 +0100 Subject: haskell-hledger-web: disable 'doCheck' to avoid test suite build failure tests/main.hs:12:8: Could not find module `HomeTest' Use -v to see a list of the files searched for. --- pkgs/development/libraries/haskell/hledger-web/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix index 4a2d7ef7a95a..c33026f5fd60 100644 --- a/pkgs/development/libraries/haskell/hledger-web/default.nix +++ b/pkgs/development/libraries/haskell/hledger-web/default.nix @@ -25,6 +25,7 @@ cabal.mkDerivation (self: { sed -r -i -e 's|blaze-html * >= 0.5 *&& < 0.6|blaze-html >= 0.5|' hledger-web.cabal ''; jailbreak = true; + doCheck = false; meta = { homepage = "http://hledger.org"; description = "A web interface for the hledger accounting tool"; -- cgit 1.4.1 From 958caa71082d1762501c02795c3ece75aaa94dbc Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Thu, 28 Feb 2013 14:06:23 +0100 Subject: webkit: finally fix (hopefully, but it builds for me) --- pkgs/development/libraries/webkit/bison26.patch | 515 ++++++++++++++++++++++++ pkgs/development/libraries/webkit/default.nix | 7 +- 2 files changed, 520 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/webkit/bison26.patch (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/webkit/bison26.patch b/pkgs/development/libraries/webkit/bison26.patch new file mode 100644 index 000000000000..95898adeb8a6 --- /dev/null +++ b/pkgs/development/libraries/webkit/bison26.patch @@ -0,0 +1,515 @@ +Index: /trunk/Source/WebCore/ChangeLog +=================================================================== +--- /trunk/Source/WebCore/ChangeLog (revision 124098) ++++ /trunk/Source/WebCore/ChangeLog (revision 124099) +@@ -1,2 +1,27 @@ ++2012-07-30 Alexis Menard ++ ++ Build fix with newer bison 2.6. ++ https://bugs.webkit.org/show_bug.cgi?id=92264 ++ ++ Reviewed by Adam Barth. ++ ++ As stated in http://www.gnu.org/software/bison/manual/html_node/Table-of-Symbols.html ++ YYLEX_PARAM and YYPARSE_PARAM are depecreated since version 1.875. So far all Mac OS ++ version I had access to as well as recent Linux runs at least version 2.3 so it's safe ++ to use the replacement of these deprecated macros in favor of %lex-param and %parse-param. ++ As announced http://lists.gnu.org/archive/html/info-gnu/2012-07/msg00011.html with the release ++ of version 2.6 YYLEX_PARAM and YYPARSE_PARAM are not supported anymore. ++ ++ No new tests : build fix and the patch should not trigger any regressions ++ ++ * css/CSSGrammar.y: ++ * css/CSSParser.cpp: ++ * xml/XPathGrammar.y: Refactored a bit to not use an intermediate PARSER define. ++ * xml/XPathParser.cpp: bison 2.6 declare xpathyyparse in the .h file now, i.e. XPathGrammar.h ++ therefore including this file within the namespace {} declarations leads to xpathyyparse being ++ defined part of WebCore::XPath namespaces but the actual implementation of xpathyyparse is in XPathGrammar.cpp ++ (generated) and not implemented within the WebCore::XPath so it lead to linking issues. Last, XPathGrammar.h needs ++ to be included after the other includes as it uses some XPath types. It breaks the style but CSSParser.cpp is doing the same. ++ + 2012-07-30 Sadrul Habib Chowdhury + +Index: /trunk/Source/WebCore/css/CSSParser.cpp +=================================================================== +--- /trunk/Source/WebCore/css/CSSParser.cpp (revision 124098) ++++ /trunk/Source/WebCore/css/CSSParser.cpp (revision 124099) +@@ -115,5 +115,5 @@ + #endif + +-extern int cssyyparse(void* parser); ++extern int cssyyparse(WebCore::CSSParser*); + + using namespace std; +Index: /trunk/Source/WebCore/css/CSSGrammar.y +=================================================================== +--- /trunk/Source/WebCore/css/CSSGrammar.y (revision 124098) ++++ /trunk/Source/WebCore/css/CSSGrammar.y (revision 124099) +@@ -54,11 +54,10 @@ + #define YYDEBUG 0 + +-// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x +-#define YYPARSE_PARAM parser +-#define YYLEX_PARAM parser +- + %} + + %pure_parser ++ ++%parse-param { CSSParser* parser } ++%lex-param { CSSParser* parser } + + %union { +@@ -90,5 +89,5 @@ + %{ + +-static inline int cssyyerror(const char*) ++static inline int cssyyerror(void*, const char*) + { + return 1; +Index: /trunk/Source/WebCore/xml/XPathParser.cpp +=================================================================== +--- /trunk/Source/WebCore/xml/XPathParser.cpp (revision 124098) ++++ /trunk/Source/WebCore/xml/XPathParser.cpp (revision 124099) +@@ -33,22 +33,19 @@ + #include "XPathException.h" + #include "XPathNSResolver.h" ++#include "XPathPath.h" + #include "XPathStep.h" + #include + #include + +-int xpathyyparse(void*); +- ++using namespace WebCore; + using namespace WTF; + using namespace Unicode; +- +-namespace WebCore { +-namespace XPath { +- +-class LocationPath; +- +-#include "XPathGrammar.h" ++using namespace XPath; ++ ++extern int xpathyyparse(WebCore::XPath::Parser*); ++#include "XPathGrammar.h" + + Parser* Parser::currentParser = 0; +- ++ + enum XMLCat { NameStart, NameCont, NotPartOfName }; + +@@ -631,4 +628,2 @@ + } + +-} +-} +Index: /trunk/Source/WebCore/xml/XPathGrammar.y +=================================================================== +--- /trunk/Source/WebCore/xml/XPathGrammar.y (revision 124098) ++++ /trunk/Source/WebCore/xml/XPathGrammar.y (revision 124099) +@@ -35,4 +35,5 @@ + #include "XPathPath.h" + #include "XPathPredicate.h" ++#include "XPathStep.h" + #include "XPathVariableReference.h" + #include +@@ -45,6 +46,4 @@ + #define YYDEBUG 0 + #define YYMAXDEPTH 10000 +-#define YYPARSE_PARAM parserParameter +-#define PARSER static_cast(parserParameter) + + using namespace WebCore; +@@ -54,4 +53,5 @@ + + %pure_parser ++%parse-param { WebCore::XPath::Parser* parser } + + %union +@@ -72,5 +72,5 @@ + + static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); } +-static void xpathyyerror(const char*) { } ++static void xpathyyerror(void*, const char*) { } + + %} +@@ -119,5 +119,5 @@ + OrExpr + { +- PARSER->m_topExpr = $1; ++ parser->m_topExpr = $1; + } + ; +@@ -139,5 +139,5 @@ + { + $$ = new LocationPath; +- PARSER->registerParseNode($$); ++ parser->registerParseNode($$); + } + | +@@ -151,5 +151,5 @@ + $$ = $2; + $$->insertFirstStep($1); +- PARSER->unregisterParseNode($1); ++ parser->unregisterParseNode($1); + } + ; +@@ -160,6 +160,6 @@ + $$ = new LocationPath; + $$->appendStep($1); +- PARSER->unregisterParseNode($1); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->registerParseNode($$); + } + | +@@ -167,5 +167,5 @@ + { + $$->appendStep($3); +- PARSER->unregisterParseNode($3); ++ parser->unregisterParseNode($3); + } + | +@@ -174,6 +174,6 @@ + $$->appendStep($2); + $$->appendStep($3); +- PARSER->unregisterParseNode($2); +- PARSER->unregisterParseNode($3); ++ parser->unregisterParseNode($2); ++ parser->unregisterParseNode($3); + } + ; +@@ -184,9 +184,9 @@ + if ($2) { + $$ = new Step(Step::ChildAxis, *$1, *$2); +- PARSER->deletePredicateVector($2); ++ parser->deletePredicateVector($2); + } else + $$ = new Step(Step::ChildAxis, *$1); +- PARSER->deleteNodeTest($1); +- PARSER->registerParseNode($$); ++ parser->deleteNodeTest($1); ++ parser->registerParseNode($$); + } + | +@@ -195,6 +195,6 @@ + String localName; + String namespaceURI; +- if (!PARSER->expandQName(*$1, localName, namespaceURI)) { +- PARSER->m_gotNamespaceError = true; ++ if (!parser->expandQName(*$1, localName, namespaceURI)) { ++ parser->m_gotNamespaceError = true; + YYABORT; + } +@@ -202,9 +202,9 @@ + if ($2) { + $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2); +- PARSER->deletePredicateVector($2); ++ parser->deletePredicateVector($2); + } else + $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); +- PARSER->deleteString($1); +- PARSER->registerParseNode($$); ++ parser->deleteString($1); ++ parser->registerParseNode($$); + } + | +@@ -213,9 +213,9 @@ + if ($3) { + $$ = new Step($1, *$2, *$3); +- PARSER->deletePredicateVector($3); ++ parser->deletePredicateVector($3); + } else + $$ = new Step($1, *$2); +- PARSER->deleteNodeTest($2); +- PARSER->registerParseNode($$); ++ parser->deleteNodeTest($2); ++ parser->registerParseNode($$); + } + | +@@ -224,6 +224,6 @@ + String localName; + String namespaceURI; +- if (!PARSER->expandQName(*$2, localName, namespaceURI)) { +- PARSER->m_gotNamespaceError = true; ++ if (!parser->expandQName(*$2, localName, namespaceURI)) { ++ parser->m_gotNamespaceError = true; + YYABORT; + } +@@ -231,9 +231,9 @@ + if ($3) { + $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3); +- PARSER->deletePredicateVector($3); ++ parser->deletePredicateVector($3); + } else + $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI)); +- PARSER->deleteString($2); +- PARSER->registerParseNode($$); ++ parser->deleteString($2); ++ parser->registerParseNode($$); + } + | +@@ -260,6 +260,6 @@ + $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest); + +- PARSER->deleteString($1); +- PARSER->registerNodeTest($$); ++ parser->deleteString($1); ++ parser->registerNodeTest($$); + } + | +@@ -267,6 +267,6 @@ + { + $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest); +- PARSER->deleteString($1); +- PARSER->registerNodeTest($$); ++ parser->deleteString($1); ++ parser->registerNodeTest($$); + } + | +@@ -274,7 +274,7 @@ + { + $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace()); +- PARSER->deleteString($1); +- PARSER->deleteString($3); +- PARSER->registerNodeTest($$); ++ parser->deleteString($1); ++ parser->deleteString($3); ++ parser->registerNodeTest($$); + } + ; +@@ -294,6 +294,6 @@ + $$ = new Vector; + $$->append(new Predicate($1)); +- PARSER->unregisterParseNode($1); +- PARSER->registerPredicateVector($$); ++ parser->unregisterParseNode($1); ++ parser->registerPredicateVector($$); + } + | +@@ -301,5 +301,5 @@ + { + $$->append(new Predicate($2)); +- PARSER->unregisterParseNode($2); ++ parser->unregisterParseNode($2); + } + ; +@@ -316,5 +316,5 @@ + { + $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); +- PARSER->registerParseNode($$); ++ parser->registerParseNode($$); + } + ; +@@ -324,5 +324,5 @@ + { + $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); +- PARSER->registerParseNode($$); ++ parser->registerParseNode($$); + } + | +@@ -330,5 +330,5 @@ + { + $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest)); +- PARSER->registerParseNode($$); ++ parser->registerParseNode($$); + } + ; +@@ -338,6 +338,6 @@ + { + $$ = new VariableReference(*$1); +- PARSER->deleteString($1); +- PARSER->registerParseNode($$); ++ parser->deleteString($1); ++ parser->registerParseNode($$); + } + | +@@ -350,6 +350,6 @@ + { + $$ = new StringExpression(*$1); +- PARSER->deleteString($1); +- PARSER->registerParseNode($$); ++ parser->deleteString($1); ++ parser->registerParseNode($$); + } + | +@@ -357,6 +357,6 @@ + { + $$ = new Number($1->toDouble()); +- PARSER->deleteString($1); +- PARSER->registerParseNode($$); ++ parser->deleteString($1); ++ parser->registerParseNode($$); + } + | +@@ -370,6 +370,6 @@ + if (!$$) + YYABORT; +- PARSER->deleteString($1); +- PARSER->registerParseNode($$); ++ parser->deleteString($1); ++ parser->registerParseNode($$); + } + | +@@ -379,7 +379,7 @@ + if (!$$) + YYABORT; +- PARSER->deleteString($1); +- PARSER->deleteExpressionVector($3); +- PARSER->registerParseNode($$); ++ parser->deleteString($1); ++ parser->deleteExpressionVector($3); ++ parser->registerParseNode($$); + } + ; +@@ -390,6 +390,6 @@ + $$ = new Vector; + $$->append($1); +- PARSER->unregisterParseNode($1); +- PARSER->registerExpressionVector($$); ++ parser->unregisterParseNode($1); ++ parser->registerExpressionVector($$); + } + | +@@ -397,5 +397,5 @@ + { + $$->append($3); +- PARSER->unregisterParseNode($3); ++ parser->unregisterParseNode($3); + } + ; +@@ -413,7 +413,7 @@ + $$->addSubExpression($1); + $$->addSubExpression($3); +- PARSER->unregisterParseNode($1); +- PARSER->unregisterParseNode($3); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->unregisterParseNode($3); ++ parser->registerParseNode($$); + } + ; +@@ -431,7 +431,7 @@ + $3->setAbsolute(true); + $$ = new Path(static_cast($1), $3); +- PARSER->unregisterParseNode($1); +- PARSER->unregisterParseNode($3); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->unregisterParseNode($3); ++ parser->registerParseNode($$); + } + | +@@ -441,8 +441,8 @@ + $3->setAbsolute(true); + $$ = new Path(static_cast($1), $3); +- PARSER->unregisterParseNode($1); +- PARSER->unregisterParseNode($2); +- PARSER->unregisterParseNode($3); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->unregisterParseNode($2); ++ parser->unregisterParseNode($3); ++ parser->registerParseNode($$); + } + ; +@@ -454,7 +454,7 @@ + { + $$ = new Filter($1, *$2); +- PARSER->unregisterParseNode($1); +- PARSER->deletePredicateVector($2); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->deletePredicateVector($2); ++ parser->registerParseNode($$); + } + ; +@@ -466,7 +466,7 @@ + { + $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3); +- PARSER->unregisterParseNode($1); +- PARSER->unregisterParseNode($3); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->unregisterParseNode($3); ++ parser->registerParseNode($$); + } + ; +@@ -478,7 +478,7 @@ + { + $$ = new LogicalOp(LogicalOp::OP_And, $1, $3); +- PARSER->unregisterParseNode($1); +- PARSER->unregisterParseNode($3); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->unregisterParseNode($3); ++ parser->registerParseNode($$); + } + ; +@@ -490,7 +490,7 @@ + { + $$ = new EqTestOp($2, $1, $3); +- PARSER->unregisterParseNode($1); +- PARSER->unregisterParseNode($3); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->unregisterParseNode($3); ++ parser->registerParseNode($$); + } + ; +@@ -502,7 +502,7 @@ + { + $$ = new EqTestOp($2, $1, $3); +- PARSER->unregisterParseNode($1); +- PARSER->unregisterParseNode($3); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->unregisterParseNode($3); ++ parser->registerParseNode($$); + } + ; +@@ -514,7 +514,7 @@ + { + $$ = new NumericOp(NumericOp::OP_Add, $1, $3); +- PARSER->unregisterParseNode($1); +- PARSER->unregisterParseNode($3); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->unregisterParseNode($3); ++ parser->registerParseNode($$); + } + | +@@ -522,7 +522,7 @@ + { + $$ = new NumericOp(NumericOp::OP_Sub, $1, $3); +- PARSER->unregisterParseNode($1); +- PARSER->unregisterParseNode($3); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->unregisterParseNode($3); ++ parser->registerParseNode($$); + } + ; +@@ -534,7 +534,7 @@ + { + $$ = new NumericOp($2, $1, $3); +- PARSER->unregisterParseNode($1); +- PARSER->unregisterParseNode($3); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($1); ++ parser->unregisterParseNode($3); ++ parser->registerParseNode($$); + } + ; +@@ -547,6 +547,6 @@ + $$ = new Negative; + $$->addSubExpression($2); +- PARSER->unregisterParseNode($2); +- PARSER->registerParseNode($$); ++ parser->unregisterParseNode($2); ++ parser->registerParseNode($$); + } + ; diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix index 1ba90e67d85f..47bdcabd5146 100644 --- a/pkgs/development/libraries/webkit/default.nix +++ b/pkgs/development/libraries/webkit/default.nix @@ -1,6 +1,6 @@ args : with args; let - s = import ./src-for-default.nix; + s = import ./src-for-default.nix; # 1.10 needs newer gtk3, wait for x-updates version = lib.attrByPath ["version"] s.version args; in rec { @@ -54,13 +54,16 @@ rec { ]; /* doConfigure should be specified separately */ - phaseNames = ["setVars" "fixConfigure" /* "paranoidFixComments" */ "doConfigure" (doPatchShebangs ".") + phaseNames = ["setVars" "doPatch" "fixConfigure" /* "paranoidFixComments" */ "doConfigure" (doPatchShebangs ".") "doReplaceUsrBin" "doMakeInstall" "doAddPrograms"]; setVars = fullDepEntry ('' export NIX_LDFLAGS="$NIX_LDFLAGS -lXt" '') ["minInit"]; + patches = [ ./bison26.patch ]; # http://trac.webkit.org/changeset/124099 + patchFlags = "-p2"; + doReplaceUsrBin = fullDepEntry ('' for i in $(find . -name '*.pl') $(find . -name '*.pm'); do sed -e 's@/usr/bin/gcc@gcc@' -i $i -- cgit 1.4.1 From 16ba3d388aeee918d16b8c1293f108218f1c898f Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Thu, 28 Feb 2013 14:23:20 +0100 Subject: glibmm: fix buildNativeInputs --- pkgs/development/libraries/glibmm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 05efa2757568..962b14bc7888 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1i4jsvahva2q0mig7kjnpsw0r3fnpybm8b6hzymfm2hpgqnaa9dl"; }; - buildNativeInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib gdk_pixbuf libsigcxx ]; meta = { -- cgit 1.4.1 From face3a8242ab6c5a9ebea210069dfc7d66fa347d Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 2 Mar 2013 15:45:13 +0100 Subject: librdf: update the libraries --- pkgs/development/libraries/librdf/default.nix | 28 +++++++++++++++++++-------- pkgs/development/libraries/librdf/raptor2.nix | 6 +++--- pkgs/development/libraries/librdf/rasqal.nix | 8 ++++---- pkgs/development/libraries/librdf/redland.nix | 4 ++-- 4 files changed, 29 insertions(+), 17 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/librdf/default.nix b/pkgs/development/libraries/librdf/default.nix index 1f3e5b409378..21c952b7fb89 100644 --- a/pkgs/development/libraries/librdf/default.nix +++ b/pkgs/development/libraries/librdf/default.nix @@ -1,18 +1,30 @@ -{ stdenv, fetchurl, pkgconfig, librdf_raptor, ladspaH, openssl, zlib }: +{ stdenv, fetchurl, pkgconfig, libtool, automake, autoconf +, librdf_raptor, librdf_raptor2, ladspaH, openssl, zlib #, swh_lv2 +}: -stdenv.mkDerivation { - name = "liblrdf-0.4.0"; +stdenv.mkDerivation rec { + version = "0.5.0"; + name = "liblrdf-${version}"; src = fetchurl { - url = mirror://sourceforge/lrdf/liblrdf/0.4.0/liblrdf-0.4.0.tar.gz; - sha256 = "015jv7pp0a0qxgljgdvf7d01nj4fx0zgzg0wayjp7v86pa38xscm"; + url = "http://github.com/swh/LRDF/archive/${version}.tar.gz"; + sha256 = "18p2flb2sv2hq6w2qkd29z9c7knnwqr3f12i2srshlzx6vwkm05s"; }; - buildInputs = [ pkgconfig ladspaH openssl zlib ]; + postPatch = "sed -i -e 's:usr/local:usr:' examples/{instances,remove}_test.c"; - propagatedBuildInputs = [ librdf_raptor ]; + preConfigure = "rm m4/* && autoreconf -if"; - meta = { + buildInputs = [ + pkgconfig libtool automake autoconf ladspaH openssl zlib /*swh_lv2*/ + #librdf_raptor + ]; + + propagatedBuildInputs = [ librdf_raptor2 ]; + + #doCheck = true; # would need swh_lv2 and some path patching + + meta = { description = "A lightweight RDF library with special support for LADSPA plugins."; homepage = http://sourceforge.net/projects/lrdf/; license = "GPLv2"; diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix index 2f956630fa12..4658cf283353 100644 --- a/pkgs/development/libraries/librdf/raptor2.nix +++ b/pkgs/development/libraries/librdf/raptor2.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, libxml2, libxslt, curl }: stdenv.mkDerivation rec { - name = "raptor2-2.0.4"; + name = "raptor2-2.0.8"; # 2.0.9 misses a header and so fails liblrdf src = fetchurl { url = "http://download.librdf.org/source/${name}.tar.gz"; - sha256 = "0viaam60adhsxim2vaq5xs1pfmm6wiidxpkrhwyl7x9mz8x9vx1l"; + sha256 = "1mz7cxnfw73saf74c9if06n2mlsvn2rnn67vy7j2mq3wkhy0hcb0"; }; buildInputs = [ libxml2 libxslt ]; postInstall = "rm -rvf $out/share/gtk-doc"; - meta = { + meta = { description = "The RDF Parser Toolkit"; homepage = "http://librdf.org/raptor"; license = "LGPL-2.1 Apache-2.0"; diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix index 9b65487ccfb2..6d6f9d058081 100644 --- a/pkgs/development/libraries/librdf/rasqal.nix +++ b/pkgs/development/libraries/librdf/rasqal.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, librdf_raptor2, gmp, pkgconfig, pcre, libxml2 }: stdenv.mkDerivation rec { - name = "rasqal-0.9.26"; + name = "rasqal-0.9.30"; src = fetchurl { url = "http://download.librdf.org/source/${name}.tar.gz"; - sha256 = "1drjcy1k9g72iis0ghllzn7n0w03bahhrd2p5hs39anbm6mr0yk9"; + sha256 = "1z8wifq79kivcwpwzmjnjdrbr65zam190gpxhgrvsyfch0yykw5b"; }; nativeBuildInputs = [ pkgconfig ]; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ librdf_raptor2 ]; postInstall = "rm -rvf $out/share/gtk-doc"; - - meta = { + + meta = { description = "Library that handles Resource Description Framework (RDF)"; homepage = "http://librdf.org/rasqal"; license = "LGPL-2.1 Apache-2.0"; diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix index 47e25877be9f..26b3de70dcdc 100644 --- a/pkgs/development/libraries/librdf/redland.nix +++ b/pkgs/development/libraries/librdf/redland.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation rec { - name = "redland-1.0.14"; + name = "redland-1.0.16"; src = fetchurl { url = "http://download.librdf.org/source/${name}.tar.gz"; - sha256 = "1i460q9gslb7l75hjwc6w2kp2wk7fgp8lr7phamg33c6j013y30k"; + sha256 = "1gcx0h5dxa3c4xhhjk3gr0708zjj0n6zpslvbjfi2qbf13y798nr"; }; nativeBuildInputs = [ perl pkgconfig ]; -- cgit 1.4.1 From 4c74dea53780f678610ca829f19472a4ce4e53c0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Mar 2013 10:54:13 +0100 Subject: haskell-OpenAL: update to version 1.4.0.2 --- pkgs/development/libraries/haskell/OpenAL/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/OpenAL/default.nix b/pkgs/development/libraries/haskell/OpenAL/default.nix index 206e78eb728b..a04aea993fa2 100644 --- a/pkgs/development/libraries/haskell/OpenAL/default.nix +++ b/pkgs/development/libraries/haskell/OpenAL/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "OpenAL"; - version = "1.4.0.1"; - sha256 = "180f84sjakhd1b8h5n3l92by2wmic20n6ax0z5fi3fvk9w73khyv"; + version = "1.4.0.2"; + sha256 = "19q4pd5i2w330qh895z0cgim4m4f4gxqf4ya1192fchqmgcz1svz"; buildDepends = [ ObjectName StateVar Tensor ]; extraLibraries = [ openal ]; meta = { -- cgit 1.4.1 From 34d77b360f4699898a369b00f673570c43986447 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Mar 2013 10:54:13 +0100 Subject: haskell-basic-prelude: update to version 0.3.4.0 --- pkgs/development/libraries/haskell/basic-prelude/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/basic-prelude/default.nix b/pkgs/development/libraries/haskell/basic-prelude/default.nix index 77f37cfe5af1..04f3842be41b 100644 --- a/pkgs/development/libraries/haskell/basic-prelude/default.nix +++ b/pkgs/development/libraries/haskell/basic-prelude/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "basic-prelude"; - version = "0.3.3.0"; - sha256 = "1b3fydswi7sj2j5d3jfynd9r5qg8pzlv1qdb9xp56ig01ig18cyv"; + version = "0.3.4.0"; + sha256 = "0layc06df7df4mf4zafj87c4klsvkxbhi69dkv4ag9fkzvs62sz6"; buildDepends = [ hashable liftedBase ReadArgs systemFilepath text transformers unorderedContainers vector -- cgit 1.4.1 From 8142c2628c65d6fbf66d87e3148bac2603bf2ad4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Mar 2013 10:54:13 +0100 Subject: haskell-bifunctors: update to version 3.2.0.1 --- pkgs/development/libraries/haskell/bifunctors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/bifunctors/default.nix b/pkgs/development/libraries/haskell/bifunctors/default.nix index 09287600323d..c659c3bc3bea 100644 --- a/pkgs/development/libraries/haskell/bifunctors/default.nix +++ b/pkgs/development/libraries/haskell/bifunctors/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "bifunctors"; - version = "3.2"; - sha256 = "03bszf1127iw5kimjbag5gmgzz7h2qzcd9f7jb53jpiadfhjfx0a"; + version = "3.2.0.1"; + sha256 = "1biicx0zi48wzzi7vkhzvrdyk59hmmm1bqbsga6x5nbrbf3qrkm6"; buildDepends = [ semigroupoids semigroups tagged ]; meta = { homepage = "http://github.com/ekmett/bifunctors/"; -- cgit 1.4.1 From 87293bb052d57f341ff1a687fcca3341bda008a2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Mar 2013 10:54:13 +0100 Subject: haskell-binary: update to version 0.7.0.1 --- pkgs/development/libraries/haskell/binary/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/binary/default.nix b/pkgs/development/libraries/haskell/binary/default.nix index b4f205e41b21..6273a099f739 100644 --- a/pkgs/development/libraries/haskell/binary/default.nix +++ b/pkgs/development/libraries/haskell/binary/default.nix @@ -1,13 +1,14 @@ -{ cabal, QuickCheck, random, testFramework +{ cabal, Cabal, filepath, HUnit, QuickCheck, random, testFramework , testFrameworkQuickcheck2 }: cabal.mkDerivation (self: { pname = "binary"; - version = "0.6.4.0"; - sha256 = "0vq80fzhwil5bx4a2vbd3jvfh1awhg1pwxgvq3lvbi37yzl0ydgh"; + version = "0.7.0.1"; + sha256 = "16srrp0qx9hsr7820b2q3sp9wp8y8sxxi8rvsh63n48w4l3canxq"; testDepends = [ - QuickCheck random testFramework testFrameworkQuickcheck2 + Cabal filepath HUnit QuickCheck random testFramework + testFrameworkQuickcheck2 ]; meta = { homepage = "https://github.com/kolmodin/binary"; -- cgit 1.4.1 From bacce8cd251d5fbe1f7ff32372889bc0c1f93ba5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Mar 2013 10:54:13 +0100 Subject: haskell-classy-prelude-conduit: update to version 0.5.3 --- pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix index 44e27aa1bc33..c04b4dfc25e1 100644 --- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude-conduit"; - version = "0.5.2"; - sha256 = "11krzhy78z0srjy5g6h8ssv5n3ml8ryx92x0zdjigqxw4zq9ic72"; + version = "0.5.3"; + sha256 = "1rmx439kdjipyz2s3v2s1xv1mb55kb4njl9k6f8mfhykgac39rhz"; buildDepends = [ classyPrelude conduit monadControl resourcet transformers void xmlConduit -- cgit 1.4.1 From 0c702f033b3bca32ac92d740d064e6793526d80d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Mar 2013 10:54:13 +0100 Subject: haskell-classy-prelude: update to version 0.5.3 --- pkgs/development/libraries/haskell/classy-prelude/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix index 48b6bc583695..4d0f5441e414 100644 --- a/pkgs/development/libraries/haskell/classy-prelude/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude"; - version = "0.5.2"; - sha256 = "1nmhx6fs783v67b5ygdlmpxbsj41brj32i1sx9gyjyhfvr40wiw5"; + version = "0.5.3"; + sha256 = "0xlhdxkxvrzj9y8wdl2f1pz94zz2gfa9vfbia9prhr7skirxvsad"; buildDepends = [ basicPrelude hashable liftedBase systemFilepath text transformers unorderedContainers vector -- cgit 1.4.1 From d790e95a915511ce88dbe82724b497257a300a6e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Mar 2013 10:54:14 +0100 Subject: haskell-conduit: update to version 1.0.2 --- pkgs/development/libraries/haskell/conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 75260bcb1b39..21f81ee038ce 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "1.0.1"; - sha256 = "1r3d30cap4f7qxi9v2ab5w31w9ay19z848d4l8klf1np9xs27hki"; + version = "1.0.2"; + sha256 = "03hyryljvkbgyvwx63qrkvf2wm1qm8640rsm8yb4mahgzp4r130f"; buildDepends = [ liftedBase monadControl resourcet text transformers transformersBase void -- cgit 1.4.1 From 2d02edaf51a837313ad764946532b8df50234ab5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Mar 2013 10:54:14 +0100 Subject: haskell-persistent-sqlite: update to version 1.1.5 --- pkgs/development/libraries/haskell/persistent-sqlite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix index 066d1dd2ebe8..947f75342d45 100644 --- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix +++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "persistent-sqlite"; - version = "1.1.4.1"; - sha256 = "0rhvbbzlzgzx4na7ffa2jx2zinzbb6b1jxf8964hcxx7iyzcycjj"; + version = "1.1.5"; + sha256 = "1kqxp0qsvxfz352yg9k1wgb2nfm7kcz8xdj9q537ilh99wxkp6cl"; buildDepends = [ aeson conduit monadControl monadLogger persistent text transformers ]; -- cgit 1.4.1 From d0e81f3d727a5d503d2ab86f41acb498c2e83301 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Mar 2013 10:54:14 +0100 Subject: haskell-resourcet: update to version 0.4.5 --- pkgs/development/libraries/haskell/resourcet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index 35b7fec32765..f0dde62ef979 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "resourcet"; - version = "0.4.4"; - sha256 = "0ad1hl7bl9qid4brchb95gvnylfchmxncgdvgljb5lci7gy9r31z"; + version = "0.4.5"; + sha256 = "1i2n0y4ridlzi2fn319f8jg1whb10gajgyvbz0rx2mwxj15bbgni"; buildDepends = [ liftedBase monadControl mtl transformers transformersBase ]; -- cgit 1.4.1 From 4121fad56abf45c7f53e23303c146958d5155d3c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Mar 2013 10:54:14 +0100 Subject: haskell-shakespeare-js: update to version 1.1.2.1 --- pkgs/development/libraries/haskell/shakespeare-js/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index 55bf276d1f82..7f00530a7f94 100644 --- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-js"; - version = "1.1.2"; - sha256 = "0iwajn0d0yngzp10j9qbb2gpq1g7r390yqd7pj5dri35rjc6mr8n"; + version = "1.1.2.1"; + sha256 = "049nn0p236wbm2majkih87n2c7h65xrnf6gydsi7najxccjl7y8z"; buildDepends = [ aeson shakespeare text ]; testDepends = [ aeson hspec HUnit shakespeare text ]; meta = { -- cgit 1.4.1 From 39d83523a2158868b569c6ad651303093cdcb99c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Mar 2013 10:54:14 +0100 Subject: haskell-th-extras: update to version 0.0.0.2 --- pkgs/development/libraries/haskell/th-extras/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/th-extras/default.nix b/pkgs/development/libraries/haskell/th-extras/default.nix index be78bbaef31d..3475ccb804a0 100644 --- a/pkgs/development/libraries/haskell/th-extras/default.nix +++ b/pkgs/development/libraries/haskell/th-extras/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "th-extras"; - version = "0.0.0.1"; - sha256 = "13d9fs48z87inma3kg9b7lfjp3h8j85fav6awd1zj3i2nl214hff"; + version = "0.0.0.2"; + sha256 = "15sqf2jjnqcssq8hp80fk0ysgwqykjjc31gvvmzg4sypskpjs8cl"; buildDepends = [ syb ]; meta = { homepage = "https://github.com/mokus0/th-extras"; - description = "A grab bag of useful functions for use with Template Haskell"; + description = "A grab bag of functions for use with Template Haskell"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; -- cgit 1.4.1 From bd966fa58362e2b6d6078f96180d7d7ac5b91fd9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Mar 2013 10:54:14 +0100 Subject: haskell-xml-conduit: update to version 1.1.0.3 --- pkgs/development/libraries/haskell/xml-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index 7ebc0b003e55..b586a6336bca 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "xml-conduit"; - version = "1.1.0.2"; - sha256 = "17wv4rngmn8jvg6c3ia48w5q9s9dww9aisrmans9llqs7ks3ndqc"; + version = "1.1.0.3"; + sha256 = "04mnn6j9bbkhvav04gl9cbd4rldl7bwgcapvykwvf2p3nb3d7bi4"; buildDepends = [ attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit blazeHtml blazeMarkup conduit dataDefault failure monadControl -- cgit 1.4.1 From f058026b11a5813a4d702dc24f81f910e469a48c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Mar 2013 10:54:14 +0100 Subject: haskell-yaml: update to version 0.8.2.3 --- pkgs/development/libraries/haskell/yaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index f1cbb7ee7b8b..2c2f39451e6b 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "yaml"; - version = "0.8.2.1"; - sha256 = "1p0hi9psm42bsmm14gfdkj4wrbcgzkishcih6rwc2bcvn2i0hyyw"; + version = "0.8.2.3"; + sha256 = "1ds6969gbkxgkm2fha0ifmssjl7by9glgix165v0h8i7fx9wx3wa"; buildDepends = [ aeson attoparsec conduit resourcet text transformers unorderedContainers vector -- cgit 1.4.1 From 3bf5b4d930fb3fed27d117d0addeacf8f0125681 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Mar 2013 10:54:14 +0100 Subject: haskell-yesod-test: update to version 0.3.5 --- pkgs/development/libraries/haskell/yesod-test/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix index a47d109ace5a..8b32b48af873 100644 --- a/pkgs/development/libraries/haskell/yesod-test/default.nix +++ b/pkgs/development/libraries/haskell/yesod-test/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-test"; - version = "0.3.4"; - sha256 = "18sz1blnrgijcq6psqk2b5zxbizpgam1cy1vcxc4nrfryfscr42b"; + version = "0.3.5"; + sha256 = "095hwl1dm4mk467la68x3lilj0c056603kl0nn8ra4glcr86273j"; buildDepends = [ attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive cookie hspec htmlConduit httpTypes HUnit monadControl network -- cgit 1.4.1 From c150b8c3d2d0dab895b3efdd96eada7a12cd20d3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Mar 2013 10:54:14 +0100 Subject: haskell-yesod: update to version 1.1.9.2 --- pkgs/development/libraries/haskell/yesod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index e51ca16aa4fb..9998790ea739 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -12,8 +12,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.1.9.1"; - sha256 = "0kysj3akf2pvhsiy6f8yfs41mrya86b8ddskqzzibjmdyipiqksj"; + version = "1.1.9.2"; + sha256 = "1rv9mk842b9qwdzal9y5cn2z5z2rl6490600jg1xbsg0x0nl7hdj"; isLibrary = true; isExecutable = true; buildDepends = [ -- cgit 1.4.1 From 4d4b045d9564e68fe8a541ada7e11ffd2219a173 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 26 Jan 2013 16:20:25 +0100 Subject: ffmpeg: remove unused 1.0 version --- pkgs/development/libraries/ffmpeg/1.0.nix | 85 ------------------------------- pkgs/top-level/all-packages.nix | 4 -- pkgs/top-level/release-python.nix | 2 +- 3 files changed, 1 insertion(+), 90 deletions(-) delete mode 100644 pkgs/development/libraries/ffmpeg/1.0.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/ffmpeg/1.0.nix b/pkgs/development/libraries/ffmpeg/1.0.nix deleted file mode 100644 index d703fd8e3697..000000000000 --- a/pkgs/development/libraries/ffmpeg/1.0.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib -, mp3Support ? true, lame ? null -, speexSupport ? true, speex ? null -, theoraSupport ? true, libtheora ? null -, vorbisSupport ? true, libvorbis ? null -, vpxSupport ? false, libvpx ? null -, x264Support ? true, x264 ? null -, xvidSupport ? true, xvidcore ? null -, vdpauSupport ? true, libvdpau ? null -, faacSupport ? false, faac ? null -, dc1394Support ? false, libdc1394 ? null -, x11grabSupport ? false, libXext ? null, libXfixes ? null -}: - -assert speexSupport -> speex != null; -assert theoraSupport -> libtheora != null; -assert vorbisSupport -> libvorbis != null; -assert vpxSupport -> libvpx != null; -assert x264Support -> x264 != null; -assert xvidSupport -> xvidcore != null; -assert vdpauSupport -> libvdpau != null; -assert faacSupport -> faac != null; -assert x11grabSupport -> libXext != null && libXfixes != null; - -stdenv.mkDerivation rec { - name = "ffmpeg-1.0"; - - src = fetchurl { - url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "1jbi85z2zkk3fh09l9f1s70kpvsz8706ay4lsw75395q8vic70hd"; - }; - - # `--enable-gpl' (as well as the `postproc' and `swscale') mean that - # the resulting library is GPL'ed, so it can only be used in GPL'ed - # applications. - configureFlags = [ - "--enable-gpl" - "--enable-postproc" - "--enable-swscale" - "--disable-ffplay" - "--enable-shared" - "--enable-runtime-cpudetect" - ] - ++ stdenv.lib.optional mp3Support "--enable-libmp3lame" - ++ stdenv.lib.optional speexSupport "--enable-libspeex" - ++ stdenv.lib.optional theoraSupport "--enable-libtheora" - ++ stdenv.lib.optional vorbisSupport "--enable-libvorbis" - ++ stdenv.lib.optional vpxSupport "--enable-libvpx" - ++ stdenv.lib.optional x264Support "--enable-libx264" - ++ stdenv.lib.optional xvidSupport "--enable-libxvid" - ++ stdenv.lib.optional vdpauSupport "--enable-vdpau" - ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree" - ++ stdenv.lib.optional dc1394Support "--enable-libdc1394" - ++ stdenv.lib.optional x11grabSupport "--enable-x11grab"; - - buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib ] - ++ stdenv.lib.optional mp3Support lame - ++ stdenv.lib.optional speexSupport speex - ++ stdenv.lib.optional theoraSupport libtheora - ++ stdenv.lib.optional vorbisSupport libvorbis - ++ stdenv.lib.optional vpxSupport libvpx - ++ stdenv.lib.optional x264Support x264 - ++ stdenv.lib.optional xvidSupport xvidcore - ++ stdenv.lib.optional vdpauSupport libvdpau - ++ stdenv.lib.optional faacSupport faac - ++ stdenv.lib.optional dc1394Support libdc1394 - ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ]; - - enableParallelBuilding = true; - - crossAttrs = { - dontSetConfigureCross = true; - configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cross.config}-" - "--enable-cross-compile" - "--target_os=linux" - "--arch=${stdenv.cross.arch}" - ]; - }; - - meta = { - homepage = http://www.ffmpeg.org/; - description = "A complete, cross-platform solution to record, convert and stream audio and video"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70c4c079f3a8..bfab97ff543e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3648,10 +3648,6 @@ let vpxSupport = !stdenv.isMips; }; - ffmpeg_1_0 = callPackage ../development/libraries/ffmpeg/1.0.nix { - vpxSupport = !stdenv.isMips; - }; - ffmpeg_1_1 = callPackage ../development/libraries/ffmpeg/1.1.nix { vpxSupport = !stdenv.isMips; }; diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 7d98a51cab51..24bb64cb8f8a 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -335,7 +335,7 @@ in ffado = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; ffmpeg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; ffmpeg_0_6_90 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ffmpeg_1_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ffmpeg_1_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; fileschanged = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; fio = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; firefox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; -- cgit 1.4.1 From ec732e5ec12dc4b71b1bee7a085ebfb5fb558e8d Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 3 Mar 2013 17:13:56 +0100 Subject: Revert "haskell-HSH: update to version 2.1.0" This reverts commit 4b3cd9711adfea09c75131c82c01af2768567f4e. --- pkgs/development/libraries/haskell/HSH/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/HSH/default.nix b/pkgs/development/libraries/haskell/HSH/default.nix index f80f74a3dc2b..40620901839d 100644 --- a/pkgs/development/libraries/haskell/HSH/default.nix +++ b/pkgs/development/libraries/haskell/HSH/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "HSH"; - version = "2.1.0"; - sha256 = "0gz2hzdvf0gqv33jihn67bvry38c6hkjapb1prxmb3w12lisr4l5"; + version = "2.0.4"; + sha256 = "1ddpazmk82716hqd1riqs7vnl4aildgwkjgk80iam49df9p5b8v8"; isLibrary = true; isExecutable = true; buildDepends = [ -- cgit 1.4.1 From e17ac44037a2a66b8c162db45914e750862b190a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Mar 2013 11:06:00 +0100 Subject: haskell-HSH: update to version 2.1.0 --- pkgs/development/libraries/haskell/HSH/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/HSH/default.nix b/pkgs/development/libraries/haskell/HSH/default.nix index 40620901839d..f80f74a3dc2b 100644 --- a/pkgs/development/libraries/haskell/HSH/default.nix +++ b/pkgs/development/libraries/haskell/HSH/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "HSH"; - version = "2.0.4"; - sha256 = "1ddpazmk82716hqd1riqs7vnl4aildgwkjgk80iam49df9p5b8v8"; + version = "2.1.0"; + sha256 = "0gz2hzdvf0gqv33jihn67bvry38c6hkjapb1prxmb3w12lisr4l5"; isLibrary = true; isExecutable = true; buildDepends = [ -- cgit 1.4.1 From 62c29e07553d34f7f2c56940552e42b5004064f9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Mar 2013 11:06:00 +0100 Subject: haskell-blaze-html: update to version 0.6.1.0 --- pkgs/development/libraries/haskell/blaze-html/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix index 59e0f7187515..2063e3a862d7 100644 --- a/pkgs/development/libraries/haskell/blaze-html/default.nix +++ b/pkgs/development/libraries/haskell/blaze-html/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "blaze-html"; - version = "0.6.0.0"; - sha256 = "0n8jpmslcs29pfyb8jhp43dg4058ahd9y3kf2p2wr3r6b9yr5dll"; + version = "0.6.1.0"; + sha256 = "1y2z2md62kpl57qcvwvswmrjq7zhkqwfv8zr2acdvcxcxnyc47fm"; buildDepends = [ blazeBuilder blazeMarkup text ]; testDepends = [ blazeBuilder blazeMarkup HUnit QuickCheck testFramework -- cgit 1.4.1 From 3b530dba513203beb8096a143aff6c38300c091d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Mar 2013 11:06:00 +0100 Subject: haskell-diagrams-core: update to version 0.6.0.2 --- pkgs/development/libraries/haskell/diagrams/core.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix index c087e27d025d..ebea3fd60908 100644 --- a/pkgs/development/libraries/haskell/diagrams/core.nix +++ b/pkgs/development/libraries/haskell/diagrams/core.nix @@ -4,13 +4,12 @@ cabal.mkDerivation (self: { pname = "diagrams-core"; - version = "0.6.0.1"; - sha256 = "0kw0rxk9a2zkpnbx4bfd0japm75y29ldvdn7i3c93kvz0p6jc2wa"; + version = "0.6.0.2"; + sha256 = "1g4b1zabgfdpaf7y3804r3w04ll4sqqrf71rm9389dg17ghc1q85"; buildDepends = [ dualTree MemoTrie monoidExtras newtype semigroups vectorSpace vectorSpacePoints ]; - jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams"; description = "Core libraries for diagrams EDSL"; -- cgit 1.4.1 From 0395e7517597c6fd8d413162c76d2c0bd957ba84 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Mar 2013 11:06:00 +0100 Subject: haskell-flexible-defaults: update to version 0.0.1.1 --- pkgs/development/libraries/haskell/flexible-defaults/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/flexible-defaults/default.nix b/pkgs/development/libraries/haskell/flexible-defaults/default.nix index 9cba8f2c13f1..7be21dbbf347 100644 --- a/pkgs/development/libraries/haskell/flexible-defaults/default.nix +++ b/pkgs/development/libraries/haskell/flexible-defaults/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "flexible-defaults"; - version = "0.0.1.0"; - sha256 = "0vq8ci3zbzmw8abjd12dhjiqzz4ckr99c1fqk32qsp5bvm81bdma"; + version = "0.0.1.1"; + sha256 = "0cbp8hb7y29xz3hl780173cs6ca4df0r98fz7v3drqr46aq55ipl"; buildDepends = [ thExtras transformers ]; meta = { homepage = "https://github.com/mokus0/flexible-defaults"; -- cgit 1.4.1 From 53ecc95c722c95ef844ac0848bbe7b2c01012a34 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Mar 2013 11:06:00 +0100 Subject: haskell-ghc-mod: update to version 1.12.0 --- pkgs/development/libraries/haskell/ghc-mod/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index 3481d37356dc..7bcb94ab40c6 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -1,20 +1,20 @@ { cabal, Cabal, convertible, emacs, filepath, ghcPaths, ghcSybUtils -, hlint, hspec, ioChoice, regexPosix, syb, time, transformers +, hlint, hspec, ioChoice, syb, time, transformers }: cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "1.11.5"; - sha256 = "0lcq4ffmv017pdy58p91qn5d4hmcxcqzk8dvnmh7m4m7saslqivp"; + version = "1.12.0"; + sha256 = "01jq6hk8vcy47nc6gd4379k6kgjiyxy99j4pnc7nsdm63gnmr5l1"; isLibrary = false; isExecutable = true; buildDepends = [ - Cabal convertible filepath ghcPaths ghcSybUtils hlint ioChoice - regexPosix syb time transformers + Cabal convertible filepath ghcPaths ghcSybUtils hlint ioChoice syb + time transformers ]; testDepends = [ Cabal convertible filepath ghcPaths ghcSybUtils hlint hspec - ioChoice regexPosix syb time transformers + ioChoice syb time transformers ]; buildTools = [ emacs ]; postInstall = '' -- cgit 1.4.1 From e02fe72dd347b90ce6028a6682e3905b3b875b1b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Mar 2013 11:06:01 +0100 Subject: haskell-ghc-vis: update to version 0.6.1 --- pkgs/development/libraries/haskell/ghc-vis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix index 4b606e8b73b9..3fd1230073e7 100644 --- a/pkgs/development/libraries/haskell/ghc-vis/default.nix +++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ghc-vis"; - version = "0.6"; - sha256 = "0gvfs0f6fjg4bzq9q6rrhin6gk1pbyw9qbigi90cz1fg10nq7nzi"; + version = "0.6.1"; + sha256 = "0q0v1l44vagcg0nl4iv8m872g4qblj9syjlcgbf6fpgx1fqnyp24"; buildDepends = [ cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text transformers xdot -- cgit 1.4.1 From 3cb80788bf246fbbe221feaa328e216664efbcf7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Mar 2013 11:06:01 +0100 Subject: haskell-happstack-server: update to version 7.1.7 --- pkgs/development/libraries/haskell/happstack/happstack-server.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index 8d8261df97e3..370896f77e8b 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "happstack-server"; - version = "7.1.6"; - sha256 = "0gifq625kclam6sgblwa8a1vhxmx8saanzlrikch0l9q0l95nfwd"; + version = "7.1.7"; + sha256 = "1gd7qa224z04aya44fdrbhpiy5iw88wjcvqihz6l95ks9ilbzmg7"; buildDepends = [ base64Bytestring blazeHtml extensibleExceptions filepath hslogger html monadControl mtl network parsec sendfile syb systemFilepath @@ -16,7 +16,6 @@ cabal.mkDerivation (self: { utf8String xhtml zlib ]; testDepends = [ HUnit parsec zlib ]; - doCheck = false; meta = { homepage = "http://happstack.com"; description = "Web related tools and services"; -- cgit 1.4.1 From cd54b6379124fc30a7a1ede6f5e37780a4b16388 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Mar 2013 11:06:01 +0100 Subject: haskell-highlighting-kate: update to version 0.5.3.8 --- pkgs/development/libraries/haskell/highlighting-kate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index 805519d3d30c..9d6185dc5266 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "highlighting-kate"; - version = "0.5.3.7"; - sha256 = "04wa1al83v5ak6gvrwqy2b63mda0qfi2ircxfs9ddk1gkdscrlrl"; + version = "0.5.3.8"; + sha256 = "1fdgmwhiw05mgbgsrgyzvdqzklw9r10nswxfpnxkh5ivfxrhz82w"; isLibrary = true; isExecutable = true; buildDepends = [ blazeHtml filepath mtl parsec regexPcre ]; -- cgit 1.4.1 From f5313a6220cc66fac47efded5360e394539e8be4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Mar 2013 11:06:01 +0100 Subject: haskell-hp2any-core: update to version 0.11.2 --- pkgs/development/libraries/haskell/hp2any-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/hp2any-core/default.nix b/pkgs/development/libraries/haskell/hp2any-core/default.nix index 37e6000a3c01..96ac397da79c 100644 --- a/pkgs/development/libraries/haskell/hp2any-core/default.nix +++ b/pkgs/development/libraries/haskell/hp2any-core/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hp2any-core"; - version = "0.11.1"; - sha256 = "146bigmch7dawyyakj0w55p0jdpnxkj8q5izjsswqqk0pdxia546"; + version = "0.11.2"; + sha256 = "1gmw9bggw8hsp6pi0xgrryf0sqjb1aaxbwh85q5h72h4ixskwn1y"; buildDepends = [ attoparsec filepath network time ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Hp2any"; -- cgit 1.4.1 From 3c321d0327ff3c20dac3605c8957e190e412bae0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Mar 2013 11:06:01 +0100 Subject: haskell-hp2any-graph: update to version 0.5.4 --- pkgs/development/libraries/haskell/hp2any-graph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/hp2any-graph/default.nix b/pkgs/development/libraries/haskell/hp2any-graph/default.nix index 98b9518c7dea..83369ac008b7 100644 --- a/pkgs/development/libraries/haskell/hp2any-graph/default.nix +++ b/pkgs/development/libraries/haskell/hp2any-graph/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hp2any-graph"; - version = "0.5.3"; - sha256 = "1al20pxfgkgwynrx7vr0i57342s91lcm3cnd9qjx8b6vkqmzykkq"; + version = "0.5.4"; + sha256 = "1lhp9saw51w09fhk94hz31rjawnnxavd7x3lxjc8xn1778wp3v9h"; isLibrary = true; isExecutable = true; buildDepends = [ -- cgit 1.4.1 From d8b62ae485ce764a37a1fe36c6b61155ca4c447f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Mar 2013 11:06:01 +0100 Subject: haskell-shelly: update to version 0.15.4.1 --- pkgs/development/libraries/haskell/shelly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index 325021c1cca3..1e9e1f8c6ccb 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "shelly"; - version = "0.15.4"; - sha256 = "1b8fn5fa350hhlswn97g6zn9454nzn9sz60x55j959phwys0fcdk"; + version = "0.15.4.1"; + sha256 = "12m11s22izz0ny1syb1ykp2hi9n240myf0nhapvn8jx1fgf5iyck"; buildDepends = [ mtl systemFileio systemFilepath text time unixCompat ]; -- cgit 1.4.1 From fc66f4a3559ac7fb1fd38117a1bf8eb72e85655c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Mar 2013 11:06:01 +0100 Subject: haskell-uu-parsinglib: update to version 2.7.4.2 --- pkgs/development/libraries/haskell/uu-parsinglib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix index d28eb827dabf..d9477f4233da 100644 --- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix +++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uu-parsinglib"; - version = "2.7.4.1"; - sha256 = "1aya95j7dd0yal0ygy6d4w4wmlhgn5ddy3c5f6ncl4k3kg7hjxd1"; + version = "2.7.4.2"; + sha256 = "10ddm6x9km3lzs9ahqpsl9krvslsn9glimwzq4hspgsp6izd1dmq"; buildDepends = [ ListLike time ]; meta = { homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators"; -- cgit 1.4.1 From 272123038ee39afda6f47cad6cd6fcf17de21ede Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Mar 2013 11:06:01 +0100 Subject: haskell-xdot: update to version 0.2.3 --- pkgs/development/libraries/haskell/xdot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/xdot/default.nix b/pkgs/development/libraries/haskell/xdot/default.nix index 73cc5c6e7640..d1702862f422 100644 --- a/pkgs/development/libraries/haskell/xdot/default.nix +++ b/pkgs/development/libraries/haskell/xdot/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "xdot"; - version = "0.2.2"; - sha256 = "1n7lwshfn5rzbk4fxlkn02fxki2xh5m0304hnb1d5mchxyzhfdan"; + version = "0.2.3"; + sha256 = "0xb8igsqydiw1w00frn4mxkflhxkayif2vivxmq5fk53am2f43wy"; buildDepends = [ cairo graphviz gtk mtl polyparse text ]; meta = { description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo"; -- cgit 1.4.1 From 5371f4b5d6268306df45c1bf3e17af89695b800b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Mar 2013 11:06:01 +0100 Subject: haskell-zip-archive: update to version 0.1.3.4 --- pkgs/development/libraries/haskell/zip-archive/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix index 45f2ac96319d..2e658b15a15b 100644 --- a/pkgs/development/libraries/haskell/zip-archive/default.nix +++ b/pkgs/development/libraries/haskell/zip-archive/default.nix @@ -4,13 +4,12 @@ cabal.mkDerivation (self: { pname = "zip-archive"; - version = "0.1.3.3"; - sha256 = "0zzps6s6lsv35qv1xx1fwipk2nwv255wpa956mvzbwdr47pgqjwi"; + version = "0.1.3.4"; + sha256 = "0hvndr3gb7fiv4qjwjvic5mg7wq7h7nw3c3v5xq8fnlr1l943vyb"; isLibrary = true; isExecutable = true; buildDepends = [ binary digest filepath mtl time utf8String zlib ]; testDepends = [ HUnit time ]; - doCheck = false; meta = { homepage = "http://github.com/jgm/zip-archive"; description = "Library for creating and modifying zip archives"; -- cgit 1.4.1 From 4623d3ff01cd48a8ff0632a1bb1000eb4200b106 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 6 Mar 2013 14:02:53 +0100 Subject: glibc: Fix an assertion failure in getaddrinfo.c For instance, when connected to a VPN, Emacs would randomly crash at startup: emacs: ../sysdeps/posix/getaddrinfo.c:1467: rfc3484_sort: Assertion `src->results[i].native == -1 || src->results[i].native == a2_native' failed. --- pkgs/development/libraries/glibc/2.17/common.nix | 5 ++ .../libraries/glibc/2.17/glibc-rh739743.patch | 55 ++++++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 pkgs/development/libraries/glibc/2.17/glibc-rh739743.patch (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/glibc/2.17/common.nix b/pkgs/development/libraries/glibc/2.17/common.nix index eed512887073..ea2f3b6d1400 100644 --- a/pkgs/development/libraries/glibc/2.17/common.nix +++ b/pkgs/development/libraries/glibc/2.17/common.nix @@ -49,6 +49,11 @@ stdenv.mkDerivation ({ compatibility with old NixOS installations (since NixOS used to default to blowfish). */ ./glibc-crypt-blowfish.patch + + /* Fix for random "./sysdeps/posix/getaddrinfo.c:1467: + rfc3484_sort: Assertion `src->results[i].native == -1 || + src->results[i].native == a2_native' failed." crashes. */ + ./glibc-rh739743.patch ]; postPatch = '' diff --git a/pkgs/development/libraries/glibc/2.17/glibc-rh739743.patch b/pkgs/development/libraries/glibc/2.17/glibc-rh739743.patch new file mode 100644 index 000000000000..c390b772b16d --- /dev/null +++ b/pkgs/development/libraries/glibc/2.17/glibc-rh739743.patch @@ -0,0 +1,55 @@ +2009-04-26 Aurelien Jarno + + * sysdeps/posix/getaddrinfo.c (rfc3484_sort): don't assign native + result if the result has no associated interface. + +--- + sysdeps/posix/getaddrinfo.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/sysdeps/posix/getaddrinfo.c ++++ b/sysdeps/posix/getaddrinfo.c +@@ -1456,13 +1456,13 @@ + + /* Fill in the results in all the records. */ + for (int i = 0; i < src->nresults; ++i) +- if (src->results[i].index == a1_index) ++ if (a1_index != -1 && src->results[i].index == a1_index) + { + assert (src->results[i].native == -1 + || src->results[i].native == a1_native); + src->results[i].native = a1_native; + } +- else if (src->results[i].index == a2_index) ++ else if (a2_index != -1 && src->results[i].index == a2_index) + { + assert (src->results[i].native == -1 + || src->results[i].native == a2_native); + +2009-03-15 Aurelien Jarno + + * sysdeps/posix/getaddrinfo.c (getaddrinfo): correctly detect + interface for all 127.X.Y.Z addresses. + +--- + sysdeps/posix/getaddrinfo.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +--- a/sysdeps/posix/getaddrinfo.c ++++ b/sysdeps/posix/getaddrinfo.c +@@ -2265,7 +2265,14 @@ + tmp.addr[0] = 0; + tmp.addr[1] = 0; + tmp.addr[2] = htonl (0xffff); +- tmp.addr[3] = sinp->sin_addr.s_addr; ++ /* Special case for lo interface, the source address ++ being possibly different than the interface ++ address. */ ++ if ((ntohl(sinp->sin_addr.s_addr) & 0xff000000) ++ == 0x7f000000) ++ tmp.addr[3] = htonl(0x7f000001); ++ else ++ tmp.addr[3] = sinp->sin_addr.s_addr; + } + else + { -- cgit 1.4.1 From 653ad8ec2f190480baf62813bb1d558c8cd5cc63 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 6 Mar 2013 15:19:53 +0100 Subject: gmp: disable stripping when cross-compiling --- pkgs/development/libraries/gmp/5.0.5.nix | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/gmp/5.0.5.nix b/pkgs/development/libraries/gmp/5.0.5.nix index 98ebe5fcc256..c1cc36105ad2 100644 --- a/pkgs/development/libraries/gmp/5.0.5.nix +++ b/pkgs/development/libraries/gmp/5.0.5.nix @@ -23,6 +23,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + crossAttrs = { + # Disable stripping to avoid "libgmp.a: Archive has no index" + # (see .) + dontStrip = true; + dontCrossStrip = true; + }; + meta = { description = "GMP, the GNU multiple precision arithmetic library"; -- cgit 1.4.1 From da437144fa4f446e91b5f7f78b55faa4d12de58a Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Wed, 6 Mar 2013 18:14:18 +0100 Subject: webkit(_gtk2): clean, unify and enable parallel building This should make webkit_gtk2 build. --- pkgs/development/libraries/webkit/default.nix | 45 ++++++++++-------- pkgs/development/libraries/webkit/gtk2.nix | 53 ++++++++++++++-------- pkgs/development/libraries/webkit/src-for-gtk2.nix | 11 +++-- pkgs/top-level/all-packages.nix | 34 ++++++-------- 4 files changed, 80 insertions(+), 63 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix index 47bdcabd5146..ef4d259cb029 100644 --- a/pkgs/development/libraries/webkit/default.nix +++ b/pkgs/development/libraries/webkit/default.nix @@ -1,6 +1,6 @@ args : with args; let - s = import ./src-for-default.nix; # 1.10 needs newer gtk3, wait for x-updates + s = import ./src-for-default.nix; # 1.8.3 needs newer gtk3, wait for x-updates version = lib.attrByPath ["version"] s.version args; in rec { @@ -9,12 +9,13 @@ rec { sha256 = s.hash; }; - buildInputs = [gtk gtk2 glib atk cairo curl fontconfig freetype - gettext libjpeg libpng libtiff libxml2 libxslt pango - sqlite icu gperf bison flex autoconf automake libtool - perl intltool pkgconfig libsoup gtkdoc libXt libproxy - enchant python ruby which renderproto libXrender geoclue - kbproto mesa + buildInputs = with xlibs; [ + pkgconfig libtool intltool autoconf automake gperf bison flex + gtk3 gtk2 glib atk cairo pango fontconfig freetype libsoup gtkdoc + libjpeg libpng libtiff libxml2 libxslt sqlite icu curl + which libproxy geoclue enchant python ruby perl + mesa libXt libXrender renderproto libXcomposite compositeproto + libXdamage damageproto kbproto ]; propagatedBuildInputs = [ @@ -22,19 +23,22 @@ rec { ]; configureFlags = [ - "--enable-3D-transforms" + # "--enable-3D-transforms" # no longer recognized "--enable-web-sockets" "--enable-web-timing" - + + # https://bugs.webkit.org/show_bug.cgi?id=55294 + "--enable-image-resizer" + "--enable-geolocation" # Not implemented? - #"--enable-web-audio" + # "--enable-web-audio" "--enable-mathml" #"--enable-wml" - + # https://bugs.webkit.org/show_bug.cgi?id=45110 #"--enable-indexed-database" @@ -43,27 +47,30 @@ rec { # "--enable-input-speech" - "--enable-file-writer" + #"--enable-file-writer" # no longer recognized "--enable-blob" # https://bugs.webkit.org/show_bug.cgi?id=59430 - #"--enable-directory-upload" + # "--enable-directory-upload" # https://bugs.webkit.org/show_bug.cgi?id=58443 - #"--enable-file-system" + # "--enable-file-system" + + "--enable-dependency-tracking" # to fix parallel building ]; + # instead of enableParallelBuilding = true; + makeFlags = "-j$NIX_BUILD_CORES"; + /* doConfigure should be specified separately */ - phaseNames = ["setVars" "doPatch" "fixConfigure" /* "paranoidFixComments" */ "doConfigure" (doPatchShebangs ".") + phaseNames = ["doPatch" "fixConfigure" /* "paranoidFixComments" */ "doConfigure" (doPatchShebangs ".") "doReplaceUsrBin" "doMakeInstall" "doAddPrograms"]; - setVars = fullDepEntry ('' - export NIX_LDFLAGS="$NIX_LDFLAGS -lXt" - '') ["minInit"]; - patches = [ ./bison26.patch ]; # http://trac.webkit.org/changeset/124099 patchFlags = "-p2"; + #doCheck = true; # tests still have problems + doReplaceUsrBin = fullDepEntry ('' for i in $(find . -name '*.pl') $(find . -name '*.pm'); do sed -e 's@/usr/bin/gcc@gcc@' -i $i diff --git a/pkgs/development/libraries/webkit/gtk2.nix b/pkgs/development/libraries/webkit/gtk2.nix index 0b836cd08f00..c2e3b9b06dd6 100644 --- a/pkgs/development/libraries/webkit/gtk2.nix +++ b/pkgs/development/libraries/webkit/gtk2.nix @@ -10,11 +10,13 @@ rec { sha256 = s.hash; }; - buildInputs = [gtk glib atk cairo curl fontconfig freetype - gettext libjpeg libpng libtiff libxml2 libxslt pango - sqlite icu gperf bison flex autoconf automake libtool - intltool pkgconfig libsoup gtkdoc libXt libproxy - enchant python ruby which renderproto libXrender geoclue perl + buildInputs = with xlibs; [ + pkgconfig libtool intltool autoconf automake gperf bison flex + gtk2 glib atk cairo pango fontconfig freetype libsoup gtkdoc + libjpeg libpng libtiff libxml2 libxslt sqlite icu curl + which libproxy geoclue enchant python ruby perl + mesa libXt libXrender renderproto libXcomposite compositeproto + libXdamage damageproto kbproto ]; propagatedBuildInputs = [ @@ -22,12 +24,14 @@ rec { ]; configureFlags = [ - "--enable-3D-transforms" + "--with-gtk=2.0" + + # "--enable-3D-transforms" # no longer recognized "--enable-web-sockets" "--enable-web-timing" - + # https://bugs.webkit.org/show_bug.cgi?id=55294 - # "--enable-image-resizer" + "--enable-image-resizer" "--enable-geolocation" @@ -37,15 +41,16 @@ rec { "--enable-mathml" #"--enable-wml" - + # https://bugs.webkit.org/show_bug.cgi?id=45110 - # "--enable-indexed-database" + #"--enable-indexed-database" - "--enable-xhtmlmp" + # Doesn't work in release... + #"--enable-xhtmlmp" # "--enable-input-speech" - "--enable-file-writer" + #"--enable-file-writer" # no longer recognized "--enable-blob" # https://bugs.webkit.org/show_bug.cgi?id=59430 @@ -53,16 +58,21 @@ rec { # https://bugs.webkit.org/show_bug.cgi?id=58443 # "--enable-file-system" + + "--enable-dependency-tracking" # to fix parallel building ]; + # instead of enableParallelBuilding = true; + makeFlags = "-j$NIX_BUILD_CORES"; + /* doConfigure should be specified separately */ - phaseNames = ["setVars" /* "paranoidFixComments" */ "doConfigure" (doPatchShebangs ".") + phaseNames = ["doPatch" "fixConfigure" /* "paranoidFixComments" */ "doConfigure" (doPatchShebangs ".") "doReplaceUsrBin" "doMakeInstall" "doAddPrograms"]; - setVars = fullDepEntry ('' - export NIX_LDFLAGS="$NIX_LDFLAGS -lXt" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fpermissive" - '') ["minInit"]; + patches = [ ./bison26.patch ]; # http://trac.webkit.org/changeset/124099 + patchFlags = "-p2"; + + #doCheck = true; # tests still have problems doReplaceUsrBin = fullDepEntry ('' for i in $(find . -name '*.pl') $(find . -name '*.pm'); do @@ -81,12 +91,19 @@ rec { sed -re 's@( |^)//.*@/* & */@' -i $(find . -name '*.c' -o -name '*.h') '') ["minInit" "doUnpack"]; + # See http://archive.linuxfromscratch.org/mail-archives/blfs-dev/2012-April/022893.html + fixConfigure = fullDepEntry ('' + sed -i -e 's/=GSTREAMER_0_10_REQUIRED_VERSION/=\$GSTREAMER_0_10_REQUIRED_VERSION/' \ + -e 's/=GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION/=\$GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION/' \ + configure{,.ac} + '') ["minInit" "doUnpack"]; + name = s.name; meta = { description = "WebKit - a fast and correct HTML renderer"; maintainers = [stdenv.lib.maintainers.raskin]; }; passthru = { - inherit gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg; + inherit gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg libsoup; }; } diff --git a/pkgs/development/libraries/webkit/src-for-gtk2.nix b/pkgs/development/libraries/webkit/src-for-gtk2.nix index 5f5149fedfe6..65bcd4350960 100644 --- a/pkgs/development/libraries/webkit/src-for-gtk2.nix +++ b/pkgs/development/libraries/webkit/src-for-gtk2.nix @@ -1,9 +1,10 @@ rec { - version="1.4.0"; - name="webkit-1.4.0"; - hash="123zllzlnkjgw4d2ag73dvrjmkikbapxlz5730ps6y4qm43gxc1y"; - url="http://webkitgtk.org/webkit-1.4.0.tar.gz"; - advertisedUrl="http://webkitgtk.org/webkit-1.4.0.tar.gz"; + version="1.8.1"; + name="webkit-1.8.1"; + hash="0a1v3v8dp2cl332qr51j4fpl0rwpgxbf29hn3zdim9hcniv6l4ls"; + url="http://webkitgtk.org/releases/webkit-1.8.1.tar.xz"; + advertisedUrl="http://webkitgtk.org/releases/webkit-1.8.1.tar.xz"; } + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a76452fbf72..2731a19b4190 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5010,33 +5010,25 @@ let webkit = builderDefsPackage ../development/libraries/webkit { + inherit gtk2; # for plugins etc. even with gtk3, see Gentoo ebuild + inherit gtk3 glib atk cairo pango fontconfig freetype; inherit (gnome) gtkdoc libsoup; - inherit atk pango glib gtk2 /*for plugins etc. even with gtk3, see Gentoo ebuild*/; - gtk = gtk3; - inherit freetype fontconfig gettext gperf curl - libjpeg libtiff libxml2 libxslt sqlite - icu cairo intltool automake libtool - pkgconfig autoconf bison libproxy enchant - python ruby which flex geoclue mesa; - inherit gstreamer gst_plugins_base gst_ffmpeg - gst_plugins_good; - inherit (xlibs) libXt renderproto libXrender kbproto; - inherit libpng perl; + inherit pkgconfig libtool intltool autoconf automake gperf bison flex + libjpeg libpng libtiff libxml2 libxslt sqlite icu curl + which libproxy geoclue enchant python ruby perl + mesa xlibs; + inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good; }; webkit_gtk2 = builderDefsPackage ../development/libraries/webkit/gtk2.nix { + inherit gtk2 glib atk cairo pango fontconfig freetype; inherit (gnome) gtkdoc libsoup; - inherit gtk atk pango glib; - inherit freetype fontconfig gettext gperf curl - libjpeg libtiff libxml2 libxslt sqlite - icu cairo intltool automake libtool - pkgconfig autoconf bison libproxy enchant - python ruby which flex geoclue; - inherit gstreamer gst_plugins_base gst_ffmpeg - gst_plugins_good; - inherit (xlibs) libXt renderproto libXrender; - inherit libpng perl; + inherit pkgconfig libtool intltool autoconf automake gperf bison flex + libjpeg libpng libtiff libxml2 libxslt sqlite icu curl + which libproxy geoclue enchant python ruby perl + mesa xlibs; + inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good; }; webkitSVN = -- cgit 1.4.1 From 536db80abf0d72cd9da7f8a40d6bf2bb7f8cbac7 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 7 Mar 2013 10:59:03 +0400 Subject: Add Sodium cryptography library --- pkgs/development/libraries/sodium/default.nix | 28 ++++++++++++++++++++++ pkgs/development/libraries/sodium/default.upstream | 1 + pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 31 insertions(+) create mode 100644 pkgs/development/libraries/sodium/default.nix create mode 100644 pkgs/development/libraries/sodium/default.upstream (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/sodium/default.nix b/pkgs/development/libraries/sodium/default.nix new file mode 100644 index 000000000000..0d40df405744 --- /dev/null +++ b/pkgs/development/libraries/sodium/default.nix @@ -0,0 +1,28 @@ +{stdenv, fetchurl}: +let + s = # Generated upstream information + rec { + baseName="sodium"; + version="0.3"; + name="${baseName}-${version}"; + hash="0l1p0d7ag186hhs65kifp8jfgf4mm9rngv41bhq35d7d9gw2d2lh"; + url="http://download.dnscrypt.org/libsodium/releases/libsodium-0.3.tar.gz"; + sha256="0l1p0d7ag186hhs65kifp8jfgf4mm9rngv41bhq35d7d9gw2d2lh"; + }; + buildInputs = [ + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + meta = { + inherit (s) version; + description = ''A cryptography library with simple API''; + license = stdenv.lib.licenses.mit ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/sodium/default.upstream b/pkgs/development/libraries/sodium/default.upstream new file mode 100644 index 000000000000..ccc02cd89785 --- /dev/null +++ b/pkgs/development/libraries/sodium/default.upstream @@ -0,0 +1 @@ +url http://download.dnscrypt.org/libsodium/releases/ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d6c531ab0bdc..1265fa88a6f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4969,6 +4969,8 @@ let snappy = callPackage ../development/libraries/snappy { }; + sodium = callPackage ../development/libraries/sodium {}; + sofia_sip = callPackage ../development/libraries/sofia-sip { }; soprano = callPackage ../development/libraries/soprano { }; -- cgit 1.4.1 From 95ff746654f449d37385e7ace9050c801d177968 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Mar 2013 16:57:33 +0100 Subject: haskell-syb: add version 0.4.0 --- pkgs/development/libraries/haskell/syb/0.4.0.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 3 ++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/syb/0.4.0.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/syb/0.4.0.nix b/pkgs/development/libraries/haskell/syb/0.4.0.nix new file mode 100644 index 000000000000..7408d0ac5375 --- /dev/null +++ b/pkgs/development/libraries/haskell/syb/0.4.0.nix @@ -0,0 +1,15 @@ +{ cabal, HUnit, mtl }: + +cabal.mkDerivation (self: { + pname = "syb"; + version = "0.4.0"; + sha256 = "1wxz8y2dcjl407l596qswcl9cakbb5cs4wzwlyy6qjz7lyd0h0gj"; + testDepends = [ HUnit mtl ]; + meta = { + homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; + description = "Scrap Your Boilerplate"; + 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 c360214e2c6f..715d79aa9709 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -140,7 +140,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regexPosix = self.regexPosix_0_95_2; # 7.6 ok split = self.split_0_2_1_2; # 7.6 ok stm = self.stm_2_4_2; # 7.6 ok - syb = self.syb_0_3_7; # 7.6 ok + syb = self.syb_0_4_0; # 7.6 ok text = self.text_0_11_2_3; # 7.6 ok transformers = self.transformers_0_3_0_0; # 7.6 ok vector = self.vector_0_10_0_1; # 7.6 ok @@ -1620,6 +1620,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); syb_0_3_6_1 = callPackage ../development/libraries/haskell/syb/0.3.6.1.nix {}; syb_0_3_6_2 = callPackage ../development/libraries/haskell/syb/0.3.6.2.nix {}; syb_0_3_7 = callPackage ../development/libraries/haskell/syb/0.3.7.nix {}; + syb_0_4_0 = callPackage ../development/libraries/haskell/syb/0.4.0.nix {}; syb = null; # by default, we assume that syb ships with GHC, which is # true for the older GHC versions -- cgit 1.4.1 From 4fd407bab52e7490245ff767204d4addaaa99a6d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Mar 2013 16:57:52 +0100 Subject: haskell-QuickCheck: add version 2.6 --- pkgs/development/libraries/haskell/QuickCheck/2.6.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 +++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/QuickCheck/2.6.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.6.nix b/pkgs/development/libraries/haskell/QuickCheck/2.6.nix new file mode 100644 index 000000000000..39c97859e657 --- /dev/null +++ b/pkgs/development/libraries/haskell/QuickCheck/2.6.nix @@ -0,0 +1,15 @@ +{ cabal, random }: + +cabal.mkDerivation (self: { + pname = "QuickCheck"; + version = "2.6"; + sha256 = "03cp7mshjy2yrg31i13b9kmc2a6lrmrbl1sh9s8lswcj305c00c0"; + buildDepends = [ random ]; + meta = { + homepage = "http://code.haskell.org/QuickCheck"; + description = "Automatic testing of Haskell programs"; + 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 715d79aa9709..ee62aa0a0efb 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -133,7 +133,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); OpenGL = self.OpenGL_2_6_0_1; # 7.6 ok parallel = self.parallel_3_2_0_3; # 7.6 ok parsec = self.parsec_3_1_3; # 7.6 ok - QuickCheck = self.QuickCheck_2_5_1_1; # 7.6 ok + QuickCheck = self.QuickCheck_2_6; # 7.6 ok random = self.random_1_0_1_1; # 7.6 ok regexBase = self.regexBase_0_93_2; # 7.6 ok regexCompat = self.regexCompat_0_95_1; # 7.6 ok @@ -1468,8 +1468,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); QuickCheck_2_4_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.4.1.1.nix {}; QuickCheck_2_4_2 = callPackage ../development/libraries/haskell/QuickCheck/2.4.2.nix {}; QuickCheck_2_5_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.5.1.1.nix {}; + QuickCheck_2_6 = callPackage ../development/libraries/haskell/QuickCheck/2.6.nix {}; QuickCheck1 = self.QuickCheck_1_2_0_1; - QuickCheck2 = self.QuickCheck_2_5_1_1; + QuickCheck2 = self.QuickCheck_2_6; QuickCheck = self.QuickCheck2; RangedSets = callPackage ../development/libraries/haskell/Ranged-sets {}; -- cgit 1.4.1 From e459a7514e82e85f925249ea0065d6b199114550 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Mar 2013 17:03:00 +0100 Subject: haskell-doctest: jailbreak to support syb 0.4.0 --- pkgs/development/libraries/haskell/doctest/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix index 3c8988400bcb..ce418a8d053f 100644 --- a/pkgs/development/libraries/haskell/doctest/default.nix +++ b/pkgs/development/libraries/haskell/doctest/default.nix @@ -13,6 +13,7 @@ cabal.mkDerivation (self: { baseCompat deepseq filepath ghcPaths hspec HUnit QuickCheck setenv silently stringbuilder syb transformers ]; + jailbreak = true; doCheck = false; meta = { homepage = "https://github.com/sol/doctest-haskell#readme"; -- cgit 1.4.1 From 6ff4538b5ac3be05c7192b3d7e5e7171c1fd75ec Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Mar 2013 17:07:33 +0100 Subject: haskell-pandoc: jailbreak to support syb 0.4.0 --- pkgs/development/libraries/haskell/pandoc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index 93f7e8add429..204d13c71485 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -18,7 +18,7 @@ cabal.mkDerivation (self: { ]; configureFlags = "-fblaze_html_0_5"; patchPhase = '' - sed -r -i -e 's|blaze-html >= 0.5 && < 0.6,|blaze-html >= 0.5,|' pandoc.cabal + sed -r -i -e 's|blaze-html >= 0.5 && < 0.6,|blaze-html >= 0.5,|' -e 's|syb >= 0.1 && < 0.4,| syb,|' pandoc.cabal ''; doCheck = false; meta = { -- cgit 1.4.1 From 2965fb2cb0fedc4dc4428c08acd2c69ccc717566 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Mar 2013 17:07:46 +0100 Subject: haskell-data-default: update to version 0.5.1 --- pkgs/development/libraries/haskell/data-default/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/data-default/default.nix b/pkgs/development/libraries/haskell/data-default/default.nix index 893f2121f0ab..4fb21ed5f551 100644 --- a/pkgs/development/libraries/haskell/data-default/default.nix +++ b/pkgs/development/libraries/haskell/data-default/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "data-default"; - version = "0.5.0"; - sha256 = "1wv8wjd9j40s7h19aph5pqph7rby5ma1nlagqywn9q0634iq9n2a"; + version = "0.5.1"; + sha256 = "05zp9bcxm4lcdqniwckq0zi014iqcnqbrk5wh54dyy83h97z6mpv"; buildDepends = [ dlist ]; meta = { description = "A class for types with a default value"; -- cgit 1.4.1 From 213dcd584355fd819c1ce16c1cba2d36d5eaed59 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Mar 2013 17:07:47 +0100 Subject: haskell-ghc-mod: update to version 1.12.1 --- pkgs/development/libraries/haskell/ghc-mod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index 7bcb94ab40c6..1109a512a8da 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "1.12.0"; - sha256 = "01jq6hk8vcy47nc6gd4379k6kgjiyxy99j4pnc7nsdm63gnmr5l1"; + version = "1.12.1"; + sha256 = "0m876lfxi0k7v27rg4ipq3rpk7qvsrzfdflp5fayxvmi9wgdvm3r"; isLibrary = false; isExecutable = true; buildDepends = [ -- cgit 1.4.1 From 02ed0e6867e7689b32e25124fec7395e36ae3a77 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Mar 2013 17:07:47 +0100 Subject: haskell-hakyll: update to version 4.2.0.0 --- pkgs/development/libraries/haskell/hakyll/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 59a32b0d290b..8d4b36e979b4 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.1.4.0"; - sha256 = "0nhr7ai03hx2qjxlqml0js43iwxhcbpdqkwdvw8pqs396yrjwxdj"; + version = "4.2.0.0"; + sha256 = "10yamc95pq6db353miyqakjax54abl1dkqmwfv63cblxd4llsv9x"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -22,7 +22,6 @@ cabal.mkDerivation (self: { QuickCheck random regexBase regexTdfa tagsoup testFramework testFrameworkHunit testFrameworkQuickcheck2 text time ]; - jailbreak = true; meta = { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; -- cgit 1.4.1 From 0fd867192ddc09a3faaf41c4726b2342d5de9ce5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Mar 2013 17:07:47 +0100 Subject: haskell-http-conduit: update to version 1.9.1 --- pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index dc5e248f4454..683396eea818 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.9.0"; - sha256 = "1b6f2sg96fddk5ywbfvbvj9z81695d35qymf31idpkyshcp9argk"; + version = "1.9.1"; + sha256 = "1ypwqd5f6m459kjw2x3knig924s93b6yiviy7jlaxllpaw2lrial"; buildDepends = [ asn1Data base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie cprngAes dataDefault -- cgit 1.4.1 From d742d26b0d8c7125fb29417fcb40e2665e10100d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Mar 2013 17:07:47 +0100 Subject: haskell-uulib: update to version 0.9.15 --- pkgs/development/libraries/haskell/uulib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/uulib/default.nix b/pkgs/development/libraries/haskell/uulib/default.nix index 991f38080984..2521c44bec6e 100644 --- a/pkgs/development/libraries/haskell/uulib/default.nix +++ b/pkgs/development/libraries/haskell/uulib/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uulib"; - version = "0.9.14"; - sha256 = "0bi62l9fp1ghqq4dagdy4nsxmm08gpsrnfgy6d6k8f4239s3yr0z"; + version = "0.9.15"; + sha256 = "0433shh493c04qmi0sd9mfzpy198zi11gxdmcs6nz2gcnxm812zm"; meta = { homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; description = "Haskell Utrecht Tools Library"; -- cgit 1.4.1 From 1d0e0fd1673d8c98ef512df70b91132dec6f4e2d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 8 Mar 2013 12:18:21 +0100 Subject: haskell-hakyll: update to version 4.2.1.0 --- pkgs/development/libraries/haskell/hakyll/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 2ca90094bb81..f153a9b3d89a 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.1.4.0"; - sha256 = "0nhr7ai03hx2qjxlqml0js43iwxhcbpdqkwdvw8pqs396yrjwxdj"; + version = "4.2.1.0"; + sha256 = "05w5j8wc47j8g4x2lsm0zs3aspb4rjvgnrxbjlxps0mfz3csqfhh"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -22,8 +22,6 @@ cabal.mkDerivation (self: { QuickCheck random regexBase regexTdfa tagsoup testFramework testFrameworkHunit testFrameworkQuickcheck2 text time ]; - jailbreak = true; - doCheck = false; meta = { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; -- cgit 1.4.1 From 525342632fa66c86e2d34f459715e4162dac2297 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 8 Mar 2013 13:36:58 +0100 Subject: haskell-hakyll: disable test suite to fix build error --- pkgs/development/libraries/haskell/hakyll/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index f153a9b3d89a..eb27fde823fe 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -22,6 +22,7 @@ cabal.mkDerivation (self: { QuickCheck random regexBase regexTdfa tagsoup testFramework testFrameworkHunit testFrameworkQuickcheck2 text time ]; + doCheck = false; meta = { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; -- cgit 1.4.1 From 1090f928c43b63324b70912c5f1ade9024c1e5b2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 8 Mar 2013 12:18:21 +0100 Subject: haskell-monad-control: update to version 0.3.2 --- pkgs/development/libraries/haskell/monad-control/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/monad-control/default.nix b/pkgs/development/libraries/haskell/monad-control/default.nix index bf27ac461c3d..1cdf917cf8fb 100644 --- a/pkgs/development/libraries/haskell/monad-control/default.nix +++ b/pkgs/development/libraries/haskell/monad-control/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "monad-control"; - version = "0.3.1.4"; - sha256 = "0mvcj6rljh2drkpf29zavwsqpzd9lw7s0n4inxm82i2017xdazy1"; + version = "0.3.2"; + sha256 = "1gw1g89cjr993kcxjd1lvj94klrb8hsxn0yzyl1gmfk4273z39pa"; buildDepends = [ baseUnicodeSymbols transformers transformersBase ]; -- cgit 1.4.1 From b31be07af084a55ca5349088c787ecabefacd021 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 8 Mar 2013 12:18:21 +0100 Subject: haskell-multiarg: update to version 0.10.0.0 --- pkgs/development/libraries/haskell/multiarg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix index 74254a4c591e..0a2495a07e9d 100644 --- a/pkgs/development/libraries/haskell/multiarg/default.nix +++ b/pkgs/development/libraries/haskell/multiarg/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "multiarg"; - version = "0.8.0.0"; - sha256 = "17zfrm9zjf7c8g7q9vqj1srk0g766ifhwqp7gm4ql890541q5lv5"; + version = "0.10.0.0"; + sha256 = "09clgin66i2m0b3ws7di9p15cy9bd144as832xpx4li6cfbg16ip"; buildDepends = [ explicitException utf8String ]; meta = { homepage = "https://github.com/massysett/multiarg"; -- cgit 1.4.1 From e447fcc8dd4c9ae2a2b5321c6609a47e58799bb6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 8 Mar 2013 12:44:46 +0100 Subject: haskell-cuda: re-generate the expression with recent cabal2nix --- pkgs/development/libraries/haskell/cuda/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix index a90efcdf4cab..f03e1907ec08 100644 --- a/pkgs/development/libraries/haskell/cuda/default.nix +++ b/pkgs/development/libraries/haskell/cuda/default.nix @@ -7,20 +7,18 @@ cabal.mkDerivation (self: { buildDepends = [ extensibleExceptions ]; buildTools = [ c2hs ]; extraLibraries = [ cudatoolkit nvidia_x11 self.stdenv.gcc ]; + doCheck = false; # Perhaps this should be the default in cabal.nix ... # # The cudatoolkit provides both 64 and 32-bit versions of the # library. GHC's linker fails if the wrong version is found first. # We solve this by eliminating lib64 from the path on 32-bit # platforms and putting lib64 first on 64-bit platforms. - libPaths = if self.stdenv.is64bit then "lib64 lib" else "lib"; - configurePhase = '' for i in Setup.hs Setup.lhs; do test -f $i && ghc --make $i done - for p in $extraBuildInputs $propagatedNativeBuildInputs; do if [ -d "$p/include" ]; then extraLibDirs="$extraLibDirs --extra-include-dir=$p/include" @@ -31,12 +29,8 @@ cabal.mkDerivation (self: { fi done done - ./Setup configure --verbose --prefix="$out" $libraryProfiling $extraLibDirs $configureFlags ''; - - doCheck = false; - meta = { description = "FFI binding to the CUDA interface for programming NVIDIA GPUs"; license = self.stdenv.lib.licenses.bsd3; -- cgit 1.4.1 From a675c7f245008e81046d1844ad6e617e82c2f310 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 8 Mar 2013 12:53:15 +0100 Subject: haskell-data-default: update to version 0.5.1 --- pkgs/development/libraries/haskell/data-default/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/data-default/default.nix b/pkgs/development/libraries/haskell/data-default/default.nix index 893f2121f0ab..4fb21ed5f551 100644 --- a/pkgs/development/libraries/haskell/data-default/default.nix +++ b/pkgs/development/libraries/haskell/data-default/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "data-default"; - version = "0.5.0"; - sha256 = "1wv8wjd9j40s7h19aph5pqph7rby5ma1nlagqywn9q0634iq9n2a"; + version = "0.5.1"; + sha256 = "05zp9bcxm4lcdqniwckq0zi014iqcnqbrk5wh54dyy83h97z6mpv"; buildDepends = [ dlist ]; meta = { description = "A class for types with a default value"; -- cgit 1.4.1 From 9ff74626f95f3c39371a8f87f2b1a22f6dd04237 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 8 Mar 2013 12:53:15 +0100 Subject: haskell-ghc-mod: update to version 1.12.1 --- pkgs/development/libraries/haskell/ghc-mod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index 7bcb94ab40c6..1109a512a8da 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "1.12.0"; - sha256 = "01jq6hk8vcy47nc6gd4379k6kgjiyxy99j4pnc7nsdm63gnmr5l1"; + version = "1.12.1"; + sha256 = "0m876lfxi0k7v27rg4ipq3rpk7qvsrzfdflp5fayxvmi9wgdvm3r"; isLibrary = false; isExecutable = true; buildDepends = [ -- cgit 1.4.1 From 610f063554b7b43f4928cd758ec90bda3e64a596 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 8 Mar 2013 12:53:15 +0100 Subject: haskell-http-conduit: update to version 1.9.1 --- pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index dc5e248f4454..683396eea818 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.9.0"; - sha256 = "1b6f2sg96fddk5ywbfvbvj9z81695d35qymf31idpkyshcp9argk"; + version = "1.9.1"; + sha256 = "1ypwqd5f6m459kjw2x3knig924s93b6yiviy7jlaxllpaw2lrial"; buildDepends = [ asn1Data base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie cprngAes dataDefault -- cgit 1.4.1 From 8dc669a7268f3aac304d31524836547ca4fa7052 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 8 Mar 2013 12:53:15 +0100 Subject: haskell-uulib: update to version 0.9.15 --- pkgs/development/libraries/haskell/uulib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/uulib/default.nix b/pkgs/development/libraries/haskell/uulib/default.nix index 991f38080984..2521c44bec6e 100644 --- a/pkgs/development/libraries/haskell/uulib/default.nix +++ b/pkgs/development/libraries/haskell/uulib/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uulib"; - version = "0.9.14"; - sha256 = "0bi62l9fp1ghqq4dagdy4nsxmm08gpsrnfgy6d6k8f4239s3yr0z"; + version = "0.9.15"; + sha256 = "0433shh493c04qmi0sd9mfzpy198zi11gxdmcs6nz2gcnxm812zm"; meta = { homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; description = "Haskell Utrecht Tools Library"; -- cgit 1.4.1 From 7db1b1e08515e7cfd1bf1149df66d509415289c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 8 Mar 2013 13:26:17 +0100 Subject: haskell-zip-archive: disable test suite The test suite fails because it expects to find /usr/bin/zip. --- pkgs/development/libraries/haskell/zip-archive/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix index 2e658b15a15b..38290c8cd544 100644 --- a/pkgs/development/libraries/haskell/zip-archive/default.nix +++ b/pkgs/development/libraries/haskell/zip-archive/default.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { isExecutable = true; buildDepends = [ binary digest filepath mtl time utf8String zlib ]; testDepends = [ HUnit time ]; + doCheck = false; meta = { homepage = "http://github.com/jgm/zip-archive"; description = "Library for creating and modifying zip archives"; -- cgit 1.4.1 From f805ec1e0ad55239da89f73a43a651bcafdc2fad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 8 Mar 2013 13:36:45 +0100 Subject: happstack-server: disable test suite to fix build error --- pkgs/development/libraries/haskell/happstack/happstack-server.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index 370896f77e8b..0185e4e6ce92 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -16,6 +16,7 @@ cabal.mkDerivation (self: { utf8String xhtml zlib ]; testDepends = [ HUnit parsec zlib ]; + doCheck = false; meta = { homepage = "http://happstack.com"; description = "Web related tools and services"; -- cgit 1.4.1 From 7ac086aab7453938cd70be5b97c8f1e1499f0e09 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 8 Mar 2013 13:56:00 +0100 Subject: haskell-test-framework-quickcheck2: jailbreak to support QuickCheck version 2.6 --- .../development/libraries/haskell/test-framework-quickcheck2/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix index 77e201ca63d4..b944c1e104cc 100644 --- a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { buildDepends = [ extensibleExceptions QuickCheck random testFramework ]; + jailbreak = true; meta = { homepage = "http://batterseapower.github.com/test-framework/"; description = "QuickCheck2 support for the test-framework package"; -- cgit 1.4.1 From c8ff45b5c75c9679c137dcd2c9cc25bdfb1dcecb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 8 Mar 2013 13:56:12 +0100 Subject: haskell-doctest: jailbreak to support QuickCheck version 2.6 --- pkgs/development/libraries/haskell/doctest/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix index 3c8988400bcb..fd9728f4fb84 100644 --- a/pkgs/development/libraries/haskell/doctest/default.nix +++ b/pkgs/development/libraries/haskell/doctest/default.nix @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { silently stringbuilder syb transformers ]; doCheck = false; + jailbreak = true; meta = { homepage = "https://github.com/sol/doctest-haskell#readme"; description = "Test interactive Haskell examples"; -- cgit 1.4.1 From acd06b6ea0ec1f7e7824a4df148c984ede581d42 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Mar 2013 13:11:48 +0100 Subject: haskell-shake: add version 0.9.1 --- .../development/libraries/haskell/shake/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/haskell/shake/default.nix (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix new file mode 100644 index 000000000000..dd4f985e6183 --- /dev/null +++ b/pkgs/development/libraries/haskell/shake/default.nix @@ -0,0 +1,21 @@ +{ cabal, binary, deepseq, filepath, hashable, random, time +, transformers, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "shake"; + version = "0.9.1"; + sha256 = "19jpnf7794ii1v0rfafmcrs71flwz6hmz72ng529ll12iy64xwkv"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + binary deepseq filepath hashable random time transformers + unorderedContainers + ]; + meta = { + homepage = "http://community.haskell.org/~ndm/shake/"; + description = "Build system library, like Make, but more accurate dependencies"; + 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 110e19b72b34..8275aee4f52c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1653,6 +1653,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); SHA = callPackage ../development/libraries/haskell/SHA {}; + shake = callPackage ../development/libraries/haskell/shake {}; + shakespeare = callPackage ../development/libraries/haskell/shakespeare {}; shakespeareCss = callPackage ../development/libraries/haskell/shakespeare-css {}; -- cgit 1.4.1 From 2f39e18b7f91d2189eb7b96f081d3bce67ea1998 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Sat, 9 Mar 2013 13:56:26 +0100 Subject: ffmpeg: update 1.1 to 1.1.3 --- pkgs/development/libraries/ffmpeg/1.1.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/ffmpeg/1.1.nix b/pkgs/development/libraries/ffmpeg/1.1.nix index 7cb83db5e8d3..100e3456ca43 100644 --- a/pkgs/development/libraries/ffmpeg/1.1.nix +++ b/pkgs/development/libraries/ffmpeg/1.1.nix @@ -25,7 +25,7 @@ assert faacSupport -> faac != null; assert x11grabSupport -> libXext != null && libXfixes != null; stdenv.mkDerivation rec { - name = "ffmpeg-1.1"; + name = "ffmpeg-1.1.3"; src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; -- cgit 1.4.1 From 03ba2960a44a23a5683ceac3bea30bf724792594 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 9 Mar 2013 14:54:43 +0100 Subject: vdrift: update and fix Tested on two laps :-) --- pkgs/development/libraries/bullet/default.nix | 19 +++++++++++-------- pkgs/games/vdrift/default.nix | 12 ++++++++++-- 2 files changed, 21 insertions(+), 10 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index b725f6bbf9fe..6320dd58e4c6 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -1,14 +1,17 @@ -{stdenv, fetchurl, unzip, cmake}: +{ stdenv, fetchurl, cmake, mesa, freeglut }: -stdenv.mkDerivation { - name = "bullet-2.78"; +stdenv.mkDerivation rec { + name = "bullet-2.80"; # vdrift 2012-07-22 doesn't build with 2.81 + rev = "2531"; src = fetchurl { - url = "http://bullet.googlecode.com/files/bullet-2.78.zip"; - sha256 = "10l2dclvv0di9mi9qp6xfy9vybx182xp2dyygabacrpr3p75s77k"; + url = "http://bullet.googlecode.com/files/${name}-rev${rev}.tgz"; + sha256 = "0dig6k88jz5y0cz6dn186vc4l96l4v56zvwpsp5bv9f5wdwjskj6"; }; - buildInputs = [ unzip cmake ]; + + buildInputs = [ cmake mesa freeglut ]; configurePhase = '' - cmake -DBUILD_SHARED_LIBS=ON -DBUILD_EXTRAS=OFF -DBUILD_DEMOS=OFF . + cmake -DBUILD_SHARED_LIBS=ON -DBUILD_EXTRAS=OFF -DBUILD_DEMOS=OFF \ + -DCMAKE_INSTALL_PREFIX=$out . ''; meta = { @@ -19,6 +22,6 @@ stdenv.mkDerivation { ''; homepage = http://code.google.com/p/bullet/; license = stdenv.lib.licenses.zlib; - maintainers = [ "Alexander Foremny " ]; + maintainers = with stdenv.lib.maintainers; [ aforemny ]; }; } diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index 0f9da8883827..63a8f5086845 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -2,13 +2,21 @@ asio, boost, SDL_gfx, pkgconfig, bullet, curl, libarchive }: stdenv.mkDerivation rec { - name = "vdrift-2011-10-22"; + version = "2012-07-22"; + name = "vdrift-${version}"; + patch = "c"; # see https://github.com/VDrift/vdrift/issues/110 src = fetchurl { url = "mirror://sourceforge/vdrift/${name}.tar.bz2"; - sha256 = "0vg1v1590jbln6k236kxn2sfgclvc6g34kykhh4nq9q3l1xgy38s"; + sha256 = "1yqkc7y4s4g5ylw501bf0c03la7kfddjdk4yyi1xkcwy3pmgw2al"; }; + patches = fetchurl { + url = "mirror://sourceforge/vdrift/${name}${patch}_patch.diff"; + sha256 = "08mfg4xxkzyp6602cgqyjzc3rn0zsaa3ddjkpd44b83drv19lriy"; + }; + patchFlags = "-p0"; + buildInputs = [ scons mesa SDL freeglut SDL_image glew libvorbis asio boost SDL_gfx pkgconfig bullet curl libarchive ]; -- cgit 1.4.1 From 75ebcbc9a7278efe2a2c0d5f7a37b66ac9d1f9a7 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 9 Mar 2013 18:44:41 +0100 Subject: jbig2dec: fix download URI --- pkgs/development/libraries/jbig2dec/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix index 60c6e9922a4a..e15c5c8d179f 100644 --- a/pkgs/development/libraries/jbig2dec/default.nix +++ b/pkgs/development/libraries/jbig2dec/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "jbig2dec-0.11"; - + src = fetchurl { - url = http://ghostscript.com/~giles/jbig2/jbig2dec/jbig2dec-0.11.tar.gz; - sha256 = "1ffhgmf2fqzk0h4k736pp06z7q5y4x41fg844bd6a9vgncq86bby"; + url = "mirror://sourceforge/jbig2dec/${name}.tar.xz"; + sha256 = "1xddc30garsg5j8p348cz5l8vn8j7723c0sykv0kc1w5ihaghsq1"; }; - + meta = { homepage = http://jbig2dec.sourceforge.net/; description = "Decoder implementation of the JBIG2 image compression format"; -- cgit 1.4.1 From 2c13f0fd2043b8b19834eba544987b0f5c1eb68d Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 9 Mar 2013 22:50:24 +0100 Subject: libnotify: major update, no dependency on gtk+ now As a result it can be easily used with both gtk2 and gtk3. --- pkgs/development/libraries/libnotify/default.nix | 31 ++++++++++++++++++------ 1 file changed, 24 insertions(+), 7 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index 7bfd8c05104b..ab8034c781e5 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -1,17 +1,34 @@ -{ stdenv, fetchurl, pkgconfig, dbus, dbus_glib, gtk, glib }: - +{ stdenv, fetchurl, pkgconfig, automake, autoconf, libtool, glib, gdk_pixbuf }: + stdenv.mkDerivation rec { - name = "libnotify-0.4.5"; + ver_maj = "0.7"; + ver_min = "5"; + name = "libnotify-${ver_maj}.${ver_min}"; src = fetchurl { - url = "http://www.galago-project.org/files/releases/source/libnotify/${name}.tar.gz"; - sha256 = "1ndh7wpm9qh12vm5avjrq2xv1j681j9qq6j2fyj6a2shl67dp687"; + url = "mirror://gnome/sources/libnotify/${ver_maj}/${name}.tar.xz"; + sha256 = "0lmnzy16vdjs9vlgdm0b7wfyi1nh526hv2dpb7vxb92bhx3wny23"; + }; + src_m4 = fetchurl { + url = "mirror://gentoo/distfiles/introspection-20110205.m4.tar.bz2"; + sha256 = "1cnqh7aaji648nfd5537v7xaak8hgww3bpifhwam7bl0sc3ad523"; }; - buildInputs = [ pkgconfig dbus.libs dbus_glib gtk glib ]; + # see Gentoo ebuild - we don't need to depend on gtk+(2/3) + preConfigure = '' + cd m4 + tar xvf ${src_m4} + cd .. + + sed -i -e 's:noinst_PROG:check_PROG:' tests/Makefile.am || die + sed -i -e '/PKG_CHECK_MODULES(TESTS/d' configure.ac || die + AT_M4DIR=. autoreconf + ''; + + buildInputs = [ pkgconfig automake autoconf glib gdk_pixbuf ]; meta = { - homepage = http://galago-project.org/; + homepage = http://galago-project.org/; # very obsolete but found no better description = "A library that sends desktop notifications to a notification daemon"; }; } -- cgit 1.4.1