From 5911c1f45ac3c877c05192b951de5bfdf048b611 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Apr 2013 13:42:26 +0200 Subject: [PATCH 001/153] perl: Update to 5.16.3, 5.14.4 CVE-2013-1667 Cherry-picked from stdenv-updates. --- pkgs/development/interpreters/perl/5.14/default.nix | 4 ++-- pkgs/development/interpreters/perl/5.16/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/perl/5.14/default.nix b/pkgs/development/interpreters/perl/5.14/default.nix index ac19900bcfc3..08690e9507fa 100644 --- a/pkgs/development/interpreters/perl/5.14/default.nix +++ b/pkgs/development/interpreters/perl/5.14/default.nix @@ -7,11 +7,11 @@ let in stdenv.mkDerivation rec { - name = "perl-5.14.2"; + name = "perl-5.14.4"; src = fetchurl { url = "mirror://cpan/src/${name}.tar.gz"; - sha256 = "1ls8cpbgnlaxfydyyqgr7pxj1hkxh9pzcdgr3dv42zdxffakb234"; + sha256 = "1js47zzna3v38fjnirf2vq6y0rjp8m86ysj5vagzgkig956d8gw0"; }; patches = diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix index 288de63b4ae8..2113faee1640 100644 --- a/pkgs/development/interpreters/perl/5.16/default.nix +++ b/pkgs/development/interpreters/perl/5.16/default.nix @@ -7,11 +7,11 @@ let in stdenv.mkDerivation rec { - name = "perl-5.16.2"; + name = "perl-5.16.3"; src = fetchurl { url = "mirror://cpan/src/${name}.tar.gz"; - sha256 = "03nh8bqnjsdd5izjv3n2yfcxw4ck0llwww36jpbjbjgixwpqpy4f"; + sha256 = "1dpd9lhc4723wmsn4dsn4m320qlqgyw28bvcbhnfqp2nl3f0ikv9"; }; patches = From cc17e7037476e45fc5f86b0897b39b54553f2699 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 9 May 2013 13:50:51 +0200 Subject: [PATCH 002/153] glibc: Remove 2.13 It's not used and has security bugs. --- .../libraries/glibc/2.13/builder.sh | 54 ---- .../glibc/2.13/catalan-firstdays.patch | 13 - .../libraries/glibc/2.13/common.nix | 244 ------------------ .../libraries/glibc/2.13/default.nix | 99 ------- .../2.13/dont_use_system_ld_so_cache.patch | 43 --- .../glibc/2.13/glibc-elf-localscope.patch | 82 ------ .../development/libraries/glibc/2.13/info.nix | 26 -- .../libraries/glibc/2.13/locales-builder.sh | 17 -- .../libraries/glibc/2.13/locales.nix | 47 ---- .../glibc/2.13/nix-locale-archive.patch | 116 --------- .../glibc/2.13/nss-skip-unavail.patch | 21 -- .../libraries/glibc/2.13/rpcgen-path.patch | 72 ------ pkgs/top-level/all-packages.nix | 8 - 13 files changed, 842 deletions(-) delete mode 100644 pkgs/development/libraries/glibc/2.13/builder.sh delete mode 100644 pkgs/development/libraries/glibc/2.13/catalan-firstdays.patch delete mode 100644 pkgs/development/libraries/glibc/2.13/common.nix delete mode 100644 pkgs/development/libraries/glibc/2.13/default.nix delete mode 100644 pkgs/development/libraries/glibc/2.13/dont_use_system_ld_so_cache.patch delete mode 100644 pkgs/development/libraries/glibc/2.13/glibc-elf-localscope.patch delete mode 100644 pkgs/development/libraries/glibc/2.13/info.nix delete mode 100644 pkgs/development/libraries/glibc/2.13/locales-builder.sh delete mode 100644 pkgs/development/libraries/glibc/2.13/locales.nix delete mode 100644 pkgs/development/libraries/glibc/2.13/nix-locale-archive.patch delete mode 100644 pkgs/development/libraries/glibc/2.13/nss-skip-unavail.patch delete mode 100644 pkgs/development/libraries/glibc/2.13/rpcgen-path.patch diff --git a/pkgs/development/libraries/glibc/2.13/builder.sh b/pkgs/development/libraries/glibc/2.13/builder.sh deleted file mode 100644 index e68e13f9beca..000000000000 --- a/pkgs/development/libraries/glibc/2.13/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.13/catalan-firstdays.patch b/pkgs/development/libraries/glibc/2.13/catalan-firstdays.patch deleted file mode 100644 index 674e0aee8849..000000000000 --- a/pkgs/development/libraries/glibc/2.13/catalan-firstdays.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://bugzilla.redhat.com/show_bug.cgi?id=454629 - ---- glibc-20090510T1842/localedata/locales/ca_ES.orig 2009-06-26 14:05:18.422043552 +0200 -+++ glibc-20090510T1842/localedata/locales/ca_ES 2009-06-26 14:05:38.292042700 +0200 -@@ -138,6 +138,8 @@ - date_fmt "/ - / - " -+first_weekday 2 -+first_workday 2 - END LC_TIME - - LC_PAPER diff --git a/pkgs/development/libraries/glibc/2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix deleted file mode 100644 index 8be076f335c0..000000000000 --- a/pkgs/development/libraries/glibc/2.13/common.nix +++ /dev/null @@ -1,244 +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 "20120223" else "2.13"; - - needsPortsNative = stdenv.isMips || stdenv.isArm; - needsPortsCross = cross.arch == "mips" || cross.arch == "arm"; - needsPorts = - if (stdenv ? cross) && stdenv.cross != null && hurdHeaders == null then true - else if cross == null then needsPortsNative - else needsPortsCross; - - srcPorts = fetchurl { - url = "mirror://gnu/glibc/glibc-ports-2.13.tar.bz2"; - sha256 = "0npffql62m1xba15l1wkaqf2p0l2bvb33720gx28764jmq0la75i"; - }; - -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 - ] - - ++ (stdenv.lib.optional (hurdHeaders == null) - - /* 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 - ] ++ stdenv.lib.optional installLocales ./catalan-firstdays.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 && 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 (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" - ]; - - 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 = "cecec9dd5a2bafc875c56b058b6d7628a22b250b53747513dec304f31ffdb82d"; - rev = "d3cdecf18e6550b0984a42b43ed48c5fb26501e1"; - } - else fetchurl { - url = "mirror://gnu/glibc/glibc-${version}.tar.bz2"; - sha256 = "1cnv319ysc8nkwpqw6f6ymb6b8hbl0nyvyx48sddkrj50lmcjwq1"; - }; - - # `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" - + 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; -} - -// - -(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.13/default.nix b/pkgs/development/libraries/glibc/2.13/default.nix deleted file mode 100644 index f80ed9372e63..000000000000 --- a/pkgs/development/libraries/glibc/2.13/default.nix +++ /dev/null @@ -1,99 +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" - + 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 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.13/dont_use_system_ld_so_cache.patch b/pkgs/development/libraries/glibc/2.13/dont_use_system_ld_so_cache.patch deleted file mode 100644 index 444eb8251e49..000000000000 --- a/pkgs/development/libraries/glibc/2.13/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.13/glibc-elf-localscope.patch b/pkgs/development/libraries/glibc/2.13/glibc-elf-localscope.patch deleted file mode 100644 index 98f7f81087bb..000000000000 --- a/pkgs/development/libraries/glibc/2.13/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.13/info.nix b/pkgs/development/libraries/glibc/2.13/info.nix deleted file mode 100644 index 75bd996d9bc5..000000000000 --- a/pkgs/development/libraries/glibc/2.13/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.13/locales-builder.sh b/pkgs/development/libraries/glibc/2.13/locales-builder.sh deleted file mode 100644 index d732e208fa22..000000000000 --- a/pkgs/development/libraries/glibc/2.13/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.13/locales.nix b/pkgs/development/libraries/glibc/2.13/locales.nix deleted file mode 100644 index b7eae50ca385..000000000000 --- a/pkgs/development/libraries/glibc/2.13/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.13/nix-locale-archive.patch b/pkgs/development/libraries/glibc/2.13/nix-locale-archive.patch deleted file mode 100644 index aca904f7ff44..000000000000 --- a/pkgs/development/libraries/glibc/2.13/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.13/nss-skip-unavail.patch b/pkgs/development/libraries/glibc/2.13/nss-skip-unavail.patch deleted file mode 100644 index e48dc2bc0a6e..000000000000 --- a/pkgs/development/libraries/glibc/2.13/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.13/rpcgen-path.patch b/pkgs/development/libraries/glibc/2.13/rpcgen-path.patch deleted file mode 100644 index fbb03dd5fade..000000000000 --- a/pkgs/development/libraries/glibc/2.13/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 2cc7760b713c..adbbfe69e5c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3797,14 +3797,6 @@ let glibcCross = glibc217Cross; - glibc213 = (callPackage ../development/libraries/glibc/2.13 { - kernelHeaders = linuxHeaders; - installLocales = config.glibc.locales or false; - machHeaders = null; - hurdHeaders = null; - gccCross = null; - }) // (if crossSystem != null then { crossDrv = glibc213Cross; } else {}); - glibc217 = callPackage ../development/libraries/glibc/2.17 { kernelHeaders = linuxHeaders; installLocales = config.glibc.locales or false; From 0f53a2e9f3261998cd10e5c3588c2df0de3218a4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 9 May 2013 13:52:05 +0200 Subject: [PATCH 003/153] glibc: Require Linux 2.6.32 instead of 2.6.35 By popular demand. For instance, many widely used RHEL systems are still on 2.6.32. --- pkgs/development/libraries/glibc/2.17/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glibc/2.17/common.nix b/pkgs/development/libraries/glibc/2.17/common.nix index 413a0d7aae82..23ec1c46ad7b 100644 --- a/pkgs/development/libraries/glibc/2.17/common.nix +++ b/pkgs/development/libraries/glibc/2.17/common.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation ({ then "--enable-profile" else "--disable-profile") ] ++ stdenv.lib.optionals (cross == null && kernelHeaders != null) [ - "--enable-kernel=2.6.35" + "--enable-kernel=2.6.32" ] ++ stdenv.lib.optionals (cross != null) [ (if cross.withTLS then "--with-tls" else "--without-tls") (if cross.float == "soft" then "--without-fp" else "--with-fp") From c2a16ec01208e44cd37baed6654e2d6cc9909b35 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 9 May 2013 13:57:59 +0200 Subject: [PATCH 004/153] glibc: Security fixes. CVE-2013-0242, CVE-2013-1914. --- .../libraries/glibc/2.17/common.nix | 6 ++ .../libraries/glibc/2.17/cve-2013-0242.patch | 87 +++++++++++++++++++ .../libraries/glibc/2.17/cve-2013-1914.patch | 52 +++++++++++ 3 files changed, 145 insertions(+) create mode 100644 pkgs/development/libraries/glibc/2.17/cve-2013-0242.patch create mode 100644 pkgs/development/libraries/glibc/2.17/cve-2013-1914.patch diff --git a/pkgs/development/libraries/glibc/2.17/common.nix b/pkgs/development/libraries/glibc/2.17/common.nix index 23ec1c46ad7b..e0588a6275d6 100644 --- a/pkgs/development/libraries/glibc/2.17/common.nix +++ b/pkgs/development/libraries/glibc/2.17/common.nix @@ -55,6 +55,12 @@ stdenv.mkDerivation ({ rfc3484_sort: Assertion `src->results[i].native == -1 || src->results[i].native == a2_native' failed." crashes. */ ./glibc-rh739743.patch + + /* Fix buffer overrun in regexp matcher. */ + ./cve-2013-0242.patch + + /* Fix stack overflow in getaddrinfo with many results. */ + ./cve-2013-1914.patch ]; postPatch = '' diff --git a/pkgs/development/libraries/glibc/2.17/cve-2013-0242.patch b/pkgs/development/libraries/glibc/2.17/cve-2013-0242.patch new file mode 100644 index 000000000000..1d6557071e1a --- /dev/null +++ b/pkgs/development/libraries/glibc/2.17/cve-2013-0242.patch @@ -0,0 +1,87 @@ +When extending regex buffers, make sure we allocate enough room for the +state log. Merely doubling the space may not be enough if the current +node has accepted a long run of characters. This part of the code only +triggers with multibyte characters. + +Andreas. + + [BZ #15078] + * posix/regexec.c (extend_buffers): Add parameter min_len. + (check_matching): Pass minimum needed length. + (clean_state_log_if_needed): Likewise. + (get_subexp): Likewise. + * posix/Makefile (tests): Add bug-regex34. + (bug-regex34-ENV): Define. + * posix/bug-regex34.c: New file. + +diff --git a/posix/regexec.c b/posix/regexec.c +index 7f2de85..5ca2bf6 100644 +--- a/posix/regexec.c ++++ b/posix/regexec.c +@@ -197,7 +197,7 @@ static int group_nodes_into_DFAstates (const re_dfa_t *dfa, + static int check_node_accept (const re_match_context_t *mctx, + const re_token_t *node, int idx) + internal_function; +-static reg_errcode_t extend_buffers (re_match_context_t *mctx) ++static reg_errcode_t extend_buffers (re_match_context_t *mctx, int min_len) + internal_function; + + /* Entry point for POSIX code. */ +@@ -1160,7 +1160,7 @@ check_matching (re_match_context_t *mctx, int fl_longest_match, + || (BE (next_char_idx >= mctx->input.valid_len, 0) + && mctx->input.valid_len < mctx->input.len)) + { +- err = extend_buffers (mctx); ++ err = extend_buffers (mctx, next_char_idx + 1); + if (BE (err != REG_NOERROR, 0)) + { + assert (err == REG_ESPACE); +@@ -1738,7 +1738,7 @@ clean_state_log_if_needed (re_match_context_t *mctx, int next_state_log_idx) + && mctx->input.valid_len < mctx->input.len)) + { + reg_errcode_t err; +- err = extend_buffers (mctx); ++ err = extend_buffers (mctx, next_state_log_idx + 1); + if (BE (err != REG_NOERROR, 0)) + return err; + } +@@ -2792,7 +2792,7 @@ get_subexp (re_match_context_t *mctx, int bkref_node, int bkref_str_idx) + if (bkref_str_off >= mctx->input.len) + break; + +- err = extend_buffers (mctx); ++ err = extend_buffers (mctx, bkref_str_off + 1); + if (BE (err != REG_NOERROR, 0)) + return err; + +@@ -4102,7 +4102,7 @@ check_node_accept (const re_match_context_t *mctx, const re_token_t *node, + + static reg_errcode_t + internal_function __attribute_warn_unused_result__ +-extend_buffers (re_match_context_t *mctx) ++extend_buffers (re_match_context_t *mctx, int min_len) + { + reg_errcode_t ret; + re_string_t *pstr = &mctx->input; +@@ -4111,8 +4111,10 @@ extend_buffers (re_match_context_t *mctx) + if (BE (INT_MAX / 2 / sizeof (re_dfastate_t *) <= pstr->bufs_len, 0)) + return REG_ESPACE; + +- /* Double the lengthes of the buffers. */ +- ret = re_string_realloc_buffers (pstr, MIN (pstr->len, pstr->bufs_len * 2)); ++ /* Double the lengthes of the buffers, but allocate at least MIN_LEN. */ ++ ret = re_string_realloc_buffers (pstr, ++ MAX (min_len, ++ MIN (pstr->len, pstr->bufs_len * 2))); + if (BE (ret != REG_NOERROR, 0)) + return ret; + +-- +1.8.1.2 + + +-- +Andreas Schwab, SUSE Labs, schwab@suse.de +GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 +"And now for something completely different." + diff --git a/pkgs/development/libraries/glibc/2.17/cve-2013-1914.patch b/pkgs/development/libraries/glibc/2.17/cve-2013-1914.patch new file mode 100644 index 000000000000..c2963249f5e4 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.17/cve-2013-1914.patch @@ -0,0 +1,52 @@ +From: Andreas Schwab +Date: Thu, 21 Mar 2013 14:50:27 +0000 (+0100) +Subject: Fix stack overflow in getaddrinfo with many results +X-Git-Url: http://sourceware.org/git/?p=glibc.git;a=commitdiff_plain;h=1cef1b19089528db11f221e938f60b9b048945d7 + +Fix stack overflow in getaddrinfo with many results +--- + +diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c +index d95c2d1..2309281 100644 +--- a/sysdeps/posix/getaddrinfo.c ++++ b/sysdeps/posix/getaddrinfo.c +@@ -2489,11 +2489,27 @@ getaddrinfo (const char *name, const char *service, + __typeof (once) old_once = once; + __libc_once (once, gaiconf_init); + /* Sort results according to RFC 3484. */ +- struct sort_result results[nresults]; +- size_t order[nresults]; ++ struct sort_result *results; ++ size_t *order; + struct addrinfo *q; + struct addrinfo *last = NULL; + char *canonname = NULL; ++ bool malloc_results; ++ ++ malloc_results ++ = !__libc_use_alloca (nresults * (sizeof (*results) + sizeof (size_t))); ++ if (malloc_results) ++ { ++ results = malloc (nresults * (sizeof (*results) + sizeof (size_t))); ++ if (results == NULL) ++ { ++ __free_in6ai (in6ai); ++ return EAI_MEMORY; ++ } ++ } ++ else ++ results = alloca (nresults * (sizeof (*results) + sizeof (size_t))); ++ order = (size_t *) (results + nresults); + + /* Now we definitely need the interface information. */ + if (! check_pf_called) +@@ -2664,6 +2680,9 @@ getaddrinfo (const char *name, const char *service, + + /* Fill in the canonical name into the new first entry. */ + p->ai_canonname = canonname; ++ ++ if (malloc_results) ++ free (results); + } + + __free_in6ai (in6ai); From 93063dcf038586e012fa831d8df3611fe9ab639a Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Wed, 15 May 2013 02:25:56 +0200 Subject: [PATCH 005/153] eclipse: add latest stable eclipse (sdk), fix 3.7 urls, introducing more declarative style (use getAttr in favour of if) --- pkgs/applications/editors/eclipse/default.nix | 42 ++++++++++++------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index a11cbf349c02..d0ac3890d7f0 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -8,7 +8,7 @@ assert stdenv ? glibc; let buildEclipse = - { name, src, description }: + { name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }: stdenv.mkDerivation rec { inherit name src; @@ -131,17 +131,16 @@ in { eclipse_sdk_37 = buildEclipse { name = "eclipse-sdk-3.7"; description = "Eclipse Classic"; - src = - if stdenv.system == "x86_64-linux" then - fetchurl { - url = http://archive.eclipse.org/eclipse/downloads/drops/R-3.7-201106131736/eclipse-SDK-3.7-linux-gtk-x86_64.tar.gz; - sha256 = "00ig3ww98r8imf32sx5npm6csn5nx288gvdk6w653nijni0di16j"; - } - else - fetchurl { - url = http://archive.eclipse.org/eclipse/downloads/drops/R-3.7-201106131736/eclipse-SDK-3.7-linux-gtk.tar.gz; - sha256 = "08rgw85cam51l98mzb39fdc3ykb369v8pap93qhknbs6a3f5dnff"; + sources = { + "x86_64-linux" = fetchurl { + url = http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/eclipse-SDK-3.7.2-linux-gtk-x86_64.tar.gz; + sha256 = "0nf4nv7awhp1k8b1hjb7chpjyjrqnyszsjbc4dlk9phpjv3j4wg5"; }; + "i686-linux" = fetchurl { + url = http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/eclipse-SDK-3.7.2-linux-gtk.tar.gz; + sha256 = "1isn7i45l9kyn2yx6vm88jl1gnxph8ynank0aaa218cg8kdygk7j"; + }; + }; }; eclipse_cpp_37 = buildEclipse { @@ -160,7 +159,7 @@ in { }; }; - eclipse_cpp_42 = buildEclipse { + eclipse_cpp_421 = buildEclipse { name = "eclipse-cpp-4.2"; description = "Eclipse IDE for C/C++ Developers"; src = @@ -176,8 +175,8 @@ in { }; }; - eclipse_sdk_42 = buildEclipse { - name = "eclipse-sdk-4.2"; + eclipse_sdk_421 = buildEclipse { + name = "eclipse-sdk-4.2.1"; description = "Eclipse Classic"; src = if stdenv.system == "x86_64-linux" then @@ -191,4 +190,19 @@ in { sha256 = "1av6qm9wkbyk123qqf38f0jq4jv2bj9wp6fmpnl55zg6qr463c1w"; }; }; + + eclipse_sdk_422 = buildEclipse { + name = "eclipse-sdk-4.2.2"; + description = "Eclipse Classic"; + sources = { + "x86_64-linux" = fetchurl { + url = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/eclipse/downloads/drops4/R-4.2.2-201302041200/eclipse-SDK-4.2.2-linux-gtk-x86_64.tar.gz; + sha256 = "0ysa6ymk4h3k1vn59dc909iy197kmx132671kbzfwbim87jmgnqb"; + }; + "i686-linux" = fetchurl { + url = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/eclipse/downloads/drops4/R-4.2.2-201302041200/eclipse-SDK-4.2.2-linux-gtk.tar.gz; + sha256 = "038yibbrcia38wi72qrdl03g7l35mpvl5nxdfdnvpqxrkfffb826"; + }; + }; + }; } From 10b79927baa2b3ecb462e399e892b77a11c0c097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 16 May 2013 12:05:05 +0200 Subject: [PATCH 006/153] gtk2/3: bugfix updates --- pkgs/development/libraries/gtk+/2.x.nix | 4 ++-- pkgs/development/libraries/gtk+/3-default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index c8224fa18e6d..62f754c148ea 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.17"; + name = "gtk+-2.24.18"; src = fetchurl { url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz"; - sha256 = "05gl82k82w3gjrzr4vmj3ski7mp1b0jbhc49wgl9hv8mc2sb4iz9"; + sha256 = "1193frzg0qrwa885w77kd055zfpbdjwby88xn2skpx9g4w0k35kc"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gtk+/3-default.nix b/pkgs/development/libraries/gtk+/3-default.nix index 1b296e2c3985..86bd4474c7a2 100644 --- a/pkgs/development/libraries/gtk+/3-default.nix +++ b/pkgs/development/libraries/gtk+/3-default.nix @@ -8,11 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; stdenv.mkDerivation rec { - name = "gtk+-3.8.0"; + name = "gtk+-3.8.2"; src = fetchurl { url = "mirror://gnome/sources/gtk+/3.8/${name}.tar.xz"; - sha256 = "0bi5dip7l6d08c6v9c9aipwsi8hq38xjljqv86nmnpvbkpc4a4yv"; + sha256 = "15zjmyky4yw70ipi12dllira4av8wjpw5f7g9kbrbpx12nf0ra0w"; }; enableParallelBuilding = true; From 70882b980c3ed57b6815ad8f61260f8a5378ec59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 16 May 2013 17:16:02 +0200 Subject: [PATCH 007/153] WARNING: history from now is going to change (mesa+llvm) Current WIP, only tested nouveau (3D works very well). --- pkgs/development/compilers/llvm/default.nix | 27 ++- pkgs/development/libraries/libdrm/default.nix | 4 +- pkgs/development/libraries/mesa/default.nix | 118 ++++++++-- .../libraries/mesa/dricore-gallium.patch | 216 ++++++++++++++++++ .../libraries/mesa/static-gallium.patch | 71 ++++++ .../linux/xf86-video-nouveau/default.nix | 20 +- pkgs/top-level/all-packages.nix | 1 + 7 files changed, 419 insertions(+), 38 deletions(-) create mode 100644 pkgs/development/libraries/mesa/dricore-gallium.patch create mode 100644 pkgs/development/libraries/mesa/static-gallium.patch diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 4b5bbdc52584..1e514884bb5a 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, groff, cmake, python }: +{ stdenv, fetchurl, perl, groff, cmake, python, libffi, libcxx }: let version = "3.2"; in @@ -10,11 +10,32 @@ stdenv.mkDerivation { sha256 = "0hv30v5l4fkgyijs56sr1pbrlzgd674pg143x7az2h37sb290l0j"; }; - buildInputs = [ perl groff cmake python ]; + preConfigure = '' + patchShebangs . + export REQUIRES_RTTI=1 + ''; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; + # ToDo: polly, libc++; --enable-cxx11? + + configureFlags = [ + "--enable-shared" # saves half the size, and even more for e.g. mesa + "--disable-assertions" "--enable-optimized" + "--disable-timestamps" # embedding timestamps seems a danger to purity + "--enable-libffi" + #"--enable-experimental-targets=r600" + #"--enable-libcpp" + ] ; + + patches = [ ./set_soname.patch ]; # http://llvm.org/bugs/show_bug.cgi?id=12334 + patchFlags = "-p0"; + + buildInputs = [ perl groff python ] + #++ [ libcxx ] + ; + propagatedBuildInputs = [ libffi ]; enableParallelBuilding = true; + #ToDo: doCheck? meta = { homepage = http://llvm.org/; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 4e0038d4c34c..1816e212bbd0 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -16,9 +16,7 @@ stdenv.mkDerivation rec { preConfigure = stdenv.lib.optionalString stdenv.isDarwin "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache"; - configureFlags = [ "--enable-nouveau-experimental-api" - "--enable-radeon-experimental-api" - "--enable-udev" ] + configureFlags = [ "--enable-udev" ] ++ stdenv.lib.optional stdenv.isDarwin "-C"; crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index a07323b61b2e..9f1291809a6d 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,46 +1,126 @@ -{ 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 -, libffi, wayland }: +{ stdenv, fetchurl, pkgconfig, intltool, flex, bison, autoconf, automake, libtool +, python, libxml2Python, file, expat, makedepend +, libdrm, xorg, wayland, udev, llvm, libffi +, libvdpau +, enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt +, enableR600LlvmCompiler ? false +}: if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then throw "unsupported platform for Mesa" else +/** Packaging design: + - The basic mesa ($out) contains headers and libraries (GLU is in mesa_glu now). + This or the mesa attribute (which also contains GLU) are small (< 3 MB, mostly headers) + and are designed to be the buildInput of other packages. + - DRI and EGL drivers are compiled into $drivers output, + which is bigger (~27 MB) and depends on LLVM (~80 MB). + These should be searched at runtime in /run/current-system/sw/lib/* + and so are kind-of impure (given by NixOS). + (I suppose on non-NixOS one would create the appropriate symlinks from there.) +*/ + let version = "9.1.2"; + extraFeatures = true; # probably doesn't work with false yet + driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32"; in stdenv.mkDerivation { name = "mesa-noglu-${version}"; src = fetchurl { url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2"; - sha256="1ns366armqmp2bxj1l7fff95v22b5z9mnkyykbdj81lhg9gi3586"; + sha256="1ns366armqmp2bxj1l7fff95v22b5z9mnkyykbdj81lhg9gi3586"; # 9.1.2 }; prePatch = "patchShebangs ."; + patches = [ + ./static-gallium.patch + ./dricore-gallium.patch + ]; + + # Change the search path for EGL drivers from $drivers/* to driverLink + postPatch = '' + sed '/D_EGL_DRIVER_SEARCH_DIR=/s,EGL_DRIVER_INSTALL_DIR,${driverLink}/lib/egl,' \ + -i src/egl/main/Makefile.am + ''; + + outputs = ["out" "drivers"]; + preConfigure = "./autogen.sh"; - configureFlags = - "" - + " --enable-gles1 --enable-gles2 --enable-gallium-egl" - + " --with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast" - + " --with-egl-platforms=x11,wayland,drm --enable-gbm --enable-shared-glapi" - + stdenv.lib.optionalString enableR600LlvmCompiler " --enable-r600-llvm-compiler" - # Texture floats are patented, see docs/patents.txt - + stdenv.lib.optionalString enableTextureFloats " --enable-texture-float"; + configureFlags = with stdenv.lib; [ + "--with-dri-driverdir=$(drivers)/lib/dri" + "--with-egl-driver-dir=$(drivers)/lib/egl" + "--with-dri-searchpath=${driverLink}/lib/dri" - buildInputs = [ - autoconf automake libtool intltool expat libxml2Python udev llvm - libdrm libXxf86vm libXfixes libXdamage glproto dri2proto libX11 libXext libxcb libXt - libffi wayland - ]; + "--enable-dri" + "--enable-glx-tls" + "--enable-shared-glapi" "--enable-shared-gallium" + "--enable-driglx-direct" # seems enabled anyway + "--enable-gallium-llvm" "--with-llvm-shared-libs" + + "--with-dri-drivers=i965,r200,radeon" + "--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast" # radeonsi complains about R600 missing in LLVM + "--with-egl-platforms=x11,wayland,drm" "--enable-gbm" "--enable-shared-glapi" + ] + ++ optional enableR600LlvmCompiler "--enable-r600-llvm-compiler" # complains about R600 missing in LLVM + ++ optional enableTextureFloats "--enable-texture-float" + ++ optionals extraFeatures [ + "--enable-gles1" "--enable-gles2" + "--enable-xa" + "--enable-osmesa" + "--enable-openvg" "--enable-gallium-egl" # not needed for EGL in Gallium, but OpenVG might be useful + #"--enable-xvmc" # tests segfault with 9.1.{1,2} + "--enable-vdpau" + #"--enable-opencl" # ToDo: opencl seems to need libclc for clover + ]; nativeBuildInputs = [ pkgconfig python makedepend file flex bison ]; + buildInputs = with xorg; [ + autoconf automake libtool intltool expat libxml2Python udev llvm + libdrm libXxf86vm libXfixes libXdamage glproto dri2proto libX11 libXext libxcb libXt + libffi wayland + ] ++ stdenv.lib.optionals extraFeatures [ /*libXvMC*/ libvdpau ]; + enableParallelBuilding = true; + doCheck = true; + + # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM + # ToDo: probably not all .la files are completely fixed, but it shouldn't matter + postInstall = '' + mv -t "$drivers/lib/" \ + $out/lib/libdricore* \ + $out/lib/libgallium.* \ + $out/lib/gallium-pipe \ + $out/lib/gbm \ + $out/lib/libxatracker* \ + `#$out/lib/libXvMC*` \ + $out/lib/vdpau \ + $out/lib/libOSMesa* + '' + /* now fix references in .la files */ '' + sed "/^libdir=/s,$out,$drivers," -i \ + $drivers/lib/gallium-pipe/*.la \ + $drivers/lib/libgallium.la \ + $drivers/lib/libdricore*.la \ + `#$drivers/lib/libXvMC*.la` \ + $drivers/lib/vdpau/*.la \ + $drivers/lib/libOSMesa*.la + sed "s,$out\(/lib/\(libdricore[0-9\.]*\|libgallium\).la\),$drivers\1,g" \ + -i $drivers/lib/*.la $drivers/lib/*/*.la + '' + /* work around bug #529, but maybe $drivers should also be patchelf-ed */ '' + find $drivers/ -type f -executable -print0 | xargs -0 strip -S || true + '' + /* add RPATH so the drivers can find the moved libgallium and libdricore9 */ '' + for lib in $drivers/lib/*.so* $drivers/lib/*/*.so*; do + if [[ ! -L "$lib" ]]; then + patchelf --set-rpath "$(patchelf --print-rpath $lib):$drivers/lib" "$lib" + fi + done + ''; + #ToDo: @vcunat isn't sure if drirc will be found when in $out/etc/, but it doesn't seem important ATM passthru = { inherit libdrm; inherit version; }; diff --git a/pkgs/development/libraries/mesa/dricore-gallium.patch b/pkgs/development/libraries/mesa/dricore-gallium.patch new file mode 100644 index 000000000000..9a8b6768277b --- /dev/null +++ b/pkgs/development/libraries/mesa/dricore-gallium.patch @@ -0,0 +1,216 @@ +commit 5208f187c7dade2c33385a56c1a5f1c3cedc8377 (HEAD, nix-patches) +Author: Vladimír Čunát +Date: Mon May 13 11:34:59 2013 +0200 + + 118-dricore-gallium.patch + +diff --git a/configure.ac b/configure.ac +index be89843..08f6761 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -928,6 +928,8 @@ AC_SUBST([GLESv2_LIB_DEPS]) + AC_SUBST([GLESv2_PC_LIB_PRIV]) + + DRI_LIB_DEPS="\$(top_builddir)/src/mesa/libdricore/libdricore${VERSION}.la" ++MESAGALLIUM_LIBS="${DRI_LIB_DEPS}" ++AC_SUBST([MESAGALLIUM_LIBS], ${MESAGALLIUM_LIBS}) + + AC_SUBST([HAVE_XF86VIDMODE]) + +diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am +index 3cdec83..53ff69b 100644 +--- a/src/gallium/auxiliary/Makefile.am ++++ b/src/gallium/auxiliary/Makefile.am +@@ -34,14 +34,14 @@ if LLVM_NEEDS_FNORTTI + + AM_CXXFLAGS += -fno-rtti + +-libgallium_la_LIBADD = $(LLVM_LIBS) +- + endif + + libgallium_la_SOURCES += \ + $(GALLIVM_SOURCES) \ + $(GALLIVM_CPP_SOURCES) + ++libgallium_la_LIBADD = ../../mesa/libdricore/libmesagallium.la $(LLVM_LIBS) $(GALLIUM_DRI_LIB_DEPS) ++ + endif + + indices/u_indices_gen.c: $(srcdir)/indices/u_indices_gen.py +diff --git a/src/gallium/targets/dri-i915/Makefile.am b/src/gallium/targets/dri-i915/Makefile.am +index f4f9030..e9b9462 100644 +--- a/src/gallium/targets/dri-i915/Makefile.am ++++ b/src/gallium/targets/dri-i915/Makefile.am +@@ -49,7 +49,7 @@ i915_dri_la_SOURCES = \ + i915_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined + + i915_dri_la_LIBADD = \ +- $(top_builddir)/src/mesa/libmesagallium.la \ ++ @MESAGALLIUM_LIBS@ \ + $(top_builddir)/src/gallium/auxiliary/libgallium.la \ + $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ + $(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \ +diff --git a/src/gallium/targets/dri-nouveau/Makefile.am b/src/gallium/targets/dri-nouveau/Makefile.am +index 69ccf32..fef4c63 100644 +--- a/src/gallium/targets/dri-nouveau/Makefile.am ++++ b/src/gallium/targets/dri-nouveau/Makefile.am +@@ -48,7 +48,7 @@ nouveau_dri_la_SOURCES = \ + nouveau_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined + + nouveau_dri_la_LIBADD = \ +- $(top_builddir)/src/mesa/libmesagallium.la \ ++ @MESAGALLIUM_LIBS@ \ + $(top_builddir)/src/gallium/auxiliary/libgallium.la \ + $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ + $(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \ +diff --git a/src/gallium/targets/dri-r300/Makefile.am b/src/gallium/targets/dri-r300/Makefile.am +index 8c0215d..6beb536 100644 +--- a/src/gallium/targets/dri-r300/Makefile.am ++++ b/src/gallium/targets/dri-r300/Makefile.am +@@ -49,7 +49,7 @@ r300_dri_la_SOURCES = \ + r300_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined + + r300_dri_la_LIBADD = \ +- $(top_builddir)/src/mesa/libmesagallium.la \ ++ @MESAGALLIUM_LIBS@ \ + $(top_builddir)/src/gallium/auxiliary/libgallium.la \ + $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ + $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \ +diff --git a/src/gallium/targets/dri-r600/Makefile.am b/src/gallium/targets/dri-r600/Makefile.am +index 2b3524b..d40fb89 100644 +--- a/src/gallium/targets/dri-r600/Makefile.am ++++ b/src/gallium/targets/dri-r600/Makefile.am +@@ -48,7 +48,7 @@ r600_dri_la_SOURCES = \ + r600_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined + + r600_dri_la_LIBADD = \ +- $(top_builddir)/src/mesa/libmesagallium.la \ ++ @MESAGALLIUM_LIBS@ \ + $(top_builddir)/src/gallium/auxiliary/libgallium.la \ + $(top_builddir)/src/gallium/drivers/r600/libr600.la \ + $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ +diff --git a/src/gallium/targets/dri-radeonsi/Makefile.am b/src/gallium/targets/dri-radeonsi/Makefile.am +index f7d87a6..87ab2aa 100644 +--- a/src/gallium/targets/dri-radeonsi/Makefile.am ++++ b/src/gallium/targets/dri-radeonsi/Makefile.am +@@ -49,7 +49,7 @@ radeonsi_dri_la_SOURCES = \ + radeonsi_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined + + radeonsi_dri_la_LIBADD = \ +- $(top_builddir)/src/mesa/libmesagallium.la \ ++ @MESAGALLIUM_LIBS@ \ + $(top_builddir)/src/gallium/auxiliary/libgallium.la \ + $(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \ + $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ +diff --git a/src/gallium/targets/dri-swrast/Makefile.am b/src/gallium/targets/dri-swrast/Makefile.am +index 1104379..72d2401 100644 +--- a/src/gallium/targets/dri-swrast/Makefile.am ++++ b/src/gallium/targets/dri-swrast/Makefile.am +@@ -49,7 +49,7 @@ swrast_dri_la_SOURCES = \ + swrast_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined + + swrast_dri_la_LIBADD = \ +- $(top_builddir)/src/mesa/libmesagallium.la \ ++ @MESAGALLIUM_LIBS@ \ + $(top_builddir)/src/gallium/auxiliary/libgallium.la \ + $(top_builddir)/src/gallium/state_trackers/dri/sw/libdrisw.la \ + $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la \ +diff --git a/src/gallium/targets/dri-vmwgfx/Makefile.am b/src/gallium/targets/dri-vmwgfx/Makefile.am +index ca7df65..4384976 100644 +--- a/src/gallium/targets/dri-vmwgfx/Makefile.am ++++ b/src/gallium/targets/dri-vmwgfx/Makefile.am +@@ -48,7 +48,7 @@ vmwgfx_dri_la_SOURCES = \ + vmwgfx_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined + + vmwgfx_dri_la_LIBADD = \ +- $(top_builddir)/src/mesa/libmesagallium.la \ ++ @MESAGALLIUM_LIBS@ \ + $(top_builddir)/src/gallium/auxiliary/libgallium.la \ + $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ + $(top_builddir)/src/gallium/winsys/svga/drm/libsvgadrm.la \ +diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am +index 5c40ae8..6922ab2 100644 +--- a/src/gallium/targets/egl-static/Makefile.am ++++ b/src/gallium/targets/egl-static/Makefile.am +@@ -104,7 +104,7 @@ AM_CPPFLAGS += \ + $(API_DEFINES) + + egl_gallium_la_LIBADD += \ +- $(top_builddir)/src/mesa/libmesagallium.la ++ @MESAGALLIUM_LIBS@ + # make st/mesa built-in when there is a single glapi provider + if HAVE_SHARED_GLAPI + egl_gallium_la_LIBADD += \ +diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am +index 41483dd..0045a673 100644 +--- a/src/mesa/Makefile.am ++++ b/src/mesa/Makefile.am +@@ -75,9 +75,6 @@ noinst_LTLIBRARIES += libmesa.la + else + check_LTLIBRARIES = libmesa.la + endif +-if HAVE_GALLIUM +-noinst_LTLIBRARIES += libmesagallium.la +-endif + + SRCDIR = $(top_srcdir)/src/mesa/ + BUILDDIR = $(top_builddir)/src/mesa/ +@@ -119,15 +116,6 @@ libmesa_la_LIBADD = \ + $() + libmesa_la_LDFLAGS = + +-libmesagallium_la_SOURCES = \ +- $(MESA_GALLIUM_FILES) \ +- $(MESA_ASM_FILES_FOR_ARCH) +- +-libmesagallium_la_LIBADD = \ +- $(top_builddir)/src/glsl/libglsl.la \ +- $(top_builddir)/src/mesa/program/libprogram.la \ +- $() +- + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = gl.pc + +diff --git a/src/mesa/libdricore/Makefile.am b/src/mesa/libdricore/Makefile.am +index 753548e..8761418 100644 +--- a/src/mesa/libdricore/Makefile.am ++++ b/src/mesa/libdricore/Makefile.am +@@ -42,6 +42,7 @@ libdricore@VERSION@_la_SOURCES = \ + libdricore@VERSION@_la_LDFLAGS = -version-number 1:0 + libdricore@VERSION@_la_LIBADD = \ + ../program/libdricore_program.la \ ++ $(top_builddir)/src/mapi/shared-glapi/libglapi.la + $() + + if HAVE_X86_ASM +@@ -65,8 +66,10 @@ AM_CPPFLAGS += \ + -I$(top_srcdir)/src/mesa/sparc + endif + ++lib_LTLIBRARIES = ++ + if HAVE_DRI +-lib_LTLIBRARIES = libdricore@VERSION@.la ++lib_LTLIBRARIES += libdricore@VERSION@.la + + # Provide compatibility with scripts for the old Mesa build system for + # a while by putting a link to the driver into /lib of the build tree. +@@ -76,6 +79,17 @@ all-local: libdricore@VERSION@.la + ln -sf libdricore@VERSION@.so.1 $(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so + endif + ++libmesagallium_la_SOURCES = \ ++ $(STATETRACKER_FILES) ++libmesagallium_la_CFLAGS = @LLVM_CFLAGS@ ++libmesagallium_la_CXXFLAGS = @LLVM_CXXFLAGS@ ++libmesagallium_la_LIBADD = libdricore@VERSION@.la $(LLVM_LIBS) ++ ++if HAVE_GALLIUM ++noinst_LTLIBRARIES = libmesagallium.la ++endif ++ ++ + CLEANFILES = \ + $(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so.1 \ + $(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so diff --git a/pkgs/development/libraries/mesa/static-gallium.patch b/pkgs/development/libraries/mesa/static-gallium.patch new file mode 100644 index 000000000000..755682d9f1e8 --- /dev/null +++ b/pkgs/development/libraries/mesa/static-gallium.patch @@ -0,0 +1,71 @@ +commit 2c910b6f186616cac8134e2a2cbe239c8351ed99 +Author: Vladimír Čunát +Date: Mon May 13 11:34:34 2013 +0200 + + 117-static-gallium.patch + + Conflicts (moving of VISIBILITY_ confused the merge): + src/gallium/auxiliary/Makefile.am + +diff --git a/configure.ac b/configure.ac +index b9fcb0b..be89843 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -747,6 +747,19 @@ if test "x$enable_shared_glapi" = xyes; then + fi + AM_CONDITIONAL(HAVE_SHARED_GLAPI, test "x$enable_shared_glapi" = xyes) + ++AC_ARG_ENABLE([shared-gallium], ++ [AS_HELP_STRING([--enable-shared-gallium], ++ [Enable shared gallium core @<:@default=yes@:>@])], ++ [enable_shared_gallium="$enableval"], ++ [enable_shared_gallium=yes]) ++ ++SHARED_GALLIUM="0" ++if test "x$enable_shared_gallium" = xyes; then ++ SHARED_GALLIUM="1" ++fi ++AC_SUBST([SHARED_GALLIUM]) ++AM_CONDITIONAL(HAVE_SHARED_GALLIUM, test $SHARED_GALLIUM = 1) ++ + dnl + dnl Driver specific build directories + dnl +diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am +index f14279b..3cdec83 100644 +--- a/src/gallium/auxiliary/Makefile.am ++++ b/src/gallium/auxiliary/Makefile.am +@@ -3,14 +3,19 @@ AUTOMAKE_OPTIONS = subdir-objects + include Makefile.sources + include $(top_srcdir)/src/gallium/Automake.inc + +-noinst_LTLIBRARIES = libgallium.la +- + AM_CFLAGS = \ + -I$(top_srcdir)/src/gallium/auxiliary/util \ +- $(GALLIUM_CFLAGS) \ +- $(VISIBILITY_CFLAGS) ++ $(GALLIUM_CFLAGS) + +-AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS) ++AM_CXXFLAGS = ++ ++if HAVE_SHARED_GALLIUM ++lib_LTLIBRARIES = libgallium.la ++else ++noinst_LTLIBRARIES = libgallium.la ++AM_CFLAGS += $(VISIBILITY_CFLAGS) ++AM_CXXFLAGS += $(VISIBILITY_CXXFLAGS) ++endif + + libgallium_la_SOURCES = \ + $(C_SOURCES) \ +@@ -29,6 +34,8 @@ if LLVM_NEEDS_FNORTTI + + AM_CXXFLAGS += -fno-rtti + ++libgallium_la_LIBADD = $(LLVM_LIBS) ++ + endif + + libgallium_la_SOURCES += \ diff --git a/pkgs/os-specific/linux/xf86-video-nouveau/default.nix b/pkgs/os-specific/linux/xf86-video-nouveau/default.nix index 876daa7a1ecb..8ac5cdb69696 100644 --- a/pkgs/os-specific/linux/xf86-video-nouveau/default.nix +++ b/pkgs/os-specific/linux/xf86-video-nouveau/default.nix @@ -1,5 +1,5 @@ { stdenv -, fetchgit +, fetchurl , autoconf , automake , libtool @@ -8,28 +8,22 @@ , libdrm , pkgconfig }: -stdenv.mkDerivation { - name = "xf86-video-nouveau-2012-03-05"; +stdenv.mkDerivation rec { + name = "xf86-video-nouveau-1.0.7"; - src = fetchgit { - url = git://anongit.freedesktop.org/nouveau/xf86-video-nouveau; - rev = "f5d1cd2cb6808838ae1a188cef888eaa9582c76d"; - sha256 = "8c20e9ce7897fbd4c5097e4738e80ecca30e6326b758a13fc97f96ccc12fd7d9"; + src = fetchurl { + url = "mirror://xorg/individual/driver/${name}.tar.bz2"; + sha256 = "0cg1q9dz9ksfp593x707gr10s8p7z00zdws1r4lshg42w5ccd1yi"; }; + buildInputs = [ - autoconf - automake - libtool xorgserver xproto fontsproto xf86driproto renderproto videoproto pixman utilmacros libdrm pkgconfig ]; - NIX_CFLAGS_COMPILE = "-I${pixman}/include/pixman-1"; - - preConfigure = "autoreconf -vfi"; meta = { homepage = http://nouveau.freedesktop.org/wiki/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d39d23a0b3a2..c2daf19c527c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4646,6 +4646,7 @@ let mesaSupported = lib.elem system lib.platforms.mesaPlatforms; mesa_noglu = callPackage ../development/libraries/mesa { }; + mesa_drivers = mesa_noglu.drivers; mesa_glu = callPackage ../development/libraries/mesa-glu { }; mesa = if stdenv.isDarwin then darwinX11AndOpenGL else buildEnv { From d45b50ce6ff7f5982d71c28fba8446b00f45eaac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 16 May 2013 18:49:47 +0200 Subject: [PATCH 008/153] llvm: add forgotten patch, WIP --- pkgs/development/compilers/llvm/set_soname.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 pkgs/development/compilers/llvm/set_soname.patch diff --git a/pkgs/development/compilers/llvm/set_soname.patch b/pkgs/development/compilers/llvm/set_soname.patch new file mode 100644 index 000000000000..69ba74dddad8 --- /dev/null +++ b/pkgs/development/compilers/llvm/set_soname.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/show_bug.cgi?id=409267 +http://llvm.org/bugs/show_bug.cgi?id=12334 +--- tools/llvm-shlib/Makefile.orig 2012-03-26 18:14:13.071797115 +0200 ++++ tools/llvm-shlib/Makefile 2012-03-26 17:31:12.491196254 +0200 +@@ -67,6 +67,7 @@ + # Include everything from the .a's into the shared library. + LLVMLibsOptions := -Wl,--whole-archive $(LLVMLibsOptions) \ + -Wl,--no-whole-archive ++ LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT) + endif + + ifeq ($(HOST_OS),Linux) From 6e1fa815684627ece0dc12a367ba4b41f9601134 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 16 May 2013 20:35:04 +0200 Subject: [PATCH 009/153] mesa WIP: patch bad rounding (was OK on my HW, but not on hydra) --- pkgs/development/libraries/mesa/default.nix | 1 + .../libraries/mesa/fix-rounding.patch | 357 ++++++++++++++++++ 2 files changed, 358 insertions(+) create mode 100644 pkgs/development/libraries/mesa/fix-rounding.patch diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 9f1291809a6d..32ce4177b997 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation { patches = [ ./static-gallium.patch ./dricore-gallium.patch + ./fix-rounding.patch ]; # Change the search path for EGL drivers from $drivers/* to driverLink diff --git a/pkgs/development/libraries/mesa/fix-rounding.patch b/pkgs/development/libraries/mesa/fix-rounding.patch new file mode 100644 index 000000000000..f81760a6708a --- /dev/null +++ b/pkgs/development/libraries/mesa/fix-rounding.patch @@ -0,0 +1,357 @@ +From c25ae5d27b114e23d5734f846002df1a05759658 Mon Sep 17 00:00:00 2001 +From: Roland Scheidegger +Date: Thu, 31 Jan 2013 19:27:49 +0000 +Subject: gallivm: fix issues with trunc/round/floor/ceil with no arch rounding + +The emulation of these if there's no rounding instruction available +is a bit more complicated than what the code did. +In particular, doing fp-to-int/int-to-fp will not work if the exponent +is large enough (and with NaNs, Infs). Hence such values need to be filtered +out and the original value returned in this case (which fortunately should +always be exact). This comes at the expense of performance (if your cpu +doesn't support rounding instructions). +Furthermore, floor/ifloor/ceil/iceil were affected by precision issues for +values near negative (for floor) or positive (for ceil) zero, fix that as well +(fixing this issue might not actually be slower except for ceil/iceil if the +type is not signed which is probably rare - note iceil has no callers left +in any case). + +Also add some new rounding test values in lp_test_arit to actually test +for that stuff (which previously would have failed without sse41). + +This fixes https://bugs.freedesktop.org/show_bug.cgi?id=59701. +--- +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_arit.c b/src/gallium/auxiliary/gallivm/lp_bld_arit.c +index b4e9f23..ec05026 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_arit.c ++++ b/src/gallium/auxiliary/gallivm/lp_bld_arit.c +@@ -1590,12 +1590,37 @@ lp_build_trunc(struct lp_build_context *bld, + return lp_build_round_arch(bld, a, LP_BUILD_ROUND_TRUNCATE); + } + else { +- LLVMTypeRef vec_type = lp_build_vec_type(bld->gallivm, type); +- LLVMTypeRef int_vec_type = lp_build_int_vec_type(bld->gallivm, type); +- LLVMValueRef res; +- res = LLVMBuildFPToSI(builder, a, int_vec_type, ""); +- res = LLVMBuildSIToFP(builder, res, vec_type, ""); +- return res; ++ const struct lp_type type = bld->type; ++ struct lp_type inttype; ++ struct lp_build_context intbld; ++ LLVMValueRef cmpval = lp_build_const_vec(bld->gallivm, type, 2^24); ++ LLVMValueRef trunc, res, anosign, mask; ++ LLVMTypeRef int_vec_type = bld->int_vec_type; ++ LLVMTypeRef vec_type = bld->vec_type; ++ ++ assert(type.width == 32); /* might want to handle doubles at some point */ ++ ++ inttype = type; ++ inttype.floating = 0; ++ lp_build_context_init(&intbld, bld->gallivm, inttype); ++ ++ /* round by truncation */ ++ trunc = LLVMBuildFPToSI(builder, a, int_vec_type, ""); ++ res = LLVMBuildSIToFP(builder, trunc, vec_type, "floor.trunc"); ++ ++ /* mask out sign bit */ ++ anosign = lp_build_abs(bld, a); ++ /* ++ * mask out all values if anosign > 2^24 ++ * This should work both for large ints (all rounding is no-op for them ++ * because such floats are always exact) as well as special cases like ++ * NaNs, Infs (taking advantage of the fact they use max exponent). ++ * (2^24 is arbitrary anything between 2^24 and 2^31 should work.) ++ */ ++ anosign = LLVMBuildBitCast(builder, anosign, int_vec_type, ""); ++ cmpval = LLVMBuildBitCast(builder, cmpval, int_vec_type, ""); ++ mask = lp_build_cmp(&intbld, PIPE_FUNC_GREATER, anosign, cmpval); ++ return lp_build_select(bld, mask, a, res); + } + } + +@@ -1620,11 +1645,36 @@ lp_build_round(struct lp_build_context *bld, + return lp_build_round_arch(bld, a, LP_BUILD_ROUND_NEAREST); + } + else { +- LLVMTypeRef vec_type = lp_build_vec_type(bld->gallivm, type); +- LLVMValueRef res; ++ const struct lp_type type = bld->type; ++ struct lp_type inttype; ++ struct lp_build_context intbld; ++ LLVMValueRef cmpval = lp_build_const_vec(bld->gallivm, type, 2^24); ++ LLVMValueRef res, anosign, mask; ++ LLVMTypeRef int_vec_type = bld->int_vec_type; ++ LLVMTypeRef vec_type = bld->vec_type; ++ ++ assert(type.width == 32); /* might want to handle doubles at some point */ ++ ++ inttype = type; ++ inttype.floating = 0; ++ lp_build_context_init(&intbld, bld->gallivm, inttype); ++ + res = lp_build_iround(bld, a); + res = LLVMBuildSIToFP(builder, res, vec_type, ""); +- return res; ++ ++ /* mask out sign bit */ ++ anosign = lp_build_abs(bld, a); ++ /* ++ * mask out all values if anosign > 2^24 ++ * This should work both for large ints (all rounding is no-op for them ++ * because such floats are always exact) as well as special cases like ++ * NaNs, Infs (taking advantage of the fact they use max exponent). ++ * (2^24 is arbitrary anything between 2^24 and 2^31 should work.) ++ */ ++ anosign = LLVMBuildBitCast(builder, anosign, int_vec_type, ""); ++ cmpval = LLVMBuildBitCast(builder, cmpval, int_vec_type, ""); ++ mask = lp_build_cmp(&intbld, PIPE_FUNC_GREATER, anosign, cmpval); ++ return lp_build_select(bld, mask, a, res); + } + } + +@@ -1648,11 +1698,52 @@ lp_build_floor(struct lp_build_context *bld, + return lp_build_round_arch(bld, a, LP_BUILD_ROUND_FLOOR); + } + else { +- LLVMTypeRef vec_type = lp_build_vec_type(bld->gallivm, type); +- LLVMValueRef res; +- res = lp_build_ifloor(bld, a); +- res = LLVMBuildSIToFP(builder, res, vec_type, ""); +- return res; ++ const struct lp_type type = bld->type; ++ struct lp_type inttype; ++ struct lp_build_context intbld; ++ LLVMValueRef cmpval = lp_build_const_vec(bld->gallivm, type, 2^24); ++ LLVMValueRef trunc, res, anosign, mask; ++ LLVMTypeRef int_vec_type = bld->int_vec_type; ++ LLVMTypeRef vec_type = bld->vec_type; ++ ++ assert(type.width == 32); /* might want to handle doubles at some point */ ++ ++ inttype = type; ++ inttype.floating = 0; ++ lp_build_context_init(&intbld, bld->gallivm, inttype); ++ ++ /* round by truncation */ ++ trunc = LLVMBuildFPToSI(builder, a, int_vec_type, ""); ++ res = LLVMBuildSIToFP(builder, trunc, vec_type, "floor.trunc"); ++ ++ if (type.sign) { ++ LLVMValueRef tmp; ++ ++ /* ++ * fix values if rounding is wrong (for non-special cases) ++ * - this is the case if trunc > a ++ */ ++ mask = lp_build_cmp(bld, PIPE_FUNC_GREATER, res, a); ++ /* tmp = trunc > a ? 1.0 : 0.0 */ ++ tmp = LLVMBuildBitCast(builder, bld->one, int_vec_type, ""); ++ tmp = lp_build_and(&intbld, mask, tmp); ++ tmp = LLVMBuildBitCast(builder, tmp, vec_type, ""); ++ res = lp_build_sub(bld, res, tmp); ++ } ++ ++ /* mask out sign bit */ ++ anosign = lp_build_abs(bld, a); ++ /* ++ * mask out all values if anosign > 2^24 ++ * This should work both for large ints (all rounding is no-op for them ++ * because such floats are always exact) as well as special cases like ++ * NaNs, Infs (taking advantage of the fact they use max exponent). ++ * (2^24 is arbitrary anything between 2^24 and 2^31 should work.) ++ */ ++ anosign = LLVMBuildBitCast(builder, anosign, int_vec_type, ""); ++ cmpval = LLVMBuildBitCast(builder, cmpval, int_vec_type, ""); ++ mask = lp_build_cmp(&intbld, PIPE_FUNC_GREATER, anosign, cmpval); ++ return lp_build_select(bld, mask, a, res); + } + } + +@@ -1676,11 +1767,48 @@ lp_build_ceil(struct lp_build_context *bld, + return lp_build_round_arch(bld, a, LP_BUILD_ROUND_CEIL); + } + else { +- LLVMTypeRef vec_type = lp_build_vec_type(bld->gallivm, type); +- LLVMValueRef res; +- res = lp_build_iceil(bld, a); +- res = LLVMBuildSIToFP(builder, res, vec_type, ""); +- return res; ++ const struct lp_type type = bld->type; ++ struct lp_type inttype; ++ struct lp_build_context intbld; ++ LLVMValueRef cmpval = lp_build_const_vec(bld->gallivm, type, 2^24); ++ LLVMValueRef trunc, res, anosign, mask, tmp; ++ LLVMTypeRef int_vec_type = bld->int_vec_type; ++ LLVMTypeRef vec_type = bld->vec_type; ++ ++ assert(type.width == 32); /* might want to handle doubles at some point */ ++ ++ inttype = type; ++ inttype.floating = 0; ++ lp_build_context_init(&intbld, bld->gallivm, inttype); ++ ++ /* round by truncation */ ++ trunc = LLVMBuildFPToSI(builder, a, int_vec_type, ""); ++ trunc = LLVMBuildSIToFP(builder, trunc, vec_type, "ceil.trunc"); ++ ++ /* ++ * fix values if rounding is wrong (for non-special cases) ++ * - this is the case if trunc < a ++ */ ++ mask = lp_build_cmp(bld, PIPE_FUNC_LESS, trunc, a); ++ /* tmp = trunc < a ? 1.0 : 0.0 */ ++ tmp = LLVMBuildBitCast(builder, bld->one, int_vec_type, ""); ++ tmp = lp_build_and(&intbld, mask, tmp); ++ tmp = LLVMBuildBitCast(builder, tmp, vec_type, ""); ++ res = lp_build_add(bld, trunc, tmp); ++ ++ /* mask out sign bit */ ++ anosign = lp_build_abs(bld, a); ++ /* ++ * mask out all values if anosign > 2^24 ++ * This should work both for large ints (all rounding is no-op for them ++ * because such floats are always exact) as well as special cases like ++ * NaNs, Infs (taking advantage of the fact they use max exponent). ++ * (2^24 is arbitrary anything between 2^24 and 2^31 should work.) ++ */ ++ anosign = LLVMBuildBitCast(builder, anosign, int_vec_type, ""); ++ cmpval = LLVMBuildBitCast(builder, cmpval, int_vec_type, ""); ++ mask = lp_build_cmp(&intbld, PIPE_FUNC_GREATER, anosign, cmpval); ++ return lp_build_select(bld, mask, a, res); + } + } + +@@ -1826,32 +1954,30 @@ lp_build_ifloor(struct lp_build_context *bld, + res = lp_build_round_arch(bld, a, LP_BUILD_ROUND_FLOOR); + } + else { +- /* Take the sign bit and add it to 1 constant */ +- LLVMTypeRef vec_type = bld->vec_type; +- unsigned mantissa = lp_mantissa(type); +- LLVMValueRef mask = lp_build_const_int_vec(bld->gallivm, type, +- (unsigned long long)1 << (type.width - 1)); +- LLVMValueRef sign; +- LLVMValueRef offset; ++ struct lp_type inttype; ++ struct lp_build_context intbld; ++ LLVMValueRef trunc, itrunc, mask; + +- /* sign = a < 0 ? ~0 : 0 */ +- sign = LLVMBuildBitCast(builder, a, int_vec_type, ""); +- sign = LLVMBuildAnd(builder, sign, mask, ""); +- sign = LLVMBuildAShr(builder, sign, +- lp_build_const_int_vec(bld->gallivm, type, +- type.width - 1), +- "ifloor.sign"); ++ assert(type.floating); ++ assert(lp_check_value(type, a)); + +- /* offset = -0.99999(9)f */ +- offset = lp_build_const_vec(bld->gallivm, type, +- -(double)(((unsigned long long)1 << mantissa) - 10)/((unsigned long long)1 << mantissa)); +- offset = LLVMConstBitCast(offset, int_vec_type); ++ inttype = type; ++ inttype.floating = 0; ++ lp_build_context_init(&intbld, bld->gallivm, inttype); + +- /* offset = a < 0 ? offset : 0.0f */ +- offset = LLVMBuildAnd(builder, offset, sign, ""); +- offset = LLVMBuildBitCast(builder, offset, vec_type, "ifloor.offset"); ++ /* round by truncation */ ++ itrunc = LLVMBuildFPToSI(builder, a, int_vec_type, ""); ++ trunc = LLVMBuildSIToFP(builder, itrunc, bld->vec_type, "ifloor.trunc"); + +- res = LLVMBuildFAdd(builder, res, offset, "ifloor.res"); ++ /* ++ * fix values if rounding is wrong (for non-special cases) ++ * - this is the case if trunc > a ++ * The results of doing this with NaNs, very large values etc. ++ * are undefined but this seems to be the case anyway. ++ */ ++ mask = lp_build_cmp(bld, PIPE_FUNC_GREATER, trunc, a); ++ /* cheapie minus one with mask since the mask is minus one / zero */ ++ return lp_build_add(&intbld, itrunc, mask); + } + } + +@@ -1883,35 +2009,30 @@ lp_build_iceil(struct lp_build_context *bld, + res = lp_build_round_arch(bld, a, LP_BUILD_ROUND_CEIL); + } + else { +- LLVMTypeRef vec_type = bld->vec_type; +- unsigned mantissa = lp_mantissa(type); +- LLVMValueRef offset; ++ struct lp_type inttype; ++ struct lp_build_context intbld; ++ LLVMValueRef trunc, itrunc, mask; + +- /* offset = 0.99999(9)f */ +- offset = lp_build_const_vec(bld->gallivm, type, +- (double)(((unsigned long long)1 << mantissa) - 10)/((unsigned long long)1 << mantissa)); ++ assert(type.floating); ++ assert(lp_check_value(type, a)); + +- if (type.sign) { +- LLVMValueRef mask = lp_build_const_int_vec(bld->gallivm, type, +- (unsigned long long)1 << (type.width - 1)); +- LLVMValueRef sign; ++ inttype = type; ++ inttype.floating = 0; ++ lp_build_context_init(&intbld, bld->gallivm, inttype); + +- /* sign = a < 0 ? 0 : ~0 */ +- sign = LLVMBuildBitCast(builder, a, int_vec_type, ""); +- sign = LLVMBuildAnd(builder, sign, mask, ""); +- sign = LLVMBuildAShr(builder, sign, +- lp_build_const_int_vec(bld->gallivm, type, +- type.width - 1), +- "iceil.sign"); +- sign = LLVMBuildNot(builder, sign, "iceil.not"); +- +- /* offset = a < 0 ? 0.0 : offset */ +- offset = LLVMConstBitCast(offset, int_vec_type); +- offset = LLVMBuildAnd(builder, offset, sign, ""); +- offset = LLVMBuildBitCast(builder, offset, vec_type, "iceil.offset"); +- } ++ /* round by truncation */ ++ itrunc = LLVMBuildFPToSI(builder, a, int_vec_type, ""); ++ trunc = LLVMBuildSIToFP(builder, itrunc, bld->vec_type, "iceil.trunc"); + +- res = LLVMBuildFAdd(builder, a, offset, "iceil.res"); ++ /* ++ * fix values if rounding is wrong (for non-special cases) ++ * - this is the case if trunc < a ++ * The results of doing this with NaNs, very large values etc. ++ * are undefined but this seems to be the case anyway. ++ */ ++ mask = lp_build_cmp(bld, PIPE_FUNC_LESS, trunc, a); ++ /* cheapie plus one with mask since the mask is minus one / zero */ ++ return lp_build_sub(&intbld, itrunc, mask); + } + + /* round to nearest (toward zero) */ +diff --git a/src/gallium/drivers/llvmpipe/lp_test_arit.c b/src/gallium/drivers/llvmpipe/lp_test_arit.c +index 99928b8..f14e4b3 100644 +--- a/src/gallium/drivers/llvmpipe/lp_test_arit.c ++++ b/src/gallium/drivers/llvmpipe/lp_test_arit.c +@@ -207,6 +207,18 @@ const float round_values[] = { + -10.0, -1, 0.0, 12.0, + -1.49, -0.25, 1.25, 2.51, + -0.99, -0.01, 0.01, 0.99, ++ 1.401298464324817e-45f, // smallest denormal ++ -1.401298464324817e-45f, ++ 1.62981451e-08f, ++ -1.62981451e-08f, ++ 1.62981451e15f, // large number not representable as 32bit int ++ -1.62981451e15f, ++ FLT_EPSILON, ++ -FLT_EPSILON, ++ 1.0f - 0.5f*FLT_EPSILON, ++ -1.0f + FLT_EPSILON, ++ FLT_MAX, ++ -FLT_MAX + }; + + static float fractf(float x) +-- +cgit v0.9.0.2-2-gbebe From 92da417fa4364349daf27d46ca4a0419d36c0fe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 17 May 2013 09:19:04 +0200 Subject: [PATCH 010/153] mesa WIP: adding salt to restart hydra Hydra seems to have a problem with multiple-output derivations. --- pkgs/development/libraries/mesa/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 32ce4177b997..f3038f2d229a 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -93,6 +93,7 @@ stdenv.mkDerivation { # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM # ToDo: probably not all .la files are completely fixed, but it shouldn't matter postInstall = '' + # salt to restart hydra mv -t "$drivers/lib/" \ $out/lib/libdricore* \ $out/lib/libgallium.* \ From 16b2e1b46f0bb72ba82668ec2e307d80e2937798 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 17 May 2013 17:54:12 +0200 Subject: [PATCH 011/153] mesa WIP: preferLocalBuild, hopefully work around --- pkgs/development/libraries/mesa/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index f3038f2d229a..6c2415b5d100 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation { ''; outputs = ["out" "drivers"]; + preferLocalBuild = true; # see https://github.com/NixOS/nix/issues/118 preConfigure = "./autogen.sh"; @@ -93,7 +94,6 @@ stdenv.mkDerivation { # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM # ToDo: probably not all .la files are completely fixed, but it shouldn't matter postInstall = '' - # salt to restart hydra mv -t "$drivers/lib/" \ $out/lib/libdricore* \ $out/lib/libgallium.* \ From c82d9b616944b51ccc6ae02265f50165712787cc Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 9 May 2013 12:23:27 +0400 Subject: [PATCH 012/153] Adding Otter theorem prover. The development is frozen, but because of that Otter is considered a very reliable prover from soundness point of view. --- .../science/logic/otter/default.nix | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/applications/science/logic/otter/default.nix diff --git a/pkgs/applications/science/logic/otter/default.nix b/pkgs/applications/science/logic/otter/default.nix new file mode 100644 index 000000000000..55eb269f79e5 --- /dev/null +++ b/pkgs/applications/science/logic/otter/default.nix @@ -0,0 +1,47 @@ +{stdenv, fetchurl, tcsh, libXaw, libXt, libX11}: +let + s = # Generated upstream information + rec { + version = "3.3f"; + name = "otter"; + url = "http://www.cs.unm.edu/~mccune/otter/otter-${version}.tar.gz"; + sha256 = "16mc1npl7sk9cmqhrf3ghfmvx29inijw76f1b1lsykllaxjqqb1r"; + }; + buildInputs = [ + tcsh libXaw libXt libX11 + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + buildPhase = '' + find . -name Makefile | xargs sed -i -e "s@/bin/rm@$(type -P rm)@g" + find . -name Makefile | xargs sed -i -e "s@/bin/mv@$(type -P mv)@g" + find . -perm +111 -type f | xargs sed -i -e "s@/bin/csh@$(type -P csh)@g" + find . -perm +111 -type f | xargs sed -i -e "s@/bin/rm@$(type -P rm)@g" + find . -perm +111 -type f | xargs sed -i -e "s@/bin/mv@$(type -P mv)@g" + + sed -i -e "s/^XLIBS *=.*/XLIBS=-lXaw -lXt -lX11/" source/formed/Makefile + + make all + make -C examples all + make -C examples-mace2 all + make -C source/formed realclean + make -C source/formed formed + ''; + installPhase = '' + mkdir -p "$out"/{bin,share/otter} + cp bin/* source/formed/formed "$out/bin/" + cp -r examples examples-mace2 documents README* Legal Changelog Contents index.html "$out/share/otter/" + ''; + meta = { + inherit (s) version; + description = "A reliable first-order theorem prover"; + license = stdenv.lib.licenses.publicDomain ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2daf19c527c..192491f9b91f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8882,6 +8882,8 @@ let opensmt = callPackage ../applications/science/logic/opensmt { }; + otter = callPackage ../applications/science/logic/otter {}; + picosat = callPackage ../applications/science/logic/picosat {}; prover9 = callPackage ../applications/science/logic/prover9 { }; From a453e495116a8cd4971bb6d6265dc8ddf14ca3e3 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 9 May 2013 17:47:40 +0400 Subject: [PATCH 013/153] Adding E-KRHyper theorem prover --- .../science/logic/ekrhyper/default.nix | 32 +++++++++++++++++++ .../science/logic/ekrhyper/default.upstream | 3 ++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 37 insertions(+) create mode 100644 pkgs/applications/science/logic/ekrhyper/default.nix create mode 100644 pkgs/applications/science/logic/ekrhyper/default.upstream diff --git a/pkgs/applications/science/logic/ekrhyper/default.nix b/pkgs/applications/science/logic/ekrhyper/default.nix new file mode 100644 index 000000000000..7ff1acb062be --- /dev/null +++ b/pkgs/applications/science/logic/ekrhyper/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchurl, ocaml, perl}: +let + s = # Generated upstream information + rec { + baseName="ekrhyper"; + version="1_4_08022013"; + name="${baseName}-${version}"; + hash="0vni5pq1p99428ii3g13chiqxcs8k1fm6jlvg1jqh4qdcs42w7yb"; + url="http://userpages.uni-koblenz.de/~bpelzer/ekrhyper/ekrh_1_4_08022013.tar.gz"; + sha256="0vni5pq1p99428ii3g13chiqxcs8k1fm6jlvg1jqh4qdcs42w7yb"; + }; + buildInputs = [ + ocaml perl + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + setSourceRoot = "export sourceRoot=$(echo */ekrh/src/)"; + preInstall = "export INSTALLDIR=$out"; + postInstall = ''for i in "$out/casc"/*; do ln -s "$i" "$out/bin/ekrh-casc-$(basename $i)"; done ''; + meta = { + inherit (s) version; + description = "Automated first-order theorem prover"; + license = stdenv.lib.licenses.gpl2 ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/science/logic/ekrhyper/default.upstream b/pkgs/applications/science/logic/ekrhyper/default.upstream new file mode 100644 index 000000000000..310e93ea53fd --- /dev/null +++ b/pkgs/applications/science/logic/ekrhyper/default.upstream @@ -0,0 +1,3 @@ +url http://userpages.uni-koblenz.de/~bpelzer/ekrhyper/ +ensure_choice +version '.*[^0-9]_([-0-9_]+)[.].*' '\1' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 192491f9b91f..e6e7f80788a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8838,6 +8838,8 @@ let cvc3 = callPackage ../applications/science/logic/cvc3 {}; + ekrhyper = callPackage ../applications/science/logic/ekrhyper {}; + eprover = callPackage ../applications/science/logic/eprover { texLive = texLiveAggregationFun { paths = [ From ccc11345c945e4cd8c568e17428542d8b0d38f26 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 20 May 2013 11:17:20 +0400 Subject: [PATCH 014/153] Adding jq JSON processor --- .../upstream-updater/urls-from-page.sh | 2 +- pkgs/development/tools/jq/default.nix | 28 +++++++++++++++++++ pkgs/development/tools/jq/default.upstream | 1 + pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/tools/jq/default.nix create mode 100644 pkgs/development/tools/jq/default.upstream diff --git a/pkgs/build-support/upstream-updater/urls-from-page.sh b/pkgs/build-support/upstream-updater/urls-from-page.sh index 3c494114e914..d456794a563d 100755 --- a/pkgs/build-support/upstream-updater/urls-from-page.sh +++ b/pkgs/build-support/upstream-updater/urls-from-page.sh @@ -9,6 +9,6 @@ relpath="${path#$server}" echo "URL: $url" >&2 -curl -L -k "$url" | sed -re 's/^/-/;s/[hH][rR][eE][fF]=("([^"]*)"|([^" <>&]+)[ <>&])/\n+\2\3\n-/g' | \ +curl -L -k "$url" | sed -re 's/^/-/;s/[hH][rR][eE][fF]=("([^"]*)"|'\''([^'\'']*)'\''|([^"'\'' <>&]+)[ <>&])/\n+\2\3\4\n-/g' | \ sed -e '/^-/d; s/^[+]//; /^#/d;'"s/^\\//$protocol:\\/\\/$server\\//g" | \ sed -re 's`^[^:]*$`'"$protocol://$basepath/&\`" diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix new file mode 100644 index 000000000000..f0c32fc0e9ec --- /dev/null +++ b/pkgs/development/tools/jq/default.nix @@ -0,0 +1,28 @@ +{stdenv, fetchurl}: +let + s = # Generated upstream information + rec { + baseName="jq"; + version="1.3"; + name="${baseName}-${version}"; + hash="1mzy9cj3d19y1m56mwk6slls543gnlhz8302hmnxkhdzdb1j6gv2"; + url="http://stedolan.github.io/jq/download/source/jq-1.3.tar.gz"; + sha256="1mzy9cj3d19y1m56mwk6slls543gnlhz8302hmnxkhdzdb1j6gv2"; + }; + buildInputs = [ + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + meta = { + inherit (s) version; + description = ''A lightweight and flexible command-line JSON processor''; + license = stdenv.lib.licenses.mit ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/tools/jq/default.upstream b/pkgs/development/tools/jq/default.upstream new file mode 100644 index 000000000000..1ad914d717e0 --- /dev/null +++ b/pkgs/development/tools/jq/default.upstream @@ -0,0 +1 @@ +url http://stedolan.github.io/jq/download/ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6e7f80788a2..8ed2c9dd08d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1046,6 +1046,8 @@ let jnettop = callPackage ../tools/networking/jnettop { }; + jq = callPackage ../development/tools/jq {}; + jscoverage = callPackage ../development/tools/misc/jscoverage { }; jwhois = callPackage ../tools/networking/jwhois { }; From 4d9e7b2923ada28522f80a29a2fa00acca4953ca Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 23 May 2013 17:32:04 +0400 Subject: [PATCH 015/153] Fix NS plugin wrapper build --- .../browsers/mozilla-plugins/nspluginwrapper/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix index 5587f3b732ce..7cb1abf31537 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { preConfigure = '' sed -e 's@/usr/bin/@@g' -i configure sed -e '/gthread[.]h/d' -i src/npw-player.c + export NIX_LDFLAGS="$NIX_LDFLAGS -lgthread-2.0" export configureFlags="$configureFlags --target-cpu=$(uname -m)" ''; From 1d38b4842a17b436895cdc5c52c45f0c642337fb Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 24 May 2013 00:43:31 +0400 Subject: [PATCH 016/153] Support pre-start commands from newer NixOS versions in xlaunch --- pkgs/tools/X11/xlaunch/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/X11/xlaunch/default.nix b/pkgs/tools/X11/xlaunch/default.nix index 3cab25837e6c..b97c9def8227 100644 --- a/pkgs/tools/X11/xlaunch/default.nix +++ b/pkgs/tools/X11/xlaunch/default.nix @@ -46,6 +46,9 @@ EOF RESET_OPTION=\"-noreset\" fi; XCMD=\"\$(egrep \"^Environment=\" /etc/systemd/system/display-manager.service | sed -e \"s/Environment=/ export /\" | sed -e '\\''s/#.*//'\\'' ; echo export _XARGS_=\\\$\\( grep xserver_arguments \\\$SLIM_CFGFILE \\| sed -e s/xserver_arguments// \\| sed -e s/:0/:\${_display}/ \\| sed -e s/vt7/vt\$((7+_display))/ \\) ; echo ${xorgserver}/bin/X \\\$_XARGS_ \$RESET_OPTION )\" + PRE_XCMD=\"\$(egrep \"^ExecStartPre=\" /etc/systemd/system/display-manager.service | sed -e \"\s/ExecStartPre=//\")\" + echo \"\$PRE_XCMD\" + echo \"\$PRE_XCMD\" | bash echo \"\$XCMD\" echo \"\$XCMD\" | bash & while ! test -e /tmp/.X11-unix/X\$_display &>/dev/null ; do sleep 0.5; done From e3ff0f116fa8998e27429d6c8d00ccd7e4b8b1b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 22 May 2013 17:07:12 +0200 Subject: [PATCH 017/153] vmware driver: depend on mesa_drivers to find libxatracker --- pkgs/servers/x11/xorg/overrides.nix | 4 ++++ pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 1fadab2cc3d6..8d2de0525869 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -150,6 +150,10 @@ in ]; }; + xf86videovmware = attrs: attrs // { + buildInputs = attrs.buildInputs ++ [ args.mesa_drivers ]; # for libxatracker + }; + xdriinfo = attrs: attrs // { buildInputs = attrs.buildInputs ++ [args.mesa]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ed2c9dd08d2..1f0fbfb27a8a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5693,11 +5693,12 @@ let xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix { inherit fetchurl fetchsvn stdenv pkgconfig intltool freetype fontconfig - libxslt expat libdrm libpng zlib perl mesa + libxslt expat libdrm libpng zlib perl mesa_drivers xkeyboard_config dbus libuuid openssl gperf m4 autoconf libtool xmlto asciidoc udev flex bison python mtdev; automake = automake110x; pixman = pixman_cairo; + mesa = mesa_noglu; }); xorgReplacements = callPackage ../servers/x11/xorg/replacements.nix { }; From d9acff2128faf27bf2b75c70c293b97a8b4db0b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 22 May 2013 17:09:00 +0200 Subject: [PATCH 018/153] mesa WIP: bugfix-only update, minor tweaks, prune features Also disabled the workaround for #118. --- pkgs/development/libraries/mesa/default.nix | 51 ++++++++++++--------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 6c2415b5d100..a72d5d36adae 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -3,7 +3,8 @@ , libdrm, xorg, wayland, udev, llvm, libffi , libvdpau , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt -, enableR600LlvmCompiler ? false +, enableR600LlvmCompiler ? false # we would need currently unreleased LLVM or patches +, enableExtraFeatures ? false # add ~15 MB to mesa_drivers }: if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then @@ -12,18 +13,17 @@ else /** Packaging design: - The basic mesa ($out) contains headers and libraries (GLU is in mesa_glu now). - This or the mesa attribute (which also contains GLU) are small (< 3 MB, mostly headers) + This or the mesa attribute (which also contains GLU) are small (~ 2.5 MB, mostly headers) and are designed to be the buildInput of other packages. - DRI and EGL drivers are compiled into $drivers output, - which is bigger (~27 MB) and depends on LLVM (~80 MB). + which is bigger (~13 MB) and depends on LLVM (~80 MB). These should be searched at runtime in /run/current-system/sw/lib/* and so are kind-of impure (given by NixOS). (I suppose on non-NixOS one would create the appropriate symlinks from there.) */ let - version = "9.1.2"; - extraFeatures = true; # probably doesn't work with false yet + version = "9.1.3"; driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32"; in stdenv.mkDerivation { @@ -31,7 +31,7 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2"; - sha256="1ns366armqmp2bxj1l7fff95v22b5z9mnkyykbdj81lhg9gi3586"; # 9.1.2 + sha256="0rnpaambxv5cd6kbfyvv4b8x2rw1xj13a67xbkzmndfh08iaqpcd"; }; prePatch = "patchShebangs ."; @@ -49,7 +49,6 @@ stdenv.mkDerivation { ''; outputs = ["out" "drivers"]; - preferLocalBuild = true; # see https://github.com/NixOS/nix/issues/118 preConfigure = "./autogen.sh"; @@ -63,6 +62,7 @@ stdenv.mkDerivation { "--enable-shared-glapi" "--enable-shared-gallium" "--enable-driglx-direct" # seems enabled anyway "--enable-gallium-llvm" "--with-llvm-shared-libs" + "--enable-xa" # used in vmware driver "--with-dri-drivers=i965,r200,radeon" "--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast" # radeonsi complains about R600 missing in LLVM @@ -70,12 +70,11 @@ stdenv.mkDerivation { ] ++ optional enableR600LlvmCompiler "--enable-r600-llvm-compiler" # complains about R600 missing in LLVM ++ optional enableTextureFloats "--enable-texture-float" - ++ optionals extraFeatures [ + ++ optionals enableExtraFeatures [ "--enable-gles1" "--enable-gles2" - "--enable-xa" "--enable-osmesa" "--enable-openvg" "--enable-gallium-egl" # not needed for EGL in Gallium, but OpenVG might be useful - #"--enable-xvmc" # tests segfault with 9.1.{1,2} + #"--enable-xvmc" # tests segfault with 9.1.{1,2,3} "--enable-vdpau" #"--enable-opencl" # ToDo: opencl seems to need libclc for clover ]; @@ -86,35 +85,43 @@ stdenv.mkDerivation { autoconf automake libtool intltool expat libxml2Python udev llvm libdrm libXxf86vm libXfixes libXdamage glproto dri2proto libX11 libXext libxcb libXt libffi wayland - ] ++ stdenv.lib.optionals extraFeatures [ /*libXvMC*/ libvdpau ]; + ] ++ stdenv.lib.optionals enableExtraFeatures [ /*libXvMC*/ libvdpau ]; enableParallelBuilding = true; doCheck = true; # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM # ToDo: probably not all .la files are completely fixed, but it shouldn't matter - postInstall = '' + postInstall = with stdenv.lib; '' mv -t "$drivers/lib/" \ - $out/lib/libdricore* \ - $out/lib/libgallium.* \ - $out/lib/gallium-pipe \ - $out/lib/gbm \ - $out/lib/libxatracker* \ + '' + optionalString enableExtraFeatures '' `#$out/lib/libXvMC*` \ $out/lib/vdpau \ - $out/lib/libOSMesa* + $out/lib/libOSMesa* \ + $out/lib/gbm $out/lib/libgbm* \ + $out/lib/gallium-pipe \ + '' + '' + $out/lib/libdricore* \ + $out/lib/libgallium* \ + $out/lib/libxatracker* + '' + /* now fix references in .la files */ '' sed "/^libdir=/s,$out,$drivers," -i \ - $drivers/lib/gallium-pipe/*.la \ - $drivers/lib/libgallium.la \ - $drivers/lib/libdricore*.la \ + '' + optionalString enableExtraFeatures '' `#$drivers/lib/libXvMC*.la` \ $drivers/lib/vdpau/*.la \ - $drivers/lib/libOSMesa*.la + $drivers/lib/libOSMesa*.la \ + $drivers/lib/gallium-pipe/*.la \ + '' + '' + $drivers/lib/libgallium.la \ + $drivers/lib/libdricore*.la + sed "s,$out\(/lib/\(libdricore[0-9\.]*\|libgallium\).la\),$drivers\1,g" \ -i $drivers/lib/*.la $drivers/lib/*/*.la + '' + /* work around bug #529, but maybe $drivers should also be patchelf-ed */ '' find $drivers/ -type f -executable -print0 | xargs -0 strip -S || true + '' + /* add RPATH so the drivers can find the moved libgallium and libdricore9 */ '' for lib in $drivers/lib/*.so* $drivers/lib/*/*.so*; do if [[ ! -L "$lib" ]]; then From 253ee6f6a3573c5ed59745944780e8ca1ecefa1f Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Thu, 23 May 2013 16:25:21 -0700 Subject: [PATCH 019/153] update to 2013Q1 Intel Graphics Stack Release This changeset updates to all of the versions in https://01.org/linuxgraphics/downloads/2013/2013q1-intel-graphics-stack-release (but does not regression from newer version). I tried generating 'servers/x11/xorg/default.nix' with the perl script, but unrelated packges changed, so I just manually updated the file. --- pkgs/development/libraries/libva/default.nix | 4 ++-- pkgs/development/libraries/vaapi-intel/default.nix | 4 ++-- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 5caea5ba6109..5b35d2b24ad4 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes }: stdenv.mkDerivation rec { - name = "libva-1.1.0"; + name = "libva-1.1.1"; src = fetchurl { url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; - sha256 = "1a7g7i96ww8hmim2pq2a3xc89073lzacxn1xh9526bzhlqjdqsnv"; + sha256 = "0kfdcrzcr82g15l0vvmm6rqr0f0604d4dgrza78gn6bfx7rppby0"; }; buildInputs = [ libX11 libXext pkgconfig mesa libdrm libXfixes ]; diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index 548aeb8a2de6..192534a16e9f 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -2,11 +2,11 @@ , intelgen4asm }: stdenv.mkDerivation rec { - name = "libva-intel-driver-1.0.19"; + name = "libva-intel-driver-1.0.20"; src = fetchurl { url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2"; - sha256 = "14m7krah3ajkwj190q431lqqa84hdljcdmrcrqkbgaffyjlqvdid"; + sha256 = "1jfl8909j3a3in6m8b5bx3dn7pzr8a1sw3sk4vzm7h3j2dkgpzhj"; }; buildInputs = [ autoconf automake libtool mesa libva pkgconfig libdrm libX11 intelgen4asm ]; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index eddd231faa77..631ab0a24d98 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1510,11 +1510,11 @@ let })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videointel = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) { - name = "xf86-video-intel-2.20.19"; + name = "xf86-video-intel-2.21.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-intel-2.20.19.tar.bz2; - sha256 = "0k67vcf0aqhv9zmy1arxyjdl7fsrg90cjm0ryyhamghq67z0xcmr"; + url = mirror://xorg/individual/driver/xf86-video-intel-2.21.3.tar.bz2; + sha256 = "1fwxjc6vnr926yd92y1w70kvnky24xw0dsa9crvvlv928ah75rhw"; }; buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ]; })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ;}; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 79aeb7c1a3ae..8efbae0670bd 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -129,7 +129,7 @@ mirror://xorg/individual/driver/xf86-video-geode-2.11.14.tar.bz2 mirror://xorg/individual/driver/xf86-video-glide-1.2.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2 mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2 -mirror://xorg/individual/driver/xf86-video-intel-2.20.19.tar.bz2 +mirror://xorg/individual/driver/xf86-video-intel-2.21.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-mga-1.6.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.7.tar.bz2 From 800c46759238728ee71f74482d6edd4b096a2c65 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Fri, 24 May 2013 09:50:49 -0700 Subject: [PATCH 020/153] xf86-video-intel-2.21.7 --- pkgs/servers/x11/xorg/default.nix | 4 ++-- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 631ab0a24d98..4d3e3eebabcc 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1510,11 +1510,11 @@ let })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videointel = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) { - name = "xf86-video-intel-2.21.3"; + name = "xf86-video-intel-2.21.7"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-intel-2.21.3.tar.bz2; - sha256 = "1fwxjc6vnr926yd92y1w70kvnky24xw0dsa9crvvlv928ah75rhw"; + sha256 = "1nb3hc1h6scja89rwf2fvadj5z8ckcnm94lryf895i3r02jbpsps"; }; buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ]; })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ;}; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 8efbae0670bd..8af5589e5822 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -129,7 +129,7 @@ mirror://xorg/individual/driver/xf86-video-geode-2.11.14.tar.bz2 mirror://xorg/individual/driver/xf86-video-glide-1.2.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2 mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2 -mirror://xorg/individual/driver/xf86-video-intel-2.21.3.tar.bz2 +mirror://xorg/individual/driver/xf86-video-intel-2.21.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-mga-1.6.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.7.tar.bz2 From fc8f474a9c428d619f7c5ece92f31b8622bd263d Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Fri, 24 May 2013 11:56:48 -0700 Subject: [PATCH 021/153] fix url and hash for intel x driver --- pkgs/servers/x11/xorg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 4d3e3eebabcc..e0bfae80431e 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1513,8 +1513,8 @@ let name = "xf86-video-intel-2.21.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-intel-2.21.3.tar.bz2; - sha256 = "1nb3hc1h6scja89rwf2fvadj5z8ckcnm94lryf895i3r02jbpsps"; + url = mirror://xorg/individual/driver/xf86-video-intel-2.21.7.tar.bz2; + sha256 = "0mpdd7am813gv7nxxvbllcph1xg7czy0bd1kn3q6bc489h53wzbp"; }; buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ]; })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ;}; From 0f8a1b29d276b3ad126ecd483ffa76a0bf6d9590 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Sun, 26 May 2013 13:22:55 +0200 Subject: [PATCH 022/153] unzip: add bzip2 as native build input --- pkgs/tools/archivers/unzip/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index 8309a2102ab4..f939c968c44d 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -9,6 +9,7 @@ stdenv.mkDerivation ({ sha256 = "0dxx11knh3nk95p2gg2ak777dd11pr7jx5das2g49l262scrcv83"; }; + nativeBuildInputs = [ bzip2 ]; buildInputs = [ bzip2 ] ++ stdenv.lib.optional enableNLS libnatspec; makefile = "unix/Makefile"; From e7b61ea77de5960f0c3969f86776ddfaf308fccc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 27 May 2013 12:24:04 +0200 Subject: [PATCH 023/153] xorg.xf86videointel: fix bad hash (from #556) --- pkgs/servers/x11/xorg/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index e0bfae80431e..83d413e5f130 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1514,7 +1514,7 @@ let builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-intel-2.21.7.tar.bz2; - sha256 = "0mpdd7am813gv7nxxvbllcph1xg7czy0bd1kn3q6bc489h53wzbp"; + sha256 = "1nb3hc1h6scja89rwf2fvadj5z8ckcnm94lryf895i3r02jbpsps"; }; buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ]; })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ;}; From 466ce40f0f19eb2f752eac67dd50087a1ea9963d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 27 May 2013 20:43:02 +0200 Subject: [PATCH 024/153] xorg.xf86videointel: regression-fix update http://lists.freedesktop.org/archives/intel-gfx/2013-May/028277.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 83d413e5f130..164a6e56080a 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1510,11 +1510,11 @@ let })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videointel = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) { - name = "xf86-video-intel-2.21.7"; + name = "xf86-video-intel-2.21.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-intel-2.21.7.tar.bz2; - sha256 = "1nb3hc1h6scja89rwf2fvadj5z8ckcnm94lryf895i3r02jbpsps"; + url = mirror://xorg/individual/driver/xf86-video-intel-2.21.8.tar.bz2; + sha256 = "13yg9bcz55plnpx7k5xkbgpaj6hnlszxys94lxqa6b012l2hr1ad"; }; buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ]; })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ;}; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 8af5589e5822..f2ad7a4bcc54 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -129,7 +129,7 @@ mirror://xorg/individual/driver/xf86-video-geode-2.11.14.tar.bz2 mirror://xorg/individual/driver/xf86-video-glide-1.2.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2 mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2 -mirror://xorg/individual/driver/xf86-video-intel-2.21.7.tar.bz2 +mirror://xorg/individual/driver/xf86-video-intel-2.21.8.tar.bz2 mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-mga-1.6.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.7.tar.bz2 From b7703655749df57dd5cbc84b89cc3be4bc7358bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 29 May 2013 23:24:20 +0200 Subject: [PATCH 025/153] ReRevert Merge x-updates into master This reverts commit ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde. Conflicts (taken x-updates): pkgs/development/libraries/libgcrypt/default.nix pkgs/development/libraries/libgpg-error/default.nix pkgs/development/libraries/poppler/default.nix --- pkgs/applications/editors/geany/default.nix | 6 +- pkgs/applications/graphics/k3d/default.nix | 1 + .../graphics/rawtherapee/default.nix | 4 +- .../misc/blender/fix-include.patch | 12 + pkgs/applications/misc/calibre/default.nix | 14 +- pkgs/applications/misc/djvulibre/default.nix | 10 +- .../applications/misc/djvulibre/gcc-4.6.patch | 658 ------------------ pkgs/applications/misc/evince/default.nix | 59 -- .../networking/browsers/firefox/21.0.nix | 2 +- .../instant-messengers/linphone/default.nix | 2 + pkgs/applications/office/gnucash/default.nix | 8 +- .../office/gnucash/potfiles-skip.patch | 147 ++++ .../science/misc/tulip/default.nix | 8 +- .../version-management/kdesvn/default.nix | 4 +- pkgs/applications/video/gnash/default.nix | 4 +- .../window-managers/weston/default.nix | 31 + .../gsettings-desktop-schemas/default.nix | 17 - pkgs/data/misc/poppler-data/default.nix | 5 +- .../gnome-2/bindings/python-rsvg/default.nix | 16 +- pkgs/desktops/gnome-2/default.nix | 2 - .../gnome-2/platform/ORBit2/default.nix | 4 + .../gnome-2/platform/gnome-vfs/default.nix | 2 + .../gnome-2/platform/gtkglext/default.nix | 5 +- .../gnome-2/platform/intltool/default.nix | 13 - .../gnome-2/platform/libbonobo/default.nix | 4 +- .../gnome-2/platform/libgnome/default.nix | 4 +- .../gnome-2/platform/libgnome/new-glib.patch | 65 ++ .../gnome-3/core/at-spi2-atk/default.nix | 17 + .../gnome-3/core/at-spi2-core/default.nix | 23 + pkgs/desktops/gnome-3/core/evince/default.nix | 62 ++ pkgs/desktops/gnome-3/core/gconf/default.nix | 29 + pkgs/desktops/gnome-3/core/gcr/default.nix | 18 + .../gnome-3/core/gnome-icon-theme/default.nix | 12 + .../gnome-3/core/gnome-keyring/default.nix | 26 + .../gnome-3/core/gnome-terminal/default.nix | 20 + .../gsettings-desktop-schemas/default.nix | 30 + pkgs/desktops/gnome-3/core/gvfs/default.nix | 21 + .../gnome-3/core/libcroco/default.nix | 11 + .../gnome-3/core/libgnome-keyring/default.nix | 17 + .../gnome-3/core/libgweather/default.nix | 14 + pkgs/desktops/gnome-3/core/vte/default.nix | 46 ++ pkgs/desktops/gnome-3/core/zenity/default.nix | 20 + pkgs/desktops/gnome-3/default.nix | 55 ++ .../gnome-3/desktop/gnome-desktop/default.nix | 18 + .../desktop/gnome-dictionary/default.nix | 15 + .../gnome-3/desktop/rarian/default.nix | 11 + .../gnome-3/desktop/scrollkeeper/default.nix | 18 + pkgs/desktops/xfce/4_08.nix | 37 + pkgs/desktops/xfce/4_10.nix | 35 + pkgs/desktops/xfce/common.nix | 72 ++ pkgs/desktops/xfce/core/xfce4-dev-tools.nix | 24 + .../xfce/core/xfce4-session-systemd.patch | 470 +++++++++++++ pkgs/desktops/xfce/default.nix | 2 +- pkgs/development/compilers/vala/default.nix | 20 +- .../interpreters/python/2.7/default.nix | 4 +- .../interpreters/python/3.3/default.nix | 2 +- pkgs/development/libraries/GConf/3.x.nix | 23 - pkgs/development/libraries/SDL/default.nix | 13 +- .../libraries/atk/{2.6.x.nix => default.nix} | 6 +- pkgs/development/libraries/cairo/default.nix | 29 +- .../libraries/dbus-cplusplus/default.nix | 4 +- .../libraries/dbus-glib/default.nix | 8 +- pkgs/development/libraries/dbus/default.nix | 147 ++-- .../dbus/implement-getgrouplist.patch | 108 +++ .../libraries/dbus/no-create-dirs.patch | 26 + pkgs/development/libraries/dbus/systemd.patch | 14 + .../libraries/dbus/ucred-dirty-hack.patch | 18 + .../libraries/fontconfig/default.nix | 26 +- .../libraries/freetype/default.nix | 47 +- .../freetype/enable-validation.patch | 22 + .../gdk-pixbuf/{2.26.x.nix => default.nix} | 9 +- .../glib/{2.34.x.nix => default.nix} | 34 +- pkgs/development/libraries/gmime/default.nix | 15 +- .../gobject-introspection/default.nix | 8 +- .../libraries/gtk+/{2.24.x.nix => 2.x.nix} | 12 +- .../gtk+/{3.2.x.nix => 3-default.nix} | 22 +- pkgs/development/libraries/gtkmm/3.x.nix | 8 +- .../libraries/harfbuzz/default.nix | 4 +- .../libraries/libcanberra/default.nix | 16 +- .../libraries/libcroco/default.nix | 11 - pkgs/development/libraries/libdrm/default.nix | 6 +- .../libraries/libgcrypt/default.nix | 2 +- .../libraries/libgnome-keyring/3.x.nix | 18 - .../libraries/libgpg-error/default.nix | 2 +- pkgs/development/libraries/libgsf/default.nix | 21 +- .../libraries/libgweather/default.nix | 13 - pkgs/development/libraries/libmtp/default.nix | 12 +- .../libraries/libpaper/default.nix | 17 + pkgs/development/libraries/libpng/15.nix | 24 + pkgs/development/libraries/libpng/default.nix | 6 +- .../libraries/libpng/libpng-apng.nix | 18 +- .../development/libraries/librsvg/default.nix | 22 +- .../development/libraries/libtiff/default.nix | 6 +- .../development/libraries/libusb1/default.nix | 4 +- .../libraries/libvdpau/default.nix | 12 +- .../libraries/libxkbcommon/default.nix | 21 + .../libraries/libxtc_dxtn/default.nix | 5 +- .../libraries/mesa-glu/default.nix | 19 + pkgs/development/libraries/mesa/default.nix | 37 +- .../development/libraries/mesa/mips_wmb.patch | 16 - .../libraries/openjpeg/default.nix | 10 +- .../pango/{1.30.x.nix => default.nix} | 10 +- .../libraries/pangox-compat/default.nix | 19 + pkgs/development/libraries/pixman/default.nix | 22 + pkgs/development/libraries/poppler/0.18.nix | 53 ++ .../development/libraries/poppler/default.nix | 94 ++- .../libraries/qt-4.x/4.8/default.nix | 12 +- .../development/libraries/wayland/default.nix | 14 +- .../libraries/wxGTK-2.8/default.nix | 16 +- .../tools/misc/intltool/default.nix | 9 +- .../tools/misc/intltool/default.upstream | 2 +- pkgs/games/sgt-puzzles/default.nix | 6 +- pkgs/lib/misc.nix | 5 +- pkgs/lib/strings.nix | 7 + pkgs/misc/cups/default.nix | 2 +- pkgs/misc/emulators/wine/default.nix | 4 +- pkgs/misc/ghostscript/default.nix | 41 +- pkgs/misc/ghostscript/purity-9.05.patch | 27 - .../themes/gnome-themes-standard/default.nix | 15 + pkgs/os-specific/linux/qemu-kvm/default.nix | 5 +- pkgs/os-specific/linux/systemd/default.nix | 22 +- .../linux/systemd/fix-tests-1.patch | 68 ++ .../linux/systemd/no-global-install.patch | 26 + .../linux/xf86-input-wacom/default.nix | 4 +- pkgs/servers/x11/xorg/default.nix | 248 +++---- pkgs/servers/x11/xorg/extra.list | 15 +- pkgs/servers/x11/xorg/old.list | 4 +- pkgs/servers/x11/xorg/overrides.nix | 140 +--- pkgs/servers/x11/xorg/tarballs-7.7.list | 61 +- pkgs/tools/graphics/zbar/default.nix | 2 +- pkgs/tools/typesetting/pdf2djvu/default.nix | 5 +- .../typesetting/pdf2djvu/default.upstream | 10 + pkgs/top-level/all-packages.nix | 160 +++-- pkgs/top-level/release-python.nix | 3 - pkgs/top-level/release-small.nix | 1 + 135 files changed, 2718 insertions(+), 1591 deletions(-) create mode 100644 pkgs/applications/misc/blender/fix-include.patch delete mode 100644 pkgs/applications/misc/djvulibre/gcc-4.6.patch delete mode 100644 pkgs/applications/misc/evince/default.nix create mode 100644 pkgs/applications/office/gnucash/potfiles-skip.patch create mode 100644 pkgs/applications/window-managers/weston/default.nix delete mode 100644 pkgs/data/misc/gsettings-desktop-schemas/default.nix delete mode 100644 pkgs/desktops/gnome-2/platform/intltool/default.nix create mode 100644 pkgs/desktops/gnome-2/platform/libgnome/new-glib.patch create mode 100644 pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix create mode 100644 pkgs/desktops/gnome-3/core/at-spi2-core/default.nix create mode 100644 pkgs/desktops/gnome-3/core/evince/default.nix create mode 100644 pkgs/desktops/gnome-3/core/gconf/default.nix create mode 100644 pkgs/desktops/gnome-3/core/gcr/default.nix create mode 100644 pkgs/desktops/gnome-3/core/gnome-icon-theme/default.nix create mode 100644 pkgs/desktops/gnome-3/core/gnome-keyring/default.nix create mode 100644 pkgs/desktops/gnome-3/core/gnome-terminal/default.nix create mode 100644 pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix create mode 100644 pkgs/desktops/gnome-3/core/gvfs/default.nix create mode 100644 pkgs/desktops/gnome-3/core/libcroco/default.nix create mode 100644 pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix create mode 100644 pkgs/desktops/gnome-3/core/libgweather/default.nix create mode 100644 pkgs/desktops/gnome-3/core/vte/default.nix create mode 100644 pkgs/desktops/gnome-3/core/zenity/default.nix create mode 100644 pkgs/desktops/gnome-3/default.nix create mode 100644 pkgs/desktops/gnome-3/desktop/gnome-desktop/default.nix create mode 100644 pkgs/desktops/gnome-3/desktop/gnome-dictionary/default.nix create mode 100644 pkgs/desktops/gnome-3/desktop/rarian/default.nix create mode 100644 pkgs/desktops/gnome-3/desktop/scrollkeeper/default.nix create mode 100644 pkgs/desktops/xfce/4_08.nix create mode 100644 pkgs/desktops/xfce/4_10.nix create mode 100644 pkgs/desktops/xfce/common.nix create mode 100644 pkgs/desktops/xfce/core/xfce4-dev-tools.nix create mode 100644 pkgs/desktops/xfce/core/xfce4-session-systemd.patch delete mode 100644 pkgs/development/libraries/GConf/3.x.nix rename pkgs/development/libraries/atk/{2.6.x.nix => default.nix} (83%) create mode 100644 pkgs/development/libraries/dbus/implement-getgrouplist.patch create mode 100644 pkgs/development/libraries/dbus/no-create-dirs.patch create mode 100644 pkgs/development/libraries/dbus/systemd.patch create mode 100644 pkgs/development/libraries/dbus/ucred-dirty-hack.patch create mode 100644 pkgs/development/libraries/freetype/enable-validation.patch rename pkgs/development/libraries/gdk-pixbuf/{2.26.x.nix => default.nix} (77%) rename pkgs/development/libraries/glib/{2.34.x.nix => default.nix} (64%) rename pkgs/development/libraries/gtk+/{2.24.x.nix => 2.x.nix} (81%) rename pkgs/development/libraries/gtk+/{3.2.x.nix => 3-default.nix} (68%) delete mode 100644 pkgs/development/libraries/libcroco/default.nix delete mode 100644 pkgs/development/libraries/libgnome-keyring/3.x.nix delete mode 100644 pkgs/development/libraries/libgweather/default.nix create mode 100644 pkgs/development/libraries/libpaper/default.nix create mode 100644 pkgs/development/libraries/libpng/15.nix create mode 100644 pkgs/development/libraries/libxkbcommon/default.nix create mode 100644 pkgs/development/libraries/mesa-glu/default.nix delete mode 100644 pkgs/development/libraries/mesa/mips_wmb.patch rename pkgs/development/libraries/pango/{1.30.x.nix => default.nix} (77%) create mode 100644 pkgs/development/libraries/pangox-compat/default.nix create mode 100644 pkgs/development/libraries/pixman/default.nix create mode 100644 pkgs/development/libraries/poppler/0.18.nix delete mode 100644 pkgs/misc/ghostscript/purity-9.05.patch create mode 100644 pkgs/misc/themes/gnome-themes-standard/default.nix create mode 100644 pkgs/os-specific/linux/systemd/fix-tests-1.patch create mode 100644 pkgs/os-specific/linux/systemd/no-global-install.patch create mode 100644 pkgs/tools/typesetting/pdf2djvu/default.upstream diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 289cf7ff8d63..6d43cc279975 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, gtk2, which, pkgconfig, intltool }: let - version = "1.22"; + version = "1.23"; in stdenv.mkDerivation rec { name = "geany-${version}"; src = fetchurl { - url = "http://download.geany.org/${name}.tar.gz"; - md5 = "1cb7f6cea8e301c416211786cec474fa"; + url = "http://download.geany.org/${name}.tar.bz2"; + sha256 = "1c78rggjaz9fa8gj25wka1sa3argvixnzrarmqvwh0s8d5ragm6d"; }; buildInputs = [ gtk2 which pkgconfig intltool ]; diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index 058d0f79a2f4..8920d243dbf0 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { preConfigure = '' export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${gtkglext}/include/gtkglext-*) -I$(echo ${gtkglext}/lib/gtkglext-*/include)" ''; buildInputs = [ diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index bf7e2d304202..34ad7821c876 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau -, libXdmcp, lcms2, libiptcdata, libcanberra, fftw +, libXdmcp, lcms2, libiptcdata, libcanberra, fftw, expat , mercurial # Not really needed for anything, but it fails if it does not find 'hg' }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig gtk cmake pixman libpthreadstubs gtkmm libXau libXdmcp - lcms2 libiptcdata mercurial libcanberra fftw ]; + lcms2 libiptcdata mercurial libcanberra fftw expat ]; # Disable the use of the RAWZOR propietary libraries cmakeFlags = [ "-DWITH_RAWZOR=OFF" ]; diff --git a/pkgs/applications/misc/blender/fix-include.patch b/pkgs/applications/misc/blender/fix-include.patch new file mode 100644 index 000000000000..44e2147d073c --- /dev/null +++ b/pkgs/applications/misc/blender/fix-include.patch @@ -0,0 +1,12 @@ +diff --git a/intern/smoke/intern/WAVELET_NOISE.h b/intern/smoke/intern/WAVELET_NOISE.h +index fce901b..1f73c5e 100644 +--- a/intern/smoke/intern/WAVELET_NOISE.h ++++ b/intern/smoke/intern/WAVELET_NOISE.h +@@ -43,6 +43,7 @@ + #ifndef WAVELET_NOISE_H + #define WAVELET_NOISE_H + ++#include + #include + + #ifdef WIN32 diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 562a9dd52ad4..23b5092cd4d8 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,17 +1,15 @@ { stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng , imagemagick, libjpeg, fontconfig, podofo, qt4, icu, sqlite -, pil, makeWrapper, unrar, chmlib, pythonPackages, xz +, pil, makeWrapper, unrar, chmlib, pythonPackages, xz, udisks, libusb1, libmtp }: stdenv.mkDerivation rec { - name = "calibre-0.8.51"; + name = "calibre-0.8.70"; + # 0.9.* versions won't build: https://bugs.launchpad.net/calibre/+bug/1094719 src = fetchurl { - urls = [ - "http://calibre-ebook.googlecode.com/files/${name}.tar.xz" - "mirror://sourceforge/calibre/${name}.tar.xz" - ]; - sha256 = "1grcc0k9qpfpwp863x52rl9wj4wz61hcz67l8h2jmli0wxiq44z1"; + url = "mirror://sourceforge/calibre/${name}.tar.xz"; + sha256 = "12avwp8r6cnrw6c32gmd2hksa9rszdb76zs6fcmr3n8r1wkwa71g"; }; inherit python; @@ -23,7 +21,7 @@ stdenv.mkDerivation rec { fontconfig podofo qt4 pil chmlib icu pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil pythonPackages.cssutils pythonPackages.beautifulsoup - pythonPackages.sqlite3 sqlite + pythonPackages.sqlite3 sqlite udisks libusb1 libmtp ]; installPhase = '' diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix index e22dce72b628..4a51ec2d1acd 100644 --- a/pkgs/applications/misc/djvulibre/default.nix +++ b/pkgs/applications/misc/djvulibre/default.nix @@ -1,16 +1,14 @@ -{ stdenv, fetchurl, libjpeg, libtiff, libpng, ghostscript, libungif, zlib }: +{ stdenv, fetchurl, libjpeg, libtiff, librsvg }: stdenv.mkDerivation rec { - name = "djvulibre-3.5.24"; + name = "djvulibre-3.5.25.3"; src = fetchurl { url = "mirror://sourceforge/djvu/${name}.tar.gz"; - sha256 = "0d1592cmc7scg2jzah47mnvbqldhxb1x9vxm7y64a3iasa0lqwy0"; + sha256 = "1q5i5ha4zmj2ahjfhi8cv1rah80vm43m9ads46ji38rgvpb7x3c9"; }; - buildInputs = [ libjpeg libtiff libpng ghostscript zlib libungif ]; - - patches = [ ./gcc-4.6.patch ]; + buildInputs = [ libjpeg libtiff librsvg ]; meta = { description = "A library and viewer for the DJVU file format for scanned images"; diff --git a/pkgs/applications/misc/djvulibre/gcc-4.6.patch b/pkgs/applications/misc/djvulibre/gcc-4.6.patch deleted file mode 100644 index 48fbc2bc7aca..000000000000 --- a/pkgs/applications/misc/djvulibre/gcc-4.6.patch +++ /dev/null @@ -1,658 +0,0 @@ -commit 3341545edba359b292a8ef6db1b7d342caf3dcf1 -Author: Leon Bottou -Date: Wed May 4 21:25:35 2011 -0700 - - Added include for gcc-4.6 - -diff --git a/libdjvu/BSByteStream.cpp b/libdjvu/BSByteStream.cpp -index b762ccf..d662ab0 100644 ---- a/libdjvu/BSByteStream.cpp -+++ b/libdjvu/BSByteStream.cpp -@@ -62,6 +62,7 @@ - - // - Author: Leon Bottou, 07/1998 - -+#include - #include - #include - #include -diff --git a/libdjvu/BSEncodeByteStream.cpp b/libdjvu/BSEncodeByteStream.cpp -index 5d80e51..68bc3e3 100644 ---- a/libdjvu/BSEncodeByteStream.cpp -+++ b/libdjvu/BSEncodeByteStream.cpp -@@ -71,6 +71,7 @@ - #include "GOS.h" - #endif - -+#include - #include - #include - #include -diff --git a/libdjvu/ByteStream.cpp b/libdjvu/ByteStream.cpp -index 158c33c..be01847 100644 ---- a/libdjvu/ByteStream.cpp -+++ b/libdjvu/ByteStream.cpp -@@ -73,6 +73,7 @@ - #include "GOS.h" - #include "GURL.h" - #include "DjVuMessage.h" -+#include - #include - #if defined(WIN32) || defined(__CYGWIN32__) - # include -diff --git a/libdjvu/DjVuFileCache.cpp b/libdjvu/DjVuFileCache.cpp -index 6b1e85d..7d7a192 100644 ---- a/libdjvu/DjVuFileCache.cpp -+++ b/libdjvu/DjVuFileCache.cpp -@@ -63,6 +63,7 @@ - #include "DjVuFileCache.h" - #include "debug.h" - -+#include - #include - - -diff --git a/libdjvu/DjVuGlobal.cpp b/libdjvu/DjVuGlobal.cpp -index e6d3cec..df9278e 100644 ---- a/libdjvu/DjVuGlobal.cpp -+++ b/libdjvu/DjVuGlobal.cpp -@@ -76,6 +76,8 @@ - #include "GThreads.h" - #include "GException.h" - #include "GContainer.h" -+ -+#include - #include - #include - #include -diff --git a/libdjvu/DjVuGlobalMemory.cpp b/libdjvu/DjVuGlobalMemory.cpp -index 3c6012c..c8ba309 100644 ---- a/libdjvu/DjVuGlobalMemory.cpp -+++ b/libdjvu/DjVuGlobalMemory.cpp -@@ -67,6 +67,8 @@ - - #include "DjVuGlobal.h" - #include "GException.h" -+ -+#include - #include - #include - #include "debug.h" -diff --git a/libdjvu/DjVuMessage.cpp b/libdjvu/DjVuMessage.cpp -index 6f5a735..1726025 100644 ---- a/libdjvu/DjVuMessage.cpp -+++ b/libdjvu/DjVuMessage.cpp -@@ -71,6 +71,7 @@ - #include "debug.h" - #include - #include -+#include - #include - #ifdef WIN32 - # include -diff --git a/libdjvu/DjVuMessageLite.cpp b/libdjvu/DjVuMessageLite.cpp -index b8c1010..5daa9d9 100644 ---- a/libdjvu/DjVuMessageLite.cpp -+++ b/libdjvu/DjVuMessageLite.cpp -@@ -73,8 +73,8 @@ - #include "debug.h" - #include - #include -+#include - #include --// #include - #ifdef WIN32 - #include - #include -diff --git a/libdjvu/DjVuPalette.cpp b/libdjvu/DjVuPalette.cpp -index c489f7b..76b0bf4 100644 ---- a/libdjvu/DjVuPalette.cpp -+++ b/libdjvu/DjVuPalette.cpp -@@ -64,6 +64,8 @@ - #include "ByteStream.h" - #include "BSByteStream.h" - #include "DjVuPalette.h" -+ -+#include - #include - #include - -diff --git a/libdjvu/DjVuPort.h b/libdjvu/DjVuPort.h -index f6a92f6..e2b3125 100644 ---- a/libdjvu/DjVuPort.h -+++ b/libdjvu/DjVuPort.h -@@ -65,6 +65,7 @@ - - #include "GThreads.h" - #include "GURL.h" -+#include "stddef.h" - - #ifdef HAVE_NAMESPACES - namespace DJVU { -diff --git a/libdjvu/DjVuToPS.cpp b/libdjvu/DjVuToPS.cpp -index 5517bf3..6914ff9 100644 ---- a/libdjvu/DjVuToPS.cpp -+++ b/libdjvu/DjVuToPS.cpp -@@ -72,6 +72,7 @@ - #include "GPixmap.h" - #include "debug.h" - #include -+#include - #include - #include - #include -diff --git a/libdjvu/GBitmap.cpp b/libdjvu/GBitmap.cpp -index ab5c0de..797edcc 100644 ---- a/libdjvu/GBitmap.cpp -+++ b/libdjvu/GBitmap.cpp -@@ -66,6 +66,8 @@ - #include "GString.h" - #include "GThreads.h" - #include "GException.h" -+#include -+#include - #include - - // - Author: Leon Bottou, 05/1997 -diff --git a/libdjvu/GException.cpp b/libdjvu/GException.cpp -index 2ea179a..89da70f 100644 ---- a/libdjvu/GException.cpp -+++ b/libdjvu/GException.cpp -@@ -60,6 +60,7 @@ - # pragma implementation - #endif - -+#include - #include - #include - #include -diff --git a/libdjvu/GOS.cpp b/libdjvu/GOS.cpp -index e784932..d2088e2 100644 ---- a/libdjvu/GOS.cpp -+++ b/libdjvu/GOS.cpp -@@ -65,6 +65,7 @@ - #include "GOS.h" - #include "GURL.h" - -+#include - #include - #include - #include -diff --git a/libdjvu/GPixmap.cpp b/libdjvu/GPixmap.cpp -index 392df54..4bf6f57 100644 ---- a/libdjvu/GPixmap.cpp -+++ b/libdjvu/GPixmap.cpp -@@ -75,6 +75,8 @@ - #include "GThreads.h" - #include "Arrays.h" - #include "JPEGDecoder.h" -+ -+#include - #include - #include - #include -diff --git a/libdjvu/GSmartPointer.cpp b/libdjvu/GSmartPointer.cpp -index 6e523e7..58aef5b 100644 ---- a/libdjvu/GSmartPointer.cpp -+++ b/libdjvu/GSmartPointer.cpp -@@ -67,6 +67,7 @@ - // Our original implementation consisted of multiple classes. - // . - -+#include - #include - #if PARANOID_DEBUG - # include -diff --git a/libdjvu/GSmartPointer.h b/libdjvu/GSmartPointer.h -index 82781bd..8a8bb8a 100644 ---- a/libdjvu/GSmartPointer.h -+++ b/libdjvu/GSmartPointer.h -@@ -97,6 +97,8 @@ - #include "DjVuGlobal.h" - #include "atomic.h" - -+#include -+ - #ifdef HAVE_NAMESPACES - namespace DJVU { - # ifdef NOT_DEFINED // Just to fool emacs c++ mode -diff --git a/libdjvu/GString.cpp b/libdjvu/GString.cpp -index 03f6226..350b11b 100644 ---- a/libdjvu/GString.cpp -+++ b/libdjvu/GString.cpp -@@ -73,6 +73,7 @@ - #include "GThreads.h" - #include "debug.h" - -+#include - #include - #include - #include -diff --git a/libdjvu/GString.h b/libdjvu/GString.h -index b63b753..3aa1f76 100644 ---- a/libdjvu/GString.h -+++ b/libdjvu/GString.h -@@ -108,6 +108,7 @@ - #include "DjVuGlobal.h" - #include "GContainer.h" - -+#include - #include - #include - #ifdef WIN32 -diff --git a/libdjvu/GThreads.cpp b/libdjvu/GThreads.cpp -index d81f3c3..253fed8 100644 ---- a/libdjvu/GThreads.cpp -+++ b/libdjvu/GThreads.cpp -@@ -71,6 +71,8 @@ - #include "GThreads.h" - #include "GException.h" - #include "DjVuMessageLite.h" -+ -+#include - #include - #include - -diff --git a/libdjvu/GURL.cpp b/libdjvu/GURL.cpp -index c37bf52..a80078c 100644 ---- a/libdjvu/GURL.cpp -+++ b/libdjvu/GURL.cpp -@@ -72,6 +72,7 @@ - #include "GURL.h" - #include "debug.h" - -+#include - #include - #include - #include -diff --git a/libdjvu/GUnicode.cpp b/libdjvu/GUnicode.cpp -index 415c081..a8b25b8 100644 ---- a/libdjvu/GUnicode.cpp -+++ b/libdjvu/GUnicode.cpp -@@ -62,6 +62,8 @@ - - #include "GString.h" - -+#include -+ - #if HAS_ICONV - #include - #endif -diff --git a/libdjvu/IFFByteStream.h b/libdjvu/IFFByteStream.h -index a653f8c..e31b216 100644 ---- a/libdjvu/IFFByteStream.h -+++ b/libdjvu/IFFByteStream.h -@@ -124,6 +124,7 @@ - - - #include "DjVuGlobal.h" -+#include - #include - #include - #include -diff --git a/libdjvu/IW44EncodeCodec.cpp b/libdjvu/IW44EncodeCodec.cpp -index 8d7b12c..49081b7 100644 ---- a/libdjvu/IW44EncodeCodec.cpp -+++ b/libdjvu/IW44EncodeCodec.cpp -@@ -76,6 +76,7 @@ - #include "IFFByteStream.h" - #include "GRect.h" - -+#include - #include - #include - #include -diff --git a/libdjvu/IW44Image.cpp b/libdjvu/IW44Image.cpp -index 9476726..4a19fb5 100644 ---- a/libdjvu/IW44Image.cpp -+++ b/libdjvu/IW44Image.cpp -@@ -76,6 +76,7 @@ - #include "IFFByteStream.h" - #include "GRect.h" - -+#include - #include - #include - #include -diff --git a/libdjvu/JPEGDecoder.h b/libdjvu/JPEGDecoder.h -index bd430a0..fad1d4c 100644 ---- a/libdjvu/JPEGDecoder.h -+++ b/libdjvu/JPEGDecoder.h -@@ -64,6 +64,7 @@ - - #ifdef NEED_JPEG_DECODER - -+#include - #include - #include - -diff --git a/libdjvu/MMX.cpp b/libdjvu/MMX.cpp -index 5ab60bb..528dab6 100644 ---- a/libdjvu/MMX.cpp -+++ b/libdjvu/MMX.cpp -@@ -62,6 +62,7 @@ - - #include "MMX.h" - #include -+#include - #include - - -diff --git a/libdjvu/UnicodeByteStream.h b/libdjvu/UnicodeByteStream.h -index 0ae112b..9b49a17 100644 ---- a/libdjvu/UnicodeByteStream.h -+++ b/libdjvu/UnicodeByteStream.h -@@ -88,6 +88,7 @@ - #include "GString.h" - #include "ByteStream.h" - -+#include - - #ifdef HAVE_NAMESPACES - namespace DJVU { -diff --git a/libdjvu/XMLParser.cpp b/libdjvu/XMLParser.cpp -index 84386c5..7da923a 100644 ---- a/libdjvu/XMLParser.cpp -+++ b/libdjvu/XMLParser.cpp -@@ -75,6 +75,7 @@ - #include "debug.h" - #include - #include -+#include - #include - - -diff --git a/libdjvu/ZPCodec.cpp b/libdjvu/ZPCodec.cpp -index f6e971d..ff5b9bf 100644 ---- a/libdjvu/ZPCodec.cpp -+++ b/libdjvu/ZPCodec.cpp -@@ -66,6 +66,8 @@ - #include "ZPCodec.h" - #include "ByteStream.h" - #include "GException.h" -+ -+#include - #include - #include - #include -diff --git a/libdjvu/atomic.cpp b/libdjvu/atomic.cpp -index bdc193e..63fd483 100644 ---- a/libdjvu/atomic.cpp -+++ b/libdjvu/atomic.cpp -@@ -28,6 +28,7 @@ - # include "config.h" - #endif - -+#include - #include - #include - #include "atomic.h" -diff --git a/libdjvu/ddjvuapi.cpp b/libdjvu/ddjvuapi.cpp -index b18b84b..f40f5aa 100644 ---- a/libdjvu/ddjvuapi.cpp -+++ b/libdjvu/ddjvuapi.cpp -@@ -60,6 +60,7 @@ - # pragma implementation "ddjvuapi.h" - #endif - -+#include - #include - #include - #include -diff --git a/libdjvu/ddjvuapi.h b/libdjvu/ddjvuapi.h -index d0ed48f..841f223 100644 ---- a/libdjvu/ddjvuapi.h -+++ b/libdjvu/ddjvuapi.h -@@ -64,6 +64,7 @@ extern "C" { - } - #endif - -+#include - #include - #include - -diff --git a/libdjvu/miniexp.cpp b/libdjvu/miniexp.cpp -index e0fb087..fc51297 100644 ---- a/libdjvu/miniexp.cpp -+++ b/libdjvu/miniexp.cpp -@@ -23,6 +23,7 @@ - # pragma implementation "miniexp.h" - #endif - -+#include - #include - #include - #include -diff --git a/libdjvu/miniexp.h b/libdjvu/miniexp.h -index 91e345d..993005b 100644 ---- a/libdjvu/miniexp.h -+++ b/libdjvu/miniexp.h -@@ -38,7 +38,8 @@ extern "C" { - #ifndef MINILISPAPI - # define MINILISPAPI /**/ - #endif -- -+ -+#include - - /* -------------------------------------------------- */ - /* LISP EXPRESSIONS */ -diff --git a/tools/bzz.cpp b/tools/bzz.cpp -index ca092e1..2ebc7b9 100644 ---- a/tools/bzz.cpp -+++ b/tools/bzz.cpp -@@ -94,6 +94,7 @@ - #include "GURL.h" - #include "DjVuMessage.h" - #include -+#include - #include - - static const char *program = "(unknown)"; -diff --git a/tools/c44.cpp b/tools/c44.cpp -index 6f23b53..855504b 100644 ---- a/tools/c44.cpp -+++ b/tools/c44.cpp -@@ -226,6 +226,7 @@ - #include - #include - #include -+#include - #include - - // command line data -diff --git a/tools/cjb2.cpp b/tools/cjb2.cpp -index 8cf89b9..11eb662 100644 ---- a/tools/cjb2.cpp -+++ b/tools/cjb2.cpp -@@ -120,6 +120,7 @@ - #include "jb2tune.h" - - #include -+#include - #include - #if HAVE_TIFF - #include -diff --git a/tools/cpaldjvu.cpp b/tools/cpaldjvu.cpp -index 111cbd3..b640a7a 100644 ---- a/tools/cpaldjvu.cpp -+++ b/tools/cpaldjvu.cpp -@@ -118,6 +118,7 @@ - #include "jb2tune.h" - - #include -+#include - #include - #include - -diff --git a/tools/csepdjvu.cpp b/tools/csepdjvu.cpp -index cd721f8..d5203d5 100644 ---- a/tools/csepdjvu.cpp -+++ b/tools/csepdjvu.cpp -@@ -162,6 +162,7 @@ - #include "jb2tune.h" - - #include -+#include - #include - - #undef MIN -diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp -index 817e045..981a270 100644 ---- a/tools/ddjvu.cpp -+++ b/tools/ddjvu.cpp -@@ -62,6 +62,7 @@ - # include "config.h" - #endif - -+#include - #include - #include - #include -diff --git a/tools/djvm.cpp b/tools/djvm.cpp -index 951bd66..6ea88c2 100644 ---- a/tools/djvm.cpp -+++ b/tools/djvm.cpp -@@ -135,9 +135,9 @@ - #include "DjVuMessage.h" - - #include -+#include - #include - #include --#include - - static const char * progname; - -diff --git a/tools/djvmcvt.cpp b/tools/djvmcvt.cpp -index 9ca1c54..20b468a 100644 ---- a/tools/djvmcvt.cpp -+++ b/tools/djvmcvt.cpp -@@ -144,6 +144,7 @@ - - #include - #include -+#include - #include - - static const char * progname; -diff --git a/tools/djvudump.cpp b/tools/djvudump.cpp -index 6a0215a..2dddbdf 100644 ---- a/tools/djvudump.cpp -+++ b/tools/djvudump.cpp -@@ -119,6 +119,7 @@ xxx - #include - #include - #include -+#include - #include - - void -diff --git a/tools/djvuextract.cpp b/tools/djvuextract.cpp -index 4a9f381..907b99c 100644 ---- a/tools/djvuextract.cpp -+++ b/tools/djvuextract.cpp -@@ -105,6 +105,7 @@ - #include "GOS.h" - #include "DjVuMessage.h" - #include -+#include - #include - - -diff --git a/tools/djvumake.cpp b/tools/djvumake.cpp -index 7020484..4c5fc0f 100644 ---- a/tools/djvumake.cpp -+++ b/tools/djvumake.cpp -@@ -153,6 +153,7 @@ - - #include - #include -+#include - #include - #include - -diff --git a/tools/djvups.cpp b/tools/djvups.cpp -index 51aa999..632b832 100644 ---- a/tools/djvups.cpp -+++ b/tools/djvups.cpp -@@ -57,6 +57,7 @@ - # include "config.h" - #endif - -+#include - #include - #include - #include -diff --git a/tools/djvused.cpp b/tools/djvused.cpp -index de84dcd..687fdca 100644 ---- a/tools/djvused.cpp -+++ b/tools/djvused.cpp -@@ -61,6 +61,7 @@ - #endif - - #include -+#include - #include - #include - #include -diff --git a/tools/djvuserve.cpp b/tools/djvuserve.cpp -index 19a17da..818fe78 100644 ---- a/tools/djvuserve.cpp -+++ b/tools/djvuserve.cpp -@@ -73,6 +73,7 @@ - - #include - #include -+#include - #include - #include - #include -diff --git a/tools/djvutxt.cpp b/tools/djvutxt.cpp -index ba2c745..9e9124c 100644 ---- a/tools/djvutxt.cpp -+++ b/tools/djvutxt.cpp -@@ -61,6 +61,7 @@ - # include "config.h" - #endif - -+#include - #include - #include - #include -diff --git a/tools/tiff2pdf.h b/tools/tiff2pdf.h -index 082f5fb..656dc43 100644 ---- a/tools/tiff2pdf.h -+++ b/tools/tiff2pdf.h -@@ -22,6 +22,7 @@ - # endif - # if HAVE_TIFF - # include -+# include - # include - # include - # include -diff --git a/xmltools/djvutoxml.cpp b/xmltools/djvutoxml.cpp -index 17c769b..b40535e 100644 ---- a/xmltools/djvutoxml.cpp -+++ b/xmltools/djvutoxml.cpp -@@ -71,6 +71,7 @@ - - #include - #include -+#include - #include - #include - #include -diff --git a/xmltools/djvuxmlparser.cpp b/xmltools/djvuxmlparser.cpp -index bdc5768..6679a9d 100644 ---- a/xmltools/djvuxmlparser.cpp -+++ b/xmltools/djvuxmlparser.cpp -@@ -70,6 +70,7 @@ - #include - #include - #include -+#include - #include - - static void diff --git a/pkgs/applications/misc/evince/default.nix b/pkgs/applications/misc/evince/default.nix deleted file mode 100644 index 793c7bda2994..000000000000 --- a/pkgs/applications/misc/evince/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ fetchurl, stdenv, perl, perlXMLParser, gettext, intltool -, pkgconfig, glib, gtk, gnomedocutils, gnomeicontheme -, libgnome, libgnomeui, scrollkeeper, libxslt -, libglade, libgnome_keyring, dbus, dbus_glib -, poppler, libspectre, djvulibre, shared_mime_info -, makeWrapper, which, ghostscript -, recentListSize ? null # 5 is not enough, allow passing a different number -}: - -stdenv.mkDerivation rec { - name = "evince-2.32.0"; - - src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/evince/2.32/${name}.tar.bz2"; - sha256 = "2a4c91ae38f8b5028cebb91b9da9ddc50ea8ae3f3d429df89ba351da2d787ff7"; - }; - - buildInputs = [ - perl perlXMLParser gettext intltool pkgconfig glib gtk - gnomedocutils gnomeicontheme libgnome libgnomeui libglade - scrollkeeper libgnome_keyring - libxslt # for `xsltproc' - dbus dbus_glib poppler libspectre djvulibre makeWrapper which - ghostscript - ]; - - configureFlags = "--with-libgnome --enable-dbus --enable-pixbuf " - - # Do not use nautilus - + " --disable-nautilus " - # Do not update Scrollkeeper's database (GNOME's help system). - + "--disable-scrollkeeper"; - - postUnpack = if recentListSize != null then '' - sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' */shell/ev-open-recent-action.c - sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' */shell/ev-window.c - '' else ""; - - postInstall = '' - # Tell Glib/GIO about the MIME info directory, which is used - # by `g_file_info_get_content_type ()'. - wrapProgram "$out/bin/evince" \ - --prefix XDG_DATA_DIRS : "${shared_mime_info}/share:$out/share" - ''; - - meta = { - homepage = http://www.gnome.org/projects/evince/; - description = "Evince, GNOME's document viewer"; - - longDescription = '' - Evince is a document viewer for multiple document formats. It - currently supports PDF, PostScript, DjVu, TIFF and DVI. The goal - of Evince is to replace the multiple document viewers that exist - on the GNOME Desktop with a single simple application. - ''; - - license = "GPLv2+"; - }; -} diff --git a/pkgs/applications/networking/browsers/firefox/21.0.nix b/pkgs/applications/networking/browsers/firefox/21.0.nix index 1a23c9d9cf9f..6043364c754b 100644 --- a/pkgs/applications/networking/browsers/firefox/21.0.nix +++ b/pkgs/applications/networking/browsers/firefox/21.0.nix @@ -35,7 +35,7 @@ rec { #"--enable-profiling" "--disable-debug" "--enable-strip" - # "--with-system-jpeg" # Too old in nixpkgs + "--with-system-jpeg" # now we use recent libjpeg-turbo "--with-system-zlib" "--with-system-bz2" "--with-system-nspr" diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 7bdb6cc1452d..a4a32327d0c6 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { configureFlags = "--enable-external-ortp --enable-external-mediastreamer"; + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; # I'm lazy to fix these for them + meta = { homepage = http://www.linphone.org/; description = "Open Source video SIP softphone"; diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 26879a6f660f..1654aa880046 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -1,6 +1,7 @@ { fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk, libgnomeui, libofx , libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui -, intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper +, intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade +, libgsf, libart_lgpl }: /* If you experience GConf errors when running GnuCash on NixOS, see @@ -19,9 +20,12 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libxml2 gconf glib gtk libgnomeui libgtkhtml gtkhtml libgnomeprint goffice enchant gettext intltool perl guile slibGuile - swig isocodes bzip2 makeWrapper libofx + swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl ]; + # fix a problem with new intltool versions, taken from Gentoo + patchPhase = "patch -p3 < ${./potfiles-skip.patch}"; + configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx"; postInstall = '' diff --git a/pkgs/applications/office/gnucash/potfiles-skip.patch b/pkgs/applications/office/gnucash/potfiles-skip.patch new file mode 100644 index 000000000000..6fef3a1dcd38 --- /dev/null +++ b/pkgs/applications/office/gnucash/potfiles-skip.patch @@ -0,0 +1,147 @@ +Index: gnucash/branches/2.4/po/POTFILES.skip +=================================================================== +--- gnucash/branches/2.4/po/POTFILES.skip (revision 18623) ++++ gnucash/branches/2.4/po/POTFILES.skip (revision 22300) +@@ -19,2 +19,142 @@ + src/libqof/qof/qofquery-serialize.c + src/libqof/qof/qofsql.c ++ ++# The scheme files are handled by intl-scm/guile-strings.c because ++# intltool wouldn't scan scheme files. They're here now because ++# intltool 0.50 *does* scan them, and it creates an error during make ++# check. Once the whole world has upgraded to intltool 0.50, intl-scm ++# can be deleted and these files added to POTFILES.in. ++ ++src/app-utils/date-utilities.scm ++src/app-utils/prefs.scm ++src/business/business-utils/business-prefs.scm ++src/business/business-utils/business-utils.scm ++src/business/business-utils/gnucash/business-utils.scm ++src/import-export/qif-import/qif-dialog-utils.scm ++src/import-export/qif-import/qif-file.scm ++src/import-export/qif-import/qif-import/qif-dialog-utils.scm ++src/import-export/qif-import/qif-import/qif-file.scm ++src/import-export/qif-import/qif-import/qif-merge-groups.scm ++src/import-export/qif-import/qif-import/qif-parse.scm ++src/import-export/qif-import/qif-import/qif-to-gnc.scm ++src/import-export/qif-import/qif-merge-groups.scm ++src/import-export/qif-import/qif-parse.scm ++src/import-export/qif-import/qif-to-gnc.scm ++src/report/business-reports/aging.scm ++src/report/business-reports/balsheet-eg.eguile.scm ++src/report/business-reports/balsheet-eg.scm ++src/report/business-reports/business-reports.scm ++src/report/business-reports/customer-summary.scm ++src/report/business-reports/easy-invoice.scm ++src/report/business-reports/fancy-invoice.scm ++src/report/business-reports/gnucash/report/aging.scm ++src/report/business-reports/gnucash/report/balsheet-eg.eguile.scm ++src/report/business-reports/gnucash/report/balsheet-eg.scm ++src/report/business-reports/gnucash/report/business-reports.scm ++src/report/business-reports/gnucash/report/customer-summary.scm ++src/report/business-reports/gnucash/report/easy-invoice.scm ++src/report/business-reports/gnucash/report/fancy-invoice.scm ++src/report/business-reports/gnucash/report/invoice.scm ++src/report/business-reports/gnucash/report/job-report.scm ++src/report/business-reports/gnucash/report/owner-report.scm ++src/report/business-reports/gnucash/report/payables.scm ++src/report/business-reports/gnucash/report/receivables.scm ++src/report/business-reports/gnucash/report/taxinvoice.eguile.scm ++src/report/business-reports/gnucash/report/taxinvoice.scm ++src/report/business-reports/invoice.scm ++src/report/business-reports/job-report.scm ++src/report/business-reports/owner-report.scm ++src/report/business-reports/payables.scm ++src/report/business-reports/receivables.scm ++src/report/business-reports/taxinvoice.eguile.scm ++src/report/business-reports/taxinvoice.scm ++src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm ++src/report/locale-specific/us/gnucash/report/taxtxf.scm ++src/report/locale-specific/us/taxtxf-de_DE.scm ++src/report/locale-specific/us/taxtxf.scm ++src/report/report-gnome/gnucash/report/report-gnome.scm ++src/report/report-gnome/report-gnome.scm ++src/report/report-system/eguile-gnc.scm ++src/report/report-system/gnucash/report/eguile-gnc.scm ++src/report/report-system/html-acct-table.scm ++src/report/report-system/html-fonts.scm ++src/report/report-system/html-style-sheet.scm ++src/report/report-system/html-utilities.scm ++src/report/report-system/options-utilities.scm ++src/report/report-system/report-utilities.scm ++src/report/report-system/report.scm ++src/report/standard-reports/account-piecharts.scm ++src/report/standard-reports/account-summary.scm ++src/report/standard-reports/advanced-portfolio.scm ++src/report/standard-reports/average-balance.scm ++src/report/standard-reports/balance-sheet.scm ++src/report/standard-reports/budget-balance-sheet.scm ++src/report/standard-reports/budget-barchart.scm ++src/report/standard-reports/budget-flow.scm ++src/report/standard-reports/budget-income-statement.scm ++src/report/standard-reports/budget.scm ++src/report/standard-reports/cash-flow.scm ++src/report/standard-reports/category-barchart.scm ++src/report/standard-reports/daily-reports.scm ++src/report/standard-reports/equity-statement.scm ++src/report/standard-reports/general-journal.scm ++src/report/standard-reports/general-ledger.scm ++src/report/standard-reports/gnucash/report/standard-reports/account-piecharts.scm ++src/report/standard-reports/gnucash/report/standard-reports/account-summary.scm ++src/report/standard-reports/gnucash/report/standard-reports/advanced-portfolio.scm ++src/report/standard-reports/gnucash/report/standard-reports/average-balance.scm ++src/report/standard-reports/gnucash/report/standard-reports/balance-sheet.scm ++src/report/standard-reports/gnucash/report/standard-reports/budget-balance-sheet.scm ++src/report/standard-reports/gnucash/report/standard-reports/budget-barchart.scm ++src/report/standard-reports/gnucash/report/standard-reports/budget-flow.scm ++src/report/standard-reports/gnucash/report/standard-reports/budget-income-statement.scm ++src/report/standard-reports/gnucash/report/standard-reports/budget.scm ++src/report/standard-reports/gnucash/report/standard-reports/cash-flow.scm ++src/report/standard-reports/gnucash/report/standard-reports/category-barchart.scm ++src/report/standard-reports/gnucash/report/standard-reports/daily-reports.scm ++src/report/standard-reports/gnucash/report/standard-reports/equity-statement.scm ++src/report/standard-reports/gnucash/report/standard-reports/general-journal.scm ++src/report/standard-reports/gnucash/report/standard-reports/general-ledger.scm ++src/report/standard-reports/gnucash/report/standard-reports/income-statement.scm ++src/report/standard-reports/gnucash/report/standard-reports/net-barchart.scm ++src/report/standard-reports/gnucash/report/standard-reports/net-linechart.scm ++src/report/standard-reports/gnucash/report/standard-reports/portfolio.scm ++src/report/standard-reports/gnucash/report/standard-reports/price-scatter.scm ++src/report/standard-reports/gnucash/report/standard-reports/register.scm ++src/report/standard-reports/gnucash/report/standard-reports/sx-summary.scm ++src/report/standard-reports/gnucash/report/standard-reports/transaction.scm ++src/report/standard-reports/gnucash/report/standard-reports/trial-balance.scm ++src/report/standard-reports/income-statement.scm ++src/report/standard-reports/net-barchart.scm ++src/report/standard-reports/net-linechart.scm ++src/report/standard-reports/portfolio.scm ++src/report/standard-reports/price-scatter.scm ++src/report/standard-reports/register.scm ++src/report/standard-reports/sx-summary.scm ++src/report/standard-reports/transaction.scm ++src/report/standard-reports/trial-balance.scm ++src/report/stylesheets/gnucash/report/stylesheet-easy.scm ++src/report/stylesheets/gnucash/report/stylesheet-fancy.scm ++src/report/stylesheets/gnucash/report/stylesheet-footer.scm ++src/report/stylesheets/gnucash/report/stylesheet-plain.scm ++src/report/stylesheets/stylesheet-easy.scm ++src/report/stylesheets/stylesheet-fancy.scm ++src/report/stylesheets/stylesheet-footer.scm ++src/report/stylesheets/stylesheet-plain.scm ++src/report/utility-reports/gnucash/report/hello-world.scm ++src/report/utility-reports/gnucash/report/view-column.scm ++src/report/utility-reports/gnucash/report/welcome-to-gnucash.scm ++src/report/utility-reports/hello-world.scm ++src/report/utility-reports/view-column.scm ++src/report/utility-reports/welcome-to-gnucash.scm ++src/scm/build-config.scm ++src/scm/build-config.scm.in ++src/scm/command-line.scm ++src/scm/gnucash/price-quotes.scm ++src/scm/main-window.scm ++src/scm/price-quotes.scm ++src/tax/us/de_DE.scm ++src/tax/us/gnucash/tax/de_DE.scm ++src/tax/us/txf-de_DE.scm ++src/tax/us/txf.scm ++ diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index 1402dc9b1824..84da60398227 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -1,13 +1,13 @@ { fetchurl, stdenv, libxml2, freetype, mesa, glew, qt4 , cmake, makeWrapper, libjpeg }: -let version = "3.7.0"; in +let version = "4.1.0"; in stdenv.mkDerivation rec { name = "tulip-${version}"; src = fetchurl { - url = "mirror://sourceforge/auber/tulip/tulip-3.7.0/${name}-src.tar.gz"; - sha256 = "150fj9pdxblvl5sby61cb2kq98r6h8yljk3vq5xizn198d3fz4jq"; + url = "mirror://sourceforge/auber/${name}_src.tar.gz"; + sha256 = "1js1f8xdm9g2m66xbhfxa8ixzw6h4gjynxsm83p54l3i0hs3biig"; }; buildInputs = [ libxml2 freetype glew mesa qt4 libjpeg ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = { - description = "Tulip, a visualization framework for the analysis and visualization of relational data"; + description = "A visualization framework for the analysis and visualization of relational data"; longDescription = '' Tulip is an information visualization framework dedicated to the diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix index 29b8b306fe54..59fb1f5a867f 100644 --- a/pkgs/applications/version-management/kdesvn/default.nix +++ b/pkgs/applications/version-management/kdesvn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, apr, aprutil, subversion, db4, kdelibs }: +{ stdenv, fetchurl, gettext, apr, aprutil, subversion, db4, kdelibs, expat }: stdenv.mkDerivation rec { name = "kdesvn-1.5.5"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patches = [ ./docbook.patch ./virtual_inheritance.patch ]; - buildInputs = [ apr aprutil subversion db4 kdelibs ]; + buildInputs = [ apr aprutil subversion db4 kdelibs expat ]; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index db6bde782b99..4f2addcc99b0 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -3,7 +3,7 @@ , gst_ffmpeg, speex , libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool , boost, freetype, agg, dbus, curl, pkgconfig, gettext -, glib, gtk, gtkglext, x11, ming, dejagnu, python, perl +, glib, gtk, gtkglext, pangox_compat, x11, ming, dejagnu, python, perl , freefont_ttf, haxe, swftools , lib, makeWrapper , xulrunner }: @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { gettext x11 SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg speex libtool libogg libxml2 libjpeg mesa libpng libungif boost freetype agg - dbus curl pkgconfig glib gtk gtkglext + dbus curl pkgconfig glib gtk gtkglext pangox_compat xulrunner makeWrapper ] diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix new file mode 100644 index 000000000000..2c1044d69372 --- /dev/null +++ b/pkgs/applications/window-managers/weston/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon +, cairo, libxcb, libXcursor, x11, udev, libdrm, mtdev +, libjpeg, pam, autoconf, automake, libtool }: + +let version = "1.0.5"; in + +stdenv.mkDerivation rec { + name = "weston-${version}"; + + src = fetchurl { + url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; + sha256 = "0g2k82pnlxl8b70ykazj7kn8xffjfsmgcgx427qdrm4083z2hgm0"; + }; + + buildInputs = [ pkgconfig wayland mesa libxkbcommon + cairo libxcb libXcursor x11 udev libdrm mtdev + libjpeg pam autoconf automake libtool ]; + + preConfigure = "autoreconf -vfi"; + + # prevent install target to chown root weston-launch, which fails + configureFlags = '' + --disable-setuid-install + ''; + + meta = { + description = "Reference implementation of a Wayland compositor"; + homepage = http://wayland.freedesktop.org/; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/data/misc/gsettings-desktop-schemas/default.nix b/pkgs/data/misc/gsettings-desktop-schemas/default.nix deleted file mode 100644 index c934863d75d7..000000000000 --- a/pkgs/data/misc/gsettings-desktop-schemas/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, glib, pkgconfig, intltool }: - -stdenv.mkDerivation { - name = "gsettings-desktop-schemas-3.2.0"; - - src = fetchurl { - url = mirror://gnome/sources/gsettings-desktop-schemas/3.2/gsettings-desktop-schemas-3.2.0.tar.xz; - sha256 = "0772axkd1nlf3j1lcg0zi5x5jh4zmr25k98dhn7pzppahljaj3hi"; - }; - - buildInputs = [ glib ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - meta = { - inherit (glib.meta) maintainers platforms; - }; -} diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix index 14a41cf84fc9..9e2679c04380 100644 --- a/pkgs/data/misc/poppler-data/default.nix +++ b/pkgs/data/misc/poppler-data/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, cmake }: stdenv.mkDerivation rec { - name = "poppler-data-0.4.5"; + name = "poppler-data-0.4.6"; src = fetchurl { url = "http://poppler.freedesktop.org/${name}.tar.gz"; - sha256 = "1zbh1zd083wfwrcw7vxc2bn32h42y6iyh24syxcb3r5ggd2vr41i"; + sha256 = "1yhaz74b50hjkz3ii077kmq3qg3p3kdyxm33cv6r1njvz8fr01pk"; }; buildInputs = [ cmake ]; @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { homepage = http://poppler.freedesktop.org/; description = "Encoding files for Poppler, a PDF rendering library"; platforms = stdenv.lib.platforms.all; + license = "free"; # more free licenses combined maintainers = [ stdenv.lib.maintainers.urkud ]; }; } diff --git a/pkgs/desktops/gnome-2/bindings/python-rsvg/default.nix b/pkgs/desktops/gnome-2/bindings/python-rsvg/default.nix index c09ed74a97c0..1e2faf3af84f 100644 --- a/pkgs/desktops/gnome-2/bindings/python-rsvg/default.nix +++ b/pkgs/desktops/gnome-2/bindings/python-rsvg/default.nix @@ -1,24 +1,26 @@ -{ stdenv, fetchurl, gnome, librsvg, pkgconfig, pygtk, python }: +{ stdenv, fetchurl, gnome, librsvg, pkgconfig, pygtk, python, gtk }: stdenv.mkDerivation rec { - version = "2.32"; + ver_maj = "2.32"; + ver_min = "0"; + version = "${ver_maj}.${ver_min}"; name = "python-rsvg-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gnome-python-desktop/${version}/gnome-python-desktop-${version}.0.tar.gz"; - sha256 = "1xhh3h1qdnimydvv55pmqwyzjchhjwfvp951sjlq0180kskqrlj5"; + url = "mirror://gnome/sources/gnome-python-desktop/${ver_maj}/gnome-python-desktop-${version}.tar.bz2"; + sha256 = "1s8f9rns9v7qlwjv9qh9lr8crp88dpzfm45hj47zc3ivpy0dbnq9"; }; configurePhase = '' - sed -e "s@{PYTHONDIR}/gtk-2.0@{PYTHONDIR}/@" -i rsvg/wscript - python waf configure --enable-modules=rsvg --prefix=$out + sed -e "s@{PYTHONDIR}/gtk-2.0@{PYTHONDIR}/@" -i rsvg/wscript + python waf configure --enable-modules=rsvg --prefix=$out ''; buildPhase = "python waf build"; installPhase = "python waf install"; - buildInputs = [ gnome.gnome_python librsvg pkgconfig pygtk python ]; + buildInputs = [ gtk gnome.gnome_python librsvg pkgconfig pygtk python ]; meta = with stdenv.lib; { homepage = "http://www.pygtk.org"; diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 38ae4c015342..3d76ba72daeb 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -29,8 +29,6 @@ libgtkhtml = callPackage ./platform/libgtkhtml { }; - intltool = callPackage ./platform/intltool { }; - GConf = callPackage ./platform/GConf { }; gconfmm = callPackage ./platform/gconfmm { }; diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix index ec6931724bc2..22c22c6bcf50 100644 --- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix +++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix @@ -9,6 +9,10 @@ stdenv.mkDerivation rec { sha256 = "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam"; }; + preBuild = '' + sed 's/-DG_DISABLE_DEPRECATED//' -i linc2/src/Makefile + ''; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libIDL ]; } diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix index 0215b341f934..55daa496afc7 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix @@ -16,4 +16,6 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ GConf glib ]; + + postPatch = "find . -name Makefile.in | xargs sed 's/-DG_DISABLE_DEPRECATED//g' -i "; } diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix index 4eab4b8213c6..903387f50b14 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, mesa, pango }: +{ stdenv, fetchurl, pkgconfig, glib, gtk, mesa, pango, pangox_compat, xlibs }: stdenv.mkDerivation rec { name = "gtkglext-1.2.0"; @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0lbz96jwz57hnn52b8rfj54inwpwcc9fkdq6ya043cgnfih77g8n"; }; - buildInputs = [ pkgconfig gtk mesa pango ]; + buildInputs = with xlibs; + [ pkgconfig glib gtk mesa pango pangox_compat libX11 libXmu ]; # The library uses `GTK_WIDGET_REALIZED', `GTK_WIDGET_TOPLEVEL', and # `GTK_WIDGET_NO_WINDOW', all of which appear to be deprecated nowadays. diff --git a/pkgs/desktops/gnome-2/platform/intltool/default.nix b/pkgs/desktops/gnome-2/platform/intltool/default.nix deleted file mode 100644 index 51eaa4a2cf48..000000000000 --- a/pkgs/desktops/gnome-2/platform/intltool/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gettext}: - -stdenv.mkDerivation rec { - name = "intltool-0.40.6"; - - src = fetchurl { - url = mirror://gnome/sources/intltool/0.40/intltool-0.40.6.tar.bz2; - sha256 = "0r1vkvy5xzqk01yl6a0xlrry39bra24alkrx6279b77hc62my7jd"; - }; - - buildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ perl perlXMLParser gettext ]; -} diff --git a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix index 79c41f924d3f..2303fb15a6f1 100644 --- a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix +++ b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { sha256 = "0swp4kk6x7hy1rvd1f9jba31lvfc6qvafkvbpg9h0r34fzrd8q4i"; }; - preConfigure = "export USER=`whoami`"; + preConfigure = # still using stuff deprecated in new glib versions + "sed 's/-DG_DISABLE_DEPRECATED//g' -i configure activation-server/Makefile.in"; + nativeBuildInputs = [ flex bison pkgconfig intltool procps ]; buildInputs = [ libxml2 ]; propagatedBuildInputs = [ popt glib ORBit2 ]; diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix index 37dbfd129611..5ab6d5e813d6 100644 --- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { major = "2"; minor = "32"; patchlevel = "1"; sha256 = "197pnq8y0knqjhm2fg4j6hbqqm3qfzfnd0irhwxpk1b4hqb3kimj"; }; - + + patches = [ ./new-glib.patch ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra libtool ]; propagatedBuildInputs = [ glib libbonobo ]; diff --git a/pkgs/desktops/gnome-2/platform/libgnome/new-glib.patch b/pkgs/desktops/gnome-2/platform/libgnome/new-glib.patch new file mode 100644 index 000000000000..ceabfbdd158e --- /dev/null +++ b/pkgs/desktops/gnome-2/platform/libgnome/new-glib.patch @@ -0,0 +1,65 @@ +Porting libgnome to newer glib: + * remove g_thread_init and g_thread_supported, which are longer needed + https://developer.gnome.org/glib/2.36/glib-Deprecated-Thread-APIs.html#g-thread-init + * replace GStaticRecMutex by GRecMutex + https://developer.gnome.org/glib/2.36/glib-Deprecated-Thread-APIs.html#GStaticRecMutex + +diff --git a/libgnome/gnome-i18n.c b/libgnome/gnome-i18n.c +index 531c56c..f13d61e 100644 +--- a/libgnome/gnome-i18n.c ++++ b/libgnome/gnome-i18n.c +@@ -55,12 +55,14 @@ + const GList * + gnome_i18n_get_language_list (const gchar *ignored) + { +- static GStaticRecMutex lang_list_lock = G_STATIC_REC_MUTEX_INIT; ++ static GRecMutex lang_list_lock; ++ g_rec_mutex_init (&lang_list_lock); ++ + static GList *list = NULL; + const char * const* langs; + int i; + +- g_static_rec_mutex_lock (&lang_list_lock); ++ g_rec_mutex_lock (&lang_list_lock); + + if (list == NULL) { + langs = g_get_language_names (); +@@ -71,7 +73,7 @@ gnome_i18n_get_language_list (const gchar *ignored) + list = g_list_reverse (list); + } + +- g_static_rec_mutex_unlock (&lang_list_lock); ++ g_rec_mutex_unlock (&lang_list_lock); + + return list; + } +diff --git a/libgnome/gnome-init.c b/libgnome/gnome-init.c +index fe3efd4..c6619af 100644 +--- a/libgnome/gnome-init.c ++++ b/libgnome/gnome-init.c +@@ -115,9 +115,6 @@ gnome_bonobo_module_info_get (void) + static void + bonobo_activation_pre_args_parse (GnomeProgram *program, GnomeModuleInfo *mod_info) + { +- if (!g_thread_supported ()) +- g_thread_init (NULL); +- + if (!bonobo_activation_is_initialized ()) + bonobo_activation_preinit (program, mod_info); + } +diff --git a/libgnome/gnome-program.c b/libgnome/gnome-program.c +index 739765e..cd14999 100644 +--- a/libgnome/gnome-program.c ++++ b/libgnome/gnome-program.c +@@ -1878,10 +1878,6 @@ gnome_program_init (const char *app_id, const char *app_version, + GnomeProgram *program; + va_list args; + +- /* g_thread_init() has to be the first GLib function called ever */ +- if (!g_threads_got_initialized) +- g_thread_init (NULL); +- + g_type_init (); + + va_start(args, first_property_name); diff --git a/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix b/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix new file mode 100644 index 000000000000..948774572670 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xlibs, libXi +, intltool, dbus_glib, at_spi2_core, libSM }: + +stdenv.mkDerivation rec { + versionMajor = "2.8"; + versionMinor = "0"; + moduleName = "at-spi2-atk"; + name = "${moduleName}-${versionMajor}.${versionMinor}"; + + src = fetchurl { + url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; + sha256 = "085sqww174vl3i9ccb477v706rkjs2d107rl96ma1kbl2jyar226"; + }; + + buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi + intltool dbus_glib at_spi2_core libSM ]; +} diff --git a/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix b/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix new file mode 100644 index 000000000000..2d433486677a --- /dev/null +++ b/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, python, pkgconfig, popt, intltool, dbus_glib +, libX11, xextproto, libSM, libICE, libXtst, libXi }: + +stdenv.mkDerivation rec { + + versionMajor = "2.8"; + versionMinor = "0"; + moduleName = "at-spi2-core"; + name = "${moduleName}-${versionMajor}.${versionMinor}"; + + src = fetchurl { + url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; + sha256 = "0n64h6j10sn90ds9y70d9wlvvsbwnrym9fm0cyjxb0zmqw7s6q8q"; + }; + + buildInputs = [ + python pkgconfig popt intltool dbus_glib + libX11 xextproto libSM libICE libXtst libXi + ]; + + # ToDo: on non-NixOS we create a symlink from there? + configureFlags = "--with-dbus-daemondir=/run/current-system/sw/bin/"; +} diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix new file mode 100644 index 000000000000..de49bffc419e --- /dev/null +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -0,0 +1,62 @@ +{ fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2 +, glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info +, itstool, gnome_icon_theme, libgnome_keyring, gsettings_desktop_schemas +, poppler, ghostscriptX, djvulibre, libspectre +, makeWrapper #, python /*just for tests*/ +, recentListSize ? null # 5 is not enough, allow passing a different number +}: + +stdenv.mkDerivation rec { + name = "evince-3.6.1"; + + src = fetchurl { + url = "http://ftp.gnome.org/pub/GNOME/sources/evince/3.6/${name}.tar.xz"; + sha256 = "1da1pij030dh8mb0pr0jnyszgsbjnh8lc17rj5ii52j3kmbv51qv"; + }; + + buildInputs = [ + pkgconfig intltool perl perlXMLParser libxml2 + glib gtk3 pango atk gdk_pixbuf + itstool gnome_icon_theme libgnome_keyring gsettings_desktop_schemas + poppler ghostscriptX djvulibre libspectre + makeWrapper + ]; + + configureFlags = [ + "--disable-nautilus" # Do not use nautilus + "--disable-dbus" # strange compilation error + ]; + + preConfigure = with stdenv.lib; + optionalString doCheck '' + for file in test/*.py; do + echo "patching $file" + sed '1s,/usr,${python},' -i "$file" + done + '' + optionalString (recentListSize != null) '' + sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c + sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c + ''; + + postInstall = '' + # Tell Glib/GIO about the MIME info directory, which is used + # by `g_file_info_get_content_type ()'. + wrapProgram "$out/bin/evince" \ + --prefix XDG_DATA_DIRS : "${shared_mime_info}/share:$out/share" + '' + gsettings_desktop_schemas.doCompileSchemas; + doCheck = false; # would need pythonPackages.dogTail, which is missing + + meta = { + homepage = http://www.gnome.org/projects/evince/; + description = "GNOME's document viewer"; + + longDescription = '' + Evince is a document viewer for multiple document formats. It + currently supports PDF, PostScript, DjVu, TIFF and DVI. The goal + of Evince is to replace the multiple document viewers that exist + on the GNOME Desktop with a single simple application. + ''; + + license = "GPLv2+"; + }; +} diff --git a/pkgs/desktops/gnome-3/core/gconf/default.nix b/pkgs/desktops/gnome-3/core/gconf/default.nix new file mode 100644 index 000000000000..9ca9c227d586 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gconf/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, dbus_glib, gtk, glib, libxml2 +, intltool, polkit, orbit }: + +stdenv.mkDerivation rec { + + versionMajor = "3.2"; + versionMinor = "5"; + moduleName = "GConf"; + + origName = "${moduleName}-${versionMajor}.${versionMinor}"; + + name = "gconf-${versionMajor}.${versionMinor}"; + + src = fetchurl { + url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${origName}.tar.xz"; + sha256 = "1ijqks0jxc4dyfxg4vnbqds4aj6miyahlsmlqlkf2bi1798akpjd"; + }; + + 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/gcr/default.nix b/pkgs/desktops/gnome-3/core/gcr/default.nix new file mode 100644 index 000000000000..cf9774c5511c --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gcr/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib +, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk }: + +stdenv.mkDerivation rec { + name = "gcr-3.6.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gcr/3.6/${name}.tar.xz"; + sha256 = "16xyqxv2hxl3a4m8ahilqcf1ps58w1ijh8dav1l5nqz36ljdn2gp"; + }; + + buildInputs = [ + pkgconfig intltool gnupg p11_kit glib + libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk + ]; + + #doCheck = true; +} diff --git a/pkgs/desktops/gnome-3/core/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/gnome-icon-theme/default.nix new file mode 100644 index 000000000000..303bcd2208ce --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-icon-theme/default.nix @@ -0,0 +1,12 @@ +{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk }: + +stdenv.mkDerivation rec { + name = "gnome-icon-theme-3.6.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-icon-theme/3.6/${name}.tar.xz"; + sha256 = "0i8hkx2c1g5ckrvbkvs9n47i8fby8p9xs6p5l0mxdx9aq4smak9i"; + }; + + nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ]; +} 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/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix new file mode 100644 index 000000000000..41fdcc8086b1 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango +, gnome_doc_utils, intltool, libX11, which, gconf }: + +stdenv.mkDerivation rec { + + versionMajor = "3.4"; + versionMinor = "1.1"; + + name = "gnome-terminal-${versionMajor}.${versionMinor}"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-terminal/${versionMajor}/${name}.tar.xz"; + sha256 = "1p9zqjmkxryf2kyghhhwwpsh4kd8y1jzzwc9zxghmpxszi9a5m0l"; + }; + + configureFlags = "--disable-scrollkeeper"; + buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte gconf ]; + + nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ]; +} diff --git a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix new file mode 100644 index 000000000000..9c13539a1cc6 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgconfig, intltool, glib + # just for passthru +, gtk3, gsettings_desktop_schemas }: + +stdenv.mkDerivation rec { + + versionMajor = "3.6"; + versionMinor = "1"; + moduleName = "gsettings-desktop-schemas"; + + name = "${moduleName}-${versionMajor}.${versionMinor}"; + + src = fetchurl { + url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; + sha256 = "1rk71q2rky9nzy0zb5jsvxa62vhg7dk65kdgdifq8s761797ga6r"; + }; + + buildInputs = [ glib ]; + + nativeBuildInputs = [ pkgconfig intltool ]; + + passthru = { + doCompileSchemas = '' + for pkg in "${gsettings_desktop_schemas}" "${gtk3}"; do + cp -s $pkg/share/glib-2.0/schemas/*.gschema.xml $out/share/glib-2.0/schemas/ + done + ${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/ + ''; + }; +} diff --git a/pkgs/desktops/gnome-3/core/gvfs/default.nix b/pkgs/desktops/gnome-3/core/gvfs/default.nix new file mode 100644 index 000000000000..1eea518c4b7f --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gvfs/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, dbus_libs, samba, libarchive, fuse, libgphoto2 +, libcdio, libxml2, libtool, glib, intltool, gconf, libgnome_keyring, libsoup +, udev, avahi, libxslt, docbook_xsl }: + +stdenv.mkDerivation rec { + name = "gvfs-1.14.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gvfs/1.14/${name}.tar.xz"; + sha256 = "1g4ghyf45jg2ajdkv2d972hbckyjh3d9jdrppai85pl9pk2dmfy3"; + }; + + buildInputs = + [ glib dbus_libs udev samba libarchive fuse libgphoto2 libcdio libxml2 gconf + libgnome_keyring libsoup avahi libtool libxslt docbook_xsl + ]; + + nativeBuildInputs = [ pkgconfig intltool ]; + + enableParallelBuilding = true; +} 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/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/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/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix new file mode 100644 index 000000000000..ffc3aab87064 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/vte/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses +, pythonSupport ? false, python, pygtk}: + +stdenv.mkDerivation rec { + + versionMajor = "0.32"; + versionMinor = "2"; + moduleName = "vte"; + + name = "${moduleName}-${versionMajor}.${versionMinor}"; + + src = fetchurl { + url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; + sha256 = "0sj837b9ib36gx00hzdinv23f7w91fd5mcw1p6wdi053yxqw17nn"; + }; + + buildInputs = [ intltool pkgconfig gnome3.glib gnome3.gtk ncurses ] ++ + stdenv.lib.optionals pythonSupport [python pygtk]; + + configureFlags = '' + ${if pythonSupport then "--enable-python" else "--disable-python"} + ''; + + postInstall = stdenv.lib.optionalString pythonSupport '' + cd $(toPythonPath $out)/gtk-2.0 + for n in *; do + ln -s "gtk-2.0/$n" "../$n" + done + ''; + + meta = { + homepage = http://www.gnome.org/; + description = "A library implementing a terminal emulator widget for GTK+"; + longDescription = '' + VTE is a library (libvte) implementing a terminal emulator widget for + GTK+, and a minimal sample application (vte) using that. Vte is + mainly used in gnome-terminal, but can also be used to embed a + console/terminal in games, editors, IDEs, etc. VTE supports Unicode and + character set conversion, as well as emulating any terminal known to + the system's terminfo database. + ''; + license = "LGPLv2"; + maintainers = with stdenv.lib.maintainers; [ astsmtl antono ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix new file mode 100644 index 000000000000..18b91d4f61e8 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/zenity/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango +, gnome_doc_utils, intltool, libX11, which }: + +stdenv.mkDerivation rec { + + versionMajor = "3.4"; + versionMinor = "0"; + + name = "zenity-${versionMajor}.${versionMinor}"; + + src = fetchurl { + url = "mirror://gnome/sources/zenity/${versionMajor}/zenity-${versionMajor}.${versionMinor}.tar.xz"; + sha256 = "1bqbfcvd3kj2xk15fvbcdaqvyg9qvymlhn8cwvg5m6v4gicniw2w"; + }; + + configureFlags = "--disable-scrollkeeper"; + buildInputs = [ gnome3.gtk libxml2 libxslt libX11 ]; + + nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ]; +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix new file mode 100644 index 000000000000..5d517da82b39 --- /dev/null +++ b/pkgs/desktops/gnome-3/default.nix @@ -0,0 +1,55 @@ +{ callPackage, lib, self, stdenv, gettext, overrides ? {}, pkgs }: + +rec { + inherit (pkgs) fetchurl_gnome glib gtk3 atk pango; + gtk = gtk3; + orbit = pkgs.gnome2.ORBit2; + + inherit (lib) lowPrio hiPrio appendToName makeOverridable; + + __overrides = overrides; + +#### Core (http://ftp.acc.umu.se/pub/GNOME/core/) + + at_spi2_atk = lib.lowPrio (callPackage ./core/at-spi2-atk { }); + + at_spi2_core = callPackage ./core/at-spi2-core { }; + + evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests + + gconf = callPackage ./core/gconf { }; + + gcr = callPackage ./core/gcr { }; # ToDo: tests fail + + gnome_icon_theme = callPackage ./core/gnome-icon-theme { }; + + 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 { }); + + gvfs = callPackage ./core/gvfs { }; + + libcroco = callPackage ./core/libcroco {}; + + libgweather = callPackage ./core/libgweather { }; + + vte = callPackage ./core/vte { }; + + zenity = callPackage ./core/zenity { }; + +#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) + + gnome_dictionary = callPackage ./desktop/gnome-dictionary { }; + + gnome_desktop = callPackage ./desktop/gnome-desktop { }; + + # Removed from recent GNOME releases, but still required + scrollkeeper = callPackage ./desktop/scrollkeeper { }; + + # scrollkeeper replacement + rarian = callPackage ./desktop/rarian { }; + +} diff --git a/pkgs/desktops/gnome-3/desktop/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/desktop/gnome-desktop/default.nix new file mode 100644 index 000000000000..4d22f6ad7466 --- /dev/null +++ b/pkgs/desktops/gnome-3/desktop/gnome-desktop/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3 +, intltool, gnome_doc_utils}: + +stdenv.mkDerivation rec { + + majorVersion = "3.5"; + minorVersion = "3"; + name = "gnome-desktop-${majorVersion}.${minorVersion}"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-desktop/${majorVersion}/${name}.tar.xz"; + sha256 = "1nrqcp1p5cxhfjjy5hjpvkqmzsgl2353a08fg0b11c932v95bsba"; + }; + + configureFlags = "--disable-scrollkeeper"; + buildInputs = [ pkgconfig python libxml2Python libxslt which libX11 + gnome3.gtk gnome3.glib intltool gnome_doc_utils ]; +} diff --git a/pkgs/desktops/gnome-3/desktop/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/desktop/gnome-dictionary/default.nix new file mode 100644 index 000000000000..7a1ab5b1505a --- /dev/null +++ b/pkgs/desktops/gnome-3/desktop/gnome-dictionary/default.nix @@ -0,0 +1,15 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gnome_doc_utils, intltool, which +, libxml2, libxslt }: + +stdenv.mkDerivation rec { + version = "3.5.2"; + name = "gnome-dictionary-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-dictionary/3.5/${name}.tar.xz"; + sha256 = "1cq32csxn27vir5nlixx337ym2nal9ykq3s1j7yynh2adh4m0jil"; + }; + + buildInputs = [ gnome3.gtk ]; + nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libxml2 libxslt gnome3.scrollkeeper ]; +} diff --git a/pkgs/desktops/gnome-3/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/desktop/rarian/default.nix new file mode 100644 index 000000000000..77a2b710f447 --- /dev/null +++ b/pkgs/desktops/gnome-3/desktop/rarian/default.nix @@ -0,0 +1,11 @@ +{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}: + +stdenv.mkDerivation rec { + name = "rarian-0.8.1"; + src = fetchurl { + url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2"; + sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"; + }; + buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt]; + configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat"; +} diff --git a/pkgs/desktops/gnome-3/desktop/scrollkeeper/default.nix b/pkgs/desktops/gnome-3/desktop/scrollkeeper/default.nix new file mode 100644 index 000000000000..97dcbf4e0041 --- /dev/null +++ b/pkgs/desktops/gnome-3/desktop/scrollkeeper/default.nix @@ -0,0 +1,18 @@ +{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42, automake}: + +stdenv.mkDerivation { + name = "scrollkeeper-0.3.14"; + src = fetchurl { + url = mirror://gnome/sources/scrollkeeper/0.3/scrollkeeper-0.3.14.tar.bz2; + sha256 = "08n1xgj1f53zahwm0wpn3jid3rfbhi3iwby0ilaaldnid5qriqgc"; + }; + + # The fuloong2f is not supported by scrollkeeper-0.3.14 config.guess + preConfigure = " + substituteInPlace extract/dtds/Makefile.am --replace /usr/bin/xmlcatalog xmlcatalog + cp ${automake}/share/automake*/config.{sub,guess} . + "; + + buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt]; + configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat"; +} diff --git a/pkgs/desktops/xfce/4_08.nix b/pkgs/desktops/xfce/4_08.nix new file mode 100644 index 000000000000..d29e3ac51ef0 --- /dev/null +++ b/pkgs/desktops/xfce/4_08.nix @@ -0,0 +1,37 @@ +{ pkgs, newScope }: let + +common = (import ./common.nix) { inherit pkgs newScope xfce_self; }; +callPackage = common.callPackage; + +xfce_self = common.xfce_common // rec { # the lines are very long but it seems better than the even-odd line approach + + #### CORE + + exo = callPackage ./core/exo.nix { v= "0.6.2"; h= "0f8zh5y057l7xffskjvky6k88hrnz6jyk35mvlfpmx26anlgd77l"; }; + libxfce4ui = callPackage ./core/libxfce4ui.nix { v= "4.8.1"; h= "0mlrcr8rqmv047xrb2dbh7f4knsppb1anx2b05s015h6v8lyvjrr"; }; + libxfce4util = callPackage ./core/libxfce4util.nix { v= "4.8.2"; h= "05n8586h2fwkibfld5fm4ygx1w66jnbqqb3li0ardjvm2n24k885"; }; + libxfcegui4 = callPackage ./core/libxfcegui4.nix { v= "4.8.1"; h= "0hr4h6a9p6w3qw1976p8v9c9pwhd9zhrjlbaph0p7nyz7j1836ih"; }; + thunar = callPackage ./core/thunar.nix { v= "1.2.3"; h= "19mczys6xr683r68g3s2njrrmnk1p73zypvwrhajw859c6nsjsp6"; }; + xfce4panel = callPackage ./core/xfce4-panel.nix { v= "4.8.6"; h= "00zdkg1jg4n2n109nxan8ji2m06r9mc4lnlrvb55xvj229m2dwb6"; }; + xfce4session = callPackage ./core/xfce4-session.nix { v= "4.8.2"; h= "1l608kik98jxbjl73waf8515hzji06lr80qmky2qlnp0b6js5g1i"; }; + xfce4settings = callPackage ./core/xfce4-settings.nix { v= "4.8.3"; h= "0bmw0s6jp2ws4n0f3387zwsyv46b0w89m6r70yb7wrqy9r3wqy6q"; }; + xfceutils = callPackage ./core/xfce-utils.nix { v= "4.8.3"; h= "09mr0amp2f632q9i3vykaa0x5nrfihfm9v5nxsx9vch8wvbp0l03"; }; + xfconf = callPackage ./core/xfconf.nix { v= "4.8.1"; h= "1jwkb73xcgqfly449jwbn2afiyx50p150z60x19bicps75sp6q4q"; }; + xfdesktop = callPackage ./core/xfdesktop.nix { v= "4.8.3"; h= "097lc9djmay0jyyl42jmvcfda75ndp265nzn0aa3hv795bsn1175"; }; + xfwm4 = callPackage ./core/xfwm4.nix { v= "4.8.3"; h= "0zi2g1d2jdgw5armlk9xjh4ykmydy266gdba86nmhy951gm8n3hb"; }; + + xfce4_appfinder = callPackage ./core/xfce4-appfinder.nix { v= "4.8.0"; h= "0zy7i9x4qjchmyb8nfpb7m2ply5n2aq35p9wrhb8lpz4am1ihx7x"; }; + + #### APPLICATIONS + + terminal = null; # newer versions don't build with 4.8 + + # versions > 0.3* don't build with xfce-4.8.* + ristretto = callPackage ./applications/ristretto.nix { v= "0.3.7"; h= "19mzy159j4qhd7pd1b83gimxfdg3mwdab9lq9kk505d21r7iqc9b"; }; + + xfce4mixer = callPackage ./applications/xfce4-mixer.nix { v= "4.8.0"; h= "1aqgjxvck6hx26sk3n4n5avhv02vs523mfclcvjb3xnks3yli7wz"; }; + +}; # xfce_self + +in xfce_self + diff --git a/pkgs/desktops/xfce/4_10.nix b/pkgs/desktops/xfce/4_10.nix new file mode 100644 index 000000000000..3f846198e3f5 --- /dev/null +++ b/pkgs/desktops/xfce/4_10.nix @@ -0,0 +1,35 @@ +{ pkgs, newScope }: let + +common = (import ./common.nix) { inherit pkgs newScope xfce_self; }; +callPackage = common.callPackage; + +xfce_self = common.xfce_common // rec { # the lines are very long but it seems better than the even-odd line approach + + #### CORE + + exo = callPackage ./core/exo.nix { v= "0.10.2"; h= "1kknxiz703q4snmry65ajm26jwjslbgpzdal6bd090m3z25q51dk"; }; + libxfce4ui = callPackage ./core/libxfce4ui.nix { v= "4.10.0"; h= "1qm31s6568cz4c8rl9fsfq0xmf7pldxm0ki62gx1cpybihlgmfd2"; }; + libxfce4util = callPackage ./core/libxfce4util.nix { v= "4.10.0"; h= "13k0wwbbqvdmbj4xmk4nxdlgvrdgr5y6r3dk380mzfw053hzwy89"; }; + libxfcegui4 = callPackage ./core/libxfcegui4.nix { v= "4.10.0"; h= "0cs5im0ib0cmr1lhr5765yliqjfyxvk4kwy8h1l8bn3mj6bzk0ib"; }; + thunar = callPackage ./core/thunar.nix { v= "1.6.2"; h= "11dx38rvkfbp91pxrprymxhimsm90gvizp277x9s5rwnwcm1ggbx"; }; + xfce4panel = callPackage ./core/xfce4-panel.nix { v= "4.10.0"; h= "1f8903nx6ivzircl8d8s9zna4vjgfy0qhjk5d2x19g9bmycgj89k"; }; + xfce4session = callPackage ./core/xfce4-session.nix { v= "4.10.0"; h= "1kj65jkjhd0ysf0yxsf88wzpyv6n8i8qgd3gb502hf1x9jksk2mv"; }; + xfce4settings = callPackage ./core/xfce4-settings.nix { v= "4.10.0"; h= "0zppq747z9lrxyv5zrrvpalq7hb3gfhy9p7qbldisgv7m6dz0hq8"; }; + xfceutils = null; # removed in 4.10 + xfconf = callPackage ./core/xfconf.nix { v= "4.10.0"; h= "0xh520z0qh0ib0ijgnyrgii9h5d4pc53n6mx1chhyzfc86j1jlhp"; }; + xfdesktop = callPackage ./core/xfdesktop.nix { v= "4.10.0"; h= "0yrddj1lgk3xn4w340y89z7x2isks72ia36pka08kk2x8gpfcyl9"; }; + xfwm4 = callPackage ./core/xfwm4.nix { v= "4.10.0"; h= "170zzs7adj47srsi2cl723w9pl8k8awd7w1bpzxby7hj92zmf8s9"; }; + + xfce4_appfinder = callPackage ./core/xfce4-appfinder.nix { v= "4.9.4"; h= "12lgrbd1n50w9n8xkpai98s2aw8vmjasrgypc57sp0x0qafsqaxq"; }; + + #### APPLICATIONS + + ristretto = callPackage ./applications/ristretto.nix { v= "0.6.3"; h= "0y9d8w1plwp4vmxs44y8k8x15i0k0xln89k6jndhv6lf57g1cs1b"; }; + terminal = xfce4terminal; # it has changed its name + xfce4mixer = callPackage ./applications/xfce4-mixer.nix { v= "4.10.0"; h= "1pnsd00583l7p5d80rxbh58brzy3jnccwikbbbm730a33c08kid8"; }; + xfce4terminal = callPackage ./applications/terminal.nix { v= "0.6.1"; h= "1j6lpkq952mrl5p24y88f89wn9g0namvywhma639xxsswlkn8d31"; }; + +}; + +in xfce_self + diff --git a/pkgs/desktops/xfce/common.nix b/pkgs/desktops/xfce/common.nix new file mode 100644 index 000000000000..8be4ac09e145 --- /dev/null +++ b/pkgs/desktops/xfce/common.nix @@ -0,0 +1,72 @@ +{ pkgs, newScope, xfce_self }: rec { + + 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 { }; + + # intelligent fetcher for Xfce + fetchXfce = rec { + generic = prepend : name : hash : + let lib = pkgs.lib; + p = builtins.parseDrvName name; + versions = lib.splitString "." p.version; + ver_maj = lib.concatStrings (lib.intersperse "." (lib.take 2 versions)); + name_low = lib.toLower p.name; + in pkgs.fetchurl { + url = "mirror://xfce/src/${prepend}/${name_low}/${ver_maj}/${name}.tar.bz2"; + sha256 = hash; + }; + core = generic "xfce"; + app = generic "apps"; + art = generic "art"; + }; + }; + + xfce_common = rec { + + inherit (deps) gvfs; # used by NixOS + + #### CORE + + garcon = callPackage ./core/garcon.nix { v= "0.2.0"; h= "0v7pkvxcayi86z4f173z5l7w270f3g369sa88z59w0y0p7ns7ph2"; }; + + # not used anymore TODO: really? Update to 2.99.2? + gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix { }; + + # ToDo: segfaults after some work + tumbler = callPackage ./core/tumbler.nix { v= "0.1.27"; h= "0s9qj99b81asmlqa823nzykq8g6p9azcp2niak67y9bp52wv6q2c"; }; + + xfce4_power_manager = callPackage ./core/xfce4-power-manager.nix { v= "1.0.10"; h= "1w120k1sl4s459ijaxkqkba6g1p2sqrf9paljv05wj0wz12bpr40"; }; + + + #### APPLICATIONS + #TODO: correct links; more stuff + + xfce4notifyd = callPackage ./applications/xfce4-notifyd.nix { v= "0.2.2"; h= "0s4ilc36sl5k5mg5727rmqims1l3dy5pwg6dk93wyjqnqbgnhvmn"; }; + gigolo = callPackage ./applications/gigolo.nix { v= "0.4.1"; h= "1y8p9bbv1a4qgbxl4vn6zbag3gb7gl8qj75cmhgrrw9zrvqbbww2"; }; + xfce4taskmanager = callPackage ./applications/xfce4-taskmanager.nix { v= "1.0.0"; h= "1vm9gw7j4ngjlpdhnwdf7ifx6xrrn21011almx2vwidhk2f9zvy0"; }; + mousepad = callPackage ./applications/mousepad.nix { v= "0.3.0"; h= "0v84zwhjv2xynvisn5vmp7dbxfj4l4258m82ks7hn3adk437bwhh"; }; + thunar_volman = callPackage ./core/thunar-volman.nix { }; + + #### ART + + xfce4icontheme = callPackage ./art/xfce4-icon-theme.nix { v= "4.4.3"; h= "1yk6rx3zr9grm4jwpjvqdkl13pisy7qn1wm5cqzmd2kbsn96cy6l"; }; + + #### 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/core/xfce4-dev-tools.nix b/pkgs/desktops/xfce/core/xfce4-dev-tools.nix new file mode 100644 index 000000000000..e56eb3f0a713 --- /dev/null +++ b/pkgs/desktops/xfce/core/xfce4-dev-tools.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, glib, autoconf, automake, libtool, intltool }: + +stdenv.mkDerivation rec { + p_name = "xfce4-dev-tools"; + ver_maj = "4.10"; + ver_min = "0"; + + src = fetchurl { + url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "1y1byfjciqhxqfxbjfp22bn5lxk3a01ng7zfjha8h5mzzfxlk5pp"; + }; + name = "${p_name}-${ver_maj}.${ver_min}"; + + buildInputs = [ pkgconfig glib ]; + + # not needed to build it but to use it + propagatedBuildInputs = [ autoconf automake libtool intltool ]; + + meta = { + homepage = http://foo-projects.org/~benny/projects/xfce4-dev-tools/; + description = "Tools and M4 macros for Xfce4 developers"; + license = "GPLv2+"; + }; +} diff --git a/pkgs/desktops/xfce/core/xfce4-session-systemd.patch b/pkgs/desktops/xfce/core/xfce4-session-systemd.patch new file mode 100644 index 000000000000..7780491a8eda --- /dev/null +++ b/pkgs/desktops/xfce/core/xfce4-session-systemd.patch @@ -0,0 +1,470 @@ +From ae28aef315a7a6b90f1649ce6d1f30b842791cbf Mon Sep 17 00:00:00 2001 +From: Nick Schermer +Date: Sun, 04 Nov 2012 20:23:36 +0000 +Subject: Add shutdown/reboot functionality for systemd (bug #8729). + +Based on patch by Christian Hesse and Evangelos Foutras. +--- +diff --git a/configure.in.in b/configure.in.in +index 9aa4f8f..134d0f7 100644 +--- a/configure.in ++++ b/configure.in +@@ -96,6 +96,10 @@ XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.1.0]) + XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.84]) + XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.9.0]) + ++dnl Check for polkit / systemd integration ++XDT_CHECK_OPTIONAL_PACKAGE([SYSTEMD], [polkit-gobject-1], [0.100], ++ [systemd], [Systemd support (through polit)]) ++ + dnl Check for debugging support + XDT_FEATURE_DEBUG([xfsm_debug_default]) + +diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am +index c015154..f748b2b 100644 +--- a/xfce4-session/Makefile.am ++++ b/xfce4-session/Makefile.am +@@ -38,8 +38,6 @@ xfce4_session_SOURCES = \ + xfsm-compat-gnome.h \ + xfsm-compat-kde.c \ + xfsm-compat-kde.h \ +- xfsm-consolekit.c \ +- xfsm-consolekit.h \ + xfsm-dns.c \ + xfsm-dns.h \ + xfsm-error.c \ +@@ -65,6 +63,16 @@ xfce4_session_SOURCES = \ + xfsm-upower.c \ + xfsm-upower.h + ++if HAVE_SYSTEMD ++xfce4_session_SOURCES += \ ++ xfsm-systemd.c \ ++ xfsm-systemd.h ++else ++xfce4_session_SOURCES += \ ++ xfsm-consolekit.c \ ++ xfsm-consolekit.h ++endif ++ + xfce4_session_CFLAGS = \ + $(LIBSM_CFLAGS) \ + $(LIBX11_CFLAGS) \ +@@ -72,6 +80,7 @@ xfce4_session_CFLAGS = \ + $(DBUS_CFLAGS) \ + $(DBUS_GLIB_CFLAGS) \ + $(LIBWNCK_CFLAGS) \ ++ $(SYSTEMD_CFLAGS) \ + $(XFCONF_CFLAGS) \ + $(GMODULE_CFLAGS) \ + $(PLATFORM_CFLAGS) +@@ -91,6 +100,7 @@ xfce4_session_LDADD = \ + $(DBUS_LIBS) \ + $(DBUS_GLIB_LIBS) \ + $(LIBWNCK_LIBS) \ ++ $(SYSTEMD_LIBS) \ + $(XFCONF_LIBS) \ + -lm + +diff --git a/xfce4-session/xfsm-shutdown.c b/xfce4-session/xfsm-shutdown.c +index d8757a8..4c483a7 100644 +--- a/xfce4-session/xfsm-shutdown.c ++++ b/xfce4-session/xfsm-shutdown.c +@@ -66,10 +66,13 @@ + #include + #include + #include +-#include + #include + +- ++#ifdef HAVE_SYSTEMD ++#include ++#else ++#include ++#endif + + static void xfsm_shutdown_finalize (GObject *object); + static void xfsm_shutdown_sudo_free (XfsmShutdown *shutdown); +@@ -93,7 +96,11 @@ struct _XfsmShutdown + { + GObject __parent__; + ++#ifdef HAVE_SYSTEMD ++ XfsmSystemd *systemd; ++#else + XfsmConsolekit *consolekit; ++#endif + XfsmUPower *upower; + + /* kiosk settings */ +@@ -131,7 +138,11 @@ xfsm_shutdown_init (XfsmShutdown *shutdown) + { + XfceKiosk *kiosk; + ++#ifdef HAVE_SYSTEMD ++ shutdown->systemd = xfsm_systemd_get (); ++#else + shutdown->consolekit = xfsm_consolekit_get (); ++#endif + shutdown->upower = xfsm_upower_get (); + shutdown->helper_state = SUDO_NOT_INITIAZED; + shutdown->helper_require_password = FALSE; +@@ -150,7 +161,11 @@ xfsm_shutdown_finalize (GObject *object) + { + XfsmShutdown *shutdown = XFSM_SHUTDOWN (object); + ++#ifdef HAVE_SYSTEMD ++ g_object_unref (G_OBJECT (shutdown->systemd)); ++#else + g_object_unref (G_OBJECT (shutdown->consolekit)); ++#endif + g_object_unref (G_OBJECT (shutdown->upower)); + + /* close down helper */ +@@ -641,7 +656,11 @@ xfsm_shutdown_try_restart (XfsmShutdown *shutdown, + if (shutdown->helper_state == SUDO_AVAILABLE) + return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_RESTART, error); + else ++#ifdef HAVE_SYSTEMD ++ return xfsm_systemd_try_restart (shutdown->systemd, error); ++#else + return xfsm_consolekit_try_restart (shutdown->consolekit, error); ++#endif + } + + +@@ -658,7 +677,11 @@ xfsm_shutdown_try_shutdown (XfsmShutdown *shutdown, + if (shutdown->helper_state == SUDO_AVAILABLE) + return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_SHUTDOWN, error); + else ++#ifdef HAVE_SYSTEMD ++ return xfsm_systemd_try_shutdown (shutdown->systemd, error); ++#else + return xfsm_consolekit_try_shutdown (shutdown->consolekit, error); ++#endif + } + + +@@ -698,7 +721,11 @@ xfsm_shutdown_can_restart (XfsmShutdown *shutdown, + return TRUE; + } + ++#ifdef HAVE_SYSTEMD ++ if (xfsm_systemd_can_restart (shutdown->systemd, can_restart, error)) ++#else + if (xfsm_consolekit_can_restart (shutdown->consolekit, can_restart, error)) ++#endif + return TRUE; + + if (xfsm_shutdown_sudo_init (shutdown, error)) +@@ -725,7 +752,11 @@ xfsm_shutdown_can_shutdown (XfsmShutdown *shutdown, + return TRUE; + } + ++#ifdef HAVE_SYSTEMD ++ if (xfsm_systemd_can_shutdown (shutdown->systemd, can_shutdown, error)) ++#else + if (xfsm_consolekit_can_shutdown (shutdown->consolekit, can_shutdown, error)) ++#endif + return TRUE; + + if (xfsm_shutdown_sudo_init (shutdown, error)) +diff --git a/xfce4-session/xfsm-systemd.c b/xfce4-session/xfsm-systemd.c +new file mode 100644 +index 0000000..7bdd39d +--- /dev/null ++++ b/xfce4-session/xfsm-systemd.c +@@ -0,0 +1,229 @@ ++/*- ++ * Copyright (C) 2012 Christian Hesse ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2, or (at your option) ++ * any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301 USA. ++ */ ++ ++#include ++ ++#include ++#include ++#include ++#include ++ ++#include ++ ++ ++ ++#define SYSTEMD_DBUS_NAME "org.freedesktop.login1" ++#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1" ++#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager" ++#define SYSTEMD_REBOOT_ACTION "Reboot" ++#define SYSTEMD_POWEROFF_ACTION "PowerOff" ++#define SYSTEMD_REBOOT_TEST "org.freedesktop.login1.reboot" ++#define SYSTEMD_POWEROFF_TEST "org.freedesktop.login1.power-off" ++ ++ ++ ++static void xfsm_systemd_finalize (GObject *object); ++ ++ ++ ++struct _XfsmSystemdClass ++{ ++ GObjectClass __parent__; ++}; ++ ++struct _XfsmSystemd ++{ ++ GObject __parent__; ++ ++ PolkitAuthority *authority; ++ PolkitSubject *subject; ++}; ++ ++ ++ ++G_DEFINE_TYPE (XfsmSystemd, xfsm_systemd, G_TYPE_OBJECT) ++ ++ ++ ++static void ++xfsm_systemd_class_init (XfsmSystemdClass *klass) ++{ ++ GObjectClass *gobject_class; ++ ++ gobject_class = G_OBJECT_CLASS (klass); ++ gobject_class->finalize = xfsm_systemd_finalize; ++} ++ ++ ++ ++static void ++xfsm_systemd_init (XfsmSystemd *systemd) ++{ ++ systemd->authority = polkit_authority_get_sync (NULL, NULL); ++ systemd->subject = polkit_unix_process_new (getpid()); ++} ++ ++ ++ ++static void ++xfsm_systemd_finalize (GObject *object) ++{ ++ XfsmSystemd *systemd = XFSM_SYSTEMD (object); ++ ++ g_object_unref (G_OBJECT (systemd->authority)); ++ g_object_unref (G_OBJECT (systemd->subject)); ++ ++ (*G_OBJECT_CLASS (xfsm_systemd_parent_class)->finalize) (object); ++} ++ ++ ++static gboolean ++xfsm_systemd_can_method (XfsmSystemd *systemd, ++ gboolean *can_method, ++ const gchar *method, ++ GError **error) ++{ ++ PolkitAuthorizationResult *res; ++ GError *local_error = NULL; ++ ++ *can_method = FALSE; ++ ++ res = polkit_authority_check_authorization_sync (systemd->authority, ++ systemd->subject, ++ method, ++ NULL, ++ POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE, ++ NULL, ++ &local_error); ++ ++ if (res == NULL) ++ { ++ g_propagate_error (error, local_error); ++ return FALSE; ++ } ++ ++ *can_method = polkit_authorization_result_get_is_authorized (res) ++ || polkit_authorization_result_get_is_challenge (res); ++ ++ g_object_unref (G_OBJECT (res)); ++ ++ return TRUE; ++} ++ ++ ++ ++static gboolean ++xfsm_systemd_try_method (XfsmSystemd *systemd, ++ const gchar *method, ++ GError **error) ++{ ++ GDBusConnection *bus; ++ GError *local_error = NULL; ++ ++ bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, error); ++ if (G_UNLIKELY (bus == NULL)) ++ return FALSE; ++ ++ g_dbus_connection_call_sync (bus, ++ SYSTEMD_DBUS_NAME, ++ SYSTEMD_DBUS_PATH, ++ SYSTEMD_DBUS_INTERFACE, ++ method, ++ g_variant_new ("(b)", TRUE), ++ NULL, 0, G_MAXINT, NULL, ++ &local_error); ++ ++ g_object_unref (G_OBJECT (bus)); ++ ++ if (local_error != NULL) ++ { ++ g_propagate_error (error, local_error); ++ return FALSE; ++ } ++ ++ return TRUE; ++} ++ ++ ++ ++XfsmSystemd * ++xfsm_systemd_get (void) ++{ ++ static XfsmSystemd *object = NULL; ++ ++ if (G_LIKELY (object != NULL)) ++ { ++ g_object_ref (G_OBJECT (object)); ++ } ++ else ++ { ++ object = g_object_new (XFSM_TYPE_SYSTEMD, NULL); ++ g_object_add_weak_pointer (G_OBJECT (object), (gpointer) &object); ++ } ++ ++ return object; ++} ++ ++ ++ ++gboolean ++xfsm_systemd_try_restart (XfsmSystemd *systemd, ++ GError **error) ++{ ++ return xfsm_systemd_try_method (systemd, ++ SYSTEMD_REBOOT_ACTION, ++ error); ++} ++ ++ ++ ++gboolean ++xfsm_systemd_try_shutdown (XfsmSystemd *systemd, ++ GError **error) ++{ ++ return xfsm_systemd_try_method (systemd, ++ SYSTEMD_POWEROFF_ACTION, ++ error); ++} ++ ++ ++ ++gboolean ++xfsm_systemd_can_restart (XfsmSystemd *systemd, ++ gboolean *can_restart, ++ GError **error) ++{ ++ return xfsm_systemd_can_method (systemd, ++ can_restart, ++ SYSTEMD_REBOOT_TEST, ++ error); ++} ++ ++ ++ ++gboolean ++xfsm_systemd_can_shutdown (XfsmSystemd *systemd, ++ gboolean *can_shutdown, ++ GError **error) ++{ ++ return xfsm_systemd_can_method (systemd, ++ can_shutdown, ++ SYSTEMD_POWEROFF_TEST, ++ error); ++} +diff --git a/xfce4-session/xfsm-systemd.h b/xfce4-session/xfsm-systemd.h +new file mode 100644 +index 0000000..8223622 +--- /dev/null ++++ b/xfce4-session/xfsm-systemd.h +@@ -0,0 +1,55 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- ++ * ++ * Copyright (C) 2012 Christian Hesse ++ * ++ * Licensed under the GNU General Public License Version 2 ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it 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. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++ */ ++ ++#ifndef __XFSM_SYSTEMD_H__ ++#define __XFSM_SYSTEMD_H__ ++ ++typedef struct _XfsmSystemdClass XfsmSystemdClass; ++typedef struct _XfsmSystemd XfsmSystemd; ++ ++#define XFSM_TYPE_SYSTEMD (xfsm_systemd_get_type ()) ++#define XFSM_SYSTEMD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XFSM_TYPE_SYSTEMD, XfsmSystemd)) ++#define XFSM_SYSTEMD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), XFSM_TYPE_SYSTEMD, XfsmSystemdClass)) ++#define XFSM_IS_SYSTEMD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XFSM_TYPE_SYSTEMD)) ++#define XFSM_IS_SYSTEMD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), XFSM_TYPE_SYSTEMD)) ++#define XFSM_SYSTEMD_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XFSM_TYPE_SYSTEMD, XfsmSystemdClass)) ++ ++GType xfsm_systemd_get_type (void) G_GNUC_CONST; ++ ++XfsmSystemd *xfsm_systemd_get (void); ++ ++gboolean xfsm_systemd_try_restart (XfsmSystemd *systemd, ++ GError **error); ++ ++gboolean xfsm_systemd_try_shutdown (XfsmSystemd *systemd, ++ GError **error); ++ ++gboolean xfsm_systemd_can_restart (XfsmSystemd *systemd, ++ gboolean *can_restart, ++ GError **error); ++ ++gboolean xfsm_systemd_can_shutdown (XfsmSystemd *systemd, ++ gboolean *can_shutdown, ++ GError **error); ++ ++G_END_DECLS ++ ++#endif /* __XFSM_SYSTEMD_H__ */ +-- +cgit v0.9.1 diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index b63a101b84f8..e5daaca9d528 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -35,7 +35,7 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od xfwm4 = callPackage ./core/xfwm4.nix { }; xfce4_appfinder = callPackage ./core/xfce4-appfinder.nix { }; - + xfce4_dev_tools = callPackage ./core/xfce4-dev-tools.nix { }; # only if autotools are needed #### APPLICATIONS from "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2" diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 13a0081a2574..c153abea247a 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -1,18 +1,24 @@ -{ stdenv, fetchurl, yacc, flex, pkgconfig, glib, libintlOrEmpty }: +{ stdenv, fetchurl, yacc, flex, pkgconfig, glib, dbus, dbus_tools, libiconvOrEmpty }: stdenv.mkDerivation rec { - - version = "0.17.2"; - name = "vala-${version}"; + p_name = "vala"; + ver_maj = "0.19"; + ver_min = "0"; src = fetchurl { - url = "mirror://gnome/sources/vala/0.17/${name}.tar.xz"; - sha256 = "09i2s0dwmrk147ind2dx7nq845g12fp6fsjqrphhrr0dbi0zzgh3"; + url = "mirror://gnome/sources/${p_name}/${ver_maj}/${name}.tar.xz"; + sha256 = "1vn524hcnaggz8zx49mvf7p4z1mscrlj2syg7jjhph8nak5wi0bp"; }; + name = "${p_name}-${ver_maj}.${ver_min}"; + + postPatch = "patchShebangs ."; nativeBuildInputs = [ yacc flex pkgconfig ]; - buildInputs = [ glib ] ++ libintlOrEmpty; + buildInputs = [ glib ] ++ libiconvOrEmpty + ++ stdenv.lib.optional doCheck [ dbus dbus_tools ]; + + doCheck = false; # problems when launching dbus tests meta = { description = "Compiler for the GObject type system"; diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 9fb2ab377dfc..7dc4708e3cf0 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; let majorVersion = "2.7"; - version = "${majorVersion}.3"; + version = "${majorVersion}.4"; src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2"; - sha256 = "0g3672il41rcfjk7sphfqdsa6qf53y8g3ai8yk1sslxi3khmfr3j"; + sha256 = "0nd3x4j2w8pi9ac3pawrzb5i3s88hw0aasr08dprdv7q81fp0pq3"; }; patches = diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix index 1471abe287a7..16973c6226ee 100644 --- a/pkgs/development/interpreters/python/3.3/default.nix +++ b/pkgs/development/interpreters/python/3.3/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation { readlineSupport = readline != null; opensslSupport = openssl != null; tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); - libPrefix = "python${majorVersion}"; + libPrefix = "python${majorVersion}m"; }; enableParallelBuilding = true; 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/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 8ff643ce5b18..899c3bb5c8d8 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchurl, pkgconfig, audiofile , openglSupport ? false, mesa ? null , alsaSupport ? true, alsaLib ? null , x11Support ? true, x11 ? null, libXrandr ? null @@ -16,25 +16,26 @@ assert pulseaudioSupport -> pulseaudio != null; let configureFlagsFun = attrs: '' - --disable-oss + --disable-oss --disable-video-x11-xme --disable-x11-shared --disable-alsa-shared --enable-rpath --disable-pulseaudio-shared + --disable-osmesa-shared ${if alsaSupport then "--with-alsa-prefix=${attrs.alsaLib}/lib" else ""} ''; in stdenv.mkDerivation rec { - name = "SDL-1.2.14"; + name = "SDL-1.2.15"; src = fetchurl { url = "http://www.libsdl.org/release/${name}.tar.gz"; - sha256 = "1dnrxr18cyar0xd13dca7h8wp1fin4n3iyncxfq6pjrlf0l7x4jx"; + sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn"; }; # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. propagatedBuildInputs = stdenv.lib.optionals x11Support [ x11 libXrandr ] ++ stdenv.lib.optional pulseaudioSupport pulseaudio; - buildInputs = [ pkgconfig ] ++ - stdenv.lib.optional openglSupport mesa ++ + buildInputs = [ pkgconfig audiofile ] ++ + stdenv.lib.optional openglSupport [ mesa ] ++ stdenv.lib.optional alsaSupport alsaLib; # XXX: By default, SDL wants to dlopen() PulseAudio, in which case diff --git a/pkgs/development/libraries/atk/2.6.x.nix b/pkgs/development/libraries/atk/default.nix similarity index 83% rename from pkgs/development/libraries/atk/2.6.x.nix rename to pkgs/development/libraries/atk/default.nix index 4dd0ae1eeafb..d8e69fbf603e 100644 --- a/pkgs/development/libraries/atk/2.6.x.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, perl, glib }: stdenv.mkDerivation rec { - name = "atk-2.6.0"; + name = "atk-2.8.0"; src = fetchurl { - url = "mirror://gnome/sources/atk/2.6/${name}.tar.xz"; - sha256 = "eff663f90847620bb68c9c2cbaaf7f45e2ff44163b9ab3f10d15be763680491f"; + url = "mirror://gnome/sources/atk/2.8/${name}.tar.xz"; + sha256 = "1x3dd3hg9l1j9dq70xwph13vxdp6a9wbfcnryryf1wr6c8bij9dj"; }; nativeBuildInputs = [ pkgconfig perl ]; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 8c9f55426d53..65f826c7ed43 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,29 +1,33 @@ { postscriptSupport ? true , pdfSupport ? true , pngSupport ? true -, xcbSupport ? false +, xcbSupport ? true # no longer experimental since 1.12 +, glSupport ? false , gobjectSupport ? true, glib , stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs -, zlib, libpng, pixman, libxcb ? null, xcbutil ? null +, expat +, zlib, libpng, pixman, libxcb ? null, xcbutil ? null, mesa ? null , libiconvOrEmpty, libintlOrEmpty }: assert postscriptSupport -> zlib != null; assert pngSupport -> libpng != null; assert xcbSupport -> libxcb != null && xcbutil != null; +assert glSupport -> mesa != null; stdenv.mkDerivation rec { - name = "cairo-1.12.4"; + name = "cairo-1.12.14"; src = fetchurl { url = "http://cairographics.org/releases/${name}.tar.xz"; - sha1 = "f4158981ed01e73c94fb8072074b17feee61a68b"; + sha256 = "04xcykglff58ygs0dkrmmnqljmpjwp2qgwcz8sijqkdpz7ix3l4n"; }; - buildInputs = - [ pkgconfig x11 fontconfig ] - ++ stdenv.lib.optional (!stdenv.isDarwin) xlibs.libXrender + buildInputs = with xlibs; + [ pkgconfig x11 fontconfig expat ] + ++ stdenv.lib.optional (!stdenv.isDarwin) libXrender ++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ] + ++ stdenv.lib.optionals glSupport [ mesa ] ++ libintlOrEmpty ++ libiconvOrEmpty; @@ -36,17 +40,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-tee" ] ++ stdenv.lib.optional xcbSupport "--enable-xcb" + ++ stdenv.lib.optional glSupport "--enable-gl" ++ stdenv.lib.optional pdfSupport "--enable-pdf"; - preConfigure = '' - # Work around broken `Requires.private' that prevents Freetype - # `-I' flags to be propagated. - sed -i "src/cairo.pc.in" \ - -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype}/include/freetype2 -I${freetype}/include|g' - '' - + preConfigure = # On FreeBSD, `-ldl' doesn't exist. - + (stdenv.lib.optionalString stdenv.isFreeBSD + (stdenv.lib.optionalString stdenv.isFreeBSD '' for i in "util/"*"/Makefile.in" boilerplate/Makefile.in do cat "$i" | sed -es/-ldl//g > t diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/development/libraries/dbus-cplusplus/default.nix index 2704b9586b1a..0a4b80d3f3ea 100644 --- a/pkgs/development/libraries/dbus-cplusplus/default.nix +++ b/pkgs/development/libraries/dbus-cplusplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus, glib, gtkmm, pkgconfig }: +{ stdenv, fetchurl, dbus, glib, gtkmm, pkgconfig, expat }: stdenv.mkDerivation rec { name = "dbus-cplusplus-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0qafmy2i6dzx4n1dqp6pygyy6gjljnb7hwjcj2z11c1wgclsq4dw"; }; - buildInputs = [ dbus glib gtkmm pkgconfig ]; + buildInputs = [ dbus glib gtkmm pkgconfig expat ]; configureFlags = "--disable-ecore"; diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index 47e83e7780cc..be6cf442a49f 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -1,18 +1,20 @@ { stdenv, fetchurl, pkgconfig, expat, gettext, libiconv, dbus, glib }: stdenv.mkDerivation rec { - name = "dbus-glib-0.98"; + name = "dbus-glib-0.100.2"; src = fetchurl { url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz"; - sha256 = "04fiwld5yaxyggxlvdmbaqkngh4fn8gfkkqckcp3274bpgb82z19"; + sha256 = "1ibav91yg70f2l3l18cr0hf4mna1h9d4mrg0c60w4l8zjbd45fx5"; }; nativeBuildInputs = [ pkgconfig gettext ]; buildInputs = [ expat ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; - propagatedBuildInputs = [ dbus glib ]; + propagatedBuildInputs = [ dbus.libs glib ]; + + doCheck = true; passthru = { inherit dbus glib; }; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 5716ac6648a0..914ab96b5805 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -1,71 +1,104 @@ -{ stdenv, fetchurl, pkgconfig, expat, libX11, libICE, libSM, useX11 ? true }: +{ stdenv, fetchurl, pkgconfig, autoconf, automake, libtool +, expat, systemd, glib, dbus_glib, python +, libX11, libICE, libSM, useX11 ? true }: let - version = "1.6.4"; + version = "1.6.10"; # 1.7.* isn't recommended, even for gnome 3.8 + sha256 = "11jyj6aw8yf75hqv7v0601n2xms08k0mys6dyql164m7ad56yg8z"; - src = fetchurl { - url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; - sha256 = "1wacqyfkcpayg7f8rvx9awqg275n5pksxq5q7y21lxjx85x6pfjz"; + inherit (stdenv) lib; + + buildInputsX = lib.optionals useX11 [ libX11 libICE libSM ]; + + # also other parts than "libs" need this statically linked lib + makeInternalLib = "(cd dbus && make libdbus-internal.la)"; + + + # A generic builder for individual parts (subdirs) of D-Bus + dbus_drv = name: subdirs: merge: stdenv.mkDerivation (lib.mergeAttrsByFuncDefaultsClean [{ + + name = "dbus-${name}-${version}"; + + src = fetchurl { + url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; + inherit sha256; + }; + + configureFlags = [ + "--localstatedir=/var" + "--sysconfdir=/etc" + "--with-session-socket-dir=/tmp" + "--with-systemdsystemunitdir=$(out)/lib/systemd" + ]; + + preConfigure = '' + patchShebangs . + substituteInPlace tools/Makefile.am --replace 'install-localstatelibDATA:' 'disabled:' + autoreconf -fi + ''; + + installFlags = "sysconfdir=$(out)/etc"; + + doCheck = true; + + patches = [ + ./ignore-missing-includedirs.patch ./implement-getgrouplist.patch + ./ucred-dirty-hack.patch ./no-create-dirs.patch + ]; + + nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ expat ]; + buildInputs = [ autoconf automake libtool ]; # ToDo: optional selinux? + + # build only the specified subdirs + postPatch = "sed '/SUBDIRS/s/=.*/=" + subdirs + "/' -i Makefile.am\n" + # use already packaged libdbus instead of trying to build it again + + lib.optionalString (name != "libs") '' + for mfile in */Makefile.am; do + sed 's,\$(top_builddir)/dbus/\(libdbus-[0-9]\),${libs}/lib/\1,g' -i "$mfile" + done + ''; + + } merge ]); + + libs = dbus_drv "libs" "dbus" { + buildInputs = [ systemd.headers ]; + patches = [ ./systemd.patch ]; # bypass systemd detection + + # Enable X11 autolaunch support in libdbus. This doesn't actually depend on X11 + # (it just execs dbus-launch in dbus.tools), contrary to what the configure script demands. + NIX_CFLAGS_COMPILE = "-DDBUS_ENABLE_X11_AUTOLAUNCH=1"; }; - patches = [ ./ignore-missing-includedirs.patch ]; - - configureFlags = "--localstatedir=/var --sysconfdir=/etc --with-session-socket-dir=/tmp"; - in rec { - libs = stdenv.mkDerivation { - name = "dbus-library-" + version; + # This package has been split because most applications only need dbus.lib + # which serves as an interface to a *system-wide* daemon, + # see e.g. http://en.wikipedia.org/wiki/D-Bus#Architecture . + # Also some circular dependencies get split by this (like with systemd). - nativeBuildInputs = [ pkgconfig ]; + inherit libs; - buildInputs = [ expat ]; - - # FIXME: dbus has optional systemd integration when checking - # at_console policies. How to enable this without introducing a - # circular dependency between dbus and systemd? - - inherit src patches configureFlags; - - preConfigure = - '' - sed -i '/mkinstalldirs.*localstatedir/d' bus/Makefile.in - sed -i '/SUBDIRS/s/ tools//' Makefile.in - ''; - - # Enable X11 autolaunch support in libdbus. This doesn't actually - # depend on X11 (it just execs dbus-launch in dbus.tools), - # contrary to what the configure script demands. - NIX_CFLAGS_COMPILE = "-DDBUS_ENABLE_X11_AUTOLAUNCH=1"; - - installFlags = "sysconfdir=$(out)/etc"; + tools = dbus_drv "tools" "tools" { + configureFlags = [ "--with-dbus-daemondir=${daemon}/bin" ]; + buildInputs = buildInputsX ++ [ libs daemon systemd dbus_glib ]; + NIX_CFLAGS_LINK = "-Wl,--as-needed -ldbus-1"; }; - tools = stdenv.mkDerivation { - name = "dbus-tools-" + version; - - inherit src patches; - - configureFlags = "${configureFlags} --with-dbus-daemondir=${daemon}/bin"; - - nativeBuildInputs = [ pkgconfig ]; - - buildInputs = [ expat libs ] - ++ stdenv.lib.optionals useX11 [ libX11 libICE libSM ]; - - NIX_LDFLAGS = "-ldbus-1"; - - preConfigure = - '' - sed -i 's@$(top_builddir)/dbus/libdbus-1.la@@' tools/Makefile.in - substituteInPlace tools/Makefile.in --replace 'install-localstatelibDATA:' 'disabled:' - ''; - - postConfigure = "cd tools"; - - installFlags = "localstatedir=$TMPDIR/var"; + daemon = dbus_drv "daemon" "bus" { + preBuild = makeInternalLib; + buildInputs = [ systemd ]; }; - # I'm too lazy to separate daemon and libs now. - daemon = libs; + # Some of the tests don't work yet; in fact, @vcunat tried several packages + # containing dbus testing, and all of them have some test failure. + tests = dbus_drv "tests" "test" { + preBuild = makeInternalLib; + buildInputs = buildInputsX ++ [ systemd libs tools daemon dbus_glib python ]; + NIX_CFLAGS_LINK = "-Wl,--as-needed -ldbus-1"; + }; + + docs = dbus_drv "docs" "doc" { + postInstall = ''rm -r "$out/lib"''; + }; } diff --git a/pkgs/development/libraries/dbus/implement-getgrouplist.patch b/pkgs/development/libraries/dbus/implement-getgrouplist.patch new file mode 100644 index 000000000000..e3a4a25cb720 --- /dev/null +++ b/pkgs/development/libraries/dbus/implement-getgrouplist.patch @@ -0,0 +1,108 @@ +Compatibility patch for Illumos/Solaris and possibly other platforms. +Implements getgrouplist when not provided by OS. +Without it, only the user's primary group is used in authentication! +--- 1970-01-01 00:00:00.000000000 +0000 ++++ dbus-1.6.8/dbus/getgrouplist.c 2013-02-28 13:10:51.081792722 +0000 +@@ -0,0 +1,89 @@ ++/* $OpenBSD: getgrouplist.c,v 1.12 2005/08/08 08:05:34 espie Exp $ */ ++/* ++ * Copyright (c) 1991, 1993 ++ * The Regents of the University of California. All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. Neither the name of the University nor the names of its contributors ++ * may be used to endorse or promote products derived from this software ++ * without specific prior written permission. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE ++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT ++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY ++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ++ * SUCH DAMAGE. ++ */ ++ ++/* OPENBSD ORIGINAL: lib/libc/gen/getgrouplist.c */ ++ ++/* ++ * get credential ++ */ ++#include ++#include ++#include ++#include ++ ++int ++getgrouplist(const char *uname, gid_t agroup, gid_t *groups, int *grpcnt) ++{ ++ struct group *grp; ++ int i, ngroups; ++ int ret, maxgroups; ++ int bail; ++ ++ ret = 0; ++ ngroups = 0; ++ maxgroups = *grpcnt; ++ ++ /* ++ * install primary group ++ */ ++ if (ngroups >= maxgroups) { ++ *grpcnt = ngroups; ++ return (-1); ++ } ++ groups[ngroups++] = agroup; ++ ++ /* ++ * Scan the group file to find additional groups. ++ */ ++ setgrent(); ++ while ((grp = getgrent())) { ++ if (grp->gr_gid == agroup) ++ continue; ++ for (bail = 0, i = 0; bail == 0 && i < ngroups; i++) ++ if (groups[i] == grp->gr_gid) ++ bail = 1; ++ if (bail) ++ continue; ++ for (i = 0; grp->gr_mem[i]; i++) { ++ if (!strcmp(grp->gr_mem[i], uname)) { ++ if (ngroups >= maxgroups) { ++ ret = -1; ++ goto out; ++ } ++ groups[ngroups++] = grp->gr_gid; ++ break; ++ } ++ } ++ } ++out: ++ endgrent(); ++ *grpcnt = ngroups; ++ return (ret); ++} +--- dbus-1.6.8/dbus/dbus-sysdeps-unix.c.orig 2013-02-28 13:08:52.171215237 +0000 ++++ dbus-1.6.8/dbus/dbus-sysdeps-unix.c 2013-02-28 13:13:52.224615146 +0000 +@@ -21,6 +21,10 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ ++#ifndef HAVE_GETGROUPLIST ++#include "getgrouplist.c" ++#define HAVE_GETGROUPLIST ++#endif + + #include + diff --git a/pkgs/development/libraries/dbus/no-create-dirs.patch b/pkgs/development/libraries/dbus/no-create-dirs.patch new file mode 100644 index 000000000000..cf10d9775991 --- /dev/null +++ b/pkgs/development/libraries/dbus/no-create-dirs.patch @@ -0,0 +1,26 @@ +diff --git a/bus/Makefile.am b/bus/Makefile.am +index 6cbc09a..be60bb8 100644 +--- a/bus/Makefile.am ++++ b/bus/Makefile.am +@@ -212,7 +212,6 @@ clean-local: + /bin/rm *.bb *.bbg *.da *.gcov || true + + install-data-hook: +- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus + $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d + $(mkinstalldirs) $(DESTDIR)$(configdir)/session.d + $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services +diff --git a/tools/Makefile.am b/tools/Makefile.am +index cfd54b8..b6e28f9 100644 +--- a/tools/Makefile.am ++++ b/tools/Makefile.am +@@ -74,7 +74,7 @@ CLEANFILES = \ + + # create the /var/lib/dbus directory for dbus-uuidgen + install-data-local: +- $(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/dbus ++ : + + installcheck-local: +- test -d $(DESTDIR)$(localstatedir)/lib/dbus ++ : diff --git a/pkgs/development/libraries/dbus/systemd.patch b/pkgs/development/libraries/dbus/systemd.patch new file mode 100644 index 000000000000..7e6cb1f87d07 --- /dev/null +++ b/pkgs/development/libraries/dbus/systemd.patch @@ -0,0 +1,14 @@ +diff --git a/configure.ac b/configure.ac +index 24fcc9e..98e0459 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1167,7 +1167,8 @@ else + PKG_CHECK_MODULES(SYSTEMD, + [libsystemd-login >= 32, libsystemd-daemon >= 32], + have_systemd=yes, +- have_systemd=no) ++ have_systemd=yes) ++ AC_MSG_NOTICE([NixOS: do not care whether we found systemd or not]) + fi + + if test x$have_systemd = xyes; then diff --git a/pkgs/development/libraries/dbus/ucred-dirty-hack.patch b/pkgs/development/libraries/dbus/ucred-dirty-hack.patch new file mode 100644 index 000000000000..a07abcc15fb0 --- /dev/null +++ b/pkgs/development/libraries/dbus/ucred-dirty-hack.patch @@ -0,0 +1,18 @@ +diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c +index b4ecc96..267984a 100644 +--- a/dbus/dbus-sysdeps-unix.c ++++ b/dbus/dbus-sysdeps-unix.c +@@ -1635,6 +1635,13 @@ write_credentials_byte (int server_fd, + } + } + ++struct ucred ++{ ++ pid_t pid; /* PID of sending process. */ ++ uid_t uid; /* UID of sending process. */ ++ gid_t gid; /* GID of sending process. */ ++}; ++ + /** + * Reads a single byte which must be nul (an error occurs otherwise), + * and reads unix credentials if available. Clears the credentials diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 116fe3c0c20f..2067f3457b63 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -1,18 +1,26 @@ { stdenv, fetchurl, pkgconfig, freetype, expat }: stdenv.mkDerivation rec { - name = "fontconfig-2.10.1"; + name = "fontconfig-2.10.2"; src = fetchurl { - url = "http://fontconfig.org/release/${name}.tar.gz"; - sha256 = "08h252crb3aqciwdk81jypmz2i7618dzqn3zlr87w1f017wjp4f3"; + url = "http://fontconfig.org/release/${name}.tar.bz2"; + sha256 = "0llraqw86jmw4vzv7inskp3xxm2gc64my08iwq5mzncgfdbfza4f"; }; - buildInputs = [ pkgconfig freetype ]; + infinality_patch = with freetype.infinality; if useInfinality + then let subvers = "1"; + in fetchurl { + url = "${base_URL}/fontconfig-infinality-1-${vers}_${subvers}.tar.bz2"; + sha256 = "1fm5xx0mx2243jrq5rxk4v0ajw2nawpj23399h710bx6hd1rviq7"; + } + else null; - propagatedBuildInputs = [ expat ]; # !!! shouldn't be necessary, but otherwise pango breaks + buildInputs = [ pkgconfig freetype expat ]; - configureFlags = "--with-confdir=/etc/fonts --with-cache-dir=/var/cache/fontconfig --disable-docs --with-default-fonts="; + #propagatedBuildInputs = [ expat ]; # !!! shouldn't be necessary, but otherwise pango breaks + + configureFlags = "--sysconfdir=/etc --with-cache-dir=/var/cache/fontconfig --disable-docs --with-default-fonts="; # We should find a better way to access the arch reliably. crossArch = stdenv.cross.arch or null; @@ -26,7 +34,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # Don't try to write to /etc/fonts or /var/cache/fontconfig at install time. - installFlags = "CONFDIR=$(out)/etc/fonts RUN_FC_CACHE_TEST=false fc_cachedir=$(TMPDIR)/dummy"; + installFlags = "sysconfdir=$(out)/etc RUN_FC_CACHE_TEST=false fc_cachedir=$(TMPDIR)/dummy"; + + postInstall = if !freetype.infinality.useInfinality then "" else '' + cd "$out/etc/fonts" && tar xvf ${infinality_patch} + ''; meta = { description = "A library for font customization and configuration"; diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index b26789930a4b..cff22e9bc577 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -1,22 +1,50 @@ { stdenv, fetchurl, gnumake -, # FreeType supports sub-pixel rendering. This is patented by + # FreeType supports sub-pixel rendering. This is patented by # Microsoft, so it is disabled by default. This option allows it to # be enabled. See http://www.freetype.org/patents.html. - useEncumberedCode ? false +, useEncumberedCode ? false +, useInfinality ? true }: +assert !(useEncumberedCode && useInfinality); # probably wouldn't make sense + +let + + version = "2.4.11"; + + infinality = rec { + inherit useInfinality; + vers = "20130104"; + subvers = "04"; + sha256 = "0dqglig34lfcw0w6sm6vmich0pcvq303vyh8jzqapvxgvrpr2156"; + + base_URL = "http://www.infinality.net/fedora/linux/zips"; + url = "${base_URL}/freetype-infinality-${version}-${vers}_${subvers}-x86_64.tar.bz2"; + }; + +in + stdenv.mkDerivation rec { - name = "freetype-2.4.10"; + name = "freetype-${version}"; src = fetchurl { url = "mirror://sourceforge/freetype/${name}.tar.bz2"; - sha256 = "0bwrkqpygayfc1rf6rr1nb8l3svgn1fmjz8davg2hnf46cn293hc"; + sha256 = "0gxyzxqpyf8g85y6g1zc1wqrh71prbbk8xfw4m8rwzb4ck5hp7gg"; }; + infinality_patch = if useInfinality + then fetchurl { inherit (infinality) url sha256; } + else null; + configureFlags = "--disable-static"; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString useEncumberedCode - "-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING=1"; + NIX_CFLAGS_COMPILE = with stdenv.lib; + " -fno-strict-aliasing" # from Gentoo, see https://bugzilla.redhat.com/show_bug.cgi?id=506840 + + optionalString useEncumberedCode " -DFT_CONFIG_OPTION_SUBPIXEL_RENDERING=1" + + optionalString useInfinality " -DTT_CONFIG_OPTION_SUBPIXEL_HINTING=1"; + + patches = [ ./enable-validation.patch ] # from Gentoo + ++ stdenv.lib.optional useInfinality [ infinality_patch ]; # The asm for armel is written with the 'asm' keyword. CFLAGS = stdenv.lib.optionalString stdenv.isArm "-std=gnu99"; @@ -26,6 +54,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + doCheck = true; + postInstall = '' ln -s freetype2/freetype $out/include/freetype @@ -38,9 +68,12 @@ stdenv.mkDerivation rec { configureFlags = "--disable-static CC_BUILD=gcc"; }; + passthru = { inherit infinality; }; # for fontconfig + meta = { description = "A font rendering engine"; homepage = http://www.freetype.org/; - license = "GPLv2+"; # or the FreeType License (BSD + advertising clause) + license = if useEncumberedCode then "unfree" + else "GPLv2+"; # or the FreeType License (BSD + advertising clause) }; } diff --git a/pkgs/development/libraries/freetype/enable-validation.patch b/pkgs/development/libraries/freetype/enable-validation.patch new file mode 100644 index 000000000000..44f3bf6e1c94 --- /dev/null +++ b/pkgs/development/libraries/freetype/enable-validation.patch @@ -0,0 +1,22 @@ +Enables gxvalid and otvalid modules for use with ftvalid. + +--- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400 ++++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400 +@@ -110,7 +110,7 @@ + AUX_MODULES += cache + + # TrueType GX/AAT table validation. Needs ftgxval.c below. +-# AUX_MODULES += gxvalid ++AUX_MODULES += gxvalid + + # Support for streams compressed with gzip (files with suffix .gz). + # +@@ -124,7 +124,7 @@ + + # OpenType table validation. Needs ftotval.c below. + # +-# AUX_MODULES += otvalid ++AUX_MODULES += otvalid + + # Auxiliary PostScript driver component to share common code. + # diff --git a/pkgs/development/libraries/gdk-pixbuf/2.26.x.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix similarity index 77% rename from pkgs/development/libraries/gdk-pixbuf/2.26.x.nix rename to pkgs/development/libraries/gdk-pixbuf/default.nix index 2876c9b94341..c466905e4917 100644 --- a/pkgs/development/libraries/gdk-pixbuf/2.26.x.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -1,11 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz, jasper }: +{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz +, jasper }: stdenv.mkDerivation rec { - name = "gdk-pixbuf-2.26.1"; + name = "gdk-pixbuf-2.28.1"; src = fetchurl { - url = "mirror://gnome/sources/gdk-pixbuf/2.26/${name}.tar.xz"; - sha256 = "a60af12b58d9cc15ba4c680c6730ce5d38e8d664af1d575a379385b94b4ec7ba"; + url = "mirror://gnome/sources/gdk-pixbuf/2.28/${name}.tar.xz"; + sha256 = "1fy2a05xhfg7gy4l4aajsbmgj62zxhikdxqh6bicihxmzm1vg85y"; }; # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. diff --git a/pkgs/development/libraries/glib/2.34.x.nix b/pkgs/development/libraries/glib/default.nix similarity index 64% rename from pkgs/development/libraries/glib/2.34.x.nix rename to pkgs/development/libraries/glib/default.nix index 69ed44aeccaa..47d8d9433245 100644 --- a/pkgs/development/libraries/glib/2.34.x.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconvOrNull, zlib, libffi -, python, pcre }: +{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconvOrEmpty, zlib, libffi +, python, pcre, libelf }: # TODO: # * Add gio-module-fam @@ -11,16 +11,29 @@ # Reminder: add 'sed -e 's@python2\.[0-9]@python@' -i # $out/bin/gtester-report' to postInstall if this is solved +let + # some packages don't get "Cflags" from pkgconfig correctly + # and then fail to build when directly including like + flattenInclude = '' + for dir in $out/include/*; do + cp -r $dir/* "$out/include/" + rm -r "$dir" + ln -s . "$dir" + done + ln -sr -t "$out/include/" $out/lib/*/include/* 2>/dev/null || true + ''; +in + stdenv.mkDerivation (rec { - name = "glib-2.34.0"; + name = "glib-2.36.1"; src = fetchurl { - url = "mirror://gnome/sources/glib/2.34/${name}.tar.xz"; - sha256 = "f69b112f8848be35139d9099b62bc81649241f78f6a775516f0d4c9b47f65144"; + url = "mirror://gnome/sources/glib/2.36/${name}.tar.xz"; + sha256 = "090bw5par3dfy5m6dhq393pmy92zpw3d7rgbzqjc14jfg637bqvx"; }; # configure script looks for d-bus but it is only needed for tests - buildInputs = [ libiconvOrNull ]; + buildInputs = [ libelf ] ++ libiconvOrEmpty; nativeBuildInputs = [ perl pkgconfig gettext python ]; @@ -28,12 +41,17 @@ stdenv.mkDerivation (rec { configureFlags = "--with-pcre=system --disable-fam"; + postConfigure = "sed '/SANE_MALLOC_PROTOS/s,^,//,' -i config.h"; # https://bugzilla.gnome.org/show_bug.cgi?id=698716 :-) + enableParallelBuilding = true; - passthru.gioModuleDir = "lib/gio/modules"; - postInstall = ''rm -rvf $out/share/gtk-doc''; + passthru = { + gioModuleDir = "lib/gio/modules"; + inherit flattenInclude; + }; + meta = { description = "GLib, a C library of programming buildings blocks"; diff --git a/pkgs/development/libraries/gmime/default.nix b/pkgs/development/libraries/gmime/default.nix index 02145d08c289..99859b9f34ef 100644 --- a/pkgs/development/libraries/gmime/default.nix +++ b/pkgs/development/libraries/gmime/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, glib, zlib }: +{ stdenv, fetchurl, pkgconfig, glib, zlib, libgpgerror }: stdenv.mkDerivation rec { - name = "gmime-2.4.24"; - + name = "gmime-2.6.15"; + src = fetchurl { - url = "mirror://gnome/sources/gmime/2.4/${name}.tar.gz"; - sha256 = "2f538d68e215f075d16575a6da9acb87983db9e2df0d7d403858048881a0dd15"; + url = "mirror://gnome/sources/gmime/2.6/${name}.tar.xz"; + sha256 = "16n9gmlwn6rphi59hrwy6dpn785s3r13h2kmrn3k61l2kfws1hml"; }; - - buildInputs = [ pkgconfig glib zlib ]; + + nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ glib zlib libgpgerror ]; meta = { homepage = http://spruce.sourceforge.net/gmime/; diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index fe1d519f5625..b96d5b25bb1c 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python }: +{ stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python, gdk_pixbuf }: stdenv.mkDerivation rec { - name = "gobject-introspection-1.34.0"; + name = "gobject-introspection-1.34.2"; - buildInputs = [ flex bison glib pkgconfig python ]; + buildInputs = [ flex bison glib pkgconfig python gdk_pixbuf ]; propagatedBuildInputs = [ libffi ]; # Tests depend on cairo, which is undesirable (it pulls in lots of @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gobject-introspection/1.34/${name}.tar.xz"; - sha256 = "80e211ea95404fc7c5fa3b04ba69ee0b29af70847af315155ab06b8cff832c85"; + sha256 = "0a9lq0y67sr3g37l1hy0biqn046jr9wnd05hvwi8j8g2bjilhydw"; }; postInstall = "rm -rf $out/share/gtk-doc"; diff --git a/pkgs/development/libraries/gtk+/2.24.x.nix b/pkgs/development/libraries/gtk+/2.x.nix similarity index 81% rename from pkgs/development/libraries/gtk+/2.24.x.nix rename to pkgs/development/libraries/gtk+/2.x.nix index c259f7005730..c8224fa18e6d 100644 --- a/pkgs/development/libraries/gtk+/2.24.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -8,22 +8,22 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; stdenv.mkDerivation rec { - name = "gtk+-2.24.14"; + name = "gtk+-2.24.17"; src = fetchurl { url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz"; - sha256 = "8bd1b8b511a3004e8972badf467ce829e6855cdff15540b9344dc934c68008ac"; + sha256 = "05gl82k82w3gjrzr4vmj3ski7mp1b0jbhc49wgl9hv8mc2sb4iz9"; }; enableParallelBuilding = true; nativeBuildInputs = [ perl pkgconfig ]; - propagatedBuildInputs = - [ xlibs.xlibs glib atk pango gdk_pixbuf cairo - xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi + propagatedBuildInputs = with xlibs; + [ glib cairo pango gdk_pixbuf atk + libXrandr libXrender libXcomposite libXi libXcursor ] - ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama + ++ stdenv.lib.optional xineramaSupport libXinerama ++ stdenv.lib.optionals cupsSupport [ cups ]; configureFlags = "--with-xinput=yes"; diff --git a/pkgs/development/libraries/gtk+/3.2.x.nix b/pkgs/development/libraries/gtk+/3-default.nix similarity index 68% rename from pkgs/development/libraries/gtk+/3.2.x.nix rename to pkgs/development/libraries/gtk+/3-default.nix index cace1b626f49..1b296e2c3985 100644 --- a/pkgs/development/libraries/gtk+/3.2.x.nix +++ b/pkgs/development/libraries/gtk+/3-default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, glib, atk, pango, cairo, perl, xlibs -, gdk_pixbuf, xz +{ stdenv, fetchurl, pkgconfig +, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, xlibs , xineramaSupport ? true , cupsSupport ? true, cups ? null }: @@ -8,22 +8,20 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; stdenv.mkDerivation rec { - name = "gtk+-3.2.4"; + name = "gtk+-3.8.0"; src = fetchurl { - url = "mirror://gnome/sources/gtk+/3.2/${name}.tar.xz"; - sha256 = "f981bf514858c00d7084bd6f6c34b3c60b8aebdb959e7aca6faa59ed67c136bd"; + url = "mirror://gnome/sources/gtk+/3.8/${name}.tar.xz"; + sha256 = "0bi5dip7l6d08c6v9c9aipwsi8hq38xjljqv86nmnpvbkpc4a4yv"; }; 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 + nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = with xlibs; [ + expat glib cairo pango gdk_pixbuf atk at_spi2_atk + libXrandr libXrender libXcomposite libXi libXcursor + ] ++ stdenv.lib.optional xineramaSupport libXinerama ++ stdenv.lib.optionals cupsSupport [ cups ]; postInstall = "rm -rf $out/share/gtk-doc"; diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index d3681b4b3867..5c4a13fe507c 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm }: -stdenv.mkDerivation { - name = "gtkmm-3.2.0"; +stdenv.mkDerivation rec { + name = "gtkmm-3.7.12"; # gnome 3.8 release; stable 3.6 has problems with our new glibc src = fetchurl { - url = mirror://gnome/sources/gtkmm/3.2/gtkmm-3.2.0.tar.xz; - sha256 = "1wkljr2vjvjg5mggi4rvk9k4j2kzh8lc106k2yp8gqjlhk2xm5b1"; + url = "mirror://gnome/sources/gtkmm/3.7/${name}.tar.xz"; + sha256 = "05nrilm34gid7kqlq09hcdd7942prn2vbr1qgqvdhgy4x8pvz9p9"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 5755e747a6b5..8c848218d30f 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, freetype }: stdenv.mkDerivation rec { - name = "harfbuzz-0.9.4"; + name = "harfbuzz-0.9.12"; src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2"; - sha256 = "2572f9a810d17a735ef565115463827d075af2371ee5b68e6d77231381f4bddc"; + sha256 = "19cx5y2m20rp7z5j7mwqfb4ph2g8lrri69zim44x362y4w5gfly6"; }; buildInputs = [ pkgconfig glib freetype ]; diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index 6d56cd446338..710f6bd87009 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -1,25 +1,25 @@ { 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"; passthru = { gtkModule = "/lib/gtk-2.0/"; }; 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 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/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index a2546bf2d69a..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.33"; - + name = "libdrm-2.4.42"; + src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "1slgi61n4dlsfli47ql354fd1ppj7n40jd94wvnsdqx0mna9syrd"; + sha256 = "1qbnpi64hyqzd650hj6jki1d50pzypdhj3rw9m3whwbqly110rz0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 0438816b1b4f..c262535a1f7d 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; - sha1 = "c9998383532ba3e8bcaf690f2f0d65e814b48d2f"; + sha256 = "0gwnzqd64cpwdmk93nll54nidsr74jpimxzj4p4z7502ylwl66p4"; }; propagatedBuildInputs = [ libgpgerror ]; 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/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index eafa857598cb..eb0de7aa2bed 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation (rec { src = fetchurl { url = "mirror://gnupg/libgpg-error/${name}.tar.bz2"; - sha1 = "be209b013652add5c7e2c473ea114f58203cc6cd"; + sha256 = "1h0ql8j65ns2rmhj9wnc9035026crzkg226xg8614fq71947ccxf"; }; doCheck = true; diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 56f6242c09e8..35576baeb328 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, libiconvOrEmpty +}: -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 ] ++ libiconvOrEmpty; doCheck = true; 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/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index ced11c0ef4da..95d060df7f7d 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -1,13 +1,17 @@ -{ stdenv, fetchurl, libusb }: +{ stdenv, fetchurl, pkgconfig, libusb1 }: stdenv.mkDerivation rec { - name = "libmtp-1.0.1"; + name = "libmtp-1.1.5"; - propagatedBuildInputs = [ libusb ]; + propagatedBuildInputs = [ libusb1 ]; + buildInputs = [ pkgconfig ]; + + # tried to install files to /lib/udev, hopefully OK + configureFlags = [ "--with-udev=$$out/lib/udev" ]; src = fetchurl { url = "mirror://sourceforge/libmtp/${name}.tar.gz"; - sha256 = "19iha1yi07cdqzlba4ng1mn7h701binalwwkb71q0ld9b88mad6s"; + sha256 = "0fn6y7kirgln6sfizmwvjsy7qkdb0p3rccf0zkr3r2xg3cbpjxkq"; }; meta = { diff --git a/pkgs/development/libraries/libpaper/default.nix b/pkgs/development/libraries/libpaper/default.nix new file mode 100644 index 000000000000..9505a6cf052f --- /dev/null +++ b/pkgs/development/libraries/libpaper/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "1.1.24"; + name = "libpaper-${version}"; + + src = fetchurl { + url = "mirror://debian/pool/main/libp/libpaper/libpaper_${version}.tar.gz"; + sha256 = "0zhcx67afb6b5r936w5jmaydj3ks8zh83n9rm5sv3m3k8q8jib1q"; + }; + + meta = { + description = "Library for handling paper characteristics"; + homepage = "http://packages.debian.org/unstable/source/libpaper"; + license = "GPLv2"; + }; +} diff --git a/pkgs/development/libraries/libpng/15.nix b/pkgs/development/libraries/libpng/15.nix new file mode 100644 index 000000000000..8f62ef1e8dc9 --- /dev/null +++ b/pkgs/development/libraries/libpng/15.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, zlib }: + +assert zlib != null; + +stdenv.mkDerivation rec { + name = "libpng-1.5.15"; + + src = fetchurl { + url = "mirror://sourceforge/libpng/${name}.tar.xz"; + sha256 = "1iaplghmv5qhd4dgwfymhp42sh27vz6s2107jk698xm57z2v9hwm"; + }; + + propagatedBuildInputs = [ zlib ]; + + doCheck = true; + + passthru = { inherit zlib; }; + + meta = { + description = "The official reference implementation for the PNG file format"; + homepage = http://www.libpng.org/pub/png/libpng.html; + license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt + }; +} diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index ce23cf48587a..72821ef7028f 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -3,15 +3,17 @@ assert zlib != null; stdenv.mkDerivation rec { - name = "libpng-1.5.13"; + name = "libpng-1.6.2"; src = fetchurl { url = "mirror://sourceforge/libpng/${name}.tar.xz"; - sha256 = "1vks4mqv4140b10kp53qrywsx9m4xan5ibwsrlmf42ni075zjhxq"; + sha256 = "1pljkqjqgyz8c32w8fipd9f0v2gcyhah2ypp0h7ya1r1q85sk5qw"; }; propagatedBuildInputs = [ zlib ]; + doCheck = true; + passthru = { inherit zlib; }; meta = { diff --git a/pkgs/development/libraries/libpng/libpng-apng.nix b/pkgs/development/libraries/libpng/libpng-apng.nix index 534b0ae5a45f..bc6a773dba3b 100644 --- a/pkgs/development/libraries/libpng/libpng-apng.nix +++ b/pkgs/development/libraries/libpng/libpng-apng.nix @@ -1,29 +1,27 @@ { stdenv, fetchurl, zlib }: -assert zlib != null; - stdenv.mkDerivation rec { - version = "1.4.4"; + version = "1.5.14"; name = "libpng-apng-${version}"; - + patch_src = fetchurl { - url = "mirror://sourceforge/project/libpng-apng/libpng-master/${version}/libpng-${version}-apng.patch.gz"; - sha256 = "d729a2feacfd80547e06c30343d598302f4417cf2e6f649e4ee617690987bd24"; + url = "mirror://sourceforge/libpng-apng/libpng15/${version}/libpng-${version}-apng.patch.gz"; + sha256 = "1vcqbkdssy4srm8jqyzaipdc70xzanilqssypmwqyngp8ph0m45p"; }; src = fetchurl { - url = "mirror://sourceforge/libpng/libpng-${version}.tar.gz"; - sha256 = "d07616ba1e9c161017384feb3b576d70c160b970abfd9549ad39a622284b574a"; + url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz"; + sha256 = "0m3vz3gig7s63zanq5b1dgb5ph12qm0cylw4g4fbxlsq3f74hn8l"; }; preConfigure = '' gunzip < ${patch_src} | patch -Np1 ''; - + propagatedBuildInputs = [ zlib ]; passthru = { inherit zlib; }; - + meta = { description = "The official reference implementation for the PNG file format with animation patch"; homepage = http://www.libpng.org/pub/png/libpng.html; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 0da302038769..13385dfb65c0 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -1,16 +1,24 @@ -{stdenv, fetchurl, pkgconfig, libxml2, libgsf, bzip2, glib, gtk, libcroco}: +{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo +, libxml2, libgsf, bzip2, libcroco +, gtk2 ? null, gtk3 ? null +, gobjectIntrospection ? null, enableIntrospection ? false }: -stdenv.mkDerivation { - name = "librsvg-2.34.2"; +# no introspection by default, it's too big + +stdenv.mkDerivation rec { + name = "librsvg-2.36.4"; src = fetchurl { - url = mirror://gnome/sources/librsvg/2.34/librsvg-2.34.2.tar.xz; - sha256 = "0r24xr10chmz4l3ka2zy9c2245s7svzljbw9nrda3h44bcr03rsx"; + url = "mirror://gnome/sources/librsvg/2.36/${name}.tar.xz"; + sha256 = "1hp6325gdkzx8yqn2d2r915ak3k6hfshjjh0sc54z3vr0i99688h"; }; - buildInputs = [ libxml2 libgsf bzip2 libcroco ]; - 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"]; + # It wants to add loaders and update the loaders.cache in gdk-pixbuf # Patching the Makefiles to it creates rsvg specific loaders and the # relevant loader.cache here. diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index ba5966d13d4b..e073717de568 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, zlib, libjpeg }: -let version = "3.9.7"; in +let version = "4.0.3"; in stdenv.mkDerivation rec { name = "libtiff-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { [ "ftp://ftp.remotesensing.org/pub/libtiff/tiff-${version}.tar.gz" "http://download.osgeo.org/libtiff/tiff-${version}.tar.gz" ]; - sha256 = "0spg1hr5rsrmg88sfzb05qnf0haspq7r5hvdkxg5zib1rva4vmpm"; + sha256 = "0wj8d1iwk9vnpax2h29xqc2hwknxg3s0ay2d5pxkg59ihbifn6pa"; }; propagatedBuildInputs = [ zlib libjpeg ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Library and utilities for working with the TIFF image file format"; - homepage = http://www.libtiff.org/; + homepage = http://www.remotesensing.org/libtiff/; license = "bsd"; }; } diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 8a1580d4fbe8..811909c659d2 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, pkgconfig }: stdenv.mkDerivation rec { name = "libusb-1.0.9"; @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "16sz34ix6hw2wwl3kqx6rf26fg210iryr68wc439dc065pffw879"; }; + buildInputs = [ pkgconfig ]; + meta = { homepage = http://www.libusb.org; description = "User-space USB library"; diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index 92ab8d67c91e..158106247055 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, libX11 }: +{ stdenv, fetchurl, pkgconfig, xlibs }: stdenv.mkDerivation rec { - name = "libvdpau-0.5"; - + name = "libvdpau-0.6"; + src = fetchurl { url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz"; - sha256 = "0k2ydz4yp7zynlkpd1llfwax30xndwbca36z83ah1i4ldjw2gfhx"; + sha256 = "0x9dwxzw0ilsy88kqlih3170z1zfrrsx1dr9jbwbn0cbkpnbwmcv"; }; - buildInputs = [ pkgconfig libX11 ]; + buildInputs = with xlibs; [ pkgconfig dri2proto libXext ]; - propagatedBuildInputs = [ libX11 ]; + propagatedBuildInputs = [ xlibs.libX11 ]; meta = { homepage = http://people.freedesktop.org/~aplattner/vdpau/; diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix new file mode 100644 index 000000000000..4a1327778d47 --- /dev/null +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, yacc, flex, xkeyboard_config }: + +stdenv.mkDerivation rec { + name = "libxkbcommon-0.2.0"; + + src = fetchurl { + url = "http://xkbcommon.org/download/${name}.tar.bz2"; + sha256 = "0hpvfa8p4bhvhc1gcb578m354p5idd192xb8zlaq16d33h90msvl"; + }; + + buildInputs = [ yacc flex xkeyboard_config ]; + + configureFlags = '' + --with-xkb-config-root=${xkeyboard_config}/etc/X11/xkb + ''; + + meta = { + description = "A library to handle keyboard descriptions"; + homepage = http://xkbcommon.org; + }; +} diff --git a/pkgs/development/libraries/libxtc_dxtn/default.nix b/pkgs/development/libraries/libxtc_dxtn/default.nix index 0e7442633d77..a23d74a2be86 100644 --- a/pkgs/development/libraries/libxtc_dxtn/default.nix +++ b/pkgs/development/libraries/libxtc_dxtn/default.nix @@ -8,8 +8,5 @@ stdenv.mkDerivation rec { sha256 = "0q5fjaknl7s0z206dd8nzk9bdh8g4p23bz7784zrllnarl90saa5"; }; - postUnpack = '' - tar xf ${mesa.src} --wildcards '*/include/' - export NIX_CFLAGS_COMPILE="-I $NIX_BUILD_TOP/[mM]esa*/include" - ''; + NIX_CFLAGS_COMPILE = "-I ${mesa}/include"; } diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix new file mode 100644 index 000000000000..502329226ff3 --- /dev/null +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, mesa_noglu }: + +stdenv.mkDerivation rec { + name = "glu-9.0.0"; + + src = fetchurl { + url = "ftp://ftp.freedesktop.org/pub/mesa/glu/${name}.tar.bz2"; + sha256 = "04nzlil3a6fifcmb95iix3yl8mbxdl66b99s62yzq8m7g79x0yhz"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ mesa_noglu ]; + + meta = { + description = "OpenGL utility library"; + homepage = http://cgit.freedesktop.org/mesa/glu/; + license = "bsd"; # SGI-B-2.0, which seems BSD-like + }; +} diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index d3f7afbd3084..a07323b61b2e 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,41 +1,48 @@ -{ 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 -, python, libxml2Python }: +, libXt, udev, enableTextureFloats ? false, enableR600LlvmCompiler ? false +, python, libxml2Python, autoconf, automake, libtool, llvm, writeText +, libffi, wayland }: if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then throw "unsupported platform for Mesa" else -let version = "8.0.4"; in - +let + version = "9.1.2"; +in stdenv.mkDerivation { - name = "mesa-${version}"; + name = "mesa-noglu-${version}"; src = fetchurl { url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2"; - md5 = "d546f988adfdf986cff45b1efa2d8a46"; + sha256="1ns366armqmp2bxj1l7fff95v22b5z9mnkyykbdj81lhg9gi3586"; }; - patches = - stdenv.lib.optional (stdenv.system == "mips64el-linux") ./mips_wmb.patch; - prePatch = "patchShebangs ."; + preConfigure = "./autogen.sh"; + configureFlags = - " --enable-gles1 --enable-gles2 --enable-gallium-egl" - + " --with-gallium-drivers=i915,nouveau,r600,svga,swrast" + "" + + " --enable-gles1 --enable-gles2 --enable-gallium-egl" + + " --with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast" + + " --with-egl-platforms=x11,wayland,drm --enable-gbm --enable-shared-glapi" + + stdenv.lib.optionalString enableR600LlvmCompiler " --enable-r600-llvm-compiler" # 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 ]; + buildInputs = [ + autoconf automake libtool intltool expat libxml2Python udev llvm + libdrm libXxf86vm libXfixes libXdamage glproto dri2proto libX11 libXext libxcb libXt + libffi wayland + ]; nativeBuildInputs = [ pkgconfig python makedepend file flex bison ]; enableParallelBuilding = true; - passthru = { inherit libdrm; }; + passthru = { inherit libdrm; inherit version; }; meta = { description = "An open source implementation of OpenGL"; diff --git a/pkgs/development/libraries/mesa/mips_wmb.patch b/pkgs/development/libraries/mesa/mips_wmb.patch deleted file mode 100644 index 1ffa1bdd8df4..000000000000 --- a/pkgs/development/libraries/mesa/mips_wmb.patch +++ /dev/null @@ -1,16 +0,0 @@ -rixed told me (viric) it's the patch to apply for mesa. -I adapted his patch for mesa 7.5 to this 7.10 - -diff --git a/src/mesa/drivers/dri/sis/sis_context.h b/src/mesa/drivers/dri/sis/sis_context.h -index a82a659..d8d8d9a 100644 ---- a/src/mesa/drivers/dri/sis/sis_context.h -+++ b/src/mesa/drivers/dri/sis/sis_context.h -@@ -404,6 +404,8 @@ struct sis_context - #define MMIO_WMB() __asm __volatile("" : : : "memory") - #elif defined(__ia64__) - #define MMIO_WMB() __asm __volatile("mf" : : : "memory") -+#elif defined(__mips__) -+#define MMIO_WMB() __asm __volatile("" : : : "memory") - #else - #error platform needs WMB - #endif diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix index 6024456652c6..7fd18af450c3 100644 --- a/pkgs/development/libraries/openjpeg/default.nix +++ b/pkgs/development/libraries/openjpeg/default.nix @@ -1,13 +1,21 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, pkgconfig, libpng, libtiff, lcms2, glib/*passthru only*/ }: stdenv.mkDerivation rec { name = "openjpeg-1.5.1"; + passthru = { + incDir = "openjpeg-1.5"; + }; src = fetchurl { url = "http://openjpeg.googlecode.com/files/${name}.tar.gz"; sha256 = "13dbyf3jwr4h2dn1k11zph3jgx17z7d66xmi640mbsf8l6bk1yvc"; }; + nativebuildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ libpng libtiff lcms2 ]; # in closure anyway + + postInstall = glib.flattenInclude; + meta = { homepage = http://www.openjpeg.org/; description = "Open-source JPEG 2000 codec written in C language"; diff --git a/pkgs/development/libraries/pango/1.30.x.nix b/pkgs/development/libraries/pango/default.nix similarity index 77% rename from pkgs/development/libraries/pango/1.30.x.nix rename to pkgs/development/libraries/pango/default.nix index c32891b95cfd..418a2acb0b77 100644 --- a/pkgs/development/libraries/pango/1.30.x.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng, fontconfig }: +{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng, harfbuzz, fontconfig }: stdenv.mkDerivation rec { - name = "pango-1.30.1"; + name = "pango-1.32.5"; #.6 needs a not-yet-stable fontconfig src = fetchurl { - url = "mirror://gnome/sources/pango/1.30/${name}.tar.xz"; - sha256 = "3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe"; + url = "mirror://gnome/sources/pango/1.32/${name}.tar.xz"; + sha256 = "08aqis6j8nd1lb4f2h4h9d9kjvp54iwf8zvqzss0qn4v7nfcjyvx"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ gettext fontconfig ]; nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ x11 glib cairo libpng ]; + propagatedBuildInputs = [ x11 glib cairo libpng harfbuzz ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/pangox-compat/default.nix b/pkgs/development/libraries/pangox-compat/default.nix new file mode 100644 index 000000000000..8518083b4d35 --- /dev/null +++ b/pkgs/development/libraries/pangox-compat/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, glib, pango, libX11 }: + +stdenv.mkDerivation rec { + name = "pangox-compat-0.0.2"; + + src = fetchurl { + url = "mirror://gnome/sources/pangox-compat/0.0/${name}.tar.xz"; + sha256 = "0ip0ziys6mrqqmz4n71ays0kf5cs1xflj1gfpvs4fgy2nsrr482m"; + }; + + buildInputs = [ pkgconfig glib pango libX11 ]; + + meta = { + description = "A compatibility library for pango>1.30.*"; + + homepage = http://www.pango.org/; + license = "LGPLv2+"; + }; +} diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix new file mode 100644 index 000000000000..7fbcedda3956 --- /dev/null +++ b/pkgs/development/libraries/pixman/default.nix @@ -0,0 +1,22 @@ +{ fetchurl, stdenv, pkgconfig, perl, withPNG ? true, libpng, glib /*just passthru*/ }: + +stdenv.mkDerivation rec { + name = "pixman-0.28.2"; + + src = fetchurl { + url = "http://cairographics.org/releases/${name}.tar.gz"; + sha256 = "0mcvxd5gx3w1wzgph91l2vaiic91jmx7s01hi2igphyvd80ckyia"; + }; + + nativeBuildInputs = [ pkgconfig perl ]; + + buildInputs = stdenv.lib.optional withPNG [ libpng ]; # NOT in closure anyway + + postInstall = glib.flattenInclude; + + meta = { + homepage = http://pixman.org; + description = "A low-level library for pixel manipulation"; + license = "MIT"; + }; +} diff --git a/pkgs/development/libraries/poppler/0.18.nix b/pkgs/development/libraries/poppler/0.18.nix new file mode 100644 index 000000000000..3297b0a19e64 --- /dev/null +++ b/pkgs/development/libraries/poppler/0.18.nix @@ -0,0 +1,53 @@ +{ fetchurl, stdenv, cairo, freetype, fontconfig, zlib +, libjpeg, curl, libpthreadstubs, xorg, openjpeg +, libxml2, pkgconfig, cmake, lcms2 +, glibSupport ? false, glib, gtk3Support ? false, gtk3 # gtk2 no longer accepted +, qt4Support ? false, qt4 ? null +}: + +stdenv.mkDerivation rec { + name = "poppler-0.18.4"; + + src = fetchurl { + url = "${meta.homepage}${name}.tar.gz"; + sha256 = "0bnl05al7mjndp2h0355946j59nfw76f5v0x57d47q68rm412hik"; + }; + + propagatedBuildInputs = with xorg; + [ zlib cairo freetype fontconfig libjpeg lcms2 curl + libpthreadstubs libxml2 stdenv.gcc.libc + libXau libXdmcp libxcb libXrender libXext + openjpeg + ] + ++ stdenv.lib.optional glibSupport glib + ++ stdenv.lib.optional gtk3Support gtk3 + ++ stdenv.lib.optional qt4Support qt4; + + nativeBuildInputs = [ pkgconfig cmake ]; + + cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON"; + + patches = [ ./datadir_env.patch ]; + + # XXX: The Poppler/Qt4 test suite refers to non-existent PDF files + # such as `../../../test/unittestcases/UseNone.pdf'. + #doCheck = !qt4Support; + checkTarget = "test"; + + enableParallelBuilding = true; + + meta = { + homepage = http://poppler.freedesktop.org/; + description = "Poppler, a PDF rendering library"; + + longDescription = '' + Poppler is a PDF rendering library based on the xpdf-3.0 code base. + ''; + + platforms = if qt4Support + then qt4.meta.platforms + else stdenv.lib.platforms.all; + + license = "GPLv2"; + }; +} diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 1d796789210c..263162336485 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,50 +1,76 @@ -{ fetchurl, stdenv, cairo, freetype, fontconfig, zlib -, libjpeg, pixman, curl, libpthreadstubs, libXau, libXdmcp, openjpeg -, libxml2, pkgconfig, cmake, lcms -, gtkSupport ? false, glib ? null, gtk ? null +{ stdenv, fetchurl, fetchgit, cairo, freetype, fontconfig, zlib +, libjpeg, curl, libpthreadstubs, xorg, openjpeg +, libxml2, pkgconfig, cmake, lcms2 , qt4Support ? false, qt4 ? null }: -stdenv.mkDerivation rec { - name = "poppler-0.22.4"; +let + version = "0.22.3"; + sha256 = "0ca4jci8xmbdz4fhahdcck0cqms6ax55yggi2ih3clgrpqf96sli"; - src = fetchurl { - url = "${meta.homepage}${name}.tar.gz"; - sha256 = "0fz1vk0rbxvnv7ssj8l910k1rx0gjhzl5wr7hkdf4r9jwqs8yhsg"; - }; + qtcairo_patches = + let qtcairo = fetchgit { # the version for poppler-0.22 + url = "git://github.com/giddie/poppler-qt4-cairo-backend.git"; + rev = "7a12c58e5cefc2b7a5179c53b387fca8963195c0"; + sha256 = "1jg2d5y62d0bv206nijb63x426zfb2awy70505nx22d0fx1v1p9k"; + }; in + [ "${qtcairo}/0001-Cairo-backend-added-to-Qt4-wrapper.patch" + "${qtcairo}/0002-Setting-default-Qt4-backend-to-Cairo.patch" + "${qtcairo}/0003-Forcing-subpixel-rendering-in-Cairo-backend.patch" ]; - propagatedBuildInputs = - [ zlib cairo freetype fontconfig libjpeg lcms pixman curl - libpthreadstubs libXau libXdmcp openjpeg libxml2 stdenv.gcc.libc - ] - ++ stdenv.lib.optionals gtkSupport [ glib gtk ] - ++ stdenv.lib.optional qt4Support qt4; + poppler_drv = nameSuff: merge: stdenv.mkDerivation (stdenv.lib.mergeAttrsByFuncDefaultsClean [ + rec { + name = "poppler-${nameSuff}-${version}"; - nativeBuildInputs = [ pkgconfig cmake ]; + src = fetchurl { + url = "${meta.homepage}/poppler-${version}.tar.gz"; + inherit sha256; + }; - cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON"; + propagatedBuildInputs = with xorg; + [ zlib cairo freetype fontconfig libjpeg lcms2 curl + libpthreadstubs libxml2 + libXau libXdmcp libxcb libXrender libXext + openjpeg + ]; - patches = [ ./datadir_env.patch ]; + nativeBuildInputs = [ pkgconfig cmake ]; - # XXX: The Poppler/Qt4 test suite refers to non-existent PDF files - # such as `../../../test/unittestcases/UseNone.pdf'. - #doCheck = !qt4Support; - checkTarget = "test"; + cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON"; - enableParallelBuilding = true; + patches = [ ./datadir_env.patch ]; - meta = { - homepage = http://poppler.freedesktop.org/; - description = "Poppler, a PDF rendering library"; + # XXX: The Poppler/Qt4 test suite refers to non-existent PDF files + # such as `../../../test/unittestcases/UseNone.pdf'. + #doCheck = !qt4Support; + checkTarget = "test"; - longDescription = '' - Poppler is a PDF rendering library based on the xpdf-3.0 code base. - ''; + enableParallelBuilding = true; - platforms = if qt4Support - then qt4.meta.platforms - else stdenv.lib.platforms.all; + meta = { + homepage = http://poppler.freedesktop.org/; + description = "A PDF rendering library"; - license = "GPLv2"; + longDescription = '' + Poppler is a PDF rendering library based on the xpdf-3.0 code base. + ''; + + license = "GPLv2"; + }; + } merge ]); # poppler_drv + +in rec { + /* We always use cairo in poppler, so we always depend on glib, + so we always build the glib wrapper (~350kB). + We also always build the cpp wrapper (<100kB). + ToDo: around half the size could be saved by splitting out headers and tools (1.5 + 0.5 MB). + */ + + poppler_glib = poppler_drv "glib" { }; + + poppler_qt4 = poppler_drv "qt4" { + propagatedBuildInputs = [ qt4 poppler_glib ]; + patches = qtcairo_patches; + postConfigure = "cd qt4"; }; } 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 60d59030c1f3..5f66ad656940 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -20,7 +20,7 @@ let v = "4.8.4"; in # * move some plugins (e.g., SQL plugins) to dedicated derivations to avoid # false build-time dependencies -stdenv.mkDerivation rec { +stdenv.mkDerivation ( rec { name = "qt-${v}"; src = fetchurl { @@ -147,3 +147,13 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } + # ToDo: this attribute is optional *only* to prevent rebuild on hydra + // stdenv.lib.optionalAttrs developerBuild { + # fix underspecified dependency in a generated makefile + postConfigure = '' + substituteInPlace tools/designer/src/lib/Makefile --replace \ + "moc_qtgradientviewdialog.cpp:" "moc_qtgradientviewdialog.cpp: .uic/release-shared/ui_qtgradientview.h" + ''; + } +) + diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 9e00b0d8bcf5..8854a41210b6 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -1,23 +1,21 @@ { stdenv, fetchurl, libffi, expat, pkgconfig, libxslt, docbook_xsl, doxygen }: +let version = "1.0.5"; in + stdenv.mkDerivation rec { - name = "wayland-1.0.5"; + name = "wayland-${version}"; src = fetchurl { url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "130n7v5i7rfsrli2n8vdzfychlgd8v7by7sfgp8vfqdlss5km34w"; }; buildInputs = [ pkgconfig libffi expat libxslt docbook_xsl doxygen ]; meta = { - description = "The reference implementation of the Wayland protocol"; - - homepage = http://wayland.freedesktop.org; - - license = stdenv.lib.licenses.bsd3; - + description = "Reference implementation of the wayland protocol"; + homepage = http://wayland.freedesktop.org/; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix index 109077269544..e11de87415d0 100644 --- a/pkgs/development/libraries/wxGTK-2.8/default.nix +++ b/pkgs/development/libraries/wxGTK-2.8/default.nix @@ -7,12 +7,13 @@ assert withMesa -> mesa != null; with stdenv.lib; -stdenv.mkDerivation { - name = "wxGTK-2.8.12"; +stdenv.mkDerivation rec { + version = "2.8.12.1"; + name = "wxGTK-${version}"; src = fetchurl { - url = mirror://sourceforge/wxwindows/wxGTK-2.8.12.tar.gz; - sha256 = "1gjs9vfga60mk4j4ngiwsk9h6c7j22pw26m3asxr1jwvqbr8kkqk"; + url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2"; + sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz"; }; buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ] @@ -29,11 +30,12 @@ stdenv.mkDerivation { "--enable-mediactrl" ] ++ optional withMesa "--with-opengl"; - # This variable is used by configure to find some dependencies. + # These variables are used by configure to find some dependencies. SEARCH_INCLUDE = "${libXinerama}/include ${libSM}/include ${libXxf86vm}/include"; - - SEARCH_LIB = optionalString withMesa "${mesa}/lib"; + SEARCH_LIB = + "${libXinerama}/lib ${libSM}/lib ${libXxf86vm}/lib " + + optionalString withMesa "${mesa}/lib "; # Work around a bug in configure. NIX_CFLAGS_COMPILE = "-DHAVE_X11_XLIB_H=1"; diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix index 0ca8b6eb0714..b2a400a61891 100644 --- a/pkgs/development/tools/misc/intltool/default.nix +++ b/pkgs/development/tools/misc/intltool/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, perlXMLParser}: +{ stdenv, fetchurl, perl, perlXMLParser, gettext }: let s = # Generated upstream information rec { @@ -12,12 +12,15 @@ let propagatedBuildInputs = [perl perlXMLParser]; buildInputs = []; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit (s) name version; src = fetchurl { inherit (s) url sha256; }; - inherit propagatedBuildInputs buildInputs; + inherit buildInputs; + + # not needed by intltool itself but (probably) needed for its usage + propagatedBuildInputs = propagatedBuildInputs ++ [ gettext ]; meta = { description = "Translation helper tool"; diff --git a/pkgs/development/tools/misc/intltool/default.upstream b/pkgs/development/tools/misc/intltool/default.upstream index 4a2965b036af..323bf21f45a1 100644 --- a/pkgs/development/tools/misc/intltool/default.upstream +++ b/pkgs/development/tools/misc/intltool/default.upstream @@ -1,2 +1,2 @@ -attribute_name intltool_standalone +attribute_name intltool url https://launchpad.net/intltool/+download diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index b8043525719a..8aaf1f0865c4 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -10,8 +10,8 @@ in rec { src = fetchsvn { url = svn://svn.tartarus.org/sgt/puzzles; - rev = "9689"; - sha256 = "33285a971fee67324f8867de22582931135d8b8ee4cc2c41c46c3ba81eb99cb7"; + rev = "9773"; + sha256 = "1m0mmxbcj0zi44dlmhk4h30d9hdy8g9f59r7k7906pgnnyf49611"; } + "/"; inherit buildInputs; @@ -27,7 +27,7 @@ rec { setVars = a.noDepEntry '' export NIX_LDFLAGS="$NIX_LDFLAGS -lX11" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=variadic-macros" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error" ''; /* doConfigure should be removed if not needed */ diff --git a/pkgs/lib/misc.nix b/pkgs/lib/misc.nix index 0f4c0d0de953..19e5081009de 100644 --- a/pkgs/lib/misc.nix +++ b/pkgs/lib/misc.nix @@ -315,6 +315,8 @@ rec { ) ]; mergeAttrsByFuncDefaults = foldl mergeAttrByFunc { inherit mergeAttrBy; }; + mergeAttrsByFuncDefaultsClean = list: removeAttrs (mergeAttrsByFuncDefaults list) ["mergeAttrBy"]; + # merge attrs based on version key into mkDerivation args, see mergeAttrBy to learn about smart merge defaults # # This function is best explained by an example: @@ -356,7 +358,8 @@ rec { # 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) [ "nativeBuildInputs" "buildInputs" "propagatedBuildInputs" "configureFlags" "prePhases" "postAll" ]) + listToAttrs (map (n : nameValuePair n lib.concat) + [ "nativeBuildInputs" "buildInputs" "propagatedBuildInputs" "configureFlags" "prePhases" "postAll" "patches" ]) // 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/lib/strings.nix b/pkgs/lib/strings.nix index 6c4adfaa1a71..ed668e2b9270 100644 --- a/pkgs/lib/strings.nix +++ b/pkgs/lib/strings.nix @@ -109,6 +109,13 @@ rec { stringAsChars subst s; + # Case conversion utilities + lowerChars = stringToCharacters "abcdefghijklmnopqrstuvwxyz"; + upperChars = stringToCharacters "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + toLower = replaceChars upperChars lowerChars; + toUpper = replaceChars lowerChars upperChars; + + # Compares strings not requiring context equality # Obviously, a workaround but works on all Nix versions eqStrings = a: b: (a+(substring 0 0 b)) == ((substring 0 0 a)+b); diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 6cc13aa3013a..ad25b4180b5b 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { }; buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb1 ] - ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus acl ] ; + ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus.libs acl ] ; propagatedBuildInputs = [ openssl ]; diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 11402ca740f0..b6013b5eb4d5 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, xlibs, flex, bison, mesa, alsaLib , ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge -, libxml2, libxslt, openssl, gnutls, cups +, libxml2, libxslt, openssl, gnutls, cups, libdrm }: assert stdenv.isLinux; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # them to the RPATH so that the user doesn't have to set them in # LD_LIBRARY_PATH. NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [ - freetype fontconfig stdenv.gcc.gcc mesa mesa.libdrm + freetype fontconfig stdenv.gcc.gcc mesa libdrm xlibs.libXinerama xlibs.libXrender xlibs.libXrandr xlibs.libXcursor xlibs.libXcomposite libpng libjpeg openssl gnutls cups diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index ac171b2ff814..cf2c40f785e0 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, libjpeg, libpng, libtiff, zlib, pkgconfig, fontconfig, openssl, lcms, freetype +{ stdenv, fetchurl, libjpeg, libpng, libtiff, zlib, pkgconfig, fontconfig, openssl +, lcms2, freetype, libpaper, jbig2dec, expat , x11Support, x11 ? null , cupsSupport ? false, cups ? null , gnuFork ? true @@ -8,7 +9,7 @@ assert x11Support -> x11 != null; assert cupsSupport -> cups != null; let - meta = { + meta_common = { homepage = "http://www.gnu.org/software/ghostscript/"; description = "GNU Ghostscript, a PostScript interpreter"; @@ -34,25 +35,28 @@ let sha256 = "0zqa6ggbkdqiszsywgrra4ij0sddlmrfa50bx2mh568qid4ga0a2"; }; - inherit meta; + meta = meta_common; patches = [ ./purity.patch ]; }; - mainlineSrc = { - name = "ghostscript-9.05"; + mainlineSrc = rec { + name = "ghostscript-9.06"; src = fetchurl { - url = "http://downloads.ghostscript.com/public/ghostscript-9.05.tar.bz2"; - sha256 = "1b6fi76x6pn9dmr9k9lh8kimn968dmh91k824fmm59d5ycm22h8g"; + url = "http://downloads.ghostscript.com/public/${name}.tar.bz2"; + sha256 = "014f10rxn4ihvcr1frby4szd1jvkrwvmdhnbivpp55c9fssx3b05"; }; - meta = meta // { + meta = meta_common // { homepage = "http://www.ghostscript.com/"; description = "GPL Ghostscript, a PostScript interpreter"; }; preConfigure = '' - rm -R libpng jpeg lcms tiff freetype + rm -R libpng jpeg lcms{,2} tiff freetype jbig2dec expat jasper openjpeg + + substituteInPlace base/unix-aux.mak --replace "INCLUDE=/usr/include" "INCLUDE=/no-such-path" + sed "s@if ( test -f \$(INCLUDE)[^ ]* )@if ( true )@" -i base/unix-aux.mak ''; - patches = [ ./purity-9.05.patch ]; + patches = []; }; variant = if gnuFork then gnuForkSrc else mainlineSrc; @@ -64,8 +68,8 @@ stdenv.mkDerivation rec { fonts = [ (fetchurl { - url = "mirror://gnu/ghostscript/gnu-gs-fonts-std-6.0.tar.gz"; - sha256 = "1lxr1y52r26qjif8kdqkfhsb5llakdcx3f5b9ppdyn59bb83ivsc"; + url = "mirror://sourceforge/gs-fonts/ghostscript-fonts-std-8.11.tar.gz"; + sha256 = "00f4l10xd826kak51wsmaz69szzm2wp8a41jasr4jblz25bg7dhf"; }) (fetchurl { url = "mirror://gnu/ghostscript/gnu-gs-fonts-other-6.0.tar.gz"; @@ -74,9 +78,13 @@ stdenv.mkDerivation rec { # ... add other fonts here ]; - buildInputs = [libjpeg libpng libtiff zlib pkgconfig fontconfig openssl lcms] - ++ stdenv.lib.optionals x11Support [x11 freetype] - ++ stdenv.lib.optional cupsSupport cups; + buildInputs = [ + libjpeg libpng libtiff zlib pkgconfig fontconfig openssl lcms2 + libpaper jbig2dec expat + ] ++ stdenv.lib.optionals x11Support [x11 freetype] + ++ stdenv.lib.optional cupsSupport cups + # [] # maybe sometimes jpeg2000 support + ; CFLAGS = "-fPIC"; NIX_LDFLAGS = @@ -92,7 +100,7 @@ stdenv.mkDerivation rec { makeFlagsArray=(CUPSSERVERBIN=$out/lib/cups CUPSSERVERROOT=$out/etc/cups CUPSDATA=$out/share/cups) '' + stdenv.lib.optionalString (variant ? preConfigure) variant.preConfigure; - configureFlags = + configureFlags = [ "--with-system-libtiff" ] ++ (if x11Support then [ "--with-x" ] else [ "--without-x" ]) ++ (if cupsSupport then [ "--enable-cups" "--with-install-cups" ] else [ "--disable-cups" ]); @@ -100,6 +108,7 @@ stdenv.mkDerivation rec { installTargets="install soinstall"; + # ToDo: web says the fonts should be already included postInstall = '' for i in $fonts; do (cd $out/share/ghostscript && tar xvfz $i) diff --git a/pkgs/misc/ghostscript/purity-9.05.patch b/pkgs/misc/ghostscript/purity-9.05.patch deleted file mode 100644 index cae9df7110ba..000000000000 --- a/pkgs/misc/ghostscript/purity-9.05.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/base/unix-aux.mak b/base/unix-aux.mak -index 18745bc..0a67942 100644 ---- a/base/unix-aux.mak -+++ b/base/unix-aux.mak -@@ -111,15 +111,15 @@ $(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(MAKEDIRS) - # The "else true;" is required because Ultrix's implementation of sh -e - # terminates execution of a command if any error occurs, even if the command - # traps the error with ||. --INCLUDE=/usr/include -+INCLUDE=/no-such-path - $(gconfig__h): $(UNIX_AUX_MAK) $(ECHOGS_XE) - $(ECHOGS_XE) -w $(gconfig__h) -x 2f2a -s This file was generated automatically by unix-aux.mak. -s -x 2a2f -- if ( test -f $(INCLUDE)/dirent.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_DIRENT_H; else true; fi -- if ( test -f $(INCLUDE)/ndir.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_NDIR_H; else true; fi -- if ( test -f $(INCLUDE)/sys/dir.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_DIR_H; else true; fi -- if ( test -f $(INCLUDE)/sys/ndir.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_NDIR_H; else true; fi -- if ( test -f $(INCLUDE)/sys/time.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 ifndef HAVE_SYS_TIME_H ; \ -+ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_DIRENT_H; else true; fi -+ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_NDIR_H; else true; fi -+ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_DIR_H; else true; fi -+ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_NDIR_H; else true; fi -+ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 ifndef HAVE_SYS_TIME_H ; \ - $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_TIME_H ; \ - $(ECHOGS_XE) -a $(gconfig__h) -x 23 endif; else true; fi -- if ( test -f $(INCLUDE)/sys/times.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_TIMES_H; else true; fi -+ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_TIMES_H; else true; fi - if ( test -f $(JSRCDIR)/jmemsys.h); then true; else $(ECHOGS_XE) -a $(gconfig__h) -x 23 define DONT_HAVE_JMEMSYS_H; fi diff --git a/pkgs/misc/themes/gnome-themes-standard/default.nix b/pkgs/misc/themes/gnome-themes-standard/default.nix new file mode 100644 index 000000000000..f52b94138a48 --- /dev/null +++ b/pkgs/misc/themes/gnome-themes-standard/default.nix @@ -0,0 +1,15 @@ +{ stdenv, fetchurl, intltool, gtk3, librsvg, pkgconfig, pango, atk, gtk2, gdk_pixbuf }: +stdenv.mkDerivation { + name = "gnome-themes-standard"; + src = fetchurl { + url = "http://ftp.gnome.org/pub/GNOME/sources/gnome-themes-standard/3.7/gnome-themes-standard-3.7.92.tar.xz"; + sha256 = "0a1ed83c07f57b5b45b8f3817ca0ca14feecb56de505243c086fb306c88da8de"; + }; + + buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf ]; + + preConfigure = '' + cat ${gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache ${librsvg}/lib/gdk-pixbuf/loaders.cache > loaders.cache + export GDK_PIXBUF_MODULE_FILE=`readlink -e loaders.cache` + ''; +} \ No newline at end of file diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix index eeaeacd46601..2f93769d2801 100644 --- a/pkgs/os-specific/linux/qemu-kvm/default.nix +++ b/pkgs/os-specific/linux/qemu-kvm/default.nix @@ -21,7 +21,10 @@ stdenv.mkDerivation rec { patches = [ ./fix-librt-check.patch ./fix-usb-passthrough.patch ]; - postPatch = "patchShebangs .;" + postPatch = '' + patchShebangs . + sed '/qtest_add_func.*check_time/d' -i tests/rtc-test.c + '' # disable tests that meddle with system time, they seem to work bad, maybe due to newer glib + stdenv.lib.optionalString spiceSupport '' for i in configure spice-qemu-char.c ui/spice-input.c ui/spice-core.c ui/qemu-spice.h; do substituteInPlace $i --replace '#include ' '#include ' diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 2482f808cac8..8c681f893edd 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -3,10 +3,9 @@ , glib, kbd, libxslt, coreutils, libgcrypt, sysvtools, docbook_xsl }: -assert stdenv.gcc.libc or null != null; - stdenv.mkDerivation rec { - name = "systemd-203"; + version = "203"; + name = "systemd-${version}"; src = fetchurl { url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz"; @@ -25,8 +24,8 @@ stdenv.mkDerivation rec { ./0009-Start-ctrl-alt-del.target-irreversibly.patch ] ++ stdenv.lib.optional stdenv.isArm ./libc-bug-accept4-arm.patch; - buildInputs = - [ pkgconfig intltool gperf libcap dbus kmod xz pam acl + buildInputs = assert stdenv.gcc.libc or null != null; # assertion here, so it doesn't trigger on passthru.headers + [ pkgconfig intltool gperf libcap dbus.libs kmod xz pam acl /* cryptsetup */ libuuid m4 glib libxslt libgcrypt docbook_xsl ]; @@ -125,6 +124,19 @@ stdenv.mkDerivation rec { # runtime; otherwise we can't and we need to reboot. passthru.interfaceVersion = 2; + passthru.headers = stdenv.mkDerivation { + name = "systemd-headers-${version}"; + inherit src; + + phases = [ "unpackPhase" "installPhase" ]; + + # some are needed by dbus.libs, which is needed for systemd :-) + installPhase = '' + mkdir -p "$out/include/systemd" + mv src/systemd/*.h "$out/include/systemd" + ''; + }; + meta = { homepage = "http://www.freedesktop.org/wiki/Software/systemd"; description = "A system and service manager for Linux"; diff --git a/pkgs/os-specific/linux/systemd/fix-tests-1.patch b/pkgs/os-specific/linux/systemd/fix-tests-1.patch new file mode 100644 index 000000000000..14bb0fa27081 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/fix-tests-1.patch @@ -0,0 +1,68 @@ +Signed-off-by: Ramkumar Ramachandra +--- + Ramkumar Ramachandra wrote: + > $ ./test-id128 + > random: a08ea8ed34594d4bbd953dd182ec86f9 + > Assertion 'sd_id128_get_machine(&id) == 0' failed at + > src/test/test-id128.c:41, function main(). Aborting. + > [1] 8017 abort (core dumped) ./test-id128 + + Okay, this test fails because I don't have a /etc/machine-id -- I + thought systemd is supposed to create it? However, from the logic in + src/core/machine-id-setup.c, it looks like although open() is called + with O_CREAT on /etc/machine-id, systemd barfs if the file isn't + present. How about changing this? + + src/core/machine-id-setup.c | 12 +++++------- + src/test/test-id128.c | 6 ++++-- + 2 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c +index 7f4c23b..3f21d58 100644 +--- a/src/core/machine-id-setup.c ++++ b/src/core/machine-id-setup.c +@@ -168,12 +168,8 @@ int machine_id_setup(void) { + writable = true; + else { + fd = open("/etc/machine-id", O_RDONLY|O_CLOEXEC|O_NOCTTY); +- if (fd < 0) { +- umask(m); +- log_error("Cannot open /etc/machine-id: %m"); +- return -errno; +- } +- ++ if (fd < 0) ++ goto generate; + writable = false; + } + +@@ -192,7 +188,9 @@ int machine_id_setup(void) { + } + } + +- /* Hmm, so, the id currently stored is not useful, then let's ++generate: ++ /* Hmm, so, either /etc/machine-id doesn't exist, the id ++ * currently stored is not useful, then let's + * generate one */ + + r = generate(id); +diff --git a/src/test/test-id128.c b/src/test/test-id128.c +index bfd743e..60902d0 100644 +--- a/src/test/test-id128.c ++++ b/src/test/test-id128.c +@@ -38,8 +38,10 @@ int main(int argc, char *argv[]) { + assert_se(sd_id128_from_string(t, &id2) == 0); + assert_se(sd_id128_equal(id, id2)); + +- assert_se(sd_id128_get_machine(&id) == 0); +- printf("machine: %s\n", sd_id128_to_string(id, t)); ++ if (sd_id128_get_machine(&id) < 0) ++ printf("machine: run systemd-machine-id-setup first\n"); ++ else ++ printf("machine: %s\n", sd_id128_to_string(id, t)); + + assert_se(sd_id128_get_boot(&id) == 0); + printf("boot: %s\n", sd_id128_to_string(id, t)); +-- +1.7.8.1.362.g5d6df.dirty diff --git a/pkgs/os-specific/linux/systemd/no-global-install.patch b/pkgs/os-specific/linux/systemd/no-global-install.patch new file mode 100644 index 000000000000..6567251d57a1 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/no-global-install.patch @@ -0,0 +1,26 @@ +diff --git a/Makefile.am b/Makefile.am +index 05bf582..aa16a7c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2568,11 +2568,6 @@ endif + # "adm" and "wheel". + libsystemd-journal-install-hook: + libname=libsystemd-journal.so && $(move-to-rootlibdir) +- $(MKDIR_P) $(DESTDIR)/var/log/journal +- -chown 0:0 $(DESTDIR)/var/log/journal +- -chmod 755 $(DESTDIR)/var/log/journal +- -setfacl -nm g:adm:rx,d:g:adm:rx $(DESTDIR)/var/log/journal/ +- -setfacl -nm g:wheel:rx,d:g:wheel:rx $(DESTDIR)/var/log/journal/ + + libsystemd-journal-uninstall-hook: + rm -f $(DESTDIR)$(rootlibdir)/libsystemd-journal.so* +@@ -3676,9 +3671,6 @@ if HAVE_SYSV_COMPAT + sysvinit_DATA = \ + docs/sysvinit/README + +-varlog_DATA = \ +- docs/var-log/README +- + docs/sysvinit/README: docs/sysvinit/README.in + $(SED_PROCESS) + diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index 63e4fb1ca738..4350694c13a6 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -3,11 +3,11 @@ , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }: stdenv.mkDerivation rec { - name = "xf86-input-wacom-0.19.0"; + name = "xf86-input-wacom-0.20.0"; src = fetchurl { url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2"; - sha256 = "1lkvhirjysx0d2154jrwqc2i8jrqdjrlzjv7grbnm2cg5vpg7n53"; + sha256 = "1408zjqsakcyx6v81qwh4q7m49cc6vcaad54jaw8ycw4i832jvjq"; }; buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 6cb4907aa968..eddd231faa77 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -7,6 +7,8 @@ let xorg = rec { + inherit pixman; + applewmproto = (stdenv.mkDerivation ((if overrides ? applewmproto then overrides.applewmproto else x: x) { name = "applewmproto-1.4.2"; builder = ./builder.sh; @@ -881,7 +883,7 @@ let name = "libpthread-stubs-0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libpthread-stubs-0.3.tar.bz2; + url = http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2; sha256 = "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim"; }; buildInputs = [pkgconfig ]; @@ -891,7 +893,7 @@ let name = "libxcb-1.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xcb/libxcb-1.9.tar.bz2; + url = http://xcb.freedesktop.org/dist/libxcb-1.9.tar.bz2; sha256 = "15icn78x610dvvgnji6b3pyn8nd88lz68hq0w73pcadf78mycmw8"; }; buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ]; @@ -957,16 +959,6 @@ let buildInputs = [pkgconfig libfontenc freetype xproto zlib ]; })) // {inherit libfontenc freetype xproto zlib ;}; - pixman = (stdenv.mkDerivation ((if overrides ? pixman then overrides.pixman else x: x) { - name = "pixman-0.26.2"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/individual/lib/pixman-0.26.2.tar.bz2; - sha256 = "0z34jb75wpbyj3gxn34icd8j81fk5d6s6qnwp2ncz7m8icf6afqr"; - }; - buildInputs = [pkgconfig libpng perl ]; - })) // {inherit libpng perl ;}; - printproto = (stdenv.mkDerivation ((if overrides ? printproto then overrides.printproto else x: x) { name = "printproto-1.0.5"; builder = ./builder.sh; @@ -1141,7 +1133,7 @@ let name = "xcb-proto-1.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xcb/xcb-proto-1.8.tar.bz2; + url = http://xcb.freedesktop.org/dist/xcb-proto-1.8.tar.bz2; sha256 = "1c11652h9sjynw3scm1pn5z3a6ci888pq7hij8q5n8qrl33icg93"; }; buildInputs = [pkgconfig python ]; @@ -1151,7 +1143,7 @@ let name = "xcb-util-0.3.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xcb/xcb-util-0.3.9.tar.bz2; + url = http://xcb.freedesktop.org/dist/xcb-util-0.3.9.tar.bz2; sha256 = "1i0qbhqkcdlbbsj7ifkyjsffl61whj24d3zlg5pxf3xj1af2a4f6"; }; buildInputs = [pkgconfig gperf m4 libxcb xproto ]; @@ -1161,7 +1153,7 @@ let name = "xcb-util-image-0.3.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xcb/xcb-util-image-0.3.9.tar.bz2; + url = http://xcb.freedesktop.org/dist/xcb-util-image-0.3.9.tar.bz2; sha256 = "1pr1l1nkg197gyl9d0fpwmn72jqpxjfgn9y13q4gawg1m873qnnk"; }; buildInputs = [pkgconfig gperf m4 libxcb xcbutil xproto ]; @@ -1171,7 +1163,7 @@ let name = "xcb-util-keysyms-0.3.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.9.tar.bz2; + url = http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.3.9.tar.bz2; sha256 = "0vjwk7vrcfnlhiadv445c6skfxmdrg5v4qf81y8s2s5xagqarqbv"; }; buildInputs = [pkgconfig gperf m4 libxcb xproto ]; @@ -1191,7 +1183,7 @@ let name = "xcb-util-wm-0.3.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xcb/xcb-util-wm-0.3.9.tar.bz2; + url = http://xcb.freedesktop.org/dist/xcb-util-wm-0.3.9.tar.bz2; sha256 = "0c30fj33gvwzwhyz1dhsfwni0ai16bxpvxb4l6c6s7vvj7drp3q3"; }; buildInputs = [pkgconfig gperf m4 libxcb xproto ]; @@ -1348,11 +1340,11 @@ let })) // {inherit inputproto udev xorgserver xproto ;}; xf86inputjoystick = (stdenv.mkDerivation ((if overrides ? xf86inputjoystick then overrides.xf86inputjoystick else x: x) { - name = "xf86-input-joystick-1.6.1"; + name = "xf86-input-joystick-1.6.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-input-joystick-1.6.1.tar.bz2; - sha256 = "1xgpkdmfw4ahjlva97gs9sllzw8nlpa8mxj59g28fxhak67mvv8x"; + url = mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2; + sha256 = "038mfqairyyqvz02rk7v3i070sab1wr0k6fkxvyvxdgkfbnqcfzf"; }; buildInputs = [pkgconfig inputproto kbproto xorgserver xproto ]; })) // {inherit inputproto kbproto xorgserver xproto ;}; @@ -1388,11 +1380,11 @@ let })) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;}; xf86inputvmmouse = (stdenv.mkDerivation ((if overrides ? xf86inputvmmouse then overrides.xf86inputvmmouse else x: x) { - name = "xf86-input-vmmouse-12.9.0"; + name = "xf86-input-vmmouse-13.0.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-vmmouse-12.9.0.tar.bz2; - sha256 = "1gwrna96f0p4gpjhin8yx01y5xvns2j15f7hw1jvqf7fpzv01kzv"; + url = mirror://xorg/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2; + sha256 = "0b31ap9wp7nwpnihz8m7bz3p0hhaipxxhl652nw4v380cq1vdkq4"; }; buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; })) // {inherit inputproto randrproto xorgserver xproto ;}; @@ -1401,7 +1393,7 @@ let name = "xf86-input-void-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-input-void-1.4.0.tar.bz2; + url = mirror://xorg/individual/driver/xf86-input-void-1.4.0.tar.bz2; sha256 = "01bmk324fq48wydvy1qrnxbw6qz0fjd0i80g0n4cqr1c4mjmif9a"; }; buildInputs = [pkgconfig xorgserver xproto ]; @@ -1418,31 +1410,31 @@ let })) // {inherit ;}; xf86videoark = (stdenv.mkDerivation ((if overrides ? xf86videoark then overrides.xf86videoark else x: x) { - name = "xf86-video-ark-0.7.4"; + name = "xf86-video-ark-0.7.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-video-ark-0.7.4.tar.bz2; - sha256 = "194zc35ivfh3vcxcilf9nbi88c2di8kbh84x535cljlpiajdnk5x"; + url = mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2; + sha256 = "07p5vdsj2ckxb6wh02s61akcv4qfg6s1d5ld3jn3lfaayd3f1466"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; - })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libpciaccess xextproto xorgserver xproto ]; + })) // {inherit fontsproto libpciaccess xextproto xorgserver xproto ;}; xf86videoast = (stdenv.mkDerivation ((if overrides ? xf86videoast then overrides.xf86videoast else x: x) { - name = "xf86-video-ast-0.93.10"; + name = "xf86-video-ast-0.97.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-video-ast-0.93.10.tar.bz2; - sha256 = "1q64z8qqa0ix3cymqiwk1s3sphd1fvvz30lvyxhgkgciygz6dm69"; + url = mirror://xorg/individual/driver/xf86-video-ast-0.97.0.tar.bz2; + sha256 = "0xlfk64pa0vbg74m261fw8cn4vw6jw3nxm6wys9m4j3n2rwd9z18"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoati = (stdenv.mkDerivation ((if overrides ? xf86videoati then overrides.xf86videoati else x: x) { - name = "xf86-video-ati-6.14.4"; + name = "xf86-video-ati-7.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ati-6.14.4.tar.bz2; - sha256 = "11gg6xn65vym75769hzgzpkjsyhlkrw4zw3ncngriq7vz1g47zjg"; + url = mirror://xorg/individual/driver/xf86-video-ati-7.1.0.tar.bz2; + sha256 = "1k8hwszx1zj17z0657dna8q4k7x67adc163z44jiccyb3w2l9bn8"; }; buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; })) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; @@ -1458,11 +1450,11 @@ let })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videodummy = (stdenv.mkDerivation ((if overrides ? xf86videodummy then overrides.xf86videodummy else x: x) { - name = "xf86-video-dummy-0.3.5"; + name = "xf86-video-dummy-0.3.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-video-dummy-0.3.5.tar.bz2; - sha256 = "0pyr50kqh7g84r4p0x09ay5kxax20dip9sh8h3cbd4xv8cswdbfm"; + url = mirror://xorg/individual/driver/xf86-video-dummy-0.3.6.tar.bz2; + sha256 = "16773lxa74d9v2x758bx0byrmxssplqygnjn09q3klr605j5ncs4"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; })) // {inherit fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;}; @@ -1478,41 +1470,41 @@ let })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;}; xf86videogeode = (stdenv.mkDerivation ((if overrides ? xf86videogeode then overrides.xf86videogeode else x: x) { - name = "xf86-video-geode-2.11.13"; + name = "xf86-video-geode-2.11.14"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-video-geode-2.11.13.tar.bz2; - sha256 = "09p2cjd2fb7h32k9qs4wp7qvhfn2zv454spv5mfplv7w2jis4863"; + url = mirror://xorg/individual/driver/xf86-video-geode-2.11.14.tar.bz2; + sha256 = "1k6gl1kq2fr0gj6sqrg2rypp59f8b8pr46c902m4z4rjr530nxac"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoglide = (stdenv.mkDerivation ((if overrides ? xf86videoglide then overrides.xf86videoglide else x: x) { - name = "xf86-video-glide-1.2.0"; + name = "xf86-video-glide-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-video-glide-1.2.0.tar.bz2; - sha256 = "0byapm9mnpqk3wijfnnan3d22ii5cw6dmg4xn1625iiz89j5vs1l"; + url = mirror://xorg/individual/driver/xf86-video-glide-1.2.1.tar.bz2; + sha256 = "0vp9izdy7lgx09jfwr4ra9zvrx1hg15a5v2nhx00v31ffkh2aiyp"; }; buildInputs = [pkgconfig xextproto xorgserver xproto ]; })) // {inherit xextproto xorgserver xproto ;}; xf86videoglint = (stdenv.mkDerivation ((if overrides ? xf86videoglint then overrides.xf86videoglint else x: x) { - name = "xf86-video-glint-1.2.7"; + name = "xf86-video-glint-1.2.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-video-glint-1.2.7.tar.bz2; - sha256 = "0nf36jryabpncqq4m6sfsnmzk00f7gvfmjnl8l8sfy7w6sa6iacs"; + url = mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2; + sha256 = "08a2aark2yn9irws9c78d9q44dichr03i9zbk61jgr54ncxqhzv5"; }; buildInputs = [pkgconfig libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ]; })) // {inherit libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ;}; xf86videoi128 = (stdenv.mkDerivation ((if overrides ? xf86videoi128 then overrides.xf86videoi128 else x: x) { - name = "xf86-video-i128-1.3.5"; + name = "xf86-video-i128-1.3.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-video-i128-1.3.5.tar.bz2; - sha256 = "1sik8ck410hb2885vy7rlc590hw5br8lr2fzxgmv55jyawgfpv9y"; + url = mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2; + sha256 = "171b8lbxr56w3isph947dnw7x87hc46v6m3mcxdcz44gk167x0pq"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1524,55 +1516,35 @@ let url = mirror://xorg/individual/driver/xf86-video-intel-2.20.19.tar.bz2; sha256 = "0k67vcf0aqhv9zmy1arxyjdl7fsrg90cjm0ryyhamghq67z0xcmr"; }; - buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ]; - })) // {inherit dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ;}; - - xf86videointel_2_14_901 = (stdenv.mkDerivation ((if overrides ? xf86videointel_2_14_901 then overrides.xf86videointel_2_14_901 else x: x) { - name = "xf86-video-intel-2.14.901"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-intel-2.14.901.tar.bz2; - sha256 = "1hm3zn96ahmirvx1iv87sk7fl7g8a6h1j7560gyw7y5b3l1zmg5r"; - }; - buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ]; - })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ;}; - - xf86videointel_2_17_0 = (stdenv.mkDerivation ((if overrides ? xf86videointel_2_17_0 then overrides.xf86videointel_2_17_0 else x: x) { - name = "xf86-video-intel-2.17.0"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-intel-2.17.0.tar.bz2; - sha256 = "11s3vjp0lrfmb4bv848fd5bajj77j3rf451lm0qyylnclbr5114b"; - }; - buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ]; - })) // {inherit dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ;}; + buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ]; + })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ;}; xf86videomach64 = (stdenv.mkDerivation ((if overrides ? xf86videomach64 then overrides.xf86videomach64 else x: x) { - name = "xf86-video-mach64-6.9.1"; + name = "xf86-video-mach64-6.9.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-video-mach64-6.9.1.tar.bz2; - sha256 = "0kl3kvpc2ny48z89313i9fi4cxzwb2pllvxcr9j5ly680ygx8slz"; + url = mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2; + sha256 = "0pl582vnc6hdxqhf5c0qdyanjqxb4crnhqlmxxml5a60syw0iwcp"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videomga = (stdenv.mkDerivation ((if overrides ? xf86videomga then overrides.xf86videomga else x: x) { - name = "xf86-video-mga-1.5.0"; + name = "xf86-video-mga-1.6.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-video-mga-1.5.0.tar.bz2; - sha256 = "03l3wz5kz0hmxmzqqbkgn7pf9d956jlag04rb701a0fr1mw3v66a"; + url = mirror://xorg/individual/driver/xf86-video-mga-1.6.2.tar.bz2; + sha256 = "0v6agqc9lxg8jgrksc1yksmhnv70j1vnhm09i7gg14za1qjwx29z"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videoneomagic = (stdenv.mkDerivation ((if overrides ? xf86videoneomagic then overrides.xf86videoneomagic else x: x) { - name = "xf86-video-neomagic-1.2.6"; + name = "xf86-video-neomagic-1.2.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-video-neomagic-1.2.6.tar.bz2; - sha256 = "124qci48xrk0w2jy91n7vqs7s6q397zyiqqszhmkx6ld7six57mi"; + url = mirror://xorg/individual/driver/xf86-video-neomagic-1.2.7.tar.bz2; + sha256 = "0xnbk2y5pzs1g3w2rmjc4k3nyq6kazf67bv4q3dnbywalsgfh1lz"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; @@ -1598,101 +1570,101 @@ let })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoopenchrome = (stdenv.mkDerivation ((if overrides ? xf86videoopenchrome then overrides.xf86videoopenchrome else x: x) { - name = "xf86-video-openchrome-0.2.906"; + name = "xf86-video-openchrome-0.3.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-video-openchrome-0.2.906.tar.bz2; - sha256 = "0hgzn1r7ig94xbr9dvq0bp1nxqlfp2ki8823jca3f22a2kf8wmg7"; + url = mirror://xorg/individual/driver/xf86-video-openchrome-0.3.2.tar.bz2; + sha256 = "11pm8h9qxdjxn5rwz433cbnp6v0gg62b61nl20gxvghb7rgwv70m"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ]; - })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;}; + buildInputs = [pkgconfig fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ]; + })) // {inherit fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;}; xf86videor128 = (stdenv.mkDerivation ((if overrides ? xf86videor128 then overrides.xf86videor128 else x: x) { - name = "xf86-video-r128-6.8.2"; + name = "xf86-video-r128-6.9.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-video-r128-6.8.2.tar.bz2; - sha256 = "1c84x40k9qz9dnf5qs6nnjcgz7px6mpc3rbk8mj62zhp7mf16hbv"; + url = mirror://xorg/individual/driver/xf86-video-r128-6.9.1.tar.bz2; + sha256 = "0k746kk75h3hg3wmihqlmp14s52fg0svylqay02km7misflbmqwb"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ;}; xf86videosavage = (stdenv.mkDerivation ((if overrides ? xf86videosavage then overrides.xf86videosavage else x: x) { - name = "xf86-video-savage-2.3.4"; + name = "xf86-video-savage-2.3.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-video-savage-2.3.4.tar.bz2; - sha256 = "0jdy4wv3k3ylx3lajjcbsg37z2hf6366a1jvv16sv1ln6dk6lris"; + url = mirror://xorg/individual/driver/xf86-video-savage-2.3.6.tar.bz2; + sha256 = "1mk3mpwl97clxhwzl990hj31z8qfh7fd4vs6qbl5i250ykc3x0a8"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videosiliconmotion = (stdenv.mkDerivation ((if overrides ? xf86videosiliconmotion then overrides.xf86videosiliconmotion else x: x) { - name = "xf86-video-siliconmotion-1.7.6"; + name = "xf86-video-siliconmotion-1.7.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-video-siliconmotion-1.7.6.tar.bz2; - sha256 = "01sdl6ky1vmvmfgx2d44i35rqafi0z07xdy40cvindcr2k91p7x5"; + url = mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.7.tar.bz2; + sha256 = "1an321kqvsxq0z35acwl99lc8hpdkayw0q180744ypcl8ffvbf47"; }; buildInputs = [pkgconfig fontsproto libpciaccess videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess videoproto xextproto xorgserver xproto ;}; xf86videosis = (stdenv.mkDerivation ((if overrides ? xf86videosis then overrides.xf86videosis else x: x) { - name = "xf86-video-sis-0.10.4"; + name = "xf86-video-sis-0.10.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-video-sis-0.10.4.tar.bz2; - sha256 = "03diq0l93lfsipmwkpdb2ysgbxxryl6yakpghzc3fksjxa01112f"; + url = mirror://xorg/individual/driver/xf86-video-sis-0.10.7.tar.bz2; + sha256 = "1l0w84x39gq4y9j81dny9r6rma1xkqvxpsavpkd8h7h8panbcbmy"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ;}; xf86videosuncg6 = (stdenv.mkDerivation ((if overrides ? xf86videosuncg6 then overrides.xf86videosuncg6 else x: x) { - name = "xf86-video-suncg6-1.1.1"; + name = "xf86-video-suncg6-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-video-suncg6-1.1.1.tar.bz2; - sha256 = "07w0hm63fiy5l3cpcjsl0ig8z84z9r36xm0cmnpiv3g75dy6q8fi"; + url = mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2; + sha256 = "04fgwgk02m4nimlv67rrg1wnyahgymrn6rb2cjj1l8bmzkii4glr"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ]; })) // {inherit fontsproto randrproto renderproto xorgserver xproto ;}; xf86videosunffb = (stdenv.mkDerivation ((if overrides ? xf86videosunffb then overrides.xf86videosunffb else x: x) { - name = "xf86-video-sunffb-1.2.1"; + name = "xf86-video-sunffb-1.2.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-video-sunffb-1.2.1.tar.bz2; - sha256 = "04byax4sc1fn183vyyq0q11q730k16h2by4ggjky7s36wgv7ldzx"; + url = mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2; + sha256 = "07z3ngifwg2d4jgq8pms47n5lr2yn0ai72g86xxjnb3k20n5ym7s"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ]; })) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;}; xf86videotdfx = (stdenv.mkDerivation ((if overrides ? xf86videotdfx then overrides.xf86videotdfx else x: x) { - name = "xf86-video-tdfx-1.4.4"; + name = "xf86-video-tdfx-1.4.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-video-tdfx-1.4.4.tar.bz2; - sha256 = "124gsi30rj547jjd7gvv7xykfnwlyrxw0gcacamby7pvl3g33fg0"; + url = mirror://xorg/individual/driver/xf86-video-tdfx-1.4.5.tar.bz2; + sha256 = "0nfqf1c8939s21ci1g7gacwzlr4g4nnilahgz7j2bz30zfnzpmbh"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videotga = (stdenv.mkDerivation ((if overrides ? xf86videotga then overrides.xf86videotga else x: x) { - name = "xf86-video-tga-1.2.1"; + name = "xf86-video-tga-1.2.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-video-tga-1.2.1.tar.bz2; - sha256 = "0mdqrn02zzkdnmhg4vh9djaawg6b2p82g5qbj66z8b30yr77b93h"; + url = mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2; + sha256 = "0cb161lvdgi6qnf1sfz722qn38q7kgakcvj7b45ba3i0020828r0"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; xf86videotrident = (stdenv.mkDerivation ((if overrides ? xf86videotrident then overrides.xf86videotrident else x: x) { - name = "xf86-video-trident-1.3.5"; + name = "xf86-video-trident-1.3.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-video-trident-1.3.5.tar.bz2; - sha256 = "02y5pzdp0a1c12jr8gghbrzgbyfbgq67x7kd7n4f323pmf8x1csb"; + url = mirror://xorg/individual/driver/xf86-video-trident-1.3.6.tar.bz2; + sha256 = "0141qbfsm32i0pxjyx5czpa8x8m4lvapsp4amw1qigaa0gry6n3a"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; @@ -1718,21 +1690,21 @@ let })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; xf86videovmware = (stdenv.mkDerivation ((if overrides ? xf86videovmware then overrides.xf86videovmware else x: x) { - name = "xf86-video-vmware-12.0.2"; + name = "xf86-video-vmware-13.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-video-vmware-12.0.2.tar.bz2; - sha256 = "0isiwx516gww8hfk3vy7js83yziyjym9mq2zjadyq1a8v5gqf9y8"; + url = mirror://xorg/individual/driver/xf86-video-vmware-13.0.1.tar.bz2; + sha256 = "0ggyz3yl1ly0p9c9lva5z3892vm033z49py3svd2wh92bi0xlbc0"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;}; xf86videovoodoo = (stdenv.mkDerivation ((if overrides ? xf86videovoodoo then overrides.xf86videovoodoo else x: x) { - name = "xf86-video-voodoo-1.2.4"; + name = "xf86-video-voodoo-1.2.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-video-voodoo-1.2.4.tar.bz2; - sha256 = "0ha748yz92yzn6hp2rhin3il8f4j2rs4vkgdvqkagnv1ryxkh0ph"; + url = mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2; + sha256 = "1s6p7yxmi12q4y05va53rljwyzd6ry492r1pgi7wwq6cznivhgly"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ;}; @@ -1758,11 +1730,11 @@ let })) // {inherit ;}; xfs = (stdenv.mkDerivation ((if overrides ? xfs then overrides.xfs else x: x) { - name = "xfs-1.1.2"; + name = "xfs-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xfs-1.1.2.tar.bz2; - sha256 = "17g34yq789grnic83cqj5khq0knda1w2rgabhjflsyw9wg663shd"; + url = mirror://xorg/individual/app/xfs-1.1.3.tar.bz2; + sha256 = "1dwnf5gncpnjsbh9bdrc665kfnclhzzcpwpfnprvrnq4mlr4mx3v"; }; buildInputs = [pkgconfig libXfont xproto xtrans ]; })) // {inherit libXfont xproto xtrans ;}; @@ -1848,14 +1820,14 @@ let })) // {inherit inputproto libX11 libXaw xproto libXt ;}; xkeyboardconfig = (stdenv.mkDerivation ((if overrides ? xkeyboardconfig then overrides.xkeyboardconfig else x: x) { - name = "xkeyboard-config-2.6"; + name = "xkeyboard-config-2.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xkeyboard-config-2.6.tar.bz2; - sha256 = "1nmb7ma8rqryicc5xqrn2hm5pwp5lkf7nj28bwbf63mz2r0mk892"; + url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.8.tar.bz2; + sha256 = "1bkq415qw4r3dl139mqgal9v585x7kh3km6z1lraz2j8im3ga72f"; }; - buildInputs = [pkgconfig ]; - })) // {inherit ;}; + buildInputs = [pkgconfig libX11 xproto ]; + })) // {inherit libX11 xproto ;}; xkill = (stdenv.mkDerivation ((if overrides ? xkill then overrides.xkill else x: x) { name = "xkill-1.0.3"; @@ -1888,11 +1860,11 @@ let })) // {inherit libxcb ;}; xmessage = (stdenv.mkDerivation ((if overrides ? xmessage then overrides.xmessage else x: x) { - name = "xmessage-1.0.3"; + name = "xmessage-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xmessage-1.0.3.tar.bz2; - sha256 = "0nrxidff0pcd1ampfzj91ai74j6mx613j5kqk3j0c4xdshx5v8yg"; + url = mirror://xorg/individual/app/xmessage-1.0.4.tar.bz2; + sha256 = "0s5bjlpxnmh8sxx6nfg9m0nr32r1sr3irr71wsnv76s33i34ppxw"; }; buildInputs = [pkgconfig libXaw libXt ]; })) // {inherit libXaw libXt ;}; @@ -1928,24 +1900,14 @@ let })) // {inherit ;}; xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) { - name = "xorg-server-1.12.4"; + name = "xorg-server-1.13.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.12.4.tar.bz2; - sha256 = "1xscr6rf0q15hv3hmm51xhwk0c0rx7a2swkj14ygp8vb60sprh4a"; + url = mirror://xorg/individual/xserver/xorg-server-1.13.4.tar.bz2; + sha256 = "1kwq5hqgl3qmm4nxh5iwpa0wwwzsj67fxqiiglzhyyrwgy46kjd2"; }; buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ]; })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;}; - - xorgserver_1_13_0 = (stdenv.mkDerivation ((if overrides ? xorgserver_1_13_0 then overrides.xorgserver_1_13_0 else x: x) { - name = "xorg-server-1.13.0"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.13.0.tar.bz2; - sha256 = "12pjis236ss3402cg1iy749cylajjp27m3j2jbwd8yh8075r32sl"; - }; - buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv pixman glproto ]; - })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv pixman glproto ;}; xorgsgmldoctools = (stdenv.mkDerivation ((if overrides ? xorgsgmldoctools then overrides.xorgsgmldoctools else x: x) { name = "xorg-sgml-doctools-1.11"; diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index f7f139b19c1c..c1ef747b3a84 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -1,7 +1,8 @@ -mirror://xorg/individual/lib/pixman-0.26.2.tar.bz2 -mirror://xorg/individual/xcb/xcb-util-0.3.9.tar.bz2 -mirror://xorg/individual/xcb/xcb-util-image-0.3.9.tar.bz2 -mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.9.tar.bz2 -mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.8.tar.bz2 -mirror://xorg/individual/xcb/xcb-util-wm-0.3.9.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.13.0.tar.bz2:xorgserver_1_13_0 +http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2 +http://xcb.freedesktop.org/dist/libxcb-1.9.tar.bz2 +http://xcb.freedesktop.org/dist/xcb-proto-1.8.tar.bz2 +http://xcb.freedesktop.org/dist/xcb-util-0.3.9.tar.bz2 +http://xcb.freedesktop.org/dist/xcb-util-image-0.3.9.tar.bz2 +http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.3.9.tar.bz2 +http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.8.tar.bz2 +http://xcb.freedesktop.org/dist/xcb-util-wm-0.3.9.tar.bz2 diff --git a/pkgs/servers/x11/xorg/old.list b/pkgs/servers/x11/xorg/old.list index 94fae784488e..742c656b9b76 100644 --- a/pkgs/servers/x11/xorg/old.list +++ b/pkgs/servers/x11/xorg/old.list @@ -2,9 +2,9 @@ mirror://xorg/individual/app/twm-1.0.7.tar.bz2 mirror://xorg/individual/app/xclock-1.0.6.tar.bz2 mirror://xorg/individual/app/xdm-1.1.11.tar.bz2 mirror://xorg/individual/app/xeyes-1.1.1.tar.bz2 -mirror://xorg/individual/app/xfs-1.1.2.tar.bz2 +mirror://xorg/individual/app/xfs-1.1.3.tar.bz2 mirror://xorg/individual/app/xinit-1.3.2.tar.bz2 -mirror://xorg/individual/app/xmessage-1.0.3.tar.bz2 +mirror://xorg/individual/app/xmessage-1.0.4.tar.bz2 mirror://xorg/individual/lib/libXp-1.0.1.tar.bz2 mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2 mirror://xorg/individual/proto/printproto-1.0.5.tar.bz2 diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index e5b7a9a34021..1fadab2cc3d6 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -7,6 +7,9 @@ let ''; in { + encodings = attrs: attrs // { + buildInputs = attrs.buildInputs ++ [ xorg.mkfontscale ]; + }; fontcursormisc = attrs: attrs // { buildInputs = attrs.buildInputs ++ [ xorg.mkfontscale ]; @@ -46,11 +49,6 @@ in nativeBuildInputs = [ args.python ]; }; - pixman = attrs : attrs // { - buildInputs = [ args.pkgconfig ]; - nativeBuildInputs = [ args.perl ]; - }; - libpciaccess = attrs : attrs // { patches = [ ./libpciaccess-apple.patch ]; }; @@ -132,83 +130,28 @@ in xf86inputevdev = attrs: attrs // { preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c"; - NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; - buildInputs = attrs.buildInputs ++ [xorg.kbproto xorg.libxkbfile xorg.randrproto xorg.pixman]; installFlags = "sdkdir=\${out}/include/xorg"; }; - xf86inputkeyboard = attrs: attrs // { - NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; - buildInputs = attrs.buildInputs ++ [xorg.pixman]; - }; - - xf86inputmouse = attrs: attrs // { - NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; - buildInputs = attrs.buildInputs ++ [xorg.pixman]; + xf86inputjoystick = attrs: attrs // { + installFlags = "sdkdir=\${out}/include/xorg"; }; xf86inputsynaptics = attrs: attrs // { - NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; - buildInputs = attrs.buildInputs ++ [args.mtdev xorg.pixman]; + buildInputs = attrs.buildInputs ++ [args.mtdev]; installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/include/xorg"; }; - xf86inputvoid = attrs: attrs // { - NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; - buildInputs = attrs.buildInputs ++ [xorg.pixman]; - }; - - xf86videointel = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa]; - }; - - xf86videosis = attrs: attrs // { - NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; - buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa]; - }; - - xf86videoati = attrs: attrs // { - NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; - buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa xorg.pixman]; - }; - - xf86videocirrus = attrs: attrs // { - NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; - buildInputs = attrs.buildInputs ++ [xorg.pixman]; - }; - - xf86videodummy = attrs: attrs // { - NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; - buildInputs = attrs.buildInputs ++ [xorg.pixman]; - }; - - xf86videofbdev = attrs: attrs // { - NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; - buildInputs = attrs.buildInputs ++ [xorg.pixman]; - }; - - xf86videoopenchrome = attrs: attrs // { - NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; - buildInputs = attrs.buildInputs ++ [xorg.pixman xorg.glproto args.mesa]; - }; - - xf86videonv = attrs: attrs // { - NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; - buildInputs = attrs.buildInputs ++ [xorg.pixman]; - }; - - xf86videovesa = attrs: attrs // { - NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; - buildInputs = attrs.buildInputs ++ [xorg.pixman]; - }; - - xf86videovmware = attrs: attrs // { - NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; - buildInputs = attrs.buildInputs ++ [xorg.pixman xorg.glproto args.mesa]; + xf86inputvmmouse = attrs: attrs // { + configureFlags = [ + "--sysconfdir=$(out)/etc" + "--with-xorg-conf-dir=$(out)/share/X11/xorg.conf.d" + "--with-udev-rules-dir=$(out)/lib/udev/rules.d" + ]; }; xdriinfo = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa]; + buildInputs = attrs.buildInputs ++ [args.mesa]; }; xvinfo = attrs: attrs // { @@ -219,44 +162,28 @@ in NIX_CFLAGS_COMPILE = "-DDFLT_XKB_CONFIG_ROOT=\".\""; }; - xorgserver = attrs: attrs // { - configureFlags = "--enable-xcsecurity"; # enable SECURITY extension - patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch ./xorgserver12-CVE-1940.patch]; - buildInputs = attrs.buildInputs ++ - [ args.zlib args.udev args.mesa args.dbus.libs - xorg.xf86bigfontproto xorg.glproto xorg.xf86driproto - xorg.compositeproto xorg.scrnsaverproto xorg.resourceproto - xorg.xineramaproto xorg.xf86dgaproto - xorg.dmxproto xorg.libdmx xorg.xf86vidmodeproto - xorg.recordproto xorg.libXext xorg.pixman xorg.libXfont - xorg.damageproto xorg.xcmiscproto xorg.xtrans xorg.bigreqsproto - ]; - propagatedBuildInputs = - [ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto - xorg.dri2proto xorg.kbproto - ]; - postInstall = - '' - rm -fr $out/share/X11/xkb/compiled - ln -s /var/tmp $out/share/X11/xkb/compiled - ''; + xkeyboardconfig = attrs: attrs // { + buildInputs = attrs.buildInputs ++ [args.intltool]; }; - xorgserver_1_13_0 = attrs: attrs // { - configureFlags = "--enable-xcsecurity"; # enable SECURITY extension + xorgserver = with xorg; attrs: attrs // { + configureFlags = [ + "--enable-xcsecurity" # enable SECURITY extension + "--with-default-font-path= " # there were only paths containing "${prefix}", + # and there are no fonts in this package anyway + ]; patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch]; - buildInputs = attrs.buildInputs ++ - [ args.zlib args.udev args.mesa args.dbus.libs - xorg.xf86bigfontproto xorg.glproto xorg.xf86driproto - xorg.compositeproto xorg.scrnsaverproto xorg.resourceproto - xorg.xineramaproto xorg.xf86dgaproto - xorg.dmxproto xorg.libdmx xorg.xf86vidmodeproto - xorg.recordproto xorg.libXext xorg.pixman xorg.libXfont - xorg.damageproto xorg.xcmiscproto xorg.xtrans xorg.bigreqsproto - ]; + buildInputs = attrs.buildInputs ++ [ xtrans ]; propagatedBuildInputs = - [ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto - xorg.dri2proto xorg.kbproto + [ args.zlib args.udev args.mesa args.dbus.libs + xf86bigfontproto glproto xf86driproto + compositeproto scrnsaverproto resourceproto + xf86dgaproto + dmxproto /*libdmx not used*/ xf86vidmodeproto + recordproto libXext pixman libXfont + damageproto xcmiscproto bigreqsproto + libpciaccess inputproto xextproto randrproto renderproto + dri2proto kbproto xineramaproto resourceproto scrnsaverproto videoproto ]; postInstall = '' @@ -283,6 +210,11 @@ in buildInputs = attrs.buildInputs ++ [xorg.libXrender]; }; + xcursorthemes = attrs: attrs // { + buildInputs = attrs.buildInputs ++ [xorg.xcursorgen]; + configureFlags = "--with-cursordir=$(out)/share/icons"; + }; + xinput = attrs: attrs // { buildInputs = attrs.buildInputs ++ [xorg.libXrender]; }; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 7b3616362649..79aeb7c1a3ae 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -54,13 +54,11 @@ mirror://xorg/X11R7.7/src/everything/libfontenc-1.1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/libFS-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/libICE-1.0.8.tar.bz2 mirror://xorg/X11R7.7/src/everything/libpciaccess-0.13.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libpthread-stubs-0.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/libSM-1.2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/libX11-1.5.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXau-1.0.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXaw-1.0.11.tar.bz2 -mirror://xorg/individual/xcb/libxcb-1.9.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXcomposite-0.4.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXcursor-1.1.13.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXdamage-1.1.3.tar.bz2 @@ -103,7 +101,6 @@ mirror://xorg/X11R7.7/src/everything/x11perf-1.5.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xauth-1.0.7.tar.bz2 mirror://xorg/individual/app/xbacklight-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2 -mirror://xorg/individual/xcb/xcb-proto-1.8.tar.bz2 mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/xcmsdb-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xcursorgen-1.0.5.tar.bz2 @@ -116,42 +113,42 @@ mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.7.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-input-joystick-1.6.1.tar.bz2 +mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-input-keyboard-1.6.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-input-mouse-1.7.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.6.2.tar.bz2 -mirror://xorg/individual/driver/xf86-input-vmmouse-12.9.0.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-input-void-1.4.0.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-video-ark-0.7.4.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-video-ast-0.93.10.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ati-6.14.4.tar.bz2 +mirror://xorg/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-void-1.4.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ast-0.97.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-7.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-video-dummy-0.3.5.tar.bz2 +mirror://xorg/individual/driver/xf86-video-dummy-0.3.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-fbdev-0.4.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-video-geode-2.11.13.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-video-glide-1.2.0.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-video-glint-1.2.7.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-video-i128-1.3.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-intel-2.20.10.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-video-mach64-6.9.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-video-mga-1.5.0.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-video-neomagic-1.2.6.tar.bz2 +mirror://xorg/individual/driver/xf86-video-geode-2.11.14.tar.bz2 +mirror://xorg/individual/driver/xf86-video-glide-1.2.1.tar.bz2 +mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2 +mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2 +mirror://xorg/individual/driver/xf86-video-intel-2.20.19.tar.bz2 +mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2 +mirror://xorg/individual/driver/xf86-video-mga-1.6.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-neomagic-1.2.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-video-openchrome-0.2.906.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-video-r128-6.8.2.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-video-savage-2.3.4.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-video-siliconmotion-1.7.6.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-video-sis-0.10.4.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-video-suncg6-1.1.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-video-sunffb-1.2.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-video-tdfx-1.4.4.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-video-tga-1.2.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-video-trident-1.3.5.tar.bz2 +mirror://xorg/individual/driver/xf86-video-openchrome-0.3.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-r128-6.9.1.tar.bz2 +mirror://xorg/individual/driver/xf86-video-savage-2.3.6.tar.bz2 +mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.7.tar.bz2 +mirror://xorg/individual/driver/xf86-video-sis-0.10.7.tar.bz2 +mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-tdfx-1.4.5.tar.bz2 +mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-trident-1.3.6.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-vesa-2.3.2.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-video-vmware-12.0.2.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-video-voodoo-1.2.4.tar.bz2 +mirror://xorg/individual/driver/xf86-video-vmware-13.0.1.tar.bz2 +mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xgamma-1.0.5.tar.bz2 @@ -161,13 +158,13 @@ mirror://xorg/X11R7.7/src/everything/xinput-1.6.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xkbcomp-1.2.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xkbevd-1.1.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/xkbutils-1.0.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xkeyboard-config-2.6.tar.bz2 +mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.8.tar.bz2 mirror://xorg/X11R7.7/src/everything/xkill-1.0.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xlsclients-1.1.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/xmodmap-1.0.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.12.4.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.13.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xprop-1.2.1.tar.bz2 diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index d5cea08f3df9..83c9b1577935 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -1,6 +1,6 @@ x@{builderDefsPackage , imagemagickBig, pkgconfig, python, pygtk, perl, libX11, libv4l - , qt4, lzma + , qt4, lzma, gtk2 , ...}: builderDefsPackage (a : diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix index aea282386655..b7204b957842 100644 --- a/pkgs/tools/typesetting/pdf2djvu/default.nix +++ b/pkgs/tools/typesetting/pdf2djvu/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }: stdenv.mkDerivation rec { - version = "0.7.11"; + version = "0.7.16"; name = "pdf2djvu-${version}"; src = fetchurl { url = "http://pdf2djvu.googlecode.com/files/pdf2djvu_${version}.tar.gz"; - sha256 = "00gscd7l02jyr132vlj08ks0pgmh5ja785n3fdxa795cib45rbgq"; + sha256 = "1yg4ppqxpfda89yi4c3rrq2zhar5dzyqypvqdvdd0r7is2321nnv"; }; buildInputs = [ pkgconfig djvulibre poppler fontconfig libjpeg ]; @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { description = "Creates djvu files from PDF files"; homepage = http://code.google.com/p/pdf2djvu/; license = stdenv.lib.licenses.gpl2; + inherit version; }; } diff --git a/pkgs/tools/typesetting/pdf2djvu/default.upstream b/pkgs/tools/typesetting/pdf2djvu/default.upstream new file mode 100644 index 000000000000..1bb4aebdc616 --- /dev/null +++ b/pkgs/tools/typesetting/pdf2djvu/default.upstream @@ -0,0 +1,10 @@ +url http://code.google.com/p/pdf2djvu/downloads/list +version_link '[.]tar[.][a-z0-9]+$' +process 'code[.]google[.]com//' '' +version '.*_([0-9.]+[0-9]).*' '\1' + +do_overwrite () { + ensure_hash + set_var_value version "$CURRENT_VERSION" + set_var_value sha256 "$CURRENT_HASH" +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2edc268319c3..e89bdc2c639d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1496,7 +1496,7 @@ let pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; - pythonDBus = callPackage ../development/python-modules/dbus { }; + pythonDBus = dbus_python; pythonIRClib = builderDefsPackage (import ../development/python-modules/irclib) { inherit python; @@ -1793,7 +1793,7 @@ let tigervnc = callPackage ../tools/admin/tigervnc { fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc xorg.fontbhlucidatypewriter75dpi ]; - xorgserver = xorg.xorgserver_1_13_0; + inherit (xorg) xorgserver; fltk = fltk13; }; @@ -1967,7 +1967,11 @@ let youtubeDL = callPackage ../tools/misc/youtube-dl { inherit (haskellPackages) pandoc; }; - zbar = callPackage ../tools/graphics/zbar {}; + zbar = callPackage ../tools/graphics/zbar { + pygtk = lib.overrideDerivation pygtk (x: { + gtk = gtk2; + }); + }; zdelta = callPackage ../tools/compression/zdelta { }; @@ -2809,13 +2813,13 @@ let urweb = callPackage ../development/compilers/urweb { }; - vala = vala17; + vala = vala19; vala15 = callPackage ../development/compilers/vala/15.2.nix { }; vala16 = callPackage ../development/compilers/vala/16.1.nix { }; - vala17 = callPackage ../development/compilers/vala/default.nix { }; + vala19 = callPackage ../development/compilers/vala/default.nix { }; visualcpp = callPackage ../development/compilers/visual-c++ { }; @@ -2970,6 +2974,7 @@ let pure = callPackage ../development/interpreters/pure {}; python3 = hiPrio (callPackage ../development/interpreters/python/3.3 { }); + python33 = callPackage ../development/interpreters/python/3.3 { }; python = python27; python26 = callPackage ../development/interpreters/python/2.6 { }; @@ -3663,23 +3668,16 @@ let db48 = callPackage ../development/libraries/db4/db4-4.8.nix { }; - dbus = pkgs.dbus_all.libs // { inherit (pkgs.dbus_all) libs; }; - - dbus_daemon = pkgs.dbus_all.daemon; - - dbus_tools = pkgs.dbus_all.tools; - - dbus_libs = pkgs.dbus_all.libs; - - dbus_all = callPackage ../development/libraries/dbus { - useX11 = true; - }; - - dbus_cplusplus = callPackage ../development/libraries/dbus-cplusplus { }; - - dbus_glib = callPackage ../development/libraries/dbus-glib { }; - - dbus_java = callPackage ../development/libraries/java/dbus-java { }; + dbus = let dbus_all = callPackage ../development/libraries/dbus { }; + in dbus_all.libs // dbus_all; # previously dbus.libs also contained the daemon + dbus_cplusplus = callPackage ../development/libraries/dbus-cplusplus { }; + dbus_glib = callPackage ../development/libraries/dbus-glib { }; + dbus_java = callPackage ../development/libraries/java/dbus-java { }; + dbus_python = callPackage ../development/python-modules/dbus { }; + # Should we deprecate these? Currently there are many references. + dbus_tools = dbus.tools; + dbus_libs = dbus.libs; + dbus_daemon = dbus.daemon; dclib = callPackage ../development/libraries/dclib { }; @@ -3793,8 +3791,6 @@ let gav = callPackage ../games/gav { }; - GConf3 = callPackage ../development/libraries/GConf/3.x.nix { }; - gdome2 = callPackage ../development/libraries/gdome2 { inherit (gnome) gtkdoc; }; @@ -4023,25 +4019,32 @@ let gtkmm; }; - glib = callPackage ../development/libraries/glib/2.34.x.nix { }; + glib = callPackage ../development/libraries/glib { }; glibmm = callPackage ../development/libraries/glibmm { }; glib_networking = callPackage ../development/libraries/glib-networking {}; - atk = callPackage ../development/libraries/atk/2.6.x.nix { }; + atk = callPackage ../development/libraries/atk { }; atkmm = callPackage ../development/libraries/atkmm { }; - cairo = callPackage ../development/libraries/cairo { }; + cairo = callPackage ../development/libraries/cairo { + pixman = pixman_cairo; # it's recommended to be in sync + }; + pixman_cairo = callPackage ../development/libraries/pixman { }; cairomm = callPackage ../development/libraries/cairomm { }; cairo_1_12_2 = callPackage ../development/libraries/cairo/1.12.2.nix { }; - pango = callPackage ../development/libraries/pango/1.30.x.nix { }; + pango = callPackage ../development/libraries/pango { }; pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix { }; - gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.26.x.nix { }; + pangox_compat = callPackage ../development/libraries/pangox-compat { }; - gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix { }; - gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.2.x.nix { }); + gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { }; + + gtk2 = callPackage ../development/libraries/gtk+/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 { }; @@ -4133,8 +4136,7 @@ let inteltbb = callPackage ../development/libraries/intel-tbb { }; - intltool = gnome.intltool; - intltool_standalone = callPackage ../development/tools/misc/intltool {}; + intltool = callPackage ../development/tools/misc/intltool { }; irrlicht3843 = callPackage ../development/libraries/irrlicht { }; @@ -4240,7 +4242,7 @@ let libcm = callPackage ../development/libraries/libcm { }; - libcroco = callPackage ../development/libraries/libcroco {}; + inherit (gnome3) libcroco; libctemplate = callPackage ../development/libraries/libctemplate { }; @@ -4310,12 +4312,10 @@ 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 {}; - libgweather = callPackage ../development/libraries/libgweather {}; - liblo = callPackage ../development/libraries/liblo { }; liblrdf = librdf; @@ -4410,9 +4410,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 { }; @@ -4440,9 +4438,9 @@ let libiptcdata = callPackage ../development/libraries/libiptcdata { }; - libjpeg = callPackage ../development/libraries/libjpeg { }; - + libjpeg_original = callPackage ../development/libraries/libjpeg { }; libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { }; + libjpeg = if stdenv.isDarwin then libjpeg_original else libjpeg_turbo; libjpeg62 = callPackage ../development/libraries/libjpeg/62.nix { libtool = libtool_1_5; @@ -4535,6 +4533,9 @@ let libpng = callPackage ../development/libraries/libpng { }; libpng_apng = callPackage ../development/libraries/libpng/libpng-apng.nix { }; libpng12 = callPackage ../development/libraries/libpng/12.nix { }; + libpng15 = callPackage ../development/libraries/libpng/15.nix { }; + + libpaper = callPackage ../development/libraries/libpaper { }; libproxy = callPackage ../development/libraries/libproxy { }; @@ -4542,7 +4543,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 { }; @@ -4603,7 +4606,7 @@ let libva = callPackage ../development/libraries/libva { }; - libvdpau = callPackage ../development/libraries/libvdpau { inherit (xlibs) libX11; }; + libvdpau = callPackage ../development/libraries/libvdpau { }; libvirt = callPackage ../development/libraries/libvirt { }; @@ -4641,6 +4644,8 @@ let libxdg_basedir = callPackage ../development/libraries/libxdg-basedir { }; + libxkbcommon = callPackage ../development/libraries/libxkbcommon { }; + libxklavier = callPackage ../development/libraries/libxklavier { }; libxmi = callPackage ../development/libraries/libxmi { }; @@ -4678,13 +4683,14 @@ let liquidwar = builderDefsPackage ../games/liquidwar { inherit (xlibs) xproto libX11 libXrender; - inherit gmp mesa libjpeg libpng + inherit gmp mesa libjpeg expat gettext perl SDL SDL_image SDL_mixer SDL_ttf curl sqlite libogg libvorbis ; - guile = guile_1_8; + guile = guile_1_8; + libpng = libpng15; # 0.0.13 needs libpng 1.2--1.5 }; log4cpp = callPackage ../development/libraries/log4cpp { }; @@ -4704,11 +4710,15 @@ let mesaSupported = lib.elem system lib.platforms.mesaPlatforms; + mesa_noglu = callPackage ../development/libraries/mesa { }; + mesa_glu = callPackage ../development/libraries/mesa-glu { }; + mesa = if stdenv.isDarwin then darwinX11AndOpenGL + else buildEnv { + name = "mesa-${mesa_noglu.version}"; + paths = [ mesa_glu mesa_noglu ]; + }; darwinX11AndOpenGL = callPackage ../os-specific/darwin/native-x11-and-opengl { }; - mesa = if stdenv.isDarwin then darwinX11AndOpenGL else - callPackage ../development/libraries/mesa { }; - metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec { sdfLibrary = callPackage ../development/libraries/sdf-library { aterm = aterm28; }; toolbuslib = callPackage ../development/libraries/toolbuslib { aterm = aterm28; inherit (windows) w32api; }; @@ -4901,14 +4911,14 @@ let policykit = callPackage ../development/libraries/policykit { }; - poppler = callPackage ../development/libraries/poppler { - gtkSupport = true; - qt4Support = false; - }; + poppler = let popplers = callPackage ../development/libraries/poppler { }; + in popplers // popplers.poppler_glib; + popplerQt4 = poppler.poppler_qt4; - popplerQt4 = poppler.override { - gtkSupport = false; - qt4Support = true; + poppler_0_18 = callPackage ../development/libraries/poppler/0.18.nix { + glibSupport = true; + gtk3Support = false; + qt4Support = false; }; popt = callPackage ../development/libraries/popt { }; @@ -5762,11 +5772,12 @@ let xinetd = callPackage ../servers/xinetd { }; xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix { - inherit fetchurl fetchsvn stdenv pkgconfig freetype fontconfig + inherit fetchurl fetchsvn stdenv pkgconfig intltool freetype fontconfig libxslt expat libdrm libpng zlib perl mesa xkeyboard_config dbus libuuid openssl gperf m4 autoconf libtool xmlto asciidoc udev flex bison python mtdev; automake = automake110x; + pixman = pixman_cairo; }); xorgReplacements = callPackage ../servers/x11/xorg/replacements.nix { }; @@ -6296,7 +6307,9 @@ let nettools = callPackage ../os-specific/linux/net-tools { }; - neverball = callPackage ../games/neverball { }; + neverball = callPackage ../games/neverball { + libpng = libpng15; + }; numactl = callPackage ../os-specific/linux/numactl { }; @@ -6625,7 +6638,7 @@ let gnome_user_docs = callPackage ../data/documentation/gnome-user-docs { }; - gsettings_desktop_schemas = callPackage ../data/misc/gsettings-desktop-schemas {}; + inherit (gnome3) gsettings_desktop_schemas; hicolor_icon_theme = callPackage ../data/misc/hicolor-icon-theme { }; @@ -6863,7 +6876,6 @@ let compiz = callPackage ../applications/window-managers/compiz { inherit (gnome) GConf ORBit2 metacity; boost = boost149; # https://bugs.launchpad.net/compiz/+bug/1131864 - intltool = intltool_standalone; }; coriander = callPackage ../applications/video/coriander { @@ -7111,13 +7123,7 @@ let keepassx = callPackage ../applications/misc/keepassx { }; - # FIXME: Evince and other GNOME/GTK+ apps (e.g., Viking) provide - # `share/icons/hicolor/icon-theme.cache'. Arbitrarily give this one a - # higher priority. - evince = hiPrio (callPackage ../applications/misc/evince { - inherit (gnome) gnomedocutils gnomeicontheme libgnome - libgnomeui libglade scrollkeeper; - }); + inherit (gnome3) evince; evolution_data_server = newScope (gnome) ../servers/evolution-data-server { }; @@ -7275,8 +7281,8 @@ let gmrun = callPackage ../applications/misc/gmrun {}; gnucash = callPackage ../applications/office/gnucash { - inherit (gnome) libgnomeui libgtkhtml gtkhtml libbonoboui libgnomeprint; - gconf = gnome.GConf; + inherit (gnome2) libgnomeui libgtkhtml gtkhtml libbonoboui libgnomeprint libglade libart_lgpl; + gconf = gnome2.GConf; guile = guile_1_8; slibGuile = slibGuile.override { scheme = guile_1_8; }; }; @@ -7502,7 +7508,7 @@ let jwm = callPackage ../applications/window-managers/jwm { }; k3d = callPackage ../applications/graphics/k3d { - inherit (pkgs.gnome) gtkglext; + inherit (pkgs.gnome2) gtkglext; }; keepnote = callPackage ../applications/office/keepnote { @@ -7554,6 +7560,7 @@ let freefont_ttf xorg.fontmiscmisc xorg.fontbhttf ]; }; + poppler = poppler_0_18; }; lingot = callPackage ../applications/audio/lingot { @@ -8188,6 +8195,12 @@ let weechat = callPackage ../applications/networking/irc/weechat { }; + weston = callPackage ../applications/window-managers/weston { + cairo = cairo.override { + glSupport = true; + }; + }; + wings = callPackage ../applications/graphics/wings { erlang = erlangR14B04; esdl = esdl.override { erlang = erlangR14B04; }; @@ -8673,6 +8686,11 @@ let inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils; }; + gnome3 = callPackage ../desktops/gnome-3 { + callPackage = pkgs.newScope pkgs.gnome3; + self = pkgs.gnome3; + }; + gnome = recurseIntoAttrs gnome2; kde4 = recurseIntoAttrs pkgs.kde48; @@ -8817,6 +8835,8 @@ let oxygen_gtk = callPackage ../misc/themes/gtk2/oxygen-gtk { }; + gnome_themes_standard = callPackage ../misc/themes/gnome-themes-standard { }; + xfce = xfce4_10; xfce4_10 = recurseIntoAttrs (import ../desktops/xfce { inherit pkgs newScope; }); diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 4b5bad0761d0..ad2f8e901c14 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -372,7 +372,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; }; @@ -1032,7 +1031,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; }; @@ -1933,7 +1931,6 @@ in xmessage = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xmodmap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xorgserver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xorgserver_1_13_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xpr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xprop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xrandr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 9c85cb381b6e..cde219eafe6a 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -200,6 +200,7 @@ with (import ./release-lib.nix); dbus_all = { libs = linux; + daemon = linux; tools = linux; }; From 4a4c9c239e0a9621431255fc8218916708fa5640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 29 May 2013 23:29:57 +0200 Subject: [PATCH 026/153] poppler: minor update Includes some thread safety fixes. --- pkgs/development/libraries/poppler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 263162336485..8e7109fbc76a 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -5,8 +5,8 @@ }: let - version = "0.22.3"; - sha256 = "0ca4jci8xmbdz4fhahdcck0cqms6ax55yggi2ih3clgrpqf96sli"; + version = "0.23.1"; + sha256 = "1yh9zh17adqlcx2bvcyf1dj65m1hl39mmvraf8h0k3llg38b3g1a"; qtcairo_patches = let qtcairo = fetchgit { # the version for poppler-0.22 @@ -23,7 +23,7 @@ let name = "poppler-${nameSuff}-${version}"; src = fetchurl { - url = "${meta.homepage}/poppler-${version}.tar.gz"; + url = "${meta.homepage}/poppler-${version}.tar.xz"; inherit sha256; }; From 787f8216d55ec33260a0a97d844a6fdd4bfed165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 29 May 2013 23:20:57 +0200 Subject: [PATCH 027/153] Fixing firefox reference --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 17460b294313..0148e125a71d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7189,7 +7189,7 @@ let firefoxWrapper = wrapFirefox { browser = pkgs.firefox; }; - firefoxPkgs = pkgs.firefox20Pkgs; + firefoxPkgs = pkgs.firefox21Pkgs; firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix { inherit (gnome) libIDL; From 14f36162d26d52667d3717dd6dd2bb1e9ffdb166 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 1 Jun 2013 23:36:38 +0200 Subject: [PATCH 028/153] llvm: switch back to cmake build, so now clang builds --- pkgs/development/compilers/llvm/default.nix | 31 +++++++-------------- pkgs/development/libraries/mesa/default.nix | 4 +-- 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 1e514884bb5a..59e2bdc5509a 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, groff, cmake, python, libffi, libcxx }: +{ stdenv, fetchurl, perl, groff, cmake, python, libffi }: let version = "3.2"; in @@ -10,32 +10,21 @@ stdenv.mkDerivation { sha256 = "0hv30v5l4fkgyijs56sr1pbrlzgd674pg143x7az2h37sb290l0j"; }; - preConfigure = '' - patchShebangs . - export REQUIRES_RTTI=1 - ''; - - # ToDo: polly, libc++; --enable-cxx11? - - configureFlags = [ - "--enable-shared" # saves half the size, and even more for e.g. mesa - "--disable-assertions" "--enable-optimized" - "--disable-timestamps" # embedding timestamps seems a danger to purity - "--enable-libffi" - #"--enable-experimental-targets=r600" - #"--enable-libcpp" - ] ; - patches = [ ./set_soname.patch ]; # http://llvm.org/bugs/show_bug.cgi?id=12334 patchFlags = "-p0"; - buildInputs = [ perl groff python ] - #++ [ libcxx ] - ; + preConfigure = "patchShebangs ."; + propagatedBuildInputs = [ libffi ]; + buildInputs = [ perl groff cmake python ]; # ToDo: polly, libc++; enable cxx11? + + # created binaries need to be run before installation... I coudn't find a better way + preBuild = ''export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:"`pwd`/lib''; + + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_SHARED_LIBS=ON" ]; enableParallelBuilding = true; - #ToDo: doCheck? + #doCheck = true; # tests are broken, don't know why meta = { homepage = http://llvm.org/; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index a72d5d36adae..468e27de6ab5 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -13,10 +13,10 @@ else /** Packaging design: - The basic mesa ($out) contains headers and libraries (GLU is in mesa_glu now). - This or the mesa attribute (which also contains GLU) are small (~ 2.5 MB, mostly headers) + This or the mesa attribute (which also contains GLU) are small (~ 2.2 MB, mostly headers) and are designed to be the buildInput of other packages. - DRI and EGL drivers are compiled into $drivers output, - which is bigger (~13 MB) and depends on LLVM (~80 MB). + which is bigger (~13 MB) and depends on LLVM (~40 MB). These should be searched at runtime in /run/current-system/sw/lib/* and so are kind-of impure (given by NixOS). (I suppose on non-NixOS one would create the appropriate symlinks from there.) From 2e36aee50879e5cb6546813b239ce6b4474369fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 30 May 2013 14:43:26 +0200 Subject: [PATCH 029/153] cairo: expression refactoring, build OpenGL support by default Mesa is now only a small dependency. --- pkgs/development/libraries/cairo/default.nix | 47 ++++++++------------ 1 file changed, 18 insertions(+), 29 deletions(-) diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 65f826c7ed43..a957a84c6a70 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,19 +1,13 @@ -{ postscriptSupport ? true -, pdfSupport ? true -, pngSupport ? true -, xcbSupport ? true # no longer experimental since 1.12 -, glSupport ? false +{ stdenv, fetchurl, pkgconfig, libiconvOrEmpty, libintlOrEmpty +, expat, zlib, libpng, pixman, fontconfig, freetype, xlibs , gobjectSupport ? true, glib -, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs -, expat -, zlib, libpng, pixman, libxcb ? null, xcbutil ? null, mesa ? null -, libiconvOrEmpty, libintlOrEmpty +, xcbSupport ? true # no longer experimental since 1.12 +, glSupport ? true, mesa_noglu ? null # mesa is no longer a big dependency }: -assert postscriptSupport -> zlib != null; -assert pngSupport -> libpng != null; -assert xcbSupport -> libxcb != null && xcbutil != null; -assert glSupport -> mesa != null; +assert glSupport -> mesa_noglu != null; + +with { inherit (stdenv.lib) optional optionals; }; stdenv.mkDerivation rec { name = "cairo-1.12.14"; @@ -23,25 +17,20 @@ stdenv.mkDerivation rec { sha256 = "04xcykglff58ygs0dkrmmnqljmpjwp2qgwcz8sijqkdpz7ix3l4n"; }; - buildInputs = with xlibs; - [ pkgconfig x11 fontconfig expat ] - ++ stdenv.lib.optional (!stdenv.isDarwin) libXrender - ++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ] - ++ stdenv.lib.optionals glSupport [ mesa ] - ++ libintlOrEmpty - ++ libiconvOrEmpty; + nativeBuildInputs = [ pkgconfig ] ++ libintlOrEmpty ++ libiconvOrEmpty; propagatedBuildInputs = - [ freetype pixman ] ++ - stdenv.lib.optional gobjectSupport glib ++ - stdenv.lib.optional postscriptSupport zlib ++ - stdenv.lib.optional pngSupport libpng; + with xlibs; [ xlibs.xlibs fontconfig expat freetype pixman zlib libpng ] + ++ optional (!stdenv.isDarwin) libXrender + ++ optionals xcbSupport [ libxcb xcbutil ] + ++ optional gobjectSupport glib + ++ optionals glSupport [ mesa_noglu ] + ; - configureFlags = - [ "--enable-tee" ] - ++ stdenv.lib.optional xcbSupport "--enable-xcb" - ++ stdenv.lib.optional glSupport "--enable-gl" - ++ stdenv.lib.optional pdfSupport "--enable-pdf"; + configureFlags = [ "--enable-tee" ] + ++ optional xcbSupport "--enable-xcb" + ++ optional glSupport "--enable-gl" + ; preConfigure = # On FreeBSD, `-ldl' doesn't exist. From 777799eba6ccbf34b785433da4faa88542427c6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 30 May 2013 15:11:43 +0200 Subject: [PATCH 030/153] libjpeg(_turbo): update, enable tests --- pkgs/development/libraries/libjpeg-turbo/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index eb86a1d3ff23..a4aa1cf44b41 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -1,15 +1,18 @@ { stdenv, fetchurl, nasm }: stdenv.mkDerivation rec { - name = "libjpeg-turbo-1.2.1"; + name = "libjpeg-turbo-1.3.0"; src = fetchurl { url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz"; - sha256 = "0w1pj3j7hkx6irkrxlcmz53l94s6im0wml1v36nysb50akq26cyb"; + sha256 = "0d0jwdmj3h89bxdxlwrys2mw18mqcj4rzgb5l2ndpah8zj600mr6"; }; buildInputs = [ nasm ]; + doCheck = true; + checkTarget = "test"; + meta = { homepage = http://libjpeg-turbo.virtualgl.org/; description = "A faster (using SIMD) libjpeg implementation"; From 0cc921120a456c31e63b3dd48e0d3fbce882f80c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 4 Jun 2013 11:09:23 +0400 Subject: [PATCH 031/153] SBCL update --- pkgs/development/compilers/sbcl/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 066554ddc153..1e4feff1107b 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -4,11 +4,11 @@ let s= # Generated upstream information rec { baseName="sbcl"; - version="1.1.7"; + version="1.1.8"; name="${baseName}-${version}"; - hash="1g2z1p1qk9pdz1p2fbmy3bhwqq0li5vwy0vymkkxcwrhqnw5h8n8"; - url="mirror://sourceforge/project/sbcl/sbcl/1.1.7/sbcl-1.1.7-source.tar.bz2"; - sha256="1g2z1p1qk9pdz1p2fbmy3bhwqq0li5vwy0vymkkxcwrhqnw5h8n8"; + hash="1fmcpsi2bddfpz3impm9i62y9p15r3mc4xgm1dg0k77l33859jip"; + url="mirror://sourceforge/project/sbcl/sbcl/1.1.8/sbcl-1.1.8-source.tar.bz2"; + sha256="1fmcpsi2bddfpz3impm9i62y9p15r3mc4xgm1dg0k77l33859jip"; }; buildInputs = with a; [ clisp makeWrapper From f0276491f9be94a0bd572aa16bd80fd4b01ac0e6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 4 Jun 2013 11:29:34 +0400 Subject: [PATCH 032/153] ECL update --- pkgs/development/compilers/ecl/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index 40690841965a..d2c26487c0f4 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -6,11 +6,11 @@ let s = # Generated upstream information rec { baseName="ecl"; - version="12.12.1"; + version="13.5.1"; name="${baseName}-${version}"; - hash="15y2dgj95li6mxiz9pnllj9x88km0z8gfh46kysfllkp2pl7rrsl"; - url="mirror://sourceforge/project/ecls/ecls/12.12/ecl-12.12.1.tgz"; - sha256="15y2dgj95li6mxiz9pnllj9x88km0z8gfh46kysfllkp2pl7rrsl"; + hash="18ic8w9sdl0dh3kmyc9lsrafikrd9cg1jkhhr25p9saz0v75f77r"; + url="mirror://sourceforge/project/ecls/ecls/13.5/ecl-13.5.1.tgz"; + sha256="18ic8w9sdl0dh3kmyc9lsrafikrd9cg1jkhhr25p9saz0v75f77r"; }; buildInputs = [ libffi From 22967c71f856165c6871e61872a2fb20b42e5181 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 4 Jun 2013 16:34:59 +0200 Subject: [PATCH 033/153] network-manager: update all to 0.9.8.0 This should fix compilation with newer glib versions. --- .../network-manager-applet/default.nix | 8 ++--- .../networking/network-manager/default.nix | 4 +-- .../network-manager/nixos-purity.patch | 31 ------------------- .../networking/network-manager/openvpn.nix | 4 +-- .../tools/networking/network-manager/pptp.nix | 6 ++-- 5 files changed, 12 insertions(+), 41 deletions(-) diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 1f874c70ddc8..7daf12075675 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, networkmanager, GConf , libnotify, libgnome_keyring, dbus_glib, polkit, isocodes , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas -, makeWrapper, networkmanager_openvpn }: +, makeWrapper, networkmanager_openvpn, udev }: let pn = "network-manager-applet"; major = "0.9"; - version = "${major}.6.4"; + version = "${major}.8.0"; in stdenv.mkDerivation rec { @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz"; - sha256 = "0ha16wvp2jcl96849qahaagidhiyalbjzi3nxi235y7hcnqnfmmf"; + sha256 = "141m0n4fhsv1k82jm4531f12mq29d3213lph5c9rbfkhd1rnxyqs"; }; buildInputs = [ gtk libglade networkmanager GConf libnotify libgnome_keyring dbus_glib - polkit isocodes makeWrapper + polkit isocodes makeWrapper udev ]; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index d9e73a706dbe..af35e3f71da2 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "network-manager-${version}"; - version = "0.9.6.4"; + version = "0.9.8.0"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/0.9/NetworkManager-${version}.tar.xz"; - sha256 = "1sx7h29j9h13qszcppja1p27zq2m7vdrylbcyb47n62x0lg426si"; + sha256 = "0sq9yvln0yjff1sgk483m98ca2x2sqk5vh4kmn382k9msvgbqrn3"; }; preConfigure = '' diff --git a/pkgs/tools/networking/network-manager/nixos-purity.patch b/pkgs/tools/networking/network-manager/nixos-purity.patch index 998c2f25b2b2..5736009571e7 100644 --- a/pkgs/tools/networking/network-manager/nixos-purity.patch +++ b/pkgs/tools/networking/network-manager/nixos-purity.patch @@ -1,19 +1,3 @@ -diff --git a/src/backends/NetworkManagerExherbo.c b/src/backends/NetworkManagerExherbo.c -index d027789..ef6b646 100644 ---- a/src/backends/NetworkManagerExherbo.c -+++ b/src/backends/NetworkManagerExherbo.c -@@ -41,9 +41,9 @@ void nm_backend_update_dns (void) - /* Make glibc/nscd aware of any changes to the resolv.conf file by - * restarting nscd. Only restart if already running. - */ -- if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) { -+ if (g_file_test ("@glibc@/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) { - nm_log_info (LOGD_DNS, "Clearing nscd hosts cache."); -- nm_spawn_process ("/usr/sbin/nscd -i hosts"); -+ nm_spawn_process ("@glibc@/sbin/nscd -i hosts"); - } - } - diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c index 0932139..5b5aee8 100644 --- a/src/dhcp-manager/nm-dhcp-dhclient.c @@ -44,21 +28,6 @@ index 237661f..48bc33f 100644 NULL }; const char **path = dhcpcd_paths; -diff --git a/src/dns-manager/nm-dns-bind.c b/src/dns-manager/nm-dns-bind.c -index 1a3243b..a47dccd 100644 ---- a/src/dns-manager/nm-dns-bind.c -+++ b/src/dns-manager/nm-dns-bind.c -@@ -51,9 +51,7 @@ static inline const char * - find_bind (void) - { - static const char *paths[] = { -- "/usr/local/sbin/named", -- "/usr/sbin/named", -- "/sbin/named", -+ "@bind@/sbin/named", - NULL - }; - const char **binary = paths; diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c index 8e216f4..6e00210 100644 --- a/src/dns-manager/nm-dns-dnsmasq.c diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix index 15da0236172b..9817a8cddd12 100644 --- a/pkgs/tools/networking/network-manager/openvpn.nix +++ b/pkgs/tools/networking/network-manager/openvpn.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-openvpn"; - version = "0.9.6.0"; + version = "0.9.8.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz"; - sha256 = "18w7mlgnm7y5kg3s2jfm8biymh33ggw97bz27m5mg69kg42qgf4g"; + sha256 = "1klmhcizp6fmbxjbyihsk2w0alnkyiw2a3ldgijq8s224k0z95j1"; }; buildInputs = [ openvpn networkmanager ] diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix index b71e41c8b56a..a60199aab2d0 100644 --- a/pkgs/tools/networking/network-manager/pptp.nix +++ b/pkgs/tools/networking/network-manager/pptp.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-pptp"; - version = "0.9.4.0"; + version = "0.9.8.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz"; - sha256 = "0p93in5dn8m6dp9qs2ppfmazwqlklp5hwp9pjqr7jwvjbac75dvg"; + sha256 = "1j4wczf0lv2c58pgdfxg2qsva5v0r1w99x6l1p78m56qc8a9il1l"; }; buildInputs = [ networkmanager pptp ppp ] @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { configureFlags = if withGnome then "--with-gnome --with-gtkver=2" else "--without-gnome"; + postConfigure = "sed 's/-Werror//g' -i Makefile */Makefile"; + patches = [ ( substituteAll { src = ./pptp-purity.patch; From 73a75867094d94a8cfe7d71f0fd7892eac1b5701 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 4 Jun 2013 19:12:07 +0400 Subject: [PATCH 034/153] Adding mitmproxy --- pkgs/top-level/python-packages.nix | 58 ++++++++++++++++++++++++++++-- 1 file changed, 55 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 20bbc37e4d69..59579a1a6f70 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2376,6 +2376,35 @@ pythonPackages = python.modules // rec { }; }; + mitmproxy = buildPythonPackage rec { + baseName = "mitmproxy"; + name = "${baseName}-${meta.version}"; + + src = fetchurl { + url = "${meta.homepage}/download/${name}.tar.gz"; + sha256 = "1ddqni6d4kc8ypl6yig4nc00izvbk359sz6hykb9g0lfcpfqlngj"; + }; + + buildInputs = [ + pkgs.pyopenssl pyasn1 urwid pil lxml flask protobuf netlib + ]; + + doCheck = false; + + postInstall = '' + for prog in $out/bin/*; do + wrapProgram "$prog" \ + --prefix PYTHONPATH : "$PYTHONPATH" + done + ''; + + meta = { + version = "0.9"; + description = ''Man-in-the-middle proxy''; + homepage = "http://mitmproxy.org/"; + license = pkgs.lib.licenses.mit; + }; + }; mock = buildPythonPackage (rec { name = "mock-1.0.1"; @@ -2581,6 +2610,29 @@ pythonPackages = python.modules // rec { }; }; + netlib = buildPythonPackage rec { + baseName = "netlib"; + name = "${baseName}-${meta.version}"; + + src = fetchurl { + url = "https://github.com/cortesi/netlib/archive/v${meta.version}.tar.gz"; + name = "${name}.tar.gz"; + sha256 = "1y8lx2j1jrr93mqfb06zg1x5jm9lllw744sb61ib8dagw43nnq3v"; + }; + + buildInputs = [ + pkgs.pyopenssl pyasn1 + ]; + + doCheck = false; + + meta = { + version = "0.9"; + description = ''Man-in-the-middle proxy''; + homepage = "https://github.com/cortesi/netlib"; + license = pkgs.lib.licenses.mit; + }; + }; nevow = buildPythonPackage (rec { name = "nevow-${version}"; @@ -3204,11 +3256,11 @@ pythonPackages = python.modules // rec { pyasn1 = buildPythonPackage ({ - name = "pyasn1-0.0.11a"; + name = "pyasn1-0.1.7"; src = fetchurl { - url = "mirror://sourceforge/pyasn1/pyasn1-devel/0.0.11a/pyasn1-0.0.11a.tar.gz"; - sha256 = "0b7q67ygdk48zn07pyhyg7r0b74gds50652ndpzfw4vs8l3vjg0b"; + url = "mirror://sourceforge/pyasn1/0.1.7/pyasn1-0.1.7.tar.gz"; + sha256 = "1aqy21fb564gmnkw2fbkn55c40diyx3z0ixh4savvxikqm9ivy74"; }; meta = { From 9e4bee5270adbfa498eb1bc36be58fac753aaaf7 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 4 Jun 2013 20:00:13 +0400 Subject: [PATCH 035/153] Fixing LibreOffice configure for now --- .../applications/office/libreoffice/default.nix | 17 ++++++++++++----- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index fc5f5058f97b..34a8ee25765d 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -7,7 +7,9 @@ , librsvg, gnome_vfs, gstreamer, gst_plugins_base, mesa , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , libwpg, dbus_glib, qt4, kde4, clucene_core_2, libcdr, lcms2, vigra -, libiodbc, mdds, saneBackends, mythes, libexttextcat, libvisio +, libiodbc, mdds, saneBackends, mythes, libexttextcat, libvisio, libdrm +, libXdamage, damageproto, fixesproto, libXfixes, libxcb +, libXxf86vm, xf86vidmodeproto , fontsConf , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" ] }: @@ -163,13 +165,18 @@ stdenv.mkDerivation rec { buildInputs = [ ant ArchiveZip autoconf automake bison boost cairo clucene_core_2 - CompressZlib cppunit cups curl db4 dbus_glib expat file flex fontconfig + CompressZlib cppunit cups curl damageproto + db4 dbus_glib expat file fixesproto flex fontconfig freetype GConf getopt gnome_vfs gperf gst_plugins_base gstreamer gtk - hunspell icu jdk kde4.kdelibs lcms2 libcdr libexttextcat libiodbc libjpeg + hunspell icu jdk kde4.kdelibs lcms2 libcdr libdrm + libexttextcat libiodbc libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 - libXaw libXext libXi libXinerama libxml2 libxslt libXtst mdds mesa mythes + libXaw libxcb libXdamage + libXext libXfixes libXi libXinerama + libxml2 libxslt libXtst libXxf86vm mdds mesa mythes neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler - python sablotron saneBackends tcsh unzip vigra which zip zlib + python sablotron saneBackends tcsh unzip vigra xf86vidmodeproto + which zip zlib ]; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0148e125a71d..80110853991e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7553,7 +7553,8 @@ let libreoffice = callPackage ../applications/office/libreoffice { inherit (perlPackages) ArchiveZip CompressZlib; - inherit (gnome) GConf ORBit2 gnome_vfs; + inherit (gnome2) GConf ORBit2 gnome_vfs; + gtk = gtk2; zip = zip.override { enableNLS = false; }; boost = boost149; jdk = openjdk; From 0bed8c15e3d68832f9f6380744375e7efb870d21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 4 Jun 2013 22:11:33 +0200 Subject: [PATCH 036/153] poppler: downgrade to stable, drop deps that aren't really needed --- pkgs/development/libraries/poppler/default.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 8e7109fbc76a..61303b57f1cc 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchurl, fetchgit, cairo, freetype, fontconfig, zlib -, libjpeg, curl, libpthreadstubs, xorg, openjpeg -, libxml2, pkgconfig, cmake, lcms2 +{ stdenv, fetchurl, fetchgit, pkgconfig, cmake +, zlib, curl, cairo, freetype, fontconfig, lcms2, libjpeg, openjpeg , qt4Support ? false, qt4 ? null }: let - version = "0.23.1"; - sha256 = "1yh9zh17adqlcx2bvcyf1dj65m1hl39mmvraf8h0k3llg38b3g1a"; + version = "0.22.4"; # even major numbers are stable + sha256 = "0fz1vk0rbxvnv7ssj8l910k1rx0gjhzl5wr7hkdf4r9jwqs8yhsg"; qtcairo_patches = let qtcairo = fetchgit { # the version for poppler-0.22 @@ -23,16 +22,11 @@ let name = "poppler-${nameSuff}-${version}"; src = fetchurl { - url = "${meta.homepage}/poppler-${version}.tar.xz"; + url = "${meta.homepage}/poppler-${version}.tar.gz"; inherit sha256; }; - propagatedBuildInputs = with xorg; - [ zlib cairo freetype fontconfig libjpeg lcms2 curl - libpthreadstubs libxml2 - libXau libXdmcp libxcb libXrender libXext - openjpeg - ]; + propagatedBuildInputs = [ zlib cairo freetype fontconfig libjpeg lcms2 curl openjpeg ]; nativeBuildInputs = [ pkgconfig cmake ]; From 1a1d8dfc6930b97471f5ebd4f4ade88d4f6d2f1b Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Wed, 5 Jun 2013 21:07:46 +0200 Subject: [PATCH 037/153] Python: 2.7.4 -> 2.7.5 --- pkgs/development/interpreters/python/2.7/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 7dc4708e3cf0..4110f2502dcf 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; let majorVersion = "2.7"; - version = "${majorVersion}.4"; + version = "${majorVersion}.5"; src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2"; - sha256 = "0nd3x4j2w8pi9ac3pawrzb5i3s88hw0aasr08dprdv7q81fp0pq3"; + sha256 = "0nc091f19sllibvxm6n3qw5pflcphkwwxmz43q26lqafhra7airv"; }; patches = From 619b024600e7e8861331c3f4304f28fbb24054d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 5 Jun 2013 17:26:51 +0200 Subject: [PATCH 038/153] X security updates http://www.x.org/wiki/Development/Security/Advisory-2013-05-23 Three libs not released yet and without commit activity for around two weeks, so I took the current master heads. --- pkgs/servers/x11/xorg/default.nix | 120 +++++++++--------- pkgs/servers/x11/xorg/extra.list | 3 +- .../x11/xorg/generate-expr-from-tarballs.pl | 4 +- pkgs/servers/x11/xorg/old.list | 2 +- pkgs/servers/x11/xorg/overrides.nix | 74 +++++++---- pkgs/servers/x11/xorg/tarballs-7.7.list | 36 +++--- pkgs/top-level/all-packages.nix | 2 +- 7 files changed, 131 insertions(+), 110 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 164a6e56080a..1afdb57c1275 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -510,11 +510,11 @@ let })) // {inherit xproto ;}; inputproto = (stdenv.mkDerivation ((if overrides ? inputproto then overrides.inputproto else x: x) { - name = "inputproto-2.2"; + name = "inputproto-2.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/inputproto-2.2.tar.bz2; - sha256 = "1c5wqamfsd8g5i8kya5pjfmcac8q5zq1l3vclh6p96f24nmicxfy"; + url = mirror://xorg/individual/proto/inputproto-2.3.tar.bz2; + sha256 = "0by3aa8i1gki6i904i34vlrymv5p8il05gr83sf8x7v9ys9v29kx"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; @@ -540,11 +540,11 @@ let })) // {inherit applewmproto libX11 libXext xextproto ;}; libFS = (stdenv.mkDerivation ((if overrides ? libFS then overrides.libFS else x: x) { - name = "libFS-1.0.4"; + name = "libFS-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libFS-1.0.4.tar.bz2; - sha256 = "05c3bqgn5m7j4kx8wvy0p36faq6f9jv5yq12m6033m4lflg7cwvh"; + url = mirror://xorg/individual/lib/libFS-1.0.5.tar.bz2; + sha256 = "01v1z6hy702pcxz89kqb84w9gjjrvnjqsxc2zzvswlw0vl2k1sr2"; }; buildInputs = [pkgconfig fontsproto xproto xtrans ]; })) // {inherit fontsproto xproto xtrans ;}; @@ -580,11 +580,11 @@ let })) // {inherit windowswmproto libX11 libXext xextproto ;}; libX11 = (stdenv.mkDerivation ((if overrides ? libX11 then overrides.libX11 else x: x) { - name = "libX11-1.5.0"; + name = "libX11-1.6.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libX11-1.5.0.tar.bz2; - sha256 = "11jdpl15bxwpwv0knpkh990s8jvlybng3dx477pkrz1bx7byz0n3"; + url = mirror://xorg/individual/lib/libX11-1.6.0.tar.bz2; + sha256 = "1yhrf36is2f2h28x8wjd87wmdhslmzg06jg1gwq55hiy6h9184sk"; }; buildInputs = [pkgconfig inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ]; })) // {inherit inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ;}; @@ -630,11 +630,11 @@ let })) // {inherit compositeproto libX11 libXfixes xproto ;}; libXcursor = (stdenv.mkDerivation ((if overrides ? libXcursor then overrides.libXcursor else x: x) { - name = "libXcursor-1.1.13"; + name = "libXcursor-1.1.14"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXcursor-1.1.13.tar.bz2; - sha256 = "13xd1dyb06gwdwb0bxb22fkgdlmis6wrljm2xk6fhz0v9bg2g27p"; + url = mirror://xorg/individual/lib/libXcursor-1.1.14.tar.bz2; + sha256 = "1prkdicl5y5yx32h1azh6gjfbijvjp415javv8dsakd13jrarilv"; }; buildInputs = [pkgconfig fixesproto libX11 libXfixes xproto libXrender ]; })) // {inherit fixesproto libX11 libXfixes xproto libXrender ;}; @@ -660,21 +660,21 @@ let })) // {inherit xproto ;}; libXext = (stdenv.mkDerivation ((if overrides ? libXext then overrides.libXext else x: x) { - name = "libXext-1.3.1"; + name = "libXext-1.3.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXext-1.3.1.tar.bz2; - sha256 = "0ng8clhn7srbkadxjc7ih3z3v27v9ny0aa0dqkgddgxpgrhrq8jn"; + url = mirror://xorg/individual/lib/libXext-1.3.2.tar.bz2; + sha256 = "1q1j0kjyhmy24wqr6mdkrrciffyqhmc8vn95za2w1ka6qrdhfagq"; }; buildInputs = [pkgconfig libX11 xextproto xproto ]; })) // {inherit libX11 xextproto xproto ;}; libXfixes = (stdenv.mkDerivation ((if overrides ? libXfixes then overrides.libXfixes else x: x) { - name = "libXfixes-5.0"; + name = "libXfixes-5.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXfixes-5.0.tar.bz2; - sha256 = "1qx2rmwhmca2n7rgafy0arp15k5vwhdhhh6v6mx76hlj29328yjk"; + url = mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2; + sha256 = "0rs7qgzr6dpr62db7sd91c1b47hzhzfr010qwnpcm8sg122w1gk3"; }; buildInputs = [pkgconfig fixesproto libX11 xextproto xproto ]; })) // {inherit fixesproto libX11 xextproto xproto ;}; @@ -700,21 +700,21 @@ let })) // {inherit fontconfig freetype libX11 xproto libXrender ;}; libXi = (stdenv.mkDerivation ((if overrides ? libXi then overrides.libXi else x: x) { - name = "libXi-1.6.1"; + name = "libXi-1.7.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXi-1.6.1.tar.bz2; - sha256 = "029ihw4jq8mng8rx7a3jdvq64jm1zdkqidca93zmxv4jf9yn5qzj"; + url = mirror://xorg/individual/lib/libXi-1.7.1.tar.bz2; + sha256 = "1ib6026bh4bcc2q0y04klqsvjl9pwabxnr8ybkh52g65d5mxnap9"; }; - buildInputs = [pkgconfig inputproto libX11 libXext xextproto xproto ]; - })) // {inherit inputproto libX11 libXext xextproto xproto ;}; + buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ]; + })) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;}; libXinerama = (stdenv.mkDerivation ((if overrides ? libXinerama then overrides.libXinerama else x: x) { - name = "libXinerama-1.1.2"; + name = "libXinerama-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXinerama-1.1.2.tar.bz2; - sha256 = "1b3aq1762hxzchd9ndavdjlksq93991s0g2z6spf8wl3v0pprrx4"; + url = mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2; + sha256 = "1qlqfvzw45gdzk9xirgwlp2qgj0hbsyiqj8yh8zml2bk2ygnjibs"; }; buildInputs = [pkgconfig libX11 libXext xextproto xineramaproto ]; })) // {inherit libX11 libXext xextproto xineramaproto ;}; @@ -730,11 +730,11 @@ let })) // {inherit libX11 libXext xextproto xproto libXt ;}; libXp = (stdenv.mkDerivation ((if overrides ? libXp then overrides.libXp else x: x) { - name = "libXp-1.0.1"; + name = "libXp-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXp-1.0.1.tar.bz2; - sha256 = "1lj3cjg9ygbmclxvayy5v88kkndpy9jq6y68p13dc5jn01hg5lbi"; + url = mirror://xorg/individual/lib/libXp-1.0.2.tar.bz2; + sha256 = "1dfh5w8sjz5b5fl6dl4y63ckq99snslz7bir8zq2rg8ax6syabwm"; }; buildInputs = [pkgconfig printproto libX11 libXau libXext xextproto ]; })) // {inherit printproto libX11 libXau libXext xextproto ;}; @@ -750,11 +750,11 @@ let })) // {inherit libX11 libXext xextproto xproto libXt ;}; libXrandr = (stdenv.mkDerivation ((if overrides ? libXrandr then overrides.libXrandr else x: x) { - name = "libXrandr-1.4.0"; + name = "libXrandr-1.4.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXrandr-1.4.0.tar.bz2; - sha256 = "1hzm2ndra4nf8xxzm4lzd225zj05hzbzcq464q2znah15ynd0fh3"; + url = mirror://xorg/individual/lib/libXrandr-1.4.1.tar.bz2; + sha256 = "01dr1wvyxq2y4yq4hilgglkjlvn551dmnl4l65nfm8nh1x4s056r"; }; buildInputs = [pkgconfig randrproto renderproto libX11 libXext xextproto xproto libXrender ]; })) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;}; @@ -763,28 +763,28 @@ let name = "libXrender-0.9.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXrender-0.9.7.tar.bz2; + url = mirror://xorg/individual/lib/libXrender-0.9.7.tar.bz2; sha256 = "1rmvja2gkf5v0k2n1bcghw8v98m2kfn3af0rbmsda5dwr69npd7r"; }; buildInputs = [pkgconfig renderproto libX11 xproto ]; })) // {inherit renderproto libX11 xproto ;}; libXres = (stdenv.mkDerivation ((if overrides ? libXres then overrides.libXres else x: x) { - name = "libXres-1.0.6"; + name = "libXres-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXres-1.0.6.tar.bz2; - sha256 = "1478pm70gdi6l70r4jpkyyg2am9wv6xh53z9ibwq5cg84p4n31pz"; + url = mirror://xorg/individual/lib/libXres-1.0.7.tar.bz2; + sha256 = "1rd0bzn67cpb2qkc946gch2183r4bdjfhs6cpqbipy47m9a91296"; }; buildInputs = [pkgconfig resourceproto libX11 libXext xextproto xproto ]; })) // {inherit resourceproto libX11 libXext xextproto xproto ;}; libXt = (stdenv.mkDerivation ((if overrides ? libXt then overrides.libXt else x: x) { - name = "libXt-1.1.3"; + name = "libXt-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXt-1.1.3.tar.bz2; - sha256 = "1g85gwnhs7lg5f01gfi1cpb916xc3spm1fjlv2f4xz2zzk1r7dcd"; + url = mirror://xorg/individual/lib/libXt-1.1.4.tar.bz2; + sha256 = "0myxwbx9ylam5x3ia5b5f4x8azcqdm420h9ad1r4hrgmi2lrffl4"; }; buildInputs = [pkgconfig libICE kbproto libSM libX11 xproto ]; })) // {inherit libICE kbproto libSM libX11 xproto ;}; @@ -800,11 +800,11 @@ let })) // {inherit inputproto recordproto libX11 libXext xextproto libXi ;}; libXv = (stdenv.mkDerivation ((if overrides ? libXv then overrides.libXv else x: x) { - name = "libXv-1.0.7"; + name = "libXv-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXv-1.0.7.tar.bz2; - sha256 = "044hllz013afhzywwpxz007l4zjy99bv9im065rqd30zckmllrjx"; + url = mirror://xorg/individual/lib/libXv-1.0.8.tar.bz2; + sha256 = "1mvkmypf9rsr3lr161hf9sjadlirb116jfp5lk70j29r8x9yn02g"; }; buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto ]; })) // {inherit videoproto libX11 libXext xextproto xproto ;}; @@ -813,18 +813,18 @@ let name = "libXvMC-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXvMC-1.0.7.tar.bz2; + url = mirror://xorg/individual/lib/libXvMC-1.0.7.tar.bz2; sha256 = "18yf6ysc01pqkbk9704914ghalq1sl2hfdjmwggxm8qqhpy8bw18"; }; buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto libXv ]; })) // {inherit videoproto libX11 libXext xextproto xproto libXv ;}; libXxf86dga = (stdenv.mkDerivation ((if overrides ? libXxf86dga then overrides.libXxf86dga else x: x) { - name = "libXxf86dga-1.1.3"; + name = "libXxf86dga-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXxf86dga-1.1.3.tar.bz2; - sha256 = "15291ddhyr54sribwbg8hxx2psgzm5gh0pgkw5yrf3zgvdsa67sm"; + url = mirror://xorg/individual/lib/libXxf86dga-1.1.4.tar.bz2; + sha256 = "0zn7aqj8x0951d8zb2h2andldvwkzbsc4cs7q023g6nzq6vd9v4f"; }; buildInputs = [pkgconfig libX11 libXext xextproto xf86dgaproto xproto ]; })) // {inherit libX11 libXext xextproto xf86dgaproto xproto ;}; @@ -840,21 +840,21 @@ let })) // {inherit libX11 libXext xextproto xf86miscproto xproto ;}; libXxf86vm = (stdenv.mkDerivation ((if overrides ? libXxf86vm then overrides.libXxf86vm else x: x) { - name = "libXxf86vm-1.1.2"; + name = "libXxf86vm-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXxf86vm-1.1.2.tar.bz2; - sha256 = "117w92xz39rcqcahspi48nc04cc9110x1dycpf3vbcb6p0pifr55"; + url = mirror://xorg/individual/lib/libXxf86vm-1.1.3.tar.bz2; + sha256 = "1f1pxj018nk7ybxv58jmn5y8gm2288p4q3l2dng9n1p25v1qcpns"; }; buildInputs = [pkgconfig libX11 libXext xextproto xf86vidmodeproto xproto ]; })) // {inherit libX11 libXext xextproto xf86vidmodeproto xproto ;}; libdmx = (stdenv.mkDerivation ((if overrides ? libdmx then overrides.libdmx else x: x) { - name = "libdmx-1.1.2"; + name = "libdmx-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libdmx-1.1.2.tar.bz2; - sha256 = "1fiq73sfxcbyjval118ialwrzxhzb08xsxmg69adcs47i9j0p1x7"; + url = mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2; + sha256 = "00djlxas38kbsrglcmwmxfbmxjdchlbj95pqwjvdg8jn5rns6zf9"; }; buildInputs = [pkgconfig dmxproto libX11 libXext xextproto ]; })) // {inherit dmxproto libX11 libXext xextproto ;}; @@ -890,11 +890,11 @@ let })) // {inherit ;}; libxcb = (stdenv.mkDerivation ((if overrides ? libxcb then overrides.libxcb else x: x) { - name = "libxcb-1.9"; + name = "libxcb-1.9.1"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/libxcb-1.9.tar.bz2; - sha256 = "15icn78x610dvvgnji6b3pyn8nd88lz68hq0w73pcadf78mycmw8"; + url = http://xcb.freedesktop.org/dist/libxcb-1.9.1.tar.bz2; + sha256 = "0brn7vw66widc5mw7gynwy8dln3gmzym2fqqyzk6k58bxgs5yjnl"; }; buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ]; })) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;}; @@ -1516,8 +1516,8 @@ let url = mirror://xorg/individual/driver/xf86-video-intel-2.21.8.tar.bz2; sha256 = "13yg9bcz55plnpx7k5xkbgpaj6hnlszxys94lxqa6b012l2hr1ad"; }; - buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ]; - })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ;}; + buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ]; + })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ;}; xf86videomach64 = (stdenv.mkDerivation ((if overrides ? xf86videomach64 then overrides.xf86videomach64 else x: x) { name = "xf86-video-mach64-6.9.4"; @@ -1570,11 +1570,11 @@ let })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoopenchrome = (stdenv.mkDerivation ((if overrides ? xf86videoopenchrome then overrides.xf86videoopenchrome else x: x) { - name = "xf86-video-openchrome-0.3.2"; + name = "xf86-video-openchrome-0.3.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-openchrome-0.3.2.tar.bz2; - sha256 = "11pm8h9qxdjxn5rwz433cbnp6v0gg62b61nl20gxvghb7rgwv70m"; + url = mirror://xorg/individual/driver/xf86-video-openchrome-0.3.3.tar.bz2; + sha256 = "1v8j4i1r268n4fc5gq54zg1x50j0rhw71f3lba7411mcblg2z7p4"; }; buildInputs = [pkgconfig fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ]; })) // {inherit fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;}; diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index c1ef747b3a84..2372df2701e8 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -1,8 +1,9 @@ http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2 -http://xcb.freedesktop.org/dist/libxcb-1.9.tar.bz2 +http://xcb.freedesktop.org/dist/libxcb-1.9.1.tar.bz2 http://xcb.freedesktop.org/dist/xcb-proto-1.8.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-0.3.9.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-image-0.3.9.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.3.9.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.8.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-wm-0.3.9.tar.bz2 +http://xorg.freedesktop.org/releases/individual/util/util-macros-1.17.tar.bz2 diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 7b00e5e90432..256d108c4e86 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -2,9 +2,9 @@ # Typical command to generate the list of tarballs: -# export i="mirror://xorg/X11R7.6/src/everything/"; cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' | sort > tarballs-7.6.list +# export i="mirror://xorg/X11R7.7/src/everything/"; cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' | sort > tarballs-7.7.list # manually update extra.list -# then run: cat tarballs-7.6.list extra.list old.list | perl ./generate-expr-from-tarballs.pl +# then run: cat tarballs-7.7.list extra.list old.list | perl ./generate-expr-from-tarballs.pl # tarballs-x.y.list is generated + changes for individual packages # extra.list are packages not contained in the tarballs # old.list are packages that used to be part of the tarballs diff --git a/pkgs/servers/x11/xorg/old.list b/pkgs/servers/x11/xorg/old.list index 742c656b9b76..68c88594932b 100644 --- a/pkgs/servers/x11/xorg/old.list +++ b/pkgs/servers/x11/xorg/old.list @@ -5,7 +5,7 @@ mirror://xorg/individual/app/xeyes-1.1.1.tar.bz2 mirror://xorg/individual/app/xfs-1.1.3.tar.bz2 mirror://xorg/individual/app/xinit-1.3.2.tar.bz2 mirror://xorg/individual/app/xmessage-1.0.4.tar.bz2 -mirror://xorg/individual/lib/libXp-1.0.1.tar.bz2 +mirror://xorg/individual/lib/libXp-1.0.2.tar.bz2 mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2 mirror://xorg/individual/proto/printproto-1.0.5.tar.bz2 mirror://xorg/individual/proto/xf86miscproto-0.9.3.tar.bz2 diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 8d2de0525869..cbf24c0a51a3 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -5,6 +5,18 @@ let configureFlags="$configureFlags --enable-malloc0returnsnull"; fi ''; + + gitRelease = { libName, version, rev, sha256 } : attrs : attrs // { + name = libName + "-" + version; + src = args.fetchgit { + url = git://anongit.freedesktop.org/xorg/lib/ + libName; + inherit rev sha256; + }; + buildInputs = attrs.buildInputs ++ [ xorg.utilmacros ]; + preConfigure = (attrs.preConfigure or "") + "\n./autogen.sh"; + }; + + compose = f: g: x: f (g x); in { encodings = attrs: attrs // { @@ -35,17 +47,10 @@ in }; libxcb = attrs : attrs // { - # I only remove python from the original, and add xproto. I don't know how - # to achieve that referring to attrs.buildInputs. - # I should use: builtins.unsafeDiscardStringContext - buildInputs = [args.pkgconfig args.libxslt xorg.libpthreadstubs /*xorg.python*/ - xorg.libXau xorg.xcbproto xorg.libXdmcp ] ++ [ xorg.xproto ]; nativeBuildInputs = [ args.python ]; }; xcbproto = attrs : attrs // { - # I only remove python from the original. - buildInputs = [args.pkgconfig /*xorg.python*/ ]; nativeBuildInputs = [ args.python ]; }; @@ -62,16 +67,13 @@ in ''; }; - libXrender = attrs: attrs // { - preConfigure = setMalloc0ReturnsNullCrossCompiling; - }; - libXxf86vm = attrs: attrs // { preConfigure = setMalloc0ReturnsNullCrossCompiling; }; libXrandr = attrs: attrs // { preConfigure = setMalloc0ReturnsNullCrossCompiling; + propagatedBuildInputs = [xorg.libXrender]; }; # Propagate some build inputs because of header file dependencies. @@ -95,18 +97,39 @@ in }; libXft = attrs: attrs // { - buildInputs = attrs.buildInputs ++ - [ xorg.xproto xorg.libX11 xorg.renderproto ]; propagatedBuildInputs = [ xorg.libXrender args.freetype args.fontconfig ]; preConfigure = setMalloc0ReturnsNullCrossCompiling; }; libXext = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [xorg.libXau]; - propagatedBuildInputs = [ xorg.xproto ]; + propagatedBuildInputs = [ xorg.xproto xorg.libXau ]; preConfigure = setMalloc0ReturnsNullCrossCompiling; }; + libSM = attrs: attrs + // { propagatedBuildInputs = [ xorg.libICE ]; }; + + libXi = gitRelease { + libName = "libXi"; + version = "1.7.1.91"; + rev = "661c45ca17c434dbd342a46fd3fb813852ae0ca9"; + sha256 = "01wx8fgjjfqm0sm9anj6rmz72yvjyb4y3ifjk2q4ixd7pdp63bx6"; + }; + + libXrender = compose (gitRelease { + libName = "libXrender"; + version = "0.9.7.91"; + rev = "786f78fd8df6d165ccbc81f306fd9f22b5c1551c"; + sha256 = "157ljyhkxqk2xgizrq8pmpl75szb5j89gvvhkxsi0lys1wnbrxi4"; + }) (attrs: attrs // { preConfigure = setMalloc0ReturnsNullCrossCompiling; }); + + libXvMC = compose (gitRelease { + libName = "libXvMC"; + version = "1.0.7.91"; + rev = "8c164524d229adb6141fdac8336b3823e7fe1a5d"; + sha256 = "157ljyhkxqk2xgizrq8pmpl75szb5j89gvvhkxsi0lys1wnbrxi4"; + }) (attrs: attrs // { buildInputs = attrs.buildInputs ++ [xorg.renderproto]; }); + libXpm = attrs: attrs // { patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in"; }; @@ -119,13 +142,12 @@ in ''; }; - x11perf = attrs: attrs // { - NIX_CFLAGS_COMPILE = "-I${args.freetype}/include/freetype2"; - buildInputs = attrs.buildInputs ++ [ args.freetype args.fontconfig ]; + utilmacros = attrs: attrs // { # not needed for releases, we propagate the needed tools + propagatedBuildInputs = with args; [ automake autoconf libtool ]; }; - xev = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [ xorg.libXrender ]; + x11perf = attrs: attrs // { + buildInputs = attrs.buildInputs ++ [ args.freetype args.fontconfig ]; }; xf86inputevdev = attrs: attrs // { @@ -196,8 +218,6 @@ in ''; }; - libSM = attrs: attrs - // { propagatedBuildInputs = [ xorg.libICE ]; }; lndir = attrs: attrs // { preConfigure = '' @@ -210,17 +230,13 @@ in nativeBuildInputs = [args.bison args.flex]; }; - xbacklight = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [xorg.libXrender]; - }; - xcursorthemes = attrs: attrs // { buildInputs = attrs.buildInputs ++ [xorg.xcursorgen]; configureFlags = "--with-cursordir=$(out)/share/icons"; }; xinput = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [xorg.libXrender]; + propagatedBuildInputs = [xorg.libXfixes]; }; xinit = attrs: attrs // { @@ -231,6 +247,10 @@ in ''; }; + xf86videointel = attrs: attrs // { + buildInputs = attrs.buildInputs ++ [xorg.libXfixes]; + }; + xwd = attrs: attrs // { buildInputs = attrs.buildInputs ++ [xorg.libXt]; }; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index f2ad7a4bcc54..cbdd379d6068 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -46,42 +46,42 @@ mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.4.tar.bz2 mirror://xorg/individual/proto/glproto-1.4.16.tar.bz2 mirror://xorg/X11R7.7/src/everything/iceauth-1.0.5.tar.bz2 -mirror://xorg/X11R7.7/src/everything/inputproto-2.2.tar.bz2 +mirror://xorg/individual/proto/inputproto-2.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/kbproto-1.0.6.tar.bz2 mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libdmx-1.1.2.tar.bz2 +mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/libfontenc-1.1.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libFS-1.0.4.tar.bz2 +mirror://xorg/individual/lib/libFS-1.0.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/libICE-1.0.8.tar.bz2 mirror://xorg/X11R7.7/src/everything/libpciaccess-0.13.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/libSM-1.2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libX11-1.5.0.tar.bz2 +mirror://xorg/individual/lib/libX11-1.6.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXau-1.0.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXaw-1.0.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXcomposite-0.4.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libXcursor-1.1.13.tar.bz2 +mirror://xorg/individual/lib/libXcursor-1.1.14.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXdamage-1.1.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXdmcp-1.1.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libXext-1.3.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libXfixes-5.0.tar.bz2 +mirror://xorg/individual/lib/libXext-1.3.2.tar.bz2 +mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXfont-1.4.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXft-2.3.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libXi-1.6.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libXinerama-1.1.2.tar.bz2 +mirror://xorg/individual/lib/libXi-1.7.1.tar.bz2 +mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/libxkbfile-1.0.8.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXmu-1.1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXpm-3.5.10.tar.bz2 -mirror://xorg/individual/lib/libXrandr-1.4.0.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libXrender-0.9.7.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libXres-1.0.6.tar.bz2 +mirror://xorg/individual/lib/libXrandr-1.4.1.tar.bz2 +mirror://xorg/individual/lib/libXrender-0.9.7.tar.bz2 +mirror://xorg/individual/lib/libXres-1.0.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libXt-1.1.3.tar.bz2 +mirror://xorg/individual/lib/libXt-1.1.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXtst-1.2.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libXv-1.0.7.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libXvMC-1.0.7.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libXxf86dga-1.1.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libXxf86vm-1.1.2.tar.bz2 +mirror://xorg/individual/lib/libXv-1.0.8.tar.bz2 +mirror://xorg/individual/lib/libXvMC-1.0.7.tar.bz2 +mirror://xorg/individual/lib/libXxf86dga-1.1.4.tar.bz2 +mirror://xorg/individual/lib/libXxf86vm-1.1.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/luit-1.1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/makedepend-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/mkfontdir-1.0.7.tar.bz2 @@ -135,7 +135,7 @@ mirror://xorg/individual/driver/xf86-video-mga-1.6.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2 -mirror://xorg/individual/driver/xf86-video-openchrome-0.3.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-openchrome-0.3.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-r128-6.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-savage-2.3.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.7.tar.bz2 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3401e3c57c43..e04ecaf7a058 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5794,7 +5794,7 @@ let xinetd = callPackage ../servers/xinetd { }; xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix { - inherit fetchurl fetchsvn stdenv pkgconfig intltool freetype fontconfig + inherit fetchurl fetchgit stdenv pkgconfig intltool freetype fontconfig libxslt expat libdrm libpng zlib perl mesa_drivers xkeyboard_config dbus libuuid openssl gperf m4 autoconf libtool xmlto asciidoc udev flex bison python mtdev; From a479aafb75e1287e370fa01b61314e65740ada50 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 5 Jun 2013 22:51:21 +0200 Subject: [PATCH 039/153] Revert "Fixing LibreOffice configure for now" This reverts commit 9e4bee5270adbfa498eb1bc36be58fac753aaaf7. --- .../applications/office/libreoffice/default.nix | 17 +++++------------ pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 34a8ee25765d..fc5f5058f97b 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -7,9 +7,7 @@ , librsvg, gnome_vfs, gstreamer, gst_plugins_base, mesa , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , libwpg, dbus_glib, qt4, kde4, clucene_core_2, libcdr, lcms2, vigra -, libiodbc, mdds, saneBackends, mythes, libexttextcat, libvisio, libdrm -, libXdamage, damageproto, fixesproto, libXfixes, libxcb -, libXxf86vm, xf86vidmodeproto +, libiodbc, mdds, saneBackends, mythes, libexttextcat, libvisio , fontsConf , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" ] }: @@ -165,18 +163,13 @@ stdenv.mkDerivation rec { buildInputs = [ ant ArchiveZip autoconf automake bison boost cairo clucene_core_2 - CompressZlib cppunit cups curl damageproto - db4 dbus_glib expat file fixesproto flex fontconfig + CompressZlib cppunit cups curl db4 dbus_glib expat file flex fontconfig freetype GConf getopt gnome_vfs gperf gst_plugins_base gstreamer gtk - hunspell icu jdk kde4.kdelibs lcms2 libcdr libdrm - libexttextcat libiodbc libjpeg + hunspell icu jdk kde4.kdelibs lcms2 libcdr libexttextcat libiodbc libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 - libXaw libxcb libXdamage - libXext libXfixes libXi libXinerama - libxml2 libxslt libXtst libXxf86vm mdds mesa mythes + libXaw libXext libXi libXinerama libxml2 libxslt libXtst mdds mesa mythes neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler - python sablotron saneBackends tcsh unzip vigra xf86vidmodeproto - which zip zlib + python sablotron saneBackends tcsh unzip vigra which zip zlib ]; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e04ecaf7a058..6c1737039588 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7579,8 +7579,7 @@ let libreoffice = callPackage ../applications/office/libreoffice { inherit (perlPackages) ArchiveZip CompressZlib; - inherit (gnome2) GConf ORBit2 gnome_vfs; - gtk = gtk2; + inherit (gnome) GConf ORBit2 gnome_vfs; zip = zip.override { enableNLS = false; }; boost = boost149; jdk = openjdk; From c78ba70c2f14e822b377b3e798b445a4176c681a Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 4 Jun 2013 17:06:54 +0200 Subject: [PATCH 040/153] mesa: propagate libraries - fixes libreoffice - --- pkgs/development/libraries/mesa/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 468e27de6ab5..1fca905cf55b 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -81,9 +81,10 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig python makedepend file flex bison ]; + propagatedBuildInputs = with xorg; [ libdrm libXdamage libXxf86vm ]; buildInputs = with xorg; [ autoconf automake libtool intltool expat libxml2Python udev llvm - libdrm libXxf86vm libXfixes libXdamage glproto dri2proto libX11 libXext libxcb libXt + libXfixes glproto dri2proto libX11 libXext libxcb libXt libffi wayland ] ++ stdenv.lib.optionals enableExtraFeatures [ /*libXvMC*/ libvdpau ]; From 35d3e38d543f070a546437bdbc1744b2007f4ed5 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 5 Jun 2013 22:29:10 +0200 Subject: [PATCH 041/153] add idris wrapper --- pkgs/development/compilers/idris/wrapper.nix | 10 ++++++++++ pkgs/top-level/haskell-packages.nix | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/idris/wrapper.nix diff --git a/pkgs/development/compilers/idris/wrapper.nix b/pkgs/development/compilers/idris/wrapper.nix new file mode 100644 index 000000000000..427a690234ca --- /dev/null +++ b/pkgs/development/compilers/idris/wrapper.nix @@ -0,0 +1,10 @@ +{ gmp, makeWrapper, gcc, runCommand, idris_plain}: + +runCommand "idris-wrapper" {} '' + source ${makeWrapper}/nix-support/setup-hook + mkdir -p $out/bin + ln -s ${idris_plain}/bin/idris $out/bin + wrapProgram $out/bin/idris \ + --suffix NIX_CFLAGS_COMPILE : '"-I${gmp}/include -L${gmp}/lib"' \ + --suffix PATH : ${gcc}/bin +'' diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index fff7983d7c47..0a146559db52 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2243,7 +2243,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); darcs = callPackage ../applications/version-management/darcs {}; - idris = callPackage ../development/compilers/idris {}; + idris_plain = callPackage ../development/compilers/idris {}; + + idris = callPackage ../development/compilers/idris/wrapper.nix {}; leksah = callPackage ../applications/editors/leksah { QuickCheck = self.QuickCheck2; From 7717bc1573a021cd38250297ad27540bddec22c3 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 3 Jun 2013 06:01:12 +0200 Subject: [PATCH 042/153] vaapi-intel: fix compilation --- pkgs/development/libraries/vaapi-intel/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index 192534a16e9f..f05c01bf58df 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -3,16 +3,15 @@ stdenv.mkDerivation rec { name = "libva-intel-driver-1.0.20"; - + src = fetchurl { url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2"; sha256 = "1jfl8909j3a3in6m8b5bx3dn7pzr8a1sw3sk4vzm7h3j2dkgpzhj"; }; - buildInputs = [ autoconf automake libtool mesa libva pkgconfig libdrm libX11 intelgen4asm ]; + buildInputs = [ pkgconfig libdrm libva libX11 ]; preConfigure = '' - sh autogen.sh sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure ''; From 0bcd97bb0b2d9a6d50abd1fa8b11f82cc9b7c9b8 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 26 May 2013 15:12:21 +0200 Subject: [PATCH 043/153] popplerQt4: force linking to poppler_glib to fix: ldd /nix/store/...poppler-qt4-0.22.3/lib/libpoppler-qt4.so libpoppler.so.36 => not found --- pkgs/development/libraries/poppler/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 61303b57f1cc..2807b2988560 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -65,6 +65,7 @@ in rec { poppler_qt4 = poppler_drv "qt4" { propagatedBuildInputs = [ qt4 poppler_glib ]; patches = qtcairo_patches; + NIX_LDFLAGS = "-lpoppler"; postConfigure = "cd qt4"; }; } From d465d6764ab6e11bdd01b2f8bf8bd5cb436e6870 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 6 Jun 2013 13:59:26 -0400 Subject: [PATCH 044/153] Allow imports in submodules Signed-off-by: Shea Levy --- pkgs/lib/modules.nix | 4 ++-- pkgs/lib/options.nix | 7 +------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/lib/modules.nix b/pkgs/lib/modules.nix index 286178a0fa70..74603e9c5798 100644 --- a/pkgs/lib/modules.nix +++ b/pkgs/lib/modules.nix @@ -197,9 +197,9 @@ rec { recurseInto = name: moduleMerge (addName name) (modulesOf name); - recurseForOption = name: modules: + recurseForOption = name: modules: args: moduleMerge name ( - map unifyModuleSyntax modules + moduleClosure modules args ); errorSource = modules: diff --git a/pkgs/lib/options.nix b/pkgs/lib/options.nix index 3a8cc0006ef1..d31a501cac92 100644 --- a/pkgs/lib/options.nix +++ b/pkgs/lib/options.nix @@ -82,16 +82,11 @@ rec { handleOptionSets = opt: if opt ? type && opt.type.hasOptions then let - - optionConfig = vals: args: - map (f: lib.applyIfFunction f args) - (opt.options ++ toList vals); - # Evaluate sub-modules. subModuleMerge = path: vals: lib.fix (args: let - result = recurseInto path (optionConfig vals args); + result = recurseInto path (opt.options ++ toList vals) args; name = lib.removePrefix (opt.name + ".") path; extraArgs = opt.extraArgs or {}; individualExtraArgs = opt.individualExtraArgs or {}; From 3fe8b9451afaf743654a91b8c4762d02ff35cada Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 7 Jun 2013 10:23:48 +0400 Subject: [PATCH 045/153] Update Wine --- pkgs/misc/emulators/wine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index b6013b5eb4d5..9ff339136e6d 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -7,12 +7,12 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; stdenv.mkDerivation rec { - version = "1.5.29"; + version = "1.5.31"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "1cc8g1mrs02nk16jz4a8brr82slp944k4c1nmaa2xpz183a0wz1q"; + sha256 = "1hlj1r3xi1mbqblkiwrcphvvb8rd50qig25jhyid58qp3r2lf9a6"; }; gecko = fetchurl { From 74bde3bedd42f0910697b054550e824e098ac3c6 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Fri, 7 Jun 2013 09:35:20 +0200 Subject: [PATCH 046/153] groff: let hydra build it --- pkgs/tools/text/groff/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index 90c5ef0ba819..a4ca140b1153 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { homepage = "http://www.gnu.org/software/groff/"; description = "GNU Troff, a typesetting package that reads plain text and produces formatted output"; license = "GPLv3+"; + platforms = stdenv.lib.platforms.all; longDescription = '' groff is the GNU implementation of troff, a document formatting From 6d64b1d92c9ac0b0f7404f8bbb3a302b3030027a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 7 Jun 2013 03:42:46 -0400 Subject: [PATCH 047/153] Give unique keys to submodule components I'm not wed to the outPath values I chose, other options are probably valid there too. It would be nice if we could track which file each merged value came from as well. Signed-off-by: Shea Levy --- pkgs/lib/modules.nix | 19 +++++++++++++------ pkgs/lib/options.nix | 11 +++++++++-- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/pkgs/lib/modules.nix b/pkgs/lib/modules.nix index 74603e9c5798..3d4ebc325120 100644 --- a/pkgs/lib/modules.nix +++ b/pkgs/lib/modules.nix @@ -75,12 +75,19 @@ rec { ); - unifyOptionModule = {key ? ""}: m: (args: - let module = lib.applyIfFunction m args; in - if lib.isModule module then - { inherit key; } // module + unifyOptionModule = {key ? ""}: name: index: m: (args: + let + module = lib.applyIfFunction m args; + key_ = rec { + file = key; + option = name; + number = index; + outPath = "file ${toString file} option ${option} options number ${toString number}"; + }; + in if lib.isModule module then + { key = key_; } // module else - { inherit key; options = module; } + { key = key_; options = module; } ); @@ -240,7 +247,7 @@ rec { decls = # add location to sub-module options. map (m: mapSubOptions - (unifyOptionModule {inherit (m) key;}) + (unifyOptionModule {inherit (m) key;} name) m.options ) declarations; diff --git a/pkgs/lib/options.nix b/pkgs/lib/options.nix index d31a501cac92..1fdf9ad8088d 100644 --- a/pkgs/lib/options.nix +++ b/pkgs/lib/options.nix @@ -31,7 +31,7 @@ rec { mapSubOptions = f: opt: if opt ? options then opt // { - options = map f (toList opt.options); + options = imap f (toList opt.options); } else opt; @@ -86,7 +86,14 @@ rec { subModuleMerge = path: vals: lib.fix (args: let - result = recurseInto path (opt.options ++ toList vals) args; + result = recurseInto path (opt.options ++ imap (index: v: args: { + key = rec { + #!!! Would be nice if we had the file the val was from + option = path; + number = index; + outPath = "option ${option} config number ${toString number}"; + }; + } // (lib.applyIfFunction v args)) (toList vals)) args; name = lib.removePrefix (opt.name + ".") path; extraArgs = opt.extraArgs or {}; individualExtraArgs = opt.individualExtraArgs or {}; From eb946b4795b55231be13de5e3d59626d5bb1e834 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 7 Jun 2013 14:01:22 +0400 Subject: [PATCH 048/153] Luarocks: new package --- .../tools/misc/luarocks/default.nix | 29 +++++++++++++++++++ .../tools/misc/luarocks/default.upstream | 1 + pkgs/top-level/all-packages.nix | 4 +++ 3 files changed, 34 insertions(+) create mode 100644 pkgs/development/tools/misc/luarocks/default.nix create mode 100644 pkgs/development/tools/misc/luarocks/default.upstream diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix new file mode 100644 index 000000000000..da44a7d73a56 --- /dev/null +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl, lua, curl}: +let + s = # Generated upstream information + rec { + baseName="luarocks"; + version="2.0.13"; + name="${baseName}-${version}"; + hash="1cpdi61dwcc2i4bwrn7bb8fibkd1s75jrr0bjcbs8p76rn6hkb2y"; + url="http://luarocks.org/releases/luarocks-2.0.13-rc1.tar.gz"; + sha256="1cpdi61dwcc2i4bwrn7bb8fibkd1s75jrr0bjcbs8p76rn6hkb2y"; + }; + buildInputs = [ + lua curl + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + meta = { + inherit (s) version; + description = ''A package manager for Lua''; + license = stdenv.lib.licenses.mit ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/tools/misc/luarocks/default.upstream b/pkgs/development/tools/misc/luarocks/default.upstream new file mode 100644 index 000000000000..e69de1fe8895 --- /dev/null +++ b/pkgs/development/tools/misc/luarocks/default.upstream @@ -0,0 +1 @@ +url http://luarocks.org/releases/ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c1737039588..8dac5d914882 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2943,6 +2943,10 @@ let lua5_0 = callPackage ../development/interpreters/lua-5/5.0.3.nix { }; lua5_1 = callPackage ../development/interpreters/lua-5/5.1.nix { }; + luarocks = callPackage ../development/tools/misc/luarocks { + lua = lua5; + }; + maude = callPackage ../development/interpreters/maude { }; octave = callPackage ../development/interpreters/octave { From a3187cbba2a41b341f9f2b906befc5ccf05a4ab0 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 8 Jun 2013 16:51:43 +0400 Subject: [PATCH 049/153] Update libgphoto2 - fix gphotofs --- pkgs/development/libraries/libgphoto2/default.nix | 5 +++-- pkgs/development/libraries/libgphoto2/default.upstream | 9 +++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/libgphoto2/default.upstream diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 3edc8d0ac6ca..af985ac91fcd 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}: stdenv.mkDerivation rec { - name = "libgphoto2-2.4.14"; + name = "libgphoto2-${meta.version}"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "14h20s0kwqr1nsj90dgjwzs0r3h7z1cpmnivrikd0rrg4m2jvcsr"; + sha256 = "0f1818l1vs5fbmrihzyv3qasddbqi3r01jik5crrxddwalsi2bd3"; }; nativeBuildInputs = [ pkgconfig gettext ]; @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { MTP, and other vendor specific protocols for controlling and transferring data from digital cameras. ''; + version = "2.5.2"; # XXX: the homepage claims LGPL, but several src files are lgpl21Plus license = stdenv.lib.licenses.lgpl21Plus; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/development/libraries/libgphoto2/default.upstream b/pkgs/development/libraries/libgphoto2/default.upstream new file mode 100644 index 000000000000..0029e6959306 --- /dev/null +++ b/pkgs/development/libraries/libgphoto2/default.upstream @@ -0,0 +1,9 @@ +url http://sourceforge.net/projects/gphoto/files/libgphoto/ +SF_version_dir +version_link '[.]tar[.]bz2/download$' +SF_redirect +do_overwrite () { + ensure_hash + set_var_value version "$CURRENT_VERSION" + set_var_value sha256 "$CURRENT_HASH" +} From bbbf625b7decfbc2baa76119bef47c42174785d5 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Fri, 7 Jun 2013 10:58:39 -0700 Subject: [PATCH 050/153] Cherry-picking gphoto update by Jack Cummings, too --- pkgs/applications/misc/gphoto2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index 827488260260..cba54bf8013c 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "gphoto2-2.5.1"; + name = "gphoto2-2.5.2"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "12zn677fvw1bmx70pg0vck2vrvkiy7hx1wzlwf6k23mhdnm4ipad"; + sha256 = "16c8k1cxfypg7v5h8xi87grclw7a5ayaamn548ys3zkj727r5fcf"; }; nativeBuildInputs = [ pkgconfig gettext ]; From ba6c764a519a2dbe61b0a99a95df0d8bcd8a81fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 8 Jun 2013 17:08:20 +0200 Subject: [PATCH 051/153] xorg: intel driver bugfix update --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 1afdb57c1275..076e296de60c 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1510,11 +1510,11 @@ let })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videointel = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) { - name = "xf86-video-intel-2.21.8"; + name = "xf86-video-intel-2.21.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-intel-2.21.8.tar.bz2; - sha256 = "13yg9bcz55plnpx7k5xkbgpaj6hnlszxys94lxqa6b012l2hr1ad"; + url = mirror://xorg/individual/driver/xf86-video-intel-2.21.9.tar.bz2; + sha256 = "12gigzpgbrz6g2gf4q5nj2sqmjw8fczbh79dlpx898llwk4wnn8k"; }; buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ]; })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ;}; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index cbdd379d6068..7029c641cced 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -129,7 +129,7 @@ mirror://xorg/individual/driver/xf86-video-geode-2.11.14.tar.bz2 mirror://xorg/individual/driver/xf86-video-glide-1.2.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2 mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2 -mirror://xorg/individual/driver/xf86-video-intel-2.21.8.tar.bz2 +mirror://xorg/individual/driver/xf86-video-intel-2.21.9.tar.bz2 mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-mga-1.6.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.7.tar.bz2 From 9aa7f55017676ce14242f4b683b88f5511b528ca Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 2 Jun 2013 10:45:57 +0200 Subject: [PATCH 052/153] firefox: use system jpeg library --- pkgs/applications/networking/browsers/firefox/21.0.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/21.0.nix b/pkgs/applications/networking/browsers/firefox/21.0.nix index 02766a9ccff6..6245419b6f4a 100644 --- a/pkgs/applications/networking/browsers/firefox/21.0.nix +++ b/pkgs/applications/networking/browsers/firefox/21.0.nix @@ -35,7 +35,7 @@ rec { #"--enable-profiling" "--disable-debug" "--enable-strip" - # "--with-system-jpeg" # Too old in nixpkgs + "--with-system-jpeg" "--with-system-zlib" "--with-system-bz2" "--with-system-nspr" From ce50fe26cb8b8e64ad1902dcb4ea91696ab46f87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 9 Jun 2013 10:39:55 +0200 Subject: [PATCH 053/153] libgsf: maintenance update, use gdk_pixbuf now --- pkgs/development/libraries/libgsf/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 35576baeb328..7f44e6b1706e 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,21 +1,21 @@ { fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2 -, python, libiconvOrEmpty +, python, gdk_pixbuf, libiconvOrEmpty }: with { inherit (stdenv.lib) optionals; }; stdenv.mkDerivation rec { - name = "libgsf-1.14.25"; + name = "libgsf-1.14.26"; src = fetchurl { url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz"; - sha256 = "18ni8hwi3q83vs3m6mg6xwd4g7jvss4kz70kzf21k587gvq4hx8j"; + sha256 = "1md67l60li7rkma9m6mwchqz6b6q4xsfr38c6n056y6xm8jyf6c9"; }; nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ gettext bzip2 zlib python ]; - propagatedBuildInputs = [ libxml2 glib ] ++ libiconvOrEmpty; + propagatedBuildInputs = [ libxml2 glib gdk_pixbuf ] ++ libiconvOrEmpty; doCheck = true; From f06f6955bdc4300f439d594edfcb1b51d517a72e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 9 Jun 2013 10:59:23 +0200 Subject: [PATCH 054/153] qt4: fix build via adding dependency in generated makefile Also reorder attributes into the order in which they are run. --- .../libraries/qt-4.x/4.8/default.nix | 33 ++++++++----------- 1 file changed, 14 insertions(+), 19 deletions(-) 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 7f88418bb99c..1ba022797542 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -23,7 +23,7 @@ let v = "4.8.4"; in # * move some plugins (e.g., SQL plugins) to dedicated derivations to avoid # false build-time dependencies -stdenv.mkDerivation ( rec { +stdenv.mkDerivation rec { name = "qt-${v}"; src = fetchurl { @@ -31,6 +31,12 @@ stdenv.mkDerivation ( rec { sha256 = "0w1j16q6glniv4hppdgcvw52w72gb2jab35ylkw0qjn5lj5y7c1k"; }; + prePatch = '' + substituteInPlace configure --replace /bin/pwd pwd + substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls + sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i mkspecs/*/*.conf + ''; + patches = [ ./glib-2.32.patch (substituteAll { @@ -63,6 +69,7 @@ stdenv.mkDerivation ( rec { " ''; + prefixKey = "-prefix "; configureFlags = '' -v -no-separate-debug-info -release -no-fast -confirm-license -opensource @@ -83,6 +90,12 @@ stdenv.mkDerivation ( rec { ${if developerBuild then "-developer-build" else ""} ''; + # fix underspecified dependency in a generated makefile + postConfigure = '' + substituteInPlace tools/designer/src/lib/Makefile --replace \ + "moc_qtgradientviewdialog.cpp:" "moc_qtgradientviewdialog.cpp: .uic/release-shared/ui_qtgradientview.h" + ''; + propagatedBuildInputs = [ libXrender libXrandr libXinerama libXcursor libXext libXfixes libXv libXi libSM @@ -100,14 +113,6 @@ stdenv.mkDerivation ( rec { nativeBuildInputs = [ perl pkgconfig which ]; - prefixKey = "-prefix "; - - prePatch = '' - substituteInPlace configure --replace /bin/pwd pwd - substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls - sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i mkspecs/*/*.conf - ''; - enableParallelBuilding = true; crossAttrs = let @@ -152,13 +157,3 @@ stdenv.mkDerivation ( rec { platforms = platforms.linux; }; } - # ToDo: this attribute is optional *only* to prevent rebuild on hydra - // stdenv.lib.optionalAttrs developerBuild { - # fix underspecified dependency in a generated makefile - postConfigure = '' - substituteInPlace tools/designer/src/lib/Makefile --replace \ - "moc_qtgradientviewdialog.cpp:" "moc_qtgradientviewdialog.cpp: .uic/release-shared/ui_qtgradientview.h" - ''; - } -) - From a2680cdc48b47dbd37b1e734452b3df3bb3ed8a9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Jun 2013 11:55:52 +0200 Subject: [PATCH 055/153] groff: explicitly disable X11 support in configure to avoid impure builds Without this flag, the configure script will find /usr/X11 on host system and assume that it can build with X11 support. --- pkgs/tools/text/groff/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index a4ca140b1153..f4d3169f2fae 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { buildInputs = [ ghostscript ]; nativeBuildInputs = [ perl ]; + # Builds running without a chroot environment may detect the presence + # of /usr/X11 in the host system, leading to an impure build of the + # package. To avoid this issue, X11 support is explicitly disabled. + # Note: If we ever want to *enable* X11 support, then we'll probably + # have to pass "--with-appresdir", too. + configureFlags = "--without-x"; + doCheck = true; crossAttrs = { From c1bec6fb5b7b247e5e2119e4e0bf96d02da55b0e Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 11 Jun 2013 11:52:15 +0200 Subject: [PATCH 056/153] firefox-21: use more system libraries Conflicts: pkgs/applications/networking/browsers/firefox/21.0.nix --- pkgs/applications/networking/browsers/firefox/21.0.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/browsers/firefox/21.0.nix b/pkgs/applications/networking/browsers/firefox/21.0.nix index f1382c0c191c..568569232151 100644 --- a/pkgs/applications/networking/browsers/firefox/21.0.nix +++ b/pkgs/applications/networking/browsers/firefox/21.0.nix @@ -2,6 +2,7 @@ , libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite +, hunspell, libevent, libstartup_notification, libvpx , # If you want the resulting program to call itself "Firefox" instead # of "Shiretoko" or whatever, enable this option. However, those @@ -40,8 +41,14 @@ rec { "--with-system-bz2" "--with-system-nspr" "--with-system-nss" + "--with-system-libevent" + "--with-system-libvpx" # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" + "--enable-startup-notification" "--enable-system-cairo" + "--enable-system-ffi" + "--enable-system-hunspell" + "--enable-system-pixman" "--enable-system-sqlite" "--disable-crashreporter" "--disable-tests" @@ -63,6 +70,7 @@ rec { alsaLib nspr nss libnotify xlibs.pixman yasm mesa xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper + hunspell libevent libstartup_notification libvpx ]; configureFlags = @@ -131,6 +139,7 @@ rec { [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify xlibs.pixman yasm mesa sqlite file unzip pysqlite + hunspell libevent libstartup_notification libvpx ]; patches = [ From 6b433019fa8b6835b45791400a3da9394df574c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 11 Jun 2013 18:03:48 +0200 Subject: [PATCH 057/153] libvpx: update Also set the shared-vpx for firefox, just to be sure. Firefox, Chromium, and other seem to work fine. --- .../networking/browsers/firefox/21.0.nix | 1 + pkgs/development/libraries/libvpx/default.nix | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/21.0.nix b/pkgs/applications/networking/browsers/firefox/21.0.nix index 568569232151..cdbc75b8fdf2 100644 --- a/pkgs/applications/networking/browsers/firefox/21.0.nix +++ b/pkgs/applications/networking/browsers/firefox/21.0.nix @@ -50,6 +50,7 @@ rec { "--enable-system-hunspell" "--enable-system-pixman" "--enable-system-sqlite" + "--with-system-libvpx" "--disable-crashreporter" "--disable-tests" "--disable-necko-wifi" # maybe we want to enable this at some point diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 1c225aa7853d..494a5c36a3c4 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -1,11 +1,13 @@ {stdenv, fetchurl, bash, yasm, which, perl}: +let version = "1.2.0"; +in stdenv.mkDerivation rec { - name = "libvpx-1.1.0"; - - src = fetchurl { - url = http://webm.googlecode.com/files/libvpx-v1.1.0.tar.bz2; - sha256 = "1ibjxcdsazqfbbjhb8w56vy3n9qwny2m9q4kzx4rmk9v9g7p9q4w"; + name = "libvpx-" + version; + + src = fetchurl { # sadly, there's no official tarball for this release + url = "ftp://ftp.archlinux.org/other/libvpx/libvpx-${version}.tar.xz"; + sha256 = "02k9ylswgr2hvjqmg422fa9ggym0g94gzwb14nnckly698rvjc50"; }; patchPhase = '' @@ -14,15 +16,17 @@ stdenv.mkDerivation rec { sed -e '/enable linux/d' -i configure ''; - configureScript = "../configure"; + buildInputs = [ yasm which perl ]; preConfigure = '' mkdir -p build cd build ''; + configureScript = "../configure"; configureFlags = [ "--disable-install-srcs" + "--disable-install-docs" "--disable-examples" "--enable-vp8" "--enable-runtime-cpu-detect" @@ -34,8 +38,6 @@ stdenv.mkDerivation rec { make quiet=false DIST_DIR=$out install ''; - buildInputs = [ yasm which perl ]; - meta = { description = "VP8 video encoder"; homepage = http://code.google.com/p/webm; From 92ba0a091385ac26593ac18b32919ff0359933fb Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Wed, 12 Jun 2013 13:39:23 +0800 Subject: [PATCH 058/153] gtk+: enable NLS support (merge #611) @vcunat: add minor refactorings like file-naming style unification. ToDo: we get 2*20MB of locale, perhaps it's worth splitting one day. --- pkgs/development/libraries/gtk+/2.x.nix | 6 +++--- pkgs/development/libraries/gtk+/{3-default.nix => 3.x.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/development/libraries/gtk+/{3-default.nix => 3.x.nix} (94%) diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index 62f754c148ea..2135c4ae52b5 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, glib, atk, pango, cairo, perl, xlibs -, gdk_pixbuf, xz +{ stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xlibs +, gdk_pixbuf , xineramaSupport ? true , cupsSupport ? true, cups ? null }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ perl pkgconfig ]; + nativeBuildInputs = [ perl pkgconfig gettext ]; propagatedBuildInputs = with xlibs; [ glib cairo pango gdk_pixbuf atk diff --git a/pkgs/development/libraries/gtk+/3-default.nix b/pkgs/development/libraries/gtk+/3.x.nix similarity index 94% rename from pkgs/development/libraries/gtk+/3-default.nix rename to pkgs/development/libraries/gtk+/3.x.nix index 86bd4474c7a2..a22e243411aa 100644 --- a/pkgs/development/libraries/gtk+/3-default.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchurl, pkgconfig, gettext , expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, xlibs , xineramaSupport ? true , cupsSupport ? true, cups ? null @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gettext ]; propagatedBuildInputs = with xlibs; [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk libXrandr libXrender libXcomposite libXi libXcursor diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac6c6712a92f..dd25805d9eae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4091,7 +4091,7 @@ let gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { }; gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { }; - gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3-default.nix { + gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.x.nix { inherit (gnome3) at_spi2_atk; }); gtk = pkgs.gtk2; From 0813e7b7486fa798f3a59c335623629a7393f258 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 13 Jun 2013 08:53:22 +0200 Subject: [PATCH 059/153] firefox-21: make "use system cairo" optional, defaulting to false --- .../networking/browsers/firefox/21.0.nix | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/21.0.nix b/pkgs/applications/networking/browsers/firefox/21.0.nix index cdbc75b8fdf2..35ba2cad1244 100644 --- a/pkgs/applications/networking/browsers/firefox/21.0.nix +++ b/pkgs/applications/networking/browsers/firefox/21.0.nix @@ -1,9 +1,10 @@ { stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs +, libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xlibs , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , hunspell, libevent, libstartup_notification, libvpx - +, cairo ? null +, useSystemCairo ? false , # If you want the resulting program to call itself "Firefox" instead # of "Shiretoko" or whatever, enable this option. However, those # binaries may not be distributed without permission from the @@ -13,8 +14,10 @@ }: assert stdenv.gcc ? libc && stdenv.gcc.libc != null; +assert useSystemCairo -> cairo != null; -rec { +let optional = stdenv.lib.optional; +in rec { firefoxVersion = "21.0"; @@ -45,18 +48,16 @@ rec { "--with-system-libvpx" # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" "--enable-startup-notification" - "--enable-system-cairo" "--enable-system-ffi" "--enable-system-hunspell" "--enable-system-pixman" "--enable-system-sqlite" - "--with-system-libvpx" "--disable-crashreporter" "--disable-tests" "--disable-necko-wifi" # maybe we want to enable this at some point "--disable-installer" "--disable-updater" - ]; + ] ++ optional useSystemCairo "--enable-system-cairo"; xulrunner = stdenv.mkDerivation rec { @@ -65,14 +66,14 @@ rec { inherit src; buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 + [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib bzip2 python dbus dbus_glib pango freetype fontconfig xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file alsaLib nspr nss libnotify xlibs.pixman yasm mesa xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper hunspell libevent libstartup_notification libvpx - ]; + ] ++ optional useSystemCairo cairo; configureFlags = [ "--enable-application=xulrunner" @@ -81,9 +82,7 @@ rec { enableParallelBuilding = true; - patches = [ - ./system-cairo.patch # accepted upstream, probably in 22 - ]; + patches = optional useSystemCairo ./system-cairo.patch; # probably in 22 preConfigure = '' @@ -137,11 +136,11 @@ rec { enableParallelBuilding = true; buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python + [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 python dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify xlibs.pixman yasm mesa sqlite file unzip pysqlite hunspell libevent libstartup_notification libvpx - ]; + ] ++ optional useSystemCairo cairo; patches = [ ./disable-reporter.patch # fixes "search box not working when built on xulrunner" From 34f152e0d374e5aa93a45bd882cd0e1c86ea9350 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 13 Jun 2013 12:51:00 +0200 Subject: [PATCH 060/153] qt48: hopefully a good fix for parallel builds, finally It caused rare failures, mainly for Qt for creator build. --- pkgs/development/libraries/qt-4.x/4.8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 1ba022797542..1eb108b1e177 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -92,8 +92,8 @@ stdenv.mkDerivation rec { # fix underspecified dependency in a generated makefile postConfigure = '' - substituteInPlace tools/designer/src/lib/Makefile --replace \ - "moc_qtgradientviewdialog.cpp:" "moc_qtgradientviewdialog.cpp: .uic/release-shared/ui_qtgradientview.h" + sed "1iqtgradientview.h: .uic/release-shared/ui_qtgradientview.h" \ + -i tools/designer/src/lib/Makefile ''; propagatedBuildInputs = From 3d1491c166e4fb54e5c3e427924be99784d5722c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 13 Jun 2013 12:52:41 +0200 Subject: [PATCH 061/153] kde410.kdepimlibs: add pkgconfig Accidentally noticed the request in logs. --- pkgs/desktops/kde-4.10/kdepimlibs.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/kde-4.10/kdepimlibs.nix b/pkgs/desktops/kde-4.10/kdepimlibs.nix index c9813b19f521..7ec1612b1e5f 100644 --- a/pkgs/desktops/kde-4.10/kdepimlibs.nix +++ b/pkgs/desktops/kde-4.10/kdepimlibs.nix @@ -1,8 +1,10 @@ -{ kde, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info +{ kde, pkgconfig, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info , kdelibs, akonadi, libxslt, prison, nepomuk_core , shared_desktop_ontologies, qjson }: kde { + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ boost gpgme libical libxslt qjson openldap cyrus_sasl akonadi shared_desktop_ontologies From 84262c18e3a7dd980245a7d059ace83b16128510 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 13 Jun 2013 12:59:13 +0200 Subject: [PATCH 062/153] pygtk: propagate gtk (fixes solfege build) --- pkgs/development/python-modules/pygtk/default.nix | 7 +++---- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix index 07d57591f1ac..940ba18f2a2a 100644 --- a/pkgs/development/python-modules/pygtk/default.nix +++ b/pkgs/development/python-modules/pygtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, pkgconfig, glib, gtk, pygobject, pycairo +{ stdenv, fetchurl, python, pkgconfig, gtk, pygobject, pycairo , buildPythonPackage, libglade ? null }: buildPythonPackage rec { @@ -9,11 +9,10 @@ buildPythonPackage rec { sha256 = "4acf0ef2bde8574913c40ee4a43d9c4f43bb77b577b67147271b534501a54cc8"; }; - buildInputs = - [ pkgconfig glib gtk ] + buildInputs = [ pkgconfig ] ++ stdenv.lib.optional (libglade != null) libglade; - propagatedBuildInputs = [ pygobject pycairo ]; + propagatedBuildInputs = [ gtk pygobject pycairo ]; installCommand = "make install"; checkPhase = stdenv.lib.optionalString (libglade == null) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 89e1faeb9b2a..a848f4707d85 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -97,7 +97,7 @@ pythonPackages = python.modules // rec { }; pygtk = import ../development/python-modules/pygtk { - inherit (pkgs) fetchurl stdenv pkgconfig glib gtk; + inherit (pkgs) fetchurl stdenv pkgconfig gtk; inherit python buildPythonPackage pygobject pycairo; }; From ca67fccbfe867c7594e87b9f842dababbe3c7403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 13 Jun 2013 13:12:39 +0200 Subject: [PATCH 063/153] pyGtkGlade: fix eval I didn't expect the file to be imported on two places. --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a848f4707d85..0d3e532efab1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -106,7 +106,7 @@ pythonPackages = python.modules // rec { # inherit (pkgs.gnome) libglade; #}; pyGtkGlade = import ../development/python-modules/pygtk { - inherit (pkgs) fetchurl stdenv pkgconfig glib gtk; + inherit (pkgs) fetchurl stdenv pkgconfig gtk; inherit (pkgs.gnome) libglade; inherit python buildPythonPackage pygobject pycairo; }; From 2956b5db46d6ed21cb234a7c7ddf78cbe08df413 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Sun, 2 Jun 2013 11:21:30 +1000 Subject: [PATCH 064/153] sdcv: add expression --- pkgs/applications/misc/sdcv/default.nix | 31 +++++++++++++++++++ pkgs/applications/misc/sdcv/sdcv.cpp.patch | 12 +++++++ .../misc/sdcv/sdcv.cpp.patch-darwin | 19 ++++++++++++ pkgs/applications/misc/sdcv/utils.hpp.patch | 10 ++++++ pkgs/top-level/all-packages.nix | 2 ++ 5 files changed, 74 insertions(+) create mode 100644 pkgs/applications/misc/sdcv/default.nix create mode 100644 pkgs/applications/misc/sdcv/sdcv.cpp.patch create mode 100644 pkgs/applications/misc/sdcv/sdcv.cpp.patch-darwin create mode 100644 pkgs/applications/misc/sdcv/utils.hpp.patch diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix new file mode 100644 index 000000000000..8ac4730de9a7 --- /dev/null +++ b/pkgs/applications/misc/sdcv/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, pkgconfig, glib, gettext }: + +stdenv.mkDerivation rec { + name= "sdcv-0.4.2"; + + meta = { + homepage = http://sdcv.sourceforge.net/; + description = "Console version of StarDict program"; + maintainers = with stdenv.lib.maintainers; [ lovek323 ]; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + }; + + src = fetchurl { + url = "mirror://sourceforge/sdcv/${name}.tar.bz2"; + sha256 = "1cnyv7gd1qvz8ma8545d3aq726wxrx4km7ykl97831irx5wz0r51"; + }; + + patches = ( if stdenv.isDarwin + then [ ./sdcv.cpp.patch-darwin ./utils.hpp.patch ] + else [ ./sdcv.cpp.patch ] ); + + buildInputs = [ pkgconfig glib gettext ]; + + preBuild = '' + sed -i 's/guint32 page_size/size_t page_size/' src/lib/lib.cpp + ''; + + NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__"; +} + diff --git a/pkgs/applications/misc/sdcv/sdcv.cpp.patch b/pkgs/applications/misc/sdcv/sdcv.cpp.patch new file mode 100644 index 000000000000..6f835f16e458 --- /dev/null +++ b/pkgs/applications/misc/sdcv/sdcv.cpp.patch @@ -0,0 +1,12 @@ +--- a/src/utils.hpp ++++ b/src/utils.hpp +@@ -2,6 +2,9 @@ + #define _UTILS_HPP_ + + #include ++#include ++#include ++ + using std::string; + + extern bool stdio_getline(FILE *in, string &str); diff --git a/pkgs/applications/misc/sdcv/sdcv.cpp.patch-darwin b/pkgs/applications/misc/sdcv/sdcv.cpp.patch-darwin new file mode 100644 index 000000000000..2ee9a24e0347 --- /dev/null +++ b/pkgs/applications/misc/sdcv/sdcv.cpp.patch-darwin @@ -0,0 +1,19 @@ +--- a/src/sdcv.cpp ++++ b/src/sdcv.cpp +@@ -27,13 +27,13 @@ + #include + #include + #include ++#include ++#include ++#include + #include + #include + #include + #include +-#include +-#include +-#include + + #include "libwrapper.hpp" + #include "readline.hpp" diff --git a/pkgs/applications/misc/sdcv/utils.hpp.patch b/pkgs/applications/misc/sdcv/utils.hpp.patch new file mode 100644 index 000000000000..c08641abd6b9 --- /dev/null +++ b/pkgs/applications/misc/sdcv/utils.hpp.patch @@ -0,0 +1,10 @@ +--- a/src/utils.hpp ++++ b/src/utils.hpp +@@ -2,6 +2,7 @@ + #define _UTILS_HPP_ + + #include ++#include + using std::string; + + extern bool stdio_getline(FILE *in, string &str); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14b5710048ed..e30dbf513c0a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1613,6 +1613,8 @@ let scrot = callPackage ../tools/graphics/scrot { }; + sdcv = callPackage ../applications/misc/sdcv { }; + seccure = callPackage ../tools/security/seccure/0.4.nix { }; setserial = builderDefsPackage (import ../tools/system/setserial) { From fa6caedfeae369ed65ad9ade4a14abf57d179d25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 13 Jun 2013 19:17:01 +0200 Subject: [PATCH 065/153] qt48: hopefully a version that works for all possibilities All builds were OK on my 8-thread testing machine, but it's probably too little parallelism to show these problems. --- pkgs/development/libraries/qt-4.x/4.8/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1eb108b1e177..a00f9e5c81ab 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { ''; # fix underspecified dependency in a generated makefile - postConfigure = '' + postConfigure = stdenv.lib.optional developerBuild '' sed "1iqtgradientview.h: .uic/release-shared/ui_qtgradientview.h" \ -i tools/designer/src/lib/Makefile ''; From 84bf7818a456ef642ce823a2d828936aae23d1cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 13 Jun 2013 20:57:41 +0200 Subject: [PATCH 066/153] dbus: minor update, fixing DOS CVE-2013-2168 I tried building some X apps, all seems fine. --- pkgs/development/libraries/dbus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 914ab96b5805..2ed527c1d45c 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -3,8 +3,8 @@ , libX11, libICE, libSM, useX11 ? true }: let - version = "1.6.10"; # 1.7.* isn't recommended, even for gnome 3.8 - sha256 = "11jyj6aw8yf75hqv7v0601n2xms08k0mys6dyql164m7ad56yg8z"; + version = "1.6.12"; # 1.7.* isn't recommended, even for gnome 3.8 + sha256 = "14pfh2ksn4srfry752kf1jy3c61hklcs9fx2xglw2ifhsszplypn"; inherit (stdenv) lib; From 94d8de2b998ed78cbd3e87cfe2afd43a27810092 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 13 Jun 2013 20:58:44 +0200 Subject: [PATCH 067/153] dbus: fix build on non-Linux platforms We do not want systemd there. This should fix the tarball job systemd assertion problems. --- pkgs/development/libraries/dbus/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 2ed527c1d45c..b7f7eac30468 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -13,6 +13,7 @@ let # also other parts than "libs" need this statically linked lib makeInternalLib = "(cd dbus && make libdbus-internal.la)"; + systemdOrEmpty = stdenv.lib.optional stdenv.isLinux systemd; # A generic builder for individual parts (subdirs) of D-Bus dbus_drv = name: subdirs: merge: stdenv.mkDerivation (lib.mergeAttrsByFuncDefaultsClean [{ @@ -61,14 +62,15 @@ let } merge ]); - libs = dbus_drv "libs" "dbus" { - buildInputs = [ systemd.headers ]; - patches = [ ./systemd.patch ]; # bypass systemd detection - + libs = dbus_drv "libs" "dbus" ({ # Enable X11 autolaunch support in libdbus. This doesn't actually depend on X11 # (it just execs dbus-launch in dbus.tools), contrary to what the configure script demands. NIX_CFLAGS_COMPILE = "-DDBUS_ENABLE_X11_AUTOLAUNCH=1"; - }; + } // stdenv.lib.optionalAttrs (systemdOrEmpty != []) { + buildInputs = [ systemd.headers ]; + patches = [ ./systemd.patch ]; # bypass systemd detection + }); + in rec { @@ -81,20 +83,20 @@ in rec { tools = dbus_drv "tools" "tools" { configureFlags = [ "--with-dbus-daemondir=${daemon}/bin" ]; - buildInputs = buildInputsX ++ [ libs daemon systemd dbus_glib ]; + buildInputs = buildInputsX ++ systemdOrEmpty ++ [ libs daemon dbus_glib ]; NIX_CFLAGS_LINK = "-Wl,--as-needed -ldbus-1"; }; daemon = dbus_drv "daemon" "bus" { preBuild = makeInternalLib; - buildInputs = [ systemd ]; + buildInputs = systemdOrEmpty; }; # Some of the tests don't work yet; in fact, @vcunat tried several packages # containing dbus testing, and all of them have some test failure. tests = dbus_drv "tests" "test" { preBuild = makeInternalLib; - buildInputs = buildInputsX ++ [ systemd libs tools daemon dbus_glib python ]; + buildInputs = buildInputsX ++ systemdOrEmpty ++ [ libs tools daemon dbus_glib python ]; NIX_CFLAGS_LINK = "-Wl,--as-needed -ldbus-1"; }; From 1a41887398e51f11c06deba0eb5ed3ca4b76eff1 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 14 Jun 2013 00:11:34 +0400 Subject: [PATCH 068/153] Fix a missing option declaration after merge --- pkgs/development/libraries/cairo/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 55a746890262..a09903f7ea91 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -3,6 +3,7 @@ , gobjectSupport ? true, glib , xcbSupport ? true # no longer experimental since 1.12 , glSupport ? true, mesa_noglu ? null # mesa is no longer a big dependency +, pdfSupport ? true }: assert glSupport -> mesa_noglu != null; From 7093dd2c707dbb76fcd9bb3998d5c8439c5b4d67 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 14 Jun 2013 07:46:33 +0400 Subject: [PATCH 069/153] Some fixes --- pkgs/development/libraries/mesa/default.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 1fca905cf55b..6cfb4314e0aa 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -81,12 +81,14 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig python makedepend file flex bison ]; - propagatedBuildInputs = with xorg; [ libdrm libXdamage libXxf86vm ]; + propagatedBuildInputs = with xorg; [ libXdamage libXxf86vm ]; buildInputs = with xorg; [ - autoconf automake libtool intltool expat libxml2Python udev llvm + autoconf automake libtool intltool expat libxml2Python llvm libXfixes glproto dri2proto libX11 libXext libxcb libXt libffi wayland - ] ++ stdenv.lib.optionals enableExtraFeatures [ /*libXvMC*/ libvdpau ]; + ] ++ stdenv.lib.optionals enableExtraFeatures [ /*libXvMC*/ libvdpau ] + ++ stdenv.lib.optional stdenv.isLinux [libdrm udev] + ; enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 973378f0e503..26b7d474275c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4091,6 +4091,7 @@ let cairo = callPackage ../development/libraries/cairo { pixman = pixman_cairo; # it's recommended to be in sync + glSupport = lib.elem system lib.platforms.mesaPlatforms; }; pixman_cairo = callPackage ../development/libraries/pixman { }; cairomm = callPackage ../development/libraries/cairomm { }; From 2735e9c8d6aa444f4a07c26563cda71774d2ca0a Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Fri, 14 Jun 2013 18:16:37 +1000 Subject: [PATCH 070/153] apacheHttpd: fix build on darwin * remove the gcc_s library from NIX_LDFLAGS (not available on darwin) --- pkgs/servers/http/apache-httpd/2.2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix index ba0bde633584..23d18ad7c9c6 100644 --- a/pkgs/servers/http/apache-httpd/2.2.nix +++ b/pkgs/servers/http/apache-httpd/2.2.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-iquote ${apr}/include/apr-1"; # Required for ‘pthread_cancel’. - NIX_LDFLAGS = "-lgcc_s"; + NIX_LDFLAGS = (if stdenv.isDarwin then "" else "-lgcc_s"); configureFlags = '' --with-z=${zlib} From 4d19da7e99785bc408be1438711339a46630a3fa Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 14 Jun 2013 13:46:26 +0200 Subject: [PATCH 071/153] gtk-2: remove unneeded argument --- pkgs/development/libraries/gtk+/2.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index b7c7841bf58c..055d93ef9290 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xlibs -, gdk_pixbuf, xz, libintlOrEmpty +, gdk_pixbuf, libintlOrEmpty , xineramaSupport ? true , cupsSupport ? true, cups ? null }: From 935a054de9f2a3682c7c23ff90ed4aac237814b1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 14 Jun 2013 14:53:36 +0200 Subject: [PATCH 072/153] libXrender, libXvMC: Update --- pkgs/servers/x11/xorg/default.nix | 420 +++++++++--------- .../x11/xorg/generate-expr-from-tarballs.pl | 32 +- pkgs/servers/x11/xorg/overrides.nix | 29 +- pkgs/servers/x11/xorg/tarballs-7.7.list | 4 +- pkgs/top-level/all-packages.nix | 13 +- 5 files changed, 248 insertions(+), 250 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 076e296de60c..3a523469248d 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -18,7 +18,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + bdftopcf = (stdenv.mkDerivation ((if overrides ? bdftopcf then overrides.bdftopcf else x: x) { name = "bdftopcf-1.0.3"; builder = ./builder.sh; @@ -28,7 +28,7 @@ let }; buildInputs = [pkgconfig libXfont ]; })) // {inherit libXfont ;}; - + bigreqsproto = (stdenv.mkDerivation ((if overrides ? bigreqsproto then overrides.bigreqsproto else x: x) { name = "bigreqsproto-1.1.2"; builder = ./builder.sh; @@ -38,7 +38,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + compositeproto = (stdenv.mkDerivation ((if overrides ? compositeproto then overrides.compositeproto else x: x) { name = "compositeproto-0.4.2"; builder = ./builder.sh; @@ -48,7 +48,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + damageproto = (stdenv.mkDerivation ((if overrides ? damageproto then overrides.damageproto else x: x) { name = "damageproto-1.2.1"; builder = ./builder.sh; @@ -58,7 +58,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + dmxproto = (stdenv.mkDerivation ((if overrides ? dmxproto then overrides.dmxproto else x: x) { name = "dmxproto-2.3.1"; builder = ./builder.sh; @@ -68,7 +68,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + dri2proto = (stdenv.mkDerivation ((if overrides ? dri2proto then overrides.dri2proto else x: x) { name = "dri2proto-2.8"; builder = ./builder.sh; @@ -78,7 +78,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + encodings = (stdenv.mkDerivation ((if overrides ? encodings then overrides.encodings else x: x) { name = "encodings-1.0.4"; builder = ./builder.sh; @@ -88,7 +88,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + fixesproto = (stdenv.mkDerivation ((if overrides ? fixesproto then overrides.fixesproto else x: x) { name = "fixesproto-5.0"; builder = ./builder.sh; @@ -98,7 +98,7 @@ let }; buildInputs = [pkgconfig xextproto ]; })) // {inherit xextproto ;}; - + fontadobe100dpi = (stdenv.mkDerivation ((if overrides ? fontadobe100dpi then overrides.fontadobe100dpi else x: x) { name = "font-adobe-100dpi-1.0.3"; builder = ./builder.sh; @@ -108,7 +108,7 @@ let }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; - + fontadobe75dpi = (stdenv.mkDerivation ((if overrides ? fontadobe75dpi then overrides.fontadobe75dpi else x: x) { name = "font-adobe-75dpi-1.0.3"; builder = ./builder.sh; @@ -118,7 +118,7 @@ let }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; - + fontadobeutopia100dpi = (stdenv.mkDerivation ((if overrides ? fontadobeutopia100dpi then overrides.fontadobeutopia100dpi else x: x) { name = "font-adobe-utopia-100dpi-1.0.4"; builder = ./builder.sh; @@ -128,7 +128,7 @@ let }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; - + fontadobeutopia75dpi = (stdenv.mkDerivation ((if overrides ? fontadobeutopia75dpi then overrides.fontadobeutopia75dpi else x: x) { name = "font-adobe-utopia-75dpi-1.0.4"; builder = ./builder.sh; @@ -138,7 +138,7 @@ let }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; - + fontadobeutopiatype1 = (stdenv.mkDerivation ((if overrides ? fontadobeutopiatype1 then overrides.fontadobeutopiatype1 else x: x) { name = "font-adobe-utopia-type1-1.0.4"; builder = ./builder.sh; @@ -148,7 +148,7 @@ let }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit mkfontdir mkfontscale ;}; - + fontalias = (stdenv.mkDerivation ((if overrides ? fontalias then overrides.fontalias else x: x) { name = "font-alias-1.0.3"; builder = ./builder.sh; @@ -158,7 +158,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + fontarabicmisc = (stdenv.mkDerivation ((if overrides ? fontarabicmisc then overrides.fontarabicmisc else x: x) { name = "font-arabic-misc-1.0.3"; builder = ./builder.sh; @@ -168,7 +168,7 @@ let }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; - + fontbh100dpi = (stdenv.mkDerivation ((if overrides ? fontbh100dpi then overrides.fontbh100dpi else x: x) { name = "font-bh-100dpi-1.0.3"; builder = ./builder.sh; @@ -178,7 +178,7 @@ let }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; - + fontbh75dpi = (stdenv.mkDerivation ((if overrides ? fontbh75dpi then overrides.fontbh75dpi else x: x) { name = "font-bh-75dpi-1.0.3"; builder = ./builder.sh; @@ -188,7 +188,7 @@ let }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; - + fontbhlucidatypewriter100dpi = (stdenv.mkDerivation ((if overrides ? fontbhlucidatypewriter100dpi then overrides.fontbhlucidatypewriter100dpi else x: x) { name = "font-bh-lucidatypewriter-100dpi-1.0.3"; builder = ./builder.sh; @@ -198,7 +198,7 @@ let }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; - + fontbhlucidatypewriter75dpi = (stdenv.mkDerivation ((if overrides ? fontbhlucidatypewriter75dpi then overrides.fontbhlucidatypewriter75dpi else x: x) { name = "font-bh-lucidatypewriter-75dpi-1.0.3"; builder = ./builder.sh; @@ -208,7 +208,7 @@ let }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; - + fontbhttf = (stdenv.mkDerivation ((if overrides ? fontbhttf then overrides.fontbhttf else x: x) { name = "font-bh-ttf-1.0.3"; builder = ./builder.sh; @@ -218,7 +218,7 @@ let }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit mkfontdir mkfontscale ;}; - + fontbhtype1 = (stdenv.mkDerivation ((if overrides ? fontbhtype1 then overrides.fontbhtype1 else x: x) { name = "font-bh-type1-1.0.3"; builder = ./builder.sh; @@ -228,7 +228,7 @@ let }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit mkfontdir mkfontscale ;}; - + fontbitstream100dpi = (stdenv.mkDerivation ((if overrides ? fontbitstream100dpi then overrides.fontbitstream100dpi else x: x) { name = "font-bitstream-100dpi-1.0.3"; builder = ./builder.sh; @@ -238,7 +238,7 @@ let }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; - + fontbitstream75dpi = (stdenv.mkDerivation ((if overrides ? fontbitstream75dpi then overrides.fontbitstream75dpi else x: x) { name = "font-bitstream-75dpi-1.0.3"; builder = ./builder.sh; @@ -248,7 +248,7 @@ let }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; - + fontbitstreamtype1 = (stdenv.mkDerivation ((if overrides ? fontbitstreamtype1 then overrides.fontbitstreamtype1 else x: x) { name = "font-bitstream-type1-1.0.3"; builder = ./builder.sh; @@ -258,7 +258,7 @@ let }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit mkfontdir mkfontscale ;}; - + fontcronyxcyrillic = (stdenv.mkDerivation ((if overrides ? fontcronyxcyrillic then overrides.fontcronyxcyrillic else x: x) { name = "font-cronyx-cyrillic-1.0.3"; builder = ./builder.sh; @@ -268,7 +268,7 @@ let }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; - + fontcursormisc = (stdenv.mkDerivation ((if overrides ? fontcursormisc then overrides.fontcursormisc else x: x) { name = "font-cursor-misc-1.0.3"; builder = ./builder.sh; @@ -278,7 +278,7 @@ let }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; - + fontdaewoomisc = (stdenv.mkDerivation ((if overrides ? fontdaewoomisc then overrides.fontdaewoomisc else x: x) { name = "font-daewoo-misc-1.0.3"; builder = ./builder.sh; @@ -288,7 +288,7 @@ let }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; - + fontdecmisc = (stdenv.mkDerivation ((if overrides ? fontdecmisc then overrides.fontdecmisc else x: x) { name = "font-dec-misc-1.0.3"; builder = ./builder.sh; @@ -298,7 +298,7 @@ let }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; - + fontibmtype1 = (stdenv.mkDerivation ((if overrides ? fontibmtype1 then overrides.fontibmtype1 else x: x) { name = "font-ibm-type1-1.0.3"; builder = ./builder.sh; @@ -308,7 +308,7 @@ let }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit mkfontdir mkfontscale ;}; - + fontisasmisc = (stdenv.mkDerivation ((if overrides ? fontisasmisc then overrides.fontisasmisc else x: x) { name = "font-isas-misc-1.0.3"; builder = ./builder.sh; @@ -318,7 +318,7 @@ let }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; - + fontjismisc = (stdenv.mkDerivation ((if overrides ? fontjismisc then overrides.fontjismisc else x: x) { name = "font-jis-misc-1.0.3"; builder = ./builder.sh; @@ -328,7 +328,7 @@ let }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; - + fontmicromisc = (stdenv.mkDerivation ((if overrides ? fontmicromisc then overrides.fontmicromisc else x: x) { name = "font-micro-misc-1.0.3"; builder = ./builder.sh; @@ -338,7 +338,7 @@ let }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; - + fontmisccyrillic = (stdenv.mkDerivation ((if overrides ? fontmisccyrillic then overrides.fontmisccyrillic else x: x) { name = "font-misc-cyrillic-1.0.3"; builder = ./builder.sh; @@ -348,7 +348,7 @@ let }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; - + fontmiscethiopic = (stdenv.mkDerivation ((if overrides ? fontmiscethiopic then overrides.fontmiscethiopic else x: x) { name = "font-misc-ethiopic-1.0.3"; builder = ./builder.sh; @@ -358,7 +358,7 @@ let }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit mkfontdir mkfontscale ;}; - + fontmiscmeltho = (stdenv.mkDerivation ((if overrides ? fontmiscmeltho then overrides.fontmiscmeltho else x: x) { name = "font-misc-meltho-1.0.3"; builder = ./builder.sh; @@ -368,7 +368,7 @@ let }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit mkfontdir mkfontscale ;}; - + fontmiscmisc = (stdenv.mkDerivation ((if overrides ? fontmiscmisc then overrides.fontmiscmisc else x: x) { name = "font-misc-misc-1.1.2"; builder = ./builder.sh; @@ -378,7 +378,7 @@ let }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; - + fontmuttmisc = (stdenv.mkDerivation ((if overrides ? fontmuttmisc then overrides.fontmuttmisc else x: x) { name = "font-mutt-misc-1.0.3"; builder = ./builder.sh; @@ -388,7 +388,7 @@ let }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; - + fontschumachermisc = (stdenv.mkDerivation ((if overrides ? fontschumachermisc then overrides.fontschumachermisc else x: x) { name = "font-schumacher-misc-1.1.2"; builder = ./builder.sh; @@ -398,7 +398,7 @@ let }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; - + fontscreencyrillic = (stdenv.mkDerivation ((if overrides ? fontscreencyrillic then overrides.fontscreencyrillic else x: x) { name = "font-screen-cyrillic-1.0.4"; builder = ./builder.sh; @@ -408,7 +408,7 @@ let }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; - + fontsonymisc = (stdenv.mkDerivation ((if overrides ? fontsonymisc then overrides.fontsonymisc else x: x) { name = "font-sony-misc-1.0.3"; builder = ./builder.sh; @@ -418,7 +418,7 @@ let }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; - + fontsproto = (stdenv.mkDerivation ((if overrides ? fontsproto then overrides.fontsproto else x: x) { name = "fontsproto-2.1.2"; builder = ./builder.sh; @@ -428,7 +428,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + fontsunmisc = (stdenv.mkDerivation ((if overrides ? fontsunmisc then overrides.fontsunmisc else x: x) { name = "font-sun-misc-1.0.3"; builder = ./builder.sh; @@ -438,7 +438,7 @@ let }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; - + fontutil = (stdenv.mkDerivation ((if overrides ? fontutil then overrides.fontutil else x: x) { name = "font-util-1.3.0"; builder = ./builder.sh; @@ -448,7 +448,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + fontwinitzkicyrillic = (stdenv.mkDerivation ((if overrides ? fontwinitzkicyrillic then overrides.fontwinitzkicyrillic else x: x) { name = "font-winitzki-cyrillic-1.0.3"; builder = ./builder.sh; @@ -458,7 +458,7 @@ let }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; - + fontxfree86type1 = (stdenv.mkDerivation ((if overrides ? fontxfree86type1 then overrides.fontxfree86type1 else x: x) { name = "font-xfree86-type1-1.0.4"; builder = ./builder.sh; @@ -468,7 +468,7 @@ let }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit mkfontdir mkfontscale ;}; - + gccmakedep = (stdenv.mkDerivation ((if overrides ? gccmakedep then overrides.gccmakedep else x: x) { name = "gccmakedep-1.0.2"; builder = ./builder.sh; @@ -478,7 +478,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + glproto = (stdenv.mkDerivation ((if overrides ? glproto then overrides.glproto else x: x) { name = "glproto-1.4.16"; builder = ./builder.sh; @@ -488,7 +488,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + iceauth = (stdenv.mkDerivation ((if overrides ? iceauth then overrides.iceauth else x: x) { name = "iceauth-1.0.5"; builder = ./builder.sh; @@ -498,7 +498,7 @@ let }; buildInputs = [pkgconfig libICE xproto ]; })) // {inherit libICE xproto ;}; - + imake = (stdenv.mkDerivation ((if overrides ? imake then overrides.imake else x: x) { name = "imake-1.0.5"; builder = ./builder.sh; @@ -508,7 +508,7 @@ let }; buildInputs = [pkgconfig xproto ]; })) // {inherit xproto ;}; - + inputproto = (stdenv.mkDerivation ((if overrides ? inputproto then overrides.inputproto else x: x) { name = "inputproto-2.3"; builder = ./builder.sh; @@ -518,7 +518,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + kbproto = (stdenv.mkDerivation ((if overrides ? kbproto then overrides.kbproto else x: x) { name = "kbproto-1.0.6"; builder = ./builder.sh; @@ -528,7 +528,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + libAppleWM = (stdenv.mkDerivation ((if overrides ? libAppleWM then overrides.libAppleWM else x: x) { name = "libAppleWM-1.4.1"; builder = ./builder.sh; @@ -538,7 +538,7 @@ let }; buildInputs = [pkgconfig applewmproto libX11 libXext xextproto ]; })) // {inherit applewmproto libX11 libXext xextproto ;}; - + libFS = (stdenv.mkDerivation ((if overrides ? libFS then overrides.libFS else x: x) { name = "libFS-1.0.5"; builder = ./builder.sh; @@ -548,7 +548,7 @@ let }; buildInputs = [pkgconfig fontsproto xproto xtrans ]; })) // {inherit fontsproto xproto xtrans ;}; - + libICE = (stdenv.mkDerivation ((if overrides ? libICE then overrides.libICE else x: x) { name = "libICE-1.0.8"; builder = ./builder.sh; @@ -558,7 +558,7 @@ let }; buildInputs = [pkgconfig xproto xtrans ]; })) // {inherit xproto xtrans ;}; - + libSM = (stdenv.mkDerivation ((if overrides ? libSM then overrides.libSM else x: x) { name = "libSM-1.2.1"; builder = ./builder.sh; @@ -568,7 +568,7 @@ let }; buildInputs = [pkgconfig libICE libuuid xproto xtrans ]; })) // {inherit libICE libuuid xproto xtrans ;}; - + libWindowsWM = (stdenv.mkDerivation ((if overrides ? libWindowsWM then overrides.libWindowsWM else x: x) { name = "libWindowsWM-1.0.1"; builder = ./builder.sh; @@ -578,7 +578,7 @@ let }; buildInputs = [pkgconfig windowswmproto libX11 libXext xextproto ]; })) // {inherit windowswmproto libX11 libXext xextproto ;}; - + libX11 = (stdenv.mkDerivation ((if overrides ? libX11 then overrides.libX11 else x: x) { name = "libX11-1.6.0"; builder = ./builder.sh; @@ -588,7 +588,7 @@ let }; buildInputs = [pkgconfig inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ]; })) // {inherit inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ;}; - + libXScrnSaver = (stdenv.mkDerivation ((if overrides ? libXScrnSaver then overrides.libXScrnSaver else x: x) { name = "libXScrnSaver-1.2.2"; builder = ./builder.sh; @@ -598,7 +598,7 @@ let }; buildInputs = [pkgconfig scrnsaverproto libX11 libXext xextproto ]; })) // {inherit scrnsaverproto libX11 libXext xextproto ;}; - + libXau = (stdenv.mkDerivation ((if overrides ? libXau then overrides.libXau else x: x) { name = "libXau-1.0.7"; builder = ./builder.sh; @@ -608,7 +608,7 @@ let }; buildInputs = [pkgconfig xproto ]; })) // {inherit xproto ;}; - + libXaw = (stdenv.mkDerivation ((if overrides ? libXaw then overrides.libXaw else x: x) { name = "libXaw-1.0.11"; builder = ./builder.sh; @@ -618,7 +618,7 @@ let }; buildInputs = [pkgconfig libX11 libXext xextproto libXmu libXpm xproto libXt ]; })) // {inherit libX11 libXext xextproto libXmu libXpm xproto libXt ;}; - + libXcomposite = (stdenv.mkDerivation ((if overrides ? libXcomposite then overrides.libXcomposite else x: x) { name = "libXcomposite-0.4.3"; builder = ./builder.sh; @@ -628,7 +628,7 @@ let }; buildInputs = [pkgconfig compositeproto libX11 libXfixes xproto ]; })) // {inherit compositeproto libX11 libXfixes xproto ;}; - + libXcursor = (stdenv.mkDerivation ((if overrides ? libXcursor then overrides.libXcursor else x: x) { name = "libXcursor-1.1.14"; builder = ./builder.sh; @@ -638,7 +638,7 @@ let }; buildInputs = [pkgconfig fixesproto libX11 libXfixes xproto libXrender ]; })) // {inherit fixesproto libX11 libXfixes xproto libXrender ;}; - + libXdamage = (stdenv.mkDerivation ((if overrides ? libXdamage then overrides.libXdamage else x: x) { name = "libXdamage-1.1.3"; builder = ./builder.sh; @@ -648,7 +648,7 @@ let }; buildInputs = [pkgconfig damageproto fixesproto libX11 xextproto libXfixes xproto ]; })) // {inherit damageproto fixesproto libX11 xextproto libXfixes xproto ;}; - + libXdmcp = (stdenv.mkDerivation ((if overrides ? libXdmcp then overrides.libXdmcp else x: x) { name = "libXdmcp-1.1.1"; builder = ./builder.sh; @@ -658,7 +658,7 @@ let }; buildInputs = [pkgconfig xproto ]; })) // {inherit xproto ;}; - + libXext = (stdenv.mkDerivation ((if overrides ? libXext then overrides.libXext else x: x) { name = "libXext-1.3.2"; builder = ./builder.sh; @@ -668,7 +668,7 @@ let }; buildInputs = [pkgconfig libX11 xextproto xproto ]; })) // {inherit libX11 xextproto xproto ;}; - + libXfixes = (stdenv.mkDerivation ((if overrides ? libXfixes then overrides.libXfixes else x: x) { name = "libXfixes-5.0.1"; builder = ./builder.sh; @@ -678,7 +678,7 @@ let }; buildInputs = [pkgconfig fixesproto libX11 xextproto xproto ]; })) // {inherit fixesproto libX11 xextproto xproto ;}; - + libXfont = (stdenv.mkDerivation ((if overrides ? libXfont then overrides.libXfont else x: x) { name = "libXfont-1.4.5"; builder = ./builder.sh; @@ -688,7 +688,7 @@ let }; buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ]; })) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;}; - + libXft = (stdenv.mkDerivation ((if overrides ? libXft then overrides.libXft else x: x) { name = "libXft-2.3.1"; builder = ./builder.sh; @@ -698,7 +698,7 @@ let }; buildInputs = [pkgconfig fontconfig freetype libX11 xproto libXrender ]; })) // {inherit fontconfig freetype libX11 xproto libXrender ;}; - + libXi = (stdenv.mkDerivation ((if overrides ? libXi then overrides.libXi else x: x) { name = "libXi-1.7.1"; builder = ./builder.sh; @@ -708,7 +708,7 @@ let }; buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ]; })) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;}; - + libXinerama = (stdenv.mkDerivation ((if overrides ? libXinerama then overrides.libXinerama else x: x) { name = "libXinerama-1.1.3"; builder = ./builder.sh; @@ -718,7 +718,7 @@ let }; buildInputs = [pkgconfig libX11 libXext xextproto xineramaproto ]; })) // {inherit libX11 libXext xextproto xineramaproto ;}; - + libXmu = (stdenv.mkDerivation ((if overrides ? libXmu then overrides.libXmu else x: x) { name = "libXmu-1.1.1"; builder = ./builder.sh; @@ -728,7 +728,7 @@ let }; buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ]; })) // {inherit libX11 libXext xextproto xproto libXt ;}; - + libXp = (stdenv.mkDerivation ((if overrides ? libXp then overrides.libXp else x: x) { name = "libXp-1.0.2"; builder = ./builder.sh; @@ -738,7 +738,7 @@ let }; buildInputs = [pkgconfig printproto libX11 libXau libXext xextproto ]; })) // {inherit printproto libX11 libXau libXext xextproto ;}; - + libXpm = (stdenv.mkDerivation ((if overrides ? libXpm then overrides.libXpm else x: x) { name = "libXpm-3.5.10"; builder = ./builder.sh; @@ -748,7 +748,7 @@ let }; buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ]; })) // {inherit libX11 libXext xextproto xproto libXt ;}; - + libXrandr = (stdenv.mkDerivation ((if overrides ? libXrandr then overrides.libXrandr else x: x) { name = "libXrandr-1.4.1"; builder = ./builder.sh; @@ -758,17 +758,17 @@ let }; buildInputs = [pkgconfig randrproto renderproto libX11 libXext xextproto xproto libXrender ]; })) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;}; - + libXrender = (stdenv.mkDerivation ((if overrides ? libXrender then overrides.libXrender else x: x) { - name = "libXrender-0.9.7"; + name = "libXrender-0.9.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXrender-0.9.7.tar.bz2; - sha256 = "1rmvja2gkf5v0k2n1bcghw8v98m2kfn3af0rbmsda5dwr69npd7r"; + url = mirror://xorg/individual/lib/libXrender-0.9.8.tar.bz2; + sha256 = "0qpwyjhbpp734vnhca992pjh4w7ijslidkzx1pcwbbk000pv050x"; }; buildInputs = [pkgconfig renderproto libX11 xproto ]; })) // {inherit renderproto libX11 xproto ;}; - + libXres = (stdenv.mkDerivation ((if overrides ? libXres then overrides.libXres else x: x) { name = "libXres-1.0.7"; builder = ./builder.sh; @@ -778,7 +778,7 @@ let }; buildInputs = [pkgconfig resourceproto libX11 libXext xextproto xproto ]; })) // {inherit resourceproto libX11 libXext xextproto xproto ;}; - + libXt = (stdenv.mkDerivation ((if overrides ? libXt then overrides.libXt else x: x) { name = "libXt-1.1.4"; builder = ./builder.sh; @@ -788,7 +788,7 @@ let }; buildInputs = [pkgconfig libICE kbproto libSM libX11 xproto ]; })) // {inherit libICE kbproto libSM libX11 xproto ;}; - + libXtst = (stdenv.mkDerivation ((if overrides ? libXtst then overrides.libXtst else x: x) { name = "libXtst-1.2.1"; builder = ./builder.sh; @@ -798,7 +798,7 @@ let }; buildInputs = [pkgconfig inputproto recordproto libX11 libXext xextproto libXi ]; })) // {inherit inputproto recordproto libX11 libXext xextproto libXi ;}; - + libXv = (stdenv.mkDerivation ((if overrides ? libXv then overrides.libXv else x: x) { name = "libXv-1.0.8"; builder = ./builder.sh; @@ -808,17 +808,17 @@ let }; buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto ]; })) // {inherit videoproto libX11 libXext xextproto xproto ;}; - + libXvMC = (stdenv.mkDerivation ((if overrides ? libXvMC then overrides.libXvMC else x: x) { - name = "libXvMC-1.0.7"; + name = "libXvMC-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXvMC-1.0.7.tar.bz2; - sha256 = "18yf6ysc01pqkbk9704914ghalq1sl2hfdjmwggxm8qqhpy8bw18"; + url = mirror://xorg/individual/lib/libXvMC-1.0.8.tar.bz2; + sha256 = "015jk3bxfmj6zaw99x282f9npi8qqaw34yg186frags3z8g406jy"; }; buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto libXv ]; })) // {inherit videoproto libX11 libXext xextproto xproto libXv ;}; - + libXxf86dga = (stdenv.mkDerivation ((if overrides ? libXxf86dga then overrides.libXxf86dga else x: x) { name = "libXxf86dga-1.1.4"; builder = ./builder.sh; @@ -828,7 +828,7 @@ let }; buildInputs = [pkgconfig libX11 libXext xextproto xf86dgaproto xproto ]; })) // {inherit libX11 libXext xextproto xf86dgaproto xproto ;}; - + libXxf86misc = (stdenv.mkDerivation ((if overrides ? libXxf86misc then overrides.libXxf86misc else x: x) { name = "libXxf86misc-1.0.3"; builder = ./builder.sh; @@ -838,7 +838,7 @@ let }; buildInputs = [pkgconfig libX11 libXext xextproto xf86miscproto xproto ]; })) // {inherit libX11 libXext xextproto xf86miscproto xproto ;}; - + libXxf86vm = (stdenv.mkDerivation ((if overrides ? libXxf86vm then overrides.libXxf86vm else x: x) { name = "libXxf86vm-1.1.3"; builder = ./builder.sh; @@ -848,7 +848,7 @@ let }; buildInputs = [pkgconfig libX11 libXext xextproto xf86vidmodeproto xproto ]; })) // {inherit libX11 libXext xextproto xf86vidmodeproto xproto ;}; - + libdmx = (stdenv.mkDerivation ((if overrides ? libdmx then overrides.libdmx else x: x) { name = "libdmx-1.1.3"; builder = ./builder.sh; @@ -858,7 +858,7 @@ let }; buildInputs = [pkgconfig dmxproto libX11 libXext xextproto ]; })) // {inherit dmxproto libX11 libXext xextproto ;}; - + libfontenc = (stdenv.mkDerivation ((if overrides ? libfontenc then overrides.libfontenc else x: x) { name = "libfontenc-1.1.1"; builder = ./builder.sh; @@ -868,7 +868,7 @@ let }; buildInputs = [pkgconfig xproto zlib ]; })) // {inherit xproto zlib ;}; - + libpciaccess = (stdenv.mkDerivation ((if overrides ? libpciaccess then overrides.libpciaccess else x: x) { name = "libpciaccess-0.13.1"; builder = ./builder.sh; @@ -878,7 +878,7 @@ let }; buildInputs = [pkgconfig zlib ]; })) // {inherit zlib ;}; - + libpthreadstubs = (stdenv.mkDerivation ((if overrides ? libpthreadstubs then overrides.libpthreadstubs else x: x) { name = "libpthread-stubs-0.3"; builder = ./builder.sh; @@ -888,7 +888,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + libxcb = (stdenv.mkDerivation ((if overrides ? libxcb then overrides.libxcb else x: x) { name = "libxcb-1.9.1"; builder = ./builder.sh; @@ -898,7 +898,7 @@ let }; buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ]; })) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;}; - + libxkbfile = (stdenv.mkDerivation ((if overrides ? libxkbfile then overrides.libxkbfile else x: x) { name = "libxkbfile-1.0.8"; builder = ./builder.sh; @@ -908,7 +908,7 @@ let }; buildInputs = [pkgconfig kbproto libX11 ]; })) // {inherit kbproto libX11 ;}; - + lndir = (stdenv.mkDerivation ((if overrides ? lndir then overrides.lndir else x: x) { name = "lndir-1.0.3"; builder = ./builder.sh; @@ -918,7 +918,7 @@ let }; buildInputs = [pkgconfig xproto ]; })) // {inherit xproto ;}; - + luit = (stdenv.mkDerivation ((if overrides ? luit then overrides.luit else x: x) { name = "luit-1.1.1"; builder = ./builder.sh; @@ -928,7 +928,7 @@ let }; buildInputs = [pkgconfig libfontenc ]; })) // {inherit libfontenc ;}; - + makedepend = (stdenv.mkDerivation ((if overrides ? makedepend then overrides.makedepend else x: x) { name = "makedepend-1.0.4"; builder = ./builder.sh; @@ -938,7 +938,7 @@ let }; buildInputs = [pkgconfig xproto ]; })) // {inherit xproto ;}; - + mkfontdir = (stdenv.mkDerivation ((if overrides ? mkfontdir then overrides.mkfontdir else x: x) { name = "mkfontdir-1.0.7"; builder = ./builder.sh; @@ -948,7 +948,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + mkfontscale = (stdenv.mkDerivation ((if overrides ? mkfontscale then overrides.mkfontscale else x: x) { name = "mkfontscale-1.1.0"; builder = ./builder.sh; @@ -958,7 +958,7 @@ let }; buildInputs = [pkgconfig libfontenc freetype xproto zlib ]; })) // {inherit libfontenc freetype xproto zlib ;}; - + printproto = (stdenv.mkDerivation ((if overrides ? printproto then overrides.printproto else x: x) { name = "printproto-1.0.5"; builder = ./builder.sh; @@ -968,7 +968,7 @@ let }; buildInputs = [pkgconfig libXau ]; })) // {inherit libXau ;}; - + randrproto = (stdenv.mkDerivation ((if overrides ? randrproto then overrides.randrproto else x: x) { name = "randrproto-1.4.0"; builder = ./builder.sh; @@ -978,7 +978,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + recordproto = (stdenv.mkDerivation ((if overrides ? recordproto then overrides.recordproto else x: x) { name = "recordproto-1.14.2"; builder = ./builder.sh; @@ -988,7 +988,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + renderproto = (stdenv.mkDerivation ((if overrides ? renderproto then overrides.renderproto else x: x) { name = "renderproto-0.11.1"; builder = ./builder.sh; @@ -998,7 +998,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + resourceproto = (stdenv.mkDerivation ((if overrides ? resourceproto then overrides.resourceproto else x: x) { name = "resourceproto-1.2.0"; builder = ./builder.sh; @@ -1008,7 +1008,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + scrnsaverproto = (stdenv.mkDerivation ((if overrides ? scrnsaverproto then overrides.scrnsaverproto else x: x) { name = "scrnsaverproto-1.2.2"; builder = ./builder.sh; @@ -1018,7 +1018,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + sessreg = (stdenv.mkDerivation ((if overrides ? sessreg then overrides.sessreg else x: x) { name = "sessreg-1.0.7"; builder = ./builder.sh; @@ -1028,7 +1028,7 @@ let }; buildInputs = [pkgconfig xproto ]; })) // {inherit xproto ;}; - + setxkbmap = (stdenv.mkDerivation ((if overrides ? setxkbmap then overrides.setxkbmap else x: x) { name = "setxkbmap-1.3.0"; builder = ./builder.sh; @@ -1038,7 +1038,7 @@ let }; buildInputs = [pkgconfig libX11 libxkbfile ]; })) // {inherit libX11 libxkbfile ;}; - + smproxy = (stdenv.mkDerivation ((if overrides ? smproxy then overrides.smproxy else x: x) { name = "smproxy-1.0.5"; builder = ./builder.sh; @@ -1048,7 +1048,7 @@ let }; buildInputs = [pkgconfig libICE libSM libXmu libXt ]; })) // {inherit libICE libSM libXmu libXt ;}; - + twm = (stdenv.mkDerivation ((if overrides ? twm then overrides.twm else x: x) { name = "twm-1.0.7"; builder = ./builder.sh; @@ -1058,7 +1058,7 @@ let }; buildInputs = [pkgconfig libICE libSM libX11 libXext libXmu xproto libXt ]; })) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;}; - + utilmacros = (stdenv.mkDerivation ((if overrides ? utilmacros then overrides.utilmacros else x: x) { name = "util-macros-1.17"; builder = ./builder.sh; @@ -1068,7 +1068,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + videoproto = (stdenv.mkDerivation ((if overrides ? videoproto then overrides.videoproto else x: x) { name = "videoproto-2.3.1"; builder = ./builder.sh; @@ -1078,7 +1078,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + windowswmproto = (stdenv.mkDerivation ((if overrides ? windowswmproto then overrides.windowswmproto else x: x) { name = "windowswmproto-1.0.4"; builder = ./builder.sh; @@ -1088,7 +1088,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + x11perf = (stdenv.mkDerivation ((if overrides ? x11perf then overrides.x11perf else x: x) { name = "x11perf-1.5.4"; builder = ./builder.sh; @@ -1098,7 +1098,7 @@ let }; buildInputs = [pkgconfig libX11 libXext libXft libXmu libXrender ]; })) // {inherit libX11 libXext libXft libXmu libXrender ;}; - + xauth = (stdenv.mkDerivation ((if overrides ? xauth then overrides.xauth else x: x) { name = "xauth-1.0.7"; builder = ./builder.sh; @@ -1108,7 +1108,7 @@ let }; buildInputs = [pkgconfig libX11 libXau libXext libXmu ]; })) // {inherit libX11 libXau libXext libXmu ;}; - + xbacklight = (stdenv.mkDerivation ((if overrides ? xbacklight then overrides.xbacklight else x: x) { name = "xbacklight-1.2.0"; builder = ./builder.sh; @@ -1118,7 +1118,7 @@ let }; buildInputs = [pkgconfig libxcb xcbutil ]; })) // {inherit libxcb xcbutil ;}; - + xbitmaps = (stdenv.mkDerivation ((if overrides ? xbitmaps then overrides.xbitmaps else x: x) { name = "xbitmaps-1.1.1"; builder = ./builder.sh; @@ -1128,7 +1128,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + xcbproto = (stdenv.mkDerivation ((if overrides ? xcbproto then overrides.xcbproto else x: x) { name = "xcb-proto-1.8"; builder = ./builder.sh; @@ -1138,7 +1138,7 @@ let }; buildInputs = [pkgconfig python ]; })) // {inherit python ;}; - + xcbutil = (stdenv.mkDerivation ((if overrides ? xcbutil then overrides.xcbutil else x: x) { name = "xcb-util-0.3.9"; builder = ./builder.sh; @@ -1148,7 +1148,7 @@ let }; buildInputs = [pkgconfig gperf m4 libxcb xproto ]; })) // {inherit gperf m4 libxcb xproto ;}; - + xcbutilimage = (stdenv.mkDerivation ((if overrides ? xcbutilimage then overrides.xcbutilimage else x: x) { name = "xcb-util-image-0.3.9"; builder = ./builder.sh; @@ -1158,7 +1158,7 @@ let }; buildInputs = [pkgconfig gperf m4 libxcb xcbutil xproto ]; })) // {inherit gperf m4 libxcb xcbutil xproto ;}; - + xcbutilkeysyms = (stdenv.mkDerivation ((if overrides ? xcbutilkeysyms then overrides.xcbutilkeysyms else x: x) { name = "xcb-util-keysyms-0.3.9"; builder = ./builder.sh; @@ -1168,7 +1168,7 @@ let }; buildInputs = [pkgconfig gperf m4 libxcb xproto ]; })) // {inherit gperf m4 libxcb xproto ;}; - + xcbutilrenderutil = (stdenv.mkDerivation ((if overrides ? xcbutilrenderutil then overrides.xcbutilrenderutil else x: x) { name = "xcb-util-renderutil-0.3.8"; builder = ./builder.sh; @@ -1178,7 +1178,7 @@ let }; buildInputs = [pkgconfig gperf m4 libxcb xproto ]; })) // {inherit gperf m4 libxcb xproto ;}; - + xcbutilwm = (stdenv.mkDerivation ((if overrides ? xcbutilwm then overrides.xcbutilwm else x: x) { name = "xcb-util-wm-0.3.9"; builder = ./builder.sh; @@ -1188,7 +1188,7 @@ let }; buildInputs = [pkgconfig gperf m4 libxcb xproto ]; })) // {inherit gperf m4 libxcb xproto ;}; - + xclock = (stdenv.mkDerivation ((if overrides ? xclock then overrides.xclock else x: x) { name = "xclock-1.0.6"; builder = ./builder.sh; @@ -1198,7 +1198,7 @@ let }; buildInputs = [pkgconfig libX11 libXaw libXft libxkbfile libXmu libXrender libXt ]; })) // {inherit libX11 libXaw libXft libxkbfile libXmu libXrender libXt ;}; - + xcmiscproto = (stdenv.mkDerivation ((if overrides ? xcmiscproto then overrides.xcmiscproto else x: x) { name = "xcmiscproto-1.2.2"; builder = ./builder.sh; @@ -1208,7 +1208,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + xcmsdb = (stdenv.mkDerivation ((if overrides ? xcmsdb then overrides.xcmsdb else x: x) { name = "xcmsdb-1.0.4"; builder = ./builder.sh; @@ -1218,7 +1218,7 @@ let }; buildInputs = [pkgconfig libX11 ]; })) // {inherit libX11 ;}; - + xcursorgen = (stdenv.mkDerivation ((if overrides ? xcursorgen then overrides.xcursorgen else x: x) { name = "xcursorgen-1.0.5"; builder = ./builder.sh; @@ -1228,7 +1228,7 @@ let }; buildInputs = [pkgconfig libpng libX11 libXcursor ]; })) // {inherit libpng libX11 libXcursor ;}; - + xcursorthemes = (stdenv.mkDerivation ((if overrides ? xcursorthemes then overrides.xcursorthemes else x: x) { name = "xcursor-themes-1.0.3"; builder = ./builder.sh; @@ -1238,7 +1238,7 @@ let }; buildInputs = [pkgconfig libXcursor ]; })) // {inherit libXcursor ;}; - + xdm = (stdenv.mkDerivation ((if overrides ? xdm then overrides.xdm else x: x) { name = "xdm-1.1.11"; builder = ./builder.sh; @@ -1248,7 +1248,7 @@ let }; buildInputs = [pkgconfig libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ]; })) // {inherit libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ;}; - + xdpyinfo = (stdenv.mkDerivation ((if overrides ? xdpyinfo then overrides.xdpyinfo else x: x) { name = "xdpyinfo-1.3.0"; builder = ./builder.sh; @@ -1258,7 +1258,7 @@ let }; buildInputs = [pkgconfig libdmx libX11 libxcb libXcomposite libXext libXi libXinerama libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ]; })) // {inherit libdmx libX11 libxcb libXcomposite libXext libXi libXinerama libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;}; - + xdriinfo = (stdenv.mkDerivation ((if overrides ? xdriinfo then overrides.xdriinfo else x: x) { name = "xdriinfo-1.0.4"; builder = ./builder.sh; @@ -1268,7 +1268,7 @@ let }; buildInputs = [pkgconfig glproto libX11 ]; })) // {inherit glproto libX11 ;}; - + xev = (stdenv.mkDerivation ((if overrides ? xev then overrides.xev else x: x) { name = "xev-1.2.0"; builder = ./builder.sh; @@ -1278,7 +1278,7 @@ let }; buildInputs = [pkgconfig libX11 xproto libXrandr ]; })) // {inherit libX11 xproto libXrandr ;}; - + xextproto = (stdenv.mkDerivation ((if overrides ? xextproto then overrides.xextproto else x: x) { name = "xextproto-7.2.1"; builder = ./builder.sh; @@ -1288,7 +1288,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + xeyes = (stdenv.mkDerivation ((if overrides ? xeyes then overrides.xeyes else x: x) { name = "xeyes-1.1.1"; builder = ./builder.sh; @@ -1298,7 +1298,7 @@ let }; buildInputs = [pkgconfig libX11 libXext libXmu libXrender libXt ]; })) // {inherit libX11 libXext libXmu libXrender libXt ;}; - + xf86bigfontproto = (stdenv.mkDerivation ((if overrides ? xf86bigfontproto then overrides.xf86bigfontproto else x: x) { name = "xf86bigfontproto-1.2.0"; builder = ./builder.sh; @@ -1308,7 +1308,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + xf86dgaproto = (stdenv.mkDerivation ((if overrides ? xf86dgaproto then overrides.xf86dgaproto else x: x) { name = "xf86dgaproto-2.1"; builder = ./builder.sh; @@ -1318,7 +1318,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + xf86driproto = (stdenv.mkDerivation ((if overrides ? xf86driproto then overrides.xf86driproto else x: x) { name = "xf86driproto-2.1.1"; builder = ./builder.sh; @@ -1328,7 +1328,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + xf86inputevdev = (stdenv.mkDerivation ((if overrides ? xf86inputevdev then overrides.xf86inputevdev else x: x) { name = "xf86-input-evdev-2.7.3"; builder = ./builder.sh; @@ -1338,7 +1338,7 @@ let }; buildInputs = [pkgconfig inputproto udev xorgserver xproto ]; })) // {inherit inputproto udev xorgserver xproto ;}; - + xf86inputjoystick = (stdenv.mkDerivation ((if overrides ? xf86inputjoystick then overrides.xf86inputjoystick else x: x) { name = "xf86-input-joystick-1.6.2"; builder = ./builder.sh; @@ -1348,7 +1348,7 @@ let }; buildInputs = [pkgconfig inputproto kbproto xorgserver xproto ]; })) // {inherit inputproto kbproto xorgserver xproto ;}; - + xf86inputkeyboard = (stdenv.mkDerivation ((if overrides ? xf86inputkeyboard then overrides.xf86inputkeyboard else x: x) { name = "xf86-input-keyboard-1.6.1"; builder = ./builder.sh; @@ -1358,7 +1358,7 @@ let }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; })) // {inherit inputproto xorgserver xproto ;}; - + xf86inputmouse = (stdenv.mkDerivation ((if overrides ? xf86inputmouse then overrides.xf86inputmouse else x: x) { name = "xf86-input-mouse-1.7.2"; builder = ./builder.sh; @@ -1368,7 +1368,7 @@ let }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; })) // {inherit inputproto xorgserver xproto ;}; - + xf86inputsynaptics = (stdenv.mkDerivation ((if overrides ? xf86inputsynaptics then overrides.xf86inputsynaptics else x: x) { name = "xf86-input-synaptics-1.6.2"; builder = ./builder.sh; @@ -1378,7 +1378,7 @@ let }; buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ]; })) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;}; - + xf86inputvmmouse = (stdenv.mkDerivation ((if overrides ? xf86inputvmmouse then overrides.xf86inputvmmouse else x: x) { name = "xf86-input-vmmouse-13.0.0"; builder = ./builder.sh; @@ -1388,7 +1388,7 @@ let }; buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; })) // {inherit inputproto randrproto xorgserver xproto ;}; - + xf86inputvoid = (stdenv.mkDerivation ((if overrides ? xf86inputvoid then overrides.xf86inputvoid else x: x) { name = "xf86-input-void-1.4.0"; builder = ./builder.sh; @@ -1398,7 +1398,7 @@ let }; buildInputs = [pkgconfig xorgserver xproto ]; })) // {inherit xorgserver xproto ;}; - + xf86miscproto = (stdenv.mkDerivation ((if overrides ? xf86miscproto then overrides.xf86miscproto else x: x) { name = "xf86miscproto-0.9.3"; builder = ./builder.sh; @@ -1408,7 +1408,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + xf86videoark = (stdenv.mkDerivation ((if overrides ? xf86videoark then overrides.xf86videoark else x: x) { name = "xf86-video-ark-0.7.5"; builder = ./builder.sh; @@ -1418,7 +1418,7 @@ let }; buildInputs = [pkgconfig fontsproto libpciaccess xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess xextproto xorgserver xproto ;}; - + xf86videoast = (stdenv.mkDerivation ((if overrides ? xf86videoast then overrides.xf86videoast else x: x) { name = "xf86-video-ast-0.97.0"; builder = ./builder.sh; @@ -1428,7 +1428,7 @@ let }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; - + xf86videoati = (stdenv.mkDerivation ((if overrides ? xf86videoati then overrides.xf86videoati else x: x) { name = "xf86-video-ati-7.1.0"; builder = ./builder.sh; @@ -1438,7 +1438,7 @@ let }; buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; })) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; - + xf86videocirrus = (stdenv.mkDerivation ((if overrides ? xf86videocirrus then overrides.xf86videocirrus else x: x) { name = "xf86-video-cirrus-1.5.1"; builder = ./builder.sh; @@ -1448,7 +1448,7 @@ let }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; - + xf86videodummy = (stdenv.mkDerivation ((if overrides ? xf86videodummy then overrides.xf86videodummy else x: x) { name = "xf86-video-dummy-0.3.6"; builder = ./builder.sh; @@ -1458,7 +1458,7 @@ let }; buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; })) // {inherit fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;}; - + xf86videofbdev = (stdenv.mkDerivation ((if overrides ? xf86videofbdev then overrides.xf86videofbdev else x: x) { name = "xf86-video-fbdev-0.4.3"; builder = ./builder.sh; @@ -1468,7 +1468,7 @@ let }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;}; - + xf86videogeode = (stdenv.mkDerivation ((if overrides ? xf86videogeode then overrides.xf86videogeode else x: x) { name = "xf86-video-geode-2.11.14"; builder = ./builder.sh; @@ -1478,7 +1478,7 @@ let }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; - + xf86videoglide = (stdenv.mkDerivation ((if overrides ? xf86videoglide then overrides.xf86videoglide else x: x) { name = "xf86-video-glide-1.2.1"; builder = ./builder.sh; @@ -1488,7 +1488,7 @@ let }; buildInputs = [pkgconfig xextproto xorgserver xproto ]; })) // {inherit xextproto xorgserver xproto ;}; - + xf86videoglint = (stdenv.mkDerivation ((if overrides ? xf86videoglint then overrides.xf86videoglint else x: x) { name = "xf86-video-glint-1.2.8"; builder = ./builder.sh; @@ -1498,7 +1498,7 @@ let }; buildInputs = [pkgconfig libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ]; })) // {inherit libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ;}; - + xf86videoi128 = (stdenv.mkDerivation ((if overrides ? xf86videoi128 then overrides.xf86videoi128 else x: x) { name = "xf86-video-i128-1.3.6"; builder = ./builder.sh; @@ -1508,7 +1508,7 @@ let }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; - + xf86videointel = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) { name = "xf86-video-intel-2.21.9"; builder = ./builder.sh; @@ -1518,7 +1518,7 @@ let }; buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ]; })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ;}; - + xf86videomach64 = (stdenv.mkDerivation ((if overrides ? xf86videomach64 then overrides.xf86videomach64 else x: x) { name = "xf86-video-mach64-6.9.4"; builder = ./builder.sh; @@ -1528,7 +1528,7 @@ let }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; - + xf86videomga = (stdenv.mkDerivation ((if overrides ? xf86videomga then overrides.xf86videomga else x: x) { name = "xf86-video-mga-1.6.2"; builder = ./builder.sh; @@ -1538,7 +1538,7 @@ let }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; - + xf86videoneomagic = (stdenv.mkDerivation ((if overrides ? xf86videoneomagic then overrides.xf86videoneomagic else x: x) { name = "xf86-video-neomagic-1.2.7"; builder = ./builder.sh; @@ -1548,7 +1548,7 @@ let }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; - + xf86videonewport = (stdenv.mkDerivation ((if overrides ? xf86videonewport then overrides.xf86videonewport else x: x) { name = "xf86-video-newport-0.2.4"; builder = ./builder.sh; @@ -1558,7 +1558,7 @@ let }; buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xorgserver xproto ]; })) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;}; - + xf86videonv = (stdenv.mkDerivation ((if overrides ? xf86videonv then overrides.xf86videonv else x: x) { name = "xf86-video-nv-2.1.20"; builder = ./builder.sh; @@ -1568,7 +1568,7 @@ let }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; - + xf86videoopenchrome = (stdenv.mkDerivation ((if overrides ? xf86videoopenchrome then overrides.xf86videoopenchrome else x: x) { name = "xf86-video-openchrome-0.3.3"; builder = ./builder.sh; @@ -1578,7 +1578,7 @@ let }; buildInputs = [pkgconfig fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ]; })) // {inherit fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;}; - + xf86videor128 = (stdenv.mkDerivation ((if overrides ? xf86videor128 then overrides.xf86videor128 else x: x) { name = "xf86-video-r128-6.9.1"; builder = ./builder.sh; @@ -1588,7 +1588,7 @@ let }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ;}; - + xf86videosavage = (stdenv.mkDerivation ((if overrides ? xf86videosavage then overrides.xf86videosavage else x: x) { name = "xf86-video-savage-2.3.6"; builder = ./builder.sh; @@ -1598,7 +1598,7 @@ let }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; - + xf86videosiliconmotion = (stdenv.mkDerivation ((if overrides ? xf86videosiliconmotion then overrides.xf86videosiliconmotion else x: x) { name = "xf86-video-siliconmotion-1.7.7"; builder = ./builder.sh; @@ -1608,7 +1608,7 @@ let }; buildInputs = [pkgconfig fontsproto libpciaccess videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess videoproto xextproto xorgserver xproto ;}; - + xf86videosis = (stdenv.mkDerivation ((if overrides ? xf86videosis then overrides.xf86videosis else x: x) { name = "xf86-video-sis-0.10.7"; builder = ./builder.sh; @@ -1618,7 +1618,7 @@ let }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ;}; - + xf86videosuncg6 = (stdenv.mkDerivation ((if overrides ? xf86videosuncg6 then overrides.xf86videosuncg6 else x: x) { name = "xf86-video-suncg6-1.1.2"; builder = ./builder.sh; @@ -1628,7 +1628,7 @@ let }; buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ]; })) // {inherit fontsproto randrproto renderproto xorgserver xproto ;}; - + xf86videosunffb = (stdenv.mkDerivation ((if overrides ? xf86videosunffb then overrides.xf86videosunffb else x: x) { name = "xf86-video-sunffb-1.2.2"; builder = ./builder.sh; @@ -1638,7 +1638,7 @@ let }; buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ]; })) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;}; - + xf86videotdfx = (stdenv.mkDerivation ((if overrides ? xf86videotdfx then overrides.xf86videotdfx else x: x) { name = "xf86-video-tdfx-1.4.5"; builder = ./builder.sh; @@ -1648,7 +1648,7 @@ let }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; - + xf86videotga = (stdenv.mkDerivation ((if overrides ? xf86videotga then overrides.xf86videotga else x: x) { name = "xf86-video-tga-1.2.2"; builder = ./builder.sh; @@ -1658,7 +1658,7 @@ let }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; - + xf86videotrident = (stdenv.mkDerivation ((if overrides ? xf86videotrident then overrides.xf86videotrident else x: x) { name = "xf86-video-trident-1.3.6"; builder = ./builder.sh; @@ -1668,7 +1668,7 @@ let }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; - + xf86videov4l = (stdenv.mkDerivation ((if overrides ? xf86videov4l then overrides.xf86videov4l else x: x) { name = "xf86-video-v4l-0.2.0"; builder = ./builder.sh; @@ -1678,7 +1678,7 @@ let }; buildInputs = [pkgconfig randrproto videoproto xorgserver xproto ]; })) // {inherit randrproto videoproto xorgserver xproto ;}; - + xf86videovesa = (stdenv.mkDerivation ((if overrides ? xf86videovesa then overrides.xf86videovesa else x: x) { name = "xf86-video-vesa-2.3.2"; builder = ./builder.sh; @@ -1688,7 +1688,7 @@ let }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; - + xf86videovmware = (stdenv.mkDerivation ((if overrides ? xf86videovmware then overrides.xf86videovmware else x: x) { name = "xf86-video-vmware-13.0.1"; builder = ./builder.sh; @@ -1698,7 +1698,7 @@ let }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;}; - + xf86videovoodoo = (stdenv.mkDerivation ((if overrides ? xf86videovoodoo then overrides.xf86videovoodoo else x: x) { name = "xf86-video-voodoo-1.2.5"; builder = ./builder.sh; @@ -1708,7 +1708,7 @@ let }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ;}; - + xf86videowsfb = (stdenv.mkDerivation ((if overrides ? xf86videowsfb then overrides.xf86videowsfb else x: x) { name = "xf86-video-wsfb-0.4.0"; builder = ./builder.sh; @@ -1718,7 +1718,7 @@ let }; buildInputs = [pkgconfig xorgserver xproto ]; })) // {inherit xorgserver xproto ;}; - + xf86vidmodeproto = (stdenv.mkDerivation ((if overrides ? xf86vidmodeproto then overrides.xf86vidmodeproto else x: x) { name = "xf86vidmodeproto-2.3.1"; builder = ./builder.sh; @@ -1728,7 +1728,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + xfs = (stdenv.mkDerivation ((if overrides ? xfs then overrides.xfs else x: x) { name = "xfs-1.1.3"; builder = ./builder.sh; @@ -1738,7 +1738,7 @@ let }; buildInputs = [pkgconfig libXfont xproto xtrans ]; })) // {inherit libXfont xproto xtrans ;}; - + xgamma = (stdenv.mkDerivation ((if overrides ? xgamma then overrides.xgamma else x: x) { name = "xgamma-1.0.5"; builder = ./builder.sh; @@ -1748,7 +1748,7 @@ let }; buildInputs = [pkgconfig libX11 libXxf86vm ]; })) // {inherit libX11 libXxf86vm ;}; - + xhost = (stdenv.mkDerivation ((if overrides ? xhost then overrides.xhost else x: x) { name = "xhost-1.0.5"; builder = ./builder.sh; @@ -1758,7 +1758,7 @@ let }; buildInputs = [pkgconfig libX11 libXau libXmu ]; })) // {inherit libX11 libXau libXmu ;}; - + xineramaproto = (stdenv.mkDerivation ((if overrides ? xineramaproto then overrides.xineramaproto else x: x) { name = "xineramaproto-1.2.1"; builder = ./builder.sh; @@ -1768,7 +1768,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + xinit = (stdenv.mkDerivation ((if overrides ? xinit then overrides.xinit else x: x) { name = "xinit-1.3.2"; builder = ./builder.sh; @@ -1778,7 +1778,7 @@ let }; buildInputs = [pkgconfig libX11 ]; })) // {inherit libX11 ;}; - + xinput = (stdenv.mkDerivation ((if overrides ? xinput then overrides.xinput else x: x) { name = "xinput-1.6.0"; builder = ./builder.sh; @@ -1788,7 +1788,7 @@ let }; buildInputs = [pkgconfig inputproto libX11 libXext libXi libXinerama libXrandr ]; })) // {inherit inputproto libX11 libXext libXi libXinerama libXrandr ;}; - + xkbcomp = (stdenv.mkDerivation ((if overrides ? xkbcomp then overrides.xkbcomp else x: x) { name = "xkbcomp-1.2.4"; builder = ./builder.sh; @@ -1798,7 +1798,7 @@ let }; buildInputs = [pkgconfig libX11 libxkbfile xproto ]; })) // {inherit libX11 libxkbfile xproto ;}; - + xkbevd = (stdenv.mkDerivation ((if overrides ? xkbevd then overrides.xkbevd else x: x) { name = "xkbevd-1.1.3"; builder = ./builder.sh; @@ -1808,7 +1808,7 @@ let }; buildInputs = [pkgconfig libX11 libxkbfile ]; })) // {inherit libX11 libxkbfile ;}; - + xkbutils = (stdenv.mkDerivation ((if overrides ? xkbutils then overrides.xkbutils else x: x) { name = "xkbutils-1.0.3"; builder = ./builder.sh; @@ -1818,7 +1818,7 @@ let }; buildInputs = [pkgconfig inputproto libX11 libXaw xproto libXt ]; })) // {inherit inputproto libX11 libXaw xproto libXt ;}; - + xkeyboardconfig = (stdenv.mkDerivation ((if overrides ? xkeyboardconfig then overrides.xkeyboardconfig else x: x) { name = "xkeyboard-config-2.8"; builder = ./builder.sh; @@ -1828,7 +1828,7 @@ let }; buildInputs = [pkgconfig libX11 xproto ]; })) // {inherit libX11 xproto ;}; - + xkill = (stdenv.mkDerivation ((if overrides ? xkill then overrides.xkill else x: x) { name = "xkill-1.0.3"; builder = ./builder.sh; @@ -1838,7 +1838,7 @@ let }; buildInputs = [pkgconfig libX11 libXmu ]; })) // {inherit libX11 libXmu ;}; - + xlsatoms = (stdenv.mkDerivation ((if overrides ? xlsatoms then overrides.xlsatoms else x: x) { name = "xlsatoms-1.1.1"; builder = ./builder.sh; @@ -1848,7 +1848,7 @@ let }; buildInputs = [pkgconfig libxcb ]; })) // {inherit libxcb ;}; - + xlsclients = (stdenv.mkDerivation ((if overrides ? xlsclients then overrides.xlsclients else x: x) { name = "xlsclients-1.1.2"; builder = ./builder.sh; @@ -1858,7 +1858,7 @@ let }; buildInputs = [pkgconfig libxcb ]; })) // {inherit libxcb ;}; - + xmessage = (stdenv.mkDerivation ((if overrides ? xmessage then overrides.xmessage else x: x) { name = "xmessage-1.0.4"; builder = ./builder.sh; @@ -1868,7 +1868,7 @@ let }; buildInputs = [pkgconfig libXaw libXt ]; })) // {inherit libXaw libXt ;}; - + xmodmap = (stdenv.mkDerivation ((if overrides ? xmodmap then overrides.xmodmap else x: x) { name = "xmodmap-1.0.7"; builder = ./builder.sh; @@ -1878,7 +1878,7 @@ let }; buildInputs = [pkgconfig libX11 xproto ]; })) // {inherit libX11 xproto ;}; - + xorgcffiles = (stdenv.mkDerivation ((if overrides ? xorgcffiles then overrides.xorgcffiles else x: x) { name = "xorg-cf-files-1.0.4"; builder = ./builder.sh; @@ -1888,7 +1888,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + xorgdocs = (stdenv.mkDerivation ((if overrides ? xorgdocs then overrides.xorgdocs else x: x) { name = "xorg-docs-1.7"; builder = ./builder.sh; @@ -1898,7 +1898,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) { name = "xorg-server-1.13.4"; builder = ./builder.sh; @@ -1908,7 +1908,7 @@ let }; buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ]; })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;}; - + xorgsgmldoctools = (stdenv.mkDerivation ((if overrides ? xorgsgmldoctools then overrides.xorgsgmldoctools else x: x) { name = "xorg-sgml-doctools-1.11"; builder = ./builder.sh; @@ -1918,7 +1918,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + xpr = (stdenv.mkDerivation ((if overrides ? xpr then overrides.xpr else x: x) { name = "xpr-1.0.4"; builder = ./builder.sh; @@ -1928,7 +1928,7 @@ let }; buildInputs = [pkgconfig libX11 libXmu xproto ]; })) // {inherit libX11 libXmu xproto ;}; - + xprop = (stdenv.mkDerivation ((if overrides ? xprop then overrides.xprop else x: x) { name = "xprop-1.2.1"; builder = ./builder.sh; @@ -1938,7 +1938,7 @@ let }; buildInputs = [pkgconfig libX11 xproto ]; })) // {inherit libX11 xproto ;}; - + xproto = (stdenv.mkDerivation ((if overrides ? xproto then overrides.xproto else x: x) { name = "xproto-7.0.23"; builder = ./builder.sh; @@ -1948,7 +1948,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + xrandr = (stdenv.mkDerivation ((if overrides ? xrandr then overrides.xrandr else x: x) { name = "xrandr-1.3.5"; builder = ./builder.sh; @@ -1958,7 +1958,7 @@ let }; buildInputs = [pkgconfig libX11 xproto libXrandr libXrender ]; })) // {inherit libX11 xproto libXrandr libXrender ;}; - + xrdb = (stdenv.mkDerivation ((if overrides ? xrdb then overrides.xrdb else x: x) { name = "xrdb-1.0.9"; builder = ./builder.sh; @@ -1968,7 +1968,7 @@ let }; buildInputs = [pkgconfig libX11 libXmu ]; })) // {inherit libX11 libXmu ;}; - + xrefresh = (stdenv.mkDerivation ((if overrides ? xrefresh then overrides.xrefresh else x: x) { name = "xrefresh-1.0.4"; builder = ./builder.sh; @@ -1978,7 +1978,7 @@ let }; buildInputs = [pkgconfig libX11 ]; })) // {inherit libX11 ;}; - + xset = (stdenv.mkDerivation ((if overrides ? xset then overrides.xset else x: x) { name = "xset-1.2.2"; builder = ./builder.sh; @@ -1988,7 +1988,7 @@ let }; buildInputs = [pkgconfig libX11 libXext libXmu xproto libXxf86misc ]; })) // {inherit libX11 libXext libXmu xproto libXxf86misc ;}; - + xsetroot = (stdenv.mkDerivation ((if overrides ? xsetroot then overrides.xsetroot else x: x) { name = "xsetroot-1.1.0"; builder = ./builder.sh; @@ -1998,7 +1998,7 @@ let }; buildInputs = [pkgconfig libX11 xbitmaps libXcursor libXmu ]; })) // {inherit libX11 xbitmaps libXcursor libXmu ;}; - + xtrans = (stdenv.mkDerivation ((if overrides ? xtrans then overrides.xtrans else x: x) { name = "xtrans-1.2.7"; builder = ./builder.sh; @@ -2008,7 +2008,7 @@ let }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - + xvinfo = (stdenv.mkDerivation ((if overrides ? xvinfo then overrides.xvinfo else x: x) { name = "xvinfo-1.1.1"; builder = ./builder.sh; @@ -2018,7 +2018,7 @@ let }; buildInputs = [pkgconfig libX11 libXv ]; })) // {inherit libX11 libXv ;}; - + xwd = (stdenv.mkDerivation ((if overrides ? xwd then overrides.xwd else x: x) { name = "xwd-1.0.5"; builder = ./builder.sh; @@ -2028,7 +2028,7 @@ let }; buildInputs = [pkgconfig libX11 xproto ]; })) // {inherit libX11 xproto ;}; - + xwininfo = (stdenv.mkDerivation ((if overrides ? xwininfo then overrides.xwininfo else x: x) { name = "xwininfo-1.1.2"; builder = ./builder.sh; @@ -2038,7 +2038,7 @@ let }; buildInputs = [pkgconfig libX11 libxcb xproto ]; })) // {inherit libX11 libxcb xproto ;}; - + xwud = (stdenv.mkDerivation ((if overrides ? xwud then overrides.xwud else x: x) { name = "xwud-1.0.4"; builder = ./builder.sh; @@ -2048,5 +2048,5 @@ let }; buildInputs = [pkgconfig libX11 xproto ]; })) // {inherit libX11 xproto ;}; - + }; in xorg diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 256d108c4e86..04ee5f109611 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -65,8 +65,8 @@ while (<>) { print " $pkg $pkgName\n"; if (defined $pkgNames{$pkg}) { - print " SKIPPING\n"; - next; + print " SKIPPING\n"; + next; } $pkgURLs{$pkg} = $tarball; @@ -90,7 +90,7 @@ while (<>) { my $provides = `find $pkgDir -name "*.pc.in"`; my @provides2 = split '\n', $provides; my @requires = (); - + foreach my $pcFile (@provides2) { my $pc = $pcFile; $pc =~ s/.*\///; @@ -111,7 +111,7 @@ while (<>) { } } close FOO; - + } my $file; @@ -129,7 +129,7 @@ while (<>) { if ($file =~ /zlib is required/ || $file =~ /AC_CHECK_LIB\(z\,/) { push @requires, "zlib"; } - + if ($file =~ /Perl is required/) { push @requires, "perl"; } @@ -151,9 +151,9 @@ while (<>) { } if ($file =~ /AC_PATH_PROG\(FCCACHE/) { - # Don't run fc-cache. - die if defined $extraAttrs{$pkg}; - $extraAttrs{$pkg} = " preInstall = \"installFlags=(FCCACHE=true)\"; "; + # Don't run fc-cache. + die if defined $extraAttrs{$pkg}; + $extraAttrs{$pkg} = " preInstall = \"installFlags=(FCCACHE=true)\"; "; } my $isFont; @@ -179,10 +179,10 @@ while (<>) { sub process { my $requires = shift; - my $s = shift; - $s =~ s/\[/\ /g; - $s =~ s/\]/\ /g; - $s =~ s/\,/\ /g; + my $s = shift; + $s =~ s/\[/\ /g; + $s =~ s/\]/\ /g; + $s =~ s/\,/\ /g; foreach my $req (split / /, $s) { next if $req eq ">="; #next if $req =~ /^\$/; @@ -211,7 +211,7 @@ while (<>) { push @requires, "libxslt" if $pkg =~ /libxcb/; push @requires, "gperf", "m4", "xproto" if $pkg =~ /xcbutil/; - + print "REQUIRES $pkg => @requires\n"; $pkgRequires{$pkg} = \@requires; @@ -234,6 +234,8 @@ let xorg = rec { + inherit pixman; + EOF @@ -257,7 +259,7 @@ foreach my $pkg (sort (keys %pkgURLs)) { my $extraAttrs = $extraAttrs{"$pkg"}; $extraAttrs = "" unless defined $extraAttrs; - + print OUT < Date: Tue, 4 Jun 2013 17:06:54 +0200 Subject: [PATCH 073/153] Re-propagate libdrm --- pkgs/development/libraries/mesa/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 6cfb4314e0aa..de130d465c2e 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -81,13 +81,16 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig python makedepend file flex bison ]; - propagatedBuildInputs = with xorg; [ libXdamage libXxf86vm ]; + propagatedBuildInputs = with xorg; [ libXdamage libXxf86vm ] + ++ + stdenv.lib.optionals stdenv.isLinux [libdrm] + ; buildInputs = with xorg; [ autoconf automake libtool intltool expat libxml2Python llvm libXfixes glproto dri2proto libX11 libXext libxcb libXt libffi wayland ] ++ stdenv.lib.optionals enableExtraFeatures [ /*libXvMC*/ libvdpau ] - ++ stdenv.lib.optional stdenv.isLinux [libdrm udev] + ++ stdenv.lib.optional stdenv.isLinux [udev] ; enableParallelBuilding = true; From 85f2674e22c294ac194caff765c55888a716be8a Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Sat, 15 Jun 2013 22:02:58 +1000 Subject: [PATCH 074/153] apacheHttpd: minor modifications to meta attrs * add myself as a maintainer * use reference to `stdenv.lib.licenses.asl20` rather than literal string --- pkgs/servers/http/apache-httpd/2.2.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix index 23d18ad7c9c6..23454d048b71 100644 --- a/pkgs/servers/http/apache-httpd/2.2.nix +++ b/pkgs/servers/http/apache-httpd/2.2.nix @@ -55,10 +55,9 @@ stdenv.mkDerivation rec { meta = { description = "Apache HTTPD, the world's most popular web server"; - homepage = http://httpd.apache.org/; - license = "ASL2.0"; - - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.simons ]; + homepage = http://httpd.apache.org/; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ simons lovek323 ]; }; } From cfab5a8ecfe9e9106ca9c2cbc5ae29f3ae790fd3 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Sun, 16 Jun 2013 12:23:57 +1000 Subject: [PATCH 075/153] ruby19: fix on darwin * seems to require readline even when cursesSupport is not enabled --- pkgs/development/interpreters/ruby/ruby-19.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/ruby/ruby-19.nix b/pkgs/development/interpreters/ruby/ruby-19.nix index 638aeab11cac..090bb0c1bce7 100644 --- a/pkgs/development/interpreters/ruby/ruby-19.nix +++ b/pkgs/development/interpreters/ruby/ruby-19.nix @@ -30,7 +30,12 @@ stdenv.mkDerivation rec { ++ (op zlibSupport zlib) ++ (op opensslSupport openssl) ++ (op gdbmSupport gdbm) - ++ (op yamlSupport libyaml); + ++ (op yamlSupport libyaml) + # Looks like ruby fails to build on darwin without readline even if curses + # support is not enabled, so add readline to the build inputs if curses + # support is disabled (if it's enabled, we already have it) and we're + # running on darwin + ++ (op (!cursesSupport && stdenv.isDarwin) readline); enableParallelBuilding = true; patches = [ ./ruby19-parallel-install.patch ]; @@ -42,10 +47,11 @@ stdenv.mkDerivation rec { postInstall = "mkdir -pv $out/${passthru.gemPath}"; meta = { - license = "Ruby"; - homepage = "http://www.ruby-lang.org/en/"; + license = "Ruby"; + homepage = "http://www.ruby-lang.org/en/"; description = "The Ruby language"; - platforms = stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [ lovek323 ]; + platforms = stdenv.lib.platforms.all; }; passthru = rec { From fc36c198342d06cc8f64d27cc493188a477fa9b0 Mon Sep 17 00:00:00 2001 From: Christophe Raffalli Date: Sun, 16 Jun 2013 22:23:51 +0200 Subject: [PATCH 076/153] Added OCaml gmp bindings mlgmp --- pkgs/development/ocaml-modules/mlgmp/META | 7 ++++ .../ocaml-modules/mlgmp/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 46 insertions(+) create mode 100644 pkgs/development/ocaml-modules/mlgmp/META create mode 100644 pkgs/development/ocaml-modules/mlgmp/default.nix diff --git a/pkgs/development/ocaml-modules/mlgmp/META b/pkgs/development/ocaml-modules/mlgmp/META new file mode 100644 index 000000000000..e132e179b33f --- /dev/null +++ b/pkgs/development/ocaml-modules/mlgmp/META @@ -0,0 +1,7 @@ +name="gmp" +version="@VERSION@" +description="bindings to GNU MP library" +archive(byte)="gmp.cma" +archive(native)="gmp.cmxa" +requires="" + diff --git a/pkgs/development/ocaml-modules/mlgmp/default.nix b/pkgs/development/ocaml-modules/mlgmp/default.nix new file mode 100644 index 000000000000..78447796025a --- /dev/null +++ b/pkgs/development/ocaml-modules/mlgmp/default.nix @@ -0,0 +1,37 @@ +{stdenv, fetchurl, ocaml, findlib, gmp, mpfr, ncurses }: + +let + ocaml_version = (builtins.parseDrvName ocaml.name).version; + pname = "mlgmp"; + version = "20120224"; +in + +stdenv.mkDerivation { + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://www-verimag.imag.fr/~monniaux/download/${pname}_${version}.tar.gz"; + sha256 = "3ce1a53fa452ff5a9ba618864d3bc46ef32190b57202d1e996ca7df837ad4f24"; + }; + + makeFlags = [ + "DESTDIR=$(out)/lib/ocaml/${ocaml_version}/site-lib/gmp" + ]; + + preConfigure = "make clean"; + buildInputs = [ocaml findlib gmp mpfr ncurses]; + + createFindlibDestdir = true; + + propagatedbuildInputs = [gmp mpfr ncurses]; + + postInstall = '' + cp ${./META} $out/lib/ocaml/${ocaml_version}/site-lib/gmp/META + ''; + + meta = { + homepage = http://opam.ocamlpro.com/pkg/mlgmp.20120224.html; + description = "OCaml bindings to GNU MP library"; + license = "Free software ?"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60e18a4847a5..fbd55303fd45 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2736,6 +2736,8 @@ let mldonkey = callPackage ../applications/networking/p2p/mldonkey { }; + mlgmp = callPackage ../development/ocaml-modules/mlgmp { }; + ocaml_batteries = callPackage ../development/ocaml-modules/batteries { camomile = camomile_0_8_2; }; From 27bf590d3c0467a6993caa0d17835f19d1e68aef Mon Sep 17 00:00:00 2001 From: Christophe Raffalli Date: Sun, 16 Jun 2013 22:25:08 +0200 Subject: [PATCH 077/153] upgraded ocaml-mysql to 1.1.1 --- pkgs/development/ocaml-modules/mysql/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix index 32455fb4310c..ed70d1b9c3ee 100644 --- a/pkgs/development/ocaml-modules/mysql/default.nix +++ b/pkgs/development/ocaml-modules/mysql/default.nix @@ -7,17 +7,22 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "ocaml-mysql"; - version = "1.0.4"; + version = "1.1.1"; in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { - url = "http://raevnos.pennmush.org/code/${pname}/${pname}-${version}.tar.gz"; - sha256 = "17i5almar8qrhc9drq0cvlprxf9wi9szj5kh4gnz11l9al8i3lar"; + url = "https://forge.ocamlcore.org/frs/download.php/870/${pname}-${version}.tar.gz"; + sha256 = "f896fa101a05d81b85af8122fe1c2809008a5e5fdca00f9ceeb7eec356369e3a"; }; + configureFlags = [ + "--prefix=$out" + "--libdir=$out/lib/ocaml/${ocaml_version}/site-lib/mysql" + ]; + buildInputs = [ocaml findlib mysql]; createFindlibDestdir = true; @@ -34,7 +39,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://raevnos.pennmush.org/code/ocaml-mysql/; + homepage = http://ocaml-mysql.forge.ocamlcore.org; description = "Bindings for interacting with MySQL databases from ocaml"; license = "LGPLv2.1+"; maintainers = [ stdenv.lib.maintainers.roconnor ]; From c205449003eeb2ac23265946167e91c51d79f598 Mon Sep 17 00:00:00 2001 From: Christophe Raffalli Date: Sun, 16 Jun 2013 22:25:49 +0200 Subject: [PATCH 078/153] upgraded freeglut to 2.8.1 (menu are broken in 2.8.0) --- pkgs/development/libraries/freeglut/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index 9d599560fc80..6e556a144ce2 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa, x11 }: stdenv.mkDerivation { - name = "freeglut-2.8.0"; + name = "freeglut-2.8.1"; src = fetchurl { - url = mirror://sourceforge/freeglut/freeglut-2.8.0.tar.gz; - sha256 = "197293ff886abe613bc9eb4a762d9161b0c9e64b3e8e613ed7c5e353974fba05"; + url = mirror://sourceforge/freeglut/freeglut-2.8.1.tar.gz; + sha256 = "16lrxxxd9ps9l69y3zsw6iy0drwjsp6m26d1937xj71alqk6dr6x"; }; configureFlags = "--" + (if stdenv.isDarwin then "disable" else "enable") + "-warnings"; buildInputs = [ libXi libXrandr libXxf86vm mesa x11 ]; - patches = [ ./0001-remove-typedefs-now-living-in-mesa.patch ]; + # patches = [ ./0001-remove-typedefs-now-living-in-mesa.patch ]; } From ce2efd0b5b99449f59f1f17f09cbde181072ab7c Mon Sep 17 00:00:00 2001 From: Christophe Raffalli Date: Sun, 16 Jun 2013 22:26:17 +0200 Subject: [PATCH 079/153] fixed dependencies of camlimages --- pkgs/development/ocaml-modules/camlimages/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix index 00168d46c3f1..db11fc4fb8b2 100644 --- a/pkgs/development/ocaml-modules/camlimages/default.nix +++ b/pkgs/development/ocaml-modules/camlimages/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng_apng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }: +{stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng_apng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript, lablgtk }: let ocaml_version = (builtins.parseDrvName ocaml.name).version; @@ -14,9 +14,9 @@ stdenv.mkDerivation { sha256 = "b40237c1505487049799a7af296eb3996b3fa08eab94415546f46d61355747c4"; }; - buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript ]; + buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript libtiff libjpeg libpng_apng giflib freetype libXpm lablgtk]; - propagatedbuildInputs = [libtiff libjpeg libpng_apng giflib freetype libXpm ]; + propagatedbuildInputs = [libtiff libjpeg libpng_apng giflib freetype libXpm lablgtk ]; createFindlibDestdir = true; From cb980d97d73a7059fdad1ec93746fa8de78f68ea Mon Sep 17 00:00:00 2001 From: Christophe Raffalli Date: Sun, 16 Jun 2013 22:27:14 +0200 Subject: [PATCH 080/153] added glsurf package --- .../science/math/glsurf/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/science/math/glsurf/default.nix diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix new file mode 100644 index 000000000000..30ed454f61ab --- /dev/null +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -0,0 +1,32 @@ + +{ stdenv, fetchdarcs, ocaml, findlib, lablgl, camlimages, mesa, freeglut, ocaml_mysql, mlgmp, mpfr, gmp, libtiff, libjpeg, libpng_apng, giflib, freetype, libXpm }: + +let + ocaml_version = (builtins.parseDrvName ocaml.name).version; +in + +stdenv.mkDerivation { + name = "glsurf-3.3"; + + src = fetchdarcs { + url = "http://lama.univ-savoie.fr/~raffalli/GlSurf"; + tag = "3.3"; + sha256 = ""; md5=""; + }; + + buildInputs = [ ocaml findlib freeglut mesa + lablgl camlimages ocaml_mysql mlgmp mpfr gmp + libtiff libjpeg libpng_apng giflib freetype libXpm ]; + + installPhase = '' + mkdir -p $out/bin $out/share/doc/glsurf + cp ./src/glsurf.opt $out/bin/glsurf + cp ./doc/doc.pdf $out/share/doc/glsurf + cp -r ./examples $out/share/doc/glsurf + ''; + + meta = { + homepage = http://www.lama.univ-savoie.fr/~raffalli/glsurf; + description = "GlSurf: a program to draw implicit surfaces and curves"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fbd55303fd45..0d947cfeb6e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3979,6 +3979,10 @@ let glpk = callPackage ../development/libraries/glpk { }; + glsurf = callPackage ../applications/science/math/glsurf { + inherit (ocamlPackages) lablgl findlib camlimages ocaml_mysql mlgmp; + }; + gmime = callPackage ../development/libraries/gmime { }; gmm = callPackage ../development/libraries/gmm { }; From 1570336325b7dcac981ad6964148fc7692f4eea9 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sun, 16 Jun 2013 23:38:33 +0200 Subject: [PATCH 081/153] Fix dropbox-cli. Dropbox doesn't version the CLI. This broke the download. This patch also fixes the `dropbox-cli start' command. Signed-off-by: Moritz Ulrich --- .../networking/dropbox-cli/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox-cli/default.nix index b298b3c9df99..936856448694 100644 --- a/pkgs/applications/networking/dropbox-cli/default.nix +++ b/pkgs/applications/networking/dropbox-cli/default.nix @@ -1,17 +1,18 @@ -{ stdenv, coreutils, fetchurl, python }: +{ stdenv, coreutils, fetchurl, python, dropbox }: stdenv.mkDerivation { name = "dropbox-cli"; src = fetchurl { + # Note: dropbox doesn't version this file. Annoying. url = "https://linux.dropbox.com/packages/dropbox.py"; - sha256 = "1x46i0aplah4a2nqglb8byl3c60w7h1cjja62myxj2dpxyv7fydy"; + sha256 = "0p1pg8bw6mlhqi5k8y3pgs7byg0kfvq57s53sh188lb5sxvlg7yz"; }; buildInputs = [ coreutils python ]; phases = "installPhase fixupPhase"; - + installPhase = '' mkdir -pv $out/bin/ cp $src $out/bin/dropbox-cli @@ -20,11 +21,12 @@ stdenv.mkDerivation { fixupPhase = '' substituteInPlace $out/bin/dropbox-cli \ --replace "/usr/bin/python" ${python}/bin/python \ - --replace "use dropbox help" "use dropbox-cli help" - + --replace "use dropbox help" "use dropbox-cli help" \ + --replace "~/.dropbox-dist/dropboxd" ${dropbox}/bin/dropbox + chmod +x $out/bin/dropbox-cli ''; - + meta = { homepage = http://dropbox.com; description = "Command line client for the dropbox daemon."; @@ -33,4 +35,3 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.linux; }; } - From edaca7bdf00f905f1cb703d8e3335a315d4d1a0f Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sun, 16 Jun 2013 23:40:43 +0200 Subject: [PATCH 082/153] Add myself as a maintainer of dropbox-cli. Signed-off-by: Moritz Ulrich --- pkgs/applications/networking/dropbox-cli/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox-cli/default.nix index 936856448694..34fe6db8932b 100644 --- a/pkgs/applications/networking/dropbox-cli/default.nix +++ b/pkgs/applications/networking/dropbox-cli/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation { homepage = http://dropbox.com; description = "Command line client for the dropbox daemon."; license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; # NOTE: Dropbox itself only works on linux, so this is ok. platforms = stdenv.lib.platforms.linux; }; From cba6d9b11a018b17c8e2bce8ad1741821022f37c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 17 Jun 2013 10:06:23 +0200 Subject: [PATCH 083/153] qt48: I give up, switching off parallel building I was unable to find a reliable fix for the problems. I seem to get either this http://hydra.nixos.org/build/5326327/nixlog/1/tail-reload or that http://hydra.nixos.org/build/5297462/nixlog/1/tail-reload . # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # On branch x-updates # You are currently rebasing branch 'x-updates' on '81b7f5f'. # (all conflicts fixed: run "git rebase --continue") # # Changes to be committed: # (use "git reset HEAD ..." to unstage) # # modified: pkgs/development/libraries/qt-4.x/4.8/default.nix # # Untracked files: # (use "git add ..." to include in what will be committed) # # core # dev.diff # pkgs/applications/networking/browsers/firefox/cairo-test.patch # pkgs/applications/video/flowblade/ # pkgs/desktops/gnome-3/core/dconf/ # pkgs/desktops/gnome-3/core/eog/ # pkgs/desktops/gnome-3/core/libsecret/ # pkgs/development/libraries/ncurses/builder.sh # pkgs/servers/x11/xorg/download-cache/ # pkgs/servers/x11/xorg/still-missing.txt --- pkgs/development/libraries/qt-4.x/4.8/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) 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 a00f9e5c81ab..d0e23e596885 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -90,12 +90,6 @@ stdenv.mkDerivation rec { ${if developerBuild then "-developer-build" else ""} ''; - # fix underspecified dependency in a generated makefile - postConfigure = stdenv.lib.optional developerBuild '' - sed "1iqtgradientview.h: .uic/release-shared/ui_qtgradientview.h" \ - -i tools/designer/src/lib/Makefile - ''; - propagatedBuildInputs = [ libXrender libXrandr libXinerama libXcursor libXext libXfixes libXv libXi libSM @@ -113,7 +107,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkgconfig which ]; - enableParallelBuilding = true; + # occasional build problems if one has too many cores (like on Hydra) + # @vcunat has been unable to find a *reliable* fix + enableParallelBuilding = false; crossAttrs = let isMingw = stdenv.cross.config == "i686-pc-mingw32" || From 2c715069296549d88dd525c1f7e822c449291ae0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 17 Jun 2013 12:38:19 +0200 Subject: [PATCH 084/153] nlopt: build octave plugins --- pkgs/development/interpreters/octave/default.nix | 10 +++++++++- pkgs/development/libraries/nlopt/default.nix | 15 +++++++++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 73f13c11a7db..428d97eaf794 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -2,8 +2,11 @@ libX11, graphicsmagick, pcre, liblapack, texLive, pkgconfig, mesa, fltk, fftw, fftwSinglePrec, zlib, curl, qrupdate }: +let + version = "3.6.4"; +in stdenv.mkDerivation rec { - name = "octave-3.6.4"; + name = "octave-${version}"; src = fetchurl { url = "mirror://gnu/octave/${name}.tar.bz2"; sha256 = "0qn9s7jrjmrn6w3rvp8d7vfnymyv0spnxzrp9l7p8p8zb7wms67s"; @@ -27,6 +30,11 @@ stdenv.mkDerivation rec { cp test/fntests.log $out/share/octave/${name}-fntests.log ''; + passthru = { + inherit version; + sitePath = "share/octave/${version}/site"; + }; + meta = { homepage = http://octave.org/; license = "GPLv3+"; diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix index 0936332cd489..cc216a59d758 100644 --- a/pkgs/development/libraries/nlopt/default.nix +++ b/pkgs/development/libraries/nlopt/default.nix @@ -1,12 +1,19 @@ -{ fetchurl, stdenv }: +{ fetchurl, stdenv +, withOctave ? true, octave ? null}: stdenv.mkDerivation rec { - name = "nlopt-2.2.1"; + name = "nlopt-2.3"; src = fetchurl { url = "http://ab-initio.mit.edu/nlopt/${name}.tar.gz"; - sha256 = "0p7ri7dcp6vga7jwng7wj9bf2ixk6p5ldxp76r93xkrdixqfngaq"; + sha256 = "1iw2cjgypyqz779f47fz0nmifbrvk4zs4rxi1ibk36f4ly3wg6p6"; }; - configureFlags = "--with-cxx --with-pic --without-guile --without-python --without-octave --without-matlab"; + buildInputs = stdenv.lib.optional withOctave octave; + + configureFlags = "--with-cxx --enable-shared --with-pic --without-guile --without-python + --without-matlab " + + stdenv.lib.optionalString withOctave ("--with-octave " + + "M_INSTALL_DIR=$(out)/${octave.sitePath}/m " + + "OCT_INSTALL_DIR=$(out)/${octave.sitePath}/oct "); } From 8ce7550a9f03892f0eb9d848480f5681895b3306 Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Sat, 15 Jun 2013 15:04:05 +1000 Subject: [PATCH 085/153] cairo-1.12.2: fix pixman include path --- pkgs/development/libraries/cairo/1.12.2.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/cairo/1.12.2.nix b/pkgs/development/libraries/cairo/1.12.2.nix index 18195017c0fb..e60af3a23a80 100644 --- a/pkgs/development/libraries/cairo/1.12.2.nix +++ b/pkgs/development/libraries/cairo/1.12.2.nix @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { stdenv.lib.optional postscriptSupport zlib ++ stdenv.lib.optional pngSupport libpng; + NIX_CFLAGS_COMPILE = ( if stdenv.isDarwin + then "-I${pixman}/include/pixman-1" + else "" ); + configureFlags = [ "--enable-tee" ] ++ stdenv.lib.optional xcbSupport "--enable-xcb" From f83a4dd41d8a1906acadfd89ed5b9d4a5e295ea7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 17 Jun 2013 15:14:19 +0200 Subject: [PATCH 086/153] Add Forks::Super --- pkgs/top-level/perl-packages.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5209c497192a..5c4574fddd86 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2794,6 +2794,18 @@ rec { }; }; + ForksSuper = buildPerlPackage { + name = "Forks-Super-0.67"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MO/MOB/Forks-Super-0.67.tar.gz; + sha256 = "8831cd70e1eb3d4ab7d9a8c3692caa7b7220dc888cd1a8dc5640fb2a08379141"; + }; + meta = { + description = "Extensions and convenience methods to manage background processes"; + license = "perl"; + }; + }; + FreezeThaw = buildPerlPackage { name = "FreezeThaw-0.43"; src = fetchurl { From d5dac74d9452bb98eb2cb583c073c822354c4d78 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Jun 2013 15:24:55 +0200 Subject: [PATCH 087/153] gnuplot: update to version 4.6.3 --- pkgs/tools/graphics/gnuplot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 3e6902a183d5..485edf7335d3 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -17,11 +17,11 @@ assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null); stdenv.mkDerivation rec { - name = "gnuplot-4.6.0"; + name = "gnuplot-4.6.3"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${name}.tar.gz"; - sha256 = "1ghp1jbcf95yy09lqhjcfmvb6y2101qfdbf20zs42dcs0fsssq3f"; + sha256 = "1xd7gqdhlk7k1p9yyqf9vkk811nadc7m4si0q3nb6cpv4pxglpyz"; }; buildInputs = From abfca0ad1461c202f09468ad27bd7eed471911d1 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 17 Jun 2013 10:05:46 -0400 Subject: [PATCH 088/153] When printing submodule keys, print just the file name if known Signed-off-by: Shea Levy --- pkgs/lib/modules.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/lib/modules.nix b/pkgs/lib/modules.nix index 3d4ebc325120..ea38010ceccc 100644 --- a/pkgs/lib/modules.nix +++ b/pkgs/lib/modules.nix @@ -82,7 +82,7 @@ rec { file = key; option = name; number = index; - outPath = "file ${toString file} option ${option} options number ${toString number}"; + outPath = key; }; in if lib.isModule module then { key = key_; } // module From 0f7e530c9dda92b36567aa2bb598b97a135c7828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 17 Jun 2013 16:12:17 +0200 Subject: [PATCH 089/153] mesa_noglu: make it meaningful even on darwin In future we should change the mess, e.g. have libGL, libGLU and similar attributes. --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25ae2dcc717e..314662813d65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4784,7 +4784,8 @@ let mesaSupported = lib.elem system lib.platforms.mesaPlatforms; - mesa_noglu = callPackage ../development/libraries/mesa { }; + mesa_noglu = if stdenv.isDarwin then darwinX11AndOpenGL + else callPackage ../development/libraries/mesa { }; mesa_drivers = mesa_noglu.drivers; mesa_glu = callPackage ../development/libraries/mesa-glu { }; mesa = if stdenv.isDarwin then darwinX11AndOpenGL From ad14e4c90ded11aa5092208d19dba8c783f962bf Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Mon, 17 Jun 2013 17:53:36 +0200 Subject: [PATCH 090/153] add tarman-0.1 --- pkgs/top-level/python-packages.nix | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 89e1faeb9b2a..f6ce19f39279 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5636,6 +5636,36 @@ pythonPackages = python.modules // rec { }; + tarman = buildPythonPackage rec { + version = "0.1"; + name = "tarman-${version}"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/t/tarman/tarman-${version}.zip"; + sha256 = "1g6p9v7z2qrg000150flwmpykkzc4y8l3lvkvpn0rb8czyw7l27f"; + }; + + buildInputs = [ pkgs.unzip unittest2 nose mock ]; + propagatedBuildInputs = [ python.modules.curses libarchive ]; + + # two tests fail + doCheck = false; + }; + + + libarchive = buildPythonPackage rec { + version = "3.0.4-5"; + name = "libarchive-${version}"; + + src = fetchurl { + url = "http://python-libarchive.googlecode.com/files/python-libarchive-${version}.tar.gz"; + sha256 = "141yx9ym8gvybn67mw0lmgafzsd79rmd9l77lk0k6m2fzclqx1j5"; + }; + + propagatedBuildInputs = [ pkgs.libarchive ]; + }; + + pyzmq = buildPythonPackage rec { name = "pyzmq-13.0.0"; src = fetchurl { From afdc7fdfb6ff0380c8c46cf56afbe8611f34ba7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 17 Jun 2013 22:06:36 +0200 Subject: [PATCH 091/153] fix evaluation on non-Linux, should fix tarball --- pkgs/development/libraries/libdrm/default.nix | 5 +++-- pkgs/os-specific/linux/systemd/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 5 +++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 1816e212bbd0..e411e599dc54 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -9,14 +9,15 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libpthreadstubs libpciaccess udev ]; + buildInputs = [ libpthreadstubs libpciaccess ] + ++ stdenv.lib.optional stdenv.isLinux udev; patches = stdenv.lib.optional stdenv.isDarwin ./libdrm-apple.patch; preConfigure = stdenv.lib.optionalString stdenv.isDarwin "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache"; - configureFlags = [ "--enable-udev" ] + configureFlags = stdenv.lib.optional stdenv.isLinux "--enable-udev" ++ stdenv.lib.optional stdenv.isDarwin "-C"; crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ]; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 8c681f893edd..77126e5ffdc5 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -3,6 +3,8 @@ , glib, kbd, libxslt, coreutils, libgcrypt, sysvtools, docbook_xsl }: +assert stdenv.isLinux; + stdenv.mkDerivation rec { version = "203"; name = "systemd-${version}"; @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { ./0009-Start-ctrl-alt-del.target-irreversibly.patch ] ++ stdenv.lib.optional stdenv.isArm ./libc-bug-accept4-arm.patch; - buildInputs = assert stdenv.gcc.libc or null != null; # assertion here, so it doesn't trigger on passthru.headers + buildInputs = [ pkgconfig intltool gperf libcap dbus.libs kmod xz pam acl /* cryptsetup */ libuuid m4 glib libxslt libgcrypt docbook_xsl ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 314662813d65..44d19c74a0fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4784,9 +4784,10 @@ let mesaSupported = lib.elem system lib.platforms.mesaPlatforms; + mesa_original = callPackage ../development/libraries/mesa { }; mesa_noglu = if stdenv.isDarwin then darwinX11AndOpenGL - else callPackage ../development/libraries/mesa { }; - mesa_drivers = mesa_noglu.drivers; + else mesa_original; + mesa_drivers = mesa_original.drivers; mesa_glu = callPackage ../development/libraries/mesa-glu { }; mesa = if stdenv.isDarwin then darwinX11AndOpenGL else buildEnv { From efde9567d17cbb1d8f87a7223f06adc5d82ad8cd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 17 Jun 2013 03:12:46 +0200 Subject: [PATCH 092/153] flightgear: Remove from channel It's 264 MiB compressed... --- pkgs/games/flightgear/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index fa0bb9bb4f7c..9b9e7ab96806 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -49,8 +49,7 @@ rec { [ raskin ]; - platforms = with a.lib.platforms; - linux; + #platforms = a.lib.platforms.linux; license = a.lib.licenses.gpl2; }; passthru = { From 5bc8275075429764b609023fd12c4ff1dabf69f8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Jun 2013 00:56:00 +0200 Subject: [PATCH 093/153] nix: Update to 1.5.3 --- pkgs/tools/package-management/nix/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 55f783d792f0..b6f8d5000a13 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.5.2"; + name = "nix-1.5.3"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "84880fcb94c06b11f66b28837f9c145aa3d65eb0e173fd6da195794a7b0331d1"; + sha256 = "070e82a155851900768eb4a638aa50a6df9a8475c6dbc78a3b4a7dea75d64201"; }; nativeBuildInputs = [ perl pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a014961b8cad..6665eb5ea9e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9344,10 +9344,13 @@ let stateDir = config.nix.stateDir or "/nix/var"; }; + nixUnstable = nixStable; + /* nixUnstable = callPackage ../tools/package-management/nix/unstable.nix { storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; }; + */ nut = callPackage ../applications/misc/nut { }; From f3fade60fc81efe3732e1157ff2fb9ee10cfe168 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 27 May 2013 13:43:53 +1000 Subject: [PATCH 094/153] pygit: add DYLD_LIBRARY_PATH to compile on darwin --- pkgs/top-level/python-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7a0e527f3860..94cd526b616b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3369,6 +3369,10 @@ pythonPackages = python.modules // rec { md5 = "8d27f84509a96d6791a6c393ae67d7c8"; }; + preConfigure = ( if stdenv.isDarwin then '' + export DYLD_LIBRARY_PATH="${pkgs.libgit2}/lib" + '' else "" ); + propagatedBuildInputs = [ pkgs.libgit2 ]; meta = { From 02eef5b0f45c614dd30ac515a7ffc16c550e17eb Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Tue, 18 Jun 2013 13:19:36 +1000 Subject: [PATCH 095/153] ruby-1.9: disable tk when compiling on darwin --- pkgs/development/interpreters/ruby/ruby-19.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/ruby/ruby-19.nix b/pkgs/development/interpreters/ruby/ruby-19.nix index 090bb0c1bce7..afe9066dd081 100644 --- a/pkgs/development/interpreters/ruby/ruby-19.nix +++ b/pkgs/development/interpreters/ruby/ruby-19.nix @@ -40,7 +40,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; patches = [ ./ruby19-parallel-install.patch ]; - configureFlags = ["--enable-shared" "--enable-pthread"]; + configureFlags = [ "--enable-shared" "--enable-pthread" ] + # on darwin, we have /usr/include/tk.h -- so the configure script detects + # that tk is installed + ++ ( if stdenv.isDarwin then [ "--with-out-ext=tk " ] else [ ]); installFlags = stdenv.lib.optionalString docSupport "install-doc"; # Bundler tries to create this directory From 9b409f2caee3fdb228e0573d68710d0f672dbf2b Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Tue, 18 Jun 2013 13:58:48 +1000 Subject: [PATCH 096/153] tree: fix compilation on darwin --- pkgs/top-level/all-packages.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 250db466ee95..81ca4ee1ba0b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8259,7 +8259,13 @@ let trayer = callPackage ../applications/window-managers/trayer { }; - tree = callPackage ../tools/system/tree { }; + tree = callPackage ../tools/system/tree { + # use gccApple to compile on darwin as the configure script adds a + # -no-cpp-precomp flag, which is not compatible with the default gcc + stdenv = if stdenv.isDarwin + then stdenvAdapters.overrideGCC stdenv gccApple + else stdenv; + }; tribler = callPackage ../applications/networking/p2p/tribler { }; From 85bfa943f730d8a920c9be9ae965fd919450447e Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Tue, 18 Jun 2013 16:00:46 +1000 Subject: [PATCH 097/153] glib: fix on darwin (merge #644) * include Foundation.h header * add myself to maintainers * build with gccApple @vcunat: minor refactoring. --- pkgs/development/libraries/glib/default.nix | 16 ++++++++-------- pkgs/top-level/all-packages.nix | 6 +++++- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 47d8d9433245..747a18f04ccc 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -41,7 +41,10 @@ stdenv.mkDerivation (rec { configureFlags = "--with-pcre=system --disable-fam"; - postConfigure = "sed '/SANE_MALLOC_PROTOS/s,^,//,' -i config.h"; # https://bugzilla.gnome.org/show_bug.cgi?id=698716 :-) + postConfigure = "sed '/SANE_MALLOC_PROTOS/s,^,//,' -i config.h" # https://bugzilla.gnome.org/show_bug.cgi?id=698716 :-) + + stdenv.lib.optionalString stdenv.isDarwin '' + sed '24 i #include ' + ''; enableParallelBuilding = true; @@ -54,6 +57,10 @@ stdenv.mkDerivation (rec { meta = { description = "GLib, a C library of programming buildings blocks"; + homepage = http://www.gtk.org/; + license = "LGPLv2+"; + maintainers = with stdenv.lib.maintainers; [ raskin urkud lovek323 ]; + platforms = stdenv.lib.platforms.unix; longDescription = '' GLib provides the core application building blocks for libraries @@ -61,13 +68,6 @@ stdenv.mkDerivation (rec { system used in GNOME, the main loop implementation, and a large set of utility functions for strings and common data structures. ''; - - homepage = http://www.gtk.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 81ca4ee1ba0b..883372b8dcbb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4105,7 +4105,11 @@ let gtkmm; }; - glib = callPackage ../development/libraries/glib { }; + glib = callPackage ../development/libraries/glib { + stdenv = if stdenv.isDarwin + then overrideGCC stdenv gccApple + else stdenv; + }; glibmm = callPackage ../development/libraries/glibmm { }; glib_networking = callPackage ../development/libraries/glib-networking {}; From 4ecbe3bf5d3f59938ef51f3a7bd5561e17b69696 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 18 Jun 2013 11:51:35 +0400 Subject: [PATCH 098/153] Adding pandas - Python data analsysis library --- pkgs/top-level/python-packages.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 94cd526b616b..675b945a594e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2947,6 +2947,28 @@ pythonPackages = python.modules // rec { }; }); + pandas = buildPythonPackage rec { + name = "pandas-0.11.0"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/pandas/${name}.tar.gz"; + sha256 = "1mwh783hcch6lywgjayj8aqmbfv6n8fd2qbf1xlwqk2913ad8x2d"; + }; + + buildInputs = [ nose ]; + propagatedBuildInputs = [ dateutil numpy pytz python.modules.sqlite3 ]; + + # Tests require networking to pass + doCheck = false; + + meta = { + homepage = "http://pandas.pydata.org/"; + description = "Python Data Analysis Library"; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = stdenv.lib.platforms.linux; + }; + }; paramiko = buildPythonPackage rec { name = "paramiko-1.10"; From 23f43527e1cb0f0c40e70a8fabfe7ca0e7048bf7 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 18 Jun 2013 10:36:28 +0200 Subject: [PATCH 099/153] harfbuzz needs libintl on non glibc platforms --- pkgs/development/libraries/harfbuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 8c848218d30f..bdae6cbef04f 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, freetype }: +{ stdenv, fetchurl, pkgconfig, glib, freetype, gettext }: stdenv.mkDerivation rec { name = "harfbuzz-0.9.12"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "19cx5y2m20rp7z5j7mwqfb4ph2g8lrri69zim44x362y4w5gfly6"; }; - buildInputs = [ pkgconfig glib freetype ]; + buildInputs = [ pkgconfig glib freetype ] ++ stdenv.lib.optional (!stdenv.isLinux) gettext; meta = { description = "An OpenType text shaping engine"; From 37b25a712eb3138e18106d7386a179c09f6f72cd Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 18 Jun 2013 12:24:40 +0200 Subject: [PATCH 100/153] Fix graphviz building on darwin --- pkgs/tools/graphics/graphviz/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 370ce4fc1a17..c1aebd3dfe1a 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw -, yacc, libtool, fontconfig, pango, gd, xlibs, gts, gettext +, yacc, libtool, fontconfig, pango, gd, xlibs, gts, gettext, cairo }: stdenv.mkDerivation rec { @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { patches = [ ./fix-broken-memcp-signature.patch ]; + CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo}/include/cairo"; + configureFlags = [ "--with-pngincludedir=${libpng}/include" "--with-pnglibdir=${libpng}/lib" From e6c48a73f804deb9444282a0e518b7934d3e40fe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Jun 2013 11:44:40 +0200 Subject: [PATCH 101/153] celestia: update hashes for the downloaded patches --- pkgs/applications/science/astronomy/celestia/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index 22180e9a3f7d..71d3138944e7 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -7,25 +7,25 @@ let gcc46Patch = fetchurl { url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/celestia-1.6.1-gcc46.patch?h=packages/celestia"; - sha256 = "1q840ip5h2q93r0d68jwrvf40ns5qzqss9vzd6xnwvs3wa77m5wp"; + sha256 = "0my7dpyh5wpz5df7bjhwb4db3ci2rn8ib1nkjv15fbp1g76bxfaz"; name = "celestia-1.6.1-gcc46.patch"; }; libpng15Patch = fetchurl { url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/celestia-1.6.1-libpng15.patch?h=packages/celestia"; - sha256 = "19yqbi5k944d3jm0q2mvcfg52kicy4j347gj62dyaijzj505x4pm"; + sha256 = "1jrmbwmvs9b6k2b2g4104q22v4vqi0wfpz6hmfhniaq34626jcms"; name = "celestia-1.6.1-libpng15.patch"; }; linkingPatch = fetchurl { url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/celestia-1.6.1-linking.patch?h=packages/celestia"; - sha256 = "1qzv18b2prqbhy21js5bnf7vwkmrq1dmrq8r0wab7v10axjqdv35"; + sha256 = "1m8xyq26nm352828bp12c3b8f6m9bys9fwfxbfzqppllk7il2f24"; name = "celestia-1.6.1-linking.patch"; }; gcc47Patch = fetchurl { url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/gcc-4.7-fixes.diff?h=packages/celestia"; - sha256 = "1jqkafwrg1829cwqvlxxkqbf42zqfsgpqd8a5b2qlzma5napdmg5"; + sha256 = "1na26c7pv9qfv8a981m1zvglhv05r3h8513xqjra91qhhzx8wr8n"; name = "gcc-4.7-fixes.diff"; }; in From 3e241c3f83121f4dd499f5658eec35b6cb876bbb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Jun 2013 11:51:11 +0200 Subject: [PATCH 102/153] celestia: add patch to support libpng 1.6 --- pkgs/applications/science/astronomy/celestia/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index 71d3138944e7..5a399169c094 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -17,6 +17,12 @@ let name = "celestia-1.6.1-libpng15.patch"; }; + libpng16Patch = fetchurl { + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/celestia-1.6.1-libpng16.patch?h=packages/celestia"; + sha256 = "1q85prw4ci6d50lri8w1jm19pghxw96qizf5dl4g0j86rlhlkc8f"; + name = "celestia-1.6.1-libpng16.patch"; + }; + linkingPatch = fetchurl { url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/celestia-1.6.1-linking.patch?h=packages/celestia"; sha256 = "1m8xyq26nm352828bp12c3b8f6m9bys9fwfxbfzqppllk7il2f24"; @@ -43,6 +49,7 @@ stdenv.mkDerivation { patchPhase = '' patch -Np0 -i "${gcc46Patch}" patch -Np0 -i "${libpng15Patch}" + patch -Np2 -i "${libpng16Patch}" patch -Np1 -i "${linkingPatch}" patch -Np1 -i "${gcc47Patch}" autoreconf From efac6d8e73bcac39f673eacc0d7b90a9fb0bb79c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Jun 2013 12:44:07 +0200 Subject: [PATCH 103/153] celestia: help the package find the gtk related libraries --- .../science/astronomy/celestia/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index 5a399169c094..837fd2c2755e 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, freeglut, gtk2, gtkglext, libjpeg_turbo, libtheora, libXmu -, lua, mesa, pkgconfig, perl, automake, autoconf, libtool, gettext +, lua, mesa, pkgconfig, perl, automake, autoconf, libtool, gettext, glib, cairo +, pango, gdk_pixbuf, atk }: let @@ -44,7 +45,7 @@ stdenv.mkDerivation { }; buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu mesa pkgconfig lua - perl automake autoconf libtool gettext ]; + perl automake autoconf libtool gettext ]; patchPhase = '' patch -Np0 -i "${gcc46Patch}" @@ -53,7 +54,13 @@ stdenv.mkDerivation { patch -Np1 -i "${linkingPatch}" patch -Np1 -i "${gcc47Patch}" autoreconf - configureFlagsArray=( --with-gtk --with-lua=${lua} CFLAGS="-O2 -fsigned-char" CXXFLAGS="-O2 -fsigned-char" ) + configureFlagsArray=( + --with-gtk + --with-lua=${lua} + CPPFLAGS="-I${gtk2}/include/gtk-2.0 -I${gtk2}/lib/gtk-2.0/include -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${cairo}/include/cairo -I${pango}/include/pango-1.0 -I${gdk_pixbuf}/include/gdk-pixbuf-2.0 -I${atk}/include/atk-1.0 -I${gtkglext}/include/gtkglext-1.0 -I${gtkglext}/lib/gtkglext-1.0/include" + CFLAGS="-O2 -fsigned-char" + CXXFLAGS="-O2 -fsigned-char" + ) ''; enableParallelBuilding = true; From 53fa11cfc9e5b6c87fdd2ce1d7170120367ff46f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 18 Jun 2013 12:52:47 +0200 Subject: [PATCH 104/153] poppler: attempt to fix missing libiconv on non-Linux --- pkgs/development/libraries/poppler/0.18.nix | 4 ++-- pkgs/development/libraries/poppler/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/poppler/0.18.nix b/pkgs/development/libraries/poppler/0.18.nix index 3297b0a19e64..29e99b675491 100644 --- a/pkgs/development/libraries/poppler/0.18.nix +++ b/pkgs/development/libraries/poppler/0.18.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, cairo, freetype, fontconfig, zlib , libjpeg, curl, libpthreadstubs, xorg, openjpeg -, libxml2, pkgconfig, cmake, lcms2 +, libxml2, pkgconfig, cmake, lcms2, libiconvOrEmpty , glibSupport ? false, glib, gtk3Support ? false, gtk3 # gtk2 no longer accepted , qt4Support ? false, qt4 ? null }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional gtk3Support gtk3 ++ stdenv.lib.optional qt4Support qt4; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkgconfig cmake ] ++ libiconvOrEmpty; cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON"; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 2807b2988560..8e168c2f4114 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, pkgconfig, cmake +{ stdenv, fetchurl, fetchgit, pkgconfig, cmake, libiconvOrEmpty , zlib, curl, cairo, freetype, fontconfig, lcms2, libjpeg, openjpeg , qt4Support ? false, qt4 ? null }: @@ -28,7 +28,7 @@ let propagatedBuildInputs = [ zlib cairo freetype fontconfig libjpeg lcms2 curl openjpeg ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkgconfig cmake ] ++ libiconvOrEmpty; cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON"; From cd1b531867ac4728c67711daa256d7dff1f83a30 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Tue, 18 Jun 2013 13:04:05 +0200 Subject: [PATCH 105/153] gnucash: add me as maintainer --- pkgs/applications/office/gnucash/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index e40a0e19f8ff..a6b79eee2817 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnucash.org/; - maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons stdenv.lib.maintainers.iElectric ]; platforms = stdenv.lib.platforms.gnu; }; } From 1d4c7f50ec41de4a26efd173b01671e9c67b9256 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 18 Jun 2013 13:05:43 +0200 Subject: [PATCH 106/153] libv8 ruby gem has hardcoded reference to /usr/bin/env, so that it won't build in a chroot -> fix this --- pkgs/development/interpreters/ruby/patches.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix index e20cb81883f9..55e62594c847 100644 --- a/pkgs/development/interpreters/ruby/patches.nix +++ b/pkgs/development/interpreters/ruby/patches.nix @@ -40,6 +40,7 @@ in export AR=$(type -p ar) ''; buildInputs = [ python ]; + NIX_POST_EXTRACT_FILES_HOOK = patchUsrBinEnv; }; sqlite3 = { propagatedBuildInputs = [ sqlite ]; }; From e006c2fd49fb5edcfeefa8a5022ee2664393ea3d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Jun 2013 13:02:35 +0200 Subject: [PATCH 107/153] celestia: fix compilation and linking after x-updates merge --- pkgs/applications/science/astronomy/celestia/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index 837fd2c2755e..d7814aa5b78f 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -57,9 +57,11 @@ stdenv.mkDerivation { configureFlagsArray=( --with-gtk --with-lua=${lua} - CPPFLAGS="-I${gtk2}/include/gtk-2.0 -I${gtk2}/lib/gtk-2.0/include -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${cairo}/include/cairo -I${pango}/include/pango-1.0 -I${gdk_pixbuf}/include/gdk-pixbuf-2.0 -I${atk}/include/atk-1.0 -I${gtkglext}/include/gtkglext-1.0 -I${gtkglext}/lib/gtkglext-1.0/include" + CPPFLAGS="-DNDEBUG" CFLAGS="-O2 -fsigned-char" CXXFLAGS="-O2 -fsigned-char" + GTK_CFLAGS="-I${gtk2}/include/gtk-2.0 -I${gtk2}/lib/gtk-2.0/include -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${cairo}/include/cairo -I${pango}/include/pango-1.0 -I${gdk_pixbuf}/include/gdk-pixbuf-2.0 -I${atk}/include/atk-1.0 -I${gtkglext}/include/gtkglext-1.0 -I${gtkglext}/lib/gtkglext-1.0/include" + GTK_LIBS="-lgtk-x11-2.0 -lgtkglext-x11-1.0 -lcairo -lgdk_pixbuf-2.0 -lpango-1.0 -lgobject-2.0" ) ''; From d815e5eba2446a2d2fc596210038e750c9a5b12b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Jun 2013 13:10:32 +0200 Subject: [PATCH 108/153] gnucash: fix build (by removing the obsolete potfiles patch) --- pkgs/applications/office/gnucash/default.nix | 3 - .../office/gnucash/potfiles-skip.patch | 147 ------------------ 2 files changed, 150 deletions(-) delete mode 100644 pkgs/applications/office/gnucash/potfiles-skip.patch diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index a6b79eee2817..0865b12e9728 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -23,9 +23,6 @@ stdenv.mkDerivation rec { swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl ]; - # fix a problem with new intltool versions, taken from Gentoo - patchPhase = "patch -p3 < ${./potfiles-skip.patch}"; - configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx"; postInstall = '' diff --git a/pkgs/applications/office/gnucash/potfiles-skip.patch b/pkgs/applications/office/gnucash/potfiles-skip.patch deleted file mode 100644 index 6fef3a1dcd38..000000000000 --- a/pkgs/applications/office/gnucash/potfiles-skip.patch +++ /dev/null @@ -1,147 +0,0 @@ -Index: gnucash/branches/2.4/po/POTFILES.skip -=================================================================== ---- gnucash/branches/2.4/po/POTFILES.skip (revision 18623) -+++ gnucash/branches/2.4/po/POTFILES.skip (revision 22300) -@@ -19,2 +19,142 @@ - src/libqof/qof/qofquery-serialize.c - src/libqof/qof/qofsql.c -+ -+# The scheme files are handled by intl-scm/guile-strings.c because -+# intltool wouldn't scan scheme files. They're here now because -+# intltool 0.50 *does* scan them, and it creates an error during make -+# check. Once the whole world has upgraded to intltool 0.50, intl-scm -+# can be deleted and these files added to POTFILES.in. -+ -+src/app-utils/date-utilities.scm -+src/app-utils/prefs.scm -+src/business/business-utils/business-prefs.scm -+src/business/business-utils/business-utils.scm -+src/business/business-utils/gnucash/business-utils.scm -+src/import-export/qif-import/qif-dialog-utils.scm -+src/import-export/qif-import/qif-file.scm -+src/import-export/qif-import/qif-import/qif-dialog-utils.scm -+src/import-export/qif-import/qif-import/qif-file.scm -+src/import-export/qif-import/qif-import/qif-merge-groups.scm -+src/import-export/qif-import/qif-import/qif-parse.scm -+src/import-export/qif-import/qif-import/qif-to-gnc.scm -+src/import-export/qif-import/qif-merge-groups.scm -+src/import-export/qif-import/qif-parse.scm -+src/import-export/qif-import/qif-to-gnc.scm -+src/report/business-reports/aging.scm -+src/report/business-reports/balsheet-eg.eguile.scm -+src/report/business-reports/balsheet-eg.scm -+src/report/business-reports/business-reports.scm -+src/report/business-reports/customer-summary.scm -+src/report/business-reports/easy-invoice.scm -+src/report/business-reports/fancy-invoice.scm -+src/report/business-reports/gnucash/report/aging.scm -+src/report/business-reports/gnucash/report/balsheet-eg.eguile.scm -+src/report/business-reports/gnucash/report/balsheet-eg.scm -+src/report/business-reports/gnucash/report/business-reports.scm -+src/report/business-reports/gnucash/report/customer-summary.scm -+src/report/business-reports/gnucash/report/easy-invoice.scm -+src/report/business-reports/gnucash/report/fancy-invoice.scm -+src/report/business-reports/gnucash/report/invoice.scm -+src/report/business-reports/gnucash/report/job-report.scm -+src/report/business-reports/gnucash/report/owner-report.scm -+src/report/business-reports/gnucash/report/payables.scm -+src/report/business-reports/gnucash/report/receivables.scm -+src/report/business-reports/gnucash/report/taxinvoice.eguile.scm -+src/report/business-reports/gnucash/report/taxinvoice.scm -+src/report/business-reports/invoice.scm -+src/report/business-reports/job-report.scm -+src/report/business-reports/owner-report.scm -+src/report/business-reports/payables.scm -+src/report/business-reports/receivables.scm -+src/report/business-reports/taxinvoice.eguile.scm -+src/report/business-reports/taxinvoice.scm -+src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm -+src/report/locale-specific/us/gnucash/report/taxtxf.scm -+src/report/locale-specific/us/taxtxf-de_DE.scm -+src/report/locale-specific/us/taxtxf.scm -+src/report/report-gnome/gnucash/report/report-gnome.scm -+src/report/report-gnome/report-gnome.scm -+src/report/report-system/eguile-gnc.scm -+src/report/report-system/gnucash/report/eguile-gnc.scm -+src/report/report-system/html-acct-table.scm -+src/report/report-system/html-fonts.scm -+src/report/report-system/html-style-sheet.scm -+src/report/report-system/html-utilities.scm -+src/report/report-system/options-utilities.scm -+src/report/report-system/report-utilities.scm -+src/report/report-system/report.scm -+src/report/standard-reports/account-piecharts.scm -+src/report/standard-reports/account-summary.scm -+src/report/standard-reports/advanced-portfolio.scm -+src/report/standard-reports/average-balance.scm -+src/report/standard-reports/balance-sheet.scm -+src/report/standard-reports/budget-balance-sheet.scm -+src/report/standard-reports/budget-barchart.scm -+src/report/standard-reports/budget-flow.scm -+src/report/standard-reports/budget-income-statement.scm -+src/report/standard-reports/budget.scm -+src/report/standard-reports/cash-flow.scm -+src/report/standard-reports/category-barchart.scm -+src/report/standard-reports/daily-reports.scm -+src/report/standard-reports/equity-statement.scm -+src/report/standard-reports/general-journal.scm -+src/report/standard-reports/general-ledger.scm -+src/report/standard-reports/gnucash/report/standard-reports/account-piecharts.scm -+src/report/standard-reports/gnucash/report/standard-reports/account-summary.scm -+src/report/standard-reports/gnucash/report/standard-reports/advanced-portfolio.scm -+src/report/standard-reports/gnucash/report/standard-reports/average-balance.scm -+src/report/standard-reports/gnucash/report/standard-reports/balance-sheet.scm -+src/report/standard-reports/gnucash/report/standard-reports/budget-balance-sheet.scm -+src/report/standard-reports/gnucash/report/standard-reports/budget-barchart.scm -+src/report/standard-reports/gnucash/report/standard-reports/budget-flow.scm -+src/report/standard-reports/gnucash/report/standard-reports/budget-income-statement.scm -+src/report/standard-reports/gnucash/report/standard-reports/budget.scm -+src/report/standard-reports/gnucash/report/standard-reports/cash-flow.scm -+src/report/standard-reports/gnucash/report/standard-reports/category-barchart.scm -+src/report/standard-reports/gnucash/report/standard-reports/daily-reports.scm -+src/report/standard-reports/gnucash/report/standard-reports/equity-statement.scm -+src/report/standard-reports/gnucash/report/standard-reports/general-journal.scm -+src/report/standard-reports/gnucash/report/standard-reports/general-ledger.scm -+src/report/standard-reports/gnucash/report/standard-reports/income-statement.scm -+src/report/standard-reports/gnucash/report/standard-reports/net-barchart.scm -+src/report/standard-reports/gnucash/report/standard-reports/net-linechart.scm -+src/report/standard-reports/gnucash/report/standard-reports/portfolio.scm -+src/report/standard-reports/gnucash/report/standard-reports/price-scatter.scm -+src/report/standard-reports/gnucash/report/standard-reports/register.scm -+src/report/standard-reports/gnucash/report/standard-reports/sx-summary.scm -+src/report/standard-reports/gnucash/report/standard-reports/transaction.scm -+src/report/standard-reports/gnucash/report/standard-reports/trial-balance.scm -+src/report/standard-reports/income-statement.scm -+src/report/standard-reports/net-barchart.scm -+src/report/standard-reports/net-linechart.scm -+src/report/standard-reports/portfolio.scm -+src/report/standard-reports/price-scatter.scm -+src/report/standard-reports/register.scm -+src/report/standard-reports/sx-summary.scm -+src/report/standard-reports/transaction.scm -+src/report/standard-reports/trial-balance.scm -+src/report/stylesheets/gnucash/report/stylesheet-easy.scm -+src/report/stylesheets/gnucash/report/stylesheet-fancy.scm -+src/report/stylesheets/gnucash/report/stylesheet-footer.scm -+src/report/stylesheets/gnucash/report/stylesheet-plain.scm -+src/report/stylesheets/stylesheet-easy.scm -+src/report/stylesheets/stylesheet-fancy.scm -+src/report/stylesheets/stylesheet-footer.scm -+src/report/stylesheets/stylesheet-plain.scm -+src/report/utility-reports/gnucash/report/hello-world.scm -+src/report/utility-reports/gnucash/report/view-column.scm -+src/report/utility-reports/gnucash/report/welcome-to-gnucash.scm -+src/report/utility-reports/hello-world.scm -+src/report/utility-reports/view-column.scm -+src/report/utility-reports/welcome-to-gnucash.scm -+src/scm/build-config.scm -+src/scm/build-config.scm.in -+src/scm/command-line.scm -+src/scm/gnucash/price-quotes.scm -+src/scm/main-window.scm -+src/scm/price-quotes.scm -+src/tax/us/de_DE.scm -+src/tax/us/gnucash/tax/de_DE.scm -+src/tax/us/txf-de_DE.scm -+src/tax/us/txf.scm -+ From a8f153267c4f1c2fa7428096cf626b2a631033f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 18 Jun 2013 13:55:22 +0200 Subject: [PATCH 109/153] qt48: security fix for CVE-2013-0254 Taken from Gentoo. --- .../libraries/qt-4.x/4.8/CVE-2013-0254.patch | 66 +++++++++++++++++++ .../libraries/qt-4.x/4.8/default.nix | 3 +- 2 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/qt-4.x/4.8/CVE-2013-0254.patch diff --git a/pkgs/development/libraries/qt-4.x/4.8/CVE-2013-0254.patch b/pkgs/development/libraries/qt-4.x/4.8/CVE-2013-0254.patch new file mode 100644 index 000000000000..48cc05f1800d --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/CVE-2013-0254.patch @@ -0,0 +1,66 @@ +From 20b26bdb3dd5e46b01b9a7e1ce8342074df3c89c Mon Sep 17 00:00:00 2001 +From: Thiago Macieira +Date: Sat, 22 Dec 2012 08:32:12 -0800 +Subject: [PATCH] Change all shmget calls to user-only memory + +Drop the read and write permissions for group and other users in the +system. + +Change-Id: I8fc753f09126651af3fb82df3049050f0b14e876 +(cherry-picked from Qt 5 commit 856f209fb63ae336bfb389a12d2a75fa886dc1c5) +Reviewed-by: Richard J. Moore +--- + src/corelib/kernel/qsharedmemory_unix.cpp | 6 +++--- + src/corelib/kernel/qsystemsemaphore_unix.cpp | 4 ++-- + +diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp +index 20d76e3..4cf3acf 100644 +--- a/src/corelib/kernel/qsharedmemory_unix.cpp ++++ b/src/corelib/kernel/qsharedmemory_unix.cpp +@@ -238,7 +238,7 @@ bool QSharedMemoryPrivate::create(int size) + } + + // create +- if (-1 == shmget(unix_key, size, 0666 | IPC_CREAT | IPC_EXCL)) { ++ if (-1 == shmget(unix_key, size, 0600 | IPC_CREAT | IPC_EXCL)) { + QString function = QLatin1String("QSharedMemory::create"); + switch (errno) { + case EINVAL: +@@ -293,7 +293,7 @@ bool QSharedMemoryPrivate::attach(QSharedMemory::AccessMode mode) + { + #ifndef QT_POSIX_IPC + // grab the shared memory segment id +- int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0444 : 0660)); ++ int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0400 : 0600)); + if (-1 == id) { + setErrorString(QLatin1String("QSharedMemory::attach (shmget)")); + return false; +@@ -381,7 +381,7 @@ bool QSharedMemoryPrivate::detach() + size = 0; + + // Get the number of current attachments +- int id = shmget(unix_key, 0, 0444); ++ int id = shmget(unix_key, 0, 0400); + cleanHandle(); + + struct shmid_ds shmid_ds; +diff --git a/src/corelib/kernel/qsystemsemaphore_unix.cpp b/src/corelib/kernel/qsystemsemaphore_unix.cpp +index fad9acc..e77456b 100644 +--- a/src/corelib/kernel/qsystemsemaphore_unix.cpp ++++ b/src/corelib/kernel/qsystemsemaphore_unix.cpp +@@ -153,10 +153,10 @@ key_t QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode mode) + } + + // Get semaphore +- semaphore = semget(unix_key, 1, 0666 | IPC_CREAT | IPC_EXCL); ++ semaphore = semget(unix_key, 1, 0600 | IPC_CREAT | IPC_EXCL); + if (-1 == semaphore) { + if (errno == EEXIST) +- semaphore = semget(unix_key, 1, 0666 | IPC_CREAT); ++ semaphore = semget(unix_key, 1, 0600 | IPC_CREAT); + if (-1 == semaphore) { + setErrorString(QLatin1String("QSystemSemaphore::handle")); + cleanHandle(); +-- +1.7.1 + 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 d0e23e596885..ccd01dd5d79e 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { patches = [ ./glib-2.32.patch + ./CVE-2013-0254.patch (substituteAll { src = ./dlopen-absolute-paths.diff; inherit cups icu libXfixes; @@ -150,6 +151,6 @@ stdenv.mkDerivation rec { description = "A cross-platform application framework for C++"; license = "GPL/LGPL"; maintainers = with maintainers; [ urkud sander phreedom ]; - platforms = platforms.linux; + platforms = platforms.all; }; } From 79c2db389c2afcb526062c5fcd2dc74dd8d4b88b Mon Sep 17 00:00:00 2001 From: Gergely Risko Date: Tue, 18 Jun 2013 15:36:42 +0200 Subject: [PATCH 110/153] Update xpra to 0.9.5 --- pkgs/tools/X11/xpra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index e0881e5aa9b8..71c5d5f3a44e 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -4,11 +4,11 @@ , ffmpeg_1, x264, libvpx, pil, libwebp }: buildPythonPackage rec { - name = "xpra-0.8.8"; + name = "xpra-0.9.5"; src = fetchurl { url = "http://xpra.org/src/${name}.tar.bz2"; - sha256 = "248bac50c78eccfbc7f728667f9d0ef26b101b288193fa286881cda452e63683"; + sha256 = "1qr9gxmfnkays9hrw2qki1jdkyxhbbkjx71gy23x423cfsxsjmiw"; }; buildInputs = [ From aeaaa0a7e71945465fce54764e0b98fe4bfb7706 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 18 Jun 2013 17:14:17 +0200 Subject: [PATCH 111/153] libv8 still broken in chroots, but this scons patch script fixes it --- pkgs/development/interpreters/ruby/patches.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix index 55e62594c847..3c495526c8b9 100644 --- a/pkgs/development/interpreters/ruby/patches.nix +++ b/pkgs/development/interpreters/ruby/patches.nix @@ -35,12 +35,17 @@ in EOF chmod +x $TMPDIR/g++ - export CXX=$TMPDIR/g++ export AR=$(type -p ar) ''; buildInputs = [ python ]; - NIX_POST_EXTRACT_FILES_HOOK = patchUsrBinEnv; + NIX_POST_EXTRACT_FILES_HOOK = writeScript "patch-scons" '' + #!/bin/sh + for i in `find "$1" -name scons` + do + sed -i -e "s@/usr/bin/env@$(type -p env)@g" $i + done + ''; }; sqlite3 = { propagatedBuildInputs = [ sqlite ]; }; From ab7d7333be9edabc4dc82b6b23aa05a9732c1998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 18 Jun 2013 14:59:32 +0200 Subject: [PATCH 112/153] dbus: attempt to fix build on FreeBSD and Darwin Also build it there. --- pkgs/development/libraries/dbus/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index b7f7eac30468..4418e6a2ebca 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -13,7 +13,7 @@ let # also other parts than "libs" need this statically linked lib makeInternalLib = "(cd dbus && make libdbus-internal.la)"; - systemdOrEmpty = stdenv.lib.optional stdenv.isLinux systemd; + systemdOrEmpty = lib.optional stdenv.isLinux systemd; # A generic builder for individual parts (subdirs) of D-Bus dbus_drv = name: subdirs: merge: stdenv.mkDerivation (lib.mergeAttrsByFuncDefaultsClean [{ @@ -42,10 +42,9 @@ let doCheck = true; - patches = [ - ./ignore-missing-includedirs.patch ./implement-getgrouplist.patch - ./ucred-dirty-hack.patch ./no-create-dirs.patch - ]; + patches = [ ./ignore-missing-includedirs.patch ] + ++ lib.optional (stdenv.isSunOS || stdenv.isLinux/*avoid rebuilds*/) ./implement-getgrouplist.patch + ++ [ ./ucred-dirty-hack.patch ./no-create-dirs.patch ]; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ expat ]; @@ -85,6 +84,8 @@ in rec { configureFlags = [ "--with-dbus-daemondir=${daemon}/bin" ]; buildInputs = buildInputsX ++ systemdOrEmpty ++ [ libs daemon dbus_glib ]; NIX_CFLAGS_LINK = "-Wl,--as-needed -ldbus-1"; + + meta.platforms = stdenv.lib.platforms.all; }; daemon = dbus_drv "daemon" "bus" { From 3adf8e6429aa9da49ff0e97a763b540737cb151d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 18 Jun 2013 15:35:26 +0200 Subject: [PATCH 113/153] vala, libusb1, deps of libjpeg: attempt to fix on non-Linux --- pkgs/development/compilers/vala/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 8 ++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index c153abea247a..9af30230757e 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, yacc, flex, pkgconfig, glib, dbus, dbus_tools, libiconvOrEmpty }: +{ stdenv, fetchurl, yacc, flex, pkgconfig, glib, dbus, dbus_tools +, libiconvOrEmpty, libintlOrEmpty }: stdenv.mkDerivation rec { p_name = "vala"; @@ -15,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ yacc flex pkgconfig ]; - buildInputs = [ glib ] ++ libiconvOrEmpty + buildInputs = [ glib ] ++ libiconvOrEmpty ++ libintlOrEmpty ++ stdenv.lib.optional doCheck [ dbus dbus_tools ]; doCheck = false; # problems when launching dbus tests diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 883372b8dcbb..6d56c1ff8af2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4537,7 +4537,7 @@ let libjpeg_original = callPackage ../development/libraries/libjpeg { }; libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { }; - libjpeg = if stdenv.isDarwin then libjpeg_original else libjpeg_turbo; + libjpeg = if (stdenv.isLinux) then libjpeg_turbo else libjpeg_original; # some problems, both on FreeBSD and Darwin libjpeg62 = callPackage ../development/libraries/libjpeg/62.nix { libtool = libtool_1_5; @@ -4697,7 +4697,11 @@ let else stdenv; }; - libusb1 = callPackage ../development/libraries/libusb1 { }; + libusb1 = callPackage ../development/libraries/libusb1 { + stdenv = if stdenv.isDarwin # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50909 + then overrideGCC stdenv gccApple + else stdenv; + }; libunwind = callPackage ../development/libraries/libunwind { }; From 92ecf99373f2bb3cb33b18538a873b749a3d0514 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 18 Jun 2013 18:34:25 +0200 Subject: [PATCH 114/153] qt48, gstreamer: attempt to fix on non-Linux --- pkgs/development/libraries/gstreamer/gstreamer/default.nix | 4 ++-- pkgs/development/libraries/qt-4.x/4.8/default.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/gstreamer/default.nix index 5d33e7bff03d..392e8e31f436 100644 --- a/pkgs/development/libraries/gstreamer/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamer/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, perl, bison, flex, pkgconfig, glib, libxml2 }: +{ fetchurl, stdenv, perl, bison, flex, pkgconfig, glib, libxml2, libintlOrEmpty }: stdenv.mkDerivation rec { name = "gstreamer-0.10.36"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ perl bison flex pkgconfig ]; - propagatedBuildInputs = [ glib libxml2 ]; + propagatedBuildInputs = [ glib libxml2 ] ++ libintlOrEmpty; patchPhase = '' sed -i -e 's/^ /\t/' docs/gst/Makefile.in docs/libs/Makefile.in docs/plugins/Makefile.in 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 ccd01dd5d79e..f8c6dd2a2470 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { libXv libXi libSM ] ++ optional (stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms) mesa - ++ optional (buildWebkit || buildMultimedia) alsaLib + ++ optional ((buildWebkit || buildMultimedia) && stdenv.isLinux ) alsaLib ++ [ zlib libpng openssl dbus.libs freetype fontconfig glib ] ++ optionals (buildWebkit || buildMultimedia) [ gstreamer gst_plugins_base ]; From 98436616a5149caf0b0dac33ce5b08c89260293f Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 18 Jun 2013 22:01:40 +0200 Subject: [PATCH 115/153] Replaced ad-hoc gettext buildinput by libintlOrEmpty --- pkgs/development/libraries/harfbuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index bdae6cbef04f..d955526d22ac 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, freetype, gettext }: +{ stdenv, fetchurl, pkgconfig, glib, freetype, libintlOrEmpty }: stdenv.mkDerivation rec { name = "harfbuzz-0.9.12"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "19cx5y2m20rp7z5j7mwqfb4ph2g8lrri69zim44x362y4w5gfly6"; }; - buildInputs = [ pkgconfig glib freetype ] ++ stdenv.lib.optional (!stdenv.isLinux) gettext; + buildInputs = [ pkgconfig glib freetype libintlOrEmpty ]; meta = { description = "An OpenType text shaping engine"; From 3cba7555964fad746743347c45931adacfd0d5f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 18 Jun 2013 22:00:20 +0200 Subject: [PATCH 116/153] qt48: minimize default dependencies on non-Linux --- pkgs/development/libraries/qt-4.x/4.8/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) 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 f8c6dd2a2470..b797f631b8e7 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -5,8 +5,8 @@ , libtiff, glib, icu , mysql, postgresql, sqlite , perl, coreutils, libXi -, buildMultimedia ? true, alsaLib, gstreamer, gst_plugins_base -, buildWebkit ? true +, buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst_plugins_base +, buildWebkit ? stdenv.isLinux , flashplayerFix ? false, gdk_pixbuf , gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs , developerBuild ? false diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d56c1ff8af2..e7e96565728e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5069,6 +5069,7 @@ let qt48 = callPackage ../development/libraries/qt-4.x/4.8 { # GNOME dependencies are not used unless gtkStyle == true inherit (pkgs.gnome) libgnomeui GConf gnome_vfs; + cups = if stdenv.isLinux then cups else null; }; qt48Full = callPackage ../development/libraries/qt-4.x/4.8 { From 2058d95eb41520f72e8cbb7c0f895d86b0da0769 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 18 Jun 2013 22:02:52 +0200 Subject: [PATCH 117/153] non-Linux platforms: extend to some important pkgs --- pkgs/applications/audio/flac/default.nix | 1 + pkgs/development/libraries/expat/default.nix | 1 + pkgs/development/libraries/fontconfig/default.nix | 5 ++--- pkgs/development/libraries/freetype/default.nix | 1 + pkgs/development/libraries/gtk+/2.x.nix | 2 +- pkgs/development/libraries/gtk+/3.x.nix | 2 +- pkgs/development/libraries/libpng/default.nix | 1 + pkgs/development/libraries/poppler/default.nix | 1 + pkgs/tools/networking/curl/default.nix | 1 + 9 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix index d42147294852..0383a1ce0ad5 100644 --- a/pkgs/applications/audio/flac/default.nix +++ b/pkgs/applications/audio/flac/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://xiph.org/flac/; description = "Library and tools for encoding and decoding the FLAC lossless audio file format"; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 6b675230119e..d7915a93962c 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -11,5 +11,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.libexpat.org/; description = "A stream-oriented XML parser library written in C"; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 2067f3457b63..e3b0a54ee82e 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig freetype expat ]; - #propagatedBuildInputs = [ expat ]; # !!! shouldn't be necessary, but otherwise pango breaks - configureFlags = "--sysconfdir=/etc --with-cache-dir=/var/cache/fontconfig --disable-docs --with-default-fonts="; # We should find a better way to access the arch reliably. @@ -36,7 +34,7 @@ stdenv.mkDerivation rec { # Don't try to write to /etc/fonts or /var/cache/fontconfig at install time. installFlags = "sysconfdir=$(out)/etc RUN_FC_CACHE_TEST=false fc_cachedir=$(TMPDIR)/dummy"; - postInstall = if !freetype.infinality.useInfinality then "" else '' + postInstall = stdenv.lib.optionalString freetype.infinality.useInfinality '' cd "$out/etc/fonts" && tar xvf ${infinality_patch} ''; @@ -44,5 +42,6 @@ stdenv.mkDerivation rec { description = "A library for font customization and configuration"; homepage = http://fontconfig.org/; license = "bsd"; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index cff22e9bc577..8fa75425544f 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -75,5 +75,6 @@ stdenv.mkDerivation rec { homepage = http://www.freetype.org/; license = if useEncumberedCode then "unfree" else "GPLv2+"; # or the FreeType License (BSD + advertising clause) + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index 055d93ef9290..1cd85ae2aa58 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { license = "LGPLv2+"; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index a22e243411aa..796b36f821cd 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { license = "LGPLv2+"; maintainers = with stdenv.lib.maintainers; [urkud raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 72821ef7028f..0a1506107817 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { description = "The official reference implementation for the PNG file format"; homepage = http://www.libpng.org/pub/png/libpng.html; license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 8e168c2f4114..a871c0ab0d72 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -50,6 +50,7 @@ let ''; license = "GPLv2"; + platforms = stdenv.lib.platforms.all; }; } merge ]); # poppler_drv diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index f9439f1b42aa..73dcb44269c3 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -66,5 +66,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://curl.haxx.se/"; description = "A command line tool for transferring files with URL syntax"; + platforms = stdenv.lib.platforms.all; }; } From 1a23f715f49d329781dcafee9b758edf59f5090c Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Tue, 18 Jun 2013 22:42:02 +0200 Subject: [PATCH 118/153] tig: built for linux --- .../version-management/git-and-tools/tig/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index 20644d09dd70..bdd6e806fe3b 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://jonas.nitro.dk/tig/"; description = "Tig is a git repository browser that additionally can act as a pager for output from various git commands"; - maintainers = [ maintainers.garbas maintainers.bjornfor ]; + maintainers = [ maintainers.garbas maintainers.bjornfor maintainers.iElectric ]; license = licenses.gpl2; + platforms = platforms.linux; }; } From d7be74adc0e2f44cd91bf6bbe8f1fcde55b7f3b7 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Tue, 18 Jun 2013 22:48:34 +0200 Subject: [PATCH 119/153] acpid: build on linux --- pkgs/os-specific/linux/acpid/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/acpid/default.nix b/pkgs/os-specific/linux/acpid/default.nix index fe1792478d6b..7f3440d8f59e 100644 --- a/pkgs/os-specific/linux/acpid/default.nix +++ b/pkgs/os-specific/linux/acpid/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { homepage = http://tedfelix.com/linux/acpid-netlink.html; description = "A daemon for delivering ACPI events to userspace programs"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } From 35431a7d7b3853a861a76502db12d21be475b4e4 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Tue, 18 Jun 2013 22:50:15 +0200 Subject: [PATCH 120/153] libgnomeprint: build on linux --- pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix index 0b6d3e25e2e7..390059089fc0 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix @@ -14,4 +14,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk gettext intltool libart_lgpl libgnomecups bison flex ]; propagatedBuildInputs = [ libxml2 ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; } From ae98b6185051ed0a5b7636dc85b696112910e1e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 18 Jun 2013 22:53:19 +0200 Subject: [PATCH 121/153] dropbear: update to 2013.58, and build dynamically I had to do a trick with GNU make, to allow it to find libs. --- pkgs/tools/networking/dropbear/default.nix | 18 +++++++++++++++--- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index f42c8f7ebe9b..362e21a3fcff 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -2,11 +2,11 @@ sftpPath ? "/var/run/current-system/sw/libexec/sftp-server" }: stdenv.mkDerivation rec { - name = "dropbear-0.52"; + name = "dropbear-2013.58"; src = fetchurl { - url = http://matt.ucc.asn.au/dropbear/releases/dropbear-0.52.tar.bz2; - sha256 = "1h84dwld8qm19m0a1zslm2ssz65nr93irw7p2h5fjrlh9ix74ywc"; + url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; + sha256 = "0m9fhabs78v35fhqmji5gkm66ahkyqbbdzmlmr9m7q8l3ndihrnq"; }; dontDisableStatic = enableStatic; @@ -15,6 +15,18 @@ stdenv.mkDerivation rec { CFLAGS = "-DSFTPSERVER_PATH=\\\"${sftpPath}\\\""; + # http://www.gnu.org/software/make/manual/html_node/Libraries_002fSearch.html + preConfigure = '' + makeFlags=VPATH=`cat $NIX_GCC/nix-support/orig-libc`/lib + ''; + + crossAttrs = { + # This works for uclibc, at least. + preConfigure = '' + makeFlags=VPATH=`cat ${stdenv.gccCross}/nix-support/orig-libc`/lib + ''; + }; + patches = [ # Allow sessions to inherit the PATH from the parent dropbear. # Otherwise they only get the usual /bin:/usr/bin kind of PATH diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7e96565728e..f016b3e2816d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -725,10 +725,7 @@ let dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { }; - dropbear = callPackage ../tools/networking/dropbear { - enableStatic = true; - zlib = zlibStatic; - }; + dropbear = callPackage ../tools/networking/dropbear { }; dtach = callPackage ../tools/misc/dtach { }; From 83dee22f4a69c81a827c23cade14f7e02df3ec79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 18 Jun 2013 23:35:34 +0200 Subject: [PATCH 122/153] Fixing a crash bug in dropbear. --- pkgs/tools/networking/dropbear/default.nix | 4 ++++ pkgs/tools/networking/dropbear/proxycrash.patch | 17 +++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/tools/networking/dropbear/proxycrash.patch diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index 362e21a3fcff..1d51c4864a18 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -31,6 +31,10 @@ stdenv.mkDerivation rec { # Allow sessions to inherit the PATH from the parent dropbear. # Otherwise they only get the usual /bin:/usr/bin kind of PATH ./pass-path.patch + + # Bugfix + # http://article.gmane.org/gmane.network.ssh.dropbear/1361 + ./proxycrash.patch ]; buildInputs = [ zlib ]; diff --git a/pkgs/tools/networking/dropbear/proxycrash.patch b/pkgs/tools/networking/dropbear/proxycrash.patch new file mode 100644 index 000000000000..1a17e7e3c624 --- /dev/null +++ b/pkgs/tools/networking/dropbear/proxycrash.patch @@ -0,0 +1,17 @@ +diff -r 5ba19d00da08 cli-runopts.c +--- a/cli-runopts.c Sun May 26 18:43:00 2013 +0800 ++++ b/cli-runopts.c Mon Jun 17 19:51:08 2013 +0000 +@@ -383,6 +383,13 @@ + exit(EXIT_FAILURE); + } + ++#ifdef ENABLE_CLI_PROXYCMD ++ if (cli_opts.proxycmd) { ++ /* To match the common path of m_freeing it */ ++ cli_opts.proxycmd = m_strdup(cli_opts.proxycmd); ++ } ++#endif ++ + if (cli_opts.remoteport == NULL) { + cli_opts.remoteport = "22"; + } From 1f81984293c72b63d5ee2d2d2e9e36e1116238bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 18 Jun 2013 23:42:25 +0200 Subject: [PATCH 123/153] non-Linux: more adjustments Also reordered stuff in all-packages.nix. --- pkgs/development/libraries/dbus/default.nix | 2 +- pkgs/development/libraries/glib/default.nix | 4 ++-- pkgs/development/libraries/gtk+/2.x.nix | 17 +++++++++-------- pkgs/development/libraries/gtk+/3.x.nix | 4 ++-- pkgs/development/libraries/poppler/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 10 ++++------ 6 files changed, 20 insertions(+), 21 deletions(-) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 4418e6a2ebca..d50a0076e62a 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, autoconf, automake, libtool , expat, systemd, glib, dbus_glib, python -, libX11, libICE, libSM, useX11 ? true }: +, libX11, libICE, libSM, useX11 ? stdenv.isLinux }: let version = "1.6.12"; # 1.7.* isn't recommended, even for gnome 3.8 diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 747a18f04ccc..7469b07ce866 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation (rec { }; # configure script looks for d-bus but it is only needed for tests - buildInputs = [ libelf ] ++ libiconvOrEmpty; + buildInputs = [ libelf ]; nativeBuildInputs = [ perl pkgconfig gettext python ]; - propagatedBuildInputs = [ pcre zlib libffi ]; + propagatedBuildInputs = [ pcre zlib libffi ] ++ libiconvOrEmpty; configureFlags = "--with-pcre=system --disable-fam"; diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index 1cd85ae2aa58..c7dc45aa462c 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xlibs -, gdk_pixbuf, libintlOrEmpty -, xineramaSupport ? true +, gdk_pixbuf, libintlOrEmpty, x11 +, xineramaSupport ? stdenv.isLinux , cupsSupport ? true, cups ? null }: @@ -21,13 +21,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkgconfig gettext ]; - propagatedBuildInputs = with xlibs; - [ glib cairo pango gdk_pixbuf atk - libXrandr libXrender libXcomposite libXi libXcursor - ] + propagatedBuildInputs = with xlibs; with stdenv.lib; + [ glib cairo pango gdk_pixbuf atk ] + ++ optionals stdenv.isLinux + [ libXrandr libXrender libXcomposite libXi libXcursor ] + ++ optional stdenv.isDarwin x11 ++ libintlOrEmpty - ++ stdenv.lib.optional xineramaSupport libXinerama - ++ stdenv.lib.optionals cupsSupport [ cups ]; + ++ optional xineramaSupport libXinerama + ++ optionals cupsSupport [ cups ]; configureFlags = "--with-xinput=yes"; diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 796b36f821cd..8abc602c0a1f 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, gettext , expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, xlibs -, xineramaSupport ? true -, cupsSupport ? true, cups ? null +, xineramaSupport ? stdenv.isLinux +, cupsSupport ? stdenv.isLinux, cups ? null }: assert xineramaSupport -> xlibs.libXinerama != null; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index a871c0ab0d72..7c392832406a 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, pkgconfig, cmake, libiconvOrEmpty +{ stdenv, fetchurl, fetchgit, pkgconfig, cmake, libiconvOrEmpty, libintlOrEmpty , zlib, curl, cairo, freetype, fontconfig, lcms2, libjpeg, openjpeg , qt4Support ? false, qt4 ? null }: @@ -28,7 +28,7 @@ let propagatedBuildInputs = [ zlib cairo freetype fontconfig libjpeg lcms2 curl openjpeg ]; - nativeBuildInputs = [ pkgconfig cmake ] ++ libiconvOrEmpty; + nativeBuildInputs = [ pkgconfig cmake ] ++ libiconvOrEmpty ++ libintlOrEmpty; cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f016b3e2816d..4de632bb3bf5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4114,15 +4114,13 @@ let atk = callPackage ../development/libraries/atk { }; atkmm = callPackage ../development/libraries/atkmm { }; + pixman = callPackage ../development/libraries/pixman { }; + cairo = callPackage ../development/libraries/cairo { glSupport = lib.elem system lib.platforms.mesaPlatforms; }; - - pixman = callPackage ../development/libraries/pixman { }; - - cairomm = callPackage ../development/libraries/cairomm { }; - cairo_1_12_2 = callPackage ../development/libraries/cairo/1.12.2.nix { }; + cairomm = callPackage ../development/libraries/cairomm { }; pango = callPackage ../development/libraries/pango { }; pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix { }; @@ -4132,7 +4130,7 @@ let gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { }; gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { - cupsSupport = config.gtk2.cups or true; + cupsSupport = config.gtk2.cups or stdenv.isLinux; }; gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.x.nix { From e366dc565ac9c11a1f81f32a2239463e0f3426b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 18 Jun 2013 23:52:34 +0200 Subject: [PATCH 124/153] Fix the hash changes accidentally caused in 98436616 Moreover I'm not sure It's legal to add *lists inside* buildInputs. --- pkgs/development/libraries/harfbuzz/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index d955526d22ac..4fb024db0e13 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "19cx5y2m20rp7z5j7mwqfb4ph2g8lrri69zim44x362y4w5gfly6"; }; - buildInputs = [ pkgconfig glib freetype libintlOrEmpty ]; + buildInputs = [ pkgconfig glib freetype ] ++ libintlOrEmpty; meta = { description = "An OpenType text shaping engine"; From 4d60fa66f1beb553ae2da4a56270baed1826bdf9 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Wed, 19 Jun 2013 01:02:57 +0200 Subject: [PATCH 125/153] Add sha256 for python-obfsproxy. Signed-off-by: Moritz Ulrich --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 675b945a594e..f683af198987 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2873,6 +2873,7 @@ pythonPackages = python.modules // rec { src = fetchgit { url = https://git.torproject.org/pluggable-transports/obfsproxy.git; rev = "3c4e843a30c430aec1de03e0e09ef654072efc03"; + sha256 = "8fd1e63a37bc42add7609d97d50ecd81da81881bcf7015a9e2958531dbf39018"; }; propagatedBuildInputs = [ pyptlib argparse twisted pycrypto ]; From 81b564b52e3a8484caaf0f9bdc62f57c0545058b Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Wed, 19 Jun 2013 00:26:18 +0100 Subject: [PATCH 126/153] haskellPackages: vector-0.9.1 fix 'primitive' dependency --- .../libraries/haskell/primitive/0.4.1.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 5 ++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/primitive/0.4.1.nix diff --git a/pkgs/development/libraries/haskell/primitive/0.4.1.nix b/pkgs/development/libraries/haskell/primitive/0.4.1.nix new file mode 100644 index 000000000000..4c4b274f425d --- /dev/null +++ b/pkgs/development/libraries/haskell/primitive/0.4.1.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "primitive"; + version = "0.4.1"; + sha256 = "06999i59xhvjwfdbnr1n09zkvg7lnim64nqxqlvk0x6slkidb7f6"; + meta = { + homepage = "http://code.haskell.org/primitive"; + description = "Primitive memory-related operations"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 99ba9e01895f..733401b4fa9e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1593,6 +1593,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); punycode = callPackage ../development/libraries/haskell/punycode {}; + primitive_0_4_1 = callPackage ../development/libraries/haskell/primitive/0.4.1.nix {}; primitive_0_5_0_1 = callPackage ../development/libraries/haskell/primitive/0.5.0.1.nix {}; primitive = self.primitive_0_5_0_1; @@ -2005,7 +2006,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); vect = callPackage ../development/libraries/haskell/vect {}; - vector_0_9_1 = callPackage ../development/libraries/haskell/vector/0.9.1.nix {}; + vector_0_9_1 = callPackage ../development/libraries/haskell/vector/0.9.1.nix { + primitive = self.primitive_0_4_1; + }; vector_0_10 = callPackage ../development/libraries/haskell/vector/0.10.nix {}; vector_0_10_0_1 = callPackage ../development/libraries/haskell/vector/0.10.0.1.nix {}; vector = self.vector_0_10_0_1; From ccb2e9a8328097283cfb0c9866c34c3abb7813dd Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Wed, 15 May 2013 00:41:22 +0200 Subject: [PATCH 127/153] Adding multiple versions of sbt. Probably you want to use the latest(default). --- .../simple-build-tool/default.nix | 114 +++++++++++++----- 1 file changed, 83 insertions(+), 31 deletions(-) diff --git a/pkgs/development/tools/build-managers/simple-build-tool/default.nix b/pkgs/development/tools/build-managers/simple-build-tool/default.nix index 218957ae360d..a72f94d52f67 100644 --- a/pkgs/development/tools/build-managers/simple-build-tool/default.nix +++ b/pkgs/development/tools/build-managers/simple-build-tool/default.nix @@ -1,41 +1,93 @@ -{ stdenv, fetchurl }: +{ stdenv, versionedDerivation, fetchurl, version ? "xsbt-0.12.3" }: + +let + + description = "A build tool for Scala"; + longDescription = name: '' + ${name} is a simple build tool for Scala projects that aims to do the + basics well. + + This package is the sbt launcher which automatically manages + and downloads dependencies, including the SBT package and the + Scala compiler. + ''; + + metaSBT = { + inherit description; + longDescription = longDescription "sbt"; + homepage = http://code.google.com/p/simple-build-tool/; + license = "bsd"; + }; + + metaXSBT = { + inherit description; + longDescription = longDescription "xsbt"; + homepage = https://github.com/harrah/xsbt; + license = "bsd"; + }; + +in # Depends on a JRE at runtime. -let - version = "0.7.3"; -in - stdenv.mkDerivation rec { +versionedDerivation "simple-build-tool" version { + "0.7.3" = let version = "0.7.3"; in { name = "simple-build-tool-${version}"; src = fetchurl { url = "http://simple-build-tool.googlecode.com/files/sbt-launch-${version}.jar"; sha256 = "1nciifzf00cs54a4h57a7v1hyklm5vgln0sscmz5kzv96ggphs6k"; }; + meta = metaSBT; + }; - installPhase = '' - mkdir -pv "$out/lib/java" - cp $src "$out/lib/java/sbt-launch-${version}.jar" - mkdir -p "$out/bin" - cat > "$out/bin/sbt" < "$out/bin/sbt" < Date: Mon, 17 Jun 2013 12:33:25 +0200 Subject: [PATCH 128/153] ocaml adding deriving --- .../tools/ocaml/deriving/default.nix | 72 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 74 insertions(+) create mode 100644 pkgs/development/tools/ocaml/deriving/default.nix diff --git a/pkgs/development/tools/ocaml/deriving/default.nix b/pkgs/development/tools/ocaml/deriving/default.nix new file mode 100644 index 000000000000..baa6bce4d432 --- /dev/null +++ b/pkgs/development/tools/ocaml/deriving/default.nix @@ -0,0 +1,72 @@ +{stdenv, fetchurl, zlib, ocaml, findlib, ncurses +, versionedDerivation, unzip +, version ? + let match = { + "ocaml-3.10.0" = "for-3.10.0"; + "ocaml-3.12.1" = "for-3.12.1"; + }; in stdenv.lib.maybeAttr ocaml.name (throw "no matching source of ocaml-deriving for ocaml version: ${ocaml.name}") match +}: + +/* +Usage example: + +== main.ml == +type t = | A | B + deriving (Show) + +print_string (Show.show (A));; +== + +ocamlopt -pp $out/bin/deriving -I $d/lib -I $d/syntax nums.cmxa show.cmx main.ml +*/ + +versionedDerivation "ocaml-deriving" version { + + "for-3.10.0" = { + name = "deriving-0.1.1a"; + # ocaml: 3.10.0 + src = fetchurl { + url = https://deriving.googlecode.com/files/deriving-0.1.1a.tar.gz; + sha256 = "0ppmqhc23kccfjn3cnd9n205ky627ni8f5djf8sppmc3lc1m97mb"; + }; + }; + + "for-3.12.1" = { + name = "deriving-more-recent"; + + # https://github.com/jaked/deriving + src = fetchurl { + name = "for-3.12.0.zip"; + url = https://codeload.github.com/jaked/deriving/zip/c7b9cea3eb4bbfb9e09673faf725f70247c9df78; + sha256 = "1zrmpqb5lsjmizqs68czmfpsbz9hz30pf97w11kkby175hhj84gi"; + }; + + buildInputs = [ unzip ]; + }; + +} +{ + buildInputs = [ocaml findlib]; + + installPhase = '' + # not all tests compile !? + # (cd tests; make) + + ensureDir $out/bin + cp -a lib $out/ + cp -a syntax $out + + # this allows -pp deriving + ln -s $out/syntax/deriving $out/bin/deriving + ''; + + meta = { + homepage = "https://code.google.com/p/deriving/source/checkout"; + description = "A library of cryptographic primitives for OCaml"; + license = stdenv.lib.licenses.mit; + platforms = ocaml.meta.platforms; + maintainers = [ + stdenv.lib.maintainers.z77z + ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4de632bb3bf5..90d418310eb8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2717,6 +2717,8 @@ let cryptokit = callPackage ../development/ocaml-modules/cryptokit { }; + deriving = callPackage ../development/tools/ocaml/deriving { }; + findlib = callPackage ../development/tools/ocaml/findlib { }; dypgen = callPackage ../development/ocaml-modules/dypgen { }; From f5f76e6446788af7b4cdbdaac3b0142d3a786488 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 19 Jun 2013 03:18:59 +0300 Subject: [PATCH 129/153] ocamlPackages.deriving: fix version --- pkgs/development/tools/ocaml/deriving/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/ocaml/deriving/default.nix b/pkgs/development/tools/ocaml/deriving/default.nix index baa6bce4d432..d53f41b5da5c 100644 --- a/pkgs/development/tools/ocaml/deriving/default.nix +++ b/pkgs/development/tools/ocaml/deriving/default.nix @@ -32,7 +32,7 @@ versionedDerivation "ocaml-deriving" version { }; "for-3.12.1" = { - name = "deriving-more-recent"; + name = "deriving-git20100903"; # https://github.com/jaked/deriving src = fetchurl { From e77a7d21dc301a8cf15f248a3f539e953678d2fe Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 19 Jun 2013 05:15:05 +0300 Subject: [PATCH 130/153] Fix attr name to match version --- pkgs/applications/editors/eclipse/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index d0ac3890d7f0..21dad42ea46d 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -159,7 +159,7 @@ in { }; }; - eclipse_cpp_421 = buildEclipse { + eclipse_cpp_42 = buildEclipse { name = "eclipse-cpp-4.2"; description = "Eclipse IDE for C/C++ Developers"; src = From 101aad1467561f14a1a6d69b004d993edfb4e8c2 Mon Sep 17 00:00:00 2001 From: Christophe Raffalli Date: Wed, 19 Jun 2013 04:39:08 +0200 Subject: [PATCH 131/153] camlimages ... still wasn't ok. Now better. --- pkgs/development/ocaml-modules/camlimages/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix index db11fc4fb8b2..037ebdea6b61 100644 --- a/pkgs/development/ocaml-modules/camlimages/default.nix +++ b/pkgs/development/ocaml-modules/camlimages/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng_apng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript, lablgtk }: +{stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng12, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }: let ocaml_version = (builtins.parseDrvName ocaml.name).version; @@ -14,9 +14,9 @@ stdenv.mkDerivation { sha256 = "b40237c1505487049799a7af296eb3996b3fa08eab94415546f46d61355747c4"; }; - buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript libtiff libjpeg libpng_apng giflib freetype libXpm lablgtk]; - - propagatedbuildInputs = [libtiff libjpeg libpng_apng giflib freetype libXpm lablgtk ]; + buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript libtiff libjpeg libpng12 giflib freetype libXpm ]; + + propagatedbuildInputs = [libtiff libjpeg libpng12 giflib freetype libXpm ]; createFindlibDestdir = true; From 102216f8c92a3c52c98f58774194ffd91062cda2 Mon Sep 17 00:00:00 2001 From: Christophe Raffalli Date: Wed, 19 Jun 2013 05:03:16 +0200 Subject: [PATCH 132/153] Drop useless dependencies in glsurf --- pkgs/applications/science/math/glsurf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 30ed454f61ab..51b2850347b5 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchdarcs, ocaml, findlib, lablgl, camlimages, mesa, freeglut, ocaml_mysql, mlgmp, mpfr, gmp, libtiff, libjpeg, libpng_apng, giflib, freetype, libXpm }: +{ stdenv, fetchdarcs, ocaml, findlib, lablgl, camlimages, mesa, freeglut, ocaml_mysql, mlgmp, mpfr, gmp, libtiff, libjpeg, libpng12, giflib }: let ocaml_version = (builtins.parseDrvName ocaml.name).version; @@ -16,7 +16,7 @@ stdenv.mkDerivation { buildInputs = [ ocaml findlib freeglut mesa lablgl camlimages ocaml_mysql mlgmp mpfr gmp - libtiff libjpeg libpng_apng giflib freetype libXpm ]; + libtiff libjpeg libpng12 giflib ]; installPhase = '' mkdir -p $out/bin $out/share/doc/glsurf From 4255b343e8ca737f148e0b9b42460b190ee1bbee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 19 Jun 2013 08:59:30 +0200 Subject: [PATCH 133/153] pango, gtk3: non-Linux attempts to fix --- pkgs/development/libraries/gtk+/3.x.nix | 11 ++++++----- pkgs/development/libraries/pango/default.nix | 5 +++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 8abc602c0a1f..f89b521758ca 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gettext -, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, xlibs +, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, xlibs, x11 , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux, cups ? null }: @@ -18,10 +18,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig gettext ]; - propagatedBuildInputs = with xlibs; [ - expat glib cairo pango gdk_pixbuf atk at_spi2_atk - libXrandr libXrender libXcomposite libXi libXcursor - ] ++ stdenv.lib.optional xineramaSupport libXinerama + propagatedBuildInputs = with xlibs; with stdenv.lib; + [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk ] + ++ optionals stdenv.isLinux [ libXrandr libXrender libXcomposite libXi libXcursor ] + ++ optional stdenv.isDarwin x11 + ++ stdenv.lib.optional xineramaSupport libXinerama ++ stdenv.lib.optionals cupsSupport [ cups ]; postInstall = "rm -rf $out/share/gtk-doc"; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 8d3efe490251..1acb3639f065 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng, harfbuzz, fontconfig }: +{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng, harfbuzz, fontconfig +, libintlOrEmpty }: stdenv.mkDerivation rec { name = "pango-1.32.5"; #.6 needs a not-yet-stable fontconfig @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ x11 glib cairo libpng harfbuzz ]; + propagatedBuildInputs = [ x11 glib cairo libpng harfbuzz ] ++ libintlOrEmpty; enableParallelBuilding = true; From 7154e32f65ea40e8512d02ad856b181b78b0d562 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Jun 2013 09:17:23 +0200 Subject: [PATCH 134/153] Dropped obsolete Haskell packages primitive-0.4.1, vector-0.9.1, and vector-0.10. --- .../libraries/haskell/primitive/0.4.1.nix | 13 ------------- .../development/libraries/haskell/vector/0.10.nix | 15 --------------- .../libraries/haskell/vector/0.9.1.nix | 15 --------------- pkgs/top-level/haskell-packages.nix | 5 ----- 4 files changed, 48 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/primitive/0.4.1.nix delete mode 100644 pkgs/development/libraries/haskell/vector/0.10.nix delete mode 100644 pkgs/development/libraries/haskell/vector/0.9.1.nix diff --git a/pkgs/development/libraries/haskell/primitive/0.4.1.nix b/pkgs/development/libraries/haskell/primitive/0.4.1.nix deleted file mode 100644 index 4c4b274f425d..000000000000 --- a/pkgs/development/libraries/haskell/primitive/0.4.1.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "primitive"; - version = "0.4.1"; - sha256 = "06999i59xhvjwfdbnr1n09zkvg7lnim64nqxqlvk0x6slkidb7f6"; - meta = { - homepage = "http://code.haskell.org/primitive"; - description = "Primitive memory-related operations"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/vector/0.10.nix b/pkgs/development/libraries/haskell/vector/0.10.nix deleted file mode 100644 index 8fac71eed4b3..000000000000 --- a/pkgs/development/libraries/haskell/vector/0.10.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ cabal, deepseq, primitive }: - -cabal.mkDerivation (self: { - pname = "vector"; - version = "0.10"; - sha256 = "0lwhsdg7wv6gwjswakf2d1h9w7lp4pznab0mz6xg5q48pgknrcig"; - buildDepends = [ deepseq primitive ]; - meta = { - homepage = "http://code.haskell.org/vector"; - description = "Efficient Arrays"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/vector/0.9.1.nix b/pkgs/development/libraries/haskell/vector/0.9.1.nix deleted file mode 100644 index 63add64226d6..000000000000 --- a/pkgs/development/libraries/haskell/vector/0.9.1.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ cabal, primitive }: - -cabal.mkDerivation (self: { - pname = "vector"; - version = "0.9.1"; - sha256 = "1m6p9dy48fwh2y21y7r6svhzs86a1yijkjil7ch1mdn86gv0f9as"; - buildDepends = [ primitive ]; - meta = { - homepage = "http://code.haskell.org/vector"; - description = "Efficient Arrays"; - 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 733401b4fa9e..58706742e077 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1593,7 +1593,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); punycode = callPackage ../development/libraries/haskell/punycode {}; - primitive_0_4_1 = callPackage ../development/libraries/haskell/primitive/0.4.1.nix {}; primitive_0_5_0_1 = callPackage ../development/libraries/haskell/primitive/0.5.0.1.nix {}; primitive = self.primitive_0_5_0_1; @@ -2006,10 +2005,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); vect = callPackage ../development/libraries/haskell/vect {}; - vector_0_9_1 = callPackage ../development/libraries/haskell/vector/0.9.1.nix { - primitive = self.primitive_0_4_1; - }; - vector_0_10 = callPackage ../development/libraries/haskell/vector/0.10.nix {}; vector_0_10_0_1 = callPackage ../development/libraries/haskell/vector/0.10.0.1.nix {}; vector = self.vector_0_10_0_1; From 5e5b04d00a8e1f99810afa23bc395b1df33a80be Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Jun 2013 09:27:55 +0200 Subject: [PATCH 135/153] haskell-JuicyPixels: update to version 3.1 --- .../libraries/haskell/JuicyPixels/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix index c289c0092567..2a7bc888c48c 100644 --- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix +++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix @@ -1,17 +1,17 @@ -{ cabal, binary, deepseq, mtl, primitive, transformers, vector -, zlib +{ cabal, binary, deepseq, mmap, mtl, primitive, transformers +, vector, zlib }: cabal.mkDerivation (self: { pname = "JuicyPixels"; - version = "3.0"; - sha256 = "1qhhhnfs12r67nf07bx58n8a2v6wikan8cqs1wnjnaad8yk2spsg"; + version = "3.1"; + sha256 = "1z3adva85qgdyx85hldqi99lnb3pg7a42q44zxil4gxwi62pw4xr"; buildDepends = [ - binary deepseq mtl primitive transformers vector zlib + binary deepseq mmap mtl primitive transformers vector zlib ]; meta = { homepage = "https://github.com/Twinside/Juicy.Pixels"; - description = "Picture loading/serialization (in png, jpeg, bitmap, radiance and gif)"; + description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tiff and radiance)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; From f14d6839b1ff6b53a880479a82818dae7a7f661c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Jun 2013 09:27:55 +0200 Subject: [PATCH 136/153] haskell-hakyll: update to version 4.3.1.0 --- .../libraries/haskell/hakyll/default.nix | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 9575bc7b4bba..766f56ee8e33 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -1,28 +1,28 @@ { cabal, binary, blazeHtml, blazeMarkup, citeprocHs, cmdargs , cryptohash, dataDefault, deepseq, filepath, fsnotify, httpConduit -, httpTypes, HUnit, lrucache, mtl, pandoc, parsec, QuickCheck -, random, regexBase, regexTdfa, snapCore, snapServer +, httpTypes, HUnit, lrucache, mtl, network, pandoc, parsec +, QuickCheck, random, regexBase, regexTdfa, snapCore, snapServer , systemFilepath, tagsoup, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, text, time }: cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.3.0.0"; - sha256 = "188j3spdi2mivx5a10whpb09fm8yhg54ddfwc6x0k040c7q3aq0q"; + version = "4.3.1.0"; + sha256 = "1cx5pf0wf49cylbcgy1di218qk0fw8rgzqri9lx1v8jfl31zvsg5"; isLibrary = true; isExecutable = true; buildDepends = [ binary blazeHtml blazeMarkup citeprocHs cmdargs cryptohash dataDefault deepseq filepath fsnotify httpConduit httpTypes - lrucache mtl pandoc parsec random regexBase regexTdfa snapCore - snapServer systemFilepath tagsoup text time + lrucache mtl network pandoc parsec random regexBase regexTdfa + snapCore snapServer systemFilepath tagsoup text time ]; testDepends = [ binary blazeHtml blazeMarkup citeprocHs cmdargs cryptohash dataDefault deepseq filepath fsnotify httpConduit httpTypes HUnit - lrucache mtl pandoc parsec QuickCheck random regexBase regexTdfa - snapCore snapServer systemFilepath tagsoup testFramework + lrucache mtl network pandoc parsec QuickCheck random regexBase + regexTdfa snapCore snapServer systemFilepath tagsoup testFramework testFrameworkHunit testFrameworkQuickcheck2 text time ]; doCheck = false; @@ -31,9 +31,6 @@ cabal.mkDerivation (self: { description = "A static website compiler library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) From c7097891e007d33d7ee5daa9a8b9e233da64c789 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Jun 2013 09:27:55 +0200 Subject: [PATCH 137/153] haskell-persistent-template: update to version 1.2.0.2 --- .../libraries/haskell/persistent-template/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index f3ab1800dae4..2afc416cb522 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "persistent-template"; - version = "1.2.0.1"; - sha256 = "1l8ws4mijl0cwcl14ms8hibfgcn3y6b1679xc0cdyz1ifiymkdns"; + version = "1.2.0.2"; + sha256 = "0zj35mg7fzyk4b98s3s8m5i064s0wznz9aixgxa4kzm4xps7hj4z"; buildDepends = [ aeson monadControl monadLogger persistent text transformers ]; From 962e2aede8df63d94d2ca9f973380111efcebcf7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Jun 2013 09:27:55 +0200 Subject: [PATCH 138/153] haskell-postgresql-simple: update to version 0.3.3.2 --- .../libraries/haskell/postgresql-simple/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix index 926668039ab0..888f992b159a 100644 --- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "postgresql-simple"; - version = "0.3.3.1"; - sha256 = "0fqndncfy6yg27ndfaqyqd2q9wrbabkdq388s4q9m7maj222xlb9"; + version = "0.3.3.2"; + sha256 = "1gh2ih1n6g17jry12g7nv344sfzrhfc1assslx0cjlsryhbz25lp"; buildDepends = [ attoparsec blazeBuilder blazeTextual postgresqlLibpq text time transformers vector From 4c6a98107080c13737223854e88f3ff12b95599a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 19 Jun 2013 16:12:55 +0200 Subject: [PATCH 139/153] Adding 'weka'. --- .../science/math/weka/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/science/math/weka/default.nix diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix new file mode 100644 index 000000000000..8471c46c8d75 --- /dev/null +++ b/pkgs/applications/science/math/weka/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, jre, unzip }: + +stdenv.mkDerivation { + name = "weka-3.6.9"; + + src = fetchurl { + url = "mirror://sourceforge/weka/weka-3-6-9.zip"; + sha256 = "0rnis4vvihhdcdvpp79hkmklcnn897paa0qrs95cbjnpgvxzbczs"; + }; + + buildInputs = [ unzip ]; + + # The -Xmx1000M comes suggested from their download page: + # http://www.cs.waikato.ac.nz/ml/weka/downloading.html + installPhase = '' + mkdir -pv $out/share/weka $out/bin + cp -Rv * $out/share/weka + + cat > $out/bin/weka << EOF + #!${stdenv.shell} + ${jre}/bin/java -Xmx1000M -jar $out/share/weka/weka.jar + EOF + + chmod +x $out/bin/weka + ''; + + meta = { + homepage = "http://www.cs.waikato.ac.nz/ml/weka/"; + description = "Collection of machine learning algorithms for data mining tasks"; + license = "GPLv2+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14232f5cbcef..01b8dcc2ac91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9255,6 +9255,8 @@ let msieve = callPackage ../applications/science/math/msieve { }; + weka = callPackage ../applications/science/math/weka { }; + yacas = callPackage ../applications/science/math/yacas { }; From d4aa6099bd1e2a983a21a4ffb82ac6f1f72f05aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 19 Jun 2013 17:33:44 +0200 Subject: [PATCH 140/153] Fixing vaapi-vdpau build with newer mesa. --- .../libraries/vaapi-vdpau/default.nix | 2 ++ .../libraries/vaapi-vdpau/glext85.patch | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/vaapi-vdpau/glext85.patch diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix index a3d51217ead8..fb24ba98b450 100644 --- a/pkgs/development/libraries/vaapi-vdpau/default.nix +++ b/pkgs/development/libraries/vaapi-vdpau/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure ''; + patches = [ ./glext85.patch ]; + meta = { homepage = http://cgit.freedesktop.org/vaapi/vdpau-driver/; license = "GPLv2+"; diff --git a/pkgs/development/libraries/vaapi-vdpau/glext85.patch b/pkgs/development/libraries/vaapi-vdpau/glext85.patch new file mode 100644 index 000000000000..d66dad3e1742 --- /dev/null +++ b/pkgs/development/libraries/vaapi-vdpau/glext85.patch @@ -0,0 +1,18 @@ +diff --git a/src/utils_glx.h b/src/utils_glx.h +index 19d03e4..f270fba 100644 +--- a/src/utils_glx.h ++++ b/src/utils_glx.h +@@ -42,6 +42,13 @@ typedef void (*PFNGLVDPAUMAPSURFACESNVPROC)(GLsizei numSurfaces, const GLvdpauSu + typedef void (*PFNGLVDPAUUNMAPSURFACESNVPROC)(GLsizei numSurface, const GLvdpauSurfaceNV *surfaces); + #endif + ++#if GL_GLEXT_VERSION >= 85 ++/* XXX: PFNGLMULTITEXCOORD2FPROC got out of the GL_VERSION_1_3_DEPRECATED ++ block and is not defined if GL_VERSION_1_3 is defined in ++ Redefine the type here as an interim solution */ ++typedef void (*PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t); ++#endif ++ + /* GLX_EXT_texture_from_pixmap */ + #if GLX_GLXEXT_VERSION < 18 + typedef void (*PFNGLXBINDTEXIMAGEEXTPROC)(Display *, GLXDrawable, int, const int *); From 5f28fb15af8729dec259a86b11158fb841c9f795 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 19 Jun 2013 17:38:38 +0200 Subject: [PATCH 141/153] Note about the source of previous build fix in glext85 --- pkgs/development/libraries/vaapi-vdpau/glext85.patch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/vaapi-vdpau/glext85.patch b/pkgs/development/libraries/vaapi-vdpau/glext85.patch index d66dad3e1742..073b8cf11904 100644 --- a/pkgs/development/libraries/vaapi-vdpau/glext85.patch +++ b/pkgs/development/libraries/vaapi-vdpau/glext85.patch @@ -1,3 +1,5 @@ +http://www.mail-archive.com/libva@lists.freedesktop.org/msg01457.html + diff --git a/src/utils_glx.h b/src/utils_glx.h index 19d03e4..f270fba 100644 --- a/src/utils_glx.h From f4d648ed5c6d64d3f63d11150a571434baa913ed Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 27 May 2013 21:29:11 +1000 Subject: [PATCH 142/153] shishi: fix compilation on darwin --- pkgs/servers/shishi/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index db6f94d38266..a5d31ca354d0 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -12,10 +12,17 @@ stdenv.mkDerivation rec { buildInputs = [ libtasn1 libgcrypt gnutls ] ; + NIX_CFLAGS_COMPILE + = stdenv.lib.optionalString stdenv.isDarwin "-DBIND_8_COMPAT"; + doCheck = true; meta = { description = "GNU Shishi, free implementation of the Kerberos 5 network security system"; + homepage = http://www.gnu.org/software/shishi/; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = with stdenv.lib.maintainers; [ bjg lovek323 ]; + platforms = stdenv.lib.platforms.all; longDescription = '' GNU Shishi is an implementation of the Kerberos 5 network @@ -28,11 +35,5 @@ stdenv.mkDerivation rec { users to acquire and manage tickets (and more). The server side, a Key Distribution Center, is implemented by `shishid'. ''; - - homepage = http://www.gnu.org/software/shishi/; - license = "GPLv3+"; - - maintainers = [ stdenv.lib.maintainers.bjg ]; - platforms = stdenv.lib.platforms.all; }; } From 438034483a53da6002ba18215ca8b37a591c3d38 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 27 May 2013 21:28:48 +1000 Subject: [PATCH 143/153] guile: remove gcc_s dep, skip check on darwin --- .../development/interpreters/guile/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 66b5b79083a1..6e4051ff46eb 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -34,7 +34,9 @@ # Explicitly link against libgcc_s, to work around the infamous # "libgcc_s.so.1 must be installed for pthread_cancel to work". - LDFLAGS = "-lgcc_s"; + + # don't have "libgcc_s.so.1" on darwin + LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; postInstall = '' wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin" @@ -48,7 +50,8 @@ s|-lltdl|-L${libtool}/lib -lltdl|g' ''; - doCheck = true; + # make check doesn't work on darwin + doCheck = !stdenv.isDarwin; setupHook = ./setup-hook-2.0.sh; @@ -63,6 +66,10 @@ meta = { description = "GNU Guile 2.0, an embeddable Scheme implementation"; + homepage = http://www.gnu.org/software/guile/; + license = stdenv.lib.licenses.lgpl3Plus; + maintainers = with stdenv.lib.maintainers; [ ludo lovek323 ]; + platforms = stdenv.lib.platforms.all; longDescription = '' GNU Guile is an implementation of the Scheme programming language, with @@ -73,13 +80,6 @@ linking, a foreign function call interface, and powerful string processing. ''; - - homepage = http://www.gnu.org/software/guile/; - license = "LGPLv3+"; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - - platforms = stdenv.lib.platforms.all; }; } From 657ef3959bb18ede93e8d0ce5b439163b0452da5 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 20 Jun 2013 09:25:54 +1000 Subject: [PATCH 144/153] irssi: fix build on darwin * use `gccApple` (so we can cope with `-no-cpp-precompile`) * add `libintlOrEmpty` --- pkgs/applications/networking/irc/irssi/default.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 7 ++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 86d800e0cfe5..67e06be08830 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl}: +{ stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }: stdenv.mkDerivation rec { name = "irssi-0.8.15"; @@ -8,13 +8,15 @@ stdenv.mkDerivation rec { sha256 = "19m0aah9bhc70dnhh7kpydbsz5n35l0l9knxav1df0sic3xicbf1"; }; - buildInputs = [pkgconfig ncurses glib openssl perl]; + buildInputs = [ pkgconfig ncurses glib openssl perl libintlOrEmpty ]; NIX_LDFLAGS = "-lncurses"; configureFlags = "--with-proxy --with-ncurses --enable-ssl --with-perl=yes"; meta = { - homepage = http://irssi.org; + homepage = http://irssi.org; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ lovek323 ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01b8dcc2ac91..666ddcb4a4d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7612,7 +7612,12 @@ let iptraf = callPackage ../applications/networking/iptraf { }; - irssi = callPackage ../applications/networking/irc/irssi { }; + irssi = callPackage ../applications/networking/irc/irssi { + # compile with gccApple on darwin to support the -no-cpp-precompile flag + stdenv = if stdenv.isDarwin + then stdenvAdapters.overrideGCC stdenv gccApple + else stdenv; + }; irssi_fish = callPackage ../applications/networking/irc/irssi/fish { }; From cf2b5daa15bfe63e3b84af2f0135eadbe24bac4a Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 20 Jun 2013 10:09:15 +1000 Subject: [PATCH 145/153] sup: update to latest version --- .../networking/mailreaders/sup/default.nix | 15 ++++++++------- pkgs/development/interpreters/ruby/generated.nix | 11 +++++++++++ pkgs/development/interpreters/ruby/patches.nix | 4 ++++ pkgs/top-level/all-packages.nix | 3 ++- 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix index d71b0ed1e953..058335370266 100644 --- a/pkgs/applications/networking/mailreaders/sup/default.nix +++ b/pkgs/applications/networking/mailreaders/sup/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, ruby, rake, rubygems, makeWrapper, ncursesw_sup -, xapian_full_alaveteli, gpgme, libiconvOrEmpty, rmail, mime_types, chronic -, trollop, lockfile, gettext, iconv, locale, text }: +, xapian_ruby, gpgme, libiconvOrEmpty, rmail, mime_types, chronic, trollop +, lockfile, gettext, iconv, locale, text, highline }: stdenv.mkDerivation { - name = "sup-d21f027afcd6a4031de9619acd8dacbd2f2f4fd4"; + name = "sup-896ab66c0263e5ce0fa45857fb08e0fb78fcb6bd"; meta = { homepage = http://supmua.org; @@ -16,12 +16,12 @@ stdenv.mkDerivation { dontStrip = true; src = fetchurl { - url = "https://github.com/sup-heliotrope/sup/archive/d21f027afcd6a4031de9619acd8dacbd2f2f4fd4.tar.gz"; - sha256 = "0syifva6pqrg3nyy7xx7nan9zswb4ls6bkk96vi9ki2ly1ymwcdp"; + url = "https://github.com/sup-heliotrope/sup/archive/896ab66c0263e5ce0fa45857fb08e0fb78fcb6bd.tar.gz"; + sha256 = "0sknf4ha13m2478fa27qnm43bcn59g6qbd8f2nmv64k2zs7xnwmk"; }; buildInputs = - [ ruby rake rubygems makeWrapper gpgme ncursesw_sup xapian_full_alaveteli + [ ruby rake rubygems makeWrapper gpgme ncursesw_sup xapian_ruby libiconvOrEmpty ]; buildPhase = "rake gem"; @@ -43,7 +43,8 @@ stdenv.mkDerivation { GEM_PATH="$GEM_PATH:${rmail}/${ruby.gemPath}" GEM_PATH="$GEM_PATH:${text}/${ruby.gemPath}" GEM_PATH="$GEM_PATH:${trollop}/${ruby.gemPath}" - GEM_PATH="$GEM_PATH:${xapian_full_alaveteli}/${ruby.gemPath}" + GEM_PATH="$GEM_PATH:${xapian_ruby}/${ruby.gemPath}" + GEM_PATH="$GEM_PATH:${highline}/${ruby.gemPath}" # Don't install some dependencies -- we have already installed # the dependencies but gem doesn't acknowledge this diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index aa31bb34423f..2e8991282529 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -105,6 +105,7 @@ g: # Get dependencies from patched gems uuidtools = g.uuidtools_2_1_3; websocket = g.websocket_1_0_7; xapian_full_alaveteli = g.xapian_full_alaveteli_1_2_9_5; + xapian_ruby = g.xapian_ruby_1_2_15_1; xml_simple = g.xml_simple_1_1_1; yajl_ruby = g.yajl_ruby_1_1_0; }; @@ -1570,6 +1571,16 @@ specify.''; requiredGems = [ ]; sha256 = ''0qg1jkx5lr4a5v7l3f9gq7f07al6qaxxzma230zrzs48bz3qnhxm''; }; + xapian_ruby_1_2_15_1 = { + basename = ''xapian_ruby''; + meta = { + description = ''xapian libraries and ruby bindings''; + homepage = ''https://github.com/garaio/xapian-ruby''; + }; + name = ''xapian-ruby-1.2.15.1''; + requiredGems = [ ]; + sha256 = ''02v3l931246asbcivkr4j0x99pl4i4fjvfsr8ga8v6lkvz0ls1xp''; + }; xml_simple_1_1_1 = { basename = ''xml_simple''; meta = { diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix index 3c495526c8b9..e236a71b5542 100644 --- a/pkgs/development/interpreters/ruby/patches.nix +++ b/pkgs/development/interpreters/ruby/patches.nix @@ -101,6 +101,10 @@ in buildInputs = [ zlib libuuid ]; }; + xapian_ruby = { + buildInputs = [ zlib libuuid ]; + }; + rjb = { buildInputs = [ jdk ]; JAVA_HOME = jdk; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01b8dcc2ac91..1273d3209841 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7869,6 +7869,7 @@ let chronic = rubyLibs.chronic; gettext = rubyLibs.gettext; gpgme = ruby_gpgme; + highline = rubyLibs.highline; iconv = rubyLibs.iconv; locale = rubyLibs.locale; lockfile = rubyLibs.lockfile; @@ -7878,7 +7879,7 @@ let rmail = rubyLibs.rmail; text = rubyLibs.text; trollop = rubyLibs.trollop; - xapian_full_alaveteli = rubyLibs.xapian_full_alaveteli_1_2_9_5; + xapian_ruby = rubyLibs.xapian_ruby; }; msmtp = callPackage ../applications/networking/msmtp { }; From d16f1759348e242cd3d3caaba5bb4f06d03af336 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Thu, 20 Jun 2013 02:22:18 +0000 Subject: [PATCH 146/153] amdappsdk: Fix download urls and some other things, so derivations for older sdk versions now build succesfully --- pkgs/development/misc/amdapp-sdk/default.nix | 59 ++++++++++---------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix index 355afb9587b6..021c84fee0f1 100644 --- a/pkgs/development/misc/amdapp-sdk/default.nix +++ b/pkgs/development/misc/amdapp-sdk/default.nix @@ -5,43 +5,44 @@ let - src_hashes = { - "2.6" = { - x86 = "99610737f21b2f035e0eac4c9e776446cc4378a614c7667de03a82904ab2d356"; - x86_64 = "1fj55358s4blxq9bp77k07gqi22n5nfkzwjkbdc62gmy1zxxlhih"; - }; - - "2.7" = { - x86 = "99610737f21b2f035e0eac4c9e776446cc4378a614c7667de03a82904ab2d356"; - x86_64 = "08bi43bgnsxb47vbirh09qy02w7zxymqlqr8iikk9aavfxjlmch1"; - }; - - "2.8" = { - x86 = "99610737f21b2f035e0eac4c9e776446cc4378a614c7667de03a82904ab2d356"; - x86_64 = "d9c120367225bb1cd21abbcf77cb0a69cfb4bb6932d0572990104c566aab9681"; - }; - }; - bits = if stdenv.system == "x86_64-linux" then "64" else "32"; arch = if stdenv.system == "x86_64-linux" then "x86_64" else "x86"; + src_info = { + "2.6" = { + url = "http://download2-developer.amd.com/amd/APPSDK/AMD-APP-SDK-v2.6-lnx${bits}.tgz"; + x86 = "03vyvqp44f96036zsyy8n21ymbzy2bx09hlbd6ci3ikj8g7ic1dm"; + x86_64 = "1fj55358s4blxq9bp77k07gqi22n5nfkzwjkbdc62gmy1zxxlhih"; + }; + + "2.7" = { + url = "http://download2-developer.amd.com/amd/APPSDK/AMD-APP-SDK-v2.7-lnx${bits}.tgz"; + x86 = "1v26n7g1xvlg5ralbfk3qiy34gj8fascpnjzm3120b6sgykfp16b"; + x86_64 = "08bi43bgnsxb47vbirh09qy02w7zxymqlqr8iikk9aavfxjlmch1"; + }; + + "2.8" = { + url = "http://developer.amd.com/wordpress/media/2012/11/AMD-APP-SDK-v2.8-lnx${bits}.tgz"; + x86 = "99610737f21b2f035e0eac4c9e776446cc4378a614c7667de03a82904ab2d356"; + x86_64 = "d9c120367225bb1cd21abbcf77cb0a69cfb4bb6932d0572990104c566aab9681"; + + # TODO: Add support for aparapi, java parallel api + patches = [ ./01-remove-aparapi-samples.patch ]; + }; + }; + in stdenv.mkDerivation rec { name = "amdapp-sdk-${version}"; - src = if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://developer.amd.com/wordpress/media/2012/11/AMD-APP-SDK-v${version}-lnx64.tgz"; - sha256 = (builtins.getAttr version src_hashes).x86_64; - } else if stdenv.system == "i686-linux" then fetchurl { - url = "http://developer.amd.com/wordpress/media/2012/11/AMD-APP-SDK-v${version}-lnx32.tgz"; - sha256 = (builtins.getAttr version src_hashes).x86; - } else - throw "System not supported"; + src = fetchurl { + url = stdenv.lib.getAttrFromPath [version "url"] src_info; + sha256 = stdenv.lib.getAttrFromPath [version arch] src_info; + }; - # TODO: Add support for aparapi, java parallel api - patches = [ ./01-remove-aparapi-samples.patch ]; + patches = stdenv.lib.attrByPath [version "patches"] [] src_info; patchFlags = "-p0"; buildInputs = [ makeWrapper perl mesa xorg.libX11 xorg.libXext xorg.libXaw xorg.libXi xorg.libXxf86vm ]; @@ -51,8 +52,8 @@ in stdenv.mkDerivation rec { unpackPhase = '' tar xvzf $src - tar xf AMD-APP-SDK-v${version}-RC-lnx${bits}.tgz - cd AMD-APP-SDK-v${version}-RC-lnx${bits} + tar xf AMD-APP-SDK-v${version}-*-lnx${bits}.tgz + cd AMD-APP-SDK-v${version}-*-lnx${bits} ''; buildPhase = if !samples then ''echo "nothing to build"'' else null; From b2b6c81d4cbf79787db89acaa19ea0032340c4d4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Jun 2013 12:08:28 +0200 Subject: [PATCH 147/153] haskell-ghc-heap-view: update to version 0.5.1 --- pkgs/development/libraries/haskell/ghc-heap-view/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix index 342e2a7cd311..62b07030a460 100644 --- a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix +++ b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ghc-heap-view"; - version = "0.5.0.1"; - sha256 = "1zqzv6r4nkzam51bb6pp2i1kkzhx5mnaqcn8wzr0hxbi5lc1088h"; + version = "0.5.1"; + sha256 = "1qi7f3phj2j63x1wd2cvk36945cxd84s12zs03hlrn49wzx2pf1n"; buildDepends = [ binary transformers ]; meta = { description = "Extract the heap representation of Haskell values and thunks"; From 8c2b28b4a653112f6c81e76554057efa861b1872 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Jun 2013 12:08:28 +0200 Subject: [PATCH 148/153] haskell-mongoDB: update to version 1.4.1 --- pkgs/development/libraries/haskell/mongoDB/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/mongoDB/default.nix b/pkgs/development/libraries/haskell/mongoDB/default.nix index e730125544e0..12c65deb4453 100644 --- a/pkgs/development/libraries/haskell/mongoDB/default.nix +++ b/pkgs/development/libraries/haskell/mongoDB/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "mongoDB"; - version = "1.4.0"; - sha256 = "1cj73k6lfpxmfaigqwwglnncfl1ikz6yjgs0d9f6k42kwysbddwz"; + version = "1.4.1"; + sha256 = "1r1ywqy3igcmmwxjy4fjqdnf8m4zqbc8l0nj43h2xwrl86lhfym9"; buildDepends = [ binary bson cryptohash liftedBase monadControl mtl network parsec random randomShuffle text transformersBase From ebd26e2d67ac12750544d48fd894a345238a0304 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Thu, 20 Jun 2013 13:43:10 +0200 Subject: [PATCH 149/153] tarman: 1.0 -> 1.0.1 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f683af198987..6c27ef4bf017 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5664,12 +5664,12 @@ pythonPackages = python.modules // rec { tarman = buildPythonPackage rec { - version = "0.1"; + version = "0.1.1"; name = "tarman-${version}"; src = fetchurl { url = "https://pypi.python.org/packages/source/t/tarman/tarman-${version}.zip"; - sha256 = "1g6p9v7z2qrg000150flwmpykkzc4y8l3lvkvpn0rb8czyw7l27f"; + sha256 = "0ppd2365hf841b58fss5pgaja0y0mwx5n0gk1p3rxx9y3r0kyfas"; }; buildInputs = [ pkgs.unzip unittest2 nose mock ]; From 87fca9cf725bf5f81df08265c494133216f3a475 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 20 Jun 2013 14:22:11 +0200 Subject: [PATCH 150/153] audacious: update 3.2.2 -> 3.3.4, now needs gtk3 Also build on Linux platforms. Seems to work fine for me. --- pkgs/applications/audio/audacious/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 9ac62f585703..9ae2fcdd20ed 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -1,29 +1,26 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk, libmowgli, libmcs +{ stdenv, fetchurl, pkgconfig, glib, gtk3, libmowgli, libmcs , gettext, dbus_glib, libxml2, libmad, xlibs, alsaLib, libogg , libvorbis, libcdio, libcddb, flac, ffmpeg }: let - version = "3.2.2"; + version = "3.3.4"; in stdenv.mkDerivation { name = "audacious-${version}"; src = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2"; - sha256 = "1vj2f3jq67r9wc3s8p51w8338cjhidj3lpxmzyh31lrfikj21766"; + sha256 = "19zw4yj8g4fvxkv0ql8v8vgxzldxl1fzig239zzv88mpnvwxn737"; }; pluginsSrc = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"; - sha256 = "1z5p4ny0kzszaki4f1fgrvcr0q1j6i19847jhplc07nl1rvycdy6"; + sha256 = "1l5g0zq73qp1hlrf4xsaj0n3hg0asrp7169531jgpncjn15dhvdn"; }; - # `--enable-amidiplug' is to prevent configure from looking in /proc/asound. - configureFlags = "--enable-amidiplug --disable-oss"; - buildInputs = - [ gettext pkgconfig glib gtk libmowgli libmcs libxml2 dbus_glib + [ gettext pkgconfig glib gtk3 libmowgli libmcs libxml2 dbus_glib libmad xlibs.libXcomposite libogg libvorbis flac alsaLib libcdio libcddb ffmpeg ]; @@ -54,6 +51,7 @@ stdenv.mkDerivation { meta = { description = "Audacious, a media player forked from the Beep Media Player, which was itself an XMMS fork"; homepage = http://audacious-media-player.org/; - maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.simons ]; + maintainers = with stdenv.lib.maintainers; [ eelco simons ]; + platforms = stdenv.lib.platforms.linux; }; } From 97b95d60d895bd4064f8feec75792ac990ab3be8 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 20 Jun 2013 09:21:25 -0400 Subject: [PATCH 151/153] Chromedriver: update to 2.0 Signed-off-by: Shea Levy --- .../tools/selenium/chromedriver/default.nix | 16 +++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 063af69a7f37..bccaa70ead7c 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -1,22 +1,20 @@ { stdenv, fetchurl, cairo, fontconfig, freetype, gdk_pixbuf, glib -, glibc, gtk, libX11, makeWrapper, nspr, nss, pango, unzip +, glibc, gtk, libX11, makeWrapper, nspr, nss, pango, unzip, gconf +, libXrender, libXext }: # note: there is a i686 version available as well assert stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { - name = "chromedriver_linux64_26.0.1383.0"; + name = "chromedriver_linux64_2.0"; src = fetchurl { url = "http://chromedriver.googlecode.com/files/${name}.zip"; - sha256 = "0fh4r2rcpjc3nfrdyj256kjlyc0b6mhxqwxcah73q4vm1kjax8rs"; + sha256 = "165dq5550fs6262qa2jnjvm9smwjvws2zkkz7z5v4ibfg2j3409m"; }; - buildInputs = [ - cairo fontconfig freetype gdk_pixbuf glib gtk libX11 makeWrapper - nspr nss pango unzip - ]; + buildInputs = [ unzip makeWrapper ]; unpackPhase = "unzip $src"; @@ -25,7 +23,7 @@ stdenv.mkDerivation rec { mv chromedriver $out/bin patchelf --set-interpreter ${glibc}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver wrapProgram "$out/bin/chromedriver" \ - --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.gcc}/nix-support/orig-gcc)/lib64:${cairo}/lib:${fontconfig}/lib:${freetype}/lib:${gdk_pixbuf}/lib:${glib}/lib:${gtk}/lib:${libX11}/lib:${nspr}/lib:${nss}/lib:${pango}/lib:\$LD_LIBRARY_PATH" + --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.gcc}/nix-support/orig-gcc)/lib64:${cairo}/lib:${fontconfig}/lib:${freetype}/lib:${gdk_pixbuf}/lib:${glib}/lib:${gtk}/lib:${libX11}/lib:${nspr}/lib:${nss}/lib:${pango}/lib:${libXrender}/lib:${gconf}/lib:${libXext}/lib:\$LD_LIBRARY_PATH" ''; meta = with stdenv.lib; { @@ -34,4 +32,4 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = [ maintainers.goibhniu ]; }; -} \ No newline at end of file +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 695755f08db5..412d48e863ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3252,7 +3252,7 @@ let cgdb = callPackage ../development/tools/misc/cgdb { }; - chromedriver = callPackage ../development/tools/selenium/chromedriver { }; + chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome.GConf; }; complexity = callPackage ../development/tools/misc/complexity { }; From 3b67955fcfbaf7b5fdf187c6edf41a550cd0609d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 20 Jun 2013 17:13:17 +0200 Subject: [PATCH 152/153] skype: update from 4.1.0.20 to 4.2.0.11 --- .../networking/instant-messengers/skype/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/skype/default.nix b/pkgs/applications/networking/instant-messengers/skype/default.nix index 715f0e5c2deb..aa90c8e70261 100644 --- a/pkgs/applications/networking/instant-messengers/skype/default.nix +++ b/pkgs/applications/networking/instant-messengers/skype/default.nix @@ -5,11 +5,11 @@ assert stdenv.system == "i686-linux"; stdenv.mkDerivation rec { - name = "skype-4.1.0.20"; + name = "skype-4.2.0.11"; src = fetchurl { url = "http://download.skype.com/linux/${name}.tar.bz2"; - sha256 = "1qhcxkfmlpblpy9rqimzdl79rm781swbldkzi6nyw56bbp6lf7n3"; + sha256 = "0kh66p50m3x4ql6j8ciz73c30npcizd00ya9qrhid711rar0mlw7"; }; buildInputs = From 2cfbe7b292f17ec03ccbdb359dbf21ec73f2de0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 20 Jun 2013 19:08:09 +0200 Subject: [PATCH 153/153] wpa_supplicant: update 1.1 -> 2.0 It works fine for me, GUI as well. --- pkgs/os-specific/linux/wpa_supplicant/default.nix | 4 ++-- pkgs/os-specific/linux/wpa_supplicant/libnl.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 8f441303c255..ec2c704cfb5c 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -5,13 +5,13 @@ assert readlineSupport -> readline != null; stdenv.mkDerivation rec { - version = "1.1"; + version = "2.0"; name = "wpa_supplicant-${version}"; src = fetchurl { url = "http://hostap.epitest.fi/releases/${name}.tar.gz"; - sha256 = "00lyifj8cz7qyal6dy1dxbpk3g3bywvdarik8gbj9ds7zmfbwkd5"; + sha256 = "02cy6wrs4nzm7wbq9mc1vby8lnj58k4sb10h718ks8mmzc4mc49c"; }; extraConfig = diff --git a/pkgs/os-specific/linux/wpa_supplicant/libnl.patch b/pkgs/os-specific/linux/wpa_supplicant/libnl.patch index ede6dad721c5..477f8dd55f69 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/libnl.patch +++ b/pkgs/os-specific/linux/wpa_supplicant/libnl.patch @@ -5,7 +5,7 @@ diff -up wpa_supplicant-1.0-rc2/src/drivers/drivers.mak.foo wpa_supplicant-1.0-r ifdef CONFIG_LIBNL32 DRV_LIBS += -lnl-3 DRV_LIBS += -lnl-genl-3 -- DRV_CFLAGS += -DCONFIG_LIBNL20 +- DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3 + DRV_CFLAGS += -DCONFIG_LIBNL20 `pkg-config --cflags libnl-3.0` else ifdef CONFIG_LIBNL_TINY